lody 0.59.1 → 0.60.1

package/dist/index.js

@@ -20,6 +20,7 @@ import require$$0$7, { errorMonitor, EventEmitter as EventEmitter$1 } from "node
 import * as diagch from "diagnostics_channel";
 import diagch__default from "diagnostics_channel";
 import * as net from "node:net";
+import net__default from "node:net";
 import require$$1$4 from "async_hooks";
 import require$$1$5, { execFile, spawn as spawn$1, execFileSync } from "node:child_process";
 import fs$3, { readdir, readFile, createReadStream, existsSync, readFileSync as readFileSync$1, createWriteStream, rmSync, readdirSync, promises as promises$1 } from "node:fs";
@@ -47,7 +48,7 @@ import require$$1$6 from "string_decoder";
 import * as http$2 from "http";
 import http__default from "http";
 import require$$1$7 from "https";
-import { randomFillSync, randomUUID, createHash, randomBytes as randomBytes$1 } from "node:crypto";
+import crypto$1, { randomFillSync, randomUUID, createHash, randomBytes as randomBytes$1 } from "node:crypto";
 import require$$0$a from "net";
 import require$$4$3 from "tls";
 import { i as imports, _ as __wbg_set_wasm$1, r as rawWasm, L as LoroDoc, E as EphemeralStoreWasm, U as UndoManager, c as callPendingEvents$3, a as LoroTree, b as LoroText, d as LoroMovableList, e as LoroList, f as LoroMap, g as __vite__initWasm, V as VersionVector, h as decodeImportBlobMeta, __tla as __tla_0 } from "./chunks/loro_wasm_bg-BV-n7JyC.js";
@@ -12304,7 +12305,7 @@ ${JSON.stringify(itemHeaders)}
   function createTransport(options, makeRequest, buffer2 = makePromiseBuffer(options.bufferSize || DEFAULT_TRANSPORT_BUFFER_SIZE)) {
     let rateLimits = {};
     const flush2 = (timeout2) => buffer2.drain(timeout2);
-    function send(envelope) {
+    function send2(envelope) {
       const filteredEnvelopeItems = [];
       forEachEnvelopeItem(envelope, (item, type2) => {
         const dataCategory = envelopeItemTypeToDataCategory(type2);
@@ -12353,7 +12354,7 @@ ${JSON.stringify(itemHeaders)}
       });
     }
     return {
-      send,
+      send: send2,
       flush: flush2
     };
   }
@@ -25954,7 +25955,7 @@ Event: ${getEventDescription(event)}`);
       const instrumentation2 = this;
       this._diag.debug("Patching fastify reply.send function");
       return function patchSend(original) {
-        return function send(...args2) {
+        return function send2(...args2) {
           const maybeError = args2[0];
           if (!instrumentation2.isEnabled()) {
             return original.apply(this, args2);
@@ -27283,7 +27284,7 @@ Event: ${getEventDescription(event)}`);
             const transactionPromise = original.apply(this, args2);
             transactionPromise.then((transaction2) => {
               const originalSend = transaction2.send;
-              transaction2.send = function send(...args3) {
+              transaction2.send = function send2(...args3) {
                 return api_1.context.with(api_1.trace.setSpan(api_1.context.active(), transactionSpan), () => {
                   const patched = instrumentation2._getSendPatch()(originalSend);
                   return patched.apply(this, args3).catch((err2) => {
@@ -27369,7 +27370,7 @@ Event: ${getEventDescription(event)}`);
       _getSendPatch() {
         const instrumentation2 = this;
         return (original) => {
-          return function send(...args2) {
+          return function send2(...args2) {
             const record2 = args2[0];
             const spans = record2.messages.map((message) => {
               return instrumentation2._startProducerSpan(record2.topic, message);
@@ -36827,7 +36828,7 @@ Mongoose Error Code: ${error2.code}` : ""}`
     return client;
   }
   const name$1 = "lody";
-  const version$4 = "0.59.1";
+  const version$4 = "0.60.1";
   const description$1 = "Lody Agent CLI tool for managing remote command execution";
   const type$2 = "module";
   const main$4 = "dist/index.js";
@@ -36942,6 +36943,7 @@ Mongoose Error Code: ${error2.code}` : ""}`
   const dependencies$1 = {
     "better-sqlite3": "catalog:",
     "loro-crdt": "1.13.1",
+    "node-pty": "1.1.0",
     "shell-env": "^4.0.3",
     "typescript": "^5.9.3"
   };
@@ -37137,6 +37139,30 @@ Task description:
     "image/webp",
     "image/gif"
   ];
+  const IMAGE_MIME_TYPE_BY_EXTENSION = {
+    png: "image/png",
+    apng: "image/apng",
+    jpg: "image/jpeg",
+    jpeg: "image/jpeg",
+    jfif: "image/jpeg",
+    gif: "image/gif",
+    webp: "image/webp",
+    svg: "image/svg+xml",
+    bmp: "image/bmp",
+    ico: "image/x-icon",
+    cur: "image/x-icon",
+    avif: "image/avif"
+  };
+  function getImageMimeTypeForPath(pathOrName) {
+    const lastDot = pathOrName.lastIndexOf(".");
+    if (lastDot < 0 || lastDot === pathOrName.length - 1) return void 0;
+    const extension2 = pathOrName.slice(lastDot + 1).trim().toLowerCase();
+    return IMAGE_MIME_TYPE_BY_EXTENSION[extension2];
+  }
+  function isBinaryImagePath(pathOrName) {
+    const mimeType = getImageMimeTypeForPath(pathOrName);
+    return mimeType !== void 0 && mimeType !== "image/svg+xml";
+  }
   const WORKSPACE_API_PATH_PREFIX = "/api/workspaces";
   const SESSION_IMAGE_UPLOAD_API_PATH = "/session-images/upload";
   const trimTrailingSlash = (url) => {
@@ -47263,7 +47289,11 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
   const LocalProjectFileReadResultSchema = object$1({
     path: string$1(),
     content: string$1(),
-    truncated: boolean()
+    truncated: boolean(),
+    encoding: _enum$1([
+      "utf8",
+      "base64"
+    ]).optional()
   }).strict();
   const LocalProjectDirectoryListResultSchema = object$1({
     entries: array$2(object$1({
@@ -47777,6 +47807,8 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     "acp_not_ready",
     "agent_disconnected",
     "turn_pre_prompt_failed",
+    "message_delivery_failed",
+    "machine_access_denied",
     "acp_auth_required",
     "acp_internal_error",
     "acp_upstream_api_error",
@@ -48123,7 +48155,35 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
       };
     }
   }
-  const REGISTRY_ACP_AGENTS = [
+  const HARDCODED_REGISTRY_ACP_AGENTS = [
+    {
+      id: "claude-p",
+      name: "Interactive Claude",
+      version: "0.1.5",
+      description: "Interactive Claude Code ACP runtime",
+      distribution: {
+        npx: {
+          package: "acp-extension-claude-pty@0.1.5",
+          registry: "https://registry.npmjs.org/",
+          platformPackages: {
+            darwin: {
+              arm64: "acp-extension-claude-pty-darwin-arm64@0.1.5",
+              x64: "acp-extension-claude-pty-darwin-x64@0.1.5"
+            },
+            linux: {
+              arm64: "acp-extension-claude-pty-linux-arm64@0.1.5",
+              x64: "acp-extension-claude-pty-linux-x64@0.1.5"
+            },
+            win32: {
+              arm64: "acp-extension-claude-pty-win32-arm64@0.1.5",
+              x64: "acp-extension-claude-pty-win32-x64@0.1.5"
+            }
+          }
+        }
+      }
+    }
+  ];
+  const REMOTE_REGISTRY_ACP_AGENTS = [
     {
       id: "agoragentic-acp",
       name: "Agoragentic",
@@ -48946,6 +49006,10 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
       }
     }
   ];
+  const REGISTRY_ACP_AGENTS = [
+    ...HARDCODED_REGISTRY_ACP_AGENTS,
+    ...REMOTE_REGISTRY_ACP_AGENTS
+  ];
   const CodexShellCommandArraySchema = array$2(string$1()).min(1);
   const CodexToolRawInputSchema = object$1({
     command: union$7([
@@ -55617,6 +55681,7 @@ ${tailedOutput}` : null;
     if (brandId === "minimax") return "MM";
     if (session.cliType === "builtin" && session.agentType === "codex") return "CX";
     if (session.cliType === "builtin" && session.agentType === "claude") return "CC";
+    if (session.cliType === "registry" && session.agentType === "claude-p") return "IC";
     const source = normalizeText(agentConfig?.name) || normalizeText(session.agentType) || normalizeText(session.cliType) || "ACP";
     const letters = source.replace(/[^a-zA-Z0-9]+/g, " ").split(" ").filter(Boolean).map((part) => part[0]).join("").slice(0, 2).toUpperCase();
     return letters || "ACP";
@@ -55631,6 +55696,7 @@ ${tailedOutput}` : null;
     if (brandId === "minimax") return "minimax";
     if (session.cliType === "builtin" && session.agentType === "codex") return "codex";
     if (session.cliType === "builtin" && session.agentType === "claude") return "claude";
+    if (session.cliType === "registry" && session.agentType === "claude-p") return "claude";
     return "agent";
   }
   function buildLiveActivityConversationItems({ sessions, agentConfigs = [], currentUserId, defaultTitle, statusLabels, formatUpdatedAt, maxItems = DEFAULT_MAX_ITEMS }) {
@@ -55731,6 +55797,102 @@ ${tailedOutput}` : null;
       return normalizeBaseUrl$1(convexUrl);
     }
   }
+  const TerminalDimensionsSchema = object$1({
+    cols: number$3().int().positive(),
+    rows: number$3().int().positive()
+  });
+  const TerminalSnapshotSchema = object$1({
+    terminalId: string$1().min(1),
+    title: string$1(),
+    cwd: string$1().optional()
+  });
+  const TERMINAL_MAX_PER_SESSION = 8;
+  const RequestIdSchema$1 = string$1().min(1).optional();
+  const TerminalClientMessageSchema = discriminatedUnion("type", [
+    object$1({
+      type: literal$1("list"),
+      requestId: RequestIdSchema$1,
+      sessionId: string$1().min(1)
+    }),
+    object$1({
+      type: literal$1("open"),
+      requestId: RequestIdSchema$1,
+      sessionId: string$1().min(1),
+      cols: TerminalDimensionsSchema.shape.cols,
+      rows: TerminalDimensionsSchema.shape.rows
+    }),
+    object$1({
+      type: literal$1("attach"),
+      requestId: RequestIdSchema$1,
+      terminalId: string$1().min(1),
+      cols: TerminalDimensionsSchema.shape.cols,
+      rows: TerminalDimensionsSchema.shape.rows
+    }),
+    object$1({
+      type: literal$1("input"),
+      requestId: RequestIdSchema$1,
+      terminalId: string$1().min(1),
+      data: string$1()
+    }),
+    object$1({
+      type: literal$1("resize"),
+      requestId: RequestIdSchema$1,
+      terminalId: string$1().min(1),
+      cols: TerminalDimensionsSchema.shape.cols,
+      rows: TerminalDimensionsSchema.shape.rows
+    }),
+    object$1({
+      type: literal$1("close"),
+      requestId: RequestIdSchema$1,
+      terminalId: string$1().min(1)
+    }),
+    object$1({
+      type: literal$1("close_session"),
+      requestId: RequestIdSchema$1,
+      sessionId: string$1().min(1)
+    })
+  ]);
+  discriminatedUnion("type", [
+    object$1({
+      type: literal$1("terminals"),
+      requestId: RequestIdSchema$1,
+      sessionId: string$1().min(1),
+      terminals: array$2(TerminalSnapshotSchema)
+    }),
+    object$1({
+      type: literal$1("opened"),
+      requestId: RequestIdSchema$1,
+      terminalId: string$1().min(1),
+      cwd: string$1().optional()
+    }),
+    object$1({
+      type: literal$1("data"),
+      requestId: RequestIdSchema$1,
+      terminalId: string$1().min(1),
+      data: string$1(),
+      replay: boolean().optional()
+    }),
+    object$1({
+      type: literal$1("title"),
+      requestId: RequestIdSchema$1,
+      terminalId: string$1().min(1),
+      title: string$1()
+    }),
+    object$1({
+      type: literal$1("exit"),
+      requestId: RequestIdSchema$1,
+      terminalId: string$1().min(1),
+      exitCode: number$3().int(),
+      signal: string$1().optional()
+    }),
+    object$1({
+      type: literal$1("error"),
+      requestId: RequestIdSchema$1,
+      terminalId: string$1().min(1).optional(),
+      code: string$1().min(1),
+      message: string$1()
+    })
+  ]);
   const LOCAL_PROBE_PORT$1 = 17789;
   const LOCAL_SESSION_CONTROL_PORT = 17790;
   const IMAGE_UPLOAD_PATH = "/image-upload";
@@ -84135,17 +84297,17 @@ ${fromBody}`;
       return this.client.subscribeToConnectionState(cb);
     }
   }
-  const require$1 = createRequire(resolve$1("."));
+  const require$2 = createRequire(resolve$1("."));
   var __create = Object.create;
   var __defProp = Object.defineProperty;
   var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
   var __getOwnPropNames = Object.getOwnPropertyNames;
   var __getProtoOf = Object.getPrototypeOf;
   var __hasOwnProp = Object.prototype.hasOwnProperty;
-  var __require = ((x) => typeof require$1 !== "undefined" ? require$1 : typeof Proxy !== "undefined" ? new Proxy(x, {
-    get: (a, b) => (typeof require$1 !== "undefined" ? require$1 : a)[b]
+  var __require = ((x) => typeof require$2 !== "undefined" ? require$2 : typeof Proxy !== "undefined" ? new Proxy(x, {
+    get: (a, b) => (typeof require$2 !== "undefined" ? require$2 : a)[b]
   }) : x)(function(x) {
-    if (typeof require$1 !== "undefined") return require$1.apply(this, arguments);
+    if (typeof require$2 !== "undefined") return require$2.apply(this, arguments);
     throw Error('Dynamic require of "' + x + '" is not supported');
   });
   var __commonJS = (cb, mod2) => function __require2() {
@@ -110943,6 +111105,18 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
       }
     }
   };
+  const DEFAULT_RECONNECT_BASE_DELAY_MS = 1e3;
+  const DEFAULT_RECONNECT_MAX_DELAY_MS = 3e4;
+  const RECONNECT_JITTER_FRACTION = 0.2;
+  const computeLoroReconnectDelayMs = (attempt, options = {}) => {
+    const safeAttempt = Number.isFinite(attempt) ? Math.max(0, Math.floor(attempt)) : 0;
+    const baseDelayMs = Math.max(0, options.baseDelayMs ?? DEFAULT_RECONNECT_BASE_DELAY_MS);
+    const maxDelayMs = Math.max(baseDelayMs, options.maxDelayMs ?? DEFAULT_RECONNECT_MAX_DELAY_MS);
+    const exponentialDelay = Math.min(maxDelayMs, baseDelayMs * 2 ** safeAttempt);
+    const random2 = options.random ?? Math.random;
+    const jitter = exponentialDelay * RECONNECT_JITTER_FRACTION * (Math.min(1, Math.max(0, random2())) * 2 - 1);
+    return Math.min(maxDelayMs, Math.max(0, Math.round(exponentialDelay + jitter)));
+  };
   const isRecoverableMetaRoomStatus = (status) => status === "disconnected" || status === "error";
   class LoroConnectionRecoveryController {
     recoveryEvents = runSync(unbounded());
@@ -110962,6 +111136,7 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
     activeOperation = null;
     metaRoomReadyPending = 0;
     metaRoomReadySequence = 0;
+    reconnectAttempt = 0;
     initialMetaSyncCompleted;
     isCleanedUp = false;
     constructor(options) {
@@ -110992,6 +111167,10 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
     }
     setTransportStatus(status) {
       this.transportStatus = status;
+      if (this.isStreamsHealthy()) {
+        this.resetReconnectBackoff("transport-connected");
+        return;
+      }
       if (status === "disconnected") {
         this.scheduleReconnect("transport-disconnected");
       }
@@ -111123,6 +111302,7 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
           this.markReconnectCompletionActive(event.completion);
           try {
             await this.runReconnect(event.reason, event.options);
+            this.updateBackoffAfterReconnect(event.reason, event.options);
             this.resolveReconnectCompletion(event.completion);
           } catch (error2) {
             this.rejectReconnectCompletion(event.completion, error2);
@@ -111219,6 +111399,9 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
           this.metaRoomReadyPending = Math.max(0, this.metaRoomReadyPending - 1);
         }
       }
+      if (this.isStreamsHealthy()) {
+        this.resetReconnectBackoff("meta-room-joined");
+      }
     }
     startAutoReconnectWatchdog() {
       const intervalMs = readTimeoutEnv("LODY_LORO_AUTO_RECONNECT_INTERVAL_MS", 3e4);
@@ -111241,8 +111424,13 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
       if (this.isCleanedUp || this.isStreamsHealthy() || this.reconnectTimer) {
         return;
       }
-      const delayMs = readTimeoutEnv("LODY_LORO_AUTO_RECONNECT_DELAY_MS", 1e3);
-      this.logger.debug(`[${this.workspaceId}] Scheduling Loro streams reconnect in ${delayMs}ms (reason=${reason}, transport=${this.transportStatus}, metaRoom=${this.metaRoomStatus ?? "unknown"})`);
+      const baseDelayMs = readTimeoutEnv("LODY_LORO_AUTO_RECONNECT_DELAY_MS", DEFAULT_RECONNECT_BASE_DELAY_MS);
+      const maxDelayMs = readTimeoutEnv("LODY_LORO_AUTO_RECONNECT_MAX_DELAY_MS", DEFAULT_RECONNECT_MAX_DELAY_MS);
+      const delayMs = computeLoroReconnectDelayMs(this.reconnectAttempt, {
+        baseDelayMs,
+        maxDelayMs
+      });
+      this.logger.debug(`[${this.workspaceId}] Scheduling Loro streams reconnect in ${delayMs}ms (attempt=${this.reconnectAttempt + 1}, reason=${reason}, transport=${this.transportStatus}, metaRoom=${this.metaRoomStatus ?? "unknown"})`);
       this.reconnectTimer = setTimeout(() => {
         this.reconnectTimer = null;
         this.offer({
@@ -111258,6 +111446,28 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
     isStreamsHealthy() {
       return this.transportStatus === "connected" && this.metaRoomStatus === "joined";
     }
+    resetReconnectBackoff(reason) {
+      if (this.reconnectAttempt === 0) {
+        return;
+      }
+      this.logger.debug(`[${this.workspaceId}] Resetting Loro streams reconnect backoff (reason=${reason}, attempts=${this.reconnectAttempt})`);
+      this.reconnectAttempt = 0;
+    }
+    updateBackoffAfterReconnect(reason, options) {
+      if (this.isCleanedUp) {
+        return;
+      }
+      if (this.isStreamsHealthy()) {
+        this.resetReconnectBackoff(`reconnect:${reason}`);
+        return;
+      }
+      if (options.force) {
+        this.reconnectAttempt = 0;
+        return;
+      }
+      this.reconnectAttempt += 1;
+      this.scheduleReconnect(`retry-after-${reason}`);
+    }
     async runReconnect(reason, options) {
       if (this.isCleanedUp) {
         return;
@@ -111275,7 +111485,7 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
         }
         await this.ensureMetaRoomJoined(reason);
         await withTimeout$3(this.repo.reconnect({
-          resetBackoff: true,
+          resetBackoff: options.force === true,
           timeout: timeoutMs
         }), timeoutMs, `Timeout waiting for Loro streams reconnect (workspace=${this.workspaceId})`);
         if (shouldLog) {
@@ -111314,6 +111524,7 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
         }
         this.initialMetaSyncCompleted = true;
         this.onMetaRoomReady();
+        this.resetReconnectBackoff(`meta-room-ready:${reason}`);
         this.logger.debug(`[${this.workspaceId}] Loro meta room ready in ${Date.now() - startedAt}ms (reason=${reason})`);
         this.emitMetaRoomSynced(reason);
       } catch (error2) {
@@ -112784,16 +112995,6 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
       const key2 = getAcpCapabilityCacheKey(cliType, agentType);
       return meta?.acpCapabilities?.[key2];
     }
-    async sendMachineHeartbeat() {
-      if (!this.machine) {
-        return;
-      }
-      const startedAt = Date.now();
-      this.logger.debug(`[${this.workspaceId}] Machine heartbeat writing presence and meta`);
-      this.presenceRuntime?.writeMachineHeartbeat();
-      await withSlowOperationWarning(this.machine.sendHeartbeat(), this.logger, "machine.sendHeartbeat repo.upsertDocMeta(lastSeen)", this.workspaceId);
-      this.logger.debug(`[${this.workspaceId}] Machine heartbeat meta write completed (duration=${Date.now() - startedAt}ms)`);
-    }
     async restoreMachineDocument(machineId) {
       const machineRoomId = getMachineRoomId(machineId);
       await this.repo.restoreDoc(machineRoomId);
@@ -113337,9 +113538,6 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
       const current2 = await this.repo.getDocMeta(this.roomId);
       if (isLoroRepoDocDeleted(current2)) return;
       const currentMeta = current2?.meta;
-      await this.repo.upsertDocMeta(this.roomId, {
-        lastRunningSeen: getServerNow()
-      });
       this.presenceRuntime?.setSessionPresence({
         sessionId: this.sessionId,
         machineId: currentMeta?.machineId,
@@ -113760,11 +113958,6 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
         }
       });
     }
-    async sendHeartbeat() {
-      await this.repo.upsertDocMeta(this.roomId, {
-        lastSeen: getServerNow()
-      });
-    }
   }
   const DEFAULT_GATEWAY_BASE_URL = "https://streams-api-proxy.loro.dev";
   const JSON_RPC_VERSION$1 = "2.0";
@@ -127702,6 +127895,9 @@ ${error2.message}` : execaMessage;
   function resolveCodexPlatformPackage(platform2 = process.platform, arch = process.arch) {
     return CODEX_PLATFORM_PACKAGES[platform2]?.[arch];
   }
+  function resolveRegistryNpxPackage(distribution, platform2 = process.platform, arch = process.arch) {
+    return distribution.platformPackages?.[platform2]?.[arch] ?? distribution.package;
+  }
   const DEFAULT_ACP_PATH_RELATIVE_DIRS = [
     ".local/bin",
     "bin",
@@ -127711,10 +127907,6 @@ ${error2.message}` : execaMessage;
     agent.id,
     agent
   ]));
-  const builtinTypeSet = /* @__PURE__ */ new Set([
-    "claude",
-    "codex"
-  ]);
   const moduleRequire = createRequire$1(import.meta.url);
   function isRecord$2(value) {
     return typeof value === "object" && value !== null;
@@ -127739,7 +127931,7 @@ ${error2.message}` : execaMessage;
     }
   }
   function resolveBuiltinACPSetting(agentType) {
-    if (!builtinTypeSet.has(agentType)) {
+    if (!isBuiltinAgentType(agentType)) {
       throw new Error(`Unsupported builtin ACP type: ${agentType}`);
     }
     const builtinType = agentType;
@@ -127759,8 +127951,8 @@ ${error2.message}` : execaMessage;
         };
       }
     }
-    const codexPlatformPackage = builtinType === "codex" ? resolveCodexPlatformPackage() : void 0;
-    const packageName = codexPlatformPackage ?? setting.packageName;
+    const platformPackage = builtinType === "codex" ? resolveCodexPlatformPackage() : void 0;
+    const packageName = platformPackage ?? setting.packageName;
     const packageSpec = `${packageName}@${setting.version}`;
     const args2 = [
       ...builtinType === "codex" ? [
@@ -127787,7 +127979,7 @@ ${error2.message}` : execaMessage;
       return input2.customAcp ? `custom:${serializeCustomAcpLaunchSpec(input2.customAcp)}` : `custom:${input2.agentType}:unknown`;
     }
     if (input2.cliType === "builtin") {
-      if (builtinTypeSet.has(input2.agentType)) {
+      if (isBuiltinAgentType(input2.agentType)) {
         const setting = BuiltinACPSetting[input2.agentType];
         return `${setting.packageName}@${setting.version}`;
       }
@@ -127821,11 +128013,16 @@ ${error2.message}` : execaMessage;
       };
     }
     if (agent.distribution.npx?.package) {
+      const npxDistribution = agent.distribution.npx;
+      const packageSpec = resolveRegistryNpxPackage(npxDistribution);
       const args2 = [
+        ...npxDistribution.registry ? [
+          `--registry=${npxDistribution.registry}`
+        ] : [],
         NPX_CACHE_MODE_ARG,
         "-y",
-        agent.distribution.npx.package,
-        ...agent.distribution.npx.args ?? []
+        packageSpec,
+        ...npxDistribution.args ?? []
       ];
       return {
         status: {
@@ -127835,7 +128032,7 @@ ${error2.message}` : execaMessage;
         exec: {
           command: "npx",
           args: args2,
-          env: agent.distribution.npx.env
+          env: npxDistribution.env
         }
       };
     }
@@ -131541,6 +131738,9 @@ ${exitStatus.output}` : `Worktree ${options.phase} failed at command "${stepComm
     }
     return out;
   }
+  function shouldScrubClaudeAuthEnv(cliType, agentType) {
+    return cliType === "builtin" && agentType === "claude" || cliType === "registry" && agentType === "claude-p";
+  }
   function isSelectGroup(item) {
     return typeof item === "object" && item !== null && "group" in item;
   }
@@ -131596,7 +131796,7 @@ ${exitStatus.output}` : `Worktree ${options.phase} failed at command "${stepComm
       ...process.env,
       ...env2
     } : process.env;
-    const probeEnv = cliType === "builtin" && agentType === "claude" && env2 ? scrubInheritedClaudeAuthEnv(mergedProbeEnv, env2) : mergedProbeEnv;
+    const probeEnv = shouldScrubClaudeAuthEnv(cliType, agentType) && env2 ? scrubInheritedClaudeAuthEnv(mergedProbeEnv, env2) : mergedProbeEnv;
     let capturedCommands;
     let commandsResolve;
     const commandsPromise = new Promise((resolve2) => {
@@ -132035,23 +132235,12 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
       "diff",
       "--numstat",
       "--no-renames",
-      mergeBase
+      mergeBase,
+      "HEAD"
     ]);
     const baseDiff = parseGitNumstat(baseNumstat);
-    const trackedBasePaths = new Set(baseDiff.map((diff2) => diff2.filePath));
-    const untrackedPaths = (await listUntrackedFiles(runGit)).filter((filePath) => !trackedBasePaths.has(filePath));
-    const untrackedFileDiff = await buildUntrackedFileDiffs(untrackedPaths, options?.countWorkingTreeFileLines);
-    const baseDiffWithUntracked = [
-      ...baseDiff,
-      ...untrackedFileDiff
-    ];
-    const untrackedFileDiffByPath = new Map(untrackedFileDiff.map((diff2) => [
-      diff2.filePath,
-      diff2
-    ]));
     const baseDiffStats = {
-      allChange: sumLineChange(baseDiffWithUntracked),
-      files: baseDiffWithUntracked
+      allChange: sumLineChange(baseDiff)
     };
     let commitFileDiff;
     if (options?.baseCommitHash) {
@@ -132075,6 +132264,12 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
         });
       }
       const commitFileDiffPaths = new Set(commitFileDiff.map((diff2) => diff2.filePath));
