lody 0.52.3 → 0.53.0

package/dist/index.js

@@ -23,9 +23,9 @@ import require$$1$4 from "async_hooks";
 import require$$1$5, { execFile, spawn as spawn$1 } from "node:child_process";
 import fs$6, { readdir, readFile, createReadStream, existsSync, readFileSync as readFileSync$1, promises } from "node:fs";
 import * as os from "node:os";
-import os__default$1 from "node:os";
+import os__default$1, { homedir } from "node:os";
 import * as path$3 from "node:path";
-import path__default$1, { join as join$2, dirname as dirname$1, posix, sep as sep$1, resolve as resolve$2, relative, isAbsolute } from "node:path";
+import path__default$1, { join as join$2, dirname as dirname$1, posix, sep as sep$1, delimiter, normalize as normalize$2, resolve as resolve$2, relative, isAbsolute } from "node:path";
 import * as util$2 from "node:util";
 import util__default, { format as format$8, promisify, inspect as inspect$2 } from "node:util";
 import * as readline$1 from "node:readline";
@@ -5144,8 +5144,8 @@ let __tla = Promise.all([
         }
         return debug2;
       }
-      function extend2(namespace, delimiter) {
-        const newDebug = createDebug(this.namespace + (typeof delimiter === "undefined" ? ":" : delimiter) + namespace);
+      function extend2(namespace, delimiter2) {
+        const newDebug = createDebug(this.namespace + (typeof delimiter2 === "undefined" ? ":" : delimiter2) + namespace);
         newDebug.log = this.log;
         return newDebug;
       }
@@ -8644,7 +8644,7 @@ Error:`, e);
     }
     return newLine;
   }
-  function safeJoin(input2, delimiter) {
+  function safeJoin(input2, delimiter2) {
     if (!Array.isArray(input2)) {
       return "";
     }
@@ -8661,7 +8661,7 @@ Error:`, e);
         output.push("[value cannot be serialized]");
       }
     }
