@morty-build/cli 0.4.13 → 0.4.15

package/dist/{chunk-SPF6MCPU.js → chunk-D5ASHLUO.js}

@@ -80,7 +80,7 @@ var __callDispose = (stack, error, hasError) => {
 // package.json
 var package_default = {
   name: "@morty-build/cli",
-  version: "0.4.13",
+  version: "0.4.15",
   description: "Morty CLI for installing, pairing, and operating the Morty background service.",
   type: "module",
   bin: {
@@ -176,4 +176,4 @@ export {
   __callDispose,
   package_default
 };
-//# sourceMappingURL=chunk-SPF6MCPU.js.map
+//# sourceMappingURL=chunk-D5ASHLUO.js.map

package/dist/{chunk-SPF6MCPU.js.map → chunk-D5ASHLUO.js.map}

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../package.json"],
-  "sourcesContent": ["{\n    \"name\": \"@morty-build/cli\",\n    \"version\": \"0.4.13\",\n    \"description\": \"Morty CLI for installing, pairing, and operating the Morty background service.\",\n    \"type\": \"module\",\n    \"bin\": {\n        \"morty\": \"dist/cli.js\"\n    },\n    \"exports\": {\n        \"./engine\": {\n            \"morty-source\": \"./src/exports/engine.ts\",\n            \"types\": \"./dist/exports/engine.d.ts\",\n            \"default\": \"./dist/engine.js\"\n        }\n    },\n    \"files\": [\n        \"dist\",\n        \"LICENSE\",\n        \"NOTICE\",\n        \"THIRD-PARTY-NOTICES.txt\"\n    ],\n    \"engines\": {\n        \"node\": \"^22.19.0 || ^24.20.0\"\n    },\n    \"publishConfig\": {\n        \"access\": \"public\",\n        \"exports\": {\n            \"./engine\": {\n                \"types\": \"./dist/exports/engine.d.ts\",\n                \"import\": \"./dist/engine.js\",\n                \"default\": \"./dist/engine.js\"\n            }\n        }\n    },\n    \"repository\": {\n        \"type\": \"git\",\n        \"url\": \"git+https://github.com/moxt-ai/mobius-morty.git\",\n        \"directory\": \"packages/cli\"\n    },\n    \"scripts\": {\n        \"prebuild\": \"tsc --project src/engine/acp/harness/claude/upstream/tsconfig.json && tsc --project src/engine/acp/harness/pi/upstream/tsconfig.json\",\n        \"build\": \"node scripts/build.ts && tsc --project tsconfig.build.json\",\n        \"dev\": \"node --watch src/cli/entrypoint.ts\",\n        \"pretypecheck\": \"tsc --project src/engine/acp/harness/claude/upstream/tsconfig.json && tsc --project src/engine/acp/harness/pi/upstream/tsconfig.json\",\n        \"prepack\": \"pnpm build\",\n        \"start\": \"node dist/cli.js\",\n        \"typecheck\": \"tsc --project tsconfig.json && tsc --project tests/tsconfig.json\",\n        \"pretest:controlled\": \"pnpm build && pnpm pack:test\",\n        \"test:controlled\": \"vitest run tests/sessions tests/runtime\",\n        \"pretest:manual\": \"pnpm pretest:controlled\",\n        \"test:manual\": \"vitest run tests/manual\",\n        \"pretest:agents\": \"pnpm build && pnpm pack:test\",\n        \"test:agents\": \"vitest run tests/agents --maxWorkers=2\",\n        \"pretest:pressure\": \"tsc --project src/engine/acp/harness/claude/upstream/tsconfig.json && tsc --project src/engine/acp/harness/pi/upstream/tsconfig.json\",\n        \"test:pressure\": \"node tests/pressure/concurrent-sessions.mjs\",\n        \"pack:test\": \"node scripts/pack-test-release.ts\"\n    },\n    \"dependencies\": {\n        \"undici\": \"8.12.2\"\n    },\n    \"devDependencies\": {\n        \"@agentclientprotocol/sdk\": \"^1.4.0\",\n        \"@anthropic-ai/claude-agent-sdk\": \"0.3.257\",\n        \"@anthropic-ai/sdk\": \"0.122.0\",\n        \"@morty-build/client\": \"workspace:*\",\n        \"@morty-build/platform-test-support\": \"workspace:*\",\n        \"@types/node\": \"^24.13.5\",\n        \"@types/semver\": \"^7.8.0\",\n        \"@types/ws\": \"^8.18.1\",\n        \"commander\": \"15.0.0\",\n        \"drizzle-kit\": \"1.0.0-rc.4\",\n        \"drizzle-orm\": \"1.0.0-rc.4\",\n        \"esbuild\": \"0.28.2\",\n        \"semver\": \"^7.8.5\",\n        \"valibot\": \"1.5.0\",\n        \"ws\": \"^8.21.3\",\n        \"zod\": \"^4.6.7\",\n        \"@morty-build/local-state\": \"workspace:*\",\n        \"miniflare\": \"catalog:\"\n    },\n    \"keywords\": [],\n    \"author\": \"Moxt\",\n    \"license\": \"Apache-2.0\",\n    \"bugs\": {\n        \"url\": \"https://github.com/moxt-ai/mobius-morty/issues\"\n    },\n    \"homepage\": \"https://morty.build\",\n    \"private\": false\n}\n"],
+  "sourcesContent": ["{\n    \"name\": \"@morty-build/cli\",\n    \"version\": \"0.4.15\",\n    \"description\": \"Morty CLI for installing, pairing, and operating the Morty background service.\",\n    \"type\": \"module\",\n    \"bin\": {\n        \"morty\": \"dist/cli.js\"\n    },\n    \"exports\": {\n        \"./engine\": {\n            \"morty-source\": \"./src/exports/engine.ts\",\n            \"types\": \"./dist/exports/engine.d.ts\",\n            \"default\": \"./dist/engine.js\"\n        }\n    },\n    \"files\": [\n        \"dist\",\n        \"LICENSE\",\n        \"NOTICE\",\n        \"THIRD-PARTY-NOTICES.txt\"\n    ],\n    \"engines\": {\n        \"node\": \"^22.19.0 || ^24.20.0\"\n    },\n    \"publishConfig\": {\n        \"access\": \"public\",\n        \"exports\": {\n            \"./engine\": {\n                \"types\": \"./dist/exports/engine.d.ts\",\n                \"import\": \"./dist/engine.js\",\n                \"default\": \"./dist/engine.js\"\n            }\n        }\n    },\n    \"repository\": {\n        \"type\": \"git\",\n        \"url\": \"git+https://github.com/moxt-ai/mobius-morty.git\",\n        \"directory\": \"packages/cli\"\n    },\n    \"scripts\": {\n        \"prebuild\": \"tsc --project src/engine/acp/harness/claude/upstream/tsconfig.json && tsc --project src/engine/acp/harness/pi/upstream/tsconfig.json\",\n        \"build\": \"node scripts/build.ts && tsc --project tsconfig.build.json\",\n        \"dev\": \"node --watch src/cli/entrypoint.ts\",\n        \"pretypecheck\": \"tsc --project src/engine/acp/harness/claude/upstream/tsconfig.json && tsc --project src/engine/acp/harness/pi/upstream/tsconfig.json\",\n        \"prepack\": \"pnpm build\",\n        \"start\": \"node dist/cli.js\",\n        \"typecheck\": \"tsc --project tsconfig.json && tsc --project tests/tsconfig.json\",\n        \"pretest:controlled\": \"pnpm build && pnpm pack:test\",\n        \"test:controlled\": \"vitest run tests/sessions tests/runtime\",\n        \"pretest:manual\": \"pnpm pretest:controlled\",\n        \"test:manual\": \"vitest run tests/manual\",\n        \"pretest:agents\": \"pnpm build && pnpm pack:test\",\n        \"test:agents\": \"vitest run tests/agents --maxWorkers=2\",\n        \"pretest:pressure\": \"tsc --project src/engine/acp/harness/claude/upstream/tsconfig.json && tsc --project src/engine/acp/harness/pi/upstream/tsconfig.json\",\n        \"test:pressure\": \"node tests/pressure/concurrent-sessions.mjs\",\n        \"pack:test\": \"node scripts/pack-test-release.ts\"\n    },\n    \"dependencies\": {\n        \"undici\": \"8.12.2\"\n    },\n    \"devDependencies\": {\n        \"@agentclientprotocol/sdk\": \"^1.4.0\",\n        \"@anthropic-ai/claude-agent-sdk\": \"0.3.257\",\n        \"@anthropic-ai/sdk\": \"0.122.0\",\n        \"@morty-build/client\": \"workspace:*\",\n        \"@morty-build/platform-test-support\": \"workspace:*\",\n        \"@types/node\": \"^24.13.5\",\n        \"@types/semver\": \"^7.8.0\",\n        \"@types/ws\": \"^8.18.1\",\n        \"commander\": \"15.0.0\",\n        \"drizzle-kit\": \"1.0.0-rc.4\",\n        \"drizzle-orm\": \"1.0.0-rc.4\",\n        \"esbuild\": \"0.28.2\",\n        \"semver\": \"^7.8.5\",\n        \"valibot\": \"1.5.0\",\n        \"ws\": \"^8.21.3\",\n        \"zod\": \"^4.6.7\",\n        \"@morty-build/local-state\": \"workspace:*\",\n        \"miniflare\": \"catalog:\"\n    },\n    \"keywords\": [],\n    \"author\": \"Moxt\",\n    \"license\": \"Apache-2.0\",\n    \"bugs\": {\n        \"url\": \"https://github.com/moxt-ai/mobius-morty/issues\"\n    },\n    \"homepage\": \"https://morty.build\",\n    \"private\": false\n}\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA,EACI,MAAQ;AAAA,EACR,SAAW;AAAA,EACX,aAAe;AAAA,EACf,MAAQ;AAAA,EACR,KAAO;AAAA,IACH,OAAS;AAAA,EACb;AAAA,EACA,SAAW;AAAA,IACP,YAAY;AAAA,MACR,gBAAgB;AAAA,MAChB,OAAS;AAAA,MACT,SAAW;AAAA,IACf;AAAA,EACJ;AAAA,EACA,OAAS;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACJ;AAAA,EACA,SAAW;AAAA,IACP,MAAQ;AAAA,EACZ;AAAA,EACA,eAAiB;AAAA,IACb,QAAU;AAAA,IACV,SAAW;AAAA,MACP,YAAY;AAAA,QACR,OAAS;AAAA,QACT,QAAU;AAAA,QACV,SAAW;AAAA,MACf;AAAA,IACJ;AAAA,EACJ;AAAA,EACA,YAAc;AAAA,IACV,MAAQ;AAAA,IACR,KAAO;AAAA,IACP,WAAa;AAAA,EACjB;AAAA,EACA,SAAW;AAAA,IACP,UAAY;AAAA,IACZ,OAAS;AAAA,IACT,KAAO;AAAA,IACP,cAAgB;AAAA,IAChB,SAAW;AAAA,IACX,OAAS;AAAA,IACT,WAAa;AAAA,IACb,sBAAsB;AAAA,IACtB,mBAAmB;AAAA,IACnB,kBAAkB;AAAA,IAClB,eAAe;AAAA,IACf,kBAAkB;AAAA,IAClB,eAAe;AAAA,IACf,oBAAoB;AAAA,IACpB,iBAAiB;AAAA,IACjB,aAAa;AAAA,EACjB;AAAA,EACA,cAAgB;AAAA,IACZ,QAAU;AAAA,EACd;AAAA,EACA,iBAAmB;AAAA,IACf,4BAA4B;AAAA,IAC5B,kCAAkC;AAAA,IAClC,qBAAqB;AAAA,IACrB,uBAAuB;AAAA,IACvB,sCAAsC;AAAA,IACtC,eAAe;AAAA,IACf,iBAAiB;AAAA,IACjB,aAAa;AAAA,IACb,WAAa;AAAA,IACb,eAAe;AAAA,IACf,eAAe;AAAA,IACf,SAAW;AAAA,IACX,QAAU;AAAA,IACV,SAAW;AAAA,IACX,IAAM;AAAA,IACN,KAAO;AAAA,IACP,4BAA4B;AAAA,IAC5B,WAAa;AAAA,EACjB;AAAA,EACA,UAAY,CAAC;AAAA,EACb,QAAU;AAAA,EACV,SAAW;AAAA,EACX,MAAQ;AAAA,IACJ,KAAO;AAAA,EACX;AAAA,EACA,UAAY;AAAA,EACZ,SAAW;AACf;",
   "names": []
 }

package/dist/{chunk-LZZG3QZL.js → chunk-QEHEPZW2.js}

@@ -3,7 +3,7 @@ import {
   __export,
   __using,
   package_default
-} from "./chunk-SPF6MCPU.js";
+} from "./chunk-D5ASHLUO.js";
 
 // src/engine/runtime/relay/runtime-revocation.ts
 var runtimeRevocationCloseCode = 1008;
@@ -21188,12 +21188,11 @@ var sessionCloseCommandSchema = external_exports.object({
 }).readonly();
 var sessionPrepareCommandSchema = external_exports.object({
   ...sessionIdentityFields,
-  configuration: external_exports.object({
-    booleanValue: external_exports.boolean(),
-    configId: external_exports.string().min(1).max(128),
-    value: external_exports.string().max(500),
-    valueType: external_exports.enum(["boolean", "select"])
-  }).readonly().optional(),
+  /**
+   * The complete settings a new Session starts with. The Runtime applies them in dependency order as part of
+   * creating the Session: it answers only once every selection holds, and otherwise creates nothing.
+   */
+  configurations: sessionConfigurationSelectionsSchema.optional(),
   kind: external_exports.literal(SESSION_PREPARE_KIND),
   requestId: identifierStringSchema,
   sessionState: external_exports.literal("provisioned").optional(),
@@ -21207,6 +21206,13 @@ var sessionPrepareCommandSchema = external_exports.object({
       path: ["sessionState"]
     });
   }
+  if (command2.configurations !== void 0 && (command2.transient === true || command2.sessionState !== void 0)) {
+    context.addIssue({
+      code: "custom",
+      message: "Only a Session being created states its initial settings",
+      path: ["configurations"]
+    });
+  }
 }).readonly();
 var runtimeTimingsSchema = external_exports.array(
   external_exports.object({
@@ -71284,6 +71290,33 @@ function readProcessTableWithPs(executable) {
     );
   });
 }
+function selectPosixProcessTree(entries, rootProcessId) {
+  const processIds = /* @__PURE__ */ new Set([rootProcessId]);
+  for (const entry of entries) {
+    if (entry.processGroupId === rootProcessId) {
+      processIds.add(entry.processId);
+    }
+  }
+  let previousSize = 0;
+  while (previousSize !== processIds.size) {
+    previousSize = processIds.size;
+    for (const entry of entries) {
+      if (processIds.has(entry.parentProcessId)) {
+        processIds.add(entry.processId);
+      }
+    }
+  }
+  return entries.filter((entry) => processIds.has(entry.processId)).map((entry) => ({
+    processGroupId: entry.processGroupId,
+    processId: entry.processId
+  }));
+}
+function posixProcessTreeCapture(readSynchronously, read) {
+  return async (root) => {
+    const entries = readSynchronously();
+    return selectPosixProcessTree(entries.length > 0 ? entries : await read(), root.processId);
+  };
+}
 function processExists(processId) {
   try {
     process.kill(processId, 0);
@@ -71445,7 +71478,7 @@ function processExists2(processId) {
 var linuxProcessPlatform = {
   ...posixOperations2,
   readProcessTable: readLinuxProcessTableWithFallback,
-  readProcessTableSynchronously: readLinuxProcessTableSynchronously,
+  captureProcessTree: posixProcessTreeCapture(readLinuxProcessTableSynchronously, readLinuxProcessTableWithFallback),
   processExists: processExists2
 };
 
@@ -71453,7 +71486,10 @@ var linuxProcessPlatform = {
 var macosProcessPlatform = {
   ...posixOperations2,
   readProcessTable: () => readProcessTableWithPs("/bin/ps"),
-  readProcessTableSynchronously: () => [],
+  captureProcessTree: posixProcessTreeCapture(
+    () => [],
+    () => readProcessTableWithPs("/bin/ps")
+  ),
   processExists
 };
 
@@ -71532,7 +71568,24 @@ function executableLaunch(command2, args) {
   }
   return { command: command2, arguments: args };
 }
-function readProcessTable() {
+function parseWindowsProcesses(output2) {
+  const processes = [];
+  for (const line of output2.split("\n")) {
+    const groups = /^\s*(?<pid>\d+)\s+(?<ppid>\d+)\s+(?<created>\d+)\s*$/.exec(line)?.groups;
+    if (groups === void 0) {
+      continue;
+    }
+    const processId = Number(groups["pid"]);
+    const parentProcessId = Number(groups["ppid"]);
+    const createdAt = Number(groups["created"]);
+    if (!Number.isSafeInteger(processId) || processId <= 0 || !Number.isSafeInteger(parentProcessId) || parentProcessId < 0 || !Number.isSafeInteger(createdAt)) {
+      continue;
+    }
+    processes.push({ processId, parentProcessId, createdAt });
+  }
+  return processes;
+}
+function readWindowsProcesses() {
   const systemRoot = environmentValue2(process.env, "SystemRoot");
   if (systemRoot === void 0) {
     return Promise.resolve([]);
@@ -71545,7 +71598,8 @@ function readProcessTable() {
         "-NoProfile",
         "-NonInteractive",
         "-Command",
-        "Get-CimInstance Win32_Process | ForEach-Object { '{0} {1} {0}' -f $_.ProcessId, $_.ParentProcessId }"
+        // Processes without a creation time, such as the System process, are never part of a spawned tree.
+        "Get-CimInstance Win32_Process | Where-Object { $_.CreationDate } | ForEach-Object { '{0} {1} {2}' -f $_.ProcessId, $_.ParentProcessId, ([DateTimeOffset]$_.CreationDate.ToUniversalTime()).ToUnixTimeMilliseconds() }"
       ],
       {
         encoding: "utf8",
@@ -71554,10 +71608,44 @@ function readProcessTable() {
         signal: AbortSignal.timeout(1e4),
         maxBuffer: 1024 * 1024
       },
-      (error62, stdout) => resolveTable(error62 === null ? parseProcessTable(stdout) : [])
+      (error62, stdout) => resolveTable(error62 === null ? parseWindowsProcesses(stdout) : [])
     );
   });
 }
+async function readProcessTable() {
+  return (await readWindowsProcesses()).map(({ processId, parentProcessId }) => ({
+    processId,
+    parentProcessId,
+    processGroupId: processId
+  }));
+}
+function selectWindowsProcessTree(processes, root) {
+  const running = new Map(processes.map((entry) => [entry.processId, entry]));
+  const members2 = /* @__PURE__ */ new Set();
+  if (root.state === "running" && running.has(root.processId)) {
+    members2.add(root.processId);
+  }
+  const belongsToTree = (entry) => {
+    const parent = running.get(entry.parentProcessId);
+    if (parent !== void 0 && parent.createdAt <= entry.createdAt) {
+      return members2.has(parent.processId);
+    }
+    return root.state === "exited" && entry.parentProcessId === root.processId && root.spawnedAt <= entry.createdAt && entry.createdAt <= root.exitedAt;
+  };
+  let previousSize = -1;
+  while (previousSize !== members2.size) {
+    previousSize = members2.size;
+    for (const entry of processes) {
+      if (!members2.has(entry.processId) && belongsToTree(entry)) {
+        members2.add(entry.processId);
+      }
+    }
+  }
+  return [...members2].map((processId) => ({ processGroupId: processId, processId }));
+}
+async function captureProcessTree(root) {
+  return selectWindowsProcessTree(await readWindowsProcesses(), root);
+}
 function signalCapturedProcesses2(processes, _rootProcessId, signal) {
   for (const identity2 of [...processes].reverse()) {
     try {
@@ -71582,7 +71670,7 @@ var windowsProcessPlatform = {
   signalCapturedProcesses: signalCapturedProcesses2,
   terminateProcess: terminateProcess2,
   readProcessTable,
-  readProcessTableSynchronously: () => [],
+  captureProcessTree,
   processExists
 };
 
@@ -71590,7 +71678,10 @@ var windowsProcessPlatform = {
 var fallbackPlatform2 = {
   ...posixOperations2,
   readProcessTable: () => readProcessTableWithPs("/usr/bin/ps"),
-  readProcessTableSynchronously: () => [],
+  captureProcessTree: posixProcessTreeCapture(
+    () => [],
+    () => readProcessTableWithPs("/usr/bin/ps")
+  ),
   processExists
 };
 var platforms2 = /* @__PURE__ */ new Map([
@@ -71696,29 +71787,25 @@ function appendBounded(chunks, chunk, currentBytes, limitBytes) {
   chunks.push(chunk);
   return nextBytes;
 }
-function readProcessTable2() {
-  return hostPlatform.readProcessTable();
-}
-function selectProcessTree(entries, rootProcessId) {
-  const processIds = /* @__PURE__ */ new Set([rootProcessId]);
-  for (const entry of entries) {
-    if (entry.processGroupId === rootProcessId) {
-      processIds.add(entry.processId);
-    }
+var lifetimes = /* @__PURE__ */ new WeakMap();
+function spawnProcess(command2, args, options) {
+  const spawnedAt = Date.now();
+  const child = spawn3(command2, [...args], options);
+  const processId = child.pid;
+  if (processId !== void 0) {
+    lifetimes.set(child, { state: "running", processId, spawnedAt });
+    child.once("exit", () => {
+      lifetimes.set(child, { state: "exited", processId, spawnedAt, exitedAt: Date.now() });
+    });
   }
-  let previousSize = 0;
-  while (previousSize !== processIds.size) {
-    previousSize = processIds.size;
-    for (const entry of entries) {
-      if (processIds.has(entry.parentProcessId)) {
-        processIds.add(entry.processId);
-      }
-    }
+  return child;
+}
+function spawnedProcess(child) {
+  const lifetime = lifetimes.get(child);
+  if (lifetime === void 0) {
+    throw new Error("Only a child started by spawnProcess has an identifiable process tree");
   }
-  return entries.filter((entry) => processIds.has(entry.processId)).map((entry) => ({
-    processGroupId: entry.processGroupId,
-    processId: entry.processId
-  }));
+  return lifetime;
 }
 function mergeProcessTrees(captured, current) {
   const processes = /* @__PURE__ */ new Map();
@@ -71730,15 +71817,11 @@ function mergeProcessTrees(captured, current) {
   }
   return [...processes.values()];
 }
-async function captureProcessTree(child) {
+async function captureProcessTree2(child) {
   if (child.pid === void 0) {
     return [];
   }
-  const entries = hostPlatform.readProcessTableSynchronously();
-  if (entries.length > 0) {
-    return selectProcessTree(entries, child.pid);
-  }
-  return selectProcessTree(await readProcessTable2(), child.pid);
+  return await hostPlatform.captureProcessTree(spawnedProcess(child));
 }
 async function waitForCapturedProcessesExit(processes, rootProcessId) {
   const processIds = processes.map((identity2) => identity2.processId).filter((processId) => processId !== rootProcessId);
@@ -71746,7 +71829,7 @@ async function waitForCapturedProcessesExit(processes, rootProcessId) {
     if (processIds.every((processId) => !hostPlatform.processExists(processId))) {
       return true;
     }
-    await readProcessTable2();
+    await hostPlatform.readProcessTable();
   }
   return processIds.every((processId) => !hostPlatform.processExists(processId));
 }
@@ -71756,7 +71839,7 @@ async function stopProcessTree(child, capturedProcesses = []) {
     return;
   }
   const childExited = child.exitCode !== null || child.signalCode !== null;
-  const processes = mergeProcessTrees(capturedProcesses, await captureProcessTree(child));
+  const processes = mergeProcessTrees(capturedProcesses, await captureProcessTree2(child));
   if (childExited && processes.length === 0) {
     return;
   }
@@ -71806,7 +71889,7 @@ async function runBoundedProcess(options) {
   options.signal.throwIfAborted();
   const outputLimitBytes = options.outputLimitBytes ?? DEFAULT_OUTPUT_LIMIT_BYTES;
   const launch = executableLaunch2(options.command, options.arguments);
-  const child = spawn3(launch.command, [...launch.arguments], {
+  const child = spawnProcess(launch.command, launch.arguments, {
     cwd: options.cwd,
     ...hostPlatform.spawnOptions,
     env: { ...options.environment },
@@ -71996,9 +72079,6 @@ var ClaudeCodeAgentSpecification = class extends InProcessAcpAgentSpecification
   };
 };
 
-// src/engine/acp/harness/codex/app-server-client.ts
-import { spawn as spawn4 } from "node:child_process";
-
 // src/engine/acp/harness/codex/app-server-protocol.ts
 import { isAbsolute as isAbsolute8 } from "node:path";
 var boundedText = (maximum) => external_exports.string().max(maximum);
@@ -72331,7 +72411,7 @@ var CodexAppServerClient = class {
   constructor(options) {
     this.#handlers = options.handlers;
     const launch = executableLaunch2(options.command, ["app-server"]);
-    this.#child = spawn4(launch.command, [...launch.arguments], {
+    this.#child = spawnProcess(launch.command, launch.arguments, {
       cwd: options.cwd,
       ...platformSpawnOptions,
       env: { ...process.env, ...options.environment },
@@ -72730,12 +72810,12 @@ function presentToolItem(item) {
     };
   }
   if (item.type === "collabAgentToolCall") {
-    const spawn6 = item.tool === "spawnAgent";
+    const spawn5 = item.tool === "spawnAgent";
     return {
       content: [],
       kind: "other",
       locations: [],
-      rawInput: spawn6 ? {
+      rawInput: spawn5 ? {
         model: item.model,
         prompt: item.prompt,
         reasoningEffort: item.reasoningEffort,
@@ -72743,10 +72823,10 @@ function presentToolItem(item) {
       } : { receiverThreadIds: item.receiverThreadIds, senderThreadId: item.senderThreadId },
       rawOutput: {
         agentsStates: item.agentsStates,
-        ...spawn6 ? { receiverThreadIds: item.receiverThreadIds } : {}
+        ...spawn5 ? { receiverThreadIds: item.receiverThreadIds } : {}
       },
       status: collaborationStatus(item.status),
-      title: spawn6 ? "Dispatch subagent" : "Wait for subagent"
+      title: spawn5 ? "Dispatch subagent" : "Wait for subagent"
     };
   }
   if (item.type === "subAgentActivity" && item.kind === "started") {
@@ -74929,7 +75009,7 @@ var CodexAcpAgent = class {
           this.#appServer.detach();
           const child = this.#appServer.child();
           try {
-            const captured = await captureProcessTree(child);
+            const captured = await captureProcessTree2(child);
             await stopProcessTree(child, captured);
           } finally {
             this.#connection?.close();
@@ -75070,7 +75150,7 @@ import { existsSync as existsSync8, readdirSync as readdirSync6, readFileSync as
 import { basename as basename5, dirname as dirname9, isAbsolute as isAbsolute12, join as join21 } from "node:path";
 
 // src/engine/acp/harness/pi/upstream/dist/pi-rpc/process.js
-import { spawn as spawn5 } from "node:child_process";
+import { spawn as spawn4 } from "node:child_process";
 import * as readline from "node:readline";
 
 // src/engine/acp/harness/pi/upstream/dist/pi-rpc/command.js
@@ -75187,7 +75267,7 @@ var PiRpcProcess = class _PiRpcProcess {
         args.push("--fork", params.origin.sessionPath);
         break;
     }
-    const child = spawn5(cmd, args, {
+    const child = spawn4(cmd, args, {
       cwd: params.cwd,
       stdio: "pipe",
       env: params.environment,
@@ -91460,6 +91540,33 @@ var SessionManager2 = class {
     );
   }
   prepareSession = async (options, metrics = unmeasuredOperationMetrics, closed = "reopen") => await this.#prepareSession(options, { kind: "interactive-only" }, closed, metrics);
+  /**
+   * Creates a Session with the initial settings `configure` applies, and answers with the configured snapshot. A
+   * Session this call created that cannot take its settings is discarded, so a refused creation leaves nothing
+   * behind. A Session that already existed, such as one whose creation answer was lost, is configured again and kept.
+   */
+  createSession = async (options, configure, metrics = unmeasuredOperationMetrics, closed = "reopen") => {
+    const created = !this.#isKnownSession(options.sessionId);
+    try {
+      await configure(await this.prepareSession(options, metrics, closed));
+      return await this.prepareSession(options, metrics, closed);
+    } catch (error62) {
+      if (created) {
+        await this.#discardCreatedSession(options.sessionId);
+      }
+      throw error62;
+    }
+  };
+  async #discardCreatedSession(sessionId) {
+    const runtime = this.#executionProcesses.get(sessionId);
+    try {
+      if (runtime !== void 0) {
+        await this.#retireSessionProcess(sessionId, runtime, async () => await runtime.close());
+      }
+    } finally {
+      this.#store.remove(sessionId);
+    }
+  }
   restoreSession = async (options, metrics = unmeasuredOperationMetrics, closed = "reopen") => await this.#prepareSession(options, { kind: "history-required" }, closed, metrics);
   /**
    * Opens a short-lived native ACP session only to read the local Agent's
@@ -95882,16 +95989,19 @@ function sessionConfigurationMatches(option, selection) {
   validateSessionConfigurationSelection(option, selection);
   return option.type === "boolean" ? option.booleanValue === selection.booleanValue : option.currentValue === selection.value;
 }
-function assertAppliedSessionConfiguration(options, selections) {
-  const selectionsById = new Map(selections.map((selection) => [selection.configId, selection]));
-  for (const option of options) {
-    const selection = selectionsById.get(option.id);
-    if (selection === void 0 || !sessionConfigurationSelectionIsAvailable(option, selection)) {
+function sessionConfigurationConflict(message) {
+  return new AcpExecutionError(message, {}, "session_configuration_conflict");
+}
+function assertAppliedSessionConfiguration(options, selections, unavailable) {
+  for (const selection of selections) {
+    const option = options.find((candidate) => candidate.id === selection.configId);
+    const holds = option !== void 0 && sessionConfigurationSelectionIsAvailable(option, selection) ? sessionConfigurationMatches(option, selection) : unavailable === "ignore";
+    if (holds) {
       continue;
     }
-    if (!sessionConfigurationMatches(option, selection)) {
-      throw invalidSessionConfiguration(`The Turn configuration does not match Agent setting ${option.id}`);
-    }
+    throw unavailable === "refuse" ? sessionConfigurationConflict(
+      `The Agent did not retain the selected setting "${selection.configId}". Review the settings and try again.`
+    ) : invalidSessionConfiguration(`The Turn configuration does not match Agent setting ${selection.configId}`);
   }
 }
 function unavailableSessionConfigurationCategory(selection) {
@@ -95903,57 +96013,42 @@ function unavailableSessionConfigurationCategory(selection) {
   }
   return "unknown";
 }
-async function applySessionConfigurationSelection(sessions, options, selection, agent2, adapter, cwd, additionalDirectories, commandId, sessionId, signal) {
-  const option = options.find((candidate) => candidate.id === selection.configId);
+function unavailableReason(option, selection) {
   if (option === void 0) {
-    warnIgnoredSetting(
-      "session_configuration_setting_ignored",
-      commandId,
-      sessionId,
-      agent2.id,
-      selection,
-      unavailableSessionConfigurationCategory(selection),
-      "setting_unavailable"
-    );
-    return options;
+    return "setting_unavailable";
   }
   if (option.type !== selection.valueType) {
-    warnIgnoredSetting(
-      "session_configuration_setting_ignored",
-      commandId,
-      sessionId,
-      agent2.id,
-      selection,
-      option.category,
-      "setting_schema_mismatch"
-    );
-    return options;
+    return "setting_schema_mismatch";
   }
   if (option.type === "boolean" && selection.value.length > 0 || option.type === "select" && selection.booleanValue) {
-    warnIgnoredSetting(
-      "session_configuration_setting_ignored",
-      commandId,
-      sessionId,
-      agent2.id,
-      selection,
-      option.category,
-      "selection_schema_mismatch"
-    );
-    return options;
+    return "selection_schema_mismatch";
   }
   if (option.type === "select" && !option.values.some((value) => value.value === selection.value)) {
+    return "value_unavailable";
+  }
+  return null;
+}
+async function applySessionConfigurationSelection(sessions, options, selection, unavailable, agent2, adapter, cwd, additionalDirectories, commandId, sessionId, signal) {
+  const option = options.find((candidate) => candidate.id === selection.configId);
+  const reason = unavailableReason(option, selection);
+  if (reason !== null) {
+    if (unavailable === "refuse") {
+      throw sessionConfigurationConflict(
+        `The selected Agent setting "${selection.configId}" is no longer available. Refresh the settings and try again.`
+      );
+    }
     warnIgnoredSetting(
       "session_configuration_setting_ignored",
       commandId,
       sessionId,
       agent2.id,
       selection,
-      option.category,
-      "value_unavailable"
+      option?.category ?? unavailableSessionConfigurationCategory(selection),
+      reason
     );
     return options;
   }
-  if (sessionConfigurationMatches(option, selection)) {
+  if (option === void 0 || sessionConfigurationMatches(option, selection)) {
     return options;
   }
   return (await sessions.applySessionConfiguration({
@@ -95970,13 +96065,14 @@ async function applySessionConfigurationSelection(sessions, options, selection,
     valueType: selection.valueType
   })).configOptions;
 }
-async function applyCompleteSessionConfiguration(sessions, initialOptions, selections, agent2, adapter, cwd, additionalDirectories, commandId, sessionId, signal) {
+async function applyCompleteSessionConfiguration(sessions, initialOptions, selections, unavailable, agent2, adapter, cwd, additionalDirectories, commandId, sessionId, signal) {
   let options = initialOptions;
   for (const selection of inDependencyOrder(selections, initialOptions)) {
     options = await applySessionConfigurationSelection(
       sessions,
       options,
       selection,
+      unavailable,
       agent2,
       adapter,
       cwd,
@@ -95986,7 +96082,7 @@ async function applyCompleteSessionConfiguration(sessions, initialOptions, selec
       signal
     );
   }
-  assertAppliedSessionConfiguration(options, selections);
+  assertAppliedSessionConfiguration(options, selections, unavailable);
 }
 function warnIgnoredSetting(event, commandId, sessionId, agentId, selection, category, reason) {
   const details = {
@@ -96052,6 +96148,7 @@ async function executePrompt({
         sessions,
         prepared.configOptions,
         sessionConfigurations ?? [],
+        "ignore",
         executionAgent,
         adapter,
         resolved.cwd,
@@ -96364,19 +96461,40 @@ async function prepareSession(command2, recovery, closed, config2, resolveAgent,
       sessionId: command2.sessionId,
       signal
     };
-    const prepared = command2.transient === true ? await sessions.inspectSession(preparation, metrics) : recovery.kind === "history-required" ? await sessions.restoreSession(preparation, metrics, closed) : await sessions.prepareSession(preparation, metrics, closed);
-    const configuration = command2.configuration;
-    const snapshot = configuration === void 0 ? prepared : await metrics.measure(
-      "configuration",
-      async () => await sessions.applySessionConfiguration({
-        ...preparation,
-        booleanValue: configuration.booleanValue,
-        configId: configuration.configId,
-        requestId: command2.requestId,
-        value: configuration.value,
-        valueType: configuration.valueType
-      })
-    );
+    const prepare = async () => {
+      if (command2.transient === true) {
+        return await sessions.inspectSession(preparation, metrics);
+      }
+      if (recovery.kind === "history-required") {
+        return await sessions.restoreSession(preparation, metrics, closed);
+      }
+      const configurations = command2.configurations;
+      if (configurations === void 0) {
+        return await sessions.prepareSession(preparation, metrics, closed);
+      }
+      return await sessions.createSession(
+        preparation,
+        async (created) => await metrics.measure(
+          "configuration",
+          async () => await applyCompleteSessionConfiguration(
+            sessions,
+            created.configOptions,
+            configurations,
+            "refuse",
+            resolvedAgent.agent,
+            resolvedAgent.adapter,
+            resolved.cwd,
+            resolved.additionalDirectories,
+            command2.requestId,
+            command2.sessionId,
+            signal
+          )
+        ),
+        metrics,
+        closed
+      );
+    };
+    const prepared = await prepare();
     return {
       additionalDirectories: resolved.additionalDirectoryEntries,
       agentId: command2.agentId,
@@ -96384,8 +96502,8 @@ async function prepareSession(command2, recovery, closed, config2, resolveAgent,
       agentVersion: prepared.agentVersion,
       capabilities: prepared.capabilities,
       commands: prepared.commands,
-      configOptions: snapshot.configOptions,
-      configurationRevision: snapshot.configurationRevision,
+      configOptions: prepared.configOptions,
+      configurationRevision: prepared.configurationRevision,
       directoryId: command2.directoryId,
       directoryLabel: resolved.directoryLabel,
       kind: "session.ready",
@@ -97907,4 +98025,4 @@ export {
   * MIT Licensed
   *)
 */
-//# sourceMappingURL=chunk-LZZG3QZL.js.map
+//# sourceMappingURL=chunk-QEHEPZW2.js.map