@swifty.js/swifty 0.0.22 → 0.0.24

package/dist/lib/index.d.ts

@@ -1,6 +1,6 @@
+import Anthropic from '@anthropic-ai/sdk';
 import z$1, { z } from 'zod';
 import OpenAI from 'openai';
-import Anthropic from '@anthropic-ai/sdk';
 import { FunctionTool } from 'openai/resources/responses/responses';
 import { Logger } from 'pino';
 import { Transport } from '@modelcontextprotocol/sdk/shared/transport.js';
@@ -68,6 +68,212 @@ declare class RecoveryState {
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+declare class FileStateCache {
+    private cache;
+    /** Called after a successful ReadFile to register the file as "seen". */
+    record(filePath: string, lastModifiedTimeMs: number): void;
+    /**
+     * Gate check before EditFile / WriteFile
+     */
+    check(filePath: string): {
+        ok: true;
+    } | {
+        ok: false;
+        error: string;
+    };
+    /**
+     * Called after a successful edit / write to keep the cache in sync
+     * with the new on-disk state
+     */
+    update(filePath: string): void;
+}
+
+/**
+ * Copyright (c) 2026 hangtiancheng
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+interface Backup {
+    backupPath: string;
+    version: number;
+    time: string;
+}
+interface Snapshot {
+    messageIndex: number;
+    userText: string;
+    backups: Record<string, Backup>;
+    timestamp: string;
+}
+/** Single source of truth for a session's file-history directory layout. */
+declare function fileHistoryDir(baseDir: string, sessionId: string): string;
+declare class FileHistory {
+    private sessionDir;
+    /** Tracked file absolute path to version */
+    private trackedFiles;
+    private snapshots;
+    constructor(baseDir: string, sessionID: string);
+    trackEdit(path: string): void;
+    makeSnapshot(messageIndex: number, userText: string): void;
+    rewind(snapshotIndex: number): string[];
+    getSnapshots(): Snapshot[];
+    hasSnapshots(): boolean;
+    save(): void;
+}
+
+/**
+ * Copyright (c) 2026 hangtiancheng
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+type ToolCategory = "read" | "write" | "command";
+type AnthropicToolResultContent = NonNullable<Anthropic.ToolResultBlockParam["content"]>;
+type ToolResultContentBlock = Exclude<AnthropicToolResultContent, string>[number];
+declare function normalizeToolResultContentBlock(value: unknown): ToolResultContentBlock | null;
+declare function isToolResultContentBlock(value: unknown): value is ToolResultContentBlock;
+interface ToolResult {
+    output: string;
+    contentBlocks?: ToolResultContentBlock[];
+    isError: boolean;
+}
+interface ToolContext {
+    workDir: string;
+    abortSignal?: AbortSignal;
+    fileHistory?: FileHistory | undefined;
+    fileStateCache?: FileStateCache | undefined;
+}
+/**
+ * How MCP tools enter the context, written into ToolRegistry by mcp/strategy
+ * after connecting to the server.
+ *
+ * eager    total schema size under one tenth of the context; all go into tools[],
+ *          no deferral
+ * native   official endpoint; tools stay in the array with defer_loading but the
+ *          server does not show them to the model, and ToolSearch returns a
+ *          tool_reference so the server expands the schema
+ * dispatch other endpoints support neither of the above; MCP tools never enter
+ *          tools[] at all and go through McpCall
+ *
+ * Why three modes: tools render after system and before messages, so any change to
+ * the array invalidates the entire trailing conversation-history cache. In a test
+ * with twenty thousand tokens of history, appending one tool to the end of tools
+ * dropped the hit rate from 99.4% to 9.5%.
+ */
+type McpLoadingMode = "eager" | "native" | "dispatch";
+/** Extra capabilities the MCP tool wrapper exposes to dispatch and routing logic. */
+interface MCPToolLike extends Tool {
+    mcpServerName: string;
+    mcpInputSchema(): Record<string, unknown>;
+    setDeferLoading(on: boolean): void;
+}
+interface ToolSchema {
+    name: string;
+    parameters?: Record<string, unknown>;
+    strict?: boolean;
+    /** For OpenAI, this must be "function"; for Anthropic, it can be "custom" or null */
+    type?: "function" | "custom";
+    defer_loading?: boolean;
+    description: string;
+    /** The input schema for the tool. */
+    input_schema: {
+        type: "object";
+        properties: Record<string, object>;
+        required?: string[];
+    };
+    allowed_callers?: ("direct" | "code_execution_20250825" | "code_execution_20260120")[];
+    cache_control?: {
+        type: "ephemeral";
+        ttl?: "5m" | "1h";
+    };
+    eager_input_streaming?: boolean;
+}
+interface Tool {
+    name: string;
+    description: string;
+    category: ToolCategory;
+    /**
+     * Whether to defer loading. A deferred tool does not appear in the initial
+     * tool list; the model must first pull its schema out via ToolSearch before
+     * it can call it.
+     *
+     * Only MCP tools are set to true. MCP is configured per project, a single
+     * server can easily expose dozens of tools with long schemas, and stuffing
+     * all of them into the initial tool list would eat up a large chunk of the
+     * context — especially since most of those tools won't be used in a given
+     * session. Built-in tools are a fixed few dozen, a controllable count;
+     * hiding them would only force the model into an extra ToolSearch round
+     * trip, so they are never deferred and always ship their full schema.
+     */
+    deferred?: boolean;
+    /**
+     * Whether this particular invocation can run concurrently with others,
+     * judged by actual arguments rather than just the tool category.
+     *
+     * When not implemented, falls back to category: read-only tools may run
+     * concurrently, write and command tools may not. Currently only Bash
+     * implements this — whether a command is read-only depends on the command
+     * itself (ls vs rm are both Bash but have very different safety profiles).
+     */
+    isConcurrencySafe?(args: Record<string, unknown>): boolean;
+    schema(): ToolSchema;
+    execute(ctx: ToolContext, args: Record<string, unknown>): Promise<ToolResult>;
+}
+declare const SKIP_DIRS: Set<string>;
+
+/**
+ * Copyright (c) 2026 hangtiancheng
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
 interface ToolUseBlock {
     toolUseId: string;
     toolName: string;
@@ -75,7 +281,8 @@ interface ToolUseBlock {
 }
 interface ToolResultBlock {
     toolUseId: string;
-    content: string | Record<string, unknown>[];
+    content: string;
+    contentBlocks?: ToolResultContentBlock[];
     isError: boolean;
 }
 interface ThinkingBlock {
@@ -101,7 +308,7 @@ declare class ConversationManager {
     addToolUseMessage(text: string, toolUseId: string, toolName: string, args: Record<string, unknown>): void;
     addAssistantMessageWithTools(text: string, toolUses: ToolUseBlock[]): void;
     addAssistantFull(text: string, thinking: ThinkingBlock[], toolUses: ToolUseBlock[]): void;
-    addToolResultMessage(toolUseId: string, content: string | Record<string, unknown>[], isError: boolean): void;
+    addToolResultMessage(toolUseId: string, content: string, isError: boolean, contentBlocks?: ToolResultContentBlock[]): void;
     addToolResultsMessage(results: ToolResultBlock[]): void;
     addSystemReminder(content: string): void;
     /**
@@ -113,6 +320,7 @@ declare class ConversationManager {
      */
     hasReminderContaining(marker: string): boolean;
     injectLongTermMemory(instructions: string, memories: string, skills?: string): void;
+    appendMessages(msgs: Message[]): void;
     len(): number;
     truncateTo(index: number): void;
     reset(): void;
@@ -126,54 +334,6 @@ declare class ConversationManager {
     } | null;
 }
 
