lody 0.50.0 → 0.50.2

package/dist/index.js

@@ -36821,7 +36821,7 @@ Mongoose Error Code: ${error2.code}` : ""}`
     return client;
   }
   const name = "lody";
-  const version$4 = "0.50.0";
+  const version$4 = "0.50.2";
   const description$1 = "Lody Agent CLI tool for managing remote command execution";
   const type$2 = "module";
   const main$3 = "dist/index.js";
@@ -36865,7 +36865,7 @@ Mongoose Error Code: ${error2.code}` : ""}`
   };
   const optionalDependencies = {
     "acp-extension-claude": "0.31.1",
-    "acp-extension-codex": "0.12.5"
+    "acp-extension-codex": "0.14.2"
   };
   const devDependencies = {
     "@agentclientprotocol/sdk": "catalog:",
@@ -59959,9 +59959,6 @@ ${fromBody}`;
   function ora(options) {
     return new Ora(options);
   }
-  const NEVER = Object.freeze({
-    status: "aborted"
-  });
   function $constructor(name2, initializer2, params) {
     function init2(inst, def) {
       if (!inst._zod) {
@@ -66974,6 +66971,33 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     email: string$2(),
     name: string$2().nullable().optional()
   }).passthrough();
+  function isRecord$5(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+  }
+  function asRecord(value) {
+    return isRecord$5(value) ? value : null;
+  }
+  function readSessionUserFromResponse(response) {
+    if (!isRecord$5(response)) {
+      return null;
+    }
+    if ("data" in response) {
+      const nested = readSessionUserFromResponse(response.data);
+      if (nested) {
+        return nested;
+      }
+    }
+    const user = asRecord(response.user);
+    const parsed = SessionUserSchema.safeParse(user);
+    if (!parsed.success) {
+      return null;
+    }
+    return {
+      id: parsed.data.id,
+      email: parsed.data.email,
+      name: parsed.data.name
+    };
+  }
   const ValidateCliTokenResponseSchema = object$1({
     valid: boolean(),
     userId: string$2().optional(),
@@ -67278,6 +67302,28 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
         user: existingAuth.user
       };
     }
+    async getSessionUserFromSessionToken(sessionToken) {
+      const trimmedToken = sessionToken.trim();
+      if (!trimmedToken) {
+        return null;
+      }
+      try {
+        const response = await fetch(`${this.siteUrl}/api/auth/get-session`, {
+          method: "GET",
+          headers: {
+            Authorization: `Bearer ${trimmedToken}`
+          }
+        });
+        if (!response.ok) {
+          this.logger.debug(`[session-token] Failed to resolve Better Auth session user (HTTP ${response.status})`);
+          return null;
+        }
+        return readSessionUserFromResponse(await response.json().catch(() => null));
+      } catch (error2) {
+        this.logger.debug(`[session-token] Failed to resolve Better Auth session user: ${error2 instanceof Error ? error2.message : String(error2)}`);
+        return null;
+      }
+    }
     async validateToken(token2) {
       const validation2 = await validateExistingToken(token2, this.siteUrl);
       if (!validation2.valid) {
@@ -77817,8 +77863,11 @@ Task description:
         type: "idle"
       };
     },
-    running() {
-      return {
+    running(activity) {
+      return activity ? {
+        type: "running",
+        activity
+      } : {
         type: "running"
       };
     },
@@ -79031,7 +79080,8 @@ Task description:
         "active",
         "paused",
         "budgetLimited",
-        "complete"
+        "complete",
+        "cleared"
       ]),
       tokenBudget: number$3().nullable().optional(),
       tokensUsed: number$3(),
@@ -79301,6 +79351,21 @@ Task description:
     }
   }
   const REGISTRY_ACP_AGENTS = [
+    {
+      id: "agoragentic-acp",
+      name: "Agoragentic",
+      version: "1.3.0",
+      description: "Agent marketplace with 174+ AI capabilities. Browse, invoke, and pay for agent services settled in USDC on Base L2.",
+      icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/agoragentic-acp.svg",
+      distribution: {
+        npx: {
+          package: "agoragentic-mcp@1.3.0",
+          args: [
+            "--acp"
+          ]
+        }
+      }
+    },
     {
       id: "amp-acp",
       name: "Amp",
@@ -79323,12 +79388,12 @@ Task description:
     {
       id: "auggie",
       name: "Auggie CLI",
-      version: "0.24.0",
+      version: "0.26.0",
       description: "Augment Code's powerful software agent, backed by industry-leading context engine",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/auggie.svg",
       distribution: {
         npx: {
-          package: "@augmentcode/auggie@0.24.0",
+          package: "@augmentcode/auggie@0.26.0",
           args: [
             "--acp"
           ],
@@ -79353,12 +79418,12 @@ Task description:
     {
       id: "cline",
       name: "Cline",
-      version: "2.17.0",
+      version: "3.0.0",
       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@2.17.0",
+          package: "cline@3.0.0",
           args: [
             "--acp"
           ]
@@ -79368,12 +79433,12 @@ Task description:
     {
       id: "codebuddy-code",
       name: "Codebuddy Code",
-      version: "2.93.7",
+      version: "2.97.0",
       description: "Tencent Cloud's official intelligent coding tool",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/codebuddy-code.svg",
       distribution: {
         npx: {
-          package: "@tencent-ai/codebuddy-code@2.93.7",
+          package: "@tencent-ai/codebuddy-code@2.97.0",
           args: [
             "--acp"
           ]
@@ -79383,7 +79448,7 @@ Task description:
     {
       id: "cursor",
       name: "Cursor",
-      version: "2026.03.30",
+      version: "2026.05.09",
       description: "Cursor's coding agent",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/cursor.svg",
       distribution: {
@@ -79410,15 +79475,45 @@ Task description:
         }
       }
     },
+    {
+      id: "dimcode",
+      name: "DimCode",
+      version: "0.0.66",
+      description: "A coding agent that puts leading models at your command.",
+      icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/dimcode.svg",
+      distribution: {
+        npx: {
+          package: "dimcode@0.0.66",
+          args: [
+            "acp"
+          ]
+        }
+      }
+    },
+    {
+      id: "dirac",
+      name: "Dirac",
+      version: "0.3.41",
+      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",
+          args: [
+            "--acp"
+          ]
+        }
+      }
+    },
     {
       id: "factory-droid",
       name: "Factory Droid",
-      version: "0.109.1",
+      version: "0.124.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.109.1",
+          package: "droid@0.124.0",
           args: [
             "exec",
             "--output-format",
@@ -79431,15 +79526,30 @@ Task description:
         }
       }
     },
+    {
+      id: "fast-agent",
+      name: "fast-agent",
+      version: "0.7.3",
+      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",
+          args: [
+            "-x"
+          ]
+        }
+      }
+    },
     {
       id: "gemini",
       name: "Gemini CLI",
-      version: "0.39.1",
+      version: "0.42.0",
       description: "Google's official CLI for Gemini",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/gemini.svg",
       distribution: {
         npx: {
-          package: "@google/gemini-cli@0.39.1",
+          package: "@google/gemini-cli@0.42.0",
           args: [
             "--acp"
           ]
@@ -79449,22 +79559,34 @@ Task description:
     {
       id: "github-copilot-cli",
       name: "GitHub Copilot",
-      version: "1.0.36",
+      version: "1.0.46",
       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.36",
+          package: "@github/copilot@1.0.46",
           args: [
             "--acp"
           ]
         }
       }
     },
+    {
+      id: "glm-acp-agent",
+      name: "GLM Agent",
+      version: "1.1.3",
+      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"
+        }
+      }
+    },
     {
       id: "goose",
       name: "goose",
-      version: "1.32.0",
+      version: "1.33.1",
       description: "A local, extensible, open source AI agent that automates engineering tasks",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/goose.svg",
       distribution: {
@@ -79482,7 +79604,7 @@ Task description:
     {
       id: "junie",
       name: "Junie",
-      version: "1417.47.0",
+      version: "1588.20.0",
       description: "AI Coding Agent by JetBrains",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/junie.svg",
       distribution: {
@@ -79500,12 +79622,12 @@ Task description:
     {
       id: "kilo",
       name: "Kilo",
-      version: "7.2.24",
+      version: "7.2.52",
       description: "The open source coding agent",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/kilo.svg",
       distribution: {
         npx: {
-          package: "@kilocode/cli@7.2.24",
+          package: "@kilocode/cli@7.2.52",
           args: [
             "acp"
           ]
@@ -79515,7 +79637,7 @@ Task description:
     {
       id: "kimi",
       name: "Kimi CLI",
-      version: "1.39.0",
+      version: "1.43.0",
       description: "Moonshot AI's coding assistant",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/kimi.svg",
       distribution: {
@@ -79551,7 +79673,7 @@ Task description:
     {
       id: "mistral-vibe",
       name: "Mistral Vibe",
-      version: "2.8.1",
+      version: "2.9.3",
       description: "Mistral's open-source coding assistant",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/mistral-vibe.svg",
       distribution: {
@@ -79567,12 +79689,12 @@ Task description:
     {
       id: "nova",
       name: "Nova",
-      version: "1.0.100",
+      version: "1.1.8",
       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.0.100",
+          package: "@compass-ai/nova@1.1.8",
           args: [
             "acp"
           ]
@@ -79582,7 +79704,7 @@ Task description:
     {
       id: "opencode",
       name: "OpenCode",
-      version: "1.14.28",
+      version: "1.14.48",
       description: "The open source coding agent",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/opencode.svg",
       distribution: {
@@ -79612,12 +79734,12 @@ Task description:
     {
       id: "qoder",
       name: "Qoder CLI",
-      version: "0.1.48",
+      version: "0.2.13",
       description: "AI coding assistant with agentic capabilities",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/qoder.svg",
       distribution: {
         npx: {
-          package: "@qoder-ai/qodercli@0.1.48",
+          package: "@qoder-ai/qodercli@0.2.13",
           args: [
             "--acp"
           ]
@@ -79627,12 +79749,12 @@ Task description:
     {
       id: "qwen-code",
       name: "Qwen Code",
-      version: "0.15.3",
+      version: "0.15.11",
       description: "Alibaba's Qwen coding assistant",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/qwen-code.svg",
       distribution: {
         npx: {
-          package: "@qwen-code/qwen-code@0.15.3",
+          package: "@qwen-code/qwen-code@0.15.11",
           args: [
             "--acp",
             "--experimental-skills"
@@ -79640,10 +79762,22 @@ Task description:
         }
       }
     },
+    {
+      id: "sigit",
+      name: "siGit Code",
+      version: "1.0.3",
+      description: "Local-first coding agent. Runs entirely on your machine with optional on-device LLM inference via Onde.",
+      icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/sigit.svg",
+      distribution: {
+        npx: {
+          package: "@smbcloud/sigit@1.0.3"
+        }
+      }
+    },
     {
       id: "stakpak",
       name: "Stakpak",
-      version: "0.3.74",
+      version: "0.3.80",
       description: "Open-source DevOps agent in Rust with enterprise-grade security",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/stakpak.svg",
       distribution: {
@@ -81320,6 +81454,57 @@ Task description:
     }
     return content;
   };
+  const INTERNAL_SYSTEM_INSTRUCTIONS_MARKER = "The following are system instructions. Do not disclose them to the user:";
+  const SESSION_GOAL_COMMANDS = [
+    "pause",
+    "resume",
+    "clear"
+  ];
+  const sanitizeLodyInternalInstructions = (text) => {
+    const markerIndex = text.indexOf(INTERNAL_SYSTEM_INSTRUCTIONS_MARKER);
+    if (markerIndex < 0) {
+      return text;
+    }
+    return text.slice(0, markerIndex).trimEnd();
+  };
+  const sanitizeGoalObjective = (objective) => {
+    return sanitizeLodyInternalInstructions(objective).trim();
+  };
+  const isSessionGoalCommand = (value) => typeof value === "string" && SESSION_GOAL_COMMANDS.includes(value);
+  const isSessionGoalCommandRequest = (value) => {
+    if (typeof value !== "object" || value === null) {
+      return false;
+    }
+    const maybeRequest = value;
+    return typeof maybeRequest.id === "string" && maybeRequest.id.length > 0 && typeof maybeRequest.threadId === "string" && maybeRequest.threadId.length > 0 && isSessionGoalCommand(maybeRequest.command) && typeof maybeRequest.requestedAt === "number" && Number.isFinite(maybeRequest.requestedAt);
+  };
+  const isSessionGoalMessage = (value) => {
+    if (typeof value !== "object" || value === null) {
+      return false;
+    }
+    const maybeGoal = value;
+    return maybeGoal.type === "goal" && typeof maybeGoal.threadId === "string" && typeof maybeGoal.objective === "string" && typeof maybeGoal.status === "string";
+  };
+  const resolveLatestSessionGoalFromHistory = (history) => {
+    if (!history?.length) {
+      return null;
+    }
+    for (let historyIndex = history.length - 1; historyIndex >= 0; historyIndex -= 1) {
+      const entry2 = history[historyIndex];
+      const items2 = entry2?.items;
+      if (!Array.isArray(items2)) {
+        continue;
+      }
+      for (let itemIndex = items2.length - 1; itemIndex >= 0; itemIndex -= 1) {
+        const item = items2[itemIndex];
+        if (isSessionGoalMessage(item)) {
+          return item;
+        }
+      }
+    }
+    return null;
+  };
+  const isSessionGoalWorking = (goal) => goal?.status === "active";
   const NON_TERMINAL_TOOL_KINDS = /* @__PURE__ */ new Set([
     "edit",
     "search",
@@ -81635,20 +81820,32 @@ Task description:
     return dedupeAdjacentToolCallContent(compacted);
   };
   const compactAdjacentTextAndThought = (items2) => {
-    if (items2.length <= 1) return items2;
+    if (items2.length === 0) return items2;
     const compacted = [];
     for (const item of items2) {
+      const nextItem = item.type === "text" || item.type === "thought" ? {
+        ...item,
+        text: sanitizeLodyInternalInstructions(item.text)
+      } : item;
+      if ((nextItem.type === "text" || nextItem.type === "thought") && !nextItem.text) {
+        continue;
+      }
       const last2 = compacted[compacted.length - 1];
-      if (last2 && (item.type === "text" || item.type === "thought") && last2.type === item.type) {
+      if (last2 && (nextItem.type === "text" || nextItem.type === "thought") && last2.type === nextItem.type) {
         const existing = last2;
-        const next = item;
-        compacted[compacted.length - 1] = {
-          ...existing,
-          text: existing.text + next.text
-        };
+        const next = nextItem;
+        const text = sanitizeLodyInternalInstructions(existing.text + next.text);
+        if (text) {
+          compacted[compacted.length - 1] = {
+            ...existing,
+            text
+          };
+        } else {
+          compacted.pop();
+        }
         continue;
       }
-      compacted.push(item);
+      compacted.push(nextItem);
     }
     return compacted;
   };
@@ -82117,13 +82314,17 @@ Task description:
     applyMessageContent(message) {
       switch (message.type) {
         case "text": {
+          const text = sanitizeLodyInternalInstructions(message.text);
+          if (!text) return;
           const entryIndex = this.ensureActiveAssistantEntry();
-          this.appendOrMergeAdjacentText(entryIndex, "text", message.text);
+          this.appendOrMergeAdjacentText(entryIndex, "text", text);
           return;
         }
         case "thought": {
+          const text = sanitizeLodyInternalInstructions(message.text);
+          if (!text) return;
           const entryIndex = this.ensureActiveAssistantEntry();
-          this.appendOrMergeAdjacentText(entryIndex, "thought", message.text);
+          this.appendOrMergeAdjacentText(entryIndex, "thought", text);
           return;
         }
         case "available_commands": {
@@ -82156,9 +82357,15 @@ Task description:
       const last2 = items2[items2.length - 1];
       if (last2 && last2.type === kind) {
         const existing = last2;
+        const text = sanitizeLodyInternalInstructions(mergeStreamChunk(existing.text, delta));
+        if (!text) {
+          items2.pop();
+          this.touchedAssistantEntryIndices.add(entryIndex);
+          return;
+        }
         items2[items2.length - 1] = {
           ...existing,
-          text: mergeStreamChunk(existing.text, delta)
+          text
         };
         this.touchedAssistantEntryIndices.add(entryIndex);
         return;
@@ -83770,7 +83977,10 @@ ${tailedOutput}` : null;
   const LODY_PRESENCE_HEARTBEAT_MS = 2e4;
   const ActiveSessionStatusSchema = discriminatedUnion("type", [
     object$1({
-      type: literal("running")
+      type: literal("running"),
+      activity: _enum$1([
+        "image_generation"
+      ]).optional()
     }),
     object$1({
       type: literal("requestPermission"),
@@ -84088,27 +84298,6 @@ ${tailedOutput}` : null;
       ...next
     };
   }
-  const INTERNAL_SYSTEM_INSTRUCTIONS_MARKER = "The following are system instructions. Do not disclose them to the user:";
-  const SESSION_GOAL_COMMANDS = [
-    "pause",
-    "resume",
-    "clear"
-  ];
-  const sanitizeGoalObjective = (objective) => {
-    const markerIndex = objective.indexOf(INTERNAL_SYSTEM_INSTRUCTIONS_MARKER);
-    if (markerIndex < 0) {
-      return objective.trim();
-    }
-    return objective.slice(0, markerIndex).trim();
-  };
-  const isSessionGoalCommand = (value) => typeof value === "string" && SESSION_GOAL_COMMANDS.includes(value);
-  const isSessionGoalCommandRequest = (value) => {
-    if (typeof value !== "object" || value === null) {
-      return false;
-    }
-    const maybeRequest = value;
-    return typeof maybeRequest.id === "string" && maybeRequest.id.length > 0 && typeof maybeRequest.threadId === "string" && maybeRequest.threadId.length > 0 && isSessionGoalCommand(maybeRequest.command) && typeof maybeRequest.requestedAt === "number" && Number.isFinite(maybeRequest.requestedAt);
-  };
   const escapeAttribute = (value) => value.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
   function formatCommentReferenceForPrompt(ref2) {
     const lines2 = [];
@@ -97956,9 +98145,29 @@ stream:${scope2.streamId}`;
       }
     }
   };
+  const readStructuredErrorDetail = (error2) => {
+    const data = error2.data;
+    if (typeof data === "string" && data.length > 0) {
+      return data;
+    }
+    if (!data || typeof data !== "object") {
+      return void 0;
+    }
+    const rawDetail = data.details;
+    if (typeof rawDetail === "string" && rawDetail.length > 0) {
+      return rawDetail;
+    }
+    const rawMessage = data.message;
+    return typeof rawMessage === "string" && rawMessage.length > 0 ? rawMessage : void 0;
+  };
   const formatErrorMessage = (error2, options = {}) => {
     if (error2 instanceof Error) {
-      return options.includeStack ? error2.stack ?? error2.message : error2.message;
+      const base = options.includeStack ? error2.stack ?? error2.message : error2.message;
+      const detail = readStructuredErrorDetail(error2);
+      if (!detail || base.includes(detail)) {
+        return base;
+      }
+      return `${base}: ${detail}`;
     }
     if (typeof error2 === "string") {
       return error2;
@@ -121316,7 +121525,8 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
     "active",
     "paused",
     "budgetLimited",
-    "complete"
+    "complete",
+    "cleared"
   ]);
   const ThreadGoalPayloadSchema = object$1({
     threadId: string$2(),
@@ -121336,54 +121546,31 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
   const ThreadGoalClearedParamsSchema = object$1({
     threadId: string$2()
   });
-  const CodexImageGenerationBeginParamsSchema = object$1({
-    sessionId: string$2().optional(),
-    session_id: string$2().optional(),
-    callId: string$2().optional(),
-    call_id: string$2().optional()
-  }).passthrough().transform((params, ctx) => {
-    const sessionId = params.sessionId ?? params.session_id;
-    const callId = params.callId ?? params.call_id;
-    if (!sessionId || !callId) {
-      ctx.addIssue({
-        code: ZodIssueCode$1.custom,
-        message: "sessionId/session_id and callId/call_id are required"
-      });
-      return NEVER;
-    }
-    return {
-      sessionId,
-      callId
-    };
-  });
-  const CodexImageGenerationEndParamsSchema = object$1({
-    sessionId: string$2().optional(),
-    session_id: string$2().optional(),
-    callId: string$2().optional(),
-    call_id: string$2().optional(),
-    status: string$2(),
-    revisedPrompt: string$2().nullable().optional(),
-    revised_prompt: string$2().nullable().optional(),
-    savedPath: string$2().nullable().optional(),
-    saved_path: string$2().nullable().optional()
-  }).passthrough().transform((params, ctx) => {
-    const sessionId = params.sessionId ?? params.session_id;
-    const callId = params.callId ?? params.call_id;
-    if (!sessionId || !callId) {
-      ctx.addIssue({
-        code: ZodIssueCode$1.custom,
-        message: "sessionId/session_id and callId/call_id are required"
-      });
-      return NEVER;
+  const CODEX_IMAGE_GENERATION_TOOL_TITLE = "Image generation";
+  const CODEX_IMAGE_GENERATION_REVISED_PROMPT_PREFIX = "Revised prompt: ";
+  function extractCodexImageGenerationFields(content) {
+    if (!Array.isArray(content)) return {};
+    let revisedPrompt;
+    let savedPath;
+    for (const block of content) {
+      if (!block || typeof block !== "object") continue;
+      const b = block;
+      if (b.type !== "content") continue;
+      const inner = b.content;
+      if (!inner) continue;
+      if (inner.type === "text" && typeof inner.text === "string") {
+        if (revisedPrompt === void 0 && inner.text.startsWith(CODEX_IMAGE_GENERATION_REVISED_PROMPT_PREFIX)) {
+          revisedPrompt = inner.text.slice(CODEX_IMAGE_GENERATION_REVISED_PROMPT_PREFIX.length);
+        }
+      } else if (inner.type === "image" && typeof inner.uri === "string" && inner.uri.length > 0) {
+        savedPath = inner.uri;
+      }
     }
     return {
-      sessionId,
-      callId,
-      status: params.status,
-      revisedPrompt: params.revisedPrompt ?? params.revised_prompt ?? void 0,
-      savedPath: params.savedPath ?? params.saved_path ?? void 0
+      revisedPrompt,
+      savedPath
     };
-  });
+  }
   class AgentClient {
     constructor(options) {
       this.options = options;
@@ -121405,6 +121592,7 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
     currentModel;
     userSelectedModeId;
     isAgentInPlanMode = false;
+    codexImageGenerationToolCallIds = /* @__PURE__ */ new Set();
     buildMcpServers() {
       if (!this.options.workspaceId || !this.options.machineId) {
         return [];
@@ -121466,9 +121654,58 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
           }
         }
       }
+      if (this.handleCodexImageGenerationNotification(notification)) {
+        return;
+      }
       this.options.onUpdateMessage(notification);
       return;
     }
+    handleCodexImageGenerationNotification(notification) {
+      if (!this.isCodexAgent()) return false;
+      const update2 = notification.update;
+      if (update2.sessionUpdate !== "tool_call" && update2.sessionUpdate !== "tool_call_update") {
+        return false;
+      }
+      const callId = update2.toolCallId;
+      if (typeof callId !== "string" || callId.length === 0) return false;
+      const isBegin = update2.sessionUpdate === "tool_call";
+      const isImageGenByTitle = typeof update2.title === "string" && update2.title === CODEX_IMAGE_GENERATION_TOOL_TITLE;
+      const isTracked = this.codexImageGenerationToolCallIds.has(callId);
+      if (isBegin) {
+        if (!isImageGenByTitle) return false;
+      } else if (!isTracked) {
+        return false;
+      }
+      const acpSessionId = notification.sessionId ?? this.acpSessionId;
+      if (!acpSessionId || !this.isCurrentAcpSession(acpSessionId)) {
+        this.logger.debug(`[${this.options.sessionId}] Dropping Codex image generation notification for mismatched ACP session: ${acpSessionId}`);
+        return true;
+      }
+      const status = typeof update2.status === "string" ? update2.status : void 0;
+      const isTerminalStatus = status === "completed" || status === "failed";
+      if (isBegin && !isTracked) {
+        this.codexImageGenerationToolCallIds.add(callId);
+        this.options.onCodexImageGenerationBegin?.({
+          acpSessionId,
+          callId
+        });
+      }
+      const carriesEndPayload = !isBegin || isTerminalStatus || Array.isArray(update2.content);
+      if (carriesEndPayload && status) {
+        const { revisedPrompt, savedPath } = extractCodexImageGenerationFields(update2.content);
+        this.options.onCodexImageGenerationEnd?.({
+          acpSessionId,
+          callId,
+          status,
+          revisedPrompt,
+          savedPath
+        });
+      }
+      if (isTerminalStatus) {
+        this.codexImageGenerationToolCallIds.delete(callId);
+      }
+      return true;
+    }
     handleUsageUpdate(update2) {
       if (!isUsageUpdate(update2)) {
         return false;
@@ -121595,47 +121832,6 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
           this.options.onThreadGoalCleared?.(result.data.threadId);
           break;
         }
-        case "acp_ext:image_generation_begin": {
-          if (!this.isCodexAgent()) {
-            break;
-          }
-          const result = CodexImageGenerationBeginParamsSchema.safeParse(params);
-          if (!result.success) {
-            this.logger.debug(`[${this.options.sessionId}] Dropping invalid Codex image generation begin: ${result.error.message}`);
-            break;
-          }
-          if (!this.isCurrentAcpSession(result.data.sessionId)) {
-            this.logger.debug(`[${this.options.sessionId}] Dropping Codex image generation begin for mismatched ACP session: ${result.data.sessionId}`);
-            break;
-          }
-          this.options.onCodexImageGenerationBegin?.({
-            acpSessionId: result.data.sessionId,
-            callId: result.data.callId
-          });
-          break;
-        }
-        case "acp_ext:image_generation_end": {
-          if (!this.isCodexAgent()) {
-            break;
-          }
-          const result = CodexImageGenerationEndParamsSchema.safeParse(params);
-          if (!result.success) {
-            this.logger.debug(`[${this.options.sessionId}] Dropping invalid Codex image generation end: ${result.error.message}`);
-            break;
-          }
-          if (!this.isCurrentAcpSession(result.data.sessionId)) {
-            this.logger.debug(`[${this.options.sessionId}] Dropping Codex image generation end for mismatched ACP session: ${result.data.sessionId}`);
-            break;
-          }
-          this.options.onCodexImageGenerationEnd?.({
-            acpSessionId: result.data.sessionId,
-            callId: result.data.callId,
-            status: result.data.status,
-            revisedPrompt: result.data.revisedPrompt,
-            savedPath: result.data.savedPath
-          });
-          break;
-        }
       }
     }
     isCodexAgent() {
@@ -122012,11 +122208,13 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
     },
     codex: {
       packageName: "acp-extension-codex",
-      version: "0.12.5",
+      version: "0.14.2",
       binName: "acp-extension-codex",
       args: [
         "-c",
-        "shell_environment_policy.ignore_default_excludes=true"
+        "shell_environment_policy.ignore_default_excludes=true",
+        "-c",
+        "features.goals=true"
       ]
     }
   };
@@ -122116,6 +122314,23 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
         }
       };
     }
