@schlenkr/ragents 0.1.4 → 0.1.6

package/packages/agent/src/core/extensions/types.ts

@@ -1,340 +1,43 @@
-/**
- * Extension system types.
- *
- * Extensions are TypeScript modules that can:
- * - Subscribe to agent lifecycle events
- * - Register LLM-callable tools
- * - Register commands, keyboard shortcuts, and CLI flags
- * - Interact with the user via UI primitives
- */
+/** Extensions are inline factories: they adjust the system prompt, the messages of a model call and tool results, and register tools. */
 
-import type {
-	AgentMessage,
-	AgentToolResult,
-	AgentToolUpdateCallback,
-	ThinkingLevel,
-	ToolExecutionMode,
-} from "@aicontainer/agent-core";
-import type {
-	Api,
-	AssistantMessageEvent,
-	AssistantMessageEventStream,
-	Context,
-	ImageContent,
-	InputModality,
-	UserAttachment,
-	UserContent,
-	Model,
-	OAuthCredentials,
-	OAuthLoginCallbacks,
-	ProviderHeaders,
-	RefreshModelsContext,
-	SimpleStreamOptions,
-	TextContent,
-	ToolResultMessage,
-} from "@aicontainer/ai";
+import type { AgentMessage, AgentToolResult, AgentToolUpdateCallback, ToolExecutionMode } from "../../loop/index.ts";
+import type { ImageContent, Model, TextContent, UserAttachment } from "@ragents/ai";
 import type { Static, TSchema } from "typebox";
-import type { BashResult } from "../bash-executor.ts";
-import type { CompactionPreparation, CompactionResult } from "../compaction/index.ts";
-import type { EventBus } from "../event-bus.ts";
-import type { ExecOptions, ExecResult } from "../exec.ts";
-import type { CustomMessage } from "../messages.ts";
-import type { ModelRegistry } from "../model-registry.ts";
-import type { BranchSummaryEntry, CompactionEntry, ReadonlySessionManager, SessionEntry, SessionManager } from "../session-manager.ts";
-import type { SlashCommandInfo } from "../slash-commands.ts";
+import type { ReadonlySessionManager } from "../session-manager.ts";
 import type { SourceInfo } from "../source-info.ts";
 import type { BuildSystemPromptOptions } from "../system-prompt.ts";
-import type { BashOperations } from "../tools/bash.ts";
-import type { EditToolDetails } from "../tools/edit.ts";
-import type {
-	BashToolDetails,
-	BashToolInput,
-	EditToolInput,
-	ReadToolDetails,
-	ReadToolInput,
-	WriteToolInput,
-} from "../tools/index.ts";
 
-export type { ExecOptions, ExecResult } from "../exec.ts";
 export type { BuildSystemPromptOptions } from "../system-prompt.ts";
 export type { AgentToolResult, AgentToolUpdateCallback, ToolExecutionMode };
 