-/**
- * Copyright (c) 2026 hangtiancheng
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-interface Backup {
-    backupPath: string;
-    version: number;
-    time: string;
-}
-interface Snapshot {
-    messageIndex: number;
-    userText: string;
-    backups: Record<string, Backup>;
-    timestamp: string;
-}
-/** Single source of truth for a session's file-history directory layout. */
-declare function fileHistoryDir(baseDir: string, sessionId: string): string;
-declare class FileHistory {
-    private sessionDir;
-    /** Tracked file absolute path to version */
-    private trackedFiles;
-    private snapshots;
-    constructor(baseDir: string, sessionID: string);
-    trackEdit(path: string): void;
-    makeSnapshot(messageIndex: number, userText: string): void;
-    rewind(snapshotIndex: number): string[];
-    getSnapshots(): Snapshot[];
-    hasSnapshots(): boolean;
-    save(): void;
-}
-
 /**
  * Copyright (c) 2026 hangtiancheng
  *
@@ -416,158 +576,6 @@ type StreamEvent = {
     usage: UsageInfo;
 };
 
-/**
- * Copyright (c) 2026 hangtiancheng
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-declare class FileStateCache {
-    private cache;
-    /** Called after a successful ReadFile to register the file as "seen". */
-    record(filePath: string, lastModifiedTimeMs: number): void;
-    /**
-     * Gate check before EditFile / WriteFile
-     */
-    check(filePath: string): {
-        ok: true;
-    } | {
-        ok: false;
-        error: string;
-    };
-    /**
-     * Called after a successful edit / write to keep the cache in sync
-     * with the new on-disk state
-     */
-    update(filePath: string): void;
-}
-
-/**
- * Copyright (c) 2026 hangtiancheng
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-type ToolCategory = "read" | "write" | "command";
-interface ToolResult {
-    output: string | Record<string, unknown>[];
-    isError: boolean;
-}
-interface ToolContext {
-    workDir: string;
-    abortSignal?: AbortSignal;
-    fileHistory?: FileHistory | undefined;
-    fileStateCache?: FileStateCache | undefined;
-}
-/**
- * How MCP tools enter the context, written into ToolRegistry by mcp/strategy
- * after connecting to the server.
- *
- * eager    total schema size under one tenth of the context; all go into tools[],
- *          no deferral
- * native   official endpoint; tools stay in the array with defer_loading but the
- *          server does not show them to the model, and ToolSearch returns a
- *          tool_reference so the server expands the schema
- * dispatch other endpoints support neither of the above; MCP tools never enter
- *          tools[] at all and go through McpCall
- *
- * Why three modes: tools render after system and before messages, so any change to
- * the array invalidates the entire trailing conversation-history cache. In a test
- * with twenty thousand tokens of history, appending one tool to the end of tools
- * dropped the hit rate from 99.4% to 9.5%.
- */
-type McpLoadingMode = "eager" | "native" | "dispatch";
-/** Extra capabilities the MCP tool wrapper exposes to dispatch and routing logic. */
-interface MCPToolLike extends Tool {
-    mcpServerName: string;
-    mcpInputSchema(): Record<string, unknown>;
-    setDeferLoading(on: boolean): void;
-}
-interface ToolSchema {
-    name: string;
-    parameters?: Record<string, unknown>;
-    strict?: boolean;
-    /** For OpenAI, this must be "function"; for Anthropic, it can be "custom" or null */
-    type?: "function" | "custom";
-    defer_loading?: boolean;
-    description: string;
-    /** The input schema for the tool. */
-    input_schema: {
-        type: "object";
-        properties: Record<string, object>;
-        required?: string[];
-    };
-    allowed_callers?: ("direct" | "code_execution_20250825" | "code_execution_20260120")[];
-    cache_control?: {
-        type: "ephemeral";
-        ttl?: "5m" | "1h";
-    };
-    eager_input_streaming?: boolean;
-}
-interface Tool {
-    name: string;
-    description: string;
-    category: ToolCategory;
-    /**
-     * Whether to defer loading. A deferred tool does not appear in the initial
-     * tool list; the model must first pull its schema out via ToolSearch before
-     * it can call it.
-     *
-     * Only MCP tools are set to true. MCP is configured per project, a single
-     * server can easily expose dozens of tools with long schemas, and stuffing
-     * all of them into the initial tool list would eat up a large chunk of the
-     * context — especially since most of those tools won't be used in a given
-     * session. Built-in tools are a fixed few dozen, a controllable count;
-     * hiding them would only force the model into an extra ToolSearch round
-     * trip, so they are never deferred and always ship their full schema.
-     */
-    deferred?: boolean;
-    /**
-     * Whether this particular invocation can run concurrently with others,
-     * judged by actual arguments rather than just the tool category.
-     *
-     * When not implemented, falls back to category: read-only tools may run
-     * concurrently, write and command tools may not. Currently only Bash
-     * implements this — whether a command is read-only depends on the command
-     * itself (ls vs rm are both Bash but have very different safety profiles).
-     */
-    isConcurrencySafe?(args: Record<string, unknown>): boolean;
-    schema(): ToolSchema;
-    execute(ctx: ToolContext, args: Record<string, unknown>): Promise<ToolResult>;
-}
-declare const SKIP_DIRS: Set<string>;
-
 /**
  * Copyright (c) 2026 hangtiancheng
  *
@@ -742,7 +750,10 @@ interface RelevantMemory {
 declare class MemoryManager {
     private userDir;
     private projectDir;
+    private malformedFingerprints;
     constructor(workDir: string);
+    private readMemory;
+    private scanAllMemories;
     loadAll(): MemoryFile[];
     getMemories(): MemoryFile[];
     /**
@@ -763,12 +774,14 @@ declare class MemoryManager {
      * alphabetically by name, truncated at MAX_ENTRYPOINT_LINES / MAX_ENTRYPOINT_BYTES.
      */
     rebuildIndex(): void;