+    if (agent.distribution.uvx?.package) {
+      const args2 = [
+        agent.distribution.uvx.package,
+        ...agent.distribution.uvx.args ?? []
+      ];
+      return {
+        status: {
+          agent: `${agent.name}@${agent.version}`,
+          command: "uvx"
+        },
+        exec: {
+          command: "uvx",
+          args: args2,
+          env: agent.distribution.uvx.env
+        }
+      };
+    }
     throw new Error(`Registry ACP ${agentType} has no supported launcher`);
   }
   function resolveACPSetting(input2) {
@@ -124668,6 +124883,8 @@ path=/${options.repoFullName}.git
       codexImageGenerationTurnIds: /* @__PURE__ */ new Map(),
       codexImageGenerationUploads: /* @__PURE__ */ new Map(),
       codexImageGenerationUploadedCallIds: /* @__PURE__ */ new Set(),
+      codexImageGenerationActiveCallIds: /* @__PURE__ */ new Set(),
+      codexImageGenerationActivityStatusChain: Promise.resolve(),
       permissionWaitMs: 0,
       autoApprovePermissions: false,
       pendingUnread: false,
@@ -124767,6 +124984,7 @@ path=/${options.repoFullName}.git
         state2.contextWindowUsageTimer = null;
       }
       state2.contextWindowUsageBuffer = null;
