one-code-extension 0.5.0 → 0.6.0

package/extensions/subagents/runner.ts

@@ -29,6 +29,8 @@ import { CHILD_EXTENSION_PATHS } from "../lib/child-extensions.ts";
 import { type HandbackSlot, SUBAGENT_HANDBACK, subagentHandbackExtension } from "../lib/subagent-handback.ts";
 import type { RequestCapture } from "../lib/request-replay.ts";
 import { forkCacheExtension } from "./fork-cache.ts";
+import { parentModeExtension } from "./parent-mode.ts";
+import { type DeferRequest, deferLikeParentExtension, injectedByParent } from "../lib/deferred.ts";
 import type { ChildHandle, ChildOutcome, RpcChildHandle } from "./outcome.ts";
 import { sendToMainTool } from "./send-to-main-tool.ts";
 import { SessionTurnTracker } from "./session-turns.ts";
@@ -162,6 +164,10 @@ export class SubagentRuntime {
 	 * still-connecting (possibly empty) one.
 	 */
 	private readonly getMcpTools: () => ToolDefinition[] | Promise<ToolDefinition[]>;
+	/** The tools the parent session defers (lib/deferred.ts queryDeferred): a child defers the ones injected into it the same way. */
+	private readonly getParentDeferred: () => DeferRequest[];
+	/** The main session's live permission mode, for a fork: told to it when it differs from what it was told (parent-mode.ts). */
+	private readonly getParentMode: (() => string) | undefined;
 	/**
 	 * The parent's permission decision closure (undefined until permissions
 	 * publishes it), wrapped so every call carries the asking run's name: the
@@ -200,8 +206,12 @@ export class SubagentRuntime {
 		onExtensionError: (runName: string | undefined, error: ExtensionError) => void,
 		onModelUnusable: (model: string, reason: string) => void,
 		onChildWrite: (path: string, runName: string | undefined) => void,
+		getParentDeferred: () => DeferRequest[],
+		getParentMode: (() => string) | undefined,
 	) {
 		this.modelRuntime = modelRuntime;
+		this.getParentDeferred = getParentDeferred;
+		this.getParentMode = getParentMode;
 		this.onChildWrite = onChildWrite;
 		this.baseCwd = baseCwd;
 		this.getMcpTools = getMcpTools;
@@ -231,11 +241,13 @@ export class SubagentRuntime {
 		onExtensionError: (runName: string | undefined, error: ExtensionError) => void = () => {},
 		onModelUnusable: (model: string, reason: string) => void = () => {},
 		onChildWrite: (path: string, runName: string | undefined) => void = () => {},
+		getParentDeferred: () => DeferRequest[] = () => [],
+		getParentMode?: () => string,
 	): Promise<SubagentRuntime> {
 		const modelRuntime = await createSharedModelRuntime(getAgentDir());
 		// Prime the catalog once; spawns read the live snapshot (see resolveModel).
 		await modelRuntime.getAvailable();
-		return new SubagentRuntime(modelRuntime, cwd, getMcpTools, getPermissionBridge, getHookBridge, onExtensionError, onModelUnusable, onChildWrite);
+		return new SubagentRuntime(modelRuntime, cwd, getMcpTools, getPermissionBridge, getHookBridge, onExtensionError, onModelUnusable, onChildWrite, getParentDeferred, getParentMode);
 	}
 
 	/**
@@ -275,7 +287,11 @@ export class SubagentRuntime {
 			// lib/subagent-handback.ts). Inline extensions load after the paths
 			// above, so the fork-cache one, last, sees the final body.
 			extraFactories: [
+				// The tools injected below (the spawn and cron tools, the shared MCP
+				// tools) are deferred as the parent defers them: their owners run there.
+				deferLikeParentExtension(this.getParentDeferred(), injectedByParent(spec.extraTools ?? [])),
 				subagentHandbackExtension(handback, { deferred: fork }),
+				...(fork && this.getParentMode ? [parentModeExtension(this.getParentMode)] : []),
 				...(fork && spec.parentRequest ? [forkCacheExtension(spec.parentRequest)] : []),
 			],
 			// claude-context (above) injects the CLAUDE.md instructions on the child's session_start;
@@ -390,7 +406,10 @@ export class SubagentRuntime {
 	 * agent's own prompt and toolset.
 	 */
 	private async buildChildSession(spec: ChildSessionSpec, handback: HandbackSlot): Promise<{ session: Session; note?: string }> {
-		const [loader, mcpTools] = await Promise.all([buildAgentLoader(this.childLoaderOptions(spec, handback)), this.getMcpTools()]);
+		// The MCP wait first: the loader takes the parent's deferrals, which a server
+		// connecting during the wait adds to (it is instant once the connects settled).
+		const mcpTools = await this.getMcpTools();
+		const loader = await buildAgentLoader(this.childLoaderOptions(spec, handback));
 		const newSessionManager = () => newChildSessionManager(spec);
 		// A fork keeps the parent's toolset; only a named agent carries tool lists.
 		const agent = spec.forkFrom ? undefined : spec.agent;
@@ -659,6 +678,14 @@ export class SubagentRuntime {
 				await session.steer(message);
 				return "steered";
 			},
+			// The background extension is not loaded in a child, so the parent's
+			// cron fires record what they sent straight into the child's session.
+			conversation: {
+				getBranch: () => session.sessionManager.getBranch(),
+				appendEntry: (customType, data) => {
+					session.sessionManager.appendCustomEntry(customType, data);
+				},
+			},
 			busy: () => turnActive || !session.isIdle,
 			exited: () => exited,
 			kill: () => {

package/extensions/subagents/runs.ts

@@ -140,6 +140,11 @@ export class RunRegistry {
 		this.reserved.clear();
 	}
 
+	/** Keep only the records `keep` accepts; names held for runs being spawned stay held. */
+	retain(keep: (record: AgentRunRecord) => boolean): void {
+		for (const record of [...this.byId.values()]) if (!keep(record)) this.remove(record.taskId);
+	}
+
 	/** Hold a name until its record is added. */
 	reserve(name: string): void {
 		this.reserved.add(name);

package/extensions/system-prompt/index.ts

@@ -11,16 +11,22 @@
  * which a model that takes a mid-conversation system message gets there
  * instead (system-reminder). The scratchpad path the block names embeds the
  * session id — derived at session_start, constant within the session.
+ *
+ * Both are live state with facts: the scratchpad the block names and whether
+ * the run is one-shot. Inside an epoch message 1 is the record, so a /fork
+ * (a new session id, so a new scratchpad) or a session continued in another
+ * run mode is announced on the request's tail, live minus what the epoch
+ * told (RENDER_CHANNEL), never by rewriting message 1.
  */
 
 import { getCurrentSystemMessage } from "@earendil-works/pi-ai";
 import type { BuildSystemPromptOptions, ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { environmentBlock, modelLine } from "../lib/environment-block.ts";
 import { GIT_SNAPSHOT_OWNER_CHANNEL } from "../lib/git-status.ts";
-import { oneShotSessionNote, sessionOutlivesTurn } from "../lib/notifications.ts";
+import { interactiveSessionNote, oneShotSessionNote, sessionOutlivesTurn } from "../lib/notifications.ts";
 import { taskToolsEnabled } from "../lib/model-tier.ts";
 import { sessionModelTier } from "../lib/session-model-tier.ts";
-import { CONTEXT_ORDER, REMINDER_CHANNEL } from "../lib/reminders.ts";
+import { CONTEXT_ORDER, REMINDER_CHANNEL, RENDER_CHANNEL, type RenderRequest, toldBlockFact } from "../lib/reminders.ts";
 import { privateSessionScratchpadDir } from "../lib/scratchpad.ts";
 import { collectEnvironment, type EnvironmentInfo } from "./environment.ts";
 import { totalTokensBlock, turnTokenBudget } from "../context-budget/budget.ts";
@@ -29,6 +35,16 @@ import { buildClaudeCodeSystemPrompt } from "./template.ts";
 import { WORKSPACE_CHANNEL, type WorkspaceAnnouncement } from "../lib/workspace-channel.ts";
 import { PROMPT_OPTIONS_CHANNEL, type PromptOptionsAnnouncement, SYSTEM_PROMPT_REQUEST_CHANNEL, type SystemPromptRequest } from "../lib/prompt-options.ts";
 
+/** The told fact of the scratchpad the environment block names. */
+const SCRATCHPAD_FACT = "environment:scratchpad";
+/** The told mode of the one-shot run note. */
+const ONE_SHOT_MODE = "one-shot";
+
+/** The notice that this session's scratchpad is not the one message 1 names (a /fork is a new session). */
+function scratchpadChangedNote(dir: string): string {
+	return `This session's scratchpad directory is now ${dir}. Use it for temporary files instead of the scratchpad named earlier in this conversation.`;
+}
+
 export default function systemPromptExtension(pi: ExtensionAPI) {
 	const requestTier = sessionModelTier(pi);
 	let cachedEnv: EnvironmentInfo | undefined;
@@ -40,6 +56,8 @@ export default function systemPromptExtension(pi: ExtensionAPI) {
 	let workspaceDirs: string[] = [];
 	/** The options the last before_agent_start saw; a turn opened from idle rebuilds from them. */
 	let lastOptions: BuildSystemPromptOptions | undefined;
+	/** Whether this run is one-shot (`-p`, json): the turn_start that queued the blocks saw it. */
+	let oneShotRun = false;
 	pi.events.on(WORKSPACE_CHANNEL, (data) => {
 		const dirs = (data as WorkspaceAnnouncement | undefined)?.dirs;
 		workspaceDirs = Array.isArray(dirs) ? dirs.filter((dir): dir is string => typeof dir === "string") : [];
@@ -88,24 +106,26 @@ export default function systemPromptExtension(pi: ExtensionAPI) {
 		const env = environment(ctx.cwd);
 		pi.events.emit(REMINDER_CHANNEL, {
 			text: environmentBlock({ ...env, scratchpadDir: scratchpad, workspaceDirs }),
-			scope: "every-turn",
 			key: "environment",
 			placement: "first-prepend",
 			order: CONTEXT_ORDER.environment,
+			facts: [toldBlockFact(SCRATCHPAD_FACT, scratchpad ?? "")],
 		});
-		if (!sessionOutlivesTurn(ctx.mode)) {
+		oneShotRun = !sessionOutlivesTurn(ctx.mode);
+		if (oneShotRun) {
 			pi.events.emit(REMINDER_CHANNEL, {
 				text: oneShotSessionNote(),
-				scope: "every-turn",
 				key: "one-shot",
 				placement: "first-prepend",
 				order: CONTEXT_ORDER.oneShot,
+				facts: [{ kind: "mode", key: ONE_SHOT_MODE, on: true }],
 			});
+		} else {
+			pi.events.emit(REMINDER_CHANNEL, { key: "one-shot", remove: true });
 		}
 		if (ctx.model) {
 			pi.events.emit(REMINDER_CHANNEL, {
 				text: modelLine(ctx.model),
-				scope: "every-turn",
 				key: "model-line",
 				placement: "first-prepend",
 				order: CONTEXT_ORDER.modelLine,
@@ -113,6 +133,20 @@ export default function systemPromptExtension(pi: ExtensionAPI) {
 		}
 	});
 
+	// Inside an epoch, what changed since message 1 was rendered goes on the tail.
+	pi.events.on(RENDER_CHANNEL, (data) => {
+		const request = data as RenderRequest;
+		if (request.epoch || lastOptions?.customPrompt) return;
+		const told = request.toldBlocks.get(SCRATCHPAD_FACT);
+		const live = toldBlockFact(SCRATCHPAD_FACT, scratchpad ?? "");
+		if (told !== undefined && told !== live.hash && scratchpad) {
+			request.blocks.push({ text: scratchpadChangedNote(scratchpad), facts: [live] });
+		}
+		if ((request.modes.get(ONE_SHOT_MODE) ?? false) !== oneShotRun) {
+			request.blocks.push({ text: oneShotRun ? oneShotSessionNote() : interactiveSessionNote(), facts: [{ kind: "mode", key: ONE_SHOT_MODE, on: oneShotRun }] });
+		}
+	});
+
 	// A copy: pi goes on mutating this object after the handlers return
 	// (forceSystemPrompt, the live selectedTools).
 	const copyOptions = (options: BuildSystemPromptOptions): BuildSystemPromptOptions => ({

package/extensions/system-prompt/template.ts

@@ -39,7 +39,16 @@ const BUNDLES: Record<PromptTier, PromptBundle> = {
 
 function buildToolsSection(options: BuildSystemPromptOptions): string {
 	const tools = options.selectedTools ?? ["read", "bash", "edit", "write"];
-	const visible = tools.filter((name) => !!options.toolSnippets?.[name]);
+	// In registration order (the snippets' own), never activation order: a tool
+	// withdrawn and brought back (a model hop through another tier) is appended
+	// to pi's active list, and a prompt built from that order would depend on
+	// the process's history instead of the branch (R3, the fresh-process oracle).
+	const order = Object.keys(options.toolSnippets ?? {});
+	const rank = (name: string) => {
+		const at = order.indexOf(name);
+		return at === -1 ? order.length : at;
+	};
+	const visible = tools.filter((name) => !!options.toolSnippets?.[name]).sort((a, b) => rank(a) - rank(b));
 	const toolsList =
 		visible.length > 0 ? visible.map((name) => `- ${name}: ${options.toolSnippets![name]}`).join("\n") : "(none)";