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

package/dist/types/advisor/watchdog.d.ts

@@ -1,5 +1,16 @@
 import type { ActiveRepoContext } from "../utils/active-repo-context";
 export declare function formatActiveRepoWatchdogPrompt(activeRepoContext: ActiveRepoContext): string;
+/**
+ * Render the project context files (AGENTS.md and the like) into a block for the
+ * advisor's system prompt, mirroring how the primary agent receives them. Gives
+ * the read-only reviewer the user's standing project instructions so it can hold
+ * the driving agent to them instead of advising against project conventions it
+ * cannot otherwise see. Returns undefined when there are no context files.
+ */
+export declare function formatAdvisorContextPrompt(contextFiles: ReadonlyArray<{
+    path: string;
+    content: string;
+}>): string | undefined;
 /**
  * Discover and load WATCHDOG.md files walking up from cwd, project .omp folder, and user agent dir.
  * Returns formatted watchdog file blocks ready to be appended to the advisor system prompt.

package/dist/types/modes/acp/acp-event-mapper.d.ts

@@ -8,6 +8,7 @@ interface AcpEventMapperOptions {
     getMessageId?: (message: unknown) => string | undefined;
     getMessageProgress?: (message: unknown) => MessageProgress | undefined;
     getToolArgs?: (toolCallId: string) => unknown;
+    resolveImageData?: (data: string, mimeType: string | undefined) => string;
     /**
      * Session cwd. Tool call locations sent to ACP clients must be absolute
      * (the editor host needs them to open or focus files). When provided,

package/dist/types/session/agent-session.d.ts

@@ -239,6 +239,12 @@ export interface AgentSessionConfig {
     advisorReadOnlyTools?: AgentTool[];
     /** Preloaded watchdog prompt content for the advisor. */
     advisorWatchdogPrompt?: string;
+    /**
+     * Preloaded project context files (AGENTS.md, etc.) rendered as a system-prompt
+     * block for the advisor — the same standing instructions the primary agent
+     * receives, so the reviewer holds the agent to them.
+     */
+    advisorContextPrompt?: string;
     /**
      * Strip tool descriptions from provider-bound tool specs on side requests
      * (handoff). Must match the session-start value used to build the system

package/dist/types/session/blob-store.d.ts

@@ -27,6 +27,8 @@ export declare class BlobStore {
     putSync(data: Buffer, options?: BlobPutOptions): BlobPutResult;
     /** Read blob by hash, returns Buffer or null if not found. */
     get(hash: string): Promise<Buffer | null>;
+    /** Synchronous variant of {@link get}. */
+    getSync(hash: string): Buffer | null;
     /** Check if a blob exists. */
     has(hash: string): Promise<boolean>;
 }
@@ -62,3 +64,5 @@ export declare function resolveImageDataUrl(blobStore: BlobStore, data: string):
  * If the blob is missing, logs a warning and returns a placeholder.
  */
 export declare function resolveImageData(blobStore: BlobStore, data: string): Promise<string>;
+/** Synchronous variant of {@link resolveImageData}. */
+export declare function resolveImageDataSync(blobStore: BlobStore, data: string): string;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "16.2.0",
+	"version": "16.2.1",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://omp.sh",
 	"author": "Can Boluk",
@@ -55,17 +55,17 @@
 		"@agentclientprotocol/sdk": "0.25.0",
 		"@babel/parser": "^7.29.7",
 		"@mozilla/readability": "^0.6.0",
-		"@oh-my-pi/hashline": "16.2.0",
-		"@oh-my-pi/omp-stats": "16.2.0",
-		"@oh-my-pi/pi-agent-core": "16.2.0",
-		"@oh-my-pi/pi-ai": "16.2.0",
-		"@oh-my-pi/pi-catalog": "16.2.0",
-		"@oh-my-pi/pi-mnemopi": "16.2.0",
-		"@oh-my-pi/pi-natives": "16.2.0",
-		"@oh-my-pi/pi-tui": "16.2.0",
-		"@oh-my-pi/pi-utils": "16.2.0",
-		"@oh-my-pi/pi-wire": "16.2.0",
-		"@oh-my-pi/snapcompact": "16.2.0",
+		"@oh-my-pi/hashline": "16.2.1",
+		"@oh-my-pi/omp-stats": "16.2.1",
+		"@oh-my-pi/pi-agent-core": "16.2.1",
+		"@oh-my-pi/pi-ai": "16.2.1",
+		"@oh-my-pi/pi-catalog": "16.2.1",
+		"@oh-my-pi/pi-mnemopi": "16.2.1",
+		"@oh-my-pi/pi-natives": "16.2.1",
+		"@oh-my-pi/pi-tui": "16.2.1",
+		"@oh-my-pi/pi-utils": "16.2.1",
+		"@oh-my-pi/pi-wire": "16.2.1",
+		"@oh-my-pi/snapcompact": "16.2.1",
 		"@opentelemetry/api": "^1.9.1",
 		"@opentelemetry/context-async-hooks": "^2.7.1",
 		"@opentelemetry/exporter-trace-otlp-proto": "^0.218.0",