+      const untrackedPaths = await listUntrackedFiles(runGit);
+      const untrackedFileDiff = await buildUntrackedFileDiffs(untrackedPaths, options?.countWorkingTreeFileLines);
+      const untrackedFileDiffByPath = new Map(untrackedFileDiff.map((diff2) => [
+        diff2.filePath,
+        diff2
+      ]));
       let turnUntrackedPaths = untrackedPaths.filter((filePath) => !commitFileDiffPaths.has(filePath));
       if (turnStartWorkingTreeDiff && turnUntrackedPaths.length > 0) {
         const currentHashes = await hashObjectPaths(runGit, turnUntrackedPaths);
@@ -133030,9 +133225,13 @@ $mem | ConvertTo-Json -Compress
         this.deps.logger.warn(`[${sessionId}] Code Collab host skipped: session has no workspace directory`);
         return _void;
       }
-      this.deps.logger.debug(`[${sessionId}] Code Collab host start requested by agent turn workspaceRoot=${workspaceRoot}`);
+      const hostSessionId = session.getParentSessionId();
+      this.deps.logger.debug(`[${sessionId}] Code Collab host start requested by agent turn workspaceRoot=${workspaceRoot}${hostSessionId === void 0 ? "" : ` host=${hostSessionId}`}`);
       return this.tryPromise(() => startCodeCollabHost({
         sessionId,
+        ...hostSessionId === void 0 ? {} : {
+          hostSessionId
+        },
         workspaceRoot,
         project
       }));
@@ -133181,7 +133380,13 @@ $mem | ConvertTo-Json -Compress
           turnId: options.turnId,
           session: runtime?.session ?? options.session ?? null,
           baseCommitHash: runtime?.baseCommitHash ?? null,
