@rowan-agent/agent 0.30.0 → 0.32.0

package/dist/{index-CMFf6UJI.d.ts → index-BNGbx6JB.d.ts}

@@ -1,13 +1,13 @@
 import * as _rowan_agent_models from '@rowan-agent/models';
-import { LlmContentPart, ModelRef, LlmTokenUsage, JsonObject as JsonObject$1, ScopeRef, ToolCallStatus, JsonValue as JsonValue$1, ToolProgress, ToolCallContent, ToolCallLocation, ToolKind, ModelConfig, StreamFn, ToolAnnotations, ThinkingLevel, ContentBlock, ToolCall as ToolCall$1, ToolCallUpdate, ProviderConfig } from '@rowan-agent/models';
+import { LlmMessage, LlmContentBlock, JsonObject, ModelRef, LlmTokenUsage, ScopeRef, ToolResult, RunInteractionRequest, JsonValue, ToolCallStatus, ToolProgress, ToolCallContent, ToolCallLocation, ToolKind, ModelConfig, StreamFn, ToolAnnotations, ThinkingLevel, StreamBlock, ToolCall, ToolCallUpdate, LlmToolCall, ProviderConfig, TextBlock, ImageBlock, ThinkingBlock, RunInteractionKind } from '@rowan-agent/models';
 import Type from 'typebox';
 