-// ============================================================================
-// UI Context
-// ============================================================================
-
-/** Options for extension UI dialogs. */
-export interface ExtensionUIDialogOptions {
-	/** AbortSignal to programmatically dismiss the dialog. */
-	signal?: AbortSignal;
-	/** Timeout in milliseconds. Dialog auto-dismisses with live countdown display. */
-	timeout?: number;
-}
-
-/** Placement for extension widgets. */
-export type WidgetPlacement = "aboveEditor" | "belowEditor";
-
-/** Options for extension widgets. */
-export interface ExtensionWidgetOptions {
-	/** Where the widget is rendered. Defaults to "aboveEditor". */
-	placement?: WidgetPlacement;
-}
-
-/** Raw terminal input listener for extensions. */
-export type TerminalInputHandler = (data: string) => { consume?: boolean; data?: string } | undefined;
-
-/** Working indicator configuration for the interactive streaming loader. */
-export interface WorkingIndicatorOptions {
-	/** Animation frames. Use an empty array to hide the indicator entirely. Custom frames are rendered verbatim. */
-	frames?: string[];
-	/** Frame interval in milliseconds for animated indicators. */
-	intervalMs?: number;
-}
-
-/**
- * UI context for extensions to request interactive UI.
- * Each mode (interactive, RPC, print) provides its own implementation.
- */
-export interface ExtensionUIContext {
-	/** Show a selector and return the user's choice. */
-	select(title: string, options: string[], opts?: ExtensionUIDialogOptions): Promise<string | undefined>;
-
-	/** Show a confirmation dialog. */
-	confirm(title: string, message: string, opts?: ExtensionUIDialogOptions): Promise<boolean>;
-
-	/** Show a text input dialog. */
-	input(title: string, placeholder?: string, opts?: ExtensionUIDialogOptions): Promise<string | undefined>;
-
-	/** Show a notification to the user. */
-	notify(message: string, type?: "info" | "warning" | "error"): void;
-
-	/** Listen to raw terminal input (interactive mode only). Returns an unsubscribe function. */
-	onTerminalInput(handler: TerminalInputHandler): () => void;
-
-	/** Set status text in the footer/status bar. Pass undefined to clear. */
-	setStatus(key: string, text: string | undefined): void;
-
-	/** Set the working/loading message shown during streaming. Call with no argument to restore default. */
-	setWorkingMessage(message?: string): void;
-
-	/** Show or hide the built-in interactive working loader row during streaming. */
-	setWorkingVisible(visible: boolean): void;
-
-	/**
-	 * Configure the interactive working indicator shown during streaming.
-	 *
-	 * - Omit the argument to restore the default animated spinner.
-	 * - Use `frames: ["●"]` for a static indicator.
-	 * - Use `frames: []` to hide the indicator entirely.
-	 * - Custom frames are rendered as provided, so extensions must add their own colors.
-	 */
-	setWorkingIndicator(options?: WorkingIndicatorOptions): void;
-
-	/** Set the label shown for hidden thinking blocks. Call with no argument to restore default. */
-	setHiddenThinkingLabel(label?: string): void;
-
-	/** Set a widget to display above or below the editor. Accepts string array or component factory. */
-	setWidget(key: string, content: string[] | undefined, options?: ExtensionWidgetOptions): void;
-
-	
-
-	
-
-	/** Set the terminal window/tab title. */
-	setTitle(title: string): void;
-
-	
-
-	/** Paste text into the editor, triggering paste handling (collapse for large content). */
-	pasteToEditor(text: string): void;
-
-	/** Set the text in the core input editor. */
-	setEditorText(text: string): void;
-
-	/** Get the current text from the core input editor. */
-	getEditorText(): string;
-
-	/** Show a multi-line editor for text editing. */
-	editor(title: string, prefill?: string): Promise<string | undefined>;
-
-	
-
-	
-
-	
-
-	/** Get the current theme for styling. */
-
-	
-
-	
-
-	
-
-	/** Get current tool output expansion state. */
-	getToolsExpanded(): boolean;
-
-	/** Set tool output expansion state. */
-	setToolsExpanded(expanded: boolean): void;
-}
-
-// ============================================================================
-// Extension Context
-// ============================================================================
-
-export interface ContextUsage {
-	/** Estimated context tokens, or null if unknown (e.g. right after compaction, before next LLM response). */
-	tokens: number | null;
-	contextWindow: number;
-	/** Context usage as percentage of context window, or null if tokens is unknown. */
-	percent: number | null;
-}
-
-export interface CompactOptions {
-	customInstructions?: string;
-	onComplete?: (result: CompactionResult) => void;
-	onError?: (error: Error) => void;
-}
-
-/**
- * Context passed to extension event handlers.
- */
-export type ExtensionMode = "rpc" | "json" | "print";
-
+/** Context passed to extension event handlers and tools. */
 export interface ExtensionContext {
-	/** UI methods for user interaction */
-	ui: ExtensionUIContext;
-	mode: ExtensionMode;
-	/** Whether dialog-capable UI is available (true in RPC mode) */
-	hasUI: boolean;
-	/** Current working directory */
-	cwd: string;
 	/** Session manager (read-only) */
 	sessionManager: ReadonlySessionManager;
-	/** Model registry for API key resolution */
-	modelRegistry: ModelRegistry;
 	/** Current model (may be undefined) */
 	model: Model<any> | undefined;
-	/** Whether the agent is idle (not streaming) */
-	isIdle(): boolean;
-	/** Whether project-local trust is active for this context. */
-	isProjectTrusted(): boolean;
 	/** The current abort signal, or undefined when the agent is not streaming. */
 	signal: AbortSignal | undefined;
-	/** Abort the current agent operation */
-	abort(): void;
-	/** Whether there are queued messages waiting */
-	hasPendingMessages(): boolean;
-	/** Gracefully shutdown the agent and exit. Available in all contexts. */
-	shutdown(): void;
-	/** Get current context usage for the active model. */
-	getContextUsage(): ContextUsage | undefined;
-	/** Trigger compaction without awaiting completion. */
-	compact(options?: CompactOptions): void;
-	/** Get the current effective system prompt. */
-	getSystemPrompt(): string;
-}
-
-/**
- * Extended context for command handlers.
- * Includes session control methods only safe in user-initiated commands.
- */
-export interface ExtensionCommandContext extends ExtensionContext {
-	/** Get the current base system-prompt construction options. */
-	getSystemPromptOptions(): BuildSystemPromptOptions;
-
-	/** Wait for the agent to finish streaming */
-	waitForIdle(): Promise<void>;
-
-	/** Start a new session, optionally with initialization. */
-	newSession(options?: {
-		parentSession?: string;
-		setup?: (sessionManager: SessionManager) => Promise<void>;
-		withSession?: (ctx: ReplacedSessionContext) => Promise<void>;
-	}): Promise<{ cancelled: boolean }>;
-
-	/** Fork from a specific entry, creating a new session file. */
-	fork(
-		entryId: string,
-		options?: { position?: "before" | "at"; withSession?: (ctx: ReplacedSessionContext) => Promise<void> },
-	): Promise<{ cancelled: boolean }>;
-
-	/** Navigate to a different point in the session tree. */
-	navigateTree(
-		targetId: string,
-		options?: { summarize?: boolean; customInstructions?: string; replaceInstructions?: boolean; label?: string },
-	): Promise<{ cancelled: boolean }>;
-
-	/** Switch to a different session file. */
-	switchSession(
-		sessionPath: string,
-		options?: { withSession?: (ctx: ReplacedSessionContext) => Promise<void> },
-	): Promise<{ cancelled: boolean }>;
-
-	/** Reload extensions, skills, prompts, themes, and context files. */
-	reload(): Promise<void>;
-}
-
-/**
- * Fresh command-capable context bound to the replacement session after a session switch.
- *
- * This is passed to `withSession()` callbacks on `newSession()`, `fork()`, and `switchSession()`.
- */
-export interface ReplacedSessionContext extends ExtensionCommandContext {
-	sendMessage<T = unknown>(
-		message: Pick<CustomMessage<T>, "customType" | "content" | "display" | "details">,
-		options?: { triggerTurn?: boolean; deliverAs?: "steer" | "followUp" | "nextTurn" },
-	): Promise<void>;
-
-	sendUserMessage(
-		content: string | UserContent[],
-		options?: { deliverAs?: "steer" | "followUp" },
-	): Promise<void>;
 }
 
-// ============================================================================
-// Tool Types
-// ============================================================================
-
-/** Rendering options for tool results */
-export interface ToolRenderResultOptions {
-	/** Whether the result view is expanded */
-	expanded: boolean;
-	/** Whether this is a partial/streaming result */
-	isPartial: boolean;
-}
-
-/**
- * Tool definition for registerTool().
- */
+/** Tool definition for registerTool(). */
 export interface ToolDefinition<TParams extends TSchema = TSchema, TDetails = unknown, TState = any> {
 	/** Tool name (used in LLM tool calls) */
 	name: string;
-	/** Human-readable label for UI */
+	/** Human-readable label */
 	label: string;
 	/** Description for LLM */
 	description: string;
-	/** Optional one-line snippet for the Available tools section in the default system prompt. Custom tools are omitted from that section when this is not provided. */
+	/** Optional one-line snippet for the Available tools section in the default system prompt. */
 	promptSnippet?: string;
 	/** Optional guideline bullets appended to the default system prompt Guidelines section when this tool is active. */
 	promptGuidelines?: string[];
 	/** Parameter schema (TypeBox) */
 	parameters: TParams;
-	/** Controls whether ToolExecutionComponent renders the standard colored shell or the tool renders its own framing. */
-	renderShell?: "default" | "self";
-
-	/** Optional compatibility shim to prepare raw tool call arguments before schema validation. Must return an object conforming to TParams. */
+	/** Optional compatibility shim to prepare raw tool call arguments before schema validation. */
 	prepareArguments?: (args: unknown) => Static<TParams>;
-
-	/**
-	 * Per-tool execution mode override.
-	 * - "sequential": this tool must execute one at a time with other tool calls.
-	 * - "parallel": this tool can execute concurrently with other tool calls.
-	 *
-	 * If omitted, the default execution mode applies.
-	 */
+	/** Per-tool execution mode override; if omitted, the default execution mode applies. */
 	executionMode?: ToolExecutionMode;
-
 	/** Execute the tool. */
 	execute(
 		toolCallId: string,
@@ -343,921 +46,85 @@ export interface ToolDefinition<TParams extends TSchema = TSchema, TDetails = un
 		onUpdate: AgentToolUpdateCallback<TDetails> | undefined,
 		ctx: ExtensionContext,
 	): Promise<AgentToolResult<TDetails>>;
-
 }
 
 type AnyToolDefinition = ToolDefinition<any, any, any>;
 