-          fileDiff: markerResult?.fileDiff
+          fileDiff: markerResult?.fileDiff,
+          ...markerResult?.allChangesFileDiff === void 0 ? {} : {
+            allChangesFileDiff: markerResult.allChangesFileDiff
+          },
+          ...runtime?.project === void 0 ? {} : {
+            project: runtime.project
+          }
         })));
       }).pipe(ensuring(sync(() => {
         self2.clearTurnCancellation(options.sessionId, options.turnId);
@@ -133268,7 +133473,13 @@ $mem | ConvertTo-Json -Compress
           turnId: options.runtime.turnId,
           session: options.runtime.session ?? null,
           baseCommitHash: options.runtime.baseCommitHash ?? null,
-          fileDiff: failedMarkerResult?.fileDiff
+          fileDiff: failedMarkerResult?.fileDiff,
+          ...failedMarkerResult?.allChangesFileDiff === void 0 ? {} : {
+            allChangesFileDiff: failedMarkerResult.allChangesFileDiff
+          },
+          ...options.runtime.project === void 0 ? {} : {
+            project: options.runtime.project
+          }
         });
       } catch (persistError) {
         this.deps.logger.warn(`[${options.sessionId}] Failed to persist Code Collab fileDiff for failed turn: ${formatErrorMessage$1(persistError)}`);
@@ -133283,7 +133494,10 @@ $mem | ConvertTo-Json -Compress
           sessionId: options.sessionId,
           sessionDoc: options.sessionDoc,
           turnId: options.turnId,
-          fileDiff: markerResult?.fileDiff
+          fileDiff: markerResult?.fileDiff,
+          ...markerResult?.allChangesFileDiff === void 0 ? {} : {
+            allChangesFileDiff: markerResult.allChangesFileDiff
+          }
         });
         await this.handleTurnError(options.sessionId, options.sessionDoc);
       } catch (error2) {
@@ -133414,40 +133628,68 @@ $mem | ConvertTo-Json -Compress
       if (await stopIfTurnCancelled("ACP finalization")) {
         return;
       }
-      if (resolveProjectGitHubRepo(project)) {
-        const branchName = await this.deps.turnFinalization.syncSessionBranchName(sessionId, session);
+      const githubProject = resolveProjectGitHubRepo(project);
+      let branchName = null;
+      let preferredStatsBaseBranch = project?.branch;
+      if (githubProject) {
+        branchName = await this.deps.turnFinalization.syncSessionBranchName(sessionId, session);
         if (await stopIfTurnCancelled("branch synchronization")) {
           return;
         }
-        await this.deps.turnFinalization.updateSessionDiffStats(sessionId, session, {
-          turnId,
-          baseCommitHash: baseCommitHash ?? void 0,
-          turnStartWorkingTreeDiff,
-          preferredBaseBranch: project?.branch
-        });
-        if (await stopIfTurnCancelled("diff recording")) {
-          return;
-        }
         try {
-          await this.deps.turnFinalization.detectAndAssociatePR({
+          const detectedPr = await this.deps.turnFinalization.detectAndAssociatePR({
             sessionId,
             session,
             sessionDoc,
             project,
             branchName
           });
+          preferredStatsBaseBranch = detectedPr?.baseBranch ?? preferredStatsBaseBranch;
         } catch (error2) {
           this.deps.logger.debug(`[${sessionId}] PR detection failed: ${formatErrorMessage$1(error2)}`);
         }
         if (await stopIfTurnCancelled("PR detection")) {
           return;
         }
+        await this.deps.turnFinalization.updateSessionDiffStats(sessionId, session, {
+          turnId,
+          baseCommitHash: baseCommitHash ?? void 0,
+          turnStartWorkingTreeDiff,
+          preferredBaseBranch: preferredStatsBaseBranch
+        });
+        if (await stopIfTurnCancelled("diff recording")) {
+          return;
+        }
+      }
+      const codeCollabTurnMarkerResult = await runPromise(this.recordCodeCollabTurnMarkerEffect(sessionId, turnId, "turn:end", project, {
+        baseCommitHash,
+        turnStartWorkingTreeDiff
+      }));
+      await this.persistCodeCollabFileDiffForTurn({
+        sessionId,
+        sessionDoc,
+        turnId,
+        session,
+        baseCommitHash,
+        fileDiff: codeCollabTurnMarkerResult?.fileDiff,
+        ...codeCollabTurnMarkerResult?.allChangesFileDiff === void 0 ? {} : {
+          allChangesFileDiff: codeCollabTurnMarkerResult.allChangesFileDiff
+        },
+        ...project === void 0 ? {} : {
+          project
+        }
+      });
+      if (await stopIfTurnCancelled("Code Collab diff recording")) {
+        return;
+      }
+      if (githubProject) {
         try {
           await this.deps.turnFinalization.autoCommitAndPushForPR({
             sessionId,
             session,
             sessionDoc,
             project,
+            preferredBaseBranch: preferredStatsBaseBranch,
             userId,
             isTurnCancelled,
             abortSignal: ctx.abortSignal,
@@ -133466,18 +133708,6 @@ $mem | ConvertTo-Json -Compress
       this.captureStatusChanged(sessionId, "idle", void 0, "turn_completed");
       await this.captureTurnCompleted(sessionId, sessionDoc, turnId);
       this.deps.logger.info(`Session chat completed: ${sessionId}`);
-      const codeCollabTurnMarkerResult = await runPromise(this.recordCodeCollabTurnMarkerEffect(sessionId, turnId, "turn:end", project, {
-        baseCommitHash,
-        turnStartWorkingTreeDiff
-      }));
-      await this.persistCodeCollabFileDiffForTurn({
-        sessionId,
-        sessionDoc,
-        turnId,
-        session,
-        baseCommitHash,
-        fileDiff: codeCollabTurnMarkerResult?.fileDiff
-      });
       try {
         await sessionDoc.setLastMessageAt();
       } catch (error2) {
@@ -133505,18 +133735,14 @@ $mem | ConvertTo-Json -Compress
         }
         const currentMeta = current2?.meta;
         const currentDiffStats = currentMeta?.diffStats ?? (targetSessionId === sessionId ? meta?.diffStats : void 0);
-        const currentFiles = currentDiffStats?.files ?? [];
         const currentAllChange = currentDiffStats?.allChange;
-        const hasExistingStats = currentFiles.length > 0 || (currentAllChange?.add ?? 0) !== 0 || (currentAllChange?.del ?? 0) !== 0;
+        const hasExistingStats = (currentAllChange?.add ?? 0) !== 0 || (currentAllChange?.del ?? 0) !== 0;
         if (hasExistingStats) {
           return;
         }
         await this.deps.workspaceDocument.repo.upsertDocMeta(targetRoomId, {
           diffStats: {
-            allChange: sumLineChange(fileDiff),
-            files: [
-              ...fileDiff
-            ]
+            allChange: sumLineChange(fileDiff)
           }
         });
       } catch (error2) {
@@ -133551,14 +133777,38 @@ $mem | ConvertTo-Json -Compress
     }
     async persistCodeCollabFileDiffForTurn(options) {
       const fileDiff = options.fileDiff ?? [];
-      if (fileDiff.length === 0) {
+      let normalizedCodeCollabFileDiff = [];
+      if (fileDiff.length > 0) {
+        normalizedCodeCollabFileDiff = options.session === void 0 || options.session === null ? [
+          ...fileDiff
+        ] : await this.normalizeCodeCollabFileDiffLineStats(options.session, options.baseCommitHash ?? null, fileDiff);
+        options.sessionDoc.setLatestAssistantHistoryFileDiff(normalizedCodeCollabFileDiff, options.turnId);
+      }
+      if (options.allChangesFileDiff !== void 0 && !resolveProjectGitHubRepo(options.project)) {
+        await this.upsertDiffStatsFromCodeCollabAllChanges(options.sessionId, options.sessionDoc, options.allChangesFileDiff);
         return;
       }
-      const normalizedCodeCollabFileDiff = options.session === void 0 || options.session === null ? [
-        ...fileDiff
-      ] : await this.normalizeCodeCollabFileDiffLineStats(options.session, options.baseCommitHash ?? null, fileDiff);
-      options.sessionDoc.setLatestAssistantHistoryFileDiff(normalizedCodeCollabFileDiff, options.turnId);
-      await this.upsertMissingDiffStatsFromCodeCollabFileDiff(options.sessionId, options.sessionDoc, normalizedCodeCollabFileDiff);
+      if (normalizedCodeCollabFileDiff.length > 0) {
+        await this.upsertMissingDiffStatsFromCodeCollabFileDiff(options.sessionId, options.sessionDoc, normalizedCodeCollabFileDiff);
+      }
+    }
+    async upsertDiffStatsFromCodeCollabAllChanges(sessionId, sessionDoc, allChangesFileDiff) {
+      try {
+        const meta = await sessionDoc.getMetaState();
+        const targetSessionId = meta?.parentSessionId ?? sessionId;
+        const targetRoomId = getSessionRoomId(targetSessionId);
+        const current2 = await this.deps.workspaceDocument.repo.getDocMeta(targetRoomId);
+        if (isLoroRepoDocDeleted(current2)) {
+          return;
+        }
+        await this.deps.workspaceDocument.repo.upsertDocMeta(targetRoomId, {
+          diffStats: {
+            allChange: sumLineChange(allChangesFileDiff)
+          }
+        });
+      } catch (error2) {
+        this.deps.logger.debug(`[${sessionId}] Failed to persist session diffStats from Code Collab All Changes: ${formatErrorMessage$1(error2)}`);
+      }
     }
     async isFileMissingAtGitBase(session, options) {
       if (!options.baseCommitHash) {
@@ -133750,7 +134000,8 @@ $mem | ConvertTo-Json -Compress
       await this.setUserTurnStatus(sessionDoc, userTurnId, "processing");
       await this.upsertSessionMeta(sessionId, {
         latestUserMsgId: userTurnId,
-        processingUserMsgId: userTurnId
+        processingUserMsgId: userTurnId,
+        lastMissingHistoryUserMsgId: void 0
       });
     }
     async clearDispatchProcessing(sessionId) {
@@ -133814,7 +134065,8 @@ $mem | ConvertTo-Json -Compress
       await this.upsertSessionMeta(sessionId, {
         latestUserMsgId: this.resolveLatestUserMsgIdForTerminalTurn(existingMeta, userTurnId),
         lastHandledUserMsgId: userTurnId,
-        processingUserMsgId: void 0
+        processingUserMsgId: void 0,
+        lastMissingHistoryUserMsgId: void 0
       });
     }
     async markTurnFailed(sessionId, sessionDoc, userTurnId) {
@@ -133823,7 +134075,8 @@ $mem | ConvertTo-Json -Compress
       await this.upsertSessionMeta(sessionId, {
         latestUserMsgId: this.resolveLatestUserMsgIdForTerminalTurn(existingMeta, userTurnId),
         lastHandledUserMsgId: userTurnId,
-        processingUserMsgId: void 0
+        processingUserMsgId: void 0,
+        lastMissingHistoryUserMsgId: void 0
       });
     }
     resolveGitHubProjectBranch(meta, preferredBranch) {
@@ -135099,6 +135352,9 @@ $mem | ConvertTo-Json -Compress
       if (meta.lastGoalCommand?.id && meta.lastGoalCommand.id !== this.goalCommandSeenId.get(meta.id)) {
         return true;
       }
+      if (meta.lastMissingHistoryUserMsgId && !meta.latestUserMsgId) {
+        return false;
+      }
       if (!meta.lastHandledUserMsgId) {
         return true;
       }
@@ -135126,7 +135382,7 @@ $mem | ConvertTo-Json -Compress
       const nextUserTurn = await this.findOrAwaitDispatchableTurn(sessionId, sessionDoc, meta);
       if (!nextUserTurn) {
         if (this.hasPendingUserTurnSignal(meta)) {
-          await this.markMissingUserTurnRecovery(sessionId, meta);
+          await this.markMissingUserTurnRecovery(sessionId, sessionDoc, meta);
         } else {
           await this.markMessageQueueSignalChecked(sessionDoc, meta);
         }
@@ -135258,7 +135514,8 @@ $mem | ConvertTo-Json -Compress
       await this.deps.workspaceDocument.repo.upsertDocMeta?.(getSessionRoomId(sessionId), {
         latestUserMsgId: userTurnId,
         lastHandledUserMsgId: userTurnId,
-        processingUserMsgId: void 0
+        processingUserMsgId: void 0,
+        lastMissingHistoryUserMsgId: void 0
       });
       await sessionDoc.setStatus(SessionStatusFactory.idle());
       await this.deps.recordChatFailure?.(sessionDoc, "machine_access_denied", message);
@@ -135579,7 +135836,7 @@ $mem | ConvertTo-Json -Compress
         }
       });
     }
-    async markMissingUserTurnRecovery(sessionId, previousMeta) {
+    async markMissingUserTurnRecovery(sessionId, sessionDoc, previousMeta) {
       const roomId = getSessionRoomId(sessionId);
       let meta = previousMeta;
       try {
@@ -135596,13 +135853,20 @@ $mem | ConvertTo-Json -Compress
       const pendingUserMsgId = meta.processingUserMsgId ?? meta.latestUserMsgId ?? meta.lastHandledUserMsgId;
       const recoveryPatch = {
         status: SessionStatusFactory.idle(),
+        latestUserMsgId: void 0,
         processingUserMsgId: void 0
       };
       if (pendingUserMsgId) {
-        recoveryPatch.lastHandledUserMsgId = pendingUserMsgId;
-        recoveryPatch.latestUserMsgId = pendingUserMsgId;
+        recoveryPatch.lastMissingHistoryUserMsgId = pendingUserMsgId;
       }
       await this.deps.workspaceDocument.repo.upsertDocMeta?.(roomId, recoveryPatch);
+      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.");
+        } catch (error2) {
+          this.deps.logger.debug(`[${sessionId}] Failed to record missing-history delivery failure: ${formatErrorMessage$1(error2)}`);
+        }
+      }
       const watched = this.watchedSessions.get(sessionId);
       watched?.unsubscribe();
       this.watchedSessions.delete(sessionId);
@@ -135729,7 +135993,8 @@ $mem | ConvertTo-Json -Compress
       "CLOSED",
       "MERGED"
     ]),
-    headRefName: string$1()
+    headRefName: string$1(),
+    baseRefName: string$1()
   });
   const GhPrListSchema = array$2(GhPrListItemSchema);
   async function detectPullRequestForBranch(options) {
@@ -135746,7 +136011,7 @@ $mem | ConvertTo-Json -Compress
         "--head",
         branchName,
         "--json",
-        "number,url,state,headRefName",
+        "number,url,state,headRefName,baseRefName",
         "--limit",
         "5"
       ], workdir, false);
@@ -135772,6 +136037,7 @@ $mem | ConvertTo-Json -Compress
         prNumber: pr.number,
         prUrl: pr.url,
         branch: branchName,
+        baseBranch: pr.baseRefName,
         status
       };
     } catch (error2) {
@@ -135838,8 +136104,7 @@ $mem | ConvertTo-Json -Compress
         allChange: {
           add: 0,
           del: 0
-        },
-        files: []
+        }
       };
       try {
         const preferredBaseBranch = resolveBaseBranchPreference({
@@ -135889,11 +136154,7 @@ $mem | ConvertTo-Json -Compress
       const { sessionId, session, sessionDoc, project, branchName } = ctx;
       const githubRepo = resolveProjectGitHubRepo(project);
       if (!githubRepo) {
-        return;
-      }
-      const workspace = await this.resolveWorkspaceSessionContext(sessionId, sessionDoc);
-      if (workspace.pullRequests.some((pr) => pr.status === "open")) {
-        return;
+        return null;
       }
       const workdir = session.getWorkdir();
       const detected = await detectPullRequestForBranch({
@@ -135903,8 +136164,15 @@ $mem | ConvertTo-Json -Compress
         branchName: branchName ?? void 0,
         logger: this.deps.logger
       });
-      if (!detected || !this.deps.authBaseUrl) {
-        return;
+      if (!detected) {
+        return null;
+      }
+      const workspace = await this.resolveWorkspaceSessionContext(sessionId, sessionDoc);
+      if (workspace.pullRequests.some((pr) => pr.status === "open")) {
+        return detected;
+      }
+      if (!this.deps.authBaseUrl) {
+        return detected;
       }
       try {
         const actionUrl = new URL("/api/action", this.deps.authBaseUrl).toString();
@@ -135931,12 +136199,12 @@ $mem | ConvertTo-Json -Compress
         if (!res.ok) {
           const text = await res.text().catch(() => "");
           this.deps.logger.debug(`[${sessionId}] PR association backend call failed (${res.status}): ${text || "no body"}`);
-          return;
+          return detected;
         }
         this.deps.logger.debug(`[${sessionId}] Associated PR #${detected.prNumber} with session`);
       } catch (error2) {
         this.deps.logger.debug(`[${sessionId}] PR association backend call failed: ${formatErrorMessage$1(error2)}`);
-        return;
+        return detected;
       }
       const reportedAt = (/* @__PURE__ */ new Date()).toISOString();
       try {
@@ -135951,6 +136219,7 @@ $mem | ConvertTo-Json -Compress
       } catch (error2) {
         this.deps.logger.debug(`[${sessionId}] Failed to write PR to local doc: ${formatErrorMessage$1(error2)}`);
       }
+      return detected;
     }
     async autoCommitAndPushForPR(ctx) {
       const { sessionId, session, sessionDoc, project } = ctx;
@@ -135969,6 +136238,7 @@ $mem | ConvertTo-Json -Compress
       if (workspace.pullRequests.length === 0) {
         return;
       }
+      const preferredBaseBranch = ctx.preferredBaseBranch ?? project?.branch;
       const workdir = session.getWorkdir();
       const runGit = (args2) => session.exec("git", args2, workdir, false);
       for (let attempt = 0; attempt < 2; attempt++) {
@@ -136006,7 +136276,7 @@ $mem | ConvertTo-Json -Compress
             turnId: result.turnId,
             baseCommitHash: result.baseCommitHash ?? void 0,
             turnStartWorkingTreeDiff: result.turnStartWorkingTreeDiff,
-            preferredBaseBranch: project?.branch
+            preferredBaseBranch
           });
         } catch (error2) {
           if (shouldStop("commit prompt failure")) {
@@ -136051,7 +136321,7 @@ $mem | ConvertTo-Json -Compress
             turnId: result.turnId,
             baseCommitHash: result.baseCommitHash ?? void 0,
             turnStartWorkingTreeDiff: result.turnStartWorkingTreeDiff,
-            preferredBaseBranch: project?.branch
+            preferredBaseBranch
           });
         } catch (error2) {
           if (shouldStop("push prompt failure")) {
@@ -141278,7 +141548,6 @@ $mem | ConvertTo-Json -Compress
     return parseFileId(key2).fileId;
   }
   function normalizeCurrentChangeValue(value) {
-    if (value === true) return true;
     if (!value || typeof value !== "object" || Array.isArray(value)) return void 0;
     const record2 = value;
     const a = parseOptionalLineCount(record2.a);
@@ -141308,7 +141577,7 @@ $mem | ConvertTo-Json -Compress
         n: true
       } : {}
     };
-    return Object.keys(normalized).length === 0 ? true : normalized;
+    return Object.keys(normalized).length === 0 ? void 0 : normalized;
   }
   function parseOptionalOpId(value) {
     if (typeof value !== "string" || !/^\d+:\d+$/u.test(value)) return void 0;
@@ -142402,7 +142671,8 @@ $mem | ConvertTo-Json -Compress
       "diff",
       "--numstat",
       "--no-renames",
-      stats.mergeBase
+      stats.mergeBase,
+      "HEAD"
     ]));
     const tracked = await Promise.all(trackedFileDiffs.map(async (fileDiff) => {
       const baseText = await readGitTextAtMergeBase(runGit, stats.mergeBase, fileDiff.filePath);
@@ -142447,17 +142717,7 @@ $mem | ConvertTo-Json -Compress
         }
       };
     }));
-    const trackedPaths = new Set(trackedFileDiffs.map((file2) => file2.filePath));
-    const untracked = (await listUntrackedFiles(runGit)).filter((filePath) => !trackedPaths.has(filePath)).map((filePath) => ({
-      path: filePath,
-      base: {
-        status: "missing"
-      }
-    }));
-    return [
-      ...tracked,
-      ...untracked
-    ];
+    return tracked;
   }
   class TurnFileChangeTracker {
     #base = /* @__PURE__ */ new Map();
@@ -143607,7 +143867,7 @@ $mem | ConvertTo-Json -Compress
         await m.__tla;
         return m;
       }),
-      import("./chunks/index-Dv4vvpJo.js").then(async (m) => {
+      import("./chunks/index-Dr2JkTB2.js").then(async (m) => {
         await m.__tla;
         return m;
       })
@@ -143634,6 +143894,7 @@ $mem | ConvertTo-Json -Compress
         host: input2.host
       }),
       computeHostTurnChanges: async (input2) => await codeCollab.computeHostTurnChanges(input2),
+      computeHostTurnFileDiff: async (input2) => await codeCollab.computeHostTurnFileDiff(input2),
       publishHostCurrentChanges: async (input2) => await codeCollab.publishHostCurrentChanges(input2)
     };
   }
