@nimbus-dev/connectors 0.7.0 → 0.9.0

package/connectors/iac/src/tools.ts

@@ -1,66 +1,687 @@
-import { mkdtemp, rm, writeFile } from "node:fs/promises";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
+import { createHash, randomBytes, timingSafeEqual } from "node:crypto";
+import { chmod, lstat, mkdir, readFile, realpath, rm, writeFile } from "node:fs/promises";
+import { basename, isAbsolute, join, relative, sep } from "node:path";
 import { z } from "zod";
 import { awsCliArg, cliArg } from "../../../shared/cli-json-kit.ts";
 import type { ConsentServer } from "../../../shared/consent-kit.ts";
-import { createWriteToolRegistrar } from "../../../shared/consent-kit.ts";
+import {
+  createPrepareToolRegistrar,
+  createWriteToolRegistrar,
+} from "../../../shared/consent-kit.ts";
 import {
   createRegisterSimpleTool,
   createZodToolRegistrar,
   mcpJsonResult as jsonResult,
 } from "../../../shared/mcp-tool-kit.ts";
-import { runCliOkThrowing } from "../../../shared/run-cli-json.ts";
+import { scratchDirBase, withScratchDir } from "../../../shared/private-scratch.ts";
+import { runCliCode, runCliOkThrowing } from "../../../shared/run-cli-json.ts";
 
 /**
- * The most a template may be when it is deployed without an S3 bucket, which this tool does not
- * take: `aws cloudformation deploy` refuses a larger one itself, and only after the prompt.
+ * The most a template may be when it is handed to `create-change-set` as `--template-body`, which
+ * is how this connector hands one over (no S3 bucket): CloudFormation refuses a larger one itself.
+ * https://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_CreateChangeSet.html
  */
 const TEMPLATE_MAX_BYTES = 51_200;
 
+/** A saved plan file is read whole (to hash it), so it is bounded. */
+const PLAN_FILE_MAX_BYTES = 64 * 1024 * 1024;
+/** `terraform show -json` output is returned whole, so it is bounded. */
+const PLAN_JSON_MAX_BYTES = 4 * 1024 * 1024;
+/** Most resource changes one change-set reply carries. */
+const CHANGES_MAX = 500;
+/** Most bytes of one change-set reply (the prepare tool's whole answer). */
+const CHANGESET_REPLY_MAX_BYTES = 256 * 1024;
+/** Longest the change set is polled for, and how often. */
+const CHANGESET_POLL_DEADLINE_MS = 120_000;
+const CHANGESET_POLL_INTERVAL_MS = 2000;
+/** Page guard for `NextToken` following, so a misbehaving CLI cannot loop forever. */
+const CHANGESET_PAGES_MAX = 100;
+
+/**
+ * Time seams for the change-set poll, exported so a test never waits two real seconds per poll.
+ * Production never replaces them.
+ */
+export const iacTimeHooks: {
+  sleep: (ms: number) => Promise<void>;
+  now: () => number;
+} = {
+  sleep: (ms) => new Promise((resolve) => setTimeout(resolve, ms)),
+  now: () => Date.now(),
+};
+
 /**
  * A CloudFormation template. It reaches the AWS CLI as a file, never as an argument (see
- * {@link withTemplateFile}), so none of the argument rules apply to it: a YAML template may well
- * start with `---`. Its size is refused here, in the schema, because no consent can lift it: a
- * larger template would be put to the human, spend a unit of write budget, and then fail. The
- * character bound is the one a client is shown; no string over it can be within the byte bound.
+ * `withScratchDir` below), so none of the argument rules apply to it: a YAML template may well
+ * start with `---`. The schema carries only the character bound a client is shown; the UTF-8 byte
+ * bound is {@link templateProblem}, run by the handlers and by `refuseBefore` (a `.refine()` on the
+ * registered schema would lose its `.shape`).
  */
-const templateDocument = z
+const templateDocument = z.string().min(1).max(TEMPLATE_MAX_BYTES);
+
+/** Why `template` may not be sent, or `undefined`. A fixed message, before any spawn. */
+export function templateProblem(template: string): string | undefined {
+  if (new TextEncoder().encode(template).length > TEMPLATE_MAX_BYTES) {
+    return `templateBody must be at most ${String(TEMPLATE_MAX_BYTES)} bytes as UTF-8, the most create-change-set takes without an S3 bucket`;
+  }
+  return undefined;
+}
+
+const CAPABILITY_VALUES = [
+  "CAPABILITY_IAM",
+  "CAPABILITY_NAMED_IAM",
+  "CAPABILITY_AUTO_EXPAND",
+] as const;
+const capabilitiesSchema = z.array(z.enum(CAPABILITY_VALUES)).max(3).optional();
+
+/** Why `capabilities` may not be sent (a duplicate), or `undefined`. */
+function capabilitiesProblem(capabilities: readonly string[] | undefined): string | undefined {
+  if (capabilities !== undefined && new Set(capabilities).size !== capabilities.length) {
+    return "capabilities must not repeat a value";
+  }
+  return undefined;
+}
+
+/**
+ * A change set's ARN. The CLI's `--change-set-name` takes a name or an ARN; the ARN alone names
+ * one change set of one stack unambiguously, and starts with `arn:` so it can never read as a flag
+ * or a `file://` load.
+ */
+const changeSetArn = z
   .string()
