lody 0.76.0 → 0.77.0

package/dist/chunks/{index-VHXDv9iy.js → index-gHAU1HiK.js}

@@ -5,7 +5,7 @@ import { Writable, Readable } from "node:stream";
 import { StringDecoder } from "node:string_decoder";
 import fs__default from "node:fs";
 import path__default from "node:path";
-import fs__default$1, { readFile, constants } from "node:fs/promises";
+import fs__default$1, { constants, readFile } from "node:fs/promises";
 import process$1 from "node:process";
 import { fileURLToPath } from "node:url";
 import { promisify } from "node:util";
@@ -52,7 +52,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var require_is = __commonJS({
-  "../../node_modules/.pnpm/vscode-jsonrpc@9.0.1/node_modules/vscode-jsonrpc/lib/common/is.js"(exports$1) {
+  "../../../node_modules/.pnpm/vscode-jsonrpc@9.0.1/node_modules/vscode-jsonrpc/lib/common/is.js"(exports$1) {
     Object.defineProperty(exports$1, "__esModule", { value: true });
     exports$1.boolean = boolean4;
     exports$1.string = string4;
@@ -85,7 +85,7 @@ var require_is = __commonJS({
   }
 });
 var require_messages = __commonJS({
-  "../../node_modules/.pnpm/vscode-jsonrpc@9.0.1/node_modules/vscode-jsonrpc/lib/common/messages.js"(exports$1) {
+  "../../../node_modules/.pnpm/vscode-jsonrpc@9.0.1/node_modules/vscode-jsonrpc/lib/common/messages.js"(exports$1) {
     var __createBinding = exports$1 && exports$1.__createBinding || (Object.create ? (function(o, m, k, k2) {
       if (k2 === void 0) k2 = k;
       var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -467,7 +467,7 @@ var require_messages = __commonJS({
   }
 });
 var require_linkedMap = __commonJS({
-  "../../node_modules/.pnpm/vscode-jsonrpc@9.0.1/node_modules/vscode-jsonrpc/lib/common/linkedMap.js"(exports$1) {
+  "../../../node_modules/.pnpm/vscode-jsonrpc@9.0.1/node_modules/vscode-jsonrpc/lib/common/linkedMap.js"(exports$1) {
     Object.defineProperty(exports$1, "__esModule", { value: true });
     exports$1.LRUCache = exports$1.LinkedMap = exports$1.Touch = void 0;
     var Touch;
@@ -848,7 +848,7 @@ var require_linkedMap = __commonJS({
   }
 });
 var require_disposable = __commonJS({
-  "../../node_modules/.pnpm/vscode-jsonrpc@9.0.1/node_modules/vscode-jsonrpc/lib/common/disposable.js"(exports$1) {
+  "../../../node_modules/.pnpm/vscode-jsonrpc@9.0.1/node_modules/vscode-jsonrpc/lib/common/disposable.js"(exports$1) {
     Object.defineProperty(exports$1, "__esModule", { value: true });
     exports$1.Disposable = void 0;
     var Disposable;
@@ -863,7 +863,7 @@ var require_disposable = __commonJS({
   }
 });
 var require_ral = __commonJS({
-  "../../node_modules/.pnpm/vscode-jsonrpc@9.0.1/node_modules/vscode-jsonrpc/lib/common/ral.js"(exports$1) {
+  "../../../node_modules/.pnpm/vscode-jsonrpc@9.0.1/node_modules/vscode-jsonrpc/lib/common/ral.js"(exports$1) {
     Object.defineProperty(exports$1, "__esModule", { value: true });
     var _ral;
     function RAL() {
@@ -885,7 +885,7 @@ var require_ral = __commonJS({
   }
 });
 var require_events = __commonJS({
-  "../../node_modules/.pnpm/vscode-jsonrpc@9.0.1/node_modules/vscode-jsonrpc/lib/common/events.js"(exports$1) {
+  "../../../node_modules/.pnpm/vscode-jsonrpc@9.0.1/node_modules/vscode-jsonrpc/lib/common/events.js"(exports$1) {
     var __importDefault = exports$1 && exports$1.__importDefault || function(mod) {
       return mod && mod.__esModule ? mod : { "default": mod };
     };
@@ -1019,7 +1019,7 @@ var require_events = __commonJS({
   }
 });
 var require_cancellation = __commonJS({
-  "../../node_modules/.pnpm/vscode-jsonrpc@9.0.1/node_modules/vscode-jsonrpc/lib/common/cancellation.js"(exports$1) {
+  "../../../node_modules/.pnpm/vscode-jsonrpc@9.0.1/node_modules/vscode-jsonrpc/lib/common/cancellation.js"(exports$1) {
     var __createBinding = exports$1 && exports$1.__createBinding || (Object.create ? (function(o, m, k, k2) {
       if (k2 === void 0) k2 = k;
       var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -1145,7 +1145,7 @@ var require_cancellation = __commonJS({
   }
 });
 var require_sharedArrayCancellation = __commonJS({
-  "../../node_modules/.pnpm/vscode-jsonrpc@9.0.1/node_modules/vscode-jsonrpc/lib/common/sharedArrayCancellation.js"(exports$1) {
+  "../../../node_modules/.pnpm/vscode-jsonrpc@9.0.1/node_modules/vscode-jsonrpc/lib/common/sharedArrayCancellation.js"(exports$1) {
     Object.defineProperty(exports$1, "__esModule", { value: true });
     exports$1.SharedArrayReceiverStrategy = exports$1.SharedArraySenderStrategy = void 0;
     var cancellation_1 = require_cancellation();
@@ -1221,7 +1221,7 @@ var require_sharedArrayCancellation = __commonJS({
   }
 });
 var require_semaphore = __commonJS({
-  "../../node_modules/.pnpm/vscode-jsonrpc@9.0.1/node_modules/vscode-jsonrpc/lib/common/semaphore.js"(exports$1) {
+  "../../../node_modules/.pnpm/vscode-jsonrpc@9.0.1/node_modules/vscode-jsonrpc/lib/common/semaphore.js"(exports$1) {
     var __importDefault = exports$1 && exports$1.__importDefault || function(mod) {
       return mod && mod.__esModule ? mod : { "default": mod };
     };
@@ -1292,7 +1292,7 @@ var require_semaphore = __commonJS({
   }
 });
 var require_messageReader = __commonJS({
-  "../../node_modules/.pnpm/vscode-jsonrpc@9.0.1/node_modules/vscode-jsonrpc/lib/common/messageReader.js"(exports$1) {
+  "../../../node_modules/.pnpm/vscode-jsonrpc@9.0.1/node_modules/vscode-jsonrpc/lib/common/messageReader.js"(exports$1) {
     var __createBinding = exports$1 && exports$1.__createBinding || (Object.create ? (function(o, m, k, k2) {
       if (k2 === void 0) k2 = k;
       var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -1530,7 +1530,7 @@ ${JSON.stringify(Object.fromEntries(headers))}`));
   }
 });
 var require_messageWriter = __commonJS({
-  "../../node_modules/.pnpm/vscode-jsonrpc@9.0.1/node_modules/vscode-jsonrpc/lib/common/messageWriter.js"(exports$1) {
+  "../../../node_modules/.pnpm/vscode-jsonrpc@9.0.1/node_modules/vscode-jsonrpc/lib/common/messageWriter.js"(exports$1) {
     var __createBinding = exports$1 && exports$1.__createBinding || (Object.create ? (function(o, m, k, k2) {
       if (k2 === void 0) k2 = k;
       var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -1685,7 +1685,7 @@ var require_messageWriter = __commonJS({
   }
 });
 var require_messageBuffer = __commonJS({
-  "../../node_modules/.pnpm/vscode-jsonrpc@9.0.1/node_modules/vscode-jsonrpc/lib/common/messageBuffer.js"(exports$1) {
+  "../../../node_modules/.pnpm/vscode-jsonrpc@9.0.1/node_modules/vscode-jsonrpc/lib/common/messageBuffer.js"(exports$1) {
     Object.defineProperty(exports$1, "__esModule", { value: true });
     exports$1.AbstractMessageBuffer = void 0;
     var CR = 13;
@@ -1833,7 +1833,7 @@ ${header}`);
   }
 });
 var require_connection = __commonJS({
-  "../../node_modules/.pnpm/vscode-jsonrpc@9.0.1/node_modules/vscode-jsonrpc/lib/common/connection.js"(exports$1) {
+  "../../../node_modules/.pnpm/vscode-jsonrpc@9.0.1/node_modules/vscode-jsonrpc/lib/common/connection.js"(exports$1) {
     var __createBinding = exports$1 && exports$1.__createBinding || (Object.create ? (function(o, m, k, k2) {
       if (k2 === void 0) k2 = k;
       var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -2996,7 +2996,7 @@ ${JSON.stringify(message, null, 4)}`);
   }
 });
 var require_api = __commonJS({
-  "../../node_modules/.pnpm/vscode-jsonrpc@9.0.1/node_modules/vscode-jsonrpc/lib/common/api.js"(exports$1) {
+  "../../../node_modules/.pnpm/vscode-jsonrpc@9.0.1/node_modules/vscode-jsonrpc/lib/common/api.js"(exports$1) {
     var __importDefault = exports$1 && exports$1.__importDefault || function(mod) {
       return mod && mod.__esModule ? mod : { "default": mod };
     };
@@ -3207,7 +3207,7 @@ var require_api = __commonJS({
   }
 });
 var require_ril = __commonJS({
-  "../../node_modules/.pnpm/vscode-jsonrpc@9.0.1/node_modules/vscode-jsonrpc/lib/node/ril.js"(exports$1) {
+  "../../../node_modules/.pnpm/vscode-jsonrpc@9.0.1/node_modules/vscode-jsonrpc/lib/node/ril.js"(exports$1) {
     Object.defineProperty(exports$1, "__esModule", { value: true });
     var util_1 = __require("util");
     var api_1 = require_api();
@@ -3362,7 +3362,7 @@ var require_ril = __commonJS({
   }
 });
 var require_main = __commonJS({
-  "../../node_modules/.pnpm/vscode-jsonrpc@9.0.1/node_modules/vscode-jsonrpc/lib/node/main.js"(exports$1) {
+  "../../../node_modules/.pnpm/vscode-jsonrpc@9.0.1/node_modules/vscode-jsonrpc/lib/node/main.js"(exports$1) {
     var __createBinding = exports$1 && exports$1.__createBinding || (Object.create ? (function(o, m, k, k2) {
       if (k2 === void 0) k2 = k;
       var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -3416,7 +3416,7 @@ var require_main = __commonJS({
     exports$1.createMessageConnection = createMessageConnection2;
     var ril_1 = __importDefault(require_ril());
     ril_1.default.install();
-    var path6 = __importStar(__require("path"));
+    var path7 = __importStar(__require("path"));
     var os2 = __importStar(__require("os"));
     var fs7 = __importStar(__require("fs"));
     var crypto_1 = __require("crypto");
@@ -3568,7 +3568,7 @@ var require_main = __commonJS({
         throw new Error(`Unable to generate a random pipe name with ${randomLength} characters.`);
       }
       const randomSuffix = (0, crypto_1.randomBytes)(Math.floor(randomLength / 2)).toString("hex");
-      return path6.join(tmpDir, `lsp-${randomSuffix}.sock`);
+      return path7.join(tmpDir, `lsp-${randomSuffix}.sock`);
     }
     function createClientPipeTransport(pipeName, encoding = "utf-8") {
       let connectResolve;
@@ -3653,6 +3653,8 @@ var require_main = __commonJS({
     }
   }
 });
+var rpc = __toESM(require_main());
+var import_node = __toESM(require_main());
 var AGENT_METHODS = {
   initialize: "initialize",
   authenticate: "authenticate",
@@ -4457,10 +4459,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path6) {
-  if (!path6)
+function getElementAtPath(obj, path7) {
+  if (!path7)
     return obj;
-  return path6.reduce((acc, key) => acc?.[key], obj);
+  return path7.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -4843,11 +4845,11 @@ function aborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path6, issues) {
+function prefixIssues(path7, issues) {
   return issues.map((iss) => {
     var _a2;
     (_a2 = iss).path ?? (_a2.path = []);
-    iss.path.unshift(path6);
+    iss.path.unshift(path7);
     return iss;
   });
 }
@@ -5028,7 +5030,7 @@ function formatError(error48, mapper = (issue2) => issue2.message) {
 }
 function treeifyError(error48, mapper = (issue2) => issue2.message) {
   const result = { errors: [] };
-  const processError = (error49, path6 = []) => {
+  const processError = (error49, path7 = []) => {
     var _a2, _b;
     for (const issue2 of error49.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
@@ -5038,7 +5040,7 @@ function treeifyError(error48, mapper = (issue2) => issue2.message) {
       } else if (issue2.code === "invalid_element") {
         processError({ issues: issue2.issues }, issue2.path);
       } else {
-        const fullpath = [...path6, ...issue2.path];
+        const fullpath = [...path7, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -5070,8 +5072,8 @@ function treeifyError(error48, mapper = (issue2) => issue2.message) {
 }
 function toDotPath(_path) {
   const segs = [];
-  const path6 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
-  for (const seg of path6) {
+  const path7 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path7) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -16906,13 +16908,13 @@ function resolveRef(ref, ctx) {
   if (!ref.startsWith("#")) {
     throw new Error("External $ref is not supported, only local refs (#/...) are allowed");
   }
-  const path6 = ref.slice(1).split("/").filter(Boolean);
-  if (path6.length === 0) {
+  const path7 = ref.slice(1).split("/").filter(Boolean);
+  if (path7.length === 0) {
     return ctx.rootSchema;
   }
   const defsKey = ctx.version === "draft-2020-12" ? "$defs" : "definitions";
-  if (path6[0] === defsKey) {
-    const key = path6[1];
+  if (path7[0] === defsKey) {
+    const key = path7[1];
     if (!key || !ctx.defs[key]) {
       throw new Error(`Reference not found: ${ref}`);
     }
@@ -20811,8 +20813,6 @@ var AgentApp = class {
     };
   }
 };
-var rpc = __toESM(require_main());
-var import_node = __toESM(require_main());
 function createJSONRPCWriter(writable) {
   return {
     async write(msg) {
@@ -20985,13 +20985,16 @@ 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 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 GOAL_CONTROL_METHOD = "_codex/session/goal_control";
 function getLodyForkTurnId(meta3) {
   if (typeof meta3 !== "object" || meta3 === null) return null;
   const lody = meta3["lody"];
@@ -21010,7 +21013,7 @@ var CODEX_STEER_CAPABILITY = {
   configPolicy: "active"
 };
 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 === 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 === LEGACY_GOAL_CONTROL_METHOD || request.method === SESSION_STEERING_METHOD;
 }
 function toTokenCount(usage) {
   return {
@@ -22109,13 +22112,13 @@ function createTerminalCommandEvent(event, terminalId, cwd) {
     }
   };
 }
-function createSearchTitle(query, path6) {
-  if (query && path6) {
-    return `Search for '${query}' in ${path6}`;
+function createSearchTitle(query, path7) {
+  if (query && path7) {
+    return `Search for '${query}' in ${path7}`;
   } else if (query) {
     return `Search for '${query}'`;
-  } else if (path6) {
-    return `Search in '${path6}'`;
+  } else if (path7) {
+    return `Search in '${path7}'`;
   }
   return "Search";
 }
@@ -22341,12 +22344,12 @@ function revertPatch(unifiedDiff) {
   if (!patch) return null;
   return reversePatch(patch);
 }
-function createUpdateDiffContent(path6, oldText, newText) {
+function createUpdateDiffContent(path7, oldText, newText) {
   return {
     type: "diff",
     oldText,
     newText,
-    path: path6,
+    path: path7,
     _meta: {
       kind: "update"
     }
@@ -22496,13 +22499,30 @@ function createAgentTextMessageChunk(text, messageId, meta3) {
 function createAgentTextThoughtChunk(text, messageId, meta3) {
   return createAgentThoughtChunk({ type: "text", text }, messageId);
 }
+function toGoalStatus(status) {
+  switch (status) {
+    case "active":
+    case "paused":
+    case "blocked":
+    case "complete":
+      return status;
+    case "usageLimited":
+    case "budgetLimited":
+      return "limited";
+  }
+}
+function toUnixMilliseconds(timestampSeconds) {
+  return timestampSeconds * 1e3;
+}
 function toThreadGoalSnapshot(goal) {
   return {
     objective: goal.objective.trim(),
-    status: goal.status,
+    status: toGoalStatus(goal.status),
     tokenBudget: goal.tokenBudget,
+    tokensUsed: goal.tokensUsed,
     timeUsedSeconds: goal.timeUsedSeconds,
-    createdAt: goal.createdAt,
+    createdAt: toUnixMilliseconds(goal.createdAt),
+    updatedAt: toUnixMilliseconds(goal.updatedAt),
     controlMethod: GOAL_CONTROL_METHOD
   };
 }
@@ -22852,9 +22872,7 @@ ${event.details}` : "";
       return null;
     }
     this.sessionState.currentGoal = goalSnapshot;
-    return this.createCodexSessionInfoUpdate({
-      goal: goalSnapshot
-    });
+    return this.createGoalSessionInfoUpdate(goalSnapshot);
   }
   createThreadGoalClearedEvent(_event) {
     this.sessionState.goalRevision += 1;
@@ -22862,9 +22880,13 @@ ${event.details}` : "";
       return null;
     }
     this.sessionState.currentGoal = null;
-    return this.createCodexSessionInfoUpdate({
-      goal: null
-    });
+    return this.createGoalSessionInfoUpdate(null);
+  }
+  createGoalSessionInfoUpdate(goal) {
+    return {
+      sessionUpdate: "session_info_update",
+      _meta: { goal }
+    };
   }
   createReasoningSummaryDeltaEvent(event) {
     this.seenReasoningDeltaItemIds.add(event.itemId);
@@ -23701,11 +23723,11 @@ var CodexApprovalHandler = class {
       });
     }
     const fileSystem = permissions.fileSystem;
-    for (const path6 of fileSystem?.read ?? []) {
-      changes.push(this.fileSystemGrantChange(path6, "read", lifetime, suffix));
+    for (const path7 of fileSystem?.read ?? []) {
+      changes.push(this.fileSystemGrantChange(path7, "read", lifetime, suffix));
     }
-    for (const path6 of fileSystem?.write ?? []) {
-      changes.push(this.fileSystemGrantChange(path6, "write", lifetime, suffix));
+    for (const path7 of fileSystem?.write ?? []) {
+      changes.push(this.fileSystemGrantChange(path7, "write", lifetime, suffix));
     }
     for (const entry of fileSystem?.entries ?? []) {
       const matcher = (() => {
@@ -23734,16 +23756,16 @@ var CodexApprovalHandler = class {
     }
     return changes.length > 0 ? { version: 1, changes } : void 0;
   }
-  fileSystemGrantChange(path6, access, lifetime, suffix) {
+  fileSystemGrantChange(path7, access, lifetime, suffix) {
     return {
       type: "grant",
       operation: "grant",
-      description: `Allow ${access} access to ${path6}${suffix}`,
+      description: `Allow ${access} access to ${path7}${suffix}`,
       lifetime,
       targets: [{
         type: "filesystem",
         access: [access],
-        matcher: { type: "exact_path", path: path6 }
+        matcher: { type: "exact_path", path: path7 }
       }]
     };
   }
@@ -24423,6 +24445,11 @@ var ChatGptAuthMethod = {
   name: "ChatGPT",
   description: "Use ChatGPT to authenticate"
 };
+var ChatGptDeviceCodeAuthMethod = {
+  id: "chat-gpt-device-code",
+  name: "ChatGPT (device code)",
+  description: "Sign in to ChatGPT by opening a verification page and entering a one-time code"
+};
 var GatewayAuthMethod = {
   id: "gateway",
   name: "Custom model gateway",
@@ -24439,6 +24466,9 @@ function getCodexAuthMethods(clientCapabilities, env = process.env) {
   if (!env["NO_BROWSER"]) {
     authMethods.push(ChatGptAuthMethod);
   }
+  if (clientSupportsUrlElicitation(clientCapabilities)) {
+    authMethods.push(ChatGptDeviceCodeAuthMethod);
+  }
   const supportsGatewayAuth = clientCapabilities?.auth?._meta?.["gateway"] === true;
   if (supportsGatewayAuth) {
     authMethods.push(GatewayAuthMethod);
@@ -24446,7 +24476,7 @@ function getCodexAuthMethods(clientCapabilities, env = process.env) {
   return authMethods;
 }
 function isCodexAuthRequest(request) {
-  return request.methodId === "api-key" || request.methodId === "chat-gpt" || request.methodId === "gateway";
+  return request.methodId === "api-key" || request.methodId === "chat-gpt" || request.methodId === "chat-gpt-device-code" || request.methodId === "gateway";
 }
 var isDockerCached;
 function hasDockerEnv() {
@@ -24600,15 +24630,15 @@ var wslDefaultBrowser = async () => {
   const { stdout } = await executePowerShell(command, { powerShellPath: psPath });
   return stdout.trim();
 };
-var convertWslPathToWindows = async (path6) => {
-  if (/^[a-z]+:\/\//i.test(path6)) {
-    return path6;
+var convertWslPathToWindows = async (path7) => {
+  if (/^[a-z]+:\/\//i.test(path7)) {
+    return path7;
   }
   try {
-    const { stdout } = await execFile2("wslpath", ["-aw", path6], { encoding: "utf8" });
+    const { stdout } = await execFile2("wslpath", ["-aw", path7], { encoding: "utf8" });
     return stdout.trim();
   } catch {
-    return path6;
+    return path7;
   }
 };
 function defineLazyProperty(object2, propertyName, valueGetter) {
@@ -25148,7 +25178,7 @@ var package_default = {
   publishConfig: {
     access: "public"
   },
-  version: "1.3.0",
+  version: "1.4.0",
   description: "An ACP-compatible coding agent powered by Codex",
   main: "dist/index.js",
   bin: {
@@ -25216,7 +25246,7 @@ var package_default = {
   },
   dependencies: {
     "@agentclientprotocol/sdk": "^1.3.0",
-    "@openai/codex": "^0.145.0",
+    "@openai/codex": "^0.147.0",
     diff: "^9.0.0",
     open: "^11.0.0",
     "vscode-jsonrpc": "^9.0.1",
@@ -25256,6 +25286,51 @@ function createCodexCollaborationMode(mode, currentModelId) {
     }
   };
 }
+function isAbsolutePathLike(value) {
+  const trimmed = value.trim();
+  return path__default.isAbsolute(trimmed) || isWindowsAbsolutePath(trimmed);
+}
+function arePathsEqual(left, right) {
+  return normalizePathForComparison(left) === normalizePathForComparison(right);
+}
+function arePathBasenamesEqual(left, right) {
+  const leftBase = path__default.posix.basename(normalizePathForComparison(left));
+  const rightBase = path__default.posix.basename(normalizePathForComparison(right));
+  if (shouldComparePathCaseInsensitive(left) || shouldComparePathCaseInsensitive(right)) {
+    return leftBase.toLowerCase() === rightBase.toLowerCase();
+  }
+  return leftBase === rightBase;
+}
+function normalizePathForComparison(value) {
+  const trimmed = value.trim();
+  if (trimmed.length === 0) {
+    return "";
+  }
+  if (isWindowsAbsolutePath(trimmed)) {
+    const normalized2 = path__default.win32.normalize(trimmed).replace(/\\/g, "/");
+    return trimTrailingPathSeparators(normalized2).toLowerCase();
+  }
+  const pathForComparison = path__default.isAbsolute(trimmed) ? trimmed : trimmed.replace(/\\/g, "/");
+  const normalized = path__default.posix.normalize(pathForComparison);
+  return trimTrailingPathSeparators(normalized);
+}
+function isWindowsAbsolutePath(value) {
+  const portableValue = value.replace(/\\/g, "/");
+  return /^[A-Za-z]:\//.test(portableValue) || /^\/\/[^/]+\/[^/]+/.test(portableValue);
+}
+function shouldComparePathCaseInsensitive(value) {
+  return isWindowsAbsolutePath(value) || /^[A-Za-z]:/.test(value) || value.includes("\\");
+}
+function trimTrailingPathSeparators(value) {
+  let trimmed = value;
+  while (trimmed.endsWith("/") && !isRootPath(trimmed)) {
+    trimmed = trimmed.slice(0, -1);
+  }
+  return trimmed;
+}
+function isRootPath(value) {
+  return value === "/" || /^[A-Za-z]:\/$/.test(value) || /^\/\/[^/]+\/[^/]+\/$/.test(value);
+}
 var CUSTOM_GATEWAY_PROVIDER_ID = "custom-gateway";
 var SESSION_LIST_PAGE_SIZE = 100;
 var SUPPORTED_GATEWAY_PROTOCOLS = {
@@ -25299,43 +25374,24 @@ var CodexAcpClient = class {
   getHomePath() {
     return this.configPath;
   }
-  async authenticate(authRequest) {
+  async authenticate(authRequest, urlElicitationRequester) {
     if (!isCodexAuthRequest(authRequest)) {
       throw RequestError.invalidRequest();
     }
     this.gatewayConfig = null;
     switch (authRequest.methodId) {
-      case "api-key": {
-        const apiKey = authRequest._meta?.["api-key"]?.apiKey ?? this.readApiKeyFromEnv();
-        return await this.authenticateWithApiKey(apiKey);
-      }
-      case "chat-gpt": {
-        const accountResponse = await this.codexClient.accountRead({ refreshToken: true });
-        if (accountResponse.account?.type === "chatgpt") {
-          return true;
-        }
-        const loginCompletedPromise = this.awaitNextLoginCompleted();
-        const loginResponse = await this.codexClient.accountLogin({ type: "chatgpt" });
-        if (loginResponse.type == "chatgpt") {
-          await open_default(loginResponse.authUrl);
-        }
-        const result = await loginCompletedPromise;
-        return result.success;
-      }
+      case "api-key":
+        return await this.authenticateWithApiKey(authRequest);
+      case "chat-gpt":
+        return await this.authenticateWithChatGpt();
+      case "chat-gpt-device-code":
+        return await this.authenticateWithChatGptDeviceCode(urlElicitationRequester);
       case "gateway":
-        if (!authRequest._meta) throw RequestError.invalidRequest();
-        const gatewaySettings = authRequest._meta["gateway"];
-        if (!gatewaySettings) throw RequestError.invalidRequest();
-        this.applyGatewayConfig({
-          baseUrl: gatewaySettings.baseUrl,
-          apiType: GatewayAuthMethod._meta.gateway.protocol,
-          headers: gatewaySettings.headers,
-          providerName: gatewaySettings.providerName
-        });
-        return true;
+        return this.authenticateWithGateway(authRequest);
     }
   }
-  async authenticateWithApiKey(apiKey) {
+  async authenticateWithApiKey(authRequest) {
+    const apiKey = authRequest._meta?.["api-key"]?.apiKey ?? this.readApiKeyFromEnv();
     const loginCompletedPromise = this.awaitNextLoginCompleted();
     await this.codexClient.accountLogin({
       type: "apiKey",
@@ -25344,6 +25400,56 @@ var CodexAcpClient = class {
     const result = await loginCompletedPromise;
     return result.success;
   }
+  async authenticateWithChatGpt() {
+    const accountResponse = await this.codexClient.accountRead({ refreshToken: true });
+    if (accountResponse.account?.type === "chatgpt") {
+      return true;
+    }
+    const loginCompletedPromise = this.awaitNextLoginCompleted();
+    const loginResponse = await this.codexClient.accountLogin({ type: "chatgpt" });
+    if (loginResponse.type == "chatgpt") {
+      await open_default(loginResponse.authUrl);
+    }
+    const result = await loginCompletedPromise;
+    return result.success;
+  }
+  async authenticateWithChatGptDeviceCode(urlElicitationRequester) {
+    const accountResponse = await this.codexClient.accountRead({ refreshToken: true });
+    if (accountResponse.account?.type === "chatgpt") {
+      return true;
+    }
+    if (!urlElicitationRequester) {
+      throw RequestError.invalidRequest(void 0, "Device code authentication requires URL elicitation support");
+    }
+    const loginCompletedPromise = this.awaitNextLoginCompleted();
+    const loginResponse = await this.codexClient.accountLogin({ type: "chatgptDeviceCode" });
+    if (loginResponse.type !== "chatgptDeviceCode") {
+      return false;
+    }
+    const elicitationResponse = await urlElicitationRequester.elicitUrl({
+      url: loginResponse.verificationUrl,
+      message: `Sign in to ChatGPT and enter this code: ${loginResponse.userCode}`,
+      elicitationId: loginResponse.loginId
+    });
+    if (!CreateElicitationResponse.isAccept(elicitationResponse)) {
+      await this.codexClient.accountLoginCancel({ loginId: loginResponse.loginId });
+      return false;
+    }
+    const result = await loginCompletedPromise;
+    return result.success;
+  }
+  authenticateWithGateway(authRequest) {
+    if (!authRequest._meta) throw RequestError.invalidRequest();
+    const gatewaySettings = authRequest._meta["gateway"];
+    if (!gatewaySettings) throw RequestError.invalidRequest();
+    this.applyGatewayConfig({
+      baseUrl: gatewaySettings.baseUrl,
+      apiType: GatewayAuthMethod._meta.gateway.protocol,
+      headers: gatewaySettings.headers,
+      providerName: gatewaySettings.providerName
+    });
+    return true;
+  }
   readApiKeyFromEnv() {
     for (const envVar of [CODEX_API_KEY_ENV_VAR, OPENAI_API_KEY_ENV_VAR]) {
       const value = process.env[envVar]?.trim();
@@ -25613,12 +25719,16 @@ var CodexAcpClient = class {
     const response = await this.codexClient.threadGoalGet({ threadId: sessionId });
     return response?.goal ?? null;
   }
-  async setGoal(sessionId, objective, onTurnStarted) {
-    return await this.codexClient.runGoalSet({
+  async setGoal(sessionId, objective, onTurnStarted, onGoalSet) {
+    const params = {
       threadId: sessionId,
       objective,
       status: "active"
-    }, onTurnStarted);
+    };
+    if (onGoalSet === void 0) {
+      return await this.codexClient.runGoalSet(params, onTurnStarted);
+    }
+    return await this.codexClient.runGoalSet(params, onTurnStarted, void 0, onGoalSet);
   }
   async setGoalStatus(sessionId, status) {
     let updatedGoal = null;
@@ -25633,11 +25743,15 @@ var CodexAcpClient = class {
     }
     return updatedGoal;
   }
-  async resumeGoal(sessionId, onTurnStarted) {
-    return await this.codexClient.runGoalSet({
+  async resumeGoal(sessionId, onTurnStarted, onGoalSet) {
+    const params = {
       threadId: sessionId,
       status: "active"
-    }, onTurnStarted);
+    };
+    if (onGoalSet === void 0) {
+      return await this.codexClient.runGoalSet(params, onTurnStarted);
+    }
+    return await this.codexClient.runGoalSet(params, onTurnStarted, void 0, onGoalSet);
   }
   async clearGoal(sessionId) {
     await this.codexClient.runGoalClear({ threadId: sessionId });
@@ -25893,11 +26007,10 @@ var CodexAcpClient = class {
     const requestedCwd = request.cwd?.trim() ?? null;
     const filterByCwd = (thread) => {
       if (!requestedCwd) return true;
-      if (path__default.isAbsolute(requestedCwd)) {
-        return thread.cwd === requestedCwd;
+      if (isAbsolutePathLike(requestedCwd)) {
+        return arePathsEqual(thread.cwd, requestedCwd);
       }
-      const requestedBase = path__default.basename(requestedCwd);
-      return path__default.basename(thread.cwd) === requestedBase;
+      return arePathBasenamesEqual(thread.cwd, requestedCwd);
     };
     const preferredProvider = this.getModelProvider();
     const modelProviders = preferredProvider ? [preferredProvider] : [];
@@ -25923,7 +26036,7 @@ var CodexAcpClient = class {
     let sessions = listResponse.data.map(mapThreadToSession);
     if (requestedCwd) {
       const filtered = listResponse.data.filter(filterByCwd).map(mapThreadToSession);
-      if (filtered.length > 0 || path__default.isAbsolute(requestedCwd)) {
+      if (filtered.length > 0 || isAbsolutePathLike(requestedCwd)) {
         sessions = filtered;
       } else {
         logger.log("Ignoring non-absolute cwd filter for session/list", { cwd: requestedCwd });
@@ -26039,8 +26152,8 @@ function formatUriAsLink(name, uri) {
     return `[@${name}](${uri})`;
   }
   if (uri.startsWith("file://")) {
-    const path6 = uri.replace("file://", "");
-    const fileName = path6.split("/").pop() ?? path6;
+    const path7 = uri.replace("file://", "");
+    const fileName = path7.split("/").pop() ?? path7;
     return `[@${fileName}](${uri})`;
   }
   return uri;
@@ -26192,6 +26305,10 @@ function createReasoningEffortConfigOption(supportedReasoningEfforts, currentEff
     }))
   };
 }
+var GOAL_CONTINUATION_PROMPT = [{
+  type: "text",
+  text: "Continue working toward the active goal."
+}];
 var CodexCommands = class {
   connection;
   codexAcpClient;
@@ -26485,7 +26602,7 @@ var CodexCommands = class {
   }
   createGoalCommandResult(turnCompleted) {
     if (turnCompleted === null) {
-      return { handled: true };
+      return { handled: false, prompt: GOAL_CONTINUATION_PROMPT };
     }
     return {
       handled: true,
@@ -26920,8 +27037,8 @@ function imageBlocks(images) {
       return [{ type: "text", text: `[@image](${image})` }];
     }
     const record2 = asRecord(image);
-    const path6 = record2 ? stringValue(record2["path"]) ?? stringValue(record2["url"]) : null;
-    return path6 ? [{ type: "text", text: `[@image](${path6})` }] : [];
+    const path7 = record2 ? stringValue(record2["path"]) ?? stringValue(record2["url"]) : null;
+    return path7 ? [{ type: "text", text: `[@image](${path7})` }] : [];
   });
 }
 function contentBlocksFromResponseContent(content) {
@@ -27720,6 +27837,7 @@ var CodexAcpServer = class _CodexAcpServer {
   closingSessions;
   sessionGenerations;
   sessionOpenGenerations;
+  goalControlGenerations;
   constructor(connection, codexAcpClient, defaultAuthRequest, getExitCode, getRecentStderr) {
     this.sessions = /* @__PURE__ */ new Map();
     this.pendingMcpStartupSessions = /* @__PURE__ */ new Map();
@@ -27730,6 +27848,7 @@ var CodexAcpServer = class _CodexAcpServer {
     this.closingSessions = /* @__PURE__ */ new Map();
     this.sessionGenerations = /* @__PURE__ */ new Map();
     this.sessionOpenGenerations = /* @__PURE__ */ new Map();
+    this.goalControlGenerations = /* @__PURE__ */ new Map();
     this.connection = connection;
     this.codexAcpClient = codexAcpClient;
     this.defaultAuthRequest = defaultAuthRequest ?? null;
@@ -27796,6 +27915,11 @@ var CodexAcpServer = class _CodexAcpServer {
       _meta: {
         steering: {
           supported: true
+        },
+        goal: {
+          version: GOAL_EXTENSION_VERSION,
+          controlMethod: GOAL_CONTROL_METHOD,
+          actions: [...GOAL_CONTROL_ACTIONS]
         }
       }
     };
@@ -27816,17 +27940,58 @@ 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 GOAL_CONTROL_METHOD:
+      case LEGACY_GOAL_CONTROL_METHOD: {
         const sessionState = this.sessions.get(methodRequest.params.sessionId);
         if (!sessionState) {
           throw RequestError.invalidParams(void 0, `Unknown session: ${methodRequest.params.sessionId}`);
         }
         const sessionGeneration = this.getSessionGeneration(sessionState.sessionId);
-        if (methodRequest.params.action === "pause") {
+        const goalControlGeneration = this.bumpGoalControlGeneration(sessionState.sessionId);
+        if (methodRequest.params.action === "set") {
+          const objective = methodRequest.params.objective;
+          let updatedGoal = null;
+          const turnCompleted = await this.runWithProcessCheck(() => this.codexAcpClient.setGoal(
+            sessionState.sessionId,
+            objective,
+            void 0,
+            (goal) => {
+              updatedGoal = goal;
+            }
+          ));
+          if (turnCompleted === null && updatedGoal !== null) {
+            await this.startGoalContinuationIfCurrent(
+              sessionState,
+              sessionGeneration,
+              goalControlGeneration,
+              updatedGoal
+            );
+          }
+        } else if (methodRequest.params.action === "pause") {
           const goal = await this.runWithProcessCheck(() => this.codexAcpClient.setGoalStatus(sessionState.sessionId, "paused"));
           if (this.goalPublishIsCurrent(sessionState, sessionGeneration)) {
             await this.publishGoalSnapshot(sessionState, toThreadGoalSnapshot(goal), false);
           }
+        } else if (methodRequest.params.action === "resume") {
+          let updatedGoal = null;
+          const turnCompleted = await this.runWithProcessCheck(() => this.codexAcpClient.resumeGoal(
+            sessionState.sessionId,
+            void 0,
+            (goal) => {
+              updatedGoal = goal;
+            }
+          ));
+          if (updatedGoal !== null && this.goalPublishIsCurrent(sessionState, sessionGeneration)) {
+            await this.publishGoalSnapshot(sessionState, toThreadGoalSnapshot(updatedGoal), false);
+          }
+          if (turnCompleted === null && updatedGoal !== null) {
+            await this.startGoalContinuationIfCurrent(
+              sessionState,
+              sessionGeneration,
+              goalControlGeneration,
+              updatedGoal
+            );
+          }
         } else if (methodRequest.params.action === "clear") {
           await this.runWithProcessCheck(() => this.codexAcpClient.clearGoal(sessionState.sessionId));
           if (this.goalPublishIsCurrent(sessionState, sessionGeneration)) {
@@ -27935,6 +28100,11 @@ Check ${configPath} and project .codex directories, especially their config.toml
   getSessionGeneration(sessionId) {
     return this.sessionGenerations.get(sessionId) ?? 0;
   }
+  bumpGoalControlGeneration(sessionId) {
+    const generation = (this.goalControlGenerations.get(sessionId) ?? 0) + 1;
+    this.goalControlGenerations.set(sessionId, generation);
+    return generation;
+  }
   bumpSessionGeneration(sessionId) {
     const generation = this.getSessionGeneration(sessionId) + 1;
     this.sessionGenerations.set(sessionId, generation);
@@ -28220,6 +28390,7 @@ Check ${configPath} and project .codex directories, especially their config.toml
         this.activePrompts.delete(params.sessionId);
         this.pendingSteers.delete(params.sessionId);
         this.steeringQueues.delete(params.sessionId);
+        this.goalControlGenerations.delete(params.sessionId);
       }
       this.endSessionCloseFence(params.sessionId);
     }
@@ -28275,9 +28446,10 @@ Check ${configPath} and project .codex directories, especially their config.toml
       });
     }, 0);
   }
-  async authenticate(_params) {
+  async authenticate(_params, requestId) {
     logger.log("Authenticate request received");
-    const isAuthenticated = await this.runWithProcessCheck(() => this.codexAcpClient.authenticate(_params));
+    const elicitationRequester = this.createUrlElicitationRequester(requestId);
+    const isAuthenticated = await this.runWithProcessCheck(() => this.codexAcpClient.authenticate(_params, elicitationRequester));
     if (!isAuthenticated) {
       logger.log("Authenticate request failed");
       throw RequestError.invalidParams();
@@ -28286,6 +28458,18 @@ Check ${configPath} and project .codex directories, especially their config.toml
     logger.log("Authenticate request completed");
     return {};
   }
+  createUrlElicitationRequester(requestId) {
+    if (requestId == null || !clientSupportsUrlElicitation(this.clientCapabilities)) {
+      return void 0;
+    }
+    return {
+      elicitUrl: (request) => this.connection.request(methods.client.elicitation.create, {
+        mode: "url",
+        requestId,
+        ...request
+      })
+    };
+  }
   async logout(_params) {
     logger.log("Logout request received");
     await this.runWithProcessCheck(() => this.codexAcpClient.logout());
@@ -28609,29 +28793,48 @@ Check ${configPath} and project .codex directories, especially their config.toml
    *     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,
+      prompt: GOAL_CONTINUATION_PROMPT
+    }, "Goal continuation", async () => {
+      if (!this.goalPublishIsCurrent(sessionState, sessionGeneration) || this.goalControlGenerations.get(sessionState.sessionId) !== goalControlGeneration) {
+        return false;
+      }
+      const currentGoal = await this.runWithProcessCheck(() => this.codexAcpClient.getGoal(sessionState.sessionId));
+      return currentGoal?.status === "active" && currentGoal.objective === expectedGoal.objective && currentGoal.createdAt === expectedGoal.createdAt && this.goalControlGenerations.get(sessionState.sessionId) === goalControlGeneration;
+    });
+  }
+  async startNewTurnFromExternalPrompt(params, source, canStart = async () => true) {
     const previousPrompt = this.activePrompts.get(params.sessionId);
     await previousPrompt?.completion;
     if (this.sessionIsClosing(params.sessionId)) {
       throw RequestError.invalidRequest(`Session ${params.sessionId} is closing`);
     }
+    if (!await canStart()) {
+      return false;
+    }
     return await new Promise((resolve, reject) => {
       let turnStarted = false;
       const promptDone = this.prompt(params, void 0, () => {
         turnStarted = true;
-        logger.log("Steering session started a new turn", { sessionId: params.sessionId });
-        resolve({ outcome: "startedNewTurn" });
+        logger.log(`${source} started a new turn`, { sessionId: params.sessionId });
+        resolve(true);
       });
       promptDone.then(
         (response) => {
           if (!turnStarted && response.stopReason === "cancelled") {
             reject(RequestError.invalidRequest(`Session ${params.sessionId} was cancelled before the steering turn started`));
           } else {
-            resolve({ outcome: "startedNewTurn" });
+            resolve(turnStarted);
           }
         },
         (error48) => {
           if (turnStarted) {
-            logger.error(`Steering-started prompt for session ${params.sessionId} failed`, error48);
+            logger.error(`${source} prompt for session ${params.sessionId} failed`, error48);
           } else {
             reject(error48);
           }
@@ -28745,9 +28948,7 @@ Check ${configPath} and project .codex directories, especially their config.toml
     await session.update({
       sessionUpdate: "session_info_update",
       _meta: {
-        codex: {
-          goal: snapshot
-        }
+        goal: snapshot
       }
     });
   }
@@ -29043,8 +29244,8 @@ Check ${configPath} and project .codex directories, especially their config.toml
       return `[@${name}](${uri})`;
     }
     if (uri.startsWith("file://")) {
-      const path6 = uri.replace("file://", "");
-      const fileName = path6.split("/").pop() ?? path6;
+      const path7 = uri.replace("file://", "");
+      const fileName = path7.split("/").pop() ?? path7;
       return `[@${fileName}](${uri})`;
     }
     return uri;
@@ -29419,6 +29620,7 @@ Check ${configPath} and project .codex directories, especially their config.toml
           _meta: this.buildQuotaMeta(sessionState)
         };
       }
+      const effectiveParams = commandResult.prompt === void 0 ? params : { ...params, prompt: commandResult.prompt };
       if (this.sessionIsClosing(params.sessionId)) {
         return this.cancelledPromptResponse(sessionState);
       }
@@ -29431,7 +29633,7 @@ Check ${configPath} and project .codex directories, especially their config.toml
           reason: sessionState.account?.type === "apiKey" ? "API key" : "model lacks reasoning"
         });
       }
-      if (!sessionState.supportedInputModalities.includes("image") && params.prompt.some((b) => b.type === "image")) {
+      if (!sessionState.supportedInputModalities.includes("image") && effectiveParams.prompt.some((b) => b.type === "image")) {
         throw RequestError.invalidRequest("The current model does not support image input");
       }
       const agentMode = sessionState.agentMode;
@@ -29442,7 +29644,7 @@ Check ${configPath} and project .codex directories, especially their config.toml
       ensurePendingTurnStart();
       const sendPromptPromise = this.runWithProcessCheck(
         () => this.codexAcpClient.sendPrompt(
-          params,
+          effectiveParams,
           agentMode,
           modelId,
           serviceTier,
@@ -30162,6 +30364,9 @@ var CodexAppServerClient = class {
   async accountLogin(params) {
     return await this.sendRequest({ method: "account/login/start", params });
   }
+  async accountLoginCancel(params) {
+    return await this.sendRequest({ method: "account/login/cancel", params });
+  }
   async accountLogout() {
     return await this.sendRequest({ method: "account/logout", params: void 0 });
   }
@@ -30688,6 +30893,20 @@ function spawnCodexCli(codexPath, args) {
   const bundledCodexPath = createRequire$1(import.meta.url).resolve("@openai/codex/bin/codex.js");
   return spawn(process.execPath, [bundledCodexPath, ...args], options);
 }
+var goalControlParamsParser = external_exports.discriminatedUnion("action", [
+  external_exports.object({
+    sessionId: external_exports.string(),
+    action: external_exports.literal("set"),
+    objective: external_exports.string().trim().min(1)
+  }).passthrough(),
+  external_exports.object({
+    sessionId: external_exports.string(),
+    action: external_exports.enum(["pause", "resume", "clear"])
+  }).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));
+}
 var emptyExtensionParamsParser = external_exports.preprocess(
   (params) => params ?? {},
   external_exports.object({}).passthrough()
@@ -30701,10 +30920,25 @@ var sessionSteerParamsParser = external_exports.object({
   prompt: external_exports.array(external_exports.any()),
   steerId: external_exports.string().min(1).optional()
 }).passthrough();
-var goalControlParamsParser = external_exports.object({
-  sessionId: external_exports.string(),
-  action: external_exports.enum(["pause", "clear"])
-}).passthrough();
+function createCodexAcpApp(options) {
+  let codexAcpServer = null;
+  const getAgent = () => {
+    if (!codexAcpServer) {
+      throw RequestError.internalError("ACP agent is not connected");
+    }
+    return codexAcpServer;
+  };
+  const agentApp = agent({ name: options.name }).onConnect((connection) => {
+    const agent2 = options.createAgent(connection.client);
+    codexAcpServer = agent2;
+    connection.signal.addEventListener("abort", () => {
+      if (codexAcpServer === agent2) {
+        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(SESSION_STEERING_METHOD, sessionSteerParamsParser, (ctx) => getAgent().extMethod(SESSION_STEERING_METHOD, ctx.params));
+  return registerGoalControlRequests(agentApp, getAgent);
+}
 if (process.argv.includes("--version")) {
   console.log(`${package_default.name} ${package_default.version}`);
   process.exit(0);
@@ -30761,20 +30995,5 @@ function startAcpServer() {
     const codexClient = new CodexAcpClient(appServerClient, config2, modelProvider);
     return new CodexAcpServer(connection, codexClient, defaultAuthRequest, () => codexConnection.process.exitCode, () => stderr);
   }
-  let codexAcpServer = null;
-  const getAgent = () => {
-    if (!codexAcpServer) {
-      throw RequestError.internalError("ACP agent is not connected");
-    }
-    return codexAcpServer;
-  };
-  agent({ name: package_default.name }).onConnect((connection) => {
-    const agent2 = createAgent(connection.client);
-    codexAcpServer = agent2;
-    connection.signal.addEventListener("abort", () => {
-      if (codexAcpServer === agent2) {
-        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)).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(SESSION_STEERING_METHOD, sessionSteerParamsParser, (ctx) => getAgent().extMethod(SESSION_STEERING_METHOD, ctx.params)).onRequest(GOAL_CONTROL_METHOD, goalControlParamsParser, (ctx) => getAgent().extMethod(GOAL_CONTROL_METHOD, ctx.params)).connect(acpJsonStream);
+  createCodexAcpApp({ name: package_default.name, createAgent }).connect(acpJsonStream);
 }