@super-one/cli 0.55.2-alpha → 0.57.0-alpha

package/lib/cli.mjs

@@ -164,10 +164,113 @@ var init_host_actions = __esm({
 });
 
 // ../../packages/shared/src/environment/host-action-superone-descriptors.ts
-var HOST_ACTION_SUPERONE_TOOL_DESCRIPTORS;
+var deviceDescriptionProperty, deviceTargetProperty, deviceConditionSchema, deviceActionSchema, HOST_ACTION_SUPERONE_TOOL_DESCRIPTORS;
 var init_host_action_superone_descriptors = __esm({
   "../../packages/shared/src/environment/host-action-superone-descriptors.ts"() {
     "use strict";
+    deviceDescriptionProperty = {
+      type: "string",
+      minLength: 1,
+      maxLength: 160,
+      description: "A short human-friendly explanation of what this step accomplishes, phrased for the user watching (e.g. 'Open the profile tab', 'Check the order total'). Shown in the UI in place of refs and coordinates. Write it in the conversation's language."
+    };
+    deviceTargetProperty = {
+      type: "string",
+      description: "Which controlled device to act on \u2014 the id from device_list, or its name. Optional while this session controls exactly one device; required once it controls more than one (driving the wrong app there looks like a bug in the right one). Use device_request_control to be granted another."
+    };
+    deviceConditionSchema = {
+      type: "object",
+      properties: {
+        kind: { type: "string", enum: ["exists", "notExists", "textEquals", "textContains"] },
+        ref: {
+          description: "Only valid within the snapshot it came from; prefer label or identifier when waiting.",
+          type: "string"
+        },
+        label: { description: "Visible name of the element.", type: "string" },
+        identifier: {
+          description: "Developer-assigned id. Survives copy changes and translation \u2014 the most durable target.",
+          type: "string"
+        },
+        text: {
+          description: "The string textEquals/textContains compares against. Required by those two kinds, and NOT a way to name an element \u2014 use label for that.",
+          type: "string",
+          minLength: 1
+        }
+      },
+      required: ["kind"],
+      additionalProperties: false
+    };
+    deviceActionSchema = {
+      type: "object",
+      properties: {
+        type: {
+          type: "string",
+          enum: ["tap", "doubleTap", "longPress", "swipe", "pinch", "press", "type", "key", "rotate", "keyboard"]
+        },
+        ref: { description: 'Element ref from the snapshot, e.g. "@e12". Preferred over coordinates.', type: "string" },
+        x: {
+          description: "Horizontal position as a fraction of the screen (0-1). Only when no ref fits.",
+          type: "number",
+          minimum: 0,
+          maximum: 1
+        },
+        y: {
+          description: "Vertical position as a fraction of the screen (0-1).",
+          type: "number",
+          minimum: 0,
+          maximum: 1
+        },
+        direction: {
+          description: 'swipe: which way the finger travels. Content moves the opposite way, so "up" scrolls down a list.',
+          type: "string",
+          enum: ["up", "down", "left", "right"]
+        },
+        distance: {
+          description: "swipe: travel as a fraction of the screen. Default 0.6.",
+          type: "number",
+          minimum: 0.05,
+          maximum: 1
+        },
+        toX: {
+          description: "swipe: explicit destination instead of direction.",
+          type: "number",
+          minimum: 0,
+          maximum: 1
+        },
+        toY: { type: "number", minimum: 0, maximum: 1 },
+        scale: {
+          description: "pinch: final separation factor. Below 1 pinches in (zoom out), above 1 spreads.",
+          type: "number",
+          minimum: 0.1,
+          maximum: 5
+        },
+        durationMs: {
+          description: "How long the gesture takes. Short swipes flick and coast; long ones drag and stop.",
+          type: "integer",
+          minimum: 16,
+          maximum: 1e4
+        },
+        text: {
+          description: "type: text to enter. Anything the simulated keyboard cannot spell (Chinese, emoji) is pasted automatically.",
+          type: "string"
+        },
+        button: {
+          type: "string",
+          enum: ["home", "lock", "side", "volume-up", "volume-down", "back", "app-switch"],
+          description: "key: a hardware button. `back` and `app-switch` are Android-only and are refused elsewhere."
+        },
+        orientation: {
+          type: "string",
+          enum: ["portrait", "landscape-left", "portrait-upside-down", "landscape-right"]
+        },
+        connected: {
+          description: "keyboard: attach or detach the hardware keyboard. Detach it to make the on-screen keyboard appear.",
+          type: "boolean"
+        }
+      },
+      required: ["type"],
+      additionalProperties: false
+    };
     HOST_ACTION_SUPERONE_TOOL_DESCRIPTORS = [
       {
         "name": "session_collab_list_agents",
@@ -3563,7 +3666,7 @@ If the tool returns an error containing "user_locked", the user has manually nam
                 },
                 "reasoningEffort": {
                   "type": "string",
-                  "enum": ["minimal", "low", "medium", "high", "xhigh"],
+                  "enum": ["minimal", "low", "medium", "high", "xhigh", "max", "ultra"],
                   "description": "Codex legacy alias for effort."
                 },
                 "permissionPreset": {
@@ -3620,6 +3723,116 @@ If the tool returns an error containing "user_locked", the user has manually nam
           ],
           "additionalProperties": false
         }
+      },
+      {
+        "name": "device_list",
+        "description": "Browse the devices this machine can offer, one tier at a time \u2014 a dev machine holds over a hundred simulators, so this never dumps them all. No arguments: what is running (attaching is instant; a cold boot costs ~20s), what this project used before, and which kinds exist. kind: that kind's models. model: that model's devices, one per runtime, with the ids. Prefer a running or recent device; ids only matter when you need a specific runtime, since device_request_control also takes a model name and picks its newest. Free and side-effect-free \u2014 it grants nothing and boots nothing.",
+        "inputSchema": {
+          "type": "object",
+          "properties": {
+            "kind": {
+              "type": "string",
+              "description": 'Narrow to one family: "iphone", "ipad", "watch", "tv", "vision". Returns its models.'
+            },
+            "model": {
+              "type": "string",
+              "description": 'A model name from the kind tier ("iPhone 17 Pro Max"). Returns one entry per runtime, with ids.'
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      {
+        "name": "device_request_control",
+        "description": "Ask the user to let this session control one specific device, and wait for their answer. Every other device_* tool needs that grant and fails with NO_DEVICE until this succeeds \u2014 call it first, not after a failure. Pick the device from device_list yourself; the user only approves or declines, and a decline carries their feedback (often naming a different device \u2014 read it before retrying). Returns it once bound and ready, booting it if it was not running; asking again for one this session already holds returns it without prompting. A session may hold several, and then every device_* call must name one with `device`. Install a build afterwards with `xcrun simctl install/launch`.",
+        "inputSchema": {
+          "type": "object",
+          "properties": {
+            "description": deviceDescriptionProperty,
+            "device": {
+              "type": "string",
+              "description": 'The id from device_list. A device name ("iPhone 17 Pro Max") is matched loosely against the catalog as a fallback, but the id is what makes the approved device the one you meant.'
+            }
+          },
+          "required": [
+            "description",
+            "device"
+          ],
+          "additionalProperties": false
+        }
+      },
+      {
+        "name": "device_snapshot",
+        "description": "Capture the screen and return a stateId later calls must quote. mode=semantic (default) returns the accessibility tree with @eN refs, labels, identifiers and bounds \u2014 prefer it: refs survive animation and rotation, coordinates do not. mode=visual saves a PNG and returns image.path (not pixels); Read it to look. fused returns both. Waits for animation to stop; settled=false means geometry is approximate. A region with no accessibility tree \u2014 a WebView, a canvas \u2014 has its text read from pixels and merged in, marked (ocr): tap those, never press. The reply says source=ocr or hybrid. Re-snapshot after anything that changes the screen \u2014 refs are positional and device_act rejects a stale stateId.",
+        "inputSchema": {
+          "type": "object",
+          "properties": {
+            "description": deviceDescriptionProperty,
+            "device": deviceTargetProperty,
+            "mode": { "description": "Default semantic", "type": "string", "enum": ["semantic", "visual", "fused"] },
+            "maxNodes": {
+              "description": "Ceiling on tree size. Default 500; truncated=true means the screen has more.",
+              "type": "integer",
+              "minimum": 1,
+              "maximum": 2e3
+            }
+          },
+          "required": ["description"],
+          "additionalProperties": false
+        }
+      },
+      {
+        "name": "device_query",
+        "description": "Search or inspect an existing snapshot without re-capturing the device. Use this instead of taking another snapshot when you only need to find an element or read its details \u2014 it costs no device round trip and cannot race an animation. op=search matches text against labels, values and identifiers. op=inspect returns one element and its children.",
+        "inputSchema": {
+          "type": "object",
+          "properties": {
+            "description": deviceDescriptionProperty,
+            "device": deviceTargetProperty,
+            "stateId": { "type": "string", "description": "From a prior device_snapshot." },
+            "op": { "type": "string", "enum": ["search", "inspect"] },
+            "text": { "description": "For search.", "type": "string" },
+            "ref": { "description": 'For inspect, e.g. "@e12".', "type": "string" }
+          },
+          "required": ["description", "stateId", "op"],
+          "additionalProperties": false
+        }
+      },
+      {
+        "name": "device_act",
+        "description": "Run 1-10 touch actions against a snapshot, then re-observe to judge if they worked. Actions: tap, doubleTap, longPress, swipe(direction|toX/toY), pinch(scale), press(ref), type, key, rotate, keyboard. Prefer press for a ref-backed control; it goes through accessibility, immune to animation, rotation and scale (not on a source=ocr snapshot \u2014 tap there). Aim touch actions at refs too; raw x/y is a last resort. The whole batch, stale stateId included, is validated up front. rotate ends the snapshot it is in: put it last, then re-snapshot \u2014 a later ref or coordinate is refused. Returns worked|didnt|unknown; unknown means input landed but nothing visibly changed. Pass expect to define success.",
+        "inputSchema": {
+          "type": "object",
+          "properties": {
+            "description": deviceDescriptionProperty,
+            "device": deviceTargetProperty,
+            "stateId": { "type": "string" },
+            "actions": { "minItems": 1, "maxItems": 10, "type": "array", "items": deviceActionSchema },
+            "expect": { "description": "Postcondition checked after the actions run.", ...deviceConditionSchema }
+          },
+          "required": ["description", "stateId", "actions"],
+          "additionalProperties": false
+        }
+      },
+      {
+        "name": "device_wait_for",
+        "description": "Wait until the screen satisfies a condition. Use this instead of snapshotting in a loop. Distinguishes preexisting (already true when asked) from verified (became true while waiting), so you can tell a real transition from a check that was never going to fail. Returns a fresh settled stateId and matching tree when successful. Target the element by label or identifier, not by ref: refs belong to one snapshot, and what you are waiting for usually does not exist yet. Every condition must name an element that way \u2014 text only says what to compare, it never selects.",
+        "inputSchema": {
+          "type": "object",
+          "properties": {
+            "description": deviceDescriptionProperty,
+            "device": deviceTargetProperty,
+            "condition": deviceConditionSchema,
+            "timeoutMs": {
+              "description": "Default 5000",
+              "type": "integer",
+              "minimum": 100,
+              "maximum": 6e4
+            }
+          },
+          "required": ["description", "condition"],
+          "additionalProperties": false
+        }
       }
     ];
   }
@@ -3693,6 +3906,10 @@ var init_host_action_browser_catalog = __esm({
       "widget_list_templates",
       "miniapp_list",
       "automation_list",
+      "device_list",
+      "device_snapshot",
+      "device_query",
+      "device_wait_for",
       // session_collab_* are node-local (not HA); list_agents stays "safe" if ever reclassified
       "computer_apps",
       "computer_snapshot",
@@ -19033,7 +19250,7 @@ var init_agent_error = __esm({
   }
 });
 
-// ../../packages/codex/src/agent-event-mapper.ts
+// ../../packages/codex/src/protocol-v149.ts
 function asRecord(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : null;
 }
@@ -19041,6 +19258,75 @@ function readString(value) {
   return typeof value === "string" && value.length > 0 ? value : null;
 }
 function readNumber(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : null;
+}
+function readCodexAgentMessageDelivery(value) {
+  return value === "async" ? "async" : void 0;
+}
+function readCodexImageGenerationFailure(value) {
+  const failure = asRecord(value);
+  if (!failure || failure.type !== "usageLimitExceeded") return void 0;
+  const limitId = readString(failure.limitId);
+  if (!limitId) return void 0;
+  return {
+    type: "usageLimitExceeded",
+    limitId,
+    resetsAt: readNumber(failure.resetsAt)
+  };
+}
+function readCodexErrorOverrides(value) {
+  const rec = asRecord(value);
+  const error51 = asRecord(rec?.error) ?? rec;
+  const info = error51?.codexErrorInfo ?? error51?.codex_error_info;
+  if (typeof info === "string") return { code: info };
+  const variant = asRecord(info);
+  if (!variant) return {};
+  const normalizedCode = readString(variant.code);
+  if (normalizedCode) {
+    const httpStatus2 = readNumber(variant.httpStatus);
+    return { code: normalizedCode, ...httpStatus2 === null ? {} : { httpStatus: httpStatus2 } };
+  }
+  const [code, payload] = Object.entries(variant)[0] ?? [];
+  if (!code) return {};
+  const httpStatus = readNumber(asRecord(payload)?.httpStatusCode);
+  return { code, ...httpStatus === null ? {} : { httpStatus } };
+}
+async function readCodexServerDiagnostics(client3) {
+  const result = await client3.request("server/diagnostics");
+  const process3 = asRecord(result.process);
+  const gauges = Array.isArray(result.gauges) ? result.gauges.flatMap((value) => {
+    const gauge = asRecord(value);
+    const name = readString(gauge?.name);
+    const numeric = readNumber(gauge?.value);
+    return name && numeric !== null ? [{ name, value: numeric }] : [];
+  }) : [];
+  return {
+    process: {
+      id: readNumber(process3?.id) ?? 0,
+      residentMemoryBytes: readNumber(process3?.residentMemoryBytes),
+      physicalFootprintBytes: readNumber(process3?.physicalFootprintBytes)
+    },
+    gauges
+  };
+}
+async function readCodexConfigRequirements(client3) {
+  const result = await client3.request("configRequirements/read", {});
+  return asRecord(result.requirements);
+}
+var init_protocol_v149 = __esm({
+  "../../packages/codex/src/protocol-v149.ts"() {
+    "use strict";
+  }
+});
+
+// ../../packages/codex/src/agent-event-mapper.ts
+function asRecord2(value) {
+  return value && typeof value === "object" && !Array.isArray(value) ? value : null;
+}
+function readString2(value) {
+  return typeof value === "string" && value.length > 0 ? value : null;
+}
+function readNumber2(value) {
   if (typeof value === "number" && Number.isFinite(value)) return value;
   if (typeof value === "string") {
     const parsed = Number(value);
@@ -19053,7 +19339,7 @@ function readBoolean(value) {
 }
 function readStringArray(value) {
   if (!Array.isArray(value)) return [];
-  return value.map(readString).filter((entry) => entry !== null);
+  return value.map(readString2).filter((entry) => entry !== null);
 }
 function uniqueStrings(values) {
   const result = [];
@@ -19064,30 +19350,30 @@ function uniqueStrings(values) {
   return result;
 }
 function readTextPart(value) {
-  const direct = readString(value);
+  const direct = readString2(value);
   if (direct !== null) return direct;
-  const rec = asRecord(value);
+  const rec = asRecord2(value);
   if (!rec) return null;
-  return readString(rec.text) ?? readString(rec.summaryText) ?? readString(rec.summary_text) ?? readString(rec.content);
+  return readString2(rec.text) ?? readString2(rec.summaryText) ?? readString2(rec.summary_text) ?? readString2(rec.content);
 }
 function readTextParts(value) {
   if (!Array.isArray(value)) return [];
   return value.map(readTextPart).filter((entry) => entry !== null && entry.length > 0);
 }
 function readCodexItemId(rec) {
-  return readString(rec.itemId) ?? readString(rec.item_id) ?? readString(rec.id) ?? readString(asRecord(rec.item)?.id);
+  return readString2(rec.itemId) ?? readString2(rec.item_id) ?? readString2(rec.id) ?? readString2(asRecord2(rec.item)?.id);
 }
 function readCodexDeltaText(rec) {
-  return readString(rec.delta) ?? readString(rec.textDelta) ?? readString(rec.text_delta) ?? readString(rec.summaryTextDelta) ?? readString(rec.summary_text_delta) ?? readString(rec.summaryDelta) ?? readString(rec.summary_delta) ?? readString(rec.text) ?? readString(rec.summaryText) ?? readString(rec.summary_text) ?? "";
+  return readString2(rec.delta) ?? readString2(rec.textDelta) ?? readString2(rec.text_delta) ?? readString2(rec.summaryTextDelta) ?? readString2(rec.summary_text_delta) ?? readString2(rec.summaryDelta) ?? readString2(rec.summary_delta) ?? readString2(rec.text) ?? readString2(rec.summaryText) ?? readString2(rec.summary_text) ?? "";
 }
 function mapPatchChangeKind(raw) {
-  const direct = readString(raw);
+  const direct = readString2(raw);
   if (direct === "add" || direct === "delete" || direct === "update") return direct;
-  const kind = readString(asRecord(raw)?.type);
+  const kind = readString2(asRecord2(raw)?.type);
   return kind === "add" || kind === "delete" || kind === "update" ? kind : "update";
 }
 function mapCommandExecutionStatus(raw) {
-  switch (readString(raw)) {
+  switch (readString2(raw)) {
     case "in_progress":
     case "inProgress":
       return "in_progress";
@@ -19099,11 +19385,11 @@ function mapCommandExecutionStatus(raw) {
   }
 }
 function mapPatchApplyStatus(raw) {
-  const status = readString(raw);
+  const status = readString2(raw);
   return status === "failed" || status === "declined" ? "failed" : "completed";
 }
 function mapMcpToolCallStatus(raw) {
-  switch (readString(raw)) {
+  switch (readString2(raw)) {
     case "in_progress":
     case "inProgress":
       return "in_progress";
@@ -19114,7 +19400,7 @@ function mapMcpToolCallStatus(raw) {
   }
 }
 function normalizeCollabTool(value) {
-  switch (readString(value)) {
+  switch (readString2(value)) {
     case "spawnAgent":
     case "spawn_agent":
       return "spawnAgent";
@@ -19135,7 +19421,7 @@ function normalizeCollabTool(value) {
   }
 }
 function normalizeCollabAgentStatus(value) {
-  switch (readString(value)) {
+  switch (readString2(value)) {
     case "pendingInit":
     case "pending_init":
       return "pendingInit";
@@ -19161,10 +19447,10 @@ function buildCodexReasoningItem(id, text, previous, now = Date.now) {
   return { id, type: "reasoning", text, startedAt, endedAt: timestamp };
 }
 function mapCodexThreadItem(raw, previous, now = Date.now) {
-  const rec = asRecord(raw);
+  const rec = asRecord2(raw);
   if (!rec) return null;
-  const type = readString(rec.type);
-  const id = readString(rec.id) ?? previous?.id;
+  const type = readString2(rec.type);
+  const id = readString2(rec.id) ?? previous?.id;
   if (!type || !id) return null;
   switch (type) {
     case "agent_message":
@@ -19172,32 +19458,33 @@ function mapCodexThreadItem(raw, previous, now = Date.now) {
       return {
         id,
         type: "agent_message",
-        text: readString(rec.text) ?? (previous?.type === "agent_message" ? previous.text : "")
+        text: readString2(rec.text) ?? (previous?.type === "agent_message" ? previous.text : ""),
+        ...readCodexAgentMessageDelivery(rec.delivery) ?? (previous?.type === "agent_message" ? previous.delivery : void 0) ? { delivery: "async" } : {}
       };
     case "reasoning": {
-      const text = readString(rec.text) || readTextParts(rec.summary).join("\n\n") || readTextParts(rec.content).join("\n\n") || (previous?.type === "reasoning" ? previous.text : "");
+      const text = readString2(rec.text) || readTextParts(rec.summary).join("\n\n") || readTextParts(rec.content).join("\n\n") || (previous?.type === "reasoning" ? previous.text : "");
       return buildCodexReasoningItem(id, text, previous, now);
     }
     case "command_execution":
     case "commandExecution": {
       const prev = previous?.type === "command_execution" ? previous : null;
       const actions = Array.isArray(rec.commandActions) ? rec.commandActions.map((entry) => {
-        const action = asRecord(entry);
+        const action = asRecord2(entry);
         if (!action) return null;
         return {
-          type: readString(action.type) ?? "unknown",
-          ...action.command != null ? { command: readString(action.command) ?? void 0 } : {},
-          ...action.name != null ? { name: readString(action.name) ?? void 0 } : {},
-          ...action.path != null ? { path: readString(action.path) ?? void 0 } : {},
-          ...action.query != null ? { query: readString(action.query) ?? void 0 } : {}
+          type: readString2(action.type) ?? "unknown",
+          ...action.command != null ? { command: readString2(action.command) ?? void 0 } : {},
+          ...action.name != null ? { name: readString2(action.name) ?? void 0 } : {},
+          ...action.path != null ? { path: readString2(action.path) ?? void 0 } : {},
+          ...action.query != null ? { query: readString2(action.query) ?? void 0 } : {}
         };
       }).filter((entry) => entry !== null) : void 0;
-      const exitCode = readNumber(rec.exitCode) ?? readNumber(rec.exit_code);
+      const exitCode = readNumber2(rec.exitCode) ?? readNumber2(rec.exit_code);
       return {
         id,
         type: "command_execution",
-        command: readString(rec.command) ?? prev?.command ?? "",
-        aggregatedOutput: readString(rec.aggregatedOutput) ?? readString(rec.aggregated_output) ?? prev?.aggregatedOutput ?? "",
+        command: readString2(rec.command) ?? prev?.command ?? "",
+        aggregatedOutput: readString2(rec.aggregatedOutput) ?? readString2(rec.aggregated_output) ?? prev?.aggregatedOutput ?? "",
         ...exitCode !== null ? { exitCode } : {},
         status: mapCommandExecutionStatus(rec.status ?? prev?.status),
         ...actions ? { commandActions: actions } : prev?.commandActions ? { commandActions: prev.commandActions } : {}
@@ -19206,10 +19493,10 @@ function mapCodexThreadItem(raw, previous, now = Date.now) {
     case "file_change":
     case "fileChange": {
       const changes = Array.isArray(rec.changes) ? rec.changes.map((entry) => {
-        const change = asRecord(entry);
-        const path = readString(change?.path);
+        const change = asRecord2(entry);
+        const path = readString2(change?.path);
         if (!path) return null;
-        const diff = readString(change?.diff);
+        const diff = readString2(change?.diff);
         return { path, kind: mapPatchChangeKind(change?.kind), ...diff !== null ? { diff } : {} };
       }).filter((entry) => entry !== null) : previous?.type === "file_change" ? previous.changes : [];
       return {
@@ -19222,19 +19509,19 @@ function mapCodexThreadItem(raw, previous, now = Date.now) {
     case "mcp_tool_call":
     case "mcpToolCall": {
       const prev = previous?.type === "mcp_tool_call" ? previous : null;
-      const result = asRecord(rec.result);
-      const error51 = asRecord(rec.error);
+      const result = asRecord2(rec.result);
+      const error51 = asRecord2(rec.error);
       return {
         id,
         type: "mcp_tool_call",
-        server: readString(rec.server) ?? prev?.server ?? "",
-        tool: readString(rec.tool) ?? prev?.tool ?? "",
+        server: readString2(rec.server) ?? prev?.server ?? "",
+        tool: readString2(rec.tool) ?? prev?.tool ?? "",
         arguments: rec.arguments ?? prev?.arguments ?? {},
         ...result ? { result: {
           content: Array.isArray(result.content) ? result.content : [],
           structuredContent: result.structuredContent ?? result.structured_content ?? null
         } } : prev?.result ? { result: prev.result } : {},
-        ...error51 ? { error: { message: readString(error51.message) ?? "Unknown MCP tool error" } } : prev?.error ? { error: prev.error } : {},
+        ...error51 ? { error: { message: readString2(error51.message) ?? "Unknown MCP tool error" } } : prev?.error ? { error: prev.error } : {},
         status: mapMcpToolCallStatus(rec.status ?? prev?.status)
       };
     }
@@ -19244,29 +19531,31 @@ function mapCodexThreadItem(raw, previous, now = Date.now) {
       return {
         id,
         type: "web_search",
-        query: readString(rec.query) ?? prev?.query ?? "",
+        query: readString2(rec.query) ?? prev?.query ?? "",
         status: mapMcpToolCallStatus(rec.status ?? prev?.status)
       };
     }
     case "image_generation":
     case "imageGeneration": {
       const prev = previous?.type === "image_generation" ? previous : null;
-      const revisedPrompt = readString(rec.revisedPrompt ?? rec.revised_prompt) ?? prev?.revisedPrompt;
-      const savedPath = readString(rec.savedPath ?? rec.saved_path) ?? prev?.savedPath;
+      const revisedPrompt = readString2(rec.revisedPrompt ?? rec.revised_prompt) ?? prev?.revisedPrompt;
+      const savedPath = readString2(rec.savedPath ?? rec.saved_path) ?? prev?.savedPath;
+      const failure = readCodexImageGenerationFailure(rec.failure) ?? prev?.failure;
       return {
         id,
         type: "image_generation",
-        status: readString(rec.status) ?? prev?.status ?? "in_progress",
+        status: readString2(rec.status) ?? prev?.status ?? "in_progress",
         ...revisedPrompt ? { revisedPrompt } : {},
         ...savedPath ? { savedPath } : {},
+        ...failure ? { failure } : {},
         ...prev?.generationMs !== void 0 ? { generationMs: prev.generationMs } : {}
       };
     }
     case "todo_list":
     case "todoList": {
       const items = Array.isArray(rec.items) ? rec.items.map((entry) => {
-        const todo = asRecord(entry);
-        const text = readString(todo?.text);
+        const todo = asRecord2(entry);
+        const text = readString2(todo?.text);
         return text ? { text, completed: readBoolean(todo?.completed) ?? false } : null;
       }).filter((entry) => entry !== null) : previous?.type === "todo_list" ? previous.items : [];
       return { id, type: "todo_list", items };
@@ -19275,16 +19564,16 @@ function mapCodexThreadItem(raw, previous, now = Date.now) {
       return {
         id,
         type: "error",
-        message: readString(rec.message) ?? (previous?.type === "error" ? previous.message : "Unknown error")
+        message: readString2(rec.message) ?? (previous?.type === "error" ? previous.message : "Unknown error")
       };
     case "plan": {
-      const text = readString(rec.text);
+      const text = readString2(rec.text);
       return text ? buildCodexReasoningItem(id, text, previous, now) : null;
     }
     case "enteredReviewMode":
-      return { id, type: "review", phase: "entered", text: readString(rec.text) ?? readString(rec.review) ?? "" };
+      return { id, type: "review", phase: "entered", text: readString2(rec.text) ?? readString2(rec.review) ?? "" };
     case "exitedReviewMode":
-      return { id: `${id}_exit`, type: "review", phase: "exited", text: readString(rec.text) ?? readString(rec.review) ?? "" };
+      return { id: `${id}_exit`, type: "review", phase: "exited", text: readString2(rec.text) ?? readString2(rec.review) ?? "" };
     case "contextCompaction":
       return { id, type: "compaction" };
     case "collabAgentToolCall":
@@ -19292,44 +19581,44 @@ function mapCodexThreadItem(raw, previous, now = Date.now) {
       const prev = previous?.type === "collab_tool_call" ? previous : null;
       const receiverThreadIds = uniqueStrings([
         ...readStringArray(rec.receiverThreadIds ?? rec.receiver_thread_ids),
-        readString(rec.receiverThreadId ?? rec.receiver_thread_id),
-        readString(rec.newThreadId ?? rec.new_thread_id)
+        readString2(rec.receiverThreadId ?? rec.receiver_thread_id),
+        readString2(rec.newThreadId ?? rec.new_thread_id)
       ]);
       const agentsStates = { ...prev?.agentsStates ?? {} };
-      const rawStates = asRecord(rec.agentsStates ?? rec.agents_states);
+      const rawStates = asRecord2(rec.agentsStates ?? rec.agents_states);
       if (rawStates) {
         for (const [agentId, value] of Object.entries(rawStates)) {
-          const state = asRecord(value);
+          const state = asRecord2(value);
           if (!state) continue;
           const prior = prev?.agentsStates?.[agentId];
           agentsStates[agentId] = {
             ...prior,
             status: normalizeCollabAgentStatus(state.status) ?? prior?.status ?? "running",
-            ...state.message != null ? { message: readString(state.message) ?? void 0 } : {}
+            ...state.message != null ? { message: readString2(state.message) ?? void 0 } : {}
           };
         }
       }
       const rawAgentStatus = rec.agentStatus ?? rec.agent_status;
-      const agentStatus = asRecord(rawAgentStatus);
+      const agentStatus = asRecord2(rawAgentStatus);
       if (!rawStates && rawAgentStatus != null) {
         for (const agentId of receiverThreadIds) {
           const prior = prev?.agentsStates?.[agentId];
           agentsStates[agentId] = {
             ...prior,
             status: normalizeCollabAgentStatus(agentStatus?.status ?? rawAgentStatus) ?? prior?.status ?? "running",
-            ...agentStatus?.message != null ? { message: readString(agentStatus.message) ?? void 0 } : {}
+            ...agentStatus?.message != null ? { message: readString2(agentStatus.message) ?? void 0 } : {}
           };
         }
       }
-      const rawStatus = readString(rec.status);
+      const rawStatus = readString2(rec.status);
       return {
         id,
         type: "collab_tool_call",
         tool: normalizeCollabTool(rec.tool) ?? prev?.tool ?? "spawnAgent",
         status: rawStatus === "completed" ? "completed" : rawStatus === "failed" ? "failed" : "in_progress",
-        ...readString(rec.senderThreadId) ?? readString(rec.sender_thread_id) ?? prev?.senderThreadId ? { senderThreadId: readString(rec.senderThreadId) ?? readString(rec.sender_thread_id) ?? prev?.senderThreadId } : {},
+        ...readString2(rec.senderThreadId) ?? readString2(rec.sender_thread_id) ?? prev?.senderThreadId ? { senderThreadId: readString2(rec.senderThreadId) ?? readString2(rec.sender_thread_id) ?? prev?.senderThreadId } : {},
         receiverThreadIds: receiverThreadIds.length > 0 ? receiverThreadIds : prev?.receiverThreadIds ?? [],
-        ...readString(rec.prompt) ?? prev?.prompt ? { prompt: readString(rec.prompt) ?? prev?.prompt } : {},
+        ...readString2(rec.prompt) ?? prev?.prompt ? { prompt: readString2(rec.prompt) ?? prev?.prompt } : {},
         agentsStates,
         ...prev?.childItems ? { childItems: prev.childItems } : {}
       };
@@ -19339,17 +19628,17 @@ function mapCodexThreadItem(raw, previous, now = Date.now) {
   }
 }
 function mapCodexUsage(raw) {
-  const rec = asRecord(raw);
+  const rec = asRecord2(raw);
   if (!rec) return null;
   const parse4 = (value) => {
-    const data = asRecord(value);
+    const data = asRecord2(value);
     if (!data) return null;
     return {
-      inputTokens: readNumber(data.inputTokens ?? data.input_tokens) ?? 0,
-      cachedInputTokens: readNumber(data.cachedInputTokens ?? data.cached_input_tokens) ?? 0,
-      cacheWriteInputTokens: readNumber(data.cacheWriteInputTokens ?? data.cache_write_input_tokens) ?? 0,
-      outputTokens: readNumber(data.outputTokens ?? data.output_tokens) ?? 0,
-      reasoningOutputTokens: readNumber(data.reasoningOutputTokens ?? data.reasoning_output_tokens) ?? 0
+      inputTokens: readNumber2(data.inputTokens ?? data.input_tokens) ?? 0,
+      cachedInputTokens: readNumber2(data.cachedInputTokens ?? data.cached_input_tokens) ?? 0,
+      cacheWriteInputTokens: readNumber2(data.cacheWriteInputTokens ?? data.cache_write_input_tokens) ?? 0,
+      outputTokens: readNumber2(data.outputTokens ?? data.output_tokens) ?? 0,
+      reasoningOutputTokens: readNumber2(data.reasoningOutputTokens ?? data.reasoning_output_tokens) ?? 0
     };
   };
   const last = parse4(rec.last);
@@ -19366,19 +19655,19 @@ function mapCodexUsage(raw) {
     lastCachedInputTokens: resolvedLast.cachedInputTokens,
     lastCacheWriteInputTokens: resolvedLast.cacheWriteInputTokens,
     lastOutputTokens: resolvedLast.outputTokens,
-    reasoningOutputTokens: resolvedTotal.reasoningOutputTokens || (readNumber(rec.reasoningOutputTokens ?? rec.reasoning_output_tokens) ?? 0),
-    contextWindow: readNumber(rec.modelContextWindow ?? rec.model_context_window ?? rec.contextWindow ?? rec.context_window) ?? 0
+    reasoningOutputTokens: resolvedTotal.reasoningOutputTokens || (readNumber2(rec.reasoningOutputTokens ?? rec.reasoning_output_tokens) ?? 0),
+    contextWindow: readNumber2(rec.modelContextWindow ?? rec.model_context_window ?? rec.contextWindow ?? rec.context_window) ?? 0
   };
 }
 function extractError(raw) {
-  const rec = asRecord(raw);
+  const rec = asRecord2(raw);
   if (!rec) return "Codex turn failed";
-  return readString(rec.message) ?? readString(asRecord(rec.error)?.message) ?? "Codex turn failed";
+  return readString2(rec.message) ?? readString2(asRecord2(rec.error)?.message) ?? "Codex turn failed";
 }
 function deriveCodexFinalResponse(items) {
   for (let index = items.length - 1; index >= 0; index--) {
     const item = items[index];
-    if (item?.type === "agent_message") return item.text;
+    if (item?.type === "agent_message" && item.delivery !== "async") return item.text;
   }
   return "";
 }
@@ -19412,13 +19701,13 @@ function createCodexAgentEventMapper(options) {
   };
   const finishStatus = () => options.emit({ type: "status_change", status: "idle" });
   const startCompaction = (params) => {
-    const turnId = readString(params.turnId) ?? readString(params.turn_id) ?? currentTurnId;
+    const turnId = readString2(params.turnId) ?? readString2(params.turn_id) ?? currentTurnId;
     if (turnId && completedCompactionTurns.has(turnId)) return;
     if (activeCompaction && (!activeCompaction.turnId || !turnId || activeCompaction.turnId === turnId)) {
       if (!activeCompaction.turnId && turnId) {
         activeCompaction = {
           turnId,
-          startedAt: readNumber(params.startedAtMs ?? params.started_at_ms) ?? activeCompaction.startedAt,
+          startedAt: readNumber2(params.startedAtMs ?? params.started_at_ms) ?? activeCompaction.startedAt,
           preTokens: currentUsage?.lastInputTokens ?? activeCompaction.preTokens
         };
       }
@@ -19426,18 +19715,18 @@ function createCodexAgentEventMapper(options) {
     }
     activeCompaction = {
       turnId,
-      startedAt: readNumber(params.startedAtMs ?? params.started_at_ms) ?? now(),
+      startedAt: readNumber2(params.startedAtMs ?? params.started_at_ms) ?? now(),
       preTokens: currentUsage?.lastInputTokens ?? 0
     };
     options.emit({ type: "status_indicator", indicator: "compacting" });
   };
   const completeCompaction = (params) => {
-    const turnId = readString(params.turnId) ?? readString(params.turn_id) ?? currentTurnId;
+    const turnId = readString2(params.turnId) ?? readString2(params.turn_id) ?? currentTurnId;
     if (turnId && completedCompactionTurns.has(turnId)) return;
     if (!activeCompaction) startCompaction(params);
     const current = activeCompaction;
     if (!current) return;
-    const completedAt = readNumber(params.completedAtMs ?? params.completed_at_ms) ?? now();
+    const completedAt = readNumber2(params.completedAtMs ?? params.completed_at_ms) ?? now();
     const postTokens = currentUsage?.lastInputTokens;
     options.emit({
       type: "compact_boundary",
@@ -19452,7 +19741,7 @@ function createCodexAgentEventMapper(options) {
     if (completedTurnId) completedCompactionTurns.add(completedTurnId);
     activeCompaction = null;
   };
-  const fail2 = (error51, interrupted = false) => {
+  const fail2 = (error51, interrupted = false, errorOverrides = {}) => {
     if (terminal) return;
     terminal = true;
     if (activeCompaction) {
@@ -19463,7 +19752,10 @@ function createCodexAgentEventMapper(options) {
       type: "message_error",
       messageId: options.messageId,
       error: error51,
-      errorInfo: buildAgentErrorInfo(error51, retriedErrors.length > 0 ? { retries: { attempts: retriedErrors.length } } : {})
+      errorInfo: buildAgentErrorInfo(error51, {
+        ...retriedErrors.length > 0 ? { retries: { attempts: retriedErrors.length } } : {},
+        ...errorOverrides
+      })
     });
     finishStatus();
   };
@@ -19493,7 +19785,7 @@ function createCodexAgentEventMapper(options) {
       const params = note.params;
       switch (note.method) {
         case "thread/started": {
-          const threadId = readString(asRecord(params.thread)?.id);
+          const threadId = readString2(asRecord2(params.thread)?.id);
           if (threadId && threadId !== currentThreadId) {
             currentThreadId = threadId;
             options.emit({ type: "codex_thread_started", messageId: options.messageId, threadId });
@@ -19502,14 +19794,14 @@ function createCodexAgentEventMapper(options) {
         }
         case "item/started":
         case "item/completed": {
-          const raw = asRecord(params.item);
+          const raw = asRecord2(params.item);
           if (!raw) break;
-          if (readString(raw.type) === "contextCompaction") {
+          if (readString2(raw.type) === "contextCompaction") {
             if (note.method === "item/started") startCompaction(params);
             else completeCompaction(params);
             break;
           }
-          const previous = readString(raw.id) ? itemMap.get(readString(raw.id)) : void 0;
+          const previous = readString2(raw.id) ? itemMap.get(readString2(raw.id)) : void 0;
           if (previous?.type === "plan" && note.method === "item/completed") {
             emitItem("completed", previous);
             break;
@@ -19527,14 +19819,26 @@ function createCodexAgentEventMapper(options) {
         case "item/agentMessage/delta":
         case "item/agentMessageDelta": {
           const delta = readCodexDeltaText(params);
-          result.textDelta = delta || null;
           const itemId = readCodexItemId(params);
           if (!itemId) break;
           const previous = itemMap.get(itemId);
+          if (previous?.type !== "agent_message" || previous.delivery !== "async") {
+            result.textDelta = delta || null;
+          }
           emitItem("updated", {
             id: itemId,
             type: "agent_message",
-            text: `${previous?.type === "agent_message" ? previous.text : ""}${delta}`
+            text: `${previous?.type === "agent_message" ? previous.text : ""}${delta}`,
+            ...previous?.type === "agent_message" && previous.delivery === "async" ? { delivery: "async" } : {}
+          });
+          break;
+        }
+        case "autoApprovalReview/strictReviewRequired": {
+          const turnId = readString2(params.turnId) ?? currentTurnId ?? "current";
+          emitItem("completed", {
+            id: `strict_review_${turnId}`,
+            type: "error",
+            message: "Codex requires strict safety review for this turn."
           });
           break;
         }
@@ -19588,12 +19892,12 @@ function createCodexAgentEventMapper(options) {
         case "turn/plan/updated": {
           const rawPlan = Array.isArray(params.plan) ? params.plan : [];
           const todoItems = rawPlan.map((entry) => {
-            const step = asRecord(entry);
-            const text = readString(step?.step);
-            return text ? { text, completed: readString(step?.status) === "completed" } : null;
+            const step = asRecord2(entry);
+            const text = readString2(step?.step);
+            return text ? { text, completed: readString2(step?.status) === "completed" } : null;
           }).filter((entry) => entry !== null);
           if (todoItems.length > 0) {
-            const turnId = readString(params.turnId) ?? readString(params.turn_id) ?? currentTurnId ?? "current";
+            const turnId = readString2(params.turnId) ?? readString2(params.turn_id) ?? currentTurnId ?? "current";
             emitItem("updated", { id: `todo_${turnId}`, type: "todo_list", items: todoItems });
           }
           break;
@@ -19617,11 +19921,11 @@ function createCodexAgentEventMapper(options) {
           break;
         }
         case "mcpServer/startupStatus/updated": {
-          const name = readString(params.name);
+          const name = readString2(params.name);
           if (!name) break;
-          const rawStatus = readString(params.status);
+          const rawStatus = readString2(params.status);
           const status = rawStatus === "ready" || rawStatus === "failed" || rawStatus === "cancelled" ? rawStatus : "starting";
-          const failureReason = readString(params.failureReason) === "reauthenticationRequired" ? "reauthenticationRequired" : void 0;
+          const failureReason = readString2(params.failureReason) === "reauthenticationRequired" ? "reauthenticationRequired" : void 0;
           mcpServers.set(name, { status, ...failureReason ? { failureReason } : {} });
           options.emit({
             type: "codex_mcp_startup",
@@ -19636,17 +19940,17 @@ function createCodexAgentEventMapper(options) {
             break;
           }
           result.error = extractError(params);
-          fail2(result.error);
+          fail2(result.error, false, readCodexErrorOverrides(params));
           break;
         }
         case "turn/completed":
         case "turn/completed/v2": {
-          const turn = asRecord(params.turn);
-          currentTurnId = readString(turn?.id) ?? currentTurnId;
-          const status = readString(turn?.status) ?? readString(params.status) ?? "completed";
+          const turn = asRecord2(params.turn);
+          currentTurnId = readString2(turn?.id) ?? currentTurnId;
+          const status = readString2(turn?.status) ?? readString2(params.status) ?? "completed";
           if (status === "failed" || status === "error") {
             result.error = extractError(turn?.error ?? params);
-            fail2(result.error);
+            fail2(result.error, false, readCodexErrorOverrides(turn?.error ?? params));
             break;
           }
           if (status === "interrupted" || status === "cancelled") {
@@ -19699,6 +20003,7 @@ var init_agent_event_mapper = __esm({
   "../../packages/codex/src/agent-event-mapper.ts"() {
     "use strict";
     init_agent_error();
+    init_protocol_v149();
   }
 });
 
@@ -19993,8 +20298,8 @@ async function ensureCodexThread(opts) {
       sandbox: "workspace-write",
       ...configPayload
     });
-    const thread = asRecord2(resumed.thread);
-    threadId = readString2(thread?.id) ?? readString2(resumed.id) ?? threadId;
+    const thread = asRecord3(resumed.thread);
+    threadId = readString3(thread?.id) ?? readString3(resumed.id) ?? threadId;
   } else {
     const started = await opts.client.request("thread/start", {
       cwd: opts.cwd,
@@ -20002,8 +20307,8 @@ async function ensureCodexThread(opts) {
       sandbox: "workspace-write",
       ...configPayload
     });
-    const thread = asRecord2(started.thread);
-    threadId = readString2(thread?.id) ?? readString2(started.id);
+    const thread = asRecord3(started.thread);
+    threadId = readString3(thread?.id) ?? readString3(started.id);
   }
   if (!threadId) {
     throw new Error("thread/start did not return a thread id");
@@ -20083,8 +20388,8 @@ async function runCodexAppServerTurn(opts) {
       sandboxPolicy: buildCodexWorkspaceWriteSandboxPolicy(opts.cwd, opts.additionalDirectories),
       ...collaborationMode ? { collaborationMode } : {}
     }));
-    const turn = asRecord2(turnStartResult.turn);
-    turnId = readString2(turn?.id);
+    const turn = asRecord3(turnStartResult.turn);
+    turnId = readString3(turn?.id);
   }
   let finalText = "";
   const deadline = Date.now() + TURN_WAIT_TIMEOUT_MS;
@@ -20110,8 +20415,8 @@ async function runCodexAppServerTurn(opts) {
       continue;
     }
     if (note.method === "turn/completed" || note.method === "turn/completed/v2") {
-      const completedTurn = asRecord2(note.params.turn);
-      const completedId = readString2(completedTurn?.id);
+      const completedTurn = asRecord3(note.params.turn);
+      const completedId = readString3(completedTurn?.id);
       if (turnId && completedId && completedId !== turnId) {
         continue;
       }
@@ -20126,8 +20431,8 @@ async function runCodexAppServerTurn(opts) {
       });
     }
     if (note.method === "turn/completed" || note.method === "turn/completed/v2") {
-      const completedTurn = asRecord2(note.params.turn);
-      const status = readString2(completedTurn?.status) ?? readString2(note.params.status);
+      const completedTurn = asRecord3(note.params.turn);
+      const status = readString3(completedTurn?.status) ?? readString3(note.params.status);
       if (status === "failed" || status === "error") {
         throw new Error("Codex turn failed");
       }
@@ -20180,10 +20485,10 @@ function extractAgentTextFromTurn(turn) {
   let text = "";
   const items = Array.isArray(turn.items) ? turn.items : [];
   for (const item of items) {
-    const rec = asRecord2(item);
+    const rec = asRecord3(item);
     if (!rec) continue;
-    if (readString2(rec.type) === "agentMessage" || readString2(rec.itemType) === "agentMessage") {
-      const t = readString2(rec.text);
+    if (readString3(rec.type) === "agentMessage" || readString3(rec.itemType) === "agentMessage") {
+      const t = readString3(rec.text);
       if (t) text += t;
     }
   }
@@ -20191,7 +20496,7 @@ function extractAgentTextFromTurn(turn) {
 }
 function applyAgentDelta(note, onDelta) {
   if (note.method === "item/agentMessage/delta" || note.method === "item/agentMessageDelta") {
-    const delta = readString2(note.params.delta) ?? readString2(note.params.text) ?? readString2(asRecord2(note.params.item)?.delta);
+    const delta = readString3(note.params.delta) ?? readString3(note.params.text) ?? readString3(asRecord3(note.params.item)?.delta);
     if (delta) onDelta(delta);
   }
 }
@@ -20207,10 +20512,10 @@ function defaultSpawn(command, args, options) {
     windowsHide: options.windowsHide
   });
 }
-function asRecord2(value) {
+function asRecord3(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : null;
 }
-function readString2(value) {
+function readString3(value) {
   return typeof value === "string" && value.length > 0 ? value : null;
 }
 var DEFAULT_REQUEST_TIMEOUT_MS, THREAD_TIMEOUT_MS, TURN_WAIT_TIMEOUT_MS, MAX_STDERR_CHARS;
@@ -20258,15 +20563,54 @@ function applySetAuth(current, request) {
   }
   return { mode, apiKey: normalizeApiKey(apiKey) };
 }
-function asRecord3(value) {
+function asRecord4(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : null;
 }
-function readString3(value) {
+function readString4(value) {
   return typeof value === "string" && value.length > 0 ? value : null;
 }
 function readBoolean2(value) {
   return typeof value === "boolean" ? value : null;
 }
+function parseAccountAuthMode(value) {
+  switch (value) {
+    case "apiKey":
+    case "chatgpt":
+    case "chatgptAuthTokens":
+    case "agentIdentity":
+    case "personalAccessToken":
+    case "amazonBedrock":
+    case "bedrockApiKey":
+      return value;
+    default:
+      return null;
+  }
+}
+function parseAccountStatus(raw) {
+  const account = asRecord4(raw.account);
+  return {
+    signedIn: account !== null,
+    authMode: parseAccountAuthMode(account?.type),
+    email: readString4(account?.email),
+    planType: readString4(account?.planType),
+    requiresOpenaiAuth: readBoolean2(raw.requiresOpenaiAuth) ?? false
+  };
+}
+function parseAccountLoginStart(raw) {
+  const loginId = readString4(raw.loginId);
+  const type = readString4(raw.type);
+  if (!loginId || type !== "chatgpt" && type !== "chatgptDeviceCode") {
+    throw new Error("Codex returned an invalid account login response");
+  }
+  const result = { type, loginId };
+  const authUrl = readString4(raw.authUrl);
+  const verificationUrl = readString4(raw.verificationUrl);
+  const userCode = readString4(raw.userCode);
+  if (authUrl) result.authUrl = authUrl;
+  if (verificationUrl) result.verificationUrl = verificationUrl;
+  if (userCode) result.userCode = userCode;
+  return result;
+}
 function readFiniteNumber(value) {
   return typeof value === "number" && Number.isFinite(value) ? value : null;
 }
@@ -20293,15 +20637,15 @@ function parseRateLimitWindow(raw) {
 function parseResetCredit(raw) {
   if (!raw || typeof raw !== "object") return null;
   const rec = raw;
-  const id = readString3(rec.id);
+  const id = readString4(rec.id);
   if (!id) return null;
-  const rawStatus = readString3(rec.status);
+  const rawStatus = readString4(rec.status);
   const status = rawStatus === "available" || rawStatus === "redeeming" || rawStatus === "redeemed" ? rawStatus : "unknown";
   return {
     id,
     status,
-    title: readString3(rec.title) ?? null,
-    description: readString3(rec.description) ?? null,
+    title: readString4(rec.title) ?? null,
+    description: readString4(rec.description) ?? null,
     expiresAt: readNumericLike(rec.expiresAt)
   };
 }
@@ -20318,32 +20662,62 @@ function parseRateLimits(raw) {
   return {
     primary,
     secondary,
-    planType: readString3(snapshot.planType),
+    planType: readString4(snapshot.planType),
     resetCredits,
     ...resetCreditList && resetCreditList.length > 0 ? { resetCreditList } : {}
   };
 }
 function parseAccountUsage(raw) {
   const summary = raw.summary && typeof raw.summary === "object" ? raw.summary : raw;
+  const threadUsage = parseThreadUsage(raw.threadUsage);
   const usage2 = {
     lifetimeTokens: readNumericLike(summary.lifetimeTokens),
     peakDailyTokens: readNumericLike(summary.peakDailyTokens),
     longestRunningTurnSec: readNumericLike(summary.longestRunningTurnSec),
     currentStreakDays: readNumericLike(summary.currentStreakDays),
-    longestStreakDays: readNumericLike(summary.longestStreakDays)
+    longestStreakDays: readNumericLike(summary.longestStreakDays),
+    ...threadUsage ? { threadUsage } : {}
   };
-  const hasAny = Object.values(usage2).some((v2) => v2 !== null);
+  const hasAny = Object.values(usage2).some((v2) => v2 !== null && v2 !== void 0);
   return hasAny ? usage2 : null;
 }
+function parseThreadUsage(raw) {
+  const rec = asRecord4(raw);
+  const threadId = readString4(rec?.threadId);
+  const credits = readNumericLike(rec?.estimatedUsageCreditsMicros);
+  if (!threadId || credits === null) return null;
+  const groups = Array.isArray(rec?.groups) ? rec.groups.flatMap((value) => {
+    const group = asRecord4(value);
+    const groupCredits = readNumericLike(group?.estimatedUsageCreditsMicros);
+    if (!group || groupCredits === null) return [];
+    return [{
+      model: readString4(group.model),
+      reasoningEffort: readString4(group.reasoningEffort),
+      speed: readString4(group.speed),
+      estimatedUsageCreditsMicros: groupCredits,
+      netNewInputTokens: readNumericLike(group.netNewInputTokens),
+      cachedInputTokens: readNumericLike(group.cachedInputTokens),
+      inputTokens: readNumericLike(group.inputTokens),
+      outputTokens: readNumericLike(group.outputTokens),
+      totalTokens: readNumericLike(group.totalTokens)
+    }];
+  }) : [];
+  return {
+    threadId,
+    estimatedUsageCreditsMicros: credits,
+    estimatedUsageUsdMicros: readNumericLike(rec?.estimatedUsageUsdMicros),
+    groups
+  };
+}
 function parseExternalAgentItem(raw) {
   if (!raw || typeof raw !== "object") return null;
   const rec = raw;
-  const itemType = readString3(rec.itemType);
+  const itemType = readString4(rec.itemType);
   if (!itemType) return null;
   return {
     itemType,
-    description: readString3(rec.description) ?? "",
-    cwd: readString3(rec.cwd) ?? null,
+    description: readString4(rec.description) ?? "",
+    cwd: readString4(rec.cwd) ?? null,
     ...rec.details !== void 0 ? { details: rec.details } : {}
   };
 }
@@ -20367,16 +20741,47 @@ async function readRateLimits(client3) {
     throw safePublicError("account/rateLimits/read failed", err);
   }
 }
-async function readAccountUsage(client3) {
+async function readAccountStatus(client3, refreshToken = false) {
+  try {
+    return parseAccountStatus(await client3.request("account/read", { refreshToken }));
+  } catch (err) {
+    throw safePublicError("account/read failed", err);
+  }
+}
+async function startAccountLogin(client3, type) {
+  try {
+    return parseAccountLoginStart(await client3.request(
+      "account/login/start",
+      type === "chatgpt" ? { type, useHostedLoginSuccessPage: true, appBrand: "chatgpt" } : { type }
+    ));
+  } catch (err) {
+    throw safePublicError("account/login/start failed", err);
+  }
+}
+async function cancelAccountLogin(client3, loginId) {
+  try {
+    await client3.request("account/login/cancel", { loginId });
+  } catch (err) {
+    throw safePublicError("account/login/cancel failed", err);
+  }
+}
+async function logoutAccount(client3) {
   try {
-    const result = await client3.request("account/usage/read");
+    await client3.request("account/logout");
+  } catch (err) {
+    throw safePublicError("account/logout failed", err);
+  }
+}
+async function readAccountUsage(client3, threadId) {
+  try {
+    const result = await client3.request("account/usage/read", threadId ? { threadId } : {});
     return parseAccountUsage(result);
   } catch (err) {
     throw safePublicError("account/usage/read failed", err);
   }
 }
 function parseResetOutcome(raw) {
-  switch (readString3(raw.outcome)) {
+  switch (readString4(raw.outcome)) {
     case "reset":
       return "reset";
     case "nothingToReset":
@@ -20400,20 +20805,27 @@ async function consumeRateLimitReset(client3, creditId) {
     throw safePublicError("account/rateLimitResetCredit/consume failed", err);
   }
 }
-async function loginMcpServerOauth(client3, serverName, openUrl, timeoutMs = 18e4) {
+async function loginMcpServerOauth(client3, serverName, openUrl, timeoutMs = 18e4, options) {
   try {
-    const res = await client3.request("mcpServer/oauth/login", { name: serverName });
-    const authorizationUrl = readString3(res.authorizationUrl);
+    const res = await client3.request("mcpServer/oauth/login", compactRecord2({
+      name: serverName,
+      clientRegistration: options?.clientRegistration,
+      threadId: options?.threadId,
+      scopes: options?.scopes,
+      timeoutSecs: options?.timeoutSecs
+    }));
+    const authorizationUrl = readString4(res.authorizationUrl);
     if (!authorizationUrl) return { success: false, error: "Codex returned no authorization URL" };
     openUrl?.(authorizationUrl);
-    const deadline = Date.now() + timeoutMs;
+    const effectiveTimeoutMs = typeof options?.timeoutSecs === "number" && options.timeoutSecs > 0 ? options.timeoutSecs * 1e3 : timeoutMs;
+    const deadline = Date.now() + effectiveTimeoutMs;
     while (Date.now() < deadline) {
       const notif = await client3.nextNotification(Math.min(1e3, deadline - Date.now()));
       if (!notif) continue;
-      if (notif.method === "mcpServer/oauthLogin/completed" && readString3(notif.params.name) === serverName) {
+      if (notif.method === "mcpServer/oauthLogin/completed" && readString4(notif.params.name) === serverName && (!options?.threadId || readString4(notif.params.threadId) === options.threadId)) {
         return {
           success: readBoolean2(notif.params.success) ?? false,
-          error: readString3(notif.params.error) ?? void 0,
+          error: readString4(notif.params.error) ?? void 0,
           authorizationUrl
         };
       }
@@ -20449,12 +20861,12 @@ async function importExternalAgentConfig(client3, items, timeoutMs = 12e4) {
       migrationItems: items,
       source: "superone"
     });
-    const importId = readString3(res.importId);
+    const importId = readString4(res.importId);
     const deadline = Date.now() + timeoutMs;
     while (Date.now() < deadline) {
       const notif = await client3.nextNotification(Math.min(1e3, deadline - Date.now()));
       if (!notif) continue;
-      if (notif.method === "externalAgentConfig/import/completed" && (!importId || readString3(notif.params.importId) === importId)) {
+      if (notif.method === "externalAgentConfig/import/completed" && (!importId || readString4(notif.params.importId) === importId)) {
         return summarizeImportResults(notif.params.itemTypeResults);
       }
     }
@@ -20471,19 +20883,19 @@ async function listPluginInventory(client3, projectPath) {
   const marketplaces = Array.isArray(result.marketplaces) ? result.marketplaces : [];
   const records = [];
   for (const rawMarketplace of marketplaces) {
-    const marketplace = asRecord3(rawMarketplace);
+    const marketplace = asRecord4(rawMarketplace);
     if (!marketplace) continue;
-    const marketplaceName = readString3(marketplace.name);
-    const marketplacePath = readString3(marketplace.path);
+    const marketplaceName = readString4(marketplace.name);
+    const marketplacePath = readString4(marketplace.path);
     if (!marketplaceName || !marketplacePath) continue;
     const plugins = Array.isArray(marketplace.plugins) ? marketplace.plugins : [];
     for (const rawPlugin of plugins) {
-      const plugin = asRecord3(rawPlugin);
+      const plugin = asRecord4(rawPlugin);
       if (!plugin) continue;
-      const key = readString3(plugin.id);
-      const name = readString3(plugin.name);
-      const source = asRecord3(plugin.source);
-      const sourcePath = readString3(source?.path) ?? void 0;
+      const key = readString4(plugin.id);
+      const name = readString4(plugin.name);
+      const source = asRecord4(plugin.source);
+      const sourcePath = readString4(source?.path) ?? void 0;
       if (!key || !name) continue;
       records.push({
         key,
@@ -20513,8 +20925,8 @@ async function marketplaceAdd(client3, request) {
     sparsePaths: request.sparsePaths && request.sparsePaths.length > 0 ? request.sparsePaths : void 0
   }));
   return {
-    marketplaceName: readString3(result.marketplaceName) ?? "",
-    installedRoot: readString3(result.installedRoot) ?? "",
+    marketplaceName: readString4(result.marketplaceName) ?? "",
+    installedRoot: readString4(result.installedRoot) ?? "",
     alreadyAdded: readBoolean2(result.alreadyAdded) ?? false
   };
 }
@@ -20530,10 +20942,10 @@ async function marketplaceUpgrade(client3, marketplaceName) {
     name ? { marketplaceName: name } : {}
   );
   const errors = Array.isArray(result.errors) ? result.errors.map((raw) => {
-    const rec = asRecord3(raw);
+    const rec = asRecord4(raw);
     if (!rec) return null;
-    const marketplaceName2 = readString3(rec.marketplaceName) ?? readString3(rec.name);
-    const message = readString3(rec.message) ?? readString3(rec.error);
+    const marketplaceName2 = readString4(rec.marketplaceName) ?? readString4(rec.name);
+    const message = readString4(rec.message) ?? readString4(rec.error);
     if (!marketplaceName2 || !message) return null;
     return { marketplaceName: marketplaceName2, message };
   }).filter((e) => e !== null) : [];
@@ -20593,6 +21005,7 @@ var init_src = __esm({
     init_codex_admin();
     init_fork_thread();
     init_agent_event_mapper();
+    init_protocol_v149();
   }
 });
 
@@ -20618,7 +21031,7 @@ function isStaticHostOwnedSuperoneToolQualified(qualifiedName) {
   const bare = qualifiedName.slice(MCP_SUPERONE_TOOL_PREFIX.length);
   return isStaticHostOwnedSuperoneBareName(bare);
 }
-var MCP_SUPERONE_TOOL_PREFIX, BROWSER_PRIMITIVE_TOOL_NAMES, BROWSER_ACTION_TOOL_NAMES, BROWSER_LEGACY_TOOL_NAMES, BROWSER_COMPACT_TOOL_NAMES, BROWSER_TOOL_NAMES, BUILT_IN_SUPERONE_TOOL_NAMES, MOBILE_SHARE_FILE_TOOL_NAME, MINIAPP_LIST_BARE_NAME, MINIAPP_CALL_BARE_NAME, STATIC_HOST_OWNED_SUPERONE_QUALIFIED_TOOL_NAMES;
+var MCP_SUPERONE_TOOL_PREFIX, BROWSER_PRIMITIVE_TOOL_NAMES, BROWSER_ACTION_TOOL_NAMES, BROWSER_LEGACY_TOOL_NAMES, BROWSER_COMPACT_TOOL_NAMES, BROWSER_TOOL_NAMES, DEVICE_AGENT_TOOL_NAMES, BUILT_IN_SUPERONE_TOOL_NAMES, MOBILE_SHARE_FILE_TOOL_NAME, MINIAPP_LIST_BARE_NAME, MINIAPP_CALL_BARE_NAME, STATIC_HOST_OWNED_SUPERONE_QUALIFIED_TOOL_NAMES;
 var init_superone_host_owned_tools = __esm({
   "../../packages/shared/src/superone-host-owned-tools.ts"() {
     "use strict";
@@ -20679,6 +21092,14 @@ var init_superone_host_owned_tools = __esm({
         (name) => !BROWSER_LEGACY_TOOL_NAMES.includes(name)
       )
     ];
+    DEVICE_AGENT_TOOL_NAMES = [
+      "device_list",
+      "device_request_control",
+      "device_snapshot",
+      "device_query",
+      "device_act",
+      "device_wait_for"
+    ];
     BUILT_IN_SUPERONE_TOOL_NAMES = [
       "read_manual",
       "miniapp_dev_setup",
@@ -20709,7 +21130,8 @@ var init_superone_host_owned_tools = __esm({
       "automation_list",
       "automation_apply",
       "automation_delete",
-      ...BROWSER_TOOL_NAMES
+      ...BROWSER_TOOL_NAMES,
+      ...DEVICE_AGENT_TOOL_NAMES
     ];
     MOBILE_SHARE_FILE_TOOL_NAME = "mobile_share_file";
     MINIAPP_LIST_BARE_NAME = "miniapp_list";
@@ -20724,7 +21146,7 @@ var init_superone_host_owned_tools = __esm({
 });
 
 // ../../packages/claude/src/map-sdk-message.ts
-function asRecord4(value) {
+function asRecord5(value) {
   if (value && typeof value === "object" && !Array.isArray(value)) {
     return value;
   }
@@ -20766,11 +21188,11 @@ function applySdkMessage(message, state, emit) {
   const sessionId = sessionIdOf(record2);
   const parentToolUseId = typeof record2.parent_tool_use_id === "string" ? record2.parent_tool_use_id : null;
   if (record2.type === "stream_event") {
-    const event = asRecord4(record2.event);
+    const event = asRecord5(record2.event);
     if (!event) return emptyApply(sessionId);
     const index = typeof event.index === "number" ? event.index : null;
     if (event.type === "content_block_start") {
-      const block = asRecord4(event.content_block);
+      const block = asRecord5(event.content_block);
       if (!block) return emptyApply(sessionId);
       if (block.type === "text" && index != null) {
         state.indexToKind.set(index, "text");
@@ -20802,7 +21224,7 @@ function applySdkMessage(message, state, emit) {
       return emptyApply(sessionId);
     }
     if (event.type === "content_block_delta") {
-      const delta = asRecord4(event.delta);
+      const delta = asRecord5(event.delta);
       if (!delta) return emptyApply(sessionId);
       if (delta.type === "text_delta" && typeof delta.text === "string" && delta.text.length > 0) {
         return {
@@ -20836,10 +21258,10 @@ function applySdkMessage(message, state, emit) {
     return emptyApply(sessionId);
   }
   if (record2.type === "assistant") {
-    const messageBody = asRecord4(record2.message);
+    const messageBody = asRecord5(record2.message);
     const content = messageBody && Array.isArray(messageBody.content) ? messageBody.content : [];
     for (const raw of content) {
-      const block = asRecord4(raw);
+      const block = asRecord5(raw);
       if (!block || block.type !== "tool_use") continue;
       const toolUseId = typeof block.id === "string" && block.id.length > 0 ? block.id : null;
       const toolName = typeof block.name === "string" && block.name.length > 0 ? block.name : "unknown";
@@ -20866,10 +21288,10 @@ function applySdkMessage(message, state, emit) {
     return emptyApply(sessionId);
   }
   if (record2.type === "user") {
-    const messageBody = asRecord4(record2.message);
+    const messageBody = asRecord5(record2.message);
     const content = messageBody && Array.isArray(messageBody.content) ? messageBody.content : [];
     for (const raw of content) {
-      const block = asRecord4(raw);
+      const block = asRecord5(raw);
       if (!block || block.type !== "tool_result") continue;
       const toolUseId = typeof block.tool_use_id === "string" ? block.tool_use_id : typeof block.toolUseId === "string" ? block.toolUseId : null;
       if (!toolUseId) continue;
@@ -21182,6 +21604,7 @@ function createClaudeAgentEventMapper(options) {
             outputStyle: system.output_style,
             availableOutputStyles: system.available_output_styles,
             plugins: system.plugins,
+            ...system.effort !== void 0 ? { appliedEffort: system.effort } : {},
             fastModeState: system.fast_mode_state,
             fastModeDisabledReason: system.fast_mode_disabled_reason
           }
@@ -21716,6 +22139,94 @@ var init_root_permission_guard = __esm({
   }
 });
 
+// ../../packages/shared/src/ask-user-question.ts
+function asQuestionPreviewFormat(value) {
+  const v2 = value?.trim();
+  return v2 === "markdown" || v2 === "html" ? v2 : void 0;
+}
+function buildAnsweredQuestionInput(params) {
+  const { questions, answers, previewFormat } = params;
+  const annotations = { ...params.annotations };
+  for (const q of questions) {
+    const answer = answers[q.question];
+    if (!answer) continue;
+    const lastLabel = q.multiSelect ? answer.split(", ").pop() : answer;
+    const selected = q.options?.find((o) => o.label === lastLabel);
+    if (selected?.preview) {
+      annotations[q.question] = { ...annotations[q.question], preview: selected.preview };
+    }
+  }
+  return {
+    questions,
+    answers,
+    ...Object.keys(annotations).length > 0 && { annotations },
+    ...previewFormat ? { previewFormat } : {}
+  };
+}
+function answeredQuestionDelta(messageId, toolUseId, input) {
+  return {
+    type: "content_delta",
+    messageId,
+    delta: {
+      type: "tool_use",
+      toolName: "AskUserQuestion",
+      toolUseId,
+      input: JSON.stringify(input)
+    }
+  };
+}
+var init_ask_user_question = __esm({
+  "../../packages/shared/src/ask-user-question.ts"() {
+    "use strict";
+  }
+});
+
+// ../../packages/claude/src/ask-user-question-bridge.ts
+function asRecord6(value) {
+  return value && typeof value === "object" && !Array.isArray(value) ? value : null;
+}
+async function resolveAskUserQuestion(params) {
+  const { onQuestion, interactionId, toolName, toolUseId, input } = params;
+  if (!onQuestion) {
+    return { behavior: "deny", message: "Question denied by SuperOne node (no question handler)" };
+  }
+  const previewFormat = asQuestionPreviewFormat(params.previewFormat);
+  const rawInput = asRecord6(input);
+  const baseInput = rawInput ? { ...rawInput, ...previewFormat ? { previewFormat } : {} } : null;
+  const answer = await onQuestion({
+    interactionId,
+    kind: "question",
+    toolName,
+    toolUseId,
+    input: baseInput ?? void 0
+  });
+  const record2 = asRecord6(answer);
+  const answers = record2 && "answers" in record2 ? record2.answers : answer;
+  const answerMap = asRecord6(answers);
+  const updatedInput = {
+    ...baseInput,
+    ...buildAnsweredQuestionInput({
+      questions: Array.isArray(baseInput?.questions) ? baseInput.questions : [],
+      answers: answerMap ?? {},
+      annotations: record2?.annotations,
+      previewFormat
+    }),
+    // Preserve the host's answer shape verbatim — it is not always a record.
+    answers
+  };
+  const messageId = params.getMessageId?.();
+  if (messageId && toolUseId && params.emitAgentEvent) {
+    params.emitAgentEvent(answeredQuestionDelta(messageId, toolUseId, updatedInput));
+  }
+  return { behavior: "allow", updatedInput };
+}
+var init_ask_user_question_bridge = __esm({
+  "../../packages/claude/src/ask-user-question-bridge.ts"() {
+    "use strict";
+    init_ask_user_question();
+  }
+});
+
 // ../../packages/claude/src/run-sdk-turn.ts
 import { query as sdkQuery } from "@anthropic-ai/claude-agent-sdk";
 var init_run_sdk_turn = __esm({
@@ -21727,6 +22238,8 @@ var init_run_sdk_turn = __esm({
     init_agent_event_mapper2();
     init_resolve_sdk_binary();
     init_root_permission_guard();
+    init_ask_user_question_bridge();
+    init_ask_user_question();
   }
 });
 
@@ -21800,7 +22313,7 @@ var init_message_bridge = __esm({
 import { existsSync as existsSync18 } from "node:fs";
 import { randomUUID as randomUUID2 } from "node:crypto";
 import { query as sdkQuery2 } from "@anthropic-ai/claude-agent-sdk";
-function buildLiveOptions(opts, onPermission, onQuestion, onPlan, signal, timing) {
+function buildLiveOptions(opts, onPermission, onQuestion, onPlan, signal, timing, turn) {
   const abortController = new AbortController();
   if (signal.aborted) abortController.abort();
   else signal.addEventListener("abort", () => abortController.abort(), { once: true });
@@ -21813,26 +22326,16 @@ function buildLiveOptions(opts, onPermission, onQuestion, onPlan, signal, timing
     }
     const interactionId = typeof toolOpts.requestId === "string" && toolOpts.requestId || typeof toolOpts.toolUseID === "string" && toolOpts.toolUseID || `interaction_${Date.now()}`;
     if (toolName === "AskUserQuestion") {
-      if (!onQuestion) {
-        return { behavior: "deny", message: "Question denied by SuperOne node (no question handler)" };
-      }
-      const answer = await onQuestion({
+      return resolveAskUserQuestion({
+        onQuestion,
         interactionId,
-        kind: "question",
         toolName,
         toolUseId: typeof toolOpts.toolUseID === "string" ? toolOpts.toolUseID : void 0,
-        input: input && typeof input === "object" ? input : void 0
+        input,
+        previewFormat: opts.askUserQuestionPreviewFormat,
+        emitAgentEvent: turn.emitAgentEvent,
+        getMessageId: turn.getMessageId
       });
-      const record2 = answer && typeof answer === "object" ? answer : null;
-      const answers = record2 && "answers" in record2 ? record2.answers : answer;
-      return {
-        behavior: "allow",
-        updatedInput: {
-          ...input && typeof input === "object" ? input : {},
-          answers,
-          ...record2 && record2.annotations !== void 0 ? { annotations: record2.annotations } : {}
-        }
-      };
     }
     if (toolName === "ExitPlanMode") {
       if (!onPlan) {
@@ -21900,6 +22403,7 @@ function buildLiveOptions(opts, onPermission, onQuestion, onPlan, signal, timing
     ...sandbox ? { sandbox } : {},
     ...opts.additionalDirectories && opts.additionalDirectories.length > 0 ? { additionalDirectories: opts.additionalDirectories } : {},
     ...opts.enabledSkills && opts.enabledSkills.length > 0 ? { skills: opts.enabledSkills } : {},
+    ...asQuestionPreviewFormat(opts.askUserQuestionPreviewFormat) ? { toolConfig: { askUserQuestion: { previewFormat: asQuestionPreviewFormat(opts.askUserQuestionPreviewFormat) } } } : {},
     systemPrompt: {
       type: "preset",
       preset: "claude_code",
@@ -21936,6 +22440,8 @@ var init_claude_live_session = __esm({
     init_map_sdk_message();
     init_resolve_sdk_binary();
     init_root_permission_guard();
+    init_ask_user_question_bridge();
+    init_ask_user_question();
     init_superone_system_prompt();
     init_superone_host_owned_tools();
     ClaudeLiveSession = class _ClaudeLiveSession {
@@ -21959,7 +22465,11 @@ var init_claude_live_session = __esm({
             return this.planHandler(req);
           },
           this.processAbort.signal,
-          this.timing
+          this.timing,
+          {
+            emitAgentEvent: (e) => this.active?.input.onAgentEvent?.(e),
+            getMessageId: () => this.active?.messageId
+          }
         );
         const q = queryFn({ prompt: this.bridge, options });
         this.iterationDone = this.iterate(q);
@@ -22481,7 +22991,7 @@ var init_content_delta = __esm({
 });
 
 // ../../packages/shared/src/node-session-event-map.ts
-function asRecord5(value) {
+function asRecord7(value) {
   if (value && typeof value === "object" && !Array.isArray(value)) {
     return value;
   }
@@ -22513,7 +23023,7 @@ function stamp(event, ctx, sequence) {
 }
 function mapQuestionRequest(payload, fallbackId) {
   const interactionId = asString2(payload.interactionId) ?? asString2(payload.requestId) ?? fallbackId;
-  const input = asRecord5(payload.input);
+  const input = asRecord7(payload.input);
   const rawQuestions = Array.isArray(payload.questions) ? payload.questions : Array.isArray(input.questions) ? input.questions : [];
   const questions = [];
   for (const q of rawQuestions) {
@@ -22552,7 +23062,7 @@ function mapQuestionRequest(payload, fallbackId) {
 }
 function mapPlanRequest(payload, fallbackId) {
   const interactionId = asString2(payload.interactionId) ?? asString2(payload.requestId) ?? fallbackId;
-  const input = asRecord5(payload.input);
+  const input = asRecord7(payload.input);
   let planContent = asString2(payload.plan) ?? asString2(payload.planContent) ?? asString2(input.plan) ?? asString2(input.planContent) ?? "";
   if (!planContent && input.plan && typeof input.plan === "object") {
     try {
@@ -22618,7 +23128,7 @@ function createNodeSessionEventMapper(ctx) {
     if (envelope.aggregateType && envelope.aggregateType !== "session") return [];
     if (envelope.aggregateId && envelope.aggregateId !== ctx.sessionId) return [];
     const eventType = envelope.eventType;
-    const payload = asRecord5(envelope.payload);
+    const payload = asRecord7(envelope.payload);
     const out = [];
     const push = (event) => {
       out.push(stamp(event, ctx, envelope.sequence));
@@ -22644,7 +23154,7 @@ function createNodeSessionEventMapper(ctx) {
         break;
       }
       case SESSION_DURABLE_EVENT.agentEvent: {
-        const rawEvent = asRecord5(payload.event);
+        const rawEvent = asRecord7(payload.event);
         const type = asString2(rawEvent.type);
         if (!type) break;
         const eventRecord = { ...rawEvent };
@@ -22654,7 +23164,7 @@ function createNodeSessionEventMapper(ctx) {
         delete eventRecord.seq;
         delete eventRecord.epoch;
         const event = eventRecord;
-        const rawMessageId = type === "message_start" ? asString2(asRecord5(eventRecord.message).id) : asString2(eventRecord.messageId);
+        const rawMessageId = type === "message_start" ? asString2(asRecord7(eventRecord.message).id) : asString2(eventRecord.messageId);
         if (type === "message_start" && rawMessageId) {
           startedAssistantIds.add(rawMessageId);
           lastAssistantId = rawMessageId;
@@ -22832,7 +23342,7 @@ function createNodeSessionEventMapper(ctx) {
           requestId: interactionId,
           toolName,
           toolUseId: asString2(payload.toolUseId),
-          input: asRecord5(payload.input),
+          input: asRecord7(payload.input),
           allowAlwaysAllow: requestKind === "session_agents_confirm" ? false : payload.allowAlwaysAllow !== false,
           ...requestKind ? {
             requestKind
@@ -22937,7 +23447,7 @@ var init_node_session_event_map = __esm({
 });
 
 // ../../packages/runtime/src/session/message-catalog.ts
-function asRecord6(value) {
+function asRecord8(value) {
   if (value && typeof value === "object" && !Array.isArray(value)) {
     return value;
   }
@@ -23020,7 +23530,7 @@ function collectToolsByAssistantId(events, sessionId) {
   for (const ev of events) {
     if (ev.aggregateType && ev.aggregateType !== "session") continue;
     if (ev.aggregateId && ev.aggregateId !== sessionId) continue;
-    const payload = asRecord6(ev.payload);
+    const payload = asRecord8(ev.payload);
     switch (ev.eventType) {
       case SESSION_DURABLE_EVENT.turnStarted: {
         turnKey += 1;
@@ -23046,10 +23556,10 @@ function collectToolsByAssistantId(events, sessionId) {
         break;
       }
       case SESSION_DURABLE_EVENT.agentEvent: {
-        const raw = asRecord6(payload.event);
+        const raw = asRecord8(payload.event);
         const type = asString3(raw.type);
         if (type === "message_start") {
-          const id = asString3(asRecord6(raw.message).id);
+          const id = asString3(asRecord8(raw.message).id);
           if (id) bindAssistant(id);
         } else if (type === "message_complete") {
           const id = asString3(raw.messageId);
@@ -23057,7 +23567,7 @@ function collectToolsByAssistantId(events, sessionId) {
         } else if (type === "content_delta") {
           const messageId = asString3(raw.messageId);
           if (messageId) bindAssistant(messageId);
-          const delta = asRecord6(raw.delta);
+          const delta = asRecord8(raw.delta);
           const dType = asString3(delta.type);
           if (dType === "tool_use") {
             const toolUseId = asString3(delta.toolUseId);
@@ -23200,7 +23710,7 @@ function collectContentByAssistantId(events, sessionId) {
         if (changed) contentById.set(ev.messageId, next);
       }
     }
-    const payload = asRecord6(envelope.payload);
+    const payload = asRecord8(envelope.payload);
     if (envelope.eventType === SESSION_DURABLE_EVENT.assistantMessage) {
       const blockId = asString3(payload.blockId);
       const sticky = stickyBefore ?? mapper.currentAssistantMessageId();
@@ -23224,7 +23734,7 @@ function extractCheckpointMeta(events, sessionId, blockId) {
     const ev = events[i];
     if (ev.aggregateType && ev.aggregateType !== "session") continue;
     if (ev.aggregateId && ev.aggregateId !== sessionId) continue;
-    const payload = asRecord6(ev.payload);
+    const payload = asRecord8(ev.payload);
     if (ev.eventType === SESSION_DURABLE_EVENT.assistantMessage) {
       if (asString3(payload.blockId) !== blockId) continue;
       const checkpointId = asString3(payload.checkpointId);
@@ -23239,7 +23749,7 @@ function extractCheckpointMeta(events, sessionId, blockId) {
       }
     }
     if (ev.eventType === SESSION_DURABLE_EVENT.agentEvent) {
-      const raw = asRecord6(payload.event);
+      const raw = asRecord8(payload.event);
       if (asString3(raw.type) !== "message_complete" && asString3(raw.type) !== "checkpoint_captured") {
         continue;
       }
@@ -24623,10 +25133,7 @@ var init_session_runtime = __esm({
           if (typeof stored === "string" && stored.trim()) return stored.trim();
           return stored ?? void 0;
         };
-        let turnKind = input.turnKind ?? null;
-        if (!turnKind && session.status === "streaming" && (session.harnessId || "claude") === "codex") {
-          turnKind = "steer";
-        }
+        const turnKind = input.turnKind ?? null;
         const turnOpts = {
           text: input.text,
           requestId: input.requestId,
@@ -24646,11 +25153,8 @@ var init_session_runtime = __esm({
         this.appendUserMessage(session, turnOpts);
         if (session.status === "streaming") {
           const harnessId = session.harnessId || "claude";
-          const liveInject = harnessId === "claude" || harnessId === "codex" && (turnOpts.turnKind === "steer" || turnOpts.turnKind === "run");
+          const liveInject = harnessId === "claude" || harnessId === "codex" && turnOpts.turnKind === "steer";
           if (liveInject) {
-            if (harnessId === "codex" && turnOpts.turnKind === "run") {
-              turnOpts.turnKind = "steer";
-            }
             this.beginTurn(session, turnOpts);
             return this.clone(session);
           }
@@ -31046,6 +31550,7 @@ function createNodeClaudeTurnRunner(opts) {
         permissionMode: permissions.permissionMode,
         uid,
         sandboxMode: input.sandboxMode && input.sandboxMode.trim() ? input.sandboxMode.trim() : void 0,
+        askUserQuestionPreviewFormat: opts.askUserQuestionPreviewFormat?.(),
         additionalDirectories: input.additionalDirectories?.filter(Boolean),
         enabledSkills: resolveEnabledSkills(cwd, input.enabledSkills, input.disabledSkills),
         env: authEnv,
@@ -50062,6 +50567,79 @@ var init_slash_filter = __esm({
   }
 });
 
+// ../../packages/shared/src/partial-json.ts
+function extractJsonStringValue(json4, key, opts) {
+  const re = new RegExp(`"${key}":\\s*"`);
+  const match = re.exec(json4);
+  if (!match) return void 0;
+  let i = match.index + match[0].length;
+  const start = i;
+  while (i < json4.length) {
+    const c = json4.charCodeAt(i);
+    if (c === 92 || c === 34) break;
+    i++;
+  }
+  if (i >= json4.length) return opts?.requireClosed ? void 0 : json4.slice(start);
+  if (json4.charCodeAt(i) === 34) return json4.slice(start, i);
+  const parts = [json4.slice(start, i)];
+  while (i < json4.length) {
+    const ch = json4[i];
+    if (ch === '"') {
+      return parts.join("");
+    }
+    if (ch === "\\") {
+      if (i + 1 >= json4.length) {
+        parts.push(ch);
+        i++;
+        break;
+      }
+      const next = json4[i + 1];
+      if (next === '"') {
+        parts.push('"');
+        i += 2;
+      } else if (next === "\\") {
+        parts.push("\\");
+        i += 2;
+      } else if (next === "n") {
+        parts.push("\n");
+        i += 2;
+      } else if (next === "r") {
+        parts.push("\r");
+        i += 2;
+      } else if (next === "t") {
+        parts.push("	");
+        i += 2;
+      } else if (next === "/") {
+        parts.push("/");
+        i += 2;
+      } else if (next === "u" && i + 5 < json4.length) {
+        const hex3 = json4.slice(i + 2, i + 6);
+        if (/^[0-9a-fA-F]{4}$/.test(hex3)) {
+          parts.push(String.fromCharCode(parseInt(hex3, 16)));
+          i += 6;
+        } else {
+          parts.push(ch);
+          i++;
+        }
+      } else {
+        parts.push(ch);
+        i++;
+      }
+    } else {
+      const runStart = i;
+      i++;
+      while (i < json4.length && json4[i] !== "\\" && json4[i] !== '"') i++;
+      parts.push(json4.slice(runStart, i));
+    }
+  }
+  return opts?.requireClosed ? void 0 : parts.join("");
+}
+var init_partial_json = __esm({
+  "../../packages/shared/src/partial-json.ts"() {
+    "use strict";
+  }
+});
+
 // ../../packages/shared/src/tool-ui.ts
 function normalizeToolIdKey(id) {
   return id.trim().toLowerCase().replace(/[\s-]+/g, "_");
@@ -50084,6 +50662,23 @@ function uiToolNameFromId(id) {
   const key = normalizeToolIdKey(id);
   return TOOL_ID_TO_UI_NAME[key] ?? null;
 }
+function isAlwaysHiddenToolName(toolName) {
+  const ui = uiToolNameFromId(toolName) ?? toolName;
+  if (HIDDEN_UI_TOOL_NAMES.has(ui)) return true;
+  const harnessKey = ui.trim().toLowerCase().replace(/[^a-z0-9]/g, "");
+  if (HIDDEN_HARNESS_TOOL_KEYS.has(harnessKey)) return true;
+  const mcp = ui.match(/^mcp__(.+?)__(.+)$/) ?? toolName.match(/^mcp__(.+?)__(.+)$/);
+  return mcp?.[1] === "superone" && HIDDEN_SUPERONE_MCP_TOOLS.has(mcp[2]);
+}
+function resolveGrokStreamingToolName(wireName, argumentsJson) {
+  if (!wireName) return null;
+  const ui = uiToolNameFromId(wireName) ?? wireName;
+  if (ui === "UseTool" && argumentsJson) {
+    const id = extractJsonStringValue(argumentsJson, "tool_name", { requireClosed: true });
+    if (id && id.includes("__")) return `mcp__${id}`;
+  }
+  return ui;
+}
 function normalizeTranscriptTool(rawName, rawInput) {
   const envelopeId = typeof rawInput.tool_name === "string" ? rawInput.tool_name : "";
   const isUseTool = normalizeToolIdKey(rawName) === "use_tool" || rawInput.variant === "UseTool";
@@ -50393,10 +50988,11 @@ function formatTranscriptToolResult(content, opts) {
   const max = opts?.maxChars ?? MAX_TRANSCRIPT_TOOL_RESULT_CHARS;
   return truncateTranscriptToolResult(formatted, max);
 }
-var TOOL_ID_TO_UI_NAME, GENERIC_SUBAGENT_TYPES, DESCRIPTION_PERSONA_RE, MAX_TRANSCRIPT_TOOL_RESULT_CHARS;
+var TOOL_ID_TO_UI_NAME, GENERIC_SUBAGENT_TYPES, DESCRIPTION_PERSONA_RE, HIDDEN_UI_TOOL_NAMES, HIDDEN_HARNESS_TOOL_KEYS, HIDDEN_SUPERONE_MCP_TOOLS, MAX_TRANSCRIPT_TOOL_RESULT_CHARS;
 var init_tool_ui = __esm({
   "../../packages/shared/src/tool-ui.ts"() {
     "use strict";
+    init_partial_json();
     TOOL_ID_TO_UI_NAME = {
       read: "Read",
       read_file: "Read",
@@ -50405,6 +51001,8 @@ var init_tool_ui = __esm({
       search_replace: "Edit",
       str_replace: "Edit",
       apply_patch: "Edit",
+      hashline_edit: "Edit",
+      hashlineedit: "Edit",
       write: "Write",
       write_file: "Write",
       writefile: "Write",
@@ -50431,6 +51029,8 @@ var init_tool_ui = __esm({
       open_page_with_find: "WebFetch",
       web_search: "WebSearch",
       websearch: "WebSearch",
+      x_search: "XSearch",
+      xsearch: "XSearch",
       todo_write: "TodoWrite",
       todowrite: "TodoWrite",
       todo: "TodoWrite",
@@ -50450,16 +51050,21 @@ var init_tool_ui = __esm({
       memory_search: "MemorySearch",
       memorysearch: "MemorySearch",
       search_memory: "MemorySearch",
+      memory_get: "MemoryGet",
+      memoryget: "MemoryGet",
       ask_user_question: "AskUserQuestion",
       askuserquestion: "AskUserQuestion",
       get_task_output: "TaskOutput",
       get_command_or_subagent_output: "TaskOutput",
       get_terminal_command_output: "TaskOutput",
+      get_task_or_subagent_output: "TaskOutput",
       wait_tasks: "TaskOutput",
       wait_commands_or_subagents: "TaskOutput",
+      wait_tasks_or_subagents: "TaskOutput",
       kill_task: "KillTask",
       kill_command_or_subagent: "KillTask",
       kill_terminal_command: "KillTask",
+      kill_task_or_subagent: "KillTask",
       enter_plan_mode: "EnterPlanMode",
       exit_plan_mode: "ExitPlanMode",
       skill: "Skill",
@@ -50472,10 +51077,31 @@ var init_tool_ui = __esm({
       update_goal: "UpdateGoal",
       scheduler_create: "SchedulerCreate",
       scheduler_delete: "SchedulerDelete",
-      scheduler_list: "SchedulerList"
+      scheduler_list: "SchedulerList",
+      deploy_app: "DeployApp",
+      deployapp: "DeployApp",
+      lsp: "Lsp",
+      report_findings: "ReportFindings",
+      reportfindings: "ReportFindings"
     };
     GENERIC_SUBAGENT_TYPES = /* @__PURE__ */ new Set(["general-purpose", "general"]);
     DESCRIPTION_PERSONA_RE = /^\[([a-zA-Z][a-zA-Z0-9_-]*)\]\s*/;
+    HIDDEN_UI_TOOL_NAMES = /* @__PURE__ */ new Set([
+      "TodoWrite",
+      "TaskCreate",
+      "TaskUpdate",
+      "UseTool",
+      "SearchTools",
+      "ToolSearch"
+    ]);
+    HIDDEN_HARNESS_TOOL_KEYS = /* @__PURE__ */ new Set(["toolsearch", "searchtool", "searchtools"]);
+    HIDDEN_SUPERONE_MCP_TOOLS = /* @__PURE__ */ new Set([
+      "session_rename",
+      "session_tag_list",
+      "session_collab_list_agents",
+      "session_list_agents",
+      "miniapp_list"
+    ]);
     MAX_TRANSCRIPT_TOOL_RESULT_CHARS = 48e3;
   }
 });
@@ -50495,7 +51121,7 @@ function toolInputJson(raw) {
     return "{}";
   }
 }
-function asRecord7(raw) {
+function asRecord9(raw) {
   if (raw && typeof raw === "object" && !Array.isArray(raw)) return raw;
   return {};
 }
@@ -50570,6 +51196,11 @@ function nameFromVariant(raw) {
     if (variant === "ExitPlanMode") return "ExitPlanMode";
     if (variant === "KillTask") return "KillTask";
     if (variant === "Skill") return "Skill";
+    if (variant === "HashlineEdit") return "Edit";
+    if (variant === "MemoryGet") return "MemoryGet";
+    if (variant === "DeployApp") return "DeployApp";
+    if (variant === "Lsp") return "Lsp";
+    if (variant === "XSearch") return "XSearch";
   }
   if (Array.isArray(raw.questions) && raw.questions.length > 0) return "AskUserQuestion";
   if (Array.isArray(raw.task_ids) || raw.task_id != null || raw.taskId != null) {
@@ -50634,7 +51265,7 @@ function grokMetaInput(tool) {
   const xai = meta3["x.ai/tool"];
   if (!xai || typeof xai !== "object") return {};
   const input = xai.input;
-  return asRecord7(input);
+  return asRecord9(input);
 }
 function queryFromWebSearchTitle(title) {
   if (!title) return void 0;
@@ -50890,17 +51521,21 @@ function normalizeInput(toolName, kind, raw, filePath, diffs, terminalCommand) {
       return { ...raw };
   }
 }
+function isUseToolEnvelope(tool, raw) {
+  return nameFromGrokMeta(tool) === "UseTool" || raw.variant === "UseTool" || uiToolNameFromId(typeof tool.title === "string" ? tool.title : null) === "UseTool";
+}
 function unwrapMcpEnvelope(tool, raw) {
-  const isEnvelope = nameFromGrokMeta(tool) === "UseTool" || raw.variant === "UseTool";
-  if (!isEnvelope) return null;
+  if (!isUseToolEnvelope(tool, raw)) return null;
   const id = raw.tool_name;
   if (typeof id !== "string" || !id.includes("__")) return null;
-  return { toolName: `mcp__${id}`, input: asRecord7(raw.tool_input) };
+  return { toolName: `mcp__${id}`, input: asRecord9(raw.tool_input) };
 }
 function normalizeAcpTool(tool, opts) {
-  const raw = { ...grokMetaInput(tool), ...asRecord7(tool.rawInput) };
-  const mcp = unwrapMcpEnvelope(tool, asRecord7(tool.rawInput));
+  const raw = { ...grokMetaInput(tool), ...asRecord9(tool.rawInput) };
+  const rawInput = asRecord9(tool.rawInput);
+  const mcp = unwrapMcpEnvelope(tool, rawInput);
   if (mcp) return mcp;
+  if (isUseToolEnvelope(tool, rawInput) && typeof rawInput.tool_name !== "string") return null;
   const diffs = extractDiffs(tool.content);
   const terminalId = extractEmbeddedTerminalId(tool.content);
   const toolName = resolveToolName(tool, raw, diffs, !!terminalId);
@@ -51093,6 +51728,39 @@ var init_tool_result_map = __esm({
   }
 });
 
+// ../../packages/shared/src/acp-goal.ts
+function normalizeAcpGoalStatus(raw) {
+  const status = raw.trim().toLowerCase().replace(/-/g, "_");
+  switch (status) {
+    case "active":
+      return "active";
+    case "blocked":
+      return "blocked";
+    case "budget_limited":
+    case "budgetlimited":
+      return "budgetLimited";
+    case "complete":
+    case "completed":
+      return "complete";
+    case "cleared":
+      return "cleared";
+    case "user_paused":
+    case "backoff_paused":
+    case "back_off_paused":
+    case "no_progress_paused":
+    case "infra_paused":
+    case "paused":
+      return "paused";
+    default:
+      return "paused";
+  }
+}
+var init_acp_goal = __esm({
+  "../../packages/shared/src/acp-goal.ts"() {
+    "use strict";
+  }
+});
+
 // ../../packages/acp/src/xai-state.ts
 import { homedir as homedir4 } from "node:os";
 import { join as join20 } from "node:path";
@@ -51102,6 +51770,7 @@ function skipEventSeqDedup(kind) {
 function createXaiCorrelationState(opts) {
   return {
     ...opts?.cwd ? { cwd: opts.cwd } : {},
+    ...opts?.parentSessionId ? { parentSessionId: opts.parentSessionId } : {},
     workflowToolByRunId: /* @__PURE__ */ new Map(),
     workflowRevision: /* @__PURE__ */ new Map(),
     workflowStarted: /* @__PURE__ */ new Set(),
@@ -51113,6 +51782,9 @@ function createXaiCorrelationState(opts) {
     subagentStarted: /* @__PURE__ */ new Set(),
     deferredSubagentFinishes: /* @__PURE__ */ new Map(),
     deltaToolStarted: /* @__PURE__ */ new Set(),
+    deltaToolWireName: /* @__PURE__ */ new Map(),
+    deltaToolArgs: /* @__PURE__ */ new Map(),
+    deltaToolIdByIndex: /* @__PURE__ */ new Map(),
     bgTaskById: /* @__PURE__ */ new Map(),
     goalStarted: /* @__PURE__ */ new Set(),
     lastEventSeq: null,
@@ -51157,7 +51829,7 @@ function bindSubagentToolId(state, subagentId, toolUseId, description, migrateOu
     });
   }
 }
-function asRecord8(v2) {
+function asRecord10(v2) {
   if (!v2 || typeof v2 !== "object" || Array.isArray(v2)) return null;
   return v2;
 }
@@ -51190,18 +51862,18 @@ function arrField(o, ...keys) {
   return void 0;
 }
 function parseXaiSessionNotificationEnvelope(raw) {
-  const o = asRecord8(raw);
+  const o = asRecord10(raw);
   if (!o) return null;
-  const update = asRecord8(o.update);
+  const update = asRecord10(o.update);
   if (!update) return null;
   const sessionId = strField(o, "sessionId", "session_id");
-  const meta3 = asRecord8(o._meta) ?? asRecord8(o.meta);
+  const meta3 = asRecord10(o._meta) ?? asRecord10(o.meta);
   const eventSeq = meta3 ? numField(meta3, "eventSeq", "event_seq") ?? null : null;
   const eventId = meta3 ? strField(meta3, "eventId", "event_id") ?? null : null;
   return { sessionId, update, meta: meta3, eventSeq, eventId };
 }
 function parseXaiExtParams(raw) {
-  return asRecord8(raw) ?? {};
+  return asRecord10(raw) ?? {};
 }
 function parsePlainTextTaskAck(text) {
   const subagentId = text.match(/subagent_id:\s*(\S+)/i)?.[1] ?? text.match(/task_ids?\s*=\s*\[\s*"([^"]+)"/i)?.[1];
@@ -51306,13 +51978,13 @@ function tryParseJsonObject(text) {
   if (!trimmed.startsWith("{") && !trimmed.startsWith("[")) return null;
   try {
     const v2 = JSON.parse(trimmed);
-    return asRecord8(v2);
+    return asRecord10(v2);
   } catch {
     const start = trimmed.indexOf("{");
     const end = trimmed.lastIndexOf("}");
     if (start < 0 || end <= start) return null;
     try {
-      return asRecord8(JSON.parse(trimmed.slice(start, end + 1)));
+      return asRecord10(JSON.parse(trimmed.slice(start, end + 1)));
     } catch {
       return null;
     }
@@ -51435,6 +52107,9 @@ function mapXaiStandaloneNotification(method, params, state, ctx = {}) {
         log.debug("[acp-xai] bad session_notification envelope");
         return [];
       }
+      if (env.sessionId && state.parentSessionId && env.sessionId !== state.parentSessionId) {
+        return [];
+      }
       const kind = strField(env.update, "sessionUpdate", "session_update");
       if (!skipEventSeqDedup(kind) && env.eventSeq != null) {
         if (state.lastEventSeq != null && env.eventSeq <= state.lastEventSeq) {
@@ -51550,7 +52225,7 @@ function mapWorkflowPhases(raw) {
   if (!raw?.length) return [];
   const out = [];
   for (const item of raw) {
-    const p2 = asRecord8(item);
+    const p2 = asRecord10(item);
     if (!p2) continue;
     const title = strField(p2, "title");
     if (!title) continue;
@@ -51568,7 +52243,7 @@ function mapWorkflowAgents(raw) {
   if (!raw?.length) return [];
   const out = [];
   for (const item of raw) {
-    const a = asRecord8(item);
+    const a = asRecord10(item);
     if (!a) continue;
     const agentId = strField(a, "agent_id", "agentId");
     const label = strField(a, "label") ?? agentId ?? "agent";
@@ -51594,7 +52269,7 @@ function buildWorkflowPhaseSummary(u, currentPhase, pauseMessage, lastEvent, las
   const phaseBits = [];
   if (phases?.length) {
     for (const p2 of phases) {
-      const ph = asRecord8(p2);
+      const ph = asRecord10(p2);
       if (!ph) continue;
       const title = strField(ph, "title") ?? "?";
       const state = strField(ph, "state") ?? "";
@@ -51742,7 +52417,7 @@ function mapTaskBackgrounded(u, state) {
   }];
 }
 function mapTaskCompleted(u, state) {
-  const snapshot = asRecord8(u.task_snapshot) ?? asRecord8(u.taskSnapshot) ?? u;
+  const snapshot = asRecord10(u.task_snapshot) ?? asRecord10(u.taskSnapshot) ?? u;
   const taskId = strField(snapshot, "task_id", "taskId");
   if (!taskId) return [];
   const known = state.bgTaskById.get(taskId);
@@ -51824,6 +52499,16 @@ function mapGoalUpdated(u, state) {
     pauseMessage || lastEvent
   ].filter(Boolean).join(" \xB7 ");
   const events = [];
+  const goal = {
+    goalId,
+    objective,
+    status: normalizeAcpGoalStatus(status),
+    tokensUsed,
+    elapsedMs,
+    ...pauseMessage ? { pauseMessage } : {},
+    ...phase ? { phase } : {}
+  };
+  events.push({ type: "acp_goal", goal: goal.status === "cleared" ? null : goal });
   if (!state.goalStarted.has(goalId)) {
     state.goalStarted.add(goalId);
     events.push({
@@ -51920,13 +52605,21 @@ function mapScheduledTaskDeleted(u, _state) {
 function mapToolCallDeltaChunk(u, state, ctx) {
   const toolCallId = strField(u, "tool_call_id", "toolCallId");
   const index = numField(u, "tool_index", "toolIndex");
-  const id = toolCallId ?? (index != null ? `acp_delta_${index}` : null);
+  if (index != null && toolCallId) state.deltaToolIdByIndex.set(index, toolCallId);
+  const id = toolCallId ?? (index != null ? state.deltaToolIdByIndex.get(index) : void 0) ?? (index != null ? `acp_delta_${index}` : null);
   const messageId = ctx.messageId ?? state.lastMessageId;
   if (!id || !messageId) return [];
   const name = strField(u, "name");
   const delta = strField(u, "arguments_delta", "argumentsDelta") ?? "";
+  if (name) state.deltaToolWireName.set(id, name);
+  if (delta) state.deltaToolArgs.set(id, (state.deltaToolArgs.get(id) ?? "") + delta);
+  const resolved = resolveGrokStreamingToolName(
+    name ?? state.deltaToolWireName.get(id),
+    state.deltaToolArgs.get(id)
+  );
   const events = [];
-  if (name && !state.deltaToolStarted.has(id)) {
+  const hidden = resolved ? isAlwaysHiddenToolName(resolved) : false;
+  if (resolved && !hidden && !state.deltaToolStarted.has(id)) {
     state.deltaToolStarted.add(id);
     events.push({
       type: "content_delta",
@@ -51934,13 +52627,22 @@ function mapToolCallDeltaChunk(u, state, ctx) {
       delta: {
         type: "tool_use",
         toolUseId: id,
-        toolName: name,
+        toolName: resolved,
         input: "",
         status: "streaming"
       }
     });
-  }
-  if (delta) {
+    const acc = state.deltaToolArgs.get(id);
+    if (acc) {
+      events.push({
+        type: "tool_input_delta",
+        messageId,
+        toolUseId: id,
+        partialJson: acc
+      });
+    }
+    state.deltaToolArgs.delete(id);
+  } else if (delta && state.deltaToolStarted.has(id)) {
     events.push({
       type: "tool_input_delta",
       messageId,
@@ -51948,6 +52650,9 @@ function mapToolCallDeltaChunk(u, state, ctx) {
       partialJson: delta
     });
   }
+  if (resolved && hidden && resolved !== "UseTool") {
+    state.deltaToolArgs.delete(id);
+  }
   return events;
 }
 function noteContextTokensFromMeta(state, meta3) {
@@ -52008,7 +52713,7 @@ function mapResponseStarted(u, state, ctx) {
   return event ? [event] : [];
 }
 function mapResponseCompleted(u, state, ctx) {
-  const usageRaw = asRecord8(u.usage) ?? u;
+  const usageRaw = asRecord10(u.usage) ?? u;
   const input = numField(usageRaw, "inputTokens", "input_tokens") ?? 0;
   const output = numField(usageRaw, "outputTokens", "output_tokens") ?? 0;
   const cacheRead = numField(usageRaw, "cacheReadInputTokens", "cache_read_input_tokens") ?? 0;
@@ -52023,7 +52728,7 @@ function mapResponseCompleted(u, state, ctx) {
 }
 function mapTurnCompleted(u, state, ctx) {
   const events = mapTurnStopReason(u, state);
-  const usageRaw = asRecord8(u.usage);
+  const usageRaw = asRecord10(u.usage);
   if (!usageRaw) {
     resetTurnTokens(state);
     return events;
@@ -52190,7 +52895,7 @@ function mapModelAutoSwitched(u) {
   ];
 }
 function mapRetryState(u) {
-  const nested = asRecord8(u.retry_state) ?? asRecord8(u.retryState) ?? u;
+  const nested = asRecord10(u.retry_state) ?? asRecord10(u.retryState) ?? u;
   const type = (strField(nested, "type") ?? "").toLowerCase();
   if (type === "retrying") {
     const attempt = numField(nested, "attempt") ?? 1;
@@ -52257,7 +52962,7 @@ function mapAutoRecoveryExhausted(u) {
   }];
 }
 function mapFollowUps(u) {
-  const meta3 = asRecord8(u._meta) ?? asRecord8(u.meta);
+  const meta3 = asRecord10(u._meta) ?? asRecord10(u.meta);
   if (meta3 && meta3["x.ai/replayed"] === true) return [];
   const responseId = strField(u, "response_id", "responseId");
   if (!responseId || responseId.length > 128) return [];
@@ -52266,7 +52971,7 @@ function mapFollowUps(u) {
   let count = 0;
   for (const s2 of suggestions) {
     if (count >= 6) break;
-    const rec = asRecord8(s2);
+    const rec = asRecord10(s2);
     const label = (rec ? strField(rec, "label") : typeof s2 === "string" ? s2 : void 0)?.trim();
     if (!label) continue;
     const cleaned = label.replace(/[\u0000-\u001f\u007f]/g, "").slice(0, 256).trim();
@@ -52288,6 +52993,8 @@ var log, WORKFLOW_TERMINAL;
 var init_xai_event_map = __esm({
   "../../packages/acp/src/xai-event-map.ts"() {
     "use strict";
+    init_acp_goal();
+    init_tool_ui();
     init_xai_state();
     log = { debug: (..._args) => void 0 };
     WORKFLOW_TERMINAL = /* @__PURE__ */ new Set([
@@ -52595,6 +53302,7 @@ function createAcpAgentEventMapper(options) {
     start(providerSessionId) {
       if (started) return;
       started = true;
+      if (providerSessionId) xaiCorrelation.parentSessionId = providerSessionId;
       emitMessageStart(options.messageId);
       options.emit({ type: "status_change", status: "streaming" });
       if (providerSessionId) {
@@ -60112,7 +60820,7 @@ function toolDisplayName(name) {
 }
 function unwrapCursorMcpTool(toolType, args) {
   if (toolType.toLowerCase() !== "mcp") return { toolType, args };
-  const rec = asRecord9(args);
+  const rec = asRecord11(args);
   if (!rec) return { toolType, args };
   const server = typeof rec.providerIdentifier === "string" ? rec.providerIdentifier.trim() : "";
   const name = typeof rec.toolName === "string" ? rec.toolName.trim() : "";
@@ -60138,12 +60846,12 @@ function idField(obj, ...keys) {
   return stableIdField(obj, ...keys) ?? `tool_${Date.now()}`;
 }
 function extractCursorCallId(update) {
-  const rec = asRecord9(update);
+  const rec = asRecord11(update);
   if (!rec) return null;
-  const nested = asRecord9(rec.toolCall) ?? asRecord9(rec.message);
+  const nested = asRecord11(rec.toolCall) ?? asRecord11(rec.message);
   return stableIdField(rec, ...TOOL_CALL_ID_KEYS) ?? (nested ? stableIdField(nested, ...TOOL_CALL_ID_KEYS) : null);
 }
-function asRecord9(value) {
+function asRecord11(value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) return null;
   return value;
 }
@@ -60157,13 +60865,13 @@ function stringifyPayload(value) {
   }
 }
 function extractToolCallParts(update) {
-  const rec = asRecord9(update) ?? {};
+  const rec = asRecord11(update) ?? {};
   const callId = extractCursorCallId(update);
-  const nested = asRecord9(rec.toolCall);
+  const nested = asRecord11(rec.toolCall);
   if (nested) {
     const toolType2 = typeof nested.type === "string" && nested.type ? nested.type : "Tool";
     const result = nested.result;
-    const resultRec = asRecord9(result);
+    const resultRec = asRecord11(result);
     const isError = resultRec?.status === "error" || Boolean(rec.isError);
     return {
       callId,
@@ -60187,7 +60895,7 @@ function mapTodosPayload(todos) {
   return {
     type: "todos_updated",
     todos: todos.map((todo, index) => {
-      const row = asRecord9(todo) ?? {};
+      const row = asRecord11(todo) ?? {};
       const statusRaw = String(row.status ?? "pending");
       return {
         id: String(row.id ?? index + 1),
@@ -60216,15 +60924,15 @@ function toolUseEvent(messageId, callId, toolType, args, status) {
 }
 function normalizeCursorToolInput(toolName, args) {
   if (toolName.startsWith("mcp__")) return args;
-  const rec = asRecord9(args);
+  const rec = asRecord11(args);
   if (!rec) return args ?? {};
   return normalizeTranscriptTool(toolName, rec).input;
 }
 function mergeCursorToolResultArgs(toolType, args, result) {
   if (toolType.toLowerCase() === "mcp") return args;
-  const res = asRecord9(result);
+  const res = asRecord11(result);
   if (!res) return args;
-  const rec = asRecord9(args);
+  const rec = asRecord11(args);
   if (!rec) return args;
   const diff = typeof res.diffString === "string" ? res.diffString : void 0;
   const linesAdded = typeof res.linesAdded === "number" ? res.linesAdded : void 0;
@@ -60285,7 +60993,7 @@ function stampParentToolUseId(events, parentToolUseId) {
 function mapInteractionUpdate(messageId, update, options) {
   const events = [];
   const type = String(update.type ?? "");
-  const rec = asRecord9(update) ?? {};
+  const rec = asRecord11(update) ?? {};
   switch (type) {
     case "text-delta": {
       const text = strField2(update, "text");
@@ -60325,7 +61033,7 @@ function mapInteractionUpdate(messageId, update, options) {
       if (!parts.callId) break;
       events.push(toolUseEvent(messageId, parts.callId, parts.toolType, parts.args, "streaming"));
       if (parts.toolType === "updateTodos" || parts.toolType === "update_todos") {
-        const todos = asRecord9(parts.args)?.todos;
+        const todos = asRecord11(parts.args)?.todos;
         const todoEvent = mapTodosPayload(todos);
         if (todoEvent) events.push(todoEvent);
       }
@@ -60362,7 +61070,7 @@ function mapInteractionUpdate(messageId, update, options) {
       events.push(toolUseEvent(messageId, parts.callId, parts.toolType, args, "complete"));
       events.push(toolResultEvent(messageId, parts.callId, parts.result, parts.isError));
       if (parts.toolType === "updateTodos" || parts.toolType === "update_todos") {
-        const todos = asRecord9(parts.args)?.todos ?? asRecord9(parts.result)?.todos;
+        const todos = asRecord11(parts.args)?.todos ?? asRecord11(parts.result)?.todos;
         const todoEvent = mapTodosPayload(todos);
         if (todoEvent) events.push(todoEvent);
       }
@@ -60467,7 +61175,7 @@ ${text}
 }
 function mapConversationStep(messageId, step, options) {
   const events = [];
-  const rec = asRecord9(step);
+  const rec = asRecord11(step);
   if (!rec) return events;
   const stepType = strField2(rec, "type");
   if (stepType === "assistantMessage" || stepType === "thinkingMessage") {
@@ -60475,14 +61183,14 @@ function mapConversationStep(messageId, step, options) {
   }
   if (stepType === "toolCall") {
     const message = rec.message ?? rec.toolCall ?? rec;
-    const nested = asRecord9(message);
+    const nested = asRecord11(message);
     const callId = extractCursorCallId(rec) || options?.resolveCallId?.(step) || null;
     if (!callId) {
       return events;
     }
     const toolType = nested && typeof nested.type === "string" && nested.type ? nested.type : strField2(rec, "name") || "Tool";
     const args = nested?.args ?? nested?.input ?? {};
-    const resultRec = asRecord9(nested?.result);
+    const resultRec = asRecord11(nested?.result);
     const resultValue = resultRec?.status === "success" ? resultRec.value ?? nested?.result : nested?.result;
     events.push(toolUseEvent(
       messageId,
@@ -60492,7 +61200,7 @@ function mapConversationStep(messageId, step, options) {
       "complete"
     ));
     if (toolType === "updateTodos" || toolType === "update_todos") {
-      const todos = asRecord9(args)?.todos;
+      const todos = asRecord11(args)?.todos;
       const todoEvent = mapTodosPayload(todos);
       if (todoEvent) events.push(todoEvent);
     }
@@ -60629,7 +61337,7 @@ var init_cursor_event_map = __esm({
       observeDelta(update) {
         const type = String(update.type ?? "");
         if (type === "tool-call-delta") {
-          const taskUpdate = asRecord9(update)?.taskUpdate;
+          const taskUpdate = asRecord11(update)?.taskUpdate;
           if (taskUpdate && typeof taskUpdate === "object") {
             this.observeDelta(taskUpdate);
           }
@@ -62010,10 +62718,10 @@ var init_harness_runners = __esm({
 });
 
 // src/session/codex-live-turn.ts
-function asRecord10(value) {
+function asRecord12(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : null;
 }
-function readString4(value) {
+function readString5(value) {
   return typeof value === "string" && value.length > 0 ? value : null;
 }
 function compactRecord3(input) {
@@ -62041,10 +62749,10 @@ function extractAgentTextFromTurn2(turn) {
   let text = "";
   const items = Array.isArray(turn.items) ? turn.items : [];
   for (const item of items) {
-    const rec = asRecord10(item);
+    const rec = asRecord12(item);
     if (!rec) continue;
-    if (readString4(rec.type) === "agentMessage" || readString4(rec.itemType) === "agentMessage") {
-      const t = readString4(rec.text);
+    if (readString5(rec.type) === "agentMessage" || readString5(rec.itemType) === "agentMessage") {
+      const t = readString5(rec.text);
       if (t) text += t;
     }
   }
@@ -62073,8 +62781,8 @@ async function openTurnAndStream(opts) {
       ...collaborationMode ? { collaborationMode } : {}
     })
   );
-  const turn = asRecord10(turnStartResult.turn);
-  const turnId = readString4(turn?.id);
+  const turn = asRecord12(turnStartResult.turn);
+  const turnId = readString5(turn?.id);
   opts.onTurnStarted?.(turnId);
   let finalText = "";
   const deadline = Date.now() + TURN_WAIT_TIMEOUT_MS2;
@@ -62101,23 +62809,23 @@ async function openTurnAndStream(opts) {
       continue;
     }
     if (note.method === "turn/completed" || note.method === "turn/completed/v2") {
-      const completedTurn = asRecord10(note.params.turn);
-      const completedId = readString4(completedTurn?.id);
+      const completedTurn = asRecord12(note.params.turn);
+      const completedId = readString5(completedTurn?.id);
       if (turnId && completedId && completedId !== turnId) continue;
     }
     if (agentEventMapper) {
       const applied = agentEventMapper.apply(note);
       if (applied.textDelta) finalText += applied.textDelta;
     } else if (note.method === "item/agentMessage/delta" || note.method === "item/agentMessageDelta") {
-      const delta = readString4(note.params.delta) ?? readString4(note.params.text) ?? readString4(asRecord10(note.params.item)?.delta);
+      const delta = readString5(note.params.delta) ?? readString5(note.params.text) ?? readString5(asRecord12(note.params.item)?.delta);
       if (delta) {
         finalText += delta;
         opts.onDelta?.(delta);
       }
     }
     if (note.method === "turn/completed" || note.method === "turn/completed/v2") {
-      const completedTurn = asRecord10(note.params.turn);
-      const status = readString4(completedTurn?.status) ?? readString4(note.params.status);
+      const completedTurn = asRecord12(note.params.turn);
+      const status = readString5(completedTurn?.status) ?? readString5(note.params.status);
       if (status === "failed" || status === "error") {
         throw new Error("Codex turn failed");
       }
@@ -62154,8 +62862,7 @@ import { existsSync as existsSync25 } from "node:fs";
 function mapCodexReasoningEffort(effort) {
   if (!effort) return void 0;
   const e = effort.trim().toLowerCase();
-  if (e === "max") return "xhigh";
-  if (e === "minimal" || e === "low" || e === "medium" || e === "high" || e === "xhigh") {
+  if (e === "minimal" || e === "low" || e === "medium" || e === "high" || e === "xhigh" || e === "max" || e === "ultra") {
     return e;
   }
   return void 0;
@@ -62387,6 +63094,7 @@ function createProductionTurnRunner(opts) {
     allowSimulatedFallback: opts.allowSimulatedFallback,
     providers: opts.providers,
     experimentalClaudeOpenAiChatEnabled: opts.experimentalClaudeOpenAiChatEnabled,
+    askUserQuestionPreviewFormat: opts.askUserQuestionPreviewFormat,
     createHostActionClaudeMcp: opts.createHostActionClaudeMcp,
     mcpMergeMode: opts.mcpMergeMode,
     homeDir: opts.homeDir
@@ -62452,8 +63160,13 @@ function createCodexAdminService(opts) {
 }
 function clearCodexAdminAuthForTest() {
   projectAuthById.clear();
+  for (const pending of pendingAccountLogins.values()) {
+    void pending.client.close().catch(() => {
+    });
+  }
+  pendingAccountLogins.clear();
 }
-var projectAuthById, CodexAdminService;
+var projectAuthById, pendingAccountLogins, CodexAdminService;
 var init_codex_admin_service = __esm({
   "src/session/codex-admin-service.ts"() {
     "use strict";
@@ -62462,6 +63175,7 @@ var init_codex_admin_service = __esm({
     init_codex_turn_runner();
     init_resolve_service();
     projectAuthById = /* @__PURE__ */ new Map();
+    pendingAccountLogins = /* @__PURE__ */ new Map();
     CodexAdminService = class {
       constructor(opts) {
         this.opts = opts;
@@ -62535,6 +63249,91 @@ var init_codex_admin_service = __esm({
           });
         }
       }
+      async openAccountClient() {
+        const binary = resolveCodexBinaryPath({
+          binaryPath: this.opts.binaryPath,
+          harnesses: this.opts.harnesses
+        });
+        if (!binary) {
+          throw Object.assign(new Error("Codex binary not available"), {
+            code: "failed_precondition"
+          });
+        }
+        const env = { ...process.env, ...this.opts.env };
+        delete env.CODEX_API_KEY;
+        return openCodexAppServer({
+          binaryPath: binary,
+          env,
+          spawnFn: this.opts.spawnFn
+        });
+      }
+      async getAccountStatus() {
+        const client3 = await this.openAccountClient();
+        try {
+          return await readAccountStatus(client3);
+        } finally {
+          await client3.close().catch(() => {
+          });
+        }
+      }
+      async startAccountLogin(projectId) {
+        const client3 = await this.openAccountClient();
+        try {
+          const result = await startAccountLogin(client3, "chatgptDeviceCode");
+          pendingAccountLogins.set(result.loginId, { projectId, client: client3 });
+          void this.waitForAccountLogin(result.loginId, client3);
+          return result;
+        } catch (error51) {
+          await client3.close().catch(() => {
+          });
+          throw error51;
+        }
+      }
+      async waitForAccountLogin(loginId, client3) {
+        const deadline = Date.now() + 15 * 6e4;
+        try {
+          while (Date.now() < deadline && pendingAccountLogins.get(loginId)?.client === client3) {
+            const notification = await client3.nextNotification(Math.min(1e3, deadline - Date.now()));
+            if (!notification) continue;
+            if (notification.method === "account/login/completed" && notification.params.loginId === loginId) return;
+          }
+        } catch {
+        } finally {
+          if (pendingAccountLogins.get(loginId)?.client === client3) {
+            pendingAccountLogins.delete(loginId);
+          }
+          await client3.close().catch(() => {
+          });
+        }
+      }
+      async cancelAccountLogin(loginId) {
+        const pending = pendingAccountLogins.get(loginId);
+        if (!pending) return;
+        pendingAccountLogins.delete(loginId);
+        try {
+          await cancelAccountLogin(pending.client, loginId);
+        } finally {
+          await pending.client.close().catch(() => {
+          });
+        }
+      }
+      async logoutAccount() {
+        for (const [loginId, pending] of [...pendingAccountLogins]) {
+          pendingAccountLogins.delete(loginId);
+          await cancelAccountLogin(pending.client, loginId).catch(() => {
+          });
+          await pending.client.close().catch(() => {
+          });
+        }
+        const client3 = await this.openAccountClient();
+        try {
+          await logoutAccount(client3);
+          return await readAccountStatus(client3);
+        } finally {
+          await client3.close().catch(() => {
+          });
+        }
+      }
       async getRateLimits(projectId, apiProviderId) {
         const auth = this.getProjectAuth(projectId);
         if (resolveMode(auth.mode, auth.apiKey) !== "chatgpt") return null;
@@ -62544,11 +63343,25 @@ var init_codex_admin_service = __esm({
           return null;
         }
       }
-      async getAccountUsage(projectId, apiProviderId) {
+      async getAccountUsage(projectId, apiProviderId, threadId) {
         const auth = this.getProjectAuth(projectId);
         if (resolveMode(auth.mode, auth.apiKey) !== "chatgpt") return null;
         try {
-          return await this.withClient(projectId, apiProviderId, (client3) => readAccountUsage(client3));
+          return await this.withClient(projectId, apiProviderId, (client3) => readAccountUsage(client3, threadId));
+        } catch {
+          return null;
+        }
+      }
+      async getServerDiagnostics(projectId, apiProviderId) {
+        try {
+          return await this.withClient(projectId, apiProviderId, (client3) => readCodexServerDiagnostics(client3));
+        } catch {
+          return null;
+        }
+      }
+      async getConfigRequirements(projectId, apiProviderId) {
+        try {
+          return await this.withClient(projectId, apiProviderId, (client3) => readCodexConfigRequirements(client3));
         } catch {
           return null;
         }
@@ -62566,11 +63379,11 @@ var init_codex_admin_service = __esm({
           return null;
         }
       }
-      async loginMcpOauth(projectId, serverName, apiProviderId) {
+      async loginMcpOauth(projectId, serverName, apiProviderId, options) {
         return this.withClient(
           projectId,
           apiProviderId,
-          (client3) => loginMcpServerOauth(client3, serverName)
+          (client3) => loginMcpServerOauth(client3, serverName, void 0, 18e4, options)
         );
       }
       async detectExternalAgent(projectId, apiProviderId) {
@@ -69749,8 +70562,8 @@ import { fileURLToPath } from "node:url";
 function resolveCliReleaseVersion() {
   const fromEnv = process.env.SUPERONE_CLI_VERSION?.trim();
   if (fromEnv) return fromEnv;
-  if ("0.55.2-alpha".trim()) {
-    return "0.55.2-alpha".trim();
+  if ("0.57.0-alpha".trim()) {
+    return "0.57.0-alpha".trim();
   }
   const fromDist = readDistManifestVersion();
   if (fromDist) return fromDist;
@@ -71385,13 +72198,15 @@ import { existsSync as existsSync3, mkdirSync as mkdirSync3, readFileSync as rea
 import { dirname as dirname4 } from "node:path";
 var CODEX_PRESETS = /* @__PURE__ */ new Set(["", "read-only", "default", "full-access"]);
 var SANDBOX_MODES = /* @__PURE__ */ new Set(["", "off", "on", "auto"]);
+var QUESTION_PREVIEW_FORMATS = /* @__PURE__ */ new Set(["", "markdown", "html"]);
 var DEFAULT_NODE_AGENT_SETTINGS = {
   claude: {
     defaultModel: "",
     defaultEffort: "",
     permissionMode: "",
     sandboxMode: "",
-    disabledSkills: []
+    disabledSkills: [],
+    askUserQuestionPreviewFormat: ""
   },
   codex: {
     defaultModel: "",
@@ -71414,12 +72229,14 @@ function normalizeClaude(raw) {
   const r = raw && typeof raw === "object" ? raw : {};
   const sandboxMode = asString(r.sandboxMode ?? r.defaultSandboxMode, "");
   const permissionMode = asString(r.permissionMode ?? r.defaultPermissionMode, "");
+  const previewFormat = asString(r.askUserQuestionPreviewFormat, "");
   return {
     defaultModel: asString(r.defaultModel, ""),
     defaultEffort: asString(r.defaultEffort, ""),
     permissionMode,
     sandboxMode: SANDBOX_MODES.has(sandboxMode) ? sandboxMode : "",
-    disabledSkills: asStringArray(r.disabledSkills, [])
+    disabledSkills: asStringArray(r.disabledSkills, []),
+    askUserQuestionPreviewFormat: QUESTION_PREVIEW_FORMATS.has(previewFormat) ? previewFormat : ""
   };
 }
 function normalizeCodex(raw) {
@@ -71466,6 +72283,10 @@ function mergeNodeAgentSettings(current, patch) {
       const m2 = patch.claude.sandboxMode;
       next.claude.sandboxMode = SANDBOX_MODES.has(m2) ? m2 : next.claude.sandboxMode;
     }
+    if (typeof patch.claude.askUserQuestionPreviewFormat === "string") {
+      const f2 = patch.claude.askUserQuestionPreviewFormat;
+      if (QUESTION_PREVIEW_FORMATS.has(f2)) next.claude.askUserQuestionPreviewFormat = f2;
+    }
     if (Array.isArray(patch.claude.disabledSkills)) {
       next.claude.disabledSkills = patch.claude.disabledSkills.filter((s2) => typeof s2 === "string").map((s2) => s2.trim()).filter(Boolean);
     }
@@ -71788,7 +72609,7 @@ function requireResourceWrite(client3, scope) {
   if (scope === "user") return requireScopes(client3, OPERATION_SCOPES.adminNode);
   return null;
 }
-function asRecord11(payload) {
+function asRecord13(payload) {
   return payload && typeof payload === "object" ? payload : {};
 }
 function mapThrown(err) {
@@ -71817,7 +72638,7 @@ function manageOpts(ctx) {
 function handleSkillsList(payload, ctx) {
   const denied = requireScopes(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord11(payload);
+  const p2 = asRecord13(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -71837,7 +72658,7 @@ function handleSkillsList(payload, ctx) {
 function handleSkillsGet(payload, ctx) {
   const denied = requireScopes(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord11(payload);
+  const p2 = asRecord13(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -71862,7 +72683,7 @@ function handleSkillsGet(payload, ctx) {
 function handleSkillsReadFile(payload, ctx) {
   const denied = requireScopes(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord11(payload);
+  const p2 = asRecord13(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -71896,7 +72717,7 @@ function handleSkillsReadFile(payload, ctx) {
 function handleSkillsDelete(payload, ctx) {
   const denied = requireScopes(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (denied) return denied;
-  const p2 = asRecord11(payload);
+  const p2 = asRecord13(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -71921,7 +72742,7 @@ function handleSkillsDelete(payload, ctx) {
 function handleSkillsInstall(payload, ctx) {
   const baseDenied = requireScopes(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (baseDenied) return baseDenied;
-  const p2 = asRecord11(payload);
+  const p2 = asRecord13(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -71955,7 +72776,7 @@ function handleSkillsInstall(payload, ctx) {
 function handleMcpList(payload, ctx) {
   const denied = requireScopes(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord11(payload);
+  const p2 = asRecord13(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -71979,7 +72800,7 @@ function handleMcpList(payload, ctx) {
 function handleAdditionalDirsList(payload, ctx) {
   const denied = requireScopes(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord11(payload);
+  const p2 = asRecord13(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -71994,7 +72815,7 @@ function handleAdditionalDirsList(payload, ctx) {
 function handleAdditionalDirsAdd(payload, ctx) {
   const denied = requireScopes(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (denied) return denied;
-  const p2 = asRecord11(payload);
+  const p2 = asRecord13(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -72012,7 +72833,7 @@ function handleAdditionalDirsAdd(payload, ctx) {
 function handleAdditionalDirsRemove(payload, ctx) {
   const denied = requireScopes(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (denied) return denied;
-  const p2 = asRecord11(payload);
+  const p2 = asRecord13(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -72063,7 +72884,7 @@ function parseMcpWriteConfig(raw) {
 function handleMcpSave(payload, ctx) {
   const baseDenied = requireScopes(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (baseDenied) return baseDenied;
-  const p2 = asRecord11(payload);
+  const p2 = asRecord13(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -72093,7 +72914,7 @@ function handleMcpSave(payload, ctx) {
 function handleMcpToggle(payload, ctx) {
   const baseDenied = requireScopes(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (baseDenied) return baseDenied;
-  const p2 = asRecord11(payload);
+  const p2 = asRecord13(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -72124,7 +72945,7 @@ function handleMcpToggle(payload, ctx) {
 function handleMcpDelete(payload, ctx) {
   const baseDenied = requireScopes(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (baseDenied) return baseDenied;
-  const p2 = asRecord11(payload);
+  const p2 = asRecord13(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -72164,7 +72985,7 @@ function parseMarketplaceScope(raw) {
 async function handlePluginsList(payload, ctx) {
   const denied = requireScopes(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord11(payload);
+  const p2 = asRecord13(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     projectRoot(ctx.projects, projectId);
@@ -72211,7 +73032,7 @@ async function handlePluginsList(payload, ctx) {
 function handlePluginsGet(payload, ctx) {
   const denied = requireScopes(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord11(payload);
+  const p2 = asRecord13(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -72235,7 +73056,7 @@ function handlePluginsGet(payload, ctx) {
 function handlePluginsReadFile(payload, ctx) {
   const denied = requireScopes(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord11(payload);
+  const p2 = asRecord13(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -72263,7 +73084,7 @@ function handlePluginsReadFile(payload, ctx) {
 function handlePluginsDelete(payload, ctx) {
   const baseDenied = requireScopes(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (baseDenied) return baseDenied;
-  const p2 = asRecord11(payload);
+  const p2 = asRecord13(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -72289,7 +73110,7 @@ function handlePluginsDelete(payload, ctx) {
 async function handlePluginsInstall(payload, ctx) {
   const baseDenied = requireScopes(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (baseDenied) return baseDenied;
-  const p2 = asRecord11(payload);
+  const p2 = asRecord13(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -72315,7 +73136,7 @@ async function handlePluginsInstall(payload, ctx) {
 function handlePluginsUpdate(payload, ctx) {
   const baseDenied = requireScopes(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (baseDenied) return baseDenied;
-  const p2 = asRecord11(payload);
+  const p2 = asRecord13(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -72341,7 +73162,7 @@ function handlePluginsUpdate(payload, ctx) {
 function handlePluginsListMarketplace(payload, ctx) {
   const denied = requireScopes(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord11(payload);
+  const p2 = asRecord13(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -72363,7 +73184,7 @@ function handlePluginsListMarketplace(payload, ctx) {
 async function handlePluginsAddMarketplace(payload, ctx) {
   const baseDenied = requireScopes(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (baseDenied) return baseDenied;
-  const p2 = asRecord11(payload);
+  const p2 = asRecord13(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -72389,7 +73210,7 @@ async function handlePluginsAddMarketplace(payload, ctx) {
 async function handlePluginsRemoveMarketplace(payload, ctx) {
   const baseDenied = requireScopes(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (baseDenied) return baseDenied;
-  const p2 = asRecord11(payload);
+  const p2 = asRecord13(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -72424,7 +73245,7 @@ async function handlePluginsUpdateMarketplace(payload, ctx) {
   if (denied) return denied;
   const adminDenied = requireScopes(ctx.client, OPERATION_SCOPES.adminNode);
   if (adminDenied) return adminDenied;
-  const p2 = asRecord11(payload);
+  const p2 = asRecord13(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     if (projectId) {
@@ -72446,7 +73267,7 @@ async function handlePluginsUpdateMarketplace(payload, ctx) {
 function handlePluginsReadMarketplace(payload, ctx) {
   const denied = requireScopes(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord11(payload);
+  const p2 = asRecord13(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     if (projectId) {
@@ -72477,7 +73298,7 @@ function handlePluginsReadMarketplace(payload, ctx) {
 function handlePluginsReadMarketplaceFile(payload, ctx) {
   const denied = requireScopes(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord11(payload);
+  const p2 = asRecord13(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     if (projectId) {
@@ -72511,7 +73332,7 @@ function handlePluginsReadMarketplaceFile(payload, ctx) {
 function handleAgentsList(payload, ctx) {
   const denied = requireScopes(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord11(payload);
+  const p2 = asRecord13(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -72528,7 +73349,7 @@ function handleAgentsList(payload, ctx) {
 function handleAgentsReadFile(payload, ctx) {
   const denied = requireScopes(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord11(payload);
+  const p2 = asRecord13(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -72560,7 +73381,7 @@ function parseHookSavePayload(raw) {
 function handleHooksList(payload, ctx) {
   const denied = requireScopes(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord11(payload);
+  const p2 = asRecord13(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -72573,7 +73394,7 @@ function handleHooksList(payload, ctx) {
 function handleHooksSave(payload, ctx) {
   const baseDenied = requireScopes(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (baseDenied) return baseDenied;
-  const p2 = asRecord11(payload);
+  const p2 = asRecord13(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -72601,7 +73422,7 @@ function handleHooksSave(payload, ctx) {
 function handleHooksDelete(payload, ctx) {
   const baseDenied = requireScopes(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (baseDenied) return baseDenied;
-  const p2 = asRecord11(payload);
+  const p2 = asRecord13(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -72706,7 +73527,7 @@ function requireScopes2(client3, scopes) {
   }
   return null;
 }
-function asRecord12(payload) {
+function asRecord14(payload) {
   return payload && typeof payload === "object" ? payload : {};
 }
 function mapThrown2(err) {
@@ -72797,7 +73618,7 @@ function parseSchedule(raw) {
 function handleAutomationList(payload, ctx) {
   const denied = requireScopes2(ctx.client, OPERATION_SCOPES.readSession);
   if (denied) return denied;
-  const p2 = asRecord12(payload);
+  const p2 = asRecord14(payload);
   const projectId = String(p2.projectId ?? "").trim();
   if (!projectId) {
     return { error: { code: "invalid_argument", message: "projectId is required" } };
@@ -72816,7 +73637,7 @@ function handleAutomationList(payload, ctx) {
 function handleAutomationCreate(payload, ctx) {
   const denied = requireScopes2(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord12(payload);
+  const p2 = asRecord14(payload);
   const projectId = String(p2.projectId ?? "").trim();
   if (!projectId) {
     return { error: { code: "invalid_argument", message: "projectId is required" } };
@@ -72853,7 +73674,7 @@ function handleAutomationCreate(payload, ctx) {
 function handleAutomationUpdate(payload, ctx) {
   const denied = requireScopes2(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord12(payload);
+  const p2 = asRecord14(payload);
   const automationId = String(p2.automationId ?? p2.id ?? "").trim();
   if (!automationId) {
     return { error: { code: "invalid_argument", message: "automationId is required" } };
@@ -72897,7 +73718,7 @@ function handleAutomationUpdate(payload, ctx) {
 function handleAutomationDelete(payload, ctx) {
   const denied = requireScopes2(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord12(payload);
+  const p2 = asRecord14(payload);
   const automationId = String(p2.automationId ?? p2.id ?? "").trim();
   if (!automationId) {
     return { error: { code: "invalid_argument", message: "automationId is required" } };
@@ -72923,7 +73744,7 @@ function handleAutomationDelete(payload, ctx) {
 async function handleAutomationRunNow(payload, ctx) {
   const denied = requireScopes2(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord12(payload);
+  const p2 = asRecord14(payload);
   const automationId = String(p2.automationId ?? p2.id ?? "").trim();
   if (!automationId) {
     return { error: { code: "invalid_argument", message: "automationId is required" } };
@@ -72980,7 +73801,7 @@ function requireScopes3(client3, scopes) {
   }
   return null;
 }
-function asRecord13(payload) {
+function asRecord15(payload) {
   return payload && typeof payload === "object" ? payload : {};
 }
 function optionalString(value) {
@@ -72989,7 +73810,7 @@ function optionalString(value) {
 function parseAttachments(value) {
   if (!Array.isArray(value)) return [];
   return value.flatMap((raw) => {
-    const a = asRecord13(raw);
+    const a = asRecord15(raw);
     const name = typeof a.name === "string" ? a.name : "";
     const mimeType = typeof a.mimeType === "string" ? a.mimeType : "";
     const data = typeof a.data === "string" ? a.data : "";
@@ -73002,7 +73823,7 @@ function mapThrown3(err) {
 function handleDraftList(payload, ctx) {
   const denied = requireScopes3(ctx.client, OPERATION_SCOPES.readSession);
   if (denied) return denied;
-  const p2 = asRecord13(payload);
+  const p2 = asRecord15(payload);
   const projectPath = optionalString(p2.projectPath);
   try {
     return { result: { drafts: ctx.drafts.list(projectPath ?? void 0) } };
@@ -73013,7 +73834,7 @@ function handleDraftList(payload, ctx) {
 function handleDraftUpsert(payload, ctx) {
   const denied = requireScopes3(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord13(payload);
+  const p2 = asRecord15(payload);
   const id = String(p2.id ?? "").trim();
   if (!id) {
     return { error: { code: "invalid_argument", message: "id is required" } };
@@ -73044,7 +73865,7 @@ function handleDraftUpsert(payload, ctx) {
 function handleDraftDelete(payload, ctx) {
   const denied = requireScopes3(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord13(payload);
+  const p2 = asRecord15(payload);
   const draftId = String(p2.draftId ?? "").trim();
   if (!draftId) {
     return { error: { code: "invalid_argument", message: "draftId is required" } };
@@ -73078,7 +73899,7 @@ function requireScopes4(client3, scopes) {
   }
   return null;
 }
-function asRecord14(payload) {
+function asRecord16(payload) {
   return payload && typeof payload === "object" ? payload : {};
 }
 function mapThrown4(err) {
@@ -73105,10 +73926,22 @@ async function dispatchCodexRpc(method, payload, ctx) {
       return handleGetAuthStatus(payload, ctx);
     case "codex.setAuth":
       return handleSetAuth(payload, ctx);
+    case "codex.getAccountStatus":
+      return handleGetAccountStatus(payload, ctx);
+    case "codex.accountLoginStart":
+      return handleAccountLoginStart(payload, ctx);
+    case "codex.accountLoginCancel":
+      return handleAccountLoginCancel(payload, ctx);
+    case "codex.accountLogout":
+      return handleAccountLogout(payload, ctx);
     case "codex.getRateLimits":
       return handleGetRateLimits(payload, ctx);
     case "codex.getAccountUsage":
       return handleGetAccountUsage(payload, ctx);
+    case "codex.getServerDiagnostics":
+      return handleGetServerDiagnostics(payload, ctx);
+    case "codex.getConfigRequirements":
+      return handleGetConfigRequirements(payload, ctx);
     case "codex.consumeRateLimitReset":
       return handleConsumeRateLimitReset(payload, ctx);
     case "codex.loginMcpOauth":
@@ -73137,6 +73970,9 @@ async function dispatchCodexRpc(method, payload, ctx) {
 }
 var CODEX_MUTATING_METHODS = [
   "codex.setAuth",
+  "codex.accountLoginStart",
+  "codex.accountLoginCancel",
+  "codex.accountLogout",
   "codex.consumeRateLimitReset",
   "codex.loginMcpOauth",
   "codex.importExternalAgent",
@@ -73149,7 +73985,7 @@ var CODEX_MUTATING_METHODS = [
 function handleGetAuthStatus(payload, ctx) {
   const denied = requireScopes4(ctx.client, OPERATION_SCOPES.readEnvironment);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord16(payload);
   const projectId = projectIdOf(p2);
   if (!projectId) {
     return { error: { code: "invalid_argument", message: "projectId required" } };
@@ -73162,7 +73998,7 @@ function handleGetAuthStatus(payload, ctx) {
 function handleSetAuth(payload, ctx) {
   const denied = requireScopes4(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord16(payload);
   const projectId = projectIdOf(p2);
   if (!projectId) {
     return { error: { code: "invalid_argument", message: "projectId required" } };
@@ -73184,10 +74020,62 @@ function handleSetAuth(payload, ctx) {
     return mapThrown4(err);
   }
 }
+async function handleGetAccountStatus(payload, ctx) {
+  const denied = requireScopes4(ctx.client, OPERATION_SCOPES.readEnvironment);
+  if (denied) return denied;
+  const p2 = asRecord16(payload);
+  const projectId = projectIdOf(p2);
+  if (!projectId) return { error: { code: "invalid_argument", message: "projectId required" } };
+  if (!ctx.projects.get(projectId)) return { error: { code: "not_found", message: "project not found" } };
+  try {
+    return { result: await admin(ctx).getAccountStatus() };
+  } catch (err) {
+    return mapThrown4(err);
+  }
+}
+async function handleAccountLoginStart(payload, ctx) {
+  const denied = requireScopes4(ctx.client, OPERATION_SCOPES.adminNode);
+  if (denied) return denied;
+  const p2 = asRecord16(payload);
+  const projectId = projectIdOf(p2);
+  if (!projectId) return { error: { code: "invalid_argument", message: "projectId required" } };
+  if (!ctx.projects.get(projectId)) return { error: { code: "not_found", message: "project not found" } };
+  try {
+    return { result: await admin(ctx).startAccountLogin(projectId) };
+  } catch (err) {
+    return mapThrown4(err);
+  }
+}
+async function handleAccountLoginCancel(payload, ctx) {
+  const denied = requireScopes4(ctx.client, OPERATION_SCOPES.adminNode);
+  if (denied) return denied;
+  const p2 = asRecord16(payload);
+  const loginId = typeof p2.loginId === "string" ? p2.loginId.trim() : "";
+  if (!loginId) return { error: { code: "invalid_argument", message: "loginId required" } };
+  try {
+    await admin(ctx).cancelAccountLogin(loginId);
+    return { result: { ok: true } };
+  } catch (err) {
+    return mapThrown4(err);
+  }
+}
+async function handleAccountLogout(payload, ctx) {
+  const denied = requireScopes4(ctx.client, OPERATION_SCOPES.adminNode);
+  if (denied) return denied;
+  const p2 = asRecord16(payload);
+  const projectId = projectIdOf(p2);
+  if (!projectId) return { error: { code: "invalid_argument", message: "projectId required" } };
+  if (!ctx.projects.get(projectId)) return { error: { code: "not_found", message: "project not found" } };
+  try {
+    return { result: await admin(ctx).logoutAccount() };
+  } catch (err) {
+    return mapThrown4(err);
+  }
+}
 async function handleGetRateLimits(payload, ctx) {
   const denied = requireScopes4(ctx.client, OPERATION_SCOPES.readEnvironment);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord16(payload);
   const projectId = projectIdOf(p2);
   if (!projectId) {
     return { error: { code: "invalid_argument", message: "projectId required" } };
@@ -73214,7 +74102,7 @@ async function handleGetRateLimits(payload, ctx) {
 async function handleGetAccountUsage(payload, ctx) {
   const denied = requireScopes4(ctx.client, OPERATION_SCOPES.readEnvironment);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord16(payload);
   const projectId = projectIdOf(p2);
   if (!projectId) {
     return { error: { code: "invalid_argument", message: "projectId required" } };
@@ -73233,7 +74121,44 @@ async function handleGetAccountUsage(payload, ctx) {
       };
     }
     const apiProviderId = typeof p2.apiProviderId === "string" ? p2.apiProviderId : null;
-    return { result: await svc.getAccountUsage(projectId, apiProviderId) };
+    const threadId = typeof p2.threadId === "string" ? p2.threadId : null;
+    return { result: await svc.getAccountUsage(projectId, apiProviderId, threadId) };
+  } catch (err) {
+    return mapThrown4(err);
+  }
+}
+async function handleGetServerDiagnostics(payload, ctx) {
+  const denied = requireScopes4(ctx.client, OPERATION_SCOPES.readEnvironment);
+  if (denied) return denied;
+  const p2 = asRecord16(payload);
+  const projectId = projectIdOf(p2);
+  if (!projectId) return { error: { code: "invalid_argument", message: "projectId required" } };
+  if (!ctx.projects.get(projectId)) return { error: { code: "not_found", message: "project not found" } };
+  try {
+    const svc = admin(ctx);
+    if (!svc.isBinaryReady()) {
+      return { error: { code: "failed_precondition", message: "Codex binary not ready" } };
+    }
+    const apiProviderId = typeof p2.apiProviderId === "string" ? p2.apiProviderId : null;
+    return { result: await svc.getServerDiagnostics(projectId, apiProviderId) };
+  } catch (err) {
+    return mapThrown4(err);
+  }
+}
+async function handleGetConfigRequirements(payload, ctx) {
+  const denied = requireScopes4(ctx.client, OPERATION_SCOPES.readEnvironment);
+  if (denied) return denied;
+  const p2 = asRecord16(payload);
+  const projectId = projectIdOf(p2);
+  if (!projectId) return { error: { code: "invalid_argument", message: "projectId required" } };
+  if (!ctx.projects.get(projectId)) return { error: { code: "not_found", message: "project not found" } };
+  try {
+    const svc = admin(ctx);
+    if (!svc.isBinaryReady()) {
+      return { error: { code: "failed_precondition", message: "Codex binary not ready" } };
+    }
+    const apiProviderId = typeof p2.apiProviderId === "string" ? p2.apiProviderId : null;
+    return { result: await svc.getConfigRequirements(projectId, apiProviderId) };
   } catch (err) {
     return mapThrown4(err);
   }
@@ -73241,7 +74166,7 @@ async function handleGetAccountUsage(payload, ctx) {
 async function handleConsumeRateLimitReset(payload, ctx) {
   const denied = requireScopes4(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord16(payload);
   const projectId = projectIdOf(p2);
   if (!projectId) {
     return { error: { code: "invalid_argument", message: "projectId required" } };
@@ -73271,7 +74196,7 @@ async function handleConsumeRateLimitReset(payload, ctx) {
 async function handleLoginMcpOauth(payload, ctx) {
   const denied = requireScopes4(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord16(payload);
   const projectId = projectIdOf(p2);
   const serverName = String(p2.serverName ?? p2.name ?? "").trim();
   if (!projectId || !serverName) {
@@ -73281,8 +74206,15 @@ async function handleLoginMcpOauth(payload, ctx) {
   }
   try {
     const apiProviderId = typeof p2.apiProviderId === "string" ? p2.apiProviderId : null;
+    const rawOptions = asRecord16(p2.options);
+    const options = {
+      ...rawOptions.clientRegistration === "auto" || rawOptions.clientRegistration === "cimd" || rawOptions.clientRegistration === "dcr" ? { clientRegistration: rawOptions.clientRegistration } : {},
+      ...typeof rawOptions.threadId === "string" || rawOptions.threadId === null ? { threadId: rawOptions.threadId } : {},
+      ...Array.isArray(rawOptions.scopes) && rawOptions.scopes.every((scope) => typeof scope === "string") ? { scopes: rawOptions.scopes } : {},
+      ...typeof rawOptions.timeoutSecs === "number" && Number.isFinite(rawOptions.timeoutSecs) && rawOptions.timeoutSecs > 0 ? { timeoutSecs: rawOptions.timeoutSecs } : {}
+    };
     return {
-      result: await admin(ctx).loginMcpOauth(projectId, serverName, apiProviderId)
+      result: await admin(ctx).loginMcpOauth(projectId, serverName, apiProviderId, options)
     };
   } catch (err) {
     return mapThrown4(err);
@@ -73291,7 +74223,7 @@ async function handleLoginMcpOauth(payload, ctx) {
 async function handleDetectExternalAgent(payload, ctx) {
   const denied = requireScopes4(ctx.client, OPERATION_SCOPES.readEnvironment);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord16(payload);
   const projectId = projectIdOf(p2);
   if (!projectId) {
     return { error: { code: "invalid_argument", message: "projectId required" } };
@@ -73310,7 +74242,7 @@ async function handleDetectExternalAgent(payload, ctx) {
 async function handleImportExternalAgent(payload, ctx) {
   const denied = requireScopes4(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord16(payload);
   const projectId = projectIdOf(p2);
   if (!projectId) {
     return { error: { code: "invalid_argument", message: "projectId required" } };
@@ -73328,7 +74260,7 @@ async function handleImportExternalAgent(payload, ctx) {
 async function handlePluginsList2(payload, ctx) {
   const denied = requireScopes4(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord16(payload);
   const projectId = projectIdOf(p2);
   if (!projectId) {
     return { error: { code: "invalid_argument", message: "projectId required" } };
@@ -73351,7 +74283,7 @@ async function handlePluginsList2(payload, ctx) {
 async function handlePluginsInstall2(payload, ctx) {
   const denied = requireScopes4(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord16(payload);
   const projectId = projectIdOf(p2);
   const key = String(p2.key ?? p2.pluginId ?? "").trim();
   if (!projectId || !key) {
@@ -73367,7 +74299,7 @@ async function handlePluginsInstall2(payload, ctx) {
 async function handlePluginsUninstall(payload, ctx) {
   const denied = requireScopes4(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord16(payload);
   const projectId = projectIdOf(p2);
   const key = String(p2.key ?? p2.pluginId ?? "").trim();
   if (!projectId || !key) {
@@ -73383,7 +74315,7 @@ async function handlePluginsUninstall(payload, ctx) {
 async function handleMarketplaceAdd(payload, ctx) {
   const denied = requireScopes4(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord16(payload);
   const projectId = projectIdOf(p2);
   const source = String(p2.source ?? "").trim();
   if (!projectId || !source) {
@@ -73412,7 +74344,7 @@ async function handleMarketplaceAdd(payload, ctx) {
 async function handleMarketplaceRemove(payload, ctx) {
   const denied = requireScopes4(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord16(payload);
   const projectId = projectIdOf(p2);
   const marketplaceName = String(p2.marketplaceName ?? p2.name ?? "").trim();
   if (!projectId || !marketplaceName) {
@@ -73435,7 +74367,7 @@ async function handleMarketplaceRemove(payload, ctx) {
 async function handleMarketplaceUpgrade(payload, ctx) {
   const denied = requireScopes4(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord16(payload);
   const projectId = projectIdOf(p2);
   if (!projectId) {
     return { error: { code: "invalid_argument", message: "projectId required" } };
@@ -73468,7 +74400,7 @@ function requireScopes5(client3, scopes) {
   }
   return null;
 }
-function asRecord15(payload) {
+function asRecord17(payload) {
   return payload && typeof payload === "object" ? payload : {};
 }
 function mapThrown5(err) {
@@ -73497,7 +74429,7 @@ function dispatchSessionProviderRpc(method, payload, ctx) {
 function handleList(payload, ctx) {
   const denied = requireScopes5(ctx.client, OPERATION_SCOPES.readEnvironment);
   if (denied) return denied;
-  const p2 = asRecord15(payload);
+  const p2 = asRecord17(payload);
   try {
     const harnessId = typeof p2.harnessId === "string" && p2.harnessId.trim() ? p2.harnessId.trim() : null;
     const providers = harnessId ? ctx.sessionProviders.listByHarness(harnessId) : ctx.sessionProviders.list();
@@ -73509,7 +74441,7 @@ function handleList(payload, ctx) {
 function handleGet(payload, ctx) {
   const denied = requireScopes5(ctx.client, OPERATION_SCOPES.readEnvironment);
   if (denied) return denied;
-  const p2 = asRecord15(payload);
+  const p2 = asRecord17(payload);
   const id = String(p2.id ?? "");
   if (!id) return { error: { code: "invalid_argument", message: "id required" } };
   try {
@@ -73521,7 +74453,7 @@ function handleGet(payload, ctx) {
 function handleGetBase(payload, ctx) {
   const denied = requireScopes5(ctx.client, OPERATION_SCOPES.readEnvironment);
   if (denied) return denied;
-  const p2 = asRecord15(payload);
+  const p2 = asRecord17(payload);
   const harnessId = String(p2.harnessId ?? "");
   if (!harnessId) return { error: { code: "invalid_argument", message: "harnessId required" } };
   try {
@@ -73533,7 +74465,7 @@ function handleGetBase(payload, ctx) {
 function handleCreate(payload, ctx) {
   const denied = requireScopes5(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord15(payload);
+  const p2 = asRecord17(payload);
   try {
     const provider = ctx.sessionProviders.create({
       harnessId: String(p2.harnessId ?? ""),
@@ -73549,7 +74481,7 @@ function handleCreate(payload, ctx) {
 function handleUpdate(payload, ctx) {
   const denied = requireScopes5(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord15(payload);
+  const p2 = asRecord17(payload);
   const id = String(p2.id ?? "");
   if (!id) return { error: { code: "invalid_argument", message: "id required" } };
   try {
@@ -73565,7 +74497,7 @@ function handleUpdate(payload, ctx) {
 function handleDelete(payload, ctx) {
   const denied = requireScopes5(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord15(payload);
+  const p2 = asRecord17(payload);
   const id = String(p2.id ?? "");
   if (!id) return { error: { code: "invalid_argument", message: "id required" } };
   try {
@@ -73606,7 +74538,7 @@ function requireScopes6(client3, scopes) {
   }
   return null;
 }
-function asRecord16(payload) {
+function asRecord18(payload) {
   return payload && typeof payload === "object" ? payload : {};
 }
 function defaultProbeModels(ctx) {
@@ -73634,7 +74566,7 @@ async function dispatchHarnessResourcesRpc(method, payload, ctx) {
 async function handleHarnessResources(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.readEnvironment);
   if (denied) return denied;
-  const p2 = asRecord16(payload);
+  const p2 = asRecord18(payload);
   const projectId = String(p2.projectId ?? "");
   if (!projectId) {
     return { error: { code: "invalid_argument", message: "projectId required" } };
@@ -74076,7 +75008,7 @@ function handleProviderListCredentials(ctx) {
 function handleProviderGetCredentialDecrypted(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const cred = ctx.providers.getCredentialDecrypted(String(p2.id ?? ""));
   if (!cred) return { error: { code: "not_found", message: "credential not found" } };
   return { result: cred };
@@ -74084,7 +75016,7 @@ function handleProviderGetCredentialDecrypted(payload, ctx) {
 function handleProviderCreateCredential(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   try {
     return {
       result: ctx.providers.createCredential({
@@ -74106,7 +75038,7 @@ function handleProviderCreateCredential(payload, ctx) {
 function handleProviderUpdateCredential(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const id = String(p2.id ?? "");
   const updated = ctx.providers.updateCredential(id, {
     name: typeof p2.name === "string" ? p2.name : void 0,
@@ -74123,7 +75055,7 @@ function handleProviderUpdateCredential(payload, ctx) {
 function handleProviderDeleteCredential(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const ok = ctx.providers.deleteCredential(String(p2.id ?? ""));
   if (!ok) return { error: { code: "not_found", message: "credential not found" } };
   return { result: { ok: true } };
@@ -74136,7 +75068,7 @@ function handleProviderListBindings(ctx) {
 function handleProviderSetBinding(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const binding = p2;
   if (!binding.consumer || !binding.credentialId) {
     return { error: { code: "invalid_argument", message: "consumer and credentialId required" } };
@@ -74147,7 +75079,7 @@ function handleProviderSetBinding(payload, ctx) {
 function handleProviderClearBinding(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   ctx.providers.clearBinding(String(p2.consumer ?? ""));
   return { result: { ok: true } };
 }
@@ -74159,14 +75091,14 @@ function handleProviderListCustomPlatforms(ctx) {
 function handleProviderUpsertCustomPlatform(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const def = asRecord17(payload);
+  const def = asRecord19(payload);
   if (!def?.id) return { error: { code: "invalid_argument", message: "platform id required" } };
   return { result: ctx.providers.upsertCustomPlatform(def) };
 }
 function handleProviderDeleteCustomPlatform(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const ok = ctx.providers.deleteCustomPlatform(String(p2.id ?? ""));
   if (!ok) return { error: { code: "not_found", message: "custom platform not found" } };
   return { result: { ok: true } };
@@ -74179,7 +75111,7 @@ function handleProviderExportBundle(ctx) {
 function handleProviderListModels(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.readEnvironment);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const harness = String(p2.harness ?? p2.harnessId ?? "claude");
   const apiProviderId = typeof p2.apiProviderId === "string" && p2.apiProviderId.trim() ? p2.apiProviderId.trim() : null;
   return {
@@ -74191,7 +75123,7 @@ function handleProviderListModels(payload, ctx) {
 function handleProviderImportBundle(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const bundle = p2.bundle && typeof p2.bundle === "object" ? p2.bundle : p2;
   const replaceAll = p2.replaceAll === true;
   try {
@@ -74256,7 +75188,7 @@ function handleHarnessList(ctx) {
 function handleHarnessShow(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const id = typeof p2.harnessId === "string" ? p2.harnessId : typeof p2.id === "string" ? p2.id : "";
   if (!isNodeHarnessId(id)) {
     return { error: { code: "invalid_argument", message: `unknown harnessId: ${id}` } };
@@ -74266,7 +75198,7 @@ function handleHarnessShow(payload, ctx) {
 function handleHarnessProbe(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const id = typeof p2.harnessId === "string" ? p2.harnessId : typeof p2.id === "string" ? p2.id : "";
   if (!isNodeHarnessId(id)) {
     return { error: { code: "invalid_argument", message: `unknown harnessId: ${id}` } };
@@ -74281,7 +75213,7 @@ function handleHarnessProbe(payload, ctx) {
 async function handleHarnessEnable(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const id = typeof p2.harnessId === "string" ? p2.harnessId : typeof p2.id === "string" ? p2.id : "";
   if (!isNodeHarnessId(id)) {
     return { error: { code: "invalid_argument", message: `unknown harnessId: ${id}` } };
@@ -74307,7 +75239,7 @@ async function handleHarnessEnable(payload, ctx) {
 function handleHarnessDisable(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const id = typeof p2.harnessId === "string" ? p2.harnessId : typeof p2.id === "string" ? p2.id : "";
   if (!isNodeHarnessId(id)) {
     return { error: { code: "invalid_argument", message: `unknown harnessId: ${id}` } };
@@ -74372,7 +75304,7 @@ function handleSettingsGet(ctx) {
 function handleSettingsPatch(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const rawPatch = p2.patch && typeof p2.patch === "object" ? p2.patch : p2;
   try {
     const settings = patchNodeAgentSettings(
@@ -74393,13 +75325,13 @@ async function handleSandboxProbe(ctx) {
     return mapThrown7(err);
   }
 }
-function asRecord17(payload) {
+function asRecord19(payload) {
   return payload && typeof payload === "object" ? payload : {};
 }
 function handleTerminalCreate(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.operateTerminal);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const cwd = typeof p2.cwd === "string" ? p2.cwd : process.cwd();
   try {
     const info = ctx.terminals.create({
@@ -74424,7 +75356,7 @@ function handleTerminalCreate(payload, ctx) {
 function handleTerminalAttach(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.operateTerminal);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const terminalId = String(p2.terminalId ?? "");
   try {
     const attached = ctx.terminals.attach(terminalId);
@@ -74436,7 +75368,7 @@ function handleTerminalAttach(payload, ctx) {
 function handleTerminalRead(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.operateTerminal);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   try {
     return {
       result: ctx.terminals.readAfter(
@@ -74464,7 +75396,7 @@ function requireTerminalLease(payload, ctx, terminalId) {
 function handleTerminalWrite(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.operateTerminal);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const terminalId = String(p2.terminalId ?? "");
   const leaseErr = requireTerminalLease(p2, ctx, terminalId);
   if (leaseErr) return leaseErr;
@@ -74482,7 +75414,7 @@ function handleTerminalWrite(payload, ctx) {
 function handleTerminalResize(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.operateTerminal);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const terminalId = String(p2.terminalId ?? "");
   const leaseErr = requireTerminalLease(p2, ctx, terminalId);
   if (leaseErr) return leaseErr;
@@ -74498,7 +75430,7 @@ function handleTerminalResize(payload, ctx) {
 function handleTerminalKill(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.operateTerminal);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const terminalId = String(p2.terminalId ?? "");
   const leaseErr = requireTerminalLease(p2, ctx, terminalId);
   if (leaseErr) return leaseErr;
@@ -74512,7 +75444,7 @@ function handleTerminalKill(payload, ctx) {
 function handleTerminalAcquireControl(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.operateTerminal);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const terminalId = String(p2.terminalId ?? "");
   try {
     return {
@@ -74529,7 +75461,7 @@ function handleTerminalAcquireControl(payload, ctx) {
 function handleTerminalRenewControl(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.operateTerminal);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   try {
     return {
       result: ctx.leases.renew({
@@ -74546,7 +75478,7 @@ function handleTerminalRenewControl(payload, ctx) {
 function handleTerminalReleaseControl(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.operateTerminal);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   try {
     ctx.leases.release(
       String(p2.leaseId ?? ""),
@@ -74571,7 +75503,7 @@ function handleProjectList(ctx) {
 function handleProjectGet(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.readProject);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const projectId = String(p2.projectId ?? "");
   return { result: ctx.projects.get(projectId) };
 }
@@ -74587,7 +75519,7 @@ function expandHostPath(path) {
 function handleProjectOpen(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.manageProject);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const path = expandHostPath(String(p2.path ?? ""));
   if (!path) {
     return { error: { code: "invalid_argument", message: "path is required" } };
@@ -74605,7 +75537,7 @@ function handleProjectOpen(payload, ctx) {
 function handleProjectRemove(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.manageProject);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const projectId = typeof p2.projectId === "string" && p2.projectId ? p2.projectId : void 0;
   const pathRaw = typeof p2.path === "string" && p2.path ? expandHostPath(p2.path) : void 0;
   if (!projectId && !pathRaw) {
@@ -74624,7 +75556,7 @@ function handleProjectRemove(payload, ctx) {
 function handleFsListDir(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const raw = String(p2.path ?? "");
   if (!raw || raw.includes("\0")) {
     return { error: { code: "invalid_argument", message: "path is required" } };
@@ -74650,7 +75582,7 @@ function handleFsListDir(payload, ctx) {
 function handleWorkspaceListDir(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   try {
     return {
       result: ctx.workspaceFs.listDir(String(p2.projectId ?? ""), String(p2.relativePath ?? "."))
@@ -74662,7 +75594,7 @@ function handleWorkspaceListDir(payload, ctx) {
 function handleWorkspaceListFiles(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   try {
     return {
       result: {
@@ -74680,7 +75612,7 @@ function handleWorkspaceListFiles(payload, ctx) {
 function handleWorkspaceListSkills(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   try {
     return {
       result: ctx.workspaceFs.listSkillsAndCommands(String(p2.projectId ?? ""))
@@ -74692,7 +75624,7 @@ function handleWorkspaceListSkills(payload, ctx) {
 function handleWorkspaceReadFile(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   try {
     return {
       result: ctx.workspaceFs.readFile(String(p2.projectId ?? ""), String(p2.relativePath ?? ""), {
@@ -74707,7 +75639,7 @@ function handleWorkspaceReadFile(payload, ctx) {
 function handleWorkspaceWriteFile(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const raw = typeof p2.content === "string" ? p2.content : String(p2.content ?? "");
   const encoding = p2.encoding === "base64" ? "base64" : "utf8";
   let content = raw;
@@ -74737,7 +75669,7 @@ function handleWorkspaceWriteFile(payload, ctx) {
 function handleWorkspaceSearch(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   try {
     return {
       result: ctx.workspaceFs.search(
@@ -74753,7 +75685,7 @@ function handleWorkspaceSearch(payload, ctx) {
 function handleWorkspaceRename(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   try {
     return {
       result: ctx.workspaceFs.rename(
@@ -74769,7 +75701,7 @@ function handleWorkspaceRename(payload, ctx) {
 function handleWorkspaceMove(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   try {
     return {
       result: ctx.workspaceFs.move(
@@ -74785,7 +75717,7 @@ function handleWorkspaceMove(payload, ctx) {
 function handleWorkspaceDelete(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   try {
     return {
       result: ctx.workspaceFs.delete(
@@ -74800,7 +75732,7 @@ function handleWorkspaceDelete(payload, ctx) {
 function handleWorkspaceMkdir(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   try {
     return {
       result: ctx.workspaceFs.mkdir(
@@ -74815,7 +75747,7 @@ function handleWorkspaceMkdir(payload, ctx) {
 function handleWorkspaceWatchStart(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   try {
     const events = [];
     const { watchId, cancel } = ctx.workspaceWatch.subscribe(
@@ -74836,7 +75768,7 @@ function handleWorkspaceWatchStart(payload, ctx) {
 function handleWorkspaceWatchPoll(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const watchId = String(p2.watchId ?? "");
   const buf = watchBuffers.get(watchId);
   if (!buf || buf.owner !== ctx.client.clientSessionId) {
@@ -74848,7 +75780,7 @@ function handleWorkspaceWatchPoll(payload, ctx) {
 function handleWorkspaceWatchStop(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const watchId = String(p2.watchId ?? "");
   const buf = watchBuffers.get(watchId);
   if (buf && buf.owner === ctx.client.clientSessionId) {
@@ -74860,7 +75792,7 @@ function handleWorkspaceWatchStop(payload, ctx) {
 function handleWorkspaceTailWatchStart(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   try {
     const offset = typeof p2.offset === "number" ? p2.offset : void 0;
     const absolutePath = typeof p2.absolutePath === "string" ? p2.absolutePath : void 0;
@@ -74878,7 +75810,7 @@ function handleWorkspaceTailWatchStart(payload, ctx) {
 function handleWorkspaceTailWatchPoll(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   try {
     return {
       result: ctx.workspaceTailWatch.poll(String(p2.watchId ?? ""), ctx.client.clientSessionId)
@@ -74890,7 +75822,7 @@ function handleWorkspaceTailWatchPoll(payload, ctx) {
 function handleWorkspaceTailWatchStop(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   try {
     return {
       result: ctx.workspaceTailWatch.stop(String(p2.watchId ?? ""), ctx.client.clientSessionId)
@@ -74902,7 +75834,7 @@ function handleWorkspaceTailWatchStop(payload, ctx) {
 function handleGitStatus(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = typeof p2.cwd === "string" ? p2.cwd : null;
@@ -74916,7 +75848,7 @@ function handleGitStatus(payload, ctx) {
 function handleGitDiff(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   try {
     return {
       result: ctx.workspaceGit.diff(String(p2.projectId ?? ""), {
@@ -74931,7 +75863,7 @@ function handleGitDiff(payload, ctx) {
 function handleGitBranches(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   try {
     return {
       result: ctx.workspaceGit.branches(
@@ -74946,7 +75878,7 @@ function handleGitBranches(payload, ctx) {
 function handleGitSwitchBranch(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   try {
     return {
       result: ctx.workspaceGit.switchBranch(String(p2.projectId ?? ""), String(p2.branch ?? ""), {
@@ -74961,7 +75893,7 @@ function handleGitSwitchBranch(payload, ctx) {
 function handleGitCreateBranch(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   try {
     return {
       result: ctx.workspaceGit.switchBranch(String(p2.projectId ?? ""), String(p2.branch ?? ""), {
@@ -74976,7 +75908,7 @@ function handleGitCreateBranch(payload, ctx) {
 function handleGitWorktrees(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   try {
     return { result: ctx.workspaceGit.worktrees(String(p2.projectId ?? "")) };
   } catch (err) {
@@ -74986,7 +75918,7 @@ function handleGitWorktrees(payload, ctx) {
 function handleGitWorktreeActivate(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const mode = p2.mode === "attach" || p2.mode === "detach" || p2.mode === "branch" ? p2.mode : null;
   if (!mode) {
     return { error: { code: "invalid_argument", message: "mode must be branch|attach|detach" } };
@@ -75007,7 +75939,7 @@ function handleGitWorktreeActivate(payload, ctx) {
 function handleGitWorktreeCheckedOutBranches(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   try {
     return { result: { branches: ctx.workspaceGit.checkedOutBranches(String(p2.projectId ?? "")) } };
   } catch (err) {
@@ -75017,7 +75949,7 @@ function handleGitWorktreeCheckedOutBranches(payload, ctx) {
 function handleGitWorktreeAssignBranch(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   try {
     return {
       result: ctx.workspaceGit.assignBranch(
@@ -75033,7 +75965,7 @@ function handleGitWorktreeAssignBranch(payload, ctx) {
 function handleGitWorktreeHandoff(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   try {
     return {
       result: ctx.workspaceGit.handoffToMain(
@@ -75048,7 +75980,7 @@ function handleGitWorktreeHandoff(payload, ctx) {
 function handleGitWorktreeHandoffPreview(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   try {
     return {
       result: ctx.workspaceGit.handoffPreview(
@@ -75063,7 +75995,7 @@ function handleGitWorktreeHandoffPreview(payload, ctx) {
 function handleSessionSetCwd(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const sessionId = String(p2.sessionId ?? "");
   const cwdRaw = p2.cwd;
   const cwd = cwdRaw === null || cwdRaw === void 0 || cwdRaw === "" ? null : String(cwdRaw);
@@ -75092,7 +76024,7 @@ function handleSessionSetCwd(payload, ctx) {
 function handleSessionPatchSettings(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const sessionId = String(p2.sessionId ?? "").trim();
   if (!sessionId) {
     return { error: { code: "invalid_argument", message: "sessionId required" } };
@@ -75108,7 +76040,7 @@ function handleSessionPatchSettings(payload, ctx) {
       generation: String(p2.generation ?? ""),
       holderClientId: ctx.client.clientSessionId
     });
-    const settingsSrc = asRecord17(p2.settings ?? p2);
+    const settingsSrc = asRecord19(p2.settings ?? p2);
     const patch = {};
     const take = (key) => {
       if (!(key in settingsSrc)) return;
@@ -75134,7 +76066,7 @@ function handleSessionPatchSettings(payload, ctx) {
 async function handleSessionFork(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const sessionId = String(p2.sessionId ?? "").trim();
   if (!sessionId) {
     return { error: { code: "invalid_argument", message: "sessionId required" } };
@@ -75221,7 +76153,7 @@ async function handleSessionFork(payload, ctx) {
 async function handleGitClone(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.manageProject);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   try {
     const cloned = await cloneRepository({
       remoteUrl: String(p2.remoteUrl ?? ""),
@@ -75237,7 +76169,7 @@ async function handleGitClone(payload, ctx) {
 function handleSessionCreate(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const rawHarnessId = typeof p2.harnessId === "string" ? p2.harnessId : "claude";
   const harnessId = normalizeSessionHarnessId(rawHarnessId);
   if (!harnessId) {
@@ -75290,7 +76222,7 @@ function handleSessionCreate(payload, ctx) {
   try {
     const agentSettings = loadNodeAgentSettings(ctx.settingsConfigPath);
     const defaults = resolveAgentTurnDefaults(agentSettings, harnessId);
-    const options = asRecord17(p2.options);
+    const options = asRecord19(p2.options);
     const providerId = typeof p2.providerId === "string" && p2.providerId.trim() ? p2.providerId.trim() : void 0;
     const profile = providerId ? ctx.sessionProviders.get(providerId) : null;
     const profileSettings = profile ? settingsFromSessionProviderConfig(profile.config) : {};
@@ -75351,13 +76283,13 @@ function handleSessionCreate(payload, ctx) {
 function handleSessionGet(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.readSession);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   return { result: ctx.sessions.get(String(p2.sessionId ?? "")) };
 }
 function handleSessionList(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.readSession);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const projectId = typeof p2.projectId === "string" ? p2.projectId : void 0;
   if (typeof p2.limit !== "number" || !Number.isFinite(p2.limit)) {
     return { error: { code: "invalid_argument", message: "session.list requires finite limit" } };
@@ -75397,7 +76329,7 @@ function handleSessionList(payload, ctx) {
 function handleSessionAcquireControl(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const sessionId = String(p2.sessionId ?? "");
   if (!sessionId) {
     return { error: { code: "invalid_argument", message: "sessionId required" } };
@@ -75421,7 +76353,7 @@ function handleSessionAcquireControl(payload, ctx) {
 function handleSessionRenewControl(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   try {
     return {
       result: ctx.leases.renew({
@@ -75438,7 +76370,7 @@ function handleSessionRenewControl(payload, ctx) {
 function handleSessionReleaseControl(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   try {
     ctx.leases.release(
       String(p2.leaseId ?? ""),
@@ -75453,7 +76385,7 @@ function handleSessionReleaseControl(payload, ctx) {
 function handleSessionClose(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const sessionId = String(p2.sessionId ?? "");
   try {
     ctx.leases.assertValid({
@@ -75479,7 +76411,7 @@ function handleSessionClose(payload, ctx) {
 function handleSessionRemove(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const sessionId = String(p2.sessionId ?? "");
   if (!sessionId) {
     return { error: { code: "invalid_argument", message: "sessionId required" } };
@@ -75506,7 +76438,7 @@ function handleSessionRemove(payload, ctx) {
 function handleSessionRename(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const sessionId = String(p2.sessionId ?? "");
   const title = String(p2.title ?? "");
   const source = p2.source === "agent" ? "agent" : "user";
@@ -75522,7 +76454,7 @@ function handleSessionRename(payload, ctx) {
 function handleSessionSetTags(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const sessionId = String(p2.sessionId ?? "");
   if (!sessionId) {
     return { error: { code: "invalid_argument", message: "sessionId required" } };
@@ -75548,7 +76480,7 @@ function handleSessionSetTags(payload, ctx) {
 function handleSessionSetUiFlags(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const sessionId = String(p2.sessionId ?? "");
   if (!sessionId) {
     return { error: { code: "invalid_argument", message: "sessionId required" } };
@@ -75567,9 +76499,9 @@ function handleSessionSetUiFlags(payload, ctx) {
 async function handleSessionSend(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   try {
-    const options = asRecord17(p2.options);
+    const options = asRecord19(p2.options);
     const modelFromOptions = typeof options.model === "string" && options.model.trim() ? options.model.trim() : null;
     const modelTopLevel = typeof p2.model === "string" && p2.model.trim() ? p2.model.trim() : null;
     const apiProviderId = typeof options.apiProviderId === "string" && options.apiProviderId.trim() ? options.apiProviderId.trim() : typeof p2.apiProviderId === "string" && p2.apiProviderId.trim() ? p2.apiProviderId.trim() : null;
@@ -75662,7 +76594,7 @@ async function handleSessionSend(payload, ctx) {
 function handleSessionInterrupt(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   try {
     ctx.sessions.interrupt(
       String(p2.sessionId ?? ""),
@@ -75678,7 +76610,7 @@ function handleSessionInterrupt(payload, ctx) {
 function handleSessionRespondPermission(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   try {
     const formAnswers = p2.formAnswers && typeof p2.formAnswers === "object" && !Array.isArray(p2.formAnswers) ? p2.formAnswers : p2.options && typeof p2.options === "object" && !Array.isArray(p2.options) ? p2.options.formAnswers ?? p2.options : void 0;
     ctx.sessions.respondPermission({
@@ -75699,7 +76631,7 @@ function handleSessionRespondPermission(payload, ctx) {
 function handleSessionRespondQuestion(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   try {
     ctx.sessions.respondQuestion({
       sessionId: String(p2.sessionId ?? ""),
@@ -75717,7 +76649,7 @@ function handleSessionRespondQuestion(payload, ctx) {
 function handleSessionRespondPlan(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const decision = p2.decision === "approve" || p2.decision === "reject" ? p2.decision : null;
   if (!decision) {
     return { error: { code: "invalid_argument", message: "decision must be approve|reject" } };
@@ -75740,7 +76672,7 @@ function handleSessionRespondPlan(payload, ctx) {
 async function handleSessionHostActionsPoll(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   try {
     const result = await ctx.sessions.pollHostActions({
       controllerClientSessionId: ctx.client.clientSessionId,
@@ -75756,7 +76688,7 @@ async function handleSessionHostActionsPoll(payload, ctx) {
 function handleSessionClaimHostAction(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   try {
     const result = ctx.sessions.claimHostAction({
       actionId: String(p2.actionId ?? ""),
@@ -75772,7 +76704,7 @@ function handleSessionClaimHostAction(payload, ctx) {
 function handleSessionRespondHostAction(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const outcome = p2.outcome === "failed" ? "failed" : p2.outcome === "succeeded" ? "succeeded" : null;
   if (!outcome) {
     return { error: { code: "invalid_argument", message: "outcome must be succeeded|failed" } };
@@ -75794,14 +76726,14 @@ function handleSessionRespondHostAction(payload, ctx) {
 function handleSessionEvents(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.readSession);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const after = String(p2.afterSequence ?? "0");
   return { result: { events: ctx.sessions.listEventsAfter(after) } };
 }
 function handleSessionMessagesList(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.readSession);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const sessionId = String(p2.sessionId ?? "").trim();
   if (!sessionId) {
     return { error: { code: "invalid_argument", message: "sessionId required" } };
@@ -75840,7 +76772,7 @@ function handleCollaborationListProfiles(ctx) {
 async function handleCollaborationRequest(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const parentSessionId = String(p2.parentSessionId ?? "");
   if (!parentSessionId) {
     return { error: { code: "invalid_argument", message: "parentSessionId required" } };
@@ -75874,7 +76806,7 @@ async function handleCollaborationRequest(payload, ctx) {
 async function handleCollaborationStart(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const credential = typeof p2.credential === "string" ? p2.credential : void 0;
   const grantId = typeof p2.grantId === "string" ? p2.grantId : void 0;
   if (!credential && !grantId) {
@@ -75920,7 +76852,7 @@ async function handleCollaborationStart(payload, ctx) {
 function handleCollaborationSend(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const credential = String(p2.credential ?? "");
   const sessionId = String(p2.sessionId ?? p2.fromSessionId ?? "");
   const content = typeof p2.content === "string" ? p2.content : p2.body !== void 0 ? typeof p2.body === "string" ? p2.body : JSON.stringify(p2.body) : "";
@@ -75956,7 +76888,7 @@ function handleCollaborationSend(payload, ctx) {
 function handleCollaborationRetrieve(payload, ctx) {
   const denied = requireScopes7(ctx.client, OPERATION_SCOPES.readSession);
   if (denied) return denied;
-  const p2 = asRecord17(payload);
+  const p2 = asRecord19(payload);
   const credential = String(p2.credential ?? "");
   const sessionId = String(p2.sessionId ?? "");
   if (!credential) {
@@ -76802,8 +77734,8 @@ function requiredRuntimeVersion(harnessId, manifest) {
 import { existsSync as existsSync29, mkdirSync as mkdirSync18, readFileSync as readFileSync17, readdirSync as readdirSync10, statSync as statSync9, writeFileSync as writeFileSync13 } from "node:fs";
 import { arch as osArch2, platform as osPlatform2 } from "node:os";
 import { join as join27, resolve as resolve7 } from "node:path";
-var OFFICIAL_CLAUDE_SDK_VERSION = "0.3.232";
-var OFFICIAL_CODEX_NPM_VERSION = "0.147.0";
+var OFFICIAL_CLAUDE_SDK_VERSION = "0.3.238";
+var OFFICIAL_CODEX_NPM_VERSION = "0.149.0";
 var OFFICIAL_CODEX_PACKAGE = "@openai/codex";
 function codexPlatformPackageVersion(baseVersion = OFFICIAL_CODEX_NPM_VERSION) {
   const platform2 = process.platform;
@@ -94751,6 +95683,7 @@ async function startNodeRuntime(partial2 = {}) {
     allowSimulatedFallback: allowSimulatedTurnFallback,
     providers,
     experimentalClaudeOpenAiChatEnabled: () => loadNodeAgentSettings(paths.configJson).experimentalClaudeOpenAiChatEnabled,
+    askUserQuestionPreviewFormat: () => loadNodeAgentSettings(paths.configJson).claude.askUserQuestionPreviewFormat,
     // Claude: in-process SDK MCP (same core tools as HTTP).
     createHostActionClaudeMcp: (sessionId) => hostActionMcp.createClaudeSdkMcp(sessionId),
     // Codex / ACP / OpenCode: loopback HTTP with per-session HMAC.