diff --git a/astro.config.mjs b/astro.config.mjs
index 20c2dcd..688accd 100644
--- a/astro.config.mjs
+++ b/astro.config.mjs
@@ -11,6 +11,7 @@ export default defineConfig({
redirects: {
// The compare index only repeated the sidebar; its URL lands on the main comparison.
'/compare/': '/compare/terraform-platforms/',
+ '/compare/choudoufu-and-terraform-state/': '/compare/coordinating-changes/',
'/compare/control-planes/': '/compare/terraform-platforms/',
// chant, CDK and Pulumi is argued on the blog and in chant's docs.
'/compare/chant-cdk-and-pulumi/': 'https://intentius.io/chant/',
@@ -87,7 +88,7 @@ export default defineConfig({
{
label: 'Compare',
collapsed: true,
- items: ['compare/terraform-platforms', 'compare/choudoufu-and-terraform-state'],
+ items: ['compare/terraform-platforms', 'compare/coordinating-changes'],
},
{
label: 'About',
diff --git a/src/components/Landing.astro b/src/components/Landing.astro
index edab700..1ac883f 100644
--- a/src/components/Landing.astro
+++ b/src/components/Landing.astro
@@ -16,7 +16,7 @@ const { part = 'top' } = Astro.props;
// One row of cards under the header, each straight into a page of the site.
const cards = [
{ title: 'Comparing Intentius to the rest', body: "Free, against each vendor's top tier.", href: '/compare/terraform-platforms/' },
- { title: 'choudoufu and the state file', body: 'The owner on the resource, no state lock.', href: '/compare/choudoufu-and-terraform-state/' },
+ { title: 'Coordinating changes', body: 'Application locks or resource labels, for OpenTofu and Pulumi.', href: '/compare/coordinating-changes/' },
{ title: 'Move off another runner', body: 'Atlantis, Terraform Cloud or Spacelift, one repo at a time.', href: '/for/moving/' },
{ title: 'Carve up a large estate', body: 'Hundreds of roots, or one state file shared by too many teams.', href: '/for/estate/' },
];
diff --git a/src/components/PageTitle.astro b/src/components/PageTitle.astro
index e2aa938..cb61984 100644
--- a/src/components/PageTitle.astro
+++ b/src/components/PageTitle.astro
@@ -5,10 +5,10 @@
import Default from '@astrojs/starlight/components/PageTitle.astro';
const { entry } = Astro.locals.starlightRoute;
-const { description, wide } = entry.data;
+const { description, wide, lead = true } = entry.data;
---
-{description &&
{description}
}
+{lead && description && {description}
}
{wide && }
diff --git a/src/content.config.ts b/src/content.config.ts
index bee4a74..fdc3a14 100644
--- a/src/content.config.ts
+++ b/src/content.config.ts
@@ -9,6 +9,9 @@ export const collections = {
extend: z.object({
// A comparison page uses the full main column (PageTitle.astro).
wide: z.boolean().optional(),
+ // false keeps the description for search and link previews and
+ // leaves it off the page.
+ lead: z.boolean().optional(),
}),
}),
}),
diff --git a/src/content/docs/compare/choudoufu-and-terraform-state.mdx b/src/content/docs/compare/choudoufu-and-terraform-state.mdx
deleted file mode 100644
index c38d77e..0000000
--- a/src/content/docs/compare/choudoufu-and-terraform-state.mdx
+++ /dev/null
@@ -1,15 +0,0 @@
----
-title: "choudoufu and the Terraform state file"
-wide: true
-tableOfContents: false
-description: "Same HCL, same providers, same plan. Ownership moves onto the resource."
----
-
-import Arenas from '../../../components/Arenas.astro';
-import * as data from '../../../data/compare-choudoufu-state.mjs';
-
-A state file does three jobs. It says which live resource an address refers to, holds values the cloud cannot, and records that an effect happened. [choudoufu](https://intentius.io/choudoufu/) takes them apart, and the state file becomes a cache you may lose.
-
-Everything else is stock OpenTofu.
-
-
diff --git a/src/content/docs/compare/coordinating-changes.mdx b/src/content/docs/compare/coordinating-changes.mdx
new file mode 100644
index 0000000..a5c7e10
--- /dev/null
+++ b/src/content/docs/compare/coordinating-changes.mdx
@@ -0,0 +1,36 @@
+---
+title: "Coordinating changes"
+lead: false
+wide: true
+tableOfContents: false
+description: "How resources are grouped and locked decides the operations a team lives with. A backend per boundary against one backend with boundaries by label, compared operation by operation."
+---
+
+import Arenas from '../../../components/Arenas.astro';
+import Op from '../../../components/StateOp.astro';
+import * as cdf from '../../../data/compare-choudoufu-state.mjs';
+import * as pl from '../../../data/compare-plunge-state.mjs';
+
+Coordinating applies comes down to ownership and boundaries, and the way you implement them shapes every operation below.
+
+
+
+
+
+
+
+
+
+
+
+## choudoufu and the Terraform state file
+
+Same HCL, same providers, same plan. Everything else is stock OpenTofu.
+
+
+
+## plunge and the Pulumi checkpoint
+
+Your Pulumi programs, SDKs and providers run unchanged.
+
+
diff --git a/src/content/docs/tools.mdx b/src/content/docs/tools.mdx
index 9081c0c..a876496 100644
--- a/src/content/docs/tools.mdx
+++ b/src/content/docs/tools.mdx
@@ -34,13 +34,13 @@ Declares an agent's sandbox, its secrets and its schedule as ordinary infrastruc
, and the engine terragucci can run with `binary: choudoufu`. Every resource records who owns it on the resource itself, as tags or labels on the three big clouds and Kubernetes. The state file becomes a copy you are allowed to lose.
-[Docs](https://intentius.io/choudoufu/) · [Source](https://github.com/INTENTIUS/choudoufu) · [Compare](/compare/choudoufu-and-terraform-state/)
+[Docs](https://intentius.io/choudoufu/) · [Source](https://github.com/INTENTIUS/choudoufu) · [Compare](/compare/coordinating-changes/)
## plunge
, and the engine plywood can run with `engine: plunge`. This fork of Pulumi has a drop-in CLI that runs your programs as they are. plunge keeps one record per resource in place of one state file per stack and writes two ownership tags on each cloud object, so two runs that change different resources of one stack do not wait for each other.
-[Docs](https://intentius.io/plunge/) · [Source](https://github.com/INTENTIUS/plunge) · [Compare](/compare/terraform-platforms/)
+[Docs](https://intentius.io/plunge/) · [Source](https://github.com/INTENTIUS/plunge) · [Compare](/compare/coordinating-changes/)
## plywood
diff --git a/src/data/compare-choudoufu-state.mjs b/src/data/compare-choudoufu-state.mjs
index dc058ed..d185763 100644
--- a/src/data/compare-choudoufu-state.mjs
+++ b/src/data/compare-choudoufu-state.mjs
@@ -7,6 +7,10 @@ export const LABEL = 'choudoufu and the Terraform state file compared';
export const READ_ON = '2026-10-25';
+export const PREFIX = 'cdf-';
+
+export const LEVEL = 3;
+
export const TRADEMARKS = 'Terraform is a trademark of HashiCorp, an IBM Company. OpenTofu is a trademark of The Linux Foundation.';
export const VENDORS = [
@@ -35,12 +39,12 @@ export const ARENAS = [
rows: [
{ q: 'An apply killed after a create',
cdf: ['good', 'the next plan finds the resource by its tag', `${C}/`],
- tf: ['bad', 'an orphan the re-run doesn\'t know about', `${C}/`] },
- { q: 'The lock a killed apply leaves',
- cdf: ['good', 'none to release', `${C}/`],
- tf: ['warn', 'on S3, GCS or azurerm, held until force-unlock', `${H}/cli/commands/force-unlock`] },
+ tf: ['bad', 'an orphan outside the state', `${C}/`] },
+ { q: 'After a killed apply',
+ cdf: ['good', 'the next run starts at once', `${C}/`],
+ tf: ['warn', 'on S3, GCS or azurerm, a lock to force-unlock', `${H}/cli/commands/force-unlock`] },
{ q: 'Losing the state file',
- cdf: ['good', 'it was a cache; the next plan rebuilds it', `${C}/docs/model/cache/`],
+ cdf: ['good', 'the next plan reads the resources and records', `${C}/docs/model/cache/`],
tf: ['bad', 're-import every resource', `${H}/language/import`] },
],
},
@@ -48,13 +52,13 @@ export const ARENAS = [
id: 'concurrency', title: 'Two changes at once',
rows: [
{ q: 'What one apply holds',
- cdf: ['good', 'no lock; each resource is its own record', `${C}/how-it-works/locking/`],
+ cdf: ['good', 'each resource is its own record', `${C}/how-it-works/locking/`],
tf: ['warn', 'the whole state file', `${H}/language/state/locking`] },
{ q: 'Applies on different resources',
cdf: ['good', 'both land', `${C}/docs/model/concurrency/`],
tf: ['warn', 'the second waits for the lock', `${H}/language/state/locking`] },
{ q: 'A saved plan another apply made stale',
- cdf: ['good', 'refused, naming the resource that moved', `${C}/`],
+ cdf: ['good', 'caught, naming the resource that moved', `${C}/`],
tf: ['warn', 'the whole plan refused as stale', `${H}/cli/commands/apply`] },
],
},
@@ -65,7 +69,7 @@ export const ARENAS = [
cdf: ['warn', 'AWS, Kubernetes, GCP and Azure', `${C}/docs/progress/`],
tf: ['good', 'every provider', `${H}/language/backend`] },
{ q: 'A backend block or a non-default workspace',
- cdf: ['warn', 'refused; choudoufu live-check reports it before you start', `${C}/docs/progress/`],
+ cdf: ['warn', 'choudoufu live-check flags it before you start', `${C}/docs/progress/`],
tf: ['good', 'supported', `${H}/language/backend`] },
],
},
diff --git a/src/data/compare-plunge-state.mjs b/src/data/compare-plunge-state.mjs
new file mode 100644
index 0000000..7a7aa96
--- /dev/null
+++ b/src/data/compare-plunge-state.mjs
@@ -0,0 +1,77 @@
+// plunge against the stock Pulumi checkpoint, as arenas for Arenas.astro.
+// Same shape as compare-choudoufu-state.mjs. plunge cells state only what
+// plunge's published docs describe.
+
+export const LABEL = 'plunge and the Pulumi checkpoint compared';
+
+export const READ_ON = '2026-11-17';
+
+export const PREFIX = 'pl-';
+
+export const HEAD = false;
+
+export const LEVEL = 3;
+
+export const TRADEMARKS = 'Pulumi and the Pulumi logo are trademarks of Pulumi Corporation, and plunge is independent of it.';
+
+export const VENDORS = [
+ { id: 'pl', name: 'plunge', logo: { dark: '/brand/vendors/plunge.png', light: '/brand/vendors/plunge.png' }, named: true, link: true, color: '#4a9fd0', href: 'https://intentius.io/plunge/' },
+ { id: 'pu', name: 'Pulumi', logo: { dark: '/brand/vendors/pulumi-on-dark.svg', light: '/brand/vendors/pulumi-on-light.svg' }, icon: true, color: '#a35dc9', href: 'https://www.pulumi.com/docs/iac/concepts/state-and-backends/' },
+];
+
+const P = 'https://intentius.io/plunge';
+const S = 'https://www.pulumi.com/docs/iac/concepts/state-and-backends/';
+
+export const ARENAS = [
+ {
+ id: 'access', title: 'Who can touch what',
+ rows: [
+ { q: 'The permission unit',
+ pl: ['good', 'one resource', `${P}/how-it-works/identity/`],
+ pu: ['warn', 'one stack', S] },
+ { q: 'Narrowing access',
+ pl: ['good', 'an IAM condition on the plunge-stack tag', `${P}/aws/gate/`],
+ pu: ['warn', 'split the stack', S] },
+ ],
+ },
+ {
+ id: 'failure', title: 'When something breaks',
+ blurb: 'A crash, a killed run, a surprise delete.',
+ rows: [
+ { q: 'A create that already landed',
+ pl: ['good', 'the next create lists by marker and binds it', `${P}/how-it-works/concurrency/`],
+ pu: ['warn', 'a pending operation to resolve', S] },
+ { q: 'A run that would delete an object',
+ pl: ['good', 'checks the live marker first', `${P}/how-it-works/deletes/`],
+ pu: ['warn', 'deletes what the checkpoint lists', S] },
+ { q: 'Losing the store',
+ pl: ['warn', 'records hold full state; bucket versioning keeps their versions', `${P}/how-it-works/records/`],
+ pu: ['warn', 'restore the checkpoint from a backup', S] },
+ ],
+ },
+ {
+ id: 'concurrency', title: 'Two changes at once',
+ rows: [
+ { q: 'What one update holds',
+ pl: ['good', 'each record is its own write', `${P}/how-it-works/concurrency/`],
+ pu: ['warn', 'the stack lock', S] },
+ { q: 'Updates on different resources',
+ pl: ['good', 'both land', `${P}/how-it-works/concurrency/`],
+ pu: ['warn', 'one at a time per stack', S] },
+ { q: 'A saved plan another run made stale',
+ pl: ['good', 'caught, naming the record that moved', `${P}/how-it-works/concurrency/`],
+ pu: ['warn', 'checked against the plan\'s constraints', 'https://www.pulumi.com/docs/iac/concepts/update-plans/'] },
+ ],
+ },
+ {
+ id: 'reach', title: 'Where it runs',
+ rows: [
+ { q: 'Platforms',
+ pl: ['warn', 'AWS, Kubernetes, GCP and Azure', `${P}/`],
+ pu: ['good', 'every provider', S] },
+ { q: 'Stack history',
+ pl: ['warn', 'record versions, in the bucket', `${P}/how-it-works/`],
+ pu: ['good', 'kept', S] },
+ ],
+ },
+];
diff --git a/src/data/rooms.mjs b/src/data/rooms.mjs
index 73a3d0f..c3b6d61 100644
--- a/src/data/rooms.mjs
+++ b/src/data/rooms.mjs
@@ -36,7 +36,7 @@ export const ROOMS = [
],
read: [
{ label: 'Fractional retainer', href: '/work/#fractional-devops-retainer-from-8000-a-month' },
- { label: 'choudoufu and the state file', href: '/compare/choudoufu-and-terraform-state/' },
+ { label: 'Coordinating changes', href: '/compare/coordinating-changes/' },
],
},
{