@sayknow-cli/coding-agent 0.3.16 → 0.4.1

package/src/export/html/template.js

@@ -436,6 +436,39 @@
         return div.innerHTML;
       }
 
+      function escapeHtmlAttribute(value) {
+        return String(value)
+          .replace(/&/g, '&')
+          .replace(/"/g, '"')
+          .replace(/'/g, ''')
+          .replace(/</g, '&lt;')
+          .replace(/>/g, '&gt;');
+      }
+
+      const SUPPORTED_DATA_IMAGE_MIME_TYPES = new Set([
+        'image/png',
+        'image/jpeg',
+        'image/gif',
+        'image/webp',
+      ]);
+      const STRICT_BASE64_PATTERN = /^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/;
+
+      function isStrictBase64(value) {
+        if (value.length === 0 || !STRICT_BASE64_PATTERN.test(value)) return false;
+        try {
+          return btoa(atob(value)) === value;
+        } catch {
+          return false;
+        }
+      }
+
+      function renderDataImage(image, className) {
+        if (!image || typeof image.mimeType !== 'string' || typeof image.data !== 'string') return '';
+        if (!SUPPORTED_DATA_IMAGE_MIME_TYPES.has(image.mimeType)) return '';
+        if (!isStrictBase64(image.data)) return '';
+        return `<img src="data:${escapeHtmlAttribute(image.mimeType)};base64,${escapeHtmlAttribute(image.data)}" class="${escapeHtmlAttribute(className)}" />`;
+      }
+
       /**
        * Truncate string to maxLen chars, append "..." if truncated.
        */
@@ -480,7 +513,7 @@
               if (toolCall) {
                 return labelHtml + `<span class="tree-role-tool">${escapeHtml(formatToolCall(toolCall.name, toolCall.arguments))}</span>`;
               }
-              return labelHtml + `<span class="tree-role-tool">[${msg.toolName || 'tool'}]</span>`;
+              return labelHtml + `<span class="tree-role-tool">[${escapeHtml(msg.toolName || 'tool')}]</span>`;
             }
             if (msg.role === 'bashExecution') {
               const cmd = truncate(normalize(msg.command || ''));
@@ -490,7 +523,7 @@
               const code = truncate(normalize(msg.code || ''));
               return labelHtml + `<span class="tree-role-tool">[js]:</span> ${escapeHtml(code)}`;
             }
-            return labelHtml + `<span class="tree-muted">[${msg.role}]</span>`;
+            return labelHtml + `<span class="tree-muted">[${escapeHtml(msg.role)}]</span>`;
           }
           case 'compaction':
             return labelHtml + `<span class="tree-compaction">[compaction: ${Math.round(entry.tokensBefore/1000)}k tokens]</span>`;
@@ -505,11 +538,11 @@
           case 'model_change':
             return labelHtml + `<span class="tree-muted">[model: ${escapeHtml(entry.model)}]</span>`;
           case 'thinking_level_change':
-            return labelHtml + `<span class="tree-muted">[thinking: ${entry.thinkingLevel}]</span>`;
+            return labelHtml + `<span class="tree-muted">[thinking: ${escapeHtml(entry.thinkingLevel)}]</span>`;
           case 'mode_change':
             return labelHtml + `<span class="tree-muted">[mode: ${escapeHtml(entry.mode)}]</span>`;
           default:
-            return labelHtml + `<span class="tree-muted">[${entry.type}]</span>`;
+            return labelHtml + `<span class="tree-muted">[${escapeHtml(entry.type)}]</span>`;
         }
       }
 
@@ -1579,7 +1612,7 @@
             const images = result.content.filter(c => c.type === 'image');
             if (images.length === 0) return '';
             return '<div class="tool-images">' +
-              images.map(img => '<img src="data:' + img.mimeType + ';base64,' + img.data + '" class="tool-image" />').join('') +
+              images.map(img => renderDataImage(img, 'tool-image')).join('') +
               '</div>';
           },
         };
