@super-one/cli 0.50.8-alpha → 0.51.1-alpha

package/lib/cli.mjs

@@ -3485,6 +3485,31 @@ var init_session_messages = __esm({
   }
 });
 
+// ../../packages/shared/src/environment/provider-resume.ts
+function providerSessionIdFromResume(providerResume) {
+  const raw = typeof providerResume === "string" ? providerResume.trim() : "";
+  if (!raw) return null;
+  for (const prefix of RESUME_PREFIXES) {
+    if (raw.startsWith(prefix)) {
+      const id = raw.slice(prefix.length).trim();
+      return id.length > 0 ? id : null;
+    }
+  }
+  return raw;
+}
+var RESUME_PREFIXES;
+var init_provider_resume = __esm({
+  "../../packages/shared/src/environment/provider-resume.ts"() {
+    "use strict";
+    RESUME_PREFIXES = [
+      "claude-session:",
+      "thread:",
+      "acp-session:",
+      "opencode:"
+    ];
+  }
+});
+
 // ../../packages/shared/src/environment/lease.ts
 var init_lease = __esm({
   "../../packages/shared/src/environment/lease.ts"() {
@@ -3590,6 +3615,7 @@ var init_environment = __esm({
     init_events();
     init_session_events();
     init_session_messages();
+    init_provider_resume();
     init_lease();
     init_gateway();
     init_connection_supervisor_core();
@@ -10612,7 +10638,145 @@ var init_src2 = __esm({
   }
 });
 
-// ../../packages/runtime/src/session/message-catalog.ts
+// ../../packages/shared/src/content-delta.ts
+function parseInputObject(input) {
+  if (input == null || input === "") return {};
+  if (typeof input === "object" && !Array.isArray(input)) {
+    return input;
+  }
+  if (typeof input !== "string" || !input.trim()) return {};
+  try {
+    const parsed = JSON.parse(input);
+    return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : {};
+  } catch {
+    return {};
+  }
+}
+function mergeToolUseInputJson(existing, incoming) {
+  const prev = parseInputObject(existing);
+  const next = parseInputObject(incoming);
+  const asString7 = typeof existing === "string" || typeof incoming === "string";
+  if (Object.keys(next).length === 0) {
+    if (existing != null && existing !== "") return existing;
+    return asString7 ? typeof incoming === "string" ? incoming : "{}" : incoming ?? {};
+  }
+  if (Object.keys(prev).length === 0) {
+    return asString7 ? typeof incoming === "string" ? incoming : JSON.stringify(next) : next;
+  }
+  const merged = { ...prev, ...next };
+  for (const key of SUMMARY_INPUT_KEYS) {
+    const n = merged[key];
+    const empty = n == null || n === "";
+    if (empty && prev[key] != null && prev[key] !== "") {
+      merged[key] = prev[key];
+    }
+  }
+  if (!asString7) return merged;
+  try {
+    return JSON.stringify(merged);
+  } catch {
+    return typeof incoming === "string" ? incoming : "{}";
+  }
+}
+function pickRicherToolSummary(existing, incoming, mergedInput) {
+  const input = parseInputObject(mergedInput);
+  for (const key of ["query", "pattern", "command", "description"]) {
+    const v2 = input[key];
+    if (typeof v2 === "string" && v2.trim()) return v2.trim();
+  }
+  const a = existing?.trim() || "";
+  const b2 = incoming?.trim() || "";
+  const placeholders = /* @__PURE__ */ new Set(["Web search:", "web_search", "grep", "Grep", "Search"]);
+  if (b2 && !placeholders.has(b2)) return b2;
+  if (a && !placeholders.has(a)) return a;
+  return b2 || a || void 0;
+}
+function sameParent(a, b2) {
+  const ap = "parentToolUseId" in a ? a.parentToolUseId ?? null : null;
+  const bp = "parentToolUseId" in b2 ? b2.parentToolUseId ?? null : null;
+  return ap === bp;
+}
+function lastMergeTargetIndex(content, delta) {
+  for (let i = content.length - 1; i >= 0; i--) {
+    const b2 = content[i];
+    if (!sameParent(b2, delta)) continue;
+    if (b2.type === "tool_result") continue;
+    return i;
+  }
+  return -1;
+}
+function applyContentDelta(content, delta) {
+  if (delta.type === "text") {
+    const idx = lastMergeTargetIndex(content, delta);
+    const target = idx === -1 ? void 0 : content[idx];
+    if (target?.type === "text") {
+      return content.map((b2, i) => i === idx ? { ...target, text: target.text + delta.text } : b2);
+    }
+  }
+  if (delta.type === "thinking") {
+    const idx = lastMergeTargetIndex(content, delta);
+    const target = idx === -1 ? void 0 : content[idx];
+    if (target?.type === "thinking") {
+      return content.map((b2, i) => i === idx ? { ...target, thinking: target.thinking + delta.thinking, endedAt: delta.endedAt ?? target.endedAt } : b2);
+    }
+  }
+  if (delta.type === "tool_use") {
+    const idx = content.findIndex((b2) => b2.type === "tool_use" && b2.toolUseId === delta.toolUseId);
+    if (idx !== -1) {
+      const existing = content[idx];
+      if (existing.type !== "tool_use") {
+        return content.map((b2, i) => i === idx ? { ...delta, startedAt: Date.now() } : b2);
+      }
+      const mergedInput = mergeToolUseInputJson(existing.input, delta.input);
+      const mergedSummary = pickRicherToolSummary(
+        existing.toolSummary,
+        delta.toolSummary,
+        mergedInput
+      );
+      return content.map((b2, i) => i === idx ? {
+        ...existing,
+        ...delta,
+        startedAt: existing.startedAt,
+        elapsedSeconds: delta.elapsedSeconds ?? existing.elapsedSeconds,
+        status: delta.status ?? existing.status,
+        // ContentBlock.input is typed as string; object form is test/legacy only.
+        input: mergedInput,
+        toolSummary: mergedSummary,
+        toolFilePath: delta.toolFilePath || existing.toolFilePath
+      } : b2);
+    }
+    return [...content, { ...delta, startedAt: Date.now() }];
+  }
+  if (delta.type === "tool_result") {
+    const updated = content.map(
+      (b2) => b2.type === "tool_use" && b2.toolUseId === delta.toolUseId ? { ...b2, status: "complete" } : b2
+    );
+    return [...updated, delta];
+  }
+  return [...content, delta];
+}
+var SUMMARY_INPUT_KEYS;
+var init_content_delta = __esm({
+  "../../packages/shared/src/content-delta.ts"() {
+    "use strict";
+    SUMMARY_INPUT_KEYS = [
+      "query",
+      "pattern",
+      "command",
+      "description",
+      "file_path",
+      "path",
+      "url",
+      "prompt",
+      "skill",
+      "tool_name",
+      "subject",
+      "task_id"
+    ];
+  }
+});
+
+// ../../packages/shared/src/node-session-event-map.ts
 function asRecord5(value) {
   if (value && typeof value === "object" && !Array.isArray(value)) {
     return value;
@@ -10622,6 +10786,461 @@ function asRecord5(value) {
 function asString2(value) {
   return typeof value === "string" ? value : void 0;
 }
+function asBool(value) {
+  return typeof value === "boolean" ? value : void 0;
+}
+function coerceToolInput(value) {
+  if (typeof value === "string") return value;
+  if (value == null) return "";
+  try {
+    return JSON.stringify(value);
+  } catch {
+    return "";
+  }
+}
+function stamp(event, ctx, sequence) {
+  const seqNum = sequence && /^\d+$/.test(sequence) ? Number(sequence) : void 0;
+  return {
+    ...event,
+    ...ctx.projectPath ? { projectPath: ctx.projectPath } : {},
+    sessionId: ctx.sessionId,
+    ...seqNum !== void 0 && Number.isFinite(seqNum) ? { seq: seqNum } : {}
+  };
+}
+function mapQuestionRequest(payload, fallbackId) {
+  const interactionId = asString2(payload.interactionId) ?? asString2(payload.requestId) ?? fallbackId;
+  const input = asRecord5(payload.input);
+  const rawQuestions = Array.isArray(payload.questions) ? payload.questions : Array.isArray(input.questions) ? input.questions : [];
+  const questions = [];
+  for (const q of rawQuestions) {
+    if (!q || typeof q !== "object") continue;
+    const row = q;
+    const question = asString2(row.question) ?? asString2(row.header) ?? "";
+    if (!question) continue;
+    const optionsRaw = Array.isArray(row.options) ? row.options : [];
+    const options = optionsRaw.map((opt) => {
+      if (!opt || typeof opt !== "object") return null;
+      const o = opt;
+      const label = asString2(o.label) ?? asString2(o.value) ?? "";
+      if (!label) return null;
+      return {
+        label,
+        description: asString2(o.description) ?? "",
+        ...asString2(o.preview) ? { preview: asString2(o.preview) } : {}
+      };
+    }).filter((o) => o != null);
+    questions.push({
+      question,
+      header: asString2(row.header) ?? question,
+      options,
+      multiSelect: row.multiSelect === true || row.multiple === true
+    });
+  }
+  if (questions.length === 0) {
+    questions.push({
+      question: asString2(payload.toolName) ? `Respond to ${asString2(payload.toolName)}` : "Continue?",
+      header: "Question",
+      options: [{ label: "Yes", description: "" }, { label: "No", description: "" }],
+      multiSelect: false
+    });
+  }
+  return { requestId: interactionId, questions };
+}
+function mapPlanRequest(payload, fallbackId) {
+  const interactionId = asString2(payload.interactionId) ?? asString2(payload.requestId) ?? fallbackId;
+  const input = asRecord5(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 {
+      planContent = JSON.stringify(input.plan);
+    } catch {
+      planContent = "";
+    }
+  }
+  return {
+    requestId: interactionId,
+    planContent: planContent || "Plan approval required",
+    planFilePath: asString2(payload.planFilePath) ?? asString2(input.planFilePath) ?? "",
+    allowedPrompts: Array.isArray(payload.allowedPrompts) ? payload.allowedPrompts : Array.isArray(input.allowedPrompts) ? input.allowedPrompts : []
+  };
+}
+function userMessage(ctx, blockId, text, nowIso) {
+  return {
+    id: blockId,
+    role: "user",
+    status: "complete",
+    content: text ? [{ type: "text", text }] : [],
+    createdAt: nowIso,
+    providerId: ctx.providerId ?? "codex"
+  };
+}
+function assistantMessage(ctx, blockId, nowIso) {
+  return {
+    id: blockId,
+    role: "assistant",
+    status: "streaming",
+    content: [],
+    createdAt: nowIso,
+    providerId: ctx.providerId ?? "codex"
+  };
+}
+function mapAgentStatus(status, fallback) {
+  if (status === "streaming" || status === "idle" || status === "error" || status === "background") {
+    return status;
+  }
+  if (status === "interrupted" || status === "ended" || status === "unknown") return "idle";
+  return fallback;
+}
+function createNodeSessionEventMapper(ctx) {
+  const startedAssistantIds = /* @__PURE__ */ new Set();
+  const completedAssistantIds = /* @__PURE__ */ new Set();
+  let lastAssistantId = null;
+  let rawTerminalThisTurn = false;
+  const nowIso = ctx.nowIso ?? (() => (/* @__PURE__ */ new Date()).toISOString());
+  const ensureAssistant = (push, preferredId) => {
+    if (lastAssistantId) return lastAssistantId;
+    const id = preferredId && preferredId.length > 0 ? preferredId : `assistant-${ctx.sessionId}`;
+    if (!startedAssistantIds.has(id)) {
+      startedAssistantIds.add(id);
+      push({
+        type: "message_start",
+        message: assistantMessage(ctx, id, nowIso())
+      });
+    }
+    lastAssistantId = id;
+    return id;
+  };
+  const mapOne = (envelope) => {
+    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 out = [];
+    const push = (event) => {
+      out.push(stamp(event, ctx, envelope.sequence));
+    };
+    switch (eventType) {
+      case SESSION_DURABLE_EVENT.userMessage: {
+        if (ctx.skipUserMessage) break;
+        const blockId = asString2(payload.blockId) ?? `user-${envelope.eventId}`;
+        const text = asString2(payload.text) ?? "";
+        push({
+          type: "user_message_appended",
+          message: userMessage(ctx, blockId, text, nowIso())
+        });
+        break;
+      }
+      case SESSION_DURABLE_EVENT.turnStarted: {
+        lastAssistantId = null;
+        rawTerminalThisTurn = false;
+        push({
+          type: "status_change",
+          status: mapAgentStatus(asString2(payload.status), "streaming")
+        });
+        break;
+      }
+      case SESSION_DURABLE_EVENT.agentEvent: {
+        const rawEvent = asRecord5(payload.event);
+        const type = asString2(rawEvent.type);
+        if (!type) break;
+        const eventRecord = { ...rawEvent };
+        delete eventRecord.projectPath;
+        delete eventRecord.sessionId;
+        delete eventRecord.draftSessionId;
+        delete eventRecord.seq;
+        delete eventRecord.epoch;
+        const event = eventRecord;
+        const rawMessageId = type === "message_start" ? asString2(asRecord5(eventRecord.message).id) : asString2(eventRecord.messageId);
+        if (type === "message_start" && rawMessageId) {
+          startedAssistantIds.add(rawMessageId);
+          lastAssistantId = rawMessageId;
+        } else if (rawMessageId) {
+          ensureAssistant(push, rawMessageId);
+        }
+        push(event);
+        if (rawMessageId && (type === "message_complete" || type === "message_error" || type === "message_interrupted")) {
+          completedAssistantIds.add(rawMessageId);
+          rawTerminalThisTurn = true;
+        }
+        break;
+      }
+      case SESSION_DURABLE_EVENT.assistantDelta: {
+        const wireBlockId = asString2(payload.blockId);
+        const messageId = ensureAssistant(push, wireBlockId ?? `assistant-${envelope.eventId}`);
+        const delta = asString2(payload.delta) ?? asString2(payload.text) ?? "";
+        if (delta) {
+          push({
+            type: "content_delta",
+            messageId,
+            delta: { type: "text", text: delta }
+          });
+        }
+        break;
+      }
+      case SESSION_DURABLE_EVENT.assistantText: {
+        const wireBlockId = asString2(payload.blockId);
+        const text = asString2(payload.text) ?? "";
+        const first = lastAssistantId == null;
+        const messageId = ensureAssistant(push, wireBlockId ?? `assistant-${envelope.eventId}`);
+        if (first && text) {
+          push({
+            type: "content_delta",
+            messageId,
+            delta: { type: "text", text }
+          });
+        }
+        break;
+      }
+      case SESSION_DURABLE_EVENT.assistantMessage: {
+        const wireBlockId = asString2(payload.blockId);
+        if (wireBlockId && completedAssistantIds.has(wireBlockId)) break;
+        const text = asString2(payload.text);
+        const wasOpen = lastAssistantId != null;
+        const messageId = ensureAssistant(push, wireBlockId ?? `assistant-${envelope.eventId}`);
+        if (!wasOpen && text) {
+          push({
+            type: "content_delta",
+            messageId,
+            delta: { type: "text", text }
+          });
+        }
+        push({ type: "message_complete", messageId });
+        break;
+      }
+      case SESSION_DURABLE_EVENT.toolStarted: {
+        const toolUseId = asString2(payload.toolUseId) ?? envelope.eventId;
+        const toolName = asString2(payload.toolName) ?? "tool";
+        const input = coerceToolInput(payload.input);
+        const parentToolUseId = asString2(payload.parentToolUseId) ?? null;
+        const messageId = ensureAssistant(push, `assistant-${envelope.eventId}`);
+        push({
+          type: "content_delta",
+          messageId,
+          delta: {
+            type: "tool_use",
+            toolUseId,
+            toolName,
+            input,
+            status: "streaming",
+            parentToolUseId
+          }
+        });
+        break;
+      }
+      case SESSION_DURABLE_EVENT.toolInputDelta: {
+        const toolUseId = asString2(payload.toolUseId) ?? envelope.eventId;
+        const partialJson = asString2(payload.inputDelta) ?? asString2(payload.partialJson) ?? (typeof payload.input === "string" ? payload.input : "");
+        if (!partialJson) break;
+        const messageId = ensureAssistant(push, `assistant-${envelope.eventId}`);
+        push({
+          type: "tool_input_delta",
+          messageId,
+          toolUseId,
+          partialJson,
+          parentToolUseId: asString2(payload.parentToolUseId) ?? null
+        });
+        break;
+      }
+      case SESSION_DURABLE_EVENT.toolCompleted:
+      case SESSION_DURABLE_EVENT.toolFailed: {
+        const toolUseId = asString2(payload.toolUseId) ?? envelope.eventId;
+        const toolName = asString2(payload.toolName) ?? "tool";
+        const output = asString2(payload.output) ?? "";
+        const isError = eventType === SESSION_DURABLE_EVENT.toolFailed || asBool(payload.isError) === true;
+        const messageId = ensureAssistant(push, `assistant-${envelope.eventId}`);
+        push({
+          type: "content_delta",
+          messageId,
+          delta: {
+            type: "tool_use",
+            toolUseId,
+            toolName,
+            input: coerceToolInput(payload.input),
+            status: "complete",
+            parentToolUseId: asString2(payload.parentToolUseId) ?? null
+          }
+        });
+        push({
+          type: "content_delta",
+          messageId,
+          delta: {
+            type: "tool_result",
+            toolUseId,
+            summary: output || (isError ? "failed" : "done"),
+            isError,
+            parentToolUseId: asString2(payload.parentToolUseId) ?? null
+          }
+        });
+        break;
+      }
+      case SESSION_DURABLE_EVENT.turnCompleted: {
+        if (rawTerminalThisTurn) {
+          lastAssistantId = null;
+          rawTerminalThisTurn = false;
+          break;
+        }
+        lastAssistantId = null;
+        push({
+          type: "status_change",
+          status: mapAgentStatus(asString2(payload.status), "idle")
+        });
+        break;
+      }
+      case SESSION_DURABLE_EVENT.turnInterrupted: {
+        if (rawTerminalThisTurn) {
+          lastAssistantId = null;
+          rawTerminalThisTurn = false;
+          break;
+        }
+        if (lastAssistantId) {
+          push({ type: "message_interrupted", messageId: lastAssistantId });
+        }
+        lastAssistantId = null;
+        push({ type: "status_change", status: "idle" });
+        break;
+      }
+      case SESSION_DURABLE_EVENT.turnError: {
+        if (rawTerminalThisTurn) {
+          lastAssistantId = null;
+          rawTerminalThisTurn = false;
+          break;
+        }
+        const message = asString2(payload.message) ?? "remote turn failed";
+        const errorId = ensureAssistant(push);
+        push({ type: "message_error", messageId: errorId, error: message });
+        lastAssistantId = null;
+        push({ type: "status_change", status: "error" });
+        break;
+      }
+      case SESSION_DURABLE_EVENT.statusChanged: {
+        push({
+          type: "status_change",
+          status: mapAgentStatus(asString2(payload.status), "idle")
+        });
+        break;
+      }
+      case SESSION_DURABLE_EVENT.permissionRequested: {
+        const interactionId = asString2(payload.interactionId) ?? asString2(payload.requestId) ?? envelope.eventId;
+        const toolName = asString2(payload.toolName) ?? "tool";
+        const requestKind = asString2(payload.requestKind);
+        const sessionAgentsConfirm = payload.sessionAgentsConfirm && typeof payload.sessionAgentsConfirm === "object" ? payload.sessionAgentsConfirm : void 0;
+        const request = {
+          requestId: interactionId,
+          toolName,
+          toolUseId: asString2(payload.toolUseId),
+          input: asRecord5(payload.input),
+          allowAlwaysAllow: requestKind === "session_agents_confirm" ? false : payload.allowAlwaysAllow !== false,
+          ...requestKind ? {
+            requestKind
+          } : {},
+          ...asString2(payload.serverName) ? { serverName: asString2(payload.serverName) } : {},
+          ...asString2(payload.message) ? { message: asString2(payload.message) } : {},
+          ...sessionAgentsConfirm ? { sessionAgentsConfirm } : {}
+        };
+        push({ type: "permission_request", request });
+        break;
+      }
+      case SESSION_DURABLE_EVENT.permissionResponded:
+      case SESSION_DURABLE_EVENT.permissionTimeout:
+      case SESSION_DURABLE_EVENT.permissionAborted: {
+        const interactionId = asString2(payload.interactionId) ?? asString2(payload.requestId) ?? envelope.eventId;
+        const decision = asString2(payload.decision);
+        const approved = decision === "allow" || decision === "allow_always";
+        push({
+          type: "interaction_resolved",
+          interactionType: "permission",
+          requestId: interactionId,
+          approved
+        });
+        break;
+      }
+      case SESSION_DURABLE_EVENT.questionRequested: {
+        const request = mapQuestionRequest(payload, envelope.eventId);
+        if (request) push({ type: "ask_user_question", request });
+        break;
+      }
+      case SESSION_DURABLE_EVENT.questionResponded:
+      case SESSION_DURABLE_EVENT.questionTimeout:
+      case SESSION_DURABLE_EVENT.questionAborted: {
+        const interactionId = asString2(payload.interactionId) ?? asString2(payload.requestId) ?? envelope.eventId;
+        push({
+          type: "interaction_resolved",
+          interactionType: "question",
+          requestId: interactionId,
+          approved: eventType === SESSION_DURABLE_EVENT.questionResponded
+        });
+        break;
+      }
+      case SESSION_DURABLE_EVENT.planRequested: {
+        const request = mapPlanRequest(payload, envelope.eventId);
+        if (request) push({ type: "plan_approval", request });
+        break;
+      }
+      case SESSION_DURABLE_EVENT.planResponded:
+      case SESSION_DURABLE_EVENT.planTimeout:
+      case SESSION_DURABLE_EVENT.planAborted: {
+        const interactionId = asString2(payload.interactionId) ?? asString2(payload.requestId) ?? envelope.eventId;
+        const decision = asString2(payload.decision);
+        const approved = decision === "approve" || decision === "approved";
+        push({
+          type: "interaction_resolved",
+          interactionType: "plan_approval",
+          requestId: interactionId,
+          approved,
+          ...asString2(payload.feedback) ? { feedback: asString2(payload.feedback) } : {}
+        });
+        break;
+      }
+      case SESSION_DURABLE_EVENT.renamed: {
+        const title = asString2(payload.title);
+        if (title != null) {
+          const sourceRaw = asString2(payload.source);
+          const source = sourceRaw === "agent" || sourceRaw === "user" ? sourceRaw : "user";
+          push({
+            type: "session_title_changed",
+            sessionId: ctx.sessionId,
+            title,
+            source
+          });
+        }
+        break;
+      }
+      case SESSION_DURABLE_EVENT.closed:
+      case SESSION_DURABLE_EVENT.removed: {
+        push({ type: "status_change", status: "idle" });
+        break;
+      }
+      case SESSION_DURABLE_EVENT.created:
+      case SESSION_DURABLE_EVENT.reconciled:
+      case SESSION_DURABLE_EVENT.uiFlags:
+        break;
+      default:
+        break;
+    }
+    return out;
+  };
+  return {
+    map: mapOne,
+    currentAssistantMessageId: () => lastAssistantId
+  };
+}
+var init_node_session_event_map = __esm({
+  "../../packages/shared/src/node-session-event-map.ts"() {
+    "use strict";
+    init_session_events();
+  }
+});
+
+// ../../packages/runtime/src/session/message-catalog.ts
+function asRecord6(value) {
+  if (value && typeof value === "object" && !Array.isArray(value)) {
+    return value;
+  }
+  return {};
+}
+function asString3(value) {
+  return typeof value === "string" ? value : void 0;
+}
 function truncate(text, max = SUMMARY_MAX) {
   if (text.length <= max) return text;
   return `${text.slice(0, max)}\u2026`;
@@ -10696,7 +11315,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 = asRecord5(ev.payload);
+    const payload = asRecord6(ev.payload);
     switch (ev.eventType) {
       case SESSION_DURABLE_EVENT.turnStarted: {
         turnKey += 1;
@@ -10712,47 +11331,47 @@ function collectToolsByAssistantId(events, sessionId) {
       }
       case SESSION_DURABLE_EVENT.assistantDelta:
       case SESSION_DURABLE_EVENT.assistantText: {
-        const blockId = asString2(payload.blockId);
+        const blockId = asString3(payload.blockId);
         if (blockId) bindAssistant(blockId);
         break;
       }
       case SESSION_DURABLE_EVENT.assistantMessage: {
-        const blockId = asString2(payload.blockId);
+        const blockId = asString3(payload.blockId);
         if (blockId) bindAssistant(blockId, { authoritative: true });
         break;
       }
       case SESSION_DURABLE_EVENT.agentEvent: {
-        const raw = asRecord5(payload.event);
-        const type = asString2(raw.type);
+        const raw = asRecord6(payload.event);
+        const type = asString3(raw.type);
         if (type === "message_start") {
-          const id = asString2(asRecord5(raw.message).id);
+          const id = asString3(asRecord6(raw.message).id);
           if (id) bindAssistant(id);
         } else if (type === "message_complete") {
-          const id = asString2(raw.messageId);
+          const id = asString3(raw.messageId);
           if (id) bindAssistant(id, { authoritative: true });
         } else if (type === "content_delta") {
-          const messageId = asString2(raw.messageId);
+          const messageId = asString3(raw.messageId);
           if (messageId) bindAssistant(messageId);
-          const delta = asRecord5(raw.delta);
-          const dType = asString2(delta.type);
+          const delta = asRecord6(raw.delta);
+          const dType = asString3(delta.type);
           if (dType === "tool_use") {
-            const toolUseId = asString2(delta.toolUseId);
+            const toolUseId = asString3(delta.toolUseId);
             if (!toolUseId) break;
             const key = currentAssistantId ?? provisionalKey;
             const bucket = ensureBucket(key);
             const existing = bucket.get(toolUseId) ?? {
               toolUseId,
-              toolName: asString2(delta.toolName) ?? "tool"
+              toolName: asString3(delta.toolName) ?? "tool"
             };
-            existing.toolName = asString2(delta.toolName) ?? existing.toolName;
+            existing.toolName = asString3(delta.toolName) ?? existing.toolName;
             const input = coerceSummary(delta.input);
             if (input) existing.inputSummary = input;
             if (delta.parentToolUseId !== void 0) {
-              existing.parentToolUseId = asString2(delta.parentToolUseId) ?? null;
+              existing.parentToolUseId = asString3(delta.parentToolUseId) ?? null;
             }
             bucket.set(toolUseId, existing);
           } else if (dType === "tool_result") {
-            const toolUseId = asString2(delta.toolUseId);
+            const toolUseId = asString3(delta.toolUseId);
             if (!toolUseId) break;
             const key = currentAssistantId ?? provisionalKey;
             const bucket = ensureBucket(key);
@@ -10770,34 +11389,34 @@ function collectToolsByAssistantId(events, sessionId) {
       }
       case SESSION_DURABLE_EVENT.toolStarted:
       case SESSION_DURABLE_EVENT.toolInputDelta: {
-        const toolUseId = asString2(payload.toolUseId);
+        const toolUseId = asString3(payload.toolUseId);
         if (!toolUseId) break;
         const key = currentAssistantId ?? provisionalKey;
         const bucket = ensureBucket(key);
         const existing = bucket.get(toolUseId) ?? {
           toolUseId,
-          toolName: asString2(payload.toolName) ?? "tool"
+          toolName: asString3(payload.toolName) ?? "tool"
         };
-        existing.toolName = asString2(payload.toolName) ?? existing.toolName;
+        existing.toolName = asString3(payload.toolName) ?? existing.toolName;
         const input = coerceSummary(payload.input) ?? coerceSummary(payload.inputDelta) ?? existing.inputSummary;
         if (input) existing.inputSummary = input;
         if (payload.parentToolUseId !== void 0) {
-          existing.parentToolUseId = asString2(payload.parentToolUseId) ?? null;
+          existing.parentToolUseId = asString3(payload.parentToolUseId) ?? null;
         }
         bucket.set(toolUseId, existing);
         break;
       }
       case SESSION_DURABLE_EVENT.toolCompleted:
       case SESSION_DURABLE_EVENT.toolFailed: {
-        const toolUseId = asString2(payload.toolUseId);
+        const toolUseId = asString3(payload.toolUseId);
         if (!toolUseId) break;
         const key = currentAssistantId ?? provisionalKey;
         const bucket = ensureBucket(key);
         const existing = bucket.get(toolUseId) ?? {
           toolUseId,
-          toolName: asString2(payload.toolName) ?? "tool"
+          toolName: asString3(payload.toolName) ?? "tool"
         };
-        existing.toolName = asString2(payload.toolName) ?? existing.toolName;
+        existing.toolName = asString3(payload.toolName) ?? existing.toolName;
         const input = coerceSummary(payload.input);
         if (input) existing.inputSummary = input;
         const output = coerceSummary(payload.output);
@@ -10806,7 +11425,7 @@ function collectToolsByAssistantId(events, sessionId) {
           existing.isError = true;
         }
         if (payload.parentToolUseId !== void 0) {
-          existing.parentToolUseId = asString2(payload.parentToolUseId) ?? null;
+          existing.parentToolUseId = asString3(payload.parentToolUseId) ?? null;
         }
         bucket.set(toolUseId, existing);
         break;
@@ -10839,16 +11458,72 @@ function collectToolsByAssistantId(events, sessionId) {
   }
   return out;
 }
+function collectContentByAssistantId(events, sessionId) {
+  const contentById = /* @__PURE__ */ new Map();
+  const mapper = createNodeSessionEventMapper({ sessionId });
+  const mergeContent = (fromId, toId) => {
+    if (!fromId || !toId || fromId === toId) return;
+    const from = contentById.get(fromId);
+    if (!from || from.length === 0) return;
+    const to = contentById.get(toId);
+    if (!to || to.length === 0) {
+      contentById.set(toId, from);
+    } else {
+      contentById.set(toId, from.length >= to.length ? from : to);
+    }
+    contentById.delete(fromId);
+  };
+  for (const envelope of events) {
+    if (envelope.aggregateType && envelope.aggregateType !== "session") continue;
+    if (envelope.aggregateId && envelope.aggregateId !== sessionId) continue;
+    const stickyBefore = mapper.currentAssistantMessageId();
+    const mapped = mapper.map(envelope);
+    for (const ev of mapped) {
+      if (ev.type === "content_delta" && ev.messageId) {
+        const prev = contentById.get(ev.messageId) ?? [];
+        contentById.set(ev.messageId, applyContentDelta(prev, ev.delta));
+        continue;
+      }
+      if (ev.type === "tool_input_delta" && ev.messageId && ev.toolUseId && ev.partialJson) {
+        const prev = contentById.get(ev.messageId) ?? [];
+        let changed = false;
+        const next = prev.map((block) => {
+          if (block.type !== "tool_use" || block.toolUseId !== ev.toolUseId) return block;
+          changed = true;
+          return { ...block, input: `${block.input ?? ""}${ev.partialJson}` };
+        });
+        if (changed) contentById.set(ev.messageId, next);
+      }
+    }
+    const payload = asRecord6(envelope.payload);
+    if (envelope.eventType === SESSION_DURABLE_EVENT.assistantMessage) {
+      const blockId = asString3(payload.blockId);
+      const sticky = stickyBefore ?? mapper.currentAssistantMessageId();
+      if (blockId && sticky) mergeContent(sticky, blockId);
+      const text = asString3(payload.text);
+      if (blockId && text) {
+        const prev = contentById.get(blockId) ?? [];
+        const hasTopLevelText = prev.some(
+          (b2) => b2.type === "text" && (b2.parentToolUseId == null || b2.parentToolUseId === void 0)
+        );
+        if (!hasTopLevelText) {
+          contentById.set(blockId, applyContentDelta(prev, { type: "text", text }));
+        }
+      }
+    }
+  }
+  return contentById;
+}
 function extractCheckpointMeta(events, sessionId, blockId) {
   for (let i = events.length - 1; i >= 0; i--) {
     const ev = events[i];
     if (ev.aggregateType && ev.aggregateType !== "session") continue;
     if (ev.aggregateId && ev.aggregateId !== sessionId) continue;
-    const payload = asRecord5(ev.payload);
+    const payload = asRecord6(ev.payload);
     if (ev.eventType === SESSION_DURABLE_EVENT.assistantMessage) {
-      if (asString2(payload.blockId) !== blockId) continue;
-      const checkpointId = asString2(payload.checkpointId);
-      const resumePointId = asString2(payload.resumePointId);
+      if (asString3(payload.blockId) !== blockId) continue;
+      const checkpointId = asString3(payload.checkpointId);
+      const resumePointId = asString3(payload.resumePointId);
       const metadata = payload.metadata && typeof payload.metadata === "object" ? payload.metadata : void 0;
       if (checkpointId || resumePointId || metadata) {
         return {
@@ -10859,14 +11534,14 @@ function extractCheckpointMeta(events, sessionId, blockId) {
       }
     }
     if (ev.eventType === SESSION_DURABLE_EVENT.agentEvent) {
-      const raw = asRecord5(payload.event);
-      if (asString2(raw.type) !== "message_complete" && asString2(raw.type) !== "checkpoint_captured") {
+      const raw = asRecord6(payload.event);
+      if (asString3(raw.type) !== "message_complete" && asString3(raw.type) !== "checkpoint_captured") {
         continue;
       }
-      const messageId = asString2(raw.messageId) ?? asString2(raw.id);
+      const messageId = asString3(raw.messageId) ?? asString3(raw.id);
       if (messageId && messageId !== blockId) continue;
-      const checkpointId = asString2(raw.checkpointId);
-      const resumePointId = asString2(raw.resumePointId);
+      const checkpointId = asString3(raw.checkpointId);
+      const resumePointId = asString3(raw.resumePointId);
       if (checkpointId || resumePointId) {
         return {
           ...checkpointId ? { checkpointId } : {},
@@ -10879,12 +11554,14 @@ function extractCheckpointMeta(events, sessionId, blockId) {
 }
 function buildSessionMessageCatalog(session, events) {
   const toolsByAssistant = collectToolsByAssistantId(events, session.sessionId);
+  const contentByAssistant = collectContentByAssistantId(events, session.sessionId);
   const transcript = Array.isArray(session.transcript) ? session.transcript : [];
   const out = [];
   for (let i = 0; i < transcript.length; i++) {
     const block = transcript[i];
     const role = block.role === "user" || block.role === "assistant" || block.role === "system" ? block.role : "system";
     const tools = role === "assistant" ? toolsByAssistant.get(block.id) : void 0;
+    const orderedContent = role === "assistant" ? contentByAssistant.get(block.id) : void 0;
     const extra = role === "assistant" ? extractCheckpointMeta(events, session.sessionId, block.id) : {};
     let resumePointId = extra.resumePointId;
     if (!resumePointId && role === "assistant" && i === transcript.length - 1 && session.providerResume) {
@@ -10896,6 +11573,7 @@ function buildSessionMessageCatalog(session, events) {
       text: typeof block.text === "string" ? block.text : "",
       createdAt: typeof block.createdAt === "number" ? block.createdAt : Date.now(),
       sortOrder: i,
+      ...orderedContent && orderedContent.length > 0 ? { content: orderedContent } : {},
       ...tools && tools.length > 0 ? { tools } : {},
       ...extra.metadata ? { metadata: extra.metadata } : {},
       ...extra.checkpointId ? { checkpointId: extra.checkpointId } : {},
@@ -10921,7 +11599,9 @@ var DEFAULT_LIMIT, MAX_LIMIT, SUMMARY_MAX;
 var init_message_catalog = __esm({
   "../../packages/runtime/src/session/message-catalog.ts"() {
     "use strict";
+    init_content_delta();
     init_environment();
+    init_node_session_event_map();
     DEFAULT_LIMIT = 50;
     MAX_LIMIT = 200;
     SUMMARY_MAX = 2e3;
@@ -14282,6 +14962,12 @@ function familyBaseUrl(family, baseUrl) {
   if (family === "openai" || family === "newapi") return `${trimmed}/v1`;
   return trimmed;
 }
+function harnessChatProtocols(harness, options) {
+  if (harness === "claude" && options?.experimentalClaudeOpenAiChatEnabled) {
+    return [...HARNESS_CHAT_PROTOCOLS.claude, "openai-chat"];
+  }
+  return HARNESS_CHAT_PROTOCOLS[harness];
+}
 var PROTOCOL_TASKS, PROTOCOL_FAMILIES, PROTOCOL_FAMILY, FAMILY_PROTOCOLS, PROTOCOL_ORDER, CAPABILITY_ORDER, FAMILY_TASK_PROTOCOL, FAMILY_TASKS, HARNESS_CHAT_PROTOCOLS, PROXY_TRANSFORMERS_ENV;
 var init_protocols = __esm({
   "../../packages/shared/src/platform-registry/protocols.ts"() {
@@ -14354,7 +15040,7 @@ var init_protocols = __esm({
       google: CAPABILITY_ORDER.filter((task) => FAMILY_TASK_PROTOCOL.google[task])
     };
     HARNESS_CHAT_PROTOCOLS = {
-      claude: ["anthropic-messages", "openai-chat"],
+      claude: ["anthropic-messages"],
       codex: ["openai-responses", "openai-chat"]
     };
     PROXY_TRANSFORMERS_ENV = "SUPERONE_PROXY_TRANSFORMERS";
@@ -14463,11 +15149,31 @@ var init_model_tasks = __esm({
 });
 
 // ../../packages/shared/src/platform-registry/relay-discovery.ts
+var CANONICAL_CATALOG_PROVIDERS, FIRST_PARTY_CATALOG_PROVIDERS;
 var init_relay_discovery = __esm({
   "../../packages/shared/src/platform-registry/relay-discovery.ts"() {
     "use strict";
     init_model_tasks();
     init_protocols();
+    CANONICAL_CATALOG_PROVIDERS = ["openai", "anthropic", "google"];
+    FIRST_PARTY_CATALOG_PROVIDERS = /* @__PURE__ */ new Set([
+      ...CANONICAL_CATALOG_PROVIDERS,
+      "xai",
+      "deepseek",
+      "mistral",
+      "cohere",
+      "meta",
+      "moonshotai",
+      "moonshotai-cn",
+      "zhipuai",
+      "zhipuai-coding-plan",
+      "alibaba",
+      "alibaba-cn",
+      "minimax",
+      "minimax-cn",
+      "bytedance",
+      "perplexity"
+    ]);
   }
 });
 
@@ -15431,16 +16137,16 @@ function findPlatform(platforms, platformId) {
 function findPlan(platform2, planId) {
   return platform2?.plans.find((p2) => p2.id === planId);
 }
-function selectProtocol(endpoint, task, harness) {
+function selectProtocol(endpoint, task, harness, options) {
   const serving = endpoint.protocols.filter((p2) => protocolServes(p2, task));
-  if (harness) return HARNESS_CHAT_PROTOCOLS[harness].find((p2) => serving.includes(p2));
+  if (harness) return harnessChatProtocols(harness, options).find((p2) => serving.includes(p2));
   return [...serving].sort((a, b2) => PROTOCOL_ORDER.indexOf(a) - PROTOCOL_ORDER.indexOf(b2))[0];
 }
-function selectEndpoint(plan, consumer, endpointId, credential, endpoints = plan.endpoints) {
+function selectEndpoint(plan, consumer, endpointId, credential, endpoints = plan.endpoints, options) {
   const task = CONSUMER_TASK[consumer];
   const harness = consumer === "chat:claude" ? "claude" : consumer === "chat:codex" ? "codex" : void 0;
   const pick3 = (e) => {
-    const protocol = selectProtocol(e, task, harness);
+    const protocol = selectProtocol(e, task, harness, options);
     if (!protocol) return void 0;
     if (harness) return protocol;
     if (!credential) return protocol;
@@ -15462,7 +16168,7 @@ function selectEndpoint(plan, consumer, endpointId, credential, endpoints = plan
     }
   }
   if (harness) {
-    for (const proto of HARNESS_CHAT_PROTOCOLS[harness]) {
+    for (const proto of harnessChatProtocols(harness, options)) {
       const endpoint = endpoints.find((e) => e.protocols.includes(proto) && protocolServes(proto, task));
       if (endpoint) return { endpoint, protocol: proto };
     }
@@ -15490,7 +16196,7 @@ var init_platform_registry = __esm({
 });
 
 // ../../packages/runtime/src/llm-proxy/claude-messages/helpers.ts
-function asString3(value) {
+function asString4(value) {
   return typeof value === "string" ? value : void 0;
 }
 function asArray(value) {
@@ -15534,13 +16240,13 @@ function splitLeadingThinkBlock(text) {
 }
 function extractReasoningFieldText(value) {
   for (const key of ["reasoning_content", "reasoning"]) {
-    const text = asString3(get(value, key));
+    const text = asString4(get(value, key));
     if (text) return text;
   }
   const reasoning = get(value, "reasoning");
   if (reasoning) {
     for (const key of ["content", "text", "summary"]) {
-      const text = asString3(get(reasoning, key));
+      const text = asString4(get(reasoning, key));
       if (text) return text;
     }
   }
@@ -15549,12 +16255,12 @@ function extractReasoningFieldText(value) {
     if (typeof details === "string") return details || void 0;
     const arr = asArray(details);
     if (arr) {
-      const joined = arr.map((part) => asString3(get(part, "text")) ?? asString3(get(part, "content")) ?? asString3(part)).filter((t) => !!t).join("\n\n");
+      const joined = arr.map((part) => asString4(get(part, "text")) ?? asString4(get(part, "content")) ?? asString4(part)).filter((t) => !!t).join("\n\n");
       return joined || void 0;
     }
     const obj = asObject(details);
     if (obj) {
-      const text = asString3(get(obj, "text")) ?? asString3(get(obj, "content")) ?? asString3(get(obj, "summary"));
+      const text = asString4(get(obj, "text")) ?? asString4(get(obj, "content")) ?? asString4(get(obj, "summary"));
       if (text) return text;
     }
   }
@@ -15582,7 +16288,7 @@ function isOpenAiOSeries2(model) {
 function mapThinkingToEffort(thinking, maxTokens) {
   const t = asObject2(thinking);
   if (!t) return null;
-  const type = asString4(t.type);
+  const type = asString5(t.type);
   if (type === "disabled") return null;
   if (type === "adaptive") return "medium";
   if (type === "enabled") {
@@ -15608,7 +16314,7 @@ function stripModelPrefix(model, providerName) {
 function asObject2(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value) ? value : void 0;
 }
-function asString4(value) {
+function asString5(value) {
   return typeof value === "string" ? value : void 0;
 }
 var init_capabilities3 = __esm({
@@ -15621,7 +16327,7 @@ var init_capabilities3 = __esm({
 function claudeMessagesToChatCompletions(body, providerName) {
   const result = {};
   const src = asObject(body) ?? {};
-  const rawModel = asString3(src.model) ?? "";
+  const rawModel = asString4(src.model) ?? "";
   const model = stripModelPrefix(rawModel, providerName);
   result.model = model;
   const maxTokens = typeof src.max_tokens === "number" ? src.max_tokens : void 0;
@@ -15664,11 +16370,11 @@ function claudeMessagesToChatCompletions(body, providerName) {
   return result;
 }
 function systemTextFromClaude(value) {
-  const str2 = asString3(value);
+  const str2 = asString4(value);
   if (str2 !== void 0) return str2;
   const arr = asArray(value);
   if (arr) {
-    return arr.map((part) => asString3(get(part, "text")) ?? asString3(part)).filter((s2) => !!s2).join("\n\n");
+    return arr.map((part) => asString4(get(part, "text")) ?? asString4(part)).filter((s2) => !!s2).join("\n\n");
   }
   return "";
 }
@@ -15676,7 +16382,7 @@ function appendClaudeMessagesAsChat(src, messages) {
   const arr = asArray(src);
   if (!arr) return;
   for (const item of arr) {
-    const role = asString3(get(item, "role"));
+    const role = asString4(get(item, "role"));
     if (role === "assistant") {
       messages.push(claudeAssistantToChat(item));
     } else if (role === "user") {
@@ -15696,9 +16402,9 @@ function claudeUserToChat(item) {
     const chatParts = [];
     let hasNonText = false;
     for (const part of parts) {
-      const partType = asString3(get(part, "type")) ?? "";
+      const partType = asString4(get(part, "type")) ?? "";
       if (partType === "text" || partType === "input_text") {
-        const t = asString3(get(part, "text"));
+        const t = asString4(get(part, "text"));
         if (t) chatParts.push({ type: "text", text: t });
       } else if (partType === "image" || partType === "input_image") {
         hasNonText = true;
@@ -15706,11 +16412,11 @@ function claudeUserToChat(item) {
         const imageUrl = get(part, "image_url");
         let url2;
         if (source) {
-          const mediaType = asString3(get(source, "media_type")) ?? "image/png";
-          const data = asString3(get(source, "data"));
+          const mediaType = asString4(get(source, "media_type")) ?? "image/png";
+          const data = asString4(get(source, "data"));
           if (data) url2 = `data:${mediaType};base64,${data}`;
         } else if (imageUrl !== void 0) {
-          url2 = asString3(imageUrl) ?? "";
+          url2 = asString4(imageUrl) ?? "";
         }
         if (url2) chatParts.push({ type: "image_url", image_url: { url: url2 } });
       }
@@ -15743,17 +16449,17 @@ function extractThinkingFromAssistant(item) {
   const content = asArray(get(item, "content"));
   if (content) {
     for (const part of content) {
-      if (asString3(get(part, "type")) === "thinking") {
-        const thinking = asString3(get(part, "thinking"));
+      if (asString4(get(part, "type")) === "thinking") {
+        const thinking = asString4(get(part, "thinking"));
         if (thinking) return thinking;
       }
     }
   }
-  return asString3(get(item, "reasoning_content"));
+  return asString4(get(item, "reasoning_content"));
 }
 function claudeToolUseToChatToolCall(item) {
-  const callId = asString3(get(item, "id")) ?? asString3(get(item, "tool_use_id"));
-  const name = asString3(get(item, "name"));
+  const callId = asString4(get(item, "id")) ?? asString4(get(item, "tool_use_id"));
+  const name = asString4(get(item, "name"));
   if (!callId || !name) return void 0;
   const input = get(item, "input") ?? get(item, "arguments");
   return {
@@ -15763,13 +16469,13 @@ function claudeToolUseToChatToolCall(item) {
   };
 }
 function claudeFunctionCallToChatToolCall(functionCall) {
-  const callId = asString3(get(functionCall, "id")) ?? "call_0";
-  const name = asString3(get(functionCall, "name")) ?? "";
+  const callId = asString4(get(functionCall, "id")) ?? "call_0";
+  const name = asString4(get(functionCall, "name")) ?? "";
   const args = canonicalizeToolArguments(get(functionCall, "arguments"));
   return { id: callId, type: "function", function: { name, arguments: args } };
 }
 function claudeToolResultToChat(item) {
-  const toolUseId = asString3(get(item, "tool_use_id")) ?? asString3(get(item, "call_id")) ?? "";
+  const toolUseId = asString4(get(item, "tool_use_id")) ?? asString4(get(item, "call_id")) ?? "";
   const content = get(item, "content");
   const text = contentToText(content);
   const isError = get(item, "is_error") === true;
@@ -15781,7 +16487,7 @@ function claudeToolResultToChat(item) {
   };
 }
 function claudeToolToChatTool(tool) {
-  const name = asString3(get(tool, "name"));
+  const name = asString4(get(tool, "name"));
   if (!name) return void 0;
   const schema = asObject(get(tool, "input_schema"));
   const parameters = schema ?? asObject(get(tool, "parameters")) ?? {};
@@ -15798,29 +16504,29 @@ function claudeToolToChatTool(tool) {
 function claudeToolChoiceToChat(toolChoice) {
   const obj = asObject(toolChoice);
   if (obj) {
-    const type = asString3(obj.type);
+    const type = asString4(obj.type);
     if (type === "tool" || type === "function") {
-      const name = asString3(obj.name) ?? asString3(get(obj, "function.name"));
+      const name = asString4(obj.name) ?? asString4(get(obj, "function.name"));
       if (name) return { type: "function", function: { name } };
     }
     if (type === "any") return "required";
     if (type === "auto" || type === "none") return type;
   }
-  if (asString3(toolChoice) === "none" || asString3(toolChoice) === "auto" || asString3(toolChoice) === "required") {
+  if (asString4(toolChoice) === "none" || asString4(toolChoice) === "auto" || asString4(toolChoice) === "required") {
     return toolChoice;
   }
   return toolChoice;
 }
 function contentToText(content) {
   if (content === null || content === void 0) return void 0;
-  const str2 = asString3(content);
+  const str2 = asString4(content);
   if (str2 !== void 0) return str2;
   const parts = asArray(content);
   if (!parts) return void 0;
   const textParts = parts.map((part) => {
-    const partType = asString3(get(part, "type")) ?? "";
-    if (partType === "text" || partType === "input_text") return asString3(get(part, "text"));
-    if (partType === "thinking") return asString3(get(part, "thinking"));
+    const partType = asString4(get(part, "type")) ?? "";
+    if (partType === "text" || partType === "input_text") return asString4(get(part, "text"));
+    if (partType === "thinking") return asString4(get(part, "thinking"));
     return void 0;
   }).filter((s2) => s2 !== void 0);
   if (textParts.length === 0) return void 0;
@@ -15830,8 +16536,8 @@ function collapseSystemMessagesToHead(messages) {
   const systemChunks = [];
   const rest = [];
   for (const msg of messages) {
-    if (asString3(msg.role) === "system") {
-      const text = asString3(msg.content);
+    if (asString4(msg.role) === "system") {
+      const text = asString4(msg.content);
       if (text !== void 0) {
         if (text.trim()) systemChunks.push(text);
         continue;
@@ -15875,10 +16581,10 @@ function chatCompletionToMessage(body) {
   if (choice === void 0) throw new Error("Empty choices in chat response");
   const message = get(choice, "message");
   if (message === void 0) throw new Error("No message in chat choice");
-  const messageId = messageIdFromChatId(asString3(get(body, "id")));
-  const model = asString3(get(body, "model")) ?? "";
+  const messageId = messageIdFromChatId(asString4(get(body, "id")));
+  const model = asString4(get(body, "model")) ?? "";
   const createdAt = typeof get(body, "created") === "number" ? get(body, "created") : 0;
-  const finishReason = asString3(get(choice, "finish_reason"));
+  const finishReason = asString4(get(choice, "finish_reason"));
   const reasoning = chatReasoningText(message);
   const output = [];
   const reasoningItem = chatReasoningToOutputItem(reasoning, messageId);
@@ -15909,7 +16615,7 @@ function chatReasoningToOutputItem(reasoning, messageId) {
 function chatReasoningText(message) {
   const field = extractReasoningFieldText(message);
   if (field) return field;
-  const content = asString3(get(message, "content"));
+  const content = asString4(get(message, "content"));
   if (content) {
     const split = splitLeadingThinkBlock(content);
     if (split && split.reasoning) return split.reasoning;
@@ -15918,7 +16624,7 @@ function chatReasoningText(message) {
 }
 function chatMessageToOutputItem(message, messageId) {
   const content = [];
-  const text = asString3(get(message, "content"));
+  const text = asString4(get(message, "content"));
   if (text !== void 0) {
     const answer = splitLeadingThinkBlock(text)?.answer ?? text;
     if (answer) content.push({ type: "text", text: answer, annotations: [] });
@@ -15926,12 +16632,12 @@ function chatMessageToOutputItem(message, messageId) {
     const parts = asArray(get(message, "content"));
     if (parts) {
       for (const part of parts) {
-        const partType = asString3(get(part, "type")) ?? "";
+        const partType = asString4(get(part, "type")) ?? "";
         if (partType === "text" || partType === "output_text") {
-          const t = asString3(get(part, "text"));
+          const t = asString4(get(part, "text"));
           if (t) content.push({ type: "text", text: t, annotations: [] });
         } else if (partType === "refusal") {
-          const t = asString3(get(part, "refusal"));
+          const t = asString4(get(part, "refusal"));
           if (t) content.push({ type: "text", text: t, annotations: [] });
         }
       }
@@ -15957,9 +16663,9 @@ function chatToolCallsToOutputItems(message) {
   return output;
 }
 function chatToolCallToOutputItem(toolCall, index) {
-  const callId = asString3(get(toolCall, "id"))?.trim() || `call_${index}`;
+  const callId = asString4(get(toolCall, "id"))?.trim() || `call_${index}`;
   const fn = get(toolCall, "function");
-  const name = asString3(get(fn, "name")) ?? "";
+  const name = asString4(get(fn, "name")) ?? "";
   const args = canonicalizeToolArguments(get(fn, "arguments"));
   return {
     type: "tool_use",
@@ -15969,8 +16675,8 @@ function chatToolCallToOutputItem(toolCall, index) {
   };
 }
 function chatLegacyFunctionCallToOutputItem(functionCall) {
-  const callId = asString3(get(functionCall, "id"))?.trim() || "call_0";
-  const name = asString3(get(functionCall, "name")) ?? "";
+  const callId = asString4(get(functionCall, "id"))?.trim() || "call_0";
+  const name = asString4(get(functionCall, "name")) ?? "";
   const args = canonicalizeToolArguments(get(functionCall, "arguments"));
   return {
     type: "tool_use",
@@ -16022,13 +16728,13 @@ function chatErrorToMessageError(body) {
       error: { type: "upstream_error", message: "Upstream returned an empty error response" }
     };
   }
-  const str2 = asString3(body);
+  const str2 = asString4(body);
   if (str2 !== void 0) {
     return { type: "error", error: { type: "upstream_error", message: str2 } };
   }
   const source = get(body, "error") ?? body;
-  const message = asString3(get(source, "message")) ?? asString3(get(source, "detail")) ?? asString3(get(source, "status_msg")) ?? asString3(get(get(source, "base_resp"), "status_msg")) ?? asString3(source) ?? safeStringify(source);
-  const errorType = asString3(get(source, "type")) ?? "upstream_error";
+  const message = asString4(get(source, "message")) ?? asString4(get(source, "detail")) ?? asString4(get(source, "status_msg")) ?? asString4(get(get(source, "base_resp"), "status_msg")) ?? asString4(source) ?? safeStringify(source);
+  const errorType = asString4(get(source, "type")) ?? "upstream_error";
   return {
     type: "error",
     error: { type: errorType, message }
@@ -16121,8 +16827,8 @@ function stripLeadingThinkOpenTag(text) {
 }
 function extractChatSseError(value) {
   const error51 = get(value, "error") ?? value;
-  const message = asString3(error51) ?? asString3(get(error51, "message")) ?? asString3(get(error51, "detail")) ?? JSON.stringify(error51);
-  const errorType = asString3(get(error51, "type")) ?? asString3(get(error51, "code"));
+  const message = asString4(error51) ?? asString4(get(error51, "message")) ?? asString4(get(error51, "detail")) ?? JSON.stringify(error51);
+  const errorType = asString4(get(error51, "type")) ?? asString4(get(error51, "code"));
   return { message, errorType: errorType ?? void 0 };
 }
 function stripSseField(line, field) {
@@ -16232,9 +16938,9 @@ var init_stream = __esm({
       inputTokens;
       handleChatChunk(chunk) {
         const events = [];
-        const id = asString3(get(chunk, "id"));
+        const id = asString4(get(chunk, "id"));
         if (id) this.responseId = messageIdFromChatId(id);
-        const model = asString3(get(chunk, "model"));
+        const model = asString4(get(chunk, "model"));
         if (model) this.model = model;
         const created = get(chunk, "created");
         if (typeof created === "number") this.createdAt = created;
@@ -16254,7 +16960,7 @@ var init_stream = __esm({
         if (delta !== void 0) {
           const reasoning = extractReasoningFieldText(delta);
           if (reasoning) events.push(...this.pushReasoningDelta(reasoning));
-          const content = asString3(get(delta, "content"));
+          const content = asString4(get(delta, "content"));
           if (content) events.push(...this.pushContentDelta(content));
           const toolCalls = asArray(get(delta, "tool_calls"));
           if (toolCalls) {
@@ -16264,7 +16970,7 @@ var init_stream = __esm({
             for (const toolCall of toolCalls) events.push(...this.pushToolCallDelta(toolCall, reasoningForTool));
           }
         }
-        const finishReason = asString3(get(choice, "finish_reason"));
+        const finishReason = asString4(get(choice, "finish_reason"));
         if (finishReason) this.finishReason = finishReason;
         return events;
       }
@@ -16420,10 +17126,10 @@ var init_stream = __esm({
       }
       pushToolCallDelta(toolCall, reasoning) {
         const chatIndex = typeof get(toolCall, "index") === "number" ? get(toolCall, "index") : 0;
-        const idDelta = asString3(get(toolCall, "id"));
+        const idDelta = asString4(get(toolCall, "id"));
         const fn = get(toolCall, "function");
-        const nameDelta = asString3(get(fn, "name"));
-        const argsDelta = asString3(get(fn, "arguments")) ?? "";
+        const nameDelta = asString4(get(fn, "name"));
+        const argsDelta = asString4(get(fn, "arguments")) ?? "";
         let state = this.tools.get(chatIndex);
         if (!state) {
           state = newToolCall();
@@ -16640,7 +17346,7 @@ var init_transformer = __esm({
 });
 
 // ../../packages/runtime/src/llm-proxy/codex-responses/helpers.ts
-function asString5(value) {
+function asString6(value) {
   return typeof value === "string" ? value : void 0;
 }
 function asArray2(value) {
@@ -16701,7 +17407,7 @@ function stripLeadingThinkOpenTag2(text) {
 }
 function detailPartText(value) {
   for (const key of ["text", "content", "summary"]) {
-    const text = asString5(get2(value, key));
+    const text = asString6(get2(value, key));
     if (text) return text;
   }
   const parts = asArray2(get2(value, "parts"));
@@ -16723,13 +17429,13 @@ function detailsText(value) {
 }
 function extractReasoningFieldText2(value) {
   for (const key of ["reasoning_content", "reasoning"]) {
-    const text = asString5(get2(value, key));
+    const text = asString6(get2(value, key));
     if (text) return text;
   }
   const reasoning = get2(value, "reasoning");
   if (reasoning) {
     for (const key of ["content", "text", "summary"]) {
-      const text = asString5(get2(reasoning, key));
+      const text = asString6(get2(reasoning, key));
       if (text) return text;
     }
   }
@@ -16742,22 +17448,22 @@ function extractReasoningFieldText2(value) {
 }
 function extractReasoningSummaryText(value) {
   for (const key of ["reasoning_content", "content", "text"]) {
-    const text = asString5(get2(value, key));
+    const text = asString6(get2(value, key));
     if (text) return text;
   }
   const summary = get2(value, "summary");
   if (summary === void 0) return void 0;
-  const asStr = asString5(summary);
+  const asStr = asString6(summary);
   if (asStr !== void 0) return asStr || void 0;
   const parts = asArray2(summary);
   if (!parts) return void 0;
-  const joined = parts.map((part) => asString5(get2(part, "text")) ?? asString5(get2(part, "content")) ?? asString5(part)).filter((t) => !!t).join("\n\n");
+  const joined = parts.map((part) => asString6(get2(part, "text")) ?? asString6(get2(part, "content")) ?? asString6(part)).filter((t) => !!t).join("\n\n");
   return joined || void 0;
 }
 function appendReasoningContent(message, reasoning) {
   const trimmed = reasoning.trim();
   if (!trimmed) return false;
-  const existing = asString5(message.reasoning_content);
+  const existing = asString6(message.reasoning_content);
   if (existing) {
     message.reasoning_content = `${existing}
 
@@ -16785,7 +17491,7 @@ function applyCodexChatReasoning(result, body, config2) {
   if (!config2) return;
   const reasoning = asObject4(asObject4(body)?.reasoning);
   if (!reasoning) return;
-  const rawEffort = asString5(reasoning.effort);
+  const rawEffort = asString6(reasoning.effort);
   const reasoningEnabled = rawEffort ? !isDisabled(rawEffort) : true;
   if (config2.supportsThinking) {
     if (config2.thinkingParam === "thinking") {
@@ -16901,7 +17607,7 @@ function responsesToChatCompletions(body, reasoningConfig) {
   if (instructions) messages.push({ role: "system", content: instructions });
   appendResponsesInputAsChatMessages(src.input, messages);
   result.messages = collapseSystemMessagesToHead2(messages);
-  const model = asString5(src.model) ?? "";
+  const model = asString6(src.model) ?? "";
   if (src.max_output_tokens !== void 0) {
     if (isOpenAiOSeries3(model)) result.max_completion_tokens = src.max_output_tokens;
     else result.max_tokens = src.max_output_tokens;
@@ -16928,17 +17634,17 @@ function responsesToChatCompletions(body, reasoningConfig) {
   return result;
 }
 function instructionText(value) {
-  const str2 = asString5(value);
+  const str2 = asString6(value);
   if (str2 !== void 0) return str2;
   const arr = asArray2(value);
   if (arr) {
-    return arr.map((part) => asString5(get2(part, "text")) ?? asString5(part)).filter((s2) => !!s2).join("\n\n");
+    return arr.map((part) => asString6(get2(part, "text")) ?? asString6(part)).filter((s2) => !!s2).join("\n\n");
   }
   return "";
 }
 function appendResponsesInputAsChatMessages(input, messages) {
   const state = { pendingToolCalls: [], pendingReasoning: void 0, lastAssistantIndex: void 0 };
-  const str2 = asString5(input);
+  const str2 = asString6(input);
   if (str2 !== void 0) {
     messages.push({ role: "user", content: str2 });
   } else {
@@ -16953,7 +17659,7 @@ function appendResponsesInputAsChatMessages(input, messages) {
   backfillToolCallReasoningPlaceholders(messages);
 }
 function appendResponsesItem(item, messages, state) {
-  const itemType = asString5(get2(item, "type"));
+  const itemType = asString6(get2(item, "type"));
   switch (itemType) {
     case "function_call": {
       appendUniquePendingReasoning(state, extractReasoningFieldText2(item));
@@ -16962,7 +17668,7 @@ function appendResponsesItem(item, messages, state) {
     }
     case "function_call_output": {
       flushPendingToolCalls(messages, state);
-      const callId = asString5(get2(item, "call_id")) ?? "";
+      const callId = asString6(get2(item, "call_id")) ?? "";
       messages.push({ role: "tool", tool_call_id: callId, content: functionCallOutput(get2(item, "output")) });
       return;
     }
@@ -16983,7 +17689,7 @@ function appendResponsesItem(item, messages, state) {
   }
 }
 function functionCallOutput(output) {
-  const str2 = asString5(output);
+  const str2 = asString6(output);
   if (str2 !== void 0) return canonicalizeJsonStringIfParseable(str2);
   if (output === void 0) return "";
   return canonicalJsonString(output);
@@ -16997,7 +17703,7 @@ function flushPendingToolCalls(messages, state) {
   messages.push(message);
 }
 function responsesMessageItemToChatMessage(item, state) {
-  const role = asString5(get2(item, "role")) ?? "user";
+  const role = asString6(get2(item, "role")) ?? "user";
   const chatRole = responsesRoleToChatRole(role);
   const content = "content" in (asObject4(item) ?? {}) ? responsesContentToChatContent(get2(item, "content")) : null;
   const message = { role: chatRole, content };
@@ -17023,7 +17729,7 @@ function responsesRoleToChatRole(role) {
   }
 }
 function updateLastAssistantIndex(messages, message, state) {
-  const role = asString5(message.role);
+  const role = asString6(message.role);
   if (role === "assistant") state.lastAssistantIndex = messages.length;
   else if (role !== "tool") state.lastAssistantIndex = void 0;
 }
@@ -17052,51 +17758,51 @@ function attachReasoningToLastAssistant(messages, lastAssistantIndex, reasoning)
   if (!trimmed) return true;
   if (lastAssistantIndex === void 0) return false;
   const message = messages[lastAssistantIndex];
-  if (!message || asString5(message.role) !== "assistant") return false;
+  if (!message || asString6(message.role) !== "assistant") return false;
   appendReasoningContent(message, trimmed);
   return true;
 }
 function backfillToolCallReasoningPlaceholders(messages) {
   for (const message of messages) {
-    const isToolCall = asString5(message.role) === "assistant" && (asArray2(message.tool_calls)?.length ?? 0) > 0;
-    if (isToolCall && !asString5(message.reasoning_content)?.trim()) {
+    const isToolCall = asString6(message.role) === "assistant" && (asArray2(message.tool_calls)?.length ?? 0) > 0;
+    if (isToolCall && !asString6(message.reasoning_content)?.trim()) {
       message.reasoning_content = "tool call";
     }
   }
 }
 function responsesContentToChatContent(content) {
   if (content === null || content === void 0) return null;
-  const str2 = asString5(content);
+  const str2 = asString6(content);
   if (str2 !== void 0) return str2;
   const parts = asArray2(content);
   if (!parts) return content;
   const chatParts = [];
   let hasNonText = false;
   for (const part of parts) {
-    const partType = asString5(get2(part, "type")) ?? "";
+    const partType = asString6(get2(part, "type")) ?? "";
     if (partType === "input_text" || partType === "output_text" || partType === "text") {
-      const text = asString5(get2(part, "text"));
+      const text = asString6(get2(part, "text"));
       if (text) chatParts.push({ type: "text", text });
     } else if (partType === "refusal") {
-      const text = asString5(get2(part, "refusal"));
+      const text = asString6(get2(part, "refusal"));
       if (text) chatParts.push({ type: "text", text });
     } else if (partType === "input_image") {
       const imageUrl = get2(part, "image_url");
       if (imageUrl !== void 0) {
-        const value = asObject4(imageUrl) ? imageUrl : { url: asString5(imageUrl) ?? "" };
+        const value = asObject4(imageUrl) ? imageUrl : { url: asString6(imageUrl) ?? "" };
         chatParts.push({ type: "image_url", image_url: value });
         hasNonText = true;
       }
     }
   }
   if (!hasNonText) {
-    return chatParts.map((part) => asString5(part.text) ?? "").join("\n");
+    return chatParts.map((part) => asString6(part.text) ?? "").join("\n");
   }
   return chatParts;
 }
 function responsesFunctionCallToChatToolCall(item) {
-  const callId = asString5(get2(item, "call_id")) ?? asString5(get2(item, "id")) ?? "";
-  const name = asString5(get2(item, "name")) ?? "";
+  const callId = asString6(get2(item, "call_id")) ?? asString6(get2(item, "id")) ?? "";
+  const name = asString6(get2(item, "name")) ?? "";
   return {
     id: callId,
     type: "function",
@@ -17104,7 +17810,7 @@ function responsesFunctionCallToChatToolCall(item) {
   };
 }
 function responsesToolToChatTool(tool) {
-  if (asString5(get2(tool, "type")) !== "function") return void 0;
+  if (asString6(get2(tool, "type")) !== "function") return void 0;
   const fn = asObject4(get2(tool, "function"));
   if (fn) {
     const cloned = { ...asObject4(tool) };
@@ -17118,7 +17824,7 @@ function responsesToolToChatTool(tool) {
     return cloned;
   }
   const fnObj = {
-    name: asString5(get2(tool, "name")) ?? "",
+    name: asString6(get2(tool, "name")) ?? "",
     description: get2(tool, "description") ?? null,
     parameters: get2(tool, "parameters") ?? {}
   };
@@ -17127,8 +17833,8 @@ function responsesToolToChatTool(tool) {
 }
 function responsesToolChoiceToChat(toolChoice) {
   const obj = asObject4(toolChoice);
-  if (obj && asString5(obj.type) === "function") {
-    return { type: "function", function: { name: asString5(obj.name) ?? "" } };
+  if (obj && asString6(obj.type) === "function") {
+    return { type: "function", function: { name: asString6(obj.name) ?? "" } };
   }
   return toolChoice;
 }
@@ -17136,8 +17842,8 @@ function collapseSystemMessagesToHead2(messages) {
   const systemChunks = [];
   const rest = [];
   for (const msg of messages) {
-    if (asString5(msg.role) === "system") {
-      const text = asString5(msg.content);
+    if (asString6(msg.role) === "system") {
+      const text = asString6(msg.content);
       if (text !== void 0) {
         if (text.trim()) systemChunks.push(text);
         continue;
@@ -17181,10 +17887,10 @@ function chatCompletionToResponse(body) {
   if (choice === void 0) throw new Error("Empty choices in chat response");
   const message = get2(choice, "message");
   if (message === void 0) throw new Error("No message in chat choice");
-  const responseId = responseIdFromChatId(asString5(get2(body, "id")));
-  const model = asString5(get2(body, "model")) ?? "";
+  const responseId = responseIdFromChatId(asString6(get2(body, "id")));
+  const model = asString6(get2(body, "model")) ?? "";
   const createdAt = typeof get2(body, "created") === "number" ? get2(body, "created") : 0;
-  const finishReason = asString5(get2(choice, "finish_reason"));
+  const finishReason = asString6(get2(choice, "finish_reason"));
   const reasoning = chatReasoningText2(message);
   const output = [];
   const reasoningItem = chatReasoningToOutputItem2(reasoning, responseId);
@@ -17215,7 +17921,7 @@ function chatReasoningToOutputItem2(reasoning, responseId) {
 function chatReasoningText2(message) {
   const field = extractReasoningFieldText2(message);
   if (field) return field;
-  const content = asString5(get2(message, "content"));
+  const content = asString6(get2(message, "content"));
   if (content) {
     const split = splitLeadingThinkBlock3(content);
     if (split && split.reasoning) return split.reasoning;
@@ -17224,7 +17930,7 @@ function chatReasoningText2(message) {
 }
 function chatMessageToOutputItem2(message, responseId) {
   const content = [];
-  const text = asString5(get2(message, "content"));
+  const text = asString6(get2(message, "content"));
   if (text !== void 0) {
     const answer = splitLeadingThinkBlock3(text)?.answer ?? text;
     if (answer) content.push({ type: "output_text", text: answer, annotations: [] });
@@ -17232,18 +17938,18 @@ function chatMessageToOutputItem2(message, responseId) {
     const parts = asArray2(get2(message, "content"));
     if (parts) {
       for (const part of parts) {
-        const partType = asString5(get2(part, "type")) ?? "";
+        const partType = asString6(get2(part, "type")) ?? "";
         if (partType === "text" || partType === "output_text") {
-          const t = asString5(get2(part, "text"));
+          const t = asString6(get2(part, "text"));
           if (t) content.push({ type: "output_text", text: t, annotations: [] });
         } else if (partType === "refusal") {
-          const t = asString5(get2(part, "refusal"));
+          const t = asString6(get2(part, "refusal"));
           if (t) content.push({ type: "refusal", refusal: t });
         }
       }
     }
   }
-  const refusal = asString5(get2(message, "refusal"));
+  const refusal = asString6(get2(message, "refusal"));
   if (refusal) content.push({ type: "refusal", refusal });
   if (content.length === 0) return void 0;
   return {
@@ -17278,15 +17984,15 @@ function functionCallItem(itemId, callId, name, args, reasoning) {
   return item;
 }
 function chatToolCallToOutputItem2(toolCall, index, reasoning) {
-  const callId = asString5(get2(toolCall, "id"))?.trim() || `call_${index}`;
+  const callId = asString6(get2(toolCall, "id"))?.trim() || `call_${index}`;
   const fn = get2(toolCall, "function");
-  const name = asString5(get2(fn, "name")) ?? "";
+  const name = asString6(get2(fn, "name")) ?? "";
   const args = canonicalizeToolArguments2(get2(fn, "arguments"));
   return functionCallItem(`fc_${callId}`, callId, name, args, reasoning);
 }
 function chatLegacyFunctionCallToOutputItem2(functionCall, reasoning) {
-  const callId = asString5(get2(functionCall, "id"))?.trim() || "call_0";
-  const name = asString5(get2(functionCall, "name")) ?? "";
+  const callId = asString6(get2(functionCall, "id"))?.trim() || "call_0";
+  const name = asString6(get2(functionCall, "name")) ?? "";
   const args = canonicalizeToolArguments2(get2(functionCall, "arguments"));
   return functionCallItem(`fc_${callId}`, callId, name, args, reasoning);
 }
@@ -17322,13 +18028,13 @@ function chatErrorToResponseError(body) {
       error: { message: "Upstream returned an empty error response", type: "upstream_error", code: null, param: null }
     };
   }
-  const str2 = asString5(body);
+  const str2 = asString6(body);
   if (str2 !== void 0) {
     return { error: { message: str2, type: "upstream_error", code: null, param: null } };
   }
   const source = get2(body, "error") ?? body;
-  const message = asString5(get2(source, "message")) ?? asString5(get2(source, "detail")) ?? asString5(get2(source, "status_msg")) ?? asString5(get2(get2(source, "base_resp"), "status_msg")) ?? asString5(source) ?? safeStringify2(source);
-  const errorType = asString5(get2(source, "type")) ?? "upstream_error";
+  const message = asString6(get2(source, "message")) ?? asString6(get2(source, "detail")) ?? asString6(get2(source, "status_msg")) ?? asString6(get2(get2(source, "base_resp"), "status_msg")) ?? asString6(source) ?? safeStringify2(source);
+  const errorType = asString6(get2(source, "type")) ?? "upstream_error";
   const code = get2(source, "code") ?? get2(get2(source, "base_resp"), "status_code") ?? null;
   const param = get2(source, "param") ?? null;
   return { error: { message, type: errorType, code, param } };
@@ -17381,8 +18087,8 @@ function leadingThinkPrefixDecision2(buffer) {
 }
 function extractChatSseError2(value) {
   const error51 = get2(value, "error") ?? value;
-  const message = asString5(error51) ?? asString5(get2(error51, "message")) ?? asString5(get2(error51, "detail")) ?? JSON.stringify(error51);
-  const errorType = asString5(get2(error51, "type")) ?? asString5(get2(error51, "code"));
+  const message = asString6(error51) ?? asString6(get2(error51, "message")) ?? asString6(get2(error51, "detail")) ?? JSON.stringify(error51);
+  const errorType = asString6(get2(error51, "type")) ?? asString6(get2(error51, "code"));
   return { message, errorType: errorType ?? void 0 };
 }
 function stripSseField2(line, field) {
@@ -17491,9 +18197,9 @@ var init_stream2 = __esm({
       finishReason;
       handleChatChunk(chunk) {
         const events = [];
-        const id = asString5(get2(chunk, "id"));
+        const id = asString6(get2(chunk, "id"));
         if (id) this.responseId = responseIdFromChatId(id);
-        const model = asString5(get2(chunk, "model"));
+        const model = asString6(get2(chunk, "model"));
         if (model) this.model = model;
         const created = get2(chunk, "created");
         if (typeof created === "number") this.createdAt = created;
@@ -17506,7 +18212,7 @@ var init_stream2 = __esm({
         if (delta !== void 0) {
           const reasoning = extractReasoningFieldText2(delta);
           if (reasoning) events.push(...this.pushReasoningDelta(reasoning));
-          const content = asString5(get2(delta, "content"));
+          const content = asString6(get2(delta, "content"));
           if (content) events.push(...this.pushContentDelta(content));
           const toolCalls = asArray2(get2(delta, "tool_calls"));
           if (toolCalls) {
@@ -17516,7 +18222,7 @@ var init_stream2 = __esm({
             for (const toolCall of toolCalls) events.push(...this.pushToolCallDelta(toolCall, reasoningForTool));
           }
         }
-        const finishReason = asString5(get2(choice, "finish_reason"));
+        const finishReason = asString6(get2(choice, "finish_reason"));
         if (finishReason) this.finishReason = finishReason;
         return events;
       }
@@ -17689,10 +18395,10 @@ var init_stream2 = __esm({
       }
       pushToolCallDelta(toolCall, reasoning) {
         const chatIndex = typeof get2(toolCall, "index") === "number" ? get2(toolCall, "index") : 0;
-        const idDelta = asString5(get2(toolCall, "id"));
+        const idDelta = asString6(get2(toolCall, "id"));
         const fn = get2(toolCall, "function");
-        const nameDelta = asString5(get2(fn, "name"));
-        const argsDelta = asString5(get2(fn, "arguments")) ?? "";
+        const nameDelta = asString6(get2(fn, "name"));
+        const argsDelta = asString6(get2(fn, "arguments")) ?? "";
         let state = this.tools.get(chatIndex);
         if (!state) {
           state = newToolCall2();
@@ -18259,7 +18965,7 @@ function platformsForNode(store) {
   for (const p2 of custom2) byId2.set(p2.id, p2);
   return [...byId2.values()];
 }
-function resolveServiceFromCredential(consumer, cred, platforms, binding) {
+function resolveServiceFromCredential(consumer, cred, platforms, binding, options) {
   const platform2 = findPlatform(platforms, cred.platformId);
   const plan = findPlan(platform2, cred.planId);
   if (!platform2 || !plan) return null;
@@ -18269,7 +18975,8 @@ function resolveServiceFromCredential(consumer, cred, platforms, binding) {
     consumer,
     binding?.endpointId,
     cred,
-    endpoints
+    endpoints,
+    options
   );
   if (!selected) return null;
   const { endpoint, protocol } = selected;
@@ -18302,7 +19009,7 @@ function consumerForHarness(harness) {
   if (harness === "codex") return "chat:codex";
   return null;
 }
-function listHarnessApiProviders(store, harness) {
+function listHarnessApiProviders(store, harness, options) {
   const consumer = consumerForHarness(harness);
   if (!consumer) return [];
   const platforms = platformsForNode(store);
@@ -18312,7 +19019,7 @@ function listHarnessApiProviders(store, harness) {
     const plan = findPlan(platform2, cred.planId);
     if (!platform2 || !plan) continue;
     const endpoints = effectiveEndpoints(platform2, plan, cred);
-    if (!selectEndpoint(plan, consumer, void 0, cred, endpoints)) continue;
+    if (!selectEndpoint(plan, consumer, void 0, cred, endpoints, options)) continue;
     out.push({
       id: cred.id,
       name: platform2.name ?? cred.name,
@@ -18361,7 +19068,7 @@ async function buildHarnessEnvWithProxy(harness, resolved) {
   }
   return env;
 }
-function resolveHarnessService(store, harness, apiProviderId) {
+function resolveHarnessService(store, harness, apiProviderId, options) {
   const consumer = consumerForHarness(harness);
   if (!consumer) return null;
   const platforms = platformsForNode(store);
@@ -18375,11 +19082,12 @@ function resolveHarnessService(store, harness, apiProviderId) {
     consumer,
     cred,
     platforms,
-    binding && binding.credentialId === cred.id ? { endpointId: binding.endpointId, config: binding.config } : null
+    binding && binding.credentialId === cred.id ? { endpointId: binding.endpointId, config: binding.config } : null,
+    options
   );
 }
-function listHarnessProviderModels(store, harness, apiProviderId) {
-  const resolved = resolveHarnessService(store, harness, apiProviderId);
+function listHarnessProviderModels(store, harness, apiProviderId, options) {
+  const resolved = resolveHarnessService(store, harness, apiProviderId, options);
   if (resolved) {
     const mapped = /* @__PURE__ */ new Map();
     for (const m2 of resolved.models ?? []) {
@@ -18410,8 +19118,8 @@ function listHarnessProviderModels(store, harness, apiProviderId) {
   }
   return [];
 }
-function listHarnessModels(store, harness, apiProviderId) {
-  const fromProvider = listHarnessProviderModels(store, harness, apiProviderId);
+function listHarnessModels(store, harness, apiProviderId, options) {
+  const fromProvider = listHarnessProviderModels(store, harness, apiProviderId, options);
   if (fromProvider.length > 0) return fromProvider;
   if (harness === "claude") return DEFAULT_CLAUDE_MODELS;
   if (harness === "codex") return DEFAULT_CODEX_MODELS;
@@ -21337,7 +22045,9 @@ function createNodeClaudeTurnRunner(opts) {
     const cwd = input.session.cwd && input.session.cwd.trim() ? input.session.cwd.trim() : projectRoot2;
     const providerEnv = opts.providers ? await buildHarnessEnvWithProxy(
       "claude",
-      resolveHarnessService(opts.providers, "claude", input.apiProviderId)
+      resolveHarnessService(opts.providers, "claude", input.apiProviderId, {
+        experimentalClaudeOpenAiChatEnabled: opts.experimentalClaudeOpenAiChatEnabled?.() ?? false
+      })
     ) : {};
     const authEnv = {
       ...process.env,
@@ -40500,7 +41210,7 @@ function toolInputJson(raw) {
     return "{}";
   }
 }
-function asRecord6(raw) {
+function asRecord7(raw) {
   if (raw && typeof raw === "object" && !Array.isArray(raw)) return raw;
   return {};
 }
@@ -40639,7 +41349,7 @@ function grokMetaInput(tool) {
   const xai = meta3["x.ai/tool"];
   if (!xai || typeof xai !== "object") return {};
   const input = xai.input;
-  return asRecord6(input);
+  return asRecord7(input);
 }
 function queryFromWebSearchTitle(title) {
   if (!title) return void 0;
@@ -40897,11 +41607,11 @@ function unwrapMcpEnvelope(tool, raw) {
   if (!isEnvelope) return null;
   const id = raw.tool_name;
   if (typeof id !== "string" || !id.includes("__")) return null;
-  return { toolName: `mcp__${id}`, input: asRecord6(raw.tool_input) };
+  return { toolName: `mcp__${id}`, input: asRecord7(raw.tool_input) };
 }
 function normalizeAcpTool(tool, opts) {
-  const raw = { ...grokMetaInput(tool), ...asRecord6(tool.rawInput) };
-  const mcp = unwrapMcpEnvelope(tool, asRecord6(tool.rawInput));
+  const raw = { ...grokMetaInput(tool), ...asRecord7(tool.rawInput) };
+  const mcp = unwrapMcpEnvelope(tool, asRecord7(tool.rawInput));
   if (mcp) return mcp;
   const diffs = extractDiffs(tool.content);
   const terminalId = extractEmbeddedTerminalId(tool.content);
@@ -41094,9 +41804,14 @@ function createXaiCorrelationState(opts) {
     goalStarted: /* @__PURE__ */ new Set(),
     lastEventSeq: null,
     lastUsage: null,
-    lastMessageId: null
+    lastMessageId: null,
+    turnTokens: { input: 0, output: 0, cacheRead: 0 },
+    rateLimited: false
   };
 }
+function resetTurnTokens(state) {
+  state.turnTokens = { input: 0, output: 0, cacheRead: 0 };
+}
 function resolveGrokChildChatHistoryPath(cwd, childSessionId) {
   if (!cwd || !childSessionId) return void 0;
   return join16(homedir4(), ".grok", "sessions", encodeURIComponent(cwd), childSessionId, "chat_history.jsonl");
@@ -41129,7 +41844,7 @@ function bindSubagentToolId(state, subagentId, toolUseId, description, migrateOu
     });
   }
 }
-function asRecord7(v2) {
+function asRecord8(v2) {
   if (!v2 || typeof v2 !== "object" || Array.isArray(v2)) return null;
   return v2;
 }
@@ -41162,18 +41877,18 @@ function arrField(o, ...keys) {
   return void 0;
 }
 function parseXaiSessionNotificationEnvelope(raw) {
-  const o = asRecord7(raw);
+  const o = asRecord8(raw);
   if (!o) return null;
-  const update = asRecord7(o.update);
+  const update = asRecord8(o.update);
   if (!update) return null;
   const sessionId = strField(o, "sessionId", "session_id");
-  const meta3 = asRecord7(o._meta) ?? asRecord7(o.meta);
+  const meta3 = asRecord8(o._meta) ?? asRecord8(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 asRecord7(raw) ?? {};
+  return asRecord8(raw) ?? {};
 }
 function parsePlainTextTaskAck(text) {
   const subagentId = text.match(/subagent_id:\s*(\S+)/i)?.[1] ?? text.match(/task_ids?\s*=\s*\[\s*"([^"]+)"/i)?.[1];
@@ -41278,13 +41993,13 @@ function tryParseJsonObject(text) {
   if (!trimmed.startsWith("{") && !trimmed.startsWith("[")) return null;
   try {
     const v2 = JSON.parse(trimmed);
-    return asRecord7(v2);
+    return asRecord8(v2);
   } catch {
     const start = trimmed.indexOf("{");
     const end = trimmed.lastIndexOf("}");
     if (start < 0 || end <= start) return null;
     try {
-      return asRecord7(JSON.parse(trimmed.slice(start, end + 1)));
+      return asRecord8(JSON.parse(trimmed.slice(start, end + 1)));
     } catch {
       return null;
     }
@@ -41352,6 +42067,10 @@ function mapXaiSessionUpdate(update, state, ctx = {}) {
       return mapScheduledTaskDeleted(update, state);
     case "turn_completed":
       return mapTurnCompleted(update, state, ctx);
+    case "response_started":
+      return mapResponseStarted(update, state, ctx);
+    case "response_completed":
+      return mapResponseCompleted(update, state, ctx);
     case "auto_compact_started":
       return mapAutoCompactStarted(update);
     case "auto_compact_completed":
@@ -41375,7 +42094,7 @@ function mapXaiSessionUpdate(update, state, ctx = {}) {
     case "session_recap":
       return mapSessionRecap(update);
     case "session_recap_unavailable":
-      return [];
+      return [{ type: "session_recap_unavailable" }];
     case "unknown":
       return [];
     default:
@@ -41508,7 +42227,7 @@ function mapWorkflowPhases(raw) {
   if (!raw?.length) return [];
   const out = [];
   for (const item of raw) {
-    const p2 = asRecord7(item);
+    const p2 = asRecord8(item);
     if (!p2) continue;
     const title = strField(p2, "title");
     if (!title) continue;
@@ -41521,7 +42240,7 @@ function mapWorkflowAgents(raw) {
   if (!raw?.length) return [];
   const out = [];
   for (const item of raw) {
-    const a = asRecord7(item);
+    const a = asRecord8(item);
     if (!a) continue;
     const agentId = strField(a, "agent_id", "agentId");
     const label = strField(a, "label") ?? agentId ?? "agent";
@@ -41547,7 +42266,7 @@ function buildWorkflowPhaseSummary(u, currentPhase, pauseMessage, lastEvent, las
   const phaseBits = [];
   if (phases?.length) {
     for (const p2 of phases) {
-      const ph = asRecord7(p2);
+      const ph = asRecord8(p2);
       if (!ph) continue;
       const title = strField(ph, "title") ?? "?";
       const state = strField(ph, "state") ?? "";
@@ -41689,7 +42408,7 @@ function mapTaskBackgrounded(u, state) {
   }];
 }
 function mapTaskCompleted(u, state) {
-  const snapshot = asRecord7(u.task_snapshot) ?? asRecord7(u.taskSnapshot) ?? u;
+  const snapshot = asRecord8(u.task_snapshot) ?? asRecord8(u.taskSnapshot) ?? u;
   const taskId = strField(snapshot, "task_id", "taskId");
   if (!taskId) return [];
   const known = state.bgTaskById.get(taskId);
@@ -41892,9 +42611,55 @@ function noteContextWindow(state, maxTokens) {
 function uncachedPromptInputTokens(fullInput, cachedRead) {
   return Math.max(0, fullInput - cachedRead);
 }
+function messageUsageFromTurnTokens(state, ctx, tokens) {
+  const messageId = ctx.messageId ?? state.lastMessageId;
+  if (!messageId) return null;
+  if (tokens.input <= 0 && tokens.output <= 0 && tokens.cacheRead <= 0) return null;
+  const prev = state.lastUsage;
+  const contextTokens = prev?.totalTokens && prev.totalTokens > 0 ? prev.totalTokens : 0;
+  const maxTokens = prev?.maxTokens && prev.maxTokens > 0 ? prev.maxTokens : 0;
+  return {
+    type: "message_usage",
+    messageId,
+    inputTokens: tokens.input,
+    outputTokens: tokens.output,
+    ...tokens.cacheRead > 0 ? { cacheReadTokens: tokens.cacheRead } : {},
+    ...contextTokens > 0 ? { contextTokens } : {},
+    ...maxTokens > 0 ? { contextWindow: maxTokens } : {}
+  };
+}
+function mapResponseStarted(u, state, ctx) {
+  const input = numField(u, "inputTokens", "input_tokens") ?? 0;
+  const cacheRead = numField(u, "cacheReadInputTokens", "cache_read_input_tokens") ?? 0;
+  const provisional = {
+    input: state.turnTokens.input + input,
+    output: state.turnTokens.output,
+    cacheRead: state.turnTokens.cacheRead + cacheRead
+  };
+  const event = messageUsageFromTurnTokens(state, ctx, provisional);
+  return event ? [event] : [];
+}
+function mapResponseCompleted(u, state, ctx) {
+  const usageRaw = asRecord8(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;
+  if (input <= 0 && output <= 0 && cacheRead <= 0) return [];
+  state.turnTokens = {
+    input: state.turnTokens.input + input,
+    output: state.turnTokens.output + output,
+    cacheRead: state.turnTokens.cacheRead + cacheRead
+  };
+  const event = messageUsageFromTurnTokens(state, ctx, state.turnTokens);
+  return event ? [event] : [];
+}
 function mapTurnCompleted(u, state, ctx) {
-  const usageRaw = asRecord7(u.usage);
-  if (!usageRaw) return [];
+  const events = mapTurnStopReason(u, state);
+  const usageRaw = asRecord8(u.usage);
+  if (!usageRaw) {
+    resetTurnTokens(state);
+    return events;
+  }
   const fullInput = numField(usageRaw, "inputTokens", "input_tokens") ?? 0;
   const cachedRead = numField(usageRaw, "cachedReadTokens", "cached_read_tokens") ?? 0;
   const uncachedInput = uncachedPromptInputTokens(fullInput, cachedRead);
@@ -41917,18 +42682,39 @@ function mapTurnCompleted(u, state, ctx) {
       model: prev?.model ?? ""
     };
   }
+  state.turnTokens = {
+    input: uncachedInput,
+    output: outputTokens,
+    cacheRead: cachedRead
+  };
   const messageId = ctx.messageId ?? state.lastMessageId;
-  if (!messageId) return [];
-  return [{
-    type: "message_usage",
-    messageId,
-    // Footer: this-turn new spend (exclude cache hits).
-    inputTokens: uncachedInput,
-    outputTokens,
-    ...contextTokens > 0 ? { contextTokens } : {},
-    ...maxTokens > 0 ? { contextWindow: maxTokens } : {},
-    ...costUsd != null ? { costUsd } : {}
-  }];
+  if (messageId) {
+    events.push({
+      type: "message_usage",
+      messageId,
+      // Footer: this-turn new spend (exclude cache hits).
+      inputTokens: uncachedInput,
+      outputTokens,
+      ...cachedRead > 0 ? { cacheReadTokens: cachedRead } : {},
+      ...contextTokens > 0 ? { contextTokens } : {},
+      ...maxTokens > 0 ? { contextWindow: maxTokens } : {},
+      ...costUsd != null ? { costUsd } : {}
+    });
+  }
+  resetTurnTokens(state);
+  return events;
+}
+function mapTurnStopReason(u, state) {
+  const stopReason = strField(u, "stopReason", "stop_reason");
+  if (stopReason === "rate_limit") {
+    state.rateLimited = true;
+    return [{ type: "rate_limit", status: "rejected", rateLimitType: "api" }];
+  }
+  if (stopReason === "end_turn" && state.rateLimited) {
+    state.rateLimited = false;
+    return [{ type: "rate_limit", status: "allowed" }];
+  }
+  return [];
 }
 function mapAutoCompactStarted(u) {
   void u;
@@ -42036,7 +42822,7 @@ function mapModelAutoSwitched(u) {
   ];
 }
 function mapRetryState(u) {
-  const nested = asRecord7(u.retry_state) ?? asRecord7(u.retryState) ?? u;
+  const nested = asRecord8(u.retry_state) ?? asRecord8(u.retryState) ?? u;
   const type = (strField(nested, "type") ?? "").toLowerCase();
   if (type === "retrying") {
     const attempt = numField(nested, "attempt") ?? 1;
@@ -42103,7 +42889,7 @@ function mapAutoRecoveryExhausted(u) {
   }];
 }
 function mapFollowUps(u) {
-  const meta3 = asRecord7(u._meta) ?? asRecord7(u.meta);
+  const meta3 = asRecord8(u._meta) ?? asRecord8(u.meta);
   if (meta3 && meta3["x.ai/replayed"] === true) return [];
   const responseId = strField(u, "response_id", "responseId");
   if (!responseId || responseId.length > 128) return [];
@@ -42112,7 +42898,7 @@ function mapFollowUps(u) {
   let count = 0;
   for (const s2 of suggestions) {
     if (count >= 6) break;
-    const rec = asRecord7(s2);
+    const rec = asRecord8(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();
@@ -49647,7 +50433,7 @@ var init_harness_runners = __esm({
 });
 
 // src/session/codex-live-turn.ts
-function asRecord8(value) {
+function asRecord9(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : null;
 }
 function readString4(value) {
@@ -49678,7 +50464,7 @@ function extractAgentTextFromTurn2(turn) {
   let text = "";
   const items = Array.isArray(turn.items) ? turn.items : [];
   for (const item of items) {
-    const rec = asRecord8(item);
+    const rec = asRecord9(item);
     if (!rec) continue;
     if (readString4(rec.type) === "agentMessage" || readString4(rec.itemType) === "agentMessage") {
       const t = readString4(rec.text);
@@ -49713,7 +50499,7 @@ async function openTurnAndStream(opts) {
       ...collaborationMode ? { collaborationMode } : {}
     })
   );
-  const turn = asRecord8(turnStartResult.turn);
+  const turn = asRecord9(turnStartResult.turn);
   const turnId = readString4(turn?.id);
   opts.onTurnStarted?.(turnId);
   let finalText = "";
@@ -49741,7 +50527,7 @@ async function openTurnAndStream(opts) {
       continue;
     }
     if (note.method === "turn/completed" || note.method === "turn/completed/v2") {
-      const completedTurn = asRecord8(note.params.turn);
+      const completedTurn = asRecord9(note.params.turn);
       const completedId = readString4(completedTurn?.id);
       if (turnId && completedId && completedId !== turnId) continue;
     }
@@ -49749,14 +50535,14 @@ async function openTurnAndStream(opts) {
       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(asRecord8(note.params.item)?.delta);
+      const delta = readString4(note.params.delta) ?? readString4(note.params.text) ?? readString4(asRecord9(note.params.item)?.delta);
       if (delta) {
         finalText += delta;
         opts.onDelta?.(delta);
       }
     }
     if (note.method === "turn/completed" || note.method === "turn/completed/v2") {
-      const completedTurn = asRecord8(note.params.turn);
+      const completedTurn = asRecord9(note.params.turn);
       const status = readString4(completedTurn?.status) ?? readString4(note.params.status);
       if (status === "failed" || status === "error") {
         throw new Error("Codex turn failed");
@@ -50024,6 +50810,7 @@ function createProductionTurnRunner(opts) {
     queryFn: opts.claudeQueryFn,
     allowSimulatedFallback: opts.allowSimulatedFallback,
     providers: opts.providers,
+    experimentalClaudeOpenAiChatEnabled: opts.experimentalClaudeOpenAiChatEnabled,
     createHostActionClaudeMcp: opts.createHostActionClaudeMcp,
     mcpMergeMode: opts.mcpMergeMode,
     homeDir: opts.homeDir
@@ -57444,8 +58231,8 @@ import { fileURLToPath } from "node:url";
 function resolveCliReleaseVersion() {
   const fromEnv = process.env.SUPERONE_CLI_VERSION?.trim();
   if (fromEnv) return fromEnv;
-  if ("0.50.8-alpha".trim()) {
-    return "0.50.8-alpha".trim();
+  if ("0.51.1-alpha".trim()) {
+    return "0.51.1-alpha".trim();
   }
   const fromDist = readDistManifestVersion();
   if (fromDist) return fromDist;
@@ -58316,6 +59103,7 @@ function openNodeDatabase(dbPath) {
   mkdirSync2(dirname3(dbPath), { recursive: true });
   const db = new Database(dbPath);
   db.pragma("journal_mode = WAL");
+  db.pragma("busy_timeout = 5000");
   db.pragma("foreign_keys = ON");
   db.exec(SCHEMA_SQL);
   ensureSessionUiColumns(db);
@@ -58606,7 +59394,7 @@ var DEFAULT_NODE_AGENT_SETTINGS = {
     defaultEffort: "",
     permissionPreset: ""
   },
-  experimentalAgentCollaborationEnabled: false
+  experimentalClaudeOpenAiChatEnabled: false
 };
 function asString(value, fallback) {
   return typeof value === "string" ? value : fallback;
@@ -58648,8 +59436,8 @@ function normalizeNodeAgentSettings(raw) {
   return {
     claude: normalizeClaude(agent.claude),
     codex: normalizeCodex(agent.codex),
-    experimentalAgentCollaborationEnabled: asBoolean(
-      agent.experimentalAgentCollaborationEnabled,
+    experimentalClaudeOpenAiChatEnabled: asBoolean(
+      agent.experimentalClaudeOpenAiChatEnabled,
       false
     )
   };
@@ -58658,7 +59446,7 @@ function mergeNodeAgentSettings(current, patch) {
   const next = {
     claude: { ...current.claude },
     codex: { ...current.codex },
-    experimentalAgentCollaborationEnabled: current.experimentalAgentCollaborationEnabled
+    experimentalClaudeOpenAiChatEnabled: current.experimentalClaudeOpenAiChatEnabled
   };
   if (patch.claude) {
     if (typeof patch.claude.defaultModel === "string") {
@@ -58692,8 +59480,8 @@ function mergeNodeAgentSettings(current, patch) {
       }
     }
   }
-  if (typeof patch.experimentalAgentCollaborationEnabled === "boolean") {
-    next.experimentalAgentCollaborationEnabled = patch.experimentalAgentCollaborationEnabled;
+  if (typeof patch.experimentalClaudeOpenAiChatEnabled === "boolean") {
+    next.experimentalClaudeOpenAiChatEnabled = patch.experimentalClaudeOpenAiChatEnabled;
   }
   return normalizeNodeAgentSettings(next);
 }
@@ -58712,7 +59500,7 @@ function readConfigFile(path) {
 function loadNodeAgentSettings(configPath) {
   const file2 = readConfigFile(configPath);
   if (file2.agent) return normalizeNodeAgentSettings(file2.agent);
-  if (file2.claude || file2.codex || typeof file2.experimentalAgentCollaborationEnabled === "boolean") {
+  if (file2.claude || file2.codex || typeof file2.experimentalClaudeOpenAiChatEnabled === "boolean") {
     return normalizeNodeAgentSettings(file2);
   }
   return { ...DEFAULT_NODE_AGENT_SETTINGS, claude: { ...DEFAULT_NODE_AGENT_SETTINGS.claude, disabledSkills: [] }, codex: { ...DEFAULT_NODE_AGENT_SETTINGS.codex } };
@@ -59841,7 +60629,7 @@ function requireResourceWrite(client3, scope) {
   if (scope === "user") return requireScopes(client3, OPERATION_SCOPES.adminNode);
   return null;
 }
-function asRecord9(payload) {
+function asRecord10(payload) {
   return payload && typeof payload === "object" ? payload : {};
 }
 function mapThrown(err) {
@@ -59870,7 +60658,7 @@ function manageOpts(ctx) {
 function handleSkillsList(payload, ctx) {
   const denied = requireScopes(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord9(payload);
+  const p2 = asRecord10(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -59890,7 +60678,7 @@ function handleSkillsList(payload, ctx) {
 function handleSkillsGet(payload, ctx) {
   const denied = requireScopes(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord9(payload);
+  const p2 = asRecord10(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -59915,7 +60703,7 @@ function handleSkillsGet(payload, ctx) {
 function handleSkillsReadFile(payload, ctx) {
   const denied = requireScopes(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord9(payload);
+  const p2 = asRecord10(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -59949,7 +60737,7 @@ function handleSkillsReadFile(payload, ctx) {
 function handleSkillsDelete(payload, ctx) {
   const denied = requireScopes(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (denied) return denied;
-  const p2 = asRecord9(payload);
+  const p2 = asRecord10(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -59974,7 +60762,7 @@ function handleSkillsDelete(payload, ctx) {
 function handleSkillsInstall(payload, ctx) {
   const baseDenied = requireScopes(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (baseDenied) return baseDenied;
-  const p2 = asRecord9(payload);
+  const p2 = asRecord10(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -60008,7 +60796,7 @@ function handleSkillsInstall(payload, ctx) {
 function handleMcpList(payload, ctx) {
   const denied = requireScopes(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord9(payload);
+  const p2 = asRecord10(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -60065,7 +60853,7 @@ function parseMcpWriteConfig(raw) {
 function handleMcpSave(payload, ctx) {
   const baseDenied = requireScopes(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (baseDenied) return baseDenied;
-  const p2 = asRecord9(payload);
+  const p2 = asRecord10(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -60095,7 +60883,7 @@ function handleMcpSave(payload, ctx) {
 function handleMcpToggle(payload, ctx) {
   const baseDenied = requireScopes(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (baseDenied) return baseDenied;
-  const p2 = asRecord9(payload);
+  const p2 = asRecord10(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -60126,7 +60914,7 @@ function handleMcpToggle(payload, ctx) {
 function handleMcpDelete(payload, ctx) {
   const baseDenied = requireScopes(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (baseDenied) return baseDenied;
-  const p2 = asRecord9(payload);
+  const p2 = asRecord10(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -60166,7 +60954,7 @@ function parseMarketplaceScope(raw) {
 async function handlePluginsList(payload, ctx) {
   const denied = requireScopes(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord9(payload);
+  const p2 = asRecord10(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     projectRoot(ctx.projects, projectId);
@@ -60213,7 +61001,7 @@ async function handlePluginsList(payload, ctx) {
 function handlePluginsGet(payload, ctx) {
   const denied = requireScopes(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord9(payload);
+  const p2 = asRecord10(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -60237,7 +61025,7 @@ function handlePluginsGet(payload, ctx) {
 function handlePluginsReadFile(payload, ctx) {
   const denied = requireScopes(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord9(payload);
+  const p2 = asRecord10(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -60265,7 +61053,7 @@ function handlePluginsReadFile(payload, ctx) {
 function handlePluginsDelete(payload, ctx) {
   const baseDenied = requireScopes(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (baseDenied) return baseDenied;
-  const p2 = asRecord9(payload);
+  const p2 = asRecord10(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -60291,7 +61079,7 @@ function handlePluginsDelete(payload, ctx) {
 async function handlePluginsInstall(payload, ctx) {
   const baseDenied = requireScopes(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (baseDenied) return baseDenied;
-  const p2 = asRecord9(payload);
+  const p2 = asRecord10(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -60317,7 +61105,7 @@ async function handlePluginsInstall(payload, ctx) {
 function handlePluginsUpdate(payload, ctx) {
   const baseDenied = requireScopes(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (baseDenied) return baseDenied;
-  const p2 = asRecord9(payload);
+  const p2 = asRecord10(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -60343,7 +61131,7 @@ function handlePluginsUpdate(payload, ctx) {
 function handlePluginsListMarketplace(payload, ctx) {
   const denied = requireScopes(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord9(payload);
+  const p2 = asRecord10(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -60365,7 +61153,7 @@ function handlePluginsListMarketplace(payload, ctx) {
 async function handlePluginsAddMarketplace(payload, ctx) {
   const baseDenied = requireScopes(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (baseDenied) return baseDenied;
-  const p2 = asRecord9(payload);
+  const p2 = asRecord10(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -60391,7 +61179,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 = asRecord9(payload);
+  const p2 = asRecord10(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -60426,7 +61214,7 @@ async function handlePluginsUpdateMarketplace(payload, ctx) {
   if (denied) return denied;
   const adminDenied = requireScopes(ctx.client, OPERATION_SCOPES.adminNode);
   if (adminDenied) return adminDenied;
-  const p2 = asRecord9(payload);
+  const p2 = asRecord10(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     if (projectId) {
@@ -60448,7 +61236,7 @@ async function handlePluginsUpdateMarketplace(payload, ctx) {
 function handlePluginsReadMarketplace(payload, ctx) {
   const denied = requireScopes(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord9(payload);
+  const p2 = asRecord10(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     if (projectId) {
@@ -60479,7 +61267,7 @@ function handlePluginsReadMarketplace(payload, ctx) {
 function handlePluginsReadMarketplaceFile(payload, ctx) {
   const denied = requireScopes(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord9(payload);
+  const p2 = asRecord10(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     if (projectId) {
@@ -60513,7 +61301,7 @@ function handlePluginsReadMarketplaceFile(payload, ctx) {
 function handleAgentsList(payload, ctx) {
   const denied = requireScopes(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord9(payload);
+  const p2 = asRecord10(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -60530,7 +61318,7 @@ function handleAgentsList(payload, ctx) {
 function handleAgentsReadFile(payload, ctx) {
   const denied = requireScopes(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord9(payload);
+  const p2 = asRecord10(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -60562,7 +61350,7 @@ function parseHookSavePayload(raw) {
 function handleHooksList(payload, ctx) {
   const denied = requireScopes(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord9(payload);
+  const p2 = asRecord10(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -60575,7 +61363,7 @@ function handleHooksList(payload, ctx) {
 function handleHooksSave(payload, ctx) {
   const baseDenied = requireScopes(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (baseDenied) return baseDenied;
-  const p2 = asRecord9(payload);
+  const p2 = asRecord10(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -60603,7 +61391,7 @@ function handleHooksSave(payload, ctx) {
 function handleHooksDelete(payload, ctx) {
   const baseDenied = requireScopes(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (baseDenied) return baseDenied;
-  const p2 = asRecord9(payload);
+  const p2 = asRecord10(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = projectRoot(ctx.projects, projectId);
@@ -60702,7 +61490,7 @@ function requireScopes2(client3, scopes) {
   }
   return null;
 }
-function asRecord10(payload) {
+function asRecord11(payload) {
   return payload && typeof payload === "object" ? payload : {};
 }
 function mapThrown2(err) {
@@ -60768,7 +61556,7 @@ function parseSchedule(raw) {
 function handleAutomationList(payload, ctx) {
   const denied = requireScopes2(ctx.client, OPERATION_SCOPES.readSession);
   if (denied) return denied;
-  const p2 = asRecord10(payload);
+  const p2 = asRecord11(payload);
   const projectId = String(p2.projectId ?? "").trim();
   if (!projectId) {
     return { error: { code: "invalid_argument", message: "projectId is required" } };
@@ -60787,7 +61575,7 @@ function handleAutomationList(payload, ctx) {
 function handleAutomationCreate(payload, ctx) {
   const denied = requireScopes2(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord10(payload);
+  const p2 = asRecord11(payload);
   const projectId = String(p2.projectId ?? "").trim();
   if (!projectId) {
     return { error: { code: "invalid_argument", message: "projectId is required" } };
@@ -60824,7 +61612,7 @@ function handleAutomationCreate(payload, ctx) {
 function handleAutomationUpdate(payload, ctx) {
   const denied = requireScopes2(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord10(payload);
+  const p2 = asRecord11(payload);
   const automationId = String(p2.automationId ?? p2.id ?? "").trim();
   if (!automationId) {
     return { error: { code: "invalid_argument", message: "automationId is required" } };
@@ -60868,7 +61656,7 @@ function handleAutomationUpdate(payload, ctx) {
 function handleAutomationDelete(payload, ctx) {
   const denied = requireScopes2(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord10(payload);
+  const p2 = asRecord11(payload);
   const automationId = String(p2.automationId ?? p2.id ?? "").trim();
   if (!automationId) {
     return { error: { code: "invalid_argument", message: "automationId is required" } };
@@ -60894,7 +61682,7 @@ function handleAutomationDelete(payload, ctx) {
 async function handleAutomationRunNow(payload, ctx) {
   const denied = requireScopes2(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord10(payload);
+  const p2 = asRecord11(payload);
   const automationId = String(p2.automationId ?? p2.id ?? "").trim();
   if (!automationId) {
     return { error: { code: "invalid_argument", message: "automationId is required" } };
@@ -60952,7 +61740,7 @@ function requireScopes3(client3, scopes) {
   }
   return null;
 }
-function asRecord11(payload) {
+function asRecord12(payload) {
   return payload && typeof payload === "object" ? payload : {};
 }
 function mapThrown3(err) {
@@ -61023,7 +61811,7 @@ var CODEX_MUTATING_METHODS = [
 function handleGetAuthStatus(payload, ctx) {
   const denied = requireScopes3(ctx.client, OPERATION_SCOPES.readEnvironment);
   if (denied) return denied;
-  const p2 = asRecord11(payload);
+  const p2 = asRecord12(payload);
   const projectId = projectIdOf(p2);
   if (!projectId) {
     return { error: { code: "invalid_argument", message: "projectId required" } };
@@ -61036,7 +61824,7 @@ function handleGetAuthStatus(payload, ctx) {
 function handleSetAuth(payload, ctx) {
   const denied = requireScopes3(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord11(payload);
+  const p2 = asRecord12(payload);
   const projectId = projectIdOf(p2);
   if (!projectId) {
     return { error: { code: "invalid_argument", message: "projectId required" } };
@@ -61061,7 +61849,7 @@ function handleSetAuth(payload, ctx) {
 async function handleGetRateLimits(payload, ctx) {
   const denied = requireScopes3(ctx.client, OPERATION_SCOPES.readEnvironment);
   if (denied) return denied;
-  const p2 = asRecord11(payload);
+  const p2 = asRecord12(payload);
   const projectId = projectIdOf(p2);
   if (!projectId) {
     return { error: { code: "invalid_argument", message: "projectId required" } };
@@ -61088,7 +61876,7 @@ async function handleGetRateLimits(payload, ctx) {
 async function handleGetAccountUsage(payload, ctx) {
   const denied = requireScopes3(ctx.client, OPERATION_SCOPES.readEnvironment);
   if (denied) return denied;
-  const p2 = asRecord11(payload);
+  const p2 = asRecord12(payload);
   const projectId = projectIdOf(p2);
   if (!projectId) {
     return { error: { code: "invalid_argument", message: "projectId required" } };
@@ -61115,7 +61903,7 @@ async function handleGetAccountUsage(payload, ctx) {
 async function handleConsumeRateLimitReset(payload, ctx) {
   const denied = requireScopes3(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord11(payload);
+  const p2 = asRecord12(payload);
   const projectId = projectIdOf(p2);
   if (!projectId) {
     return { error: { code: "invalid_argument", message: "projectId required" } };
@@ -61145,7 +61933,7 @@ async function handleConsumeRateLimitReset(payload, ctx) {
 async function handleLoginMcpOauth(payload, ctx) {
   const denied = requireScopes3(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord11(payload);
+  const p2 = asRecord12(payload);
   const projectId = projectIdOf(p2);
   const serverName = String(p2.serverName ?? p2.name ?? "").trim();
   if (!projectId || !serverName) {
@@ -61165,7 +61953,7 @@ async function handleLoginMcpOauth(payload, ctx) {
 async function handleDetectExternalAgent(payload, ctx) {
   const denied = requireScopes3(ctx.client, OPERATION_SCOPES.readEnvironment);
   if (denied) return denied;
-  const p2 = asRecord11(payload);
+  const p2 = asRecord12(payload);
   const projectId = projectIdOf(p2);
   if (!projectId) {
     return { error: { code: "invalid_argument", message: "projectId required" } };
@@ -61184,7 +61972,7 @@ async function handleDetectExternalAgent(payload, ctx) {
 async function handleImportExternalAgent(payload, ctx) {
   const denied = requireScopes3(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord11(payload);
+  const p2 = asRecord12(payload);
   const projectId = projectIdOf(p2);
   if (!projectId) {
     return { error: { code: "invalid_argument", message: "projectId required" } };
@@ -61202,7 +61990,7 @@ async function handleImportExternalAgent(payload, ctx) {
 async function handlePluginsList2(payload, ctx) {
   const denied = requireScopes3(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord11(payload);
+  const p2 = asRecord12(payload);
   const projectId = projectIdOf(p2);
   if (!projectId) {
     return { error: { code: "invalid_argument", message: "projectId required" } };
@@ -61225,7 +62013,7 @@ async function handlePluginsList2(payload, ctx) {
 async function handlePluginsInstall2(payload, ctx) {
   const denied = requireScopes3(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord11(payload);
+  const p2 = asRecord12(payload);
   const projectId = projectIdOf(p2);
   const key = String(p2.key ?? p2.pluginId ?? "").trim();
   if (!projectId || !key) {
@@ -61241,7 +62029,7 @@ async function handlePluginsInstall2(payload, ctx) {
 async function handlePluginsUninstall(payload, ctx) {
   const denied = requireScopes3(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord11(payload);
+  const p2 = asRecord12(payload);
   const projectId = projectIdOf(p2);
   const key = String(p2.key ?? p2.pluginId ?? "").trim();
   if (!projectId || !key) {
@@ -61257,7 +62045,7 @@ async function handlePluginsUninstall(payload, ctx) {
 async function handleMarketplaceAdd(payload, ctx) {
   const denied = requireScopes3(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord11(payload);
+  const p2 = asRecord12(payload);
   const projectId = projectIdOf(p2);
   const source = String(p2.source ?? "").trim();
   if (!projectId || !source) {
@@ -61286,7 +62074,7 @@ async function handleMarketplaceAdd(payload, ctx) {
 async function handleMarketplaceRemove(payload, ctx) {
   const denied = requireScopes3(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord11(payload);
+  const p2 = asRecord12(payload);
   const projectId = projectIdOf(p2);
   const marketplaceName = String(p2.marketplaceName ?? p2.name ?? "").trim();
   if (!projectId || !marketplaceName) {
@@ -61309,7 +62097,7 @@ async function handleMarketplaceRemove(payload, ctx) {
 async function handleMarketplaceUpgrade(payload, ctx) {
   const denied = requireScopes3(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord11(payload);
+  const p2 = asRecord12(payload);
   const projectId = projectIdOf(p2);
   if (!projectId) {
     return { error: { code: "invalid_argument", message: "projectId required" } };
@@ -61342,7 +62130,7 @@ function requireScopes4(client3, scopes) {
   }
   return null;
 }
-function asRecord12(payload) {
+function asRecord13(payload) {
   return payload && typeof payload === "object" ? payload : {};
 }
 function mapThrown4(err) {
@@ -61371,7 +62159,7 @@ function dispatchSessionProviderRpc(method, payload, ctx) {
 function handleList(payload, ctx) {
   const denied = requireScopes4(ctx.client, OPERATION_SCOPES.readEnvironment);
   if (denied) return denied;
-  const p2 = asRecord12(payload);
+  const p2 = asRecord13(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();
@@ -61383,7 +62171,7 @@ function handleList(payload, ctx) {
 function handleGet(payload, ctx) {
   const denied = requireScopes4(ctx.client, OPERATION_SCOPES.readEnvironment);
   if (denied) return denied;
-  const p2 = asRecord12(payload);
+  const p2 = asRecord13(payload);
   const id = String(p2.id ?? "");
   if (!id) return { error: { code: "invalid_argument", message: "id required" } };
   try {
@@ -61395,7 +62183,7 @@ function handleGet(payload, ctx) {
 function handleGetBase(payload, ctx) {
   const denied = requireScopes4(ctx.client, OPERATION_SCOPES.readEnvironment);
   if (denied) return denied;
-  const p2 = asRecord12(payload);
+  const p2 = asRecord13(payload);
   const harnessId = String(p2.harnessId ?? "");
   if (!harnessId) return { error: { code: "invalid_argument", message: "harnessId required" } };
   try {
@@ -61407,7 +62195,7 @@ function handleGetBase(payload, ctx) {
 function handleCreate(payload, ctx) {
   const denied = requireScopes4(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord12(payload);
+  const p2 = asRecord13(payload);
   try {
     const provider = ctx.sessionProviders.create({
       harnessId: String(p2.harnessId ?? ""),
@@ -61423,7 +62211,7 @@ function handleCreate(payload, ctx) {
 function handleUpdate(payload, ctx) {
   const denied = requireScopes4(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord12(payload);
+  const p2 = asRecord13(payload);
   const id = String(p2.id ?? "");
   if (!id) return { error: { code: "invalid_argument", message: "id required" } };
   try {
@@ -61439,7 +62227,7 @@ function handleUpdate(payload, ctx) {
 function handleDelete(payload, ctx) {
   const denied = requireScopes4(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord12(payload);
+  const p2 = asRecord13(payload);
   const id = String(p2.id ?? "");
   if (!id) return { error: { code: "invalid_argument", message: "id required" } };
   try {
@@ -61480,7 +62268,7 @@ function requireScopes5(client3, scopes) {
   }
   return null;
 }
-function asRecord13(payload) {
+function asRecord14(payload) {
   return payload && typeof payload === "object" ? payload : {};
 }
 function defaultProbeModels(ctx) {
@@ -61508,7 +62296,7 @@ async function dispatchHarnessResourcesRpc(method, payload, ctx) {
 async function handleHarnessResources(payload, ctx) {
   const denied = requireScopes5(ctx.client, OPERATION_SCOPES.readEnvironment);
   if (denied) return denied;
-  const p2 = asRecord13(payload);
+  const p2 = asRecord14(payload);
   const projectId = String(p2.projectId ?? "");
   if (!projectId) {
     return { error: { code: "invalid_argument", message: "projectId required" } };
@@ -61523,8 +62311,16 @@ async function handleHarnessResources(payload, ctx) {
     ctx.projects.touch(projectId);
     const harnessId = typeof p2.harnessId === "string" && p2.harnessId.trim() ? p2.harnessId.trim() : null;
     const apiProviderId = typeof p2.apiProviderId === "string" && p2.apiProviderId.trim() ? p2.apiProviderId.trim() : p2.apiProviderId === null ? null : void 0;
+    const providerOptions = {
+      experimentalClaudeOpenAiChatEnabled: ctx.experimentalClaudeOpenAiChatEnabled ?? false
+    };
     const listModels = (hid, apiId) => {
-      return listHarnessProviderModels(ctx.providers, hid, apiId ?? null);
+      return listHarnessProviderModels(
+        ctx.providers,
+        hid,
+        apiId ?? null,
+        providerOptions
+      );
     };
     const probeModels = async (hid) => {
       const probe = ctx.probeModels ?? defaultProbeModels(ctx);
@@ -61533,7 +62329,12 @@ async function handleHarnessResources(payload, ctx) {
       console.warn(
         `[harness.resources] ${hid} probe returned no models; serving the built-in fallback table`
       );
-      return listHarnessModels(ctx.providers, hid, apiProviderId ?? null);
+      return listHarnessModels(
+        ctx.providers,
+        hid,
+        apiProviderId ?? null,
+        providerOptions
+      );
     };
     const bundle = await collectHarnessResources({
       projectPath: project.path,
@@ -61716,7 +62517,8 @@ async function dispatchRpcInner(method, payload, ctx) {
     client: ctx.client,
     projects: ctx.projects,
     providers: ctx.providers,
-    harnesses: ctx.harnesses
+    harnesses: ctx.harnesses,
+    experimentalClaudeOpenAiChatEnabled: loadNodeAgentSettings(ctx.settingsConfigPath).experimentalClaudeOpenAiChatEnabled
   });
   if (harnessResources) return harnessResources;
   const codex = await dispatchCodexRpc(method, payload, {
@@ -61931,7 +62733,7 @@ function handleProviderListCredentials(ctx) {
 function handleProviderGetCredentialDecrypted(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   const cred = ctx.providers.getCredentialDecrypted(String(p2.id ?? ""));
   if (!cred) return { error: { code: "not_found", message: "credential not found" } };
   return { result: cred };
@@ -61939,7 +62741,7 @@ function handleProviderGetCredentialDecrypted(payload, ctx) {
 function handleProviderCreateCredential(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   try {
     return {
       result: ctx.providers.createCredential({
@@ -61961,7 +62763,7 @@ function handleProviderCreateCredential(payload, ctx) {
 function handleProviderUpdateCredential(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   const id = String(p2.id ?? "");
   const updated = ctx.providers.updateCredential(id, {
     name: typeof p2.name === "string" ? p2.name : void 0,
@@ -61978,7 +62780,7 @@ function handleProviderUpdateCredential(payload, ctx) {
 function handleProviderDeleteCredential(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   const ok = ctx.providers.deleteCredential(String(p2.id ?? ""));
   if (!ok) return { error: { code: "not_found", message: "credential not found" } };
   return { result: { ok: true } };
@@ -61991,7 +62793,7 @@ function handleProviderListBindings(ctx) {
 function handleProviderSetBinding(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   const binding = p2;
   if (!binding.consumer || !binding.credentialId) {
     return { error: { code: "invalid_argument", message: "consumer and credentialId required" } };
@@ -62002,7 +62804,7 @@ function handleProviderSetBinding(payload, ctx) {
 function handleProviderClearBinding(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   ctx.providers.clearBinding(String(p2.consumer ?? ""));
   return { result: { ok: true } };
 }
@@ -62014,14 +62816,14 @@ function handleProviderListCustomPlatforms(ctx) {
 function handleProviderUpsertCustomPlatform(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const def = asRecord14(payload);
+  const def = asRecord15(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 = requireScopes6(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(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 } };
@@ -62034,15 +62836,19 @@ function handleProviderExportBundle(ctx) {
 function handleProviderListModels(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.readEnvironment);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   const harness = String(p2.harness ?? p2.harnessId ?? "claude");
   const apiProviderId = typeof p2.apiProviderId === "string" && p2.apiProviderId.trim() ? p2.apiProviderId.trim() : null;
-  return { result: listHarnessModels(ctx.providers, harness, apiProviderId) };
+  return {
+    result: listHarnessModels(ctx.providers, harness, apiProviderId, {
+      experimentalClaudeOpenAiChatEnabled: loadNodeAgentSettings(ctx.settingsConfigPath).experimentalClaudeOpenAiChatEnabled
+    })
+  };
 }
 function handleProviderImportBundle(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   const bundle = p2.bundle && typeof p2.bundle === "object" ? p2.bundle : p2;
   const replaceAll = p2.replaceAll === true;
   try {
@@ -62107,7 +62913,7 @@ function handleHarnessList(ctx) {
 function handleHarnessShow(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(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}` } };
@@ -62117,7 +62923,7 @@ function handleHarnessShow(payload, ctx) {
 function handleHarnessProbe(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(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}` } };
@@ -62132,7 +62938,7 @@ function handleHarnessProbe(payload, ctx) {
 async function handleHarnessEnable(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(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}` } };
@@ -62158,7 +62964,7 @@ async function handleHarnessEnable(payload, ctx) {
 function handleHarnessDisable(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(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}` } };
@@ -62223,7 +63029,7 @@ function handleSettingsGet(ctx) {
 function handleSettingsPatch(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.adminNode);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   const rawPatch = p2.patch && typeof p2.patch === "object" ? p2.patch : p2;
   try {
     const settings = patchNodeAgentSettings(
@@ -62244,13 +63050,13 @@ async function handleSandboxProbe(ctx) {
     return mapThrown6(err);
   }
 }
-function asRecord14(payload) {
+function asRecord15(payload) {
   return payload && typeof payload === "object" ? payload : {};
 }
 function handleTerminalCreate(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.operateTerminal);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   const cwd = typeof p2.cwd === "string" ? p2.cwd : process.cwd();
   try {
     const info = ctx.terminals.create({
@@ -62275,7 +63081,7 @@ function handleTerminalCreate(payload, ctx) {
 function handleTerminalAttach(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.operateTerminal);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   const terminalId = String(p2.terminalId ?? "");
   try {
     const attached = ctx.terminals.attach(terminalId);
@@ -62287,7 +63093,7 @@ function handleTerminalAttach(payload, ctx) {
 function handleTerminalRead(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.operateTerminal);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   try {
     return {
       result: ctx.terminals.readAfter(
@@ -62315,7 +63121,7 @@ function requireTerminalLease(payload, ctx, terminalId) {
 function handleTerminalWrite(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.operateTerminal);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   const terminalId = String(p2.terminalId ?? "");
   const leaseErr = requireTerminalLease(p2, ctx, terminalId);
   if (leaseErr) return leaseErr;
@@ -62333,7 +63139,7 @@ function handleTerminalWrite(payload, ctx) {
 function handleTerminalResize(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.operateTerminal);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   const terminalId = String(p2.terminalId ?? "");
   const leaseErr = requireTerminalLease(p2, ctx, terminalId);
   if (leaseErr) return leaseErr;
@@ -62349,7 +63155,7 @@ function handleTerminalResize(payload, ctx) {
 function handleTerminalKill(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.operateTerminal);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   const terminalId = String(p2.terminalId ?? "");
   const leaseErr = requireTerminalLease(p2, ctx, terminalId);
   if (leaseErr) return leaseErr;
@@ -62363,7 +63169,7 @@ function handleTerminalKill(payload, ctx) {
 function handleTerminalAcquireControl(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.operateTerminal);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   const terminalId = String(p2.terminalId ?? "");
   try {
     return {
@@ -62380,7 +63186,7 @@ function handleTerminalAcquireControl(payload, ctx) {
 function handleTerminalRenewControl(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.operateTerminal);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   try {
     return {
       result: ctx.leases.renew({
@@ -62397,7 +63203,7 @@ function handleTerminalRenewControl(payload, ctx) {
 function handleTerminalReleaseControl(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.operateTerminal);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   try {
     ctx.leases.release(
       String(p2.leaseId ?? ""),
@@ -62422,7 +63228,7 @@ function handleProjectList(ctx) {
 function handleProjectGet(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.readProject);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   const projectId = String(p2.projectId ?? "");
   return { result: ctx.projects.get(projectId) };
 }
@@ -62438,7 +63244,7 @@ function expandHostPath(path) {
 function handleProjectOpen(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.manageProject);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   const path = expandHostPath(String(p2.path ?? ""));
   if (!path) {
     return { error: { code: "invalid_argument", message: "path is required" } };
@@ -62456,7 +63262,7 @@ function handleProjectOpen(payload, ctx) {
 function handleProjectRemove(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.manageProject);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(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) {
@@ -62475,7 +63281,7 @@ function handleProjectRemove(payload, ctx) {
 function handleFsListDir(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   const raw = String(p2.path ?? "");
   if (!raw || raw.includes("\0")) {
     return { error: { code: "invalid_argument", message: "path is required" } };
@@ -62501,7 +63307,7 @@ function handleFsListDir(payload, ctx) {
 function handleWorkspaceListDir(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   try {
     return {
       result: ctx.workspaceFs.listDir(String(p2.projectId ?? ""), String(p2.relativePath ?? "."))
@@ -62513,7 +63319,7 @@ function handleWorkspaceListDir(payload, ctx) {
 function handleWorkspaceListFiles(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   try {
     return {
       result: {
@@ -62531,7 +63337,7 @@ function handleWorkspaceListFiles(payload, ctx) {
 function handleWorkspaceListSkills(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   try {
     return {
       result: ctx.workspaceFs.listSkillsAndCommands(String(p2.projectId ?? ""))
@@ -62543,7 +63349,7 @@ function handleWorkspaceListSkills(payload, ctx) {
 function handleWorkspaceReadFile(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   try {
     return {
       result: ctx.workspaceFs.readFile(String(p2.projectId ?? ""), String(p2.relativePath ?? ""), {
@@ -62558,7 +63364,7 @@ function handleWorkspaceReadFile(payload, ctx) {
 function handleWorkspaceWriteFile(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   const raw = typeof p2.content === "string" ? p2.content : String(p2.content ?? "");
   const encoding = p2.encoding === "base64" ? "base64" : "utf8";
   let content = raw;
@@ -62588,7 +63394,7 @@ function handleWorkspaceWriteFile(payload, ctx) {
 function handleWorkspaceSearch(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   try {
     return {
       result: ctx.workspaceFs.search(
@@ -62604,7 +63410,7 @@ function handleWorkspaceSearch(payload, ctx) {
 function handleWorkspaceRename(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   try {
     return {
       result: ctx.workspaceFs.rename(
@@ -62620,7 +63426,7 @@ function handleWorkspaceRename(payload, ctx) {
 function handleWorkspaceMove(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   try {
     return {
       result: ctx.workspaceFs.move(
@@ -62636,7 +63442,7 @@ function handleWorkspaceMove(payload, ctx) {
 function handleWorkspaceDelete(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   try {
     return {
       result: ctx.workspaceFs.delete(
@@ -62651,7 +63457,7 @@ function handleWorkspaceDelete(payload, ctx) {
 function handleWorkspaceMkdir(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   try {
     return {
       result: ctx.workspaceFs.mkdir(
@@ -62666,7 +63472,7 @@ function handleWorkspaceMkdir(payload, ctx) {
 function handleWorkspaceWatchStart(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   try {
     const events = [];
     const { watchId, cancel } = ctx.workspaceWatch.subscribe(
@@ -62687,7 +63493,7 @@ function handleWorkspaceWatchStart(payload, ctx) {
 function handleWorkspaceWatchPoll(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   const watchId = String(p2.watchId ?? "");
   const buf = watchBuffers.get(watchId);
   if (!buf || buf.owner !== ctx.client.clientSessionId) {
@@ -62699,7 +63505,7 @@ function handleWorkspaceWatchPoll(payload, ctx) {
 function handleWorkspaceWatchStop(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   const watchId = String(p2.watchId ?? "");
   const buf = watchBuffers.get(watchId);
   if (buf && buf.owner === ctx.client.clientSessionId) {
@@ -62711,7 +63517,7 @@ function handleWorkspaceWatchStop(payload, ctx) {
 function handleWorkspaceTailWatchStart(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   try {
     const offset = typeof p2.offset === "number" ? p2.offset : void 0;
     const absolutePath = typeof p2.absolutePath === "string" ? p2.absolutePath : void 0;
@@ -62729,7 +63535,7 @@ function handleWorkspaceTailWatchStart(payload, ctx) {
 function handleWorkspaceTailWatchPoll(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   try {
     return {
       result: ctx.workspaceTailWatch.poll(String(p2.watchId ?? ""), ctx.client.clientSessionId)
@@ -62741,7 +63547,7 @@ function handleWorkspaceTailWatchPoll(payload, ctx) {
 function handleWorkspaceTailWatchStop(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   try {
     return {
       result: ctx.workspaceTailWatch.stop(String(p2.watchId ?? ""), ctx.client.clientSessionId)
@@ -62753,7 +63559,7 @@ function handleWorkspaceTailWatchStop(payload, ctx) {
 function handleGitStatus(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   try {
     const projectId = String(p2.projectId ?? "");
     const cwd = typeof p2.cwd === "string" ? p2.cwd : null;
@@ -62767,7 +63573,7 @@ function handleGitStatus(payload, ctx) {
 function handleGitDiff(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   try {
     return {
       result: ctx.workspaceGit.diff(String(p2.projectId ?? ""), {
@@ -62782,7 +63588,7 @@ function handleGitDiff(payload, ctx) {
 function handleGitBranches(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   try {
     return {
       result: ctx.workspaceGit.branches(
@@ -62797,7 +63603,7 @@ function handleGitBranches(payload, ctx) {
 function handleGitSwitchBranch(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   try {
     return {
       result: ctx.workspaceGit.switchBranch(String(p2.projectId ?? ""), String(p2.branch ?? ""), {
@@ -62812,7 +63618,7 @@ function handleGitSwitchBranch(payload, ctx) {
 function handleGitCreateBranch(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   try {
     return {
       result: ctx.workspaceGit.switchBranch(String(p2.projectId ?? ""), String(p2.branch ?? ""), {
@@ -62827,7 +63633,7 @@ function handleGitCreateBranch(payload, ctx) {
 function handleGitWorktrees(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   try {
     return { result: ctx.workspaceGit.worktrees(String(p2.projectId ?? "")) };
   } catch (err) {
@@ -62837,7 +63643,7 @@ function handleGitWorktrees(payload, ctx) {
 function handleGitWorktreeActivate(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(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" } };
@@ -62858,7 +63664,7 @@ function handleGitWorktreeActivate(payload, ctx) {
 function handleGitWorktreeCheckedOutBranches(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   try {
     return { result: { branches: ctx.workspaceGit.checkedOutBranches(String(p2.projectId ?? "")) } };
   } catch (err) {
@@ -62868,7 +63674,7 @@ function handleGitWorktreeCheckedOutBranches(payload, ctx) {
 function handleGitWorktreeAssignBranch(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   try {
     return {
       result: ctx.workspaceGit.assignBranch(
@@ -62884,7 +63690,7 @@ function handleGitWorktreeAssignBranch(payload, ctx) {
 function handleGitWorktreeHandoff(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.writeWorkspace);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   try {
     return {
       result: ctx.workspaceGit.handoffToMain(
@@ -62899,7 +63705,7 @@ function handleGitWorktreeHandoff(payload, ctx) {
 function handleGitWorktreeHandoffPreview(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.readWorkspace);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   try {
     return {
       result: ctx.workspaceGit.handoffPreview(
@@ -62914,7 +63720,7 @@ function handleGitWorktreeHandoffPreview(payload, ctx) {
 function handleSessionSetCwd(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   const sessionId = String(p2.sessionId ?? "");
   const cwdRaw = p2.cwd;
   const cwd = cwdRaw === null || cwdRaw === void 0 || cwdRaw === "" ? null : String(cwdRaw);
@@ -62943,7 +63749,7 @@ function handleSessionSetCwd(payload, ctx) {
 function handleSessionPatchSettings(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   const sessionId = String(p2.sessionId ?? "").trim();
   if (!sessionId) {
     return { error: { code: "invalid_argument", message: "sessionId required" } };
@@ -62959,7 +63765,7 @@ function handleSessionPatchSettings(payload, ctx) {
       generation: String(p2.generation ?? ""),
       holderClientId: ctx.client.clientSessionId
     });
-    const settingsSrc = asRecord14(p2.settings ?? p2);
+    const settingsSrc = asRecord15(p2.settings ?? p2);
     const patch = {};
     const take = (key) => {
       if (!(key in settingsSrc)) return;
@@ -62985,7 +63791,7 @@ function handleSessionPatchSettings(payload, ctx) {
 async function handleSessionFork(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   const sessionId = String(p2.sessionId ?? "").trim();
   if (!sessionId) {
     return { error: { code: "invalid_argument", message: "sessionId required" } };
@@ -63072,7 +63878,7 @@ async function handleSessionFork(payload, ctx) {
 async function handleGitClone(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.manageProject);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   try {
     const cloned = await cloneRepository({
       remoteUrl: String(p2.remoteUrl ?? ""),
@@ -63087,7 +63893,7 @@ async function handleGitClone(payload, ctx) {
 function handleSessionCreate(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   const rawHarnessId = typeof p2.harnessId === "string" ? p2.harnessId : "claude";
   const harnessId = normalizeSessionHarnessId(rawHarnessId);
   if (!harnessId) {
@@ -63140,7 +63946,7 @@ function handleSessionCreate(payload, ctx) {
   try {
     const agentSettings = loadNodeAgentSettings(ctx.settingsConfigPath);
     const defaults = resolveAgentTurnDefaults(agentSettings, harnessId);
-    const options = asRecord14(p2.options);
+    const options = asRecord15(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) : {};
@@ -63200,13 +64006,13 @@ function handleSessionCreate(payload, ctx) {
 function handleSessionGet(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.readSession);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   return { result: ctx.sessions.get(String(p2.sessionId ?? "")) };
 }
 function handleSessionList(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.readSession);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(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" } };
@@ -63218,28 +64024,34 @@ function handleSessionList(payload, ctx) {
   const offset = Math.max(Math.floor(p2.offset), 0);
   const rows = ctx.sessions.list(projectId, { limit, offset });
   return {
-    result: rows.map((s2) => ({
-      sessionId: s2.sessionId,
-      projectId: s2.projectId,
-      harnessId: s2.harnessId,
-      providerId: s2.providerId,
-      title: s2.title,
-      status: s2.status,
-      messageCount: Array.isArray(s2.transcript) ? s2.transcript.length : 0,
-      cwd: s2.cwd,
-      createdAt: s2.createdAt,
-      updatedAt: s2.updatedAt,
-      isPinned: s2.isPinned,
-      isHidden: s2.isHidden,
-      isAutomation: s2.isAutomation === true,
-      automationId: s2.automationId ?? null
-    }))
+    result: rows.map((s2) => {
+      const providerResume = s2.providerResume ?? null;
+      const providerSessionId = providerSessionIdFromResume(providerResume);
+      return {
+        sessionId: s2.sessionId,
+        projectId: s2.projectId,
+        harnessId: s2.harnessId,
+        providerId: s2.providerId,
+        title: s2.title,
+        status: s2.status,
+        messageCount: Array.isArray(s2.transcript) ? s2.transcript.length : 0,
+        cwd: s2.cwd,
+        createdAt: s2.createdAt,
+        updatedAt: s2.updatedAt,
+        isPinned: s2.isPinned,
+        isHidden: s2.isHidden,
+        isAutomation: s2.isAutomation === true,
+        automationId: s2.automationId ?? null,
+        providerResume,
+        ...providerSessionId ? { providerSessionId } : {}
+      };
+    })
   };
 }
 function handleSessionAcquireControl(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   const sessionId = String(p2.sessionId ?? "");
   if (!sessionId) {
     return { error: { code: "invalid_argument", message: "sessionId required" } };
@@ -63258,7 +64070,7 @@ function handleSessionAcquireControl(payload, ctx) {
 function handleSessionRenewControl(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   try {
     return {
       result: ctx.leases.renew({
@@ -63275,7 +64087,7 @@ function handleSessionRenewControl(payload, ctx) {
 function handleSessionReleaseControl(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   try {
     ctx.leases.release(
       String(p2.leaseId ?? ""),
@@ -63290,7 +64102,7 @@ function handleSessionReleaseControl(payload, ctx) {
 function handleSessionClose(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   const sessionId = String(p2.sessionId ?? "");
   try {
     ctx.leases.assertValid({
@@ -63316,7 +64128,7 @@ function handleSessionClose(payload, ctx) {
 function handleSessionRemove(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   const sessionId = String(p2.sessionId ?? "");
   if (!sessionId) {
     return { error: { code: "invalid_argument", message: "sessionId required" } };
@@ -63343,7 +64155,7 @@ function handleSessionRemove(payload, ctx) {
 function handleSessionRename(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   const sessionId = String(p2.sessionId ?? "");
   const title = String(p2.title ?? "");
   const source = p2.source === "agent" ? "agent" : "user";
@@ -63359,7 +64171,7 @@ function handleSessionRename(payload, ctx) {
 function handleSessionSetUiFlags(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   const sessionId = String(p2.sessionId ?? "");
   if (!sessionId) {
     return { error: { code: "invalid_argument", message: "sessionId required" } };
@@ -63378,9 +64190,9 @@ function handleSessionSetUiFlags(payload, ctx) {
 async function handleSessionSend(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   try {
-    const options = asRecord14(p2.options);
+    const options = asRecord15(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;
@@ -63473,7 +64285,7 @@ async function handleSessionSend(payload, ctx) {
 function handleSessionInterrupt(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   try {
     ctx.sessions.interrupt(
       String(p2.sessionId ?? ""),
@@ -63489,7 +64301,7 @@ function handleSessionInterrupt(payload, ctx) {
 function handleSessionRespondPermission(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(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({
@@ -63510,7 +64322,7 @@ function handleSessionRespondPermission(payload, ctx) {
 function handleSessionRespondQuestion(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   try {
     ctx.sessions.respondQuestion({
       sessionId: String(p2.sessionId ?? ""),
@@ -63528,7 +64340,7 @@ function handleSessionRespondQuestion(payload, ctx) {
 function handleSessionRespondPlan(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(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" } };
@@ -63551,7 +64363,7 @@ function handleSessionRespondPlan(payload, ctx) {
 async function handleSessionHostActionsPoll(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   try {
     const result = await ctx.sessions.pollHostActions({
       controllerClientSessionId: ctx.client.clientSessionId,
@@ -63567,7 +64379,7 @@ async function handleSessionHostActionsPoll(payload, ctx) {
 function handleSessionClaimHostAction(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   try {
     const result = ctx.sessions.claimHostAction({
       actionId: String(p2.actionId ?? ""),
@@ -63583,7 +64395,7 @@ function handleSessionClaimHostAction(payload, ctx) {
 function handleSessionRespondHostAction(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(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" } };
@@ -63605,14 +64417,14 @@ function handleSessionRespondHostAction(payload, ctx) {
 function handleSessionEvents(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.readSession);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   const after = String(p2.afterSequence ?? "0");
   return { result: { events: ctx.sessions.listEventsAfter(after) } };
 }
 function handleSessionMessagesList(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.readSession);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   const sessionId = String(p2.sessionId ?? "").trim();
   if (!sessionId) {
     return { error: { code: "invalid_argument", message: "sessionId required" } };
@@ -63651,7 +64463,7 @@ function handleCollaborationListProfiles(ctx) {
 async function handleCollaborationRequest(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   const parentSessionId = String(p2.parentSessionId ?? "");
   if (!parentSessionId) {
     return { error: { code: "invalid_argument", message: "parentSessionId required" } };
@@ -63685,7 +64497,7 @@ async function handleCollaborationRequest(payload, ctx) {
 async function handleCollaborationStart(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   const credential = typeof p2.credential === "string" ? p2.credential : void 0;
   const grantId = typeof p2.grantId === "string" ? p2.grantId : void 0;
   if (!credential && !grantId) {
@@ -63731,7 +64543,7 @@ async function handleCollaborationStart(payload, ctx) {
 function handleCollaborationSend(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.operateSession);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(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) : "";
@@ -63767,7 +64579,7 @@ function handleCollaborationSend(payload, ctx) {
 function handleCollaborationRetrieve(payload, ctx) {
   const denied = requireScopes6(ctx.client, OPERATION_SCOPES.readSession);
   if (denied) return denied;
-  const p2 = asRecord14(payload);
+  const p2 = asRecord15(payload);
   const credential = String(p2.credential ?? "");
   const sessionId = String(p2.sessionId ?? "");
   if (!credential) {
@@ -65942,39 +66754,28 @@ var CollaborationService = class {
   constructor(deps) {
     this.deps = deps;
   }
-  isEnabled() {
-    return this.deps.isEnabled?.() ?? true;
-  }
-  assertEnabled() {
-    if (!this.isEnabled()) {
-      throw Object.assign(
-        new Error(
-          "Agent session collaboration is disabled. Enable experimentalAgentCollaborationEnabled in node settings."
-        ),
-        { code: "failed_precondition" }
-      );
-    }
-  }
   /** Agent profiles from session_providers (+ ready-harness fallback). */
   listProfiles() {
-    this.assertEnabled();
     const { harnesses, providers, sessions, sessionProviders } = this.deps;
     const profiles = [];
     const seen = /* @__PURE__ */ new Set();
+    const providerOptions = {
+      experimentalClaudeOpenAiChatEnabled: this.deps.experimentalClaudeOpenAiChatEnabled?.() ?? false
+    };
     const pushProfile = (profileId, harnessId, name, description, profileConfig) => {
       if (seen.has(profileId)) return;
       if (harnessId !== "claude" && harnessId !== "codex" && harnessId !== "acp" && harnessId !== "opencode") {
         return;
       }
       seen.add(profileId);
-      const models = listHarnessModels(providers, harnessId, null).map((m2) => ({
+      const models = listHarnessModels(providers, harnessId, null, providerOptions).map((m2) => ({
         id: m2.id,
         name: m2.name || m2.id,
         ...m2.description ? { description: m2.description } : {}
       }));
       const defaultModel = models.find((m2) => m2.isDefault) ?? models[0];
       const efforts = /* @__PURE__ */ new Set();
-      for (const m2 of listHarnessModels(providers, harnessId, null)) {
+      for (const m2 of listHarnessModels(providers, harnessId, null, providerOptions)) {
         for (const e of m2.supportedEffortLevels ?? []) efforts.add(e);
       }
       const cfg = profileConfig && typeof profileConfig === "object" && !Array.isArray(profileConfig) ? profileConfig : {};
@@ -65994,7 +66795,7 @@ var CollaborationService = class {
         },
         models: models.length > 0 ? models : [{ id: "default", name: "Default" }],
         efforts: [...efforts],
-        apiProviders: listHarnessApiProviders(providers, harnessId)
+        apiProviders: listHarnessApiProviders(providers, harnessId, providerOptions)
       });
     };
     if (sessionProviders) {
@@ -66040,7 +66841,6 @@ var CollaborationService = class {
    * RPC path defaults to auto-approve (already-trusted controller).
    */
   async request(input) {
-    this.assertEnabled();
     const parent = this.deps.sessions.get(input.parentSessionId);
     if (!parent) {
       throw Object.assign(new Error("Parent session is not available"), { code: "not_found" });
@@ -66210,7 +67010,6 @@ var CollaborationService = class {
     return { status: "approved", launches: results };
   }
   async start(input) {
-    this.assertEnabled();
     let grant = this.resolveGrant(input.credential, input.grantId);
     if (!grant) {
       throw Object.assign(new Error("Invalid collaboration credential"), { code: "not_found" });
@@ -66349,7 +67148,6 @@ var CollaborationService = class {
     };
   }
   send(input) {
-    this.assertEnabled();
     const grant = this.grantForCredential(input.credential);
     if (!grant) {
       throw Object.assign(new Error("Invalid collaboration credential"), { code: "not_found" });
@@ -66429,7 +67227,6 @@ var CollaborationService = class {
     };
   }
   retrieve(input) {
-    this.assertEnabled();
     const credentials = [
       ...typeof input.credential === "string" && input.credential.trim() ? [input.credential.trim()] : [],
       ...Array.isArray(input.credentials) ? input.credentials.filter((c) => typeof c === "string" && c.trim().length > 0) : []
@@ -78333,16 +79130,6 @@ function collabDescriptor(name) {
   };
 }
 function registerNodeCollabTools(server, superoneSessionId, collab) {
-  const requireEnabled = () => {
-    if (!collab.isEnabled()) {
-      throw Object.assign(
-        new Error(
-          "Agent session collaboration is disabled. Enable experimentalAgentCollaborationEnabled in node settings."
-        ),
-        { code: "failed_precondition" }
-      );
-    }
-  };
   const listDesc = collabDescriptor("session_collab_list_agents");
   server.registerTool(
     "session_collab_list_agents",
@@ -78352,7 +79139,6 @@ function registerNodeCollabTools(server, superoneSessionId, collab) {
     },
     async () => {
       try {
-        requireEnabled();
         const agents = await collab.listAgents(superoneSessionId);
         return toolResultJson({ agents });
       } catch (err) {
@@ -78369,7 +79155,6 @@ function registerNodeCollabTools(server, superoneSessionId, collab) {
     },
     async (args, extra) => {
       try {
-        requireEnabled();
         const result = await collab.request(superoneSessionId, args ?? {}, extra?.signal);
         const status = result && typeof result === "object" && "status" in result ? String(result.status) : "ok";
         return toolResultJson(result, status === "error");
@@ -78389,7 +79174,6 @@ function registerNodeCollabTools(server, superoneSessionId, collab) {
     },
     async (args) => {
       try {
-        requireEnabled();
         const result = await collab.start(superoneSessionId, args ?? {});
         return toolResultJson(result);
       } catch (err) {
@@ -78406,7 +79190,6 @@ function registerNodeCollabTools(server, superoneSessionId, collab) {
     },
     async (args) => {
       try {
-        requireEnabled();
         const result = await collab.send(superoneSessionId, args ?? {});
         return toolResultJson(result);
       } catch (err) {
@@ -78423,7 +79206,6 @@ function registerNodeCollabTools(server, superoneSessionId, collab) {
     },
     async (args) => {
       try {
-        requireEnabled();
         const result = await collab.retrieve(superoneSessionId, args ?? {});
         return toolResultJson(result);
       } catch (err) {
@@ -79713,7 +80495,6 @@ async function startNodeRuntime(partial2 = {}) {
   const collabSecrets = createNodeSecretCrypto(paths.providerSecretsKey);
   let sessionsRef = null;
   let collaborationRef = null;
-  const isCollabEnabled = () => loadNodeAgentSettings(paths.configJson).experimentalAgentCollaborationEnabled;
   const hostActionMcp = await startHostActionMcpServer({
     requestHostAction: (input) => {
       if (!sessionsRef) {
@@ -79724,7 +80505,6 @@ async function startNodeRuntime(partial2 = {}) {
       return sessionsRef.requestHostAction(input);
     },
     collab: {
-      isEnabled: isCollabEnabled,
       listAgents: () => {
         if (!collaborationRef) throw Object.assign(new Error("collab not ready"), { code: "failed_precondition" });
         return collaborationRef.listProfiles();
@@ -79773,6 +80553,7 @@ async function startNodeRuntime(partial2 = {}) {
     resolveProjectPath: (projectId) => projects.get(projectId)?.path ?? null,
     allowSimulatedFallback: allowSimulatedTurnFallback,
     providers,
+    experimentalClaudeOpenAiChatEnabled: () => loadNodeAgentSettings(paths.configJson).experimentalClaudeOpenAiChatEnabled,
     // Claude: in-process SDK MCP (same core tools as HTTP).
     createHostActionClaudeMcp: (sessionId) => hostActionMcp.createClaudeSdkMcp(sessionId),
     // Codex / ACP / OpenCode: loopback HTTP with per-session HMAC.
@@ -79805,7 +80586,7 @@ async function startNodeRuntime(partial2 = {}) {
     workspaceGit,
     secrets: collabSecrets,
     sessionProviders,
-    isEnabled: isCollabEnabled
+    experimentalClaudeOpenAiChatEnabled: () => loadNodeAgentSettings(paths.configJson).experimentalClaudeOpenAiChatEnabled
   });
   collaborationRef = collaboration;
   collaboration.rehydrateSystemPrompts();