lody 0.73.0 → 0.74.0

package/dist/chunks/{directory-handle-QE16b3Ol.js → directory-handle-zGmrHbmq.js}

@@ -1,4 +1,4 @@
-import { o as object, s as string, l as literal, b as boolean, a as _enum, u as union, n as number, d as discriminatedUnion, c as array, r as record, G as tuple, e as unknown } from "./schemas-CDSDDVK-.js";
+import { o as object, s as string, l as literal, b as boolean, a as _enum, u as union, n as number, d as discriminatedUnion, c as array, r as record, I as tuple, e as unknown } from "./schemas-BDpQ67Nq.js";
 import { execFile } from "node:child_process";
 import { readFile } from "node:fs/promises";
 import path__default from "node:path";

package/dist/chunks/{index-yJXq3BkB.js → index-Cuqd9gip.js}

@@ -20804,6 +20804,16 @@ var ACP_EXT_SESSION_USAGE_UPDATE_METHOD = "_acp_ext:session_usage_update";
 var ACP_EXT_SESSION_RATE_LIMITS_METHOD = "_acp_ext:session_rate_limits";
 var ACP_EXT_CODEX_PROPOSED_PLAN_METHOD = "_acp_ext:codex_proposed_plan";
 var CODEX_STEER_APPLIED_METHOD = "_codex/steerApplied";
+function getLodyForkTurnId(meta3) {
+  if (typeof meta3 !== "object" || meta3 === null) return null;
+  const lody = meta3["lody"];
+  if (typeof lody !== "object" || lody === null) return null;
+  const forkAtTurn = lody["forkAtTurn"];
+  if (typeof forkAtTurn !== "object" || forkAtTurn === null) return null;
+  const version2 = forkAtTurn["version"];
+  const turnId = forkAtTurn["turnId"];
+  return version2 === 1 && typeof turnId === "string" && turnId.length > 0 ? turnId : null;
+}
 var CODEX_STEER_CAPABILITY = {
   version: 1,
   appliedNotification: CODEX_STEER_APPLIED_METHOD,
@@ -21720,22 +21730,24 @@ function createFuzzyFileSearchComplete(event) {
   };
 }
 function createWebSearchStartUpdate(item) {
+  const { results: _results, ...rawInput } = item;
   return {
     sessionUpdate: "tool_call",
     toolCallId: item.id,
     kind: "search",
     title: formatWebSearchTitle(item),
     status: "in_progress",
-    rawInput: item
+    rawInput
   };
 }
 function createWebSearchCompleteUpdate(item) {
+  const { results: _results, ...rawInput } = item;
   return {
     sessionUpdate: "tool_call_update",
     toolCallId: item.id,
     title: formatWebSearchTitle(item),
     status: "completed",
-    rawInput: item
+    rawInput
   };
 }
 function createCollabAgentToolCallUpdate(item) {
@@ -22180,6 +22192,12 @@ function createCodexMessagePhaseMeta(phase) {
   }
   return { codex: { phase } };
 }
