@vanillagreen/pi-claude-bridge 1.9.0 → 2.0.0

package/bundle/index.js

@@ -8788,6 +8788,7 @@ function zO(e) {
 }
 var $O = typeof String.prototype.isWellFormed === "function" ? Function.prototype.call.bind(String.prototype.isWellFormed) : void 0;
 var qUe = typeof String.prototype.toWellFormed === "function" ? Function.prototype.call.bind(String.prototype.toWellFormed) : void 0;
+var qO = ["You've hit your", "You've reached your", "You're out of usage credits", "Your org is out of usage \xB7 add funds to continue", "Your org is out of usage \xB7 contact your admin", "Your seat type doesn't include usage credits", "Your seat type doesn't include usage", "Your usage allocation has been disabled by your admin", "Your group's usage limit is set to $0", "Fable 5 requires usage credits", "You're out of extra usage", "Your seat type doesn't include extra usage"];
 var It = class extends Error {
 };
 function Cs() {
@@ -26937,514 +26938,6 @@ function splitPrefixSuffix(input, options = {}) {
   ];
 }
 
-// src/convert.ts
-var PROVIDER_ID = "claude-bridge";
-var PI_TO_SDK_TOOL_NAME = {
-  read: "Read",
-  write: "Write",
-  edit: "Edit",
-  bash: "Bash"
-};
-function sanitizeToolId(id, cache) {
-  const existing = cache.get(id);
-  if (existing) return existing;
-  const clean = id.replace(/[^a-zA-Z0-9_-]/g, "_");
-  cache.set(id, clean);
-  return clean;
-}
-function mapPiToolNameToSdk(name, customToolNameToSdk) {
-  if (!name) return "";
-  const normalized = name.toLowerCase();
-  if (customToolNameToSdk) {
-    const mapped = customToolNameToSdk.get(name) ?? customToolNameToSdk.get(normalized);
-    if (mapped) return mapped;
-  }
-  if (PI_TO_SDK_TOOL_NAME[normalized]) return PI_TO_SDK_TOOL_NAME[normalized];
-  return pascalCase(name);
-}
-function messageContentToText(content) {
-  if (typeof content === "string") return content;
-  if (!Array.isArray(content)) return "";
-  const parts = [];
-  let hasText = false;
-  for (const block of content) {
-    if (block.type === "text" && block.text) {
-      parts.push(block.text);
-      hasText = true;
-    } else if (block.type !== "text" && block.type !== "image") {
-      parts.push(`[${block.type}]`);
-    }
-  }
-  return hasText ? parts.join("\n") : "";
-}
-function imageBlockToAnthropic(block) {
-  if (!block.data || !block.mimeType) return void 0;
-  return { type: "image", source: { type: "base64", media_type: block.mimeType, data: block.data } };
-}
-function toolResultContentToAnthropic(content) {
-  if (typeof content === "string") return content;
-  if (!Array.isArray(content)) return "";
-  const blocks = [];
-  for (const block of content) {
-    if (block.type === "text" && block.text) {
-      blocks.push({ type: "text", text: block.text });
-    } else if (block.type === "image") {
-      const image = imageBlockToAnthropic(block);
-      if (image) blocks.push(image);
-    } else if (block.type) {
-      blocks.push({ type: "text", text: `[${block.type}]` });
-    }
-  }
-  if (blocks.length === 0) return "";
-  if (blocks.every((block) => block.type === "text")) return blocks.map((block) => block.text).join("\n");
-  return blocks;
-}
-function assistantProvenancePrefix(msg) {
-  if (msg.role !== "assistant") return void 0;
-  const provider = typeof msg.provider === "string" ? msg.provider : void 0;
-  const model = typeof msg.model === "string" ? msg.model : void 0;
-  const api = typeof msg.api === "string" ? msg.api : void 0;
-  if (!provider && !model && !api) return void 0;
-  if (provider === PROVIDER_ID || api === "anthropic") return void 0;
-  return `[Prior Pi assistant response from ${provider ?? api ?? "unknown-provider"}${model ? `/${model}` : ""}]
-`;
-}
-function userMessageToAnthropic(msg) {
-  if (typeof msg.content === "string") return { role: "user", content: msg.content || "[empty]" };
-  if (Array.isArray(msg.content)) {
-    const parts = [];
-    for (const block of msg.content) {
-      if (block.type === "text" && block.text) parts.push({ type: "text", text: block.text });
-      else if (block.type === "image" && block.data && block.mimeType) parts.push(imageBlockToAnthropic(block));
-    }
-    const kept = parts.filter(Boolean);
-    return { role: "user", content: kept.length ? kept : "[image]" };
-  }
-  return { role: "user", content: "[empty]" };
-}
-function toolResultToAnthropicBlock(msg, sanitizedIds) {
-  const content = toolResultContentToAnthropic(msg.content);
-  return {
-    type: "tool_result",
-    tool_use_id: sanitizeToolId(msg.toolCallId, sanitizedIds),
-    content: content || "",
-    is_error: msg.isError
-  };
-}
-function hasToolUse(msg) {
-  return msg.role === "assistant" && Array.isArray(msg.content) && msg.content.some((block) => block.type === "toolCall");
-}
-function convertPiMessages(messages, customToolNameToSdk) {
-  const anthropicMessages = [];
-  const sanitizedIds = /* @__PURE__ */ new Map();
-  const pushToolResultGroup = (toolMessages) => {
-    if (toolMessages.length === 0) return;
-    anthropicMessages.push({
-      role: "user",
-      content: toolMessages.map((toolMsg) => {
-        const content = toolResultContentToAnthropic(toolMsg.content);
-        return {
-          type: "tool_result",
-          tool_use_id: sanitizeToolId(toolMsg.toolCallId, sanitizedIds),
-          content: content || "",
-          is_error: toolMsg.isError
-        };
-      })
-    });
-  };
-  for (let i = 0; i < messages.length; i++) {
-    const msg = messages[i];
-    if (msg.role === "user") {
-      anthropicMessages.push(userMessageToAnthropic(msg));
-    } else if (msg.role === "assistant") {
-      const content = Array.isArray(msg.content) ? msg.content : [];
-      const blocks = [];
-      const provenance = assistantProvenancePrefix(msg);
-      if (provenance) blocks.push({ type: "text", text: provenance });
-      for (const block of content) {
-        if (block.type === "text" && block.text) {
-          blocks.push({ type: "text", text: block.text });
-        } else if (block.type === "thinking") {
-          const sig = block.thinkingSignature;
-          const isAnthropicProvider = msg.provider === PROVIDER_ID || msg.api === "anthropic";
-          if (isAnthropicProvider && sig) {
-            blocks.push({ type: "thinking", thinking: block.thinking ?? "", signature: sig });
-          }
-        } else if (block.type === "toolCall") {
-          const toolName = mapPiToolNameToSdk(block.name, customToolNameToSdk);
-          blocks.push({ type: "tool_use", id: sanitizeToolId(block.id, sanitizedIds), name: toolName, input: block.arguments ?? {} });
-        }
-      }
-      if (!blocks.length) blocks.push({ type: "text", text: "[incompatible content omitted]" });
-      anthropicMessages.push({ role: "assistant", content: blocks });
-      if (hasToolUse(msg)) {
-        const toolMessages = [];
-        const interleavedUsers = [];
-        let j2 = i + 1;
-        for (; j2 < messages.length; j2++) {
-          const next = messages[j2];
-          if (next.role === "assistant") break;
-          if (next.role === "toolResult") toolMessages.push(next);
-          else if (next.role === "user") interleavedUsers.push(next);
-          else break;
-        }
-        if (toolMessages.length > 0) {
-          pushToolResultGroup(toolMessages);
-          for (const userMsg of interleavedUsers) anthropicMessages.push(userMessageToAnthropic(userMsg));
-          i = j2 - 1;
-        }
-      }
-    } else if (msg.role === "toolResult") {
-      const blocks = [];
-      for (; i < messages.length; i++) {
-        const toolMsg = messages[i];
-        if (toolMsg.role !== "toolResult") {
-          i--;
-          break;
-        }
-        blocks.push(toolResultToAnthropicBlock(toolMsg, sanitizedIds));
-      }
-      anthropicMessages.push({ role: "user", content: blocks });
-    }
-  }
-  return { anthropicMessages, sanitizedIds };
-}
-
-// src/models.ts
-var FABLE_MODEL_ID = "claude-fable-5";
-var FABLE_FALLBACK_MODEL_ID = "claude-opus-4-8";
-var OPUS_5_MODEL_ID = "claude-opus-5";
-var SONNET_5_MODEL_ID = "claude-sonnet-5";
-function fallbackModelForPrimaryModel(modelId) {
-  return modelId === FABLE_MODEL_ID || modelId === OPUS_5_MODEL_ID ? FABLE_FALLBACK_MODEL_ID : void 0;
-}
-var MODEL_IDS_IN_ORDER = [
-  FABLE_MODEL_ID,
-  OPUS_5_MODEL_ID,
-  FABLE_FALLBACK_MODEL_ID,
-  "claude-opus-4-7",
-  "claude-opus-4-6",
-  SONNET_5_MODEL_ID,
-  "claude-sonnet-4-6",
-  "claude-haiku-4-5"
-];
-var FALLBACK_MODELS = {
-  [FABLE_MODEL_ID]: {
-    id: FABLE_MODEL_ID,
-    name: "Claude Fable 5",
-    reasoning: true,
-    thinkingLevelMap: { xhigh: "xhigh", max: "max" },
-    input: ["text", "image"],
-    contextWindow: 1e6,
-    maxTokens: 128e3
-  },
-  [OPUS_5_MODEL_ID]: {
-    id: OPUS_5_MODEL_ID,
-    name: "Claude Opus 5",
-    reasoning: true,
-    thinkingLevelMap: { xhigh: "xhigh", max: "max" },
-    input: ["text", "image"],
-    contextWindow: 1e6,
-    maxTokens: 128e3
-  },
-  [FABLE_FALLBACK_MODEL_ID]: {
-    id: FABLE_FALLBACK_MODEL_ID,
-    name: "Claude Opus 4.8",
-    reasoning: true,
-    thinkingLevelMap: { xhigh: "xhigh" },
-    input: ["text", "image"],
-    contextWindow: 1e6,
-    maxTokens: 128e3
-  },
-  [SONNET_5_MODEL_ID]: {
-    id: SONNET_5_MODEL_ID,
-    name: "Claude Sonnet 5",
-    reasoning: true,
-    thinkingLevelMap: { xhigh: "xhigh", max: "max" },
-    input: ["text", "image"],
-    contextWindow: 1e6,
-    maxTokens: 128e3
-  }
-};
-function modelDisplayName(modelId) {
-  return FALLBACK_MODELS[modelId]?.name ?? modelId;
-}
-function buildModels(piAiModels) {
-  return MODEL_IDS_IN_ORDER.map((id) => piAiModels.find((m) => m.id === id) ?? FALLBACK_MODELS[id]).filter((m) => m != null).map(({ id, name, reasoning, input, contextWindow, maxTokens, thinkingLevelMap }) => ({
-    id,
-    name,
-    reasoning,
-    input,
-    contextWindow,
-    maxTokens,
-    thinkingLevelMap,
-    cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 }
-  }));
-}
-
-// src/skills.ts
-var MCP_SERVER_NAME = "custom-tools";
-var MCP_TOOL_PREFIX = `mcp__${MCP_SERVER_NAME}__`;
-function extractSkillsBlock(systemPrompt) {
-  if (!systemPrompt) return void 0;
-  const startMarker = "The following skills provide specialized instructions for specific tasks.";
-  const endMarker = "</available_skills>";
-  const start = systemPrompt.indexOf(startMarker);
-  if (start === -1) return void 0;
-  const end = systemPrompt.indexOf(endMarker, start);
-  if (end === -1) return void 0;
-  return rewriteSkillsBlock(systemPrompt.slice(start, end + endMarker.length).trim());
-}
-function rewriteSkillsBlock(skillsBlock) {
-  return skillsBlock.replace(
-    "Use the read tool to load a skill's file",
-    `Use the read tool (mcp__${MCP_SERVER_NAME}__read) to load a skill's file`
-  );
-}
-
-// src/extract-tool-results.ts
-function toolResultToMcpContent(content) {
-  if (typeof content === "string") return [{ type: "text", text: content || "" }];
-  if (!Array.isArray(content)) return [{ type: "text", text: "" }];
-  const blocks = [];
-  for (const block of content) {
-    if (block.type === "text" && block.text) blocks.push({ type: "text", text: block.text });
-    else if (block.type === "image" && block.data && block.mimeType) blocks.push({ type: "image", data: block.data, mimeType: block.mimeType });
-  }
-  return blocks.length ? blocks : [{ type: "text", text: "" }];
-}
-function extractAllToolResults(messages) {
-  const results = [];
-  let stopIdx = -1;
-  for (let i = messages.length - 1; i >= 0; i--) {
-    const msg = messages[i];
-    if (msg.role === "toolResult") {
-      results.unshift({ content: toolResultToMcpContent(msg.content), isError: msg.isError, toolCallId: msg.toolCallId });
-    } else if (msg.role === "assistant") {
-      stopIdx = i;
-      break;
-    }
-  }
-  return { results, stopIdx };
-}
-
-// src/query-state.ts
-var DRAIN_CAUSE_TEXT = {
-  "abort": "the turn was aborted",
-  "stream-idle-timeout": "the Claude Code stream went idle and the turn timed out",
-  "query-end": "the query ended"
-};
-function interruptedToolCallResult(cause) {
-  return {
-    content: [{ type: "text", text: `Claude bridge: ${DRAIN_CAUSE_TEXT[cause]} before this tool call's result was delivered. The call did not complete and produced no output.` }],
-    isError: true
-  };
-}
-function toolCallDrainCause(flags) {
-  if (flags.wasAborted || flags.signalAborted) return "abort";
-  if (flags.streamIdleTimedOut) return "stream-idle-timeout";
-  return "query-end";
-}
-function drainPendingToolCalls(queryCtx, cause) {
-  const drained = queryCtx.pendingToolCalls.size;
-  if (drained === 0) return 0;
-  const result = interruptedToolCallResult(cause);
-  for (const pending of queryCtx.pendingToolCalls.values()) pending.resolve(result);
-  queryCtx.pendingToolCalls.clear();
-  return drained;
-}
-function normalizeForCompare(value) {
-  if (Array.isArray(value)) return value.map(normalizeForCompare);
-  if (value && typeof value === "object") {
-    const out = {};
-    for (const key of Object.keys(value).sort()) {
-      const child = value[key];
-      if (child !== void 0) out[key] = normalizeForCompare(child);
-    }
-    return out;
-  }
-  return value;
-}
-function argsKey(value) {
-  return JSON.stringify(normalizeForCompare(value ?? {}));
-}
-function sameArgs(left, right) {
-  return argsKey(left) === argsKey(right);
-}
-function hasRecordedArgs(args) {
-  return Object.keys(args ?? {}).length > 0;
-}
-function unique(values) {
-  const out = [];
-  const seen = /* @__PURE__ */ new Set();
-  for (const value of values) {
-    if (!value || seen.has(value)) continue;
-    seen.add(value);
-    out.push(value);
-  }
-  return out;
-}
-var QueryContext = class {
-  // Query-scoped (fully isolated per query)
-  activeQuery = null;
-  currentPiStream = null;
-  latestCursor = 0;
-  pendingToolCalls = /* @__PURE__ */ new Map();
-  pendingResults = /* @__PURE__ */ new Map();
-  turnToolCallIds = [];
-  turnToolCalls = [];
-  claimedToolCallIds = /* @__PURE__ */ new Set();
-  deliveredToolResultIds = /* @__PURE__ */ new Set();
-  resolvedToolResultIds = /* @__PURE__ */ new Set();
-  unmatchedToolResultIds = /* @__PURE__ */ new Set();
-  reportedToolResultMismatch = false;
-  deferredUserMessages = [];
-  handledTerminalError = false;
-  // Per-turn (reset together)
-  turnOutput = null;
-  turnStarted = false;
-  turnSawStreamEvent = false;
-  turnSawToolCall = false;
-  get turnBlocks() {
-    if (!this.turnOutput) throw new Error("turnBlocks accessed before resetTurnState");
-    return this.turnOutput.content;
-  }
-  resetTurnState(model) {
-    this.turnOutput = {
-      role: "assistant",
-      content: [],
-      api: model.api,
-      provider: model.provider,
-      model: model.id,
-      usage: {
-        input: 0,
-        output: 0,
-        cacheRead: 0,
-        cacheWrite: 0,
-        totalTokens: 0,
-        cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 }
-      },
-      stopReason: "stop",
-      timestamp: Date.now()
-    };
-    this.turnStarted = false;
-    this.turnSawStreamEvent = false;
-    this.turnSawToolCall = false;
-    this.handledTerminalError = false;
-  }
-  resetToolTracking() {
-    this.turnToolCallIds = [];
-    this.turnToolCalls = [];
-    this.claimedToolCallIds.clear();
-    this.deliveredToolResultIds.clear();
-    this.resolvedToolResultIds.clear();
-    this.unmatchedToolResultIds.clear();
-    this.reportedToolResultMismatch = false;
-  }
-  recordToolCall(id, toolName, args = {}) {
-    if (!id) return;
-    if (!this.turnToolCallIds.includes(id)) this.turnToolCallIds.push(id);
-    const existing = this.turnToolCalls.find((call) => call.id === id);
-    if (existing) {
-      existing.toolName = toolName;
-      existing.arguments = args;
-      return;
-    }
-    this.turnToolCalls.push({ id, toolName, arguments: args });
-  }
-  updateToolCallArgs(id, args) {
-    if (!id) return;
-    const existing = this.turnToolCalls.find((call) => call.id === id);
-    if (existing) existing.arguments = args;
-  }
-  hasRecordedToolCall(id) {
-    return Boolean(id && (this.turnToolCallIds.includes(id) || this.turnToolCalls.some((call) => call.id === id)));
-  }
-  claimToolCall(toolName, args = {}) {
-    const unclaimed = this.turnToolCalls.filter((call) => !this.claimedToolCallIds.has(call.id));
-    const byName = unclaimed.filter((call) => call.toolName === toolName);
-    const exact = byName.filter((call) => sameArgs(call.arguments, args));
-    let chosen;
-    let match = "none";
-    let ambiguous = false;
-    if (exact.length > 0) {
-      chosen = exact[0];
-      match = "tool-args";
-      ambiguous = exact.length > 1;
-    } else if (byName.length === 1 && !hasRecordedArgs(byName[0].arguments)) {
-      chosen = byName[0];
-      match = "tool-name";
-    }
-    if (!chosen) return { match: "none", ambiguous: false, available: unclaimed.length };
-    this.claimedToolCallIds.add(chosen.id);
-    return { toolCallId: chosen.id, match, ambiguous, available: unclaimed.length };
-  }
-  markToolResultDelivered(id) {
-    if (id) this.deliveredToolResultIds.add(id);
-  }
-  markToolResultResolved(id) {
-    if (id) this.resolvedToolResultIds.add(id);
-  }
-  markToolResultUnmatched(id) {
-    if (id) this.unmatchedToolResultIds.add(id);
-  }
-  toolResultProgress() {
-    const expectedIds = unique([
-      ...this.turnToolCalls.map((call) => call.id),
-      ...this.turnToolCallIds
-    ]);
-    const deliveredIds = unique(this.deliveredToolResultIds);
-    const resolvedIds = unique(this.resolvedToolResultIds);
-    const waitingIds = unique(this.pendingToolCalls.keys());
-    const queuedIds = unique(this.pendingResults.keys());
-    const unmatchedResultIds = unique(this.unmatchedToolResultIds);
-    const missingDeliveredIds = expectedIds.filter((id) => !this.deliveredToolResultIds.has(id));
-    const unresolvedIds = expectedIds.filter((id) => !this.resolvedToolResultIds.has(id));
-    const affectedIds = /* @__PURE__ */ new Set([...missingDeliveredIds, ...unresolvedIds, ...waitingIds, ...queuedIds, ...unmatchedResultIds]);
-    const counts = /* @__PURE__ */ new Map();
-    for (const call of this.turnToolCalls) {
-      if (affectedIds.size > 0 && !affectedIds.has(call.id)) continue;
-      counts.set(call.toolName, (counts.get(call.toolName) ?? 0) + 1);
-    }
-    return {
-      expectedIds,
-      deliveredIds,
-      resolvedIds,
-      waitingIds,
-      queuedIds,
-      unmatchedResultIds,
-      missingDeliveredIds,
-      unresolvedIds,
-      toolNames: [...counts.entries()].sort((a, b) => b[1] - a[1] || a[0].localeCompare(b[0])).map(([name, count]) => ({ name, count })),
-      expectedCount: expectedIds.length,
-      deliveredCount: deliveredIds.length,
-      resolvedCount: resolvedIds.length,
-      waitingCount: waitingIds.length,
-      queuedCount: queuedIds.length,
-      unmatchedResultCount: unmatchedResultIds.length
-    };
-  }
-};
-var _ctx = new QueryContext();
-var contextStack = [];
-function ctx() {
-  return _ctx;
-}
-function stackDepth() {
-  return contextStack.length;
-}
-function pushContext() {
-  if (!_ctx.activeQuery) throw new Error("pushContext() called with no active query");
-  contextStack.push(_ctx);
-  _ctx = new QueryContext();
-}
-function popContext() {
-  if (contextStack.length === 0) throw new Error("popContext() called with empty stack");
-  const parent = contextStack[contextStack.length - 1];
-  parent.deferredUserMessages.push(..._ctx.deferredUserMessages);
-  _ctx = contextStack.pop();
-}
-
 // src/config.ts
 import { existsSync as existsSync2, readFileSync as readFileSync2 } from "fs";
 import { homedir } from "os";
@@ -27649,187 +27142,1646 @@ function loadConfig(cwd) {
   };
 }
 