@@ -1672,7 +1705,7 @@
        * Render the copy-link button HTML for a message.
        */
       function renderCopyLinkButton(entryId) {
-        return `<button class="copy-link-btn" data-entry-id="${entryId}" title="Copy link to this message">
+        return `<button class="copy-link-btn" data-entry-id="${escapeHtmlAttribute(entryId)}" title="Copy link to this message">
           <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
             <path d="M10 13a5 5 0 0 0 7.54.54l3-3a5 5 0 0 0-7.07-7.07l-1.72 1.71"/>
             <path d="M14 11a5 5 0 0 0-7.54-.54l-3 3a5 5 0 0 0 7.07 7.07l1.71-1.71"/>
@@ -1682,8 +1715,8 @@
 
       function renderEntry(entry) {
         const ts = formatTimestamp(entry.timestamp);
-        const tsHtml = ts ? `<div class="message-timestamp">${ts}</div>` : '';
-        const entryId = `entry-${entry.id}`;
+        const tsHtml = ts ? `<div class="message-timestamp">${escapeHtml(ts)}</div>` : '';
+        const entryId = escapeHtmlAttribute(`entry-${entry.id}`);
         const copyBtnHtml = renderCopyLinkButton(entry.id);
 
         if (entry.type === 'message') {
@@ -1698,7 +1731,7 @@
               if (images.length > 0) {
                 html += '<div class="message-images">';
                 for (const img of images) {
-                  html += `<img src="data:${img.mimeType};base64,${img.data}" class="message-image" />`;
+                  html += renderDataImage(img, 'message-image');
                 }
                 html += '</div>';
               }
@@ -1763,7 +1796,7 @@
             if (msg.cancelled) {
               html += '<div style="color: var(--warning)">(cancelled)</div>';
             } else if (msg.exitCode !== 0 && msg.exitCode !== null) {
-              html += `<div style="color: var(--error)">(exit ${msg.exitCode})</div>`;
+              html += `<div style="color: var(--error)">(exit ${escapeHtml(msg.exitCode)})</div>`;
             }
             html += '</div>';
             return html;
@@ -1777,7 +1810,7 @@
             if (msg.cancelled) {
               html += '<div style="color: var(--warning)">(cancelled)</div>';
             } else if (msg.exitCode !== 0 && msg.exitCode !== null) {
-              html += `<div style="color: var(--error)">(exit ${msg.exitCode})</div>`;
+              html += `<div style="color: var(--error)">(exit ${escapeHtml(msg.exitCode)})</div>`;
             }
             html += '</div>';
             return html;
@@ -1798,10 +1831,11 @@
 
 
         if (entry.type === 'compaction') {
+          const tokensBefore = escapeHtml(entry.tokensBefore.toLocaleString());
           return `<div class="compaction" id="${entryId}" onclick="this.classList.toggle('expanded')">
             <div class="compaction-label">[compaction]</div>
-            <div class="compaction-collapsed">Compacted from ${entry.tokensBefore.toLocaleString()} tokens</div>
-            <div class="compaction-content"><strong>Compacted from ${entry.tokensBefore.toLocaleString()} tokens</strong>\n\n${escapeHtml(entry.summary)}</div>
+            <div class="compaction-collapsed">Compacted from ${tokensBefore} tokens</div>
+            <div class="compaction-content"><strong>Compacted from ${tokensBefore} tokens</strong>\n\n${escapeHtml(entry.summary)}</div>
           </div>`;
         }
 
@@ -1895,8 +1929,8 @@
             <div class="help-bar">Ctrl+T toggle thinking · Ctrl+O toggle tools</div>
             <div class="header-info">
               <div class="info-item"><span class="info-label">Product:</span><span class="info-value">SKC / sayknow-cli</span></div>
-              <div class="info-item"><span class="info-label">Date:</span><span class="info-value">${header?.timestamp ? new Date(header.timestamp).toLocaleString() : 'unknown'}</span></div>
-              <div class="info-item"><span class="info-label">Models:</span><span class="info-value">${globalStats.models.join(', ') || 'unknown'}</span></div>
+              <div class="info-item"><span class="info-label">Date:</span><span class="info-value">${escapeHtml(header?.timestamp ? new Date(header.timestamp).toLocaleString() : 'unknown')}</span></div>
+              <div class="info-item"><span class="info-label">Models:</span><span class="info-value">${escapeHtml(globalStats.models.join(', ') || 'unknown')}</span></div>
               <div class="info-item"><span class="info-label">Messages:</span><span class="info-value">${msgParts.join(', ') || '0'}</span></div>
               <div class="info-item"><span class="info-label">Tool Calls:</span><span class="info-value">${globalStats.toolCalls}</span></div>
               <div class="info-item"><span class="info-label">Tokens:</span><span class="info-value">${tokenParts.join(' ') || '0'}</span></div>
@@ -2039,7 +2073,7 @@
       }
 
       function renderAttribute(name, value) {
-        return value ? ` ${name}="${escapeHtml(value)}"` : '';
+        return value ? ` ${name}="${escapeHtmlAttribute(value)}"` : '';
       }
 
       function renderUnsafeLinkText(tokens, href) {
@@ -2095,7 +2129,7 @@
             if (sanitizedHref === null) {
               return renderUnsafeLinkText.call(this, token.tokens || [], href);
             }
-            return `<a href="${escapeHtml(sanitizedHref)}"${renderAttribute('title', token.title)}>${this.parser.parseInline(token.tokens || [])}</a>`;
+            return `<a href="${escapeHtmlAttribute(sanitizedHref)}"${renderAttribute('title', token.title)}>${this.parser.parseInline(token.tokens || [])}</a>`;
           },
           image(token) {
             const href = token.href || '';
@@ -2103,7 +2137,7 @@
             if (sanitizedHref === null) {
               return renderUnsafeImageText(token.text || '', href);
             }
-            return `<img src="${escapeHtml(sanitizedHref)}" alt="${escapeHtml(token.text || '')}"${renderAttribute('title', token.title)}>`;
+            return `<img src="${escapeHtmlAttribute(sanitizedHref)}" alt="${escapeHtmlAttribute(token.text || '')}"${renderAttribute('title', token.title)}>`;
           }
         }
       });

