@vanillagreen/pi-claude-bridge 1.1.0 → 1.1.1

package/README.md

@@ -27,7 +27,7 @@ Restart Pi after installation.
 
 - `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.
+- Session reuse/rebuild so Claude Code follows Pi history across normal turns, `/compact`, tree navigation, and abort recovery. Forks rebuild on the first turn so the fork never inherits the parent's external Claude jsonl.
 - 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.
 

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";
 
@@ -19797,11 +19798,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 +34541,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 +35344,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 +35378,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.1",
   "description": "Pi provider bridge that runs Claude Code through the Claude Agent SDK, with opt-in forwarding for Pi prompt context.",
   "type": "module",
   "keywords": [

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");