package/src/advisor/__tests__/advisor.test.ts

@@ -16,6 +16,7 @@ import {
 	type AdvisorRuntimeHost,
 	deriveAdvisorTelemetry,
 	formatAdvisorBatchContent,
+	formatAdvisorContextPrompt,
 	isAdvisorInterruptImmuneTurnActive,
 	isInterruptingSeverity,
 	resolveAdvisorDeliveryChannel,
@@ -57,6 +58,26 @@ describe("advisor", () => {
 		});
 	});
 
+	describe("formatAdvisorContextPrompt", () => {
+		it("renders project context files into a block with path and verbatim content", () => {
+			const rendered = formatAdvisorContextPrompt([
+				{
+					path: "/repo/AGENTS.md",
+					content: "Use `bun check`, never `tsc`.\nNo `any` unless absolutely necessary.",
+				},
+			]);
+			expect(rendered).toBeDefined();
+			expect(rendered).toContain('<file path="/repo/AGENTS.md">');
+			// Content is injected verbatim (noEscape) so backticks/markup survive for the model.
+			expect(rendered).toContain("Use `bun check`, never `tsc`.");
+			expect(rendered).toContain("No `any` unless absolutely necessary.");
+		});
+
+		it("returns undefined when there are no context files", () => {
+			expect(formatAdvisorContextPrompt([])).toBeUndefined();
+		});
+	});
+
 	describe("formatSessionHistoryMarkdown includeThinking", () => {
 		it("includes thinking text when includeThinking is true", () => {
 			const thinking = "I should check the edge case first.";

package/src/advisor/watchdog.ts

@@ -3,6 +3,7 @@ import * as path from "node:path";
 import { getAgentDir, isEnoent, logger, prompt } from "@oh-my-pi/pi-utils";
 import { expandAtImports } from "../discovery/at-imports";
 import activeRepoWatchdogTemplate from "../prompts/advisor/active-repo-watchdog.md" with { type: "text" };
+import contextFilesTemplate from "../prompts/advisor/context-files.md" with { type: "text" };
 import type { ActiveRepoContext } from "../utils/active-repo-context";
 import { repo } from "../utils/git";
 import { normalizePromptPath } from "../utils/prompt-path";
@@ -15,6 +16,20 @@ export function formatActiveRepoWatchdogPrompt(activeRepoContext: ActiveRepoCont
 		.trim();
 }
 
+/**
+ * Render the project context files (AGENTS.md and the like) into a block for the
+ * advisor's system prompt, mirroring how the primary agent receives them. Gives
+ * the read-only reviewer the user's standing project instructions so it can hold
+ * the driving agent to them instead of advising against project conventions it
+ * cannot otherwise see. Returns undefined when there are no context files.
+ */
+export function formatAdvisorContextPrompt(
+	contextFiles: ReadonlyArray<{ path: string; content: string }>,
+): string | undefined {
+	if (contextFiles.length === 0) return undefined;
+	return prompt.render(contextFilesTemplate, { contextFiles }).trim() || undefined;
+}
+
 /**
  * Discover and load WATCHDOG.md files walking up from cwd, project .omp folder, and user agent dir.
  * Returns formatted watchdog file blocks ready to be appended to the advisor system prompt.

package/src/discovery/claude-plugins.ts

@@ -17,6 +17,7 @@ import type { LoadContext, LoadResult } from "../capability/types";
 import {
 	type ClaudePluginRoot,
 	createSourceMeta,
+	expandEnvVarsDeep,
 	listClaudePluginRoots,
 	loadFilesFromDir,
 	scanSkillsFromDir,
@@ -327,8 +328,8 @@ async function loadMCPServers(ctx: LoadContext): Promise<LoadResult<MCPServer>>
 				...(raw.args !== undefined && { args: substitutePluginRoot(raw.args, root.path) }),
 				...(raw.env !== undefined && { env: substitutePluginRoot(raw.env, root.path) }),
 				...(raw.cwd !== undefined && { cwd: substitutePluginRoot(raw.cwd, root.path) }),
-				...(raw.url !== undefined && { url: raw.url }),
-				...(raw.headers !== undefined && { headers: raw.headers }),
+				...(raw.url !== undefined && { url: expandEnvVarsDeep(raw.url) }),
+				...(raw.headers !== undefined && { headers: expandEnvVarsDeep(raw.headers) }),
 				...(raw.auth !== undefined && { auth: raw.auth }),
 				...(raw.oauth !== undefined && { oauth: raw.oauth }),
 				...(raw.type !== undefined && { transport: raw.type as MCPServer["transport"] }),

package/src/modes/acp/acp-agent.ts

@@ -42,7 +42,7 @@ import {
 } from "@agentclientprotocol/sdk";
 import type { AgentToolResult } from "@oh-my-pi/pi-agent-core";
 import type { AssistantMessage, Model } from "@oh-my-pi/pi-ai";
-import { isEnoent, logger, VERSION } from "@oh-my-pi/pi-utils";
+import { getBlobsDir, isEnoent, logger, VERSION } from "@oh-my-pi/pi-utils";
 import { disableProvider, enableProvider, reset as resetCapabilities } from "../../capability";
 import { Settings } from "../../config/settings";
 import { clearPluginRootsAndCaches, resolveActiveProjectRegistryPath } from "../../discovery/helpers";
@@ -62,6 +62,7 @@ import { loadAllExtensions } from "../../modes/components/extensions/state-manag
 import { theme } from "../../modes/theme/theme";
 import { type PlanApprovalDetails, resolveApprovedPlan } from "../../plan-mode/approved-plan";
 import type { AgentSession, AgentSessionEvent } from "../../session/agent-session";
+import { BlobStore, resolveImageDataSync } from "../../session/blob-store";
 import { isSilentAbort, SKILL_PROMPT_MESSAGE_TYPE, USER_INTERRUPT_LABEL } from "../../session/messages";
 import type { UsageStatistics } from "../../session/session-entries";
 import type { SessionInfo as StoredSessionInfo } from "../../session/session-listing";
@@ -445,6 +446,7 @@ export class AcpAgent implements Agent {
 	#cleanupRegistered = false;
 	#clientCapabilities: ClientCapabilities | undefined;
 	#cancelCleanupTimeoutMs = ACP_CANCEL_CLEANUP_TIMEOUT_MS;
+	#blobs = new BlobStore(getBlobsDir());
 
 	constructor(connection: AgentSideConnection, createSession: CreateAcpSession, initialSession?: AgentSession) {
 		this.#connection = connection;
@@ -1187,11 +1189,21 @@ export class AcpAgent implements Agent {
 		}
 
 		this.#prepareLiveAssistantMessage(record, event);
+		const imageDataCache = new Map<string, string>();
+		const resolveImageDataForAcp = (data: string, mimeType: string | undefined): string => {
+			const key = `${mimeType ?? ""}\u0000${data}`;
+			const cached = imageDataCache.get(key);
+			if (cached !== undefined) return cached;
+			const resolved = resolveImageDataSync(this.#blobs, data);
+			imageDataCache.set(key, resolved);
+			return resolved;
+		};
 		for (const notification of mapAgentSessionEventToAcpSessionUpdates(event, record.session.sessionId, {
 			getMessageId: message => this.#getLiveMessageId(record, message),
 			getMessageProgress: message => this.#getLiveMessageProgress(record, message),
 			getToolArgs: toolCallId => record.toolArgsById.get(toolCallId),
 			cwd: record.session.sessionManager.getCwd(),
+			resolveImageData: resolveImageDataForAcp,
 		})) {
 			await this.#connection.sessionUpdate(notification);
 		}
@@ -2052,6 +2064,7 @@ export class AcpAgent implements Agent {
 		const notifications = mapAgentSessionEventToAcpSessionUpdates(endEvent, sessionId, {
 			cwd,
 			getToolArgs: toolCallId => (toolCallId === message.toolCallId ? options.toolArgs : undefined),
+			resolveImageData: (data, _mimeType) => resolveImageDataSync(this.#blobs, data),
 		});
 		if (options.includeStart === false) {
 			return notifications;

package/src/modes/acp/acp-event-mapper.ts

@@ -20,6 +20,7 @@ interface AcpEventMapperOptions {
 	getMessageId?: (message: unknown) => string | undefined;
 	getMessageProgress?: (message: unknown) => MessageProgress | undefined;
 	getToolArgs?: (toolCallId: string) => unknown;
+	resolveImageData?: (data: string, mimeType: string | undefined) => string;
 	/**
 	 * Session cwd. Tool call locations sent to ACP clients must be absolute
 	 * (the editor host needs them to open or focus files). When provided,
@@ -179,7 +180,7 @@ export function mapAgentSessionEventToAcpSessionUpdates(
 		case "tool_execution_update": {
 			const content = mergeToolUpdateContent(
 				buildToolStartContent(event.toolName, event.args),
-				extractToolCallContent(event.partialResult),
+				extractToolCallContent(event.partialResult, options),
 			);
 			const update: SessionUpdate = {
 				sessionUpdate: "tool_call_update",
@@ -197,7 +198,10 @@ export function mapAgentSessionEventToAcpSessionUpdates(
 			return [toSessionNotification(sessionId, update)];
 		}
 		case "tool_execution_end": {
-			const resultContent = [...extractDiffToolCallContent(event.result), ...extractToolCallContent(event.result)];
+			const resultContent = [
+				...extractDiffToolCallContent(event.result),
+				...extractToolCallContent(event.result, options),
+			];
 			const content = mergeToolUpdateContent(
 				buildToolStartContent(event.toolName, getToolExecutionEndArgs(event, options)),
 				resultContent,
@@ -641,13 +645,15 @@ function terminalToolCallContent(terminalId: string): ToolCallContent {
 	return { type: "terminal", terminalId };
 }
 
-function extractToolCallContent(value: unknown): ToolCallContent[] {
-	const richContent = extractStructuredToolCallContent(value);
+function extractToolCallContent(value: unknown, options: AcpEventMapperOptions): ToolCallContent[] {
+	const richContent = extractStructuredToolCallContent(value, options);
+	const detailsImageContent = extractDetailsImageToolCallContent(value, options, richContent);
+	const combinedContent = [...richContent, ...detailsImageContent];
 	const terminalId = extractTerminalId(value);
 	const content =
-		terminalId && !hasTerminalContent(richContent, terminalId)
-			? [...richContent, terminalToolCallContent(terminalId)]
-			: richContent;
+		terminalId && !hasTerminalContent(combinedContent, terminalId)
+			? [...combinedContent, terminalToolCallContent(terminalId)]
+			: combinedContent;
 	const fallbackText = extractReadableText(value);
 	if (!fallbackText) {
 		return content;
@@ -658,7 +664,7 @@ function extractToolCallContent(value: unknown): ToolCallContent[] {
 	return [...content, textToolCallContent(fallbackText)];
 }
 
-function extractStructuredToolCallContent(value: unknown): ToolCallContent[] {
+function extractStructuredToolCallContent(value: unknown, options: AcpEventMapperOptions): ToolCallContent[] {
 	const blocks = getContentBlocks(value);
 	if (!blocks) {
 		return [];
@@ -666,7 +672,7 @@ function extractStructuredToolCallContent(value: unknown): ToolCallContent[] {
 
 	const content: ToolCallContent[] = [];
 	for (const block of blocks) {
-		const toolCallContent = toToolCallContent(block);
+		const toolCallContent = toToolCallContent(block, options);
 		if (toolCallContent) {
 			content.push(toolCallContent);
 		}
@@ -685,7 +691,7 @@ function getContentBlocks(value: unknown): unknown[] | undefined {
 	return Array.isArray(content) ? content : undefined;
 }
 
-function toToolCallContent(value: unknown): ToolCallContent | undefined {
+function toToolCallContent(value: unknown, options: AcpEventMapperOptions): ToolCallContent | undefined {
 	const type = getContentType(value);
 	if (!type) {
 		return undefined;
@@ -697,21 +703,8 @@ function toToolCallContent(value: unknown): ToolCallContent | undefined {
 			return text ? textToolCallContent(text) : undefined;
 		}
 		case "image":
-		case "audio": {
-			const data = extractStringProperty<BinaryLikeContent>(value, "data");
-			const mimeType = extractStringProperty<BinaryLikeContent>(value, "mimeType");
-			if (!data || !mimeType) {
-				return undefined;
-			}
-			return {
-				type: "content",
-				content: {
-					type,
-					data,
-					mimeType,
-				},
-			};
-		}
+		case "audio":
+			return binaryToolCallContent(type, value, options);
 		case "resource_link": {
 			const uri = extractStringProperty<ResourceLinkLikeContent>(value, "uri");
 			const name = extractStringProperty<ResourceLinkLikeContent>(value, "name");
@@ -769,6 +762,64 @@ function toToolCallContent(value: unknown): ToolCallContent | undefined {
 	}
 }
 
+function binaryToolCallContent(
+	type: "image" | "audio",
+	value: unknown,
+	options: AcpEventMapperOptions,
+): ToolCallContent | undefined {
+	const data = extractStringProperty<BinaryLikeContent>(value, "data");
+	const mimeType = extractStringProperty<BinaryLikeContent>(value, "mimeType");
+	if (!data || !mimeType) {
+		return undefined;
+	}
+	return {
+		type: "content",
+		content: {
+			type,
+			data: type === "image" ? (options.resolveImageData?.(data, mimeType) ?? data) : data,
+			mimeType,
+		},
+	};
+}
+
+function extractDetailsImageToolCallContent(
+	value: unknown,
+	options: AcpEventMapperOptions,
+	existing: ToolCallContent[],
+): ToolCallContent[] {
+	const images = extractDetailsImages(value);
+	if (!images) {
+		return [];
+	}
+	const seen = new Set(existing.map(imageContentKey).filter((key): key is string => key !== undefined));
+	const content: ToolCallContent[] = [];
+	for (const image of images) {
+		const toolCallContent = binaryToolCallContent("image", image, options);
+		const key = imageContentKey(toolCallContent);
+		if (!toolCallContent || !key || seen.has(key)) {
+			continue;
+		}
+		seen.add(key);
+		content.push(toolCallContent);
+	}
+	return content;
+}
+
+function extractDetailsImages(value: unknown): unknown[] | undefined {
+	if (typeof value !== "object" || value === null) return undefined;
+	const details = (value as DetailsContainer).details;
+	if (typeof details !== "object" || details === null) return undefined;
+	const images = (details as { images?: unknown }).images;
+	return Array.isArray(images) && images.length > 0 ? images : undefined;
+}
+
+function imageContentKey(value: ToolCallContent | undefined): string | undefined {
+	if (value?.type !== "content" || value.content.type !== "image") {
+		return undefined;
+	}
+	return `${value.content.mimeType}\u0000${value.content.data}`;
+}
+
 function extractEmbeddedResource(
 	value: unknown,
 ): { uri: string; text: string; mimeType?: string } | { uri: string; blob: string; mimeType?: string } | undefined {
@@ -846,6 +897,12 @@ function extractReadableText(value: unknown): string | undefined {
 		if (text.length > 0) {
 			return normalizeText(text);
 		}
+		if (hasBinaryContentBlock(contentBlocks)) {
+			return undefined;
+		}
+	}
+	if (extractDetailsImages(value)) {
+		return undefined;
 	}
 	if (isTerminalOnlyDetails(value)) {
 		return undefined;
@@ -895,6 +952,13 @@ function getContentType(value: unknown): string | undefined {
 	return typeof type === "string" ? type : undefined;
 }
 
+function hasBinaryContentBlock(blocks: unknown[]): boolean {
+	return blocks.some(block => {
+		const type = getContentType(block);
+		return type === "image" || type === "audio";
+	});
+}
+
 function extractStringProperty<T extends object>(value: unknown, key: keyof T): string | undefined {
 	if (typeof value !== "object" || value === null || !(key in value)) {
 		return undefined;

package/src/prompts/advisor/context-files.md

@@ -0,0 +1,8 @@
+<project-context>
+These context files carry the user's standing instructions for this project (AGENTS.md and the like). The driving agent is bound by them. Hold the agent to them and flag drift the moment it starts; never advise against what these files mandate.
+{{#each contextFiles}}
+<file path="{{path}}">
+{{content}}
+</file>
+{{/each}}
+</project-context>

package/src/sdk.ts

@@ -25,7 +25,12 @@ import { FALLBACK_DIALECT, preferredDialect } from "@oh-my-pi/pi-catalog/identit
 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, discoverWatchdogFiles, formatActiveRepoWatchdogPrompt } from "./advisor";
+import {
+	ADVISOR_READONLY_TOOL_NAMES,
+	discoverWatchdogFiles,
+	formatActiveRepoWatchdogPrompt,
+	formatAdvisorContextPrompt,
+} from "./advisor";
 import { type AsyncJob, AsyncJobManager } from "./async";
 import { AutoLearnController, buildAutoLearnInstructions } from "./autolearn/controller";
 import { loadCapability } from "./capability";
@@ -2678,11 +2683,16 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 			advisorWatchdogPrompts.push(formatActiveRepoWatchdogPrompt(activeRepoContext));
 		}
 		const advisorWatchdogPrompt = advisorWatchdogPrompts.length > 0 ? advisorWatchdogPrompts.join("\n\n") : undefined;
+		// Hand the advisor the same project context files (AGENTS.md, etc.) the
+		// primary agent gets in its system prompt, so the read-only reviewer judges
+		// against the user's standing project rules instead of advising blind.
+		const advisorContextPrompt = formatAdvisorContextPrompt(contextFiles);
 		// Owned only when this session created the manager; subagents receive a
 		// parent's manager via `options.mcpManager` and MUST NOT disconnect it.
 		const ownedMcpManager = options.mcpManager ? undefined : mcpManager;
 		session = new AgentSession({
 			advisorWatchdogPrompt,
+			advisorContextPrompt,
 			agent,
 			pruneToolDescriptions: inlineToolDescriptors,
 			thinkingLevel: autoThinking ? AUTO_THINKING : effectiveThinkingLevel,

package/src/session/agent-session.ts

@@ -589,6 +589,12 @@ export interface AgentSessionConfig {
 	advisorReadOnlyTools?: AgentTool[];
 	/** Preloaded watchdog prompt content for the advisor. */
 	advisorWatchdogPrompt?: string;
+	/**
+	 * Preloaded project context files (AGENTS.md, etc.) rendered as a system-prompt
+	 * block for the advisor — the same standing instructions the primary agent
+	 * receives, so the reviewer holds the agent to them.
+	 */
+	advisorContextPrompt?: string;
 	/**
 	 * Strip tool descriptions from provider-bound tool specs on side requests
 	 * (handoff). Must match the session-start value used to build the system
@@ -1220,6 +1226,7 @@ export class AgentSession {
 	#advisorAdviseTool?: AdviseTool;
 	#advisorReadOnlyTools?: AgentTool[];
 	#advisorWatchdogPrompt?: string;
+	#advisorContextPrompt?: string;
 	#advisorYieldQueueUnsubscribe?: () => void;
 	/** Persists the advisor agent's turns to `<session>/__advisor.jsonl` for stats
 	 *  attribution and Agent Hub observability. Undefined when no advisor is active. */
@@ -1643,6 +1650,7 @@ export class AgentSession {
 		this.agent.serviceTierResolver = model => this.#effectiveServiceTier(model);
 		this.#advisorReadOnlyTools = config.advisorReadOnlyTools;
 		this.#advisorWatchdogPrompt = config.advisorWatchdogPrompt;
+		this.#advisorContextPrompt = config.advisorContextPrompt;
 		this.#pruneToolDescriptions = config.pruneToolDescriptions === true;
 		this.#validateRetryFallbackChains();
 		this.#toolRegistry = config.toolRegistry ?? new Map();
@@ -1960,6 +1968,9 @@ export class AgentSession {
 		const appendOnlyContext = new AppendOnlyContextManager();
 		const advisorThinkingLevel = advisorSel.thinkingLevel ?? ThinkingLevel.Medium;
 		const systemPrompt = [advisorSystemPrompt];
+		if (this.#advisorContextPrompt) {
+			systemPrompt.push(this.#advisorContextPrompt);
+		}
 		if (this.#advisorWatchdogPrompt) {
 			systemPrompt.push(this.#advisorWatchdogPrompt);
 		}

package/src/session/blob-store.ts

@@ -152,6 +152,17 @@ export class BlobStore {
 		}
 	}
 
+	/** Synchronous variant of {@link get}. */
+	getSync(hash: string): Buffer | null {
+		const blobPath = path.join(this.dir, hash);
+		try {
+			return fs.readFileSync(blobPath);
+		} catch (err) {
+			if (isEnoent(err)) return null;
+			throw err;
+		}
+	}
+
 	/** Check if a blob exists. */
 	async has(hash: string): Promise<boolean> {
 		try {
@@ -253,3 +264,16 @@ export async function resolveImageData(blobStore: BlobStore, data: string): Prom
 	}
 	return buffer.toString("base64");
 }
+
+/** Synchronous variant of {@link resolveImageData}. */
+export function resolveImageDataSync(blobStore: BlobStore, data: string): string {
+	const hash = parseBlobRef(data);
+	if (!hash) return data;
+
+	const buffer = blobStore.getSync(hash);
+	if (!buffer) {
+		logger.warn("Blob not found for image reference", { hash });
+		return data;
+	}
+	return buffer.toString("base64");
+}