-    return output.join(delimiter);
+    return output.join(delimiter2);
   }
   function isMatchingPattern(value, pattern2, requireExactStringMatch = false) {
     if (!isString$4(value)) {
@@ -36822,7 +36822,7 @@ Mongoose Error Code: ${error2.code}` : ""}`
     return client;
   }
   const name = "lody";
-  const version$4 = "0.52.3";
+  const version$4 = "0.53.0";
   const description$1 = "Lody Agent CLI tool for managing remote command execution";
   const type$2 = "module";
   const main$3 = "dist/index.js";
@@ -36866,7 +36866,7 @@ Mongoose Error Code: ${error2.code}` : ""}`
   };
   const optionalDependencies = {
     "acp-extension-claude": "0.34.3",
-    "acp-extension-codex": "0.14.3"
+    "acp-extension-codex": "0.14.5"
   };
   const devDependencies = {
     "@agentclientprotocol/sdk": "catalog:",
@@ -48967,8 +48967,8 @@ ${originalIndentation}`;
       return "#" + Array(6 - color.length + 1).join("0") + color;
     };
     var hex = getDefaultExportFromCjs2(textHex);
-    function colorspace(namespace, delimiter) {
-      const split2 = namespace.split(delimiter || ":");
+    function colorspace(namespace, delimiter2) {
+      const split2 = namespace.split(delimiter2 || ":");
       let base = hex(split2[0]);
       if (!split2.length) return base;
       for (let i2 = 0, l = split2.length - 1; i2 < l; i2++) {
@@ -73599,13 +73599,14 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
   const getLoroPreviewCommentStreamId = (workspaceId, sessionId) => `${workspaceId}:${LORO_PREVIEW_COMMENT_STREAM_SEGMENT}:${sessionId}`;
   const LODY_FULL_ACCESS_MODE_ID = "lodyFullAccess";
   const isFullAccessModeId = (modeId) => modeId === LODY_FULL_ACCESS_MODE_ID || modeId === "bypassPermissions" || modeId === "full-access";
-  const ACP_CAPABILITY_CACHE_VERSION = 1;
+  const ACP_CAPABILITY_CACHE_VERSION = 2;
   const getAcpCapabilityCacheKey = (cliType, agentType) => `${cliType}:${agentType}`;
+  const isAcpCapabilityCacheEntryCurrent = (entry2) => entry2?.cacheVersion === ACP_CAPABILITY_CACHE_VERSION;
   const getAcpCapabilityCacheStaleReason = (entry2, expectedSourceVersion) => {
     if (!entry2) {
       return "missing";
     }
-    if (entry2.cacheVersion !== ACP_CAPABILITY_CACHE_VERSION) {
+    if (!isAcpCapabilityCacheEntryCurrent(entry2)) {
       return "cache-version-mismatch";
     }
     if (entry2.sourceVersion !== expectedSourceVersion) {
@@ -77626,6 +77627,8 @@ Task description:
           return Array.isArray(v.images) && v.images.length > 0 ? true : "Missing images";
         case "plan":
           return Array.isArray(v.entries) ? true : "Missing entries";
+        case "proposed_plan":
+          return typeof v.turnId === "string" && typeof v.markdown === "string" && typeof v.status === "string" && typeof v.isLatest === "boolean" ? true : "Missing proposed plan metadata";
         case "goal":
           return typeof v.threadId === "string" && typeof v.objective === "string" && typeof v.status === "string" && typeof v.tokensUsed === "number" && typeof v.timeUsedSeconds === "number" && typeof v.createdAt === "number" && typeof v.updatedAt === "number" ? true : "Missing goal metadata";
         case "tool_call":
@@ -79151,6 +79154,17 @@ Task description:
       type: literal("plan"),
       entries: array$3(PlanEntrySchema)
     }),
+    object$1({
+      type: literal("proposed_plan"),
+      turnId: string$2(),
+      markdown: string$2(),
+      status: _enum$1([
+        "delta",
+        "completed",
+        "cleared"
+      ]),
+      isLatest: boolean()
+    }),
     object$1({
       type: literal("goal"),
       threadId: string$2(),
@@ -79468,12 +79482,12 @@ Task description:
     {
       id: "auggie",
       name: "Auggie CLI",
-      version: "0.26.0",
+      version: "0.27.2",
       description: "Augment Code's powerful software agent, backed by industry-leading context engine",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/auggie.svg",
       distribution: {
         npx: {
-          package: "@augmentcode/auggie@0.26.0",
+          package: "@augmentcode/auggie@0.27.2",
           args: [
             "--acp"
           ],
@@ -79498,12 +79512,12 @@ Task description:
     {
       id: "cline",
       name: "Cline",
-      version: "3.0.0",
+      version: "3.0.7",
       description: "Autonomous coding agent CLI - capable of creating/editing files, running commands, using the browser, and more",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/cline.svg",
       distribution: {
         npx: {
-          package: "cline@3.0.0",
+          package: "cline@3.0.7",
           args: [
             "--acp"
           ]
@@ -79513,12 +79527,12 @@ Task description:
     {
       id: "codebuddy-code",
       name: "Codebuddy Code",
-      version: "2.97.0",
+      version: "2.97.3",
       description: "Tencent Cloud's official intelligent coding tool",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/codebuddy-code.svg",
       distribution: {
         npx: {
-          package: "@tencent-ai/codebuddy-code@2.97.0",
+          package: "@tencent-ai/codebuddy-code@2.97.3",
           args: [
             "--acp"
           ]
@@ -79573,12 +79587,12 @@ Task description:
     {
       id: "dirac",
       name: "Dirac",
-      version: "0.3.41",
+      version: "0.3.44",
       description: "Reduces API costs by more than 50%, produces better and faster work. Uses Hash anchored parallel edits, AST manipulation and a whole lot of neat optimizations. Fully Open Source.",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/dirac.svg",
       distribution: {
         npx: {
-          package: "dirac-cli@0.3.41",
+          package: "dirac-cli@0.3.44",
           args: [
             "--acp"
           ]
@@ -79588,16 +79602,16 @@ Task description:
     {
       id: "factory-droid",
       name: "Factory Droid",
-      version: "0.124.0",
+      version: "0.129.0",
       description: "Factory Droid - AI coding agent powered by Factory AI",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/factory-droid.svg",
       distribution: {
         npx: {
-          package: "droid@0.124.0",
+          package: "droid@0.129.0",
           args: [
             "exec",
             "--output-format",
-            "acp-daemon"
+            "acp"
           ],
           env: {
             DROID_DISABLE_AUTO_UPDATE: "true",
@@ -79609,12 +79623,12 @@ Task description:
     {
       id: "fast-agent",
       name: "fast-agent",
-      version: "0.7.3",
+      version: "0.7.6",
       description: "Code and build agents with comprehensive multi-provider support",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/fast-agent.svg",
       distribution: {
         uvx: {
-          package: "fast-agent-acp==0.7.3",
+          package: "fast-agent-acp==0.7.6",
           args: [
             "-x"
           ]
@@ -79639,12 +79653,12 @@ Task description:
     {
       id: "github-copilot-cli",
       name: "GitHub Copilot",
-      version: "1.0.46",
+      version: "1.0.50",
       description: "GitHub's AI pair programmer",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/github-copilot-cli.svg",
       distribution: {
         npx: {
-          package: "@github/copilot@1.0.46",
+          package: "@github/copilot@1.0.50",
           args: [
             "--acp"
           ]
@@ -79654,19 +79668,19 @@ Task description:
     {
       id: "glm-acp-agent",
       name: "GLM Agent",
-      version: "1.1.3",
+      version: "1.1.4",
       description: "ACP agent powered by Zhipu AI's GLM Coding Plan models (glm-5.1, glm-5-turbo, glm-4.7, glm-4.5-air). Supports streaming, tool calls, mid-session model switching, image input via Z.AI Coding Plan Vision MCP, and session load/fork/resume with on-disk persistence.",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/glm-acp-agent.svg",
       distribution: {
         npx: {
-          package: "glm-acp-agent@1.1.3"
+          package: "glm-acp-agent@1.1.4"
         }
       }
     },
     {
       id: "goose",
       name: "goose",
-      version: "1.33.1",
+      version: "1.34.1",
       description: "A local, extensible, open source AI agent that automates engineering tasks",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/goose.svg",
       distribution: {
@@ -79702,12 +79716,12 @@ Task description:
     {
       id: "kilo",
       name: "Kilo",
-      version: "7.2.52",
+      version: "7.3.0",
       description: "The open source coding agent",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/kilo.svg",
       distribution: {
         npx: {
-          package: "@kilocode/cli@7.2.52",
+          package: "@kilocode/cli@7.3.0",
           args: [
             "acp"
           ]
@@ -79717,7 +79731,7 @@ Task description:
     {
       id: "kimi",
       name: "Kimi CLI",
-      version: "1.43.0",
+      version: "1.44.0",
       description: "Moonshot AI's coding assistant",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/kimi.svg",
       distribution: {
@@ -79769,12 +79783,12 @@ Task description:
     {
       id: "nova",
       name: "Nova",
-      version: "1.1.8",
+      version: "1.1.9",
       description: "Nova by Compass AI - a fully-fledged software engineer at your command",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/nova.svg",
       distribution: {
         npx: {
-          package: "@compass-ai/nova@1.1.8",
+          package: "@compass-ai/nova@1.1.9",
           args: [
             "acp"
           ]
@@ -79784,7 +79798,7 @@ Task description:
     {
       id: "opencode",
       name: "OpenCode",
-      version: "1.14.48",
+      version: "1.15.5",
       description: "The open source coding agent",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/opencode.svg",
       distribution: {
@@ -79802,24 +79816,24 @@ Task description:
     {
       id: "pi-acp",
       name: "pi ACP",
-      version: "0.0.26",
+      version: "0.0.27",
       description: "ACP adapter for pi coding agent",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/pi-acp.svg",
       distribution: {
         npx: {
-          package: "pi-acp@0.0.26"
+          package: "pi-acp@0.0.27"
         }
       }
     },
     {
       id: "qoder",
       name: "Qoder CLI",
-      version: "0.2.13",
+      version: "0.2.14",
       description: "AI coding assistant with agentic capabilities",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/qoder.svg",
       distribution: {
         npx: {
-          package: "@qoder-ai/qodercli@0.2.13",
+          package: "@qoder-ai/qodercli@0.2.14",
           args: [
             "--acp"
           ]
@@ -79857,7 +79871,7 @@ Task description:
     {
       id: "stakpak",
       name: "Stakpak",
-      version: "0.3.80",
+      version: "0.3.81",
       description: "Open-source DevOps agent in Rust with enterprise-grade security",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/stakpak.svg",
       distribution: {
@@ -82155,6 +82169,68 @@ Task description:
     }
     return result;
   };
+  const parseCodexProposedPlanTags = (text, turnId) => {
+    const planRegex = /(^|\r?\n)[ \t]*<proposed_plan>[ \t]*(?:\r?\n)((?:(?!<proposed_plan>)[\s\S])*?)(\r?\n)[ \t]*<\/proposed_plan>[ \t]*(?=\r?\n|$)/g;
+    const result = [];
+    let lastIndex = 0;
+    let insertIndex;
+    let markdown = "";
+    let match5;
+    while ((match5 = planRegex.exec(text)) !== null) {
+      const leadingNewline = match5[1] ?? "";
+      const textBeforeEnd = match5.index + leadingNewline.length;
+      if (textBeforeEnd > lastIndex) {
+        const textBefore = text.slice(lastIndex, textBeforeEnd);
+        if (textBefore) {
+          result.push({
+            type: "text",
+            text: textBefore
+          });
+        }
+      }
+      insertIndex ??= result.length;
+      markdown += match5[2] ?? "";
+      lastIndex = planRegex.lastIndex;
+    }
+    if (insertIndex === void 0) {
+      return [
+        {
+          type: "text",
+          text
+        }
+      ];
+    }
+    if (lastIndex < text.length) {
+      const textAfter = text.slice(lastIndex);
+      if (textAfter) {
+        result.push({
+          type: "text",
+          text: textAfter
+        });
+      }
+    }
+    if (markdown.trim()) {
+      result.splice(insertIndex, 0, {
+        type: "proposed_plan",
+        turnId,
+        markdown,
+        status: "completed",
+        isLatest: true
+      });
+    }
+    return result;
+  };
+  const parseAssistantTextTags = (text, turnId) => {
+    const withThoughts = parseClaudeCodeThinkingTags(text);
+    return withThoughts.flatMap((item) => {
+      if (item.type !== "text") {
+        return [
+          item
+        ];
+      }
+      return parseCodexProposedPlanTags(item.text, turnId);
+    });
+  };
   const buildMessageContentFromNotification = (message) => {
     const { update: update2 } = message;
     switch (update2.sessionUpdate) {
@@ -82412,6 +82488,11 @@ Task description:
           this.upsertSingletonItem(entryIndex, "available_commands", message);
           return;
         }
+        case "proposed_plan": {
+          const entryIndex = this.ensureActiveAssistantEntry();
+          this.upsertProposedPlanItem(entryIndex, message);
+          return;
+        }
         case "tool_call": {
           const existingEntryIndex = this.resolveToolCallEntryIndex(message.toolCallId);
           if (existingEntryIndex !== void 0) {
@@ -82471,6 +82552,20 @@ Task description:
       entry2.items = compacted;
       this.parsedItemsByEntryIndex[entryIndex] = compacted;
     }
+    upsertProposedPlanItem(entryIndex, next) {
+      const entry2 = this.history[entryIndex];
+      if (!entry2) return;
+      const items2 = this.ensureEntryItems(entryIndex);
+      const existingIndex = items2.findIndex((item) => item.type === "proposed_plan" && item.turnId === next.turnId);
+      if (existingIndex >= 0) {
+        items2[existingIndex] = next;
+        return;
+      }
+      items2.push(next);
+      const compacted = compactAdjacentTextAndThought(items2);
+      entry2.items = compacted;
+      this.parsedItemsByEntryIndex[entryIndex] = compacted;
+    }
     upsertToolCall(entryIndex, incoming) {
       const entry2 = this.history[entryIndex];
       if (!entry2) return;
@@ -82502,12 +82597,12 @@ Task description:
             continue;
           }
           const text = item.text;
-          if (!text.includes("<thinking>")) {
+          if (!text.includes("<thinking>") && !text.includes("<proposed_plan>")) {
             newItems.push(item);
             continue;
           }
-          const parsed = parseClaudeCodeThinkingTags(text);
-          if (parsed.length > 1 || parsed.length === 1 && parsed[0]?.type !== "text") {
+          const parsed = parseAssistantTextTags(text, entry2.id);
+          if (parsed.length !== 1 || parsed[0]?.type !== "text" || parsed[0]?.type === "text" && parsed[0].text !== text) {
             newItems.push(...parsed);
             modified = true;
           } else {
@@ -82525,6 +82620,216 @@ Task description:
   const applyNotificationOnHistory = (history, notifications, model, options = {}) => {
     return new NotificationOnHistoryApplier(history, options, model).apply(notifications);
   };
+  const applyMessageContentsBatch = (history, messages, options = {}) => {
+    if (messages.length === 0) {
+      return history;
+    }
+    const createId = options.createId ?? defaultCreateId$1;
+    const now2 = options.now ?? (() => (/* @__PURE__ */ new Date()).toISOString());
+    const parseEntryItems = (entry2) => {
+      const rawItems = entry2.items;
+      return Array.isArray(rawItems) ? rawItems : [];
+    };
+    const writeEntryItems2 = (entry2, items2) => {
+      return {
+        ...entry2,
+        items: items2
+      };
+    };
+    const createAssistantEntryState = () => ({
+      entry: {
+        id: options.targetAssistantEntryId ?? createId(),
+        role: "assistant",
+        items: [],
+        timestamp: now2(),
+        userId: void 0,
+        read: void 0,
+        fileDiff: []
+      },
+      items: [],
+      dirty: true
+    });
+    const entryStates = history.map((entry2) => {
+      return {
+        entry: entry2,
+        items: parseEntryItems(entry2),
+        dirty: false
+      };
+    });
+    const ensureActiveAssistantEntry = () => {
+      if (options.targetAssistantEntryId) {
+        const targetIndex = entryStates.findIndex((state2) => state2.entry.role === "assistant" && state2.entry.id === options.targetAssistantEntryId);
+        if (targetIndex >= 0) {
+          return targetIndex;
+        }
+        entryStates.push(createAssistantEntryState());
+        return entryStates.length - 1;
+      }
+      const lastIndex = entryStates.length - 1;
+      const last2 = lastIndex >= 0 ? entryStates[lastIndex] : void 0;
+      if (last2 && last2.entry.role === "assistant") {
+        return lastIndex;
+      }
+      entryStates.push(createAssistantEntryState());
+      return entryStates.length - 1;
+    };
+    const appendOrMergeAdjacentText = (entryIndex, kind, delta) => {
+      if (!delta) return;
+      const state2 = entryStates[entryIndex];
+      if (!state2) return;
+      const last2 = state2.items[state2.items.length - 1];
+      if (last2 && last2.type === kind) {
+        const existing = last2;
+        const text = sanitizeLodyInternalInstructions(mergeStreamChunk(existing.text, delta));
+        if (text) {
+          state2.items[state2.items.length - 1] = {
+            ...existing,
+            text
+          };
+        } else {
+          state2.items.pop();
+        }
+      } else {
+        state2.items.push({
+          type: kind,
+          text: delta
+        });
+      }
+      state2.dirty = true;
+    };
+    const upsertSingletonItem = (entryIndex, type2, next) => {
+      const state2 = entryStates[entryIndex];
+      if (!state2) return;
+      const last2 = state2.items[state2.items.length - 1];
+      if (last2 && last2.type === type2) {
+        state2.items[state2.items.length - 1] = next;
+        state2.dirty = true;
+        return;
+      }
+      const withoutType = state2.items.filter((m) => m.type !== type2);
+      withoutType.push(next);
+      state2.items = compactAdjacentTextAndThought(withoutType);
+      state2.dirty = true;
+    };
+    const upsertProposedPlanItem = (entryIndex, next) => {
+      const state2 = entryStates[entryIndex];
+      if (!state2) return;
+      const existingIndex = state2.items.findIndex((item) => item.type === "proposed_plan" && item.turnId === next.turnId);
+      if (existingIndex >= 0) {
+        state2.items[existingIndex] = next;
+        state2.dirty = true;
+        return;
+      }
+      state2.items.push(next);
+      state2.items = compactAdjacentTextAndThought(state2.items);
+      state2.dirty = true;
+    };
+    const upsertToolCall = (entryIndex, incoming) => {
+      const state2 = entryStates[entryIndex];
+      if (!state2) return;
+      const toolIndex = state2.items.findIndex((m) => m.type === "tool_call" && m.toolCallId === incoming.toolCallId);
+      if (toolIndex >= 0) {
+        const prevTool = state2.items[toolIndex];
+        state2.items[toolIndex] = mergeToolCallMessage(prevTool, incoming);
+      } else {
+        state2.items.push({
+          ...incoming,
+          status: incoming.status || "pending",
+          content: incoming.content ? compactToolCallContentForHistory(incoming.content, {
+            kind: incoming.kind ?? void 0
+          }) : void 0
+        });
+      }
+      state2.dirty = true;
+    };
+    const toolCallEntryIndexById = /* @__PURE__ */ new Map();
+    for (let i2 = 0; i2 < entryStates.length; i2++) {
+      const state2 = entryStates[i2];
+      if (!state2) continue;
+      for (const content of state2.items) {
+        if (content.type === "tool_call") {
+          toolCallEntryIndexById.set(content.toolCallId, i2);
+        }
+      }
+    }
+    for (const message of messages) {
+      switch (message.type) {
+        case "text": {
+          const text = sanitizeLodyInternalInstructions(message.text);
+          if (!text) break;
+          const entryIndex = ensureActiveAssistantEntry();
+          appendOrMergeAdjacentText(entryIndex, "text", text);
+          break;
+        }
+        case "thought": {
+          const text = sanitizeLodyInternalInstructions(message.text);
+          if (!text) break;
+          const entryIndex = ensureActiveAssistantEntry();
+          appendOrMergeAdjacentText(entryIndex, "thought", text);
+          break;
+        }
+        case "plan": {
+          const entryIndex = ensureActiveAssistantEntry();
+          const state2 = entryStates[entryIndex];
+          if (state2) {
+            state2.entry.plan = message.entries;
+            state2.dirty = true;
+          }
+          break;
+        }
+        case "available_commands": {
+          const entryIndex = ensureActiveAssistantEntry();
+          upsertSingletonItem(entryIndex, "available_commands", message);
+          break;
+        }
+        case "proposed_plan": {
+          const entryIndex = ensureActiveAssistantEntry();
+          upsertProposedPlanItem(entryIndex, message);
+          break;
+        }
+        case "tool_call": {
+          const existingEntryIndex = toolCallEntryIndexById.get(message.toolCallId);
+          if (existingEntryIndex !== void 0) {
+            upsertToolCall(existingEntryIndex, message);
+          } else {
+            const entryIndex = ensureActiveAssistantEntry();
+            upsertToolCall(entryIndex, message);
+            toolCallEntryIndexById.set(message.toolCallId, entryIndex);
+          }
+          break;
+        }
+      }
+    }
+    for (const state2 of entryStates) {
+      if (!state2.dirty || state2.entry.role !== "assistant") continue;
+      let modified = false;
+      const newItems = [];
+      for (const item of state2.items) {
+        if (item.type !== "text") {
+          newItems.push(item);
+          continue;
+        }
+        if (!item.text.includes("<thinking>") && !item.text.includes("<proposed_plan>")) {
+          newItems.push(item);
+          continue;
+        }
+        const parsed = parseAssistantTextTags(item.text, state2.entry.id);
+        if (parsed.length !== 1 || parsed[0]?.type !== "text" || parsed[0]?.type === "text" && parsed[0].text !== item.text) {
+          newItems.push(...parsed);
+          modified = true;
+        } else {
+          newItems.push(item);
+        }
+      }
+      if (modified) {
+        state2.items = compactAdjacentTextAndThought(newItems);
+      }
+    }
+    return entryStates.map((state2) => {
+      if (!state2.dirty) return state2.entry;
+      return writeEntryItems2(state2.entry, state2.items);
+    });
+  };
   const defaultNow = () => (/* @__PURE__ */ new Date()).toISOString();
   const defaultCreateId = () => {
     const maybeCrypto = globalThis.crypto;
@@ -82647,14 +82952,29 @@ Task description:
     };
   }
   const isRecord$4 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+  const getBooleanField = (value, camelCaseKey, snakeCaseKey) => value[camelCaseKey] === true || value[snakeCaseKey] === true;
   const getClaudeCodeMeta = (meta) => {
     if (!isRecord$4(meta)) return null;
     const claudeCode = meta.claudeCode;
     return isRecord$4(claudeCode) ? claudeCode : null;
   };
+  const getCodexMeta = (meta) => {
+    if (!isRecord$4(meta)) return null;
+    const codex = meta.codex;
+    return isRecord$4(codex) ? codex : null;
+  };
   function parseAskUserQuestionPermissionMeta(meta) {
     const claudeCode = getClaudeCodeMeta(meta);
-    if (!claudeCode) return null;
+    if (claudeCode) {
+      return parseClaudeAskUserQuestionPermissionMeta(claudeCode);
+    }
+    const codex = getCodexMeta(meta);
+    if (codex) {
+      return parseCodexRequestUserInputPermissionMeta(codex);
+    }
+    return null;
+  }
+  function parseClaudeAskUserQuestionPermissionMeta(claudeCode) {
     const raw = claudeCode.askUserQuestion;
     if (!isRecord$4(raw)) return null;
     const rawQuestions = raw.questions;
@@ -82687,11 +83007,55 @@ Task description:
       });
     }
     return {
+      source: "claude",
       version: typeof raw.version === "number" && Number.isFinite(raw.version) ? raw.version : 1,
       allowCustomAnswer: raw.allowCustomAnswer === true,
       questions
     };
   }
+  function parseCodexRequestUserInputPermissionMeta(codex) {
+    const raw = codex.requestUserInput;
+    if (!isRecord$4(raw)) return null;
+    const rawQuestions = raw.questions;
+    if (!Array.isArray(rawQuestions) || rawQuestions.length === 0) return null;
+    const questions = [];
+    for (const rawQuestion of rawQuestions) {
+      if (!isRecord$4(rawQuestion)) return null;
+      if (typeof rawQuestion.id !== "string") return null;
+      if (typeof rawQuestion.question !== "string") return null;
+      if (typeof rawQuestion.header !== "string") return null;
+      const rawOptions = rawQuestion.options;
+      const options = [];
+      if (rawOptions !== void 0) {
+        if (!Array.isArray(rawOptions)) return null;
+        for (const rawOption of rawOptions) {
+          if (!isRecord$4(rawOption)) return null;
+          if (typeof rawOption.label !== "string") return null;
+          options.push({
+            label: rawOption.label,
+            ...typeof rawOption.description === "string" ? {
+              description: rawOption.description
+            } : {}
+          });
+        }
+      }
+      questions.push({
+        id: rawQuestion.id,
+        question: rawQuestion.question,
+        header: rawQuestion.header,
+        options,
+        multiSelect: false,
+        allowCustomAnswer: getBooleanField(rawQuestion, "isOther", "is_other"),
+        isSecret: getBooleanField(rawQuestion, "isSecret", "is_secret")
+      });
+    }
+    return {
+      source: "codex",
+      version: 1,
+      allowCustomAnswer: questions.some((question) => question.allowCustomAnswer === true),
+      questions
+    };
+  }
   function isAskUserQuestionPermissionMeta(meta) {
     return parseAskUserQuestionPermissionMeta(meta) !== null;
   }
@@ -85425,6 +85789,26 @@ ${tailedOutput}` : null;
   };
   const isPreviewTunnelCreateResponse = (value) => isRecord$3(value) && isString$2(value.tunnelId) && isString$2(value.publicUrl) && isString$2(value.websocketUrl) && isString$2(value.sessionToken) && typeof value.expiresAt === "number" && (value.resourceLimits === void 0 || isPreviewResourceLimits(value.resourceLimits));
   const isPreviewTunnelRefreshResponse = (value) => isRecord$3(value) && isString$2(value.websocketUrl) && isString$2(value.sessionToken) && typeof value.expiresAt === "number";