+    private writeIndex;
     /**
      * Scans all memory headers from both dirs, asks the LLM to select the
      * top 5 most relevant ones for the query, and returns the full content
      * of those files. Best-effort: selector failures return an empty array.
      */
     findRelevantMemories(query: string, client: LLMClient, recentTools?: string[], alreadySurfaced?: Set<string>): Promise<RelevantMemory[]>;
+    private scanMemoryHeaders;
     renderReminder(memories: RelevantMemory[]): string;
 }
 
@@ -948,6 +961,7 @@ type ToolUseRecord = z$1.infer<typeof ToolUseRecordSchema>;
 declare const ToolResultRecordSchema: z$1.ZodObject<{
     tool_use_id: z$1.ZodString;
     content: z$1.ZodUnion<readonly [z$1.ZodString, z$1.ZodArray<z$1.ZodRecord<z$1.ZodString, z$1.ZodUnknown>>]>;
+    content_blocks: z$1.ZodOptional<z$1.ZodArray<z$1.ZodUnknown>>;
     is_error: z$1.ZodOptional<z$1.ZodBoolean>;
 }, z$1.core.$strip>;
 type ToolResultRecord = z$1.infer<typeof ToolResultRecordSchema>;
@@ -964,6 +978,7 @@ declare const SessionMessageSchema: z$1.ZodObject<{
     tool_results: z$1.ZodOptional<z$1.ZodArray<z$1.ZodObject<{
         tool_use_id: z$1.ZodString;
         content: z$1.ZodUnion<readonly [z$1.ZodString, z$1.ZodArray<z$1.ZodRecord<z$1.ZodString, z$1.ZodUnknown>>]>;
+        content_blocks: z$1.ZodOptional<z$1.ZodArray<z$1.ZodUnknown>>;
         is_error: z$1.ZodOptional<z$1.ZodBoolean>;
     }, z$1.core.$strip>>>;
 }, z$1.core.$strip>;