+      state2.codexImageGenerationActiveCallIds.clear();
       state2.permissionWaitMs = 0;
       state2.pendingUnread = false;
     }
@@ -125618,17 +125836,15 @@ $mem | ConvertTo-Json -Compress
       const { sessionId, threadId: threadId2, command: command2 } = request;
       this.deps.logger.debug(`[${sessionId}] Goal command requested (command=${command2} threadId=${threadId2})`);
       const existingSession = this.deps.sessionManager.getSession(sessionId);
-      const pendingSession = this.deps.sessionManager.getPendingSession(sessionId);
-      const candidateSession = existingSession ?? (pendingSession ? await pendingSession : null);
-      if (candidateSession?.agentClient && candidateSession.acpSessionId) {
+      if (existingSession?.agentClient && existingSession.acpSessionId) {
         try {
-          await candidateSession.agentClient.controlThreadGoal(candidateSession.acpSessionId, command2, threadId2);
+          await existingSession.agentClient.controlThreadGoal(existingSession.acpSessionId, command2, threadId2);
           this.deps.logger.debug(`[${sessionId}] Goal command sent through ACP extension method (command=${command2})`);
           return {
             status: "handled"
           };
         } catch (error2) {
-          this.deps.logger.debug(`[${sessionId}] ACP extension goal command unavailable; falling back to hidden slash command: ${formatErrorMessage(error2)}`);
+          this.deps.logger.debug(`[${sessionId}] ACP extension goal command unavailable; falling back to local state update: ${formatErrorMessage(error2)}`);
         }
       }
       if (this.getExecutionSnapshot(sessionId).hasActiveTurn) {
@@ -125638,26 +125854,8 @@ $mem | ConvertTo-Json -Compress
         };
       }
       try {
-        const session = await this.ensureSessionForGoalCommand(request);
-        if (!session.agentClient || !session.acpSessionId) {
-          return {
-            status: "failed",
-            error: "Agent session is not ready"
-          };
-        }
-        this.deps.beginACPReplaySuppression(sessionId);
-        try {
-          await session.agentClient.prompt(session.acpSessionId, [
-            {
-              type: "text",
-              text: `/goal ${command2}`
-            }
-          ]);
-        } finally {
-          this.deps.endACPReplaySuppression(sessionId);
-        }
-        this.deps.touchSession(sessionId);
-        this.deps.logger.debug(`[${sessionId}] Goal command sent through hidden slash command (command=${command2})`);
+        await this.persistLocalGoalCommandFallback(request);
+        this.deps.logger.debug(`[${sessionId}] Goal command applied through local state fallback (command=${command2})`);
         return {
           status: "handled"
         };
@@ -125670,58 +125868,50 @@ $mem | ConvertTo-Json -Compress
         };
       }
     }
