@vanillagreen/pi-claude-bridge 4.0.1 → 4.0.2

package/bundle/index.js

@@ -36017,7 +36017,8 @@ 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) });
+  const fail = (key, value, reason) => ({ ok: false, complete: false, reason: redactSecret(`${key}=${JSON.stringify(value)}
+${reason}`, credentials.accessToken) });
   let response;
   try {
     response = await fetchImpl(url2, {
@@ -36031,32 +36032,32 @@ async function listAccountConnectors(deps) {
       signal
     });
   } catch (error51) {
-    return fail(`connector list request failed: ${errorText(error51)}`);
+    return fail("connector-request", "transport", `connector list request failed: ${errorText(error51)}`);
   }
   let bodyText;
   try {
     bodyText = await response.text();
   } catch (error51) {
-    return fail(`connector list response unreadable: ${errorText(error51)}`);
+    return fail("connector-response", "unreadable", `connector list response unreadable: ${errorText(error51)}`);
   }
   if (!response.ok) {
-    return fail(`connector list returned HTTP ${response.status}${apiErrorSuffix(bodyText)}`);
+    return fail("connector-http", response.status, `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");
+    return fail("connector-json", "invalid", "connector list returned a non-JSON body");
   }
   if (!Array.isArray(parsed?.results)) {
-    return fail("connector list response had no results array");
+    return fail("connector-results", "not-array", "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");
+      return fail("connector-name", connectors.length, "connector list contained an entry with no name");
     }
     connectors.push({
       name,
@@ -36369,7 +36370,8 @@ function connectorWriteDenyOutput(toolName) {
     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.`
+      permissionDecisionReason: `connector-write-denied=${JSON.stringify(toolName)}
+Connector write tool "${toolName}" is blocked in read-only connector mode. Connector writes must go through the host application's gated approval flow.`
     }
   };
 }
@@ -36761,7 +36763,8 @@ var DRAIN_CAUSE_TEXT = {
 };
 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.` }],
+    content: [{ type: "text", text: `tool-call-drain=${cause}
+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
   };
 }
@@ -36780,7 +36783,7 @@ function drainPendingToolCalls(queryCtx, cause) {
 }
 function strandedToolCallResult() {
   return {
-    content: [{ type: "text", text: "Claude bridge: this tool call was never forwarded to Pi before its turn ended, so it did not execute and no result can arrive. Re-run the tool." }],
+    content: [{ type: "text", text: "tool-call-stranded=unforwarded\nClaude bridge: this tool call was never forwarded to Pi before its turn ended, so it did not execute and no result can arrive. Re-run the tool." }],
     isError: true
   };
 }
