pi-claude-agent-sdk 0.8.2 → 0.8.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-claude-agent-sdk",
-  "version": "0.8.2",
+  "version": "0.8.3",
   "private": false,
   "description": "Pi extension that uses Claude Code (via Agent SDK) as a model provider.",
   "keywords": [

package/src/index.ts

@@ -17,6 +17,7 @@ import { QueryContext, ctx } from "./query-state.js";
 import { makePromptStream, userMessage, type PromptStream } from "./prompt-stream.js";
 import { claudeCodeSettings, loadConfig, markStartupNoticeShown, type Config } from "./config.js";
 import {
+	getSharedPromptCaptures,
 	projectPromptCapture,
 	PromptCaptures,
 } from "./prompt-capture.js";
@@ -133,6 +134,10 @@ function diagDump(label: string, data: Record<string, unknown>) {
 //
 // On session_shutdown (including /reload), clearSession() resets this so a fresh
 // registration can occur for the next session.
+//
+// The prompt-capture table is shared the same way (PROMPT_CAPTURES_KEY): skipping
+// re-registration is not enough when the first copy's before_agent_start handler
+// is dropped and a second copy records into a different Map.
 const ACTIVE_STREAM_SIMPLE_KEY = Symbol.for("claude-bridge:activeStreamSimple");
 
 // MODELS is buildModels(getModels("anthropic")) — projection kept in models.js.
@@ -790,8 +795,10 @@ function showStartupNoticeOnce(): void {
 }
 
 // Captures of what pi assembled per agent; see src/prompt-capture.ts for why this
-// is keyed rather than held in a single slot.
-const promptCaptures = new PromptCaptures(256, (diagnostic) => {
+// is keyed rather than held in a single slot. Process-wide: a second evaluation
+// of this module (user vs project package root, or a subagent) must record into
+// the same table the first evaluation's streamSimple reads.
+const promptCaptures = getSharedPromptCaptures(() => new PromptCaptures(256, (diagnostic) => {
 	const first = diagnostic.matches[0];
 	debug(
 		`prompt-capture: no match for ${diagnostic.systemPrompt.length}-char system prompt. `
@@ -801,7 +808,7 @@ const promptCaptures = new PromptCaptures(256, (diagnostic) => {
 			: "no known captures to compare against."
 		) + ` known keys=${diagnostic.matches.length}`,
 	);
-});
+}));
 
 /** Whatever a settled session left behind, named in one greppable line.
  *

package/src/prompt-capture.ts

@@ -162,7 +162,10 @@ export class PromptCaptures {
 				+ `Claude Code would receive none of this turn's context files, skills or custom instructions. `
 				+ `The usual cause is an extension loaded after claude-bridge that rewrites the system prompt from before_agent_start — `
 				+ `one that wraps it is fine, one that rebuilds or strips it leaves nothing to match. `
-				+ `(Also possible: pi rebuilt the prompt outside before_agent_start — a late-registered tool or fresh resource discovery.)`,
+				+ `(Also possible: pi rebuilt the prompt outside before_agent_start — a late-registered tool or fresh resource discovery.)`
+				+ (this.captures.size === 0
+					? ` Zero known also means before_agent_start never recorded into this table — often a second copy of this extension loaded from another package root after the first registered the provider.`
+					: ""),
 			);
 		}
 
@@ -232,6 +235,30 @@ export class PromptCaptures {
 	}
 }
 
+/** Process-wide slot for the capture table.
+ *
+ *  `src/index.ts` is evaluated once per package root. Pi's pre-trust pass loads
+ *  the user install, which registers the provider; the post-trust pass then
+ *  loads the project install as a different module and drops the first copy's
+ *  event handlers. A per-module Map means `before_agent_start` records into a
+ *  table the live `streamSimple` never reads.
+ *
+ *  Symbol.for shares one table across those evaluations, the same way
+ *  `ACTIVE_STREAM_SIMPLE_KEY` shares the stream. Do not use `instanceof
+ *  PromptCaptures` to recognize the stored value: two package roots evaluate
+ *  two copies of the class, so a cross-realm check would replace the table
+ *  the first copy's stream already closed over. */
+export const PROMPT_CAPTURES_KEY = Symbol.for("claude-bridge:promptCaptures");
+
+export function getSharedPromptCaptures(create: () => PromptCaptures): PromptCaptures {
+	const g = globalThis as Record<symbol, unknown>;
+	const existing = g[PROMPT_CAPTURES_KEY];
+	if (existing) return existing as PromptCaptures;
+	const created = create();
+	g[PROMPT_CAPTURES_KEY] = created;
+	return created;
+}
+
 export function projectPromptCapture(
 	capture: PromptCapture,
 	options: { skillReadTool: SkillReadTool },