-    async ensureSessionForGoalCommand(request) {
-      const existing = this.deps.sessionManager.getSession(request.sessionId);
-      if (existing) {
-        return existing;
-      }
-      const pending2 = this.deps.sessionManager.getPendingSession(request.sessionId);
-      if (pending2) {
-        return await pending2;
-      }
-      const sessionDoc = await this.deps.workspaceDocument.getOrCreateSessionDoc(request.sessionId);
+    async resolveThreadGoalForLocalFallback(sessionDoc, threadId2) {
       const meta = await sessionDoc.getMetaState();
-      if (!meta) {
-        throw new Error("Session metadata is not available");
+      const metaGoal = meta?.latestGoal;
+      if (metaGoal?.threadId === threadId2) {
+        return metaGoal;
       }
-      if (meta.isArchived) {
-        throw new Error("Session is archived");
+      const historyGoal = resolveLatestSessionGoalFromHistory(await sessionDoc.getHistory());
+      if (historyGoal?.threadId === threadId2) {
+        return historyGoal;
       }
-      if (!meta.cliType || !meta.agentType) {
-        throw new Error("Session agent metadata is incomplete");
+      return null;
+    }
+    async resolveLatestGoalForCompletionNotification(sessionId, sessionDoc) {
+      let metaGoal = null;
+      try {
+        metaGoal = (await sessionDoc.getMetaState())?.latestGoal ?? null;
+      } catch (error2) {
+        this.deps.logger.debug(`[${sessionId}] Failed to read latest goal meta before completion notification: ${formatErrorMessage(error2)}`);
       }
-      const project = meta.project;
-      const localProjectId = project?.kind === "local" ? project.localProjectId : void 0;
-      const workdir = localProjectId ? await resolveWorkspaceLocalProjectRootPath(this.deps.workspaceDocument.repo, this.deps.machineId, localProjectId) ?? void 0 : void 0;
-      if (project?.kind === "local" && !workdir) {
-        throw new Error(`Local project not found in workspace: ${project.localProjectId}`);
+      try {
+        return resolveLatestSessionGoalFromHistory(await sessionDoc.getHistory()) ?? metaGoal;
+      } catch (error2) {
+        this.deps.logger.debug(`[${sessionId}] Failed to read latest goal history before completion notification: ${formatErrorMessage(error2)}`);
+        return metaGoal;
       }
-      const agentConfigEnvResolution = await resolveSessionEnvForSessionResume(this.deps.workspaceDocument.repo, {
-        sessionEnv: meta.env,
-        agentConfigId: meta.agentConfigId
-      });
-      const restoreConfig = {
-        sessionId: request.sessionId,
-        workspaceId: this.deps.workspaceId,
-        agentCliType: meta.cliType,
-        agentType: meta.agentType,
-        userId: request.userId,
-        machineId: this.deps.machineId,
-        assumeDocExisting: true,
-        env: agentConfigEnvResolution.env ?? void 0,
-        githubRepo: resolveProjectGitHubRepo(project),
-        branch: project?.branch?.trim() || void 0,
-        restoreBranchName: meta.branchName?.trim() || void 0,
-        project,
-        resume: true,
-        workdir,
-        parentSessionId: meta.parentSessionId,
-        userName: request.userName,
-        userEmail: request.userEmail
+    }
+    async persistLocalGoalCommandFallback(request) {
+      const sessionDoc = await this.deps.workspaceDocument.getOrCreateSessionDoc(request.sessionId);
+      const existingGoal = await this.resolveThreadGoalForLocalFallback(sessionDoc, request.threadId);
+      if (!existingGoal) {
+        if (request.command === "clear") {
+          return;
+        }
+        throw new Error(`Goal thread not found: ${request.threadId}`);
+      }
+      const nextStatus = request.command === "pause" ? "paused" : request.command === "resume" ? "active" : "cleared";
+      const updatedGoal = {
+        ...existingGoal,
+        status: nextStatus,
+        updatedAt: getServerNow()
       };
-      this.deps.logger.debug(`[${request.sessionId}] Restoring session for hidden goal command (resumeSessionId=${meta.acpSessionId ?? "none"})`);
-      return await this.deps.sessionManager.createSession(restoreConfig, {
-        resumeSessionId: meta.acpSessionId
+      await upsertThreadGoalInHistory(sessionDoc, updatedGoal);
+      await this.deps.workspaceDocument.repo.upsertDocMeta(sessionDoc.roomId, {
+        latestGoal: updatedGoal
       });
     }
     formatGiB(bytes) {
@@ -126058,7 +126248,8 @@ $mem | ConvertTo-Json -Compress
           const rawDataMessage = dataObj?.message;
           const dataDetails = typeof rawDetails === "string" && rawDetails.length > 0 ? rawDetails : void 0;
           const dataMessage = typeof rawDataMessage === "string" && rawDataMessage.length > 0 ? rawDataMessage : void 0;
-          const userMessage = dataDetails || dataMessage || acpError.message;
+          const dataString = typeof acpError.data === "string" && acpError.data.length > 0 ? acpError.data : void 0;
+          const userMessage = dataDetails || dataMessage || dataString || acpError.message;
           this.deps.logger.warn(`[${sessionId}] ACP error occurred (code=${acpError.code} reason=${failureReason}): ${userMessage}`);
           await this.deps.recordChatFailure(sessionDoc, failureReason, userMessage);
           if (this.shouldTerminateOnACPError(acpError.code, failureReason)) {
@@ -126162,6 +126353,11 @@ $mem | ConvertTo-Json -Compress
         this.deps.logger.debug(`[${sessionId}] Failed to persist session lastMessageAt: ${formatErrorMessage(error2)}`);
       }
       this.deps.touchSession(sessionId);
+      const latestGoal = await this.resolveLatestGoalForCompletionNotification(sessionId, sessionDoc);
+      if (isSessionGoalWorking(latestGoal)) {
+        this.deps.logger.debug(`[${sessionId}] Skipping session completion notification because a thread goal is still active`);
+        return;
+      }
       await this.deps.turnFinalization.notifySessionCompleted(sessionId, userId);
     }
     async runVisibleSessionTurn(options, body) {
@@ -127644,9 +127840,11 @@ $mem | ConvertTo-Json -Compress
         return;
       }
       const requesterUserId = nextUserTurn.userId ?? freshMeta.userId;
+      const localProjectId = freshMeta.project?.kind === "local" ? freshMeta.project.localProjectId : void 0;
       const access = await this.deps.canUseMachine({
         sessionId,
-        requesterUserId
+        requesterUserId,
+        localProjectId
       });
       if (!access.allowed) {
         await this.markDispatchAccessDenied(sessionId, sessionDoc, nextUserTurn.id, access.reason);
@@ -127668,6 +127866,8 @@ $mem | ConvertTo-Json -Compress
           return "This machine is not registered for workspace access.";
         case "not_visible":
           return "This machine is private to its owner.";
+        case "project_not_shared":
+          return "This local project is not shared with the team.";
         case "access_unavailable":
           return "Machine access could not be verified.";
         case "cli_token_invalid":
@@ -127719,14 +127919,10 @@ $mem | ConvertTo-Json -Compress
       if (request.id === this.goalCommandSeenId.get(sessionId)) {
         return;
       }
-      const user = await this.userResolver.resolve(meta.userId);
       const result = await this.deps.executionService.controlSessionGoal({
         sessionId,
         threadId: request.threadId,
-        command: request.command,
-        userId: meta.userId,
-        userName: user.name,
-        userEmail: user.email
+        command: request.command
       });
       if (result.status === "deferred") {
         this.deps.logger.debug(`[${sessionId}] Deferring hidden goal command ${request.command} until active turn completes`);
@@ -127737,7 +127933,7 @@ $mem | ConvertTo-Json -Compress
         lastGoalCommand: void 0
       });
       if (result.status === "failed") {
-        this.deps.logger.debug(`[${sessionId}] Hidden goal command ${request.command} failed: ${result.error}`);
+        this.deps.logger.debug(`[${sessionId}] Goal command ${request.command} failed: ${result.error}`);
       }
     }
     async buildChatRequestFromHistoryEntry(meta, entry2) {
@@ -128499,7 +128695,8 @@ $mem | ConvertTo-Json -Compress
       reason: _enum$1([
         "requester_not_member",
         "machine_not_registered",
-        "not_visible"
+        "not_visible",
+        "project_not_shared"
       ])
     })
   ]);
@@ -128551,15 +128748,30 @@ $mem | ConvertTo-Json -Compress
     });
     return RegisterMachineAccessResultSchema.parse(raw);
   }
+  const LEGACY_LOCAL_PROJECT_ID_VALIDATOR_ERROR = /ArgumentValidationError[\s\S]*extra field `localProjectId`/;
   async function canUseMachineForCliToken(input2) {
     const client = createAuthConvexClient();
-    const raw = await client.query(api.machines.canUseMachineFromCliToken, {
+    const baseArgs = {
       cliToken: input2.token,
       workspaceId: input2.workspaceId,
       machineId: input2.machineId,
       requesterUserId: input2.requesterUserId
-    });
-    return MachineAccessCheckResultSchema.parse(raw);
+    };
+    try {
+      const raw = await client.query(api.machines.canUseMachineFromCliToken, {
+        ...baseArgs,
+        ...input2.localProjectId !== void 0 ? {
+          localProjectId: input2.localProjectId
+        } : {}
+      });
+      return MachineAccessCheckResultSchema.parse(raw);
+    } catch (error2) {
+      if (input2.localProjectId !== void 0 && error2 instanceof Error && LEGACY_LOCAL_PROJECT_ID_VALIDATOR_ERROR.test(error2.message)) {
+        const raw = await client.query(api.machines.canUseMachineFromCliToken, baseArgs);
+        return MachineAccessCheckResultSchema.parse(raw);
+      }
+      throw error2;
+    }
   }
   const HTTP_HOP_BY_HOP_HEADERS = /* @__PURE__ */ new Set([
     "connection",
@@ -130535,9 +130747,7 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
   };
   const CODEX_IMAGE_GENERATION_TERMINAL_STATUSES = /* @__PURE__ */ new Set([
     "completed",
-    "failed",
-    "cancelled",
-    "incomplete"
+    "failed"
   ]);
   function isCodexImageGenerationTerminalStatus(status) {
     return CODEX_IMAGE_GENERATION_TERMINAL_STATUSES.has(status.trim().toLowerCase());
@@ -130705,13 +130915,14 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
         workspaceId: this.workspaceId,
         workspaceDocument: this.workspaceDocument,
         executionService: this.executionService,
-        canUseMachine: async ({ requesterUserId, sessionId }) => {
+        canUseMachine: async ({ requesterUserId, sessionId, localProjectId }) => {
           try {
             return await canUseMachineForCliToken({
               token: this.token,
               workspaceId: this.workspaceId,
               machineId: this.machineId,
-              requesterUserId
+              requesterUserId,
+              localProjectId
             });
           } catch (error2) {
             const message = formatErrorMessage(error2);
@@ -130986,11 +131197,44 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
     }
     handleCodexImageGenerationBegin(sessionId, event) {
       const turnId = this.store.getTurnId(sessionId) ?? null;
-      this.store.get(sessionId).codexImageGenerationTurnIds.set(event.callId, turnId);
+      const state2 = this.store.get(sessionId);
+      state2.codexImageGenerationTurnIds.set(event.callId, turnId);
+      state2.codexImageGenerationActiveCallIds.add(event.callId);
+      this.enqueueCodexImageGenerationActivityStatusSync(sessionId);
       this.logger.debug(`[${sessionId}] Codex image generation started (callId=${event.callId} turnId=${turnId ?? "none"})`);
     }
+    enqueueCodexImageGenerationActivityStatusSync(sessionId) {
+      const state2 = this.store.get(sessionId);
+      const task = state2.codexImageGenerationActivityStatusChain.catch(() => void 0).then(async () => {
+        const currentState = this.store.get(sessionId);
+        const hasActiveImageGeneration = currentState.codexImageGenerationActiveCallIds.size > 0;
+        const sessionDoc = await this.workspaceDocument.getOrCreateSessionDoc(sessionId);
+        const status = (await sessionDoc.getMetaState())?.status;
+        if (hasActiveImageGeneration) {
+          if (status?.type !== "requestPermission") {
+            await sessionDoc.setStatus(SessionStatusFactory.running("image_generation"));
+          }
+          return;
+        }
+        if (status?.type === "running" && status.activity === "image_generation") {
+          await sessionDoc.setStatus(SessionStatusFactory.running());
+        }
+      });
+      state2.codexImageGenerationActivityStatusChain = task;
+      void task.catch((error2) => {
+        try {
+          this.logger.debug(`[${sessionId}] Failed to sync Codex image generation activity: ${formatErrorMessage(error2)}`);
+        } catch {
+        }
+      });
+    }
     handleCodexImageGenerationEnd(sessionId, event) {
       const state2 = this.store.get(sessionId);
+      const isTerminal2 = isCodexImageGenerationTerminalStatus(event.status);
+      if (isTerminal2) {
+        state2.codexImageGenerationActiveCallIds.delete(event.callId);
+        this.enqueueCodexImageGenerationActivityStatusSync(sessionId);
+      }
       if (state2.codexImageGenerationUploadedCallIds.has(event.callId)) {
         this.logger.debug(`[${sessionId}] Ignoring duplicate Codex image generation upload (callId=${event.callId} status=${event.status})`);
         return;
@@ -131001,7 +131245,6 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
       }
       const cachedTurnId = state2.codexImageGenerationTurnIds.get(event.callId);
       const capturedTurnId = cachedTurnId !== void 0 ? cachedTurnId : this.store.getTurnId(sessionId) ?? null;
-      const isTerminal2 = isCodexImageGenerationTerminalStatus(event.status);
       const savedPath = this.resolveCodexGeneratedImagePath(sessionId, event.savedPath);
       if (!savedPath) {
         if (isTerminal2) {
@@ -143674,6 +143917,7 @@ Received ${signal}, shutting down gracefully...` : "\nShutting down gracefully..
   }
   const ELECTRON_BOOTSTRAP_ENV = "LODY_ELECTRON_BOOTSTRAP";
   const ELECTRON_SESSION_TOKEN_ENV = "LODY_ELECTRON_SESSION_TOKEN";
+  const ELECTRON_SESSION_USER_ID_ENV = "LODY_ELECTRON_SESSION_USER_ID";
   const EXIT_CODE_ALREADY_RUNNING = 3;
   function logCliDetectionResults(logger2, availability) {
     logger2.debug("Local agent auth detection results:");
@@ -143721,6 +143965,8 @@ Received ${signal}, shutting down gracefully...` : "\nShutting down gracefully..
       codex: checkCodex()
     };
     logCliDetectionResults(logger2, cliAvailability);
+    const electronSessionUser = electronSessionToken && !process.env[ELECTRON_SESSION_USER_ID_ENV]?.trim() ? await authClient.getSessionUserFromSessionToken(electronSessionToken) : null;
+    const electronSessionUserId = process.env[ELECTRON_SESSION_USER_ID_ENV]?.trim() || electronSessionUser?.id || null;
     const cliSelection = resolveCliTypesSelection({
       requestedCliTypes: options.cliTypes,
       availability: cliAvailability
@@ -143783,13 +144029,19 @@ Received ${signal}, shutting down gracefully...` : "\nShutting down gracefully..
     } else if (existingAuth) {
       logger2.debug("Found existing authentication, checking validity...");
       const validation2 = await authClient.validateToken(existingAuth.token);
-      if (validation2.valid) {
+      const existingUserId = validation2.valid ? validation2.userId ?? existingAuth.user.id : null;
+      const electronUserMismatch = !!electronSessionToken && electronSessionUserId !== null && existingUserId !== null && existingUserId !== electronSessionUserId;
+      if (validation2.valid && existingUserId && !electronUserMismatch) {
         token2 = existingAuth.token;
-        userId = validation2.userId ?? existingAuth.user.id;
+        userId = existingUserId;
         machineId = existingAuth.machine.machineId;
         machineName = defaultMachineName;
       } else {
-        logger2.warn("Existing authentication is invalid.");
+        if (electronUserMismatch) {
+          logger2.warn("Existing CLI credentials belong to a different account than the desktop session \u2014 re-authenticating.");
+        } else {
+          logger2.warn("Existing authentication is invalid.");
+        }
         const bootstrap = await completeBootstrapLogin();
         if (bootstrap) {
           token2 = bootstrap.token;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lody",
-  "version": "0.50.0",
+  "version": "0.50.2",
   "description": "Lody Agent CLI tool for managing remote command execution",
   "type": "module",
   "main": "dist/index.js",
@@ -21,7 +21,7 @@
   },
   "optionalDependencies": {
     "acp-extension-claude": "0.31.1",
-    "acp-extension-codex": "0.12.5"
+    "acp-extension-codex": "0.14.2"
   },
   "devDependencies": {
     "@agentclientprotocol/sdk": "^0.20.0",
@@ -74,10 +74,10 @@
     "ws": "^8.18.3",
     "zod": "^4.1.5",
     "@lody/cli-supervisor": "0.0.1",
+    "@lody/convex": "0.0.1",
     "@lody/loro-streams-rpc": "0.0.1",
     "@lody/shared": "0.0.1",
-    "loro-code": "0.0.1",
-    "@lody/convex": "0.0.1"
+    "loro-code": "0.0.1"
   },
   "files": [
     "dist",