+function createCodexAgentMessageMeta(phase, turnId) {
+  return {
+    ...phase ? { codex: { phase } } : {},
+    lody: { turnId }
+  };
+}
 function createUserMessageChunk(content, messageId, meta3) {
   if (messageId) {
     return {
@@ -22346,6 +22364,8 @@ var CodexEventHandler = class {
         return this.createTerminalInteractionEvent(notification.params);
       // ignored events
       case "thread/deleted":
+      case "thread/environment/connected":
+      case "thread/environment/disconnected":
       case "command/exec/outputDelta":
       case "hook/started":
       case "hook/completed":
@@ -22375,6 +22395,7 @@ var CodexEventHandler = class {
       case "mcpServer/oauthLogin/completed":
       case "externalAgentConfig/import/completed":
       case "rawResponseItem/completed":
+      case "rawResponse/completed":
       case "thread/started":
       case "item/plan/delta":
       case "remoteControl/status/changed":
@@ -22487,7 +22508,11 @@ var CodexEventHandler = class {
   }
   async createTextEvent(event) {
     const phase = this.agentMessagePhases.get(event.itemId) ?? null;
-    return createAgentTextMessageChunk(event.delta, event.itemId, createCodexMessagePhaseMeta(phase));
+    return createAgentTextMessageChunk(
+      event.delta,
+      event.itemId,
+      createCodexAgentMessageMeta(phase, event.turnId)
+    );
   }
   async createConfigWarningEvent(event) {
     const detailsText = event.details ? `
@@ -22892,6 +22917,7 @@ ${event.stdin}
       secondary: rateLimits.secondary ?? existing.secondary,
       credits: rateLimits.credits ?? existing.credits,
       individualLimit: rateLimits.individualLimit ?? existing.individualLimit,
+      spendControlReached: rateLimits.spendControlReached ?? existing.spendControlReached,
       planType: rateLimits.planType ?? existing.planType,
       rateLimitReachedType: rateLimits.rateLimitReachedType ?? existing.rateLimitReachedType
     } : rateLimits;
@@ -24599,7 +24625,7 @@ var package_default = {
   publishConfig: {
     access: "public"
   },
-  version: "1.2.1",
+  version: "1.3.0",
   description: "An ACP-compatible coding agent powered by Codex",
   main: "dist/index.js",
   bin: {
@@ -24665,7 +24691,7 @@ var package_default = {
   },
   dependencies: {
     "@agentclientprotocol/sdk": "^1.2.1",
-    "@openai/codex": "^0.144.4",
+    "@openai/codex": "^0.145.0",
     diff: "^9.0.0",
     open: "^11.0.0",
     "vscode-jsonrpc": "^9.0.1",
@@ -24673,6 +24699,7 @@ var package_default = {
   }
 };
 var CUSTOM_GATEWAY_PROVIDER_ID = "custom-gateway";
+var SESSION_LIST_PAGE_SIZE = 100;
 var SUPPORTED_GATEWAY_PROTOCOLS = {
   openai: "responses"
 };
@@ -24910,7 +24937,7 @@ var CodexAcpClient = class {
       modelProvider: await this.getResumeModelProvider(),
       threadId: request.sessionId
     });
-    onSubscribed?.();
+    onSubscribed?.(request.sessionId);
     const codexModels = await this.fetchAvailableModels();
     const currentModelId = this.createModelId(codexModels, response.model, response.reasoningEffort).toString();
     return {
@@ -24922,6 +24949,30 @@ var CodexAcpClient = class {
       additionalDirectories
     };
   }
+  async forkSession(request, onSubscribed) {
+    const additionalDirectories = readAdditionalDirectories(request.cwd, request.additionalDirectories, request._meta);
+    await this.refreshSkills(request.cwd, additionalDirectories);
+    const forkTurnId = getLodyForkTurnId(request._meta);
+    const response = await this.codexClient.threadFork({
+      config: await this.createSessionConfig(request.cwd, additionalDirectories, request.mcpServers ?? []),
+      cwd: request.cwd,
+      excludeTurns: true,
+      ...forkTurnId ? { lastTurnId: forkTurnId } : {},
+      modelProvider: await this.getResumeModelProvider(),
+      threadId: request.sessionId
+    });
+    onSubscribed?.(response.thread.id);
+    const codexModels = await this.fetchAvailableModels();
+    const currentModelId = this.createModelId(codexModels, response.model, response.reasoningEffort).toString();
+    return {
+      sessionId: response.thread.id,
+      currentModelId,
+      models: codexModels,
+      modelProvider: response.modelProvider,
+      currentServiceTier: response.serviceTier ?? null,
+      additionalDirectories
+    };
+  }
   async loadSession(request, onSubscribed) {
     const additionalDirectories = readAdditionalDirectories(request.cwd, request.additionalDirectories, request._meta);
     await this.refreshSkills(request.cwd, additionalDirectories);
@@ -24948,7 +24999,7 @@ var CodexAcpClient = class {
       additionalDirectories
     };
   }
-  async newSession(request) {
+  async newSession(request, onSubscribed) {
     const additionalDirectories = readAdditionalDirectories(request.cwd, request.additionalDirectories, request._meta);
     await this.refreshSkills(request.cwd, additionalDirectories);
     const response = await this.codexClient.threadStart({
@@ -24956,6 +25007,7 @@ var CodexAcpClient = class {
       modelProvider: this.getModelProvider(),
       cwd: request.cwd
     });
+    onSubscribed?.(response.thread.id);
     const codexModels = await this.fetchAvailableModels();
     if (codexModels.length === 0) {
       throw new Error("Codex did not return any models");
@@ -25271,8 +25323,12 @@ var CodexAcpClient = class {
     const modelProviders = preferredProvider ? [preferredProvider] : [];
     const listResponse = await this.codexClient.threadList({
       cursor: request.cursor ?? null,
+      limit: SESSION_LIST_PAGE_SIZE,
+      sortKey: "updated_at",
+      sortDirection: "desc",
       modelProviders,
-      sourceKinds
+      sourceKinds,
+      ...requestedCwd && path__default.isAbsolute(requestedCwd) ? { cwd: requestedCwd } : {}
     });
     const mapThreadToSession = (thread) => ({
       sessionId: thread.id,
@@ -25280,7 +25336,7 @@ var CodexAcpClient = class {
       title: (thread.name ?? thread.preview) || null,
       updatedAt: new Date(thread.updatedAt * 1e3).toISOString()
     });
-    if (listResponse.data.length === 0) {
+    if (listResponse.data.length === 0 && !requestedCwd) {
       const diagnostics = await this.runSessionListDiagnostics();
       logger.log("Session list diagnostics", diagnostics);
     }
@@ -27079,6 +27135,7 @@ var CodexAcpServer = class _CodexAcpServer {
         },
         sessionCapabilities: {
           resume: {},
+          fork: {},
           list: {},
           close: {},
           delete: {},
@@ -27092,6 +27149,9 @@ var CodexAcpServer = class _CodexAcpServer {
         _meta: {
           codex: {
             steer: CODEX_STEER_CAPABILITY
+          },
+          lody: {
+            forkAtTurn: { version: 1 }
           }
         }
       },
@@ -27139,6 +27199,15 @@ var CodexAcpServer = class _CodexAcpServer {
       throw e;
     }
   }
+  async getOrForkSession(request) {
+    try {
+      return await this.tryOpenSession({ kind: "fork", request });
+    } catch (e) {
+      const error48 = e instanceof Error ? e : new Error(String(e));
+      await this.handleError(error48);
+      throw e;
+    }
+  }
   async handleError(e) {
     if (e.message.includes("log out") || e.message.includes("cloud requirements")) {
       await this.runWithProcessCheck(() => this.codexAcpClient.logout());
@@ -27203,47 +27272,93 @@ You have been logged out. Please try again.`);
     return generation;
   }
   async tryCreateSession(request) {
-    const requestedSessionGeneration = "sessionId" in request ? this.beginSessionOpen(request.sessionId) : null;
+    return await this.tryOpenSession("sessionId" in request ? { kind: "resume", request } : { kind: "new", request });
+  }
+  async tryOpenSession(operation) {
+    const { request } = operation;
+    let openedSession = operation.kind === "resume" ? {
+      sessionId: operation.request.sessionId,
+      generation: this.beginSessionOpen(operation.request.sessionId)
+    } : null;
+    let subscribed = false;
+    const onSubscribed = (reportedSessionId) => {
+      const sessionId2 = reportedSessionId ?? (operation.kind === "resume" ? operation.request.sessionId : null);
+      if (!sessionId2) {
+        throw RequestError.internalError("Codex subscribed without reporting a session id");
+      }
+      subscribed = true;
+      if (!openedSession) {
+        openedSession = {
+          sessionId: sessionId2,
+          generation: this.beginSessionOpen(sessionId2)
+        };
+      }
+    };
     await this.checkAuthorization();
     const requestedMcpServers = request.mcpServers ?? [];
     const mcpServerStartupVersion = requestedMcpServers.length > 0 ? this.codexAcpClient.getMcpServerStartupVersion() : null;
     let sessionMetadata;
-    let resumeSubscribed = false;
-    if ("sessionId" in request) {
-      logger.log(`Resume existing session: ${request.sessionId}...`);
-      try {
-        sessionMetadata = await this.runWithProcessCheck(
-          () => this.codexAcpClient.resumeSession(request, () => {
-            resumeSubscribed = true;
-          })
-        );
-      } catch (err) {
-        if (resumeSubscribed && requestedSessionGeneration !== null) {
-          await this.cleanupStaleSessionOpen(request.sessionId, requestedSessionGeneration);
-        }
-        throw err;
+    try {
+      switch (operation.kind) {
+        case "new":
+          logger.log("Create new session...");
+          sessionMetadata = await this.runWithProcessCheck(
+            () => this.codexAcpClient.newSession(operation.request, onSubscribed)
+          );
+          break;
+        case "resume":
+          logger.log(`Resume existing session: ${operation.request.sessionId}...`);
+          sessionMetadata = await this.runWithProcessCheck(
+            () => this.codexAcpClient.resumeSession(operation.request, onSubscribed)
+          );
+          break;
+        case "fork":
+          logger.log(`Fork existing session: ${operation.request.sessionId}...`);
+          sessionMetadata = await this.runWithProcessCheck(
+            () => this.codexAcpClient.forkSession(operation.request, onSubscribed)
+          );
+          break;
       }
-    } else {
-      logger.log(`Create new session...`);
-      sessionMetadata = await this.runWithProcessCheck(() => this.codexAcpClient.newSession(request));
+    } catch (err) {
+      if (subscribed && openedSession) {
+        await this.cleanupStaleSessionOpen(openedSession.sessionId, openedSession.generation);
+      }
+      throw err;
     }
     const { sessionId, currentModelId, models } = sessionMetadata;
+    if (!openedSession) {
+      openedSession = {
+        sessionId,
+        generation: this.beginSessionOpen(sessionId)
+      };
+    } else if (openedSession.sessionId !== sessionId) {
+      if (subscribed) {
+        await this.cleanupStaleSessionOpen(openedSession.sessionId, openedSession.generation);
+      }
+      throw RequestError.internalError(
+        { expectedSessionId: openedSession?.sessionId, actualSessionId: sessionId },
+        "Codex opened a different session than it reported"
+      );
+    }
+    subscribed = true;
     const authProvider = sessionMetadata.modelProvider ?? this.codexAcpClient.getModelProvider();
     let authState;
     try {
       authState = await this.getAuthStateForProvider(authProvider);
     } catch (err) {
-      if (resumeSubscribed && requestedSessionGeneration !== null) {
-        await this.cleanupStaleSessionOpen(sessionId, requestedSessionGeneration);
+      if (subscribed) {
+        await this.cleanupStaleSessionOpen(sessionId, openedSession.generation);
       }
       throw err;
     }
-    const sessionGeneration = requestedSessionGeneration ?? this.beginSessionOpen(sessionId);
-    if (!this.sessionOpenCanInstall(sessionId, sessionGeneration)) {
-      resumeSubscribed = false;
-      await this.closeStaleSessionOpen(sessionId, sessionGeneration);
+    if (!this.sessionOpenCanInstall(sessionId, openedSession.generation)) {
+      subscribed = false;
+      await this.closeStaleSessionOpen(sessionId, openedSession.generation);
     }
-    const sessionMcpServers = this.resolveSessionMcpServers(requestedMcpServers, "sessionId" in request);
+    const sessionMcpServers = this.resolveSessionMcpServers(
+      requestedMcpServers,
+      operation.kind !== "new"
+    );
     const currentModel = this.findCurrentModel(models, currentModelId);
     const currentModelSupportsFast = modelSupportsFast(currentModel);
     const sessionState = {
@@ -27270,11 +27385,11 @@ You have been logged out. Please try again.`);
       sessionMcpServers,
       terminalOutputMode: this.terminalOutputMode,
       sessionTitle: null,
-      sessionTitleSource: "sessionId" in request ? "unknown" : "unset"
+      sessionTitleSource: operation.kind === "new" ? "unset" : "unknown"
     };
     this.sessions.set(sessionId, sessionState);
     this.publishRateLimitsAsync(sessionState);
-    resumeSubscribed = false;
+    subscribed = false;
     if (requestedMcpServers.length > 0 && mcpServerStartupVersion !== null) {
       this.pendingMcpStartupSessions.set(sessionId, {
         requestedServers: new Set(getRequestedMcpServerNames(requestedMcpServers)),
@@ -27375,6 +27490,20 @@ You have been logged out. Please try again.`);
       ...this.createSessionConfigOptionsResponse(this.getSessionState(sessionId))
     };
   }
+  async unstable_forkSession(params) {
+    logger.log("Forking session...", { sessionId: params.sessionId });
+    const [sessionId, , modeState, availableCommands] = await this.getOrForkSession(params);
+    this.publishAvailableCommandsAsync(sessionId, availableCommands);
+    logger.log("Session forked", {
+      sourceSessionId: params.sessionId,
+      sessionId
+    });
+    return {
+      sessionId,
+      modes: modeState,
+      ...this.createSessionConfigOptionsResponse(this.getSessionState(sessionId))
+    };
+  }
   async listSessions(params) {
     logger.log("Listing sessions...", { cwd: params.cwd, cursor: params.cursor });
     await this.checkAuthorization();
@@ -27805,7 +27934,7 @@ You have been logged out. Please try again.`);
     const threadUpdates = [];
     for (const turn of thread.turns) {
       for (const item of turn.items) {
-        const updates2 = await this.createHistoryUpdates(item, sessionState);
+        const updates2 = await this.createHistoryUpdates(item, sessionState, turn.id);
         threadUpdates.push(...updates2);
       }
     }
@@ -27855,7 +27984,7 @@ You have been logged out. Please try again.`);
     const normalized = title?.replace(/\s+/g, " ").trim() ?? "";
     return normalized.length > 0 ? normalized : null;
   }
-  async createHistoryUpdates(item, sessionState) {
+  async createHistoryUpdates(item, sessionState, turnId) {
     switch (item.type) {
       case "userMessage":
         return this.createUserMessageUpdates(item);
@@ -27864,12 +27993,11 @@ You have been logged out. Please try again.`);
       case "sleep":
         return [];
       case "agentMessage": {
-        const meta3 = createCodexMessagePhaseMeta(item.phase);
         return [{
           sessionUpdate: "agent_message_chunk",
           messageId: item.id,
           content: { type: "text", text: item.text },
-          ...meta3 ? { _meta: meta3 } : {}
+          _meta: createCodexAgentMessageMeta(item.phase, turnId)
         }];
       }
       case "reasoning":
@@ -28957,6 +29085,9 @@ var CodexAppServerClient = class {
   async threadResume(params) {
     return await this.sendRequest({ method: "thread/resume", params });
   }
+  async threadFork(params) {
+    return await this.sendRequest({ method: "thread/fork", params });
+  }
   async threadList(params) {
     return await this.sendRequest({ method: "thread/list", params });
   }
@@ -29573,5 +29704,5 @@ function startAcpServer() {
         codexAcpServer = null;
       }
     });
-  }).onRequest(methods.agent.initialize, (ctx) => getAgent().initialize(ctx.params)).onRequest(methods.agent.session.new, (ctx) => getAgent().newSession(ctx.params)).onRequest(methods.agent.session.load, (ctx) => getAgent().loadSession(ctx.params)).onRequest(methods.agent.session.list, (ctx) => getAgent().listSessions(ctx.params)).onRequest(methods.agent.session.delete, (ctx) => getAgent().deleteSession(ctx.params)).onRequest(methods.agent.session.resume, (ctx) => getAgent().resumeSession(ctx.params)).onRequest(methods.agent.session.close, (ctx) => getAgent().closeSession(ctx.params)).onRequest(methods.agent.session.setMode, (ctx) => getAgent().setSessionMode(ctx.params)).onRequest(methods.agent.session.setConfigOption, (ctx) => getAgent().setSessionConfigOption(ctx.params)).onRequest(methods.agent.authenticate, (ctx) => getAgent().authenticate(ctx.params)).onRequest(methods.agent.logout, (ctx) => getAgent().logout(ctx.params)).onRequest(methods.agent.providers.list, (ctx) => getAgent().listProviders(ctx.params)).onRequest(methods.agent.providers.set, (ctx) => getAgent().setProvider(ctx.params)).onRequest(methods.agent.providers.disable, (ctx) => getAgent().disableProvider(ctx.params)).onRequest(methods.agent.session.prompt, (ctx) => getAgent().prompt(ctx.params, ctx.signal)).onNotification(methods.agent.session.cancel, (ctx) => getAgent().cancel(ctx.params)).onRequest("authentication/status", emptyExtensionParamsParser, (ctx) => getAgent().extMethod("authentication/status", ctx.params)).onRequest("authentication/logout", emptyExtensionParamsParser, (ctx) => getAgent().extMethod("authentication/logout", ctx.params)).onRequest(LEGACY_SET_SESSION_MODEL_METHOD, legacySetSessionModelParamsParser, (ctx) => getAgent().extMethod(LEGACY_SET_SESSION_MODEL_METHOD, ctx.params)).connect(acpJsonStream);
+  }).onRequest(methods.agent.initialize, (ctx) => getAgent().initialize(ctx.params)).onRequest(methods.agent.session.new, (ctx) => getAgent().newSession(ctx.params)).onRequest(methods.agent.session.load, (ctx) => getAgent().loadSession(ctx.params)).onRequest(methods.agent.session.fork, (ctx) => getAgent().unstable_forkSession(ctx.params)).onRequest(methods.agent.session.list, (ctx) => getAgent().listSessions(ctx.params)).onRequest(methods.agent.session.delete, (ctx) => getAgent().deleteSession(ctx.params)).onRequest(methods.agent.session.resume, (ctx) => getAgent().resumeSession(ctx.params)).onRequest(methods.agent.session.close, (ctx) => getAgent().closeSession(ctx.params)).onRequest(methods.agent.session.setMode, (ctx) => getAgent().setSessionMode(ctx.params)).onRequest(methods.agent.session.setConfigOption, (ctx) => getAgent().setSessionConfigOption(ctx.params)).onRequest(methods.agent.authenticate, (ctx) => getAgent().authenticate(ctx.params)).onRequest(methods.agent.logout, (ctx) => getAgent().logout(ctx.params)).onRequest(methods.agent.providers.list, (ctx) => getAgent().listProviders(ctx.params)).onRequest(methods.agent.providers.set, (ctx) => getAgent().setProvider(ctx.params)).onRequest(methods.agent.providers.disable, (ctx) => getAgent().disableProvider(ctx.params)).onRequest(methods.agent.session.prompt, (ctx) => getAgent().prompt(ctx.params, ctx.signal)).onNotification(methods.agent.session.cancel, (ctx) => getAgent().cancel(ctx.params)).onRequest("authentication/status", emptyExtensionParamsParser, (ctx) => getAgent().extMethod("authentication/status", ctx.params)).onRequest("authentication/logout", emptyExtensionParamsParser, (ctx) => getAgent().extMethod("authentication/logout", ctx.params)).onRequest(LEGACY_SET_SESSION_MODEL_METHOD, legacySetSessionModelParamsParser, (ctx) => getAgent().extMethod(LEGACY_SET_SESSION_MODEL_METHOD, ctx.params)).connect(acpJsonStream);
 }