lody 0.85.0 → 0.86.0

package/dist/chunks/{index-ddMw90Gr.js → index-Dd0J9MIK.js}

@@ -20989,17 +20989,42 @@ var ACPSessionConnection = class {
     });
   }
 };
-var GOAL_EXTENSION_VERSION = 1;
-var GOAL_CONTROL_METHOD = "_session/goal";
-var LEGACY_GOAL_CONTROL_METHOD = "_codex/session/goal_control";
-var GOAL_CONTROL_ACTIONS = ["set", "pause", "resume", "clear"];
+var LODY_EXTENSION_METHODS = {
+  sessionUsageUpdate: "_lody/session/usage_update",
+  rateLimitsGet: "_lody/rate_limits/get",
+  rateLimitsUpdate: "_lody/rate_limits/update",
+  sessionSteer: "_lody/session/steer",
+  sessionSteerApplied: "_lody/session/steer_applied",
+  sessionGoal: "_lody/session/goal",
+  sessionHistoryRead: "_lody/session/history/read"
+};
+var LODY_TOOL_NAMES = {
+  imageGeneration: "ImageGeneration"
+};
+var GOAL_CONTROL_METHOD = LODY_EXTENSION_METHODS.sessionGoal;
 var LEGACY_SET_SESSION_MODEL_METHOD = "session/set_model";