@@ -36856,6 +36859,22 @@ var QueryContext = class {
   // Query-scoped (fully isolated per query)
   activeQuery = null;
   currentPiStream = null;
+  /** Pi replaced the history this query's Claude session was built from
+   *  (compaction, history navigation) while the query was still running.
+   *  Delivering further tool results into it would keep Claude Code on history
+   *  Pi no longer holds, so the next provider callback restarts the query from
+   *  Pi's new context. A query that ENDS while this is set persists its record
+   *  with needsRebuild, so the next turn rebuilds either way. */
+  piHistoryReplaced = false;
+  /** The handover this replacement asked for was refused, and the refusal is
+   *  already reported. Every later callback of the query re-reads
+   *  `piHistoryReplaced`, which stays set, so without this the same refusal
+   *  would be recorded once per remaining tool result. */
+  reportedHistoryRestartDecline = false;
+  /** The provider callback that observed `piHistoryReplaced`. The dying query's
+   *  own promise chain runs it, after teardown released the query state, and
+   *  feeds the replacement query's events into that callback's stream. */
+  restartRequest = null;
   latestCursor = 0;
   pendingToolCalls = /* @__PURE__ */ new Map();
   pendingResults = /* @__PURE__ */ new Map();
@@ -36940,14 +36959,20 @@ var QueryContext = class {
   /** tool_use id → raw SDK tool name. */
   childExecutedToolCalls = /* @__PURE__ */ new Map();
   /**
-   * The same calls, for the connector-call audit trail (see connector-audit.ts).
+   * Every call the CHILD executed that pi's messages cannot carry — a claude.ai
+   * connector, or a foreign MCP tool the child loaded itself — keyed by tool_use
+   * id. Nothing can rebuild these from pi's context, so a history handover is
+   * refused while the map is non-empty. Connector entries also back 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.
+   * Fresh-query setup clears it instead, once teardown has flushed it: a reused
+   * top-level context would otherwise answer for calls an earlier query made.
    */
-  connectorCallAudit = /* @__PURE__ */ new Map();
+  childSideCalls = /* @__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. */
@@ -37004,7 +37029,7 @@ var QueryContext = class {
   turnSawStreamEvent = false;
   turnSawToolCall = false;
   get turnBlocks() {
-    if (!this.turnOutput) throw new Error("turnBlocks accessed before resetTurnState");
+    if (!this.turnOutput) throw new Error("turn-state-uninitialized=turnBlocks\nturnBlocks accessed before resetTurnState");
     return this.turnOutput.content;
   }
   resetTurnState(model) {
@@ -37061,9 +37086,10 @@ var QueryContext = class {
     }
     if (id2 && isConnectorTool(rawName)) {
       this.childExecutedToolCalls.set(id2, rawName);
-      if (!this.connectorCallAudit.has(id2)) {
-        this.connectorCallAudit.set(id2, {
+      if (!this.childSideCalls.has(id2)) {
+        this.childSideCalls.set(id2, {
           name: rawName,
+          kind: "connector",
           ...this.childSessionId ? { childSessionId: this.childSessionId } : {},
           recorded: false
         });
@@ -37071,6 +37097,20 @@ var QueryContext = class {
     }
     if (typeof streamIndex === "number") this.childExecutedStreamIndexes.add(streamIndex);
   }
+  /** A foreign MCP tool the child loaded from filesystem settings and ran
+   *  itself. Pi never sees the call or its result, so it commits the turn the
+   *  same way a connector does and joins the same map: a rebuild from pi's
+   *  context would erase an account-visible operation the model could repeat. */
+  noteForeignMcpToolCall(id2, rawName) {
+    this.markOutputCommitted();
+    if (!id2 || this.childSideCalls.has(id2)) return;
+    this.childSideCalls.set(id2, {
+      name: rawName,
+      kind: "foreign-mcp",
+      ...this.childSessionId ? { childSessionId: this.childSessionId } : {},
+      recorded: false
+    });
+  }
   recordToolCall(id2, toolName, args = {}) {
     if (!id2) return;
     this.queryToolNames.set(id2, toolName);
@@ -37238,13 +37278,13 @@ function stackDepth() {
 }
 function pushContext() {
   const state = lane();
-  if (!state.current.activeQuery) throw new Error("pushContext() called with no active query");
+  if (!state.current.activeQuery) throw new Error("query-stack-push=inactive\npushContext() called with no active query");
   state.stack.push(state.current);
   state.current = new QueryContext();
 }
 function popContext() {
   const state = lane();
-  if (state.stack.length === 0) throw new Error("popContext() called with empty stack");
+  if (state.stack.length === 0) throw new Error("query-stack-pop=empty\npopContext() called with empty stack");
   const parent = state.stack[state.stack.length - 1];
   parent.deferredUserMessages.push(...state.current.deferredUserMessages);
   state.current = state.stack.pop();
@@ -37340,7 +37380,7 @@ function findUnpairedToolUses(messages) {
   }
   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.";
+var LOST_TOOL_RESULT_TEXT = "tool-result-lost=interrupted\nClaude 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 = (id2) => ({ type: "tool_result", tool_use_id: id2, content: LOST_TOOL_RESULT_TEXT, is_error: true });
   const byAssistant = /* @__PURE__ */ new Map();
@@ -37527,7 +37567,8 @@ function reportToolResultMismatch(queryCtx, reason, cwd, opts = {}) {
       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(", ")}` : ""}. ` + (queryCtx.detachedFromSharedSession ? `Detached one-shot query \u2014 shared Claude session record left untouched; ${diagGuidance()}.` : `Claude session will rebuild before the next turn; ${diagGuidance()}.`),
+      `tool-result-mismatch=${JSON.stringify({ delivered: progress.deliveredCount, expected: progress.expectedCount, resolved: progress.resolvedCount, diagnostic: DEBUG ? diagLogPath() : "CLAUDE_BRIDGE_DEBUG=1" })}
+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(", ")}` : ""}. ` + (queryCtx.detachedFromSharedSession ? `Detached one-shot query \u2014 shared Claude session record left untouched; ${diagGuidance()}.` : `Claude session will rebuild before the next turn; ${diagGuidance()}.`),
       "error"
     );
     return true;
@@ -37587,10 +37628,10 @@ function appendConnectorCallAudit(data) {
   return delivered;
 }
 function recordConnectorCallResult(queryCtx, toolUseId, name, isError, byteSize) {
-  const pending = queryCtx.connectorCallAudit.get(toolUseId);
+  const pending = queryCtx.childSideCalls.get(toolUseId);
   if (pending?.recorded) return false;
   const childSessionId = pending?.childSessionId ?? queryCtx.childSessionId;
-  queryCtx.connectorCallAudit.set(toolUseId, { ...pending, name, childSessionId, recorded: true });
+  queryCtx.childSideCalls.set(toolUseId, { ...pending, kind: pending?.kind ?? "connector", name, childSessionId, recorded: true });
   return appendConnectorCallAudit({
     name,
     toolUseId,
@@ -37601,9 +37642,9 @@ function recordConnectorCallResult(queryCtx, toolUseId, name, isError, byteSize)
 }
 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 });
+  for (const [toolUseId, state] of queryCtx.childSideCalls) {
+    if (state.recorded || state.kind !== "connector") continue;
+    queryCtx.childSideCalls.set(toolUseId, { ...state, recorded: true });
     const childSessionId = state.childSessionId ?? queryCtx.childSessionId;
     if (appendConnectorCallAudit({
       name: state.name,
@@ -37617,6 +37658,18 @@ function flushConnectorCallAudit(queryCtx, reason) {
 }
 
 // src/query-teardown.ts
+function closeSdkQuery(sdkQuery) {
+  try {
+    sdkQuery.close();
+  } catch (error51) {
+    debug("provider: closing the sdk query threw; continuing teardown:", error51);
+  }
+}
+function abortSdkQuery(sdkQuery) {
+  void sdkQuery.interrupt().catch(() => {
+  });
+  closeSdkQuery(sdkQuery);
+}
 function teardownQuery(queryCtx, sdkQuery, cause, cwd, isReentrant) {
   if (queryCtx.activeQuery !== sdkQuery) return false;
   reportToolResultMismatch(queryCtx, "query teardown", cwd, { forceRotate: cause !== "query-end" });
@@ -37687,7 +37740,9 @@ function claudeAuthSourceLabel(env = process.env) {
   return "Claude Code login";
 }
 function buildNativeProvider(piAi2, models, streamSimple, env = process.env, hasCredentials = () => hasClaudeCredentials(env)) {
-  if (!supportsNativeProvider(piAi2)) throw new Error(NATIVE_PROVIDER_UNSUPPORTED_MESSAGE);
+  if (!supportsNativeProvider(piAi2)) {
+    throw Object.assign(new Error(NATIVE_PROVIDER_UNSUPPORTED_MESSAGE), { code: "CLAUDE_BRIDGE_NATIVE_PROVIDER_UNSUPPORTED" });
+  }
   const stamped = models.map((model) => ({ ...model, api: "claude-bridge", baseUrl: "claude-bridge", provider: PROVIDER_ID }));
   const streams = {
     stream: streamSimple,
@@ -53144,28 +53199,33 @@ function verifyWrittenSession(jsonlPath, expectedSessionId, expectedRecordCount)
   try {
     st2 = statSync3(jsonlPath);
   } catch (e) {
-    warnings.push(`file missing after save \u2014 path=${jsonlPath} err=${e.message}`);
+    warnings.push(`session-file-missing=${jsonlPath}
+File missing after save: ${e.message}`);
     return warnings;
   }
   let summary;
   try {
     summary = summarizeJsonl(jsonlPath);
   } catch (e) {
-    warnings.push(`file unreadable \u2014 path=${jsonlPath} size=${st2.size} err=${e.message}`);
+    warnings.push(`session-file-unreadable=${jsonlPath}
+File unreadable: size=${st2.size} error=${e.message}`);
     return warnings;
   }
   if (summary.count !== expectedRecordCount) {
-    warnings.push(`record count mismatch \u2014 expected=${expectedRecordCount} actual=${summary.count} path=${jsonlPath} bytes=${st2.size}`);
+    warnings.push(`session-record-count=${summary.count} expected=${expectedRecordCount}
+Record count differs: path=${jsonlPath} bytes=${st2.size}`);
     return warnings;
   }
   try {
     const firstRec = JSON.parse(summary.firstLine ?? "");
     const lastRec = JSON.parse(summary.lastLine ?? "");
     if (firstRec.sessionId !== expectedSessionId || lastRec.sessionId !== expectedSessionId) {
-      warnings.push(`sessionId drift \u2014 expected=${expectedSessionId} first=${firstRec.sessionId} last=${lastRec.sessionId}`);
+      warnings.push(`session-id-drift=${expectedSessionId} first=${firstRec.sessionId} last=${lastRec.sessionId}
+Session identity differs from the expected identity.`);
     }
   } catch (e) {
-    warnings.push(`malformed JSONL \u2014 path=${jsonlPath} err=${e.message}`);
+    warnings.push(`session-json-invalid=${jsonlPath}
+Malformed JSONL: ${e.message}`);
   }
   return warnings;
 }
@@ -53481,12 +53541,14 @@ function canonicalize(p) {
   }
 }
 function shouldRestorePersistedBridgeEntry(persisted, currentPiSessionId, currentCwd) {
-  if (!persisted.piSessionId) return "missing piSessionId";
+  if (!persisted.piSessionId) return "restore-session-missing=piSessionId\nMissing piSessionId.";
   if (currentPiSessionId && persisted.piSessionId !== currentPiSessionId) {
-    return `piSessionId mismatch (persisted=${persisted.piSessionId} current=${currentPiSessionId})`;
+    return `restore-session-mismatch=${persisted.piSessionId} current=${currentPiSessionId}
+The persisted session differs from the active session.`;
   }
   if (currentCwd && canonicalize(persisted.cwd) !== canonicalize(currentCwd)) {
-    return `cwd mismatch (persisted=${persisted.cwd} current=${currentCwd})`;
+    return `restore-cwd-mismatch=${persisted.cwd} current=${currentCwd}
+The persisted working directory differs from the active directory.`;
   }
   return void 0;
 }
@@ -53640,7 +53702,7 @@ function verifyWrittenSession2(jsonlPath, expectedSessionId, expectedRecordCount
   for (const msg of warnings) {
     debug(`WARNING session verify: ${msg}`);
     safeNotify(
-      `Session file issue: ${msg}
+      `${msg}
 cwd=${displayPath(cwd)} realpath=${displayPath(safeRealpath(cwd))}
 Please copy and paste this message into a new issue at https://github.com/vanillagreencom/kendex/issues/new` + (DEBUG ? ` and attach ${DEBUG_LOG_PATH}` : ` (rerun with CLAUDE_BRIDGE_DEBUG=1 to capture a debug log)`),
       "warning"
@@ -54009,7 +54071,8 @@ function reapStaleQueuedResults(c) {
   diagDump("stale_queued_tool_results_parked", { count: stale.length, stale });
   appendIntegrityEntry("stale_queued_tool_results_parked", { count: stale.length, stale });
   safeNotify(
-    `Claude bridge: parked ${stale.length} early tool result(s) whose handler has not arrived (${names.slice(0, 6).join(", ")}${names.length > 6 ? ", \u2026" : ""}). A late handler can still consume them.`,
+    `queued-results-parked=${JSON.stringify({ count: stale.length, tools: names })}
+Claude bridge: parked ${stale.length} early tool result(s) whose handler has not arrived (${names.slice(0, 6).join(", ")}${names.length > 6 ? ", \u2026" : ""}). A late handler can still consume them.`,
     "warning"
   );
 }
@@ -54106,7 +54169,7 @@ function processStreamEvent(message, customToolNameToPi, model, c = ctx()) {
     }
     if (event.content_block?.type === "tool_use" && !isPiDispatchable(event.content_block.name, customToolNameToPi)) {
       c.suppressedStreamIndexes.add(event.index);
-      if (isForeignMcpTool(event.content_block.name)) c.markOutputCommitted();
+      if (isForeignMcpTool(event.content_block.name)) c.noteForeignMcpToolCall(event.content_block.id, event.content_block.name);
       debug(`processStreamEvent: non-dispatchable tool ${event.content_block.name} [${event.content_block.id}] \u2014 not mirrored as a Pi tool call`);
       return;
     }
@@ -54228,7 +54291,7 @@ function appendMissingToolUsesFromAssistant(assistantMsg, model, customToolNameT
       continue;
     }
     if (!isPiDispatchable(block.name, customToolNameToPi)) {
-      if (isForeignMcpTool(block.name)) c.markOutputCommitted();
+      if (isForeignMcpTool(block.name)) c.noteForeignMcpToolCall(block.id, block.name);
       debug(`assistant message: non-dispatchable tool ${block.name} [${block.id}] \u2014 not mirrored as a Pi tool call`);
       continue;
     }
@@ -54326,7 +54389,7 @@ function processAssistantMessage(message, model, customToolNameToPi, c = ctx())
         continue;
       }
       if (!isPiDispatchable(block.name, customToolNameToPi)) {
-        if (isForeignMcpTool(block.name)) c.markOutputCommitted();
+        if (isForeignMcpTool(block.name)) c.noteForeignMcpToolCall(block.id, block.name);
         debug(`processAssistantMessage fallback: non-dispatchable tool ${block.name} [${block.id}] \u2014 not mirrored as a Pi tool call`);
         continue;
       }
@@ -54456,6 +54519,52 @@ var BRIDGE_ACCOUNT_HOST = {
   probeProfile: probeClaudeAccountProfile
 };
 
+// src/billing-identity.ts
+var CLAUDE_BILLING_IDENTITY_SYMBOL = /* @__PURE__ */ Symbol.for("kendex.pi.claude-bridge.billing-identity.v1");
+var FIRST_PARTY = "firstParty";
+var BILLING_IDENTITY_LANES_SYMBOL = /* @__PURE__ */ Symbol.for("kendex.pi.claude-bridge.billing-identity-lanes.v1");
+function sharedBillingIdentityLanes() {
+  const host = globalThis;
+  let lanes = host[BILLING_IDENTITY_LANES_SYMBOL];
+  if (!lanes) {
+    lanes = /* @__PURE__ */ new Map();
+    host[BILLING_IDENTITY_LANES_SYMBOL] = lanes;
+  }
+  return lanes;
+}
+function nonEmpty(value) {
+  return typeof value === "string" && value.trim().length > 0 ? value.trim() : void 0;
+}
+function loginEmailFrom(info) {
+  if (info.apiProvider !== FIRST_PARTY) return void 0;
+  if (nonEmpty(info.apiKeySource)) return void 0;
+  return nonEmpty(info.email);
+}
+function makeBillingIdentityStore(lanes = /* @__PURE__ */ new Map()) {
+  return {
+    version: 1,
+    currentLoginEmail: (sessionId) => lanes.get(sessionId)?.loginEmail,
+    beginAttempt: (sessionId) => {
+      const attempt = /* @__PURE__ */ Symbol("billing-identity-attempt");
+      lanes.set(sessionId, { attempt });
+      return (info) => {
+        const current = lanes.get(sessionId);
+        if (current?.attempt !== attempt) return;
+        lanes.set(sessionId, { attempt, loginEmail: loginEmailFrom(info) });
+      };
+    },
+    deleteLane: (sessionId) => lanes.delete(sessionId),
+    clear: () => lanes.clear()
+  };
+}
+var BRIDGE_BILLING_IDENTITY = makeBillingIdentityStore(sharedBillingIdentityLanes());
+function beginBillingIdentityAttempt() {
+  return BRIDGE_BILLING_IDENTITY.beginAttempt(currentRequestLaneId());
+}
+function deleteBillingIdentityLane(sessionId) {
+  BRIDGE_BILLING_IDENTITY.deleteLane(sessionId);
+}
+
 // src/bridge-commands.ts
 var COMMANDS_REGISTERED_KEY = /* @__PURE__ */ Symbol.for("claude-bridge:commandsRegistered");
 function commandCwd(ctx2) {
@@ -54545,10 +54654,11 @@ function noteFastModeDisabledReason(message, bridgeConfig) {
   const text = FAST_MODE_DISABLED_REASON_TEXT[reason] ?? `unavailable (${reason})`;
   safeNotify(`Pi Claude: fast mode is enabled in settings but Claude Code declined it \u2014 ${text}.`, "warning");
 }
-async function consumeQuery(sdkQuery, queryCtx, customToolNameToPi, model, bridgeConfig, wasAborted, account, router, attemptFailureBox) {
+async function consumeQuery(sdkQuery, queryCtx, customToolNameToPi, model, bridgeConfig, wasAborted, recordBillingIdentity, account, router, attemptFailureBox) {
   let capturedSessionId;
   let failure;
   let accountProbe;
+  let accountInfoProbe;
   const holdFailure = (next) => {
     failure = next;
     if (attemptFailureBox) attemptFailureBox.failure = next;
@@ -54626,9 +54736,13 @@ async function consumeQuery(sdkQuery, queryCtx, customToolNameToPi, model, bridg
           capturedSessionId = message.session_id;
           queryCtx.childSessionId = capturedSessionId;
           noteFastModeDisabledReason(message, bridgeConfig);
+          if (!accountInfoProbe) {
+            accountInfoProbe = (async () => sdkQuery.accountInfo())();
+            void accountInfoProbe.then((info) => recordBillingIdentity(info)).catch((error51) => debug("consumeQuery: billing identity probe rejected:", error51));
+          }
           if (account && router && !accountProbe) {
             accountProbe = Promise.allSettled([
-              sdkQuery.accountInfo().then((info) => router.recordIdentity(account.profileId, {
+              accountInfoProbe.then((info) => router.recordIdentity(account.profileId, {
                 email: info.email,
                 organization: info.organization,
                 subscriptionType: info.subscriptionType
@@ -55215,6 +55329,27 @@ function applyProviderRegistration(trigger) {
     debug(`${trigger}: registerProvider threw; released stream guard for retry (kept primary):`, err);
   }
 }
+var HISTORY_REPLACED_PROMPT = "The conversation above was rewritten by Pi (compaction or history navigation). It is the complete current history, including the results of every tool call that has already run. Continue the turn from there, and do not repeat a tool call whose result is already above.";
+function restartContext(request) {
+  return {
+    ...request.context,
+    messages: [...request.context.messages, { role: "user", content: HISTORY_REPLACED_PROMPT, timestamp: Date.now() }]
+  };
+}
+function onPiHistoryReplaced(event) {
+  const activeSession = getSharedSession();
+  const queryCtx = ctx();
+  const running = queryCtx.activeQuery !== null;
+  const restarts = running && !queryCtx.detachedFromSharedSession;
+  if (running) {
+    if (restarts) queryCtx.piHistoryReplaced = true;
+    reportToolResultMismatch(queryCtx, event, activeSession?.cwd ?? process.cwd(), { expectedInterruption: restarts });
+  }
+  if (activeSession) {
+    debug(`${event}: marking needsRebuild on session ${activeSession.sessionId.slice(0, 8)}`);
+    markSessionForRebuild({ forceRotate: restarts });
+  }
+}
 function streamClaudeAgentSdk(model, context, options) {
   return runInRequestLane(options?.sessionId, () => streamClaudeAgentSdkInLane(model, context, options));
 }
@@ -55226,12 +55361,30 @@ function streamClaudeAgentSdkInLane(model, context, options) {
     if (!ephemeralLane) return;
     deleteSharedSessionLane(laneId);
     deleteQueryLane(laneId);
+    deleteBillingIdentityLane(laneId);
   };
   const lastMsgRole = context.messages[context.messages.length - 1]?.role;
   const cwd = options?.cwd ?? process.cwd();
   debug(`provider: streamClaudeAgentSdk called, activeQuery=${!!ctx().activeQuery}, lastMsgRole=${lastMsgRole}, isReentrant=${ctx().activeQuery !== null}`);
   if (ctx().activeQuery) {
     const queryCtx = ctx();
+    if (queryCtx.piHistoryReplaced) {
+      if (queryCtx.childSideCalls.size > 0) {
+        if (!queryCtx.reportedHistoryRestartDecline) {
+          queryCtx.reportedHistoryRestartDecline = true;
+          const names = [...new Set([...queryCtx.childSideCalls.values()].map((call) => call.name))];
+          debug(`provider: pi replaced this query's history, but ${queryCtx.childSideCalls.size} child-executed call(s) are absent from pi's context; not restarting (${names.join(", ")})`);
+          appendIntegrityEntry("history_restart_declined", { reason: "child-executed calls pi's history cannot carry", count: queryCtx.childSideCalls.size, names });
+        }
+      } else {
+        queryCtx.piHistoryReplaced = false;
+        queryCtx.restartRequest = { model, context, options, stream };
+        queryCtx.currentPiStream = null;
+        debug(`provider: pi replaced this query's history; restarting from ${context.messages.length} message(s)`);
+        abortSdkQuery(queryCtx.activeQuery);
+        return stream;
+      }
+    }
     queryCtx.currentPiStream = stream;
     queryCtx.resetTurnState(model);
     queryCtx.callbackGeneration += 1;
@@ -55326,6 +55479,7 @@ function streamClaudeAgentSdkInLane(model, context, options) {
     });
     return stream;
   }
+  const recordBillingIdentity = beginBillingIdentityAttempt();
   if (!hasClaudeCredentials() && !resolveClaudeAccountRouter()) {
     try {
       applyProviderRegistration("pre-spawn");
@@ -55365,6 +55519,7 @@ function streamClaudeAgentSdkInLane(model, context, options) {
   ctx().pendingToolCalls.clear();
   ctx().pendingResults.clear();
   ctx().reapedResults.clear();
+  ctx().childSideCalls.clear();
   ctx().forwardedToolCallIds.clear();
   ctx().deadToolCallIds.clear();
   ctx().callbackGeneration = 0;
@@ -55373,6 +55528,8 @@ function streamClaudeAgentSdkInLane(model, context, options) {
   ctx().resetToolTracking();
   ctx().latestCursor = 0;
   ctx().committedOutput = false;
+  ctx().piHistoryReplaced = false;
+  ctx().reportedHistoryRestartDecline = false;
   ctx().detachedFromSharedSession = isReentrant;
   const router = resolveClaudeAccountRouter();
   const rotationOptions = options;
@@ -55496,6 +55653,7 @@ function streamClaudeAgentSdkInLane(model, context, options) {
     `prompt=${promptText.slice(0, 60)}${promptBlocks ? " [+images]" : ""}`
   );
   let wasAborted = false;
+  let reentryStream = stream;
   let streamIdleTimedOut = false;
   let retryRequested = false;
   let retryFailure;
@@ -55505,7 +55663,9 @@ function streamClaudeAgentSdkInLane(model, context, options) {
   const attemptFailure = {};
   const persistSession = (next) => {
     if (isReentrant || foreignContext) return;
-    setSharedSession(next && conversationFp ? { conversationFingerprint: conversationFp, ...next } : next);
+    const restartPending = abortCtx.restartRequest !== null;
+    const replaced = next && (abortCtx.piHistoryReplaced || restartPending) ? { ...next, needsRebuild: true, ...restartPending ? { forceRotate: true } : {} } : next;
+    setSharedSession(replaced && conversationFp ? { conversationFingerprint: conversationFp, ...replaced } : replaced);
   };
   const markRebuildForThisQuery = (opts = {}) => {
     if (isReentrant || foreignContext) return;
@@ -55525,14 +55685,6 @@ function streamClaudeAgentSdkInLane(model, context, options) {
     safeRouterCall("recordFailure", () => router.recordFailure(account.profileId, failure.kind, queryModel.id));
     accountFailureRecorded = true;
   };
-  const requestAbort = () => {
-    void sdkQuery.interrupt().catch(() => {
-    });
-    try {
-      sdkQuery.close();
-    } catch {
-    }
-  };
   const requestRotation = (failure) => {
     recordAttemptFailure(failure);
     const committed = abortCtx.committedOutput || attemptBuffer?.hasCommittedOutput === true;
@@ -55573,7 +55725,7 @@ function streamClaudeAgentSdkInLane(model, context, options) {
       debug("provider: stream idle timeout", `model=${queryModel.id}`, `timeout=${timeoutMs}`, `idle=${idleMs}`);
       const idleFailure = { kind: "network", message: errorMessage };
       if (requestRotation(idleFailure)) {
-        requestAbort();
+        abortSdkQuery(sdkQuery);
         return;
       }
       abortCtx.handledTerminalError = true;
@@ -55601,7 +55753,7 @@ function streamClaudeAgentSdkInLane(model, context, options) {
       abortCtx.currentPiStream?.push({ type: "error", reason: "error", error: abortCtx.turnOutput });
       abortCtx.currentPiStream?.end();
       abortCtx.currentPiStream = null;
-      requestAbort();
+      abortSdkQuery(sdkQuery);
     },
     timeoutMs: streamIdleTimeoutMs
   }) : null;
@@ -55619,7 +55771,7 @@ function streamClaudeAgentSdkInLane(model, context, options) {
     const drained = drainPendingToolCalls(abortCtx, "abort");
     if (drained > 0) debug(`provider: abort drained ${drained} waiting MCP handler(s) as errors`);
     abortCtx.pendingResults.clear();
-    requestAbort();
+    abortSdkQuery(sdkQuery);
   });
   if (options?.signal) {
     if (options.signal.aborted) onAbort();
@@ -55651,8 +55803,12 @@ function streamClaudeAgentSdkInLane(model, context, options) {
     abortCtx.currentPiStream?.end();
     abortCtx.currentPiStream = null;
   };
-  consumeQuery(sdkQuery, abortCtx, customToolNameToPi, queryModel, bridgeConfig, () => wasAborted, account, router, attemptFailure).then(async ({ capturedSessionId, failure }) => {
+  consumeQuery(sdkQuery, abortCtx, customToolNameToPi, queryModel, bridgeConfig, () => wasAborted, recordBillingIdentity, account, router, attemptFailure).then(async ({ capturedSessionId, failure }) => {
     debug(`provider: consumeQuery completed, stopReason=${abortCtx.turnOutput?.stopReason}, failure=${failure?.kind ?? "none"}, aborted=${wasAborted}`);
+    if (abortCtx.restartRequest) {
+      debug("provider: query ended for a history restart; leaving the outcome to the replacement query");
+      return;
+    }
     if (streamIdleTimedOut) {
       dropDeferredUserMessages("stream-idle-timeout-completion");
       debug(`provider: stream idle timeout ${retryRequested ? "queued account rotation" : "already surfaced"}; skipping normal completion`);
@@ -55704,7 +55860,8 @@ function streamClaudeAgentSdkInLane(model, context, options) {
         abortCtx.activeQuery = contQuery;
         debug(`provider: continuation query, model=${queryModel.id}, resume=${resumeId.slice(0, 8)}, account=${account?.label ?? "legacy"}, prompt=${steerPreview}`);
         try {
-          const continuation = await consumeQuery(contQuery, abortCtx, customToolNameToPi, queryModel, bridgeConfig, () => wasAborted, account, router);
+          const continuation = await consumeQuery(contQuery, abortCtx, customToolNameToPi, queryModel, bridgeConfig, () => wasAborted, recordBillingIdentity, account, router);
+          if (abortCtx.restartRequest) break;
           if (continuation.failure) {
             recordAttemptFailure(continuation.failure);
             if (!abortCtx.handledTerminalError) surfaceFailure(continuation.failure);
@@ -55719,6 +55876,7 @@ function streamClaudeAgentSdkInLane(model, context, options) {
             persistSession({ sessionId: sid, cursor: activeSession2?.cursor ?? 0, cwd, ...accountScope });
           }
         } catch (contError) {
+          if (abortCtx.restartRequest) break;
           debug(`provider: continuation query error:`, contError);
           const continuationFailure = {
             kind: classifyClaudeFailure(contError),
@@ -55740,6 +55898,10 @@ function streamClaudeAgentSdkInLane(model, context, options) {
     finalizeCurrentStream(abortCtx.turnOutput?.stopReason, abortCtx);
   }).catch((error51) => {
     debug(`provider: query error, model=${queryModel.id}, aborted=${Boolean(options?.signal?.aborted)}, error=`, error51);
+    if (abortCtx.restartRequest) {
+      debug("provider: query error while a history restart was pending; suppressed");
+      return;
+    }
     const suppressDuplicateError = abortCtx.handledTerminalError || streamIdleTimedOut && !retryRequested;
     if (wasAborted || options?.signal?.aborted) {
       markRebuildForThisQuery({ forceRotate: true });
@@ -55764,8 +55926,26 @@ function streamClaudeAgentSdkInLane(model, context, options) {
     if (options?.signal) options.signal.removeEventListener("abort", onAbort);
     const cause = toolCallDrainCause({ wasAborted, signalAborted: options?.signal?.aborted, streamIdleTimedOut });
     teardownQuery(abortCtx, sdkQuery, cause, cwd, isReentrant);
-    sdkQuery.close();
+    closeSdkQuery(sdkQuery);
   }).then(async () => {
+    const restart = abortCtx.restartRequest;
+    if (restart) {
+      abortCtx.restartRequest = null;
+      reentryStream = restart.stream;
+      if (wasAborted || options?.signal?.aborted || restart.options?.signal?.aborted) {
+        debug("provider: abort before the history restart \u2014 terminating the stream without restarting");
+        abortCtx.resetTurnState(restart.model);
+        abortCtx.turnOutput.stopReason = "aborted";
+        abortCtx.turnOutput.errorMessage = "Operation aborted";
+        reentryStream.push({ type: "error", reason: "aborted", error: abortCtx.turnOutput });
+        reentryStream.end();
+        return;
+      }
+      debug(`provider: restarting query on replaced history, ${restart.context.messages.length} pi message(s)`);
+      for await (const event of streamClaudeAgentSdk(restart.model, restartContext(restart), restart.options)) reentryStream.push(event);
+      reentryStream.end();
+      return;
+    }
     if (!retryRequested) return;
     if (wasAborted || options?.signal?.aborted) {
       debug("provider: abort after queued account retry \u2014 terminating stream without retrying");
@@ -55773,8 +55953,8 @@ function streamClaudeAgentSdkInLane(model, context, options) {
         abortCtx.turnOutput.stopReason = "aborted";
         abortCtx.turnOutput.errorMessage = "Operation aborted";
       }
-      stream.push({ type: "error", reason: "aborted", error: abortCtx.turnOutput });
-      stream.end();
+      reentryStream.push({ type: "error", reason: "aborted", error: abortCtx.turnOutput });
+      reentryStream.end();
       return;
     }
     debug(`provider: starting account retry after ${retryFailure?.kind ?? "failure"}; excluded=${[...rotationState.excludedProfileIds].join(",")}`);
@@ -55782,16 +55962,22 @@ function streamClaudeAgentSdkInLane(model, context, options) {
       ...options ?? {},
       [ROTATION_STATE_KEY]: rotationState
     });
-    for await (const event of retryStream) stream.push(event);
-    stream.end();
+    for await (const event of retryStream) reentryStream.push(event);
+    reentryStream.end();
   }).catch((error51) => {
-    debug("provider: account retry pipeline failed:", error51);
+    debug("provider: re-entry pipeline failed:", error51);
+    const restart = abortCtx.restartRequest;
+    if (restart) {
+      abortCtx.restartRequest = null;
+      reentryStream = restart.stream;
+      abortCtx.resetTurnState(restart.model);
+    }
     if (abortCtx.turnOutput) {
       abortCtx.turnOutput.stopReason = "error";
       abortCtx.turnOutput.errorMessage = error51 instanceof Error ? error51.message : String(error51);
     }
-    stream.push({ type: "error", reason: "error", error: abortCtx.turnOutput });
-    stream.end();
+    reentryStream.push({ type: "error", reason: "error", error: abortCtx.turnOutput });
+    reentryStream.end();
   }).finally(releaseEphemeralLane);
   return stream;
 }
@@ -55809,6 +55995,7 @@ function index_default(pi2) {
   if (claimPrimaryInstance()) {
     const host = globalThis;
     host[CLAUDE_BRIDGE_ACCOUNT_HOST_SYMBOL] = BRIDGE_ACCOUNT_HOST;
+    host[CLAUDE_BILLING_IDENTITY_SYMBOL] = BRIDGE_BILLING_IDENTITY;
   }
   const clearSession = (event) => {
     const activeSession = getSharedSession();
@@ -55834,23 +56021,14 @@ function index_default(pi2) {
     });
     deleteSharedSessionLane(sessionId);
     deleteQueryLane(sessionId);
+    deleteBillingIdentityLane(sessionId);
   });
   pi2.on("message_end", (event, ctx2) => runInRequestLane(ctx2.sessionManager.getSessionId(), () => {
     const message = event.message;
     if (message?.role === "assistant" && message.provider === PROVIDER_ID) schedulePersistSharedSession(ctx2);
   }));
-  const markRebuild = (event) => {
-    const activeSession = getSharedSession();
-    if (ctx().activeQuery) {
-      reportToolResultMismatch(ctx(), event, activeSession?.cwd ?? process.cwd());
-    }
-    if (activeSession) {
-      debug(`${event}: marking needsRebuild on session ${activeSession.sessionId.slice(0, 8)}`);
-      markSessionForRebuild();
-    }
-  };
-  pi2.on("session_compact", (_event, ctx2) => runInRequestLane(ctx2.sessionManager.getSessionId(), () => markRebuild("session_compact")));
-  pi2.on("session_tree", (_event, ctx2) => runInRequestLane(ctx2.sessionManager.getSessionId(), () => markRebuild("session_tree")));
+  pi2.on("session_compact", (_event, ctx2) => runInRequestLane(ctx2.sessionManager.getSessionId(), () => onPiHistoryReplaced("session_compact")));
+  pi2.on("session_tree", (_event, ctx2) => runInRequestLane(ctx2.sessionManager.getSessionId(), () => onPiHistoryReplaced("session_tree")));
   applyProviderRegistration("load");
 }
 export {
@@ -55864,6 +56042,7 @@ export {
   CONNECTOR_WRITE_TOOLS,
   DEFAULT_STREAM_IDLE_TIMEOUT_MS,
   DISALLOWED_BUILTIN_TOOLS,
+  HISTORY_REPLACED_PROMPT,
   INTEGRITY_CUSTOM_TYPE,
   NATIVE_PROVIDER_UNSUPPORTED_MESSAGE,
   RetryEventBuffer,
@@ -55922,6 +56101,7 @@ export {
   mapToolName,
   normalizeRateLimitUtilization,
   noteChildExecutedToolResults,
+  onPiHistoryReplaced,
   planDeferredUserReplay,
   planIncrementalPromptBatch,
   preflightClaudeExecutable,