+  class InFlightDedupe {
+    inFlight = /* @__PURE__ */ new Map();
+    async run(key2, factory) {
+      const existing = this.inFlight.get(key2);
+      if (existing) {
+        return await existing;
+      }
+      let wrapped;
+      wrapped = factory().finally(() => {
+        if (this.inFlight.get(key2) === wrapped) {
+          this.inFlight.delete(key2);
+        }
+      });
+      this.inFlight.set(key2, wrapped);
+      return await wrapped;
+    }
+    size() {
+      return this.inFlight.size;
+    }
+  }
   const LOCAL_PROBE_PORT$1 = 17789;
   const LOCAL_SESSION_CONTROL_PORT = 17790;
   const IMAGE_UPLOAD_PATH = "/image-upload";
@@ -92876,18 +93260,18 @@ ${val.stack}`;
     };
   }
   function decodeMultipartMixed$1(boundary, data) {
-    const delimiter = new TextEncoder().encode(`--${boundary}`);
+    const delimiter2 = new TextEncoder().encode(`--${boundary}`);
     const closeDelimiter = new TextEncoder().encode(`--${boundary}--`);
     const crlfCrlf = new TextEncoder().encode("\r\n\r\n");
     const parts2 = [];
     let pos = 0;
-    const firstDelimPos = indexOf$1(data, delimiter, pos);
+    const firstDelimPos = indexOf$1(data, delimiter2, pos);
     if (firstDelimPos < 0) return parts2;
-    pos = firstDelimPos + delimiter.byteLength;
+    pos = firstDelimPos + delimiter2.byteLength;
     if (pos < data.byteLength && data[pos] === 13) pos += 1;
     if (pos < data.byteLength && data[pos] === 10) pos += 1;
     while (pos < data.byteLength) {
-      if (startsWith$1(data.subarray(pos), closeDelimiter.subarray(delimiter.byteLength))) break;
+      if (startsWith$1(data.subarray(pos), closeDelimiter.subarray(delimiter2.byteLength))) break;
       const headerEnd = indexOf$1(data, crlfCrlf, pos);
       if (headerEnd < 0) break;
       const headerBytes = data.subarray(pos, headerEnd);
@@ -92900,7 +93284,7 @@ ${val.stack}`;
         contentType = line3.slice(colon + 1).trim();
       }
       const bodyStart = headerEnd + crlfCrlf.byteLength;
