one-code-extension 0.5.0 → 0.6.0

package/extensions/bash/index.ts

@@ -27,7 +27,6 @@ import { perCwd } from "../lib/per-cwd.ts";
 import { bashSpawn, piShellEnv, withChildProcessEnv } from "../lib/shell-spawn.ts";
 import { registerShellTool } from "../lib/shell-tool.ts";
 import { type DescriptionForm, followDescriptionForm } from "../lib/tool-variants.ts";
-import { CONTEXT_BASELINE_CHANNEL, restoredContext } from "../lib/context-stack.ts";
 import { PERMISSION_STATUS_CHANNEL, type PermissionStatus } from "../permissions/modes.ts";
 import { BASH_PARAMS, bashDescription } from "./description.ts";
 import { bashGuardReason } from "./guards.ts";
@@ -70,23 +69,15 @@ export function bashTool(pi: ExtensionAPI, { announce }: { announce: boolean })
 	const spawnHook = (context: BashSpawnContext): BashSpawnContext => ({ ...context, env: childProcessEnv(context.env) });
 	const base = createBashToolDefinition(process.cwd(), { shellPath, spawnHook });
 
-	// The tier follows the model; the permission-mode variant freezes when the
-	// first request starts. Re-registering on a mode switch changes both the
-	// description and pi's tool order, losing the entire cached prefix. Mode
-	// reminders and the live permission gate carry later changes instead.
+	// The description follows the tier and the permission mode. It reaches the
+	// wire only when a request opens an epoch: inside one the ledger keeps the
+	// tools array as recorded (extensions/ledger), so a mode switch never moves
+	// the tool or re-caches the prefix; mode reminders and the live permission
+	// gate carry the change instead.
 	let form: DescriptionForm = "short";
 	// Tiny's dedicated search tools replace the long form's shell-find advice.
 	let searchTools = false;
 	let autoMode = false;
-	let liveAutoMode = false;
-	let modeFrozen = false;
-	const restoredAutoMode = (): boolean | undefined => {
-		const baselines = restoredContext(pi.events)?.baselines;
-		// Older snapshots' last mode chose the last request's description.
-		const saved = baselines?.["bash-auto-mode"];
-		if (typeof saved === "boolean") return saved;
-		return typeof baselines?.["permission-mode"] === "string" ? baselines["permission-mode"] === "auto" : undefined;
-	};
 	const describe = () => bashDescription(form, autoMode, searchTools);
 	const setDescription = registerShellTool(pi, {
 		name: "bash",
@@ -104,24 +95,11 @@ export function bashTool(pi: ExtensionAPI, { announce }: { announce: boolean })
 		setDescription(describe());
 	});
 	pi.events.on(PERMISSION_STATUS_CHANNEL, (data) => {
-		liveAutoMode = (data as PermissionStatus).mode === "auto";
-		if (modeFrozen) return;
-		// Permissions' startup broadcast precedes this extension's session_start.
-		// Honor a restored variant even here: a temporary re-registration would
-		// move the tool despite putting its original description back afterwards.
-		autoMode = restoredAutoMode() ?? liveAutoMode;
+		const next = (data as PermissionStatus).mode === "auto";
+		if (next === autoMode) return;
+		autoMode = next;
 		setDescription(describe());
 	});
-	pi.on("session_start", () => {
-		const saved = restoredAutoMode();
-		modeFrozen = saved !== undefined;
-		autoMode = saved ?? liveAutoMode;
-		setDescription(describe());
-	});
-	pi.on("turn_start", () => {
-		modeFrozen = true;
-		pi.events.emit(CONTEXT_BASELINE_CHANNEL, { key: "bash-auto-mode", value: autoMode });
-	});
 
 	// The user's own `!` commands, under the bundled app only: pi runs them with
 	// its full process environment, so they get the same restore. Outside the app

package/extensions/btw/index.ts

@@ -14,8 +14,8 @@
  * reads the cache the session wrote (lib/request-replay.ts; the compaction
  * extension publishes the capture). Without a capture for the session model,
  * or on a provider API the replay does not cover, it falls back to a
- * standalone call: the messages the session last sent (captured from the
- * `context` event), the earlier side exchanges, an empty system prompt,
+ * standalone call: the current branch's messages (read from the session at
+ * call time), the earlier side exchanges, an empty system prompt,
  * name-only tool stubs so a history carrying tool_use blocks stays valid on
  * strict providers, and withReasoningFallback for models that cannot disable
  * thinking. Both run on the SESSION model: a side question deserves the same
@@ -23,17 +23,18 @@
  *
  * Like Claude Code, the session keeps a side history: each answered question
  * is threaded into the next one and listed in the panel, where it can be