-  .min(1)
-  .max(TEMPLATE_MAX_BYTES)
-  .refine((t) => new TextEncoder().encode(t).length <= TEMPLATE_MAX_BYTES, {
-    message: `must be at most ${String(TEMPLATE_MAX_BYTES)} bytes as UTF-8, the most aws cloudformation deploy takes without an S3 bucket`,
-  });
+  .regex(
+    /^arn:aws[a-z-]*:cloudformation:[a-z0-9-]+:\d{12}:changeSet\/[A-Za-z][-A-Za-z0-9]{0,127}\/[0-9a-f-]{36}$/,
+    "must be a CloudFormation change set ARN",
+  );
+
+/** The change set name inside an ARN that already matched {@link changeSetArn}. */
+function changeSetNameOf(arn: string): string {
+  return arn.split("/")[1] ?? "";
+}
+
+/**
+ * A saved plan file path. `cliArg` refuses a leading `-` and control characters, and caps the
+ * length at 1024 characters (the repo-wide CLI argument bound, which `cli-argument-guards.test.ts`
+ * pins), a little under the 4096 the plan first named: a plan path under NIMBUS_IAC_PLAN_DIR is
+ * far shorter.
+ */
+const planFileArg = cliArg;
+
+const sha256Hex = z.string().regex(/^[0-9a-f]{64}$/, "must be a lower-case SHA-256 hex digest");
+
+function sha256Of(data: string | Uint8Array): string {
+  return createHash("sha256").update(data).digest("hex");
+}
+
+/** The file names a plan is saved under: the KIND of plan is its name (apply vs destroy). */
+const PLAN_NAME = "plan.tfplan";
+const DESTROY_PLAN_NAME = "destroy.tfplan";
+
+/**
+ * Why a plan file path is refused before the disk is touched (shared with refuseBefore): not
+ * absolute, a Windows device or UNC form (a leading backslash, which covers the
+ * long-path, device and host forms; on win32 also two forward slashes), or not one of the file
+ * names allowed (apply takes only plan.tfplan, destroy only destroy.tfplan).
+ */
+function planFilePathProblem(planFile: string, names: readonly string[]): string | undefined {
+  if (planFile.startsWith("\\") || (process.platform === "win32" && planFile.startsWith("//"))) {
+    return "planFile must not be a device or network path";
+  }
+  if (!isAbsolute(planFile)) return "planFile must be an absolute path";
+  if (!names.includes(basename(planFile))) {
+    return `planFile must be named ${names.join(" or ")}`;
+  }
+  return undefined;
+}
 
 /**
- * Run `body` with `template` written to a file of its own, removed afterwards however `body` ends.
+ * Check a plan file and return its REAL path, which is what is hashed and handed to terraform.
  *
- * `aws cloudformation deploy` takes a template only as `--template-file`, and passing one as an
- * argument would not work anyway: a template can run past the 32,767 characters a Windows command
- * line holds, and an `aws` that is a batch file, as a pip-installed v1 is, has cmd.exe parse every
- * quote in it.
+ * It must be a regular, non-linked file of a sane size that lies strictly inside the real
+ * NIMBUS_IAC_PLAN_DIR (a symlinked parent directory, or a sibling whose name merely starts with
+ * the plan dir's, is outside). NO copy is made. Making that directory read-only to everyone but the
+ * gateway between approval and apply is the gateway's job; this connector can only narrow the
+ * window, not close it (README: stated bound).
  */