@@ -979,6 +994,7 @@ declare const KeptMessageSchema: z$1.ZodObject<{
     tool_results: z$1.ZodOptional<z$1.ZodArray<z$1.ZodObject<{
         tool_use_id: z$1.ZodString;
         content: z$1.ZodUnion<readonly [z$1.ZodString, z$1.ZodArray<z$1.ZodRecord<z$1.ZodString, z$1.ZodUnknown>>]>;
+        content_blocks: z$1.ZodOptional<z$1.ZodArray<z$1.ZodUnknown>>;
         is_error: z$1.ZodOptional<z$1.ZodBoolean>;
     }, z$1.core.$strip>>>;
 }, z$1.core.$strip>;
@@ -989,11 +1005,7 @@ declare function toolUsesToRecords(toolUses?: {
     toolName: string;
     arguments?: Record<string, unknown>;
 }[]): ToolUseRecord[];
-declare function toolResultsToRecords(toolResults?: {
-    toolUseId: string;
-    content: string | Record<string, unknown>[];
-    isError?: boolean;
-}[]): ToolResultRecord[];
+declare function toolResultsToRecords(toolResults?: ToolResultBlock[]): ToolResultRecord[];
 declare const CompactBoundaryPayloadSchema: z$1.ZodObject<{
     summary: z$1.ZodString;
     keep: z$1.ZodArray<z$1.ZodObject<{
@@ -1007,6 +1019,7 @@ declare const CompactBoundaryPayloadSchema: z$1.ZodObject<{
         tool_results: z$1.ZodOptional<z$1.ZodArray<z$1.ZodObject<{
             tool_use_id: z$1.ZodString;
             content: z$1.ZodUnion<readonly [z$1.ZodString, z$1.ZodArray<z$1.ZodRecord<z$1.ZodString, z$1.ZodUnknown>>]>;
+            content_blocks: z$1.ZodOptional<z$1.ZodArray<z$1.ZodUnknown>>;
             is_error: z$1.ZodOptional<z$1.ZodBoolean>;
         }, z$1.core.$strip>>>;
     }, z$1.core.$strip>>;
@@ -1032,11 +1045,7 @@ interface RestoredMessage {
         toolName: string;
         arguments?: Record<string, unknown>;
     }[];
-    toolResults?: {
-        toolUseId: string;
-        content: string | Record<string, unknown>[];
-        isError?: boolean;
-    }[];
+    toolResults?: ToolResultBlock[];
 }
 declare function rebuildFromSession(saved: SessionMessage[]): RestoredMessage[];
 declare function listSessions(workDir: string): SessionInfo[];
@@ -1088,9 +1097,8 @@ type AgentEvent = {
     type: "tool_result";
     toolName: string;
     toolId: string;
-    /** Tool output: plain text, or structured content blocks (e.g. images).
-     * Display-only consumers flatten arrays via contentToText. */
-    output: string | Record<string, unknown>[];
+    output: string;
+    contentBlocks?: ToolResultContentBlock[];
     isError: boolean;
     elapsed: number;
 } | {
@@ -2195,8 +2203,9 @@ declare function ensureToolPairing(messages: Message[]): Message[];
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+declare const MAX_HISTORY_ENTRIES = 200;
 declare function load(dir: string): string[];
-declare function append(dir: string, text: string): void;
+declare function append(dir: string, text: string): string[];
 
 type SaveClipboardImageResult = {
     ok: true;
@@ -2429,11 +2438,7 @@ interface MCPTool {
     description: string;
     inputSchema: ToolSchema["input_schema"];
 }
-/** Convert an MCP tool-call content array into a ToolResult output: plain
- *  text when there is no image, otherwise provider-style content blocks
- *  (leading text block + image blocks). Oversized images are resized and
- *  recompressed through the shared image pipeline. */
-declare function mcpContentToToolOutput(content: unknown[]): Promise<string | Record<string, unknown>[]>;
+declare function mcpContentToToolOutput(content: unknown[]): Promise<Pick<ToolResult, "output" | "contentBlocks">>;
 declare class MCPClient {
     name: string;
     private config;
@@ -2443,14 +2448,8 @@ declare class MCPClient {
     connect(): Promise<void>;
     getInstructions(): string;
     listTools(): Promise<MCPTool[]>;
-    /** Calls a tool and returns { output, isError }. isError mirrors the MCP
-     *  protocol's isError flag so the model knows when a tool failed.
-     *  Image content blocks pass through as provider-style blocks instead of
-     *  being flattened to JSON text. */
-    callTool(name: string, args: Record<string, unknown>): Promise<{
-        output: string | Record<string, unknown>[];
-        isError: boolean;
-    }>;
+    /** Calls a tool and preserves both its text fallback and provider-native rich content. */
+    callTool(name: string, args: Record<string, unknown>): Promise<ToolResult>;
     disconnect(): Promise<void>;
 }
 
@@ -4305,6 +4304,9 @@ declare function loadTranscript(workDir: string, teamName: string, agentId: stri
  * SOFTWARE.
  */
 
+declare const TOOL_RESULT_PREVIEW_CHARS = 2000;
+declare function toDisplayPreview(content: string): string;
+declare function replaceToolResultContent(result: ToolResultBlock, content: string): void;
 /**
  * Determine whether a tool call is reading back a file under the spill
  * directory. Such results are not spilled: writing the model's freshly-read
@@ -4899,12 +4901,7 @@ declare class WriteFileTool implements Tool {
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-declare const DANGEROUSLY_JSON = "dangerouslyJson";
-/**
- * Convert a ToolResultBlock content value (string or ContentBlockParam[]) to a
- * plain text string. Used by consumers that cannot handle structured blocks
- * (session persistence, TUI display, OpenAI Responses API, etc.).
- */
+/** Convert message or legacy-session blocks to a base64-free text fallback. */
 declare function contentToText(content: string | Record<string, unknown>[]): string;
 declare function isRecord(value: unknown): value is Record<string, unknown>;
 declare function asRecord(value: unknown): Record<string, unknown>;
@@ -5347,4 +5344,4 @@ declare class TaskUpdateTool implements Tool {
     execute(ctx: ToolContext, args: Record<string, unknown>): Promise<ToolResult>;
 }
 
-export { ASYNC_AGENT_ALLOWED_TOOLS, Agent, type AgentConfig, type AgentDefinition, type AgentEvent, type AgentEventCallback, AgentEventLogger, type AgentEventSink, type AgentProgress, AgentProgressSchema, type AgentTask, AgentTool, AnthropicClient, type AppConfig, AskUserQuestionTool, type Asker, AuthenticationError, AutoCompactTrackingState, BASH_DESCRIPTION, BUILTIN_AGENTS, type Backup, BashTool, BwrapSandbox, CHARS_PER_TOKEN, COMPACT_BOUNDARY, CUSTOM_AGENT_DISALLOWED_TOOLS, CodeReviewManager, type CodeReviewMember, type CodeReviewTeam, type Command, type CommandContext, CommandRegistry, type CommandType, CommandUsageTracker, type CommentIssue, type CommentResolution, type CompactBoundaryPayload, type CompactResult, ConfigError, type ConnectResult, ContextTooLongError, ConversationManager, type CriticAssessment, type CriticEvaluation, DANGEROUSLY_JSON, DEFAULT_EAGER_THRESHOLD_PERCENT, type Decision, type DecisionEffect, type DetectedIde, type DiffResult, EDIT_FILE_DESCRIPTION, EditFileTool, EnterWorktreeTool, type EnvironmentContext, type EventLogger, type EventName, ExitPlanModeTool, ExitWorktreeTool, FORK_QUERY_SOURCE, type FileFeedback, FileHistory, type FileMailMessage, FileMailbox, FileStateCache, GLOB_DESCRIPTION, GREP_DESCRIPTION, GlobTool, GrepTool, type HookConfig, HookConfigSchema, type HookContext, HookEngine, type HookResult, INTERRUPTED_TOOL_RESULT, type IdeAtMention, type IdeConnection, ImageTooLargeError, InstallSkillTool, type InstructionSource, type KeptMessage, type LLMClient, LLMError, ListTeamsTool, LoadSkillTool, MAX_DIMENSION_PX, MAX_IMAGES_PER_MESSAGE, MAX_IMAGE_BYTES_PASSTHROUGH, MCPClient, MCPManager, type MCPServerConfig, type MCPTool, type MCPToolLike, MCPToolWrapper, MCP_CALL_TOOL_NAME, MCP_NAME_SEP, MCP_TOOL_PREFIX, MSG_PLAN_APPROVAL_REQUEST, MSG_PLAN_APPROVAL_RESPONSE, MSG_SHUTDOWN_REQUEST, MSG_SHUTDOWN_RESPONSE, MSG_TEXT, type MaxTokensSetter, McpCallTool, type McpLoadingMode, type Member, MemoryConsolidator, MemoryExtractor, type MemoryFile, type MemoryHeader, MemoryManager, type Message, NATIVE_TOOL_USE_BETA, NameRegistry, NetworkError, OpenAIClient, OpenAICompatClient, type OpenAIMessageParam, POWERSHELL_DESCRIPTION, PathSandbox, PermissionChecker, type PermissionMode, PowerShellTool, type PrintArgs, PromptBuilder, type ProviderConfig, ProviderConfigSchema, type Question, type QuestionOption, READ_FILE_DESCRIPTION, REJECTED_TOOL_RESULT, RateLimitError, ReadFileTool, type RecallResult, RecoveryState, type RelevantMemory, type RemoteAgentHandle, RemoteServer, type RestoredMessage, type ReviewComment, type ReviewRequest, ReviewSession, type ReviewSummary, RuleEngine, type RunAgent, type RunCallbacks, SHUTDOWN_PREFIX, SKIP_DIRS, SUBAGENT_DISALLOWED_TOOLS, type Sandbox, type SandboxConfig, type SandboxYamlConfig, type SaveClipboardImageResult, SeatbeltSandbox, type Section, SendMessageTool, type SessionInfo, type SessionMessage, type SharedTask, SharedTaskStore, type Skill, SkillCatalog, type SkillForkHost, type SkillHost, type SkillMeta, type Snapshot, type SpawnConfig, SpawnTeammateTool, type Task$1 as StoredTask, type StreamEvent, StreamingExecutor, SyntheticOutputTool, TEAMMATE_DISALLOWED_TOOLS, TOOL_SEARCH_TOOL_NAME, type Task, TaskCreateTool$1 as TaskCreateTool, TaskGetTool$1 as TaskGetTool, TaskList, TaskListTool$1 as TaskListTool, TaskManager, type TaskStatus, TaskStopTool, TaskStore, type TaskUpdateFields, TaskUpdateTool$1 as TaskUpdateTool, Team, TeamCreateTool, TeamDeleteTool, type TeamFile, TeamManager, type TeamMemberEntry, TeamMemberEntrySchema, type TeamMode, TaskCreateTool as TeamTaskCreateTool, TaskGetTool as TeamTaskGetTool, TaskListTool as TeamTaskListTool, TaskUpdateTool as TeamTaskUpdateTool, type TeammateUIState, TeammateUIStateSchema, type ThinkingBlock, type Tool, type ToolActivity, ToolActivitySchema, type ToolCategory, type ToolContext, ToolRegistry, type ToolResult, type ToolResultBlock, type ToolResultRecord, type ToolSchema, ToolSearchTool, type ToolUseBlock, type ToolUseRecord, type TranscriptEntry, type UsageAnchor, type UsageInfo, WRITE_FILE_DESCRIPTION, WebSocketTransport, type WorktreeResult, WriteFileTool, _resetContextWindowCache, append, applyBudget, applyMode, approved, asCriticEvaluation, asError, asErrorString, asImageMediaType, asRecord, asString, boolArg, buildAnthropicMessages, buildChatCompletionMessages, buildDiff, buildMcpToolName, buildOpenAIInput, buildPlanModeExitReminder, buildPlanModeReentryReminder, buildPlanModeReminder, buildSkillSection, buildSystemPrompt, buildTeammateRegistry, buildWorktreeNotice, cleanExpiredSessions, clipboardImageFileName, cloneRegistryForFork, closeLogger, coerceBySchema, computeCompactThreshold, computeKeepStartIndex, connectToIde, contentToText, coordinatorActive, coordinatorReminder, coordinatorToolFilter, createAgentWorktree, createChildLogger, createClient, createDefaultCodeReviewTeam, createDefaultRegistry, createModelResolver, createProgress, createRemoteAgent, createSandbox, currentContextTokens, decideAndApply, decideMode, detectBackend, detectBackendFromEnv, detectEnvironment, detectIde, discoverInstructions, doingTasksSection, ensureToolPairing, environmentSection, estimateMessages, estimateSchemaTokens, estimateTokens, evaluateRules, executingActionsSection, expandAtRefs, expandAtRefsWithImages, extractContent, fetchModelContextWindow, fileHistoryDir, filterToolsForAgent, forceCompact, forkEnabled, formatTokens, getContextWindow, getContextWindowAsync, getCurrentBranch, getCurrentPlanPath, getMaxOutputTokens, getMediaType, getNameRegistry, getOrCreatePlanPath, getSessionFilePath, handleCodeReviewCommand, hasWorktreeChanges, identitySection, initLogger, intArg, isCoordinatorTool, isCriticEvaluation, isDiffTool, isImagePath, isMcpToolLike, isObject, isOfficialAnthropicEndpoint, isPngBuffer, isRecord, isSafeCommand, isShutdownRequest, isSpillReadback, listSessions, load, loadAgentDefinitions, loadConfig, loadImageAttachment, loadInstructions, loadPlan, loadSession, loadTranscript, loadUserCommands, logger, lookupModelContextWindow, manageContext, markLastUserTailForCache, markToolsForCache, maybeResizeAndDownsampleImage, mcpCallPermissionContent, mcpContentToToolOutput, mcpToolNamePrefix, measureSchemaChars, memoryAge, memoryAgeDays, memoryFreshnessText, mergeConfig, needsToolSearchBeta, newRequestId, newSessionId, outputEfficiencySection, parse, parsePrintFlags, parseTeammateFlags, persistLargeResult, planApprovalRequest, planApprovalResponse, planExists, quickSort, randomCompletionVerb, randomVerb, readTeamFile, readWorktreeHeadSha, rebuildFromSession, record, recordError, recordExit, recordTokens, recordToolUse, recover, removeAgentWorktree, renderBody, resetPlanPath, resolveAPIKey, resolveGitDir, resolveModelId, runFork, runInline, runPrintMode, runTeammate, safeJSONParse, sanitizeNameSegment, sanitizeSegment, sanitizeTeamName, saveClipboardImage, saveCompactBoundary, saveMessage, savePlan, saveTranscript, shutdownRequest, shutdownResponse, sniffMediaType, spawnSubagent, spawnTeammate, storeClipboardImage, strArg, strList, summarizeActivities, systemSection, teamConfigPath, teamDir, teamsBaseDir, toTry, toneStyleSection, toolResultsToRecords, toolUsesToRecords, usingToolsSection, validate, version, writeTeamFile };
+export { ASYNC_AGENT_ALLOWED_TOOLS, Agent, type AgentConfig, type AgentDefinition, type AgentEvent, type AgentEventCallback, AgentEventLogger, type AgentEventSink, type AgentProgress, AgentProgressSchema, type AgentTask, AgentTool, AnthropicClient, type AppConfig, AskUserQuestionTool, type Asker, AuthenticationError, AutoCompactTrackingState, BASH_DESCRIPTION, BUILTIN_AGENTS, type Backup, BashTool, BwrapSandbox, CHARS_PER_TOKEN, COMPACT_BOUNDARY, CUSTOM_AGENT_DISALLOWED_TOOLS, CodeReviewManager, type CodeReviewMember, type CodeReviewTeam, type Command, type CommandContext, CommandRegistry, type CommandType, CommandUsageTracker, type CommentIssue, type CommentResolution, type CompactBoundaryPayload, type CompactResult, ConfigError, type ConnectResult, ContextTooLongError, ConversationManager, type CriticAssessment, type CriticEvaluation, DEFAULT_EAGER_THRESHOLD_PERCENT, type Decision, type DecisionEffect, type DetectedIde, type DiffResult, EDIT_FILE_DESCRIPTION, EditFileTool, EnterWorktreeTool, type EnvironmentContext, type EventLogger, type EventName, ExitPlanModeTool, ExitWorktreeTool, FORK_QUERY_SOURCE, type FileFeedback, FileHistory, type FileMailMessage, FileMailbox, FileStateCache, GLOB_DESCRIPTION, GREP_DESCRIPTION, GlobTool, GrepTool, type HookConfig, HookConfigSchema, type HookContext, HookEngine, type HookResult, INTERRUPTED_TOOL_RESULT, type IdeAtMention, type IdeConnection, ImageTooLargeError, InstallSkillTool, type InstructionSource, type KeptMessage, type LLMClient, LLMError, ListTeamsTool, LoadSkillTool, MAX_DIMENSION_PX, MAX_HISTORY_ENTRIES, MAX_IMAGES_PER_MESSAGE, MAX_IMAGE_BYTES_PASSTHROUGH, MCPClient, MCPManager, type MCPServerConfig, type MCPTool, type MCPToolLike, MCPToolWrapper, MCP_CALL_TOOL_NAME, MCP_NAME_SEP, MCP_TOOL_PREFIX, MSG_PLAN_APPROVAL_REQUEST, MSG_PLAN_APPROVAL_RESPONSE, MSG_SHUTDOWN_REQUEST, MSG_SHUTDOWN_RESPONSE, MSG_TEXT, type MaxTokensSetter, McpCallTool, type McpLoadingMode, type Member, MemoryConsolidator, MemoryExtractor, type MemoryFile, type MemoryHeader, MemoryManager, type Message, NATIVE_TOOL_USE_BETA, NameRegistry, NetworkError, OpenAIClient, OpenAICompatClient, type OpenAIMessageParam, POWERSHELL_DESCRIPTION, PathSandbox, PermissionChecker, type PermissionMode, PowerShellTool, type PrintArgs, PromptBuilder, type ProviderConfig, ProviderConfigSchema, type Question, type QuestionOption, READ_FILE_DESCRIPTION, REJECTED_TOOL_RESULT, RateLimitError, ReadFileTool, type RecallResult, RecoveryState, type RelevantMemory, type RemoteAgentHandle, RemoteServer, type RestoredMessage, type ReviewComment, type ReviewRequest, ReviewSession, type ReviewSummary, RuleEngine, type RunAgent, type RunCallbacks, SHUTDOWN_PREFIX, SKIP_DIRS, SUBAGENT_DISALLOWED_TOOLS, type Sandbox, type SandboxConfig, type SandboxYamlConfig, type SaveClipboardImageResult, SeatbeltSandbox, type Section, SendMessageTool, type SessionInfo, type SessionMessage, type SharedTask, SharedTaskStore, type Skill, SkillCatalog, type SkillForkHost, type SkillHost, type SkillMeta, type Snapshot, type SpawnConfig, SpawnTeammateTool, type Task$1 as StoredTask, type StreamEvent, StreamingExecutor, SyntheticOutputTool, TEAMMATE_DISALLOWED_TOOLS, TOOL_RESULT_PREVIEW_CHARS, TOOL_SEARCH_TOOL_NAME, type Task, TaskCreateTool$1 as TaskCreateTool, TaskGetTool$1 as TaskGetTool, TaskList, TaskListTool$1 as TaskListTool, TaskManager, type TaskStatus, TaskStopTool, TaskStore, type TaskUpdateFields, TaskUpdateTool$1 as TaskUpdateTool, Team, TeamCreateTool, TeamDeleteTool, type TeamFile, TeamManager, type TeamMemberEntry, TeamMemberEntrySchema, type TeamMode, TaskCreateTool as TeamTaskCreateTool, TaskGetTool as TeamTaskGetTool, TaskListTool as TeamTaskListTool, TaskUpdateTool as TeamTaskUpdateTool, type TeammateUIState, TeammateUIStateSchema, type ThinkingBlock, type Tool, type ToolActivity, ToolActivitySchema, type ToolCategory, type ToolContext, ToolRegistry, type ToolResult, type ToolResultBlock, type ToolResultContentBlock, type ToolResultRecord, type ToolSchema, ToolSearchTool, type ToolUseBlock, type ToolUseRecord, type TranscriptEntry, type UsageAnchor, type UsageInfo, WRITE_FILE_DESCRIPTION, WebSocketTransport, type WorktreeResult, WriteFileTool, _resetContextWindowCache, append, applyBudget, applyMode, approved, asCriticEvaluation, asError, asErrorString, asImageMediaType, asRecord, asString, boolArg, buildAnthropicMessages, buildChatCompletionMessages, buildDiff, buildMcpToolName, buildOpenAIInput, buildPlanModeExitReminder, buildPlanModeReentryReminder, buildPlanModeReminder, buildSkillSection, buildSystemPrompt, buildTeammateRegistry, buildWorktreeNotice, cleanExpiredSessions, clipboardImageFileName, cloneRegistryForFork, closeLogger, coerceBySchema, computeCompactThreshold, computeKeepStartIndex, connectToIde, contentToText, coordinatorActive, coordinatorReminder, coordinatorToolFilter, createAgentWorktree, createChildLogger, createClient, createDefaultCodeReviewTeam, createDefaultRegistry, createModelResolver, createProgress, createRemoteAgent, createSandbox, currentContextTokens, decideAndApply, decideMode, detectBackend, detectBackendFromEnv, detectEnvironment, detectIde, discoverInstructions, doingTasksSection, ensureToolPairing, environmentSection, estimateMessages, estimateSchemaTokens, estimateTokens, evaluateRules, executingActionsSection, expandAtRefs, expandAtRefsWithImages, extractContent, fetchModelContextWindow, fileHistoryDir, filterToolsForAgent, forceCompact, forkEnabled, formatTokens, getContextWindow, getContextWindowAsync, getCurrentBranch, getCurrentPlanPath, getMaxOutputTokens, getMediaType, getNameRegistry, getOrCreatePlanPath, getSessionFilePath, handleCodeReviewCommand, hasWorktreeChanges, identitySection, initLogger, intArg, isCoordinatorTool, isCriticEvaluation, isDiffTool, isImagePath, isMcpToolLike, isObject, isOfficialAnthropicEndpoint, isPngBuffer, isRecord, isSafeCommand, isShutdownRequest, isSpillReadback, isToolResultContentBlock, listSessions, load, loadAgentDefinitions, loadConfig, loadImageAttachment, loadInstructions, loadPlan, loadSession, loadTranscript, loadUserCommands, logger, lookupModelContextWindow, manageContext, markLastUserTailForCache, markToolsForCache, maybeResizeAndDownsampleImage, mcpCallPermissionContent, mcpContentToToolOutput, mcpToolNamePrefix, measureSchemaChars, memoryAge, memoryAgeDays, memoryFreshnessText, mergeConfig, needsToolSearchBeta, newRequestId, newSessionId, normalizeToolResultContentBlock, outputEfficiencySection, parse, parsePrintFlags, parseTeammateFlags, persistLargeResult, planApprovalRequest, planApprovalResponse, planExists, quickSort, randomCompletionVerb, randomVerb, readTeamFile, readWorktreeHeadSha, rebuildFromSession, record, recordError, recordExit, recordTokens, recordToolUse, recover, removeAgentWorktree, renderBody, replaceToolResultContent, resetPlanPath, resolveAPIKey, resolveGitDir, resolveModelId, runFork, runInline, runPrintMode, runTeammate, safeJSONParse, sanitizeNameSegment, sanitizeSegment, sanitizeTeamName, saveClipboardImage, saveCompactBoundary, saveMessage, savePlan, saveTranscript, shutdownRequest, shutdownResponse, sniffMediaType, spawnSubagent, spawnTeammate, storeClipboardImage, strArg, strList, summarizeActivities, systemSection, teamConfigPath, teamDir, teamsBaseDir, toDisplayPreview, toTry, toneStyleSection, toolResultsToRecords, toolUsesToRecords, usingToolsSection, validate, version, writeTeamFile };