- * browsed and cleared. `f` forks the current answer into a background fork
+ * browsed and cleared. A /tree keeps only the exchanges asked from a point
+ * the selected branch holds. `f` forks the current answer into a background fork
  * subagent through the subagents extension (lib/btw-fork.ts).
  */
 
-import type { AgentMessage } from "@earendil-works/pi-agent-core";
 import type { Api, Model } from "@earendil-works/pi-ai";
 import {
 	convertToLlm,
 	copyToClipboard,
 	type ExtensionAPI,
 	type ExtensionCommandContext,
+	type ExtensionContext,
 	getAgentDir,
 	SettingsManager,
 	UserMessageComponent,
@@ -43,7 +44,7 @@ import { btwForkedLine, type BtwForkResult, requestBtwFork } from "../lib/btw-fo
 import { canShowCustomUi, notifyOrPrint, printAnswer } from "../lib/headless-output.ts";
 import { announcePromptOptions } from "../lib/prompt-options.ts";
 import { followLastExchange, replaySideCall } from "../lib/replay-call.ts";
-import { answerText, stripImageBlocks, toolStubs, trimToTurnBoundary, withoutSystemMessages } from "../lib/side-call.ts";
+import { answerText, branchMessages, stripImageBlocks, toolStubs, trimToTurnBoundary, withoutSystemMessages } from "../lib/side-call.ts";
 import { boundedDockHeight, linesComponent, safeThemePaint, truncateLine } from "../lib/tui-render.ts";
 import { CONVERSATION_CACHE_PLACEMENT } from "../lib/side-call-cache.ts";
 import { releaseSideCalls, runSideCall } from "../lib/side-call-run.ts";
@@ -88,18 +89,23 @@ export default function btwExtension(pi: ExtensionAPI) {
 		return linesComponent((width) => [...row.render(width), truncateLine(`  ⎿  ${paint("dim", btwForkedLine(data.name, data.taskId))}`, width)]);
 	});
 
-	// The exact request messages the session last sent (after every extension's
-	// mutations), captured like recap and the compaction extension do.
-	let capturedMessages: AgentMessage[] | undefined;
-	pi.on("context", (event) => {
-		capturedMessages = event.messages;
-	});
-	// The same request as it went on the wire, and the reply that answered it.
+	// The session's last request as it went on the wire, and the reply that answered it.
 	const exchange = followLastExchange(pi);
 
 	// The session's answered side questions, oldest first: sent before each new
-	// question and listed in the panel. `x` in the panel clears them.
-	let history: BtwExchange[] = [];
+	// question and listed in the panel. `x` in the panel clears them. Each one
+	// keeps the entry the conversation stood at when it was asked, since it was
+	// answered from the conversation up to there.
+	let history: Array<BtwExchange & { askedAt: string | undefined }> = [];
+	/** The entry the branch ends at: where a side question is asked from (undefined in an empty session). */
+	const leafOf = (ctx: ExtensionContext): string | undefined => ctx.sessionManager.getBranch().at(-1)?.id;
+	/** Whether the selected branch holds the point a side question was asked from. */
+	const onBranch = (ctx: ExtensionContext, askedAt: string | undefined): boolean =>
+		askedAt === undefined || ctx.sessionManager.getBranch().some((entry) => entry.id === askedAt);
+	/** Thread an answer into the side history, unless a /tree since left the point it was asked from. */
+	const keep = (ctx: ExtensionContext, exchange: BtwExchange, askedAt: string | undefined) => {
+		if (exchange.answer && onBranch(ctx, askedAt)) history.push({ ...exchange, askedAt });
+	};
 
 	// The controller for an open panel's in-flight call. Aborted when the session
 	// is replaced or torn down, so a late resolve cannot repaint a disposed `tui`
@@ -116,7 +122,6 @@ export default function btwExtension(pi: ExtensionAPI) {
 		sessionEpoch++;
 		// Claude Code's `[question]` placeholder after a bare `/btw` in the prompt.
 		pi.events.emit(ARGUMENT_HINT_CHANNEL, { command: "btw", hint: "[question]" } satisfies ArgumentHint);
-		capturedMessages = undefined;
 		history = [];
 		inFlight?.abort();
 		inFlight = undefined;
@@ -127,6 +132,12 @@ export default function btwExtension(pi: ExtensionAPI) {
 		inFlight = undefined;
 		releaseSideCalls(ctx.sessionManager.getSessionId());
 	});
+	// A /tree keeps the side exchanges asked from a point the selected branch
+	// holds; the others were answered from the abandoned branch's conversation.
+	pi.on("session_tree", (_event, ctx) => {
+		const ids = new Set(ctx.sessionManager.getBranch().map((entry) => entry.id));
+		history = history.filter((exchange) => exchange.askedAt === undefined || ids.has(exchange.askedAt));
+	});
 
 	// The answer renders as Markdown, like the transcript; plain wrapped text
 	// until the renderer loads, or if it cannot.