-// src/auth-presence.ts
-import { existsSync as existsSync3, readFileSync as readFileSync3 } from "fs";
-import { homedir as homedir2, platform as osPlatform } from "os";
-import { join as join3 } from "path";
-function resolveClaudeConfigDir(env = process.env) {
-  const configured = env.CLAUDE_CONFIG_DIR;
-  if (typeof configured === "string" && configured.trim().length > 0) return configured.trim();
-  return join3(homedir2(), ".claude");
-}
-function nonEmptyEnv(value) {
-  return typeof value === "string" && value.trim().length > 0;
+// src/skills.ts
+var MCP_SERVER_NAME = "custom-tools";
+var MCP_TOOL_PREFIX = `mcp__${MCP_SERVER_NAME}__`;
+function extractSkillsBlock(systemPrompt) {
+  if (!systemPrompt) return void 0;
+  const startMarker = "The following skills provide specialized instructions for specific tasks.";
+  const endMarker = "</available_skills>";
+  const start = systemPrompt.indexOf(startMarker);
+  if (start === -1) return void 0;
+  const end = systemPrompt.indexOf(endMarker, start);
+  if (end === -1) return void 0;
+  return rewriteSkillsBlock(systemPrompt.slice(start, end + endMarker.length).trim());
 }
-function envTruthy(value) {
-  const v2 = value?.trim().toLowerCase();
-  return v2 === "1" || v2 === "true";
+function rewriteSkillsBlock(skillsBlock) {
+  return skillsBlock.replace(
+    "Use the read tool to load a skill's file",
+    `Use the read tool (mcp__${MCP_SERVER_NAME}__read) to load a skill's file`
+  );
 }
-function hasApiKeyHelper(configDir) {
-  try {
-    const settingsPath = join3(configDir, "settings.json");
-    if (!existsSync3(settingsPath)) return false;
-    const parsed = JSON.parse(readFileSync3(settingsPath, "utf8"));
-    return typeof parsed?.apiKeyHelper === "string" && parsed.apiKeyHelper.trim().length > 0;
-  } catch {
-    return false;
+
+// src/connector-inventory.ts
+var CONNECTOR_NS_PREFIX = "mcp__claude_ai_";
+var DEFAULT_API_BASE = "https://api.anthropic.com";
+var DEFAULT_PROXY_BASE = "https://mcp-proxy.anthropic.com/v1/mcp";
+var OAUTH_BETA_HEADER = "oauth-2025-04-20";
+function connectorServerName(connectorName) {
+  return `claude.ai ${connectorName.trim()}`;
+}
+function connectorProxyUrl(installedServerId, proxyBase = DEFAULT_PROXY_BASE) {
+  return `${trimTrailingSlashes(proxyBase)}/${encodeURIComponent(installedServerId)}`;
+}
+function connectorServerNamespace(connectorName) {
+  return `${CONNECTOR_NS_PREFIX}${connectorName.trim().replace(/\s+/g, "_")}__`;
+}
+function credentialCandidatePaths(env = process.env) {
+  const roots = [];
+  const configDir = env.CLAUDE_CONFIG_DIR?.trim();
+  if (configDir) roots.push(configDir);
+  const home = env.HOME?.trim();
+  if (home) roots.push(`${home}/.claude`, home);
+  const seen = /* @__PURE__ */ new Set();
+  const paths = [];
+  for (const root of roots) {
+    for (const name of [".credentials.json", ".claude.json"]) {
+      const p2 = `${root}/${name}`;
+      if (!seen.has(p2)) {
+        seen.add(p2);
+        paths.push(p2);
+      }
+    }
   }
+  return paths;
 }
-function hasClaudeCredentials(env = process.env, platform = osPlatform()) {
-  if (nonEmptyEnv(env.CLAUDE_CODE_OAUTH_TOKEN)) return true;
-  if (nonEmptyEnv(env.ANTHROPIC_API_KEY)) return true;
-  if (nonEmptyEnv(env.ANTHROPIC_AUTH_TOKEN)) return true;
-  if (envTruthy(env.CLAUDE_CODE_USE_BEDROCK)) return true;
-  if (envTruthy(env.CLAUDE_CODE_USE_VERTEX)) return true;
-  if (envTruthy(env.CLAUDE_CODE_USE_FOUNDRY)) return true;
-  if (envTruthy(env.CLAUDE_CODE_USE_ANTHROPIC_AWS)) return true;
-  if (envTruthy(env.CLAUDE_CODE_USE_MANTLE)) return true;
-  const configDir = resolveClaudeConfigDir(env);
-  if (existsSync3(join3(configDir, ".credentials.json"))) return true;
-  if (hasApiKeyHelper(configDir)) return true;
-  if (platform === "darwin") return true;
-  return false;
+function resolveClaudeOAuth(readFile, env = process.env) {
+  let accessToken;
+  let organizationUuid;
+  for (const path of credentialCandidatePaths(env)) {
+    const raw = readFile(path);
+    if (!raw) continue;
+    let parsed;
+    try {
+      parsed = JSON.parse(raw);
+    } catch {
+      continue;
+    }
+    accessToken ??= nonEmptyString(parsed?.claudeAiOauth?.accessToken);
+    organizationUuid ??= nonEmptyString(parsed?.oauthAccount?.organizationUuid);
+    if (accessToken && organizationUuid) break;
+  }
+  if (!accessToken || !organizationUuid) return void 0;
+  return { accessToken, organizationUuid };
 }
-function decideRegistration(state) {
-  if (!state.isPrimary) return "noop";
-  if (state.credentialed) return state.registered ? "noop" : "register";
-  return "unregister";
+function nonEmptyString(value) {
+  return typeof value === "string" && value.trim() ? value.trim() : void 0;
 }
-
-// src/agents-md.ts
-import { existsSync as existsSync4, readFileSync as readFileSync4 } from "fs";
-import { dirname as dirname2, join as join4, resolve as resolve3 } from "path";
-function globalAgentsPath() {
-  return join4(piUserDir(), "AGENTS.md");
+function connectorsListUrl(organizationUuid, apiBase = DEFAULT_API_BASE) {
+  return `${trimTrailingSlashes(apiBase)}/api/oauth/organizations/${encodeURIComponent(organizationUuid)}/mcp/connectors/list`;
 }
-function resolveAgentsMdPath() {
-  if (isolatedFromEnv()) return void 0;
-  const fromCwd = findAgentsMdInParents(process.cwd());
-  if (fromCwd) return fromCwd;
-  const globalPath = globalAgentsPath();
-  if (existsSync4(globalPath)) return globalPath;
-  return void 0;
+function trimTrailingSlashes(value) {
+  let end = value.length;
+  while (end > 0 && value.charCodeAt(end - 1) === 47) end--;
+  return value.slice(0, end);
 }
-function findAgentsMdInParents(startDir) {
-  let current = resolve3(startDir);
-  while (true) {
-    const candidate = join4(current, "AGENTS.md");
-    if (existsSync4(candidate)) return candidate;
-    const parent = dirname2(current);
-    if (parent === current) break;
-    current = parent;
+async function listAccountConnectors(deps) {
+  const { credentials, apiBase, signal } = deps;
+  const fetchImpl = deps.fetchImpl ?? fetch;
+  const url2 = connectorsListUrl(credentials.organizationUuid, apiBase);
+  const fail = (reason) => ({ ok: false, complete: false, reason: redactSecret(reason, credentials.accessToken) });
+  let response;
+  try {
+    response = await fetchImpl(url2, {
+      method: "POST",
+      headers: {
+        "Authorization": `Bearer ${credentials.accessToken}`,
+        "anthropic-beta": OAUTH_BETA_HEADER,
+        "Content-Type": "application/json"
+      },
+      body: "{}",
+      signal
+    });
+  } catch (error51) {
+    return fail(`connector list request failed: ${errorText(error51)}`);
   }
-  return void 0;
-}
-function extractAgentsAppend() {
-  const agentsPath = resolveAgentsMdPath();
-  if (!agentsPath) return void 0;
+  let bodyText;
   try {
-    const content = readFileSync4(agentsPath, "utf-8").trim();
-    if (!content) return void 0;
-    const sanitized = sanitizeAgentsContent(content);
-    return sanitized.length > 0 ? `# CLAUDE.md
-
-${sanitized}` : void 0;
+    bodyText = await response.text();
+  } catch (error51) {
+    return fail(`connector list response unreadable: ${errorText(error51)}`);
+  }
+  if (!response.ok) {
+    return fail(`connector list returned HTTP ${response.status}${apiErrorSuffix(bodyText)}`);
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(bodyText);
   } catch {
-    return void 0;
+    return fail("connector list returned a non-JSON body");
   }
+  if (!Array.isArray(parsed?.results)) {
+    return fail("connector list response had no results array");
+  }
+  const connectors = [];
+  for (const raw of parsed.results) {
+    const entry = raw;
+    const name = nonEmptyString(entry?.name);
+    if (!name) {
+      return fail("connector list contained an entry with no name");
+    }
+    connectors.push({
+      name,
+      installedServerId: nonEmptyString(entry?.installedServerId),
+      directoryUuid: nonEmptyString(entry?.directoryUuid),
+      installState: nonEmptyString(entry?.installState),
+      description: nonEmptyString(entry?.description),
+      isAuthless: typeof entry?.isAuthless === "boolean" ? entry.isAuthless : void 0
+    });
+  }
+  return { ok: true, complete: true, connectors };
 }
-function sanitizeAgentsContent(content) {
-  let sanitized = content;
-  sanitized = sanitized.replace(/~\/\.pi\b/gi, "~/.claude");
-  sanitized = sanitized.replace(/(^|[\s'"`])\.pi\//g, "$1.claude/");
-  sanitized = sanitized.replace(/\b\.pi\b/gi, ".claude");
-  sanitized = sanitized.replace(/\bpi\b/gi, "environment");
-  return sanitized;
-}
-
-// src/prompt-context.ts
-import { existsSync as existsSync5, readFileSync as readFileSync5 } from "fs";
-import { dirname as dirname3, join as join5, resolve as resolve4 } from "path";
-function readTrimmed(path) {
+function apiErrorSuffix(bodyText) {
   try {
-    if (!existsSync5(path)) return void 0;
-    const content = readFileSync5(path, "utf8").trim();
-    return content.length > 0 ? content : void 0;
+    const message = JSON.parse(bodyText)?.error?.message;
+    return typeof message === "string" && message.trim() ? ` (${message.trim()})` : "";
   } catch {
-    return void 0;
+    return "";
   }
 }
-function findProjectAppendSystem(startDir) {
-  let current = resolve4(startDir);
-  while (true) {
-    const candidate = join5(current, ".pi", "APPEND_SYSTEM.md");
-    if (existsSync5(candidate)) return candidate;
-    const parent = dirname3(current);
-    if (parent === current) break;
-    current = parent;
+function redactSecret(text, secret) {
+  if (!secret || secret.length < 8) return text;
+  let out = text;
+  for (const form of /* @__PURE__ */ new Set([secret, encodeURIComponent(secret)])) {
+    out = out.split(form).join("[redacted]");
   }
-  return void 0;
+  return out;
 }
-function readAppendSystemPromptFiles(cwd) {
-  const files = [
-    { label: "global APPEND_SYSTEM.md", path: join5(piUserDir(), "APPEND_SYSTEM.md") }
-  ];
-  const projectPath = isolatedFromEnv() ? void 0 : findProjectAppendSystem(cwd);
-  if (projectPath) files.push({ label: "project .pi/APPEND_SYSTEM.md", path: projectPath });
-  const seen = /* @__PURE__ */ new Set();
-  const output = [];
-  for (const file2 of files) {
-    if (seen.has(file2.path)) continue;
-    seen.add(file2.path);
-    const content = readTrimmed(file2.path);
-    if (content) output.push({ label: file2.label, content });
-  }
-  return output;
+function errorText(error51) {
+  return error51 instanceof Error ? error51.message : String(error51);
 }
-function splitPromptBlocks(systemPrompt) {
-  return (systemPrompt ?? "").split(/\n{2,}/).map((block) => block.trim()).filter(Boolean);
+
+// src/connectors.ts
+var DISALLOWED_BUILTIN_TOOLS = [
+  "Read",
+  "Write",
+  "Edit",
+  "MultiEdit",
+  "Glob",
+  "Grep",
+  "Bash",
+  "Agent",
+  "Task",
+  "NotebookEdit",
+  "EnterWorktree",
+  "ExitWorktree",
+  "CronList",
+  "CronCreate",
+  "CronDelete",
+  "TeamCreate",
+  "TeamDelete",
+  "TaskOutput",
+  "TaskStop",
+  "SendMessage",
+  "Skill",
+  "TodoRead",
+  "TodoWrite",
+  "ListMcpResources",
+  "ReadMcpResource",
+  "WebFetch",
+  "WebSearch",
+  "AskUserQuestion",
+  "EnterPlanMode",
+  "ExitPlanMode",
+  "ToolSearch",
+  "ScheduleWakeup"
+];
+var CLAUDE_BRIDGE_TOOL_ISOLATION = {
+  tools: [],
+  disallowedTools: DISALLOWED_BUILTIN_TOOLS,
+  allowedTools: [`mcp__${MCP_SERVER_NAME}__*`]
+};
+function connectorsEnabledFromEnv() {
+  const v2 = (process.env.CLAUDE_BRIDGE_ENABLE_CONNECTORS ?? "").trim().toLowerCase();
+  return v2 === "1" || v2 === "true" || v2 === "yes" || v2 === "on";
 }
-function extractHeadingSection(systemPrompt, headings) {
-  if (!systemPrompt) return void 0;
-  let start = -1;
-  for (const heading of headings) {
-    const index = systemPrompt.indexOf(heading);
-    if (index >= 0 && (start < 0 || index < start)) start = index;
-  }
-  if (start < 0) return void 0;
-  const rest = systemPrompt.slice(start).trim();
-  const endCandidates = [
-    rest.slice(1).search(/\n##\s+/),
-    rest.search(/\n<\/project_instructions>/),
-    rest.search(/\n<\/project_context>/)
-  ].map((index, offset) => index >= 0 && offset === 0 ? index + 1 : index).filter((index) => index >= 0);
-  const end = endCandidates.length > 0 ? Math.min(...endCandidates) : -1;
-  return (end >= 0 ? rest.slice(0, end) : rest).trim();
+function connectorsEnabledFor(config2) {
+  return connectorsEnabledFromEnv() || config2?.provider?.enableConnectors === true;
 }
-function extractBlockByMarkers(systemPrompt, markers) {
-  for (const block of splitPromptBlocks(systemPrompt)) {
-    if (markers.some((marker) => marker.test(block))) return block;
-  }
+var CLAUDE_AI_CONNECTOR_TOOL_PATTERNS = [
+  "mcp__claude_ai_Gmail__*",
+  "mcp__claude_ai_Google_Calendar__*",
+  "mcp__claude_ai_Google_Drive__*",
+  "mcp__claude_ai_Slack__*",
+  "mcp__claude_ai_Atlassian__*"
+];
+var CONNECTOR_DISCOVERY_TOOLS = ["ToolSearch", "ListMcpResources", "ReadMcpResource"];
+var CONNECTOR_NS_PREFIX2 = "mcp__claude_ai_";
+var CONNECTOR_NS_GMAIL = `${CONNECTOR_NS_PREFIX2}Gmail__`;
+var CONNECTOR_NS_CALENDAR = `${CONNECTOR_NS_PREFIX2}Google_Calendar__`;
+var CONNECTOR_NS_DRIVE = `${CONNECTOR_NS_PREFIX2}Google_Drive__`;
+var CONNECTOR_NS_SLACK = `${CONNECTOR_NS_PREFIX2}Slack__`;
+var CONNECTOR_NS_ATLASSIAN = `${CONNECTOR_NS_PREFIX2}Atlassian__`;
+var CONNECTOR_READ_VERBS = /* @__PURE__ */ new Set([
+  "list",
+  "search",
+  "get",
+  "read",
+  "fetch",
+  "find",
+  "download",
+  "describe",
+  "query",
+  "count",
+  "view",
+  "lookup",
+  "whoami"
+]);
+var CONNECTOR_MUTATION_WORDS = /* @__PURE__ */ new Set([
+  "create",
+  "update",
+  "delete",
+  "remove",
+  "add",
+  "edit",
+  "send",
+  "post",
+  "write",
+  "upload",
+  "publish",
+  "schedule",
+  "transition",
+  "archive",
+  "move",
+  "copy",
+  "revoke",
+  "assign",
+  "invite",
+  "share",
+  "rename",
+  "replace",
+  "set",
+  "merge",
+  "resolve",
+  "lock",
+  "unlock",
+  "acknowledge",
+  "ack",
+  "book",
+  "start",
+  "stop",
+  "terminate",
+  "restart",
+  "join",
+  "leave",
+  "star",
+  "unstar",
+  "forward",
+  "sync",
+  "approve",
+  "reject",
+  "close",
+  "reopen",
+  "cancel",
+  "enable",
+  "disable",
+  "grant",
+  "trigger",
+  "execute",
+  "apply",
+  "submit",
+  "pin",
+  "unpin",
+  "mute",
+  "unmute",
+  "subscribe",
+  "unsubscribe",
+  "follow",
+  "unfollow",
+  "clear",
+  "purge",
+  "reset",
+  "rotate",
+  "deploy",
+  "install",
+  "uninstall",
+  "save",
+  "store",
+  "put",
+  "patch",
+  "insert",
+  "append",
+  "prepend",
+  "duplicate",
+  "restore",
+  "revert",
+  "import",
+  "export",
+  "upsert",
+  "sign",
+  "complete",
+  "claim",
+  "release",
+  "promote",
+  "demote",
+  "escalate",
+  "resend",
+  "retry",
+  "react",
+  "vote"
+]);
+function connectorNameWords(segment) {
+  return segment.replace(/([a-z0-9])([A-Z])/g, "$1 $2").replace(/([A-Z]+)([A-Z][a-z])/g, "$1 $2").split(/[^A-Za-z0-9]+/).filter(Boolean).map((word) => word.toLowerCase());
+}
+var CONNECTOR_WRITE_TOOLS = [
+  `${CONNECTOR_NS_GMAIL}create_draft`,
+  `${CONNECTOR_NS_GMAIL}create_label`,
+  `${CONNECTOR_NS_GMAIL}label_message`,
+  `${CONNECTOR_NS_GMAIL}label_thread`,
+  `${CONNECTOR_NS_GMAIL}unlabel_message`,
+  `${CONNECTOR_NS_GMAIL}unlabel_thread`,
+  `${CONNECTOR_NS_GMAIL}apply_sensitive_label`,
+  `${CONNECTOR_NS_GMAIL}remove_sensitive_label`,
+  `${CONNECTOR_NS_CALENDAR}create_event`,
+  `${CONNECTOR_NS_CALENDAR}update_event`,
+  `${CONNECTOR_NS_CALENDAR}delete_event`,
+  `${CONNECTOR_NS_CALENDAR}respond_to_event`,
+  `${CONNECTOR_NS_DRIVE}create_file`,
+  `${CONNECTOR_NS_DRIVE}copy_file`,
+  // Slack + Atlassian writes, taken from a live enumeration of an account with
+  // both connectors attached. The PreToolUse hook already denies these by verb;
+  // listing them by id also removes them from the model's context in a
+  // read-only session (the CLI matcher needs exact ids). Additive only — an id
+  // missing here is still denied at call time.
+  `${CONNECTOR_NS_SLACK}slack_send_message`,
+  `${CONNECTOR_NS_SLACK}slack_send_message_draft`,
+  `${CONNECTOR_NS_SLACK}slack_schedule_message`,
+  `${CONNECTOR_NS_SLACK}slack_create_canvas`,
+  `${CONNECTOR_NS_SLACK}slack_update_canvas`,
+  `${CONNECTOR_NS_ATLASSIAN}createJiraIssue`,
+  `${CONNECTOR_NS_ATLASSIAN}editJiraIssue`,
+  `${CONNECTOR_NS_ATLASSIAN}transitionJiraIssue`,
+  `${CONNECTOR_NS_ATLASSIAN}addCommentToJiraIssue`,
+  `${CONNECTOR_NS_ATLASSIAN}addWorklogToJiraIssue`,
+  `${CONNECTOR_NS_ATLASSIAN}createIssueLink`,
+  `${CONNECTOR_NS_ATLASSIAN}createConfluencePage`,
+  `${CONNECTOR_NS_ATLASSIAN}updateConfluencePage`,
+  `${CONNECTOR_NS_ATLASSIAN}createConfluenceFooterComment`,
+  `${CONNECTOR_NS_ATLASSIAN}createConfluenceInlineComment`,
+  `${CONNECTOR_NS_ATLASSIAN}createCompassComponent`,
+  `${CONNECTOR_NS_ATLASSIAN}createCompassComponentRelationship`,
+  `${CONNECTOR_NS_ATLASSIAN}createCompassCustomFieldDefinition`
+];
+function isChildExecutedTool(name) {
+  return typeof name === "string" && name.startsWith(CONNECTOR_NS_PREFIX2);
+}
+function isConnectorWriteTool(name) {
+  if (!name.startsWith(CONNECTOR_NS_PREFIX2)) return false;
+  const sep2 = name.indexOf("__", CONNECTOR_NS_PREFIX2.length);
+  if (sep2 <= CONNECTOR_NS_PREFIX2.length) return true;
+  const server = name.slice(CONNECTOR_NS_PREFIX2.length, sep2);
+  const words = connectorNameWords(name.slice(sep2 + "__".length));
+  const serverWords = connectorNameWords(server);
+  let skipped = 0;
+  while (skipped < serverWords.length && words[skipped] === serverWords[skipped] && !CONNECTOR_MUTATION_WORDS.has(words[skipped])) skipped++;
+  const rest = words.slice(skipped);
+  if (rest.length === 0) return true;
+  if (!CONNECTOR_READ_VERBS.has(rest[0])) return true;
+  return rest.some((word) => CONNECTOR_MUTATION_WORDS.has(word));
+}
+function connectorWriteModeFromEnv() {
+  const v2 = (process.env.CLAUDE_BRIDGE_CONNECTOR_WRITE ?? "").trim().toLowerCase();
+  if (v2 === "allow") return "allow";
+  if (v2 === "deny") return "deny";
   return void 0;
 }
-function buildPromptContextAppend(systemPrompt, cwd, settings) {
-  const parts = [];
-  const labels = [];
-  if (settings.includeAppendSystemPromptMd) {
-    for (const file2 of readAppendSystemPromptFiles(cwd)) {
-      parts.push(xmlBlock("append_system_prompt", { label: file2.label }, file2.content));
-      labels.push(file2.label);
+function connectorWriteModeFor(config2) {
+  const resolved = connectorWriteModeFromEnv() ?? normalizeConnectorWriteMode(config2?.provider?.connectorWriteMode);
+  return resolved === "allow" ? "allow" : "deny";
+}
+function connectorWriteDenyHook() {
+  return async (input) => {
+    try {
+      if (input.hook_event_name !== "PreToolUse") return { continue: true };
+      if (!isConnectorWriteTool(input.tool_name)) return { continue: true };
+      return connectorWriteDenyOutput(String(input.tool_name));
+    } catch {
+      const toolName = typeof input?.tool_name === "string" ? input.tool_name : "<unknown>";
+      return connectorWriteDenyOutput(toolName);
     }
-  }
-  if (settings.includeProjectAgentsHook) {
-    const projectAgents = extractHeadingSection(systemPrompt, ["## Project Agents", "## Project Subagents"]);
-    if (projectAgents) {
-      parts.push(xmlBlock("before_agent_start", { source: "project-agents" }, projectAgents));
-      labels.push("project agents hook");
+  };
+}
+function connectorWriteDenyOutput(toolName) {
+  return {
+    hookSpecificOutput: {
+      hookEventName: "PreToolUse",
+      permissionDecision: "deny",
+      permissionDecisionReason: `Connector write tool "${toolName}" is blocked in read-only connector mode. Connector writes must go through the host application's gated approval flow.`
     }
-  }
-  if (settings.includeTaskPanelHook) {
-    const taskReminder = extractBlockByMarkers(systemPrompt, [/^Task workflow reminder:/]);
-    if (taskReminder) {
-      parts.push(xmlBlock("before_agent_start", { source: "task-panel" }, taskReminder));
-      labels.push("task panel hook");
+  };
+}
+function connectorQueryOptions(connectorsEnabled, writeMode = "deny") {
+  const isolation = toolIsolationForQuery(connectorsEnabled, writeMode);
+  if (!connectorsEnabled || writeMode === "allow") return isolation;
+  return { ...isolation, hooks: { PreToolUse: [{ hooks: [connectorWriteDenyHook()] }] } };
+}
+function toolIsolationForQuery(connectorsEnabled, writeMode = "deny") {
+  if (!connectorsEnabled) return CLAUDE_BRIDGE_TOOL_ISOLATION;
+  const disallowedTools = DISALLOWED_BUILTIN_TOOLS.filter((t) => !CONNECTOR_DISCOVERY_TOOLS.includes(t));
+  if (writeMode !== "allow") disallowedTools.push(...CONNECTOR_WRITE_TOOLS);
+  return {
+    disallowedTools,
+    allowedTools: [...CLAUDE_BRIDGE_TOOL_ISOLATION.allowedTools, ...CLAUDE_AI_CONNECTOR_TOOL_PATTERNS]
+  };
+}
+function connectorMcpServers(inventory) {
+  if (!inventory.ok) return {};
+  if (connectorDeclarationsDisabled()) return {};
+  const servers = {};
+  for (const entry of inventory.connectors) {
+    if (entry.installState !== "connected") continue;
+    if (!entry.installedServerId) continue;
+    servers[connectorServerName(entry.name)] = {
+      type: "claudeai-proxy",
+      url: connectorProxyUrl(entry.installedServerId),
+      id: entry.installedServerId,
+      alwaysLoad: true
+    };
+  }
+  return servers;
+}
+function connectorDeclarationsDisabled(env = process.env) {
+  const v2 = (env.CLAUDE_BRIDGE_CONNECTOR_DECLARE ?? "").trim().toLowerCase();
+  return v2 === "off" || v2 === "0" || v2 === "false" || v2 === "no";
+}
+
+// src/convert.ts
+var PROVIDER_ID = "claude-bridge";
+var PI_TO_SDK_TOOL_NAME = {
+  read: "Read",
+  write: "Write",
+  edit: "Edit",
+  bash: "Bash"
+};
+function sanitizeToolId(id, cache) {
+  const existing = cache.get(id);
+  if (existing) return existing;
+  const clean = id.replace(/[^a-zA-Z0-9_-]/g, "_");
+  cache.set(id, clean);
+  return clean;
+}
+function mapPiToolNameToSdk(name, customToolNameToSdk) {
+  if (!name) return "";
+  if (isChildExecutedTool(name)) return name;
+  const normalized = name.toLowerCase();
+  if (customToolNameToSdk) {
+    const mapped = customToolNameToSdk.get(name) ?? customToolNameToSdk.get(normalized);
+    if (mapped) return mapped;
+  }
+  if (PI_TO_SDK_TOOL_NAME[normalized]) return PI_TO_SDK_TOOL_NAME[normalized];
+  return pascalCase(name);
+}
+function messageContentToText(content) {
+  if (typeof content === "string") return content;
+  if (!Array.isArray(content)) return "";
+  const parts = [];
+  let hasText = false;
+  for (const block of content) {
+    if (block.type === "text" && block.text) {
+      parts.push(block.text);
+      hasText = true;
+    } else if (block.type !== "text" && block.type !== "image") {
+      parts.push(`[${block.type}]`);
+    }
+  }
+  return hasText ? parts.join("\n") : "";
+}
+function imageBlockToAnthropic(block) {
+  if (!block.data || !block.mimeType) return void 0;
+  return { type: "image", source: { type: "base64", media_type: block.mimeType, data: block.data } };
+}
+function toolResultContentToAnthropic(content) {
+  if (typeof content === "string") return content;
+  if (!Array.isArray(content)) return "";
+  const blocks = [];
+  for (const block of content) {
+    if (block.type === "text" && block.text) {
+      blocks.push({ type: "text", text: block.text });
+    } else if (block.type === "image") {
+      const image = imageBlockToAnthropic(block);
+      if (image) blocks.push(image);
+    } else if (block.type) {
+      blocks.push({ type: "text", text: `[${block.type}]` });
+    }
+  }
+  if (blocks.length === 0) return "";
+  if (blocks.every((block) => block.type === "text")) return blocks.map((block) => block.text).join("\n");
+  return blocks;
+}
+function assistantProvenancePrefix(msg) {
+  if (msg.role !== "assistant") return void 0;
+  const provider = typeof msg.provider === "string" ? msg.provider : void 0;
+  const model = typeof msg.model === "string" ? msg.model : void 0;
+  const api = typeof msg.api === "string" ? msg.api : void 0;
+  if (!provider && !model && !api) return void 0;
+  if (provider === PROVIDER_ID || api === "anthropic") return void 0;
+  return `[Prior Pi assistant response from ${provider ?? api ?? "unknown-provider"}${model ? `/${model}` : ""}]
+`;
+}
+function userMessageToAnthropic(msg) {
+  if (typeof msg.content === "string") return { role: "user", content: msg.content || "[empty]" };
+  if (Array.isArray(msg.content)) {
+    const parts = [];
+    for (const block of msg.content) {
+      if (block.type === "text" && block.text) parts.push({ type: "text", text: block.text });
+      else if (block.type === "image" && block.data && block.mimeType) parts.push(imageBlockToAnthropic(block));
+    }
+    const kept = parts.filter(Boolean);
+    return { role: "user", content: kept.length ? kept : "[image]" };
+  }
+  return { role: "user", content: "[empty]" };
+}
+function toolResultToAnthropicBlock(msg, sanitizedIds) {
+  const content = toolResultContentToAnthropic(msg.content);
+  return {
+    type: "tool_result",
+    tool_use_id: sanitizeToolId(msg.toolCallId, sanitizedIds),
+    content: content || "",
+    is_error: msg.isError
+  };
+}
+function hasToolUse(msg) {
+  return msg.role === "assistant" && Array.isArray(msg.content) && msg.content.some((block) => block.type === "toolCall");
+}
+function convertPiMessages(messages, customToolNameToSdk) {
+  const anthropicMessages = [];
+  const sanitizedIds = /* @__PURE__ */ new Map();
+  const pushToolResultGroup = (toolMessages) => {
+    if (toolMessages.length === 0) return;
+    anthropicMessages.push({
+      role: "user",
+      content: toolMessages.map((toolMsg) => {
+        const content = toolResultContentToAnthropic(toolMsg.content);
+        return {
+          type: "tool_result",
+          tool_use_id: sanitizeToolId(toolMsg.toolCallId, sanitizedIds),
+          content: content || "",
+          is_error: toolMsg.isError
+        };
+      })
+    });
+  };
+  for (let i = 0; i < messages.length; i++) {
+    const msg = messages[i];
+    if (msg.role === "user") {
+      anthropicMessages.push(userMessageToAnthropic(msg));
+    } else if (msg.role === "assistant") {
+      const content = Array.isArray(msg.content) ? msg.content : [];
+      const blocks = [];
+      const provenance = assistantProvenancePrefix(msg);
+      if (provenance) blocks.push({ type: "text", text: provenance });
+      for (const block of content) {
+        if (block.type === "text" && block.text) {
+          blocks.push({ type: "text", text: block.text });
+        } else if (block.type === "thinking") {
+          const sig = block.thinkingSignature;
+          const isAnthropicProvider = msg.provider === PROVIDER_ID || msg.api === "anthropic";
+          if (isAnthropicProvider && sig) {
+            blocks.push({ type: "thinking", thinking: block.thinking ?? "", signature: sig });
+          }
+        } else if (block.type === "toolCall") {
+          const toolName = mapPiToolNameToSdk(block.name, customToolNameToSdk);
+          blocks.push({ type: "tool_use", id: sanitizeToolId(block.id, sanitizedIds), name: toolName, input: block.arguments ?? {} });
+        }
+      }
+      if (!blocks.length) blocks.push({ type: "text", text: "[incompatible content omitted]" });
+      anthropicMessages.push({ role: "assistant", content: blocks });
+      if (hasToolUse(msg)) {
+        const toolMessages = [];
+        const interleavedUsers = [];
+        let j2 = i + 1;
+        for (; j2 < messages.length; j2++) {
+          const next = messages[j2];
+          if (next.role === "assistant") break;
+          if (next.role === "toolResult") toolMessages.push(next);
+          else if (next.role === "user") interleavedUsers.push(next);
+          else break;
+        }
+        if (toolMessages.length > 0) {
+          pushToolResultGroup(toolMessages);
+          for (const userMsg of interleavedUsers) anthropicMessages.push(userMessageToAnthropic(userMsg));
+          i = j2 - 1;
+        }
+      }
+    } else if (msg.role === "toolResult") {
+      const blocks = [];
+      for (; i < messages.length; i++) {
+        const toolMsg = messages[i];
+        if (toolMsg.role !== "toolResult") {
+          i--;
+          break;
+        }
+        blocks.push(toolResultToAnthropicBlock(toolMsg, sanitizedIds));
+      }
+      anthropicMessages.push({ role: "user", content: blocks });
+    }
+  }
+  return { anthropicMessages, sanitizedIds };
+}
+
+// src/models.ts
+var FABLE_MODEL_ID = "claude-fable-5";
+var FABLE_FALLBACK_MODEL_ID = "claude-opus-4-8";
+var OPUS_5_MODEL_ID = "claude-opus-5";
+var SONNET_5_MODEL_ID = "claude-sonnet-5";
+function fallbackModelForPrimaryModel(modelId) {
+  return modelId === FABLE_MODEL_ID || modelId === OPUS_5_MODEL_ID ? FABLE_FALLBACK_MODEL_ID : void 0;
+}
+var MODEL_IDS_IN_ORDER = [
+  FABLE_MODEL_ID,
+  OPUS_5_MODEL_ID,
+  FABLE_FALLBACK_MODEL_ID,
+  "claude-opus-4-7",
+  "claude-opus-4-6",
+  SONNET_5_MODEL_ID,
+  "claude-sonnet-4-6",
+  "claude-haiku-4-5"
+];
+var FALLBACK_MODELS = {
+  [FABLE_MODEL_ID]: {
+    id: FABLE_MODEL_ID,
+    name: "Claude Fable 5",
+    reasoning: true,
+    thinkingLevelMap: { xhigh: "xhigh", max: "max" },
+    input: ["text", "image"],
+    contextWindow: 1e6,
+    maxTokens: 128e3
+  },
+  [OPUS_5_MODEL_ID]: {
+    id: OPUS_5_MODEL_ID,
+    name: "Claude Opus 5",
+    reasoning: true,
+    thinkingLevelMap: { xhigh: "xhigh", max: "max" },
+    input: ["text", "image"],
+    contextWindow: 1e6,
+    maxTokens: 128e3
+  },
+  [FABLE_FALLBACK_MODEL_ID]: {
+    id: FABLE_FALLBACK_MODEL_ID,
+    name: "Claude Opus 4.8",
+    reasoning: true,
+    thinkingLevelMap: { xhigh: "xhigh" },
+    input: ["text", "image"],
+    contextWindow: 1e6,
+    maxTokens: 128e3
+  },
+  [SONNET_5_MODEL_ID]: {
+    id: SONNET_5_MODEL_ID,
+    name: "Claude Sonnet 5",
+    reasoning: true,
+    thinkingLevelMap: { xhigh: "xhigh", max: "max" },
+    input: ["text", "image"],
+    contextWindow: 1e6,
+    maxTokens: 128e3
+  }
+};
+function modelDisplayName(modelId) {
+  return FALLBACK_MODELS[modelId]?.name ?? modelId;
+}
+function buildModels(piAiModels) {
+  return MODEL_IDS_IN_ORDER.map((id) => piAiModels.find((m) => m.id === id) ?? FALLBACK_MODELS[id]).filter((m) => m != null).map(({ id, name, reasoning, input, contextWindow, maxTokens, thinkingLevelMap }) => ({
+    id,
+    name,
+    reasoning,
+    input,
+    contextWindow,
+    maxTokens,
+    thinkingLevelMap,
+    cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 }
+  }));
+}
+
+// src/extract-tool-results.ts
+function toolResultToMcpContent(content) {
+  if (typeof content === "string") return [{ type: "text", text: content || "" }];
+  if (!Array.isArray(content)) return [{ type: "text", text: "" }];
+  const blocks = [];
+  for (const block of content) {
+    if (block.type === "text" && block.text) blocks.push({ type: "text", text: block.text });
+    else if (block.type === "image" && block.data && block.mimeType) blocks.push({ type: "image", data: block.data, mimeType: block.mimeType });
+  }
+  return blocks.length ? blocks : [{ type: "text", text: "" }];
+}
+function extractAllToolResults(messages) {
+  const results = [];
+  let stopIdx = -1;
+  for (let i = messages.length - 1; i >= 0; i--) {
+    const msg = messages[i];
+    if (msg.role === "toolResult") {
+      results.unshift({ content: toolResultToMcpContent(msg.content), isError: msg.isError, toolCallId: msg.toolCallId });
+    } else if (msg.role === "assistant") {
+      stopIdx = i;
+      break;
+    }
+  }
+  return { results, stopIdx };
+}
+
+// src/query-state.ts
+var DRAIN_CAUSE_TEXT = {
+  "abort": "the turn was aborted",
+  "stream-idle-timeout": "the Claude Code stream went idle and the turn timed out",
+  "query-end": "the query ended"
+};
+function interruptedToolCallResult(cause) {
+  return {
+    content: [{ type: "text", text: `Claude bridge: ${DRAIN_CAUSE_TEXT[cause]} before this tool call's result was delivered. The call did not complete and produced no output.` }],
+    isError: true
+  };
+}
+function toolCallDrainCause(flags) {
+  if (flags.wasAborted || flags.signalAborted) return "abort";
+  if (flags.streamIdleTimedOut) return "stream-idle-timeout";
+  return "query-end";
+}
+function drainPendingToolCalls(queryCtx, cause) {
+  const drained = queryCtx.pendingToolCalls.size;
+  if (drained === 0) return 0;
+  const result = interruptedToolCallResult(cause);
+  for (const pending of queryCtx.pendingToolCalls.values()) pending.resolve(result);
+  queryCtx.pendingToolCalls.clear();
+  return drained;
+}
+function normalizeForCompare(value) {
+  if (Array.isArray(value)) return value.map(normalizeForCompare);
+  if (value && typeof value === "object") {
+    const out = {};
+    for (const key of Object.keys(value).sort()) {
+      const child = value[key];
+      if (child !== void 0) out[key] = normalizeForCompare(child);
+    }
+    return out;
+  }
+  return value;
+}
+function argsKey(value) {
+  return JSON.stringify(normalizeForCompare(value ?? {}));
+}
+function sameArgs(left, right) {
+  return argsKey(left) === argsKey(right);
+}
+function hasRecordedArgs(args) {
+  return Object.keys(args ?? {}).length > 0;
+}
+function unique(values) {
+  const out = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const value of values) {
+    if (!value || seen.has(value)) continue;
+    seen.add(value);
+    out.push(value);
+  }
+  return out;
+}
+var QueryContext = class {
+  // Query-scoped (fully isolated per query)
+  activeQuery = null;
+  currentPiStream = null;
+  latestCursor = 0;
+  pendingToolCalls = /* @__PURE__ */ new Map();
+  pendingResults = /* @__PURE__ */ new Map();
+  turnToolCallIds = [];
+  turnToolCalls = [];
+  /**
+   * id → Pi tool name for every tool call this QUERY recorded, across all child
+   * messages. Deliberately NOT cleared by resetToolTracking: per-message tracking
+   * resets at every message boundary, but `pendingResults` is query-scoped, so a
+   * result stranded there outlives the message that named it. Without this map a
+   * teardown report can only say "1 queued" with empty toolNames and 0/0
+   * counters — which is exactly the unactionable record the 2026-07-28 diag log
+   * showed. Bounded by the number of tool calls in one query.
+   */
+  queryToolNames = /* @__PURE__ */ new Map();
+  claimedToolCallIds = /* @__PURE__ */ new Set();
+  deliveredToolResultIds = /* @__PURE__ */ new Set();
+  resolvedToolResultIds = /* @__PURE__ */ new Set();
+  unmatchedToolResultIds = /* @__PURE__ */ new Set();
+  reportedToolResultMismatch = false;
+  deferredUserMessages = [];
+  handledTerminalError = false;
+  /** Armed grace timer for ending a tool_use turn whose terminal stream events
+   *  (message_delta/message_stop) never arrive. The normal path ends the turn at
+   *  message_stop, AFTER message_delta delivered the real output-token count;
+   *  this is the deadlock backstop for streams that go silent instead. Managed
+   *  by schedule/cancelToolUseTurnEnd in assistant-stream.ts. */
+  scheduledToolUseEnd = null;
+  // Tool calls the CHILD executes itself (claude.ai connectors — see
+  // isChildExecutedTool). Deliberately NOT in turnToolCalls/turnToolCallIds:
+  // those track calls Pi owes a result for, and Pi owes nothing here. Kept only
+  // so the child's real result can be recognized when it comes back on the SDK's
+  // `user` message, and so the streamed block's deltas can be skipped silently
+  // instead of logging as "unmatched" (which reads like a bug).
+  /** tool_use id → raw SDK tool name. */
+  childExecutedToolCalls = /* @__PURE__ */ new Map();
+  /**
+   * The same calls, for the connector-call audit trail (see connector-audit.ts).
+   *
+   * Query-scoped and deliberately NOT cleared by resetToolTracking: that runs at
+   * every child message boundary, and a call issued in one child message is only
+   * reconciled after that message ends. Clearing it there would make an abandoned
+   * call unrecordable at teardown — which is the one case the trail exists for.
+   */
+  connectorCallAudit = /* @__PURE__ */ new Map();
+  /** Claude Code session id for this query, from the SDK's `system` init message.
+   *  Undefined until it arrives; the audit trail omits the field rather than
+   *  guessing. */
+  childSessionId;
+  /** Anthropic content-block indexes of the current assistant message that carry
+   *  a child-executed tool_use. Scoped to one message: cleared at message_start,
+   *  and an index is released as soon as a new block starts there. */
+  childExecutedStreamIndexes = /* @__PURE__ */ new Set();
+  // Usage accounting for a Pi turn that spans SEVERAL child assistant messages.
+  //
+  // Every child message is a separate billed API call, and each reports its own
+  // counters — `message_start`/`message_delta` REPLACE rather than accumulate. A
+  // Pi turn used to end at the first tool call, so one Pi message meant one child
+  // message and replacing was right. A turn containing a child-executed connector
+  // call now keeps running across the child's follow-up messages, so replacing
+  // would silently drop everything the earlier ones billed (measured: 55,685
+  // cache-write tokens lost on a single connector turn).
+  //
+  // So: `turnUsageCarry` holds the totals of the child messages already COMPLETE
+  // in this Pi turn, `currentMessageUsage` holds the one in flight, and the Pi
+  // message reports their sum. Summing is the correct model for input and cache
+  // too — each call bills its own.
+  turnUsageCarry = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
+  currentMessageUsage = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
+  /** Anthropic id of the child message `currentMessageUsage` describes. */
+  currentMessageId;
+  /**
+   * Declare which child message the following usage belongs to, banking the
+   * previous one's counters into the turn total.
+   *
+   * Keyed on the MESSAGE ID rather than on the call site, because both paths
+   * that see a message boundary can fire for the SAME message: `message_start`
+   * arrives on the stream, and the SDK then yields that message again in
+   * completed form. Banking per call site double-counted whenever the completed
+   * copy took the no-stream-events branch — which it does whenever a message
+   * produced no content blocks, since `turnSawStreamEvent` only tracks those.
+   *
+   * With no id on either side (older/streamless shapes) this degrades to
+   * banking on every call, which is what each caller means when it cannot
+   * prove otherwise.
+   */
+  beginChildMessage(messageId) {
+    const id = typeof messageId === "string" && messageId.length > 0 ? messageId : void 0;
+    if (id !== void 0 && id === this.currentMessageId) return;
+    this.turnUsageCarry.input += this.currentMessageUsage.input;
+    this.turnUsageCarry.output += this.currentMessageUsage.output;
+    this.turnUsageCarry.cacheRead += this.currentMessageUsage.cacheRead;
+    this.turnUsageCarry.cacheWrite += this.currentMessageUsage.cacheWrite;
+    this.currentMessageUsage = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
+    this.currentMessageId = id;
+  }
+  // Per-turn (reset together)
+  turnOutput = null;
+  turnStarted = false;
+  turnSawStreamEvent = false;
+  turnSawToolCall = false;
+  get turnBlocks() {
+    if (!this.turnOutput) throw new Error("turnBlocks accessed before resetTurnState");
+    return this.turnOutput.content;
+  }
+  resetTurnState(model) {
+    this.turnOutput = {
+      role: "assistant",
+      content: [],
+      api: model.api,
+      provider: model.provider,
+      model: model.id,
+      usage: {
+        input: 0,
+        output: 0,
+        cacheRead: 0,
+        cacheWrite: 0,
+        totalTokens: 0,
+        cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 }
+      },
+      stopReason: "stop",
+      timestamp: Date.now()
+    };
+    this.turnStarted = false;
+    this.turnSawStreamEvent = false;
+    this.turnSawToolCall = false;
+    this.handledTerminalError = false;
+    if (this.scheduledToolUseEnd) {
+      clearTimeout(this.scheduledToolUseEnd.timer);
+      this.scheduledToolUseEnd = null;
+    }
+    this.turnUsageCarry = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
+    this.currentMessageUsage = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
+    this.currentMessageId = void 0;
+  }
+  resetToolTracking() {
+    this.turnToolCallIds = [];
+    this.turnToolCalls = [];
+    this.claimedToolCallIds.clear();
+    this.deliveredToolResultIds.clear();
+    this.resolvedToolResultIds.clear();
+    this.unmatchedToolResultIds.clear();
+    this.reportedToolResultMismatch = false;
+    this.childExecutedToolCalls.clear();
+    this.childExecutedStreamIndexes.clear();
+  }
+  /** Note a tool_use the child runs itself. `streamIndex` is present only on the
+   *  streamed path, where later deltas/stops for that block must be skipped. */
+  noteChildExecutedToolCall(id, rawName, streamIndex) {
+    if (id) {
+      this.childExecutedToolCalls.set(id, rawName);
+      if (!this.connectorCallAudit.has(id)) {
+        this.connectorCallAudit.set(id, {
+          name: rawName,
+          ...this.childSessionId ? { childSessionId: this.childSessionId } : {},
+          recorded: false
+        });
+      }
+    }
+    if (typeof streamIndex === "number") this.childExecutedStreamIndexes.add(streamIndex);
+  }
+  recordToolCall(id, toolName, args = {}) {
+    if (!id) return;
+    this.queryToolNames.set(id, toolName);
+    if (!this.turnToolCallIds.includes(id)) this.turnToolCallIds.push(id);
+    const existing = this.turnToolCalls.find((call) => call.id === id);
+    if (existing) {
+      existing.toolName = toolName;
+      existing.arguments = args;
+      return;
+    }
+    this.turnToolCalls.push({ id, toolName, arguments: args });
+  }
+  updateToolCallArgs(id, args) {
+    if (!id) return;
+    const existing = this.turnToolCalls.find((call) => call.id === id);
+    if (existing) existing.arguments = args;
+  }
+  hasRecordedToolCall(id) {
+    return Boolean(id && (this.turnToolCallIds.includes(id) || this.turnToolCalls.some((call) => call.id === id)));
+  }
+  claimToolCall(toolName, args = {}) {
+    const unclaimed = this.turnToolCalls.filter((call) => !this.claimedToolCallIds.has(call.id));
+    const byName = unclaimed.filter((call) => call.toolName === toolName);
+    const exact = byName.filter((call) => sameArgs(call.arguments, args));
+    let chosen;
+    let match = "none";
+    let ambiguous = false;
+    let argsMismatch = false;
+    if (exact.length > 0) {
+      chosen = exact[0];
+      match = "tool-args";
+      ambiguous = exact.length > 1;
+    } else if (byName.length === 1) {
+      chosen = byName[0];
+      match = "tool-name";
+      argsMismatch = hasRecordedArgs(byName[0].arguments);
+    }
+    if (!chosen) return { match: "none", ambiguous: false, available: unclaimed.length };
+    this.claimedToolCallIds.add(chosen.id);
+    return { toolCallId: chosen.id, match, ambiguous, available: unclaimed.length, ...argsMismatch ? { argsMismatch } : {} };
+  }
+  /**
+   * Drain results still queued in `pendingResults` and report what was dropped.
+   *
+   * Called at a child MESSAGE boundary (message_start / the no-stream-events
+   * assistant fallback): by then the child has necessarily received every tool
+   * result for the previous message — a handler that matched resolved its result
+   * directly or from this queue, and one that never matched already returned an
+   * error. Whatever is still queued therefore belongs to a call whose handler
+   * gave up, and no consumer will ever come for it. Left in place, each entry
+   * poisons every later mismatch report for the whole query (queued>0 with 0/0
+   * counters and no tool names) and forces a session rebuild per turn.
+   */
+  takeStaleQueuedResults() {
+    if (this.pendingResults.size === 0) return [];
+    const stale = [...this.pendingResults.keys()].map((id) => ({
+      id,
+      toolName: this.queryToolNames.get(id) ?? "unknown"
+    }));
+    this.pendingResults.clear();
+    return stale;
+  }
+  markToolResultDelivered(id) {
+    if (id) this.deliveredToolResultIds.add(id);
+  }
+  markToolResultResolved(id) {
+    if (id) this.resolvedToolResultIds.add(id);
+  }
+  markToolResultUnmatched(id) {
+    if (id) this.unmatchedToolResultIds.add(id);
+  }
+  toolResultProgress() {
+    const expectedIds = unique([
+      ...this.turnToolCalls.map((call) => call.id),
+      ...this.turnToolCallIds
+    ]);
+    const deliveredIds = unique(this.deliveredToolResultIds);
+    const resolvedIds = unique(this.resolvedToolResultIds);
+    const waitingIds = unique(this.pendingToolCalls.keys());
+    const queuedIds = unique(this.pendingResults.keys());
+    const unmatchedResultIds = unique(this.unmatchedToolResultIds);
+    const missingDeliveredIds = expectedIds.filter((id) => !this.deliveredToolResultIds.has(id));
+    const unresolvedIds = expectedIds.filter((id) => !this.resolvedToolResultIds.has(id));
+    const affectedIds = /* @__PURE__ */ new Set([...missingDeliveredIds, ...unresolvedIds, ...waitingIds, ...queuedIds, ...unmatchedResultIds]);
+    const counts = /* @__PURE__ */ new Map();
+    if (affectedIds.size > 0) {
+      for (const id of affectedIds) {
+        const name = this.queryToolNames.get(id) ?? this.turnToolCalls.find((call) => call.id === id)?.toolName ?? "unknown";
+        counts.set(name, (counts.get(name) ?? 0) + 1);
+      }
+    } else {
+      for (const call of this.turnToolCalls) {
+        counts.set(call.toolName, (counts.get(call.toolName) ?? 0) + 1);
+      }
+    }
+    return {
+      expectedIds,
+      deliveredIds,
+      resolvedIds,
+      waitingIds,
+      queuedIds,
+      unmatchedResultIds,
+      missingDeliveredIds,
+      unresolvedIds,
+      toolNames: [...counts.entries()].sort((a, b) => b[1] - a[1] || a[0].localeCompare(b[0])).map(([name, count]) => ({ name, count })),
+      expectedCount: expectedIds.length,
+      deliveredCount: deliveredIds.length,
+      resolvedCount: resolvedIds.length,
+      waitingCount: waitingIds.length,
+      queuedCount: queuedIds.length,
+      unmatchedResultCount: unmatchedResultIds.length
+    };
+  }
+};
+var _ctx = new QueryContext();
+var contextStack = [];
+function ctx() {
+  return _ctx;
+}
+function stackDepth() {
+  return contextStack.length;
+}
+function pushContext() {
+  if (!_ctx.activeQuery) throw new Error("pushContext() called with no active query");
+  contextStack.push(_ctx);
+  _ctx = new QueryContext();
+}
+function popContext() {
+  if (contextStack.length === 0) throw new Error("popContext() called with empty stack");
+  const parent = contextStack[contextStack.length - 1];
+  parent.deferredUserMessages.push(..._ctx.deferredUserMessages);
+  _ctx = contextStack.pop();
+}
+function popContextFor(target) {
+  if (_ctx === target) {
+    popContext();
+    return true;
+  }
+  const idx = contextStack.indexOf(target);
+  if (idx < 0) return false;
+  const parent = idx > 0 ? contextStack[idx - 1] : void 0;
+  parent?.deferredUserMessages.push(...target.deferredUserMessages);
+  contextStack.splice(idx, 1);
+  return true;
+}
+
+// src/debug.ts
+import { appendFileSync as appendFileSync2, chmodSync, mkdirSync as mkdirSync2 } from "fs";
+import { dirname as dirname2, join as join3 } from "path";
+var DEBUG = process.env.CLAUDE_BRIDGE_DEBUG === "1";
+var DEBUG_LOG_PATH = process.env.CLAUDE_BRIDGE_DEBUG_PATH || join3(piUserDir(), "claude-bridge.log");
+function diagLogPath() {
+  return process.env.CLAUDE_BRIDGE_DIAG_PATH || join3(piUserDir(), "claude-bridge-diag.log");
+}
+if (DEBUG) {
+  try {
+    mkdirSync2(dirname2(DEBUG_LOG_PATH), { recursive: true });
+    mkdirSync2(dirname2(diagLogPath()), { recursive: true, mode: 448 });
+  } catch {
+  }
+}
+var moduleInstanceId = Math.random().toString(36).slice(2, 8);
+function debug(...args) {
+  if (!DEBUG) return;
+  const ts2 = (/* @__PURE__ */ new Date()).toISOString();
+  const fmt = (a) => {
+    if (typeof a === "string") return a;
+    if (a instanceof Error) return `${a.name}: ${a.message}${a.stack ? "\n" + a.stack : ""}`;
+    return JSON.stringify(a);
+  };
+  const msg = args.map(fmt).join(" ");
+  try {
+    appendFileSync2(DEBUG_LOG_PATH, `[${ts2}] [${moduleInstanceId}] ${msg}
+`);
+  } catch {
+  }
+}
+var nextCliDebugSeq = 1;
+function makeCliDebugOptions(tag) {
+  if (!DEBUG) return {};
+  const seq = nextCliDebugSeq++;
+  const ts2 = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
+  const logDir = join3(dirname2(DEBUG_LOG_PATH), "cc-cli-logs");
+  try {
+    mkdirSync2(logDir, { recursive: true });
+  } catch {
+  }
+  const debugFile = join3(logDir, `${ts2}-${tag}-${seq}.log`);
+  debug(`cli-debug: ${tag} #${seq} \u2192 ${debugFile}`);
+  return {
+    debug: true,
+    debugFile,
+    stderr: (data) => {
+      for (const line of data.split(/\r?\n/)) {
+        if (line) debug(`[cli-stderr ${tag}#${seq}] ${line}`);
+      }
+    }
+  };
+}
+function diagDump(label, data) {
+  try {
+    const ts2 = (/* @__PURE__ */ new Date()).toISOString();
+    const entry = { ts: ts2, moduleInstanceId, label, ...data };
+    const path = diagLogPath();
+    try {
+      mkdirSync2(dirname2(path), { recursive: true, mode: 448 });
+    } catch {
+    }
+    appendFileSync2(path, JSON.stringify(entry) + "\n", { mode: 384 });
+    try {
+      chmodSync(path, 384);
+    } catch {
+    }
+    debug(`DIAG: ${label} (see ${path})`);
+  } catch (error51) {
+    debug(`DIAG FAILED: ${label}`, error51);
+  }
+}
+
+// src/tool-pairing-audit.ts
+function contentBlocks(content) {
+  return Array.isArray(content) ? content.filter((block) => Boolean(block && typeof block === "object")) : [];
+}
+function toolUses(content) {
+  return contentBlocks(content).filter((block) => block.type === "tool_use" && typeof block.id === "string").map((block) => ({ id: block.id, name: typeof block.name === "string" && block.name ? block.name : "unknown" }));
+}
+function toolResultIds(content) {
+  const ids = /* @__PURE__ */ new Set();
+  for (const block of contentBlocks(content)) {
+    if (block.type === "tool_result" && typeof block.tool_use_id === "string") ids.add(block.tool_use_id);
+  }
+  return ids;
+}
+function findUnpairedToolUses(messages) {
+  const missing = [];
+  for (let i = 0; i < messages.length; i++) {
+    const msg = messages[i];
+    if (msg?.role !== "assistant") continue;
+    const uses = toolUses(msg.content);
+    if (uses.length === 0) continue;
+    const next = messages[i + 1];
+    const nextUserIndex = next?.role === "user" ? i + 1 : null;
+    const resultIds = nextUserIndex == null ? /* @__PURE__ */ new Set() : toolResultIds(next.content);
+    for (const use2 of uses) {
+      if (!resultIds.has(use2.id)) {
+        missing.push({ id: use2.id, toolName: use2.name, assistantIndex: i, userIndex: nextUserIndex });
+      }
+    }
+  }
+  return missing;
+}
+var LOST_TOOL_RESULT_TEXT = "Claude bridge: the result of this tool call was lost before the session was rebuilt (the turn was interrupted). Treat the call as failed \u2014 it may or may not have executed. Re-run the tool if its output is still needed.";
+function insertLostToolResultPlaceholders(messages, missing) {
+  const block = (id) => ({ type: "tool_result", tool_use_id: id, content: LOST_TOOL_RESULT_TEXT, is_error: true });
+  const byAssistant = /* @__PURE__ */ new Map();
+  for (const item of missing) {
+    const group = byAssistant.get(item.assistantIndex) ?? [];
+    group.push(item);
+    byAssistant.set(item.assistantIndex, group);
+  }
+  for (const assistantIndex of [...byAssistant.keys()].sort((a, b) => b - a)) {
+    const group = byAssistant.get(assistantIndex);
+    const blocks = group.map((item) => block(item.id));
+    const userIndex = group[0].userIndex;
+    if (userIndex != null && messages[userIndex]?.role === "user") {
+      const user = messages[userIndex];
+      const existing = typeof user.content === "string" ? user.content ? [{ type: "text", text: user.content }] : [] : Array.isArray(user.content) ? user.content : [];
+      user.content = [...blocks, ...existing];
+    } else {
+      messages.splice(assistantIndex + 1, 0, { role: "user", content: blocks });
+    }
+  }
+}
+function summarizeMissingToolNames(missing) {
+  const counts = /* @__PURE__ */ new Map();
+  for (const item of missing) counts.set(item.toolName, (counts.get(item.toolName) ?? 0) + 1);
+  return [...counts.entries()].sort((a, b) => b[1] - a[1] || a[0].localeCompare(b[0])).map(([name, count]) => ({ name, count }));
+}
+
+// src/bridge-state.ts
+var sharedSession = null;
+var extensionApi;
+var piUI;
+function setSharedSession(next) {
+  sharedSession = next;
+}
+function setExtensionApi(next) {
+  extensionApi = next;
+}
+function setPiUI(next) {
+  piUI = next;
+}
+function safeNotify(message, level = "warning") {
+  try {
+    piUI?.notify(message, level);
+  } catch (error51) {
+    debug("notify failed:", error51);
+  }
+}
+function argKeys(args) {
+  return Object.keys(args ?? {}).sort();
+}
+function safeToolCallSummary(calls) {
+  return calls.map((call) => ({ id: call.id, toolName: call.toolName, argKeys: argKeys(call.arguments) }));
+}
+var INTEGRITY_CUSTOM_TYPE = "claude-bridge-integrity";
+function appendIntegrityEntry(label, data) {
+  try {
+    if (!extensionApi) return false;
+    extensionApi.appendEntry(INTEGRITY_CUSTOM_TYPE, { label, at: (/* @__PURE__ */ new Date()).toISOString(), ...data });
+    return true;
+  } catch (error51) {
+    debug("appendIntegrityEntry failed:", error51);
+    return false;
+  }
+}
+function compactToolNameSummary(names, limit = 12) {
+  const shown = names.slice(0, limit).map(({ name, count }) => count > 1 ? `${name}\xD7${count}` : name);
+  if (names.length > limit) shown.push(`+${names.length - limit} more`);
+  return shown;
+}
+function reportSyntheticToolResultRepair(missing, context) {
+  try {
+    if (missing.length === 0) return;
+    const toolNames = summarizeMissingToolNames(missing);
+    const toolNameSummary = compactToolNameSummary(toolNames);
+    const sampledToolCallIds = missing.slice(0, 50).map((item) => item.id);
+    diagDump("repair_tool_pairing_synthetic_results", {
+      count: missing.length,
+      toolNames,
+      sampledToolCallIds,
+      missing: missing.slice(0, 50),
+      ...context
+    });
+    appendIntegrityEntry("repair_tool_pairing_synthetic_results", {
+      count: missing.length,
+      toolNames,
+      sampledToolCallIds: sampledToolCallIds.slice(0, 12)
+    });
+    safeNotify(
+      `Claude bridge: ${missing.length} missing tool result(s) repaired with an explicit error placeholder${toolNameSummary.length ? ` for ${toolNameSummary.join(", ")}` : ""}. Real tool output was lost before Claude session import; see ${diagLogPath()}.`,
+      "error"
+    );
+  } catch (error51) {
+    debug("reportSyntheticToolResultRepair failed:", error51);
+  }
+}
+function reportToolResultMismatch(queryCtx, reason, cwd, opts = {}) {
+  try {
+    if (queryCtx.reportedToolResultMismatch) return false;
+    const progress = queryCtx.toolResultProgress();
+    const hasMismatch = progress.expectedCount > 0 ? progress.unresolvedIds.length > 0 || progress.waitingCount > 0 || progress.queuedCount > 0 || progress.unmatchedResultCount > 0 : progress.waitingCount > 0 || progress.queuedCount > 0 || progress.unmatchedResultCount > 0;
+    if (!hasMismatch) return false;
+    queryCtx.reportedToolResultMismatch = true;
+    if (sharedSession) {
+      sharedSession = { ...sharedSession, needsRebuild: true, ...opts.forceRotate ? { forceRotate: true } : {} };
+    }
+    const toolNameSummary = compactToolNameSummary(progress.toolNames);
+    diagDump("tool_result_delivery_mismatch", {
+      reason,
+      cwd,
+      progress,
+      activeQueryExists: queryCtx.activeQuery !== null,
+      sharedSession: sharedSession ? {
+        sessionId: sharedSession.sessionId.slice(0, 8),
+        cursor: sharedSession.cursor,
+        needsRebuild: sharedSession.needsRebuild === true,
+        forceRotate: sharedSession.forceRotate === true
+      } : null
+    });
+    appendIntegrityEntry("tool_result_delivery_mismatch", {
+      reason,
+      toolNames: progress.toolNames,
+      expectedCount: progress.expectedCount,
+      deliveredCount: progress.deliveredCount,
+      resolvedCount: progress.resolvedCount,
+      waitingIds: progress.waitingIds,
+      queuedIds: progress.queuedIds,
+      unmatchedResultIds: progress.unmatchedResultIds
+    });
+    safeNotify(
+      `Claude bridge: tool result delivery interrupted during ${reason}; delivered ${progress.deliveredCount}/${progress.expectedCount}, resolved ${progress.resolvedCount}/${progress.expectedCount}, waiting=${progress.waitingCount}, queued=${progress.queuedCount}, unmatched=${progress.unmatchedResultCount}${toolNameSummary.length ? `, tools=${toolNameSummary.join(", ")}` : ""}. Claude session will rebuild before the next turn; see ${diagLogPath()}.`,
+      "error"
+    );
+    return true;
+  } catch (error51) {
+    debug("reportToolResultMismatch failed:", error51);
+    return false;
+  }
+}
+function __testSetBridgeIntegrityState(state) {
+  if ("ui" in state) piUI = state.ui;
+  if ("sharedSession" in state) sharedSession = state.sharedSession ?? null;
+}
+function __testGetBridgeIntegrityState() {
+  return { sharedSession };
+}
+
+// src/connector-audit.ts
+var CONNECTOR_CALL_CUSTOM_TYPE = "claude-bridge-connector-call";
+function connectorResultByteSize(content) {
+  if (content === void 0 || content === null) return void 0;
+  if (typeof content === "string") return Buffer.byteLength(content, "utf8");
+  try {
+    const json2 = JSON.stringify(content);
+    return typeof json2 === "string" ? Buffer.byteLength(json2, "utf8") : void 0;
+  } catch {
+    return void 0;
+  }
+}
+var auditSink;
+function setConnectorCallAuditSink(sink) {
+  auditSink = sink;
+}
+function appendConnectorCallAudit(data) {
+  let delivered = false;
+  if (extensionApi) {
+    try {
+      extensionApi.appendEntry(CONNECTOR_CALL_CUSTOM_TYPE, data);
+      delivered = true;
+    } catch (error51) {
+      debug("appendConnectorCallAudit failed:", error51);
+    }
+  }
+  if (auditSink) {
+    try {
+      auditSink({ ...data });
+      delivered = true;
+    } catch (error51) {
+      debug("connector call audit sink failed:", error51);
+    }
+  }
+  return delivered;
+}
+function recordConnectorCallResult(queryCtx, toolUseId, name, isError, byteSize) {
+  const pending = queryCtx.connectorCallAudit.get(toolUseId);
+  if (pending?.recorded) return false;
+  const childSessionId = pending?.childSessionId ?? queryCtx.childSessionId;
+  queryCtx.connectorCallAudit.set(toolUseId, { ...pending, name, childSessionId, recorded: true });
+  return appendConnectorCallAudit({
+    name,
+    toolUseId,
+    outcome: isError ? "error" : "ok",
+    ...byteSize !== void 0 ? { byteSize } : {},
+    ...childSessionId ? { childSessionId } : {}
+  });
+}
+function flushConnectorCallAudit(queryCtx, reason) {
+  let appended = 0;
+  for (const [toolUseId, state] of queryCtx.connectorCallAudit) {
+    if (state.recorded) continue;
+    queryCtx.connectorCallAudit.set(toolUseId, { ...state, recorded: true });
+    const childSessionId = state.childSessionId ?? queryCtx.childSessionId;
+    if (appendConnectorCallAudit({
+      name: state.name,
+      toolUseId,
+      outcome: "unobserved",
+      reason,
+      ...childSessionId ? { childSessionId } : {}
+    })) appended++;
+  }
+  return appended;
+}
+
+// src/query-teardown.ts
+function teardownQuery(queryCtx, sdkQuery, cause, cwd, isReentrant) {
+  if (queryCtx.activeQuery !== sdkQuery) return false;
+  reportToolResultMismatch(queryCtx, "query teardown", cwd, { forceRotate: cause !== "query-end" });
+  const drained = drainPendingToolCalls(queryCtx, cause);
+  if (drained > 0) debug(`provider: query teardown drained ${drained} waiting MCP handler(s) as errors (cause=${cause})`);
+  queryCtx.pendingResults.clear();
+  const unobserved = flushConnectorCallAudit(queryCtx, cause);
+  if (unobserved > 0) debug(`provider: query teardown recorded ${unobserved} connector call(s) with no observed result (cause=${cause})`);
+  if (isReentrant) {
+    if (!popContextFor(queryCtx)) debug("provider: query teardown found context already popped; skipping pop");
+  } else {
+    queryCtx.activeQuery = null;
+  }
+  return true;
+}
+
+// src/auth-presence.ts
+import { existsSync as existsSync3, readFileSync as readFileSync3 } from "fs";
+import { homedir as homedir2, platform as osPlatform } from "os";
+import { join as join4 } from "path";
+function resolveClaudeConfigDir(env = process.env) {
+  const configured = env.CLAUDE_CONFIG_DIR;
+  if (typeof configured === "string" && configured.trim().length > 0) return configured.trim();
+  return join4(homedir2(), ".claude");
+}
+function nonEmptyEnv(value) {
+  return typeof value === "string" && value.trim().length > 0;
+}
+function envTruthy(value) {
+  const v2 = value?.trim().toLowerCase();
+  return v2 === "1" || v2 === "true";
+}
+function hasApiKeyHelper(configDir) {
+  try {
+    const settingsPath = join4(configDir, "settings.json");
+    if (!existsSync3(settingsPath)) return false;
+    const parsed = JSON.parse(readFileSync3(settingsPath, "utf8"));
+    return typeof parsed?.apiKeyHelper === "string" && parsed.apiKeyHelper.trim().length > 0;
+  } catch {
+    return false;
+  }
+}
+function hasClaudeCredentials(env = process.env, platform = osPlatform()) {
+  if (nonEmptyEnv(env.CLAUDE_CODE_OAUTH_TOKEN)) return true;
+  if (nonEmptyEnv(env.ANTHROPIC_API_KEY)) return true;
+  if (nonEmptyEnv(env.ANTHROPIC_AUTH_TOKEN)) return true;
+  if (envTruthy(env.CLAUDE_CODE_USE_BEDROCK)) return true;
+  if (envTruthy(env.CLAUDE_CODE_USE_VERTEX)) return true;
+  if (envTruthy(env.CLAUDE_CODE_USE_FOUNDRY)) return true;
+  if (envTruthy(env.CLAUDE_CODE_USE_ANTHROPIC_AWS)) return true;
+  if (envTruthy(env.CLAUDE_CODE_USE_MANTLE)) return true;
+  const configDir = resolveClaudeConfigDir(env);
+  if (existsSync3(join4(configDir, ".credentials.json"))) return true;
+  if (hasApiKeyHelper(configDir)) return true;
+  if (platform === "darwin") return true;
+  return false;
+}
+
+// src/native-provider.ts
+var NATIVE_PROVIDER_UNSUPPORTED_MESSAGE = "Claude bridge 2.x requires pi >= 0.81 (native provider API). Upgrade the host pi, or pin @vanillagreen/pi-claude-bridge@1.x.";
+function supportsNativeProvider(piAi2) {
+  return typeof piAi2?.createProvider === "function";
+}
+function claudeAuthSourceLabel(env = process.env) {
+  if (env.CLAUDE_CODE_OAUTH_TOKEN?.trim()) return "CLAUDE_CODE_OAUTH_TOKEN";
+  if (env.ANTHROPIC_API_KEY?.trim()) return "ANTHROPIC_API_KEY";
+  if (env.ANTHROPIC_AUTH_TOKEN?.trim()) return "ANTHROPIC_AUTH_TOKEN";
+  return "Claude Code login";
+}
+function buildNativeProvider(piAi2, models, streamSimple, env = process.env) {
+  if (!supportsNativeProvider(piAi2)) throw new Error(NATIVE_PROVIDER_UNSUPPORTED_MESSAGE);
+  const stamped = models.map((model) => ({ api: "claude-bridge", baseUrl: "claude-bridge", provider: PROVIDER_ID, ...model }));
+  const streams = {
+    stream: streamSimple,
+    streamSimple
+  };
+  return piAi2.createProvider({
+    id: PROVIDER_ID,
+    name: "Claude (Claude Code)",
+    baseUrl: "claude-bridge",
+    auth: {
+      apiKey: {
+        name: "Claude Code credentials",
+        // check() exists so pi's availability pass never has to call
+        // resolve(): both are existence-only, but check is the documented
+        // side-effect-free probe.
+        check: async () => hasClaudeCredentials(env) ? { type: "api_key", source: claudeAuthSourceLabel(env) } : void 0,
+        resolve: async () => hasClaudeCredentials(env) ? { auth: { apiKey: "not-used" }, source: claudeAuthSourceLabel(env) } : void 0
+      }
+    },
+    models: stamped,
+    api: streams
+  });
+}
+
+// src/agents-md.ts
+import { existsSync as existsSync4, readFileSync as readFileSync4 } from "fs";
+import { dirname as dirname3, join as join5, resolve as resolve3 } from "path";
+function globalAgentsPath() {
+  return join5(piUserDir(), "AGENTS.md");
+}
+function resolveAgentsMdPath() {
+  if (isolatedFromEnv()) return void 0;
+  const fromCwd = findAgentsMdInParents(process.cwd());
+  if (fromCwd) return fromCwd;
+  const globalPath = globalAgentsPath();
+  if (existsSync4(globalPath)) return globalPath;
+  return void 0;
+}
+function findAgentsMdInParents(startDir) {
+  let current = resolve3(startDir);
+  while (true) {
+    const candidate = join5(current, "AGENTS.md");
+    if (existsSync4(candidate)) return candidate;
+    const parent = dirname3(current);
+    if (parent === current) break;
+    current = parent;
+  }
+  return void 0;
+}
+function extractAgentsAppend() {
+  const agentsPath = resolveAgentsMdPath();
+  if (!agentsPath) return void 0;
+  try {
+    const content = readFileSync4(agentsPath, "utf-8").trim();
+    if (!content) return void 0;
+    const sanitized = sanitizeAgentsContent(content);
+    return sanitized.length > 0 ? `# CLAUDE.md
+
+${sanitized}` : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function sanitizeAgentsContent(content) {
+  let sanitized = content;
+  sanitized = sanitized.replace(/~\/\.pi\b/gi, "~/.claude");
+  sanitized = sanitized.replace(/(^|[\s'"`])\.pi\//g, "$1.claude/");
+  sanitized = sanitized.replace(/\b\.pi\b/gi, ".claude");
+  sanitized = sanitized.replace(/\bpi\b/gi, "environment");
+  return sanitized;
+}
+
+// src/prompt-context.ts
+import { existsSync as existsSync5, readFileSync as readFileSync5 } from "fs";
+import { dirname as dirname4, join as join6, resolve as resolve4 } from "path";
+function readTrimmed(path) {
+  try {
+    if (!existsSync5(path)) return void 0;
+    const content = readFileSync5(path, "utf8").trim();
+    return content.length > 0 ? content : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function findProjectAppendSystem(startDir) {
+  let current = resolve4(startDir);
+  while (true) {
+    const candidate = join6(current, ".pi", "APPEND_SYSTEM.md");
+    if (existsSync5(candidate)) return candidate;
+    const parent = dirname4(current);
+    if (parent === current) break;
+    current = parent;
+  }
+  return void 0;
+}
+function readAppendSystemPromptFiles(cwd) {
+  const files = [
+    { label: "global APPEND_SYSTEM.md", path: join6(piUserDir(), "APPEND_SYSTEM.md") }
+  ];
+  const projectPath = isolatedFromEnv() ? void 0 : findProjectAppendSystem(cwd);
+  if (projectPath) files.push({ label: "project .pi/APPEND_SYSTEM.md", path: projectPath });
+  const seen = /* @__PURE__ */ new Set();
+  const output = [];
+  for (const file2 of files) {
+    if (seen.has(file2.path)) continue;
+    seen.add(file2.path);
+    const content = readTrimmed(file2.path);
+    if (content) output.push({ label: file2.label, content });
+  }
+  return output;
+}
+function splitPromptBlocks(systemPrompt) {
+  return (systemPrompt ?? "").split(/\n{2,}/).map((block) => block.trim()).filter(Boolean);
+}
+function extractHeadingSection(systemPrompt, headings) {
+  if (!systemPrompt) return void 0;
+  let start = -1;
+  for (const heading of headings) {
+    const index = systemPrompt.indexOf(heading);
+    if (index >= 0 && (start < 0 || index < start)) start = index;
+  }
+  if (start < 0) return void 0;
+  const rest = systemPrompt.slice(start).trim();
+  const endCandidates = [
+    rest.slice(1).search(/\n##\s+/),
+    rest.search(/\n<\/project_instructions>/),
+    rest.search(/\n<\/project_context>/)
+  ].map((index, offset) => index >= 0 && offset === 0 ? index + 1 : index).filter((index) => index >= 0);
+  const end = endCandidates.length > 0 ? Math.min(...endCandidates) : -1;
+  return (end >= 0 ? rest.slice(0, end) : rest).trim();
+}
+function extractBlockByMarkers(systemPrompt, markers) {
+  for (const block of splitPromptBlocks(systemPrompt)) {
+    if (markers.some((marker) => marker.test(block))) return block;
+  }
+  return void 0;
+}
+function buildPromptContextAppend(systemPrompt, cwd, settings) {
+  const parts = [];
+  const labels = [];
+  if (settings.includeAppendSystemPromptMd) {
+    for (const file2 of readAppendSystemPromptFiles(cwd)) {
+      parts.push(xmlBlock("append_system_prompt", { label: file2.label }, file2.content));
+      labels.push(file2.label);
+    }
+  }
+  if (settings.includeProjectAgentsHook) {
+    const projectAgents = extractHeadingSection(systemPrompt, ["## Project Agents", "## Project Subagents"]);
+    if (projectAgents) {
+      parts.push(xmlBlock("before_agent_start", { source: "project-agents" }, projectAgents));
+      labels.push("project agents hook");
+    }
+  }
+  if (settings.includeTaskPanelHook) {
+    const taskReminder = extractBlockByMarkers(systemPrompt, [/^Task workflow reminder:/]);
+    if (taskReminder) {
+      parts.push(xmlBlock("before_agent_start", { source: "task-panel" }, taskReminder));
+      labels.push("task panel hook");
     }
   }
   if (settings.includeCavemanHook) {
@@ -42258,1026 +43210,471 @@ function convertBaseSchema(schema, ctx2) {
         }
         zodSchema = arraySchema;
       } else {
-        zodSchema = z2.array(z2.any());
-      }
-      break;
-    }
-    default:
-      throw new Error(`Unsupported type: ${type}`);
-  }
-  return zodSchema;
-}
-function convertSchema(schema, ctx2) {
-  if (typeof schema === "boolean") {
-    return schema ? z2.any() : z2.never();
-  }
-  let baseSchema = convertBaseSchema(schema, ctx2);
-  const hasExplicitType = schema.type || schema.enum !== void 0 || schema.const !== void 0;
-  if (schema.anyOf && Array.isArray(schema.anyOf)) {
-    const options = schema.anyOf.map((s) => convertSchema(s, ctx2));
-    const anyOfUnion = z2.union(options);
-    baseSchema = hasExplicitType ? z2.intersection(baseSchema, anyOfUnion) : anyOfUnion;
-  }
-  if (schema.oneOf && Array.isArray(schema.oneOf)) {
-    const options = schema.oneOf.map((s) => convertSchema(s, ctx2));
-    const oneOfUnion = z2.xor(options);
-    baseSchema = hasExplicitType ? z2.intersection(baseSchema, oneOfUnion) : oneOfUnion;
-  }
-  if (schema.allOf && Array.isArray(schema.allOf)) {
-    if (schema.allOf.length === 0) {
-      baseSchema = hasExplicitType ? baseSchema : z2.any();
-    } else {
-      let result = hasExplicitType ? baseSchema : convertSchema(schema.allOf[0], ctx2);
-      const startIdx = hasExplicitType ? 0 : 1;
-      for (let i = startIdx; i < schema.allOf.length; i++) {
-        result = z2.intersection(result, convertSchema(schema.allOf[i], ctx2));
-      }
-      baseSchema = result;
-    }
-  }
-  if (schema.nullable === true && ctx2.version === "openapi-3.0") {
-    baseSchema = z2.nullable(baseSchema);
-  }
-  if (schema.readOnly === true) {
-    baseSchema = z2.readonly(baseSchema);
-  }
-  if (schema.default !== void 0) {
-    baseSchema = baseSchema.default(schema.default);
-  }
-  const extraMeta = {};
-  const coreMetadataKeys = ["$id", "id", "$comment", "$anchor", "$vocabulary", "$dynamicRef", "$dynamicAnchor"];
-  for (const key of coreMetadataKeys) {
-    if (key in schema) {
-      extraMeta[key] = schema[key];
-    }
-  }
-  const contentMetadataKeys = ["contentEncoding", "contentMediaType", "contentSchema"];
-  for (const key of contentMetadataKeys) {
-    if (key in schema) {
-      extraMeta[key] = schema[key];
-    }
-  }
-  for (const key of Object.keys(schema)) {
-    if (!RECOGNIZED_KEYS.has(key)) {
-      extraMeta[key] = schema[key];
-    }
-  }
-  if (Object.keys(extraMeta).length > 0) {
-    ctx2.registry.add(baseSchema, extraMeta);
-  }
-  if (schema.description) {
-    baseSchema = baseSchema.describe(schema.description);
-  }
-  return baseSchema;
-}
-function fromJSONSchema(schema, params) {
-  if (typeof schema === "boolean") {
-    return schema ? z2.any() : z2.never();
-  }
-  let normalized;
-  try {
-    normalized = JSON.parse(JSON.stringify(schema));
-  } catch {
-    throw new Error("fromJSONSchema input is not valid JSON (possibly cyclic); use $defs/$ref for recursive schemas");
-  }
-  const version2 = detectVersion(normalized, params?.defaultTarget);
-  const defs = normalized.$defs || normalized.definitions || {};
-  const ctx2 = {
-    version: version2,
-    defs,
-    refs: /* @__PURE__ */ new Map(),
-    processing: /* @__PURE__ */ new Set(),
-    rootSchema: normalized,
-    registry: params?.registry ?? globalRegistry
-  };
-  return convertSchema(normalized, ctx2);
-}
-
-// node_modules/zod/v4/classic/coerce.js
-var coerce_exports = {};
-__export(coerce_exports, {
-  bigint: () => bigint3,
-  boolean: () => boolean3,
-  date: () => date4,
-  number: () => number3,
-  string: () => string3
-});
-function string3(params) {
-  return _coercedString(ZodString, params);
-}
-function number3(params) {
-  return _coercedNumber(ZodNumber, params);
-}
-function boolean3(params) {
-  return _coercedBoolean(ZodBoolean, params);
-}
-function bigint3(params) {
-  return _coercedBigint(ZodBigInt, params);
-}
-function date4(params) {
-  return _coercedDate(ZodDate, params);
-}
-
-// node_modules/zod/v4/classic/external.js
-config(en_default());
-
-// src/typebox-to-zod.ts
-function jsonSchemaPropertyToZod(prop) {
-  let base;
-  if (Array.isArray(prop.enum) && prop.enum.length > 0) base = external_exports.enum(prop.enum);
-  else switch (prop.type) {
-    case "string":
-      base = external_exports.string();
-      break;
-    case "number":
-    case "integer":
-      base = external_exports.number();
-      break;
-    case "boolean":
-      base = external_exports.boolean();
-      break;
-    case "array": {
-      base = prop.items ? external_exports.array(jsonSchemaPropertyToZod(prop.items)) : external_exports.array(external_exports.unknown());
-      const minItems = typeof prop.minItems === "number" ? prop.minItems : void 0;
-      if (minItems !== void 0) base = base.min(minItems);
-      break;
-    }
-    case "object": {
-      if (prop.properties && typeof prop.properties === "object" && !Array.isArray(prop.properties)) {
-        base = external_exports.object(jsonSchemaToZodShape(prop));
-        if (prop.additionalProperties === false) base = base.strict();
-        else if (prop.additionalProperties === true) base = base.passthrough();
-      } else {
-        base = external_exports.record(external_exports.string(), external_exports.unknown());
-      }
-      break;
-    }
-    default:
-      base = external_exports.unknown();
-  }
-  if (typeof prop.description === "string") base = base.describe(prop.description);
-  return base;
-}
-function jsonSchemaToZodShape(schema) {
-  const s = schema;
-  if (!s || s.type !== "object" || !s.properties) return {};
-  const props = s.properties;
-  const required2 = new Set(Array.isArray(s.required) ? s.required : []);
-  const shape = {};
-  for (const [key, prop] of Object.entries(props)) {
-    const zodProp = jsonSchemaPropertyToZod(prop);
-    shape[key] = required2.has(key) ? zodProp : zodProp.optional();
-  }
-  return shape;
-}
-
-// src/index.ts
-import { readFileSync as nodeReadFileSync } from "node:fs";
-
-// src/pi-ai-compat.ts
-var dynamicImport = (specifier) => import(specifier);
-async function resolveGetModels(root, loadCompat = () => dynamicImport("@earendil-works/pi-ai/compat")) {
-  if (typeof root?.getModels === "function") return root.getModels;
-  const compat = await loadCompat();
-  if (typeof compat?.getModels !== "function") throw new Error("pi-ai getModels API is unavailable");
-  return compat.getModels;
-}
-
-// src/connector-inventory.ts
-var CONNECTOR_NS_PREFIX = "mcp__claude_ai_";
-var DEFAULT_API_BASE = "https://api.anthropic.com";
-var OAUTH_BETA_HEADER = "oauth-2025-04-20";
-function connectorServerNamespace(connectorName) {
-  return `${CONNECTOR_NS_PREFIX}${connectorName.trim().replace(/\s+/g, "_")}__`;
-}
-function credentialCandidatePaths(env = process.env) {
-  const roots = [];
-  const configDir = env.CLAUDE_CONFIG_DIR?.trim();
-  if (configDir) roots.push(configDir);
-  const home = env.HOME?.trim();
-  if (home) roots.push(`${home}/.claude`, home);
-  const seen = /* @__PURE__ */ new Set();
-  const paths = [];
-  for (const root of roots) {
-    for (const name of [".credentials.json", ".claude.json"]) {
-      const p2 = `${root}/${name}`;
-      if (!seen.has(p2)) {
-        seen.add(p2);
-        paths.push(p2);
-      }
-    }
-  }
-  return paths;
-}
-function resolveClaudeOAuth(readFile, env = process.env) {
-  let accessToken;
-  let organizationUuid;
-  for (const path of credentialCandidatePaths(env)) {
-    const raw = readFile(path);
-    if (!raw) continue;
-    let parsed;
-    try {
-      parsed = JSON.parse(raw);
-    } catch {
-      continue;
-    }
-    accessToken ??= nonEmptyString(parsed?.claudeAiOauth?.accessToken);
-    organizationUuid ??= nonEmptyString(parsed?.oauthAccount?.organizationUuid);
-    if (accessToken && organizationUuid) break;
-  }
-  if (!accessToken || !organizationUuid) return void 0;
-  return { accessToken, organizationUuid };
-}
-function nonEmptyString(value) {
-  return typeof value === "string" && value.trim() ? value.trim() : void 0;
-}
-function connectorsListUrl(organizationUuid, apiBase = DEFAULT_API_BASE) {
-  return `${trimTrailingSlashes(apiBase)}/api/oauth/organizations/${encodeURIComponent(organizationUuid)}/mcp/connectors/list`;
-}
-function trimTrailingSlashes(value) {
-  let end = value.length;
-  while (end > 0 && value.charCodeAt(end - 1) === 47) end--;
-  return value.slice(0, end);
-}
-async function listAccountConnectors(deps) {
-  const { credentials, apiBase, signal } = deps;
-  const fetchImpl = deps.fetchImpl ?? fetch;
-  const url2 = connectorsListUrl(credentials.organizationUuid, apiBase);
-  const fail = (reason) => ({ ok: false, complete: false, reason: redactSecret(reason, credentials.accessToken) });
-  let response;
-  try {
-    response = await fetchImpl(url2, {
-      method: "POST",
-      headers: {
-        "Authorization": `Bearer ${credentials.accessToken}`,
-        "anthropic-beta": OAUTH_BETA_HEADER,
-        "Content-Type": "application/json"
-      },
-      body: "{}",
-      signal
-    });
-  } catch (error51) {
-    return fail(`connector list request failed: ${errorText(error51)}`);
-  }
-  let bodyText;
-  try {
-    bodyText = await response.text();
-  } catch (error51) {
-    return fail(`connector list response unreadable: ${errorText(error51)}`);
-  }
-  if (!response.ok) {
-    return fail(`connector list returned HTTP ${response.status}${apiErrorSuffix(bodyText)}`);
-  }
-  let parsed;
-  try {
-    parsed = JSON.parse(bodyText);
-  } catch {
-    return fail("connector list returned a non-JSON body");
-  }
-  if (!Array.isArray(parsed?.results)) {
-    return fail("connector list response had no results array");
-  }
-  const connectors = [];
-  for (const raw of parsed.results) {
-    const entry = raw;
-    const name = nonEmptyString(entry?.name);
-    if (!name) {
-      return fail("connector list contained an entry with no name");
-    }
-    connectors.push({
-      name,
-      installedServerId: nonEmptyString(entry?.installedServerId),
-      directoryUuid: nonEmptyString(entry?.directoryUuid),
-      description: nonEmptyString(entry?.description),
-      isAuthless: typeof entry?.isAuthless === "boolean" ? entry.isAuthless : void 0
-    });
-  }
-  return { ok: true, complete: true, connectors };
-}
-function apiErrorSuffix(bodyText) {
-  try {
-    const message = JSON.parse(bodyText)?.error?.message;
-    return typeof message === "string" && message.trim() ? ` (${message.trim()})` : "";
-  } catch {
-    return "";
-  }
-}
-function redactSecret(text, secret) {
-  if (!secret || secret.length < 8) return text;
-  let out = text;
-  for (const form of /* @__PURE__ */ new Set([secret, encodeURIComponent(secret)])) {
-    out = out.split(form).join("[redacted]");
-  }
-  return out;
-}
-function errorText(error51) {
-  return error51 instanceof Error ? error51.message : String(error51);
-}
-
-// src/debug.ts
-import { appendFileSync as appendFileSync2, chmodSync, mkdirSync as mkdirSync2 } from "fs";
-import { dirname as dirname4, join as join6 } from "path";
-var DEBUG = process.env.CLAUDE_BRIDGE_DEBUG === "1";
-var DEBUG_LOG_PATH = process.env.CLAUDE_BRIDGE_DEBUG_PATH || join6(piUserDir(), "claude-bridge.log");
-function diagLogPath() {
-  return process.env.CLAUDE_BRIDGE_DIAG_PATH || join6(piUserDir(), "claude-bridge-diag.log");
-}
-if (DEBUG) {
-  try {
-    mkdirSync2(dirname4(DEBUG_LOG_PATH), { recursive: true });
-    mkdirSync2(dirname4(diagLogPath()), { recursive: true, mode: 448 });
-  } catch {
-  }
-}
-var moduleInstanceId = Math.random().toString(36).slice(2, 8);
-function debug(...args) {
-  if (!DEBUG) return;
-  const ts2 = (/* @__PURE__ */ new Date()).toISOString();
-  const fmt = (a) => {
-    if (typeof a === "string") return a;
-    if (a instanceof Error) return `${a.name}: ${a.message}${a.stack ? "\n" + a.stack : ""}`;
-    return JSON.stringify(a);
-  };
-  const msg = args.map(fmt).join(" ");
-  try {
-    appendFileSync2(DEBUG_LOG_PATH, `[${ts2}] [${moduleInstanceId}] ${msg}
-`);
-  } catch {
-  }
-}
-var nextCliDebugSeq = 1;
-function makeCliDebugOptions(tag) {
-  if (!DEBUG) return {};
-  const seq = nextCliDebugSeq++;
-  const ts2 = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
-  const logDir = join6(dirname4(DEBUG_LOG_PATH), "cc-cli-logs");
-  try {
-    mkdirSync2(logDir, { recursive: true });
-  } catch {
-  }
-  const debugFile = join6(logDir, `${ts2}-${tag}-${seq}.log`);
-  debug(`cli-debug: ${tag} #${seq} \u2192 ${debugFile}`);
-  return {
-    debug: true,
-    debugFile,
-    stderr: (data) => {
-      for (const line of data.split(/\r?\n/)) {
-        if (line) debug(`[cli-stderr ${tag}#${seq}] ${line}`);
-      }
-    }
-  };
-}
-function diagDump(label, data) {
-  try {
-    const ts2 = (/* @__PURE__ */ new Date()).toISOString();
-    const entry = { ts: ts2, moduleInstanceId, label, ...data };
-    const path = diagLogPath();
-    try {
-      mkdirSync2(dirname4(path), { recursive: true, mode: 448 });
-    } catch {
-    }
-    appendFileSync2(path, JSON.stringify(entry) + "\n", { mode: 384 });
-    try {
-      chmodSync(path, 384);
-    } catch {
-    }
-    debug(`DIAG: ${label} (see ${path})`);
-  } catch (error51) {
-    debug(`DIAG FAILED: ${label}`, error51);
-  }
-}
-
-// src/claude-executable.ts
-import { spawn as spawnProcess } from "child_process";
-import { accessSync, constants as fsConstants, readFileSync as readFileSync6, realpathSync as realpathSync2, statSync as statSync2 } from "fs";
-import { delimiter, join as join7 } from "path";
-function executableFromPath(name) {
-  const paths = (process.env.PATH ?? "").split(delimiter).filter(Boolean);
-  for (const dir of paths) {
-    const candidate = join7(dir, name);
-    try {
-      accessSync(candidate, fsConstants.X_OK);
-      return candidate;
-    } catch {
-    }
-  }
-  return void 0;
-}
-function resolveClaudeExecutable(configured) {
-  const trimmed = configured?.trim();
-  if (trimmed) return trimmed;
-  if (isolatedFromEnv()) return void 0;
-  return executableFromPath("claude") ?? executableFromPath("claude-code");
-}
-function errnoValue(err) {
-  return typeof err?.errno === "number" ? err.errno : void 0;
-}
-function syscallValue(err) {
-  return typeof err?.syscall === "string" ? err.syscall : void 0;
-}
-function pathValue(err) {
-  const value = err?.path;
-  return typeof value === "string" ? value : void 0;
-}
-function codeValue(err, fallback) {
-  const value = err?.code;
-  return typeof value === "string" ? value : fallback;
-}
-function displayValue(value) {
-  return value === void 0 || value === null || value === "" ? "<none>" : String(value);
-}
-function makeClaudePreflightError(summary, details) {
-  const detail = [
-    `code=${details.code}`,
-    `errno=${displayValue(details.errno)}`,
-    `syscall=${displayValue(details.syscall)}`,
-    `path=${details.path}`,
-    `cwd=${details.cwd}`,
-    ...details.fileType ? [`fileType=${details.fileType}`] : [],
-    ...details.realPath ? [`realPath=${details.realPath}`] : []
-  ].join(" ");
-  const error51 = new Error(`${summary} (${detail})`);
-  error51.name = "ClaudeExecutablePreflightError";
-  error51.code = details.code;
-  if (details.errno !== void 0) error51.errno = typeof details.errno === "number" ? details.errno : Number(details.errno);
-  if (details.syscall) error51.syscall = details.syscall;
-  error51.path = details.path;
-  error51.cwd = details.cwd;
-  if (details.fileType) error51.fileType = details.fileType;
-  if (details.realPath) error51.realPath = details.realPath;
-  if (details.cause !== void 0) error51.cause = details.cause;
-  return error51;
-}
-function classifyClaudeExecutableBytes(bytes) {
-  if (bytes.length === 0) return "empty";
-  if (bytes.length >= 2 && bytes[0] === 35 && bytes[1] === 33) return "shebang-script";
-  if (bytes.length >= 4 && bytes[0] === 127 && bytes[1] === 69 && bytes[2] === 76 && bytes[3] === 70) return "elf";
-  if (bytes.length >= 2 && bytes[0] === 77 && bytes[1] === 90) return "pe";
-  if (bytes.length >= 4) {
-    const magic = bytes[0] * 16777216 + bytes[1] * 65536 + bytes[2] * 256 + bytes[3];
-    if (magic === 4277009102 || magic === 4277009103 || magic === 3472551422 || magic === 3489328638 || magic === 3405691582 || magic === 3199925962) return "mach-o";
+        zodSchema = z2.array(z2.any());
+      }
+      break;
+    }
+    default:
+      throw new Error(`Unsupported type: ${type}`);
   }
-  return "unknown";
+  return zodSchema;
 }
-function preflightClaudeExecutable(path, cwd) {
-  let realCwd;
-  try {
-    const cwdStat = statSync2(cwd);
-    if (!cwdStat.isDirectory()) {
-      throw makeClaudePreflightError("Claude Code spawn cwd preflight failed: cwd is not a directory.", {
-        code: "ENOTDIR",
-        syscall: "chdir",
-        path: cwd,
-        cwd
-      });
-    }
-    accessSync(cwd, fsConstants.X_OK);
-    realCwd = realpathSync2(cwd);
-  } catch (err) {
-    if (err.name === "ClaudeExecutablePreflightError") throw err;
-    throw makeClaudePreflightError("Claude Code spawn cwd preflight failed: cwd is not reachable before spawning Claude Code.", {
-      code: codeValue(err, "EACCES"),
-      errno: errnoValue(err),
-      syscall: syscallValue(err),
-      path: pathValue(err) ?? cwd,
-      cwd,
-      cause: err
-    });
+function convertSchema(schema, ctx2) {
+  if (typeof schema === "boolean") {
+    return schema ? z2.any() : z2.never();
   }
-  let realPath;
-  try {
-    const stat = statSync2(path);
-    if (!stat.isFile()) {
-      throw makeClaudePreflightError("Claude Code executable preflight failed: resolved path is not a file.", {
-        code: "EACCES",
-        syscall: "exec",
-        path,
-        cwd
-      });
+  let baseSchema = convertBaseSchema(schema, ctx2);
+  const hasExplicitType = schema.type || schema.enum !== void 0 || schema.const !== void 0;
+  if (schema.anyOf && Array.isArray(schema.anyOf)) {
+    const options = schema.anyOf.map((s) => convertSchema(s, ctx2));
+    const anyOfUnion = z2.union(options);
+    baseSchema = hasExplicitType ? z2.intersection(baseSchema, anyOfUnion) : anyOfUnion;
+  }
+  if (schema.oneOf && Array.isArray(schema.oneOf)) {
+    const options = schema.oneOf.map((s) => convertSchema(s, ctx2));
+    const oneOfUnion = z2.xor(options);
+    baseSchema = hasExplicitType ? z2.intersection(baseSchema, oneOfUnion) : oneOfUnion;
+  }
+  if (schema.allOf && Array.isArray(schema.allOf)) {
+    if (schema.allOf.length === 0) {
+      baseSchema = hasExplicitType ? baseSchema : z2.any();
+    } else {
+      let result = hasExplicitType ? baseSchema : convertSchema(schema.allOf[0], ctx2);
+      const startIdx = hasExplicitType ? 0 : 1;
+      for (let i = startIdx; i < schema.allOf.length; i++) {
+        result = z2.intersection(result, convertSchema(schema.allOf[i], ctx2));
+      }
+      baseSchema = result;
     }
-    accessSync(path, fsConstants.X_OK);
-    realPath = realpathSync2(path);
-  } catch (err) {
-    if (err.name === "ClaudeExecutablePreflightError") throw err;
-    throw makeClaudePreflightError("Claude Code executable preflight failed: cannot access resolved executable before spawning Claude Code.", {
-      code: codeValue(err, "ENOENT"),
-      errno: errnoValue(err),
-      syscall: syscallValue(err),
-      path: pathValue(err) ?? path,
-      cwd,
-      cause: err
-    });
   }
-  let fileType;
-  try {
-    fileType = classifyClaudeExecutableBytes(readFileSync6(realPath).subarray(0, 16));
-  } catch (err) {
-    throw makeClaudePreflightError("Claude Code executable preflight failed: cannot read executable header before spawning Claude Code.", {
-      code: codeValue(err, "EACCES"),
-      errno: errnoValue(err),
-      syscall: syscallValue(err),
-      path: pathValue(err) ?? realPath,
-      cwd,
-      realPath,
-      cause: err
-    });
+  if (schema.nullable === true && ctx2.version === "openapi-3.0") {
+    baseSchema = z2.nullable(baseSchema);
   }
-  if (!["elf", "mach-o", "pe", "shebang-script"].includes(fileType)) {
-    throw makeClaudePreflightError("Claude Code executable preflight failed: executable header is not an ELF, Mach-O, PE, or shebang script.", {
-      code: "ENOEXEC",
-      syscall: "exec",
-      path,
-      cwd,
-      fileType,
-      realPath
-    });
+  if (schema.readOnly === true) {
+    baseSchema = z2.readonly(baseSchema);
   }
-  return { path, realPath, cwd, realCwd, fileType };
-}
-function envFlagEnabled(value) {
-  return value === "1" || value?.toLowerCase() === "true";
-}
-function wrapClaudeSpawnErrorForSdk(err, options) {
-  const originalCode = codeValue(err, "SPAWN_ERROR");
-  const originalMessage = err.message;
-  const spawnPath = pathValue(err) ?? options.command;
-  const cwd = options.cwd ?? process.cwd();
-  const detail = [
-    `code=${originalCode}`,
-    `errno=${displayValue(errnoValue(err))}`,
-    `syscall=${displayValue(syscallValue(err))}`,
-    `path=${spawnPath}`,
-    `cwd=${cwd}`,
-    `command=${options.command}`
-  ].join(" ");
-  const wrapped = new Error(`Claude Code spawn failed: ${originalMessage} (${detail})`);
-  wrapped.name = "ClaudeSpawnDiagnosticError";
-  wrapped.code = originalCode === "ENOENT" ? "CLAUDE_BRIDGE_SPAWN_FAILED" : originalCode;
-  wrapped.originalCode = originalCode;
-  wrapped.originalMessage = originalMessage;
-  const errno = errnoValue(err);
-  if (errno !== void 0) wrapped.errno = typeof errno === "number" ? errno : Number(errno);
-  const syscall = syscallValue(err);
-  if (syscall) wrapped.syscall = syscall;
-  wrapped.path = spawnPath;
-  wrapped.cwd = cwd;
-  return wrapped;
-}
-function spawnClaudeCodeWithDiagnostics(options) {
-  const pipeStderr = DEBUG || envFlagEnabled(options.env.DEBUG_CLAUDE_AGENT_SDK);
-  const child = spawnProcess(options.command, options.args, {
-    cwd: options.cwd,
-    env: options.env,
-    signal: options.signal,
-    stdio: ["pipe", "pipe", pipeStderr ? "pipe" : "ignore"],
-    windowsHide: true
-  });
-  if (pipeStderr) {
-    child.stderr?.on("data", (data) => {
-      for (const line of data.toString().split(/\r?\n/)) {
-        if (line) debug(`[cli-stderr spawn] ${line}`);
-      }
-    });
+  if (schema.default !== void 0) {
+    baseSchema = baseSchema.default(schema.default);
   }
-  child.prependListener("error", (err) => {
-    const originalStack = err.stack;
-    const wrapped = wrapClaudeSpawnErrorForSdk(err, options);
-    Object.assign(err, wrapped);
-    err.name = wrapped.name;
-    err.message = wrapped.message;
-    if (originalStack) err.stack = originalStack;
-  });
-  return {
-    stdin: child.stdin,
-    stdout: child.stdout,
-    get killed() {
-      return child.killed;
-    },
-    get exitCode() {
-      return child.exitCode;
-    },
-    kill: child.kill.bind(child),
-    on: child.on.bind(child),
-    once: child.once.bind(child),
-    off: child.off.bind(child)
-  };
-}
-
-// src/tool-pairing-audit.ts
-function contentBlocks(content) {
-  return Array.isArray(content) ? content.filter((block) => Boolean(block && typeof block === "object")) : [];
-}
-function toolUses(content) {
-  return contentBlocks(content).filter((block) => block.type === "tool_use" && typeof block.id === "string").map((block) => ({ id: block.id, name: typeof block.name === "string" && block.name ? block.name : "unknown" }));
-}
-function toolResultIds(content) {
-  const ids = /* @__PURE__ */ new Set();
-  for (const block of contentBlocks(content)) {
-    if (block.type === "tool_result" && typeof block.tool_use_id === "string") ids.add(block.tool_use_id);
+  const extraMeta = {};
+  const coreMetadataKeys = ["$id", "id", "$comment", "$anchor", "$vocabulary", "$dynamicRef", "$dynamicAnchor"];
+  for (const key of coreMetadataKeys) {
+    if (key in schema) {
+      extraMeta[key] = schema[key];
+    }
   }
-  return ids;
-}
-function findUnpairedToolUses(messages) {
-  const missing = [];
-  for (let i = 0; i < messages.length; i++) {
-    const msg = messages[i];
-    if (msg?.role !== "assistant") continue;
-    const uses = toolUses(msg.content);
-    if (uses.length === 0) continue;
-    const next = messages[i + 1];
-    const nextUserIndex = next?.role === "user" ? i + 1 : null;
-    const resultIds = nextUserIndex == null ? /* @__PURE__ */ new Set() : toolResultIds(next.content);
-    for (const use2 of uses) {
-      if (!resultIds.has(use2.id)) {
-        missing.push({ id: use2.id, toolName: use2.name, assistantIndex: i, userIndex: nextUserIndex });
-      }
+  const contentMetadataKeys = ["contentEncoding", "contentMediaType", "contentSchema"];
+  for (const key of contentMetadataKeys) {
+    if (key in schema) {
+      extraMeta[key] = schema[key];
     }
   }
-  return missing;
-}
-function summarizeMissingToolNames(missing) {
-  const counts = /* @__PURE__ */ new Map();
-  for (const item of missing) counts.set(item.toolName, (counts.get(item.toolName) ?? 0) + 1);
-  return [...counts.entries()].sort((a, b) => b[1] - a[1] || a[0].localeCompare(b[0])).map(([name, count]) => ({ name, count }));
-}
-
-// src/bridge-state.ts
-var sharedSession = null;
-var extensionApi;
-var piUI;
-function setSharedSession(next) {
-  sharedSession = next;
-}
-function setExtensionApi(next) {
-  extensionApi = next;
-}
-function setPiUI(next) {
-  piUI = next;
-}
-function safeNotify(message, level = "warning") {
-  try {
-    piUI?.notify(message, level);
-  } catch (error51) {
-    debug("notify failed:", error51);
+  for (const key of Object.keys(schema)) {
+    if (!RECOGNIZED_KEYS.has(key)) {
+      extraMeta[key] = schema[key];
+    }
   }
-}
-function argKeys(args) {
-  return Object.keys(args ?? {}).sort();
-}
-function safeToolCallSummary(calls) {
-  return calls.map((call) => ({ id: call.id, toolName: call.toolName, argKeys: argKeys(call.arguments) }));
-}
-function compactToolNameSummary(names, limit = 12) {
-  const shown = names.slice(0, limit).map(({ name, count }) => count > 1 ? `${name}\xD7${count}` : name);
-  if (names.length > limit) shown.push(`+${names.length - limit} more`);
-  return shown;
-}
-function reportSyntheticToolResultRepair(missing, context) {
-  try {
-    if (missing.length === 0) return;
-    const toolNames = summarizeMissingToolNames(missing);
-    const toolNameSummary = compactToolNameSummary(toolNames);
-    const sampledToolCallIds = missing.slice(0, 50).map((item) => item.id);
-    diagDump("repair_tool_pairing_synthetic_results", {
-      count: missing.length,
-      toolNames,
-      sampledToolCallIds,
-      missing: missing.slice(0, 50),
-      ...context
-    });
-    safeNotify(
-      `Claude bridge: ${missing.length} missing tool result(s) repaired with "[no tool result recorded]"${toolNameSummary.length ? ` for ${toolNameSummary.join(", ")}` : ""}. Real tool output was lost before Claude session import; see ${diagLogPath()}.`,
-      "error"
-    );
-  } catch (error51) {
-    debug("reportSyntheticToolResultRepair failed:", error51);
+  if (Object.keys(extraMeta).length > 0) {
+    ctx2.registry.add(baseSchema, extraMeta);
+  }
+  if (schema.description) {
+    baseSchema = baseSchema.describe(schema.description);
   }
+  return baseSchema;
 }
-function reportToolResultMismatch(queryCtx, reason, cwd, opts = {}) {
+function fromJSONSchema(schema, params) {
+  if (typeof schema === "boolean") {
+    return schema ? z2.any() : z2.never();
+  }
+  let normalized;
   try {
-    if (queryCtx.reportedToolResultMismatch) return false;
-    const progress = queryCtx.toolResultProgress();
-    const hasMismatch = progress.expectedCount > 0 ? progress.unresolvedIds.length > 0 || progress.waitingCount > 0 || progress.queuedCount > 0 || progress.unmatchedResultCount > 0 : progress.waitingCount > 0 || progress.queuedCount > 0 || progress.unmatchedResultCount > 0;
-    if (!hasMismatch) return false;
-    queryCtx.reportedToolResultMismatch = true;
-    if (sharedSession) {
-      sharedSession = { ...sharedSession, needsRebuild: true, ...opts.forceRotate ? { forceRotate: true } : {} };
-    }
-    const toolNameSummary = compactToolNameSummary(progress.toolNames);
-    diagDump("tool_result_delivery_mismatch", {
-      reason,
-      cwd,
-      progress,
-      activeQueryExists: queryCtx.activeQuery !== null,
-      sharedSession: sharedSession ? {
-        sessionId: sharedSession.sessionId.slice(0, 8),
-        cursor: sharedSession.cursor,
-        needsRebuild: sharedSession.needsRebuild === true,
-        forceRotate: sharedSession.forceRotate === true
-      } : null
-    });
-    safeNotify(
-      `Claude bridge: tool result delivery interrupted during ${reason}; delivered ${progress.deliveredCount}/${progress.expectedCount}, resolved ${progress.resolvedCount}/${progress.expectedCount}, waiting=${progress.waitingCount}, queued=${progress.queuedCount}, unmatched=${progress.unmatchedResultCount}${toolNameSummary.length ? `, tools=${toolNameSummary.join(", ")}` : ""}. Claude session will rebuild before the next turn; see ${diagLogPath()}.`,
-      "error"
-    );
-    return true;
-  } catch (error51) {
-    debug("reportToolResultMismatch failed:", error51);
-    return false;
+    normalized = JSON.parse(JSON.stringify(schema));
+  } catch {
+    throw new Error("fromJSONSchema input is not valid JSON (possibly cyclic); use $defs/$ref for recursive schemas");
   }
-}
-function __testSetBridgeIntegrityState(state) {
-  if ("ui" in state) piUI = state.ui;
-  if ("sharedSession" in state) sharedSession = state.sharedSession ?? null;
-}
-function __testGetBridgeIntegrityState() {
-  return { sharedSession };
+  const version2 = detectVersion(normalized, params?.defaultTarget);
+  const defs = normalized.$defs || normalized.definitions || {};
+  const ctx2 = {
+    version: version2,
+    defs,
+    refs: /* @__PURE__ */ new Map(),
+    processing: /* @__PURE__ */ new Set(),
+    rootSchema: normalized,
+    registry: params?.registry ?? globalRegistry
+  };
+  return convertSchema(normalized, ctx2);
 }
 
-// src/connectors.ts
-var DISALLOWED_BUILTIN_TOOLS = [
-  "Read",
-  "Write",
-  "Edit",
-  "MultiEdit",
-  "Glob",
-  "Grep",
-  "Bash",
-  "Agent",
-  "Task",
-  "NotebookEdit",
-  "EnterWorktree",
-  "ExitWorktree",
-  "CronList",
-  "CronCreate",
-  "CronDelete",
-  "TeamCreate",
-  "TeamDelete",
-  "TaskOutput",
-  "TaskStop",
-  "SendMessage",
-  "Skill",
-  "TodoRead",
-  "TodoWrite",
-  "ListMcpResources",
-  "ReadMcpResource",
-  "WebFetch",
-  "WebSearch",
-  "AskUserQuestion",
-  "EnterPlanMode",
-  "ExitPlanMode",
-  "ToolSearch",
-  "ScheduleWakeup"
-];
-var CLAUDE_BRIDGE_TOOL_ISOLATION = {
-  tools: [],
-  disallowedTools: DISALLOWED_BUILTIN_TOOLS,
-  allowedTools: [`mcp__${MCP_SERVER_NAME}__*`]
-};
-function connectorsEnabledFromEnv() {
-  const v2 = (process.env.CLAUDE_BRIDGE_ENABLE_CONNECTORS ?? "").trim().toLowerCase();
-  return v2 === "1" || v2 === "true" || v2 === "yes" || v2 === "on";
-}
-function connectorsEnabledFor(config2) {
-  return connectorsEnabledFromEnv() || config2?.provider?.enableConnectors === true;
-}
-var CLAUDE_AI_CONNECTOR_TOOL_PATTERNS = [
-  "mcp__claude_ai_Gmail__*",
-  "mcp__claude_ai_Google_Calendar__*",
-  "mcp__claude_ai_Google_Drive__*",
-  "mcp__claude_ai_Slack__*",
-  "mcp__claude_ai_Atlassian__*"
-];
-var CONNECTOR_DISCOVERY_TOOLS = ["ToolSearch", "ListMcpResources", "ReadMcpResource"];
-var CONNECTOR_NS_PREFIX2 = "mcp__claude_ai_";
-var CONNECTOR_NS_GMAIL = `${CONNECTOR_NS_PREFIX2}Gmail__`;
-var CONNECTOR_NS_CALENDAR = `${CONNECTOR_NS_PREFIX2}Google_Calendar__`;
-var CONNECTOR_NS_DRIVE = `${CONNECTOR_NS_PREFIX2}Google_Drive__`;
-var CONNECTOR_NS_SLACK = `${CONNECTOR_NS_PREFIX2}Slack__`;
-var CONNECTOR_NS_ATLASSIAN = `${CONNECTOR_NS_PREFIX2}Atlassian__`;
-var CONNECTOR_READ_VERBS = /* @__PURE__ */ new Set([
-  "list",
-  "search",
-  "get",
-  "read",
-  "fetch",
-  "find",
-  "download",
-  "describe",
-  "query",
-  "count",
-  "view",
-  "lookup",
-  "whoami"
-]);
-var CONNECTOR_MUTATION_WORDS = /* @__PURE__ */ new Set([
-  "create",
-  "update",
-  "delete",
-  "remove",
-  "add",
-  "edit",
-  "send",
-  "post",
-  "write",
-  "upload",
-  "publish",
-  "schedule",
-  "transition",
-  "archive",
-  "move",
-  "copy",
-  "revoke",
-  "assign",
-  "invite",
-  "share",
-  "rename",
-  "replace",
-  "set",
-  "merge",
-  "resolve",
-  "lock",
-  "unlock",
-  "acknowledge",
-  "ack",
-  "book",
-  "start",
-  "stop",
-  "terminate",
-  "restart",
-  "join",
-  "leave",
-  "star",
-  "unstar",
-  "forward",
-  "sync",
-  "approve",
-  "reject",
-  "close",
-  "reopen",
-  "cancel",
-  "enable",
-  "disable",
-  "grant",
-  "trigger",
-  "execute",
-  "apply",
-  "submit",
-  "pin",
-  "unpin",
-  "mute",
-  "unmute",
-  "subscribe",
-  "unsubscribe",
-  "follow",
-  "unfollow",
-  "clear",
-  "purge",
-  "reset",
-  "rotate",
-  "deploy",
-  "install",
-  "uninstall",
-  "save",
-  "store",
-  "put",
-  "patch",
-  "insert",
-  "append",
-  "prepend",
-  "duplicate",
-  "restore",
-  "revert",
-  "import",
-  "export",
-  "upsert",
-  "sign",
-  "complete",
-  "claim",
-  "release",
-  "promote",
-  "demote",
-  "escalate",
-  "resend",
-  "retry",
-  "react",
-  "vote"
-]);
-function connectorNameWords(segment) {
-  return segment.replace(/([a-z0-9])([A-Z])/g, "$1 $2").replace(/([A-Z]+)([A-Z][a-z])/g, "$1 $2").split(/[^A-Za-z0-9]+/).filter(Boolean).map((word) => word.toLowerCase());
+// node_modules/zod/v4/classic/coerce.js
+var coerce_exports = {};
+__export(coerce_exports, {
+  bigint: () => bigint3,
+  boolean: () => boolean3,
+  date: () => date4,
+  number: () => number3,
+  string: () => string3
+});
+function string3(params) {
+  return _coercedString(ZodString, params);
 }
-var CONNECTOR_WRITE_TOOLS = [
-  `${CONNECTOR_NS_GMAIL}create_draft`,
-  `${CONNECTOR_NS_GMAIL}create_label`,
-  `${CONNECTOR_NS_GMAIL}label_message`,
-  `${CONNECTOR_NS_GMAIL}label_thread`,
-  `${CONNECTOR_NS_GMAIL}unlabel_message`,
-  `${CONNECTOR_NS_GMAIL}unlabel_thread`,
-  `${CONNECTOR_NS_GMAIL}apply_sensitive_label`,
-  `${CONNECTOR_NS_GMAIL}remove_sensitive_label`,
-  `${CONNECTOR_NS_CALENDAR}create_event`,
-  `${CONNECTOR_NS_CALENDAR}update_event`,
-  `${CONNECTOR_NS_CALENDAR}delete_event`,
-  `${CONNECTOR_NS_CALENDAR}respond_to_event`,
-  `${CONNECTOR_NS_DRIVE}create_file`,
-  `${CONNECTOR_NS_DRIVE}copy_file`,
-  // Slack + Atlassian writes, taken from a live enumeration of an account with
-  // both connectors attached. The PreToolUse hook already denies these by verb;
-  // listing them by id also removes them from the model's context in a
-  // read-only session (the CLI matcher needs exact ids). Additive only — an id
-  // missing here is still denied at call time.
-  `${CONNECTOR_NS_SLACK}slack_send_message`,
-  `${CONNECTOR_NS_SLACK}slack_send_message_draft`,
-  `${CONNECTOR_NS_SLACK}slack_schedule_message`,
-  `${CONNECTOR_NS_SLACK}slack_create_canvas`,
-  `${CONNECTOR_NS_SLACK}slack_update_canvas`,
-  `${CONNECTOR_NS_ATLASSIAN}createJiraIssue`,
-  `${CONNECTOR_NS_ATLASSIAN}editJiraIssue`,
-  `${CONNECTOR_NS_ATLASSIAN}transitionJiraIssue`,
-  `${CONNECTOR_NS_ATLASSIAN}addCommentToJiraIssue`,
-  `${CONNECTOR_NS_ATLASSIAN}addWorklogToJiraIssue`,
-  `${CONNECTOR_NS_ATLASSIAN}createIssueLink`,
-  `${CONNECTOR_NS_ATLASSIAN}createConfluencePage`,
-  `${CONNECTOR_NS_ATLASSIAN}updateConfluencePage`,
-  `${CONNECTOR_NS_ATLASSIAN}createConfluenceFooterComment`,
-  `${CONNECTOR_NS_ATLASSIAN}createConfluenceInlineComment`,
-  `${CONNECTOR_NS_ATLASSIAN}createCompassComponent`,
-  `${CONNECTOR_NS_ATLASSIAN}createCompassComponentRelationship`,
-  `${CONNECTOR_NS_ATLASSIAN}createCompassCustomFieldDefinition`
-];
-function isConnectorWriteTool(name) {
-  if (!name.startsWith(CONNECTOR_NS_PREFIX2)) return false;
-  const sep2 = name.indexOf("__", CONNECTOR_NS_PREFIX2.length);
-  if (sep2 <= CONNECTOR_NS_PREFIX2.length) return true;
-  const server = name.slice(CONNECTOR_NS_PREFIX2.length, sep2);
-  const words = connectorNameWords(name.slice(sep2 + "__".length));
-  const serverWords = connectorNameWords(server);
-  let skipped = 0;
-  while (skipped < serverWords.length && words[skipped] === serverWords[skipped] && !CONNECTOR_MUTATION_WORDS.has(words[skipped])) skipped++;
-  const rest = words.slice(skipped);
-  if (rest.length === 0) return true;
-  if (!CONNECTOR_READ_VERBS.has(rest[0])) return true;
-  return rest.some((word) => CONNECTOR_MUTATION_WORDS.has(word));
+function number3(params) {
+  return _coercedNumber(ZodNumber, params);
 }
-function connectorWriteModeFromEnv() {
-  const v2 = (process.env.CLAUDE_BRIDGE_CONNECTOR_WRITE ?? "").trim().toLowerCase();
-  if (v2 === "allow") return "allow";
-  if (v2 === "deny") return "deny";
-  return void 0;
+function boolean3(params) {
+  return _coercedBoolean(ZodBoolean, params);
 }
-function connectorWriteModeFor(config2) {
-  const resolved = connectorWriteModeFromEnv() ?? normalizeConnectorWriteMode(config2?.provider?.connectorWriteMode);
-  return resolved === "allow" ? "allow" : "deny";
+function bigint3(params) {
+  return _coercedBigint(ZodBigInt, params);
 }
-function connectorWriteDenyHook() {
-  return async (input) => {
+function date4(params) {
+  return _coercedDate(ZodDate, params);
+}
+
+// node_modules/zod/v4/classic/external.js
+config(en_default());
+
+// src/typebox-to-zod.ts
+function jsonSchemaPropertyToZod(prop) {
+  let base;
+  if (Array.isArray(prop.enum) && prop.enum.length > 0) base = external_exports.enum(prop.enum);
+  else switch (prop.type) {
+    case "string":
+      base = external_exports.string();
+      break;
+    case "number":
+    case "integer":
+      base = external_exports.number();
+      break;
+    case "boolean":
+      base = external_exports.boolean();
+      break;
+    case "array": {
+      base = prop.items ? external_exports.array(jsonSchemaPropertyToZod(prop.items)) : external_exports.array(external_exports.unknown());
+      const minItems = typeof prop.minItems === "number" ? prop.minItems : void 0;
+      if (minItems !== void 0) base = base.min(minItems);
+      break;
+    }
+    case "object": {
+      if (prop.properties && typeof prop.properties === "object" && !Array.isArray(prop.properties)) {
+        const obj = external_exports.object(jsonSchemaToZodShape(prop));
+        base = prop.additionalProperties === false ? obj.strict() : obj.passthrough();
+      } else {
+        base = external_exports.record(external_exports.string(), external_exports.unknown());
+      }
+      break;
+    }
+    default:
+      base = external_exports.unknown();
+  }
+  if (typeof prop.description === "string") base = base.describe(prop.description);
+  return base;
+}
+function jsonSchemaToZodShape(schema) {
+  const s = schema;
+  if (!s || s.type !== "object" || !s.properties) return {};
+  const props = s.properties;
+  const required2 = new Set(Array.isArray(s.required) ? s.required : []);
+  const shape = {};
+  for (const [key, prop] of Object.entries(props)) {
+    const zodProp = jsonSchemaPropertyToZod(prop);
+    shape[key] = required2.has(key) ? zodProp : zodProp.optional();
+  }
+  return shape;
+}
+
+// src/index.ts
+import { readFileSync as nodeReadFileSync } from "node:fs";
+
+// src/pi-ai-compat.ts
+var dynamicImport = (specifier) => import(specifier);
+async function resolveGetModels(root, loadCompat = () => dynamicImport("@earendil-works/pi-ai/compat")) {
+  if (typeof root?.getModels === "function") return root.getModels;
+  const compat = await loadCompat();
+  if (typeof compat?.getModels !== "function") throw new Error("pi-ai getModels API is unavailable");
+  return compat.getModels;
+}
+
+// src/connector-cache.ts
+import { createHash } from "node:crypto";
+import { mkdirSync as mkdirSync3, readFileSync as readFileSync6, writeFileSync } from "node:fs";
+import { dirname as dirname5, join as join7 } from "node:path";
+var CACHE_VERSION = 1;
+var MAX_AGE_MS = 7 * 24 * 60 * 60 * 1e3;
+function connectorCacheScopeKey(env = process.env) {
+  return env.CLAUDE_CONFIG_DIR?.trim() || "<default>";
+}
+function connectorCachePath(scopeKey = connectorCacheScopeKey()) {
+  const digest = createHash("sha256").update(scopeKey).digest("hex").slice(0, 16);
+  return join7(piUserDir(), "connector-cache", `${digest}.json`);
+}
+function readCachedConnectors(scopeKey = connectorCacheScopeKey(), now = Date.now()) {
+  let raw;
+  try {
+    raw = readFileSync6(connectorCachePath(scopeKey), "utf8");
+  } catch {
+    return void 0;
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch {
+    return void 0;
+  }
+  if (parsed?.version !== CACHE_VERSION) return void 0;
+  if (parsed?.scope !== scopeKey) return void 0;
+  const savedAt = typeof parsed?.savedAt === "number" ? parsed.savedAt : 0;
+  if (!savedAt || now - savedAt > MAX_AGE_MS || savedAt > now) return void 0;
+  if (!Array.isArray(parsed?.connectors)) return void 0;
+  const connectors = parsed.connectors.filter(
+    (entry) => entry && typeof entry.name === "string" && entry.name.trim()
+  );
+  return connectors.length > 0 ? connectors : void 0;
+}
+function writeCachedConnectors(connectors, scopeKey = connectorCacheScopeKey(), now = Date.now()) {
+  if (!Array.isArray(connectors) || connectors.length === 0) return false;
+  const path = connectorCachePath(scopeKey);
+  try {
+    mkdirSync3(dirname5(path), { recursive: true, mode: 448 });
+    writeFileSync(
+      path,
+      JSON.stringify({ version: CACHE_VERSION, scope: scopeKey, savedAt: now, connectors }),
+      { mode: 384 }
+    );
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+// src/claude-executable.ts
+import { spawn as spawnProcess } from "child_process";
+import { accessSync, constants as fsConstants, readFileSync as readFileSync7, realpathSync as realpathSync2, statSync as statSync2 } from "fs";
+import { delimiter, join as join8 } from "path";
+function executableFromPath(name) {
+  const paths = (process.env.PATH ?? "").split(delimiter).filter(Boolean);
+  for (const dir of paths) {
+    const candidate = join8(dir, name);
     try {
-      if (input.hook_event_name !== "PreToolUse") return { continue: true };
-      if (!isConnectorWriteTool(input.tool_name)) return { continue: true };
-      return connectorWriteDenyOutput(String(input.tool_name));
+      accessSync(candidate, fsConstants.X_OK);
+      return candidate;
     } catch {
-      const toolName = typeof input?.tool_name === "string" ? input.tool_name : "<unknown>";
-      return connectorWriteDenyOutput(toolName);
     }
-  };
+  }
+  return void 0;
 }
-function connectorWriteDenyOutput(toolName) {
-  return {
-    hookSpecificOutput: {
-      hookEventName: "PreToolUse",
-      permissionDecision: "deny",
-      permissionDecisionReason: `Connector write tool "${toolName}" is blocked in read-only connector mode. Connector writes must go through Memsira's gated approval flow.`
+function resolveClaudeExecutable(configured) {
+  const trimmed = configured?.trim();
+  if (trimmed) return trimmed;
+  if (isolatedFromEnv()) return void 0;
+  return executableFromPath("claude") ?? executableFromPath("claude-code");
+}
+function errnoValue(err) {
+  return typeof err?.errno === "number" ? err.errno : void 0;
+}
+function syscallValue(err) {
+  return typeof err?.syscall === "string" ? err.syscall : void 0;
+}
+function pathValue(err) {
+  const value = err?.path;
+  return typeof value === "string" ? value : void 0;
+}
+function codeValue(err, fallback) {
+  const value = err?.code;
+  return typeof value === "string" ? value : fallback;
+}
+function displayValue(value) {
+  return value === void 0 || value === null || value === "" ? "<none>" : String(value);
+}
+function makeClaudePreflightError(summary, details) {
+  const detail = [
+    `code=${details.code}`,
+    `errno=${displayValue(details.errno)}`,
+    `syscall=${displayValue(details.syscall)}`,
+    `path=${details.path}`,
+    `cwd=${details.cwd}`,
+    ...details.fileType ? [`fileType=${details.fileType}`] : [],
+    ...details.realPath ? [`realPath=${details.realPath}`] : []
+  ].join(" ");
+  const error51 = new Error(`${summary} (${detail})`);
+  error51.name = "ClaudeExecutablePreflightError";
+  error51.code = details.code;
+  if (details.errno !== void 0) error51.errno = typeof details.errno === "number" ? details.errno : Number(details.errno);
+  if (details.syscall) error51.syscall = details.syscall;
+  error51.path = details.path;
+  error51.cwd = details.cwd;
+  if (details.fileType) error51.fileType = details.fileType;
+  if (details.realPath) error51.realPath = details.realPath;
+  if (details.cause !== void 0) error51.cause = details.cause;
+  return error51;
+}
+function classifyClaudeExecutableBytes(bytes) {
+  if (bytes.length === 0) return "empty";
+  if (bytes.length >= 2 && bytes[0] === 35 && bytes[1] === 33) return "shebang-script";
+  if (bytes.length >= 4 && bytes[0] === 127 && bytes[1] === 69 && bytes[2] === 76 && bytes[3] === 70) return "elf";
+  if (bytes.length >= 2 && bytes[0] === 77 && bytes[1] === 90) return "pe";
+  if (bytes.length >= 4) {
+    const magic = bytes[0] * 16777216 + bytes[1] * 65536 + bytes[2] * 256 + bytes[3];
+    if (magic === 4277009102 || magic === 4277009103 || magic === 3472551422 || magic === 3489328638 || magic === 3405691582 || magic === 3199925962) return "mach-o";
+  }
+  return "unknown";
+}
+function preflightClaudeExecutable(path, cwd) {
+  let realCwd;
+  try {
+    const cwdStat = statSync2(cwd);
+    if (!cwdStat.isDirectory()) {
+      throw makeClaudePreflightError("Claude Code spawn cwd preflight failed: cwd is not a directory.", {
+        code: "ENOTDIR",
+        syscall: "chdir",
+        path: cwd,
+        cwd
+      });
     }
-  };
+    accessSync(cwd, fsConstants.X_OK);
+    realCwd = realpathSync2(cwd);
+  } catch (err) {
+    if (err.name === "ClaudeExecutablePreflightError") throw err;
+    throw makeClaudePreflightError("Claude Code spawn cwd preflight failed: cwd is not reachable before spawning Claude Code.", {
+      code: codeValue(err, "EACCES"),
+      errno: errnoValue(err),
+      syscall: syscallValue(err),
+      path: pathValue(err) ?? cwd,
+      cwd,
+      cause: err
+    });
+  }
+  let realPath;
+  try {
+    const stat = statSync2(path);
+    if (!stat.isFile()) {
+      throw makeClaudePreflightError("Claude Code executable preflight failed: resolved path is not a file.", {
+        code: "EACCES",
+        syscall: "exec",
+        path,
+        cwd
+      });
+    }
+    accessSync(path, fsConstants.X_OK);
+    realPath = realpathSync2(path);
+  } catch (err) {
+    if (err.name === "ClaudeExecutablePreflightError") throw err;
+    throw makeClaudePreflightError("Claude Code executable preflight failed: cannot access resolved executable before spawning Claude Code.", {
+      code: codeValue(err, "ENOENT"),
+      errno: errnoValue(err),
+      syscall: syscallValue(err),
+      path: pathValue(err) ?? path,
+      cwd,
+      cause: err
+    });
+  }
+  let fileType;
+  try {
+    fileType = classifyClaudeExecutableBytes(readFileSync7(realPath).subarray(0, 16));
+  } catch (err) {
+    throw makeClaudePreflightError("Claude Code executable preflight failed: cannot read executable header before spawning Claude Code.", {
+      code: codeValue(err, "EACCES"),
+      errno: errnoValue(err),
+      syscall: syscallValue(err),
+      path: pathValue(err) ?? realPath,
+      cwd,
+      realPath,
+      cause: err
+    });
+  }
+  if (!["elf", "mach-o", "pe", "shebang-script"].includes(fileType)) {
+    throw makeClaudePreflightError("Claude Code executable preflight failed: executable header is not an ELF, Mach-O, PE, or shebang script.", {
+      code: "ENOEXEC",
+      syscall: "exec",
+      path,
+      cwd,
+      fileType,
+      realPath
+    });
+  }
+  return { path, realPath, cwd, realCwd, fileType };
 }
-function connectorQueryOptions(connectorsEnabled, writeMode = "deny") {
-  const isolation = toolIsolationForQuery(connectorsEnabled, writeMode);
-  if (!connectorsEnabled || writeMode === "allow") return isolation;
-  return { ...isolation, hooks: { PreToolUse: [{ hooks: [connectorWriteDenyHook()] }] } };
+function envFlagEnabled(value) {
+  return value === "1" || value?.toLowerCase() === "true";
 }
-function toolIsolationForQuery(connectorsEnabled, writeMode = "deny") {
-  if (!connectorsEnabled) return CLAUDE_BRIDGE_TOOL_ISOLATION;
-  const disallowedTools = DISALLOWED_BUILTIN_TOOLS.filter((t) => !CONNECTOR_DISCOVERY_TOOLS.includes(t));
-  if (writeMode !== "allow") disallowedTools.push(...CONNECTOR_WRITE_TOOLS);
+function wrapClaudeSpawnErrorForSdk(err, options) {
+  const originalCode = codeValue(err, "SPAWN_ERROR");
+  const originalMessage = err.message;
+  const spawnPath = pathValue(err) ?? options.command;
+  const cwd = options.cwd ?? process.cwd();
+  const detail = [
+    `code=${originalCode}`,
+    `errno=${displayValue(errnoValue(err))}`,
+    `syscall=${displayValue(syscallValue(err))}`,
+    `path=${spawnPath}`,
+    `cwd=${cwd}`,
+    `command=${options.command}`
+  ].join(" ");
+  const wrapped = new Error(`Claude Code spawn failed: ${originalMessage} (${detail})`);
+  wrapped.name = "ClaudeSpawnDiagnosticError";
+  wrapped.code = originalCode === "ENOENT" ? "CLAUDE_BRIDGE_SPAWN_FAILED" : originalCode;
+  wrapped.originalCode = originalCode;
+  wrapped.originalMessage = originalMessage;
+  const errno = errnoValue(err);
+  if (errno !== void 0) wrapped.errno = typeof errno === "number" ? errno : Number(errno);
+  const syscall = syscallValue(err);
+  if (syscall) wrapped.syscall = syscall;
+  wrapped.path = spawnPath;
+  wrapped.cwd = cwd;
+  return wrapped;
+}
+function spawnClaudeCodeWithDiagnostics(options) {
+  const pipeStderr = DEBUG || envFlagEnabled(options.env.DEBUG_CLAUDE_AGENT_SDK);
+  const child = spawnProcess(options.command, options.args, {
+    cwd: options.cwd,
+    env: options.env,
+    signal: options.signal,
+    stdio: ["pipe", "pipe", pipeStderr ? "pipe" : "ignore"],
+    windowsHide: true
+  });
+  if (pipeStderr) {
+    child.stderr?.on("data", (data) => {
+      for (const line of data.toString().split(/\r?\n/)) {
+        if (line) debug(`[cli-stderr spawn] ${line}`);
+      }
+    });
+  }
+  child.prependListener("error", (err) => {
+    const originalStack = err.stack;
+    const wrapped = wrapClaudeSpawnErrorForSdk(err, options);
+    Object.assign(err, wrapped);
+    err.name = wrapped.name;
+    err.message = wrapped.message;
+    if (originalStack) err.stack = originalStack;
+  });
   return {
-    disallowedTools,
-    allowedTools: [...CLAUDE_BRIDGE_TOOL_ISOLATION.allowedTools, ...CLAUDE_AI_CONNECTOR_TOOL_PATTERNS]
+    stdin: child.stdin,
+    stdout: child.stdout,
+    get killed() {
+      return child.killed;
+    },
+    get exitCode() {
+      return child.exitCode;
+    },
+    kill: child.kill.bind(child),
+    on: child.on.bind(child),
+    once: child.once.bind(child),
+    off: child.off.bind(child)
   };
 }
 
 // node_modules/cc-session-io/dist/chunk-D6EZBJOC.js
 import { randomUUID } from "crypto";
-import { mkdirSync as mkdirSync3, writeFileSync, appendFileSync as appendFileSync3, existsSync as existsSync6, rmSync as rmSync2 } from "fs";
-import { dirname as dirname5 } from "path";
-import { readFileSync as readFileSync7 } from "fs";
+import { mkdirSync as mkdirSync4, writeFileSync as writeFileSync2, appendFileSync as appendFileSync3, existsSync as existsSync6, rmSync as rmSync2 } from "fs";
+import { dirname as dirname6 } from "path";
+import { readFileSync as readFileSync8 } from "fs";
 import { realpathSync as realpathSync3 } from "fs";
 import { homedir as homedir3 } from "os";
-import { join as join8 } from "path";
+import { join as join9 } from "path";
 function parseJsonl(content) {
   return content.split("\n").filter((line) => line.trim()).map(parseRecord);
 }
 function parseJsonlFile(path) {
-  return parseJsonl(readFileSync7(path, "utf-8"));
+  return parseJsonl(readFileSync8(path, "utf-8"));
 }
 function parseRecord(line) {
   const raw = JSON.parse(line);
@@ -43290,7 +43687,7 @@ function serializeRecord(record2) {
 }
 var MAX_SANITIZED_LENGTH = 200;
 function getClaudeDir(claudeDir) {
-  return claudeDir ?? process.env.CLAUDE_CONFIG_DIR ?? join8(homedir3(), ".claude");
+  return claudeDir ?? process.env.CLAUDE_CONFIG_DIR ?? join9(homedir3(), ".claude");
 }
 function normalizeProjectPath(projectPath) {
   try {
@@ -43308,10 +43705,10 @@ function projectPathToHash(projectPath) {
   return `${sanitized.slice(0, MAX_SANITIZED_LENGTH)}-${Math.abs(h).toString(36)}`;
 }
 function getProjectDir(projectPath, claudeDir) {
-  return join8(getClaudeDir(claudeDir), "projects", projectPathToHash(normalizeProjectPath(projectPath)));
+  return join9(getClaudeDir(claudeDir), "projects", projectPathToHash(normalizeProjectPath(projectPath)));
 }
 function getSessionPath(sessionId, projectPath, claudeDir) {
-  return join8(getProjectDir(projectPath, claudeDir), `${sessionId}.jsonl`);
+  return join9(getProjectDir(projectPath, claudeDir), `${sessionId}.jsonl`);
 }
 function repairToolPairing(messages) {
   const result = [];
@@ -43646,15 +44043,15 @@ var Session = class {
   /** Write pending records to disk. Creates the file/directory if needed. */
   save() {
     if (this._pendingRecords.length === 0) return;
-    const dir = dirname5(this.jsonlPath);
+    const dir = dirname6(this.jsonlPath);
     if (!existsSync6(dir)) {
-      mkdirSync3(dir, { recursive: true });
+      mkdirSync4(dir, { recursive: true });
     }
     const data = this._pendingRecords.map((r) => serializeRecord(r) + "\n").join("");
     if (this._fileExists) {
       appendFileSync3(this.jsonlPath, data, "utf-8");
     } else {
-      writeFileSync(this.jsonlPath, data, "utf-8");
+      writeFileSync2(this.jsonlPath, data, "utf-8");
       this._fileExists = true;
     }
     this._records.push(...this._pendingRecords);
@@ -43709,7 +44106,7 @@ function readSession(jsonlPath, projectPath) {
 }
 
 // src/session-persistence.ts
-import { createHash } from "crypto";
+import { createHash as createHash2 } from "crypto";
 import { realpathSync as realpathSync4, statSync as statSync4 } from "fs";
 import { resolve as pathResolve } from "path";
 
@@ -43800,7 +44197,7 @@ function fingerprintMessages(messages) {
     }
     return message;
   });
-  return createHash("sha256").update(JSON.stringify(normalized)).digest("hex");
+  return createHash2("sha256").update(JSON.stringify(normalized)).digest("hex");
 }
 function readBuiltSessionContext(sessionManager) {
   const built = typeof sessionManager?.buildSessionContext === "function" ? sessionManager.buildSessionContext() : void 0;
@@ -43909,6 +44306,7 @@ function convertAndImportMessages(session, messages, customToolNameToSdk, cwd) {
     );
   }
   const missingToolResults = findUnpairedToolUses(anthropicMessages);
+  if (missingToolResults.length > 0) insertLostToolResultPlaceholders(anthropicMessages, missingToolResults);
   const repaired = repairToolPairing(anthropicMessages);
   if (missingToolResults.length > 0) {
     reportSyntheticToolResultRepair(missingToolResults, {
@@ -44097,18 +44495,22 @@ function createStreamIdleWatchdog({
 // src/rate-limit.ts
 var RATE_LIMIT_AUTO_RESUME_EVENT = "vstack:rate-limit";
 var RATE_LIMIT_TOKEN = "\x1B[31m[rate-limit]\x1B[39m";
-function isExtraUsageRequiredMessage(value) {
-  let text;
-  if (typeof value === "string") text = value;
-  else if (value instanceof Error) text = value.message;
-  else {
-    try {
-      text = JSON.stringify(value ?? "");
-    } catch {
-      text = String(value);
-    }
+var USAGE_LIMIT_PREFIXES = Array.isArray(qO) ? qO : [];
+function coerceMessageText(value) {
+  if (typeof value === "string") return value;
+  if (value instanceof Error) return value.message;
+  try {
+    return JSON.stringify(value ?? "");
+  } catch {
+    return String(value);
   }
-  return /extra[-\s]?usage|overage|extra usage billing|extra usage credits|1M context/i.test(text);
+}
+function isExtraUsageRequiredMessage(value) {
+  return /extra[-\s]?usage|overage|extra usage billing|extra usage credits|1M context/i.test(coerceMessageText(value));
+}
+function isUsageLimitMessage(value) {
+  const text = coerceMessageText(value);
+  return USAGE_LIMIT_PREFIXES.some((prefix) => text.includes(prefix));
 }
 function uniqueNonEmptyLines(values) {
   const seen = /* @__PURE__ */ new Set();
@@ -44121,9 +44523,15 @@ function uniqueNonEmptyLines(values) {
   }
   return out;
 }
+function resetTimestampMs(value) {
+  let parsed = typeof value === "number" ? value : typeof value === "string" ? Date.parse(value) : Number.NaN;
+  if (!Number.isFinite(parsed)) return void 0;
+  if (typeof value === "number" && Math.abs(parsed) < 1e12) parsed *= 1e3;
+  return parsed;
+}
 function formatResetTimestamp(value) {
-  const parsed = typeof value === "number" ? value : typeof value === "string" ? Date.parse(value) : Number.NaN;
-  if (!Number.isFinite(parsed)) return "unknown";
+  const parsed = resetTimestampMs(value);
+  if (parsed === void 0) return "unknown";
   return new Date(parsed).toLocaleString(void 0, {
     day: "numeric",
     hour: "numeric",
@@ -44200,10 +44608,17 @@ function mapToolArgs(toolName, args) {
 // src/assistant-stream.ts
 import { calculateCost } from "@earendil-works/pi-ai";
 function updateUsage(output, usage, model) {
-  if (usage.input_tokens != null) output.usage.input = usage.input_tokens;
-  if (usage.output_tokens != null) output.usage.output = usage.output_tokens;
-  if (usage.cache_read_input_tokens != null) output.usage.cacheRead = usage.cache_read_input_tokens;
-  if (usage.cache_creation_input_tokens != null) output.usage.cacheWrite = usage.cache_creation_input_tokens;
+  const c = ctx();
+  const current = c.currentMessageUsage;
+  const carry = c.turnUsageCarry;
+  if (usage.input_tokens != null) current.input = usage.input_tokens;
+  if (usage.output_tokens != null) current.output = usage.output_tokens;
+  if (usage.cache_read_input_tokens != null) current.cacheRead = usage.cache_read_input_tokens;
+  if (usage.cache_creation_input_tokens != null) current.cacheWrite = usage.cache_creation_input_tokens;
+  output.usage.input = carry.input + current.input;
+  output.usage.output = carry.output + current.output;
+  output.usage.cacheRead = carry.cacheRead + current.cacheRead;
+  output.usage.cacheWrite = carry.cacheWrite + current.cacheWrite;
   output.usage.totalTokens = output.usage.input + output.usage.output + output.usage.cacheRead + output.usage.cacheWrite;
   calculateCost(model, output.usage);
   const promptTokens = output.usage.input + output.usage.cacheRead + output.usage.cacheWrite;
@@ -44229,20 +44644,60 @@ function parsePartialJson(input, fallback) {
     return fallback;
   }
 }
-function ensureTurnStarted() {
-  if (!ctx().turnStarted && ctx().currentPiStream && ctx().turnOutput) {
-    ctx().currentPiStream.push({ type: "start", partial: ctx().turnOutput });
-    ctx().turnStarted = true;
+function ensureTurnStarted(c = ctx()) {
+  if (!c.turnStarted && c.currentPiStream && c.turnOutput) {
+    c.currentPiStream.push({ type: "start", partial: c.turnOutput });
+    c.turnStarted = true;
   }
 }
-function finalizeCurrentStream(stopReason) {
-  if (!ctx().currentPiStream || !ctx().turnOutput) return;
-  debug(`provider: finalizeCurrentStream called, stopReason=${stopReason}, turnOutput=${JSON.stringify({ stopReason: ctx().turnOutput.stopReason, error: ctx().turnOutput.errorMessage })}`);
-  if (!ctx().turnStarted) ensureTurnStarted();
+function finalizeCurrentStream(stopReason, c = ctx()) {
+  if (!c.currentPiStream || !c.turnOutput) return;
+  debug(`provider: finalizeCurrentStream called, stopReason=${stopReason}, turnOutput=${JSON.stringify({ stopReason: c.turnOutput.stopReason, error: c.turnOutput.errorMessage })}`);
+  if (!c.turnStarted) ensureTurnStarted(c);
   const reason = stopReason === "length" ? "length" : "stop";
-  ctx().currentPiStream.push({ type: "done", reason, message: ctx().turnOutput });
-  ctx().currentPiStream.end();
-  ctx().currentPiStream = null;
+  c.currentPiStream.push({ type: "done", reason, message: c.turnOutput });
+  c.currentPiStream.end();
+  c.currentPiStream = null;
+}
+var TOOL_USE_END_GRACE_MS = 1500;
+function endToolUseTurn(c) {
+  if (!c.currentPiStream || !c.turnOutput) return;
+  cancelScheduledToolUseEnd(c);
+  c.turnOutput.stopReason = "toolUse";
+  c.currentPiStream.push({ type: "done", reason: "toolUse", message: c.turnOutput });
+  c.currentPiStream.end();
+  c.currentPiStream = null;
+}
+function cancelScheduledToolUseEnd(c) {
+  if (!c.scheduledToolUseEnd) return;
+  clearTimeout(c.scheduledToolUseEnd.timer);
+  c.scheduledToolUseEnd = null;
+}
+function scheduleToolUseTurnEnd(c, action, source) {
+  if (!c.currentPiStream || !c.turnOutput) return;
+  if (c.scheduledToolUseEnd?.stream === c.currentPiStream) return;
+  cancelScheduledToolUseEnd(c);
+  const stream = c.currentPiStream;
+  const timer = setTimeout(() => {
+    if (c.currentPiStream !== stream) return;
+    debug(`scheduleToolUseTurnEnd: no terminal stream event within ${TOOL_USE_END_GRACE_MS}ms (${source}) \u2014 force-ending tool_use turn`);
+    c.scheduledToolUseEnd = null;
+    action();
+  }, TOOL_USE_END_GRACE_MS);
+  timer.unref?.();
+  c.scheduledToolUseEnd = { stream, timer };
+}
+function reapStaleQueuedResults(c) {
+  const stale = c.takeStaleQueuedResults();
+  if (stale.length === 0) return;
+  const names = stale.map((entry) => entry.toolName);
+  debug(`reapStaleQueuedResults: dropping ${stale.length} queued tool result(s) with no possible consumer:`, names.join(", "));
+  diagDump("stale_queued_tool_results_dropped", { count: stale.length, stale });
+  appendIntegrityEntry("stale_queued_tool_results_dropped", { count: stale.length, stale });
+  safeNotify(
+    `Claude bridge: dropped ${stale.length} tool result(s) whose handler never matched (${names.slice(0, 6).join(", ")}${names.length > 6 ? ", \u2026" : ""}). The model saw an error for these calls and may retry them.`,
+    "warning"
+  );
 }
 function updateTurnOutputModel(modelId) {
   const c = ctx();
@@ -44251,6 +44706,29 @@ function updateTurnOutputModel(modelId) {
   debug(`provider: active Claude model changed ${c.turnOutput.model} -> ${modelId}`);
   c.turnOutput.model = modelId;
 }
+function finalizeToolUseTurnFromMcpInvocation(queryCtx, toolCallId, toolName, mappedArgs) {
+  if (!queryCtx.currentPiStream || !queryCtx.turnOutput) return;
+  let idx = queryCtx.turnBlocks.findIndex((b) => b.type === "toolCall" && b.id === toolCallId);
+  if (idx >= 0) {
+    const block = queryCtx.turnBlocks[idx];
+    if ("partialJson" in block) {
+      block.arguments = mapToolArgs(block.name, parsePartialJson(block.partialJson, block.arguments));
+      queryCtx.updateToolCallArgs(block.id, block.arguments);
+      delete block.partialJson;
+      delete block.index;
+      queryCtx.currentPiStream.push({ type: "toolcall_end", contentIndex: idx, toolCall: block, partial: queryCtx.turnOutput });
+    }
+  } else {
+    queryCtx.turnBlocks.push({ type: "toolCall", id: toolCallId, name: toolName, arguments: mappedArgs });
+    idx = queryCtx.turnBlocks.length - 1;
+    const block = queryCtx.turnBlocks[idx];
+    queryCtx.currentPiStream.push({ type: "toolcall_start", contentIndex: idx, partial: queryCtx.turnOutput });
+    queryCtx.currentPiStream.push({ type: "toolcall_end", contentIndex: idx, toolCall: block, partial: queryCtx.turnOutput });
+  }
+  queryCtx.turnSawToolCall = true;
+  debug(`mcp handler: finalizing tool_use turn from MCP invocation [${toolCallId}] (${toolName}) \u2014 terminal stream events never arrived`);
+  endToolUseTurn(queryCtx);
+}
 function processStreamEvent(message, customToolNameToPi, model) {
   const c = ctx();
   if (!c.currentPiStream || !c.turnOutput) return;
@@ -44261,7 +44739,9 @@ function processStreamEvent(message, customToolNameToPi, model) {
     return;
   }
   if (event?.type === "message_start") {
+    reapStaleQueuedResults(c);
     c.resetToolTracking();
+    c.beginChildMessage(event.message?.id);
     updateTurnOutputModel(event.message?.model);
     if (event.message?.usage) updateUsage(c.turnOutput, event.message.usage, model);
     return;
@@ -44269,6 +44749,12 @@ function processStreamEvent(message, customToolNameToPi, model) {
   if (event?.type === "content_block_start") {
     c.turnSawStreamEvent = true;
     ensureTurnStarted();
+    c.childExecutedStreamIndexes.delete(event.index);
+    if (event.content_block?.type === "tool_use" && isChildExecutedTool(event.content_block.name)) {
+      c.noteChildExecutedToolCall(event.content_block.id, event.content_block.name, event.index);
+      debug(`processStreamEvent: child-executed tool ${event.content_block.name} [${event.content_block.id}] \u2014 not mirrored as a Pi tool call`);
+      return;
+    }
     if (event.content_block?.type === "text") {
       c.turnBlocks.push({ type: "text", text: "", index: event.index });
       c.currentPiStream.push({ type: "text_start", contentIndex: c.turnBlocks.length - 1, partial: c.turnOutput });
@@ -44294,6 +44780,10 @@ function processStreamEvent(message, customToolNameToPi, model) {
     return;
   }
   if (event?.type === "content_block_delta") {
+    if (c.childExecutedStreamIndexes.has(event.index)) {
+      c.turnSawStreamEvent = true;
+      return;
+    }
     const index = c.turnBlocks.findIndex((b) => b.index === event.index);
     const block = c.turnBlocks[index];
     if (!block) {
@@ -44319,6 +44809,10 @@ function processStreamEvent(message, customToolNameToPi, model) {
     return;
   }
   if (event?.type === "content_block_stop") {
+    if (c.childExecutedStreamIndexes.has(event.index)) {
+      c.turnSawStreamEvent = true;
+      return;
+    }
     const index = c.turnBlocks.findIndex((b) => b.index === event.index);
     const block = c.turnBlocks[index];
     if (!block) {
@@ -44349,10 +44843,7 @@ function processStreamEvent(message, customToolNameToPi, model) {
     return;
   }
   if (event?.type === "message_stop" && c.turnSawToolCall) {
-    c.turnOutput.stopReason = "toolUse";
-    c.currentPiStream.push({ type: "done", reason: "toolUse", message: c.turnOutput });
-    c.currentPiStream.end();
-    c.currentPiStream = null;
+    endToolUseTurn(c);
     return;
   }
   if (event?.type !== "message_stop" && event?.type !== "ping") {
@@ -44365,6 +44856,11 @@ function appendMissingToolUsesFromAssistant(assistantMsg, model, customToolNameT
   let sawToolUse = false;
   for (const block of assistantMsg.content) {
     if (block.type !== "tool_use") continue;
+    if (isChildExecutedTool(block.name)) {
+      c.noteChildExecutedToolCall(block.id, block.name);
+      debug(`assistant message: child-executed tool ${block.name} [${block.id}] \u2014 not mirrored as a Pi tool call`);
+      continue;
+    }
     sawToolUse = true;
     const existingIdx = c.turnBlocks.findIndex((b) => b.type === "toolCall" && b.id === block.id);
     const name = mapToolName(block.name, customToolNameToPi);
@@ -44394,9 +44890,24 @@ function appendMissingToolUsesFromAssistant(assistantMsg, model, customToolNameT
     c.currentPiStream?.push({ type: "toolcall_start", contentIndex: idx, partial: c.turnOutput });
     c.currentPiStream?.push({ type: "toolcall_end", contentIndex: idx, toolCall: toolBlock, partial: c.turnOutput });
   }
-  if (assistantMsg.usage && c.turnOutput) updateUsage(c.turnOutput, assistantMsg.usage, model);
+  if (assistantMsg.usage && c.turnOutput && c.currentPiStream) updateUsage(c.turnOutput, assistantMsg.usage, model);
   return sawToolUse;
 }
+function noteChildExecutedToolResults(message) {
+  const c = ctx();
+  if (c.childExecutedToolCalls.size === 0) return;
+  const content = message.message?.content;
+  if (!Array.isArray(content)) return;
+  for (const block of content) {
+    if (block?.type !== "tool_result") continue;
+    const name = c.childExecutedToolCalls.get(block.tool_use_id);
+    if (!name) continue;
+    const isError = block.is_error === true;
+    const byteSize = connectorResultByteSize(block.content);
+    const audited = recordConnectorCallResult(c, block.tool_use_id, name, isError, byteSize);
+    debug(`child-executed tool result: ${name} [${block.tool_use_id}] isError=${isError} byteSize=${byteSize ?? "unknown"} audited=${audited}`);
+  }
+}
 function processAssistantMessage(message, model, customToolNameToPi) {
   const c = ctx();
   const assistantMsg = message.message;
@@ -44405,20 +44916,21 @@ function processAssistantMessage(message, model, customToolNameToPi) {
   if (c.turnSawStreamEvent) {
     if (appendMissingToolUsesFromAssistant(assistantMsg, model, customToolNameToPi)) {
       c.turnSawToolCall = true;
-      if (c.currentPiStream && c.turnOutput) {
-        c.turnOutput.stopReason = "toolUse";
-        c.currentPiStream.push({ type: "done", reason: "toolUse", message: c.turnOutput });
-        c.currentPiStream.end();
-        c.currentPiStream = null;
-        debug("processAssistantMessage boundary: ended streamed tool_use turn from assistant message");
-      }
+      scheduleToolUseTurnEnd(c, () => endToolUseTurn(c), "assistant-boundary");
     }
     return;
   }
-  c.resetToolTracking();
-  debug(`processAssistantMessage fallback: ${assistantMsg.content.length} blocks, types=${assistantMsg.content.map((b) => b.type).join(",")}`);
+  const sameMessage = typeof assistantMsg.id === "string" && assistantMsg.id.length > 0 && assistantMsg.id === c.currentMessageId;
+  if (!sameMessage) {
+    reapStaleQueuedResults(c);
+    c.resetToolTracking();
+  }
+  c.beginChildMessage(assistantMsg.id);
+  debug(`processAssistantMessage fallback: ${assistantMsg.content.length} blocks, types=${assistantMsg.content.map((b) => b.type).join(",")}${sameMessage ? " (same message re-yield)" : ""}`);
+  const alreadyRendered = (type, content) => c.turnBlocks.some((b) => b.type === type && (type === "text" ? b.text : b.thinking) === content);
   for (const block of assistantMsg.content) {
     if (block.type === "text" && block.text) {
+      if (alreadyRendered("text", block.text)) continue;
       ensureTurnStarted();
       c.turnBlocks.push({ type: "text", text: block.text });
       const idx = c.turnBlocks.length - 1;
@@ -44426,6 +44938,7 @@ function processAssistantMessage(message, model, customToolNameToPi) {
       c.currentPiStream?.push({ type: "text_delta", contentIndex: idx, delta: block.text, partial: c.turnOutput });
       c.currentPiStream?.push({ type: "text_end", contentIndex: idx, content: block.text, partial: c.turnOutput });
     } else if (block.type === "thinking") {
+      if (alreadyRendered("thinking", block.thinking ?? "")) continue;
       ensureTurnStarted();
       c.turnBlocks.push({ type: "thinking", thinking: block.thinking ?? "", thinkingSignature: block.signature ?? "" });
       const idx = c.turnBlocks.length - 1;
@@ -44433,11 +44946,24 @@ function processAssistantMessage(message, model, customToolNameToPi) {
       if (block.thinking) c.currentPiStream?.push({ type: "thinking_delta", contentIndex: idx, delta: block.thinking, partial: c.turnOutput });
       c.currentPiStream?.push({ type: "thinking_end", contentIndex: idx, content: block.thinking ?? "", partial: c.turnOutput });
     } else if (block.type === "tool_use") {
+      if (isChildExecutedTool(block.name)) {
+        c.noteChildExecutedToolCall(block.id, block.name);
+        debug(`processAssistantMessage fallback: child-executed tool ${block.name} [${block.id}] \u2014 not mirrored as a Pi tool call`);
+        continue;
+      }
       ensureTurnStarted();
       c.turnSawToolCall = true;
       const mappedName = mapToolName(block.name, customToolNameToPi);
       const mappedArgs = mapToolArgs(mappedName, block.input);
       c.recordToolCall(block.id, mappedName, mappedArgs);
+      const existingIdx = c.turnBlocks.findIndex((b) => b.type === "toolCall" && b.id === block.id);
+      if (existingIdx >= 0) {
+        const existing = c.turnBlocks[existingIdx];
+        existing.name = mappedName;
+        existing.arguments = mappedArgs;
+        c.updateToolCallArgs(block.id, mappedArgs);
+        continue;
+      }
       c.turnBlocks.push({
         type: "toolCall",
         id: block.id,
@@ -44456,10 +44982,7 @@ function processAssistantMessage(message, model, customToolNameToPi) {
   }
   if (assistantMsg.usage && c.turnOutput) updateUsage(c.turnOutput, assistantMsg.usage, model);
   if (c.turnSawToolCall && c.currentPiStream && c.turnOutput) {
-    c.turnOutput.stopReason = "toolUse";
-    c.currentPiStream.push({ type: "done", reason: "toolUse", message: c.turnOutput });
-    c.currentPiStream.end();
-    c.currentPiStream = null;
+    endToolUseTurn(c);
   }
 }
 
@@ -44481,6 +45004,27 @@ function emitRateLimitEvent(payload) {
 function extraUsageAllowed(config2) {
   return config2.provider?.allowExtraUsage === true;
 }
+var lastFastModeDisabledNoticeReason = null;
+var FAST_MODE_DISABLED_REASON_TEXT = {
+  disabled_by_env: "disabled by an environment variable",
+  extra_usage_disabled: "extra usage is disabled for this account",
+  free: "not available on the free plan",
+  model_not_allowed: "not available for this model",
+  network_error: "the eligibility check hit a network error",
+  not_first_party: "not available for this account type",
+  preference: "disabled by a Claude Code preference",
+  sdk_opt_in_required: "the SDK opt-in is missing",
+  unknown: "unavailable for an unknown reason"
+};
+function noteFastModeDisabledReason(message, bridgeConfig) {
+  if (bridgeConfig.provider?.fastMode !== true) return;
+  const reason = message.fast_mode_disabled_reason;
+  if (typeof reason !== "string" || reason === "pending") return;
+  if (reason === lastFastModeDisabledNoticeReason) return;
+  lastFastModeDisabledNoticeReason = reason;
+  const text = FAST_MODE_DISABLED_REASON_TEXT[reason] ?? `unavailable (${reason})`;
+  safeNotify(`Claude bridge: fast mode is enabled in settings but Claude Code declined it \u2014 ${text}.`, "warning");
+}
 function sdkTextFromMessage(message) {
   if (message.type === "result") return message.result;
   if (message.type === "assistant") {
@@ -44594,41 +45138,24 @@ function resolveMcpTools(context, excludeToolName) {
   if (!context.tools) return { mcpTools, customToolNameToSdk, customToolNameToPi };
   for (const tool of context.tools) {
     if (tool.name === excludeToolName) continue;
+    if (isChildExecutedTool(tool.name)) {
+      debug(`resolveMcpTools: not re-offering child-native tool ${tool.name}`);
+      continue;
+    }
     const sdkName = `${MCP_TOOL_PREFIX}${tool.name}`;
     mcpTools.push(tool);
+    const lowerName = tool.name.toLowerCase();
+    const collision = customToolNameToSdk.get(lowerName);
+    if (collision !== void 0 && collision !== sdkName) {
+      debug(`WARNING: resolveMcpTools lowercase alias collision: ${tool.name} overwrites mapping previously held by ${collision}`);
+    }
     customToolNameToSdk.set(tool.name, sdkName);
-    customToolNameToSdk.set(tool.name.toLowerCase(), sdkName);
+    customToolNameToSdk.set(lowerName, sdkName);
     customToolNameToPi.set(sdkName, tool.name);
     customToolNameToPi.set(sdkName.toLowerCase(), tool.name);
   }
   return { mcpTools, customToolNameToSdk, customToolNameToPi };
 }
-function finalizeToolUseTurnFromMcpInvocation(queryCtx, toolCallId, toolName, mappedArgs) {
-  if (!queryCtx.currentPiStream || !queryCtx.turnOutput) return;
-  let idx = queryCtx.turnBlocks.findIndex((b) => b.type === "toolCall" && b.id === toolCallId);
-  if (idx >= 0) {
-    const block = queryCtx.turnBlocks[idx];
-    if ("partialJson" in block) {
-      block.arguments = mapToolArgs(block.name, parsePartialJson(block.partialJson, block.arguments));
-      queryCtx.updateToolCallArgs(block.id, block.arguments);
-      delete block.partialJson;
-      delete block.index;
-      queryCtx.currentPiStream.push({ type: "toolcall_end", contentIndex: idx, toolCall: block, partial: queryCtx.turnOutput });
-    }
-  } else {
-    queryCtx.turnBlocks.push({ type: "toolCall", id: toolCallId, name: toolName, arguments: mappedArgs });
-    idx = queryCtx.turnBlocks.length - 1;
-    const block = queryCtx.turnBlocks[idx];
-    queryCtx.currentPiStream.push({ type: "toolcall_start", contentIndex: idx, partial: queryCtx.turnOutput });
-    queryCtx.currentPiStream.push({ type: "toolcall_end", contentIndex: idx, toolCall: block, partial: queryCtx.turnOutput });
-  }
-  queryCtx.turnSawToolCall = true;
-  queryCtx.turnOutput.stopReason = "toolUse";
-  debug(`mcp handler: finalizing tool_use turn from MCP invocation [${toolCallId}] (${toolName}) \u2014 SDK invoked the tool before message_stop/assistant message`);
-  queryCtx.currentPiStream.push({ type: "done", reason: "toolUse", message: queryCtx.turnOutput });
-  queryCtx.currentPiStream.end();
-  queryCtx.currentPiStream = null;
-}
 function buildMcpServers(tools, queryCtx) {
   if (!tools.length) return void 0;
   const mcpTools = tools.map((tool) => ({
@@ -44648,9 +45175,23 @@ function buildMcpServers(tools, queryCtx) {
           turnToolCallIds: queryCtx.turnToolCallIds,
           turnToolCalls: safeToolCallSummary(queryCtx.turnToolCalls)
         });
+        appendIntegrityEntry("tool_handler_unmatched", {
+          toolName: tool.name,
+          argKeys: argKeys(mappedArgs),
+          available: claim.available,
+          turnToolCallIds: queryCtx.turnToolCallIds
+        });
         return { content: [{ type: "text", text: `Claude bridge internal error: no matching tool_call id for ${tool.name}` }], isError: true };
       }
-      if (claim.match !== "tool-args" || claim.ambiguous) {
+      if (claim.argsMismatch) {
+        debug(`mcp handler: ${tool.name} [${toolCallId}] claimed sole same-name call despite args mismatch`);
+        diagDump("tool_claim_args_mismatch", {
+          toolName: tool.name,
+          toolCallId,
+          handlerArgKeys: argKeys(mappedArgs),
+          recordedArgKeys: argKeys(queryCtx.turnToolCalls.find((call) => call.id === toolCallId)?.arguments)
+        });
+      } else if (claim.match !== "tool-args" || claim.ambiguous) {
         debug(`mcp handler: ${tool.name} [${toolCallId}] claimed by ${claim.match}${claim.ambiguous ? " (ambiguous)" : ""}`);
       }
       if (toolCallId && queryCtx.pendingResults.has(toolCallId)) {
@@ -44661,7 +45202,11 @@ function buildMcpServers(tools, queryCtx) {
         return result;
       }
       debug(`mcp handler: ${tool.name} [${toolCallId}] \u2192 waiting`);
-      finalizeToolUseTurnFromMcpInvocation(queryCtx, toolCallId, tool.name, mappedArgs);
+      scheduleToolUseTurnEnd(
+        queryCtx,
+        () => finalizeToolUseTurnFromMcpInvocation(queryCtx, toolCallId, tool.name, mappedArgs),
+        `mcp-invocation:${tool.name}`
+      );
       return new Promise((resolve5) => {
         queryCtx.pendingToolCalls.set(toolCallId, {
           toolName: tool.name,
@@ -44715,20 +45260,26 @@ async function consumeQuery(sdkQuery, customToolNameToPi, model, cwd, bridgeConf
         break;
       case "result":
         if (!ctx().turnSawStreamEvent && message.subtype === "success") {
-          ensureTurnStarted();
           const text = message.result || "";
+          if (ctx().turnBlocks.some((b) => b.type === "text" && b.text === text)) {
+            debug("consumeQuery: result text already rendered by assistant fallback; skipping duplicate");
+            break;
+          }
+          ensureTurnStarted();
           ctx().turnBlocks.push({ type: "text", text });
           const idx = ctx().turnBlocks.length - 1;
           ctx().currentPiStream?.push({ type: "text_start", contentIndex: idx, partial: ctx().turnOutput });
           ctx().currentPiStream?.push({ type: "text_delta", contentIndex: idx, delta: text, partial: ctx().turnOutput });
           ctx().currentPiStream?.push({ type: "text_end", contentIndex: idx, content: text, partial: ctx().turnOutput });
-        } else if (message.subtype !== "success" && isExtraUsageRequiredMessage(message)) {
+        } else if (message.subtype !== "success" && (isExtraUsageRequiredMessage(message) || isUsageLimitMessage(message))) {
           const errorLines = Array.isArray(message.errors) ? uniqueNonEmptyLines(message.errors) : [];
           const errors = errorLines.length > 0 ? errorLines.join("\n") : String(message.subtype ?? "Claude Code rate limit");
-          const openedExtraUsage = launchExtraUsageHelperIfAllowed(cwd, bridgeConfig, "result error");
+          const extraUsage = isExtraUsageRequiredMessage(message);
+          const openedExtraUsage = extraUsage && launchExtraUsageHelperIfAllowed(cwd, bridgeConfig, "result error");
           ctx().handledTerminalError = true;
           ctx().turnOutput.stopReason = "error";
-          ctx().turnOutput.errorMessage = `${errors}${openedExtraUsage ? "\n\nOpened Claude Code /extra-usage helper. Complete billing/admin flow in the browser, then retry the prompt." : "\n\nRun /claude-bridge:extra, or enable Allow extra usage helper in settings."}`;
+          const extraUsageHint = openedExtraUsage ? "\n\nOpened Claude Code /extra-usage helper. Complete billing/admin flow in the browser, then retry the prompt." : extraUsage ? "\n\nRun /claude-bridge:extra, or enable Allow extra usage helper in settings." : "";
+          ctx().turnOutput.errorMessage = `${errors}${extraUsageHint}`;
           ctx().currentPiStream?.push({ type: "error", reason: "error", error: ctx().turnOutput });
           ctx().currentPiStream?.end();
           ctx().currentPiStream = null;
@@ -44737,6 +45288,8 @@ async function consumeQuery(sdkQuery, customToolNameToPi, model, cwd, bridgeConf
       case "system":
         if (message.subtype === "init" && message.session_id) {
           capturedSessionId = message.session_id;
+          queryCtx.childSessionId = capturedSessionId;
+          noteFastModeDisabledReason(message, bridgeConfig);
         } else if (message.subtype === "model_refusal_fallback") {
           const originalModel = message.original_model;
           const fallbackModel = message.fallback_model;
@@ -44751,14 +45304,14 @@ async function consumeQuery(sdkQuery, customToolNameToPi, model, cwd, bridgeConf
         }
         break;
       case "user":
+        noteChildExecutedToolResults(message);
         break;
-      // SDK echo of user prompt — not needed
       case "rate_limit_event": {
         const info = message.rate_limit_info;
         debug("consumeQuery: rate_limit_event", JSON.stringify(info).slice(0, 300));
         if (info?.status === "rejected") {
           const resetsAt = formatResetTimestamp(info.resetsAt);
-          const resetAtMs = typeof info.resetsAt === "string" ? Date.parse(info.resetsAt) : void 0;
+          const resetAtMs = resetTimestampMs(info.resetsAt);
           const reason = `${info.rateLimitType ?? "unknown"} rate limit`;
           const launchedExtraUsage = isExtraUsageRequiredMessage(info) && launchExtraUsageHelperIfAllowed(cwd, bridgeConfig, reason);
           emitRateLimitEvent({
@@ -44803,6 +45356,8 @@ function releaseProviderTokens(event) {
     g[PRIMARY_INSTANCE_KEY] = void 0;
   }
 }
+var nativeProviderInstance;
+var notifiedNativeUnsupported = false;
 function applyProviderRegistration(trigger) {
   const pi = extensionApi;
   if (!pi) {
@@ -44811,32 +45366,28 @@ function applyProviderRegistration(trigger) {
   }
   const g = globalThis;
   const isPrimary = claimPrimaryInstance();
-  const credentialed = hasClaudeCredentials();
-  const registered = g[ACTIVE_STREAM_SIMPLE_KEY] === streamClaudeAgentSdk;
-  const decision = decideRegistration({ credentialed, isPrimary, registered });
-  debug(`${trigger}: registration decision=${decision} credentialed=${credentialed} isPrimary=${isPrimary} registered=${registered} (module=${moduleInstanceId})`);
-  if (decision === "register") {
-    g[ACTIVE_STREAM_SIMPLE_KEY] = streamClaudeAgentSdk;
-    try {
-      pi.registerProvider(PROVIDER_ID, {
-        baseUrl: "claude-bridge",
-        apiKey: "not-used",
-        api: "claude-bridge",
-        models: MODELS,
-        // Cast: pi-ai AssistantMessageEventStream diamond dep between pi-coding-agent and pi-agent-core
-        streamSimple: streamClaudeAgentSdk
-      });
-    } catch (err) {
-      if (g[ACTIVE_STREAM_SIMPLE_KEY] === streamClaudeAgentSdk) g[ACTIVE_STREAM_SIMPLE_KEY] = void 0;
-      debug(`${trigger}: registerProvider threw; released stream guard for retry (kept primary):`, err);
-    }
-  } else if (decision === "unregister") {
-    try {
-      pi.unregisterProvider(PROVIDER_ID);
-    } catch (err) {
-      debug(`${trigger}: unregisterProvider threw (ignored):`, err);
+  if (!isPrimary) {
+    debug(`${trigger}: registration noop \u2014 non-primary instance (module=${moduleInstanceId})`);
+    return;
+  }
+  if (!supportsNativeProvider(_piAi)) {
+    debug(`${trigger}: host pi-ai lacks createProvider; refusing to register (module=${moduleInstanceId})`);
+    if (!notifiedNativeUnsupported) {
+      notifiedNativeUnsupported = true;
+      safeNotify(NATIVE_PROVIDER_UNSUPPORTED_MESSAGE, "error");
     }
+    return;
+  }
+  const credentialed = hasClaudeCredentials();
+  debug(`${trigger}: native registration upsert, credentialed=${credentialed} (module=${moduleInstanceId})`);
+  if (credentialed && connectorsEnabledFor(loadConfig(process.cwd()))) primeConnectorServers();
+  g[ACTIVE_STREAM_SIMPLE_KEY] = streamClaudeAgentSdk;
+  try {
+    nativeProviderInstance ??= buildNativeProvider(_piAi, MODELS, streamClaudeAgentSdk);
+    pi.registerProvider(nativeProviderInstance);
+  } catch (err) {
     if (g[ACTIVE_STREAM_SIMPLE_KEY] === streamClaudeAgentSdk) g[ACTIVE_STREAM_SIMPLE_KEY] = void 0;
+    debug(`${trigger}: registerProvider threw; released stream guard for retry (kept primary):`, err);
   }
 }
 function streamClaudeAgentSdk(model, context, options) {
@@ -44974,6 +45525,7 @@ function streamClaudeAgentSdk(model, context, options) {
   const providerSettings = bridgeConfig.provider ?? {};
   const enableCloudMcp = connectorsEnabledFor(bridgeConfig);
   const connectorWriteMode = connectorWriteModeFor(bridgeConfig);
+  const connectorServers = enableCloudMcp ? connectorServersSnapshot() : {};
   const appendSystemPrompt = providerSettings.appendSystemPrompt !== false;
   const agentsAppend = appendSystemPrompt ? extractAgentsAppend() : void 0;
   const skillsAppend = appendSystemPrompt ? extractSkillsBlock(context.systemPrompt) : void 0;
@@ -44988,7 +45540,6 @@ function streamClaudeAgentSdk(model, context, options) {
   const requestedEffort = options?.reasoning ? model.thinkingLevelMap?.[options.reasoning] ?? REASONING_TO_EFFORT[options.reasoning] : void 0;
   const effort = resolveConfiguredEffort(model.id, requestedEffort, providerSettings);
   const extraArgs = {};
-  if (strictMcpConfigEnabled) extraArgs["strict-mcp-config"] = null;
   if (effort) extraArgs["thinking-display"] = "summarized";
   const fallbackModel = fallbackModelForPrimaryModel(model.id);
   const childEnv = { ...process.env, ENABLE_CLAUDEAI_MCP_SERVERS: enableCloudMcp ? "1" : "0", DISABLE_AUTO_COMPACT: "1" };
@@ -45007,9 +45558,10 @@ function streamClaudeAgentSdk(model, context, options) {
       append: systemPromptAppend ? systemPromptAppend : void 0
     },
     extraArgs,
+    ...strictMcpConfigEnabled ? { strictMcpConfig: true } : {},
     ...effort ? { effort } : {},
     ...settingSources ? { settingSources } : {},
-    ...mcpServers ? { mcpServers } : {},
+    ...mcpServers || Object.keys(connectorServers).length > 0 ? { mcpServers: { ...mcpServers ?? {}, ...connectorServers } } : {},
     ...resumeSessionId ? { resume: resumeSessionId } : {},
     ...claudeExecutable ? { pathToClaudeCodeExecutable: claudeExecutable } : {},
     spawnClaudeCodeProcess: spawnClaudeCodeWithDiagnostics,
@@ -45100,7 +45652,7 @@ function streamClaudeAgentSdk(model, context, options) {
     else options.signal.addEventListener("abort", onAbort, { once: true });
   }
   consumeQuery(sdkQuery, customToolNameToPi, model, cwd, bridgeConfig, () => wasAborted).then(async ({ capturedSessionId }) => {
-    debug(`provider: consumeQuery completed, stopReason=${ctx().turnOutput?.stopReason}, error=${ctx().turnOutput?.errorMessage}, aborted=${wasAborted}`);
+    debug(`provider: consumeQuery completed, stopReason=${abortCtx.turnOutput?.stopReason}, error=${abortCtx.turnOutput?.errorMessage}, aborted=${wasAborted}`);
     if (streamIdleTimedOut) {
       abortCtx.deferredUserMessages = [];
       debug("provider: stream idle timeout already surfaced; skipping normal completion");
@@ -45108,29 +45660,29 @@ function streamClaudeAgentSdk(model, context, options) {
     }
     if (wasAborted || options?.signal?.aborted) {
       if (sharedSession) setSharedSession({ ...sharedSession, needsRebuild: true, forceRotate: true });
-      ctx().deferredUserMessages = [];
+      abortCtx.deferredUserMessages = [];
       debug(`provider: abort detected, marked sharedSession needsRebuild + forceRotate`);
-      if (ctx().turnOutput) {
-        ctx().turnOutput.stopReason = "aborted";
-        ctx().turnOutput.errorMessage = "Operation aborted";
+      if (abortCtx.turnOutput) {
+        abortCtx.turnOutput.stopReason = "aborted";
+        abortCtx.turnOutput.errorMessage = "Operation aborted";
       }
-      ctx().currentPiStream?.push({ type: "error", reason: "aborted", error: ctx().turnOutput });
-      ctx().currentPiStream?.end();
-      ctx().currentPiStream = null;
+      abortCtx.currentPiStream?.push({ type: "error", reason: "aborted", error: abortCtx.turnOutput });
+      abortCtx.currentPiStream?.end();
+      abortCtx.currentPiStream = null;
       return;
     }
     const sessionId = capturedSessionId ?? sharedSession?.sessionId;
     if (sessionId) {
-      const cursor = Math.max(context.messages.length, ctx().latestCursor, sharedSession?.cursor ?? 0);
+      const cursor = Math.max(context.messages.length, abortCtx.latestCursor, sharedSession?.cursor ?? 0);
       debug(`provider: query done, session=${sessionId.slice(0, 8)}, cursor=${cursor}`);
       setSharedSession({ sessionId, cursor, cwd });
     }
     try {
-      while (ctx().deferredUserMessages.length > 0 && !isReentrant && !wasAborted) {
-        const steerPrompt = ctx().deferredUserMessages.shift();
+      while (abortCtx.deferredUserMessages.length > 0 && !isReentrant && !wasAborted) {
+        const steerPrompt = abortCtx.deferredUserMessages.shift();
         debug(`provider: replaying deferred user message: ${steerPrompt.slice(0, 60)}`);
-        ctx().resetTurnState(model);
-        ctx().resetToolTracking();
+        abortCtx.resetTurnState(model);
+        abortCtx.resetToolTracking();
         const resumeId = sharedSession?.sessionId;
         if (!resumeId) {
           debug(`WARNING: no session to resume for deferred message, dropping`);
@@ -45138,7 +45690,7 @@ function streamClaudeAgentSdk(model, context, options) {
         }
         const contOptions = { ...queryOptions, resume: resumeId, ...makeCliDebugOptions("continuation") };
         const contQuery = Okt({ prompt: steerPrompt, options: contOptions });
-        ctx().activeQuery = contQuery;
+        abortCtx.activeQuery = contQuery;
         debug(`provider: continuation query, model=${model.id}, resume=${resumeId.slice(0, 8)}, prompt=${steerPrompt.slice(0, 60)}`);
         try {
           const { capturedSessionId: contSid } = await consumeQuery(contQuery, customToolNameToPi, model, cwd, bridgeConfig, () => wasAborted);
@@ -45154,46 +45706,36 @@ function streamClaudeAgentSdk(model, context, options) {
         }
       }
     } finally {
-      ctx().activeQuery = sdkQuery;
+      abortCtx.activeQuery = sdkQuery;
     }
-    finalizeCurrentStream(ctx().turnOutput?.stopReason);
+    finalizeCurrentStream(abortCtx.turnOutput?.stopReason, abortCtx);
   }).catch((error51) => {
     debug(`provider: query error, model=${model.id}, aborted=${Boolean(options?.signal?.aborted)}, error=`, error51);
-    const suppressDuplicateError = ctx().handledTerminalError || streamIdleTimedOut;
+    const suppressDuplicateError = abortCtx.handledTerminalError || streamIdleTimedOut;
     const openedExtraUsage = !suppressDuplicateError && isExtraUsageRequiredMessage(error51) && launchExtraUsageHelperIfAllowed(cwd, bridgeConfig, "query error");
     if ((wasAborted || options?.signal?.aborted) && sharedSession) {
       setSharedSession({ ...sharedSession, needsRebuild: true, forceRotate: true });
     } else {
       setSharedSession(null);
     }
-    ctx().deferredUserMessages = [];
+    abortCtx.deferredUserMessages = [];
     if (suppressDuplicateError) {
       debug("provider: suppressing duplicate query error after terminal error was already emitted");
       return;
     }
-    if (ctx().turnOutput) {
-      ctx().turnOutput.stopReason = options?.signal?.aborted ? "aborted" : "error";
-      ctx().turnOutput.errorMessage = `${error51 instanceof Error ? error51.message : String(error51)}${openedExtraUsage ? "\n\nOpened Claude Code /extra-usage helper. Complete billing/admin flow in the browser, then retry the prompt." : ""}`;
+    if (abortCtx.turnOutput) {
+      abortCtx.turnOutput.stopReason = options?.signal?.aborted ? "aborted" : "error";
+      abortCtx.turnOutput.errorMessage = `${error51 instanceof Error ? error51.message : String(error51)}${openedExtraUsage ? "\n\nOpened Claude Code /extra-usage helper. Complete billing/admin flow in the browser, then retry the prompt." : ""}`;
     }
-    ctx().currentPiStream?.push({ type: "error", reason: ctx().turnOutput?.stopReason ?? "error", error: ctx().turnOutput });
-    ctx().currentPiStream?.end();
-    ctx().currentPiStream = null;
+    abortCtx.currentPiStream?.push({ type: "error", reason: abortCtx.turnOutput?.stopReason ?? "error", error: abortCtx.turnOutput });
+    abortCtx.currentPiStream?.end();
+    abortCtx.currentPiStream = null;
   }).finally(() => {
     streamIdleWatchdog?.dispose();
     activeStreamIdleWatchdogs.delete(abortCtx);
     if (options?.signal) options.signal.removeEventListener("abort", onAbort);
-    if (ctx().activeQuery === sdkQuery) {
-      const cause = toolCallDrainCause({ wasAborted, signalAborted: options?.signal?.aborted, streamIdleTimedOut });
-      reportToolResultMismatch(ctx(), "query teardown", cwd, { forceRotate: cause !== "query-end" });
-      const drained = drainPendingToolCalls(ctx(), cause);
-      if (drained > 0) debug(`provider: query teardown drained ${drained} waiting MCP handler(s) as errors (cause=${cause})`);
-      ctx().pendingResults.clear();
-      if (isReentrant) {
-        popContext();
-      } else {
-        ctx().activeQuery = null;
-      }
-    }
+    const cause = toolCallDrainCause({ wasAborted, signalAborted: options?.signal?.aborted, streamIdleTimedOut });
+    teardownQuery(abortCtx, sdkQuery, cause, cwd, isReentrant);
     sdkQuery.close();
   });
   return stream;
@@ -45228,6 +45770,58 @@ function readCredentialFile(path) {
     return void 0;
   }
 }
+var connectorServerCache = /* @__PURE__ */ new Map();
+var connectorServerPending = /* @__PURE__ */ new Set();
+function connectorScopeKey() {
+  return process.env.CLAUDE_CONFIG_DIR?.trim() || "<default>";
+}
+function primeConnectorServers() {
+  const key = connectorScopeKey();
+  if (connectorServerCache.has(key) || connectorServerPending.has(key)) return;
+  connectorServerPending.add(key);
+  void (async () => {
+    try {
+      const credentials = resolveClaudeOAuth(readCredentialFile);
+      if (!credentials) {
+        debug("connectors: no OAuth credentials; declaring none");
+        connectorServerCache.set(key, {});
+        return;
+      }
+      const inventory = await listAccountConnectors({ credentials });
+      if (!inventory.ok) {
+        debug(`connectors: inventory failed (${inventory.reason}); declaring none`);
+        connectorServerCache.set(key, {});
+        return;
+      }
+      const servers = connectorMcpServers(inventory);
+      debug(
+        `connectors: declaring ${Object.keys(servers).length} of ${inventory.connectors.length} installed`,
+        Object.keys(servers).join(", ") || "none"
+      );
+      connectorServerCache.set(key, servers);
+      if (writeCachedConnectors(inventory.connectors, key)) {
+        debug(`connectors: cached ${inventory.connectors.length} entries`);
+      }
+    } catch (error51) {
+      debug("connectors: declaration lookup threw; declaring none", error51);
+      connectorServerCache.set(key, {});
+    } finally {
+      connectorServerPending.delete(key);
+    }
+  })();
+}
+function connectorServersSnapshot() {
+  const key = connectorScopeKey();
+  const ready = connectorServerCache.get(key);
+  if (ready) return ready;
+  primeConnectorServers();
+  const cached2 = readCachedConnectors(key);
+  if (!cached2) return {};
+  const servers = connectorMcpServers({ ok: true, complete: true, connectors: cached2 });
+  if (Object.keys(servers).length === 0) return {};
+  debug(`connectors: turn-1 declarations from cache \u2014 ${Object.keys(servers).join(", ")}`);
+  return servers;
+}
 async function reportConnectorInventory(ctx2) {
   const credentials = resolveClaudeOAuth(readCredentialFile);
   if (!credentials) {
@@ -45334,17 +45928,31 @@ export {
   ALLOWED_RATE_LIMIT_WARNING_UTILIZATION_THRESHOLD,
   CLAUDE_AI_CONNECTOR_TOOL_PATTERNS,
   CLAUDE_BRIDGE_TOOL_ISOLATION,
+  CONNECTOR_CALL_CUSTOM_TYPE,
   CONNECTOR_DISCOVERY_TOOLS,
   CONNECTOR_WRITE_TOOLS,
   DEFAULT_STREAM_IDLE_TIMEOUT_MS,
   DISALLOWED_BUILTIN_TOOLS,
+  INTEGRITY_CUSTOM_TYPE,
+  NATIVE_PROVIDER_UNSUPPORTED_MESSAGE,
   STREAM_IDLE_BACKOFF_HINT_MS,
   STREAM_IDLE_TIMEOUT_ENV,
   __testGetBridgeIntegrityState,
   __testSetBridgeIntegrityState,
+  appendIntegrityEntry,
+  buildNativeProvider,
   buildStreamIdleTimeoutErrorMessage,
+  cancelScheduledToolUseEnd,
   classifyClaudeExecutableBytes,
+  claudeAuthSourceLabel,
+  connectorCachePath,
+  connectorCacheScopeKey,
+  connectorDeclarationsDisabled,
+  connectorMcpServers,
+  connectorProxyUrl,
   connectorQueryOptions,
+  connectorResultByteSize,
+  connectorServerName,
   connectorServerNamespace,
   connectorWriteDenyHook,
   connectorWriteModeFor,
@@ -45355,27 +45963,43 @@ export {
   createStreamIdleWatchdog,
   credentialCandidatePaths,
   index_default as default,
+  endToolUseTurn,
+  finalizeToolUseTurnFromMcpInvocation,
+  flushConnectorCallAudit,
   formatAllowedRateLimitWarning,
   formatResetTimestamp,
+  isChildExecutedTool,
   isConnectorWriteTool,
   isExtraUsageRequiredMessage,
+  isUsageLimitMessage,
   listAccountConnectors,
   mapToolName,
   normalizeRateLimitUtilization,
+  noteChildExecutedToolResults,
   preflightClaudeExecutable,
+  primeConnectorServers,
   processAssistantMessage,
   processStreamEvent,
+  readCachedConnectors,
+  reapStaleQueuedResults,
+  recordConnectorCallResult,
   reportToolResultMismatch,
+  resetTimestampMs,
   resolveClaudeExecutable,
   resolveClaudeOAuth,
   resolveConfiguredEffort,
+  resolveMcpTools,
   restoreSharedSessionFromPi,
+  scheduleToolUseTurnEnd,
+  setConnectorCallAuditSink,
   shouldRestorePersistedBridgeEntry,
   spawnClaudeCodeWithDiagnostics,
   streamIdleTimeoutMsFromEnv,
+  supportsNativeProvider,
   toolIsolationForQuery,
   uniqueNonEmptyLines,
-  wrapClaudeSpawnErrorForSdk
+  wrapClaudeSpawnErrorForSdk,
+  writeCachedConnectors
 };
 /*! Bundled license information: