lody 0.87.0 → 0.88.0

package/dist/index.js

@@ -4325,7 +4325,7 @@ Upgrade Node, then re-run: npx lody@latest`;
   }
   const name$2 = "lody";
   const name$1 = "@lody/cli-cloud";
-  const version$9 = "0.87.0";
+  const version$9 = "0.88.0";
   const type$2 = "module";
   const scripts = {
     "dev": "node dev.mjs",
@@ -4664,7 +4664,7 @@ Upgrade Node, then re-run: npx lody@latest`;
     return "none";
   }
   const MODEL_THOUGHT_LEVEL_META_KEY = "lodyThoughtLevel";
-  const ACP_CAPABILITY_CACHE_VERSION = 5;
+  const ACP_CAPABILITY_CACHE_VERSION = 6;
   const getAcpCapabilityCacheKey = (configId) => configId;
   const isBuiltinAgentType = (agentType) => BUILTIN_AGENTS.some((agent2) => agent2.agentType === agentType);
   const isManagedBuiltinAgentType = (agentType) => MANAGED_BUILTIN_RUNTIMES.some((runtime) => runtime.agentType === agentType);
@@ -6155,7 +6155,9 @@ Requirements:
         path2.add(value);
       }
       const keys2 = Object.keys(value);
-      const strippedValues = new Array(keys2.length);
+      const strippedValues = Array.from({
+        length: keys2.length
+      });
       let changed = false;
       for (let i2 = 0; i2 < keys2.length; i2++) {
         const key2 = keys2[i2];
@@ -6459,7 +6461,7 @@ Requirements:
   function isContainerSchema(schema2) {
     return !!schema2 && (schema2.type === "loro-map" || schema2.type === "loro-list" || schema2.type === "loro-text" || schema2.type === "loro-movable-list" || schema2.type === "loro-tree");
   }
-  function validateSchema(schema2, value) {
+  function validateSchema(schema2, value, options) {
     const errors2 = [];
     const actualType = schema2.type;
     if (schema2.options.required && (value === void 0 || value === null)) {
@@ -6474,7 +6476,8 @@ Requirements:
         valid: true
       };
     }
-    if (isSchemaValidated(schema2, value)) {
+    const useCache = !options?.ignoreUnknownProperties;
+    if (useCache && isSchemaValidated(schema2, value)) {
       return {
         valid: true
       };
@@ -6587,6 +6590,7 @@ Requirements:
             }
             for (const key2 in value) {
               if (!Object.prototype.hasOwnProperty.call(schema2.definition, key2)) {
+                if (options?.ignoreUnknownProperties) continue;
                 errors2.push(`Unknown property: ${key2}`);
               }
             }
@@ -6610,7 +6614,7 @@ Requirements:
       }
     }
     if (errors2.length === 0) {
-      markSchemaValidated(schema2, value);
+      if (useCache) markSchemaValidated(schema2, value);
       return {
         valid: true
       };
@@ -9315,6 +9319,7 @@ Requirements:
         schema: options.schema,
         initialState: options.initialState || {},
         validateUpdates: options.validateUpdates !== false,
+        ignoreUnknownProperties: options.ignoreUnknownProperties || false,
         debug: options.debug || false,
         checkStateConsistency: options.checkStateConsistency || false,
         inferOptions: options.inferOptions || {}
@@ -10473,7 +10478,9 @@ Requirements:
       }) : Object.assign({}, this.state, updater);
       hardenCidDescriptors(newState, this.state);
       if (this.options.validateUpdates) {
-        const validation2 = this.schema && validateSchema(this.schema, newState);
+        const validation2 = this.schema && validateSchema(this.schema, newState, {
+          ignoreUnknownProperties: this.options.ignoreUnknownProperties
+        });
         if (validation2 && !validation2.valid) {
           const errorMessage2 = `State validation failed: ${validation2.errors?.join(", ")}`;
           throw new Error(errorMessage2);
@@ -10651,6 +10658,15 @@ Requirements:
           root[key2] = this.containerToMirrorState(container2, options);
         }
       }
+      if (this.options.ignoreUnknownProperties) {
+        const fullDocState = toNormalizedJson(this.doc);
+        for (const key2 of Object.keys(fullDocState)) {
+          if (Object.prototype.hasOwnProperty.call(rootSchema.definition, key2)) {
+            continue;
+          }
+          root[key2] = fullDocState[key2];
+        }
+      }
       return root;
     }
     registerContainerWithRegistry(containerId, schemaType) {
@@ -13247,6 +13263,13 @@ Requirements:
     localProjectId: LocalProjectIdSchema,
     requestedByUserId: string$1().trim().min(1).optional()
   }).strict();
+  const LocalProjectRemovalPreflightRequestSchema = object$1({
+    type: literal$1("local-project/removal-preflight"),
+    machineId: MachineIdSchema$1,
+    workspaceId: WorkspaceIdSchema,
+    localProjectId: LocalProjectIdSchema,
+    requestedByUserId: string$1().trim().min(1).optional()
+  }).strict();
   const LocalProjectListRequestSchema = object$1({
     type: literal$1("local-project/list"),
     machineId: MachineIdSchema$1
@@ -13386,6 +13409,7 @@ Requirements:
     LocalProjectListRootsRequestSchema,
     LocalProjectBrowseDirRequestSchema,
     LocalProjectDeleteRequestSchema,
+    LocalProjectRemovalPreflightRequestSchema,
     LocalProjectListRequestSchema,
     LocalProjectGitStateRequestSchema,
     LocalProjectListFilesRequestSchema,
@@ -13552,6 +13576,19 @@ Requirements:
     status: literal$1("resolved"),
     catalog: LocalProjectHistoryCatalogResultSchema
   }).strict();
+  const LocalProjectWorktreeCleanupItemSchema = object$1({
+    sessionId: SessionIdSchema$1,
+    title: string$1(),
+    path: string$1()
+  }).strict();
+  const LocalProjectWorktreeCleanupFailureSchema = LocalProjectWorktreeCleanupItemSchema.extend({
+    message: string$1()
+  }).strict();
+  const LocalProjectWorktreeCleanupPreflightResultSchema = object$1({
+    clean: array$2(LocalProjectWorktreeCleanupItemSchema),
+    dirty: array$2(LocalProjectWorktreeCleanupItemSchema),
+    failed: array$2(LocalProjectWorktreeCleanupFailureSchema)
+  }).strict();
   const LocalProjectControlErrorCodeSchema = _enum$1([
     "invalid_request",
     "machine_mismatch",
@@ -13572,6 +13609,7 @@ Requirements:
       "local-project/list-roots",
       "local-project/browse-dir",
       "local-project/delete",
+      "local-project/removal-preflight",
       "local-project/list",
       "local-project/git-state",
       "local-project/list-files",
@@ -13635,6 +13673,11 @@ Requirements:
         workspaceIds: array$2(WorkspaceIdSchema)
       }).strict()
     }).strict(),
