@liberseek/boft-cli-win32-arm64 0.6.1 → 0.6.3

package/app/host-runtime.mjs

@@ -5002,6 +5002,9 @@ function parseModelProviderAuth(source) {
   const tables = tomlProviderTableNames(providerId);
   let currentTable = "";
   let name;
+  let baseUrl;
+  let bearerToken;
+  let envKey;
   let requiresOpenAiAuth;
   let hasLocalApiCredential = false;
   for (const rawLine of source.split(/\r?\n/u)) {
@@ -5018,14 +5021,23 @@ function parseModelProviderAuth(source) {
     const key = assignment[1] ?? "";
     const value2 = tomlUnquote(assignment[2] ?? "");
     if (key === "name" && value2) name = value2;
+    if (key === "base_url" && value2) baseUrl = value2;
     if (key === "requires_openai_auth") requiresOpenAiAuth = tomlBoolean(value2);
-    if ((key === "experimental_bearer_token" || key === "env_key") && value2.trim().length > 0) {
+    if (key === "experimental_bearer_token" && value2.trim().length > 0) {
+      bearerToken = value2.trim();
+      hasLocalApiCredential = true;
+    }
+    if (key === "env_key" && value2.trim().length > 0) {
+      envKey = value2.trim();
       hasLocalApiCredential = true;
     }
   }
   return {
     id: providerId,
     ...name ? { name } : {},
+    ...baseUrl ? { baseUrl } : {},
+    ...bearerToken ? { bearerToken } : {},
+    ...envKey ? { envKey } : {},
     requiresOpenAiAuth: requiresOpenAiAuth ?? providerId === "openai",
     hasLocalApiCredential
   };
@@ -5069,6 +5081,24 @@ async function readOptionalUtf8(file2) {
     throw error51;
   }
 }
+function authJsonApiKey(authJson) {
+  if (!authJson) return void 0;
+  try {
+    const auth = JSON.parse(authJson);
+    return typeof auth.api_key === "string" && auth.api_key.trim() ? auth.api_key.trim() : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function inspectCodexApiUsageSource(input) {
+  const provider = parseModelProviderAuth(input.configToml);
+  const baseUrl = provider?.baseUrl?.trim();
+  if (!baseUrl) return null;
+  const env = input.env ?? process.env;
+  const apiKey = provider?.bearerToken?.trim() || authJsonApiKey(input.authJson) || (provider?.envKey ? env[provider.envKey]?.trim() : void 0);
+  if (!apiKey) return null;
+  return { baseUrl, apiKey };
+}
 async function inspectCodexHomeAuth(codexHome) {
   const root = path4.resolve(codexHome);
   const [configToml, authJson] = await Promise.all([
@@ -5080,6 +5110,87 @@ async function inspectCodexHomeAuth(codexHome) {
     ...authJson ? { authJson } : {}
   });
 }
+async function inspectCodexHomeApiUsageSource(codexHome, env = process.env) {
+  const root = path4.resolve(codexHome);
+  const [configToml, authJson] = await Promise.all([
+    readOptionalUtf8(path4.join(root, "config.toml")),
+    readOptionalUtf8(path4.join(root, "auth.json"))
+  ]);
+  return inspectCodexApiUsageSource({
+    ...configToml ? { configToml } : {},
+    ...authJson ? { authJson } : {},
+    env
+  });
+}
+
+// packages/host-runtime/src/account/codex-api-usage.ts
+var REQUEST_TIMEOUT_MS = 15e3;
+function isRecord(value2) {
+  return typeof value2 === "object" && value2 !== null && !Array.isArray(value2);
+}
+function finiteNumber(value2) {
+  if (typeof value2 === "number" && Number.isFinite(value2)) return value2;
+  if (typeof value2 === "string" && value2.trim()) {
+    const parsed = Number(value2);
+    if (Number.isFinite(parsed)) return parsed;
+  }
+  return void 0;
+}
+function text(value2) {
+  return typeof value2 === "string" && value2.trim() ? value2.trim() : void 0;
+}
+function boolean(value2) {
+  return typeof value2 === "boolean" ? value2 : void 0;
+}
+function codexApiUsageUrl(baseUrl) {
+  const trimmed = baseUrl.trim().replace(/\/+$/u, "");
+  if (!trimmed) throw new Error("Codex API usage base URL is empty");
+  const withPath = /\/v1$/iu.test(trimmed) ? `${trimmed}/usage` : `${trimmed}/v1/usage`;
+  const parsed = new URL(withPath);
+  if (parsed.protocol !== "http:" && parsed.protocol !== "https:") {
+    throw new Error("Codex API usage URL must be http or https");
+  }
+  return parsed.toString();
+}
+function extractCodexApiUsage(response) {
+  if (!isRecord(response)) return null;
+  const quota = isRecord(response.quota) ? response.quota : void 0;
+  const remaining = finiteNumber(response.remaining) ?? finiteNumber(quota?.remaining) ?? finiteNumber(response.balance);
+  if (remaining === void 0) return null;
+  const isValid = boolean(response.is_active) ?? boolean(response.isValid) ?? true;
+  if (!isValid) throw new Error("Codex API usage is inactive");
+  return {
+    remaining,
+    unit: text(response.unit) ?? text(quota?.unit) ?? "USD"
+  };
+}
+function projectCodexApiUsageToCredits(usage) {
+  return {
+    remaining: usage.remaining,
+    unit: usage.unit,
+    periodType: "unknown"
+  };
+}
+async function inspectCodexApiAccountCredits(codexHome, input = {}) {
+  const source = input.source === void 0 ? await inspectCodexHomeApiUsageSource(codexHome, input.env) : input.source;
+  if (!source) return null;
+  const fetchImpl = input.fetch ?? fetch;
+  const timeout = AbortSignal.timeout(REQUEST_TIMEOUT_MS);
+  const signal = input.signal ? AbortSignal.any([input.signal, timeout]) : timeout;
+  const response = await fetchImpl(codexApiUsageUrl(source.baseUrl), {
+    method: "GET",
+    headers: {
+      Accept: "application/json",
+      Authorization: `Bearer ${source.apiKey}`
+    },
+    signal
+  });
+  if (!response.ok) {
+    throw new Error(`Codex API usage request failed (${response.status})`);
+  }
+  const usage = extractCodexApiUsage(await response.json());
+  return usage ? projectCodexApiUsageToCredits(usage) : null;
+}
 
 // node_modules/zod/v4/classic/external.js
 var external_exports = {};
@@ -5174,7 +5285,7 @@ __export(external_exports, {
   base64: () => base642,
   base64url: () => base64url2,
   bigint: () => bigint2,
-  boolean: () => boolean2,
+  boolean: () => boolean3,
   catch: () => _catch2,
   check: () => check,
   cidrv4: () => cidrv42,
@@ -6609,7 +6720,7 @@ __export(regexes_exports, {
   base64: () => base64,
   base64url: () => base64url,
   bigint: () => bigint,
-  boolean: () => boolean,
+  boolean: () => boolean2,
   browserEmail: () => browserEmail,
   cidrv4: () => cidrv4,
   cidrv6: () => cidrv6,
@@ -6734,7 +6845,7 @@ var string = (params) => {
 var bigint = /^-?\d+n?$/;
 var integer = /^-?\d+$/;
 var number = /^-?\d+(?:\.\d+)?$/;
-var boolean = /^(?:true|false)$/i;
+var boolean2 = /^(?:true|false)$/i;
 var _null = /^null$/i;
 var _undefined = /^undefined$/i;
 var lowercase = /^[^A-Z]*$/;
@@ -7820,7 +7931,7 @@ var $ZodNumberFormat = /* @__PURE__ */ $constructor("$ZodNumberFormat", (inst, d
 });
 var $ZodBoolean = /* @__PURE__ */ $constructor("$ZodBoolean", (inst, def) => {
   $ZodType.init(inst, def);
-  inst._zod.pattern = boolean;
+  inst._zod.pattern = boolean2;
   inst._zod.parse = (payload, _ctx) => {
     if (def.coerce)
       try {
@@ -12719,8 +12830,8 @@ function ko_default() {
 }
 
 // node_modules/zod/v4/locales/lt.js
-var capitalizeFirstCharacter = (text) => {
-  return text.charAt(0).toUpperCase() + text.slice(1);
+var capitalizeFirstCharacter = (text2) => {
+  return text2.charAt(0).toUpperCase() + text2.slice(1);
 };
 function getUnitTypeFromNumber(number4) {
   const abs = Math.abs(number4);
@@ -17551,7 +17662,7 @@ __export(schemas_exports2, {
   base64: () => base642,
   base64url: () => base64url2,
   bigint: () => bigint2,
-  boolean: () => boolean2,
+  boolean: () => boolean3,
   catch: () => _catch2,
   check: () => check,
   cidrv4: () => cidrv42,
@@ -18294,7 +18405,7 @@ var ZodBoolean = /* @__PURE__ */ $constructor("ZodBoolean", (inst, def) => {
   ZodType.init(inst, def);
   inst._zod.processJSONSchema = (ctx, json2, params) => booleanProcessor(inst, ctx, json2, params);
 });
-function boolean2(params) {
+function boolean3(params) {
   return _boolean(ZodBoolean, params);
 }
 var ZodBigInt = /* @__PURE__ */ $constructor("ZodBigInt", (inst, def) => {
@@ -19049,7 +19160,7 @@ var stringbool = (...args) => _stringbool({
 }, ...args);
 function json(params) {
   const jsonSchema = lazy(() => {
-    return union([string2(params), number2(), boolean2(), _null3(), array(jsonSchema), record2(string2(), jsonSchema)]);
+    return union([string2(params), number2(), boolean3(), _null3(), array(jsonSchema), record2(string2(), jsonSchema)]);
   });
   return jsonSchema;
 }
@@ -19571,7 +19682,7 @@ function fromJSONSchema(schema, params) {
 var coerce_exports = {};
 __export(coerce_exports, {
   bigint: () => bigint3,
-  boolean: () => boolean3,
+  boolean: () => boolean4,
   date: () => date4,
   number: () => number3,
   string: () => string3
@@ -19582,7 +19693,7 @@ function string3(params) {
 function number3(params) {
   return _coercedNumber(ZodNumber, params);
 }
-function boolean3(params) {
+function boolean4(params) {
   return _coercedBoolean(ZodBoolean, params);
 }
 function bigint3(params) {
@@ -19621,6 +19732,8 @@ var threadUsageSnapshotSchema = external_exports.object({
   reasoningOutputTokens: nonNegativeSafeIntegerSchema.optional(),
   totalTokens: nonNegativeSafeIntegerSchema.optional(),
   totalCostUsd: finiteNonNegativeNumberSchema.optional(),
+  totalCredits: finiteNonNegativeNumberSchema.optional(),
+  contextUsagePercent: finiteNonNegativeNumberSchema.optional(),
   cacheHitRatePercent: cacheHitRatePercentSchema.optional(),
   contextWindowTokens: nonNegativeSafeIntegerSchema.optional(),
   contextUsedTokens: nonNegativeSafeIntegerSchema.optional(),
@@ -19677,12 +19790,28 @@ var accountResetCreditsSchema = external_exports.object({
 var accountCreditsSnapshotSchema = external_exports.object({
   /** Native label when the primary limit is scoped to a model or product group. */
   label: external_exports.string().min(1).optional(),
-  usedPercent: usagePercentSchema,
+  usedPercent: usagePercentSchema.optional(),
+  remaining: external_exports.number().finite().optional(),
+  unit: external_exports.string().trim().min(1).max(32).optional(),
   resetsAt: external_exports.string().min(1).optional(),
   periodType: external_exports.enum(["weekly", "monthly", "five_hour", "seven_day", "unknown"]),
   productUsage: external_exports.array(accountCreditsProductUsageSchema).min(1).optional(),
   resetCredits: accountResetCreditsSchema.optional()
-}).strict();
+}).strict().superRefine((credits, context) => {
+  if (credits.usedPercent === void 0 && credits.remaining === void 0) {
+    context.addIssue({
+      code: "custom",
+      message: "Account credits must include usedPercent or remaining"
+    });
+  }
+  if (credits.remaining !== void 0 && !credits.unit) {
+    context.addIssue({
+      code: "custom",
+      message: "Account remaining credits require a unit",
+      path: ["unit"]
+    });
+  }
+});
 var threadUsageInspectionParamsSchema = external_exports.object({
   threadId: hostThreadIdSchema,
   refresh: external_exports.literal("exact").optional()
@@ -20540,13 +20669,15 @@ var usageFields = /* @__PURE__ */ new Set([
   ...tokenFields,
   ...safeIntegerFields,
   ...percentFields,
-  "totalCostUsd"
+  "totalCostUsd",
+  "totalCredits",
+  "contextUsagePercent"
 ]);
-function isRecord(value2) {
+function isRecord2(value2) {
   return typeof value2 === "object" && value2 !== null && !Array.isArray(value2);
 }
 function parseHostUsage(value2) {
-  if (!isRecord(value2))
+  if (!isRecord2(value2))
     throw new Error("Harness Usage must be an object");
   const keys = Object.keys(value2);
   if (keys.length === 0)
@@ -20574,6 +20705,12 @@ function parseHostUsage(value2) {
   if (value2.totalCostUsd !== void 0 && (typeof value2.totalCostUsd !== "number" || !Number.isFinite(value2.totalCostUsd) || value2.totalCostUsd < 0)) {
     throw new Error("Harness Usage 'totalCostUsd' must be a finite non-negative number");
   }
+  for (const field of ["totalCredits", "contextUsagePercent"]) {
+    const candidate = value2[field];
+    if (candidate !== void 0 && (typeof candidate !== "number" || !Number.isFinite(candidate) || candidate < 0)) {
+      throw new Error(`Harness Usage '${field}' must be a finite non-negative number`);
+    }
+  }
   for (const field of percentFields) {
     const candidate = value2[field];
     if (candidate !== void 0 && (typeof candidate !== "number" || !Number.isFinite(candidate) || candidate < 0 || candidate > 100)) {
@@ -21142,6 +21279,9 @@ var MappingStore = class {
   async setTitle(hostThreadId, title) {
     return this.#update(hostThreadId, (current) => ({ ...current, title }));
   }
+  async setCwd(hostThreadId, cwd) {
+    return this.#update(hostThreadId, (current) => current.cwd === cwd ? null : { ...current, cwd });
+  }
   async setTransportModelId(hostThreadId, transportModelId) {
     return this.#update(hostThreadId, (current) => current.transportModelId === transportModelId ? null : { ...current, transportModelId });
   }
@@ -21448,24 +21588,24 @@ var TITLE_MAX_LENGTH = 150;
 var DESCRIPTION_MAX_LENGTH = 500;
 var SERVER_NAME_MAX_LENGTH = 80;
 var ELLIPSIS = "…";
-function isRecord2(value2) {
+function isRecord3(value2) {
   return typeof value2 === "object" && value2 !== null && !Array.isArray(value2);
 }
 function boundedText(value2, field, maxLength) {
-  const text = value2.trim();
-  if (text.length === 0 || text.length > maxLength) {
+  const text2 = value2.trim();
+  if (text2.length === 0 || text2.length > maxLength) {
     throw new Error(`Host Approval ${field} must contain 1 to ${maxLength} characters`);
   }
-  return text;
+  return text2;
 }
 function clampedText(value2, field, maxLength) {
-  const text = value2.trim();
-  if (text.length === 0) {
+  const text2 = value2.trim();
+  if (text2.length === 0) {
     throw new Error(`Host Approval ${field} must contain at least 1 character`);
   }
-  const characters = [...text];
+  const characters = [...text2];
   if (characters.length <= maxLength)
-    return text;
+    return text2;
   return `${characters.slice(0, maxLength - 1).join("").trimEnd()}${ELLIPSIS}`;
 }
 function actionsForEffect(interaction, effect) {
@@ -21502,7 +21642,7 @@ function responseError(message) {
 function responsePersist(value2) {
   if (value2 === void 0 || value2 === null)
     return null;
-  if (!isRecord2(value2) || Object.keys(value2).length !== 1 || value2.persist !== "session" && value2.persist !== "always") {
+  if (!isRecord3(value2) || Object.keys(value2).length !== 1 || value2.persist !== "session" && value2.persist !== "always") {
     throw responseError("contains malformed persist metadata");
   }
   return value2.persist;
@@ -21513,9 +21653,16 @@ function projectCodexApprovalRequest(input) {
     throw new Error("Host Approval subject is unsupported");
   }
   validateActions(interaction);
-  const allow = requiredActionForEffect(interaction, "allowOnce");
+  if (new Set(interaction.actions.map(({ effect }) => effect)).size !== interaction.actions.length) {
+    return projectApprovalChoices(input);
+  }
+  const allowOnce = optionalActionForEffect(interaction, "allowOnce");
   const allowForSession = optionalActionForEffect(interaction, "allowForSession");
   const allowAlways = optionalActionForEffect(interaction, "allowAlways");
+  const allow = allowOnce ?? allowForSession ?? allowAlways;
+  if (!allow) {
+    throw new Error("Host Approval must declare an allowOnce, allowForSession, or allowAlways action");
+  }
   const deny = requiredActionForEffect(interaction, "deny");
   const serverName = boundedText(input.serverName, "server name", SERVER_NAME_MAX_LENGTH);
   const title = clampedText(interaction.title, "title", TITLE_MAX_LENGTH);
@@ -21545,7 +21692,7 @@ function projectCodexApprovalRequest(input) {
     },
     denyResponse,
     parseResponse(result) {
-      if (!isRecord2(result) || typeof result.action !== "string") {
+      if (!isRecord3(result) || typeof result.action !== "string") {
         throw responseError("missing action");
       }
       if (Object.keys(result).some((key) => key !== "action" && key !== "content" && key !== "_meta")) {
@@ -21553,7 +21700,7 @@ function projectCodexApprovalRequest(input) {
       }
       const selectedPersist = responsePersist(result._meta);
       if (result.action === "accept") {
-        if ("content" in result && (!isRecord2(result.content) || Object.keys(result.content).length !== 0)) {
+        if ("content" in result && (!isRecord3(result.content) || Object.keys(result.content).length !== 0)) {
           throw responseError("contains non-empty accepted content");
         }
         if (selectedPersist === "session") {
@@ -21578,9 +21725,66 @@ function projectCodexApprovalRequest(input) {
     }
   };
 }
+function projectApprovalChoices(input) {
+  const { interaction } = input;
+  const allow = actionsForEffect(interaction, "allowOnce")[0];
+  const deny = actionsForEffect(interaction, "deny")[0];
+  if (!allow || !deny)
+    throw new Error("Host Approval must declare allowOnce and deny actions");
+  const denyResponse = { type: "approval", actionId: deny.id };
+  return {
+    request: {
+      method: "mcpServer/elicitation/request",
+      params: {
+        serverName: boundedText(input.serverName, "server name", SERVER_NAME_MAX_LENGTH),
+        threadId: input.threadId,
+        turnId: interaction.turnId,
+        mode: "form",
+        message: [
+          clampedText(interaction.title, "title", TITLE_MAX_LENGTH),
+          ...interaction.description ? [interaction.description] : []
+        ].join("\n\n"),
+        requestedSchema: {
+          type: "object",
+          properties: {
+            actionId: {
+              type: "string",
+              title: "Approval",
+              oneOf: interaction.actions.map(({ id: id2, label }) => ({ const: id2, title: label })),
+              default: allow.id
+            }
+          },
+          required: ["actionId"]
+        }
+      }
+    },
+    denyResponse,
+    parseResponse(result) {
+      if (!isRecord3(result) || typeof result.action !== "string")
+        throw responseError("missing action");
+      if (Object.keys(result).some((key) => !["action", "content", "_meta"].includes(key))) {
+        throw responseError("contains unreviewed fields");
+      }
+      if (result._meta !== void 0 && result._meta !== null) {
+        throw responseError("contains unexpected persist metadata");
+      }
+      if (result.action === "decline" || result.action === "cancel") {
+        if (result.content !== void 0 && result.content !== null) {
+          throw responseError("contains fields incompatible with denial");
+        }
+        return denyResponse;
+      }
+      const content = result.content;
+      if (result.action !== "accept" || !isRecord3(content) || Object.keys(content).length !== 1 || !interaction.actions.some(({ id: id2 }) => id2 === content.actionId)) {
+        throw responseError("contains an undeclared approval choice");
+      }
+      return { type: "approval", actionId: content.actionId };
+    }
+  };
+}
 
 // packages/protocol-core/dist/codex-question.js
-function isRecord3(value2) {
+function isRecord4(value2) {
   return typeof value2 === "object" && value2 !== null && !Array.isArray(value2);
 }
 function responseError2(message) {
@@ -21649,7 +21853,7 @@ function projectCodexQuestionRequest(input) {
       }
     },
     parseResponse(result) {
-      if (!isRecord3(result) || !isRecord3(result.answers)) {
+      if (!isRecord4(result) || !isRecord4(result.answers)) {
         throw responseError2("missing answers object");
       }
       const rawAnswers = result.answers;
@@ -21662,7 +21866,7 @@ function projectCodexQuestionRequest(input) {
         const question = interaction.questions.find(({ id: id2 }) => id2 === questionId);
         if (!question)
           throw responseError2("contains an unknown Question ID");
-        if (!isRecord3(answerValue) || !Array.isArray(answerValue.answers)) {
+        if (!isRecord4(answerValue) || !Array.isArray(answerValue.answers)) {
           throw responseError2("answer entry has no answers array");
         }
         const values = answerValue.answers;
@@ -21747,7 +21951,7 @@ function projectCodexThreadUsage(input) {
 }
 
 // packages/protocol-core/dist/codex-native-usage.js
-function isRecord4(value2) {
+function isRecord5(value2) {
   return typeof value2 === "object" && value2 !== null && !Array.isArray(value2);
 }
 function nonNegativeSafeInteger(value2) {
@@ -21777,20 +21981,20 @@ function addBreakdown(target, source) {
   }
 }
 function observeCodexTokenUsage(value2) {
-  if (!isRecord4(value2) || value2.method !== "thread/tokenUsage/updated")
+  if (!isRecord5(value2) || value2.method !== "thread/tokenUsage/updated")
     return null;
   const params = value2.params;
-  if (!isRecord4(params))
+  if (!isRecord5(params))
     return null;
   const threadId3 = hostThreadIdSchema.safeParse(params.threadId);
   const turnId = hostTurnIdSchema.safeParse(params.turnId);
   if (!threadId3.success || !turnId.success)
     return null;
   const tokenUsage = params.tokenUsage;
-  if (!isRecord4(tokenUsage))
+  if (!isRecord5(tokenUsage))
     return null;
-  const total = isRecord4(tokenUsage.total) ? tokenUsage.total : void 0;
-  const last = isRecord4(tokenUsage.last) ? tokenUsage.last : void 0;
+  const total = isRecord5(tokenUsage.total) ? tokenUsage.total : void 0;
+  const last = isRecord5(tokenUsage.last) ? tokenUsage.last : void 0;
   const usage = {};
   addBreakdown(usage, total);
   const contextUsedTokens = nonNegativeSafeInteger(last?.totalTokens);
@@ -21815,7 +22019,7 @@ function observeCodexTokenUsage(value2) {
   }
 }
 function parseRateLimitWindow(value2) {
-  if (!isRecord4(value2))
+  if (!isRecord5(value2))
     return null;
   const usedPercent = finitePercent(value2.usedPercent);
   const windowDurationMins = nonNegativeSafeInteger(value2.windowDurationMins);
@@ -21826,7 +22030,7 @@ function parseRateLimitWindow(value2) {
   return { usedPercent, windowDurationMins, ...resetsAt !== void 0 ? { resetsAt } : {} };
 }
 function parseRateLimitCandidate(value2, options2 = {}) {
-  if (!isRecord4(value2))
+  if (!isRecord5(value2))
     return null;
   if (options2.genericOnly && value2.limitId !== void 0 && value2.limitId !== null && value2.limitId !== "codex") {
     return null;
@@ -21836,16 +22040,16 @@ function parseRateLimitCandidate(value2, options2 = {}) {
   return primary || secondary ? { primary, secondary } : null;
 }
 function rateLimitCandidates(value2) {
-  if (!isRecord4(value2))
+  if (!isRecord5(value2))
     return [];
-  const result = isRecord4(value2.result) ? value2.result : value2;
-  if (!isRecord4(result))
+  const result = isRecord5(value2.result) ? value2.result : value2;
+  if (!isRecord5(result))
     return [];
   const candidates = [];
   const base = parseRateLimitCandidate(result.rateLimits, { genericOnly: true });
   if (base)
     candidates.push(base);
-  const notificationParams = isRecord4(value2.params) ? value2.params : void 0;
+  const notificationParams = isRecord5(value2.params) ? value2.params : void 0;
   const notificationSnapshot = parseRateLimitCandidate(notificationParams?.rateLimits, {
     genericOnly: true
   });
@@ -21889,14 +22093,14 @@ function parseAvailableCount(value2) {
   return void 0;
 }
 function rateLimitResetCreditsSummary(value2) {
-  if (!isRecord4(value2))
+  if (!isRecord5(value2))
     return null;
-  const result = isRecord4(value2.result) ? value2.result : value2;
-  const fromResult = isRecord4(result) && isRecord4(result.rateLimitResetCredits) ? result.rateLimitResetCredits : null;
+  const result = isRecord5(value2.result) ? value2.result : value2;
+  const fromResult = isRecord5(result) && isRecord5(result.rateLimitResetCredits) ? result.rateLimitResetCredits : null;
   if (fromResult)
     return fromResult;
-  const params = isRecord4(value2.params) ? value2.params : void 0;
-  return isRecord4(params?.rateLimitResetCredits) ? params.rateLimitResetCredits : null;
+  const params = isRecord5(value2.params) ? value2.params : void 0;
+  return isRecord5(params?.rateLimitResetCredits) ? params.rateLimitResetCredits : null;
 }
 function observeCodexRateLimitResetCredits(value2) {
   const summary = rateLimitResetCreditsSummary(value2);
@@ -21908,7 +22112,7 @@ function observeCodexRateLimitResetCredits(value2) {
   const expiresAtUnix = [];
   if (Array.isArray(summary.credits)) {
     for (const credit of summary.credits) {
-      if (!isRecord4(credit))
+      if (!isRecord5(credit))
         continue;
       if (credit.status !== void 0 && credit.status !== "available")
         continue;
@@ -21977,11 +22181,11 @@ function itemStatus(outcome) {
     return "inProgress";
   return outcome.status === "succeeded" ? "completed" : "failed";
 }
-function isRecord5(value2) {
+function isRecord6(value2) {
   return typeof value2 === "object" && value2 !== null && !Array.isArray(value2);
 }
 function nestedString(value2, keys) {
-  if (!isRecord5(value2))
+  if (!isRecord6(value2))
     return void 0;
   for (const key of keys) {
     const field = value2[key];
@@ -21998,8 +22202,8 @@ function nestedString(value2, keys) {
 function toolOutputText(item) {
   if (!item.output)
     return null;
-  const text = item.output.content.filter((content) => content.type === "text").map(({ text: text2 }) => text2).join("");
-  return text.length > 0 ? text : null;
+  const text2 = item.output.content.filter((content) => content.type === "text").map(({ text: text3 }) => text3).join("");
+  return text2.length > 0 ? text2 : null;
 }
 function toolCommandLine(toolName, args) {
   const lower = toolName.toLowerCase().replaceAll(/[_-]/g, "");
@@ -22153,8 +22357,8 @@ function planFromTodoValue(value2) {
   if (value2 && typeof value2 === "object" && "content" in value2 && Array.isArray(value2.content)) {
     const output = value2;
     if (output) {
-      const text = output.content.flatMap((entry) => entry.type === "text" ? [entry.text] : []).join("\n");
-      const fromText = planFromChecklistText(text);
+      const text2 = output.content.flatMap((entry) => entry.type === "text" ? [entry.text] : []).join("\n");
+      const fromText = planFromChecklistText(text2);
       if (fromText)
         return fromText;
     }
@@ -22162,7 +22366,7 @@ function planFromTodoValue(value2) {
   const record3 = unwrapToolRecord(value2);
   if (!record3)
     return planFromChecklistText(typeof value2 === "string" ? value2 : null);
-  if (isRecord5(record3.TodosUpdated)) {
+  if (isRecord6(record3.TodosUpdated)) {
     const nested = planFromTodoValue(record3.TodosUpdated);
     if (nested)
       return nested;
@@ -22177,7 +22381,7 @@ function planFromTodoValue(value2) {
       plan.push({ step: entry.trim(), status: "pending" });
       continue;
     }
-    if (!isRecord5(entry))
+    if (!isRecord6(entry))
       continue;
     const step = nestedString(entry, ["content", "step", "text", "title", "description", "task"]);
     if (!step)
@@ -22232,7 +22436,7 @@ function unwrapToolRecord(value2) {
   }
   if (Array.isArray(value2))
     return { todos: value2 };
-  if (!isRecord5(value2))
+  if (!isRecord6(value2))
     return null;
   for (const wrapper of ["input", "arguments", "params"]) {
     if (value2[wrapper] === void 0)
@@ -22290,7 +22494,7 @@ function projectItem(item, outcome, defaultCwd, includeCommandOutput = true, sen
         id: item.itemId,
         type: "agentMessage",
         text: item.text,
-        phase: null,
+        phase: item.phase ?? null,
         memoryCitation: null,
         durationMs: item.durationMs ?? null
       };
@@ -22714,10 +22918,10 @@ var CodexTurnProjector = class {
       });
     } else if (event.update.type === "output.replace") {
       if (next.type === "toolExecution" && toolCommandLine(next.toolName, next.arguments)) {
-        const text = toolOutputText(next);
-        if (text) {
+        const text2 = toolOutputText(next);
+        if (text2) {
           const previousText = previous.type === "toolExecution" ? toolOutputText(previous) ?? "" : "";
-          const delta = text.startsWith(previousText) ? text.slice(previousText.length) : text;
+          const delta = text2.startsWith(previousText) ? text2.slice(previousText.length) : text2;
           if (delta.length > 0) {
             projected.streamedCommandOutput = true;
             messages.push({
@@ -23041,7 +23245,7 @@ var CodexTurnProjector = class {
 };
 
 // packages/protocol-core/dist/thread-fork.js
-function isRecord6(value2) {
+function isRecord7(value2) {
   return typeof value2 === "object" && value2 !== null && !Array.isArray(value2);
 }
 function optionalText(params, name, options2 = {}) {
@@ -23064,7 +23268,7 @@ function optionalBoolean(params, name) {
 function decodeThreadForkRequest(request) {
   if (request.method !== "thread/fork")
     return null;
-  if (!isRecord6(request.params))
+  if (!isRecord7(request.params))
     throw new Error("thread/fork params must be an object");
   const params = request.params;
   const threadId3 = optionalText(params, "threadId");
@@ -23100,7 +23304,7 @@ function decodeThreadForkRequest(request) {
 function decodeThreadRevertRequest(request) {
   if (request.method !== "thread/revert")
     return null;
-  if (!isRecord6(request.params))
+  if (!isRecord7(request.params))
     throw new Error("thread/revert params must be an object");
   const { threadId: threadId3, beforeTurnId } = request.params;
   if (typeof threadId3 !== "string" || threadId3.length === 0) {
@@ -23114,7 +23318,7 @@ function decodeThreadRevertRequest(request) {
 function decodeThreadRollbackRequest(request) {
   if (request.method !== "thread/rollback")
     return null;
-  if (!isRecord6(request.params))
+  if (!isRecord7(request.params))
     throw new Error("thread/rollback params must be an object");
   const { threadId: threadId3, numTurns } = request.params;
   if (typeof threadId3 !== "string" || threadId3.length === 0) {
@@ -23211,13 +23415,13 @@ var THREAD_SOURCE_KINDS = /* @__PURE__ */ new Set([
   "subAgentOther",
   "unknown"
 ]);
-function isRecord7(value2) {
+function isRecord8(value2) {
   return typeof value2 === "object" && value2 !== null && !Array.isArray(value2);
 }
 function paramsObject(request, method) {
   if (request.params === void 0 && method === "thread/list")
     return {};
-  if (!isRecord7(request.params))
+  if (!isRecord8(request.params))
     throw new Error(`${method} params must be an object`);
   return request.params;
 }
@@ -23289,7 +23493,7 @@ function cursorPayload(value2) {
   };
 }
 function parseCursorPayload(value2) {
-  if (!isRecord7(value2) || value2.formatVersion !== 1)
+  if (!isRecord8(value2) || value2.formatVersion !== 1)
     throw new Error("Host cursor is invalid");
   const { queryFingerprint: fingerprint, sortDirection: sortDirection2, officialCursor, officialDone } = value2;
   const { externalAnchor: externalAnchor2, externalDone } = value2;
@@ -23298,7 +23502,7 @@ function parseCursorPayload(value2) {
   }
   let anchor = null;
   if (externalAnchor2 !== null) {
-    if (!isRecord7(externalAnchor2) || !Number.isSafeInteger(externalAnchor2.timestamp) || typeof externalAnchor2.threadId !== "string" || externalAnchor2.threadId.length === 0) {
+    if (!isRecord8(externalAnchor2) || !Number.isSafeInteger(externalAnchor2.timestamp) || typeof externalAnchor2.threadId !== "string" || externalAnchor2.threadId.length === 0) {
       throw new Error("Host cursor is invalid");
     }
     anchor = {
@@ -23418,7 +23622,7 @@ function decodeThreadMetadataUpdateRequest(request) {
   if (params.gitInfo === null) {
     gitInfo = null;
   } else if (params.gitInfo !== void 0) {
-    if (!isRecord7(params.gitInfo)) {
+    if (!isRecord8(params.gitInfo)) {
       throw new Error("thread/metadata/update params.gitInfo must be an object or null");
     }
     gitInfo = {};
@@ -23446,7 +23650,7 @@ function optionalCursor(value2, name) {
   return value2;
 }
 function decodeOfficialThreadListPage(value2) {
-  if (!isRecord7(value2) || !Array.isArray(value2.data) || value2.data.some((row) => !isRecord7(row))) {
+  if (!isRecord8(value2) || !Array.isArray(value2.data) || value2.data.some((row) => !isRecord8(row))) {
     throw new Error("Official thread/list response is invalid");
   }
   return {
@@ -24178,6 +24382,9 @@ var ExternalThreadRepository = class {
   setTitle(hostThreadId, title) {
     return this.store.setTitle(hostThreadId, title);
   }
+  setCwd(hostThreadId, cwd) {
+    return this.store.setCwd(hostThreadId, cwd);
+  }
   setTransportModelId(hostThreadId, transportModelId) {
     return this.store.setTransportModelId(hostThreadId, transportModelId);
   }
@@ -24685,8 +24892,25 @@ var HarnessSessionImporter = class {
       return { ok: false, error: fixedError(-32081, "Session mappings could not be read") };
     }
     const existing = this.#mappedRecord(records, nativeSessionId);
-    if (existing) return importedThread(existing);
     const capability = this.#capability;
+    if (existing) {
+      if (!capability?.resolveCandidate) return importedThread(existing);
+      try {
+        const resolved = await capability.resolveCandidate(nativeSessionId);
+        if (!resolved.ok) return importedThread(existing);
+        const metadata2 = harnessSessionImportCandidateSchema.safeParse(resolved.value.candidate);
+        const ref2 = nativeSessionRefSchema.safeParse(resolved.value.nativeRef);
+        if (!metadata2.success || !ref2.success || ref2.data.harnessId !== this.#harnessId || ref2.data.nativeSessionId !== nativeSessionId || metadata2.data.nativeSessionId !== nativeSessionId || metadata2.data.cwd === existing.cwd) {
+          return importedThread(existing);
+        }
+        return importedThread(
+          await this.#repository.setCwd(existing.hostThreadId, metadata2.data.cwd)
+        );
+      } catch (error51) {
+        this.#diagnose(error51);
+        return importedThread(existing);
+      }
+    }
     if (!capability?.resolveCandidate) return { ok: false, error: this.#unavailable() };
     let source;
     try {
@@ -24872,10 +25096,10 @@ function serializeCursor(anchor, includeAnchor) {
   return JSON.stringify({ anchor, includeAnchor });
 }
 function parseCursor(value2) {
-  const text = optionalText2(value2, "cursor");
-  if (text === null) return null;
+  const text2 = optionalText2(value2, "cursor");
+  if (text2 === null) return null;
   try {
-    const parsed = JSON.parse(text);
+    const parsed = JSON.parse(text2);
     if (typeof parsed === "object" && parsed !== null && typeof parsed.anchor === "string" && parsed.anchor.length > 0 && typeof parsed.includeAnchor === "boolean") {
       return { anchor: parsed.anchor, includeAnchor: parsed.includeAnchor };
     }
@@ -25738,8 +25962,8 @@ function parseInput(params) {
   )) {
     throw new ExternalSteerError(-32602, "External steering requires text input");
   }
-  const text = params.input.map((item) => item.text).join("\n");
-  if (!text.trim())
+  const text2 = params.input.map((item) => item.text).join("\n");
+  if (!text2.trim())
     throw new ExternalSteerError(-32602, "External steering input must not be empty");
   const clientUserMessageId = params.clientUserMessageId;
   if (clientUserMessageId != null && (typeof clientUserMessageId !== "string" || !clientUserMessageId.trim())) {
@@ -25747,7 +25971,7 @@ function parseInput(params) {
   }
   return {
     expectedTurnId: params.expectedTurnId,
-    text,
+    text: text2,
     ...typeof clientUserMessageId === "string" ? { clientUserMessageId } : {}
   };
 }
@@ -25893,7 +26117,7 @@ import { createHash as createHash3 } from "node:crypto";
 var CURSOR_PREFIX = "codexhost:thread-messages:v1:";
 var DEFAULT_MESSAGE_LIMIT = 25;
 var MAX_MESSAGE_LIMIT = 100;
-function isRecord8(value2) {
+function isRecord9(value2) {
   return typeof value2 === "object" && value2 !== null && !Array.isArray(value2);
 }
 function stringValue(value2) {
@@ -25902,12 +26126,12 @@ function stringValue(value2) {
 function textFromUserItem(item) {
   if (!Array.isArray(item.content)) return "";
   return item.content.flatMap(
-    (part) => isRecord8(part) && part.type === "text" && typeof part.text === "string" ? [part.text] : []
+    (part) => isRecord9(part) && part.type === "text" && typeof part.text === "string" ? [part.text] : []
   ).join("\n");
 }
 function threadStatus(value2, running) {
   if (running) return "running";
-  if (isRecord8(value2)) {
+  if (isRecord9(value2)) {
     if (value2.type === "active") return "running";
   }
   return "completed";
@@ -25924,15 +26148,15 @@ function allVisibleMessages(turns) {
     const turnId = stringValue(turn.id);
     if (!turnId || !Array.isArray(turn.items)) continue;
     const agentItems = turn.items.filter(
-      (item) => isRecord8(item) && item.type === "agentMessage"
+      (item) => isRecord9(item) && item.type === "agentMessage"
     );
     for (const item of turn.items) {
-      if (!isRecord8(item)) continue;
+      if (!isRecord9(item)) continue;
       const id2 = stringValue(item.id);
       if (!id2) continue;
       if (item.type === "userMessage") {
-        const text = textFromUserItem(item);
-        if (text) messages.push({ id: id2, turnId, role: "user", text });
+        const text2 = textFromUserItem(item);
+        if (text2) messages.push({ id: id2, turnId, role: "user", text: text2 });
       } else if (item.type === "agentMessage" && typeof item.text === "string" && item.text) {
         const itemIndex = agentItems.indexOf(item);
         const phase = item.phase === "commentary" || item.phase === "final" ? item.phase : turn.status === "inProgress" || itemIndex < agentItems.length - 1 ? "commentary" : "final";
@@ -25999,10 +26223,10 @@ function projectDelegationThreadSnapshot(input) {
   const status = input.running ? "running" : latestTurnStatus === "failed" || latestTurnStatus === "interrupted" ? latestTurnStatus : threadStatus(input.thread.status, input.running);
   const latestTurnMessages = latestTurnId ? visible.filter((message) => message.turnId === latestTurnId && message.role === "agent") : [];
   const final = latestTurnMessages.filter((message) => message.phase === "final").at(-1);
-  const progress = latestTurnMessages.filter((message) => message.phase !== "final").map(({ id: id2, turnId, text }) => ({ id: id2, turnId, text }));
+  const progress = latestTurnMessages.filter((message) => message.phase !== "final").map(({ id: id2, turnId, text: text2 }) => ({ id: id2, turnId, text: text2 }));
   const result = input.running ? { availability: "pending" } : final ? { availability: "available", text: final.text } : {
     availability: "unavailable",
-    ...isRecord8(latestTurn?.error) && typeof latestTurn.error.message === "string" ? { message: latestTurn.error.message } : {}
+    ...isRecord9(latestTurn?.error) && typeof latestTurn.error.message === "string" ? { message: latestTurn.error.message } : {}
   };
   const offset = options2.view === "messages" ? decodeCursor(input.threadId, options2.cursor) : visible.length;
   const page = options2.view === "messages" ? visible.slice(offset, offset + options2.limit) : void 0;
@@ -27157,7 +27381,7 @@ import { mkdir as mkdir6 } from "node:fs/promises";
 import { randomUUID as randomUUID7 } from "node:crypto";
 var INTERNAL_REQUEST_PREFIX = "codexhost:official:";
 var MAX_RETIRED_IDS = 1024;
-function isRecord9(value2) {
+function isRecord10(value2) {
   return typeof value2 === "object" && value2 !== null && !Array.isArray(value2);
 }
 var OfficialRequestBroker = class {
@@ -27200,7 +27424,7 @@ var OfficialRequestBroker = class {
     });
   }
   handle(value2) {
-    if (!isRecord9(value2) || typeof value2.id !== "string") return false;
+    if (!isRecord10(value2) || typeof value2.id !== "string") return false;
     const pending = this.#pending.get(value2.id);
     if (!pending) return this.#retired.has(value2.id);
     clearTimeout(pending.timeout);
@@ -27791,11 +28015,11 @@ async function aggregateOfficialAccountThreadListPage(input) {
 }
 
 // packages/host-runtime/src/route-observation.ts
-function isRecord10(value2) {
+function isRecord11(value2) {
   return typeof value2 === "object" && value2 !== null && !Array.isArray(value2);
 }
 function classifyThreadPurpose(request) {
-  return isRecord10(request.params) && request.params.ephemeral === true ? "ephemeral" : "conversation";
+  return isRecord11(request.params) && request.params.ephemeral === true ? "ephemeral" : "conversation";
 }
 var RequestRouteObservationTracker = class {
   #nextCreateOrdinal = 0;
@@ -27820,13 +28044,13 @@ var RequestRouteObservationTracker = class {
     this.#createByThreadId.set(threadId3, tracked);
   }
   bindOfficialResponse(response) {
-    if (!isRecord10(response) || !("id" in response)) return;
+    if (!isRecord11(response) || !("id" in response)) return;
     const tracked = this.#pendingByRequestId.get(response.id);
     if (!tracked) return;
     this.#pendingByRequestId.delete(response.id);
     const result = response.result;
-    const thread = isRecord10(result) ? result.thread : null;
-    if (isRecord10(thread) && typeof thread.id === "string") {
+    const thread = isRecord11(result) ? result.thread : null;
+    if (isRecord11(thread) && typeof thread.id === "string") {
       this.#createByThreadId.set(thread.id, tracked);
     }
   }
@@ -27869,11 +28093,11 @@ var OfficialThreadListError = class extends Error {
   }
   rpcError;
 };
-function isRecord11(value2) {
+function isRecord12(value2) {
   return typeof value2 === "object" && value2 !== null && !Array.isArray(value2);
 }
 function officialThreadListPageFromResponse(response) {
-  if (isRecord11(response.error)) {
+  if (isRecord12(response.error)) {
     if (!Number.isSafeInteger(response.error.code) || typeof response.error.message !== "string") {
       throw new Error("Official thread/list error response is invalid");
     }
@@ -27886,7 +28110,11 @@ function opposite(direction) {
   return direction === "asc" ? "desc" : "asc";
 }
 function officialParams(query, cursor, limit) {
-  return { ...query.params, cursor, limit };
+  const params = { ...query.params, cursor, limit };
+  if (Array.isArray(params.modelProviders) && params.modelProviders.length === 0) {
+    delete params.modelProviders;
+  }
+  return params;
 }
 function cursorValue(input) {
   return encodeHostThreadListCursor({
@@ -28038,14 +28266,14 @@ var THREAD_USAGE_UPDATED_METHOD = "codexhost/thread/usage/updated";
 function delay3(milliseconds) {
   return new Promise((resolve) => setTimeout(resolve, milliseconds));
 }
-function isRecord12(value2) {
+function isRecord13(value2) {
   return typeof value2 === "object" && value2 !== null && !Array.isArray(value2);
 }
 function isCreditsAdapter(adapter) {
   return typeof adapter.credits === "function";
 }
 function projectAccountCredits(value2) {
-  if (!isRecord12(value2)) return null;
+  if (!isRecord13(value2)) return null;
   const rest = { ...value2 };
   delete rest.fetchedAt;
   const parsed = accountCreditsSnapshotSchema.safeParse(rest);
@@ -28165,14 +28393,14 @@ function classifyCreateRequestRoute(request, defaultAgent) {
   };
 }
 function requestObject(request) {
-  if (!isRecord12(request.params)) throw new Error(`${request.method} params must be an object`);
+  if (!isRecord13(request.params)) throw new Error(`${request.method} params must be an object`);
   return request.params;
 }
 function requestText(params) {
   if (!Array.isArray(params.input)) throw new Error("turn/start input must be an array");
-  const text = params.input.filter((item) => isRecord12(item) && item.type === "text").map((item) => item.text).filter((value2) => typeof value2 === "string").join("\n");
-  if (!text) throw new Error("turn/start must contain text input");
-  return text;
+  const text2 = params.input.filter((item) => isRecord13(item) && item.type === "text").map((item) => item.text).filter((value2) => typeof value2 === "string").join("\n");
+  if (!text2) throw new Error("turn/start must contain text input");
+  return text2;
 }
 function sandboxResult(params) {
   const sandbox = params.sandbox;
@@ -28310,7 +28538,7 @@ var AppServerHost = class {
       externalRuntime: this.#externalRuntime,
       repository: this.#repository,
       registerExternalThread: (input) => this.#registerExternalThread(input),
-      startExternalTurn: (thread, text, turnId) => this.#startDelegatedExternalTurn(thread, text, turnId),
+      startExternalTurn: (thread, text2, turnId) => this.#startDelegatedExternalTurn(thread, text2, turnId),
       notifyThreadStarted: (thread) => this.#notifyExternalThreadStarted(thread),
       inspectOfficial: (input) => this.#inspectOfficialDelegationTarget(input),
       readOfficial: (input) => this.#readOfficialDelegationThread(input),
@@ -28455,12 +28683,12 @@ var AppServerHost = class {
     for (const resolve of waiters) resolve();
   }
   #observeOfficialTurnStartResponse(value2) {
-    if (!isRecord12(value2) || !("id" in value2)) return;
+    if (!isRecord13(value2) || !("id" in value2)) return;
     const threadId3 = this.#pendingOfficialTurnStarts.get(value2.id);
     if (!threadId3) return;
     this.#pendingOfficialTurnStarts.delete(value2.id);
-    const result = isRecord12(value2.result) ? value2.result : null;
-    const turn = result && isRecord12(result.turn) ? result.turn : null;
+    const result = isRecord13(value2.result) ? value2.result : null;
+    const turn = result && isRecord13(result.turn) ? result.turn : null;
     if (turn && typeof turn.id === "string") {
       this.#activeOfficialTurns.set(threadId3, turn.id);
     }
@@ -28474,7 +28702,7 @@ var AppServerHost = class {
   async #forwardDesktop() {
     for await (const frame of readLfFrames(this.#options.desktopInput)) {
       const parsed = parseJsonFrame(frame);
-      if (isRecord12(parsed) && parsed.method === "initialized" && !("id" in parsed)) {
+      if (isRecord13(parsed) && parsed.method === "initialized" && !("id" in parsed)) {
         continue;
       }
       if (await this.#handleDesktopApprovalResponse(parsed)) continue;
@@ -28685,7 +28913,7 @@ var AppServerHost = class {
         continue;
       }
       if (request.method === "thread/fork") {
-        const params = isRecord12(request.params) ? request.params : {};
+        const params = isRecord13(request.params) ? request.params : {};
         const resolution = typeof params.threadId === "string" ? await this.#resolveExternalThread(params.threadId) : { kind: "official" };
         if (resolution.kind === "error") {
           await this.#writer.json(
@@ -28708,7 +28936,7 @@ var AppServerHost = class {
         }
       }
       if (request.method === "thread/revert") {
-        const params = isRecord12(request.params) ? request.params : {};
+        const params = isRecord13(request.params) ? request.params : {};
         const resolution = typeof params.threadId === "string" ? await this.#resolveExternalThread(params.threadId) : { kind: "official" };
         if (resolution.kind === "error") {
           await this.#writer.json(
@@ -28731,7 +28959,7 @@ var AppServerHost = class {
         }
       }
       if (request.method === "thread/rollback") {
-        const params = isRecord12(request.params) ? request.params : {};
+        const params = isRecord13(request.params) ? request.params : {};
         const resolution = typeof params.threadId === "string" ? await this.#resolveExternalThread(params.threadId) : { kind: "official" };
         if (resolution.kind === "error") {
           await this.#writer.json(
@@ -28883,7 +29111,7 @@ var AppServerHost = class {
           continue;
         }
       }
-      if (request.method.startsWith("thread/") && !EXPLICIT_EXTERNAL_THREAD_METHODS.has(request.method) && isRecord12(request.params) && typeof request.params.threadId === "string") {
+      if (request.method.startsWith("thread/") && !EXPLICIT_EXTERNAL_THREAD_METHODS.has(request.method) && isRecord13(request.params) && typeof request.params.threadId === "string") {
         const location = await this.#locateExternalThread(request.params.threadId);
         if (await this.#writeResolutionError(request, location)) continue;
         if (location.kind === "external") {
@@ -28901,7 +29129,7 @@ var AppServerHost = class {
     await this.#codexRuntimePool.close();
   }
   async #forwardOfficialNonRequest(value2, frame) {
-    const response = isRecord12(value2) ? value2 : null;
+    const response = isRecord13(value2) ? value2 : null;
     const request = response && (typeof response.id === "string" || typeof response.id === "number") ? this.#officialServerRequestAccounts.get(response.id) : null;
     if (request && response) {
       this.#officialServerRequestAccounts.delete(response.id);
@@ -28915,7 +29143,7 @@ var AppServerHost = class {
   }
   async #forwardOfficialRequest(request, frame) {
     try {
-      const params = isRecord12(request.params) ? request.params : null;
+      const params = isRecord13(request.params) ? request.params : null;
       const requestedAccountId = request.method === "thread/start" && typeof params?.__codexhostAccountId === "string" ? params.__codexhostAccountId : null;
       const threadId3 = params && typeof params.threadId === "string" ? params.threadId : null;
       const loginId = params && typeof params.loginId === "string" ? params.loginId : null;
@@ -28966,7 +29194,7 @@ var AppServerHost = class {
     const parsed = input.value;
     this.#observeOfficialTurnStartResponse(parsed);
     let forwarded = parsed;
-    if (isRecord12(parsed) && typeof parsed.method === "string" && "id" in parsed) {
+    if (isRecord13(parsed) && typeof parsed.method === "string" && "id" in parsed) {
       const originalId = parsed.id;
       if (typeof originalId === "string" || typeof originalId === "number") {
         const forwardedId = `codexhost:official:${++this.#nextOfficialServerRequestId}`;
@@ -28977,12 +29205,12 @@ var AppServerHost = class {
         forwarded = { ...parsed, id: forwardedId };
       }
     }
-    if (isRecord12(parsed) && !("method" in parsed) && "id" in parsed) {
+    if (isRecord13(parsed) && !("method" in parsed) && "id" in parsed) {
       const requestKey = this.#officialRequestKey(input.accountId, parsed.id);
       const loginAccountId = this.#pendingOfficialLoginStarts.get(requestKey);
       if (loginAccountId) {
         this.#pendingOfficialLoginStarts.delete(requestKey);
-        const result = isRecord12(parsed.result) ? parsed.result : null;
+        const result = isRecord13(parsed.result) ? parsed.result : null;
         const loginId = result && typeof result.loginId === "string" ? result.loginId : null;
         if (result && loginId) {
           this.#officialLoginSessions.set(this.#loginSessionKey(loginAccountId, loginId), {
@@ -28996,8 +29224,8 @@ var AppServerHost = class {
       const pending = this.#pendingOfficialThreadBindings.get(requestKey);
       if (pending) {
         this.#pendingOfficialThreadBindings.delete(requestKey);
-        const result = isRecord12(parsed.result) ? parsed.result : null;
-        const thread = result && isRecord12(result.thread) ? result.thread : null;
+        const result = isRecord13(parsed.result) ? parsed.result : null;
+        const thread = result && isRecord13(result.thread) ? result.thread : null;
         const threadId3 = thread && typeof thread.id === "string" ? thread.id : null;
         if (threadId3) {
           try {
@@ -29012,7 +29240,7 @@ var AppServerHost = class {
         }
       }
     }
-    if (isRecord12(parsed) && parsed.method === "account/login/completed" && isRecord12(parsed.params)) {
+    if (isRecord13(parsed) && parsed.method === "account/login/completed" && isRecord13(parsed.params)) {
       const notificationLoginId = typeof parsed.params.loginId === "string" ? parsed.params.loginId : null;
       const accountSessions = notificationLoginId ? [] : [...this.#officialLoginSessions.values()].filter(
         (candidate) => candidate.accountId === input.accountId
@@ -29036,7 +29264,7 @@ var AppServerHost = class {
       }
       return;
     }
-    const accountScopedNotification = isRecord12(parsed) && typeof parsed.method === "string" && (parsed.method === "account/updated" || parsed.method.startsWith("account/rateLimits/"));
+    const accountScopedNotification = isRecord13(parsed) && typeof parsed.method === "string" && (parsed.method === "account/updated" || parsed.method.startsWith("account/rateLimits/"));
     if (accountScopedNotification) {
       if (parsed.method === "account/updated") this.#resetOfficialUsageState(input.accountId);
     }
@@ -29072,8 +29300,19 @@ var AppServerHost = class {
     try {
       if (request.method === "codexhost/account/usage/inspect") {
         const { accountId } = codexAccountUsageParamsSchema.parse(requestObject(request));
-        if (!await this.#accountRepository.get(accountId))
-          throw new Error("Unknown Codex Account");
+        const account = await this.#accountRepository.get(accountId);
+        if (!account) throw new Error("Unknown Codex Account");
+        const auth = await inspectCodexHomeAuth(account.codexHome);
+        if (auth.kind === "api") {
+          const accountCredits2 = await inspectCodexApiAccountCredits(account.codexHome);
+          const result2 = codexAccountUsageResultSchema.parse({
+            accountId,
+            usage: null,
+            ...accountCredits2 ? { accountCredits: accountCredits2 } : {}
+          });
+          await this.#writer.json(rpcEnvelope(request, { result: jsonValueSchema.parse(result2) }));
+          return;
+        }
         await this.#refreshOfficialRateLimits(accountId);
         const usage = this.#officialRateLimits.get(accountId);
         const accountCredits = this.#officialAccountCredits(accountId);
@@ -29093,11 +29332,11 @@ var AppServerHost = class {
         const response2 = await runtime.request("account/rateLimitResetCredit/consume", {
           idempotencyKey: params2.idempotencyKey ?? randomUUID8()
         });
-        if (isRecord12(response2.error)) {
+        if (isRecord13(response2.error)) {
           await this.#writer.json(rpcEnvelope(request, { error: response2.error }));
           return;
         }
-        const result = isRecord12(response2.result) ? response2.result : null;
+        const result = isRecord13(response2.result) ? response2.result : null;
         const outcome = codexAccountResetCreditConsumeOutcomeSchema.safeParse(result?.outcome);
         if (!outcome.success) throw new Error("Official reset-credit consume response is invalid");
         this.#officialRateLimits.reset(params2.accountId);
@@ -29199,11 +29438,11 @@ var AppServerHost = class {
         const response2 = await runtime.request("account/login/start", {
           type: "chatgptDeviceCode"
         });
-        if (isRecord12(response2.error)) {
+        if (isRecord13(response2.error)) {
           await this.#writer.json(rpcEnvelope(request, { error: response2.error }));
           return;
         }
-        const result = isRecord12(response2.result) ? response2.result : null;
+        const result = isRecord13(response2.result) ? response2.result : null;
         if (!result || result.type !== "chatgptDeviceCode" || typeof result.loginId !== "string" || typeof result.verificationUrl !== "string" || typeof result.userCode !== "string") {
           throw new Error("Official account/login/start response is invalid");
         }
@@ -29232,7 +29471,7 @@ var AppServerHost = class {
         return;
       }
       const response = await (await this.#codexRuntimePool.get(session.accountId)).request("account/login/cancel", { loginId: params.loginId });
-      if (isRecord12(response.error)) {
+      if (isRecord13(response.error)) {
         await this.#writer.json(rpcEnvelope(request, { error: response.error }));
         return;
       }
@@ -29264,8 +29503,8 @@ var AppServerHost = class {
     for (const account of await this.#accountRepository.list()) {
       try {
         const response = await (await this.#codexRuntimePool.get(account.accountId)).request("account/read", { refreshToken: false });
-        const result = isRecord12(response.result) ? response.result : null;
-        const officialAccount = result && isRecord12(result.account) ? result.account : null;
+        const result = isRecord13(response.result) ? response.result : null;
+        const officialAccount = result && isRecord13(result.account) ? result.account : null;
         if (!officialAccount) continue;
         const email3 = typeof officialAccount.email === "string" ? officialAccount.email.trim() : "";
         const parsedPlanType = codexAccountPlanTypeSchema.safeParse(officialAccount.planType);
@@ -29300,10 +29539,10 @@ var AppServerHost = class {
     return this.#uniqueLoginSession(loginId)?.accountId;
   }
   async #observeOfficialTurnLifecycle(value2) {
-    if (!isRecord12(value2) || !isRecord12(value2.params)) return;
+    if (!isRecord13(value2) || !isRecord13(value2.params)) return;
     const params = value2.params;
     if (value2.method === "turn/started" && typeof params.threadId === "string") {
-      const turn = isRecord12(params.turn) ? params.turn : null;
+      const turn = isRecord13(params.turn) ? params.turn : null;
       if (turn && typeof turn.id === "string") {
         this.#forgetPendingOfficialTurnStarts(params.threadId);
         this.#activeOfficialTurns.set(params.threadId, turn.id);
@@ -29316,7 +29555,7 @@ var AppServerHost = class {
       const delegation = await this.#repository.getDelegationByChild(
         hostThreadIdSchema.parse(params.threadId)
       );
-      const turn = isRecord12(params.turn) ? params.turn : null;
+      const turn = isRecord13(params.turn) ? params.turn : null;
       const status = turn?.status === "failed" ? "failed" : turn?.status === "interrupted" || turn?.status === "cancelled" ? "interrupted" : "completed";
       if (this.#pendingOfficialDelegationThreads.has(params.threadId)) {
         this.#pendingOfficialTerminalStatuses.set(params.threadId, status);
@@ -29346,21 +29585,21 @@ var AppServerHost = class {
   }
   async #inspectOfficialDelegationTarget(input) {
     const response = await this.#requestOfficial("model/list", {});
-    if (isRecord12(response.error)) {
+    if (isRecord13(response.error)) {
       throw new DelegationControlError(
         "DELEGATION_FAILED",
         typeof response.error.message === "string" ? response.error.message : "Official Model catalog could not be read"
       );
     }
-    const result = isRecord12(response.result) ? response.result : null;
+    const result = isRecord13(response.result) ? response.result : null;
     const data = result && Array.isArray(result.data) ? result.data : [];
     const thinkingById = /* @__PURE__ */ new Map();
     const models = data.flatMap((candidate) => {
-      if (!isRecord12(candidate) || typeof candidate.model !== "string" || !candidate.model.trim()) {
+      if (!isRecord13(candidate) || typeof candidate.model !== "string" || !candidate.model.trim()) {
         return [];
       }
       const supportedThinkingOptionIds = Array.isArray(candidate.supportedReasoningEfforts) ? candidate.supportedReasoningEfforts.flatMap((option) => {
-        if (!isRecord12(option) || typeof option.reasoningEffort !== "string" || !option.reasoningEffort.trim()) {
+        if (!isRecord13(option) || typeof option.reasoningEffort !== "string" || !option.reasoningEffort.trim()) {
           return [];
         }
         const id2 = harnessThinkingOptionIdSchema.safeParse(option.reasoningEffort);
@@ -29380,9 +29619,9 @@ var AppServerHost = class {
       ];
     });
     const defaultEntry = data.find(
-      (candidate) => isRecord12(candidate) && candidate.isDefault === true
+      (candidate) => isRecord13(candidate) && candidate.isDefault === true
     );
-    const defaultModel = isRecord12(defaultEntry) && typeof defaultEntry.model === "string" ? encodeOfficialCodexModelRef(defaultEntry.model) : void 0;
+    const defaultModel = isRecord13(defaultEntry) && typeof defaultEntry.model === "string" ? encodeOfficialCodexModelRef(defaultEntry.model) : void 0;
     return {
       harnessId: input.harnessId,
       inspection: {
@@ -29489,8 +29728,8 @@ var AppServerHost = class {
       ephemeral: false,
       historyMode: "paginated"
     });
-    const startedResult = isRecord12(started.result) ? started.result : null;
-    const thread = startedResult && isRecord12(startedResult.thread) ? startedResult.thread : null;
+    const startedResult = isRecord13(started.result) ? started.result : null;
+    const thread = startedResult && isRecord13(startedResult.thread) ? startedResult.thread : null;
     const threadId3 = thread && typeof thread.id === "string" ? thread.id : null;
     if (!threadId3) throw new Error("Official thread/start returned no Thread identity");
     await this.#codexRuntimePool.bindThread(threadId3, activeRuntime.account.accountId);
@@ -29503,8 +29742,8 @@ var AppServerHost = class {
         ...nativeModelId ? { model: nativeModelId } : {},
         ...input.thinkingOptionId ? { effort: input.thinkingOptionId } : {}
       });
-      const turnResult = isRecord12(turn.result) ? turn.result : null;
-      const turnValue = turnResult && isRecord12(turnResult.turn) ? turnResult.turn : null;
+      const turnResult = isRecord13(turn.result) ? turn.result : null;
+      const turnValue = turnResult && isRecord13(turnResult.turn) ? turnResult.turn : null;
       const parsedTurnId = turnValue && typeof turnValue.id === "string" ? turnValue.id : null;
       if (!parsedTurnId) throw new Error("Official turn/start returned no Turn identity");
       turnId = parsedTurnId;
@@ -29573,27 +29812,27 @@ var AppServerHost = class {
       threadId: input.threadId,
       includeTurns: true
     });
-    if (isRecord12(current.error) || !isRecord12(current.result)) {
+    if (isRecord13(current.error) || !isRecord13(current.result)) {
       throw new DelegationControlError("THREAD_NOT_FOUND", "Official Thread was not found");
     }
-    const currentThread = isRecord12(current.result.thread) ? current.result.thread : null;
+    const currentThread = isRecord13(current.result.thread) ? current.result.thread : null;
     const currentTurns = currentThread && Array.isArray(currentThread.turns) ? currentThread.turns : [];
     const latestTurn = currentTurns.at(-1);
-    if (currentThread && isRecord12(currentThread.status) && currentThread.status.type === "active" || isRecord12(latestTurn) && (latestTurn.status === "inProgress" || latestTurn.status === "running")) {
+    if (currentThread && isRecord13(currentThread.status) && currentThread.status.type === "active" || isRecord13(latestTurn) && (latestTurn.status === "inProgress" || latestTurn.status === "running")) {
       throw new DelegationControlError("THREAD_BUSY", "Thread already has an active Turn");
     }
     const response = await this.#requestOfficial("turn/start", {
       threadId: input.threadId,
       input: [{ type: "text", text: input.message }]
     });
-    if (isRecord12(response.error)) {
+    if (isRecord13(response.error)) {
       throw new DelegationControlError(
         "DELEGATION_FAILED",
         typeof response.error.message === "string" ? response.error.message : "Turn start failed"
       );
     }
-    const result = isRecord12(response.result) ? response.result : null;
-    const turn = result && isRecord12(result.turn) ? result.turn : null;
+    const result = isRecord13(response.result) ? response.result : null;
+    const turn = result && isRecord13(result.turn) ? result.turn : null;
     const turnId = turn && typeof turn.id === "string" ? turn.id : null;
     if (!turnId) throw new Error("Official turn/start returned no Turn identity");
     this.#activeOfficialTurns.set(input.threadId, turnId);
@@ -29615,13 +29854,13 @@ var AppServerHost = class {
         threadId: input.threadId,
         includeTurns: true
       });
-      if (isRecord12(current.error) || !isRecord12(current.result)) {
+      if (isRecord13(current.error) || !isRecord13(current.result)) {
         throw new DelegationControlError("THREAD_NOT_FOUND", "Official Thread was not found");
       }
-      const currentThread = isRecord12(current.result.thread) ? current.result.thread : null;
+      const currentThread = isRecord13(current.result.thread) ? current.result.thread : null;
       const currentTurns = currentThread && Array.isArray(currentThread.turns) ? currentThread.turns : [];
       const latestTurn = currentTurns.at(-1);
-      if (isRecord12(latestTurn) && typeof latestTurn.id === "string" && (latestTurn.status === "inProgress" || latestTurn.status === "running")) {
+      if (isRecord13(latestTurn) && typeof latestTurn.id === "string" && (latestTurn.status === "inProgress" || latestTurn.status === "running")) {
         turnId = latestTurn.id;
         this.#activeOfficialTurns.set(input.threadId, turnId);
       } else {
@@ -29632,7 +29871,7 @@ var AppServerHost = class {
       threadId: input.threadId,
       turnId
     });
-    if (isRecord12(response.error)) {
+    if (isRecord13(response.error)) {
       throw new DelegationControlError(
         "DELEGATION_FAILED",
         typeof response.error.message === "string" ? response.error.message : "Turn cancel failed"
@@ -29645,18 +29884,18 @@ var AppServerHost = class {
       threadId: input.threadId,
       includeTurns: true
     });
-    if (isRecord12(response.error)) {
+    if (isRecord13(response.error)) {
       throw new DelegationControlError(
         "THREAD_NOT_FOUND",
         typeof response.error.message === "string" ? response.error.message : "Official Thread was not found"
       );
     }
-    const result = isRecord12(response.result) ? response.result : null;
-    const thread = result && isRecord12(result.thread) ? result.thread : null;
+    const result = isRecord13(response.result) ? response.result : null;
+    const thread = result && isRecord13(result.thread) ? result.thread : null;
     if (!thread)
       throw new DelegationControlError("THREAD_NOT_FOUND", "Official Thread was not found");
-    const turns = Array.isArray(thread.turns) ? thread.turns.filter((turn) => isRecord12(turn)) : [];
-    const running = this.#activeOfficialTurns.has(input.threadId) || isRecord12(thread.status) && thread.status.type === "active";
+    const turns = Array.isArray(thread.turns) ? thread.turns.filter((turn) => isRecord13(turn)) : [];
+    const running = this.#activeOfficialTurns.has(input.threadId) || isRecord13(thread.status) && thread.status.type === "active";
     const snapshot = projectDelegationThreadSnapshot({
       threadId: input.threadId,
       harnessId: "codex",
@@ -29715,7 +29954,7 @@ var AppServerHost = class {
       threads: result.data.flatMap((entry) => {
         if (typeof entry.id !== "string") return [];
         const record3 = records.find((candidate) => candidate.hostThreadId === entry.id);
-        const status = isRecord12(entry.status) && entry.status.type === "active" ? "running" : "completed";
+        const status = isRecord13(entry.status) && entry.status.type === "active" ? "running" : "completed";
         return [
           {
             threadId: entry.id,
@@ -30860,10 +31099,10 @@ var AppServerHost = class {
       ...typeof params.serviceTier === "string" ? { serviceTier: params.serviceTier } : {}
     });
     try {
-      if (params.initialTurnsPage !== void 0 && params.initialTurnsPage !== null && !isRecord12(params.initialTurnsPage)) {
+      if (params.initialTurnsPage !== void 0 && params.initialTurnsPage !== null && !isRecord13(params.initialTurnsPage)) {
         throw new ExternalHistoryRequestError("initialTurnsPage must be an object");
       }
-      const initialPageParams = isRecord12(params.initialTurnsPage) ? params.initialTurnsPage : null;
+      const initialPageParams = isRecord13(params.initialTurnsPage) ? params.initialTurnsPage : null;
       const initialTurnsPage = initialPageParams ? listExternalTurns(turns, initialPageParams) : null;
       const paginated = thread.record.historyMode === "paginated";
       const turnsBackwardsCursor = paginated ? listExternalTurns(turns, { limit: 1, itemsView: "notLoaded" }).backwardsCursor : null;
@@ -30893,7 +31132,7 @@ var AppServerHost = class {
     const active = thread.projectedTurns.get(thread.activeTurnId);
     return active ? [...thread.turns, active.projector.pendingTurn()] : thread.turns;
   }
-  async #startDelegatedExternalTurn(thread, text, requestedTurnId) {
+  async #startDelegatedExternalTurn(thread, text2, requestedTurnId) {
     if (thread.running || this.#externalSteering.hasPending(thread.id)) {
       throw new Error("External Thread already has an active Turn");
     }
@@ -30904,7 +31143,7 @@ var AppServerHost = class {
         turnId,
         cwd: thread.cwd,
         startedAtMs: Date.now(),
-        initialInput: [{ type: "text", text }]
+        initialInput: [{ type: "text", text: text2 }]
       })
     };
     thread.running = true;
@@ -30917,7 +31156,7 @@ var AppServerHost = class {
     const result = await thread.session.execute({
       type: "turn.start",
       turnId,
-      input: [{ type: "text", text }]
+      input: [{ type: "text", text: text2 }]
     });
     if (!result.ok) {
       thread.running = false;
@@ -30951,14 +31190,14 @@ var AppServerHost = class {
         return;
       }
     }
-    let text;
+    let text2;
     try {
-      text = requestText(params);
+      text2 = requestText(params);
     } catch (error51) {
       await this.#writer.json(rpcError(request, -32602, errorMessage3(error51)));
       return;
     }
-    const commandCandidate = text.trimStart();
+    const commandCandidate = text2.trimStart();
     if (thread.session.commands && /^\/[^\s/]+(?:\s|$)/u.test(commandCandidate)) {
       const commandText = commandCandidate.trimEnd();
       this.#pendingExternalCommandRequests.add(thread.id);
@@ -31004,7 +31243,7 @@ var AppServerHost = class {
       return;
     }
     try {
-      const started = await this.#beginExternalTurn(thread, text);
+      const started = await this.#beginExternalTurn(thread, text2);
       try {
         await this.#writer.json(rpcEnvelope(request, { result: { turn: started.turn } }));
       } finally {
@@ -31025,7 +31264,7 @@ var AppServerHost = class {
       const started = await this.#externalSteering.run(
         thread,
         requestObject(request),
-        (text) => this.#beginExternalTurn(thread, text)
+        (text2) => this.#beginExternalTurn(thread, text2)
       );
       try {
         await this.#writer.json(rpcEnvelope(request, { result: { turnId: started.turnId } }));
@@ -31044,7 +31283,7 @@ var AppServerHost = class {
       this.#signalActiveWorkChanged();
     }
   }
-  async #beginExternalTurn(thread, text) {
+  async #beginExternalTurn(thread, text2) {
     if (this.#closeRequested || this.#externalRuntime.get(thread.id) !== thread) {
       throw new ExternalSteerError(-32073, "External Thread is no longer available");
     }
@@ -31070,7 +31309,7 @@ var AppServerHost = class {
       const result = await thread.session.execute({
         type: "turn.start",
         turnId,
-        input: [{ type: "text", text }]
+        input: [{ type: "text", text: text2 }]
       });
       if (!result.ok) throw new ExternalSteerError(-32073, result.error.message);
       return { turnId, turn: projection.projector.pendingTurn(), gate };
@@ -31103,17 +31342,15 @@ var AppServerHost = class {
       resolve: cancellationGate.resolve
     };
     thread.responseGates.set(turnId, gate);
-    const result = await thread.session.execute({ type: "turn.cancel", turnId });
-    if (!result.ok) {
-      try {
-        await this.#writer.json(rpcError(request, -32074, result.error.message));
-      } finally {
-        gate.resolve();
-      }
-      return;
+    let response;
+    try {
+      const result = await thread.session.execute({ type: "turn.cancel", turnId });
+      response = result.ok ? rpcEnvelope(request, { result: {} }) : rpcError(request, -32074, result.error.message);
+    } catch (error51) {
+      response = rpcError(request, -32074, errorMessage3(error51));
     }
     try {
-      await this.#writer.json(rpcEnvelope(request, { result: {} }));
+      await this.#writer.json(response);
     } finally {
       gate.resolve();
     }
@@ -31413,12 +31650,14 @@ var AppServerHost = class {
         await this.#repository.setDelegationStatus(delegation.delegationId, status);
       }
     }
-    for (const message of result.messages) await this.#writer.json(message);
     if (event.type === "turn.completed") {
       await this.#setThreadStatus(
         thread,
         this.#hasRunningSubagents(thread.id) ? { type: "active", activeFlags: [] } : { type: "idle" }
       );
+    }
+    for (const message of result.messages) await this.#writer.json(message);
+    if (event.type === "turn.completed") {
       this.#externalSteering.terminal(thread.id, event.turnId, event.outcome);
     }
   }
@@ -31473,7 +31712,7 @@ var AppServerHost = class {
     const previousItems = new Map(
       child.turns.flatMap(
         (turn) => Array.isArray(turn.items) ? turn.items.flatMap(
-          (item) => isRecord12(item) && typeof item.id === "string" ? [[item.id, JSON.stringify(item)]] : []
+          (item) => isRecord13(item) && typeof item.id === "string" ? [[item.id, JSON.stringify(item)]] : []
         ) : []
       )
     );
@@ -31486,7 +31725,7 @@ var AppServerHost = class {
     for (const turn of child.turns) {
       if (typeof turn.id !== "string" || !Array.isArray(turn.items)) continue;
       const changedItems = turn.items.filter(
-        (item) => isRecord12(item) && typeof item.id === "string" && previousItems.get(item.id) !== JSON.stringify(item)
+        (item) => isRecord13(item) && typeof item.id === "string" && previousItems.get(item.id) !== JSON.stringify(item)
       );
       if (changedItems.length > 0) {
         await this.#writer.json({
@@ -31618,7 +31857,7 @@ var AppServerHost = class {
     }
   }
   async #handleDesktopApprovalResponse(value2) {
-    if (!isRecord12(value2) || !isHostApprovalRequestId(value2.id)) return false;
+    if (!isRecord13(value2) || !isHostApprovalRequestId(value2.id)) return false;
     const pending = this.#pendingDesktopApprovals.get(value2.id);
     if (!pending) return true;
     this.#pendingDesktopApprovals.delete(value2.id);
@@ -31740,7 +31979,7 @@ var AppServerHost = class {
     }
   }
   async #handleDesktopQuestionResponse(value2) {
-    if (!isRecord12(value2) || !isHostQuestionRequestId(value2.id)) return false;
+    if (!isRecord13(value2) || !isHostQuestionRequestId(value2.id)) return false;
     const pending = this.#pendingDesktopQuestions.get(value2.id);
     if (!pending) return true;
     this.#pendingDesktopQuestions.delete(value2.id);
@@ -31936,9 +32175,11 @@ var DelegationControlRegistry = class {
       );
     }
     if (registrations.length === 1) return registrations[0];
-    throw new DelegationControlError("THREAD_NOT_FOUND", "Thread was not found", {
-      matchingRuntimeCount: 0
-    });
+    throw new DelegationControlError(
+      "PARENT_THREAD_AMBIGUOUS",
+      "Thread is not owned by exactly one active Host Runtime session",
+      { matchingRuntimeCount: 0 }
+    );
   }
   #compareThreads(left, right, sort) {
     const field = sort.startsWith("created") ? "createdAt" : "updatedAt";
@@ -32155,6 +32396,7 @@ import path15 from "node:path";
 var SKILL_VERSION = 5;
 var SKILL_RELATIVE_PATH = path15.join("skills", "codexhost-delegation", "SKILL.md");
 var PREVIOUS_MANAGED_DIGESTS = [
+  "aff258622dc8ff321f32b15620d081e578cb9c9ed1134d6a57f35ca8e7762c0a",
   "ba509f57e5448e796b3dfdd5031dcb08672eded50b61c0a54de84cfa02c49dd3",
   "d3ddf6db9bc5c5df825479c885bbbf0ca08da66f7057a12e02e1fdf57525149e",
   "15eb63519ff867e1536c97188a0c43738d7a49d38d4d6adeb7a1036726e7246d",
@@ -32164,12 +32406,12 @@ var CODEXHOST_DELEGATION_SKILL = `---
 name: codexhost-delegation
 version: ${SKILL_VERSION}
 description: >
-  Delegate work to another coding agent. Use when the user explicitly asks
-  Claude Code, Pi, Codex/OpenAI, OMP, Grok, another agent, or an agent mentioned
-  as @<agent> to independently review, investigate, implement, test, or verify
-  something. Do not use when the user is merely discussing, comparing, or
-  configuring agents, choosing a Model or Provider, or asking the current agent
-  to role-play as another agent.
+  Delegate tasks to other coding agents, or read and follow up on existing
+  external agent sessions. Use when the user asks another agent (including
+  @agent) to independently perform a task, or asks to view a specified external
+  session's content, progress, or results, send follow-up messages, wait, or
+  cancel a task. Not for recapping the current conversation, discussing or
+  configuring agents, or role-playing.
 ---
 
 # Execute the task
@@ -32194,9 +32436,14 @@ When the user asks for a specific Model or Thinking level, inspect the target
 Harness first and use the exact opaque IDs returned by the authoritative CLI.
 When they do not specify either setting, omit it so the target keeps its default.
 
-Create an independent child session and submit the requested task.
+For a new delegation, create an independent child session and submit the
+requested task. For an existing external session, resolve the target from the
+user-provided session link, identifier, or context and operate on that Thread
+directly; it need not have been created by the current assistant. If the target
+is ambiguous, ask the user to identify it. Keep requests to view or summarize a
+session read-only.
 
-After starting the task, choose the appropriate next action based on the
+For a new or existing task, choose the appropriate next action based on the
 user’s request and the task:
 
 - send a follow-up message to the same Thread;
@@ -32206,10 +32453,11 @@ user’s request and the task:
 - check it again later;
 - leave it running in the background.
 
-When the result is needed, explicitly read the child Thread. Report only the
+When the result is needed, explicitly read the target Thread. Report only the
 visible result returned by that Thread.
 
-Provide the user with the necessary tracking information, including:
+Provide the user with the necessary tracking information available from the
+CLI; omit unavailable fields rather than inventing them:
 
 - target agent;
 - \`delegationId\`;
@@ -34905,10 +35153,13 @@ async function runRemoteHostCli(input) {
 var HARNESS_BROKER_PROTOCOL_VERSION = 1;
 var HARNESS_BROKER_MAX_FRAME_BYTES = 8 * 1024 * 1024;
 var HARNESS_BROKER_MAX_PENDING_REQUESTS = 32;
+var HARNESS_BROKER_SESSION_IMPORT_PAGE_SIZE = 100;
 var harnessBrokerMethodSchema = external_exports.enum([
   "adapter.inspect",
   "adapter.inspectAccount",
   "adapter.open",
+  "adapter.sessionImport.list",
+  "adapter.sessionImport.resolve",
   "adapter.subagent.readSnapshot",
   "session.readSnapshot",
   "session.refreshUsage",
@@ -35064,6 +35315,27 @@ var brokerOpenInputSchema = external_exports.discriminatedUnion("kind", [
   rollbackSchema
 ]);
 var brokerInspectInputSchema = external_exports.object({ cwd: cwdSchema.optional(), refresh: external_exports.boolean().optional() }).strict();
+var brokerSessionImportListParamsSchema = external_exports.object({
+  offset: external_exports.number().int().nonnegative().safe(),
+  limit: external_exports.number().int().min(1).max(HARNESS_BROKER_SESSION_IMPORT_PAGE_SIZE)
+}).strict();
+var brokerSessionImportResolveParamsSchema = external_exports.object({ nativeSessionId: harnessSessionImportIdSchema }).strict();
+var brokerSessionImportCandidatesSchema = external_exports.array(harnessSessionImportCandidateSchema);
+var brokerSessionImportPageSchema = external_exports.object({
+  candidates: external_exports.array(harnessSessionImportCandidateSchema).max(HARNESS_BROKER_SESSION_IMPORT_PAGE_SIZE),
+  total: external_exports.number().int().nonnegative().safe()
+}).strict();
+var brokerSessionImportSourceSchema = external_exports.object({
+  candidate: harnessSessionImportCandidateSchema,
+  nativeRef: nativeSessionRefSchema
+}).strict().superRefine((source, context) => {
+  if (source.nativeRef.harnessId !== "claude-code" || source.nativeRef.nativeSessionId !== source.candidate.nativeSessionId) {
+    context.addIssue({
+      code: "custom",
+      message: "Claude Session import source identity does not match"
+    });
+  }
+});
 var textInputSchema = external_exports.object({ type: external_exports.literal("text"), text: external_exports.string().max(4e6) }).strict();
 var turnStartSchema = external_exports.object({
   type: external_exports.literal("turn.start"),
@@ -35562,6 +35834,50 @@ async function startHarnessBrokerServer(input) {
           return { ok: false, error: harnessError("Claude subagents are unavailable", false) };
         return subagents.readSnapshot(subagentReadSnapshotSchema.parse(request.params));
       }
+      if (request.method === "adapter.sessionImport.list") {
+        const { limit, offset } = brokerSessionImportListParamsSchema.parse(request.params);
+        const sessionImport = input.adapter.sessionImport;
+        if (!sessionImport?.resolveCandidate) {
+          return {
+            ok: false,
+            error: harnessError("Claude Session import is unavailable", false)
+          };
+        }
+        if (offset === 0) {
+          const result = await sessionImport.listCandidates();
+          if (!result.ok)
+            return result;
+          state.sessionImportCandidates = result.value.map((candidate) => harnessSessionImportCandidateSchema.parse(candidate));
+        }
+        const candidates = state.sessionImportCandidates;
+        if (!candidates) {
+          return {
+            ok: false,
+            error: {
+              code: "invalidState",
+              message: "Claude Session import page snapshot is unavailable",
+              retryable: true,
+              stage: "harnessBroker.sessionImport"
+            }
+          };
+        }
+        const page = candidates.slice(offset, offset + limit);
+        const total = candidates.length;
+        if (offset + page.length >= total)
+          delete state.sessionImportCandidates;
+        return { ok: true, value: { candidates: page, total } };
+      }
+      if (request.method === "adapter.sessionImport.resolve") {
+        const { nativeSessionId } = brokerSessionImportResolveParamsSchema.parse(request.params);
+        const resolveCandidate = input.adapter.sessionImport?.resolveCandidate;
+        if (!resolveCandidate) {
+          return {
+            ok: false,
+            error: harnessError("Claude Session import is unavailable", false)
+          };
+        }
+        return resolveCandidate(nativeSessionId);
+      }
       if (request.method === "adapter.open") {
         const openInput = brokerOpenInputSchema.parse(request.params);
         const sourceRef = openInput.kind === "create" ? void 0 : openInput.kind === "resume" ? openInput.nativeRef : openInput.sourceRef;