@@ -144376,16 +144637,41 @@ parentPort.on('message', (message) => {
     lastActivityAtMs = /* @__PURE__ */ new Map();
     idleTimers = /* @__PURE__ */ new Map();
     pendingWorkCounts = /* @__PURE__ */ new Map();
+    pendingWorkWaiters = /* @__PURE__ */ new Map();
     hostStreamsTokenCache = /* @__PURE__ */ new Map();
     hostStreamsTokenInFlight = /* @__PURE__ */ new Map();
     bootstrapSecretCache = /* @__PURE__ */ new Map();
     disabledLogged = false;
+    hostSessionAliases = /* @__PURE__ */ new Map();
+    publishCurrentChangesTails = /* @__PURE__ */ new Map();
     codeCollabTurnTrackers = /* @__PURE__ */ new Map();
     activeCodeCollabTurnTrackers = /* @__PURE__ */ new Map();
     turnHistoryLineStatsWorkerPool;
     initialTextSnapshotWorkerPool;
     textUpdateWorkerPool;
     textFrontierCheckoutWorkerPool;
+    resolveHostSessionId(sessionId) {
+      return this.hostSessionAliases.get(sessionId) ?? sessionId;
+    }
+    registerHostSessionAlias(sessionId, hostSessionId) {
+      if (hostSessionId === void 0 || hostSessionId === sessionId) {
+        return this.resolveHostSessionId(sessionId);
+      }
+      if (this.hostSessionAliases.get(sessionId) !== hostSessionId) {
+        this.hostSessionAliases.set(sessionId, hostSessionId);
+        this.hostStates.delete(sessionId);
+      }
+      return hostSessionId;
+    }
+    sessionIdsOnHost(hostSessionId) {
+      const ids2 = [
+        hostSessionId
+      ];
+      for (const [sessionId, host] of this.hostSessionAliases) {
+        if (host === hostSessionId) ids2.push(sessionId);
+      }
+      return ids2;
+    }
     recordAgentFileWrite(sessionId, filePath, oldContent, newContent) {
       if (!this.config.cliConfig.enabled) return;
       const normalizedFilePath = this.normalizeSessionWritePath(sessionId, filePath);
@@ -144468,10 +144754,11 @@ parentPort.on('message', (message) => {
       }
     }
     sessionTracker(sessionId) {
-      let tracker = this.codeCollabTurnTrackers.get(sessionId);
+      const hostSessionId = this.resolveHostSessionId(sessionId);
+      let tracker = this.codeCollabTurnTrackers.get(hostSessionId);
       if (tracker === void 0) {
         tracker = new TurnFileChangeTracker();
-        this.codeCollabTurnTrackers.set(sessionId, tracker);
+        this.codeCollabTurnTrackers.set(hostSessionId, tracker);
       }
       return tracker;
     }
@@ -144521,10 +144808,15 @@ parentPort.on('message', (message) => {
       if (!record2 || record2.type !== "file_changed") return;
       const filePath = normalizeWatchedTurnPath(record2.path);
       if (filePath === void 0) return;
-      const activeTurn = this.activeCodeCollabTurnTrackers.get(sessionId);
-      if (activeTurn === void 0) return;
-      const bases = this.turnSnapshotTextBases.get(turnSnapshotKey(sessionId, activeTurn.turnId));
-      const oldText = bases?.get(filePath);
+      const hostSessionId = this.resolveHostSessionId(sessionId);
+      let oldText;
+      for (const candidateSessionId of this.sessionIdsOnHost(hostSessionId)) {
+        const activeTurn = this.activeCodeCollabTurnTrackers.get(candidateSessionId);
+        if (activeTurn === void 0) continue;
+        const bases = this.turnSnapshotTextBases.get(turnSnapshotKey(candidateSessionId, activeTurn.turnId));
+        oldText = bases?.get(filePath);
+        if (oldText !== void 0) break;
+      }
       if (oldText === void 0) return;
       const normalized = this.normalizeSessionWritePath(sessionId, filePath);
       if (normalized === void 0) return;
@@ -144543,6 +144835,15 @@ parentPort.on('message', (message) => {
           reason: this.config.cliConfig.reason
         };
       }
+      if (input2.hostSessionId !== void 0 && input2.hostSessionId !== input2.sessionId) {
+        this.registerHostSessionAlias(input2.sessionId, input2.hostSessionId);
+        this.logCodeCollabDebug(`[${input2.sessionId}] Code Collab host start aliased to parent host=${input2.hostSessionId}`);
+        const { hostSessionId, sessionId: _childSessionId, ...rest } = input2;
+        return await this.startForSession({
+          ...rest,
+          sessionId: hostSessionId
+        });
+      }
       const existing = this.activeHosts.get(input2.sessionId);
       if (existing) {
         this.touchActivity(input2.sessionId);
@@ -144568,6 +144869,22 @@ parentPort.on('message', (message) => {
       return await start2;
     }
     stopSession(sessionId, reason = "session stopped") {
+      const aliasedHostSessionId = this.hostSessionAliases.get(sessionId);
+      if (aliasedHostSessionId !== void 0 && aliasedHostSessionId !== sessionId) {
+        this.hostSessionAliases.delete(sessionId);
+        this.activeCodeCollabTurnTrackers.delete(sessionId);
+        this.clearTurnSnapshotsForSession(sessionId);
+        this.hostStates.delete(sessionId);
+        this.logCodeCollabDebug(`[${sessionId}] Code Collab child session detached from host=${aliasedHostSessionId} (${reason})`);
+        return;
+      }
+      for (const childSessionId of this.sessionIdsOnHost(sessionId)) {
+        if (childSessionId === sessionId) continue;
+        this.hostSessionAliases.delete(childSessionId);
+        this.activeCodeCollabTurnTrackers.delete(childSessionId);
+        this.clearTurnSnapshotsForSession(childSessionId);
+        this.hostStates.delete(childSessionId);
+      }
       this.clearIdleTimer(sessionId);
       if (this.startInFlight.has(sessionId)) {
         this.stopRequestedWhileStarting.set(sessionId, reason);
@@ -144591,7 +144908,7 @@ parentPort.on('message', (message) => {
       this.activeCodeCollabTurnTrackers.delete(sessionId);
       this.clearTurnSnapshotsForSession(sessionId);
       this.lastActivityAtMs.delete(sessionId);
-      this.pendingWorkCounts.delete(sessionId);
+      this.clearPendingWork(sessionId);
       this.disposeTurnHistoryLineStatsWorkerPoolIfIdle();
       try {
         host.running.stop();
@@ -144636,7 +144953,7 @@ parentPort.on('message', (message) => {
       ];
     }
     getSessionState(sessionId) {
-      const state2 = this.hostStates.get(sessionId);
+      const state2 = this.hostStates.get(sessionId) ?? this.hostStates.get(this.resolveHostSessionId(sessionId));
       if (state2) {
         return state2;
       }
@@ -144651,6 +144968,17 @@ parentPort.on('message', (message) => {
         status: "idle"
       };
     }
+    async waitForPendingWork(sessionId) {
+      const hostSessionId = this.resolveHostSessionId(sessionId);
+      if ((this.pendingWorkCounts.get(hostSessionId) ?? 0) === 0) {
+        return;
+      }
+      await new Promise((resolve2) => {
+        const waiters = this.pendingWorkWaiters.get(hostSessionId) ?? /* @__PURE__ */ new Set();
+        waiters.add(resolve2);
+        this.pendingWorkWaiters.set(hostSessionId, waiters);
+      });
+    }
     prefetchWorkspaceHostStreamsToken() {
       const cliConfig = this.config.cliConfig;
       if (!cliConfig.enabled) {
@@ -144677,7 +145005,7 @@ parentPort.on('message', (message) => {
         this.logDisabledOnce();
         throw new Error(`Code Collab host disabled: ${this.config.cliConfig.message}`);
       }
-      const host = this.activeHosts.get(input2.sessionId);
+      const host = this.activeHosts.get(this.resolveHostSessionId(input2.sessionId));
       if (!host?.running) {
         throw new Error("Code Collab host runtime is not online for this session.");
       }
@@ -144714,9 +145042,10 @@ parentPort.on('message', (message) => {
           reason: this.config.cliConfig.reason
         };
       }
-      const host = this.activeHosts.get(input2.sessionId);
+      const hostSessionId = this.registerHostSessionAlias(input2.sessionId, input2.hostSessionId);
+      const host = this.activeHosts.get(hostSessionId);
       if (host?.running.runtime === void 0) {
-        this.logCodeCollabDebug(`[${input2.sessionId}] Code Collab turn marker skipped: no active host phase=${input2.phase} turn=${input2.turnId}`);
+        this.logCodeCollabDebug(`[${input2.sessionId}] Code Collab turn marker skipped: no active host host=${hostSessionId} phase=${input2.phase} turn=${input2.turnId}`);
         return {
           status: "no-host"
         };
@@ -144726,7 +145055,7 @@ parentPort.on('message', (message) => {
         const runtime = await (this.config.runtimeLoader ?? loadLodyCodeCollabRuntime)();
         const backend = this.createBackend();
         const getHostToken = async () => await runPromise(backend.getStreamsToken({
-          sessionId: input2.sessionId,
+          sessionId: hostSessionId,
           requestedRole: "host"
         }));
         const auth = async () => {
@@ -144749,6 +145078,7 @@ parentPort.on('message', (message) => {
         if (computeHostTurnChanges === void 0) {
           throw new Error(`[${input2.sessionId}] Code Collab runtime is missing computeHostTurnChanges; turn-history fallback has been removed`);
         }
+        const computeHostTurnFileDiff = runtime.computeHostTurnFileDiff;
         if (input2.phase === "turn:start") {
           const snapshot = await runtime.snapshotHostTurnHistoryFiles({
             host: host.running
@@ -144779,27 +145109,52 @@ parentPort.on('message', (message) => {
           }
         }
         const capture2 = await this.buildTurnCapture(input2.phase, input2.turnId, input2.sessionId, input2.capture, input2.baseCommitHash, input2.turnStartWorkingTreeDiff);
+        const isTerminalMarker = isTerminalLodyCodeCollabTurnMarkerPhase(input2.phase);
         let changedFilesResult;
+        let currentChangesPublishDeferred = false;
         try {
-          changedFilesResult = await this.computeTurnChangesForSessionHistory({
-            computeHostTurnChanges,
-            host: host.running,
-            input: input2,
-            baseFiles,
-            capture: capture2,
-            auth,
-            blobAuth
-          });
+          if (isTerminalMarker && computeHostTurnFileDiff !== void 0) {
+            changedFilesResult = await this.computeTurnFileDiffForSessionHistory({
+              computeHostTurnFileDiff,
+              host: host.running,
+              input: input2,
+              baseFiles,
+              capture: capture2,
+              auth,
+              blobAuth
+            });
+            currentChangesPublishDeferred = true;
+            this.publishCodeCollabCurrentChangesInBackground({
+              runtime,
+              computeHostTurnChanges,
+              host: host.running,
+              input: input2,
+              baseFiles,
+              capture: capture2,
+              auth,
+              blobAuth
+            });
+          } else {
+            changedFilesResult = await this.computeTurnChangesForSessionHistory({
+              computeHostTurnChanges,
+              host: host.running,
+              input: input2,
+              baseFiles,
+              capture: capture2,
+              auth,
+              blobAuth
+            });
+          }
         } finally {
           if (snapshotKeyToClear !== void 0) {
             this.turnSnapshots.delete(snapshotKeyToClear);
             this.turnSnapshotTextBases.delete(snapshotKeyToClear);
           }
-          if (isTerminalLodyCodeCollabTurnMarkerPhase(input2.phase)) {
+          if (isTerminalMarker) {
             this.clearActiveTurnTracker(input2.sessionId, input2.turnId);
           }
         }
-        if (isTerminalLodyCodeCollabTurnMarkerPhase(input2.phase)) {
+        if (isTerminalMarker) {
           if (changedFilesResult.status === "recorded") {
             this.config.logger.debug(`[${input2.sessionId}] Code Collab changedFiles recorded turn=${input2.turnId}`);
           } else if (changedFilesResult.status === "failed") {
@@ -144809,21 +145164,24 @@ parentPort.on('message', (message) => {
         this.logCodeCollabDebug(`[${input2.sessionId}] Code Collab turn marker recorded phase=${input2.phase} turn=${input2.turnId}`);
         const turnChangedFiles = changedFilesResult.status === "recorded" ? changedFilesResult.result?.turnChangedFiles : void 0;
         const allChangedFiles = changedFilesResult.status === "recorded" ? changedFilesResult.result?.changedFiles : void 0;
-        if (isTerminalLodyCodeCollabTurnMarkerPhase(input2.phase) && runtime.publishHostCurrentChanges !== void 0) {
-          await runtime.publishHostCurrentChanges({
+        if (isTerminalMarker && runtime.publishHostCurrentChanges !== void 0 && !currentChangesPublishDeferred) {
+          await this.publishCodeCollabCurrentChanges({
+            sessionId: input2.sessionId,
+            runtime,
             host: host.running,
-            currentChanges: allChangedFiles === void 0 ? {} : currentChangesFromChangedFiles(allChangedFiles),
-            auth,
-            ...this.config.fetch === void 0 ? {} : {
-              fetch: this.config.fetch
-            }
+            allChangedFiles,
+            auth
           });
         }
         const fileDiff = turnChangedFiles === void 0 ? void 0 : fileDiffsFromChangedFiles(turnChangedFiles);
+        const allChangesFileDiff = allChangedFiles === void 0 ? void 0 : fileDiffsFromChangedFiles(allChangedFiles);
         return {
           status: "recorded",
           ...fileDiff === void 0 ? {} : {
             fileDiff
+          },
+          ...allChangesFileDiff === void 0 ? {} : {
+            allChangesFileDiff
           }
         };
       } catch (error2) {
@@ -144878,6 +145236,109 @@ parentPort.on('message', (message) => {
         };
       }
     }
+    async computeTurnFileDiffForSessionHistory(input2) {
+      if (!isTerminalLodyCodeCollabTurnMarkerPhase(input2.input.phase)) {
+        return {
+          status: "not_applicable"
+        };
+      }
+      const capturedTurnBases = input2.capture?.capturedTurnBases ?? [];
+      if (capturedTurnBases.length === 0) {
+        return {
+          status: "recorded",
+          result: {
+            turnChangedFiles: /* @__PURE__ */ new Map()
+          }
+        };
+      }
+      try {
+        const result = await input2.computeHostTurnFileDiff({
+          host: input2.host,
+          turnId: input2.input.turnId,
+          ...input2.baseFiles === void 0 ? {} : {
+            baseFiles: input2.baseFiles
+          },
+          capturedTurnBases,
+          auth: input2.auth,
+          blobAuth: input2.blobAuth,
+          ...this.config.fetch === void 0 ? {} : {
+            fetch: this.config.fetch
+          }
+        });
+        return {
+          status: "recorded",
+          result
+        };
+      } catch (error2) {
+        return {
+          status: "failed",
+          error: formatErrorMessage$1(error2)
+        };
+      }
+    }
+    async publishCodeCollabCurrentChanges(input2) {
+      const publishHostCurrentChanges = input2.runtime.publishHostCurrentChanges;
+      if (publishHostCurrentChanges === void 0) {
+        return;
+      }
+      const hostSessionId = this.resolveHostSessionId(input2.sessionId);
+      const tail2 = this.publishCurrentChangesTails.get(hostSessionId) ?? Promise.resolve();
+      const publish2 = tail2.catch(() => void 0).then(async () => {
+        await publishHostCurrentChanges({
+          host: input2.host,
+          currentChanges: input2.allChangedFiles === void 0 ? {} : currentChangesFromChangedFiles(input2.allChangedFiles),
+          auth: input2.auth,
+          ...this.config.fetch === void 0 ? {} : {
+            fetch: this.config.fetch
+          }
+        });
+      });
+      const tracked = publish2.catch(() => void 0).then(() => {
+        if (this.publishCurrentChangesTails.get(hostSessionId) === tracked) {
+          this.publishCurrentChangesTails.delete(hostSessionId);
+        }
+      });
+      this.publishCurrentChangesTails.set(hostSessionId, tracked);
+      await publish2;
+    }
+    publishCodeCollabCurrentChangesInBackground(input2) {
+      if (!isTerminalLodyCodeCollabTurnMarkerPhase(input2.input.phase) || input2.runtime.publishHostCurrentChanges === void 0) {
+        return;
+      }
+      this.beginPendingWork(input2.input.sessionId);
+      const allChangesCapture = input2.capture === void 0 ? void 0 : {
+        capturedBases: input2.capture.capturedBases
+      };
+      void (async () => {
+        try {
+          const changedFilesResult = await this.computeTurnChangesForSessionHistory({
+            computeHostTurnChanges: input2.computeHostTurnChanges,
+            host: input2.host,
+            input: input2.input,
+            baseFiles: input2.baseFiles,
+            capture: allChangesCapture,
+            auth: input2.auth,
+            blobAuth: input2.blobAuth
+          });
+          if (changedFilesResult.status === "failed") {
+            this.config.logger.warn(`[${input2.input.sessionId}] Failed to record Code Collab current changes turn=${input2.input.turnId}: ${changedFilesResult.error ?? "unknown error"}`);
+            return;
+          }
+          const allChangedFiles = changedFilesResult.status === "recorded" ? changedFilesResult.result?.changedFiles : void 0;
+          await this.publishCodeCollabCurrentChanges({
+            sessionId: input2.input.sessionId,
+            runtime: input2.runtime,
+            host: input2.host,
+            allChangedFiles,
+            auth: input2.auth
+          });
+        } catch (error2) {
+          this.config.logger.warn(`[${input2.input.sessionId}] Failed to publish Code Collab current changes turn=${input2.input.turnId}: ${formatErrorMessage$1(error2)}`);
+        } finally {
+          this.endPendingWork(input2.input.sessionId);
+        }
+      })();
+    }
     async buildTurnCapture(phase, turnId, sessionId, captureConfig, baseCommitHash, turnStartWorkingTreeDiff) {
       if (!isTerminalLodyCodeCollabTurnMarkerPhase(phase)) return void 0;
       const mode2 = captureConfig?.mode ?? "acp-tracked";
@@ -144903,7 +145364,7 @@ parentPort.on('message', (message) => {
           }
         }
       } else {
-        const tracker = this.codeCollabTurnTrackers.get(sessionId);
+        const tracker = this.codeCollabTurnTrackers.get(this.resolveHostSessionId(sessionId));
         capturedBases = tracker ? tracker.entries().map(([filePath, base]) => ({
           path: filePath,
           base: capturedBaseContentFromTracker(base)
@@ -145173,7 +145634,7 @@ parentPort.on('message', (message) => {
           this.activeHosts.delete(sessionId);
           this.clearIdleTimer(sessionId);
           this.lastActivityAtMs.delete(sessionId);
-          this.pendingWorkCounts.delete(sessionId);
+          this.clearPendingWork(sessionId);
           this.disposeTurnHistoryLineStatsWorkerPoolIfIdle();
           this.setSessionState(sessionId, {
             status: "stopped",
@@ -145187,7 +145648,7 @@ parentPort.on('message', (message) => {
           this.activeHosts.delete(sessionId);
           this.clearIdleTimer(sessionId);
           this.lastActivityAtMs.delete(sessionId);
-          this.pendingWorkCounts.delete(sessionId);
+          this.clearPendingWork(sessionId);
           this.disposeTurnHistoryLineStatsWorkerPoolIfIdle();
           this.setSessionState(sessionId, {
             status: "degraded",
@@ -145199,24 +145660,43 @@ parentPort.on('message', (message) => {
       });
     }
     beginPendingWork(sessionId) {
-      this.pendingWorkCounts.set(sessionId, (this.pendingWorkCounts.get(sessionId) ?? 0) + 1);
-      this.touchActivity(sessionId);
+      const hostSessionId = this.resolveHostSessionId(sessionId);
+      this.pendingWorkCounts.set(hostSessionId, (this.pendingWorkCounts.get(hostSessionId) ?? 0) + 1);
+      this.touchActivity(hostSessionId);
     }
     endPendingWork(sessionId) {
-      const next2 = Math.max(0, (this.pendingWorkCounts.get(sessionId) ?? 0) - 1);
+      const hostSessionId = this.resolveHostSessionId(sessionId);
+      const next2 = Math.max(0, (this.pendingWorkCounts.get(hostSessionId) ?? 0) - 1);
       if (next2 === 0) {
-        this.pendingWorkCounts.delete(sessionId);
+        this.pendingWorkCounts.delete(hostSessionId);
+        this.resolvePendingWorkWaiters(hostSessionId);
       } else {
-        this.pendingWorkCounts.set(sessionId, next2);
+        this.pendingWorkCounts.set(hostSessionId, next2);
+      }
+      this.touchActivity(hostSessionId);
+    }
+    clearPendingWork(sessionId) {
+      const hostSessionId = this.resolveHostSessionId(sessionId);
+      this.pendingWorkCounts.delete(hostSessionId);
+      this.resolvePendingWorkWaiters(hostSessionId);
+    }
+    resolvePendingWorkWaiters(sessionId) {
+      const waiters = this.pendingWorkWaiters.get(sessionId);
+      if (waiters === void 0) {
+        return;
+      }
+      this.pendingWorkWaiters.delete(sessionId);
+      for (const resolve2 of waiters) {
+        resolve2();
       }
-      this.touchActivity(sessionId);
     }
     touchActivity(sessionId, now2 = Date.now()) {
-      if (!this.activeHosts.has(sessionId)) {
+      const hostSessionId = this.resolveHostSessionId(sessionId);
+      if (!this.activeHosts.has(hostSessionId)) {
         return;
       }
-      this.lastActivityAtMs.set(sessionId, now2);
-      this.scheduleIdleCheck(sessionId, now2);
+      this.lastActivityAtMs.set(hostSessionId, now2);
+      this.scheduleIdleCheck(hostSessionId, now2);
     }
     scheduleIdleCheck(sessionId, now2 = Date.now()) {
       this.clearIdleTimer(sessionId);
@@ -145865,22 +146345,28 @@ parentPort.on('message', (message) => {
   function currentChangesFromChangedFiles(changedFiles) {
     const projected = projectChangedFiles(changedFiles);
     if (projected.length === 0) return {};
-    return Object.fromEntries(projected.map(({ record: record2, filePath }) => {
+    const entries = [];
+    for (const { record: record2, filePath } of projected) {
+      const change = currentChangeFromChangedFileRecord(record2);
+      if (change === void 0) continue;
       const currentPath = record2.current.path;
       const basePath = record2.base.path;
       const path2 = currentPath ?? basePath ?? filePath;
       const key2 = record2.current.state === "present" ? record2.fileId : `path:${path2}`;
-      return [
+      entries.push([
         key2,
-        currentChangeFromChangedFileRecord(record2)
-      ];
-    }).sort(([left2], [right2]) => left2.localeCompare(right2)));
+        change
+      ]);
+    }
+    if (entries.length === 0) return {};
+    return Object.fromEntries(entries.sort(([left2], [right2]) => left2.localeCompare(right2)));
   }
   function fileDiffsFromChangedFiles(changedFiles) {
     const projected = projectChangedFiles(changedFiles);
     if (projected.length === 0) return void 0;
-    return projected.map(({ record: record2, filePath, add: add2, del }) => {
+    const fileDiffs = projected.flatMap(({ record: record2, filePath, add: add2, del }) => {
       const cc = codeCollabFileDiffCheckpointFromRecord(record2);
+      if (cc === void 0 && currentChangeFromChangedFileRecord(record2) === void 0) return [];
       return {
         filePath,
         add: add2,
@@ -145890,6 +146376,7 @@ parentPort.on('message', (message) => {
         }
       };
     });
+    return fileDiffs.length === 0 ? void 0 : fileDiffs;
   }
   function projectChangedFiles(changedFiles) {
     const statsByFileId = new Map(projectTurnHistoryFileDiffStats(changedFiles).map((diffStat) => [
@@ -145925,15 +146412,15 @@ parentPort.on('message', (message) => {
       } : {}
     };
     if (record2.lineStats?.kind !== "counted") {
-      const value = {
+      const value2 = {
         ...record2.current.state === "deleted" ? {
           r: true
         } : {},
         ...checkpoint
       };
-      return Object.keys(value).length === 0 ? true : value;
+      return Object.keys(value2).length === 0 ? void 0 : value2;
     }
-    return {
+    const value = {
       ...record2.lineStats.add === 0 ? {} : {
         a: record2.lineStats.add
       },
@@ -145945,6 +146432,7 @@ parentPort.on('message', (message) => {
       } : {},
       ...checkpoint
     };
+    return Object.keys(value).length === 0 ? void 0 : value;
   }
   function changedFileRecords(changedFiles) {
     if (Array.isArray(changedFiles)) {
@@ -146089,7 +146577,7 @@ parentPort.on('message', (message) => {
   const DEFAULT_LOCAL_PROJECT_BROWSE_DIR_LIMIT = 500;
   const HARD_LOCAL_PROJECT_BROWSE_DIR_LIMIT = 5e3;
   const DEFAULT_LOCAL_PROJECT_READ_MAX_BYTES = 64 * 1024;
-  const HARD_LOCAL_PROJECT_READ_MAX_BYTES = 1024 * 1024;
+  const HARD_LOCAL_PROJECT_READ_MAX_BYTES = 5 * 1024 * 1024;
   const GIT_COMMAND_MAX_BUFFER_BYTES = 64 * 1024 * 1024;
   const LOCAL_PROJECT_GIT_COMMAND_TIMEOUT_MS = 5e3;
   const LOCAL_PROJECT_WALK_YIELD_EVERY_ENTRIES = 1e3;
@@ -146152,7 +146640,7 @@ parentPort.on('message', (message) => {
     }
     return absolutePath;
   }
-  function readLocalFileAtRoot(rootPath, relativePath, maxBytes) {
+  function readLocalFileAtRoot(rootPath, relativePath, maxBytes, allowBinary = false) {
     const requestedRelativePath = normalizeProjectRelativePath(relativePath.trim());
     const safePath = resolveSafeProjectFilePath(rootPath, requestedRelativePath);
     if (!safePath) return null;
@@ -146189,8 +146677,17 @@ parentPort.on('message', (message) => {
       const bytesRead = fs$3.readSync(fd, buffer2, 0, maxBytes + 1, 0);
       const truncated = bytesRead > maxBytes;
       const safeBytes = truncated ? maxBytes : bytesRead;
+      const resolvedRelativePath = toProjectRelativePath(rootRealPath, targetRealPath);
+      if (allowBinary && isBinaryImagePath(resolvedRelativePath)) {
+        return {
+          path: resolvedRelativePath,
+          content: buffer2.subarray(0, safeBytes).toString("base64"),
+          truncated,
+          encoding: "base64"
+        };
+      }
       return {
-        path: toProjectRelativePath(rootRealPath, targetRealPath),
+        path: resolvedRelativePath,
         content: buffer2.subarray(0, safeBytes).toString("utf8"),
         truncated
       };
@@ -146740,7 +147237,7 @@ parentPort.on('message', (message) => {
     }
     readProjectFile(rootPath, relativePath, options) {
       const maxBytes = clampInteger(options?.maxBytes, 1, HARD_LOCAL_PROJECT_READ_MAX_BYTES, DEFAULT_LOCAL_PROJECT_READ_MAX_BYTES);
-      return readLocalFileAtRoot(rootPath, relativePath, maxBytes);
+      return readLocalFileAtRoot(rootPath, relativePath, maxBytes, true);
     }
     async checkoutProjectBranch(rootPath, branchName) {
       try {
@@ -150001,6 +150498,7 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
       this.cliVersion = config2.cliVersion;
       this.machineId = config2.machineId;
       this.supportRegistryAgentTypes = config2.supportRegistryAgentTypes ?? [];
+      this.closeSessionTerminals = config2.closeSessionTerminals;
       this.onFatalAuthFailure = config2.onFatalAuthFailure;
       this.notificationService = createNotificationService(this.token, this.logger);
       this.usageTrackingService = createUsageTrackingService(this.token, this.logger);
@@ -150056,9 +150554,12 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
         touchSession: (sessionId) => this.touchSession(sessionId),
         startMachineSessionHeartbeat: (sessionId) => this.startMachineSessionHeartbeat(sessionId),
         stopMachineSessionHeartbeat: (sessionId) => this.stopMachineSessionHeartbeat(sessionId),
-        startCodeCollabHost: async ({ sessionId, workspaceRoot, project }) => {
+        startCodeCollabHost: async ({ sessionId, hostSessionId, workspaceRoot, project }) => {
           const result = await this.codeCollabHostManager.startForSession({
             sessionId,
+            ...hostSessionId === void 0 ? {} : {
+              hostSessionId
+            },
             workspaceRoot,
             project
           });
@@ -150079,18 +150580,34 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
           }
         },
         recordCodeCollabTurnMarker: async ({ sessionId, turnId, phase, project, baseCommitHash, turnStartWorkingTreeDiff }) => {
+          const hostSessionId = await this.resolveCodeCollabHostSessionId(sessionId);
           const result = await this.codeCollabHostManager.recordTurnMarker({
             sessionId,
+            ...hostSessionId === void 0 ? {} : {
+              hostSessionId
+            },
             turnId,
             phase,
             baseCommitHash,
             turnStartWorkingTreeDiff,
             capture: await this.resolveCodeCollabCaptureConfig(sessionId, project)
           });
-          const fileDiff = result.status === "recorded" ? result.fileDiff : void 0;
-          return fileDiff && fileDiff.length > 0 ? {
-            fileDiff
-          } : void 0;
+          if (result.status !== "recorded") {
+            return void 0;
+          }
+          const fileDiff = result.fileDiff;
+          const allChangesFileDiff = result.allChangesFileDiff;
+          if ((!fileDiff || fileDiff.length === 0) && allChangesFileDiff === void 0) {
+            return void 0;
+          }
+          return {
+            ...fileDiff && fileDiff.length > 0 ? {
+              fileDiff
+            } : {},
+            ...allChangesFileDiff === void 0 ? {} : {
+              allChangesFileDiff
+            }
+          };
         },
         beginACPReplaySuppression: (sessionId) => this.beginACPReplaySuppression(sessionId),
         endACPReplaySuppression: (sessionId) => this.endACPReplaySuppression(sessionId),
@@ -150289,6 +150806,7 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
     machineName;
     cliVersion;
     supportRegistryAgentTypes;
+    closeSessionTerminals;
     onFatalAuthFailure;
     store = new SessionTransientStore();
     titleGenerationInFlight = /* @__PURE__ */ new Set();
@@ -150304,10 +150822,6 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
     static CODEX_PROPOSED_PLAN_UPDATE_BATCH_WINDOW_MS = 100;
     static CONTEXT_WINDOW_USAGE_THROTTLE_MS = 400;
     permissionRequestStartTimes = /* @__PURE__ */ new Map();
-    machineHeartbeatTimer = null;
-    machineHeartbeatInFlightStartedAt = null;
-    machineHeartbeatSeq = 0;
-    static MACHINE_HEARTBEAT_INTERVAL_MS = 2e4;
     static MACHINE_ACCESS_REGISTRATION_CACHE_TTL_MS = 20 * 6e4;
     machineAccessRegistrationInFlight = null;
     machineAccessRegistrationExpiresAtMs = 0;
@@ -150342,39 +150856,6 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
     touchSession(sessionId) {
       this.store.get(sessionId).lastActivityMs = Date.now();
     }
-    startMachineHeartbeat() {
-      this.stopMachineHeartbeat();
-      this.logger.debug(`Machine heartbeat started (${Math.round(MessageHandler.MACHINE_HEARTBEAT_INTERVAL_MS / 1e3)}s interval)`);
-      this.sendMachineHeartbeatWithDiagnostics("initial");
-      this.machineHeartbeatTimer = setInterval(() => {
-        this.sendMachineHeartbeatWithDiagnostics("periodic");
-      }, MessageHandler.MACHINE_HEARTBEAT_INTERVAL_MS);
-      this.machineHeartbeatTimer.unref?.();
-    }
-    sendMachineHeartbeatWithDiagnostics(reason) {
-      const now2 = Date.now();
-      if (this.machineHeartbeatInFlightStartedAt !== null) {
-        this.logger.warn(`Machine heartbeat skipped (reason=${reason}); previous heartbeat still pending for ${now2 - this.machineHeartbeatInFlightStartedAt}ms`);
-        return;
-      }
-      const seq2 = ++this.machineHeartbeatSeq;
-      this.machineHeartbeatInFlightStartedAt = now2;
-      this.logger.debug(`Machine heartbeat tick started (reason=${reason} seq=${seq2})`);
-      void withSlowOperationWarning(this.workspaceDocument.sendMachineHeartbeat(), this.logger, `workspaceDocument.sendMachineHeartbeat(reason=${reason}, seq=${seq2})`, this.machineId).then(() => {
-        this.logger.debug(`Machine heartbeat sent (reason=${reason} seq=${seq2} duration=${Date.now() - now2}ms)`);
-      }).catch((error2) => {
-        this.logger.debug(`Machine heartbeat failed (reason=${reason} seq=${seq2} duration=${Date.now() - now2}ms): ${formatErrorMessage$1(error2)}`);
-      }).finally(() => {
-        this.machineHeartbeatInFlightStartedAt = null;
-      });
-    }
-    stopMachineHeartbeat() {
-      if (this.machineHeartbeatTimer) {
-        clearInterval(this.machineHeartbeatTimer);
-        this.machineHeartbeatTimer = null;
-      }
-      this.machineHeartbeatInFlightStartedAt = null;
-    }
     preferredBaseBranch = (process.env.LODY_BASE_BRANCH || "main").trim() || "main";
     resolveGitHubProjectBranch(meta, preferredBranch) {
       return resolveBaseBranchPreference({
@@ -150384,6 +150865,21 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
         fallbackBranch: this.preferredBaseBranch
       });
     }
+    async resolveCodeCollabHostSessionId(sessionId) {
+      const activeParent = this.sessionManager.getSession(sessionId)?.getParentSessionId();
+      if (activeParent !== void 0 && activeParent !== sessionId) {
+        return activeParent;
+      }
+      try {
+        const sessionDoc = await this.workspaceDocument.getOrCreateSessionDoc(sessionId);
+        const meta = await sessionDoc.getMetaState();
+        const parentSessionId = meta?.parentSessionId;
+        return parentSessionId !== void 0 && parentSessionId !== sessionId ? parentSessionId : void 0;
+      } catch (error2) {
+        this.logger.debug(`[${sessionId}] Code Collab host session resolve failed: ${formatErrorMessage$1(error2)}`);
+        return void 0;
+      }
+    }
     async resolveCodeCollabCaptureConfig(sessionId, projectHint) {
       try {
         const sessionDoc = await this.workspaceDocument.getOrCreateSessionDoc(sessionId);
@@ -151374,7 +151870,7 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
           if (!meta) continue;
           if (meta.machineId !== this.machineId) continue;
           if (meta.status?.type === "idle") continue;
-          if (isSessionActiveWithHeartbeat(meta.status, meta.lastRunningSeen)) continue;
+          if (this.store.has(sessionId) && this.store.get(sessionId).heartbeat !== null) continue;
           await sessionDoc.setStatus(SessionStatusFactory.idle());
           resetCount += 1;
         } catch (error2) {
@@ -151534,6 +152030,7 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
       this.logger.debug(`[${sessionId}] Archiving session resources`);
       this.stopMachineSessionHeartbeat(sessionId);
       this.codeCollabHostManager.stopSession(sessionId, "session archived");
+      this.closeSessionTerminals?.(sessionId);
       this.logger.debug(`[${sessionId}] Heartbeat stopped`);
       await this.finalizeACPState(sessionId);
       this.logger.debug(`[${sessionId}] ACP state finalized`);
@@ -151655,6 +152152,7 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
       this.logger.debug(`[${parentSessionId}] Terminating ${childSessionIds.length} active child session(s) before workspace cleanup`);
       await Promise.all(childSessionIds.map(async (childSessionId) => {
         this.stopMachineSessionHeartbeat(childSessionId);
+        this.closeSessionTerminals?.(childSessionId);
         await this.finalizeACPState(childSessionId);
         await this.previewService.closeSessionPreviewForCleanup(childSessionId, reason);
         await this.sessionManager.terminateSession(childSessionId, true);
@@ -151797,6 +152295,7 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
       await this.terminateActiveChildSessions(sessionId, "Parent session deleted");
       this.stopMachineSessionHeartbeat(sessionId);
       this.codeCollabHostManager.stopSession(sessionId, "session deleted");
+      this.closeSessionTerminals?.(sessionId);
       await this.finalizeACPState(sessionId);
       await this.previewService.closeSessionPreviewForCleanup(sessionId, "Session deleted");
       this.logger.debug(`[${sessionId}] Preview tunnel closed for deletion`);
@@ -152260,7 +152759,6 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
           raceLimits: machineMeta?.raceLimits ?? {}
         });
         await this.registerMachineAccess();
-        this.startMachineHeartbeat();
         this.logger.debug(`Machine registered with name: ${registeredName}`);
       } catch (error2) {
         this.logger.error(`Failed to register machine: ${formatErrorMessage$1(error2)}`);
@@ -152310,12 +152808,16 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
         }
         return null;
       };
+      const hostSessionIdField = (parentSessionId) => parentSessionId === void 0 || parentSessionId === sessionId ? {} : {
+        hostSessionId: parentSessionId
+      };
       const activeSession = this.sessionManager.getSession(sessionId);
       if (activeSession) {
         return {
           ok: true,
           workspaceRoot: activeSession.getHostWorkdir() ?? activeSession.getWorkdir(),
-          source: "active-session"
+          source: "active-session",
+          ...hostSessionIdField(activeSession.getParentSessionId())
         };
       }
       const pendingSession = this.sessionManager.getPendingSession(sessionId);
@@ -152336,7 +152838,8 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
         return {
           ok: true,
           workspaceRoot: session.getHostWorkdir() ?? session.getWorkdir(),
-          source: "pending-session"
+          source: "pending-session",
+          ...hostSessionIdField(session.getParentSessionId())
         };
       }
       const metaRecord = await this.workspaceDocument.repo.getDocMeta(getSessionRoomId(sessionId));
@@ -152356,6 +152859,7 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
         };
       }
       const project = meta.project;
+      const hostSessionId = meta.parentSessionId ?? sessionId;
       if (project?.kind === "local") {
         const workspaceRoot = await resolveWorkspaceLocalProjectRootPath(this.workspaceDocument.repo, this.machineId, project.localProjectId);
         if (!workspaceRoot) {
@@ -152368,17 +152872,18 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
         return {
           ok: true,
           workspaceRoot,
-          source: `local-project:${project.localProjectId}`
+          source: `local-project:${project.localProjectId}`,
+          ...hostSessionIdField(hostSessionId)
         };
       }
-      const hostSessionId = meta.parentSessionId ?? sessionId;
       if (meta.parentSessionId) {
         const parentSession = this.sessionManager.getSession(meta.parentSessionId);
         if (parentSession) {
           return {
             ok: true,
             workspaceRoot: parentSession.getHostWorkdir() ?? parentSession.getWorkdir(),
-            source: `active-parent-session:${meta.parentSessionId}`
+            source: `active-parent-session:${meta.parentSessionId}`,
+            ...hostSessionIdField(hostSessionId)
           };
         }
         const pendingParentSession = this.sessionManager.getPendingSession(meta.parentSessionId);
@@ -152399,7 +152904,8 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
           return {
             ok: true,
             workspaceRoot: session.getHostWorkdir() ?? session.getWorkdir(),
-            source: `pending-parent-session:${meta.parentSessionId}`
+            source: `pending-parent-session:${meta.parentSessionId}`,
+            ...hostSessionIdField(hostSessionId)
           };
         }
       }
@@ -152414,7 +152920,8 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
           return {
             ok: true,
             workspaceRoot: worktreeManager.getWorktreeHostPath(hostSessionId),
-            source: `github-worktree-existing:${hostSessionId}`
+            source: `github-worktree-existing:${hostSessionId}`,
+            ...hostSessionIdField(hostSessionId)
           };
         }
         this.logCodeCollabDebug(`[${sessionId}] Code Collab host-start waiting for session workspace hostSessionId=${hostSessionId} repo=${repoFullName}`);
@@ -152425,13 +152932,17 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
           timeoutMs: CODE_COLLAB_HOST_SESSION_WAIT_TIMEOUT_MS
         });
         if (waited) {
-          return waited;
+          return waited.ok ? {
+            ...waited,
+            ...hostSessionIdField(hostSessionId)
+          } : waited;
         }
         if (worktreeManager.hasWorktree(hostSessionId)) {
           return {
             ok: true,
             workspaceRoot: worktreeManager.getWorktreeHostPath(hostSessionId),
-            source: `github-worktree-existing-after-wait:${hostSessionId}`
+            source: `github-worktree-existing-after-wait:${hostSessionId}`,
+            ...hostSessionIdField(hostSessionId)
           };
         }
         return {
@@ -152510,7 +153021,10 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
       this.logCodeCollabDebug(`[${sessionId}] Code Collab host-start resolved workspaceRoot=${resolved.workspaceRoot} source=${resolved.source}`);
       const result = await this.codeCollabHostManager.startForSession({
         sessionId,
-        workspaceRoot: resolved.workspaceRoot
+        workspaceRoot: resolved.workspaceRoot,
+        ...resolved.hostSessionId === void 0 ? {} : {
+          hostSessionId: resolved.hostSessionId
+        }
       });
       this.logCodeCollabDebug(`[${sessionId}] Code Collab host-start result status=${result.status}`);
       switch (result.status) {
@@ -153650,7 +154164,6 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
     }
     async cleanup() {
       this.logger.debug("Cleaning up message handler resources");
-      this.stopMachineHeartbeat();
       this.cancelPendingPermissionRequests();
       this.machineRpcServer?.stop();
       this.codeCollabHostManager.stopAll("message handler cleanup");
@@ -153877,10 +154390,14 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
       if (await this.hasActiveGoal(sessionId)) {
         return false;
       }
-      const meta = (await this.workspaceDocument.repo.getDocMeta(getSessionRoomId(sessionId)))?.meta;
-      if (meta && isSessionActiveWithHeartbeat(meta.status, meta.lastRunningSeen)) {
+      if (this.store.has(sessionId) && this.store.get(sessionId).heartbeat !== null) {
         return false;
       }
+      for (const childSessionId of this.sessionManager.getActiveChildSessionIds(sessionId)) {
+        if (!await this.isCodeCollabHostSessionIdle(childSessionId)) {
+          return false;
+        }
+      }
       return true;
     }
     async hasActiveGoal(sessionId) {
@@ -154532,6 +155049,7 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
     messageProcessor;
     gcManager = null;
     initialized = false;
+    sessionTerminatedHandlers = /* @__PURE__ */ new Set();
     async initialize() {
       if (this.initialized) {
         return {
@@ -154542,6 +155060,11 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
       this.options.logger.debug("Initializing machine runtime");
       this.sessionManager = this.options.sessionManagerFactory();
       await this.sessionManager.initialize();
+      this.sessionManager.on("terminated", (event) => {
+        for (const handler of this.sessionTerminatedHandlers) {
+          handler(event.sessionId);
+        }
+      });
       this.options.logger.debug("Session manager initialized");
       this.handler = new MessageHandler(this.sessionManager, this.options.workspaceDocument, this.options.logger, this.options.handlerConfig);
       this.initializeGCManager();
@@ -154563,6 +155086,21 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
     getSessionManager() {
       return this.sessionManager;
     }
+    async resolveSessionWorkdir(sessionId) {
+      const sessionManager = this.requireSessionManager();
+      const pendingSession = sessionManager.getPendingSession(sessionId);
+      if (pendingSession) {
+        const session = await pendingSession;
+        return session.getWorkdir();
+      }
+      return sessionManager.getSession(sessionId)?.getWorkdir() ?? null;
+    }
+    onSessionTerminated(handler) {
+      this.sessionTerminatedHandlers.add(handler);
+      return () => {
+        this.sessionTerminatedHandlers.delete(handler);
+      };
+    }
     getActiveSessionCount() {
       return this.handler?.getActiveTurnCount() ?? 0;
     }
@@ -161449,7 +161987,7 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
         LODY_WORKSPACE_SESSION_ID: workspaceSessionId
       };
       const withLoginShell = mergeLoginShellEnv(merged, getCachedLoginShellEnvSync());
-      const agentEnv = this.config.agentCliType === "builtin" && this.config.agentType === "claude" ? scrubInheritedClaudeAuthEnv(withLoginShell, {
+      const agentEnv = shouldScrubClaudeAuthEnv(this.config.agentCliType, this.config.agentType) ? scrubInheritedClaudeAuthEnv(withLoginShell, {
         ...configEnv,
         ...extraEnv
       }) : withLoginShell;
@@ -162348,6 +162886,7 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
           machineName: this.machineName,
           cliVersion: pkg.version,
           supportRegistryAgentTypes: this.supportRegistryAgentTypes,
+          closeSessionTerminals: options.closeSessionTerminals,
           onFatalAuthFailure: options.onFatalAuthFailure
         },
         logger: this.logger
@@ -162444,6 +162983,12 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
     getActiveSessionCount() {
       return this.runtime.getActiveSessionCount();
     }
+    async resolveSessionWorkdir(sessionId) {
+      return await this.runtime.resolveSessionWorkdir(sessionId);
+    }
+    onSessionTerminated(handler) {
+      return this.runtime.onSessionTerminated(handler);
+    }
     getConnectedRoomCount() {
       return this.documentManager.getConnectedRoomCount();
     }
@@ -163166,6 +163711,679 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
       server.close(() => resolve2());
     });
   }
+  const LOCAL_TERMINAL_SOCKET_BASENAME = "lody-terminal";
+  function getUserSocketSuffix() {
+    if (typeof process.getuid === "function") {
+      return String(process.getuid());
+    }
+    const userInfo2 = os__default$1.userInfo();
+    return crypto$1.createHash("sha256").update(`${userInfo2.uid}:${userInfo2.username}:${os__default$1.homedir()}`).digest("hex").slice(0, 16);
+  }
+  function getLocalTerminalSocketPath() {
+    const userId = getUserSocketSuffix();
+    if (process.platform === "win32") {
+      return `\\\\.\\pipe\\${LOCAL_TERMINAL_SOCKET_BASENAME}-${userId}`;
+    }
+    return path__default$1.join(os__default$1.tmpdir(), `${LOCAL_TERMINAL_SOCKET_BASENAME}-${userId}.sock`);
+  }
+  const MAX_BUFFER_BYTES = 1024 * 1024;
+  let terminalServer = null;
+  let activeSocketPath = null;
+  let terminalServerStart = null;
+  function encodeEvent(event) {
+    return `${JSON.stringify(event)}
+`;
+  }
+  function send(socket, event) {
+    if (socket.destroyed) return;
+    socket.write(encodeEvent(event));
+  }
+  function getEventTerminalId(event) {
+    return "terminalId" in event && typeof event.terminalId === "string" ? event.terminalId : null;
+  }
+  function createTerminalSocketState() {
+    return {
+      subscribedTerminalIds: /* @__PURE__ */ new Set(),
+      replayingTerminalIds: /* @__PURE__ */ new Set(),
+      replayBuffers: /* @__PURE__ */ new Map()
+    };
+  }
+  function publishTerminalEvent(socket, state2, event) {
+    const terminalId = getEventTerminalId(event);
+    if (!terminalId) {
+      send(socket, event);
+      return;
+    }
+    if (!state2.subscribedTerminalIds.has(terminalId)) {
+      return;
+    }
+    if (state2.replayingTerminalIds.has(terminalId)) {
+      const buffer2 = state2.replayBuffers.get(terminalId) ?? [];
+      buffer2.push(event);
+      state2.replayBuffers.set(terminalId, buffer2);
+      return;
+    }
+    send(socket, event);
+    if (event.type === "exit") {
+      state2.subscribedTerminalIds.delete(terminalId);
+    }
+  }
+  function startTerminalReplay(state2, terminalId) {
+    state2.subscribedTerminalIds.add(terminalId);
+    state2.replayingTerminalIds.add(terminalId);
+    state2.replayBuffers.set(terminalId, []);
+  }
+  function finishTerminalReplay(socket, state2, terminalId) {
+    state2.replayingTerminalIds.delete(terminalId);
+    const bufferedEvents = state2.replayBuffers.get(terminalId) ?? [];
+    state2.replayBuffers.delete(terminalId);
+    for (const event of bufferedEvents) {
+      send(socket, event);
+      if (event.type === "exit") {
+        state2.subscribedTerminalIds.delete(terminalId);
+      }
+    }
+  }
+  function cancelTerminalReplay(state2, terminalId) {
+    state2.replayingTerminalIds.delete(terminalId);
+    state2.replayBuffers.delete(terminalId);
+    state2.subscribedTerminalIds.delete(terminalId);
+  }
+  function classifyTerminalError(error2) {
+    const message = formatErrorMessage$1(error2);
+    if (message.startsWith("session_not_found:")) {
+      return {
+        code: "session_not_found",
+        message
+      };
+    }
+    if (message.startsWith("session_archived:")) {
+      return {
+        code: "session_archived",
+        message
+      };
+    }
+    if (message.startsWith("session_deleted:")) {
+      return {
+        code: "session_deleted",
+        message
+      };
+    }
+    if (message.startsWith("session_machine_mismatch:")) {
+      return {
+        code: "session_machine_mismatch",
+        message
+      };
+    }
+    if (message.startsWith("session_parent_cycle:")) {
+      return {
+        code: "session_parent_cycle",
+        message
+      };
+    }
+    if (message.startsWith("session_ambiguous:")) {
+      return {
+        code: "session_ambiguous",
+        message
+      };
+    }
+    if (message.startsWith("terminal_not_found:")) {
+      return {
+        code: "terminal_not_found",
+        message
+      };
+    }
+    if (message.startsWith("terminal_limit_exceeded:")) {
+      return {
+        code: "terminal_limit_exceeded",
+        message
+      };
+    }
+    if (message.includes("workdir") || message.includes("directory") || message.includes("ENOENT")) {
+      return {
+        code: "workdir_unavailable",
+        message
+      };
+    }
+    return {
+      code: "terminal_error",
+      message
+    };
+  }
+  async function removeStaleUnixSocket(socketPath) {
+    if (process.platform === "win32" || !fs$3.existsSync(socketPath)) {
+      return;
+    }
+    await new Promise((resolve2, reject) => {
+      const socket = net__default.createConnection(socketPath);
+      socket.once("connect", () => {
+        socket.destroy();
+        reject(new Error(`local_terminal_socket_in_use:${socketPath}`));
+      });
+      socket.once("error", (error2) => {
+        socket.destroy();
+        if (error2.code === "ECONNREFUSED" || error2.code === "ENOENT") {
+          fs$3.unlinkSync(socketPath);
+          resolve2();
+          return;
+        }
+        reject(error2);
+      });
+    });
+  }
+  async function handleMessage(config2, socket, state2, message) {
+    try {
+      switch (message.type) {
+        case "list": {
+          send(socket, {
+            type: "terminals",
+            requestId: message.requestId,
+            sessionId: message.sessionId,
+            terminals: config2.terminalPtyService.list(message.sessionId)
+          });
+          return;
+        }
+        case "open": {
+          const result = await config2.terminalPtyService.open(message);
+          send(socket, {
+            type: "opened",
+            requestId: message.requestId,
+            terminalId: result.terminalId,
+            ...result.cwd ? {
+              cwd: result.cwd
+            } : {}
+          });
+          return;
+        }
+        case "attach": {
+          startTerminalReplay(state2, message.terminalId);
+          try {
+            const replay = config2.terminalPtyService.attach(message.terminalId, message.cols, message.rows);
+            send(socket, {
+              terminalId: message.terminalId,
+              type: "title",
+              title: replay.title
+            });
+            if (replay.scrollback) {
+              send(socket, {
+                type: "data",
+                terminalId: message.terminalId,
+                data: replay.scrollback,
+                replay: true
+              });
+            }
+            finishTerminalReplay(socket, state2, message.terminalId);
+          } catch (error2) {
+            cancelTerminalReplay(state2, message.terminalId);
+            throw error2;
+          }
+          return;
+        }
+        case "input": {
+          config2.terminalPtyService.input(message.terminalId, message.data);
+          return;
+        }
+        case "resize": {
+          config2.terminalPtyService.resize(message.terminalId, message.cols, message.rows);
+          return;
+        }
+        case "close": {
+          config2.terminalPtyService.close(message.terminalId);
+          return;
+        }
+        case "close_session": {
+          config2.terminalPtyService.closeSession(message.sessionId);
+          return;
+        }
+        default: {
+          throw new Error(`unsupported_terminal_message:${JSON.stringify(message)}`);
+        }
+      }
+    } catch (error2) {
+      const terminalError = classifyTerminalError(error2);
+      send(socket, {
+        type: "error",
+        requestId: message.requestId,
+        ..."terminalId" in message ? {
+          terminalId: message.terminalId
+        } : {},
+        code: terminalError.code,
+        message: terminalError.message
+      });
+    }
+  }
+  async function startLocalTerminalServer(config2) {
+    if (terminalServer) {
+      return;
+    }
+    if (terminalServerStart) {
+      return await terminalServerStart;
+    }
+    terminalServerStart = startLocalTerminalServerInner(config2).finally(() => {
+      terminalServerStart = null;
+    });
+    return await terminalServerStart;
+  }
+  async function startLocalTerminalServerInner(config2) {
+    const socketPath = getLocalTerminalSocketPath();
+    await removeStaleUnixSocket(socketPath);
+    const server = net__default.createServer((socket) => {
+      let buffer2 = "";
+      const state2 = createTerminalSocketState();
+      const unsubscribe2 = config2.terminalPtyService.onEvent((event) => {
+        publishTerminalEvent(socket, state2, event);
+      });
+      socket.on("data", (chunk) => {
+        buffer2 += chunk.toString("utf8");
+        if (buffer2.length > MAX_BUFFER_BYTES) {
+          send(socket, {
+            type: "error",
+            code: "payload_too_large",
+            message: "Terminal socket payload exceeded buffer limit"
+          });
+          socket.destroy();
+          return;
+        }
+        let newlineIndex = buffer2.indexOf("\n");
+        while (newlineIndex >= 0) {
+          const line3 = buffer2.slice(0, newlineIndex).trim();
+          buffer2 = buffer2.slice(newlineIndex + 1);
+          if (line3) {
+            let raw2;
+            try {
+              raw2 = JSON.parse(line3);
+            } catch (error2) {
+              send(socket, {
+                type: "error",
+                code: "invalid_json",
+                message: formatErrorMessage$1(error2)
+              });
+              newlineIndex = buffer2.indexOf("\n");
+              continue;
+            }
+            const parsed = TerminalClientMessageSchema.safeParse(raw2);
+            if (!parsed.success) {
+              send(socket, {
+                type: "error",
+                code: "invalid_request",
+                message: parsed.error.message
+              });
+              newlineIndex = buffer2.indexOf("\n");
+              continue;
+            }
+            void handleMessage(config2, socket, state2, parsed.data);
+          }
+          newlineIndex = buffer2.indexOf("\n");
+        }
+      });
+      socket.on("close", unsubscribe2);
+      socket.on("error", (error2) => {
+        config2.logger.debug(`[terminal] socket error: ${error2.message}`);
+      });
+    });
+    await new Promise((resolve2, reject) => {
+      server.once("error", reject);
+      server.listen(socketPath, () => {
+        server.off("error", reject);
+        terminalServer = server;
+        activeSocketPath = socketPath;
+        if (process.platform !== "win32") {
+          fs$3.chmodSync(socketPath, 384);
+        }
+        config2.logger.debug(`[terminal] local terminal socket listening at ${socketPath}`);
+        resolve2();
+      });
+    });
+    server.on("error", (error2) => {
+      config2.logger.warn(`[terminal] local terminal server error: ${error2.message}`);
+      if (terminalServer === server) {
+        terminalServer = null;
+        activeSocketPath = null;
+      }
+      try {
+        server.close();
+      } catch {
+      }
+      if (process.platform !== "win32" && fs$3.existsSync(socketPath)) {
+        fs$3.unlinkSync(socketPath);
+      }
+    });
+  }
+  async function stopLocalTerminalServer() {
+    if (!terminalServer) {
+      return;
+    }
+    const server = terminalServer;
+    const socketPath = activeSocketPath;
+    terminalServer = null;
+    activeSocketPath = null;
+    await new Promise((resolve2) => {
+      server.close(() => resolve2());
+    });
+    if (socketPath && process.platform !== "win32" && fs$3.existsSync(socketPath)) {
+      fs$3.unlinkSync(socketPath);
+    }
+  }
+  const SCROLLBACK_MAX_CHARS = 512 * 1024;
+  const ESC = String.fromCharCode(27);
+  const BEL = String.fromCharCode(7);
+  const OSC_TITLE_REGEX = new RegExp(`${ESC}\\](?:0|2);([^${BEL}${ESC}]*)(?:${BEL}|${ESC}\\\\)`, "g");
+  const TERMINAL_ENV_BLOCKLIST = /* @__PURE__ */ new Set([
+    "LODY_CLI_TOKEN",
+    "LODY_ELECTRON_SESSION_TOKEN",
+    "LODY_GIT_CRED_BROKER_TOKEN",
+    LODY_GIT_CRED_CONTEXT_TOKEN_ENV,
+    LODY_MANAGED_GH_TOKEN_SHA256_ENV
+  ]);
+  const require$1 = createRequire$1(import.meta.url);
+  const pty = require$1("node-pty");
+  function basenameForTitle(cwd) {
+    const name2 = path__default$1.basename(cwd);
+    return name2 || cwd;
+  }
+  function resolveShellCommand() {
+    if (process.platform === "win32") {
+      return {
+        file: process.env.ComSpec || "powershell.exe",
+        args: []
+      };
+    }
+    return {
+      file: process.env.SHELL || "/bin/sh",
+      args: [
+        "-l"
+      ]
+    };
+  }
+  function buildTerminalEnv(sessionId) {
+    const base = {
+      ...process.env,
+      TERM: "xterm-256color",
+      COLORTERM: process.env.COLORTERM ?? "truecolor",
+      FORCE_COLOR: "1",
+      LODY_SESSION_ID: sessionId,
+      LODY_WORKSPACE_SESSION_ID: sessionId
+    };
+    const merged = withDefaultAcpPathEntries(mergeLoginShellEnv(base, getCachedLoginShellEnvSync()));
+    clearManagedGhTokenEnv(merged);
+    for (const key2 of TERMINAL_ENV_BLOCKLIST) {
+      delete merged[key2];
+    }
+    return merged;
+  }
+  function normalizeExitSignal(signal) {
+    if (typeof signal === "undefined") return void 0;
+    return String(signal);
+  }
+  function appendScrollback(current2, data) {
+    const next2 = current2 + data;
+    if (next2.length <= SCROLLBACK_MAX_CHARS) return next2;
+    return next2.slice(next2.length - SCROLLBACK_MAX_CHARS);
+  }
+  function extractLatestTitle(record2, data) {
+    record2.titleParseBuffer = (record2.titleParseBuffer + data).slice(-4096);
+    let latest2 = null;
+    for (const match5 of record2.titleParseBuffer.matchAll(OSC_TITLE_REGEX)) {
+      const title2 = match5[1]?.trim();
+      if (title2) {
+        latest2 = title2;
+      }
+    }
+    return latest2;
+  }
+  class TerminalPtyServiceImpl {
+    logger;
+    resolveSessionWorkdir;
+    records = /* @__PURE__ */ new Map();
+    sessionIndex = /* @__PURE__ */ new Map();
+    pendingSessionOpens = /* @__PURE__ */ new Map();
+    handlers = /* @__PURE__ */ new Set();
+    constructor(options) {
+      this.logger = options.logger;
+      this.resolveSessionWorkdir = options.resolveSessionWorkdir;
+    }
+    list(sessionId) {
+      const ids2 = this.sessionIndex.get(sessionId);
+      if (!ids2) return [];
+      return [
+        ...ids2
+      ].flatMap((terminalId) => {
+        const record2 = this.records.get(terminalId);
+        if (!record2) return [];
+        return [
+          {
+            terminalId: record2.terminalId,
+            title: record2.title,
+            cwd: record2.cwd
+          }
+        ];
+      });
+    }
+    async open(params) {
+      const sessionId = params.sessionId;
+      this.reserveSessionOpen(params.sessionId);
+      try {
+        const cwd = await this.resolveSessionWorkdir(sessionId);
+        const terminalId = randomUUID();
+        const shell = resolveShellCommand();
+        const terminal2 = pty.spawn(shell.file, shell.args, {
+          name: "xterm-256color",
+          cols: params.cols,
+          rows: params.rows,
+          cwd,
+          env: buildTerminalEnv(params.sessionId)
+        });
+        const record2 = {
+          sessionId: params.sessionId,
+          terminalId,
+          cwd,
+          title: basenameForTitle(cwd),
+          pty: terminal2,
+          scrollback: "",
+          titleParseBuffer: ""
+        };
+        this.records.set(terminalId, record2);
+        const sessionTerminals = this.sessionIndex.get(params.sessionId) ?? /* @__PURE__ */ new Set();
+        sessionTerminals.add(terminalId);
+        this.sessionIndex.set(params.sessionId, sessionTerminals);
+        terminal2.onData((data) => {
+          record2.scrollback = appendScrollback(record2.scrollback, data);
+          this.emit({
+            type: "data",
+            terminalId,
+            data
+          });
+          const title2 = extractLatestTitle(record2, data);
+          if (title2 && title2 !== record2.title) {
+            record2.title = title2;
+            this.emit({
+              type: "title",
+              terminalId,
+              title: title2
+            });
+          }
+        });
+        terminal2.onExit(({ exitCode, signal }) => {
+          this.removeRecord(terminalId);
+          this.emit({
+            type: "exit",
+            terminalId,
+            exitCode,
+            ...typeof signal === "undefined" ? {} : {
+              signal: normalizeExitSignal(signal)
+            }
+          });
+        });
+        this.emit({
+          type: "title",
+          terminalId,
+          title: record2.title
+        });
+        this.logger.debug(`[terminal] opened terminalId=${terminalId} sessionId=${params.sessionId} cwd=${cwd}`);
+        return {
+          terminalId,
+          cwd
+        };
+      } finally {
+        this.releaseSessionOpen(params.sessionId);
+      }
+    }
+    attach(terminalId, cols, rows) {
+      const record2 = this.requireRecord(terminalId);
+      record2.pty.resize(cols, rows);
+      return {
+        title: record2.title,
+        scrollback: record2.scrollback
+      };
+    }
+    input(terminalId, data) {
+      this.requireRecord(terminalId).pty.write(data);
+    }
+    resize(terminalId, cols, rows) {
+      this.requireRecord(terminalId).pty.resize(cols, rows);
+    }
+    close(terminalId) {
+      const record2 = this.requireRecord(terminalId);
+      record2.pty.kill();
+    }
+    closeSession(sessionId) {
+      const ids2 = [
+        ...this.sessionIndex.get(sessionId) ?? []
+      ];
+      for (const terminalId of ids2) {
+        this.closeIfPresent(terminalId);
+      }
+    }
+    closeAll() {
+      const ids2 = [
+        ...this.records.keys()
+      ];
+      for (const terminalId of ids2) {
+        this.closeIfPresent(terminalId);
+      }
+    }
+    onEvent(handler) {
+      this.handlers.add(handler);
+      return () => {
+        this.handlers.delete(handler);
+      };
+    }
+    requireRecord(terminalId) {
+      const record2 = this.records.get(terminalId);
+      if (!record2) {
+        throw new Error(`terminal_not_found:${terminalId}`);
+      }
+      return record2;
+    }
+    closeIfPresent(terminalId) {
+      const record2 = this.records.get(terminalId);
+      if (!record2) return;
+      try {
+        record2.pty.kill();
+      } catch (error2) {
+        this.logger.debug(`[terminal] failed to close terminalId=${terminalId}: ${formatErrorMessage$1(error2)}`);
+        this.removeRecord(terminalId);
+      }
+    }
+    removeRecord(terminalId) {
+      const record2 = this.records.get(terminalId);
+      if (!record2) return;
+      this.records.delete(terminalId);
+      const sessionTerminals = this.sessionIndex.get(record2.sessionId);
+      sessionTerminals?.delete(terminalId);
+      if (sessionTerminals && sessionTerminals.size === 0) {
+        this.sessionIndex.delete(record2.sessionId);
+      }
+    }
+    reserveSessionOpen(sessionId) {
+      const currentCount = (this.sessionIndex.get(sessionId)?.size ?? 0) + (this.pendingSessionOpens.get(sessionId) ?? 0);
+      if (currentCount >= TERMINAL_MAX_PER_SESSION) {
+        throw new Error(`terminal_limit_exceeded:${sessionId}:${TERMINAL_MAX_PER_SESSION}`);
+      }
+      this.pendingSessionOpens.set(sessionId, (this.pendingSessionOpens.get(sessionId) ?? 0) + 1);
+    }
+    releaseSessionOpen(sessionId) {
+      const current2 = this.pendingSessionOpens.get(sessionId) ?? 0;
+      if (current2 <= 1) {
+        this.pendingSessionOpens.delete(sessionId);
+        return;
+      }
+      this.pendingSessionOpens.set(sessionId, current2 - 1);
+    }
+    emit(event) {
+      for (const handler of this.handlers) {
+        handler(event);
+      }
+    }
+  }
+  function makeTerminalPtyService(options) {
+    return new TerminalPtyServiceImpl(options);
+  }
+  function defaultIsDirectory(filePath) {
+    try {
+      return fs$3.statSync(filePath).isDirectory();
+    } catch {
+      return false;
+    }
+  }
+  function requireExistingDirectory(filePath, isDirectory2) {
+    if (!isDirectory2(filePath)) {
+      throw new Error(`workdir_unavailable:path_not_found:${filePath}`);
+    }
+    return filePath;
+  }
+  function resolveDefaultChatWorkdir(sessionId, homeDir, isDirectory2) {
+    const workdir = path__default$1.join(homeDir, ".lody", "chats", sessionId);
+    fs$3.mkdirSync(workdir, {
+      recursive: true
+    });
+    return requireExistingDirectory(workdir, isDirectory2);
+  }
+  async function resolveTerminalWorkdirForSession(sessionId, options, seen) {
+    if (seen.has(sessionId)) {
+      throw new Error(`session_parent_cycle:${sessionId}`);
+    }
+    seen.add(sessionId);
+    const lookup2 = await options.lookupSessionMeta(sessionId);
+    if (lookup2.type === "missing") {
+      throw new Error(`session_not_found:${sessionId}`);
+    }
+    if (lookup2.type === "deleted") {
+      throw new Error(`session_deleted:${sessionId}`);
+    }
+    const meta = lookup2.meta;
+    if (meta.isArchived) {
+      throw new Error(`session_archived:${sessionId}`);
+    }
+    if (meta.machineId !== options.machineId) {
+      throw new Error(`session_machine_mismatch:${sessionId}:${meta.machineId}`);
+    }
+    if (meta.parentSessionId) {
+      return await resolveTerminalWorkdirForSession(meta.parentSessionId, options, seen);
+    }
+    const isDirectory2 = options.isDirectory ?? defaultIsDirectory;
+    const homeDir = options.homeDir ?? os__default$1.homedir();
+    const project = meta.project;
+    if (project?.kind === "local") {
+      const rootPath = await options.resolveLocalProjectRootPath(project.localProjectId);
+      if (!rootPath) {
+        throw new Error(`workdir_unavailable:local_project_not_found:${project.localProjectId}`);
+      }
+      if (meta.isWorktree || project.useWorktree === true) {
+        const repoId = deriveRepoIdFromLocalProjectPath(rootPath);
+        return requireExistingDirectory(getWorktreeHostPath(repoId, sessionId, homeDir), isDirectory2);
+      }
+      return requireExistingDirectory(rootPath, isDirectory2);
+    }
+    if (meta.repoFullName) {
+      const repoId = deriveRepoIdFromGitHubRepo$1(meta.repoFullName);
+      return requireExistingDirectory(getWorktreeHostPath(repoId, sessionId, homeDir), isDirectory2);
+    }
+    return resolveDefaultChatWorkdir(sessionId, homeDir, isDirectory2);
+  }
+  async function resolveTerminalWorkdirFromMetadata(options) {
+    return await resolveTerminalWorkdirForSession(options.sessionId, options, /* @__PURE__ */ new Set());
+  }
   const FLEET_RUNTIME_STATE_INTERVAL_MS = 2e3;
   class LodyFleet {
     logger;
@@ -163177,6 +164395,7 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
     machineName;
     localProjectControlService;
     runtimeStateReporter;
+    terminalPtyService;
     onFatalAuthFailure;
     runtimes = /* @__PURE__ */ new Map();
     startInFlight = /* @__PURE__ */ new Map();
@@ -163202,6 +164421,10 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
       this.runtimeStateReporter = options.runtimeStateReporter;
       this.onFatalAuthFailure = options.onFatalAuthFailure;
       this.localProjectControlService = new LocalProjectControlService(this.logger);
+      this.terminalPtyService = makeTerminalPtyService({
+        logger: this.logger,
+        resolveSessionWorkdir: async (sessionId) => await this.resolveTerminalSessionWorkdir(sessionId)
+      });
     }
     async start() {
       if (!LODY_AUTH_URL) {
@@ -163250,6 +164473,10 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
         dispatchSession: async (message) => await this.dispatchLocalSessionControl(message),
         dispatchProject: async (message) => await this.dispatchLocalProjectControl(message)
       });
+      await startLocalTerminalServer({
+        logger: this.logger,
+        terminalPtyService: this.terminalPtyService
+      });
       this.convex = new ConvexClient(LODY_AUTH_URL);
       await new Promise((resolve2, reject) => {
         let initialResolved = false;
@@ -163336,7 +164563,9 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
       for (const runtime of runtimes) {
         try {
           await runtime.lody.cleanup();
+          runtime.unsubscribeTerminalCleanup();
         } catch (error2) {
+          runtime.unsubscribeTerminalCleanup();
           this.logger.debug(`[fleet] Failed to cleanup workspace runtime ${runtime.workspace.id}: ${formatErrorMessage$1(error2)}`);
         }
       }
@@ -163346,6 +164575,10 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
       await stopLocalSessionControl().catch((error2) => {
         this.logger.debug(`[fleet] Failed to stop local session control: ${formatErrorMessage$1(error2)}`);
       });
+      await stopLocalTerminalServer().catch((error2) => {
+        this.logger.debug(`[fleet] Failed to stop local terminal server: ${formatErrorMessage$1(error2)}`);
+      });
+      this.terminalPtyService.closeAll();
     }
     async applyWorkspaceList(next2) {
       if (this.stopped) return;
@@ -163404,6 +164637,7 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
             userId: this.userId,
             machineId: this.machineId,
             machineName: this.machineName,
+            closeSessionTerminals: (sessionId) => this.terminalPtyService.closeSession(sessionId),
             onFatalAuthFailure: this.onFatalAuthFailure
           });
           if (!this.desiredWorkspaces.has(workspace.id) || this.stopped) {
@@ -163420,9 +164654,13 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
             await lody.cleanup();
             return;
           }
+          const unsubscribeTerminalCleanup = lody.onSessionTerminated((sessionId) => {
+            this.terminalPtyService.closeSession(sessionId);
+          });
           this.runtimes.set(workspace.id, {
             workspace,
-            lody
+            lody,
+            unsubscribeTerminalCleanup
           });
           this.logger.debug(`[fleet] Connected workspace: ${workspaceLabel} (${workspace.id})`);
           this.runtimeStateReporter.clearIssue(`workspace_start_failed:${workspace.id}`);
@@ -163480,7 +164718,9 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
       this.runtimes.delete(workspaceId);
       try {
         await state2.lody.cleanup();
+        state2.unsubscribeTerminalCleanup();
       } catch (error2) {
+        state2.unsubscribeTerminalCleanup();
         this.logger.debug(`[fleet] Failed to cleanup workspace runtime ${workspaceId}: ${formatErrorMessage$1(error2)}`);
       }
       this.refreshRuntimeState();
@@ -163618,6 +164858,93 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
       }
       return await runtime.lody.dispatchLocalControl(message);
     }
+    async lookupTerminalSessionMeta(runtime, sessionId) {
+      const record2 = await runtime.lody.documentManager.repo.getDocMeta(getSessionRoomId(sessionId));
+      if (!record2?.meta) {
+        return {
+          type: "missing"
+        };
+      }
+      if (isLoroRepoDocDeleted(record2)) {
+        return {
+          type: "deleted"
+        };
+      }
+      return {
+        type: "found",
+        meta: record2.meta
+      };
+    }
+    async assertTerminalSessionAllowed(sessionId) {
+      for (const runtime of this.runtimes.values()) {
+        const lookup2 = await this.lookupTerminalSessionMeta(runtime, sessionId);
+        if (lookup2.type === "missing") {
+          continue;
+        }
+        if (lookup2.type === "deleted") {
+          throw new Error(`session_deleted:${sessionId}`);
+        }
+        if (lookup2.meta.isArchived) {
+          throw new Error(`session_archived:${sessionId}`);
+        }
+        if (lookup2.meta.machineId !== this.machineId) {
+          throw new Error(`session_machine_mismatch:${sessionId}:${lookup2.meta.machineId}`);
+        }
+        return;
+      }
+    }
+    async resolveActiveTerminalSessionWorkdir(sessionId) {
+      const matches = [];
+      for (const runtime of this.runtimes.values()) {
+        const workdir = await runtime.lody.resolveSessionWorkdir(sessionId);
+        if (workdir) {
+          matches.push(workdir);
+        }
+      }
+      if (matches.length > 1) {
+        throw new Error(`session_ambiguous:${sessionId}`);
+      }
+      return matches[0] ?? null;
+    }
+    async resolveTerminalSessionWorkdirFromMetadata(sessionId) {
+      const matches = [];
+      const errors2 = [];
+      for (const runtime of this.runtimes.values()) {
+        try {
+          const workdir = await resolveTerminalWorkdirFromMetadata({
+            sessionId,
+            machineId: this.machineId,
+            lookupSessionMeta: async (targetSessionId) => await this.lookupTerminalSessionMeta(runtime, targetSessionId),
+            resolveLocalProjectRootPath: async (localProjectId) => await resolveWorkspaceLocalProjectRootPath(runtime.lody.documentManager.repo, this.machineId, localProjectId)
+          });
+          matches.push(workdir);
+        } catch (error2) {
+          const message = formatErrorMessage$1(error2);
+          if (message.startsWith("session_not_found:")) {
+            continue;
+          }
+          errors2.push(error2 instanceof Error ? error2 : new Error(message));
+        }
+      }
+      if (matches.length > 1) {
+        throw new Error(`session_ambiguous:${sessionId}`);
+      }
+      if (matches.length === 1) {
+        return matches[0];
+      }
+      if (errors2[0]) {
+        throw errors2[0];
+      }
+      throw new Error(`session_not_found:${sessionId}`);
+    }
+    async resolveTerminalSessionWorkdir(sessionId) {
+      await this.assertTerminalSessionAllowed(sessionId);
+      const activeWorkdir = await this.resolveActiveTerminalSessionWorkdir(sessionId);
+      if (activeWorkdir) {
+        return activeWorkdir;
+      }
+      return await this.resolveTerminalSessionWorkdirFromMetadata(sessionId);
+    }
     toProjectControlError(type2, error2, message, data) {
       return {
         ok: false,
@@ -168165,9 +169492,9 @@ Received ${signal}, shutting down gracefully...` : "\nShutting down gracefully..
     (function(module2) {
       const ansiEscapes2 = module2.exports;
       module2.exports.default = ansiEscapes2;
-      const ESC = "\x1B[";
+      const ESC2 = "\x1B[";
       const OSC = "\x1B]";
-      const BEL = "\x07";
+      const BEL2 = "\x07";
       const SEP = ";";
       const isTerminalApp = process.env.TERM_PROGRAM === "Apple_Terminal";
       ansiEscapes2.cursorTo = (x, y) => {
@@ -168175,9 +169502,9 @@ Received ${signal}, shutting down gracefully...` : "\nShutting down gracefully..
           throw new TypeError("The `x` argument is required");
         }
         if (typeof y !== "number") {
-          return ESC + (x + 1) + "G";
+          return ESC2 + (x + 1) + "G";
         }
-        return ESC + (y + 1) + ";" + (x + 1) + "H";
+        return ESC2 + (y + 1) + ";" + (x + 1) + "H";
       };
       ansiEscapes2.cursorMove = (x, y) => {
         if (typeof x !== "number") {
@@ -168185,29 +169512,29 @@ Received ${signal}, shutting down gracefully...` : "\nShutting down gracefully..
         }
         let ret = "";
         if (x < 0) {
-          ret += ESC + -x + "D";
+          ret += ESC2 + -x + "D";
         } else if (x > 0) {
-          ret += ESC + x + "C";
+          ret += ESC2 + x + "C";
         }
         if (y < 0) {
-          ret += ESC + -y + "A";
+          ret += ESC2 + -y + "A";
         } else if (y > 0) {
-          ret += ESC + y + "B";
+          ret += ESC2 + y + "B";
         }
         return ret;
       };
-      ansiEscapes2.cursorUp = (count2 = 1) => ESC + count2 + "A";
-      ansiEscapes2.cursorDown = (count2 = 1) => ESC + count2 + "B";
-      ansiEscapes2.cursorForward = (count2 = 1) => ESC + count2 + "C";
-      ansiEscapes2.cursorBackward = (count2 = 1) => ESC + count2 + "D";
-      ansiEscapes2.cursorLeft = ESC + "G";
-      ansiEscapes2.cursorSavePosition = isTerminalApp ? "\x1B7" : ESC + "s";
-      ansiEscapes2.cursorRestorePosition = isTerminalApp ? "\x1B8" : ESC + "u";
-      ansiEscapes2.cursorGetPosition = ESC + "6n";
-      ansiEscapes2.cursorNextLine = ESC + "E";
-      ansiEscapes2.cursorPrevLine = ESC + "F";
-      ansiEscapes2.cursorHide = ESC + "?25l";
-      ansiEscapes2.cursorShow = ESC + "?25h";
+      ansiEscapes2.cursorUp = (count2 = 1) => ESC2 + count2 + "A";
+      ansiEscapes2.cursorDown = (count2 = 1) => ESC2 + count2 + "B";
+      ansiEscapes2.cursorForward = (count2 = 1) => ESC2 + count2 + "C";
+      ansiEscapes2.cursorBackward = (count2 = 1) => ESC2 + count2 + "D";
+      ansiEscapes2.cursorLeft = ESC2 + "G";
+      ansiEscapes2.cursorSavePosition = isTerminalApp ? "\x1B7" : ESC2 + "s";
+      ansiEscapes2.cursorRestorePosition = isTerminalApp ? "\x1B8" : ESC2 + "u";
+      ansiEscapes2.cursorGetPosition = ESC2 + "6n";
+      ansiEscapes2.cursorNextLine = ESC2 + "E";
+      ansiEscapes2.cursorPrevLine = ESC2 + "F";
+      ansiEscapes2.cursorHide = ESC2 + "?25l";
+      ansiEscapes2.cursorShow = ESC2 + "?25h";
       ansiEscapes2.eraseLines = (count2) => {
         let clear = "";
         for (let i2 = 0; i2 < count2; i2++) {
@@ -168218,17 +169545,17 @@ Received ${signal}, shutting down gracefully...` : "\nShutting down gracefully..
         }
         return clear;
       };
-      ansiEscapes2.eraseEndLine = ESC + "K";
-      ansiEscapes2.eraseStartLine = ESC + "1K";
-      ansiEscapes2.eraseLine = ESC + "2K";
-      ansiEscapes2.eraseDown = ESC + "J";
-      ansiEscapes2.eraseUp = ESC + "1J";
-      ansiEscapes2.eraseScreen = ESC + "2J";
-      ansiEscapes2.scrollUp = ESC + "S";
-      ansiEscapes2.scrollDown = ESC + "T";
+      ansiEscapes2.eraseEndLine = ESC2 + "K";
+      ansiEscapes2.eraseStartLine = ESC2 + "1K";
+      ansiEscapes2.eraseLine = ESC2 + "2K";
+      ansiEscapes2.eraseDown = ESC2 + "J";
+      ansiEscapes2.eraseUp = ESC2 + "1J";
+      ansiEscapes2.eraseScreen = ESC2 + "2J";
+      ansiEscapes2.scrollUp = ESC2 + "S";
+      ansiEscapes2.scrollDown = ESC2 + "T";
       ansiEscapes2.clearScreen = "\x1Bc";
-      ansiEscapes2.clearTerminal = process.platform === "win32" ? `${ansiEscapes2.eraseScreen}${ESC}0f` : `${ansiEscapes2.eraseScreen}${ESC}3J${ESC}H`;
-      ansiEscapes2.beep = BEL;
+      ansiEscapes2.clearTerminal = process.platform === "win32" ? `${ansiEscapes2.eraseScreen}${ESC2}0f` : `${ansiEscapes2.eraseScreen}${ESC2}3J${ESC2}H`;
+      ansiEscapes2.beep = BEL2;
       ansiEscapes2.link = (text, url) => {
         return [
           OSC,
@@ -168236,13 +169563,13 @@ Received ${signal}, shutting down gracefully...` : "\nShutting down gracefully..
           SEP,
           SEP,
           url,
-          BEL,
+          BEL2,
           text,
           OSC,
           "8",
           SEP,
           SEP,
-          BEL
+          BEL2
         ].join("");
       };
       ansiEscapes2.image = (buffer2, options = {}) => {
@@ -168256,10 +169583,10 @@ Received ${signal}, shutting down gracefully...` : "\nShutting down gracefully..
         if (options.preserveAspectRatio === false) {
           ret += ";preserveAspectRatio=0";
         }
-        return ret + ":" + buffer2.toString("base64") + BEL;
+        return ret + ":" + buffer2.toString("base64") + BEL2;
       };
       ansiEscapes2.iTerm = {
-        setCwd: (cwd = process.cwd()) => `${OSC}50;CurrentDir=${cwd}${BEL}`,
+        setCwd: (cwd = process.cwd()) => `${OSC}50;CurrentDir=${cwd}${BEL2}`,
         annotation: (message, options = {}) => {
           let ret = `${OSC}1337;`;
           const hasX = typeof options.x !== "undefined";
@@ -168282,7 +169609,7 @@ Received ${signal}, shutting down gracefully...` : "\nShutting down gracefully..
           } else {
             ret += message;
           }
-          return ret + BEL;
+          return ret + BEL2;
         }
       };
     })(ansiEscapes$1);
@@ -188151,7 +189478,7 @@ ${page}${helpTipBottom}${choiceDescription}${ansiEscapes.cursorHide}`;
           throttled === null || throttled === void 0 ? void 0 : throttled.unsubscribe();
           throttled = null;
           if (trailing) {
-            send();
+            send2();
             isComplete && subscriber.complete();
           }
         };
@@ -188162,7 +189489,7 @@ ${page}${helpTipBottom}${choiceDescription}${ansiEscapes.cursorHide}`;
         var startThrottle = function(value) {
           return throttled = innerFrom_1.innerFrom(durationSelector(value)).subscribe(OperatorSubscriber_1.createOperatorSubscriber(subscriber, endThrottling, cleanupThrottling));
         };
-        var send = function() {
+        var send2 = function() {
           if (hasValue) {
             hasValue = false;
             var value = sendValue;
@@ -188174,7 +189501,7 @@ ${page}${helpTipBottom}${choiceDescription}${ansiEscapes.cursorHide}`;
         source.subscribe(OperatorSubscriber_1.createOperatorSubscriber(subscriber, function(value) {
           hasValue = true;
           sendValue = value;
-          !(throttled && !throttled.closed) && (leading ? send() : startThrottle(value));
+          !(throttled && !throttled.closed) && (leading ? send2() : startThrottle(value));
         }, function() {
           isComplete = true;
           !(trailing && hasValue && throttled && !throttled.closed) && subscriber.complete();
@@ -191068,7 +192395,7 @@ ${page}${helpTipBottom}${choiceDescription}${ansiEscapes.cursorHide}`;
     }
     function hyperlink(url, text) {
       const OSC = "\x1B]";
-      const BEL = "\x07";
+      const BEL2 = "\x07";
       const SEP = ";";
       return [
         OSC,
@@ -191076,13 +192403,13 @@ ${page}${helpTipBottom}${choiceDescription}${ansiEscapes.cursorHide}`;
         SEP,
         SEP,
         url || text,
-        BEL,
+        BEL2,
         text,
         OSC,
         "8",
         SEP,
         SEP,
-        BEL
+        BEL2
       ].join("");
     }
     utils$1 = {
@@ -193234,7 +194561,7 @@ ${page}${helpTipBottom}${choiceDescription}${ansiEscapes.cursorHide}`;
   }
   function inferAgentConfigCliType(agentType) {
     const normalized = normalizeCliValue(agentType)?.toLowerCase();
-    return normalized === "claude" || normalized === "codex" ? "builtin" : "registry";
+    return normalized && isBuiltinAgentType(normalized) ? "builtin" : "registry";
   }
   function parseEnvAssignments(entries) {
     const parsed = {};
@@ -194247,7 +195574,7 @@ ${entry.text}`).join("\n\n");
     }
     throw new Error(`Multiple agent configs are available; pass --agent-config. Candidates: ${formatAgentConfigCandidates(configs)}`);
   }
-  async function resolveLocalProjectRefOrThrow(manager, machineId, selector, requestedBranch) {
+  async function resolveLocalProjectRefOrThrow(manager, machineId, selector, requestedBranch, useWorktree) {
     const machineRoomId = getMachineRoomId(machineId);
     const raw2 = await manager.repo.getDocMeta(machineRoomId);
     const machineMeta = raw2?.meta;
@@ -194267,18 +195594,26 @@ ${entry.text}`).join("\n\n");
       throw new Error(`Local project selector is ambiguous: ${normalizedSelector}. Use a project id instead.`);
     }
     const project = matches[0];
-    const branch = await resolveLocalProjectBranchForCreate(project, requestedBranch);
+    const branch = await resolveLocalProjectBranchForCreate(project, requestedBranch, {
+      requireGit: useWorktree === true
+    });
     return {
       kind: "local",
       localProjectId: project.id,
       ...branch ? {
         branch
+      } : {},
+      ...useWorktree === true ? {
+        useWorktree: true
       } : {}
     };
   }
-  async function resolveLocalProjectBranchForCreate(project, requestedBranch) {
+  async function resolveLocalProjectBranchForCreate(project, requestedBranch, options = {}) {
     const gitState = await getLocalProjectGitStateAtRootPath(project.rootPath);
     if (!gitState.git) {
+      if (options.requireGit === true) {
+        throw new Error("Cannot use --worktree with a local project that is not a git repository.");
+      }
       if (requestedBranch) {
         throw new Error("Cannot use --branch with a local project that is not a git repository.");
       }
@@ -194634,6 +195969,10 @@ ${entry.text}`).join("\n\n");
     if (normalizedRepo && normalizedLocalProject) {
       throw new Error("Pass either --repo or --local-project, not both.");
     }
+    const useLocalProjectWorktree = options.worktree === true;
+    if (useLocalProjectWorktree && !normalizedLocalProject) {
+      throw new Error("Pass --worktree together with --local-project.");
+    }
     const requestedBranch = normalizeCliValue(options.branch);
     const envOverrides = parseEnvAssignments(options.env);
     let project;
@@ -194648,7 +195987,7 @@ ${entry.text}`).join("\n\n");
         branch
       };
     } else if (normalizedLocalProject) {
-      project = await resolveLocalProjectRefOrThrow(manager, auth.machineId, normalizedLocalProject, requestedBranch);
+      project = await resolveLocalProjectRefOrThrow(manager, auth.machineId, normalizedLocalProject, requestedBranch, useLocalProjectWorktree);
     }
     const sessionId = v4();
     const sessionRoomId = getSessionRoomId(sessionId);
@@ -194850,7 +196189,7 @@ ${entry.text}`).join("\n\n");
       process.exit(code2);
     }
   }
-  const sessionCreateCommand = new Command("create").description("Create a new session on the current machine").option("--workspace <idOrSlug>", "Target workspace id or slug").option("--agent-config <idOrName>", "Agent config id or name").option("--title <title>", "Session title").option("--repo <owner/repo>", "GitHub repository to attach").option("--local-project <id|name|path>", "Local project id, name, or root path").option("--branch <name>", "Git branch to use for GitHub repos or local git projects").option("--mode <modeId>", "ACP mode override").option("--model <modelId>", "ACP model override").option("--env <keyValue>", "Extra environment variable in KEY=VALUE form; repeatable", collectListOption, []).option("--prompt <text>", "Prompt text").option("--prompt-file <path>", "Read prompt text from file, or - for stdin").option("--json", "Print JSON output").option("--jsonl", "Print JSON Lines output").option("--timeout <seconds>", "Wait timeout in seconds for structured output", parsePositiveIntOption).option("--debug", "Enable debug output").argument("[prompt]", "Prompt text").action(async (promptArg, options) => {
+  const sessionCreateCommand = new Command("create").description("Create a new session on the current machine").option("--workspace <idOrSlug>", "Target workspace id or slug").option("--agent-config <idOrName>", "Agent config id or name").option("--title <title>", "Session title").option("--repo <owner/repo>", "GitHub repository to attach").option("--local-project <id|name|path>", "Local project id, name, or root path").option("--worktree", "Create an isolated git worktree for --local-project").option("--branch <name>", "Git branch to use for GitHub repos or local git projects").option("--mode <modeId>", "ACP mode override").option("--model <modelId>", "ACP model override").option("--env <keyValue>", "Extra environment variable in KEY=VALUE form; repeatable", collectListOption, []).option("--prompt <text>", "Prompt text").option("--prompt-file <path>", "Read prompt text from file, or - for stdin").option("--json", "Print JSON output").option("--jsonl", "Print JSON Lines output").option("--timeout <seconds>", "Wait timeout in seconds for structured output", parsePositiveIntOption).option("--debug", "Enable debug output").argument("[prompt]", "Prompt text").action(async (promptArg, options) => {
     await runSessionCommand(options, async () => {
       const outputMode = resolveStructuredOutputMode(options);
       const createStartMs = Date.now();