+    object$1({
+      ok: literal$1(true),
+      type: literal$1("local-project/removal-preflight"),
+      result: LocalProjectWorktreeCleanupPreflightResultSchema
+    }).strict(),
     object$1({
       ok: literal$1(true),
       type: literal$1("local-project/list"),
@@ -14531,12 +14574,12 @@ Requirements:
     {
       id: "auggie",
       name: "Auggie CLI",
-      version: "0.35.0",
+      version: "0.36.0",
       description: "Augment Code's powerful software agent, backed by industry-leading context engine",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/auggie.svg",
       distribution: {
         npx: {
-          package: "@augmentcode/auggie@0.35.0",
+          package: "@augmentcode/auggie@0.36.0",
           args: [
             "--acp"
           ],
@@ -14561,12 +14604,12 @@ Requirements:
     {
       id: "cline",
       name: "Cline",
-      version: "3.0.55",
+      version: "3.0.60",
       description: "Autonomous coding agent CLI - capable of creating/editing files, running commands, using the browser, and more",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/cline.svg",
       distribution: {
         npx: {
-          package: "cline@3.0.55",
+          package: "cline@3.0.60",
           args: [
             "--acp"
           ]
@@ -14576,12 +14619,12 @@ Requirements:
     {
       id: "codebuddy-code",
       name: "Codebuddy Code",
-      version: "2.137.1",
+      version: "2.140.0",
       description: "Tencent Cloud's official intelligent coding tool",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/codebuddy-code.svg",
       distribution: {
         npx: {
-          package: "@tencent-ai/codebuddy-code@2.137.1",
+          package: "@tencent-ai/codebuddy-code@2.140.0",
           args: [
             "--acp"
           ]
@@ -14753,48 +14796,48 @@ Requirements:
     {
       id: "devin",
       name: "Devin",
-      version: "3000.4.25",
+      version: "3000.6.2",
       description: "Devin CLI coding agent by Cognition",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/devin.svg",
       distribution: {
         binary: {
           "darwin-aarch64": {
-            archive: "https://static.devin.ai/cli/3000.4.25/devin-3000.4.25-aarch64-apple-darwin.tar.gz",
+            archive: "https://static.devin.ai/cli/3000.6.2/devin-3000.6.2-aarch64-apple-darwin.tar.gz",
             cmd: "./bin/devin",
             args: [
               "acp"
             ]
           },
           "darwin-x86_64": {
-            archive: "https://static.devin.ai/cli/3000.4.25/devin-3000.4.25-x86_64-apple-darwin.tar.gz",
+            archive: "https://static.devin.ai/cli/3000.6.2/devin-3000.6.2-x86_64-apple-darwin.tar.gz",
             cmd: "./bin/devin",
             args: [
               "acp"
             ]
           },
           "linux-aarch64": {
-            archive: "https://static.devin.ai/cli/3000.4.25/devin-3000.4.25-aarch64-unknown-linux.tar.gz",
+            archive: "https://static.devin.ai/cli/3000.6.2/devin-3000.6.2-aarch64-unknown-linux.tar.gz",
             cmd: "./bin/devin",
             args: [
               "acp"
             ]
           },
           "linux-x86_64": {
-            archive: "https://static.devin.ai/cli/3000.4.25/devin-3000.4.25-x86_64-unknown-linux.tar.gz",
+            archive: "https://static.devin.ai/cli/3000.6.2/devin-3000.6.2-x86_64-unknown-linux.tar.gz",
             cmd: "./bin/devin",
             args: [
               "acp"
             ]
           },
           "windows-aarch64": {
-            archive: "https://static.devin.ai/cli/3000.4.25/devin-3000.4.25-aarch64-pc-windows.zip",
+            archive: "https://static.devin.ai/cli/3000.6.2/devin-3000.6.2-aarch64-pc-windows.zip",
             cmd: "./bin\\devin.exe",
             args: [
               "acp"
             ]
           },
           "windows-x86_64": {
-            archive: "https://static.devin.ai/cli/3000.4.25/devin-3000.4.25-x86_64-pc-windows.zip",
+            archive: "https://static.devin.ai/cli/3000.6.2/devin-3000.6.2-x86_64-pc-windows.zip",
             cmd: "./bin\\devin.exe",
             args: [
               "acp"
@@ -14806,12 +14849,12 @@ Requirements:
     {
       id: "dimcode",
       name: "DimCode",
-      version: "0.3.17",
+      version: "0.3.21",
       description: "A coding agent that puts leading models at your command.",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/dimcode.svg",
       distribution: {
         npx: {
-          package: "dimcode@0.3.17",
+          package: "dimcode@0.3.21",
           args: [
             "acp"
           ]
@@ -14821,12 +14864,12 @@ Requirements:
     {
       id: "dirac",
       name: "Dirac",
-      version: "0.4.37",
+      version: "0.5.1",
       description: "Reduces API costs by more than 50%, produces better and faster work. Uses Hash anchored parallel edits, AST manipulation and a whole lot of neat optimizations. Fully Open Source.",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/dirac.svg",
       distribution: {
         npx: {
-          package: "dirac-cli@0.4.37",
+          package: "dirac-cli@0.5.1",
           args: [
             "--acp"
           ]
@@ -14836,12 +14879,12 @@ Requirements:
     {
       id: "factory-droid",
       name: "Factory Droid",
-      version: "0.200.0",
+      version: "0.205.1",
       description: "Factory Droid - AI coding agent powered by Factory AI",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/factory-droid.svg",
       distribution: {
         npx: {
-          package: "droid@0.200.0",
+          package: "droid@0.205.1",
           args: [
             "exec",
             "--output-format",
@@ -14875,12 +14918,12 @@ Requirements:
     {
       id: "gemini",
       name: "Gemini CLI",
-      version: "0.56.0",
+      version: "0.57.0",
       description: "Google's official CLI for Gemini",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/gemini.svg",
       distribution: {
         npx: {
-          package: "@google/gemini-cli@0.56.0",
+          package: "@google/gemini-cli@0.57.0",
           args: [
             "--acp"
           ]
@@ -14890,12 +14933,12 @@ Requirements:
     {
       id: "github-copilot-cli",
       name: "GitHub Copilot",
-      version: "1.0.80",
+      version: "1.0.81",
       description: "GitHub's AI pair programmer",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/github-copilot-cli.svg",
       distribution: {
         npx: {
-          package: "@github/copilot@1.0.80",
+          package: "@github/copilot@1.0.81",
           args: [
             "--acp"
           ]
@@ -14905,19 +14948,19 @@ Requirements:
     {
       id: "glm-acp-agent",
       name: "GLM Agent",
-      version: "1.6.0",
+      version: "1.6.1",
       description: "ACP agent powered by Zhipu AI's GLM Coding Plan models (glm-5.1, glm-5-turbo, glm-4.7, glm-4.5-air). Supports streaming, tool calls, mid-session model switching, image input via Z.AI Coding Plan Vision MCP, and session load/fork/resume with on-disk persistence.",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/glm-acp-agent.svg",
       distribution: {
         npx: {
-          package: "glm-acp-agent@1.6.0"
+          package: "glm-acp-agent@1.6.1"
         }
       }
     },
     {
       id: "goose",
       name: "goose",
-      version: "1.46.0",
+      version: "1.48.0",
       description: "A local, extensible, open source AI agent that automates engineering tasks",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/goose.svg",
       distribution: {
@@ -14935,13 +14978,13 @@ Requirements:
     {
       id: "harn",
       name: "Harn",
-      version: "0.10.108",
+      version: "0.10.118",
       description: "Harn runs .harn agent pipelines as a native ACP coding agent over stdio.",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/harn.svg",
       distribution: {
         binary: {
           "darwin-aarch64": {
-            archive: "https://github.com/burin-labs/harn/releases/download/v0.10.108/harn-aarch64-apple-darwin.tar.gz",
+            archive: "https://github.com/burin-labs/harn/releases/download/v0.10.118/harn-aarch64-apple-darwin.tar.gz",
             cmd: "./harn",
             args: [
               "serve",
@@ -14949,7 +14992,7 @@ Requirements:
             ]
           },
           "darwin-x86_64": {
-            archive: "https://github.com/burin-labs/harn/releases/download/v0.10.108/harn-x86_64-apple-darwin.tar.gz",
+            archive: "https://github.com/burin-labs/harn/releases/download/v0.10.118/harn-x86_64-apple-darwin.tar.gz",
             cmd: "./harn",
             args: [
               "serve",
@@ -14957,7 +15000,7 @@ Requirements:
             ]
           },
           "linux-aarch64": {
-            archive: "https://github.com/burin-labs/harn/releases/download/v0.10.108/harn-aarch64-unknown-linux-gnu.tar.gz",
+            archive: "https://github.com/burin-labs/harn/releases/download/v0.10.118/harn-aarch64-unknown-linux-gnu.tar.gz",
             cmd: "./harn",
             args: [
               "serve",
@@ -14965,7 +15008,7 @@ Requirements:
             ]
           },
           "linux-x86_64": {
-            archive: "https://github.com/burin-labs/harn/releases/download/v0.10.108/harn-x86_64-unknown-linux-gnu.tar.gz",
+            archive: "https://github.com/burin-labs/harn/releases/download/v0.10.118/harn-x86_64-unknown-linux-gnu.tar.gz",
             cmd: "./harn",
             args: [
               "serve",
@@ -14973,7 +15016,7 @@ Requirements:
             ]
           },
           "windows-x86_64": {
-            archive: "https://github.com/burin-labs/harn/releases/download/v0.10.108/harn-x86_64-pc-windows-msvc.zip",
+            archive: "https://github.com/burin-labs/harn/releases/download/v0.10.118/harn-x86_64-pc-windows-msvc.zip",
             cmd: "harn.exe",
             args: [
               "serve",
@@ -14986,7 +15029,7 @@ Requirements:
     {
       id: "junie",
       name: "Junie",
-      version: "2913.6.0",
+      version: "3032.2.0",
       description: "AI Coding Agent by JetBrains",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/junie.svg",
       distribution: {
@@ -15004,47 +15047,47 @@ Requirements:
     {
       id: "kilo",
       name: "Kilo",
-      version: "7.4.23",
+      version: "7.5.5",
       description: "The open source coding agent",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/kilo.svg",
       distribution: {
         npx: {
-          package: "@kilocode/cli@7.4.23",
+          package: "@kilocode/cli@7.5.5",
           args: [
             "acp"
           ]
         },
         binary: {
           "darwin-aarch64": {
-            archive: "https://github.com/Kilo-Org/kilocode/releases/download/v7.4.23/kilo-darwin-arm64.zip",
+            archive: "https://github.com/Kilo-Org/kilocode/releases/download/v7.5.5/kilo-darwin-arm64.zip",
             cmd: "./kilo",
             args: [
               "acp"
             ]
           },
           "darwin-x86_64": {
-            archive: "https://github.com/Kilo-Org/kilocode/releases/download/v7.4.23/kilo-darwin-x64.zip",
+            archive: "https://github.com/Kilo-Org/kilocode/releases/download/v7.5.5/kilo-darwin-x64.zip",
             cmd: "./kilo",
             args: [
               "acp"
             ]
           },
           "linux-aarch64": {
-            archive: "https://github.com/Kilo-Org/kilocode/releases/download/v7.4.23/kilo-linux-arm64.tar.gz",
+            archive: "https://github.com/Kilo-Org/kilocode/releases/download/v7.5.5/kilo-linux-arm64.tar.gz",
             cmd: "./kilo",
             args: [
               "acp"
             ]
           },
           "linux-x86_64": {
-            archive: "https://github.com/Kilo-Org/kilocode/releases/download/v7.4.23/kilo-linux-x64.tar.gz",
+            archive: "https://github.com/Kilo-Org/kilocode/releases/download/v7.5.5/kilo-linux-x64.tar.gz",
             cmd: "./kilo",
             args: [
               "acp"
             ]
           },
           "windows-x86_64": {
-            archive: "https://github.com/Kilo-Org/kilocode/releases/download/v7.4.23/kilo-windows-x64.zip",
+            archive: "https://github.com/Kilo-Org/kilocode/releases/download/v7.5.5/kilo-windows-x64.zip",
             cmd: "./kilo.exe",
             args: [
               "acp"
@@ -15126,12 +15169,12 @@ Requirements:
     {
       id: "nova",
       name: "Nova",
-      version: "1.1.35",
+      version: "1.1.37",
       description: "Nova by Compass AI - a fully-fledged software engineer at your command",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/nova.svg",
       distribution: {
         npx: {
-          package: "@compass-ai/nova@1.1.35",
+          package: "@compass-ai/nova@1.1.37",
           args: [
             "acp"
           ]
@@ -15141,7 +15184,7 @@ Requirements:
     {
       id: "opencode",
       name: "OpenCode",
-      version: "1.18.19",
+      version: "1.18.23",
       description: "The open source coding agent",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/opencode.svg",
       distribution: {
@@ -15239,12 +15282,12 @@ Requirements:
     {
       id: "qwen-code",
       name: "Qwen Code",
-      version: "0.21.15",
+      version: "0.22.2",
       description: "Alibaba's Qwen coding assistant",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/qwen-code.svg",
       distribution: {
         npx: {
-          package: "@qwen-code/qwen-code@0.21.15",
+          package: "@qwen-code/qwen-code@0.22.2",
           args: [
             "--acp",
             "--experimental-skills"
@@ -17920,14 +17963,29 @@ ${outputTail}` : blockTail.output;
   };
   function extractAskUserQuestionAnswersFromOutcome(meta, outcome) {
     if (!outcome || !isRecord$b(outcome._meta)) return null;
-    const rawAnswers = meta.source === "lody" ? getLodyOutcomeAnswers(outcome._meta) : meta.source === "codex" ? getCodexOutcomeAnswers(outcome._meta) : getClaudeOutcomeAnswers(outcome._meta);
-    if (!rawAnswers) return null;
+    const answerSources = [
+      {
+        source: "lody",
+        answers: getLodyOutcomeAnswers(outcome._meta)
+      },
+      {
+        source: "codex",
+        answers: getCodexOutcomeAnswers(outcome._meta)
+      },
+      {
+        source: "claude",
+        answers: getClaudeOutcomeAnswers(outcome._meta)
+      }
+    ];
+    const answerSource = answerSources.find(({ answers }) => answers !== null);
+    if (!answerSource?.answers) return null;
     const result = {};
     for (const [index, question] of meta.questions.entries()) {
       const key2 = getAskUserQuestionAnswerKey(meta.questions, index);
-      const raw2 = rawAnswers[key2];
+      const sourceKey = answerSource.source === "claude" ? getAskUserQuestionAnswerKey(meta.questions.map(({ id: _id, ...item }) => item), index) : key2;
+      const raw2 = answerSource.answers[sourceKey];
       if (raw2 === void 0) continue;
-      if (meta.source === "codex") {
+      if (answerSource.source === "codex") {
         if (!isRecord$b(raw2)) continue;
         const inner = raw2.answers;
         if (!Array.isArray(inner)) continue;
@@ -20609,10 +20667,13 @@ ${tailedOutput}` : null;
     return parsed;
   };
   const MACHINE_PROTOCOL_CAPABILITIES = {
+    localProjectRemoval: "localProjectRemoval",
     providerSetup: "providerSetup"
   };
+  const LOCAL_PROJECT_REMOVAL_PROTOCOL_VERSION = 1;
   const PROVIDER_SETUP_PROTOCOL_VERSION = 1;
   const CURRENT_MACHINE_PROTOCOL_CAPABILITIES = {
+    [MACHINE_PROTOCOL_CAPABILITIES.localProjectRemoval]: LOCAL_PROJECT_REMOVAL_PROTOCOL_VERSION,
     [MACHINE_PROTOCOL_CAPABILITIES.providerSetup]: PROVIDER_SETUP_PROTOCOL_VERSION
   };
   const isLoroRepoDocDeleted = (value) => {
@@ -23875,8 +23936,65 @@ ${context2.authorReply.trim()}
       }
       command2.requestedBy = value.requestedBy;
     }
+    if (!isMissing(value.projectName)) {
+      if (typeof value.projectName !== "string") return void 0;
+      command2.projectName = value.projectName;
+    }
+    if (!isMissing(value.originalRootPath)) {
+      if (typeof value.originalRootPath !== "string") return void 0;
+      command2.originalRootPath = value.originalRootPath;
+    }
+    if (!isMissing(value.cleanupWorktrees)) {
+      if (value.cleanupWorktrees !== true) return void 0;
+      command2.cleanupWorktrees = true;
+    }
+    if (!isMissing(value.status)) {
+      if (value.status !== "completed") return void 0;
+      command2.status = "completed";
+    }
+    if (!isMissing(value.cleanupResult)) {
+      const result = normalizeLocalProjectWorktreeCleanupResult(value.cleanupResult);
+      if (!result) return void 0;
+      command2.cleanupResult = result;
+    }
     return command2;
   };
+  const normalizeLocalProjectWorktreeCleanupItem = (value) => {
+    if (!isRecord$8(value)) return void 0;
+    if (typeof value.sessionId !== "string") return void 0;
+    if (typeof value.title !== "string") return void 0;
+    if (typeof value.path !== "string") return void 0;
+    return {
+      sessionId: value.sessionId,
+      title: value.title,
+      path: value.path
+    };
+  };
+  const normalizeLocalProjectWorktreeCleanupResult = (value) => {
+    if (!isRecord$8(value) || typeof value.completedAt !== "number") return void 0;
+    if (!Array.isArray(value.deleted)) return void 0;
+    if (!Array.isArray(value.skippedDirty)) return void 0;
+    if (!Array.isArray(value.failed)) return void 0;
+    const deleted = value.deleted.map(normalizeLocalProjectWorktreeCleanupItem);
+    const skippedDirty = value.skippedDirty.map(normalizeLocalProjectWorktreeCleanupItem);
+    const failed = value.failed.map((entry) => {
+      const item = normalizeLocalProjectWorktreeCleanupItem(entry);
+      if (!item || !isRecord$8(entry) || typeof entry.message !== "string") return void 0;
+      return {
+        ...item,
+        message: entry.message
+      };
+    });
+    if (deleted.includes(void 0)) return void 0;
+    if (skippedDirty.includes(void 0)) return void 0;
+    if (failed.includes(void 0)) return void 0;
+    return {
+      completedAt: value.completedAt,
+      deleted,
+      skippedDirty,
+      failed
+    };
+  };
   const normalizeLocalProjectMeta = (value) => {
     if (!isRecord$8(value) || !isNonEmptyString$2(value.id) || !isNonEmptyString$2(value.name) || !isNonEmptyString$2(value.rootPath) || typeof value.createdAtMs !== "number") {
       return void 0;
@@ -74126,6 +74244,7 @@ ${val.stack}`;
       return repo;
     }
     async ready() {
+      await this.syncRunner.ensureMetaLiveMonitor();
       if (this.metaPersister) {
         const version2 = this.metaFlock.version();
         this.metaPersister.start(version2);
@@ -104223,14 +104342,14 @@ ${value}`;
       }
       await this.machine.updateRateLimits(cliType, limits);
     }
-    async updateAcpCapabilities(machineId, configId, cliType, agentType, modes, models, configOptions, availableCommands, sessionFork, sourceVersion, modelReasoningEfforts, options = {}) {
+    async updateAcpCapabilities(machineId, configId, cliType, agentType, modes, models, configOptions, availableCommands, sessionFork, sourceVersion, modelReasoningEfforts, acknowledgedSteer = false, options = {}) {
       options.signal?.throwIfAborted();
       if (!this.machine) {
         this.machine = this.createMachineDocument(machineId);
         await this.machine.init();
       }
       options.signal?.throwIfAborted();
-      await this.machine.updateAcpCapabilities(configId, cliType, agentType, modes, models, configOptions, availableCommands, sessionFork, sourceVersion, modelReasoningEfforts, options);
+      await this.machine.updateAcpCapabilities(configId, cliType, agentType, modes, models, configOptions, availableCommands, sessionFork, sourceVersion, modelReasoningEfforts, acknowledgedSteer, options);
     }
     async getAcpCapabilities(machineId, configId) {
       if (!this.machine) {
@@ -104410,6 +104529,7 @@ ${value}`;
       this.mirror = new Mirror({
         doc: handle.doc,
         schema: sessionDocSchema,
+        ignoreUnknownProperties: true,
         initialState: merged
       });
       this.historyAutoReadHandle = attachAutoMarkLatestUserHistoryAsRead(this.mirror);
@@ -105336,6 +105456,7 @@ ${value}`;
     configOptions: entry.configOptions,
     availableCommands: entry.availableCommands,
     sessionFork: entry.sessionFork,
+    acknowledgedSteer: entry.acknowledgedSteer,
     sessionForkWorktree: entry.sessionForkWorktree
   });
   class MachineDocument {
@@ -105391,7 +105512,7 @@ ${value}`;
         }
       });
     }
-    async updateAcpCapabilities(configId, cliType, agentType, modes, models, configOptions, availableCommands, sessionFork, sourceVersion, modelReasoningEfforts, options = {}) {
+    async updateAcpCapabilities(configId, cliType, agentType, modes, models, configOptions, availableCommands, sessionFork, sourceVersion, modelReasoningEfforts, acknowledgedSteer = false, options = {}) {
       options.signal?.throwIfAborted();
       const normalizedModes = modes.map((mode2) => ({
         id: mode2.id,
@@ -105414,6 +105535,7 @@ ${value}`;
         configOptions: configOptions?.length ? configOptions : void 0,
         availableCommands: availableCommands?.length ? availableCommands : void 0,
         sessionFork,
+        acknowledgedSteer,
         sessionForkWorktree: sessionFork,
         modelReasoningEfforts: modelReasoningEfforts && Object.keys(modelReasoningEfforts).length > 0 ? modelReasoningEfforts : void 0,
         fetchedAt: getServerNow()
@@ -113545,6 +113667,7 @@ ${incoming}`).output;
       configOptions,
       availableCommands,
       sessionFork: lifecycleCapabilities.sessionFork === true,
+      acknowledgedSteer: lifecycleCapabilities.acknowledgedSteer === true,
       ...modelReasoningEfforts ? {
         modelReasoningEfforts
       } : {}
@@ -114648,7 +114771,8 @@ ${incoming}`).output;
       const toolCallId = typeof params.toolCallId === "string" ? params.toolCallId : void 0;
       const requestId = randomUUID$1();
       const firstQuestion = elicitation.meta.questions[0];
-      const autoResolveAtEpochSeconds = typeof elicitation.autoResolutionMs === "number" && Number.isFinite(elicitation.autoResolutionMs) ? Math.floor((getServerNow() + Math.max(0, elicitation.autoResolutionMs)) / 1e3) : void 0;
+      const autoResolveAt = typeof elicitation.autoResolutionMs === "number" && Number.isFinite(elicitation.autoResolutionMs) ? getServerNow() + Math.max(0, elicitation.autoResolutionMs) : void 0;
+      const autoResolveAtEpochSeconds = autoResolveAt === void 0 ? void 0 : Math.floor(autoResolveAt / 1e3);
       const lodyElicitation = {
         version: 1,
         questions: elicitation.meta.questions,
@@ -114656,6 +114780,27 @@ ${incoming}`).output;
           autoResolveAtEpochSeconds
         } : {}
       };
+      const legacyQuestionMeta = this.options.agentConfig?.agentType === "codex" ? {
+        codex: {
+          requestUserInput: {
+            version: 1,
+            allowCustomAnswer: elicitation.meta.allowCustomAnswer,
+            questions: elicitation.meta.questions,
+            ...autoResolveAt !== void 0 ? {
+              autoResolveAt
+            } : {}
+          }
+        }
+      } : this.options.agentConfig?.agentType === "claude" ? {
+        claudeCode: {
+          requestType: "askUserQuestion",
+          askUserQuestion: {
+            version: 1,
+            allowCustomAnswer: elicitation.meta.allowCustomAnswer,
+            questions: elicitation.meta.questions
+          }
+        }
+      } : {};
       const syntheticRequest = {
         sessionId,
         toolCall: {
@@ -114682,7 +114827,8 @@ ${incoming}`).output;
         _meta: {
           lody: {
             elicitation: lodyElicitation
-          }
+          },
+          ...legacyQuestionMeta
         }
       };
       this.logger.debug(`[${this.options.sessionId}] Bridging AskUserQuestion elicitation (toolCallId=${toolCallId ?? "<none>"}, questions=${elicitation.meta.questions.length})`);
@@ -129191,7 +129337,8 @@ ${fallbackStderrTail}` : errorMessage2;
     try {
       return {
         ...normalizeAcpSessionCapabilities(sessionResponse, {
-          sessionFork: client2.supportsSessionFork?.() === true
+          sessionFork: client2.supportsSessionFork?.() === true,
+          acknowledgedSteer: client2.supportsAcknowledgedSteer()
         }),
         capabilitySourceVersion
       };
@@ -131453,6 +131600,32 @@ path=/${options.repoFullName}.git
         isClean
       };
     }
+    async inspectWorktree(sessionId) {
+      return withRepoLock(this.repoId, async () => {
+        assertSafeSessionId(sessionId);
+        const worktreePath = this.getWorktreeHostPath(sessionId);
+        if (!fs.existsSync(worktreePath)) {
+          return {
+            state: "missing",
+            path: worktreePath
+          };
+        }
+        try {
+          const info = await this.getWorktreeInfo(sessionId);
+          return {
+            state: info.isClean ? "clean" : "dirty",
+            path: worktreePath,
+            info
+          };
+        } catch (error2) {
+          return {
+            state: "failed",
+            path: worktreePath,
+            message: error2 instanceof Error ? error2.message : String(error2)
+          };
+        }
+      });
+    }
     async removeWorktree(sessionId, force = false, branchName, options) {
       return withRepoLock(this.repoId, async () => {
         const resolvedBranchName = await this.removeWorktreeInternal(sessionId, {
@@ -131552,7 +131725,10 @@ path=/${options.repoFullName}.git
         ];
         if (options.force) args2.splice(2, 0, "--force");
         await this.runGit(args2, this.getGitAdminCwd());
-      } catch {
+      } catch (error2) {
+        if (!options.force) {
+          throw error2;
+        }
         this.logger.debug(`[${this.repoId}] git worktree remove failed, removing directory manually`);
         fs.rmSync(worktreePath, {
           recursive: true,
@@ -132895,6 +133071,9 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
   function shouldApplyMachineDeleteLocalProjectCommand(project, command2) {
     return project.createdAtMs <= command2.requestedAt;
   }
+  function isSessionInLocalProjectRemovalScope(session2, target) {
+    return session2.machineId === target.machineId && session2.project?.kind === "local" && session2.project.localProjectId === target.localProjectId;
+  }
   function readLegacyMachineLocalProjects(machineMeta) {
     const localProjects = machineMeta?.localProjects;
     if (!localProjects || typeof localProjects !== "object") {
@@ -136258,7 +136437,7 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
         });
         const existing = await this.deps.workspaceDocument.getAcpCapabilities(this.deps.machineId, agentConfigId);
         const availableCommands = capabilities.availableCommands !== void 0 ? capabilities.availableCommands : existing?.sourceVersion === sourceVersion ? existing.availableCommands : void 0;
-        await this.deps.workspaceDocument.updateAcpCapabilities(this.deps.machineId, agentConfigId, config2.agentCliType, config2.agentType, capabilities.modes, capabilities.models, capabilities.configOptions, availableCommands, capabilities.sessionFork, sourceVersion, capabilities.modelReasoningEfforts);
+        await this.deps.workspaceDocument.updateAcpCapabilities(this.deps.machineId, agentConfigId, config2.agentCliType, config2.agentType, capabilities.modes, capabilities.models, capabilities.configOptions, availableCommands, capabilities.sessionFork, sourceVersion, capabilities.modelReasoningEfforts, capabilities.acknowledgedSteer);
       })().catch((error2) => {
         this.deps.logger.debug(`[${session2.sessionId}] Failed to update ACP capabilities from created session: ${formatErrorMessage(error2)}`);
       });
@@ -136432,7 +136611,7 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
         options.signal?.throwIfAborted();
         await this.emitBuiltinRuntimeStatusForRefresh(message, options.onAcpBinaryProgress);
         options.signal?.throwIfAborted();
-        const { modes, models, configOptions, availableCommands, sessionFork, modelReasoningEfforts, capabilitySourceVersion } = await this.deps.fetchAcpCapabilities(message.cliType, message.agentType, message.env, message.customAcp, message.runtimeOverrides, {
+        const { modes, models, configOptions, availableCommands, sessionFork, acknowledgedSteer, modelReasoningEfforts, capabilitySourceVersion } = await this.deps.fetchAcpCapabilities(message.cliType, message.agentType, message.env, message.customAcp, message.runtimeOverrides, {
           signal: options.signal,
           onManagedRuntimeProgress: (event) => {
             if (options.signal?.aborted) return;
@@ -136445,7 +136624,7 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
           agentType: message.agentType,
           customAcp: message.customAcp,
           runtimeOverrides: message.runtimeOverrides
-        }), modelReasoningEfforts, {
+        }), modelReasoningEfforts, acknowledgedSteer, {
           signal: options.signal
         });
         return {
@@ -137254,18 +137433,21 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
         }
       }
     }
-    peekStashedRpcTurn(sessionId, meta) {
+    peekStashedRpcTurn(sessionId, meta, history = []) {
       const stash = this.rpcTurnStash.get(sessionId);
       if (!stash) {
         return null;
       }
       const now2 = Date.now();
       for (const [userTurnId, stashed] of stash) {
-        const isTerminal2 = meta.lastHandledUserMsgId === userTurnId || this.deps.executionService.getTerminalUserTurnStatusWithoutEntry?.(sessionId, userTurnId) !== void 0;
+        const isTerminal2 = meta.lastHandledUserMsgId === userTurnId || this.deps.executionService.getTerminalUserTurnStatusWithoutEntry?.(sessionId, userTurnId) !== void 0 || history.some((entry) => entry.id === userTurnId && entry.role === "user" && (entry.status === "handled" || entry.status === "failed" || entry.status === "canceled"));
         if (stashed.expiresAtMs <= now2 || isTerminal2) {
           stash.delete(userTurnId);
           continue;
         }
+        if (userTurnId === meta.lastMissingHistoryUserMsgId) {
+          continue;
+        }
         this.turnSourceHints.set(`${sessionId}:${userTurnId}`, "rpc");
         return stashed.entry;
       }
@@ -138219,7 +138401,8 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
       if (!isActive()) {
         return null;
       }
-      this.deps.logger.debug(`[${sessionId}] Pending user turn metadata is visible but history is missing it; waiting up to ${SessionDispatchWatcher.HISTORY_SYNC_WAIT_TIMEOUT_MS / 1e3}s for history CRDT sync`);
+      const pendingUserTurnId = getPendingUserTurnActivationId(meta);
+      this.deps.logger.debug(`[${sessionId}] Pending user turn ${getPendingUserTurnActivationId(meta) ?? "unknown"} metadata is visible but history is missing it; waiting up to ${SessionDispatchWatcher.HISTORY_SYNC_WAIT_TIMEOUT_MS / 1e3}s for history CRDT sync (pendingUserMsgId=${pendingUserTurnId ?? "unknown"})`);
       return await new Promise((resolve2) => {
         let settled = false;
         let currentMeta = meta;
@@ -138349,7 +138532,7 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
           }
         };
         timer2 = SessionDispatchWatcher.setUnrefTimeout(() => {
-          this.deps.logger.warn(`[${sessionId}] User turn did not arrive in history after ${SessionDispatchWatcher.HISTORY_SYNC_WAIT_TIMEOUT_MS / 1e3}s; entering dispatch recovery`);
+          this.deps.logger.warn(`[${sessionId}] User turn ${pendingUserTurnId ?? "unknown"} did not arrive in history after ${SessionDispatchWatcher.HISTORY_SYNC_WAIT_TIMEOUT_MS / 1e3}s; entering dispatch recovery`);
           finish(null);
         }, SessionDispatchWatcher.HISTORY_SYNC_WAIT_TIMEOUT_MS);
         progressTimer = setInterval(() => {
@@ -138359,7 +138542,7 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
             }
             return;
           }
-          this.deps.logger.warn(`[${sessionId}] Still waiting for pending user turn history sync (elapsed=${Date.now() - waitStartedAt}ms docRoom=${sessionDoc.getDocRoomStatus() ?? "unknown"})`);
+          this.deps.logger.warn(`[${sessionId}] Still waiting for pending user turn history sync (pendingUserMsgId=${pendingUserTurnId ?? "unknown"} elapsed=${Date.now() - waitStartedAt}ms docRoom=${sessionDoc.getDocRoomStatus() ?? "unknown"})`);
         }, SessionDispatchWatcher.HISTORY_SYNC_PROGRESS_LOG_MS);
         progressTimer.unref?.();
         if (!isActive()) {
@@ -138437,7 +138620,9 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
       if (pendingUserMsgId) {
         recoveryPatch.lastMissingHistoryUserMsgId = pendingUserMsgId;
       }
+      this.deps.logger.warn(`[${sessionId}] Marking missing-history recovery for user turn ${pendingUserMsgId ?? "unknown"} (message_delivery_failed)`);
       await this.deps.workspaceDocument.repo.upsertDocMeta?.(roomId, recoveryPatch);
+      this.deps.logger.info(`[${sessionId}] Recorded missing-history recovery for user turn ${pendingUserMsgId ?? "unknown"}; the turn stays undispatchable until the user explicitly redelivers it`);
       if (this.deps.recordChatFailure) {
         try {
           await this.deps.recordChatFailure(sessionDoc, "message_delivery_failed", "The user message could not be delivered because its history payload did not sync to this machine. Please resend it after sync recovers.");
@@ -138477,7 +138662,7 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
         this.turnSourceHints.set(`${meta.id}:${promoted.id}`, "queue");
         return promoted;
       }
-      return this.peekStashedRpcTurn(meta.id, meta);
+      return this.peekStashedRpcTurn(meta.id, meta, history);
     }
     async maybeRepairAlreadyHandledTurn(sessionDoc, meta, turn, history) {
       const sessionId = meta.id;
@@ -139876,6 +140061,7 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
         string$1(),
         boolean()
       ])).optional(),
+      taskToolsEnabled: boolean().optional(),
       inheritSessionDefaults: literal$1(false).optional()
     }).strict().nullable()).optional()
   }).strict();
@@ -151717,6 +151903,7 @@ ${part.truncated ? TRUNCATION_MARKER : ""}${part.content}`).join("\n\n");
     const mirror = new Mirror({
       doc: handle.doc,
       schema: taskDocSchema,
+      ignoreUnknownProperties: true,
       ...options?.seedEmptyDocument ? {
         initialState: emptyTaskDocState(taskId)
       } : {}
@@ -166018,7 +166205,7 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
     "local-project/set-worktree-cleanup"
   ]);
   function isRemoteLocalProjectControlRequest(request2) {
-    return HISTORY_REQUEST_TYPES.has(request2.type) || SETUP_REQUEST_TYPES.has(request2.type);
+    return request2.type === "local-project/removal-preflight" || HISTORY_REQUEST_TYPES.has(request2.type) || SETUP_REQUEST_TYPES.has(request2.type);
   }
   function precheckLocalProjectHistoryRequest(args2) {
     const { request: request2, expectedMachineId, expectedWorkspaceId } = args2;
@@ -166057,6 +166244,91 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
       requesterUserId
     };
   }
+  function getTargetSessions(target) {
+    return target.sessions.filter((session2) => session2.machineId === target.machineId && !session2.parentSessionId && session2.isWorktree === true && session2.project?.kind === "local" && session2.project.localProjectId === target.localProjectId);
+  }
+  function toCleanupItem(session2, path2) {
+    return {
+      sessionId: session2.id,
+      title: session2.title?.trim() || session2.id,
+      path: path2
+    };
+  }
+  function getManager(target) {
+    return getWorktreeManager({
+      repoId: deriveRepoIdFromLocalProjectPath(target.originalRootPath),
+      source: {
+        kind: "local-shared",
+        originalRootPath: target.originalRootPath
+      },
+      logger: target.logger
+    });
+  }
+  async function preflightLocalProjectWorktreeRemoval(target) {
+    const result = {
+      clean: [],
+      dirty: [],
+      failed: []
+    };
+    const manager = getManager(target);
+    for (const session2 of getTargetSessions(target)) {
+      const inspection = await manager.inspectWorktree(session2.id);
+      if (inspection.state === "missing") continue;
+      const item = toCleanupItem(session2, inspection.path);
+      if (inspection.state === "clean") result.clean.push(item);
+      if (inspection.state === "dirty") result.dirty.push(item);
+      if (inspection.state === "failed") {
+        result.failed.push({
+          ...item,
+          message: inspection.message
+        });
+      }
+    }
+    return result;
+  }
+  async function cleanupLocalProjectWorktrees(target) {
+    const result = {
+      completedAt: getServerNow(),
+      deleted: [],
+      skippedDirty: [],
+      failed: []
+    };
+    const manager = getManager(target);
+    for (const session2 of getTargetSessions(target)) {
+      const inspection = await manager.inspectWorktree(session2.id);
+      if (inspection.state === "missing") continue;
+      const item = toCleanupItem(session2, inspection.path);
+      if (inspection.state === "dirty") {
+        result.skippedDirty.push(item);
+        continue;
+      }
+      if (inspection.state === "failed") {
+        result.failed.push({
+          ...item,
+          message: inspection.message
+        });
+        continue;
+      }
+      try {
+        await manager.removeWorktree(session2.id, false, session2.branchName, {
+          baseBranchName: session2.baseBranch
+        });
+        result.deleted.push(item);
+      } catch (error2) {
+        const latest2 = await manager.inspectWorktree(session2.id);
+        if (latest2.state === "dirty") {
+          result.skippedDirty.push(toCleanupItem(session2, latest2.path));
+        } else if (latest2.state !== "missing") {
+          result.failed.push({
+            ...item,
+            message: formatErrorMessage(error2)
+          });
+        }
+      }
+    }
+    result.completedAt = getServerNow();
+    return result;
+  }
   const SESSION_IMAGE_DOWNLOAD_RETRY_DELAYS_MS = [
     250,
     750,
@@ -168787,7 +169059,7 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
       }
       void this.processDeleteLocalProjectRequests();
     }
-    async archiveSessionResources(sessionId) {
+    async archiveSessionResources(sessionId, options) {
       this.logger.debug(`[${sessionId}] Archiving session resources`);
       this.clearSessionActivePresence(sessionId);
       this.closeSessionTerminals?.(sessionId);
@@ -168808,55 +169080,58 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
         this.logger.debug(`[${sessionId}] Terminating active session`);
         await this.sessionManager.terminateSession(sessionId, true);
       }
-      const cleanupTarget = this.resolveWorktreeCleanupTarget({
-        sessionMeta,
-        machineMeta: archiveMachineMeta
-      });
-      if (cleanupTarget) {
-        const worktreeManager = getWorktreeManager(this.buildWorktreeManagerConfig(cleanupTarget));
-        const worktreePath = worktreeManager.getWorktreeHostPath(sessionId);
-        if (fs__default.existsSync(worktreePath)) {
-          const sessionDoc = await this.workspaceDocument.getOrCreateSessionDoc(sessionId);
-          await runWorktreeCleanup({
-            config: await resolveSessionWorktreeCleanupConfig({
-              token: this.token,
-              workspaceId: this.workspaceId,
-              machineId: this.machineId,
-              sessionId,
-              sessionMeta,
-              workspaceDocument: this.workspaceDocument,
-              logger: this.logger
-            }),
-            sessionId,
-            workspaceId: this.workspaceId,
-            workdir: worktreePath,
-            branch: cleanupTarget.branchName ?? sessionMeta?.branchName?.trim() ?? "",
-            repoFullName: sessionMeta?.project?.kind === "local" ? void 0 : sessionMeta?.repoFullName,
-            localProjectId: sessionMeta?.project?.kind === "local" ? sessionMeta.project.localProjectId : void 0,
-            logger: this.logger,
-            events: createWorktreeScriptHistoryRecorder({
-              sessionDoc,
+      if (!options?.preserveWorktree) {
+        const cleanupTarget = this.resolveWorktreeCleanupTarget({
+          sessionMeta,
+          machineMeta: archiveMachineMeta
+        });
+        if (cleanupTarget) {
+          const worktreeManager = getWorktreeManager(this.buildWorktreeManagerConfig(cleanupTarget));
+          const worktreePath = worktreeManager.getWorktreeHostPath(sessionId);
+          if (fs__default.existsSync(worktreePath)) {
+            const sessionDoc = await this.workspaceDocument.getOrCreateSessionDoc(sessionId);
+            await runWorktreeCleanup({
+              config: await resolveSessionWorktreeCleanupConfig({
+                token: this.token,
+                workspaceId: this.workspaceId,
+                machineId: this.machineId,
+                sessionId,
+                sessionMeta,
+                workspaceDocument: this.workspaceDocument,
+                logger: this.logger
+              }),
               sessionId,
-              phase: "cleanup",
-              logger: this.logger
-            })
-          });
-        }
-        try {
-          const archiveResult = await worktreeManager.archiveWorktree(sessionId);
-          if (archiveResult.branchName && archiveResult.branchName !== sessionMeta?.branchName?.trim()) {
-            await this.workspaceDocument.repo.upsertDocMeta(sessionRoomId, {
-              branchName: archiveResult.branchName
+              workspaceId: this.workspaceId,
+              workdir: worktreePath,
+              branch: cleanupTarget.branchName ?? sessionMeta?.branchName?.trim() ?? "",
+              repoFullName: sessionMeta?.project?.kind === "local" ? void 0 : sessionMeta?.repoFullName,
+              localProjectId: sessionMeta?.project?.kind === "local" ? sessionMeta.project.localProjectId : void 0,
+              logger: this.logger,
+              events: createWorktreeScriptHistoryRecorder({
+                sessionDoc,
+                sessionId,
+                phase: "cleanup",
+                logger: this.logger
+              })
             });
           }
-        } catch (error2) {
-          this.logger.debug(`[${sessionId}] Failed to archive worktree: ${formatErrorMessage(error2)}`);
+          try {
+            const archiveResult = await worktreeManager.archiveWorktree(sessionId);
+            if (archiveResult.branchName && archiveResult.branchName !== sessionMeta?.branchName?.trim()) {
+              await this.workspaceDocument.repo.upsertDocMeta(sessionRoomId, {
+                branchName: archiveResult.branchName
+              });
+            }
+          } catch (error2) {
+            this.logger.debug(`[${sessionId}] Failed to archive worktree: ${formatErrorMessage(error2)}`);
+          }
         }
       }
       await this.sessionManager.archiveSession(sessionId);
       this.logger.debug(`[${sessionId}] Session doc cleaned`);
       await this.workspaceDocument.repo.upsertDocMeta(sessionRoomId, {
-        isArchived: true
+        isArchived: true,
+        status: SessionStatusFactory.idle()
       });
       this.logger.debug(`[${sessionId}] Session meta archived`);
       this.store.get(sessionId).logger = null;
@@ -168916,14 +169191,28 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
       }
       this.logger.debug(`[local-project] Processing ${localProjectEntries.length} delete request(s)`);
       for (const [localProjectId, command2] of localProjectEntries) {
+        if (command2.status === "completed") {
+          continue;
+        }
         if (this.deleteLocalProjectInFlight.has(localProjectId)) {
           this.logger.debug(`[local-project] ${localProjectId} already in progress`);
           continue;
         }
         this.deleteLocalProjectInFlight.add(localProjectId);
         try {
-          await this.deleteLocalProjectResources(localProjectId, command2);
-          await this.removeDeleteLocalProjectRequest(localProjectId);
+          const cleanupResult = await this.deleteLocalProjectResources(localProjectId, command2);
+          if (command2.cleanupWorktrees && cleanupResult) {
+            await this.writeMachineFlockRow({
+              key: machineFlockKeys.deleteLocalProjectCommand(localProjectId),
+              value: {
+                ...command2,
+                status: "completed",
+                cleanupResult
+              }
+            });
+          } else {
+            await this.removeDeleteLocalProjectRequest(localProjectId);
+          }
         } catch (error2) {
           this.logger.error(`[local-project] Failed to delete ${localProjectId}: ${formatErrorMessage(error2)}`);
         } finally {
@@ -168941,56 +169230,68 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
         this.logger.debug(`[local-project] Failed to cleanup worktree setup for ${localProjectId}: ${formatErrorMessage(error2)}`);
       }
     }
-    async stopActiveLocalProjectSessions(localProjectId) {
-      const sessionIds = [
-        ...this.workspaceDocument.sessions.keys()
-      ];
-      if (sessionIds.length === 0) return;
-      let stoppedCount = 0;
-      for (const sessionId of sessionIds) {
-        try {
-          const sessionDoc = await this.workspaceDocument.getOrCreateSessionDoc(sessionId);
-          const meta = await sessionDoc.getMetaState();
-          if (!meta) continue;
-          if (meta.machineId !== this.machineId) continue;
-          if (meta.project?.kind !== "local") continue;
-          if (meta.project.localProjectId !== localProjectId) continue;
-          const hasRunningProcess = this.sessionManager.hasSession(sessionId);
-          if (!hasRunningProcess && !isActiveSessionStatus(meta.status)) continue;
-          this.clearSessionActivePresence(sessionId);
-          this.closeSessionTerminals?.(sessionId);
-          await this.finalizeACPState(sessionId);
-          if (hasRunningProcess) {
-            await this.sessionManager.terminateSession(sessionId, true);
-          }
-          await sessionDoc.setStatus(SessionStatusFactory.idle());
-          stoppedCount += 1;
-        } catch (error2) {
-          this.logger.debug(`[${sessionId}] Failed to stop active session before local project removal: ${formatErrorMessage(error2)}`);
-        }
+    async archiveLocalProjectSessions(localProjectId) {
+      const sessions = (await listAliveSessionMetas(this.workspaceDocument)).filter(({ meta }) => isSessionInLocalProjectRemovalScope(meta, {
+        machineId: this.machineId,
+        localProjectId
+      }));
+      if (sessions.length === 0) return;
+      const rootSessions = sessions.filter(({ meta }) => meta.isArchived !== true && !meta.parentSessionId);
+      const archivedRootSessionIds = new Set(rootSessions.map(({ meta }) => meta.id));
+      for (const { meta } of rootSessions) {
+        await this.archiveSessionResources(meta.id, {
+          preserveWorktree: true
+        });
       }
-      if (stoppedCount > 0) {
-        this.logger.debug(`[local-project] Stopped ${stoppedCount} active session(s) before removing ${localProjectId}`);
+      for (const { roomId, meta } of sessions) {
+        if (archivedRootSessionIds.has(meta.id)) continue;
+        if (this.sessionManager.hasSession(meta.id)) {
+          await this.archiveSessionResources(meta.id, {
+            preserveWorktree: true
+          });
+          continue;
+        }
+        if (meta.isArchived === true) continue;
+        await this.workspaceDocument.repo.upsertDocMeta(roomId, {
+          isArchived: true,
+          status: SessionStatusFactory.idle()
+        });
       }
+      this.logger.debug(`[local-project] Processed ${sessions.length} session(s) before removing ${localProjectId}`);
     }
     async deleteLocalProjectResources(localProjectId, command2) {
       const existingProject = await resolveWorkspaceLocalProject(this.workspaceDocument.repo, this.workspaceId, this.machineId, localProjectId);
-      if (!existingProject) {
+      if (!existingProject && !command2.cleanupWorktrees) {
         this.logger.debug(`[local-project] ${localProjectId} already removed`);
         await this.cleanupLocalProjectWorktreeSetup(localProjectId);
-        return;
+        return void 0;
       }
-      if (!shouldApplyMachineDeleteLocalProjectCommand(existingProject, command2)) {
+      if (existingProject && !shouldApplyMachineDeleteLocalProjectCommand(existingProject, command2)) {
         this.logger.debug(`[local-project] Skipping stale delete request for ${localProjectId}; project was created after the request`);
-        return;
+        return void 0;
+      }
+      await this.archiveLocalProjectSessions(localProjectId);
+      let cleanupResult;
+      const originalRootPath = existingProject?.rootPath ?? command2.originalRootPath;
+      if (command2.cleanupWorktrees && originalRootPath) {
+        const sessions = (await listAliveSessionMetas(this.workspaceDocument)).map(({ meta }) => meta);
+        cleanupResult = await cleanupLocalProjectWorktrees({
+          machineId: this.machineId,
+          localProjectId,
+          originalRootPath,
+          sessions,
+          logger: this.logger
+        });
+      }
+      if (existingProject) {
+        await removeMachineLocalProject(this.workspaceDocument.repo, this.workspaceId, this.machineId, localProjectId, void 0, {
+          sync: this.workspaceDocument,
+          reason: "local-project-delete-command"
+        });
+        this.logger.debug(`[local-project] Removed ${existingProject.name} (${existingProject.rootPath})`);
       }
-      await this.stopActiveLocalProjectSessions(localProjectId);
-      await removeMachineLocalProject(this.workspaceDocument.repo, this.workspaceId, this.machineId, localProjectId, void 0, {
-        sync: this.workspaceDocument,
-        reason: "local-project-delete-command"
-      });
-      this.logger.debug(`[local-project] Removed ${existingProject.name} (${existingProject.rootPath})`);
       await this.cleanupLocalProjectWorktreeSetup(localProjectId);
+      return cleanupResult;
     }
     toDeleteRequestRecord(request2) {
       if (!request2 || typeof request2 !== "object") {
@@ -172723,6 +173024,20 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
           return authorized.response;
         }
         const { rootPath } = authorized;
+        if (request2.type === "local-project/removal-preflight") {
+          const sessions = (await listAliveSessionMetas(this.workspaceDocument)).map(({ meta }) => meta);
+          return {
+            ok: true,
+            type: "local-project/removal-preflight",
+            result: await preflightLocalProjectWorktreeRemoval({
+              machineId: this.machineId,
+              localProjectId: request2.localProjectId,
+              originalRootPath: rootPath,
+              sessions,
+              logger: this.logger
+            })
+          };
+        }
         if (isLocalProjectWorktreeConfigRequest(request2)) {
           return await handleLocalProjectWorktreeConfigRequest(request2);
         }
@@ -181876,7 +182191,8 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
           client2 = started.client;
           acpSessionId = started.acpSessionId;
           acpCapabilities = normalizeAcpSessionCapabilities(started.sessionResponse, {
-            sessionFork: started.client.supportsSessionFork()
+            sessionFork: started.client.supportsSessionFork(),
+            acknowledgedSteer: started.client.supportsAcknowledgedSteer()
           });
         } catch (error2) {
           if (error2 instanceof AcpStartupProcessExitError || error2 instanceof AcpStartupProcessError) {
@@ -191403,6 +191719,22 @@ ${trimmed2}${closing}`;
             }
           };
         }
+        if (message.type === "local-project/removal-preflight") {
+          const runtime = await this.resolveWorkspaceRuntime(message.workspaceId);
+          const rootPath = await this.resolveWorkspaceProjectRootPath(runtime, message.localProjectId);
+          const sessions = (await listAliveSessionMetas(runtime.lody.documentManager)).map(({ meta }) => meta);
+          return {
+            ok: true,
+            type: "local-project/removal-preflight",
+            result: await preflightLocalProjectWorktreeRemoval({
+              machineId: this.machineId,
+              localProjectId: message.localProjectId,
+              originalRootPath: rootPath,
+              sessions,
+              logger: this.logger
+            })
+          };
+        }
         if (message.type === "local-project/list") {
           return {
             ok: true,
@@ -220311,7 +220643,7 @@ ${page}${helpTipBottom}${choiceDescription}${ansiEscapes.cursorHide}`;
       data = createReviewBundleSnapshot(bundle);
     }
     const { injectReviewSnapshot } = await import("./chunks/index-VoI6Ds2-.js");
-    const { resolveReviewViewerTemplate } = await import("./chunks/review-viewer-BetqYmAc.js").then(async (m) => {
+    const { resolveReviewViewerTemplate } = await import("./chunks/review-viewer-D1hRLw2L.js").then(async (m) => {
       await m.__tla;
       return m;
     });