package/src/extensibility/custom-tools/types.ts

@@ -47,7 +47,7 @@ export interface CustomToolAPI {
 	exec(command: string, args: string[], options?: ExecOptions): Promise<ExecResult>;
 	/** UI methods for user interaction (select, confirm, input, notify, custom) */
 	ui: CustomToolUIContext;
-	/** Whether UI is available (false in print/RPC mode) */
+	/** Whether an interactive UI is available */
 	hasUI: boolean;
 	/** File logger for error/warning/debug messages */
 	logger: typeof import("@sayknow-cli/utils").logger;

package/src/extensibility/extensions/compact-handler.ts

@@ -3,7 +3,7 @@
  *
  * Extension-facing APIs accept `string | CompactOptions`, but `AgentSession.compact`
  * takes two positional arguments `(instructions, options)`. This helper splits the
- * union so the same adapter can be reused by print-mode, rpc-mode, and the executor.
+ * union so the same adapter can be reused by print, SDK, ACP, and executor callers.
  */
 import type { Model } from "@sayknow-cli/ai";
 import type { CompactOptions } from "./types";
@@ -24,7 +24,7 @@ export async function runExtensionCompact(
 
 interface SetModelCapableSession {
 	modelRegistry: { getApiKey(model: Model): Promise<string | undefined> };
-	setModel(model: Model): Promise<unknown>;
+	setModel(model: Model, role?: string, options?: { cause?: string }): Promise<unknown>;
 }
 
 /**
@@ -35,6 +35,6 @@ interface SetModelCapableSession {
 export async function runExtensionSetModel(session: SetModelCapableSession, model: Model): Promise<boolean> {
 	const key = await session.modelRegistry.getApiKey(model);
 	if (!key) return false;
-	await session.setModel(model);
+	await session.setModel(model, "default", { cause: "user-selection" });
 	return true;
 }

package/src/extensibility/extensions/get-commands-handler.ts

@@ -2,8 +2,8 @@
  * Helper for wiring the `getCommands` action of {@link ExtensionAPI}.
  *
  * Centralizes the union over the three slash-command sources the runtime
- * exposes so the five wiring sites (interactive UI, ACP, RPC, print, child
- * task executor) cannot drift:
+ * exposes so the interactive UI, ACP, SDK, print, and child task executor wiring
+ * sites cannot drift:
  *   - extension-registered hook commands (`source: "extension"`)
  *   - prompt commands loaded as `LoadedCustomCommand` — user/project/bundled
  *     custom commands and MCP prompts (`source: "prompt"`)

package/src/extensibility/extensions/loader.ts

@@ -5,7 +5,7 @@ import type * as fs1 from "node:fs";
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
 import type { ThinkingLevel } from "@sayknow-cli/agent-core";
-import type { ImageContent, Model, TextContent } from "@sayknow-cli/ai";
+import type { ImageContent, Model, TextContent, Tool, UsageReport } from "@sayknow-cli/ai";
 import type { KeyId } from "@sayknow-cli/tui";
 import { hasFsCode, isEacces, isEnoent, logger } from "@sayknow-cli/utils";
 import * as Zod from "zod/v4";
@@ -62,7 +62,7 @@ export class ExtensionRuntime implements IExtensionRuntime {
 		throw new ExtensionRuntimeNotInitializedError();
 	}
 
-	sendUserMessage(): void {
+	sendUserMessage(): Promise<void> {
 		throw new ExtensionRuntimeNotInitializedError();
 	}
 
@@ -82,6 +82,10 @@ export class ExtensionRuntime implements IExtensionRuntime {
 		throw new ExtensionRuntimeNotInitializedError();
 	}
 
+	resolveTool(): Pick<Tool, "safeSummary" | "safeSummaryFields"> | undefined {
+		throw new ExtensionRuntimeNotInitializedError();
+	}
+
 	setActiveTools(): Promise<void> {
 		throw new ExtensionRuntimeNotInitializedError();
 	}
@@ -102,6 +106,38 @@ export class ExtensionRuntime implements IExtensionRuntime {
 		throw new ExtensionRuntimeNotInitializedError();
 	}
 
+	getThinkingVisibility(): "visible" | "hidden" {
+		throw new ExtensionRuntimeNotInitializedError();
+	}
+
+	setThinkingVisibility(): void {
+		throw new ExtensionRuntimeNotInitializedError();
+	}
+
+	cycleThinkingLevel(): ThinkingLevel | undefined {
+		throw new ExtensionRuntimeNotInitializedError();
+	}
+
+	setThinkingLevelForControl(): Promise<void> {
+		throw new ExtensionRuntimeNotInitializedError();
+	}
+
+	setThinkingVisibilityForControl(): Promise<void> {
+		throw new ExtensionRuntimeNotInitializedError();
+	}
+
+	setModelTemporaryForControl(): Promise<boolean> {
+		throw new ExtensionRuntimeNotInitializedError();
+	}
+
+	fetchUsageReportsForControl(): Promise<UsageReport[] | null> {
+		throw new ExtensionRuntimeNotInitializedError();
+	}
+
+	getThinkingScopeForControl(): "session" | "global config" {
+		throw new ExtensionRuntimeNotInitializedError();
+	}
+
 	getSessionName(): string | undefined {
 		throw new ExtensionRuntimeNotInitializedError();
 	}
@@ -204,9 +240,9 @@ class ConcreteExtensionAPI implements ExtensionAPI, IExtensionRuntime {
 
 	sendUserMessage(
 		content: string | (TextContent | ImageContent)[],
-		options?: { deliverAs?: "steer" | "followUp" },
-	): void {
-		this.runtime.sendUserMessage(content, options);
+		options?: { deliverAs?: "steer" | "followUp"; onPreflightAccepted?: () => void },
+	): Promise<void> {
+		return Promise.resolve(this.runtime.sendUserMessage(content, options));
 	}
 
 	appendEntry(customType: string, data?: unknown): void {
@@ -225,6 +261,10 @@ class ConcreteExtensionAPI implements ExtensionAPI, IExtensionRuntime {
 		return this.runtime.getAllTools();
 	}
 
+	resolveTool(name: string): Pick<Tool, "safeSummary" | "safeSummaryFields"> | undefined {
+		return this.runtime.resolveTool(name);
+	}
+
 	setActiveTools(toolNames: string[]): Promise<void> {
 		return this.runtime.setActiveTools(toolNames);
 	}
@@ -245,6 +285,38 @@ class ConcreteExtensionAPI implements ExtensionAPI, IExtensionRuntime {
 		this.runtime.setThinkingLevel(level, persist);
 	}
 
+	getThinkingVisibility(): "visible" | "hidden" {
+		return this.runtime.getThinkingVisibility();
+	}
+
+	setThinkingVisibility(visibility: "visible" | "hidden", persist?: boolean): void {
+		this.runtime.setThinkingVisibility(visibility, persist);
+	}
+
+	cycleThinkingLevel(): ThinkingLevel | undefined {
+		return this.runtime.cycleThinkingLevel();
+	}
+
+	setThinkingLevelForControl(level: ThinkingLevel, persist: boolean): Promise<void> {
+		return this.runtime.setThinkingLevelForControl(level, persist);
+	}
+
+	setThinkingVisibilityForControl(visibility: "visible" | "hidden", persist: boolean): Promise<void> {
+		return this.runtime.setThinkingVisibilityForControl(visibility, persist);
+	}
+
+	setModelTemporaryForControl(model: Model, expectedSessionId?: string): Promise<boolean> {
+		return this.runtime.setModelTemporaryForControl(model, expectedSessionId);
+	}
+
+	fetchUsageReportsForControl(): Promise<UsageReport[] | null> {
+		return this.runtime.fetchUsageReportsForControl();
+	}
+
+	getThinkingScopeForControl(): "session" | "global config" {
+		return this.runtime.getThinkingScopeForControl();
+	}
+
 	getSessionName(): string | undefined {
 		return this.runtime.getSessionName();
 	}

package/src/extensibility/extensions/runner.ts

@@ -6,9 +6,9 @@ import type { CredentialDisabledEvent, ImageContent, Model, ProviderResponseMeta
 import type { KeyId } from "@sayknow-cli/tui";
 import { logger } from "@sayknow-cli/utils";
 import type { ModelRegistry } from "../../config/model-registry";
-import type { WorkflowGateEmitter } from "../../modes/shared/agent-wire/unattended-session";
+import type { WorkflowGateEmitter } from "../../modes/shared/agent-wire/workflow-gate-broker";
 import { type Theme, theme } from "../../modes/theme/theme";
-import type { SessionManager } from "../../session/session-manager";
+import { createReadonlySessionManager, type SessionManager } from "../../session/session-manager";
 import type {
 	AfterProviderResponseEvent,
 	BeforeAgentStartEvent,
@@ -182,10 +182,42 @@ export class ExtensionRunner {
 	#waitForIdleFn: () => Promise<void> = async () => {};
 	#abortFn: () => void = () => {};
 	#hasPendingMessagesFn: () => boolean = () => false;
+	#getPendingMessageCountsFn: () => { steering: number; followUp: number; nextTurn: number } = () => ({
+		steering: 0,
+		followUp: 0,
+		nextTurn: 0,
+	});
 	#getContextUsageFn: () => ContextUsage | undefined = () => undefined;
 	#compactFn: (instructionsOrOptions?: string | CompactOptions) => Promise<void> = async () => {};
 	#getSystemPromptFn: () => string[] = () => [];
 	#getWorkflowGateFn: () => WorkflowGateEmitter | undefined = () => undefined;
+	#clearContextFn: () => Promise<boolean> = async () => false;
+	#getTranscriptFn: ExtensionContext["getTranscript"] = () => [];
+	#getTranscriptBodyFn: ExtensionContext["getTranscriptBody"] = () => undefined;
+	#getGoalStateFn: ExtensionContext["getGoalState"] = () => undefined;
+	#getTodoStateFn: ExtensionContext["getTodoState"] = () => undefined;
+	#getQueuedMessagesFn: ExtensionContext["getQueuedMessages"] = () => [];
+	#getActiveToolsFn: ExtensionContext["getActiveTools"] = () => [];
+	#getAllToolsFn: ExtensionContext["getAllTools"] = () => [];
+	#getResolveToolFn: ExtensionContext["resolveTool"] = () => undefined;
+	#cycleModelFn: ExtensionContextActions["cycleModel"] = undefined;
+	#cycleThinkingLevelFn: ExtensionContextActions["cycleThinkingLevel"] = undefined;
+	#setQueueModeFn: ExtensionContextActions["setQueueMode"] = undefined;
+	#getSkillStateFn: ExtensionContextActions["getSkillState"] = undefined;
+	#getConfigItemsFn: ExtensionContextActions["getConfigItems"] = undefined;
+	#getBranchCandidatesFn: ExtensionContextActions["getBranchCandidates"] = undefined;
+	#getExtensionsFn: ExtensionContextActions["getExtensions"] = undefined;
+	#getArtifactFn: ExtensionContextActions["getArtifact"] = undefined;
+	#getArtifactRangeFn: ExtensionContextActions["getArtifactRange"] = undefined;
+
+	#getJobsFn: ExtensionContextActions["getJobs"] = undefined;
+	#sdkControlFn: ExtensionContextActions["sdkControl"] = undefined;
+	#setSdkPermissionProviderFn: ExtensionContextActions["setSdkPermissionProvider"] = undefined;
+
+	#invokeSkillFn: ExtensionContextActions["invokeSkill"] = undefined;
+	#setPlanModeFn: ExtensionContextActions["setPlanMode"] = undefined;
+	#operateGoalFn: ExtensionContextActions["operateGoal"] = undefined;
+
 	#newSessionHandler: NewSessionHandler = async () => ({ cancelled: false });
 	#branchHandler: BranchHandler = async () => ({ cancelled: false });
 	#navigateTreeHandler: NavigateTreeHandler = async () => ({ cancelled: false });
@@ -244,11 +276,20 @@ export class ExtensionRunner {
 		this.runtime.appendEntry = actions.appendEntry;
 		this.runtime.getActiveTools = actions.getActiveTools;
 		this.runtime.getAllTools = actions.getAllTools;
+		this.runtime.resolveTool = actions.resolveTool ?? (() => undefined);
 		this.runtime.setActiveTools = actions.setActiveTools;
 		this.runtime.getCommands = actions.getCommands;
 		this.runtime.setModel = actions.setModel;
 		this.runtime.getThinkingLevel = actions.getThinkingLevel;
 		this.runtime.setThinkingLevel = actions.setThinkingLevel;
+		this.runtime.getThinkingVisibility = actions.getThinkingVisibility;
+		this.runtime.setThinkingVisibility = actions.setThinkingVisibility;
+		this.runtime.cycleThinkingLevel = actions.cycleThinkingLevel;
+		this.runtime.setThinkingLevelForControl = actions.setThinkingLevelForControl;
+		this.runtime.setThinkingVisibilityForControl = actions.setThinkingVisibilityForControl;
+		this.runtime.setModelTemporaryForControl = actions.setModelTemporaryForControl;
+		this.runtime.fetchUsageReportsForControl = actions.fetchUsageReportsForControl;
+		this.runtime.getThinkingScopeForControl = actions.getThinkingScopeForControl;
 		this.runtime.getSessionName = actions.getSessionName;
 		this.runtime.setSessionName = actions.setSessionName;
 
@@ -257,9 +298,37 @@ export class ExtensionRunner {
 		this.#isIdleFn = contextActions.isIdle;
 		this.#abortFn = contextActions.abort;
 		this.#hasPendingMessagesFn = contextActions.hasPendingMessages;
+		this.#getPendingMessageCountsFn =
+			contextActions.getPendingMessageCounts ?? (() => ({ steering: 0, followUp: 0, nextTurn: 0 }));
 		this.#shutdownHandler = contextActions.shutdown;
 		this.#getSystemPromptFn = contextActions.getSystemPrompt;
 		this.#getWorkflowGateFn = contextActions.getWorkflowGate ?? (() => undefined);
+		this.#clearContextFn = contextActions.clearContext ?? (async () => false);
+		this.#getTranscriptFn = contextActions.getTranscript ?? (() => []);
+		this.#getTranscriptBodyFn = contextActions.getTranscriptBody ?? (() => undefined);
+		this.#getGoalStateFn = contextActions.getGoalState ?? (() => undefined);
+		this.#getTodoStateFn = contextActions.getTodoState ?? (() => undefined);
+		this.#getQueuedMessagesFn = contextActions.getQueuedMessages ?? (() => []);
+		this.#getActiveToolsFn = contextActions.getActiveTools ?? (() => []);
+		this.#getAllToolsFn = contextActions.getAllTools ?? (() => []);
+		this.#getResolveToolFn = contextActions.resolveTool ?? (() => undefined);
+		this.#cycleModelFn = contextActions.cycleModel;
+		this.#cycleThinkingLevelFn = contextActions.cycleThinkingLevel;
+		this.#setQueueModeFn = contextActions.setQueueMode;
+		this.#getSkillStateFn = contextActions.getSkillState;
+		this.#invokeSkillFn = contextActions.invokeSkill;
+		this.#setPlanModeFn = contextActions.setPlanMode;
+		this.#operateGoalFn = contextActions.operateGoal;
+
+		this.#getConfigItemsFn = contextActions.getConfigItems;
+		this.#getBranchCandidatesFn = contextActions.getBranchCandidates;
+		this.#getExtensionsFn = contextActions.getExtensions;
+		this.#getArtifactFn = contextActions.getArtifact;
+		this.#getArtifactRangeFn = contextActions.getArtifactRange;
+
+		this.#getJobsFn = contextActions.getJobs;
+		this.#sdkControlFn = contextActions.sdkControl;
+		this.#setSdkPermissionProviderFn = contextActions.setSdkPermissionProvider;
 
 		// Command context actions (optional, only for interactive mode)
 		if (commandContextActions) {
@@ -297,8 +366,8 @@ export class ExtensionRunner {
 	 * Forward a `credential_disabled` event from `AuthStorage` to extension handlers.
 	 *
 	 * If {@link initialize} has not yet run, the event is buffered and replayed once
-	 * initialize wires the runtime/UI context. This matters because mode controllers
-	 * (interactive, RPC, ACP, print, subagent) call `initialize()` AFTER `createAgentSession`
+	 * initialize wires the runtime/UI context. This matters because session frontends
+	 * (interactive, ACP, print, and subagent) call `initialize()` AFTER `createAgentSession`
 	 * returns, but `AuthStorage` can fire `credential_disabled` during startup model probes
 	 * inside `createAgentSession()`. Without deferral, extension handlers would observe
 	 * `hasUI=false`, an unset model, and no-op runtime actions on exactly the headline
@@ -474,7 +543,7 @@ export class ExtensionRunner {
 			compact: instructionsOrOptions => this.#compactFn(instructionsOrOptions),
 			hasUI: this.hasUI(),
 			cwd: this.cwd,
-			sessionManager: this.sessionManager,
+			sessionManager: createReadonlySessionManager(this.sessionManager),
 			sessionMetadata: this.sessionMetadata,
 			modelRegistry: this.modelRegistry,
 			get model() {
@@ -483,10 +552,53 @@ export class ExtensionRunner {
 			isIdle: () => this.#isIdleFn(),
 			abort: () => this.#abortFn(),
 			hasPendingMessages: () => this.#hasPendingMessagesFn(),
+			getPendingMessageCounts: () => this.#getPendingMessageCountsFn(),
+			getTranscript: () => this.#getTranscriptFn(),
+			getTranscriptBody: entryId => this.#getTranscriptBodyFn(entryId),
+			getGoalState: () => this.#getGoalStateFn(),
+			getTodoState: () => this.#getTodoStateFn(),
+			getQueuedMessages: () => this.#getQueuedMessagesFn(),
+			getActiveTools: () => this.#getActiveToolsFn(),
+			getAllTools: () => this.#getAllToolsFn(),
+			resolveTool: name => this.#getResolveToolFn(name),
+			cycleModel: async () => await this.#cycleModelFn?.(),
+			cycleThinkingLevel: () => this.#cycleThinkingLevelFn?.(),
+			setQueueMode: (kind, mode) => this.#setQueueModeFn?.(kind, mode) ?? false,
+			invokeSkill: async (name, args) => await this.#invokeSkillFn?.(name, args),
+
+			setPlanMode: on => this.#setPlanModeFn?.(on),
+			operateGoal: async (op, objective) => await this.#operateGoalFn?.(op, objective),
+
+			getSkillState: () => this.#getSkillStateFn?.(),
+			getConfigItems: () => this.#getConfigItemsFn?.(),
+			getBranchCandidates: () => this.#getBranchCandidatesFn?.(),
+			getExtensions: () => this.#getExtensionsFn?.(),
+			getArtifact: id => this.#getArtifactFn?.(id),
+			getArtifactRange: (id, offset, length) => this.#getArtifactRangeFn?.(id, offset, length),
+
+			getJobs: () => this.#getJobsFn?.(),
+			sdkControl: (operation, input) => this.#sdkControlFn?.(operation, input),
+			setSdkPermissionProvider: provider => this.#setSdkPermissionProviderFn?.(provider),
+			sdkBindings: () => [
+				...(this.#cycleModelFn ? ["cycleModel"] : []),
+				...(this.#cycleThinkingLevelFn ? ["cycleThinkingLevel"] : []),
+				...(this.#setQueueModeFn ? ["setQueueMode"] : []),
+				...(this.#getSkillStateFn ? ["getSkillState"] : []),
+				...(this.#getConfigItemsFn ? ["getConfigItems"] : []),
+				...(this.#getBranchCandidatesFn ? ["getBranchCandidates"] : []),
+				...(this.#getExtensionsFn ? ["getExtensions"] : []),
+				...(this.#getArtifactRangeFn ? ["getArtifactRange"] : []),
+				...(this.#getJobsFn ? ["getJobs"] : []),
+				...(this.#sdkControlFn ? ["sdkControl"] : []),
+				...(this.#invokeSkillFn ? ["invokeSkill"] : []),
+				...(this.#setPlanModeFn ? ["setPlanMode"] : []),
+				...(this.#operateGoalFn ? ["operateGoal"] : []),
+			],
 			shutdown: () => this.#shutdownHandler(),
 			getSystemPrompt: () => [...this.#getSystemPromptFn()],
 			hasQueuedMessages: () => this.#hasPendingMessagesFn(), // deprecated alias
 			workflowGate: this.#getWorkflowGateFn(),
+			clearContext: () => this.#clearContextFn(),
 		};
 	}
 
@@ -570,7 +682,10 @@ export class ExtensionRunner {
 		}
 	}
 
-	async emit<TEvent extends RunnerEmitEvent>(event: TEvent): Promise<RunnerEmitResult<TEvent>> {
+	async emit<TEvent extends RunnerEmitEvent>(
+		event: TEvent,
+		continueWhile?: () => boolean,
+	): Promise<RunnerEmitResult<TEvent>> {
 		const handlers = this.#handlersByEvent.get(event.type) ?? [];
 		if (handlers.length === 0) return undefined as RunnerEmitResult<TEvent>;
 
@@ -578,7 +693,9 @@ export class ExtensionRunner {
 		let result: SessionBeforeEventResult | SessionCompactingResult | undefined;
 
 		for (const { ext, handler } of handlers) {
+			if (continueWhile && !continueWhile()) return result as RunnerEmitResult<TEvent>;
 			const handlerResult = await this.#runHandlerWithTimeout(handler, event, ctx, ext, extensionHandlerTimeoutMs);
+			if (continueWhile && !continueWhile()) return result as RunnerEmitResult<TEvent>;
 
 			if (this.#isSessionBeforeEvent(event) && handlerResult) {
 				result = handlerResult as SessionBeforeEventResult;
@@ -734,7 +851,7 @@ export class ExtensionRunner {
 	async emitInput(
 		text: string,
 		images: ImageContent[] | undefined,
-		source: "interactive" | "rpc" | "extension",
+		source: "interactive" | "sdk" | "extension",
 	): Promise<InputEventResult> {
 		const handlers = this.#handlersByEvent.get("input") ?? [];
 		if (handlers.length === 0) return {};