-/**
- * Preserve parameter inference for standalone tool definitions.
- *
- * Use this when assigning a tool to a variable or passing it through arrays such
- * as `customTools`, where contextual typing would otherwise widen params to
- * `unknown`.
- */
+/** Preserve parameter inference for standalone tool definitions. */
 export function defineTool<TParams extends TSchema, TDetails = unknown, TState = any>(
 	tool: ToolDefinition<TParams, TDetails, TState>,
 ): ToolDefinition<TParams, TDetails, TState> & AnyToolDefinition {
 	return tool as ToolDefinition<TParams, TDetails, TState> & AnyToolDefinition;
 }
 
-// ============================================================================
-// Startup/Resource Events
-// ============================================================================
-
-export interface ProjectTrustEvent {
-	type: "project_trust";
-	cwd: string;
-}
-
-export type ProjectTrustEventDecision = "yes" | "no" | "undecided";
-
-export interface ProjectTrustEventResult {
-	trusted: ProjectTrustEventDecision;
-	remember?: boolean;
-}
-
-export interface ProjectTrustContext {
-	cwd: string;
-	mode: ExtensionMode;
-	hasUI: boolean;
-	ui: Pick<ExtensionUIContext, "select" | "confirm" | "input" | "notify">;
-}
-
-export type ProjectTrustHandler = (
-	event: ProjectTrustEvent,
-	ctx: ProjectTrustContext,
-) => Promise<ProjectTrustEventResult> | ProjectTrustEventResult;
-
-/** Fired after session_start to allow extensions to provide additional resource paths. */
-export interface ResourcesDiscoverEvent {
-	type: "resources_discover";
-	cwd: string;
-	reason: "startup" | "reload";
-}
-
-/** Result from resources_discover event handler */
-export interface ResourcesDiscoverResult {
-	skillPaths?: string[];
-	promptPaths?: string[];
-}
-
-// ============================================================================
-// Session Events
-// ============================================================================
-
-/** Fired when a session is started, loaded, or reloaded */
-export interface SessionStartEvent {
-	type: "session_start";
-	/** Why this session start happened. */
-	reason: "startup" | "reload" | "new" | "resume" | "fork";
-	/** Previously active session file. Present for "new", "resume", and "fork". */
-	previousSessionFile?: string;
-}
-
-/** Fired when the current session metadata changes. */
-export interface SessionInfoChangedEvent {
-	type: "session_info_changed";
-	/** Current normalized session name. Undefined when the name is cleared. */
-	name: string | undefined;
-}
-
-/** Fired before switching to another session (can be cancelled) */
-export interface SessionBeforeSwitchEvent {
-	type: "session_before_switch";
-	reason: "new" | "resume";
-	targetSessionFile?: string;
-}
-
-/** Fired before forking a session (can be cancelled) */
-export interface SessionBeforeForkEvent {
-	type: "session_before_fork";
-	entryId: string;
-	position: "before" | "at";
-}
-
-/** Fired before context compaction (can be cancelled or customized) */
-export interface SessionBeforeCompactEvent {
-	type: "session_before_compact";
-	preparation: CompactionPreparation;
-	branchEntries: SessionEntry[];
-	customInstructions?: string;
-	/** What triggered the compaction: manual /compact, the context threshold, or context overflow recovery */
-	reason: "manual" | "threshold" | "overflow";
-	/** True when the aborted turn is retried after this compaction (overflow recovery) */
-	willRetry: boolean;
-	signal: AbortSignal;
-}
-
-/** Fired after context compaction */
-export interface SessionCompactEvent {
-	type: "session_compact";
-	compactionEntry: CompactionEntry;
-	fromExtension: boolean;
-	/** What triggered the compaction: manual /compact, the context threshold, or context overflow recovery */
-	reason: "manual" | "threshold" | "overflow";
-	/** True when the aborted turn is retried after this compaction (overflow recovery) */
-	willRetry: boolean;
-}
-
-/** Fired before an extension runtime is torn down due to quit, reload, or session replacement. */
-export interface SessionShutdownEvent {
-	type: "session_shutdown";
-	reason: "quit" | "reload" | "new" | "resume" | "fork";
-	/** Destination session file when shutting down due to session replacement. */
-	targetSessionFile?: string;
-}
-
-/** Preparation data for tree navigation */
-export interface TreePreparation {
-	targetId: string;
-	oldLeafId: string | null;
-	commonAncestorId: string | null;
-	entriesToSummarize: SessionEntry[];
-	userWantsSummary: boolean;
-	/** Custom instructions for summarization */
-	customInstructions?: string;
-	/** If true, customInstructions replaces the default prompt instead of being appended */
-	replaceInstructions?: boolean;
-	/** Label to attach to the branch summary entry */
-	label?: string;
-}
-
-/** Fired before navigating in the session tree (can be cancelled) */
-export interface SessionBeforeTreeEvent {
-	type: "session_before_tree";
-	preparation: TreePreparation;
-	signal: AbortSignal;
-}
-
-/** Fired after navigating in the session tree */
-export interface SessionTreeEvent {
-	type: "session_tree";
-	newLeafId: string | null;
-	oldLeafId: string | null;
-	summaryEntry?: BranchSummaryEntry;
-	fromExtension?: boolean;
-}
-
-export type SessionEvent =
-	| SessionStartEvent
-	| SessionInfoChangedEvent
-	| SessionBeforeSwitchEvent
-	| SessionBeforeForkEvent
-	| SessionBeforeCompactEvent
-	| SessionCompactEvent
-	| SessionShutdownEvent
-	| SessionBeforeTreeEvent
-	| SessionTreeEvent;
-
-// ============================================================================
-// Agent Events
-// ============================================================================
-
 /** Fired before each LLM call. Can modify messages. */
 export interface ContextEvent {
 	type: "context";
 	messages: AgentMessage[];
 }
 
-/** Fired before a provider request is sent. Can replace the payload. */
-export interface BeforeProviderRequestEvent {
-	type: "before_provider_request";
-	payload: unknown;
-}
-
-/**
- * Fired after request headers are assembled, before the provider HTTP call.
- * Handlers mutate `headers` in place (e.g. to inject tracing/session headers);
- * the return value is ignored. A `null` value deletes that header.
- */
-export interface BeforeProviderHeadersEvent {
-	type: "before_provider_headers";
-	headers: ProviderHeaders;
-}
-
-/** Fired after a provider response is received and before the response stream is consumed. */
-export interface AfterProviderResponseEvent {
-	type: "after_provider_response";
-	status: number;
-	headers: Record<string, string>;
-}
-
-/** Fired after user submits prompt but before agent loop. */
+/** Fired after the user submits a prompt but before the agent loop. */
 export interface BeforeAgentStartEvent {
 	type: "before_agent_start";
-	/** The raw user prompt text (after expansion). */
+	/** The raw user prompt text. */
 	prompt: string;
-	/** Images attached to the user prompt, if any. */
-	images?: ImageContent[];
 	attachments?: UserAttachment[];
 	/** The fully assembled system prompt string. */
 	systemPrompt: string;
-	/** Structured options used to build the system prompt. Extensions can inspect this to understand what the agent loaded without re-discovering resources. */
+	/** Structured options used to build the system prompt. */
 	systemPromptOptions: BuildSystemPromptOptions;
 }
 
