@vanillagreen/pi-claude-bridge 1.1.0 → 1.1.2

package/README.md

@@ -1,10 +1,20 @@
 # pi-claude-bridge
+
 ![Claude bridge demo response](https://raw.githubusercontent.com/vanillagreencom/vstack/main/pi-extensions/pi-claude-bridge/assets/bridge-demo.png)
 ![Claude Bridge settings panel](https://raw.githubusercontent.com/vanillagreencom/vstack/main/pi-extensions/pi-claude-bridge/assets/settings-panel.png)
 
-Claude Code provider bridge for Pi. It registers `claude-bridge/*` models and routes Pi turns through the Claude Agent SDK while keeping Pi's tools in the Pi TUI.
+Run Claude Code as a Pi provider. Adds `claude-bridge/*` models to `/model` and routes Pi turns through the Claude Agent SDK while keeping Pi's tools and TUI.
+
+Forked from [`elidickinson/pi-claude-bridge`](https://github.com/elidickinson/pi-claude-bridge). The provider, MCP bridge, session sync, and SDK plumbing come from upstream; this fork removes the AskClaude tool and adds opt-in forwarding for Pi prompt context.
+
+## Highlights
 
-This package is a vstack fork of [`elidickinson/pi-claude-bridge`](https://github.com/elidickinson/pi-claude-bridge). The provider, MCP tool bridge, session sync, streaming, and Claude Code SDK plumbing come from that project; this fork removes the AskClaude tool and adds vstack-controlled prompt-context forwarding.
+- `claude-bridge/claude-opus-4-7`, Sonnet, and Haiku in `/model`.
+- Pi tool calls run on Pi; Claude Code handles reasoning.
+- Session continuity across normal turns, `/compact`, tree navigation, and abort recovery.
+- Thinking-level forwarding with summarized Opus thinking display.
+- MCP isolation and Claude cloud-MCP suppression to keep tokens lean.
+- Opt-in forwarding of `APPEND_SYSTEM.md` and recognized Pi prompt hooks.
 
 ## Install
 
@@ -23,47 +33,48 @@ vstack add vanillagreencom/vstack --pi-extension pi-claude-bridge --harness pi -
 
 Restart Pi after installation.
 
-## What it provides
-
-- `claude-bridge/claude-opus-4-7`, Sonnet, and Haiku models in `/model`.
-- Pi tool calls bridged to Claude Code through a local MCP server.
-- Session reuse/rebuild so Claude Code follows Pi history across normal turns, `/compact`, forks, tree navigation, and abort recovery.
-- Thinking-level forwarding, summarized Opus thinking display, MCP isolation, and Claude cloud-MCP suppression to reduce token overhead.
-- Optional forwarding of Pi-only context that upstream does not pass to Claude Code.
-
 ## Prompt context
 
 Default behavior matches upstream: append `AGENTS.md` plus Pi's skills block to Claude Code's `claude_code` preset prompt.
 
-Extra Pi prompt context is **off by default** and can be enabled in `/extensions:settings` → `Claude Bridge`:
+Extra Pi context is off by default. Enable per item in the extension manager when you want Claude Code to see prompt blocks that other Pi extensions add to your session.
+
+## Settings
 
-| Setting | Default | Effect |
-| --- | --- | --- |
-| `includeAppendSystemPromptMd` | off | Forward project/global `APPEND_SYSTEM.md`, including `.pi/APPEND_SYSTEM.md`. |
-| `includeProjectAgentsHook` | off | Forward recognized `pi-agents-tmux` `before_agent_start` additions such as the Project Agents/Subagents list. |
-| `includeTaskPanelHook` | off | Forward recognized `pi-task-panel` workflow reminders. |
-| `includeCavemanHook` | off | Forward recognized `pi-caveman` response-style prompt additions. |
+All settings live in the extension manager under **Claude Bridge**.
 
-The bridge detects these hook additions from the effective Pi system prompt for the current turn and forwards only enabled recognized blocks.
+### General
 
-## Settings
+| Setting | What it does |
+| --- | --- |
+| Enable Claude bridge provider | Register `claude-bridge/*` models. Reload required. |
+
+### Base prompt
+
+| Setting | What it does |
+| --- | --- |
+| Forward AGENTS.md + skills | Append AGENTS.md and Pi's skills block. |
+
+### Pi prompt context
+
+| Setting | What it does |
+| --- | --- |
+| Forward APPEND_SYSTEM.md | Forward project/global `APPEND_SYSTEM.md` content. |
 
-| Setting | Default | Notes |
-| --- | --- | --- |
-| `enabled` | on | Register the Claude bridge provider; reload required. |
-| `appendSystemPrompt` | on | Forward `AGENTS.md` + skills. |
-| `strictMcpConfig` | on | When Claude Code filesystem settings are loaded, block filesystem MCP auto-loads; Pi owns tool execution. |
-| `pathToClaudeCodeExecutable` | auto | Explicit `claude` binary path; empty auto-detects `claude` or `claude-code` on PATH. |
+### Pi prompt hooks
 
-Legacy config files are still read: `~/.pi/agent/claude-bridge.json` and `.pi/claude-bridge.json`. vstack extension-manager settings override them.
+| Setting | What it does |
+| --- | --- |
+| Forward project agents hook | Forward `pi-agents-tmux` Project Agents/Subagents list. |
+| Forward task panel hook | Forward `pi-task-panel` workflow reminders. |
+| Forward caveman hook | Forward `pi-caveman` response-style directives. |
 
-## Differences from upstream
+### Claude Code
 
-- No AskClaude tool; this package is provider-only.
-- vstack extension-manager settings for prompt forwarding and Claude Code options.
-- Bundled runtime dependencies for vstack installs; the bridge auto-detects the local Claude Code executable.
-- Opt-in delivery of `APPEND_SYSTEM.md` and recognized Pi `before_agent_start` prompt hooks.
-- Keeps upstream provider fixes: ID-based tool-result matching, compact/session rebuild handling, abort recovery, skill read-tool rewriting, strict MCP config, cloud MCP suppression, and Opus 4.7 thinking display forcing.
+| Setting | What it does |
+| --- | --- |
+| Strict MCP config | Block filesystem MCP auto-loads; Pi owns tools. |
+| Claude executable path | Explicit `claude` binary path; empty auto-detects. |
 
 ## Debugging
 

package/bundle/index.js

@@ -19186,6 +19186,7 @@ function readSession(jsonlPath, projectPath) {
 // src/index.ts
 import { createHash } from "crypto";
 import { accessSync, appendFileSync as appendFileSync3, constants as fsConstants, mkdirSync as mkdirSync3, realpathSync as realpathSync3, statSync as statSync3 } from "fs";
+import { resolve as pathResolve } from "path";
 import { homedir as homedir5 } from "os";
 import { delimiter, dirname as dirname5, join as join5 } from "path";
 
@@ -19596,8 +19597,7 @@ function tryParseJson(path) {
   if (!existsSync3(path)) return {};
   try {
     return JSON.parse(readFileSync4(path, "utf-8"));
-  } catch (e2) {
-    console.error(`claude-bridge: failed to parse ${path}: ${e2}`);
+  } catch {
     return {};
   }
 }
@@ -19797,11 +19797,7 @@ ${taskReminder}`);
     }
   }
   if (settings.includeCavemanHook) {
-    const caveman = extractBlockByMarkers(systemPrompt, [
-      /^Caveman communication mode active/m,
-      /^Token efficiency mode: terse smart caveman/m,
-      /^Caveman mode is active/m
-    ]);
+    const caveman = extractBlockByMarkers(systemPrompt, [/^You MUST respond in caveman /m]);
     if (caveman) {
       parts.push(`### before_agent_start: caveman
 
@@ -34544,9 +34540,34 @@ function claudeSessionExists(sessionId, cwd) {
     return false;
   }
 }
+function canonicalize(p4) {
+  if (!p4) return void 0;
+  try {
+    return realpathSync3.native(p4);
+  } catch {
+    return pathResolve(p4);
+  }
+}
+function shouldRestorePersistedBridgeEntry(persisted, currentPiSessionId, currentCwd) {
+  if (!persisted.piSessionId) return "missing piSessionId";
+  if (currentPiSessionId && persisted.piSessionId !== currentPiSessionId) {
+    return `piSessionId mismatch (persisted=${persisted.piSessionId} current=${currentPiSessionId})`;
+  }
+  if (currentCwd && canonicalize(persisted.cwd) !== canonicalize(currentCwd)) {
+    return `cwd mismatch (persisted=${persisted.cwd} current=${currentCwd})`;
+  }
+  return void 0;
+}
 function restoreSharedSessionFromPi(ctx2) {
   const persisted = latestPersistedBridgeSession(ctx2.sessionManager);
   if (!persisted) return;
+  const currentPiSessionId = typeof ctx2.sessionManager?.getSessionId === "function" ? ctx2.sessionManager.getSessionId() : void 0;
+  const currentCwd = typeof ctx2.sessionManager?.getCwd === "function" ? ctx2.sessionManager.getCwd() : ctx2.cwd;
+  const rejection = shouldRestorePersistedBridgeEntry(persisted, currentPiSessionId, currentCwd);
+  if (rejection) {
+    debug(`restoreSharedSession: ${rejection} \u2014 forcing rebuild`);
+    return;
+  }
   const built = readBuiltSessionContext(ctx2.sessionManager);
   if (!built) return;
   const cursor = Math.max(0, Math.min(persisted.cursor, built.messages.length));
@@ -35322,7 +35343,7 @@ function index_default(pi) {
     if (event.reason === "new" || event.reason === "resume" || event.reason === "fork") {
       clearSession(`session_start:${event.reason}`);
     }
-    if (event.reason === "startup" || event.reason === "resume" || event.reason === "fork") restoreSharedSessionFromPi(ctx2);
+    if (event.reason === "startup" || event.reason === "resume") restoreSharedSessionFromPi(ctx2);
   });
   pi.on("session_shutdown", () => clearSession("session_shutdown"));
   pi.on("message_end", (event, ctx2) => {
@@ -35356,5 +35377,7 @@ export {
   CLAUDE_BRIDGE_TOOL_ISOLATION,
   DISALLOWED_BUILTIN_TOOLS,
   index_default as default,
-  mapToolName
+  mapToolName,
+  restoreSharedSessionFromPi,
+  shouldRestorePersistedBridgeEntry
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vanillagreen/pi-claude-bridge",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Pi provider bridge that runs Claude Code through the Claude Agent SDK, with opt-in forwarding for Pi prompt context.",
   "type": "module",
   "keywords": [
@@ -119,7 +119,7 @@
     "build": "esbuild src/index.ts --bundle --platform=node --format=esm --target=node20 --outfile=bundle/index.js --external:@earendil-works/pi-ai --external:@earendil-works/pi-coding-agent",
     "prepack": "npm run build",
     "test:unit": "node --import tsx --test tests/unit-*.mjs",
-    "test": "set -a && [ -f .env.test ] && . .env.test; set +a && npm run test:unit && tests/int-smoke.sh && tests/int-multi-turn.sh && tests/int-cache.sh && node --import tsx --test tests/int-*.mjs",
+    "test": "set -a && [ -f .env.test ] && . ./.env.test; set +a && npm run test:unit && tests/int-smoke.sh && tests/int-multi-turn.sh && tests/int-cache.sh && node --import tsx --test tests/int-*.mjs",
     "test:usage": "tests/usage-test.sh",
     "typecheck": "tsc --noEmit"
   },

package/src/config.ts

@@ -73,8 +73,9 @@ export function tryParseJson(path: string): Partial<Config> {
 	if (!existsSync(path)) return {};
 	try {
 		return JSON.parse(readFileSync(path, "utf-8"));
-	} catch (e) {
-		console.error(`claude-bridge: failed to parse ${path}: ${e}`);
+	} catch {
+		// Malformed optional config should not write raw terminal diagnostics;
+		// stdout/stderr output can corrupt active Pi TUI widgets.
 		return {};
 	}
 }

package/src/index.ts

@@ -6,6 +6,7 @@ import type { Base64ImageSource, ContentBlockParam, MessageParam } from "@anthro
 import { createSession, deleteSession, openSession, repairToolPairing } from "cc-session-io";
 import { createHash } from "crypto";
 import { accessSync, appendFileSync, constants as fsConstants, mkdirSync, realpathSync, statSync } from "fs";
+import { resolve as pathResolve } from "path";
 import { homedir } from "os";
 import { delimiter, dirname, join } from "path";
 import { PROVIDER_ID, messageContentToText, convertPiMessages } from "./convert.js";
@@ -238,9 +239,47 @@ function claudeSessionExists(sessionId: string, cwd: string): boolean {
 	}
 }
 
-function restoreSharedSessionFromPi(ctx: { sessionManager?: unknown }): void {
+function canonicalize(p: string | undefined): string | undefined {
+	if (!p) return undefined;
+	try { return realpathSync.native(p); } catch { return pathResolve(p); }
+}
+
+// Decides whether a persisted bridge-session marker is safe to restore.
+//
+// The fork case is the load-bearing one: pi/core's createBranchedSession copies
+// every non-label entry from root→leaf into the new session file. That includes
+// our claude-bridge-session markers from the parent. Restoring from them would
+// --resume parent's Claude jsonl on the fork's first turn, leaking conversation
+// past the fork point.
+//
+// Returns undefined when the entry is safe to use, or a short rejection reason
+// for diagnostic logging. Old entries without piSessionId always reject, which
+// degrades safely to the rebuild path.
+export function shouldRestorePersistedBridgeEntry(
+	persisted: { piSessionId?: string; cwd: string },
+	currentPiSessionId: string | undefined,
+	currentCwd: string | undefined,
+): string | undefined {
+	if (!persisted.piSessionId) return "missing piSessionId";
+	if (currentPiSessionId && persisted.piSessionId !== currentPiSessionId) {
+		return `piSessionId mismatch (persisted=${persisted.piSessionId} current=${currentPiSessionId})`;
+	}
+	if (currentCwd && canonicalize(persisted.cwd) !== canonicalize(currentCwd)) {
+		return `cwd mismatch (persisted=${persisted.cwd} current=${currentCwd})`;
+	}
+	return undefined;
+}
+
+export function restoreSharedSessionFromPi(ctx: { sessionManager?: unknown; cwd?: string }): void {
 	const persisted = latestPersistedBridgeSession(ctx.sessionManager);
 	if (!persisted) return;
+	const currentPiSessionId = typeof (ctx.sessionManager as any)?.getSessionId === "function" ? (ctx.sessionManager as any).getSessionId() : undefined;
+	const currentCwd = typeof (ctx.sessionManager as any)?.getCwd === "function" ? (ctx.sessionManager as any).getCwd() : ctx.cwd;
+	const rejection = shouldRestorePersistedBridgeEntry(persisted, currentPiSessionId, currentCwd);
+	if (rejection) {
+		debug(`restoreSharedSession: ${rejection} — forcing rebuild`);
+		return;
+	}
 	const built = readBuiltSessionContext(ctx.sessionManager);
 	if (!built) return;
 	const cursor = Math.max(0, Math.min(persisted.cursor, built.messages.length));
@@ -1292,7 +1331,11 @@ export default function (pi: ExtensionAPI) {
 		if (event.reason === "new" || event.reason === "resume" || event.reason === "fork") {
 			clearSession(`session_start:${event.reason}`);
 		}
-		if (event.reason === "startup" || event.reason === "resume" || event.reason === "fork") restoreSharedSessionFromPi(ctx);
+		// Note: "fork" intentionally omitted from restoration. createBranchedSession
+		// copies the parent's persisted bridge entries into the fork; restoring from
+		// them would --resume the parent's Claude jsonl and leak conversation past the
+		// fork point. Letting the first fork turn rebuild is the correct path.
+		if (event.reason === "startup" || event.reason === "resume") restoreSharedSessionFromPi(ctx);
 	});
 	pi.on("session_shutdown", () => clearSession("session_shutdown"));
 	pi.on("message_end", (event, ctx) => {

package/src/prompt-context.ts

@@ -115,11 +115,7 @@ export function buildPromptContextAppend(systemPrompt: string | undefined, cwd:
 	}
 
 	if (settings.includeCavemanHook) {
-		const caveman = extractBlockByMarkers(systemPrompt, [
-			/^Caveman communication mode active/m,
-			/^Token efficiency mode: terse smart caveman/m,
-			/^Caveman mode is active/m,
-		]);
+		const caveman = extractBlockByMarkers(systemPrompt, [/^You MUST respond in caveman /m]);
 		if (caveman) {
 			parts.push(`### before_agent_start: caveman\n\n${caveman}`);
 			labels.push("caveman hook");