@@ -157,7 +168,9 @@ export default function btwExtension(pi: ExtensionAPI) {
 		const auth = await ctx.modelRegistry.getApiKeyAndHeaders(model);
 		if (!auth.ok) throw new Error("No API key is available for the current model.");
 		const tools = toolStubs(pi.getActiveTools(), STUB_REASON);
-		const context = trimToTurnBoundary(withoutSystemMessages(capturedMessages ?? []));
+		// The current branch, read now: a /tree or a compaction since the last
+		// request changed it, and pi fires no `context` event for either.
+		const context = trimToTurnBoundary(withoutSystemMessages(branchMessages(ctx)));
 		// btw runs on a cheap, possibly text-only reader and answers a text question,
 		// so images the conversation carried are stripped before the call
 		// (working-docs/decisions/model-policy.md).
@@ -194,6 +207,7 @@ export default function btwExtension(pi: ExtensionAPI) {
 				ctx.ui.notify("Ask a side question: /btw <question>", "info");
 				return;
 			}
+			const askedAt = leafOf(ctx);
 			// The panel can fork a background agent whose completion opens the
 			// session's first turn; this context carries the options that turn
 			// is built from (lib/prompt-options.ts).
@@ -208,7 +222,7 @@ export default function btwExtension(pi: ExtensionAPI) {
 				try {
 					const answer = await ask(ctx, question, history, controller.signal);
 					if (controller.signal.aborted) return;
-					if (answer) history.push({ question, answer });
+					keep(ctx, { question, answer }, askedAt);
 					if (ctx.mode === "rpc") ctx.ui.notify(answer || "(no answer)", "info");
 					else printAnswer(ctx, answer || "(no answer)");
 				} catch (error) {
@@ -259,7 +273,7 @@ export default function btwExtension(pi: ExtensionAPI) {
 						const answer = await ask(ctx, question, earlier, controller.signal);
 						if (controller.signal.aborted) return;
 						view.answer = answer;
-						if (answer) history.push({ question, answer });
+						keep(ctx, { question, answer }, askedAt);
 					} catch (error) {
 						if (controller.signal.aborted) return;
 						view.error = error instanceof Error ? error.message : String(error);

package/extensions/cache-marks/index.ts

@@ -0,0 +1,42 @@
+/**
+ * cache-marks extension — keeps the previous request's conversation breakpoint
+ * on an Anthropic request, so a request that adds many blocks at once still
+ * reads the cache the previous one wrote (lib/previous-mark.ts has the why).
+ *
+ * The previous breakpoint comes from the ledger's plan, not from memory: inside
+ * an epoch the request extends a recorded base, and the base carried its tail
+ * mark on the last block before its trailing directive. So a resume, /reload,
+ * /tree and a pi cache warm mark the same block the base did.
+ *
+ * Load order: after the ledger's payload hook (extensions/ledger/wire.ts), the
+ * last extension that edits the messages. First-party Anthropic only: the
+ * Messages API is where the look-back was measured, and its four-breakpoint
+ * limit is checked here. `CC_CACHE_MARKS=0` turns it off, to compare a run with
+ * and without the mark.
+ */
+
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { looksLikeAnthropicRequest } from "../lib/anthropic-payload.ts";
+import { isFirstPartyAnthropic } from "../lib/anthropic-server-tools.ts";
+import { LEDGER_PLAN_CHANNEL, type RequestPlan } from "../lib/ledger/plan.ts";
+import { baseMark, withPreviousMark } from "../lib/previous-mark.ts";
+
+export default function cacheMarksExtension(pi: ExtensionAPI) {
+	if (process.env.CC_CACHE_MARKS === "0") return;
+	/** The plan of the request being sent; a warm reuses it. */
+	let plan: RequestPlan | undefined;
+	pi.events.on(LEDGER_PLAN_CHANNEL, (data) => {
+		plan = data as RequestPlan;
+	});
+	pi.on("session_start", () => {
+		plan = undefined;
+	});
+
+	pi.on("before_provider_request", (event, ctx) => {
+		const payload = event.payload as Record<string, unknown>;
+		if (!ctx.model || !isFirstPartyAnthropic(ctx.model) || !looksLikeAnthropicRequest(payload)) return undefined;
+		const base = plan && !plan.epoch ? plan.base : undefined;
+		const next = withPreviousMark(payload, base ? baseMark(payload.messages, base.list, ctx.model.api) : undefined);
+		return next === payload ? undefined : next;
+	});
+}