-      const nextDelimiter = indexOf$1(data, delimiter, bodyStart);
+      const nextDelimiter = indexOf$1(data, delimiter2, bodyStart);
       if (nextDelimiter < 0) {
         parts2.push({
           contentType,
@@ -92914,7 +93298,7 @@ ${val.stack}`;
         contentType,
         body: data.subarray(bodyStart, bodyEnd)
       });
-      pos = nextDelimiter + delimiter.byteLength;
+      pos = nextDelimiter + delimiter2.byteLength;
       if (pos + 1 < data.byteLength && data[pos] === 45 && data[pos + 1] === 45) break;
       if (pos < data.byteLength && data[pos] === 13) pos += 1;
       if (pos < data.byteLength && data[pos] === 10) pos += 1;
@@ -111655,14 +112039,14 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
     const split2 = text.split(new RegExp(`\\s*${escape$1(delim)}\\s*`));
     return split2;
   };
-  const parsePrimitive = (text, path2, primitive, delimiter, split2) => {
+  const parsePrimitive = (text, path2, primitive, delimiter2, split2) => {
     if (!split2) {
       return pipe$1(primitive.parse(text), mapBoth({
         onFailure: prefixed(path2),
         onSuccess: of$3
       }));
     }
-    return pipe$1(splitPathString(text, delimiter), forEachSequential((char) => primitive.parse(char.trim())), mapError(prefixed(path2)));
+    return pipe$1(splitPathString(text, delimiter2), forEachSequential((char) => primitive.parse(char.trim())), mapError(prefixed(path2)));
   };
   const transpose = (array2) => {
     return Object.keys(array2[0]).map((column) => array2.map((row) => row[column]));
@@ -118481,18 +118865,18 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
     };
   }
   function decodeMultipartMixed(boundary, data) {
-    const delimiter = new TextEncoder().encode(`--${boundary}`);
+    const delimiter2 = new TextEncoder().encode(`--${boundary}`);
     const closeDelimiter = new TextEncoder().encode(`--${boundary}--`);
     const crlfCrlf = new TextEncoder().encode("\r\n\r\n");
     const parts2 = [];
     let pos = 0;
-    const firstDelimPos = indexOf(data, delimiter, pos);
+    const firstDelimPos = indexOf(data, delimiter2, pos);
     if (firstDelimPos < 0) return parts2;
-    pos = firstDelimPos + delimiter.byteLength;
+    pos = firstDelimPos + delimiter2.byteLength;
     if (pos < data.byteLength && data[pos] === 13) pos += 1;
     if (pos < data.byteLength && data[pos] === 10) pos += 1;
     while (pos < data.byteLength) {
-      if (startsWith(data.subarray(pos), closeDelimiter.subarray(delimiter.byteLength))) break;
+      if (startsWith(data.subarray(pos), closeDelimiter.subarray(delimiter2.byteLength))) break;
       const headerEnd = indexOf(data, crlfCrlf, pos);
       if (headerEnd < 0) break;
       const headerBytes = data.subarray(pos, headerEnd);
@@ -118505,7 +118889,7 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
         contentType = line3.slice(colon + 1).trim();
       }
       const bodyStart = headerEnd + crlfCrlf.byteLength;
-      const nextDelimiter = indexOf(data, delimiter, bodyStart);
+      const nextDelimiter = indexOf(data, delimiter2, bodyStart);
       if (nextDelimiter < 0) {
         parts2.push({
           contentType,
@@ -118519,7 +118903,7 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
         contentType,
         body: data.subarray(bodyStart, bodyEnd)
       });
-      pos = nextDelimiter + delimiter.byteLength;
+      pos = nextDelimiter + delimiter2.byteLength;
       if (pos + 1 < data.byteLength && data[pos] === 45 && data[pos + 1] === 45) break;
       if (pos < data.byteLength && data[pos] === 13) pos += 1;
       if (pos < data.byteLength && data[pos] === 10) pos += 1;
@@ -119728,6 +120112,11 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
   const JSON_RPC_VERSION$1 = "2.0";
   const LORO_STREAMS_RPC_VERSION = "1";
   const LORO_STREAMS_RPC_RETENTION_SECONDS = 86400;
+  const LORO_STREAMS_RPC_ERROR_CODES = {
+    rpcVersionMismatch: "rpc_version_mismatch",
+    methodUnavailable: "method_unavailable",
+    internalError: "internal_error"
+  };
   const LORO_RPC_REQUEST_STREAM_SEGMENT = "rpc:req";
   const getLoroMachineRpcRequestStreamId = (workspaceId, machineId) => `${workspaceId}:${LORO_RPC_REQUEST_STREAM_SEGMENT}:${machineId}`;
   const normalizeLoroGatewayBaseUrl = (baseUrl) => {
@@ -119758,8 +120147,8 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
     machineId: string$2().trim().min(1),
     workspaceId: string$2().trim().min(1),
     replyTo: string$2().trim().min(1),
-    sentAt: number$3().int().nonnegative(),
-    expiresAt: number$3().int().positive()
+    sentAt: number$3().finite().nonnegative(),
+    expiresAt: number$3().finite().positive()
   }).strict();
   const LoroMachineStatusRpcRequestSchema = BaseRpcRequestSchema.extend({
     method: literal("machine/status"),
@@ -120052,19 +120441,11 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
       while (!this.stopped) {
         try {
           await (this.deps.streamClient.readJsonLive?.(this.requestStreamId, this.requestState, async (batch) => {
-            this.requestState.nextOffset = batch.nextOffset ?? this.requestState.nextOffset;
-            this.requestState.cursor = batch.cursor;
-            for (const raw of batch.messages) {
-              await this.handleRawRequest(raw);
-            }
+            await this.handleRequestBatch(batch);
           }, {
             signal: this.stopController.signal
           }) ?? readJsonLiveViaLongPollFallback(this.deps.streamClient, this.requestStreamId, this.requestState, async (batch) => {
-            this.requestState.nextOffset = batch.nextOffset ?? this.requestState.nextOffset;
-            this.requestState.cursor = batch.cursor;
-            for (const raw of batch.messages) {
-              await this.handleRawRequest(raw);
-            }
+            await this.handleRequestBatch(batch);
           }, {
             signal: this.stopController.signal
           }));
@@ -120098,6 +120479,13 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
         }
       }
     }
+    async handleRequestBatch(batch) {
+      this.requestState.nextOffset = batch.nextOffset ?? this.requestState.nextOffset;
+      this.requestState.cursor = batch.cursor;
+      for (const raw of batch.messages) {
+        await this.handleRawRequest(raw);
+      }
+    }
     async handleRawRequest(raw) {
       const parsed = LoroStreamsRpcRequestSchema.safeParse(raw);
       if (!parsed.success) {
@@ -120114,7 +120502,7 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
       }
       if (request.rpcVersion !== (this.deps.rpcVersion ?? LORO_STREAMS_RPC_VERSION)) {
         await this.appendErrorResponse(request.replyTo, request.id, request.method, {
-          code: "rpc_version_mismatch",
+          code: LORO_STREAMS_RPC_ERROR_CODES.rpcVersionMismatch,
           message: `Expected rpcVersion=${this.deps.rpcVersion ?? LORO_STREAMS_RPC_VERSION}, got ${request.rpcVersion}`
         });
         return;
@@ -120138,7 +120526,7 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
           case "session/preview-create": {
             if (!this.deps.createSessionPreview) {
               await this.appendErrorResponse(request.replyTo, request.id, request.method, {
-                code: "method_unavailable",
+                code: LORO_STREAMS_RPC_ERROR_CODES.methodUnavailable,
                 message: "Session preview creation is not available on this machine."
               });
               return;
@@ -120154,7 +120542,7 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
           case "session/preview-revoke": {
             if (!this.deps.revokeSessionPreview) {
               await this.appendErrorResponse(request.replyTo, request.id, request.method, {
-                code: "method_unavailable",
+                code: LORO_STREAMS_RPC_ERROR_CODES.methodUnavailable,
                 message: "Session preview revocation is not available on this machine."
               });
               return;
@@ -120170,7 +120558,7 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
           case "local-project/git-state": {
             if (!this.deps.getLocalProjectGitState) {
               await this.appendErrorResponse(request.replyTo, request.id, request.method, {
-                code: "method_unavailable",
+                code: LORO_STREAMS_RPC_ERROR_CODES.methodUnavailable,
                 message: "Local project Git state is not available on this machine."
               });
               return;
@@ -120185,7 +120573,7 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
           case "local-project/control": {
             if (!this.deps.dispatchLocalProjectControl) {
               await this.appendErrorResponse(request.replyTo, request.id, request.method, {
-                code: "method_unavailable",
+                code: LORO_STREAMS_RPC_ERROR_CODES.methodUnavailable,
                 message: "Local project control is not available on this machine."
               });
               return;
@@ -120198,7 +120586,7 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
       } catch (error2) {
         const message = error2 instanceof Error ? error2.message : String(error2);
         await this.appendErrorResponse(request.replyTo, request.id, request.method, {
-          code: "internal_error",
+          code: LORO_STREAMS_RPC_ERROR_CODES.internalError,
           message
         });
       }
@@ -120255,6 +120643,8 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
       return raw;
     }
   };
+  const DEFAULT_GIT_COMMAND_TIMEOUT_MS = 5e3;
+  const GIT_CHECKOUT_TIMEOUT_MS = 3e4;
   function tryRealpath(inputPath) {
     try {
       if (typeof fs$6.realpathSync.native === "function") {
@@ -120297,7 +120687,8 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
     const hash2 = createHash("sha256").update(normalizedRootPath).digest("hex").slice(0, 24);
     return `local-project-${hash2}`;
   }
-  function runGitCommand$1(rootPath, args2) {
+  function runGitCommand$1(rootPath, args2, options = {}) {
+    const timeoutMs = options.timeoutMs ?? DEFAULT_GIT_COMMAND_TIMEOUT_MS;
     try {
       const result = spawn.sync("git", args2, {
         cwd: rootPath,
@@ -120306,13 +120697,30 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
           "ignore",
           "pipe",
           "pipe"
-        ]
+        ],
+        timeout: timeoutMs,
+        killSignal: "SIGTERM",
+        env: {
+          ...process.env,
+          GIT_TERMINAL_PROMPT: "0",
+          GIT_OPTIONAL_LOCKS: "0"
+        }
       });
-      return {
+      if (result.error) {
+        const message = result.error.message || `Git command timed out after ${timeoutMs}ms: git ${args2.join(" ")}`;
+        const commandResult2 = {
+          status: null,
+          stdout: String(result.stdout ?? ""),
+          stderr: message
+        };
+        return commandResult2;
+      }
+      const commandResult = {
         status: result.status ?? null,
         stdout: String(result.stdout ?? ""),
         stderr: String(result.stderr ?? "")
       };
+      return commandResult;
     } catch (error2) {
       const message = error2 instanceof Error ? error2.message : String(error2);
       return {
@@ -120523,7 +120931,7 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
     const statusResult = runGitCommand$1(rootPath, [
       "status",
       "--porcelain=v1",
-      "--untracked-files=all"
+      "--untracked-files=normal"
     ]);
     if (statusResult.status !== 0) {
       const reason = statusResult.stderr.trim() || statusResult.stdout.trim() || "unknown error";
@@ -120604,7 +121012,9 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
     const checkoutResult = runGitCommand$1(normalizedRootPath, [
       "checkout",
       normalizedBranchName
-    ]);
+    ], {
+      timeoutMs: GIT_CHECKOUT_TIMEOUT_MS
+    });
     if (checkoutResult.status !== 0) {
       const reason = checkoutResult.stderr.trim() || checkoutResult.stdout.trim() || "unknown error";
       throw new Error(`Failed to checkout git branch: ${reason}`);
@@ -122253,6 +122663,18 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
   const ThreadGoalClearedParamsSchema = object$1({
     threadId: string$2()
   });
+  const CodexProposedPlanParamsSchema = object$1({
+    schemaVersion: literal(1),
+    sessionId: string$2(),
+    turnId: string$2(),
+    markdown: string$2(),
+    status: _enum$1([
+      "delta",
+      "completed",
+      "cleared"
+    ]),
+    isLatest: boolean()
+  });
   const CODEX_IMAGE_GENERATION_TOOL_TITLE = "Image generation";
   const CODEX_IMAGE_GENERATION_REVISED_PROMPT_PREFIX = "Revised prompt: ";
   function extractCodexImageGenerationFields(content) {
@@ -122547,7 +122969,28 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
           this.options.onThreadGoalCleared?.(result.data.threadId);
           break;
         }
+        case "acp_ext:codex_proposed_plan": {
+          this.tryHandleCodexProposedPlanExtension(resolvedMethod, params);
+          break;
+        }
+        default:
+          this.logger.debug(`[${this.options.sessionId}] Ignoring extension message ${resolvedMethod}`);
+      }
+    }
+    tryHandleCodexProposedPlanExtension(method, params) {
+      if (!this.options.onCodexProposedPlan) return;
+      const result = CodexProposedPlanParamsSchema.safeParse(params);
+      if (!result.success) {
+        this.logger.debug(`[${this.options.sessionId}] Dropping invalid Codex proposed plan update from ${method}: ${result.error.message}`);
+        return;
       }
+      this.options.onCodexProposedPlan({
+        type: "proposed_plan",
+        turnId: result.data.turnId,
+        markdown: result.data.markdown,
+        status: result.data.status,
+        isLatest: result.data.isLatest
+      });
     }
     isCodexAgent() {
       return this.options.agentConfig?.agentType === "codex";
@@ -122575,6 +123018,9 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
           _meta: {
             claudeCode: {
               askUserQuestion: true
+            },
+            codex: {
+              requestUserInput: true
             }
           }
         }
@@ -122909,7 +123355,7 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
     },
     codex: {
       packageName: "acp-extension-codex",
-      version: "0.14.3",
+      version: "0.14.5",
       binName: "acp-extension-codex",
       args: [
         "-c",
@@ -122921,6 +123367,11 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
   };
   const OFFICIAL_NPM_REGISTRY = "https://registry.npmjs.org/";
   const NPX_CACHE_MODE_ARG = "--prefer-online";
+  const DEFAULT_ACP_PATH_RELATIVE_DIRS = [
+    ".local/bin",
+    "bin",
+    ".claude/local"
+  ];
   const registryAgentsById = Object.fromEntries(REGISTRY_ACP_AGENTS.map((agent) => [
     agent.id,
     agent
@@ -123084,6 +123535,60 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
     }
     throw new Error(`Unsupported ACP cliType: ${input2.cliType}`);
   }
+  function resolveACPProcessLaunch(input2) {
+    const setting = resolveACPSetting(input2);
+    return {
+      command: setting.exec.command,
+      args: [
+        ...setting.exec.args,
+        ...input2.extraArgs ?? []
+      ],
+      env: setting.exec.env
+    };
+  }
+  function mergeACPProcessEnv(launch, baseEnv) {
+    return launch.env ? {
+      ...baseEnv,
+      ...launch.env
+    } : baseEnv;
+  }
+  function getPathEnvKey(env2) {
+    if (process.platform !== "win32") {
+      return "PATH";
+    }
+    return Object.keys(env2).find((key2) => key2.toLowerCase() === "path") ?? "Path";
+  }
+  function normalizePathEntry(entry2) {
+    const normalized = normalize$2(entry2);
+    return normalized.length > 1 ? normalized.replace(/[\\/]+$/, "") : normalized;
+  }
+  function getDefaultAcpPathEntries(homeDir = homedir()) {
+    if (!homeDir) {
+      return [];
+    }
+    return DEFAULT_ACP_PATH_RELATIVE_DIRS.map((relativeDir) => join$2(homeDir, relativeDir));
+  }
+  function withDefaultAcpPathEntries(env2) {
+    const defaultEntries = getDefaultAcpPathEntries();
+    if (defaultEntries.length === 0) {
+      return env2;
+    }
+    const pathKey2 = getPathEnvKey(env2);
+    const currentParts = (env2[pathKey2] ?? "").split(delimiter).filter(Boolean);
+    const defaultEntrySet = new Set(defaultEntries.map(normalizePathEntry));
+    const currentWithoutDefaults = currentParts.filter((entry2) => !defaultEntrySet.has(normalizePathEntry(entry2)));
+    const nextPath = [
+      ...defaultEntries,
+      ...currentWithoutDefaults
+    ].join(delimiter);
+    if (env2[pathKey2] === nextPath) {
+      return env2;
+    }
+    return {
+      ...env2,
+      [pathKey2]: nextPath
+    };
+  }
   function createStdinWritableStream(stdin) {
     stdin.on("error", (err2) => {
       if (err2.code !== "EPIPE") {
@@ -123272,6 +123777,7 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
       onRateLimitUpdate: options.onRateLimitUpdate,
       onThreadGoalUpdated: options.onThreadGoalUpdated,
       onThreadGoalCleared: options.onThreadGoalCleared,
+      onCodexProposedPlan: options.onCodexProposedPlan,
       onCodexImageGenerationBegin: options.onCodexImageGenerationBegin,
       onCodexImageGenerationEnd: options.onCodexImageGenerationEnd
     });
@@ -123333,12 +123839,12 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
     await waitForChildProcessExit$1(child, exitTimeoutMs);
   }
   const spawnAcpProcess = (options) => {
-    const setting = resolveACPSetting({
+    const launch = resolveACPProcessLaunch({
       cliType: options.cliType,
       agentType: options.agentType
     });
-    const command2 = options.command ?? setting.exec.command;
-    const args2 = options.args ?? setting.exec.args;
+    const command2 = options.command ?? launch.command;
+    const args2 = options.args ?? launch.args;
     const spawnFn = options.spawnImpl ?? spawn;
     return spawnFn(command2, args2, {
       cwd: options.workdir,
@@ -123352,24 +123858,18 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
     });
   };
   const startLocalAcpAgent = async (options) => {
-    const setting = resolveACPSetting({
+    const launch = resolveACPProcessLaunch({
       cliType: options.cliType,
-      agentType: options.agentType
+      agentType: options.agentType,
+      extraArgs: options.extraArgs
     });
-    const args2 = [
-      ...setting.exec.args,
-      ...options.extraArgs ?? []
-    ];
     const baseEnv = options.env ?? process.env;
     const shouldUseWorkdirCodexHome = options.cliType === "builtin" && options.agentType === "codex" && !baseEnv.CODEX_HOME && (baseEnv.LODY_E2E === "1" || baseEnv.LODY_TITLE_AGENT === "1");
     const env2 = shouldUseWorkdirCodexHome ? {
       ...baseEnv,
       CODEX_HOME: path__default.join(options.workdir, ".codex")
     } : baseEnv;
-    const envWithAcpStartup = setting.exec.env ? {
-      ...env2,
-      ...setting.exec.env
-    } : env2;
+    const envWithAcpStartup = withDefaultAcpPathEntries(mergeACPProcessEnv(launch, env2));
     const keepCodexHome = env2.LODY_KEEP_CODEX_HOME === "1";
     const defaultCodexHome = path__default.join(os__default.homedir(), ".codex");
     const defaultAuthPath = path__default.join(defaultCodexHome, "auth.json");
@@ -123392,7 +123892,8 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
       agentType: options.agentType,
       workdir: options.workdir,
       env: envWithAcpStartup,
-      args: args2,
+      command: launch.command,
+      args: launch.args,
       spawnImpl: options.spawnImpl
     });
     options.logger.debug(`[acp-startup] spawned ACP process (cliType=${options.cliType} agentType=${options.agentType} workdir=${options.workdir})`);
@@ -123425,8 +123926,8 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
       }
     }, {
       sessionId: "acp-startup",
-      command: setting.exec.command,
-      args: args2,
+      command: launch.command,
+      args: launch.args,
       getStderrTail: () => stderrTail
     });
     if (shouldUseWorkdirCodexHome && env2.CODEX_HOME && !keepCodexHome) {
@@ -124144,7 +124645,8 @@ const normalizeRepoPath = (rawPath) => {
 
 const main = async () => {
   const action = process.argv[2];
-  if (action && action !== 'get') {
+  const isRejectAction = action === 'erase' || action === 'reject';
+  if (action && action !== 'get' && !isRejectAction) {
     debug('skip', { reason: 'unsupported_action', action });
     return;
   }
@@ -124183,23 +124685,18 @@ const main = async () => {
     return;
   }
 
-  /**
-   * Attempt to fetch credentials from a broker URL.
-   * Returns { success: true, json } on success, { success: false, error } on connection error,
-   * or { success: false } on other failures.
-   */
-  const tryFetchFromBroker = async (baseUrl, token) => {
+  const tryBrokerRequest = async (baseUrl, token, endpoint, body) => {
     const controller = new AbortController();
     const timeoutId = setTimeout(() => controller.abort(), 10000);
     try {
-      debug('fetch', { repoFullName, baseUrl });
-      const res = await fetchImpl(\`\${baseUrl}/git-credential\`, {
+      debug('fetch', { repoFullName, baseUrl, endpoint });
+      const res = await fetchImpl(\`\${baseUrl}\${endpoint}\`, {
         method: 'POST',
         headers: {
           'Content-Type': 'application/json',
           Authorization: \`Bearer \${token}\`,
         },
-        body: JSON.stringify({ repoFullName }),
+        body: JSON.stringify(body),
         signal: controller.signal,
       });
 
@@ -124214,11 +124711,6 @@ const main = async () => {
         return { success: false };
       }
 
-      if (!json || typeof json.username !== 'string' || typeof json.password !== 'string') {
-        return { success: false };
-      }
-      if (!json.username || !json.password) return { success: false };
-
       return { success: true, json };
     } catch (error) {
       debug('fetch_error', { repoFullName, error: error && error.message });
@@ -124228,8 +124720,36 @@ const main = async () => {
     }
   };
 
+  /**
+   * Attempt to fetch credentials from a broker URL.
+   * Returns { success: true, json } on success, { success: false, error } on connection error,
+   * or { success: false } on other failures.
+   */
+  const tryFetchFromBroker = async (baseUrl, token) => {
+    const result = await tryBrokerRequest(baseUrl, token, '/git-credential', { repoFullName });
+    if (!result.success) return result;
+
+    const json = result.json;
+    if (!json || typeof json.username !== 'string' || typeof json.password !== 'string') {
+      return { success: false };
+    }
+    if (!json.username || !json.password) return { success: false };
+
+    return result;
+  };
+
+  const tryRejectFromBroker = async (baseUrl, token) => {
+    const invalidatedToken = typeof req.password === 'string' ? req.password : undefined;
+    return tryBrokerRequest(baseUrl, token, '/git-credential/reject', {
+      repoFullName,
+      ...(invalidatedToken ? { invalidatedToken } : {}),
+    });
+  };
+
   const { url: baseUrl, token, source } = brokerConfig;
-  let result = await tryFetchFromBroker(baseUrl, token);
+  let result = isRejectAction
+    ? await tryRejectFromBroker(baseUrl, token)
+    : await tryFetchFromBroker(baseUrl, token);
 
   // If we had a connection error and we were using env vars, try the file fallback
   // This handles the case where the broker restarted on a different port
@@ -124237,10 +124757,17 @@ const main = async () => {
     const fileConfig = getBrokerConfigFromFile();
     if (fileConfig && fileConfig.url !== baseUrl) {
       debug('fallback', { from: baseUrl, to: fileConfig.url });
-      result = await tryFetchFromBroker(fileConfig.url, fileConfig.token);
+      result = isRejectAction
+        ? await tryRejectFromBroker(fileConfig.url, fileConfig.token)
+        : await tryFetchFromBroker(fileConfig.url, fileConfig.token);
     }
   }
 
+  if (isRejectAction) {
+    debug(result.success ? 'reject_success' : 'reject_failed', { repoFullName });
+    return;
+  }
+
   if (!result.success || !result.json) {
     return;
   }
@@ -125624,6 +126151,9 @@ path=/${options.repoFullName}.git
       acpFlushInFlight: null,
       acpFlushTimer: null,
       acpFlushCountInTurn: 0,
+      codexProposedPlanBuffer: /* @__PURE__ */ new Map(),
+      codexProposedPlanFlushInFlight: null,
+      codexProposedPlanFlushTimer: null,
       contextWindowUsageBuffer: null,
       contextWindowUsageTimer: null,
       pendingContextWindowHandlers: /* @__PURE__ */ new Set(),
@@ -125713,7 +126243,7 @@ path=/${options.repoFullName}.git
     hasPendingTurnWork(sessionId) {
       const state2 = this.sessions.get(sessionId);
       if (!state2) return false;
-      return state2.turn.phase !== "idle" || state2.acpUpdateBuffer.length > 0 || state2.acpFlushInFlight !== null || state2.acpFlushTimer !== null || state2.contextWindowUsageBuffer !== null || state2.contextWindowUsageTimer !== null || state2.pendingContextWindowHandlers.size > 0 || state2.pendingThreadGoalHandlers.size > 0 || state2.codexImageGenerationUploads.size > 0 || state2.pendingUnread;
+      return state2.turn.phase !== "idle" || state2.acpUpdateBuffer.length > 0 || state2.acpFlushInFlight !== null || state2.acpFlushTimer !== null || state2.codexProposedPlanBuffer.size > 0 || state2.codexProposedPlanFlushInFlight !== null || state2.codexProposedPlanFlushTimer !== null || state2.contextWindowUsageBuffer !== null || state2.contextWindowUsageTimer !== null || state2.pendingContextWindowHandlers.size > 0 || state2.pendingThreadGoalHandlers.size > 0 || state2.codexImageGenerationUploads.size > 0 || state2.pendingUnread;
     }
     clearTurnState(sessionId) {
       const state2 = this.sessions.get(sessionId);
@@ -125729,6 +126259,11 @@ path=/${options.repoFullName}.git
         state2.acpFlushTimer = null;
       }
       state2.acpFlushCountInTurn = 0;
+      state2.codexProposedPlanBuffer.clear();
+      if (state2.codexProposedPlanFlushTimer) {
+        clearTimeout(state2.codexProposedPlanFlushTimer);
+        state2.codexProposedPlanFlushTimer = null;
+      }
       if (state2.contextWindowUsageTimer) {
         clearTimeout(state2.contextWindowUsageTimer);
         state2.contextWindowUsageTimer = null;
@@ -125747,6 +126282,9 @@ path=/${options.repoFullName}.git
       if (state2.acpFlushTimer) {
         clearTimeout(state2.acpFlushTimer);
       }
+      if (state2.codexProposedPlanFlushTimer) {
+        clearTimeout(state2.codexProposedPlanFlushTimer);
+      }
       this.sessions.delete(sessionId);
     }
   }
@@ -126711,6 +127249,7 @@ $mem | ConvertTo-Json -Compress
     canceledTurnBySession = /* @__PURE__ */ new Map();
     currentTurnBySession = /* @__PURE__ */ new Map();
     turnRuntimeBySession = /* @__PURE__ */ new Map();
+    inFlightAcpRefresh = new InFlightDedupe();
     getExecutionSnapshot(sessionId) {
       const runtime = this.turnRuntimeBySession.get(sessionId);
       const currentTurnId = this.currentTurnBySession.get(sessionId);
@@ -128296,7 +128835,11 @@ $mem | ConvertTo-Json -Compress
           error: `Machine mismatch: expected ${this.deps.machineId}, got ${message.machineId}`
         };
       }
+      const dedupeKey = computeAcpRefreshDedupeKey(message.cliType, message.agentType, message.env);
       this.deps.logger.debug(`[acp-capabilities] Refresh requested (cliType=${message.cliType} agentType=${message.agentType})`);
+      return await this.inFlightAcpRefresh.run(dedupeKey, () => this.executeAcpRefresh(message));
+    }
+    async executeAcpRefresh(message) {
       try {
         const { modes, models, configOptions, availableCommands } = await this.deps.fetchAcpCapabilities(message.cliType, message.agentType, message.env);
         await this.deps.workspaceDocument.updateAcpCapabilities(this.deps.machineId, message.cliType, message.agentType, modes, models, configOptions, availableCommands, getAcpCapabilitySourceVersion({
@@ -128333,6 +128876,11 @@ $mem | ConvertTo-Json -Compress
       }
     }
   }
+  const computeAcpRefreshDedupeKey = (cliType, agentType, env2) => {
+    const sortedKeys = env2 ? Object.keys(env2).sort() : [];
+    const envSerialized = sortedKeys.map((k) => `${k}=${env2[k]}`).join("
");
+    return `${cliType}\0${agentType}\0${envSerialized}`;
+  };
   class SessionUserResolver {
     constructor(logger2, workspaceId) {
       this.logger = logger2;
@@ -131638,17 +132186,24 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
   function getProviderLabel$1(provider2) {
     return getLocalProjectHistoryProviderKey(provider2);
   }
+  function resolveHistoryACPProcessLaunch(args2) {
+    const launch = resolveACPProcessLaunch(args2.provider);
+    return {
+      ...launch,
+      env: mergeACPProcessEnv(launch, args2.env ?? process.env)
+    };
+  }
   async function createHistoryAcpConnection(args2) {
-    const setting = resolveACPSetting(args2.provider);
-    const env2 = setting.exec.env ? {
-      ...process.env,
-      ...setting.exec.env
-    } : process.env;
+    const launch = resolveHistoryACPProcessLaunch({
+      provider: args2.provider
+    });
     const agentProcess = spawnAcpProcess({
       cliType: args2.provider.cliType,
       agentType: args2.provider.agentType,
       workdir: args2.workdir,
-      env: env2
+      env: launch.env,
+      command: launch.command,
+      args: launch.args
     });
     agentProcess.stderr?.setEncoding("utf8");
     agentProcess.stderr?.on("data", (chunk) => {
@@ -132539,6 +133094,7 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
           streamClient: jsonStreamClient,
           rpcVersion: LORO_STREAMS_RPC_VERSION,
           retentionSeconds: LORO_STREAMS_RPC_RETENTION_SECONDS,
+          now: getServerNow,
           getMachineStatus: async () => await this.executionService.getMachineStatus({
             type: "machine/status",
             machineId: this.machineId,
@@ -132635,6 +133191,7 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
     usageTrackingService;
     static ACP_INITIAL_UPDATE_BATCH_WINDOW_MS = 10;
     static ACP_SUBSEQUENT_UPDATE_BATCH_WINDOW_MS = 100;
+    static CODEX_PROPOSED_PLAN_UPDATE_BATCH_WINDOW_MS = 100;
     static CONTEXT_WINDOW_USAGE_THROTTLE_MS = 400;
     permissionRequestStartTimes = /* @__PURE__ */ new Map();
     machineHeartbeatTimer = null;
@@ -133038,6 +133595,125 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
         this.logger.debug(`[${sessionId}] Failed to persist thread goal clear: ${formatErrorMessage(error2)}`);
       }
     }
+    enqueueCodexProposedPlanUpdate(sessionId, plan) {
+      const state2 = this.store.get(sessionId);
+      const targetEntryId = this.store.getTurnId(sessionId);
+      const existing = state2.codexProposedPlanBuffer.get(plan.turnId);
+      if (existing && existing.targetEntryId === targetEntryId && existing.plan.markdown === plan.markdown && existing.plan.status === plan.status && existing.plan.isLatest === plan.isLatest) {
+        return;
+      }
+      state2.codexProposedPlanBuffer.set(plan.turnId, {
+        plan,
+        ...targetEntryId ? {
+          targetEntryId
+        } : {}
+      });
+      this.scheduleCodexProposedPlanFlush(sessionId);
+    }
+    clearScheduledCodexProposedPlanFlush(sessionId) {
+      const state2 = this.store.get(sessionId);
+      if (!state2.codexProposedPlanFlushTimer) {
+        return;
+      }
+      clearTimeout(state2.codexProposedPlanFlushTimer);
+      state2.codexProposedPlanFlushTimer = null;
+    }
+    scheduleCodexProposedPlanFlush(sessionId) {
+      const state2 = this.store.get(sessionId);
+      if (state2.codexProposedPlanFlushInFlight || state2.codexProposedPlanFlushTimer) {
+        return;
+      }
+      const timer2 = setTimeout(() => {
+        state2.codexProposedPlanFlushTimer = null;
+        void this.startCodexProposedPlanFlush(sessionId);
+      }, MessageHandler.CODEX_PROPOSED_PLAN_UPDATE_BATCH_WINDOW_MS);
+      timer2.unref?.();
+      state2.codexProposedPlanFlushTimer = timer2;
+    }
+    startCodexProposedPlanFlush(sessionId) {
+      const state2 = this.store.get(sessionId);
+      if (state2.codexProposedPlanFlushInFlight) {
+        return state2.codexProposedPlanFlushInFlight;
+      }
+      const flushPromise = this.flushCodexProposedPlanUpdates(sessionId).catch((error2) => {
+        this.logger.error(`[${sessionId}] Failed to flush Codex proposed plan updates: ${formatErrorMessage(error2, {
+          includeStack: true
+        })}`);
+      }).finally(() => {
+        state2.codexProposedPlanFlushInFlight = null;
+        if (state2.codexProposedPlanBuffer.size > 0) {
+          this.scheduleCodexProposedPlanFlush(sessionId);
+        }
+      });
+      state2.codexProposedPlanFlushInFlight = flushPromise;
+      return flushPromise;
+    }
+    async flushCodexProposedPlanUpdatesNow(sessionId) {
+      const state2 = this.store.get(sessionId);
+      this.clearScheduledCodexProposedPlanFlush(sessionId);
+      while (true) {
+        if (!state2.codexProposedPlanFlushInFlight) {
+          if (state2.codexProposedPlanBuffer.size === 0) {
+            return;
+          }
+          void this.startCodexProposedPlanFlush(sessionId);
+        }
+        const inFlight = state2.codexProposedPlanFlushInFlight;
+        if (!inFlight) {
+          return;
+        }
+        await inFlight;
+        this.clearScheduledCodexProposedPlanFlush(sessionId);
+        if (state2.codexProposedPlanBuffer.size === 0 && !state2.codexProposedPlanFlushInFlight) {
+          return;
+        }
+      }
+    }
+    async flushCodexProposedPlanUpdates(sessionId) {
+      const state2 = this.store.get(sessionId);
+      this.clearScheduledCodexProposedPlanFlush(sessionId);
+      if (state2.codexProposedPlanBuffer.size === 0) {
+        return;
+      }
+      const snapshots = [
+        ...state2.codexProposedPlanBuffer.values()
+      ];
+      state2.codexProposedPlanBuffer.clear();
+      const groups = /* @__PURE__ */ new Map();
+      for (const snapshot of snapshots) {
+        const key2 = snapshot.targetEntryId ?? "";
+        const group = groups.get(key2);
+        if (group) {
+          group.plans.push(snapshot.plan);
+        } else {
+          groups.set(key2, {
+            targetEntryId: snapshot.targetEntryId,
+            plans: [
+              snapshot.plan
+            ]
+          });
+        }
+      }
+      const sessionDoc = await this.workspaceDocument.getOrCreateSessionDoc(sessionId);
+      await sessionDoc.updateHistory((history) => {
+        let next = history;
+        for (const group of groups.values()) {
+          next = applyMessageContentsBatch(next, group.plans, {
+            ...group.targetEntryId ? {
+              targetAssistantEntryId: group.targetEntryId
+            } : {},
+            createId: () => group.targetEntryId ?? v4(),
+            now: () => new Date(getServerNow()).toISOString()
+          });
+        }
+        return next;
+      });
+      if (state2.turn.phase === "idle") {
+        await sessionDoc.setLastMessageAt();
+      } else {
+        state2.pendingUnread = true;
+      }
+    }
     async persistContextWindowUsage(sessionId, usage) {
       try {
         const sessionDoc = await this.workspaceDocument.getOrCreateSessionDoc(sessionId);
@@ -133473,13 +134149,14 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
         return failure("local_project_not_found", `Local project not found: ${args2.localProjectId}`);
       }
       try {
+        const state2 = getLocalProjectGitStateAtRootPath(rootPath);
         return {
           type: "local-project/git-state_response",
           machineId: this.machineId,
           workspaceId: this.workspaceId,
           localProjectId: args2.localProjectId,
           success: true,
-          state: getLocalProjectGitStateAtRootPath(rootPath),
+          state: state2,
           observedAtMs: getServerNow()
         };
       } catch (error2) {
@@ -133579,6 +134256,9 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
       this.sessionManager.on("onThreadGoalCleared", (sessionId, threadId2) => {
         this.enqueueThreadGoalHistoryPersist(sessionId, () => this.persistThreadGoalClear(sessionId, threadId2));
       });
+      this.sessionManager.on("onCodexProposedPlan", (sessionId, plan) => {
+        this.enqueueCodexProposedPlanUpdate(sessionId, plan);
+      });
       this.sessionManager.on("onCodexImageGenerationBegin", (sessionId, event) => {
         this.handleCodexImageGenerationBegin(sessionId, event);
       });
@@ -134254,6 +134934,7 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
         await this.flushSessionContextWindowUsage(sessionId);
         await this.flushACPUpdatesNow(sessionId);
         await this.flushThreadGoalHistoryPersists(sessionId);
+        await this.flushCodexProposedPlanUpdatesNow(sessionId);
         await this.flushCodexGeneratedImageUploads(sessionId);
         if (state2.pendingUnread) {
           state2.pendingUnread = false;
@@ -136089,12 +136770,17 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
       this.stopAutoRefresh();
       this.states.clear();
     }
-    invalidate(repoFullName) {
+    invalidate(repoFullName, options) {
       try {
         const repoKeyPrefix = `${normalizeGitHubRepo(repoFullName).toLowerCase()}:`;
         const states = Array.from(this.states.entries()).filter(([key2]) => key2.startsWith(repoKeyPrefix));
         for (const [repoKey, state2] of states) {
           this.logger.debug(`[github-token] Invalidating cached token for repo: ${repoKey}`);
+          if (options?.invalidatedToken && state2.operation === "write") {
+            state2.invalidatedPersonalToken = options.invalidatedToken;
+          } else if (options?.markPersonalTokenInvalid && state2.operation === "write" && state2.tokenSource === "personal" && state2.token) {
+            state2.invalidatedPersonalToken = state2.token;
+          }
           state2.token = null;
           state2.expiresAtMs = null;
           state2.tokenSource = null;
@@ -136110,6 +136796,7 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
         state2.token = null;
         state2.expiresAtMs = null;
         state2.tokenSource = null;
+        state2.invalidatedPersonalToken = null;
         state2.inFlight = void 0;
       }
     }
@@ -136123,7 +136810,8 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
         operation,
         token: null,
         expiresAtMs: null,
-        tokenSource: null
+        tokenSource: null,
+        invalidatedPersonalToken: null
       };
       this.states.set(repoKey, state2);
       return state2;
@@ -136144,7 +136832,7 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
         this.applyTokenResult(state2, result);
         return;
       }
-      state2.inFlight = this.fetchToken(state2.repoFullName, state2.operation);
+      state2.inFlight = this.fetchToken(state2.repoFullName, state2.operation, state2.invalidatedPersonalToken ?? void 0);
       try {
         const result = await state2.inFlight;
         this.applyTokenResult(state2, result);
@@ -136177,12 +136865,15 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
         this.refreshAllInFlight = null;
       }
     }
-    async fetchToken(repoFullName, operation) {
+    async fetchToken(repoFullName, operation, invalidatedPersonalToken) {
       const raw = await this.client.action(api.github.getOperationAccessTokenByRepoNameForCli, {
         repoFullName,
         cliToken: this.cliToken,
         workspaceId: this.workspaceId,
-        operation
+        operation,
+        ...operation === "write" && invalidatedPersonalToken ? {
+          invalidatedPersonalToken
+        } : {}
       });
       const result = GitHubTokenResponseSchema.parse(raw);
       if (!result.success) {
@@ -136195,9 +136886,14 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
       };
     }
     applyTokenResult(state2, result) {
+      const tokenSource = result.tokenSource ?? "app";
+      if (state2.invalidatedPersonalToken && tokenSource === "personal" && result.token === state2.invalidatedPersonalToken) {
+        throw new GitHubTokenFetchError("token_generation_failed", `Backend returned an invalidated personal GitHub token for repository "${state2.repoFullName}".`);
+      }
       const parsedMs = result.expiresAt ? Date.parse(result.expiresAt) : NaN;
       state2.token = result.token;
-      state2.tokenSource = result.tokenSource ?? "app";
+      state2.tokenSource = tokenSource;
+      state2.invalidatedPersonalToken = null;
       if (Number.isFinite(parsedMs)) {
         state2.expiresAtMs = parsedMs;
       } else if (state2.tokenSource === "personal") {
@@ -136221,7 +136917,12 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
           }));
           return;
         }
-        if (req.method !== "POST" || req.url !== "/git-credential" && req.url !== "/github-token") {
+        if (req.method !== "POST" || ![
+          "/git-credential",
+          "/github-token",
+          "/git-credential/reject",
+          "/github-token/reject"
+        ].includes(req.url ?? "")) {
           res.writeHead(404, {
             "Content-Type": "application/json"
           });
@@ -136255,8 +136956,25 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
           }));
           return;
         }
+        if (req.url === "/git-credential/reject" || req.url === "/github-token/reject") {
+          const invalidatedToken = obj && typeof obj.invalidatedToken === "string" ? obj.invalidatedToken : void 0;
+          options.tokenManager.invalidate(repoFullName, {
+            ...invalidatedToken ? {
+              invalidatedToken
+            } : {
+              markPersonalTokenInvalid: true
+            }
+          });
+          res.writeHead(200, {
+            "Content-Type": "application/json"
+          });
+          res.end(JSON.stringify({
+            ok: true
+          }));
+          return;
+        }
         const tokenValue = await options.tokenManager.getTokenForRepo(repoFullName, {
-          operation: "read"
+          operation: "write"
         });
         if (!tokenValue) {
           res.writeHead(404, {
@@ -136589,11 +137307,11 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
       return null;
     }
     if (!githubRepo) {
-      logger2.debug("[gh-token] No GitHub repo context \u2014 cannot fetch installation token");
+      logger2.debug("[gh-token] No GitHub repo context \u2014 cannot fetch managed token");
       return null;
     }
     if (!tokenManager) {
-      logger2.debug("[gh-token] No token manager available \u2014 cannot fetch installation token");
+      logger2.debug("[gh-token] No token manager available \u2014 cannot fetch managed token");
       return null;
     }
     if (managedRepoToken) {
@@ -136612,10 +137330,10 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
       const token2 = await tokenManager.getTokenForRepo(githubRepo, {
         operation: "write"
       });
-      logger2.debug(`[gh-token] Fetched installation token for ${githubRepo}`);
+      logger2.debug(`[gh-token] Fetched managed write-operation token for ${githubRepo}`);
       return token2;
     } catch (error2) {
-      logger2.debug(`[gh-token] Failed to fetch installation token for ${githubRepo}: ${formatErrorMessage(error2)}`);
+      logger2.debug(`[gh-token] Failed to fetch managed write-operation token for ${githubRepo}: ${formatErrorMessage(error2)}`);
       return null;
     }
   }
@@ -136657,9 +137375,17 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
       mode: mode2
     });
   };
-  const GH_SHIM_BASENAME = "gh";
+  const GH_SHIM_POSIX_BASENAME = "gh";
+  const GH_SHIM_WINDOWS_BASENAME = "gh.cmd";
   const REAL_GH_PATH_PLACEHOLDER = "__LODY_REAL_GH_PATH__";
+  const NODE_EXEC_PATH_PLACEHOLDER = "__LODY_NODE_EXEC_PATH__";
   const MANAGED_TOKEN_MARKER_ENV = LODY_MANAGED_GH_TOKEN_SHA256_ENV;
+  const getWindowsExecutableCandidateNames = (name2) => [
+    ".exe",
+    ".cmd",
+    ".bat",
+    ".com"
+  ].map((ext2) => `${name2}${ext2}`).concat(name2);
   const normalizeComparablePath = (value) => {
     const resolved = path__default.resolve(value);
     return process.platform === "win32" ? resolved.toLowerCase() : resolved;
@@ -136676,6 +137402,9 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
       if (!statSync(filePath).isFile()) {
         return false;
       }
+      if (process.platform === "win32") {
+        return true;
+      }
       accessSync(filePath, constants$4.X_OK);
       return true;
     } catch {
@@ -136689,10 +137418,7 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
     }
     const excludedComparablePath = toComparablePath(excludedPath);
     const excludedComparableDir = toComparablePath(path__default.dirname(excludedPath));
-    const candidateNames = process.platform === "win32" ? [
-      `${name2}.exe`,
-      name2
-    ] : [
+    const candidateNames = process.platform === "win32" ? getWindowsExecutableCandidateNames(name2) : [
       name2
     ];
     for (const dir of pathEnv.split(path__default.delimiter)) {
@@ -136729,6 +137455,7 @@ const REAL_GH_PATH = '${REAL_GH_PATH_PLACEHOLDER}';
 const SHIM_PATH = __filename;
 const SHIM_DIR = path.dirname(SHIM_PATH);
 const MANAGED_TOKEN_MARKER_ENV = '${MANAGED_TOKEN_MARKER_ENV}';
+const WINDOWS_EXECUTABLE_CANDIDATE_NAMES = ['gh.exe', 'gh.cmd', 'gh.bat', 'gh.com', 'gh'];
 
 const normalizeComparablePath = (value) => {
   const resolved = path.resolve(String(value || ''));
@@ -136748,6 +137475,7 @@ const isExecutableFile = (filePath) => {
   if (!filePath) return false;
   try {
     if (!fs.statSync(filePath).isFile()) return false;
+    if (process.platform === 'win32') return true;
     fs.accessSync(filePath, fs.constants.X_OK);
     return true;
   } catch {
@@ -136761,7 +137489,8 @@ const resolveGhFromPath = () => {
 
   const shimComparablePath = toComparablePath(SHIM_PATH);
   const shimComparableDir = toComparablePath(SHIM_DIR);
-  const candidateNames = process.platform === 'win32' ? ['gh.exe', 'gh'] : ['gh'];
+  const candidateNames =
+    process.platform === 'win32' ? WINDOWS_EXECUTABLE_CANDIDATE_NAMES : ['gh'];
 
   for (const dir of pathEnv.split(path.delimiter)) {
     if (!dir) continue;
@@ -136785,6 +137514,32 @@ const resolveRealGhCommand = () => {
   return resolveGhFromPath();
 };
 
+const quoteCmdArg = (arg) => {
+  const value = String(arg || '');
+  if (value === '') return '""';
+  if (!/[\\s"]/u.test(value)) return value;
+  return '"' + value.replace(/"/g, '""') + '"';
+};
+
+const buildWindowsSpawnSpec = (command, args) => {
+  const lower = String(command || '').toLowerCase();
+  if (process.platform === 'win32' && (lower.endsWith('.cmd') || lower.endsWith('.bat'))) {
+    const cmdline = [quoteCmdArg(command), ...args.map(quoteCmdArg)].join(' ');
+    return { command: 'cmd.exe', args: ['/d', '/s', '/c', cmdline] };
+  }
+  return { command, args };
+};
+
+const spawnGh = (command, args, options) => {
+  const spec = buildWindowsSpawnSpec(command, args);
+  return spawn(spec.command, spec.args, options);
+};
+
+const spawnSyncGh = (command, args, options) => {
+  const spec = buildWindowsSpawnSpec(command, args);
+  return spawnSync(spec.command, spec.args, options);
+};
+
 const fingerprintToken = (token) => crypto.createHash('sha256').update(token).digest('hex');
 
 const isManagedTokenValue = (token, marker) => {
@@ -136832,7 +137587,7 @@ const buildGhAuthEnv = (env) => {
 const isGhCliAuthed = (ghPath) => {
   if (!ghPath) return false;
   try {
-    const result = spawnSync(ghPath, ['auth', 'status'], {
+    const result = spawnSyncGh(ghPath, ['auth', 'status'], {
       env: buildGhAuthEnv(process.env),
       stdio: ['ignore', 'ignore', 'ignore'],
       timeout: 5000,
@@ -136932,30 +137687,23 @@ const isConnectionError = (error) => {
   return message.includes('econnrefused') || message.includes('enotfound') || message.includes('fetch failed');
 };
 
-const doFetchFromBroker = async (baseUrl, brokerToken, repoFullName) => {
+const doBrokerRequest = async (baseUrl, brokerToken, endpoint, body, timeoutMs) => {
   const fetchImpl = globalThis.fetch;
-  if (typeof fetchImpl !== 'function') return { result: null };
+  if (typeof fetchImpl !== 'function') return { unavailable: true };
 
   const controller = new AbortController();
-  const timeoutId = setTimeout(() => controller.abort(), 10000);
+  const timeoutId = setTimeout(() => controller.abort(), timeoutMs);
   try {
-    const res = await fetchImpl(baseUrl + '/github-token', {
+    const res = await fetchImpl(baseUrl + endpoint, {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json',
         Authorization: 'Bearer ' + brokerToken,
       },
-      body: JSON.stringify({ repoFullName }),
+      body: JSON.stringify(body),
       signal: controller.signal,
     });
-    if (!res || !res.ok) {
-      return { result: null };
-    }
-    const json = await res.json().catch(() => null);
-    if (!json || typeof json.token !== 'string' || !json.token) {
-      return { result: null };
-    }
-    return { result: { token: json.token } };
+    return { res };
   } catch (error) {
     return { error };
   } finally {
@@ -136963,51 +137711,105 @@ const doFetchFromBroker = async (baseUrl, brokerToken, repoFullName) => {
   }
 };
 
-const fetchTokenFromBroker = async (repoFullName) => {
+const doFetchFromBroker = async (baseUrl, brokerToken, repoFullName) => {
+  const reply = await doBrokerRequest(
+    baseUrl,
+    brokerToken,
+    '/github-token',
+    { repoFullName },
+    10000
+  );
+  if (reply.unavailable) return { result: null };
+  if (reply.error) return { error: reply.error };
+  if (!reply.res.ok) return { result: null };
+  const json = await reply.res.json().catch(() => null);
+  if (!json || typeof json.token !== 'string' || !json.token) {
+    return { result: null };
+  }
+  return { result: { token: json.token } };
+};
+
+const doRejectToBroker = async (baseUrl, brokerToken, repoFullName, invalidatedToken) => {
+  // Short timeout: the gh shim awaits this before exiting, so a slow broker would stall
+  // the user. The next gh invocation will re-trigger reject if delivery here fails.
+  const reply = await doBrokerRequest(
+    baseUrl,
+    brokerToken,
+    '/github-token/reject',
+    { repoFullName, ...(invalidatedToken ? { invalidatedToken } : {}) },
+    2000
+  );
+  if (reply.unavailable) return { result: false };
+  if (reply.error) return { error: reply.error };
+  return { result: reply.res.ok };
+};
+
+const callBrokerWithFallback = async (action) => {
   const brokerConfig = getBrokerConfig();
   if (!brokerConfig) return null;
 
   const { url, token, source } = brokerConfig;
-  const first = await doFetchFromBroker(url, token, repoFullName);
-  if (first.result !== undefined) {
-    return first.result;
-  }
+  const first = await action(url, token);
+  if (first.result !== undefined) return first;
 
   if (first.error && source === 'env' && isConnectionError(first.error)) {
     const fileConfig = getBrokerConfigFromFile();
     if (fileConfig && fileConfig.url !== url) {
-      const fallback = await doFetchFromBroker(fileConfig.url, fileConfig.token, repoFullName);
-      if (fallback.result !== undefined) {
-        return fallback.result;
-      }
+      return await action(fileConfig.url, fileConfig.token);
     }
   }
+  return first;
+};
 
-  return null;
+const fetchTokenFromBroker = async (repoFullName) => {
+  const reply = await callBrokerWithFallback((url, token) =>
+    doFetchFromBroker(url, token, repoFullName)
+  );
+  return reply && reply.result ? reply.result : null;
+};
+
+const rejectTokenToBroker = async (repoFullName, invalidatedToken) => {
+  await callBrokerWithFallback((url, token) =>
+    doRejectToBroker(url, token, repoFullName, invalidatedToken)
+  );
+};
+
+const GH_AUTH_FAILURE_PHRASES = [
+  'http 401',
+  '401 unauthorized',
+  'bad credentials',
+  'requires authentication',
+  'authentication failed',
+];
+
+const isGhAuthFailureOutput = (stderrText) => {
+  const value = String(stderrText || '').toLowerCase();
+  return GH_AUTH_FAILURE_PHRASES.some((phrase) => value.includes(phrase));
 };
 
 const buildGhEnv = async (ghCommand) => {
   const env = { ...process.env };
   if (hasUserProvidedEnvToken(env)) {
     clearManagedTokenEnv(env);
-    return env;
+    return { env };
   }
 
   if (isGhCliAuthed(ghCommand)) {
     clearManagedTokenEnv(env);
-    return env;
+    return { env };
   }
 
   const repoFullName = readRepoFullName();
   if (!repoFullName) {
-    return env;
+    return { env };
   }
 
   const result = await fetchTokenFromBroker(repoFullName);
   if (result && result.token) {
     injectGhToken(env, result.token);
+    return { env, managed: { token: result.token, repoFullName } };
   }
-  return env;
+  return { env };
 };
 
 const main = async () => {
@@ -137017,30 +137819,51 @@ const main = async () => {
     process.exit(127);
   }
 
-  const child = spawn(ghCommand, process.argv.slice(2), {
-    stdio: 'inherit',
-    env: await buildGhEnv(ghCommand),
+  const ghEnv = await buildGhEnv(ghCommand);
+  const child = spawnGh(ghCommand, process.argv.slice(2), {
+    stdio: ['inherit', 'inherit', 'pipe'],
+    env: ghEnv.env,
+  });
+  let stderrText = '';
+  child.stderr.on('data', (chunk) => {
+    const text = String(chunk || '');
+    process.stderr.write(chunk);
+    if (stderrText.length < 20000) {
+      stderrText += text.slice(0, 20000 - stderrText.length);
+    }
   });
 
   child.on('error', () => process.exit(127));
   child.on('close', (code, signal) => {
-    if (signal) {
-      process.kill(process.pid, signal);
-      return;
-    }
-    process.exit(code ?? 1);
+    void (async () => {
+      if (code && ghEnv.managed && isGhAuthFailureOutput(stderrText)) {
+        await rejectTokenToBroker(ghEnv.managed.repoFullName, ghEnv.managed.token);
+      }
+      if (signal) {
+        process.kill(process.pid, signal);
+        return;
+      }
+      process.exit(code ?? 1);
+    })();
   });
 };
 
 main().catch(() => process.exit(1));
+`;
+  const windowsLauncherSourceTemplate = `@echo off
+"${NODE_EXEC_PATH_PLACEHOLDER}" "%~dp0gh" %*
 `;
   const getGhShimHostBinDir = () => path__default.join(os__default.homedir(), ".lody", "bin");
-  const getGhShimHostPath = () => path__default.join(getGhShimHostBinDir(), GH_SHIM_BASENAME);
+  const getGhShimHostNodeScriptPath = () => path__default.join(getGhShimHostBinDir(), GH_SHIM_POSIX_BASENAME);
+  const getGhShimHostWindowsLauncherPath = () => path__default.join(getGhShimHostBinDir(), GH_SHIM_WINDOWS_BASENAME);
+  const getGhShimHostPath = () => process.platform === "win32" ? getGhShimHostWindowsLauncherPath() : getGhShimHostNodeScriptPath();
   const escapeForSingleQuotedString = (value) => value.replace(/\\/g, "\\\\").replace(/'/g, "\\'");
+  const escapeForDoubleQuotedCmdString = (value) => value.replace(/"/g, '""');
   const buildGhShimSource = (realGhPath) => {
     const escapedRealPath = realGhPath ? escapeForSingleQuotedString(realGhPath) : "";
     return wrapperSourceTemplate.split(REAL_GH_PATH_PLACEHOLDER).join(escapedRealPath);
   };
+  const buildWindowsLauncherSource = () => windowsLauncherSourceTemplate.split(NODE_EXEC_PATH_PLACEHOLDER).join(escapeForDoubleQuotedCmdString(process.execPath));
   const resolveRealGhPath = () => resolveExecutableFromPath("gh", getGhShimHostPath());
   const ensureParentDirForFile = (filePath) => {
     const dir = path__default.dirname(filePath);
@@ -137082,19 +137905,35 @@ main().catch(() => process.exit(1));
     }
   };
   const ensureGhShimScript = () => {
-    const filePath = getGhShimHostPath();
-    ensureParentDirForFile(filePath);
-    ensureWritableShimTarget(filePath);
     const source = buildGhShimSource(resolveRealGhPath());
-    try {
-      writeIfChanged(filePath, source, 493);
-    } catch (error2) {
-      const code2 = error2 instanceof Error && "code" in error2 ? error2.code : void 0;
-      if (code2 !== "ENOENT") {
-        throw error2;
+    const shimTargets = process.platform === "win32" ? [
+      {
+        filePath: getGhShimHostNodeScriptPath(),
+        content: source
+      },
+      {
+        filePath: getGhShimHostWindowsLauncherPath(),
+        content: buildWindowsLauncherSource()
       }
+    ] : [
+      {
+        filePath: getGhShimHostNodeScriptPath(),
+        content: source
+      }
+    ];
+    for (const { filePath, content } of shimTargets) {
       ensureParentDirForFile(filePath);
-      writeIfChanged(filePath, source, 493);
+      ensureWritableShimTarget(filePath);
+      try {
+        writeIfChanged(filePath, content, 493);
+      } catch (error2) {
+        const code2 = error2 instanceof Error && "code" in error2 ? error2.code : void 0;
+        if (code2 !== "ENOENT") {
+          throw error2;
+        }
+        ensureParentDirForFile(filePath);
+        writeIfChanged(filePath, content, 493);
+      }
     }
   };
   const prependGhShimBinDirToPath = (pathEnv) => {
@@ -142405,13 +143244,11 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
         LODY_SESSION_ID: this.sessionId,
         LODY_WORKSPACE_SESSION_ID: workspaceSessionId
       };
-      if (this.config.agentCliType === "builtin" && this.config.agentType === "claude") {
-        return scrubInheritedClaudeAuthEnv(merged, {
-          ...configEnv,
-          ...extraEnv
-        });
-      }
-      return merged;
+      const agentEnv = this.config.agentCliType === "builtin" && this.config.agentType === "claude" ? scrubInheritedClaudeAuthEnv(merged, {
+        ...configEnv,
+        ...extraEnv
+      }) : merged;
+      return withDefaultAcpPathEntries(agentEnv);
     }
     async createAgent(callbacks) {
       const env2 = this.buildShellEnv(callbacks.env);
@@ -142491,6 +143328,7 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
         onRateLimitUpdate: callbacks.onRateLimitUpdate,
         onThreadGoalUpdated: callbacks.onThreadGoalUpdated,
         onThreadGoalCleared: callbacks.onThreadGoalCleared,
+        onCodexProposedPlan: callbacks.onCodexProposedPlan,
         onCodexImageGenerationBegin: callbacks.onCodexImageGenerationBegin,
         onCodexImageGenerationEnd: callbacks.onCodexImageGenerationEnd,
         sessionId: this.sessionId,
@@ -142719,7 +143557,7 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
       const sessionId = config2.sessionId;
       this.logger.debug(`[${sessionId}] Session workdir resolved: ${session.getWorkdir()}`);
       let acpSessionId;
-      const setting = resolveACPSetting({
+      const launch = resolveACPProcessLaunch({
         cliType: config2.agentCliType,
         agentType: config2.agentType
       });
@@ -142736,9 +143574,9 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
         acpSessionId = await withSlowOperationWarning(session.createAgent({
           cliType: config2.agentCliType,
           agentType: config2.agentType,
-          command: setting.exec.command,
-          args: setting.exec.args,
-          env: setting.exec.env,
+          command: launch.command,
+          args: launch.args,
+          env: launch.env,
           resumeSessionId: requestedResumeSessionId,
           onStartupStage: (event) => {
             if (event.type === "initialize_start") {
@@ -142787,6 +143625,9 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
           onThreadGoalCleared: (threadId2) => {
             this.emit("onThreadGoalCleared", sessionId, threadId2);
           },
+          onCodexProposedPlan: (plan) => {
+            this.emit("onCodexProposedPlan", sessionId, plan);
+          },
           onCodexImageGenerationBegin: (event) => {
             this.emit("onCodexImageGenerationBegin", sessionId, event);
           },
@@ -142838,7 +143679,10 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
       tokenManager?.retainRepoOwner(githubRepo);
       if (tokenManager) {
         try {
-          await tokenManager.getTokenForRepo(githubRepo);
+          tokenManager.invalidate(githubRepo);
+          await tokenManager.getTokenForRepo(githubRepo, {
+            operation: "write"
+          });
           this.logger.debug(`[${config2.sessionId}] [github-token] Prefetch succeeded for ${githubRepo}`);
         } catch (error2) {
           this.logger.debug(`[${config2.sessionId}] [github-token] Prefetch failed for ${githubRepo}: ${formatErrorMessage(error2)}`);
@@ -142906,6 +143750,7 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
         return;
       }
       try {
+        tokenManager.invalidate(githubRepo);
         const token2 = await tokenManager.getTokenForRepo(githubRepo, {
           operation: "write"
         });