-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";
-var SESSION_STEERING_METHOD = "_session/steering";
-var LODY_READ_SESSION_HISTORY_METHOD = "_lody/session/history/read";
+var ACP_EXT_SESSION_USAGE_UPDATE_METHOD = LODY_EXTENSION_METHODS.sessionUsageUpdate;
+var ACP_EXT_SESSION_RATE_LIMITS_METHOD = LODY_EXTENSION_METHODS.rateLimitsUpdate;
+var CODEX_STEER_APPLIED_METHOD = LODY_EXTENSION_METHODS.sessionSteerApplied;
+var SESSION_STEERING_METHOD = LODY_EXTENSION_METHODS.sessionSteer;
+var LODY_READ_SESSION_HISTORY_METHOD = LODY_EXTENSION_METHODS.sessionHistoryRead;
+var LODY_RATE_LIMITS_GET_METHOD = LODY_EXTENSION_METHODS.rateLimitsGet;
+var CODEX_LODY_CAPABILITIES = {
+  usage: { version: 1 },
+  rateLimits: { version: 1, query: true },
+  forkAtTurn: { version: 1 },
+  steering: {
+    version: 1,
+    transport: "request",
+    upstreamTurn: "same",
+    configPolicy: "active"
+  },
+  tasks: { version: 1, background: true },
+  subagents: { version: 1, lifecycle: true },
+  goal: { version: 1, actions: ["set", "pause", "resume", "clear"] },
+  compaction: { version: 1 },
+  sessionHistory: { version: 1 }
+};
 function getLodyForkTurnId(meta3) {
   if (typeof meta3 !== "object" || meta3 === null) return null;
   const lody = meta3["lody"];
@@ -21010,19 +21035,8 @@ function getLodyForkTurnId(meta3) {
   const turnId = forkAtTurn["turnId"];
   return version2 === 1 && typeof turnId === "string" && turnId.length > 0 ? turnId : null;
 }
-var CODEX_STEER_CAPABILITY = {
-  version: 1,
-  method: SESSION_STEERING_METHOD,
-  appliedNotification: CODEX_STEER_APPLIED_METHOD,
-  upstreamTurn: "same",
-  configPolicy: "active"
-};
-var LODY_READ_SESSION_HISTORY_CAPABILITY = {
-  version: 1,
-  method: LODY_READ_SESSION_HISTORY_METHOD
-};
 function isExtMethodRequest(request) {
-  return request.method === "authentication/status" || request.method === "authentication/logout" || request.method === LEGACY_SET_SESSION_MODEL_METHOD || request.method === GOAL_CONTROL_METHOD || request.method === LEGACY_GOAL_CONTROL_METHOD || request.method === SESSION_STEERING_METHOD;
+  return request.method === "authentication/status" || request.method === "authentication/logout" || request.method === LEGACY_SET_SESSION_MODEL_METHOD || request.method === GOAL_CONTROL_METHOD || request.method === SESSION_STEERING_METHOD;
 }
 function toTokenCount(usage) {
   return {
@@ -21662,16 +21676,22 @@ function createTerminalOutputMeta(mode, terminalId, data) {
       };
   }
 }
-var CONTEXT_COMPACTION_META_KEY = "contextCompaction";
-var CONTEXT_COMPACTION_META_VERSION = 1;
 function createContextCompactionMeta(metadata = {}) {
   return {
-    [CONTEXT_COMPACTION_META_KEY]: {
-      version: CONTEXT_COMPACTION_META_VERSION,
-      ...metadata
+    lody: {
+      activity: {
+        version: 1,
+        kind: "context_compaction",
+        ...metadata.trigger === void 0 ? {} : { automatic: metadata.trigger === "automatic" },
+        ...metadata.preTokens === void 0 ? {} : { usedTokensBefore: metadata.preTokens },
+        ...metadata.postTokens === void 0 ? {} : { usedTokensAfter: metadata.postTokens },
+        ...metadata.durationMs === void 0 ? {} : { durationMs: metadata.durationMs },
+        ...metadata.error === void 0 ? {} : { failureReason: metadata.error }
+      }
     }
   };
 }
+var imageGenerationMeta = { lody: { toolName: LODY_TOOL_NAMES.imageGeneration } };
 var CONTEXT_COMPACTION_META = createContextCompactionMeta();
 function toAcpStatus(status) {
   switch (status) {
@@ -21790,6 +21810,7 @@ function createImageGenerationStartUpdate(item) {
     kind: "other",
     title: "Image generation",
     status: "in_progress",
+    _meta: imageGenerationMeta,
     rawInput: {
       id: item.id
     }
@@ -21800,6 +21821,7 @@ function createImageGenerationCompleteUpdate(item) {
     sessionUpdate: "tool_call_update",
     toolCallId: item.id,
     status: imageGenerationTerminalStatus(item.status),
+    _meta: imageGenerationMeta,
     content: imageGenerationContent(item),
     rawOutput: imageGenerationRawOutput(item)
   };
@@ -21810,6 +21832,7 @@ function createImageGenerationUpdate(item, options) {
     toolCallId: item.id,
     kind: "other",
     title: "Image generation",
+    _meta: imageGenerationMeta,
     status: options?.terminalStatus ? imageGenerationTerminalStatus(item.status) : imageGenerationToolStatus(item.status),
     content: imageGenerationContent(item),
     rawOutput: imageGenerationRawOutput(item)
@@ -21994,6 +22017,17 @@ function createCollabAgentToolCallRawInput(item) {
 }
 function createCollabAgentToolCallMeta(item) {
   return {
+    lody: {
+      task: {
+        version: 1,
+        taskId: item.id,
+        kind: "subagent",
+        status: toAcpStatus(item.status),
+        description: item.prompt,
+        actor: item.tool,
+        ...typeof item.model === "string" ? { modelId: item.model } : {}
+      }
+    },
     codex: {
       collaboration: {
         tool: item.tool,
@@ -22015,6 +22049,16 @@ function createSubAgentActivityUpdate(item, status, sessionUpdate) {
       activityKind: item.kind
     },
     _meta: {
+      lody: {
+        task: {
+          version: 1,
+          taskId: item.id,
+          kind: "subagent",
+          status,
+          description: title,
+          actor: name
+        }
+      },
       codex: {
         subagent: {
           threadId: item.agentThreadId,
@@ -22459,12 +22503,11 @@ function createCodexMessagePhaseMeta(phase) {
   if (!phase) {
     return void 0;
   }
-  return { codex: { phase } };
+  return { lody: { messagePhase: phase } };
 }
 function createCodexAgentMessageMeta(phase, turnId) {
   return {
-    ...phase ? { codex: { phase } } : {},
-    lody: { turnId }
+    lody: { turnId, ...phase ? { messagePhase: phase } : {} }
   };
 }
 function createUserMessageChunk(content, messageId, meta3) {
@@ -22530,9 +22573,6 @@ function toGoalStatus(status) {
       return "limited";
   }
 }
-function toUnixMilliseconds(timestampSeconds) {
-  return timestampSeconds * 1e3;
-}
 function toThreadGoalSnapshot(goal) {
   return {
     objective: goal.objective.trim(),
@@ -22540,15 +22580,36 @@ function toThreadGoalSnapshot(goal) {
     tokenBudget: goal.tokenBudget,
     tokensUsed: goal.tokensUsed,
     timeUsedSeconds: goal.timeUsedSeconds,
-    createdAt: toUnixMilliseconds(goal.createdAt),
-    updatedAt: toUnixMilliseconds(goal.updatedAt),
-    controlMethod: GOAL_CONTROL_METHOD
+    createdAtEpochSeconds: goal.createdAt,
+    updatedAtEpochSeconds: goal.updatedAt
   };
 }
 function sameThreadGoalSnapshot(left, right) {
   if (left === void 0) return false;
   if (left === null || right === null) return left === right;
-  return left.objective === right.objective && left.status === right.status && left.tokenBudget === right.tokenBudget && left.createdAt === right.createdAt;
+  return left.objective === right.objective && left.status === right.status && left.tokenBudget === right.tokenBudget && left.createdAtEpochSeconds === right.createdAtEpochSeconds;
+}
+function toLodyRateLimit(snapshot) {
+  const limitId = snapshot.limitId ?? snapshot.limitName ?? "codex";
+  return {
+    limitId,
+    scope: { providerId: "codex" },
+    limitName: snapshot.limitName,
+    planName: snapshot.planType,
+    windows: [snapshot.primary, snapshot.secondary].filter((window) => window !== null).map((window) => ({
+      usedPercent: window.usedPercent,
+      windowDurationSeconds: window.windowDurationMins === null ? null : window.windowDurationMins * 60,
+      resetsAtEpochSeconds: window.resetsAt
+    }))
+  };
+}
+function toLodyRateLimitsResponse(response) {
+  const buckets = Object.values(response.rateLimitsByLimitId ?? {}).filter((snapshot) => snapshot !== void 0);
+  const snapshots = buckets.length > 0 ? buckets : [response.rateLimits];
+  return {
+    rateLimits: snapshots.map(toLodyRateLimit),
+    fetchedAtEpochSeconds: Math.floor(Date.now() / 1e3)
+  };
 }
 var JETBRAINS_META_KEY = "jetbrains";
 var AIR_META_KEY = "air";
@@ -22679,8 +22740,6 @@ var CodexEventHandler = class _CodexEventHandler {
   reasoningSummaryFilters = /* @__PURE__ */ new Map();
   terminalCommandIds = /* @__PURE__ */ new Set();
   terminalCommandOutputIds = /* @__PURE__ */ new Set();
-  proposedPlanMarkdown = "";
-  proposedPlanTurnId = null;
   agentMessagePhases = /* @__PURE__ */ new Map();
   activeSubAgentActivities = /* @__PURE__ */ new Set();
   constructor(connection, sessionState, supportsPlanUpdates = false, supportsTypedSessionFailures = false, sessionFailureEpoch = randomUUID()) {
@@ -22871,7 +22930,7 @@ var CodexEventHandler = class _CodexEventHandler {
           sessionUpdate: "session_info_update",
           title: notification.params.threadName ?? null,
           _meta: {
-            codex: {
+            lody: {
               titleSource: this.sessionState.sessionTitleSource
             }
           }
@@ -22988,16 +23047,6 @@ var CodexEventHandler = class _CodexEventHandler {
           this.createSessionUsageExtNotification(notification.params)
         );
         return;
-      case "item/plan/delta":
-        if (!this.supportsPlanUpdates) {
-          await this.emitCodexProposedPlanDelta(notification.params);
-        }
-        return;
-      case "turn/completed":
-        if (!this.supportsPlanUpdates) {
-          await this.emitCodexProposedPlanCompleted(notification.params);
-        }
-        return;
       default:
         return;
     }
@@ -23009,70 +23058,20 @@ var CodexEventHandler = class _CodexEventHandler {
   createSessionUsageExtNotification(params) {
     const totalUsage = params.tokenUsage.total;
     return {
+      sessionId: this.sessionState.sessionId,
       usage: {
         inputTokens: totalUsage.inputTokens,
         outputTokens: totalUsage.outputTokens,
         cacheReadInputTokens: totalUsage.cachedInputTokens,
         reasoningOutputTokens: totalUsage.reasoningOutputTokens,
-        contextWindow: params.tokenUsage.modelContextWindow
+        ...params.tokenUsage.modelContextWindow === null ? {} : { contextWindow: params.tokenUsage.modelContextWindow }
       }
     };
   }
-  async emitCodexProposedPlanDelta(params) {
-    this.proposedPlanMarkdown += params.delta;
-    this.proposedPlanTurnId = params.turnId;
-    await this.notifyExt(
-      ACP_EXT_CODEX_PROPOSED_PLAN_METHOD,
-      this.createCodexProposedPlanExtNotification(
-        params.turnId,
-        this.proposedPlanMarkdown,
-        "delta"
-      )
-    );
-  }
-  async emitCodexProposedPlanCompleted(params) {
-    if (this.proposedPlanMarkdown.trim().length === 0) {
-      return;
-    }
-    await this.notifyExt(
-      ACP_EXT_CODEX_PROPOSED_PLAN_METHOD,
-      this.createCodexProposedPlanExtNotification(
-        this.proposedPlanTurnId ?? params.turn.id,
-        this.proposedPlanMarkdown,
-        "completed"
-      )
-    );
-  }
-  createCodexProposedPlanExtNotification(turnId, markdown, status) {
-    return {
-      schemaVersion: 1,
-      sessionId: this.sessionState.sessionId,
-      turnId,
-      markdown,
-      status,
-      isLatest: true
-    };
-  }
   createSessionRateLimitsExtNotification(rateLimits) {
-    const windows = [rateLimits.primary, rateLimits.secondary].filter(
-      (window) => window !== null
-    );
-    const fiveHour = windows.find((window) => window.windowDurationMins === 5 * 60) ?? null;
-    const sevenDay = windows.find((window) => window.windowDurationMins === 7 * 24 * 60) ?? null;
     return {
-      schemaVersion: 2,
-      planName: rateLimits.planType,
-      limitName: rateLimits.limitName,
-      limitId: rateLimits.limitId,
-      windows: windows.map((window) => ({
-        usedPercent: window.usedPercent,
-        windowDurationMins: window.windowDurationMins,
-        resetsAt: window.resetsAt
-      })),
-      fiveHour: fiveHour?.usedPercent ?? null,
-      sevenDay: sevenDay?.usedPercent ?? null,
-      fiveHourResetAt: fiveHour?.resetsAt ?? null,
-      sevenDayResetAt: sevenDay?.resetsAt ?? null
+      rateLimits: [toLodyRateLimit(rateLimits)],
+      fetchedAtEpochSeconds: Math.floor(Date.now() / 1e3)
     };
   }
   createCodexSessionInfoUpdate(codexMetadata) {
@@ -23095,20 +23094,24 @@ var CodexEventHandler = class _CodexEventHandler {
     const detailsText = event.details ? `
 
 ${event.details}` : "";
-    return this.createCodexSessionInfoUpdate({
-      warning: {
+    return {
+      sessionUpdate: "session_info_update",
+      _meta: { lody: { notice: {
+        level: "warning",
         message: `${event.summary}${detailsText}`,
         source: "configWarning"
-      }
-    });
+      } } }
+    };
   }
   createWarningEvent(event) {
-    return this.createCodexSessionInfoUpdate({
-      warning: {
+    return {
+      sessionUpdate: "session_info_update",
+      _meta: { lody: { notice: {
+        level: "warning",
         message: event.message,
         source: "warning"
-      }
-    });
+      } } }
+    };
   }
   /**
    * Unlike `warning` and `configWarning`, this notification was dropped outright, so there is no
@@ -23146,7 +23149,7 @@ ${event.details}` : "";
   createGoalSessionInfoUpdate(goal) {
     return {
       sessionUpdate: "session_info_update",
-      _meta: { goal }
+      _meta: { lody: { goal } }
     };
   }
   createReasoningSummaryDeltaEvent(event) {
@@ -24242,6 +24245,9 @@ var ELICITATION_OPTIONS = [
   { optionId: "decline", name: "Decline", kind: "reject_once" }
 ];
 var USER_INPUT_OTHER_FIELD_SUFFIX = "__other";
+var lodyElicitationMeta = (meta3) => ({
+  lody: { elicitation: { version: 1, ...meta3 } }
+});
 function parsePersistOptions(meta3) {
   const result = /* @__PURE__ */ new Set();
   if (!meta3 || typeof meta3 !== "object") return result;
@@ -24612,12 +24618,7 @@ var CodexElicitationHandler = class {
       const base = {
         title: question.header || question.id,
         description: question.question,
-        _meta: {
-          codex: {
-            isOther: question.isOther,
-            isSecret: question.isSecret
-          }
-        }
+        _meta: lodyElicitationMeta({ secret: question.isSecret })
       };
       if (!hasOtherAnswer) {
         required2.push(question.id);
@@ -24639,13 +24640,10 @@ var CodexElicitationHandler = class {
           type: "string",
           title: "Other",
           description: "Type your own answer instead of choosing an option above.",
-          _meta: {
-            codex: {
-              questionId: question.id,
-              isOtherAnswer: true,
-              isSecret: question.isSecret
-            }
-          }
+          _meta: lodyElicitationMeta({
+            customAnswerFor: question.id,
+            secret: question.isSecret
+          })
         };
       }
     }
@@ -24660,11 +24658,9 @@ var CodexElicitationHandler = class {
         properties,
         required: required2
       },
-      _meta: {
-        codex: {
-          autoResolutionMs: params.autoResolutionMs
-        }
-      }
+      _meta: lodyElicitationMeta({
+        autoResolveAfterSeconds: params.autoResolutionMs === null ? null : params.autoResolutionMs / 1e3
+      })
     };
   }
   buildPermissionRequest(params, context) {
@@ -25662,6 +25658,7 @@ var package_default = {
   dependencies: {
     "@agentclientprotocol/sdk": "^1.3.0",
     "@openai/codex": "^0.148.0",
+    "acp-extension-core": "0.1.0",
     diff: "^9.0.0",
     open: "^11.0.0",
     "vscode-jsonrpc": "^9.0.1",
@@ -26921,7 +26918,7 @@ var CodexAcpClient = class {
       threadId: params.threadId,
       expectedTurnId: params.turnId,
       input: buildPromptItems(params.prompt),
-      ...params.steerId ? { clientUserMessageId: params.steerId } : {}
+      clientUserMessageId: params.steerId
     });
   }
   async fetchAvailableModels() {
@@ -29666,26 +29663,10 @@ var CodexAcpServer = class _CodexAcpServer {
           http: true,
           sse: false
         },
-        _meta: {
-          codex: {
-            steer: CODEX_STEER_CAPABILITY
-          },
-          lody: {
-            forkAtTurn: { version: 1 },
-            readSessionHistory: LODY_READ_SESSION_HISTORY_CAPABILITY
-          }
-        }
+        _meta: { lody: CODEX_LODY_CAPABILITIES }
       },
       authMethods: getCodexAuthMethods(_params.clientCapabilities),
       _meta: {
-        steering: {
-          supported: true
-        },
-        goal: {
-          version: GOAL_EXTENSION_VERSION,
-          controlMethod: GOAL_CONTROL_METHOD,
-          actions: [...GOAL_CONTROL_ACTIONS]
-        },
         [JETBRAINS_META_KEY]: {
           [AIR_META_KEY]: {
             [AIR_EXTENSION_VERSION_KEY]: AIR_EXTENSION_VERSION,
@@ -29714,8 +29695,7 @@ var CodexAcpServer = class _CodexAcpServer {
         return await this.unstable_setSessionModel(this.parseLegacySetSessionModelParams(methodRequest.params));
       case SESSION_STEERING_METHOD:
         return await this.executeOrQueueSteeringRequest(this.parseSessionSteerParams(methodRequest.params));
-      case GOAL_CONTROL_METHOD:
-      case LEGACY_GOAL_CONTROL_METHOD: {
+      case GOAL_CONTROL_METHOD: {
         const sessionState = this.sessions.get(methodRequest.params.sessionId);
         if (!sessionState) {
           throw RequestError.invalidParams(void 0, `Unknown session: ${methodRequest.params.sessionId}`);
@@ -29792,6 +29772,11 @@ var CodexAcpServer = class _CodexAcpServer {
       }
     }
   }
+  async readRateLimits() {
+    return toLodyRateLimitsResponse(
+      await this.runWithProcessCheck(() => this.codexAcpClient.getRateLimits())
+    );
+  }
   async getOrCreateSession(request) {
     try {
       return await this.tryCreateSession(request);
@@ -30536,16 +30521,14 @@ Check ${configPath} and project .codex directories, especially their config.toml
    *
    * Every session gets its own {@link SteeringQueue}: the request is enqueued
    * and awaited, so concurrent steers for one session run strictly one at a
-   * time, in arrival order, and can never race to inject into — or start —
-   * rival turns. Steers for different sessions use different queues and run
+   * time, in arrival order, and can never race to inject into rival turns.
+   * Steers for different sessions use different queues and run
    * concurrently. Once the queue drains to idle it is removed from the map,
    * so no per-session entry leaks after the session goes quiet (the identity
    * check guards against deleting a queue a later request has since reused).
    *
    * @param params The target session id and the prompt to steer with.
-   * @returns Whether the prompt joined the active turn ("injected"), started a
-   *     new one ("startedNewTurn"), or could not be applied ("failed"); see
-   *     {@link performSteeringRequest}.
+   * @returns Whether the prompt joined the active turn or could not be applied.
    */
   async executeOrQueueSteeringRequest(params) {
     const queue = this.getSteeringQueue(params.sessionId);
@@ -30579,12 +30562,10 @@ Check ${configPath} and project .codex directories, especially their config.toml
     return queue;
   }
   /**
-   * Delivers a steering prompt to the session: injects it into the live turn
-   * when there is one, otherwise starts a new turn.
+   * Delivers a steering prompt to the currently active turn.
    *
    * @param params The target session id and the prompt to steer with.
-   * @returns "injected" when the prompt joined an existing turn, otherwise the
-   *     outcome of starting a new turn.
+   * @returns "injected" when the prompt joined the active turn.
    */
   async performSteeringRequest(params) {
     logger.log("Steering session requested", {
@@ -30601,10 +30582,7 @@ Check ${configPath} and project .codex directories, especially their config.toml
         return { outcome: "injected" };
       }
     }
-    if (params.steerId) {
-      throw RequestError.invalidRequest("No active Codex turn to steer");
-    }
-    return await this.startNewTurnFromSteering(params);
+    return { outcome: "failed" };
   }
   /**
    * Rejects a steering prompt whose content the active model cannot accept
@@ -30621,38 +30599,34 @@ Check ${configPath} and project .codex directories, especially their config.toml
    *
    * A failed injection is fatal only when the turn is still the session's
    * current turn and Codex reported something other than "no active turn to
-   * steer". Otherwise the turn has already ended underneath us and the caller
-   * should start a new turn instead.
+   * steer". Otherwise the turn has already ended underneath us and steering
+   * reports a failed delivery.
    *
-   * @returns true when the prompt was injected; false when the caller should
-   *     fall back to starting a new turn.
+   * @returns true when the prompt was injected; false when the target turn
+   *     already ended.
    */
   async injectSteerIntoActiveTurn(params, turnId, sessionState) {
     const activePrompt = this.activePrompts.get(params.sessionId);
     const activeTurn = activePrompt?.currentTurn;
-    if (params.steerId) {
-      const firstText = params.prompt[0]?.type === "text" ? params.prompt[0].text : "";
-      if (firstText.startsWith("/")) {
-        throw RequestError.invalidRequest("Slash commands cannot steer an active Codex turn");
-      }
-      if (!activePrompt || !activeTurn || activeTurn.turnId !== turnId || activePrompt.signal.aborted) {
-        return false;
-      }
+    const firstText = params.prompt[0]?.type === "text" ? params.prompt[0].text : "";
+    if (firstText.startsWith("/")) {
+      throw RequestError.invalidRequest("Slash commands cannot steer an active Codex turn");
     }
-    const pending = params.steerId ? this.pendingSteers.get(params.sessionId) ?? /* @__PURE__ */ new Map() : null;
-    if (params.steerId && activePrompt && pending) {
-      if (pending.has(params.steerId)) {
-        throw RequestError.invalidRequest(`Duplicate Codex steer id: ${params.steerId}`);
-      }
-      pending.set(params.steerId, { activePrompt, turnId });
-      this.pendingSteers.set(params.sessionId, pending);
+    if (!activePrompt || !activeTurn || activeTurn.turnId !== turnId || activePrompt.signal.aborted) {
+      return false;
+    }
+    const pending = this.pendingSteers.get(params.sessionId) ?? /* @__PURE__ */ new Map();
+    if (pending.has(params.steerId)) {
+      throw RequestError.invalidRequest(`Duplicate Codex steer id: ${params.steerId}`);
     }
+    pending.set(params.steerId, { activePrompt, turnId });
+    this.pendingSteers.set(params.sessionId, pending);
     try {
       const response = await this.runWithProcessCheck(() => this.codexAcpClient.steerTurn({
-        threadId: params.steerId && activeTurn ? activeTurn.threadId : params.sessionId,
+        threadId: activeTurn.threadId,
         turnId,
         prompt: params.prompt,
-        ...params.steerId ? { steerId: params.steerId } : {}
+        steerId: params.steerId
       }));
       if (response.turnId !== turnId) {
         throw RequestError.internalError(
@@ -30662,7 +30636,7 @@ Check ${configPath} and project .codex directories, especially their config.toml
       }
       return true;
     } catch (err) {
-      if (params.steerId && activePrompt && pending?.get(params.steerId)?.activePrompt === activePrompt) {
+      if (pending.get(params.steerId)?.activePrompt === activePrompt) {
         pending.delete(params.steerId);
         if (pending.size === 0) this.pendingSteers.delete(params.sessionId);
       }
@@ -30674,22 +30648,6 @@ Check ${configPath} and project .codex directories, especially their config.toml
       return false;
     }
   }
-  /**
-   * Starts a new turn from a steering prompt when there is no live turn to
-   * inject into, and returns as soon as that turn is running.
-   *
-   * Waits for any previous prompt to drain first, then re-checks that the
-   * session is not closing — the await above is a window during which a close
-   * request can arrive.
-   *
-   * @param params The target session id and the prompt to steer with.
-   * @returns "startedNewTurn" once the turn is running; throws if the prompt
-   *     fails or is cancelled before the turn starts.
-   */
-  async startNewTurnFromSteering(params) {
-    await this.startNewTurnFromExternalPrompt(params, "Steering");
-    return { outcome: "startedNewTurn" };
-  }
   async startGoalContinuationIfCurrent(sessionState, sessionGeneration, goalControlGeneration, expectedGoal) {
     await this.startNewTurnFromExternalPrompt({
       sessionId: sessionState.sessionId,
@@ -30768,13 +30726,13 @@ Check ${configPath} and project .codex directories, especially their config.toml
     const sessionId = params["sessionId"];
     const prompt = params["prompt"];
     const steerId = params["steerId"];
-    if (typeof sessionId !== "string" || !Array.isArray(prompt) || steerId !== void 0 && (typeof steerId !== "string" || steerId.length === 0)) {
+    if (typeof sessionId !== "string" || !Array.isArray(prompt) || typeof steerId !== "string" || steerId.length === 0) {
       throw RequestError.invalidParams();
     }
     return {
       sessionId,
       prompt,
-      ...typeof steerId === "string" ? { steerId } : {}
+      steerId
     };
   }
   createSessionConfigOptions(sessionState) {
@@ -30842,7 +30800,7 @@ Check ${configPath} and project .codex directories, especially their config.toml
     await session.update({
       sessionUpdate: "session_info_update",
       _meta: {
-        goal: snapshot
+        lody: { goal: snapshot }
       }
     });
   }
@@ -30981,7 +30939,7 @@ Check ${configPath} and project .codex directories, especially their config.toml
         sessionUpdate: "session_info_update",
         title: explicitTitle,
         _meta: {
-          codex: {
+          lody: {
             titleSource: "explicit"
           }
         }
@@ -31010,7 +30968,7 @@ Check ${configPath} and project .codex directories, especially their config.toml
       sessionUpdate: "session_info_update",
       title,
       _meta: {
-        codex: {
+        lody: {
           titleSource: "fallback"
         }
       }
@@ -32151,7 +32109,7 @@ var goalControlParamsParser = external_exports.discriminatedUnion("action", [
   }).passthrough()
 ]);
 function registerGoalControlRequests(app, getAgent) {
-  return app.onRequest(GOAL_CONTROL_METHOD, goalControlParamsParser, (ctx) => getAgent().extMethod(GOAL_CONTROL_METHOD, ctx.params)).onRequest(LEGACY_GOAL_CONTROL_METHOD, goalControlParamsParser, (ctx) => getAgent().extMethod(LEGACY_GOAL_CONTROL_METHOD, ctx.params));
+  return app.onRequest(GOAL_CONTROL_METHOD, goalControlParamsParser, (ctx) => getAgent().extMethod(GOAL_CONTROL_METHOD, ctx.params));
 }
 var emptyExtensionParamsParser = external_exports.preprocess(
   (params) => params ?? {},
@@ -32164,11 +32122,16 @@ var legacySetSessionModelParamsParser = external_exports.object({
 var sessionSteerParamsParser = external_exports.object({
   sessionId: external_exports.string(),
   prompt: external_exports.array(external_exports.any()),
-  steerId: external_exports.string().min(1).optional()
+  steerId: external_exports.string().min(1)
 }).passthrough();
 var lodyReadSessionHistoryParamsParser = external_exports.object({
   sessionId: external_exports.string().min(1)
 }).passthrough();
+var lodyRateLimitsGetParamsParser = external_exports.object({
+  sessionId: external_exports.string().optional(),
+  accountId: external_exports.string().optional(),
+  modelId: external_exports.string().optional()
+}).passthrough();
 function createCodexAcpApp(options) {
   let codexAcpServer = null;
   const getAgent = () => {
@@ -32185,7 +32148,7 @@ function createCodexAcpApp(options) {
         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.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, ctx.requestId)).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)).onRequest(LODY_READ_SESSION_HISTORY_METHOD, lodyReadSessionHistoryParamsParser, (ctx) => getAgent().readSessionHistory(ctx.params)).onRequest(SESSION_STEERING_METHOD, sessionSteerParamsParser, (ctx) => getAgent().extMethod(SESSION_STEERING_METHOD, ctx.params));
+  }).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, ctx.requestId)).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)).onRequest(LODY_RATE_LIMITS_GET_METHOD, lodyRateLimitsGetParamsParser, () => getAgent().readRateLimits()).onRequest(LODY_READ_SESSION_HISTORY_METHOD, lodyReadSessionHistoryParamsParser, (ctx) => getAgent().readSessionHistory(ctx.params)).onRequest(SESSION_STEERING_METHOD, sessionSteerParamsParser, (ctx) => getAgent().extMethod(SESSION_STEERING_METHOD, ctx.params));
   return registerGoalControlRequests(agentApp, getAgent);
 }
 if (process.argv.includes("--version")) {