-type AgentMessage = {
+type AgentMessage = Omit<LlmMessage, "role" | "content"> & {
     id: string;
-    role: "system" | "user" | "assistant" | "tool";
-    content: string | LlmContentPart[];
+    role: "system" | LlmMessage["role"];
+    content: string | LlmContentBlock[];
     createdAt: string;
-    metadata?: Record<string, unknown> & {
+    metadata?: JsonObject & {
         phase?: string;
     };
     contexts?: readonly ContextCandidate[];
@@ -30,34 +30,6 @@ type Skill = {
     /** @deprecated Use disableAutoInvocation; kept only for old in-memory callers during cutover. */
     disableModelInvocation?: boolean;
 };
-type Outcome$1 = {
-    id: string;
-    message: string;
-    /** Publish this outcome's message as an assistant message before completing the run. */
-    display?: boolean;
-    payload?: unknown;
-    toolResults?: Array<{
-        toolCallId: string;
-        toolName: string;
-        ok: boolean;
-        content: unknown;
-        error?: string;
-    }>;
-};
-type ToolCall = {
-    id: string;
-    name: string;
-    args: unknown;
-};
-type ToolResult = {
-    toolCallId: string;
-    toolName: string;
-    ok: boolean;
-    content: unknown;
-    error?: string;
-    structuredContent?: unknown;
-    isError?: boolean;
-};
 
 type PhaseRegistrySelection = Readonly<{
     entryPhaseId: string | null;
@@ -80,10 +52,6 @@ declare function parseAgentDefinition(raw: string): AgentDefinition;
 
 type ResourceKind = "agent" | "tool" | "skill" | "phase";
 type ResourceSourceId = string;
-/** Rowan-native contribution aliases. Hosts may adapt their domain handlers to
- * these existing Tool/Phase lifecycles without importing host Scope types. */
-type ToolContribution = Tool;
-type PhaseContribution = Phase;
 type ResourceView = Readonly<{
     agents: readonly ResourceSourceId[];
     tools: readonly ResourceSourceId[];
@@ -141,7 +109,7 @@ declare class ResourceRegistry {
     loadPhases(input: LoadInput<Phase>): Promise<LoadResult>;
     loadTools(input: Readonly<{
         sourceId: ResourceSourceId;
-        values: readonly ToolContribution[];
+        values: readonly Tool[];
     }>): Promise<LoadResult>;
     unload(input: Readonly<{
         kind: ResourceKind;
@@ -221,85 +189,6 @@ interface ExtensionContext {
     exec(command: string, args: string[], options?: ExecOptions): Promise<ExecResult>;
 }
 
-type LoopMetrics = {
-    /** Number of phase iterations executed. */
-    iterations: number;
-    /** Phase transition history. */
-    phaseTransitions: Array<{
-        from: string;
-        to: string;
-        ts: string;
-    }>;
-    /** Number of times compaction was triggered. */
-    compactionCount: number;
-    /** Number of retry attempts due to transient errors. */
-    retryCount: number;
-    /** Loop start timestamp. */
-    startedAt: string;
-    /** Loop start time as epoch ms (for duration calculation). */
-    startedAtMs: number;
-    /** Loop end timestamp (set on completion). */
-    endedAt?: string;
-    /** Total wall-clock duration in ms. */
-    durationMs?: number;
-};
-type ExecutionState = {
-    currentPhase: string;
-    attempt: number;
-    metrics: LoopMetrics;
-    status: "idle" | "running" | "suspended" | "completed" | "aborted" | "failed";
-    initialPhasePayload?: JsonValue;
-    entryPhases?: readonly EntryPhaseSpec[];
-    continuation?: ExecutionContinuationState;
-    runInteractions?: RunInteractionState;
-    phaseInteractions?: RunInteractionState;
-};
-type ExecutionContinuationState = {
-    isContinuing: boolean;
-    previousPayload?: unknown;
-    previousResults: Array<{
-        name: string;
-        output?: unknown;
-    }>;
-    pendingInstruction?: string;
-    previousPhaseMessageId?: string;
-};
-
-type ToolContext = Pick<AgentContext, "skills"> & {
-    toolCallId: string;
-    interaction?: RunInteractionDriver;
-};
-type ToolExecutionMode = "sequential" | "parallel";
-type Tool$1<TArgs = unknown> = {
-    name: string;
-    /** Rowan-owned Core Tool; Core Tools bypass Phase filtering. */
-    core?: boolean;
-    description: string;
-    parameters: Type.TSchema;
-    /** One-line snippet shown in the system prompt tool list. */
-    promptSnippet?: string;
-    /** Additional guidelines appended to the system prompt when this tool is active. */
-    promptGuidelines?: string[];
-    /** Whether this tool can run concurrently with others. Default: "parallel". */
-    executionMode?: ToolExecutionMode;
-    _meta?: JsonObject$1;
-    execute(args: TArgs, context: ToolContext, signal?: AbortSignal): Promise<ToolResult>;
-};
-/** Context snapshot passed into the low-level agent loop. */
-type AgentContext = {
-    /** System prompt included with the request. */
-    systemPrompt: string;
-    /** Transcript visible to the model. */
-    messages: AgentMessage[];
-    /** Tools available for this run. */
-    tools: Tool$1[];
-    /** Skills available for this run. */
-    skills: Skill[];
-    /** Custom phases for this run. Agent normalizes this with the built-in default phase. */
-    phases?: PhaseRegistry;
-    cwd?: string;
-};
-
 interface BeforePhaseEvent {
     type: "before_phase";
     phaseId: string;
@@ -317,7 +206,7 @@ interface BeforePromptEvent {
 }
 interface BeforeToolCallEvent {
     type: "before_tool_call";
-    tool: Tool$1;
+    tool: Tool;
     args: unknown;
     readonly runId?: string;
     readonly agentId?: string;
@@ -332,7 +221,7 @@ interface BeforeToolCallEvent {
 }
 interface AfterToolCallEvent {
     type: "after_tool_call";
-    tool: Tool$1;
+    tool: Tool;
     result: ToolResult;
     readonly runId?: string;
     readonly agentId?: string;
@@ -357,7 +246,7 @@ interface RunEndEvent {
 }
 type HookEvent = BeforePhaseEvent | AfterPhaseEvent | BeforePromptEvent | BeforeToolCallEvent | AfterToolCallEvent | RunStartEvent | RunEndEvent;
 interface BeforePhaseResult {
-    abort?: Outcome$1;
+    abort?: Outcome;
     skip?: {
         route: string;
         message: string;
@@ -365,7 +254,7 @@ interface BeforePhaseResult {
     input?: PhaseContext;
 }
 interface AfterPhaseResult {
-    abort?: Outcome$1;
+    abort?: Outcome;
     retry?: PhaseContext;
     output?: PhaseOutput;
 }
@@ -590,7 +479,7 @@ declare class ExtensionRunner {
         agentId: string;
         outcome: unknown;
     }): Promise<void>;
-    emitBeforeToolCall(tool: Tool$1, args: unknown, context?: {
+    emitBeforeToolCall(tool: Tool, args: unknown, context?: {
         runId?: string;
         agentId?: string;
         toolCallId?: string;
@@ -601,7 +490,7 @@ declare class ExtensionRunner {
         turn?: JsonObject;
         phase?: ToolCallPhase;
     }): Promise<BeforeToolCallResult>;
-    emitAfterToolCall(tool: Tool$1, result: ToolResult, context?: {
+    emitAfterToolCall(tool: Tool, result: ToolResult, context?: {
         runId?: string;
         agentId?: string;
         toolCallId?: string;
@@ -639,15 +528,15 @@ declare class ExtensionRunner {
 
 type ToolCallPresentationInput = Readonly<{
     status: ToolCallStatus;
-    args: JsonValue$1;
+    args: JsonValue;
     progress?: ToolProgress;
-    result?: ToolExecutionResult;
+    result?: ToolResult;
 }>;
 type ToolCallPresentationOutput = {
     title?: string;
     content?: ToolCallContent[];
     locations?: ToolCallLocation[];
-    _meta?: JsonObject$1;
+    _meta?: JsonObject;
 };
 type ToolCallMergeTarget = {
     title?: string;
@@ -655,9 +544,9 @@ type ToolCallMergeTarget = {
     status?: ToolCallStatus;
     locations?: ToolCallLocation[];
     content?: ToolCallContent[];
-    rawInput?: JsonValue$1;
-    rawOutput?: JsonValue$1;
-    _meta?: JsonObject$1;
+    rawInput?: JsonValue;
+    rawOutput?: JsonValue;
+    _meta?: JsonObject;
 };
 type ToolCallMergePatch = {
     title?: string;
@@ -665,9 +554,9 @@ type ToolCallMergePatch = {
     status?: ToolCallStatus;
     locations?: ToolCallLocation[];
     content?: ToolCallContent[];
-    rawInput?: JsonValue$1;
-    rawOutput?: JsonValue$1;
-    _meta?: JsonObject$1;
+    rawInput?: JsonValue;
+    rawOutput?: JsonValue;
+    _meta?: JsonObject;
 };
 declare function mergeToolCall<T extends ToolCallMergeTarget>(target: T, patch: ToolCallMergePatch): T;
 
@@ -776,7 +665,7 @@ declare function isConfigurationSnapshot(config: AgentConfiguration | Configurat
 
 type UserInput = string | Readonly<{
     content: UserContent;
-    metadata?: Metadata;
+    metadata?: JsonObject;
     thinkingLevel?: ThinkingLevel;
     providerOptions?: JsonObject;
 }>;
@@ -816,8 +705,8 @@ type ToolCallContext = Readonly<{
     runId: RunId;
     /** Opaque JSON metadata captured from the Agent and Run records. Rowan does
      * not interpret host/domain fields. */
-    agentMetadata?: Metadata;
-    runMetadata?: Metadata;
+    agentMetadata?: JsonObject;
+    runMetadata?: JsonObject;
     toolCallId: ToolCallId;
     /** The model's id for this call, matching `tool_call_delta` events; absent when a host runs the tool itself. */
     providerToolCallId?: string;
@@ -835,12 +724,13 @@ type Tool = Readonly<{
     /** Rowan-owned Core Tool; Core Tools bypass Definition/Phase filtering. */
     core?: boolean;
     description: string;
-    parameters: Type.TSchema;
+    parameters: Type.TSchema | JsonObject;
     promptSnippet?: string;
     promptGuidelines?: readonly string[];
     kind?: ToolKind;
     annotations?: ToolAnnotations;
     _meta?: JsonObject;
+    executionMode?: "sequential" | "parallel";
     present?(call: ToolCallPresentationInput): {
         title?: string;
         content?: ToolCallContent[];
@@ -852,7 +742,7 @@ type Tool = Readonly<{
         locations?: ToolCallLocation[];
         _meta?: JsonObject;
     } | undefined | void>;
-    execute(args: JsonValue, context: ToolInvocationContext, signal: AbortSignal): Promise<ToolExecutionResult>;
+    execute(args: JsonValue, context: ToolInvocationContext, signal: AbortSignal): Promise<ToolResult>;
 }>;
 type BeforeToolCallDecision = Readonly<{
     allow: true;
@@ -871,10 +761,10 @@ type BeforeToolCall = (input: Readonly<{
 }>) => BeforeToolCallDecision | Promise<BeforeToolCallDecision>;
 type AfterToolCall = (input: Readonly<{
     tool: Tool;
-    result: ToolExecutionResult;
+    result: ToolResult;
     context: ToolInvocationContext;
     signal: AbortSignal;
-}>) => ToolExecutionResult | Promise<ToolExecutionResult>;
+}>) => ToolResult | Promise<ToolResult>;
 type InvocationSource = "auto" | "implicit" | "external";
 type InvocationCatalogEntry = Readonly<{
     kind: "phase" | "skill";
@@ -888,7 +778,7 @@ type InvocationCatalogEntry = Readonly<{
 }>;
 type AgentRecord = Readonly<{
     id: AgentId;
-    metadata?: Metadata;
+    metadata?: JsonObject;
     currentConfigToken?: ConfigToken;
     currentConfigIdentity?: string;
     createdAt: string;
@@ -959,7 +849,7 @@ type RunRecord = Readonly<{
         messageId: MessageId;
         messageRevision: number;
     }>;
-    metadata?: Metadata;
+    metadata?: JsonObject;
     phasePayload?: JsonValue;
     entryPhases?: readonly EntryPhaseSpec[];
     pinnedConfigToken?: ConfigToken;
@@ -992,7 +882,7 @@ type RetentionResult = Readonly<{
 }>;
 type AgentSummary = Readonly<{
     id: AgentId;
-    metadata?: Metadata;
+    metadata?: JsonObject;
     currentConfigIdentity?: string;
     createdAt: string;
     activatedAt: string;
@@ -1003,7 +893,7 @@ type RunSummary = Readonly<{
     agentId: AgentId;
     agentSequence: number;
     state: RunState;
-    metadata?: Metadata;
+    metadata?: JsonObject;
     createdAt: string;
     updatedAt: string;
 }>;
@@ -1019,7 +909,7 @@ type RunSnapshotBase = Readonly<{
     input: UserInput;
     scope?: ScopeRef;
     cwd?: string;
-    metadata?: Metadata;
+    metadata?: JsonObject;
     /** Effective entry Phase payload the Run started with (defaults filled). */
     phasePayload?: JsonValue;
     entryPhases?: readonly EntryPhaseSpec[];
@@ -1083,14 +973,14 @@ type ConfigPutResult = Readonly<{
 interface ConfigProvider {
     put(input: {
         agentId: AgentId;
-        agentMetadata?: Metadata;
+        agentMetadata?: JsonObject;
         config: AgentConfiguration | ConfigurationSnapshot;
         operationId: string;
         signal: AbortSignal;
     }): Promise<ConfigPutResult>;
     resolve(input: {
         agentId: AgentId;
-        agentMetadata?: Metadata;
+        agentMetadata?: JsonObject;
         token: ConfigToken;
         signal: AbortSignal;
     }): Promise<ConfigResolution>;
@@ -1099,7 +989,7 @@ interface OwnedStore {
     readonly lease: OwnerLease;
     reserveAgent(input: {
         idempotencyKey: string;
-        metadata?: Metadata;
+        metadata?: JsonObject;
         configIdentity?: string;
         historySeed?: HistorySeed;
     }): Promise<AgentRecord>;
@@ -1129,7 +1019,7 @@ interface OwnedStore {
     createRun(input: {
         agentId: AgentId;
         input: UserInput;
-        metadata?: Metadata;
+        metadata?: JsonObject;
         scope?: ScopeRef;
         cwd?: string;
         phasePayload?: JsonValue;
@@ -1213,7 +1103,7 @@ interface OwnedStore {
         requestMessageId: MessageId;
         calls: readonly ToolCallReservation[];
         /** The model response's blocks, so the request message keeps what preceded the Tool Calls. */
-        contentBlocks?: readonly ContentBlock[];
+        contentBlocks?: readonly StreamBlock[];
         model?: ModelRef;
         usage?: LlmTokenUsage;
     }): Promise<ToolBatchCommit>;
@@ -1239,7 +1129,7 @@ interface OwnedStore {
         execution: ExecutionToken;
         expectedRevision: number;
         toolCallId: ToolCallId;
-        result: ToolExecutionResult;
+        result: ToolResult;
         state: "completed" | "failed" | "indeterminate";
         reason?: string;
         title?: string;
@@ -1258,7 +1148,7 @@ interface OwnedStore {
     recordToolCall(input: {
         runId: RunId;
         execution?: ExecutionToken;
-        update: ToolCall$1 | ToolCallUpdate;
+        update: ToolCall | ToolCallUpdate;
         external?: boolean;
         contentIndex?: number;
     }): Promise<DurableRunEvent>;
@@ -1335,7 +1225,7 @@ interface AgentRuntime {
     }>): Promise<LoadResult>;
     createAgent(config: AgentConfiguration, options?: {
         idempotencyKey?: string;
-        metadata?: Metadata;
+        metadata?: JsonObject;
         historySeed?: HistorySeed;
     }): Promise<AgentId>;
     updateAgentConfig(agentId: AgentId, config: AgentConfiguration, options: {
@@ -1355,7 +1245,7 @@ interface AgentRuntime {
     }): Promise<RetentionResult>;
     start(agentId: AgentId, input: UserInput, options: {
         idempotencyKey: string;
-        metadata?: Metadata;
+        metadata?: JsonObject;
         scope?: ScopeRef;
         cwd?: string;
         phasePayload?: JsonValue;
@@ -1412,10 +1302,67 @@ type ConsumerRegistration = Readonly<{
     waterline: EventCursor;
 }>;
 
+type LoopMetrics = {
+    /** Number of phase iterations executed. */
+    iterations: number;
+    /** Phase transition history. */
+    phaseTransitions: Array<{
+        from: string;
+        to: string;
+        ts: string;
+    }>;
+    /** Number of times compaction was triggered. */
+    compactionCount: number;
+    /** Number of retry attempts due to transient errors. */
+    retryCount: number;
+    /** Loop start timestamp. */
+    startedAt: string;
+    /** Loop start time as epoch ms (for duration calculation). */
+    startedAtMs: number;
+    /** Loop end timestamp (set on completion). */
+    endedAt?: string;
+    /** Total wall-clock duration in ms. */
+    durationMs?: number;
+};
+type ExecutionState = {
+    currentPhase: string;
+    attempt: number;
+    metrics: LoopMetrics;
+    status: "idle" | "running" | "suspended" | "completed" | "aborted" | "failed";
+    initialPhasePayload?: JsonValue;
+    entryPhases?: readonly EntryPhaseSpec[];
+    continuation?: ExecutionContinuationState;
+    runInteractions?: RunInteractionState;
+    phaseInteractions?: RunInteractionState;
+};
+type ExecutionContinuationState = {
+    isContinuing: boolean;
+    previousPayload?: unknown;
+    previousResults: Array<{
+        name: string;
+        output?: unknown;
+    }>;
+    pendingInstruction?: string;
+    previousPhaseMessageId?: string;
+};
+type AgentContext = {
+    /** System prompt included with the request. */
+    systemPrompt: string;
+    /** Transcript visible to the model. */
+    messages: AgentMessage[];
+    /** Tools available for this run. */
+    tools: Tool[];
+    /** Skills available for this run. */
+    skills: Skill[];
+    /** Custom phases for this run. Rowan normalizes this with the built-in default phase. */
+    phases?: PhaseRegistry;
+    cwd?: string;
+};
+
 type ModelInvokeOutput = {
     text: string;
-    contentBlocks: ContentBlock[];
-    toolCalls: ToolCall[];
+    contentBlocks: StreamBlock[];
+    toolCalls: LlmToolCall[];
     stopReason?: string;
     model?: ModelRef;
     usage?: LlmTokenUsage;
@@ -1432,10 +1379,10 @@ type PhaseExecution = {
     }): Promise<ModelInvokeOutput>;
     runInternalModelLoop(context: PhaseContext, options: InternalModelLoopOptions): Promise<ModelInvokeOutput>;
     reportStatus(status: PhaseStatus): Promise<void>;
-    executeTools(context: AgentContext, toolCalls: readonly ToolCall[], contentBlocks?: readonly ContentBlock[], meta?: {
+    executeTools(context: AgentContext, toolCalls: readonly LlmToolCall[], contentBlocks?: readonly StreamBlock[], meta?: {
         model?: ModelRef;
         usage?: LlmTokenUsage;
-    }): Promise<readonly ToolResult[]>;
+    }): Promise<readonly ToolResultRecord[]>;
     interaction: RunInteractionDriver;
     /** Message lifecycle manager for streaming updates from programmatic phases */
     messages: PhaseMessageManager;
@@ -1451,7 +1398,7 @@ type PhaseMessageManager = {
     /** Stream a text delta */
     update(messageId: string, delta: string): Promise<void>;
     /** Replace the active message content with model-native content parts */
-    replaceContent(messageId: string, content: string | LlmContentPart[]): void;
+    replaceContent(messageId: string, content: string | LlmContentBlock[]): void;
     /** End the message stream, appends to transcript */
     end(messageId: string, meta?: {
         model?: ModelRef;
@@ -1461,6 +1408,10 @@ type PhaseMessageManager = {
     discard(messageId: string): void;
 };
 
+/**
+ * Extension types — simplified for the new hook-based system.
+ */
+
 interface ExtensionStateStore {
     get(key: string): Promise<JsonValue | undefined>;
     set(key: string, value: JsonValue): Promise<void>;
@@ -1525,62 +1476,11 @@ type RegisteredSkill = {
     sourceId: string;
     scope?: ScopeRef;
 };
-/**
- * Tool definition for registering LLM-callable tools via `api.tools.register()`.
- *
- * @example
- * ```typescript
- * api.tools.register({
- *   name: "search_docs",
- *   description: "Search documentation",
- *   parameters: { type: "object", properties: { query: { type: "string" } } },
- *   execute: async (args, ctx) => {
- *     return { content: [{ type: "text", text: "result" }] };
- *   },
- * });
- * ```
- */
-interface ToolDefinition {
-    /** Tool name (used in LLM tool calls) */
-    name: string;
-    /** Description for LLM */
-    description: string;
-    /** Parameter schema (JSON Schema) */
-    parameters: Record<string, unknown>;
-    /** Optional: one-line snippet shown in the system prompt tool list */
-    promptSnippet?: string;
-    /** Optional: additional guidelines appended to system prompt */
-    promptGuidelines?: string[];
-    kind?: ToolKind;
-    annotations?: ToolAnnotations;
-    _meta?: JsonObject;
-    present?: (call: {
-        status: ToolCallStatus;
-        args: JsonValue;
-        progress?: ToolProgress;
-        result?: ToolExecutionResult;
-    }) => {
-        title?: string;
-        content?: ToolCallContent[];
-        locations?: ToolCallLocation[];
-        _meta?: JsonObject;
-    } | undefined | void | Promise<{
-        title?: string;
-        content?: ToolCallContent[];
-        locations?: ToolCallLocation[];
-        _meta?: JsonObject;
-    } | undefined | void>;
-    /** Execute the tool */
-    execute: (args: unknown, context: ToolInvocationContext, signal?: AbortSignal) => Promise<ToolExecutionResult>;
-    /** Optional: per-tool execution mode override */
-    executionMode?: "sequential" | "parallel";
-}
-
 /**
  * Registered tool with source metadata.
  */
 interface RegisteredTool {
-    definition: ToolDefinition;
+    definition: Tool;
     sourceInfo: SourceInfo;
     sourceId: string;
     scope?: ScopeRef;
@@ -1675,6 +1575,8 @@ interface ExtensionAgentsAPI {
         after?: RunListCursor;
         limit?: number;
     }): Promise<Page<RunSummary, RunListCursor>>;
+    /** One Run in full, including its outcome once it ended. */
+    run(runId: string): Promise<RunSnapshot>;
     runPhase(agentId: AgentId | string, options: {
         phase: string;
         payload?: JsonValue;
@@ -1701,6 +1603,7 @@ interface ExtensionAgentsRuntimeDelegate {
         after?: RunListCursor;
         limit?: number;
     }): Promise<Page<RunSummary, RunListCursor>>;
+    snapshot(runId: RunSnapshot["runId"]): Promise<RunSnapshot>;
     runPhase(agentId: AgentId, options: {
         phase: string;
         payload?: JsonValue;
@@ -1758,7 +1661,7 @@ interface ExtensionAPI {
     /** Tool capabilities — register and unregister custom tools. */
     tools: {
         /** Register a custom LLM-callable tool. */
-        register(tool: ToolDefinition, scope?: ScopeRef): Promise<void>;
+        register(tool: Tool, scope?: ScopeRef): Promise<void>;
         /** Unregister a previously registered tool by name. */
         unregister(toolName: string, scope?: ScopeRef): Promise<void>;
     };
@@ -1830,7 +1733,8 @@ type PhaseOutput = {
     toolCalls?: Array<{
         id: string;
         name: string;
-        args: unknown;
+        arguments?: unknown;
+        args?: unknown;
     }>;
     /** Route reason extracted from route tool call (for hooks to inspect) */
     routeReason?: string;
@@ -1873,7 +1777,7 @@ interface PhaseContext {
     systemPrompt: string;
     messages: AgentMessage[];
     /** Phase-filtered tools */
-    tools: Tool$1[];
+    tools: Tool[];
     /** Phase-filtered skills */
     skills: Skill[];
     /** Phase machine state */
@@ -2027,27 +1931,11 @@ type OwnerToken = OpaqueId<"OwnerToken">;
 type EventCursor = OpaqueId<"EventCursor">;
 type AgentListCursor = OpaqueId<"AgentListCursor">;
 type RunListCursor = OpaqueId<"RunListCursor">;
-type JsonPrimitive = null | boolean | number | string;
-type JsonValue = JsonPrimitive | readonly JsonValue[] | {
-    readonly [key: string]: JsonValue;
-};
-type JsonObject = Readonly<Record<string, JsonValue>>;
-type Metadata = JsonObject;
-type TextContent = Readonly<{
-    type: "text";
-    text: string;
-}>;
-type ImageContent = Readonly<{
-    type: "image";
-    data: string;
-    mimeType: string;
-}>;
-type ThinkingContent = Readonly<{
-    type: "thinking";
-    thinking: string;
-    signature?: string;
-}>;
-type ToolUseContent = Readonly<{
+type ToolResultRecord = Readonly<{
+    toolCallId: ToolCallId;
+    toolName: string;
+}> & ToolResult;
+type ToolUseBlock = Readonly<{
     type: "tool_use";
     toolCallId: ToolCallId;
     /** Provider/model correlation, retained only to reconstruct the next request. */
@@ -2055,38 +1943,16 @@ type ToolUseContent = Readonly<{
     name: string;
     input: JsonValue;
 }>;
-type ToolExecutionResult = Readonly<{
-    ok: true;
-    content: JsonValue;
-    structuredContent?: JsonValue;
-    isError?: boolean;
-}> | Readonly<{
-    ok: false;
-    content: JsonValue;
-    error: string;
-    structuredContent?: JsonValue;
-    isError?: boolean;
-}> | Readonly<{
-    content: readonly ContentBlock[];
-    structuredContent?: JsonValue;
-    isError?: boolean;
-    ok?: boolean;
-    error?: string;
-}>;
-type DurableToolResult = Readonly<{
-    toolCallId: ToolCallId;
-    toolName: string;
-}> & ToolExecutionResult;
-type ToolResultContent = Readonly<{
+type ToolResultBlock = Readonly<{
     type: "tool_result";
     toolCallId: ToolCallId;
     /** Provider/model correlation, retained only to reconstruct the next request. */
     providerToolCallId?: string;
-    result: ToolExecutionResult;
+    result: ToolResult;
 }>;
-type UserContent = string | readonly (TextContent | ImageContent)[];
-type AssistantContent = string | readonly (TextContent | ThinkingContent | ToolUseContent)[];
-type ToolMessageContent = readonly [ToolResultContent, ...ToolResultContent[]];
+type UserContent = string | readonly (TextBlock | ImageBlock)[];
+type AssistantContent = string | readonly (TextBlock | ThinkingBlock | ToolUseBlock)[];
+type ToolMessageContent = readonly [ToolResultBlock, ...ToolResultBlock[]];
 type MessageContent = UserContent | AssistantContent | ToolMessageContent;
 type MessageBase = Readonly<{
     id: MessageId;
@@ -2094,7 +1960,7 @@ type MessageBase = Readonly<{
     runId: RunId;
     /** Monotonic active revision. Omitted on legacy/initial messages and read as 0. */
     messageRevision?: number;
-    metadata?: Metadata;
+    metadata?: JsonObject;
     sequenceWithinRun: number;
     createdAt: string;
 }>;
@@ -2121,25 +1987,19 @@ type ToolMessage = MessageBase & Readonly<{
 type InteractionRecord = MessageBase & Readonly<{
     role: "interaction";
     interactionId: string;
-    kind: "user_input" | "permission" | "elicitation" | "confirmation";
-    prompt: string;
+    kind: RunInteractionKind;
     phase: string;
     status: "answered" | "replied" | "cancelled";
     answer?: JsonValue;
     reply?: string;
     toolCallId?: ToolCallId;
-    result?: Readonly<{
-        answered?: string;
-        replied?: string;
-        cancelled?: string;
-    }>;
-}>;
+}> & Pick<RunInteractionRequest, "prompt" | "result">;
 type Message = UserMessage | AssistantMessage | ToolMessage | InteractionRecord;
 type Outcome = Readonly<{
     id: OutcomeId;
     message: string;
     payload?: JsonValue;
-    toolResults?: readonly DurableToolResult[];
+    toolResults?: readonly ToolResultRecord[];
 }>;
 type RunState = "queued" | "running" | "input_required" | "completed" | "failed" | "cancelled";
 type WithdrawnUserInput = Readonly<{
@@ -2184,24 +2044,23 @@ type QueuedRunFailure = Extract<RunFailure, {
 type RunningRunFailure = Extract<RunFailure, {
     code: "runtime_interrupted" | "tool_indeterminate" | "execution_failed";
 }>;
-type ToolCallState = ToolCallStatus;
-type ToolCallSnapshot = ToolCall$1 & Readonly<{
+type ToolCallSnapshot = ToolCall & Readonly<{
     id: ToolCallId;
     providerToolCallId?: string;
-    agentId?: AgentId;
-    runId?: RunId;
+    agentId: AgentId;
+    runId: RunId;
     executionId?: ExecutionId;
     requestMessageId?: MessageId;
     name?: string;
     args?: JsonValue;
     state?: ToolCallStatus;
-    result?: DurableToolResult;
+    result?: ToolResultRecord;
     resultMessageId?: MessageId;
     reason?: string;
     external?: boolean;
     contentIndex?: number;
-    createdAt?: string;
-    updatedAt?: string;
+    createdAt: string;
+    updatedAt: string;
 }>;
 type DurableEventBase = Readonly<{
     id: EventId;
@@ -2211,7 +2070,7 @@ type DurableEventBase = Readonly<{
     agentId: AgentId;
     runId: RunId;
     runRevision: number;
-    metadata?: Metadata;
+    metadata?: JsonObject;
     createdAt: string;
 }>;
 type PhaseEntered = DurableEventBase & Readonly<{
@@ -2280,7 +2139,7 @@ type ToolStateChanged = (DurableEventBase & Readonly<{
         from: ToolCallStatus | null;
         to: ToolCallStatus;
     }>;
-    toolCall: ToolCall$1;
+    toolCall: ToolCall;
     external?: boolean;
     /** For a provider-reported call: assistant content blocks streamed before it. */
     contentIndex?: number;
@@ -2293,7 +2152,7 @@ type ToolStateChanged = (DurableEventBase & Readonly<{
         from: ToolCallStatus | null;
         to: ToolCallStatus;
     }>;
-    toolCall: ToolCall$1 | ToolCallUpdate;
+    toolCall: ToolCall | ToolCallUpdate;
     external?: boolean;
     contentIndex?: number;
 }>;
@@ -2359,38 +2218,16 @@ type RunEvent = DurableRunEvent | MessageDelta | ThinkingDelta | ToolCallDelta |
     durability: "transient";
 }>;
 
-type RunInteractionKind = "user_input" | "permission" | "elicitation" | "confirmation";
 type RunInteractionStatus = "pending" | "answered" | "replied" | "cancelled";
-type RunInteraction = Readonly<{
+type RunInteraction = RunInteractionRequest & Readonly<{
     id: string;
     phase: string;
-    kind: RunInteractionKind;
-    prompt: string;
-    payload?: JsonValue;
     createdAt: string;
     status: RunInteractionStatus;
     answer?: JsonValue;
     reply?: string;
     /** The Run is only waiting for the next user message, not asking a question. */
     turnBoundary?: true;
-    toolCallId?: string;
-    result?: Readonly<{
-        answered?: string;
-        replied?: string;
-        cancelled?: string;
-    }>;
-}>;
-type RunInteractionRequest = Readonly<{
-    id?: string;
-    kind: RunInteractionKind;
-    prompt: string;
-    payload?: JsonValue;
-    toolCallId?: string;
-    result?: Readonly<{
-        answered?: string;
-        replied?: string;
-        cancelled?: string;
-    }>;
 }>;
 type RunInteractionState = Readonly<{
     requests: readonly RunInteraction[];
@@ -2420,4 +2257,4 @@ declare class RunInteractionBoundary extends Error {
     constructor(state: ExecutionState, interactions: readonly RunInteraction[]);
 }
 
-export { type ConfigToken as $, type AgentRuntime as A, type Message as B, type ContextStatus as C, type DurableRunEvent as D, type ExtensionHost as E, type RunBoundary as F, type RunEvent as G, type HostApiExtension as H, type InvocationSource as I, type JsonObject as J, type DurableStore as K, type LoadInput as L, type Metadata as M, type AgentRecord as N, type RunRecord as O, type Phase as P, type ExecutionId as Q, type ResourceKind as R, type Skill as S, type Tool as T, type UserContent as U, type ToolCallState as V, type DurableToolResult as W, type ContextCompactionRecord as X, type ToolCallSnapshot as Y, type OwnerLease as Z, type OwnedStore as _, type JsonValue as a, type ExtensionFactory as a$, type ContextCandidate as a0, type RunClaim as a1, type RunFailure as a2, type ExecutionToken as a3, type AssistantMessage as a4, type ExecutionCheckpoint as a5, type RunInteraction as a6, type ToolCommit as a7, type ToolCallReservation as a8, type ToolBatchCommit as a9, type ResourceRef as aA, ResourceRegistry as aB, ResourceRegistryError as aC, type ResourceRegistryErrorCode as aD, type ResourceSourceId as aE, type ResourceView as aF, RuntimeBootstrapRegistry as aG, RuntimeExtensionLifetime as aH, type ToolContribution as aI, extensionSourceId as aJ, isConfigurationSnapshot as aK, mergeToolCall as aL, parseAgentDefinition as aM, resolveConfigurationSnapshot as aN, type AfterToolCall as aO, type AssistantContent as aP, type BeforeToolCall as aQ, type EventBus as aR, type EventId as aS, type ExecOptions as aT, type ExecResult as aU, type ExtensionAPI as aV, type ExtensionAgentConsumerDisposer as aW, type ExtensionAgentsAPI as aX, type ExtensionCapabilityContribution as aY, type ExtensionContext as aZ, type ExtensionDisposer as a_, type ToolExecutionResult as aa, type Outcome as ab, type ConsumerRegistration as ac, type RetentionResult as ad, type ConfigProvider as ae, type ConfigurationSnapshot as af, type ConfigPutResult as ag, type ConfigResolution as ah, type PhaseRegistry as ai, type LoadedExtension as aj, type DefinitionLayer as ak, type ExtensionActivationError as al, type ExtensionActivationResult as am, type ExtensionContribution as an, ExtensionLifetimeError as ao, type ExtensionLifetimeErrorCode as ap, type ExtensionLoadInput as aq, type InteractionRecord as ar, type LoadExtensionsResult as as, type ModelRetry as at, type OpaqueId as au, type OwnerToken as av, type PhaseContribution as aw, type PhaseRegistrySelection as ax, type ResolvedResourceView as ay, type ResourceDiagnostic as az, type AgentRuntimeOptions as b, type ExtensionFactoryResult as b0, type ExtensionStateStore as b1, type ExtensionToolContribution as b2, type HookEvent as b3, type HookEventType as b4, type HookHandler as b5, type InternalModelLoopOptions as b6, type JsonPrimitive as b7, type LiveInteractionEvent as b8, type MessageBase as b9, type RunStateChanged as bA, type SettingsBadge as bB, type SettingsControl as bC, type SettingsDefinition as bD, type SettingsItem as bE, type SettingsOption as bF, type SettingsSection as bG, type SkillRegistration as bH, type TextContent as bI, type ThinkingContent as bJ, type ThinkingDelta as bK, type ToolCallContext as bL, type ToolCallDelta as bM, type ToolCallPhase as bN, type ToolCallPresentationInput as bO, type ToolCallPresentationOutput as bP, type ToolDefinition as bQ, type ToolInvocationContext as bR, type ToolMessage as bS, type ToolMessageContent as bT, type ToolResultContent as bU, type ToolStateChanged as bV, type ToolUseContent as bW, type UserMessage as bX, type WithdrawnUserInput as bY, type MessageCommitted as ba, type MessageContent as bb, type MessageDelta as bc, type MessageRevised as bd, type ModelInvokeOutput as be, type PhaseContext as bf, type PhaseExecution as bg, type PhaseExecutionIdentity as bh, type PhaseInput as bi, type PhaseInvocation as bj, type PhaseMessageManager as bk, type PhaseOutput as bl, type PhaseRegistration as bm, type PhaseRunHandler as bn, type PhaseState as bo, type PhaseStatus as bp, type PhaseStatusState as bq, type RunEndEvent as br, RunInteractionBoundary as bs, RunInteractionCancelledError as bt, type RunInteractionDriver as bu, type RunInteractionKind as bv, type RunInteractionRequest as bw, type RunInteractionState as bx, type RunInteractionStatus as by, type RunStartEvent as bz, type AgentDefinition as c, type LoadResult as d, type AgentConfiguration as e, type HistorySeed as f, type AgentId as g, type AgentDeletionRequest as h, type MessageId as i, type MessageRevisionResult as j, type RunId as k, type ToolCallId as l, type EventCursor as m, type UserInput as n, type AgentRun as o, type EntryPhaseSpec as p, type AgentListCursor as q, type Page as r, type AgentSummary as s, type RunState as t, type RunListCursor as u, type RunSummary as v, type InvocationCatalogEntry as w, type DurableConsumer as x, type ExtensionCapability as y, type RunSnapshot as z };
+export { type AssistantMessage as $, type AgentRuntime as A, type RunEvent as B, type ContextStatus as C, type DurableRunEvent as D, type ExtensionHost as E, type DurableStore as F, type AgentRecord as G, type HostApiExtension as H, type InvocationSource as I, type RunRecord as J, type ToolCallSnapshot as K, type LoadInput as L, type MessageId as M, type ContextCompactionRecord as N, type OwnerLease as O, type Phase as P, type OwnedStore as Q, type ResourceKind as R, type Skill as S, type Tool as T, type UserContent as U, type ConfigToken as V, type ExecutionId as W, type ContextCandidate as X, type RunClaim as Y, type RunFailure as Z, type ExecutionToken as _, type AgentRuntimeOptions as a, type LiveInteractionEvent as a$, type ExecutionCheckpoint as a0, type RunInteraction as a1, type ToolCommit as a2, type ToolCallReservation as a3, type ToolBatchCommit as a4, type Outcome as a5, type ConsumerRegistration as a6, type RetentionResult as a7, type ConfigProvider as a8, type ConfigurationSnapshot as a9, extensionSourceId as aA, isConfigurationSnapshot as aB, mergeToolCall as aC, parseAgentDefinition as aD, resolveConfigurationSnapshot as aE, type AfterToolCall as aF, type AssistantContent as aG, type BeforeToolCall as aH, type EventBus as aI, type EventId as aJ, type ExecOptions as aK, type ExecResult as aL, type ExtensionAPI as aM, type ExtensionAgentConsumerDisposer as aN, type ExtensionAgentsAPI as aO, type ExtensionCapabilityContribution as aP, type ExtensionContext as aQ, type ExtensionDisposer as aR, type ExtensionFactory as aS, type ExtensionFactoryResult as aT, type ExtensionStateStore as aU, type ExtensionToolContribution as aV, type HookEvent as aW, type HookEventType as aX, type HookHandler as aY, type InteractionRecord as aZ, type InternalModelLoopOptions as a_, type ConfigPutResult as aa, type ConfigResolution as ab, type PhaseRegistry as ac, type LoadedExtension as ad, type DefinitionLayer as ae, type ExtensionActivationError as af, type ExtensionActivationResult as ag, type ExtensionContribution as ah, ExtensionLifetimeError as ai, type ExtensionLifetimeErrorCode as aj, type ExtensionLoadInput as ak, type LoadExtensionsResult as al, type ModelRetry as am, type OpaqueId as an, type OwnerToken as ao, type PhaseRegistrySelection as ap, type ResolvedResourceView as aq, type ResourceDiagnostic as ar, type ResourceRef as as, ResourceRegistry as at, ResourceRegistryError as au, type ResourceRegistryErrorCode as av, type ResourceSourceId as aw, type ResourceView as ax, RuntimeBootstrapRegistry as ay, RuntimeExtensionLifetime as az, type AgentDefinition as b, type MessageBase as b0, type MessageCommitted as b1, type MessageContent as b2, type MessageDelta as b3, type MessageRevised as b4, type ModelInvokeOutput as b5, type PhaseContext as b6, type PhaseExecution as b7, type PhaseExecutionIdentity as b8, type PhaseInput as b9, type ToolCallPhase as bA, type ToolCallPresentationInput as bB, type ToolCallPresentationOutput as bC, type ToolInvocationContext as bD, type ToolMessage as bE, type ToolMessageContent as bF, type ToolResultBlock as bG, type ToolResultRecord as bH, type ToolStateChanged as bI, type ToolUseBlock as bJ, type UserMessage as bK, type WithdrawnUserInput as bL, type PhaseInvocation as ba, type PhaseMessageManager as bb, type PhaseOutput as bc, type PhaseRegistration as bd, type PhaseRunHandler as be, type PhaseState as bf, type PhaseStatus as bg, type PhaseStatusState as bh, type RunEndEvent as bi, RunInteractionBoundary as bj, RunInteractionCancelledError as bk, type RunInteractionDriver as bl, type RunInteractionState as bm, type RunInteractionStatus as bn, type RunStartEvent as bo, type RunStateChanged as bp, type SettingsBadge as bq, type SettingsControl as br, type SettingsDefinition as bs, type SettingsItem as bt, type SettingsOption as bu, type SettingsSection as bv, type SkillRegistration as bw, type ThinkingDelta as bx, type ToolCallContext as by, type ToolCallDelta as bz, type LoadResult as c, type AgentConfiguration as d, type HistorySeed as e, type AgentId as f, type AgentDeletionRequest as g, type MessageRevisionResult as h, type RunId as i, type ToolCallId as j, type EventCursor as k, type UserInput as l, type AgentRun as m, type EntryPhaseSpec as n, type AgentListCursor as o, type Page as p, type AgentSummary as q, type RunState as r, type RunListCursor as s, type RunSummary as t, type InvocationCatalogEntry as u, type DurableConsumer as v, type ExtensionCapability as w, type RunSnapshot as x, type Message as y, type RunBoundary as z };