@oh-my-pi/pi-coding-agent 16.2.1 → 16.2.3

package/src/prompts/system/interrupted-thinking.md

@@ -0,0 +1,7 @@
+<system-notice type="interrupted-thinking">
+Your previous turn was interrupted while you were thinking.
+- You MUST treat the preserved reasoning as internal continuity context.
+- You MUST continue the user's task from the relevant unfinished point.
+------
+{{reasoning}}
+</system-notice>

package/src/prompts/system/recap-user.md

@@ -0,0 +1,9 @@
+<recap>
+The user stepped away and is coming back. Recap in under 40 words, 1-2 plain sentences, no markdown. Lead with the overall goal and current task, then the one next action. Skip root-cause narrative, fix internals, secondary to-dos, and em-dash tangents.
+{{#if goal}}
+Overall goal: {{goal}}
+{{/if}}
+{{#if task}}
+Active task: {{task}}
+{{/if}}
+</recap>

package/src/prompts/system/subagent-system-prompt.md

@@ -50,13 +50,16 @@ Use `irc` only for quick coordination, never long-form content. Address peers by
 COMPLETION
 ===================================
 
-No TODO tracking, no progress updates. Execute, call `yield`, done.
+No TODO tracking, no progress updates. Execute; report results with `yield`.
 
-While work remains, you MUST continue with another tool call — investigate, edit, run, verify. Save narrative for the final `yield` payload.
+While work remains, you MUST continue with another tool call — investigate, edit, run, verify. Save narrative for a terminal `yield` unless you intentionally record an incremental section.
 
-When finished, you MUST call `yield` exactly once. This is like writing to a ticket: provide what is required and close it.
+Yield protocol:
+- Omit `type` for the normal single terminal structured result in `result.data`.
+- Use non-empty `type: string[]` for incremental, non-terminal sections; calls accumulate by section.
+- Use `type: string` for a terminal result; if data is omitted, your last assistant turn becomes the raw final result.
 
-This is your only way to return a result. You NEVER put JSON in plain text, and you NEVER substitute a text summary for the structured `result.data` parameter.
+This is your only way to return a final result. For structured results, you NEVER put JSON in plain text or substitute a text summary for `result.data`.
 
 {{#if outputSchema}}
 Your result MUST match this TypeScript interface:
@@ -65,7 +68,7 @@ Your result MUST match this TypeScript interface:
 ```
 {{/if}}
 
-Giving up is a last resort. If truly blocked, you MUST call `yield` exactly once with `result.error` describing what you tried and the exact blocker.
+Giving up is a last resort. If truly blocked, you MUST terminal-yield `result.error` describing what you tried and the exact blocker.
 You NEVER give up due to uncertainty, missing information obtainable via tools or repo context, or needing a design decision you can derive yourself.
 
 You MUST keep going until this ticket is closed. This matters.

package/src/prompts/system/subagent-yield-reminder.md

@@ -1,12 +1,13 @@
 <system-reminder>
 Your last turn ended without a tool call, so the session went idle. This is reminder {{retryCount}} of {{maxRetries}}.
 
-Every turn MUST end with a tool call. Pick exactly one of:
-1. **Resume the work** — if the assignment is not finished, call the next tool you would have called (edit, write, bash, search, etc.). NEVER yield. NEVER treat this reminder as a forced stop.
-2. **Yield with success** — only if the assignment is genuinely complete: call `yield` with the structured payload in `result.data`.
-3. **Yield with error** — only if you hit a real, concrete blocker you can name (missing file, unavailable API, contradictory spec). Describe what you tried and the exact blocker. NEVER fabricate a "forced immediate-yield" or "system reminder required termination" reason — this reminder is not a blocker.
+Every turn MUST end with a tool call. Pick the first that applies:
+1. **Resume the work** — if the assignment is not finished and you are not recording an incremental section, call the next tool you would have called (edit, write, bash, search, etc.). NEVER treat this reminder as a forced stop.
+2. **Yield an incremental section** — only when useful for the assignment: call `yield` with non-empty `type: string[]`; matching sections accumulate and the task continues.
+3. **Yield with success** — only if the assignment is genuinely complete: call terminal `yield`. Omit `type` for the single final structured result in `result.data`; use `type: string` to finalize from the last assistant turn when data is omitted.
+4. **Yield with error** — only if you hit a real, concrete blocker you can name (missing file, unavailable API, contradictory spec). Describe what you tried and the exact blocker. NEVER fabricate a "forced immediate-yield" or "system reminder required termination" reason — this reminder is not a blocker.
 
-Default to option 1 unless the work is actually done or actually blocked.
+Default to option 1 unless the work is actually done, actually blocked, or ready for an incremental section.
 
 You NEVER end this turn with text only.
 </system-reminder>

package/src/prompts/system/system-prompt.md

@@ -58,7 +58,6 @@ Special URLs for internal resources; with most FS/bash tools they auto-resolve t
   {{/if}}
 - `agent://<id>`: agent output artifact; `/<path>` extracts a JSON field
 - `artifact://<id>`: artifact content
-- `history://<agentId>`: agent transcript (markdown); bare `history://` lists agents
 - `local://<name>.md`: plan artifacts or shared content for subagents
 {{#if hasObsidian}}
 - `vault://<vault>/<path>`: Obsidian vault (read/edit). `vault://` lists vaults; `vault://_/…` targets the active vault. File ops `?op=outline|backlinks|links|tags|properties|tasks|base|…`; vault ops `?op=search&q=…|daily|tasks|orphans|unresolved|bases|…`.

package/src/prompts/tools/irc.md

@@ -7,7 +7,7 @@ Send/receive short text messages between agents in this process.
 - Messaging an `idle`/`parked` peer wakes it — no separate revive call.
 - `op: "wait"` — block for a message (optionally only `from` one peer); consumes + returns it. Timeout = clean "no message", not an error.
 - `op: "inbox"` — drain pending messages without blocking.
-- Replies arrive only when the recipient sends one. For peer background, `read` `history://<id>`, don't interrogate.
+- Replies arrive only when the recipient sends one; don't interrogate a peer for status.
 </instruction>
 
 <when_to_use>
@@ -24,7 +24,7 @@ NEVER for: routine progress updates, things a tool call can verify, questions yo
 Applies to sending + replying.
 - **Plain prose only.** NEVER JSON status payloads like `{"type":"task_completed",…}` — write a normal sentence.
 - **NEVER quote the message you answer.** Lead with the answer; set `replyTo`.
-- **Learn about peers via IRC** — NEVER grep artifacts, read other sessions' JSONL, or shell-poke. DM them, or `read` `history://<id>`.
+- **Learn about peers via IRC** — NEVER grep artifacts, read other sessions' JSONL, or shell-poke. DM them.
 - **Send, then keep working.** `wait`/`await: true` only when you cannot proceed. NEVER "did you get my message?". A `failed` receipt = peer unreachable — move on; NEVER retry in a loop.
 - **Answer expected questions** via `irc send` to the sender (finish your current step first).
 - **Stay terse.** One question per send; share files via `local://`/`memory://`/`artifact://` URLs, never pasted blobs.

package/src/prompts/tools/read.md

@@ -7,7 +7,7 @@ Read files, directories, archives, SQLite, images, documents, internal resources
 
 ## Parameters
 
-- `path` — required. Local path, internal URI (`skill://`, `agent://`, `artifact://`, `history://`, `memory://`, `rule://`, `local://`, `vault://`, `mcp://`, `omp://`, `issue://`, `pr://`, `ssh://`), or URL. Append `:<sel>` for ranges/modes (e.g. `src/foo.ts:50-200`, `src/foo.ts:raw`, `db.sqlite:users:42`).
+- `path` — required. Local path, internal URI (`skill://`, `agent://`, `artifact://`, `memory://`, `rule://`, `local://`, `vault://`, `mcp://`, `omp://`, `issue://`, `pr://`, `ssh://`), or URL. Append `:<sel>` for ranges/modes (e.g. `src/foo.ts:50-200`, `src/foo.ts:raw`, `db.sqlite:users:42`).
 
 ## Selectors
 
@@ -67,7 +67,7 @@ For `.sqlite`, `.sqlite3`, `.db`, `.db3`:
 
 # Internal URIs
 
-All URI schemes take the same line selectors. `artifact://<id>` recovers full output a bash/eval/tool result spilled or truncated. `history://<agentId>` = agent transcript; bare `history://` lists agents.
+All URI schemes take the same line selectors. `artifact://<id>` recovers full output a bash/eval/tool result spilled or truncated.
 
 `ssh://host/<absolute-path>` reads a remote text file (UTF-8, ≤1 MiB) or lists a directory one level deep, on a pre-configured SSH host or `~/.ssh/config` alias; `ssh://host/` lists the remote root and bare `ssh://` lists the configured hosts. Files are also writable via `write` and searchable via `search`; a directory only lists (`search` refuses a directory, `write` refuses to overwrite one). A literal `:`, `?`, or `#` in the remote path must be percent-encoded (`%3A`/`%3F`/`%23`) — a trailing `:sel` is read as a line selector, and `?`/`#` start a URL query/fragment. Requires a POSIX login shell (`sh`/`bash`/`zsh`); a Windows host or a non-POSIX shell (fish, csh/tcsh) is rejected — use the `ssh` tool there.
 

package/src/sdk.ts

@@ -8,14 +8,7 @@ import {
 	filterProviderReplayMessages,
 	type ThinkingLevel,
 } from "@oh-my-pi/pi-agent-core";
-import {
-	type Context,
-	type CredentialDisabledEvent,
-	type Message,
-	type Model,
-	type SimpleStreamOptions,
-	streamSimple,
-} from "@oh-my-pi/pi-ai";
+import type { Context, CredentialDisabledEvent, Message, Model, SimpleStreamOptions } from "@oh-my-pi/pi-ai";
 import type { Dialect } from "@oh-my-pi/pi-ai/dialect";
 import {
 	getOpenAICodexTransportDetails,
@@ -26,7 +19,7 @@ import type { Component } from "@oh-my-pi/pi-tui";
 import { $env, $flag, getAgentDir, getProjectDir, logger, postmortem, prompt, Snowflake } from "@oh-my-pi/pi-utils";
 import { INTENT_FIELD } from "@oh-my-pi/pi-wire";
 import {
-	ADVISOR_READONLY_TOOL_NAMES,
+	discoverAdvisorConfigs,
 	discoverWatchdogFiles,
 	formatActiveRepoWatchdogPrompt,
 	formatAdvisorContextPrompt,
@@ -49,7 +42,7 @@ import {
 	resolveModelRoleValue,
 } from "./config/model-resolver";
 import { loadPromptTemplates as loadPromptTemplatesInternal, type PromptTemplate } from "./config/prompt-templates";
-import { Settings, type SkillsSettings, validateProviderMaxInFlightRequests } from "./config/settings";
+import { Settings, type SkillsSettings } from "./config/settings";
 import { CursorExecHandlers } from "./cursor";
 import "./discovery";
 import { initializeWithSettings } from "./discovery";
@@ -125,6 +118,7 @@ import {
 import { clampProviderContextImages } from "./session/provider-image-budget";
 import { getRestorableSessionModels } from "./session/session-context";
 import { SessionManager } from "./session/session-manager";
+import { createSettingsAwareStreamFn } from "./session/settings-stream-fn";
 import { SnapcompactInlineTransformer } from "./session/snapcompact-inline";
 import { createSnapcompactSavingsRecorder } from "./session/snapcompact-savings-journal";
 import { closeAllConnections } from "./ssh/connection-manager";
@@ -975,6 +969,7 @@ function createCustomToolsExtension(tools: CustomTool[]): ExtensionFactory {
 					maxAttempts: event.maxAttempts,
 					delayMs: event.delayMs,
 					errorMessage: event.errorMessage,
+					errorId: event.errorId,
 				},
 				ctx,
 			),
@@ -1163,6 +1158,8 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 	activeRepoContextPromise.catch(() => {});
 	const watchdogFilesPromise = logger.time("discoverWatchdogFiles", () => discoverWatchdogFiles(cwd, agentDir));
 	watchdogFilesPromise.catch(() => {});
+	const advisorConfigsPromise = logger.time("discoverAdvisorConfigs", () => discoverAdvisorConfigs(cwd, agentDir));
+	advisorConfigsPromise.catch(() => {});
 	const promptTemplatesPromise = options.promptTemplates
 		? Promise.resolve(options.promptTemplates)
 		: logger.time("discoverPromptTemplates", discoverPromptTemplates, cwd, agentDir);
@@ -1408,12 +1405,14 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		}
 		return result;
 	};
-	const [contextFiles, resolvedWorkspaceTree, watchdogFiles, activeRepoContext] = await Promise.all([
-		contextFilesPromise,
-		raceWithDeadline("buildWorkspaceTree", workspaceTreePromise),
-		watchdogFilesPromise,
-		activeRepoContextPromise,
-	]);
+	const [contextFiles, resolvedWorkspaceTree, watchdogFiles, activeRepoContext, discoveredAdvisors] =
+		await Promise.all([
+			contextFilesPromise,
+			raceWithDeadline("buildWorkspaceTree", workspaceTreePromise),
+			watchdogFilesPromise,
+			activeRepoContextPromise,
+			advisorConfigsPromise,
+		]);
 
 	let agent: Agent;
 	let session!: AgentSession;
@@ -2536,6 +2535,11 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		// One-shot launch-latency marker: fired the first time the loop dispatches
 		// a chat request to the provider transport. See onFirstChatDispatch.
 		let notifyFirstChatDispatch = options.onFirstChatDispatch;
+		// Shared, settings-aware stream wrapper used by both the main agent and
+		// the advisor (via AgentSessionConfig.streamFn). Keeps OpenRouter
+		// sticky-routing variants, antigravity endpoint routing, in-flight caps,
+		// and the loop guard consistent across every agent the session drives.
+		const settingsAwareStreamFn = createSettingsAwareStreamFn(settings);
 		agent = new Agent({
 			initialState: {
 				systemPrompt,
@@ -2586,23 +2590,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 						});
 					}
 				}
-				const openrouterRoutingPreset = settings.get("providers.openrouterVariant");
-				const openrouterVariant =
-					openrouterRoutingPreset && openrouterRoutingPreset !== "default" ? openrouterRoutingPreset : undefined;
-				const antigravityEndpointMode = settings.get("providers.antigravityEndpoint");
-				return streamSimple(streamModel, context, {
-					...streamOptions,
-					openrouterVariant: streamOptions?.openrouterVariant ?? openrouterVariant,
-					antigravityEndpointMode: streamOptions?.antigravityEndpointMode ?? antigravityEndpointMode,
-					maxInFlightRequests: validateProviderMaxInFlightRequests(
-						streamOptions?.maxInFlightRequests ?? settings.get("providers.maxInFlightRequests"),
-					),
-					loopGuard: {
-						enabled: settings.get("model.loopGuard.enabled"),
-						checkAssistantContent: settings.get("model.loopGuard.checkAssistantContent"),
-						...streamOptions?.loopGuard,
-					},
-				});
+				return settingsAwareStreamFn(streamModel, context, streamOptions);
 			},
 			cursorExecHandlers,
 			transformToolCallArguments: (args, _toolName) => {
@@ -2649,34 +2637,32 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 			}
 		}
 
-		// Hard-isolated read-only toolset for the advisor (built unconditionally so
-		// it can be toggled at runtime). Fresh ReadTool/GrepTool/GlobTool bound to a
-		// DISTINCT ToolSession so the advisor's investigative reads never touch the
-		// primary's snapshot, seen-lines, conflict, or summary caches (all keyed on
-		// session identity). `cwd` stays dynamic; edit/yield capabilities are off.
+		// Full toolset for the advisor, built unconditionally so it can be toggled at
+		// runtime. Bound to a DISTINCT ToolSession (its own `-advisor` session id +
+		// agent id) so the advisor's tool state — snapshot, seen-lines, conflict, and
+		// summary caches, all keyed on session identity — stays isolated from the
+		// primary, while edit/bash/write stay fully functional: the advisor is a full
+		// agent and its config's `tools` selects which of these it actually gets
+		// (defaulting to read/grep/glob).
 		const advisorToolSession: ToolSession = {
 			...toolSession,
 			get cwd() {
 				return sessionManager.getCwd();
 			},
-			hasEditTool: false,
+			hasEditTool: true,
 			requireYieldTool: false,
-			conflictHistory: undefined,
-			fileSnapshotStore: undefined,
 			getSessionId: () => {
 				const id = sessionManager.getSessionId?.();
 				return id ? `${id}-advisor` : null;
 			},
 			getAgentId: () => "advisor",
 		};
-		const built = await Promise.all(
-			[...ADVISOR_READONLY_TOOL_NAMES].map(name =>
-				BUILTIN_TOOLS[name as keyof typeof BUILTIN_TOOLS](advisorToolSession),
-			),
-		);
-		const advisorReadOnlyTools: Tool[] = built
-			.filter((tool): tool is Tool => tool != null)
-			.map(wrapToolWithMetaNotice);
+		const advisorToolBuilds: Array<Tool | null | Promise<Tool | null>> = [];
+		for (const name in BUILTIN_TOOLS) {
+			advisorToolBuilds.push(BUILTIN_TOOLS[name as keyof typeof BUILTIN_TOOLS](advisorToolSession));
+		}
+		const built = await Promise.all(advisorToolBuilds);
+		const advisorTools: Tool[] = built.filter((tool): tool is Tool => tool != null).map(wrapToolWithMetaNotice);
 
 		const advisorWatchdogPrompts = [...watchdogFiles];
 		if (activeRepoContext) {
@@ -2693,6 +2679,8 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		session = new AgentSession({
 			advisorWatchdogPrompt,
 			advisorContextPrompt,
+			advisorSharedInstructions: discoveredAdvisors.sharedInstructions,
+			advisorConfigs: discoveredAdvisors.advisors,
 			agent,
 			pruneToolDescriptions: inlineToolDescriptors,
 			thinkingLevel: autoThinking ? AUTO_THINKING : effectiveThinkingLevel,
@@ -2718,8 +2706,10 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 			toolRegistry,
 			builtInToolNames: builtInRegistryToolNames,
 			transformContext,
+			transformProviderContext,
 			onPayload,
 			onResponse,
+			advisorStreamFn: settingsAwareStreamFn,
 			convertToLlm: convertToLlmFinal,
 			rebuildSystemPrompt,
 			reloadSshTool,
@@ -2750,7 +2740,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 			agentKind,
 			providerSessionId: options.providerSessionId,
 			parentEvalSessionId: options.parentEvalSessionId,
-			advisorReadOnlyTools,
+			advisorTools,
 		});
 		hasSession = true;
 		if (asyncJobManager) {