-/** Fired when an agent loop starts */
-export interface AgentStartEvent {
-	type: "agent_start";
-}
-
-/** Fired when an agent loop ends */
-export interface AgentEndEvent {
-	type: "agent_end";
-	messages: AgentMessage[];
-}
-
-/** Fired after an agent run has fully settled and no automatic retry, compaction, or queued continuation will run. */
-export interface AgentSettledEvent {
-	type: "agent_settled";
-}
-
-/** Fired at the start of each turn */
-export interface TurnStartEvent {
-	type: "turn_start";
-	turnIndex: number;
-	timestamp: number;
-}
-
-/** Fired at the end of each turn */
-export interface TurnEndEvent {
-	type: "turn_end";
-	turnIndex: number;
-	message: AgentMessage;
-	toolResults: ToolResultMessage[];
-}
-
-/** Fired when a message starts (user, assistant, or toolResult) */
-export interface MessageStartEvent {
-	type: "message_start";
-	message: AgentMessage;
-}
-
-/** Fired during assistant message streaming with token-by-token updates */
-export interface MessageUpdateEvent {
-	type: "message_update";
-	message: AgentMessage;
-	assistantMessageEvent: AssistantMessageEvent;
-}
-
-/** Fired when a message ends */
-export interface MessageEndEvent {
-	type: "message_end";
-	message: AgentMessage;
-}
-
-/** Fired when a tool starts executing */
-export interface ToolExecutionStartEvent {
-	type: "tool_execution_start";
-	toolCallId: string;
-	toolName: string;
-	args: any;
-}
-
-/** Fired during tool execution with partial/streaming output */
-export interface ToolExecutionUpdateEvent {
-	type: "tool_execution_update";
-	toolCallId: string;
-	toolName: string;
-	args: any;
-	partialResult: any;
-}
-
-/** Fired when a tool finishes executing */
-export interface ToolExecutionEndEvent {
-	type: "tool_execution_end";
-	toolCallId: string;
-	toolName: string;
-	result: any;
-	isError: boolean;
-}
-
-// ============================================================================
-// Model Events
-// ============================================================================
-
-export type ModelSelectSource = "set" | "cycle" | "restore";
-
-/** Fired when a new model is selected */
-export interface ModelSelectEvent {
-	type: "model_select";
-	model: Model<any>;
-	previousModel: Model<any> | undefined;
-	source: ModelSelectSource;
-}
-
-/** Fired when a new thinking level is selected */
-export interface ThinkingLevelSelectEvent {
-	type: "thinking_level_select";
-	level: ThinkingLevel;
-	previousLevel: ThinkingLevel;
-}
-
-// ============================================================================
-// User Bash Events
-// ============================================================================
-
-/** Fired when user executes a bash command via ! or !! prefix */
-export interface UserBashEvent {
-	type: "user_bash";
-	/** The command to execute */
-	command: string;
-	/** True if !! prefix was used (excluded from LLM context) */
-	excludeFromContext: boolean;
-	/** Current working directory */
-	cwd: string;
-}
-
-// ============================================================================
-// Input Events
-// ============================================================================
-
-/** Source of user input */
-export type InputSource = "interactive" | "rpc" | "extension";
-
-/** Fired when user input is received, before agent processing */
-export interface InputEvent {
-	type: "input";
-	/** The input text */
-	text: string;
-	/** Attached images, if any */
-	images?: ImageContent[];
-	attachments?: UserAttachment[];
-	/** Where the input came from */
-	source: InputSource;
-	/** How the input will be delivered during streaming, or undefined when idle */
-	streamingBehavior?: "steer" | "followUp";
-}
-
-/** Result from input event handler */
-export type InputEventResult =
-	| { action: "continue" }
-	| { action: "transform"; text: string; images?: ImageContent[]; attachments?: UserAttachment[] }
-	| { action: "handled" };
-
-// ============================================================================
-// Tool Events
-// ============================================================================
-
-interface ToolCallEventBase {
-	type: "tool_call";
-	toolCallId: string;
-}
-
-export interface BashToolCallEvent extends ToolCallEventBase {
-	toolName: "bash";
-	input: BashToolInput;
-}
-
-export interface ReadToolCallEvent extends ToolCallEventBase {
-	toolName: "read";
-	input: ReadToolInput;
-}
-
-export interface EditToolCallEvent extends ToolCallEventBase {
-	toolName: "edit";
-	input: EditToolInput;
-}
-
-export interface WriteToolCallEvent extends ToolCallEventBase {
-	toolName: "write";
-	input: WriteToolInput;
-}
-
-export interface CustomToolCallEvent extends ToolCallEventBase {
-	toolName: string;
-	input: Record<string, unknown>;
-}
-
-/**
- * Fired before a tool executes. Can block.
- *
- * `event.input` is mutable. Mutate it in place to patch tool arguments before execution.
- * Later `tool_call` handlers see earlier mutations. No re-validation is performed after mutation.
- */
-export type ToolCallEvent =
-	| BashToolCallEvent
-	| ReadToolCallEvent
-	| EditToolCallEvent
-	| WriteToolCallEvent
-	| CustomToolCallEvent;
-
-interface ToolResultEventBase {
+/** Fired after a tool executes. Can modify the result. */
+export interface ToolResultEvent {
 	type: "tool_result";
 	toolCallId: string;
+	toolName: string;
 	input: Record<string, unknown>;
 	content: (TextContent | ImageContent)[];
-	isError: boolean;
-}
-
-export interface BashToolResultEvent extends ToolResultEventBase {
-	toolName: "bash";
-	details: BashToolDetails | undefined;
-}
-
-export interface ReadToolResultEvent extends ToolResultEventBase {
-	toolName: "read";
-	details: ReadToolDetails | undefined;
-}
-
-export interface EditToolResultEvent extends ToolResultEventBase {
-	toolName: "edit";
-	details: EditToolDetails | undefined;
-}
-
-export interface WriteToolResultEvent extends ToolResultEventBase {
-	toolName: "write";
-	details: undefined;
-}
-
-export interface CustomToolResultEvent extends ToolResultEventBase {
-	toolName: string;
 	details: unknown;
+	isError: boolean;
 }
 
-/** Fired after a tool executes. Can modify result. */
-export type ToolResultEvent =
-	| BashToolResultEvent
-	| ReadToolResultEvent
-	| EditToolResultEvent
-	| WriteToolResultEvent
-	| CustomToolResultEvent;
-
-// Type guards for ToolResultEvent
-export function isBashToolResult(e: ToolResultEvent): e is BashToolResultEvent {
-	return e.toolName === "bash";
-}
-export function isReadToolResult(e: ToolResultEvent): e is ReadToolResultEvent {
-	return e.toolName === "read";
-}
-export function isEditToolResult(e: ToolResultEvent): e is EditToolResultEvent {
-	return e.toolName === "edit";
-}
-export function isWriteToolResult(e: ToolResultEvent): e is WriteToolResultEvent {
-	return e.toolName === "write";
-}
-
-/**
- * Type guard for narrowing ToolCallEvent by tool name.
- *
- * Built-in tools narrow automatically (no type params needed):
- * ```ts
- * if (isToolCallEventType("bash", event)) {
- *   event.input.command;  // string
- * }
- * ```
- *
- * Custom tools require explicit type parameters:
- * ```ts
- * if (isToolCallEventType<"my_tool", MyToolInput>("my_tool", event)) {
- *   event.input.action;  // typed
- * }
- * ```
- *
- * Note: Direct narrowing via `event.toolName === "bash"` doesn't work because
- * CustomToolCallEvent.toolName is `string` which overlaps with all literals.
- */
-export function isToolCallEventType(toolName: "bash", event: ToolCallEvent): event is BashToolCallEvent;
-export function isToolCallEventType(toolName: "read", event: ToolCallEvent): event is ReadToolCallEvent;
-export function isToolCallEventType(toolName: "edit", event: ToolCallEvent): event is EditToolCallEvent;
-export function isToolCallEventType(toolName: "write", event: ToolCallEvent): event is WriteToolCallEvent;
-export function isToolCallEventType<TName extends string, TInput extends Record<string, unknown>>(
-	toolName: TName,
-	event: ToolCallEvent,
-): event is ToolCallEvent & { toolName: TName; input: TInput };
-export function isToolCallEventType(toolName: string, event: ToolCallEvent): boolean {
-	return event.toolName === toolName;
-}
-
-/** Union of all event types */
-export type ExtensionEvent =
-	| ProjectTrustEvent
-	| ResourcesDiscoverEvent
-	| SessionEvent
-	| ContextEvent
-	| BeforeProviderRequestEvent
-	| BeforeProviderHeadersEvent
-	| AfterProviderResponseEvent
-	| BeforeAgentStartEvent
-	| AgentStartEvent
-	| AgentEndEvent
-	| AgentSettledEvent
-	| TurnStartEvent
-	| TurnEndEvent
-	| MessageStartEvent
-	| MessageUpdateEvent
-	| MessageEndEvent
-	| ToolExecutionStartEvent
-	| ToolExecutionUpdateEvent
-	| ToolExecutionEndEvent
-	| ModelSelectEvent
-	| ThinkingLevelSelectEvent
-	| UserBashEvent
-	| InputEvent
-	| ToolCallEvent
-	| ToolResultEvent;
-
-// ============================================================================
-// Event Results
-// ============================================================================
+export type ExtensionEvent = ContextEvent | BeforeAgentStartEvent | ToolResultEvent;
 
 export interface ContextEventResult {
 	messages?: AgentMessage[];
 }
 
-export type BeforeProviderRequestEventResult = unknown;
-
-export interface ToolCallEventResult {
-	/** Block tool execution. To modify arguments, mutate `event.input` in place instead. */
-	block?: boolean;
-	reason?: string;
-}
-
-/** Result from user_bash event handler */
-export interface UserBashEventResult {
-	/** Custom operations to use for execution */
-	operations?: BashOperations;
-	/** Full replacement: extension handled execution, use this result */
-	result?: BashResult;
-}
-
 export interface ToolResultEventResult {
 	content?: (TextContent | ImageContent)[];
 	details?: unknown;
 	isError?: boolean;
 }
 
-export interface MessageEndEventResult {
-	/** Replace the finalized message. The replacement must keep the original message role. */
-	message?: AgentMessage;
-}
-
 export interface BeforeAgentStartEventResult {
-	message?: Pick<CustomMessage, "customType" | "content" | "display" | "details">;
 	/** Replace the system prompt for this turn. If multiple extensions return this, they are chained. */
 	systemPrompt?: string;
 }
 
-export interface SessionBeforeSwitchResult {
-	cancel?: boolean;
-}
-
-export interface SessionBeforeForkResult {
-	cancel?: boolean;
-	skipConversationRestore?: boolean;
-}
-
-export interface SessionBeforeCompactResult {
-	cancel?: boolean;
-	compaction?: CompactionResult;
-}
-
-export interface SessionBeforeTreeResult {
-	cancel?: boolean;
-	summary?: {
-		summary: string;
-		details?: unknown;
-	};
-	/** Override custom instructions for summarization */
-	customInstructions?: string;
-	/** Override whether customInstructions replaces the default prompt */
-	replaceInstructions?: boolean;
-	/** Override label to attach to the branch summary entry */
-	label?: string;
-}
-
-// ============================================================================
-// Message and Entry Rendering
-// ============================================================================
-
-export interface MessageRenderOptions {
-	expanded: boolean;
-}
-
-export interface EntryRenderOptions {
-	expanded: boolean;
-}
-
-// ============================================================================
-// Command Registration
-// ============================================================================
-
-export interface RegisteredCommand {
-	name: string;
-	sourceInfo: SourceInfo;
-	description?: string;
-	handler: (args: string, ctx: ExtensionCommandContext) => Promise<void>;
-}
-
-export interface ResolvedCommand extends RegisteredCommand {
-	invocationName: string;
-}
-
-// ============================================================================
-// Extension API
-// ============================================================================
-
 /** Handler function type for events */
-// biome-ignore lint/suspicious/noConfusingVoidType: void allows bare return statements
 export type ExtensionHandler<E, R = undefined> = (event: E, ctx: ExtensionContext) => Promise<R | void> | R | void;
 
-/**
- * ExtensionAPI passed to extension factory functions.
- */
+/** ExtensionAPI passed to extension factory functions. */
 export interface ExtensionAPI {
-	// =========================================================================
-	// Event Subscription
-	// =========================================================================
-
-	on(event: "project_trust", handler: ProjectTrustHandler): void;
-	on(event: "resources_discover", handler: ExtensionHandler<ResourcesDiscoverEvent, ResourcesDiscoverResult>): void;
-	on(event: "session_start", handler: ExtensionHandler<SessionStartEvent>): void;
-	on(event: "session_info_changed", handler: ExtensionHandler<SessionInfoChangedEvent>): void;
-	on(
-		event: "session_before_switch",
-		handler: ExtensionHandler<SessionBeforeSwitchEvent, SessionBeforeSwitchResult>,
-	): void;
-	on(event: "session_before_fork", handler: ExtensionHandler<SessionBeforeForkEvent, SessionBeforeForkResult>): void;
-	on(
-		event: "session_before_compact",
-		handler: ExtensionHandler<SessionBeforeCompactEvent, SessionBeforeCompactResult>,
-	): void;
-	on(event: "session_compact", handler: ExtensionHandler<SessionCompactEvent>): void;
-	on(event: "session_shutdown", handler: ExtensionHandler<SessionShutdownEvent>): void;
-	on(event: "session_before_tree", handler: ExtensionHandler<SessionBeforeTreeEvent, SessionBeforeTreeResult>): void;
-	on(event: "session_tree", handler: ExtensionHandler<SessionTreeEvent>): void;
-	on(event: "context", handler: ExtensionHandler<ContextEvent, ContextEventResult>): void;
-	on(
-		event: "before_provider_request",
-		handler: ExtensionHandler<BeforeProviderRequestEvent, BeforeProviderRequestEventResult>,
-	): void;
-	on(event: "before_provider_headers", handler: ExtensionHandler<BeforeProviderHeadersEvent>): void;
-	on(event: "after_provider_response", handler: ExtensionHandler<AfterProviderResponseEvent>): void;
 	on(event: "before_agent_start", handler: ExtensionHandler<BeforeAgentStartEvent, BeforeAgentStartEventResult>): void;
-	on(event: "agent_start", handler: ExtensionHandler<AgentStartEvent>): void;
-	on(event: "agent_end", handler: ExtensionHandler<AgentEndEvent>): void;
-	on(event: "agent_settled", handler: ExtensionHandler<AgentSettledEvent>): void;
-	on(event: "turn_start", handler: ExtensionHandler<TurnStartEvent>): void;
-	on(event: "turn_end", handler: ExtensionHandler<TurnEndEvent>): void;
-	on(event: "message_start", handler: ExtensionHandler<MessageStartEvent>): void;
-	on(event: "message_update", handler: ExtensionHandler<MessageUpdateEvent>): void;
-	on(event: "message_end", handler: ExtensionHandler<MessageEndEvent, MessageEndEventResult>): void;
-	on(event: "tool_execution_start", handler: ExtensionHandler<ToolExecutionStartEvent>): void;
-	on(event: "tool_execution_update", handler: ExtensionHandler<ToolExecutionUpdateEvent>): void;
-	on(event: "tool_execution_end", handler: ExtensionHandler<ToolExecutionEndEvent>): void;
-	on(event: "model_select", handler: ExtensionHandler<ModelSelectEvent>): void;
-	on(event: "thinking_level_select", handler: ExtensionHandler<ThinkingLevelSelectEvent>): void;
-	on(event: "tool_call", handler: ExtensionHandler<ToolCallEvent, ToolCallEventResult>): void;
+	on(event: "context", handler: ExtensionHandler<ContextEvent, ContextEventResult>): void;
 	on(event: "tool_result", handler: ExtensionHandler<ToolResultEvent, ToolResultEventResult>): void;
-	on(event: "user_bash", handler: ExtensionHandler<UserBashEvent, UserBashEventResult>): void;
-	on(event: "input", handler: ExtensionHandler<InputEvent, InputEventResult>): void;
-
-	// =========================================================================
-	// Tool Registration
-	// =========================================================================
 
 	/** Register a tool that the LLM can call. */
 	registerTool<TParams extends TSchema = TSchema, TDetails = unknown, TState = any>(
 		tool: ToolDefinition<TParams, TDetails, TState>,
 	): void;
 
-	// =========================================================================
-	// Command, Shortcut, Flag Registration
-	// =========================================================================
-
-	/** Register a custom command. */
-	registerCommand(name: string, options: Omit<RegisteredCommand, "name" | "sourceInfo">): void;
-
-	
-
-	/** Register a CLI flag. */
-	registerFlag(
-		name: string,
-		options: {
-			description?: string;
-			type: "boolean" | "string";
-			default?: boolean | string;
-		},
-	): void;
-
-	/** Get the value of a registered CLI flag. */
-	getFlag(name: string): boolean | string | undefined;
-
-	
-
-	
-
-	// =========================================================================
-	// Actions
-	// =========================================================================
-
-	/** Send a custom message to the session. */
-	sendMessage<T = unknown>(
-		message: Pick<CustomMessage<T>, "customType" | "content" | "display" | "details">,
-		options?: { triggerTurn?: boolean; deliverAs?: "steer" | "followUp" | "nextTurn" },
-	): void;
-
-	/**
-	 * Send a user message to the agent. Always triggers a turn.
-	 * When the agent is streaming, use deliverAs to specify how to queue the message.
-	 */
-	sendUserMessage(
-		content: string | UserContent[],
-		options?: { deliverAs?: "steer" | "followUp" },
-	): void;
-
 	/** Append a custom entry to the session for state persistence (not sent to LLM). */
 	appendEntry<T = unknown>(customType: string, data?: T): void;
 
-	// =========================================================================
-	// Session Metadata
-	// =========================================================================
-
-	/** Set the session display name (shown in session selector). */
-	setSessionName(name: string): void;
-
-	/** Get the current session name, if set. */
-	getSessionName(): string | undefined;
-
-	/** Set or clear a label on an entry. Labels are user-defined markers for bookmarking/navigation. */
-	setLabel(entryId: string, label: string | undefined): void;
-
-	/** Execute a shell command. */
-	exec(command: string, args: string[], options?: ExecOptions): Promise<ExecResult>;
-
-	/** Get the list of currently active tool names. */
-	getActiveTools(): string[];
-
 	/** Get all configured tools with parameter schema, prompt guidelines, and source metadata. */
 	getAllTools(): ToolInfo[];
 
 	/** Set the active tools by name. */
 	setActiveTools(toolNames: string[]): void;
-
-	/** Get available slash commands in the current session. */
-	getCommands(): SlashCommandInfo[];
-
-	// =========================================================================
-	// Model and Thinking Level
-	// =========================================================================
-
-	/** Set the current model. Returns false if no API key available. */
-	setModel(model: Model<any>): Promise<boolean>;
-
-	/** Get current thinking level. */
-	getThinkingLevel(): ThinkingLevel;
-
-	/** Set thinking level (clamped to model capabilities). */
-	setThinkingLevel(level: ThinkingLevel): void;
-
-	// =========================================================================
-	// Provider Registration
-	// =========================================================================
-
-	/**
-	 * Register or override a model provider.
-	 *
-	 * If `models` is provided: replaces all existing models for this provider.
-	 * If only `baseUrl` is provided: overrides the URL for existing models.
-	 * If `oauth` is provided: registers OAuth provider for /login support.
-	 * If `streamSimple` is provided: registers a custom API stream handler.
-	 *
-	 * During initial extension load this call is queued and applied once the
-	 * runner has bound its context. After that it takes effect immediately, so
-	 * it is safe to call from command handlers or event callbacks without
-	 * requiring a `/reload`.
-	 *
-	 * @example
-	 * // Register a new provider with custom models
-	 * agent.registerProvider("my-proxy", {
-	 *   baseUrl: "https://proxy.example.com",
-	 *   apiKey: "$PROXY_API_KEY",
-	 *   api: "anthropic-messages",
-	 *   models: [
-	 *     {
-	 *       id: "claude-sonnet-4-20250514",
-	 *       name: "Claude 4 Sonnet (proxy)",
-	 *       reasoning: false,
-	 *       input: ["text", "image"],
-	 *       cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
-	 *       contextWindow: 200000,
-	 *       maxTokens: 16384
-	 *     }
-	 *   ]
-	 * });
-	 *
-	 * @example
-	 * // Override baseUrl for an existing provider
-	 * agent.registerProvider("anthropic", {
-	 *   baseUrl: "https://proxy.example.com"
-	 * });
-	 *
-	 * @example
-	 * // Register provider with OAuth support
-	 * agent.registerProvider("corporate-ai", {
-	 *   baseUrl: "https://ai.corp.com",
-	 *   api: "openai-responses",
-	 *   models: [...],
-	 *   oauth: {
-	 *     name: "Corporate AI (SSO)",
-	 *     async login(callbacks) { ... },
-	 *     async refreshToken(credentials) { ... },
-	 *     getApiKey(credentials) { return credentials.access; }
-	 *   }
-	 * });
-	 */
-	registerProvider(name: string, config: ProviderConfig): void;
-
-	/**
-	 * Unregister a previously registered provider.
-	 *
-	 * Removes all models belonging to the named provider and restores any
-	 * built-in models that were overridden by it. Has no effect if the provider
-	 * is not currently registered.
-	 *
-	 * Like `registerProvider`, this takes effect immediately when called after
-	 * the initial load phase.
-	 *
-	 * @example
-	 * agent.unregisterProvider("my-proxy");
-	 */
-	unregisterProvider(name: string): void;
-
-	/** Shared event bus for extension communication. */
-	events: EventBus;
-}
-
-// ============================================================================
-// Provider Registration Types
-// ============================================================================
-
-/** Configuration for registering a provider via agent.registerProvider(). */
-export interface ProviderConfig {
-	/** Display name for the provider in UI. */
-	name?: string;
-	/** Base URL for the API endpoint. Required when defining models. */
-	baseUrl?: string;
-	/** API key literal, env interpolation ($ENV_VAR or ${ENV_VAR}), or leading !command. Required when defining models (unless oauth provided). */
-	apiKey?: string;
-	/** API type. Required at provider or model level when defining models. */
-	api?: Api;
-	/** Optional streamSimple handler for custom APIs. */
-	streamSimple?: (model: Model<Api>, context: Context, options?: SimpleStreamOptions) => AssistantMessageEventStream;
-	/** Custom headers to include in requests. */
-	headers?: Record<string, string>;
-	/** If true, adds Authorization: Bearer header with the resolved API key. */
-	authHeader?: boolean;
-	/** Models to register. If provided, replaces all existing models for this provider. */
-	models?: ProviderModelConfig[];
-	/**
-	 * Refresh this provider's model list. The returned list replaces extension-provided models.
-	 * Use context.store explicitly when the catalog should persist across sessions.
-	 */
-	refreshModels?(context: RefreshModelsContext): Promise<ProviderModelConfig[]>;
-	/** OAuth provider for /login support. The `id` is set automatically from the provider name. */
-	oauth?: {
-		/** Display name for the provider in login UI. */
-		name: string;
-		/** @deprecated Retained for source compatibility; canonical auth flows ignore it. */
-		usesCallbackServer?: boolean;
-		/** Run the login flow, return credentials to persist. */
-		login(callbacks: OAuthLoginCallbacks): Promise<OAuthCredentials>;
-		/** Refresh expired credentials, return updated credentials to persist. */
-		refreshToken(credentials: OAuthCredentials): Promise<OAuthCredentials>;
-		/** Convert credentials to API key string for the provider. */
-		getApiKey(credentials: OAuthCredentials): string;
-		/** Legacy synchronous credential-dependent model projection. */
-		modifyModels?(models: Model<Api>[], credentials: OAuthCredentials): Model<Api>[];
-	};
-}
-
-/** Configuration for a model within a provider. */
-export interface ProviderModelConfig {
-	/** Model ID (e.g., "claude-sonnet-4-20250514"). */
-	id: string;
-	/** Display name (e.g., "Claude 4 Sonnet"). */
-	name: string;
-	/** API type override for this model. */
-	api?: Api;
-	/** API endpoint URL override for this model. */
-	baseUrl?: string;
-	/** Whether the model supports extended thinking. */
-	reasoning: boolean;
-	/** Maps thinking levels to provider/model-specific values; null marks a level unsupported. */
-	thinkingLevelMap?: Model<Api>["thinkingLevelMap"];
-	/** Supported input types. */
-	input: InputModality[];
-	/** Per-million-token cost rates and optional request-wide input pricing tiers. */
-	cost: Model<Api>["cost"];
-	/** Maximum context window size in tokens. */
-	contextWindow: number;
-	/** Maximum output tokens. */
-	maxTokens: number;
-	/** Custom headers for this model. */
-	headers?: Record<string, string>;
-	/** OpenAI compatibility settings. */
-	compat?: Model<Api>["compat"];
 }
 
 export interface ExtensionFactoryContext {
@@ -1265,7 +132,7 @@ export interface ExtensionFactoryContext {
 }
 
 /** Extension factory function type. Supports both sync and async initialization. */
-export type ExtensionFactory = (pi: ExtensionAPI, context: ExtensionFactoryContext) => void | Promise<void>;
+export type ExtensionFactory = (agent: ExtensionAPI, context: ExtensionFactoryContext) => void | Promise<void>;
 
 /** Observes the actual lifetime of an async extension factory, independently of an aborted loader wait. */
 export type ExtensionFactorySettlementObserver = (settlement: Promise<void>) => void;
@@ -1273,185 +140,55 @@ export type ExtensionFactorySettlementObserver = (settlement: Promise<void>) =>
 export type InlineExtension =
 	| ExtensionFactory
 	| {
-			/** Display name shown as `<inline:name>` in the startup Extensions list. */
+			/** Display name shown as `<inline:name>`. */
 			name: string;
 			factory: ExtensionFactory;
 	  };
 
-// ============================================================================
-// Loaded Extension Types
-// ============================================================================
-
 export interface RegisteredTool {
 	definition: ToolDefinition;
 	sourceInfo: SourceInfo;
 }
 
-export interface ExtensionFlag {
-	name: string;
-	description?: string;
-	type: "boolean" | "string";
-	default?: boolean | string;
-	extensionPath: string;
-}
-
 type HandlerFn = (...args: unknown[]) => Promise<unknown>;
 
-export type SendMessageHandler = <T = unknown>(
-	message: Pick<CustomMessage<T>, "customType" | "content" | "display" | "details">,
-	options?: { triggerTurn?: boolean; deliverAs?: "steer" | "followUp" | "nextTurn" },
-) => void;
-
-export type SendUserMessageHandler = (
-	content: string | UserContent[],
-	options?: { deliverAs?: "steer" | "followUp" },
-) => void;
-
-export type AppendEntryHandler = <T = unknown>(customType: string, data?: T) => void;
-
-export type SetSessionNameHandler = (name: string) => void;
-
-export type GetSessionNameHandler = () => string | undefined;
-
-export type GetActiveToolsHandler = () => string[];
-
 /** Tool info with name, description, parameter schema, prompt guidelines, and source metadata. */
 export type ToolInfo = Pick<ToolDefinition, "name" | "description" | "parameters" | "promptGuidelines"> & {
 	sourceInfo: SourceInfo;
 };
 
-export type GetAllToolsHandler = () => ToolInfo[];
-
-export type GetCommandsHandler = () => SlashCommandInfo[];
-
-export type SetActiveToolsHandler = (toolNames: string[]) => void;
-
-export type RefreshToolsHandler = () => void;
-
-export type SetModelHandler = (model: Model<any>) => Promise<boolean>;
-
-export type GetThinkingLevelHandler = () => ThinkingLevel;
-
-export type SetThinkingLevelHandler = (level: ThinkingLevel) => void;
-
-export type SetLabelHandler = (entryId: string, label: string | undefined) => void;
-
-/**
- * Shared state created by loader, used during registration and runtime.
- * Contains flag values (defaults set during registration, CLI values set after).
- */
-export interface ExtensionRuntimeState {
-	flagValues: Map<string, boolean | string>;
-	/** Provider registrations queued during extension loading, processed when runner binds */
-	pendingProviderRegistrations: Array<{ name: string; config: ProviderConfig; extensionPath: string }>;
-	/** Throws when this extension instance is stale after runtime replacement. */
-	assertActive: () => void;
-	/** Marks this extension instance as stale after runtime replacement or reload. */
-	invalidate: (message?: string) => void;
-	/**
-	 * Register or unregister a provider.
-	 *
-	 * Before bindCore(): queues registrations / removes from queue.
-	 * After bindCore(): calls ModelRegistry directly for immediate effect.
-	 */
-	registerProvider: (name: string, config: ProviderConfig, extensionPath?: string) => void;
-	unregisterProvider: (name: string, extensionPath?: string) => void;
-}
-
-/**
- * Action implementations for pi.* API methods.
- * Provided to runner.initialize(), copied into the shared runtime.
- */
+/** Action implementations behind the ExtensionAPI, provided by the session. */
 export interface ExtensionActions {
-	sendMessage: SendMessageHandler;
-	sendUserMessage: SendUserMessageHandler;
-	appendEntry: AppendEntryHandler;
-	setSessionName: SetSessionNameHandler;
-	getSessionName: GetSessionNameHandler;
-	setLabel: SetLabelHandler;
-	getActiveTools: GetActiveToolsHandler;
-	getAllTools: GetAllToolsHandler;
-	setActiveTools: SetActiveToolsHandler;
-	refreshTools: RefreshToolsHandler;
-	getCommands: GetCommandsHandler;
-	setModel: SetModelHandler;
-	getThinkingLevel: GetThinkingLevelHandler;
-	setThinkingLevel: SetThinkingLevelHandler;
-}
-
-/**
- * Actions for ExtensionContext (ctx.* in event handlers).
- * Required by all modes.
- */
-export interface ExtensionContextActions {
-	getModel: () => Model<any> | undefined;
-	isIdle: () => boolean;
-	isProjectTrusted: () => boolean;
-	getSignal: () => AbortSignal | undefined;
-	abort: () => void;
-	hasPendingMessages: () => boolean;
-	shutdown: () => void;
-	getContextUsage: () => ContextUsage | undefined;
-	compact: (options?: CompactOptions) => void;
-	getSystemPrompt: () => string;
-	getSystemPromptOptions?: () => BuildSystemPromptOptions;
+	appendEntry: <T = unknown>(customType: string, data?: T) => void;
+	getAllTools: () => ToolInfo[];
+	setActiveTools: (toolNames: string[]) => void;
+	refreshTools: () => void;
 }
 
-/**
- * Actions for ExtensionCommandContext (ctx.* in command handlers).
- * Only needed for interactive mode where extension commands are invokable.
- */
-export interface ExtensionCommandContextActions {
-	waitForIdle: () => Promise<void>;
-	newSession: (options?: {
-		parentSession?: string;
-		setup?: (sessionManager: SessionManager) => Promise<void>;
-		withSession?: (ctx: ReplacedSessionContext) => Promise<void>;
-	}) => Promise<{ cancelled: boolean }>;
-	fork: (
-		entryId: string,
-		options?: { position?: "before" | "at"; withSession?: (ctx: ReplacedSessionContext) => Promise<void> },
-	) => Promise<{ cancelled: boolean }>;
-	navigateTree: (
-		targetId: string,
-		options?: { summarize?: boolean; customInstructions?: string; replaceInstructions?: boolean; label?: string },
-	) => Promise<{ cancelled: boolean }>;
-	switchSession: (
-		sessionPath: string,
-		options?: { withSession?: (ctx: ReplacedSessionContext) => Promise<void> },
-	) => Promise<{ cancelled: boolean }>;
-	reload: () => Promise<void>;
+/** Shared state created by the loader; actions are throwing stubs until the runner binds the session. */
+export interface ExtensionRuntime extends ExtensionActions {
+	/** Throws when this extension instance is stale. */
+	assertActive: () => void;
+	/** Marks this extension instance as stale. */
+	invalidate: (message?: string) => void;
 }
 
-/**
- * Full runtime = state + actions.
- * Created by loader with throwing action stubs, completed by runner.initialize().
- */
-export interface ExtensionRuntime extends ExtensionRuntimeState, ExtensionActions {}
-
 /** Loaded extension with all registered items. */
 export interface Extension {
 	path: string;
-	resolvedPath: string;
 	sourceInfo: SourceInfo;
 	handlers: Map<string, HandlerFn[]>;
 	tools: Map<string, RegisteredTool>;
-	commands: Map<string, RegisteredCommand>;
-	flags: Map<string, ExtensionFlag>;
 }
 
 /** Result of loading extensions. */
 export interface LoadExtensionsResult {
 	extensions: Extension[];
 	errors: Array<{ path: string; error: string }>;
-	/** Shared runtime - actions are throwing stubs until runner.initialize() */
+	/** Shared runtime - actions are throwing stubs until the runner binds the session */
 	runtime: ExtensionRuntime;
 }
 
-// ============================================================================
-// Extension Error
-// ============================================================================
-
 export interface ExtensionError {
 	extensionPath: string;
 	event: string;