-async function withTemplateFile<T>(
-  template: string,
-  body: (path: string) => Promise<T>,
-): Promise<T> {
-  const dir = await mkdtemp(join(tmpdir(), "nimbus-cfn-"));
+async function resolvePlanFile(planFile: string, names: readonly string[]): Promise<string> {
+  const problem = planFilePathProblem(planFile, names);
+  if (problem !== undefined) throw new Error(problem);
+  const base = await planDirBase();
+  let st: Awaited<ReturnType<typeof lstat>>;
+  try {
+    st = await lstat(planFile);
+  } catch {
+    throw new Error("planFile does not exist");
+  }
+  if (st.isSymbolicLink() || !st.isFile()) {
+    throw new Error("planFile must be a regular file, not a link");
+  }
+  if (st.size > PLAN_FILE_MAX_BYTES) {
+    throw new Error("planFile is too large");
+  }
+  const realBase = await realpath(base);
+  const real = await realpath(planFile);
+  const rel = relative(realBase, real);
+  if (rel === "" || rel === ".." || rel.startsWith(`..${sep}`) || isAbsolute(rel)) {
+    throw new Error(`planFile must be inside ${IAC_PLAN_DIR_ENV}`);
+  }
+  return real;
+}
+
+/** Environment of every terraform child: automation mode, and never an interactive prompt. */
+function terraformEnv(): Record<string, string | undefined> {
+  return { ...process.env, TF_IN_AUTOMATION: "1", TF_INPUT: "0" };
+}
+
+/** The directory plan files live under: absolute, an existing real directory. */
+export const IAC_PLAN_DIR_ENV = "NIMBUS_IAC_PLAN_DIR";
+
+async function planDirBase(): Promise<string> {
+  const configured = process.env[IAC_PLAN_DIR_ENV]?.trim();
+  if (configured === undefined || configured === "") {
+    throw new Error(`${IAC_PLAN_DIR_ENV} is not set: a plan needs a directory to be saved in`);
+  }
+  if (!isAbsolute(configured)) {
+    throw new Error(`${IAC_PLAN_DIR_ENV} must be an absolute path`);
+  }
+  let st: Awaited<ReturnType<typeof lstat>>;
+  try {
+    st = await lstat(configured);
+  } catch {
+    throw new Error(`${IAC_PLAN_DIR_ENV} does not name an existing directory`);
+  }
+  if (st.isSymbolicLink() || !st.isDirectory()) {
+    throw new Error(`${IAC_PLAN_DIR_ENV} must be a real directory, not a link`);
+  }
+  return configured;
+}
+
+/** `terraform plan` / `plan -destroy`, saved under a fresh per-plan directory. */
+async function terraformPlan(
+  workingDirectory: string,
+  destroy: boolean,
+): Promise<ReturnType<typeof jsonResult>> {
+  const base = await planDirBase();
+  const planId = randomBytes(16).toString("hex");
+  const planDir = join(base, planId);
+  // Non-recursive: an existing directory of that name is an error, never silently reused.
+  await mkdir(planDir, { mode: 0o700 });
+  const planFile = join(planDir, destroy ? DESTROY_PLAN_NAME : PLAN_NAME);
+  try {
+    const r = await runCliCode(
+      [
+        "terraform",
+        `-chdir=${workingDirectory}`,
+        "plan",
+        ...(destroy ? ["-destroy"] : []),
+        "-input=false",
+        "-no-color",
+        "-detailed-exitcode",
+        "-lock-timeout=30s",
+        `-out=${planFile}`,
+      ],
+      terraformEnv(),
+    );
+    // -detailed-exitcode: 0 = empty diff, 1 = error, 2 = changes present.
+    // https://developer.hashicorp.com/terraform/cli/commands/plan
+    if (r.code !== 0 && r.code !== 2) {
+      throw new Error(`terraform exited ${String(r.code)}: ${r.stderr.slice(0, 500)}`);
+    }
+    try {
+      await chmod(planFile, 0o600);
+    } catch {
+      // Best effort: Windows has no POSIX modes; the directory is already 0700 where it matters.
+    }
+    const planSha256 = sha256Of(await readFile(planFile));
+    return jsonResult({ planId, planFile, planSha256, hasChanges: r.code === 2 });
+  } catch (e) {
+    await rm(planDir, { recursive: true, force: true });
+    throw e;
+  }
+}
+
+/** `terraform apply <planFile>` after the file's hash is proven to be the approved one. */
+async function terraformApplyPlan(
+  p: { workingDirectory: string; planFile: string; planSha256: string },
+  name: string,
+): Promise<ReturnType<typeof jsonResult>> {
+  const planFile = await resolvePlanFile(p.planFile, [name]);
+  // Read ONCE; the hash is of exactly these bytes.
+  const actual = Buffer.from(sha256Of(await readFile(planFile)), "hex");
+  const approved = Buffer.from(p.planSha256, "hex");
+  if (actual.length !== approved.length || !timingSafeEqual(actual, approved)) {
+    throw new Error("plan file does not match the approved hash");
+  }
+  // No -auto-approve and no -destroy: a saved plan applies as it was planned, and `apply <file>`
+  // runs without a prompt. https://developer.hashicorp.com/terraform/cli/commands/apply
+  const r = await runCliCode(
+    ["terraform", `-chdir=${p.workingDirectory}`, "apply", "-input=false", "-no-color", planFile],
+    terraformEnv(),
+  );
+  if (r.code !== 0) {
+    throw new Error(`terraform exited ${String(r.code)}: ${r.stderr.slice(0, 500)}`);
+  }
+  // A plan carries secrets and is stale once applied. Best effort: a directory the gateway made
+  // read-only makes this fail, which is ignored.
   try {
-    const path = join(dir, "template");
-    await writeFile(path, template, { encoding: "utf8", mode: 0o600, flag: "wx" });
-    return await body(path);
-  } finally {
-    await rm(dir, { recursive: true, force: true });
+    await rm(planFile, { force: true });
+  } catch {
+    // ignored, see above
+  }
+  return jsonResult({ ok: true, status: "applied" });
+}
+
+// ---------------------------------------------------------------------------
+// CloudFormation
+
+/** The aws CLI's environment: the operator's, plus UTF-8 for the template file it reads. */
+function awsEnv(): Record<string, string | undefined> {
+  // The file is UTF-8. Left to itself the CLI reads it in the locale's encoding, and on a
+  // Windows machine using cp1252 a template holding "Á" fails to decode while one holding
+  // "é" deploys as "é". AWS CLI v2 reads AWS_CLI_FILE_ENCODING and ignores PYTHONUTF8; v1,
+  // plain Python, reads PYTHONUTF8 and ignores the other. Both are set.
+  return { ...process.env, AWS_CLI_FILE_ENCODING: "UTF-8", PYTHONUTF8: "1" };
+}
+
+/** Run an aws command; any non-zero exit throws the one failure message. Resolves to stdout. */
+async function awsOk(argv: readonly string[]): Promise<string> {
+  const r = await runCliCode(["aws", ...argv], awsEnv());
+  if (r.code !== 0) {
+    throw new Error(`aws exited ${String(r.code)}: ${r.stderr.slice(0, 500)}`);
+  }
+  return r.stdout;
+}
+
+function parseObject(text: string, what: string): Record<string, unknown> {
+  let v: unknown;
+  try {
+    v = JSON.parse(text);
+  } catch {
+    throw new Error(`invalid JSON from aws ${what}`);
+  }
+  if (typeof v !== "object" || v === null || Array.isArray(v)) {
+    throw new Error(`unexpected reply from aws ${what}`);
+  }
+  return v as Record<string, unknown>;
+}
+
+function str(v: unknown): string | undefined {
+  return typeof v === "string" ? v : undefined;
+}
+
+type StackState =
+  | { exists: false }
+  | { exists: true; status: string; statusReason?: string; lastUpdatedTime?: string };
+
+async function describeStack(stackName: string): Promise<StackState> {
+  const r = await runCliCode(
+    ["aws", "cloudformation", "describe-stacks", "--stack-name", stackName, "--output", "json"],
+    awsEnv(),
+  );
+  if (r.code !== 0) {
+    // A missing stack is an ordinary answer (a first deploy), reported on stderr as
+    // "Stack with id X does not exist".
+    if (/does not exist/.test(r.stderr)) return { exists: false };
+    throw new Error(`aws exited ${String(r.code)}: ${r.stderr.slice(0, 500)}`);
+  }
+  const stacks = parseObject(r.stdout, "describe-stacks")["Stacks"];
+  const first: unknown = Array.isArray(stacks) ? stacks[0] : undefined;
+  if (typeof first !== "object" || first === null) return { exists: false };
+  const s = first as Record<string, unknown>;
+  const status = str(s["StackStatus"]);
+  if (status === undefined) throw new Error("unexpected reply from aws describe-stacks");
+  const out: StackState = { exists: true, status };
+  const reason = str(s["StackStatusReason"]);
+  if (reason !== undefined) out.statusReason = reason;
+  const updated = str(s["LastUpdatedTime"]) ?? str(s["CreationTime"]);
+  if (updated !== undefined) out.lastUpdatedTime = updated;
+  return out;
+}
+
+/**
+ * Remove a change set, and the empty stack shell a CREATE-type change set leaves behind.
+ *
+ * A first-time deploy's change set puts the stack in REVIEW_IN_PROGRESS, a shell with no resources
+ * that lingers. It is deleted only when it is in that status AND holds no change set at all; a
+ * stack in any other status is never deleted here.
+ * https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-updating-stacks-changesets.html
+ */
+async function cleanupChangeSet(
+  stackName: string,
+  changeSet: string,
+  skipChangeSetDelete: boolean,
+): Promise<{ changeSetDeleted: boolean; stackDeleted: boolean }> {
+  if (!skipChangeSetDelete) {
+    await awsOk(["cloudformation", "delete-change-set", "--change-set-name", changeSet]);
+  }
+  let stackDeleted = false;
+  const stack = await describeStack(stackName);
+  if (stack.exists && stack.status === "REVIEW_IN_PROGRESS") {
+    const listed = await awsOk([
+      "cloudformation",
+      "list-change-sets",
+      "--stack-name",
+      stackName,
+      "--output",
+      "json",
+    ]);
+    const summaries = parseObject(listed, "list-change-sets")["Summaries"];
+    if (!Array.isArray(summaries) || summaries.length === 0) {
+      await awsOk(["cloudformation", "delete-stack", "--stack-name", stackName]);
+      stackDeleted = true;
+    }
+  }
+  return { changeSetDeleted: !skipChangeSetDelete, stackDeleted };
+}
+
+type ChangeRow = {
+  action: string;
+  logicalId: string;
+  physicalId?: string;
+  resourceType: string;
+  replacement: string;
+  scope: string[];
+};
+
+function changeRowOf(raw: unknown): ChangeRow | undefined {
+  if (typeof raw !== "object" || raw === null) return undefined;
+  const rc = (raw as Record<string, unknown>)["ResourceChange"];
+  if (typeof rc !== "object" || rc === null) return undefined;
+  const c = rc as Record<string, unknown>;
+  const row: ChangeRow = {
+    action: str(c["Action"]) ?? "unknown",
+    logicalId: str(c["LogicalResourceId"]) ?? "",
+    resourceType: str(c["ResourceType"]) ?? "",
+    replacement: str(c["Replacement"]) ?? "unknown",
+    scope: stringList(c["Scope"]),
+  };
+  const physical = str(c["PhysicalResourceId"]);
+  if (physical !== undefined) row.physicalId = physical;
+  return row;
+}
+
+function stringList(v: unknown): string[] {
+  return Array.isArray(v) ? v.filter((x): x is string => typeof x === "string") : [];
+}
+
+function setEqual(a: readonly string[], b: readonly string[]): boolean {
+  return new Set(a).size === a.length && a.length === b.length && a.every((x) => b.includes(x));
+}
+
+/** The name every change set of this connector carries: bound to the exact template it is for. */
+function changeSetNameFor(templateSha256: string): string {
+  return `nimbus-${templateSha256}-${randomBytes(6).toString("hex")}`;
+}
+
+/** Sync refusals shared by the execute handler and `refuseBefore`. */
+function deployProblem(p: {
+  templateBody: string;
+  capabilities?: readonly string[] | undefined;
+  changeSetId: string;
+}): string | undefined {
+  const t = templateProblem(p.templateBody) ?? capabilitiesProblem(p.capabilities);
+  if (t !== undefined) return t;
+  const expected = new RegExp(`^nimbus-${sha256Of(p.templateBody)}-[0-9a-f]{12}$`);
+  if (!expected.test(changeSetNameOf(p.changeSetId))) {
+    return "the change set was not made for this template";
+  }
+  return undefined;
+}
+
+/** Poll the change set until it is CREATE_COMPLETE; returns that reply. Throws otherwise. */
+async function awaitChangeSet(
+  describe: (nextToken?: string) => Promise<string>,
+): Promise<Record<string, unknown>> {
+  const deadline = iacTimeHooks.now() + CHANGESET_POLL_DEADLINE_MS;
+  for (;;) {
+    const d = parseObject(await describe(), "describe-change-set");
+    const status = str(d["Status"]);
+    if (status === "CREATE_COMPLETE") return d;
+    if (status !== "CREATE_PENDING" && status !== "CREATE_IN_PROGRESS") {
+      // FAILED (a template with no changes lands here too: its StatusReason says so) or any
+      // other terminal status.
+      // Capped like every stderr echo here: the reason is AWS's text and may quote the template.
+      throw new Error(
+        `change set ${status ?? "unknown"}: ${(str(d["StatusReason"]) ?? "no reason given").slice(0, 500)}`,
+      );
+    }
+    if (iacTimeHooks.now() >= deadline) {
+      throw new Error("change set was not ready within 120 seconds");
+    }
+    await iacTimeHooks.sleep(CHANGESET_POLL_INTERVAL_MS);
+  }
+}
+
+/** Every resource change, following `NextToken` by hand. */
+async function collectChanges(
+  first: Record<string, unknown>,
+  describe: (nextToken?: string) => Promise<string>,
+): Promise<ChangeRow[]> {
+  const changes: ChangeRow[] = [];
+  let page = first;
+  for (let pages = 1; ; pages += 1) {
+    const raw = page["Changes"];
+    for (const item of Array.isArray(raw) ? raw : []) {
+      const row = changeRowOf(item);
+      if (row !== undefined) changes.push(row);
+    }
+    if (changes.length > CHANGES_MAX) throw new Error("change set too large");
+    const token = str(page["NextToken"]);
+    if (token === undefined || token === "") return changes;
+    if (pages >= CHANGESET_PAGES_MAX) throw new Error("change set too large");
+    // U: whether the CLI paginates describe-change-set itself is unconfirmed; see the README.
+    page = parseObject(await describe(token), "describe-change-set");
+  }
+}
+
+async function changeSetCreate(p: {
+  stackName: string;
+  templateBody: string;
+  capabilities?: readonly string[] | undefined;
+}): Promise<ReturnType<typeof jsonResult>> {
+  const bad = templateProblem(p.templateBody) ?? capabilitiesProblem(p.capabilities);
+  if (bad !== undefined) throw new Error(bad);
+  const capabilities = p.capabilities ?? [];
+  const templateSha256 = sha256Of(p.templateBody);
+  // Refuse a missing scratch grant (Windows under the gateway) before the first aws call, as the
+  // kubernetes plan does: the template file is written under it below.
+  scratchDirBase();
+
+  const stack = await describeStack(p.stackName);
+  // REVIEW_IN_PROGRESS: a shell left by an earlier CREATE change set, which only a CREATE change
+  // set may be added to. DELETE_COMPLETE: a deleted stack can be created again under its name.
+  const changeSetType =
+    !stack.exists || stack.status === "REVIEW_IN_PROGRESS" || stack.status === "DELETE_COMPLETE"
+      ? "CREATE"
+      : "UPDATE";
+  const name = changeSetNameFor(templateSha256);
+
+  return withScratchDir("nimbus-cfn-", async (dir) => {
+    const templatePath = join(dir, "template");
+    await writeFile(templatePath, p.templateBody, { encoding: "utf8", mode: 0o600, flag: "wx" });
+    const created = parseObject(
+      await awsOk([
+        "cloudformation",
+        "create-change-set",
+        "--stack-name",
+        p.stackName,
+        "--change-set-name",
+        name,
+        "--change-set-type",
+        changeSetType,
+        "--template-body",
+        `file://${templatePath}`,
+        ...(capabilities.length > 0 ? ["--capabilities", ...capabilities] : []),
+        "--output",
+        "json",
+      ]),
+      "create-change-set",
+    );
+    const changeSetId = str(created["Id"]);
+    if (changeSetId === undefined) {
+      // The call succeeded, so a change set (and, for CREATE, a REVIEW_IN_PROGRESS stack) may
+      // exist: delete it by name, best effort, rather than leave it behind with no Id to report.
+      await runCliCode(
+        [
+          "aws",
+          "cloudformation",
+          "delete-change-set",
+          "--change-set-name",
+          name,
+          "--stack-name",
+          p.stackName,
+        ],
+        awsEnv(),
+      );
+      throw new Error("unexpected reply from aws create-change-set");
+    }
+    const stackId = str(created["StackId"]) ?? "";
+
+    const describe = (nextToken?: string): Promise<string> =>
+      awsOk([
+        "cloudformation",
+        "describe-change-set",
+        "--change-set-name",
+        changeSetId,
+        ...(nextToken === undefined ? [] : ["--next-token", nextToken]),
+        "--output",
+        "json",
+      ]);
+
+    try {
+      const changes = await collectChanges(await awaitChangeSet(describe), describe);
+      const reply = {
+        changeSetId,
+        changeSetName: name,
+        stackId,
+        stackName: p.stackName,
+        changeSetType,
+        templateSha256,
+        capabilities,
+        changes,
+      };
+      if (Buffer.byteLength(JSON.stringify(reply), "utf8") > CHANGESET_REPLY_MAX_BYTES) {
+        throw new Error("change set too large");
+      }
+      return jsonResult(reply);
+    } catch (e) {
+      try {
+        await cleanupChangeSet(p.stackName, changeSetId, false);
+      } catch {
+        // Best effort: the failure being reported is the original one.
+      }
+      throw e;
+    }
+  });
+}
+
+async function changeSetExecute(p: {
+  stackName: string;
+  templateBody: string;
+  capabilities?: readonly string[] | undefined;
+  changeSetId: string;
+}): Promise<ReturnType<typeof jsonResult>> {
+  const bad = deployProblem(p);
+  if (bad !== undefined) throw new Error(bad);
+  const d = parseObject(
+    await awsOk([
+      "cloudformation",
+      "describe-change-set",
+      "--change-set-name",
+      p.changeSetId,
+      "--output",
+      "json",
+    ]),
+    "describe-change-set",
+  );
+  if (str(d["Status"]) !== "CREATE_COMPLETE") {
+    throw new Error(`change set is ${str(d["Status"]) ?? "unknown"}, not CREATE_COMPLETE`);
+  }
+  if (str(d["ExecutionStatus"]) !== "AVAILABLE") {
+    throw new Error(`change set cannot be executed: ${str(d["ExecutionStatus"]) ?? "unknown"}`);
+  }
+  if (str(d["StackName"]) !== p.stackName) {
+    throw new Error("change set belongs to a different stack");
   }
+  if (!setEqual(stringList(d["Capabilities"]), p.capabilities ?? [])) {
+    throw new Error("change set capabilities do not match the approved capabilities");
+  }
+  await awsOk(["cloudformation", "execute-change-set", "--change-set-name", p.changeSetId]);
+  return jsonResult({
+    ok: true,
+    status: "execution started",
+    changeSetId: p.changeSetId,
+    stackId: str(d["StackId"]) ?? "",
+  });
+}
+
+/**
+ * The exact shape of a change set name this connector makes (`nimbus-<template sha256>-<12 hex>`).
+ * Discard requires all of it, not a `nimbus-` prefix: a person's own `nimbus-prod-hotfix` change
+ * set must not be deletable through a tool that says it deletes only its own.
+ */
+const NIMBUS_CHANGE_SET_NAME = /^nimbus-[0-9a-f]{64}-[0-9a-f]{12}$/;
+
+function discardProblem(changeSetId: string): string | undefined {
+  return NIMBUS_CHANGE_SET_NAME.test(changeSetNameOf(changeSetId))
+    ? undefined
+    : "only a change set this connector made (nimbus-<template sha256>-<12 hex>) can be discarded";
+}
+
+async function describeChangeSetOrMissing(
+  changeSetId: string,
+): Promise<Record<string, unknown> | undefined> {
+  const r = await runCliCode(
+    [
+      "aws",
+      "cloudformation",
+      "describe-change-set",
+      "--change-set-name",
+      changeSetId,
+      "--output",
+      "json",
+    ],
+    awsEnv(),
+  );
+  if (r.code !== 0) {
+    if (/ChangeSetNotFound|does not exist/.test(r.stderr)) return undefined;
+    throw new Error(`aws exited ${String(r.code)}: ${r.stderr.slice(0, 500)}`);
+  }
+  return parseObject(r.stdout, "describe-change-set");
 }
 
+async function changeSetDiscard(p: {
+  stackName: string;
+  changeSetId: string;
+}): Promise<ReturnType<typeof jsonResult>> {
+  const bad = discardProblem(p.changeSetId);
+  if (bad !== undefined) throw new Error(bad);
+  const d = await describeChangeSetOrMissing(p.changeSetId);
+  if (d !== undefined && str(d["StackName"]) !== p.stackName) {
+    throw new Error("change set belongs to a different stack");
+  }
+  // Not found: nothing of ours to remove, so the empty-shell deletion is NOT attempted either. It
+  // runs only after THIS call deleted a change set that belongs to the stack. (Bound: between
+  // list-change-sets and delete-stack another change set could be added; README.)
+  if (d === undefined)
+    return jsonResult({ ok: true, changeSetDeleted: false, stackDeleted: false });
+  const done = await cleanupChangeSet(p.stackName, p.changeSetId, false);
+  return jsonResult({ ok: true, ...done });
+}
+
+const PULUMI_UP_REFUSAL =
+  "iac_pulumi_up is refused: Pulumi saved update plans are documented as experimental, so no plan-bound apply exists (OR-W34-2)";
+
 /** Tool names exposed by this connector — for contract/introspection tests. */
 export const IAC_TOOL_NAMES = [
   "iac_terraform_plan",
+  "iac_terraform_destroy_plan",
+  "iac_terraform_show_json",
   "iac_terraform_apply",
   "iac_terraform_destroy",
+  "iac_cloudformation_changeset_create",
+  "iac_cloudformation_changeset_discard",
   "iac_cloudformation_deploy",
+  "iac_cloudformation_stack_get",
   "iac_pulumi_preview",
   "iac_pulumi_up",
 ] as const;
@@ -70,110 +691,195 @@ export function registerIacTools(
 ): void {
   const reg = createZodToolRegistrar(createRegisterSimpleTool(server));
 
+  const cfg = {
+    connector: "iac",
+    scopeEnv: "NIMBUS_MCP_IAC_WRITE_SCOPE",
+    scopeKinds: ["dir", "stack"],
+  } as const;
+
   /**
    * Every MUTATING iac tool goes through here. Outside the gateway this adds the
    * consent gate, the write-scope allow-list, the mutation budget and the audit record; inside
    * the gateway it is a pass-through, because executor.ts (I2) is the gate there.
    */
-  const registerWriteTool = createWriteToolRegistrar(server, {
-    connector: "iac",
-    scopeEnv: "NIMBUS_MCP_IAC_WRITE_SCOPE",
-    scopeKinds: ["dir", "stack"],
-  });
+  const registerWriteTool = createWriteToolRegistrar(server, cfg);
+  /** Tools the gateway calls before a write's prompt: they change nothing but a scratch area. */
+  const registerPrepareTool = createPrepareToolRegistrar(server, cfg);
 
-  const processEnv = process.env as Record<string, string | undefined>;
+  const dirScope = (p: { workingDirectory: string }): { kind: string; value: string } => ({
+    kind: "dir",
+    value: p.workingDirectory,
+  });
+  const stackScope = (p: { stackName: string }): { kind: string; value: string } => ({
+    kind: "stack",
+    value: p.stackName,
+  });
 
-  reg(
+  registerPrepareTool(
     "iac_terraform_plan",
-    "Run terraform plan in a directory.",
+    { scopeTargetOf: dirScope },
+    "Run terraform plan in a directory and save the plan under NIMBUS_IAC_PLAN_DIR. Returns the plan id, file, its SHA-256 and whether it has changes.",
+    z.object({ workingDirectory: cliArg }),
+    (p) => terraformPlan(p.workingDirectory, false),
+  );
+
+  registerPrepareTool(
+    "iac_terraform_destroy_plan",
+    { scopeTargetOf: dirScope },
+    "Run terraform plan -destroy in a directory and save the plan under NIMBUS_IAC_PLAN_DIR.",
     z.object({ workingDirectory: cliArg }),
+    (p) => terraformPlan(p.workingDirectory, true),
+  );
+
+  registerPrepareTool(
+    "iac_terraform_show_json",
+    { scopeTargetOf: dirScope },
+    "Render a saved terraform plan file as JSON (terraform show -json).",
+    z.object({ workingDirectory: cliArg, planFile: planFileArg }),
     async (p) => {
-      await runCliOkThrowing(
-        ["terraform", `-chdir=${p.workingDirectory}`, "plan", "-input=false"],
-        {
-          ...processEnv,
-        },
+      const planFile = await resolvePlanFile(p.planFile, [PLAN_NAME, DESTROY_PLAN_NAME]);
+      // Read once, immediately before the show: the hash is of the bytes the owner is shown.
+      const planSha256 = sha256Of(await readFile(planFile));
+      const r = await runCliCode(
+        ["terraform", `-chdir=${p.workingDirectory}`, "show", "-json", "-no-color", planFile],
+        terraformEnv(),
       );
-      return jsonResult({ ok: true });
+      if (r.code !== 0) {
+        throw new Error(`terraform exited ${String(r.code)}: ${r.stderr.slice(0, 500)}`);
+      }
+      if (Buffer.byteLength(r.stdout, "utf8") > PLAN_JSON_MAX_BYTES) {
+        throw new Error("plan JSON too large");
+      }
+      try {
+        JSON.parse(r.stdout);
+      } catch {
+        throw new Error("terraform show -json did not print JSON");
+      }
+      return jsonResult({ planJson: r.stdout, planSha256 });
     },
   );
 
+  const applyShape = {
+    workingDirectory: cliArg,
+    planFile: planFileArg,
+    planSha256: sha256Hex,
+  };
+  const applyPreState = (p: {
+    workingDirectory: string;
+    planFile: string;
+    planSha256: string;
+  }): Promise<Record<string, unknown>> =>
+    Promise.resolve({
+      workingDirectory: p.workingDirectory,
+      planFile: p.planFile,
+      planSha256: p.planSha256,
+    });
+
   registerWriteTool(
     "iac_terraform_apply",
     {
       mutates: "iac.terraform.apply",
-      recoverable: true,
-      scopeTargetOf: (p) => ({ kind: "dir", value: p.workingDirectory }),
-    },
-    "Run terraform apply.",
-    z.object({ workingDirectory: cliArg }),
-    async (p) => {
-      await runCliOkThrowing(
-        ["terraform", `-chdir=${p.workingDirectory}`, "apply", "-auto-approve", "-input=false"],
-        { ...processEnv },
-      );
-      return jsonResult({ ok: true });
+      // Applying infrastructure cannot be undone from its own result; the plan's identity is the
+      // record.
+      recoverable: false,
+      capturePreState: applyPreState,
+      scopeTargetOf: dirScope,
+      refuseBefore: (p) => planFilePathProblem(p.planFile, [PLAN_NAME]),
     },
+    "Apply a saved terraform plan file (plan.tfplan) whose SHA-256 matches the approved one.",
+    z.object(applyShape),
+    (p) => terraformApplyPlan(p, PLAN_NAME),
   );
 
   registerWriteTool(
     "iac_terraform_destroy",
     {
       mutates: "iac.terraform.destroy",
-      // Destroying infrastructure cannot be undone from its own result, and there is nothing
-      // queryable to snapshot, so the identifying parameters ARE the pre-state: a record naming
-      // WHICH directory was destroyed still beats silence.
       recoverable: false,
-      capturePreState: (p) => Promise.resolve({ workingDirectory: p.workingDirectory }),
-      scopeTargetOf: (p) => ({ kind: "dir", value: p.workingDirectory }),
+      capturePreState: applyPreState,
+      scopeTargetOf: dirScope,
+      refuseBefore: (p) => planFilePathProblem(p.planFile, [DESTROY_PLAN_NAME]),
     },
-    "Run terraform destroy.",
-    z.object({ workingDirectory: cliArg }),
-    async (p) => {
-      await runCliOkThrowing(
-        ["terraform", `-chdir=${p.workingDirectory}`, "destroy", "-auto-approve", "-input=false"],
-        { ...processEnv },
-      );
-      return jsonResult({ ok: true });
+    "Apply a saved terraform destroy plan file (destroy.tfplan) whose SHA-256 matches the approved one.",
+    z.object(applyShape),
+    (p) => terraformApplyPlan(p, DESTROY_PLAN_NAME),
+  );
+
+  registerPrepareTool(
+    "iac_cloudformation_changeset_create",
+    { scopeTargetOf: stackScope },
+    "Create a CloudFormation change set for a template and list its resource changes. Nothing is executed.",
+    z.object({
+      stackName: awsCliArg,
+      templateBody: templateDocument,
+      capabilities: capabilitiesSchema,
+    }),
+    changeSetCreate,
+  );
+
+  registerWriteTool(
+    "iac_cloudformation_changeset_discard",
+    {
+      mutates: "iac.cloudformation.changeset.discard",
+      recoverable: false,
+      capturePreState: async (p) => {
+        const d = await describeChangeSetOrMissing(p.changeSetId);
+        return d === undefined
+          ? { exists: false }
+          : {
+              exists: true,
+              status: str(d["Status"]) ?? null,
+              executionStatus: str(d["ExecutionStatus"]) ?? null,
+            };
+      },
+      scopeTargetOf: stackScope,
+      refuseBefore: (p) => discardProblem(p.changeSetId),
     },
+    "Delete a change set made by iac_cloudformation_changeset_create, and the empty stack shell it left.",
+    z.object({ stackName: awsCliArg, changeSetId: changeSetArn }),
+    changeSetDiscard,
   );
 
   registerWriteTool(
     "iac_cloudformation_deploy",
     {
       mutates: "iac.cloudformation.deploy",
-      recoverable: true,
-      scopeTargetOf: (p) => ({ kind: "stack", value: p.stackName }),
+      recoverable: false,
+      capturePreState: async (p) => {
+        const s = await describeStack(p.stackName);
+        return s.exists
+          ? { exists: true, stackStatus: s.status, lastUpdatedTime: s.lastUpdatedTime ?? null }
+          : { exists: false, stackStatus: null, lastUpdatedTime: null };
+      },
+      scopeTargetOf: stackScope,
+      refuseBefore: deployProblem,
     },
-    "Deploy a CloudFormation stack via AWS CLI.",
+    "Execute a reviewed CloudFormation change set (made by iac_cloudformation_changeset_create for exactly this template).",
     z.object({
       stackName: awsCliArg,
       templateBody: templateDocument,
+      capabilities: capabilitiesSchema,
+      changeSetId: changeSetArn,
     }),
+    changeSetExecute,
+  );
+
+  reg(
+    "iac_cloudformation_stack_get",
+    "Describe a CloudFormation stack's status.",
+    z.object({ stackName: awsCliArg }),
     async (p) => {
-      await withTemplateFile(p.templateBody, (templateFile) =>
-        runCliOkThrowing(
-          [
-            "aws",
-            "cloudformation",
-            "deploy",
-            "--stack-name",
-            p.stackName,
-            "--template-file",
-            templateFile,
-            "--capabilities",
-            "CAPABILITY_IAM",
-            // A deploy of a template that changes nothing has done what was asked, not failed.
-            "--no-fail-on-empty-changeset",
-          ],
-          // The file is UTF-8. Left to itself the CLI reads it in the locale's encoding, and on a
-          // Windows machine using cp1252 a template holding "Á" fails to decode while one holding
-          // "é" deploys as "é". AWS CLI v2 reads AWS_CLI_FILE_ENCODING and ignores PYTHONUTF8; v1,
-          // plain Python, reads PYTHONUTF8 and ignores the other. Both are set.
-          { ...processEnv, AWS_CLI_FILE_ENCODING: "UTF-8", PYTHONUTF8: "1" },
-        ),
+      const s = await describeStack(p.stackName);
+      return jsonResult(
+        s.exists
+          ? {
+              exists: true,
+              status: s.status,
+              statusReason: s.statusReason ?? null,
+              lastUpdatedTime: s.lastUpdatedTime ?? null,
+            }
+          : { exists: false },
       );
-      return jsonResult({ ok: true });
     },
   );
 
@@ -184,7 +890,7 @@ export function registerIacTools(
     async (p) => {
       await runCliOkThrowing(
         ["pulumi", "preview", "--cwd", p.workingDirectory, "--non-interactive"],
-        { ...processEnv },
+        { ...process.env },
       );
       return jsonResult({ ok: true });
     },
@@ -195,16 +901,13 @@ export function registerIacTools(
     {
       mutates: "iac.pulumi.up",
       recoverable: true,
-      scopeTargetOf: (p) => ({ kind: "dir", value: p.workingDirectory }),
+      scopeTargetOf: dirScope,
+      refuseBefore: () => PULUMI_UP_REFUSAL,
     },
-    "Run pulumi up.",
+    "Refused: no plan-bound Pulumi apply exists. Kept registered so the refusal names its reason.",
     z.object({ workingDirectory: cliArg }),
-    async (p) => {
-      await runCliOkThrowing(
-        ["pulumi", "up", "--yes", "--cwd", p.workingDirectory, "--non-interactive"],
-        { ...processEnv },
-      );
-      return jsonResult({ ok: true });
-    },
+    // Pulumi's saved update plans are experimental, so there is nothing the owner could approve
+    // that an apply is then bound to. Refused on every door, spawning nothing.
+    () => Promise.reject(new Error(PULUMI_UP_REFUSAL)),
   );
 }