@swifty.js/swifty 0.0.22 → 0.0.23

package/dist/lib/index.js

@@ -2,6 +2,7 @@ import {
   Agent,
   RecoveryState,
   StreamingExecutor,
+  TOOL_RESULT_PREVIEW_CHARS,
   applyBudget,
   buildPlanModeExitReminder,
   buildPlanModeReentryReminder,
@@ -13,9 +14,11 @@ import {
   loadPlan,
   persistLargeResult,
   planExists,
+  replaceToolResultContent,
   resetPlanPath,
-  savePlan
-} from "./chunk-UHVO63Y7.js";
+  savePlan,
+  toDisplayPreview
+} from "./chunk-MF3YLQDS.js";
 import {
   AnthropicClient,
   CHARS_PER_TOKEN,
@@ -32,11 +35,12 @@ import {
   markToolsForCache,
   measureSchemaChars,
   needsToolSearchBeta
-} from "./chunk-LUEP4JMF.js";
+} from "./chunk-7IZEK7X5.js";
 import {
   AutoCompactTrackingState,
   COMPACT_BOUNDARY,
   ConversationManager,
+  SKIP_DIRS,
   cleanExpiredSessions,
   computeCompactThreshold,
   computeKeepStartIndex,
@@ -45,22 +49,24 @@ import {
   estimateTokens,
   forceCompact,
   getSessionFilePath,
+  isToolResultContentBlock,
   listSessions,
   loadSession,
   manageContext,
   newSessionId,
+  normalizeToolResultContentBlock,
   rebuildFromSession,
   saveCompactBoundary,
   saveMessage,
   toolResultsToRecords,
   toolUsesToRecords
-} from "./chunk-C7IHCJZ3.js";
+} from "./chunk-BN4Q54G2.js";
 import {
   OpenAIClient,
   OpenAICompatClient,
   buildChatCompletionMessages,
   buildOpenAIInput
-} from "./chunk-RR2CZ6CY.js";
+} from "./chunk-BO76JDFZ.js";
 import {
   ConfigError,
   HookConfigSchema,
@@ -74,7 +80,7 @@ import {
   lookupModelContextWindow,
   mergeConfig,
   resolveAPIKey
-} from "./chunk-6GOWRPYS.js";
+} from "./chunk-CYDNMEBC.js";
 import {
   AuthenticationError,
   ContextTooLongError,
@@ -84,7 +90,7 @@ import {
   REJECTED_TOOL_RESULT,
   RateLimitError,
   ensureToolPairing
-} from "./chunk-UMFNTXKA.js";
+} from "./chunk-OO2CLOEE.js";
 import {
   PathSandbox,
   PermissionChecker,
@@ -92,7 +98,7 @@ import {
   evaluateRules,
   extractContent,
   isSafeCommand
-} from "./chunk-7URDLWQN.js";
+} from "./chunk-GNI7YX6F.js";
 import {
   MCPToolWrapper,
   MCP_NAME_SEP,
@@ -104,9 +110,8 @@ import {
   mcpCallPermissionContent,
   mcpToolNamePrefix,
   sanitizeSegment
-} from "./chunk-GNBXECZN.js";
+} from "./chunk-PZ42NAFA.js";
 import {
-  DANGEROUSLY_JSON,
   asError,
   asErrorString,
   asRecord,
@@ -126,7 +131,7 @@ import {
   strArg,
   strList,
   toTry
-} from "./chunk-EJLGB2EJ.js";
+} from "./chunk-EY7HE52Q.js";
 import {
   ASYNC_AGENT_ALLOWED_TOOLS,
   CUSTOM_AGENT_DISALLOWED_TOOLS,
@@ -1937,6 +1942,17 @@ var FileHistory = class {
         }
       }
     }
+    const createdAfterTarget = [...this.trackedFiles.keys()].filter((p) => !(p in target.backups));
+    for (const filePath of createdAfterTarget) {
+      if (existsSync4(filePath)) {
+        try {
+          unlinkSync(filePath);
+          changed.push(filePath);
+        } catch {
+        }
+      }
+      this.trackedFiles.delete(filePath);
+    }
     this.snapshots = this.snapshots.slice(0, snapshotIndex + 1);
     for (const [filePath, backup] of Object.entries(target.backups)) {
       this.trackedFiles.set(filePath, backup.version);
@@ -1960,7 +1976,7 @@ import { readFileSync as readFileSync7, writeFileSync as writeFileSync4, mkdirSy
 import { join as join6 } from "path";
 import { parse as parse3, z as z4 } from "zod";
 var log9 = createChildLogger({ module: "history" });
-var MAX_ENTRIES = 200;
+var MAX_HISTORY_ENTRIES = 200;
 var FILENAME = "prompt_history.jsonl";
 var JSONLSchema = z4.looseObject({ text: z4.string() });
 function load(dir) {
@@ -1979,7 +1995,7 @@ function load(dir) {
         log9.error({ err }, "parse history line failed");
         return "";
       }
-    });
+    }).filter(Boolean).slice(-MAX_HISTORY_ENTRIES);
   } catch (err2) {
     log9.error({ err: err2 }, "load history failed");
     return [];
@@ -1989,15 +2005,13 @@ function append(dir, text) {
   const filePath = join6(dir, FILENAME);
   mkdirSync4(dir, { recursive: true });
   const entries = load(dir);
-  if (entries.length > 0 && entries[entries.length - 1] === text) {
-    return;
-  }
-  entries.push(text);
-  while (entries.length > MAX_ENTRIES) {
-    entries.shift();
+  if (entries.length === 0 || entries[entries.length - 1] !== text) {
+    entries.push(text);
   }
-  const lines = entries.map((t) => JSON.stringify({ text: t })).join("\n") + "\n";
+  const retained = entries.slice(-MAX_HISTORY_ENTRIES);
+  const lines = retained.map((entry) => JSON.stringify({ text: entry })).join("\n") + "\n";
   writeFileSync4(filePath, lines, "utf-8");
+  return retained;
 }
 
 // src/hooks/hooks.ts
@@ -2538,15 +2552,15 @@ async function saveClipboardImage(workDir, sessionId) {
 async function createClient(config, systemPrompt) {
   switch (config.protocol) {
     case "anthropic": {
-      const { AnthropicClient: AnthropicClient2 } = await import("./anthropic-GFWP3ORB.js");
+      const { AnthropicClient: AnthropicClient2 } = await import("./anthropic-7YEN2QTU.js");
       return new AnthropicClient2(config, systemPrompt);
     }
     case "openai": {
-      const { OpenAIClient: OpenAIClient2 } = await import("./openai-HXRMPNB7.js");
+      const { OpenAIClient: OpenAIClient2 } = await import("./openai-RDHZFJUT.js");
       return new OpenAIClient2(config, systemPrompt);
     }
     case "openai-compat": {
-      const { OpenAICompatClient: OpenAICompatClient2 } = await import("./openai-HXRMPNB7.js");
+      const { OpenAICompatClient: OpenAICompatClient2 } = await import("./openai-RDHZFJUT.js");
       return new OpenAICompatClient2(config, systemPrompt);
     }
     default:
@@ -2595,7 +2609,7 @@ var PackageJsonSchema = z5.object({
 });
 function resolveVersion() {
   if (true) {
-    return "0.0.22";
+    return "0.0.23";
   }
   const here = path.dirname(fileURLToPath(import.meta.url));
   for (const levels of ["..", "../.."]) {
@@ -2631,7 +2645,8 @@ function asDict(obj) {
 var MCP_IMAGE_MEDIA_TYPES = /* @__PURE__ */ new Set(["image/png", "image/jpeg", "image/gif", "image/webp"]);
 async function mcpContentToToolOutput(content) {
   const textParts = [];
-  const imageBlocks = [];
+  const contentBlocks = [];
+  let hasImage = false;
   for (const raw of content) {
     const c = isRecord(raw) ? raw : {};
     if (c.type === "image" && typeof c.data === "string" && typeof c.mimeType === "string" && MCP_IMAGE_MEDIA_TYPES.has(c.mimeType)) {
@@ -2640,7 +2655,7 @@ async function mcpContentToToolOutput(content) {
           Buffer.from(c.data, "base64"),
           asImageMediaType(c.mimeType)
         );
-        imageBlocks.push({
+        contentBlocks.push({
           type: "image",
           source: {
             type: "base64",
@@ -2648,20 +2663,31 @@ async function mcpContentToToolOutput(content) {
             data: resized.data
           }
         });
+        textParts.push(`[Image: ${resized.mediaType}]`);
+        hasImage = true;
         continue;
       } catch (err) {
         log11.warn({ err }, "mcp image dropped (too large to fit the API limit)");
-        textParts.push("[note: an image returned by the tool was too large and was dropped]");
+        const note = "[note: an image returned by the tool was too large and was dropped]";
+        textParts.push(note);
+        contentBlocks.push({ type: "text", text: note });
         continue;
       }
     }
-    textParts.push(c.type === "text" && typeof c.text === "string" ? c.text : JSON.stringify(raw));
-  }
-  const text = textParts.join("\n");
-  if (imageBlocks.length === 0) {
-    return text;
+    if (c.type === "image") {
+      const mimeType = typeof c.mimeType === "string" ? c.mimeType : "unknown";
+      const note = `[Unsupported image: ${mimeType}]`;
+      textParts.push(note);
+      contentBlocks.push({ type: "text", text: note });
+      continue;
+    }
+    const serialized = JSON.stringify(raw);
+    const text = c.type === "text" && typeof c.text === "string" ? c.text : typeof serialized === "string" ? serialized : String(raw);
+    textParts.push(text);
+    contentBlocks.push({ type: "text", text });
   }
-  return [...text ? [{ type: "text", text }] : [], ...imageBlocks];
+  const output = textParts.join("\n");
+  return hasImage ? { output, contentBlocks } : { output };
 }
 var MCPClient = class {
   name;
@@ -2726,22 +2752,14 @@ var MCPClient = class {
       })
     );
   }
-  /** 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. */
+  /** Calls a tool and preserves both its text fallback and provider-native rich content. */
   async callTool(name, args) {
     if (!this.client) {
       throw new Error("Not connected");
     }
     const result = await this.client.callTool({ name, arguments: args });
-    let output;
-    if (result.content && Array.isArray(result.content)) {
-      output = await mcpContentToToolOutput(result.content);
-    } else {
-      output = JSON.stringify(result);
-    }
-    return { output, isError: result.isError === true };
+    const converted = result.content && Array.isArray(result.content) ? await mcpContentToToolOutput(result.content) : { output: JSON.stringify(result) };
+    return { ...converted, isError: result.isError === true };
   }
   async disconnect() {
     try {
@@ -2949,36 +2967,6 @@ Usage Notes
 - Use this instead of grep or rg commands via Bash.
 `;
 
-// src/tools/types.ts
-var SKIP_DIRS = /* @__PURE__ */ new Set([
-  ".claude",
-  // Claude Code
-  ".git",
-  // Git
-  ".swifty",
-  // Swifty
-  ".next",
-  // Next.js
-  ".venv",
-  // Python venv
-  ".mypy_cache",
-  // Python mypy
-  ".tox",
-  // Python tox
-  "__pycache__",
-  // Python
-  "build",
-  // C++
-  "dist",
-  // Webpack, Vite
-  "node_modules",
-  // Node.js
-  "vendor",
-  // Go
-  "venv"
-  // Python venv
-]);
-
 // src/tools/bash.ts
 var MAX_TIMEOUT = 600;
 var KILL_GRACE_MS = 3e3;
@@ -3691,7 +3679,11 @@ var ReadFileTool = class {
           data: attachment.data
         }
       };
-      return { output: [imageBlock], isError: false };
+      return {
+        output: `[Image: ${attachment.mediaType}]`,
+        contentBlocks: [imageBlock],
+        isError: false
+      };
     } catch (err) {
       log14.error({ err }, "image read failed");
       return {
@@ -4494,6 +4486,7 @@ function extractWrittenPaths(messages) {
 import { readdirSync as readdirSync4, readFileSync as readFileSync13, existsSync as existsSync11, mkdirSync as mkdirSync8, writeFileSync as writeFileSync8 } from "fs";
 import { homedir as homedir4 } from "os";
 import { join as join12, basename as basename4 } from "path";
+import yaml3 from "js-yaml";
 
 // src/memory/manager.ts
 import {
@@ -4575,38 +4568,63 @@ Respond with valid JSON only, no markdown, in this exact shape: {"selected_memor
 var MemoryManager = class {
   userDir;
   projectDir;
+  malformedFingerprints = /* @__PURE__ */ new Map();
   constructor(workDir) {
     this.userDir = join11(homedir3(), ".swifty", "memory");
     this.projectDir = join11(workDir, ".swifty", "memory");
   }
-  loadAll() {
+  readMemory(fullPath) {
+    let fingerprint = "unknown";
+    try {
+      const stat3 = statSync8(fullPath);
+      fingerprint = `${String(stat3.mtimeMs)}:${String(stat3.size)}`;
+      const parsed = parseFrontmatter(readFileSync12(fullPath, "utf-8"));
+      this.malformedFingerprints.delete(fullPath);
+      return {
+        memory: {
+          path: fullPath,
+          name: parsed.name ?? basename3(fullPath, ".md"),
+          description: parsed.description ?? "",
+          type: parsed.type ?? "reference",
+          content: parsed.body
+        },
+        mtimeMs: stat3.mtimeMs
+      };
+    } catch (err) {
+      if (this.malformedFingerprints.get(fullPath) !== fingerprint) {
+        this.malformedFingerprints.set(fullPath, fingerprint);
+        log19.error({ err, path: fullPath }, "memory operation failed");
+      }
+      return null;
+    }
+  }
+  scanAllMemories() {
     const memories = [];
     for (const dir of [this.userDir, this.projectDir]) {
       if (!existsSync10(dir)) {
         continue;
       }
-      const files = readdirSync3(dir).filter((f) => f.endsWith(".md") && f !== MEMORY_INDEX_NAME);
+      let files;
+      try {
+        files = readdirSync3(dir).filter(
+          (file) => file.endsWith(".md") && file !== MEMORY_INDEX_NAME
+        );
+      } catch (err) {
+        log19.error({ err, path: dir }, "memory operation failed");
+        continue;
+      }
       for (const file of files) {
-        const fullPath = join11(dir, file);
-        try {
-          const raw = readFileSync12(fullPath, "utf-8");
-          const parsed = parseFrontmatter(raw);
-          if (parsed) {
-            memories.push({
-              path: fullPath,
-              name: parsed.name ?? file.replace(".md", ""),
-              description: parsed.description ?? "",
-              type: parsed.type ?? "reference",
-              content: parsed.body
-            });
-          }
-        } catch (err) {
-          log19.error({ err }, "memory operation failed");
-          continue;
+        const loaded = this.readMemory(join11(dir, file));
+        if (loaded) {
+          memories.push(loaded.memory);
         }
       }
     }
-    this.rebuildIndex();
+    return memories;
+  }
+  loadAll() {
+    const memories = this.scanAllMemories();
+    this.writeIndex(memories);
     return memories;
   }
   getMemories() {
@@ -4676,47 +4694,29 @@ ${body}
    * alphabetically by name, truncated at MAX_ENTRYPOINT_LINES / MAX_ENTRYPOINT_BYTES.
    */
   rebuildIndex() {
-    const entries = [];
-    for (const dir of [this.userDir, this.projectDir]) {
-      if (!existsSync10(dir)) {
-        continue;
-      }
-      const files = readdirSync3(dir).filter((f) => f.endsWith(".md") && f !== MEMORY_INDEX_NAME);
+    this.writeIndex(this.scanAllMemories());
+  }
+  writeIndex(memories) {
+    const entries = memories.map((memory) => ({
+      name: memory.name,
+      relPath: relative2(this.projectDir, memory.path) || basename3(memory.path),
+      description: memory.description
+    })).toSorted((a, b) => a.name.localeCompare(b.name, void 0, { sensitivity: "base" }));
+    const lines = entries.map(
+      (entry) => entry.description ? `- [${entry.name}](${entry.relPath}) \u2014 ${entry.description}` : `- [${entry.name}](${entry.relPath})`
+    );
+    const content = capEntrypoint(lines.slice(0, MAX_ENTRYPOINT_LINES2).join("\n")) + "\n";
+    const indexPath = join11(this.projectDir, MEMORY_INDEX_NAME);
+    mkdirSync7(this.projectDir, { recursive: true });
+    if (existsSync10(indexPath)) {
       try {
-        for (const file of files) {
-          const fullPath = join11(dir, file);
-          try {
-            const raw = readFileSync12(fullPath, "utf-8");
-            const parsed = parseFrontmatter(raw);
-            if (!parsed) {
-              continue;
-            }
-            const name = parsed.name ?? file.replace(".md", "");
-            const description = parsed.description ?? "";
-            const relativePath = relative2(this.projectDir, fullPath) || file;
-            entries.push({ name, relPath: relativePath, description });
-          } catch (err) {
-            log19.error({ err }, "memory operation failed");
-            continue;
-          }
+        if (readFileSync12(indexPath, "utf-8") === content) {
+          return;
         }
-      } catch (err2) {
-        log19.error({ err: err2 }, "memory operation failed");
-        continue;
-      }
-    }
-    entries.sort((a, b) => a.name.localeCompare(b.name, void 0, { sensitivity: "base" }));
-    const lines = [];
-    for (const e of entries) {
-      if (e.description) {
-        lines.push(`- [${e.name}](${e.relPath}) \u2014 ${e.description}`);
-      } else {
-        lines.push(`- [${e.name}](${e.relPath})`);
+      } catch {
       }
     }
-    const content = capEntrypoint(lines.slice(0, MAX_ENTRYPOINT_LINES2).join("\n"));
-    mkdirSync7(this.projectDir, { recursive: true });
-    writeFileSync7(join11(this.projectDir, MEMORY_INDEX_NAME), content + "\n", "utf-8");
+    writeFileSync7(indexPath, content, "utf-8");
   }
   // ── Feature 2: findRelevantMemories ────────────────────────────────
   /**
@@ -4730,7 +4730,7 @@ ${body}
       [this.userDir, "user"],
       [this.projectDir, "project"]
     ]) {
-      const headers = scanMemoryHeaders(dir, scope);
+      const headers = this.scanMemoryHeaders(dir, scope);
       allHeaders.push(...headers);
     }
     const candidates = allHeaders.filter((h) => !alreadySurfaced.has(h.filePath));
@@ -4789,6 +4789,35 @@ ${manifest}${toolsSection}`;
     }
     return selected;
   }
+  scanMemoryHeaders(dir, scope) {
+    if (!existsSync10(dir)) {
+      return [];
+    }
+    let files;
+    try {
+      files = readdirSync3(dir).filter((file) => file.endsWith(".md") && file !== MEMORY_INDEX_NAME);
+    } catch (err) {
+      log19.error({ err, path: dir }, "memory operation failed");
+      return [];
+    }
+    const headers = [];
+    for (const file of files) {
+      const loaded = this.readMemory(join11(dir, file));
+      if (!loaded) {
+        continue;
+      }
+      headers.push({
+        filename: file,
+        filePath: loaded.memory.path,
+        scope,
+        mtimeMs: loaded.mtimeMs,
+        description: loaded.memory.description,
+        type: loaded.memory.type
+      });
+    }
+    headers.sort((a, b) => b.mtimeMs - a.mtimeMs);
+    return headers.slice(0, MAX_ENTRYPOINT_LINES2);
+  }
   renderReminder(memories) {
     if (memories.length === 0) {
       return "";
@@ -4815,49 +4844,6 @@ ${manifest}${toolsSection}`;
     return parts.join("\n");
   }
 };
-function scanMemoryHeaders(dir, scope) {
-  if (!existsSync10(dir)) {
-    return [];
-  }
-  let files;
-  try {
-    files = readdirSync3(dir).filter((f) => f.endsWith(".md") && f !== MEMORY_INDEX_NAME);
-  } catch (err) {
-    log19.error({ err }, "memory operation failed");
-    return [];
-  }
-  const headers = [];
-  for (const file of files) {
-    const fullPath = join11(dir, file);
-    try {
-      const stat3 = statSync8(fullPath);
-      if (!stat3.isFile()) {
-        continue;
-      }
-      const raw = readFileSync12(fullPath, "utf-8");
-      const parsed = parseFrontmatter(raw);
-      if (!parsed) {
-        continue;
-      }
-      headers.push({
-        filename: file,
-        filePath: fullPath,
-        scope,
-        mtimeMs: stat3.mtimeMs,
-        description: parsed.description ?? "",
-        type: parsed.type ?? ""
-      });
-    } catch (err) {
-      log19.error({ err }, "memory operation failed");
-      continue;
-    }
-  }
-  headers.sort((a, b) => b.mtimeMs - a.mtimeMs);
-  if (headers.length > MAX_ENTRYPOINT_LINES2) {
-    headers.length = MAX_ENTRYPOINT_LINES2;
-  }
-  return headers;
-}
 function formatMemoryManifest(memories) {
   if (memories.length === 0) {
     return "";
@@ -4903,27 +4889,22 @@ function parseFrontmatter(content) {
   if (!content.startsWith("---")) {
     return { body: content };
   }
-  const endIdx = content.indexOf("---", 3);
-  if (endIdx === -1) {
-    return { body: content };
-  }
-  const frontmatter = content.slice(3, endIdx).trim();
-  const body = content.slice(endIdx + 3).trim();
-  try {
-    const raw = yaml2.load(frontmatter);
-    const parsed = parse4(FrontmatterSchema, raw);
-    const topType = parsed.type;
-    const nestedType = parsed.metadata?.type;
-    return {
-      name: parsed.name,
-      description: parsed.description,
-      type: topType ?? nestedType,
-      body
-    };
-  } catch (err) {
-    log19.error({ err }, "memory operation failed");
-    return { body: content };
+  const match = /^---\r?\n([\s\S]*?)\r?\n---(?:\r?\n|$)/.exec(content);
+  if (!match) {
+    throw new Error("Memory frontmatter is missing its closing delimiter");
   }
+  const frontmatter = match[1];
+  const body = content.slice(match[0].length).trim();
+  const raw = yaml2.load(frontmatter);
+  const parsed = parse4(FrontmatterSchema, raw);
+  const topType = parsed.type;
+  const nestedType = parsed.metadata?.type;
+  return {
+    name: parsed.name,
+    description: parsed.description,
+    type: topType ?? nestedType,
+    body
+  };
 }
 
 // src/memory/extractor.ts
@@ -5046,10 +5027,10 @@ Check this list before writing \u2014 update an existing file rather than creati
       ``,
       "```markdown",
       `---`,
-      `name: {{short-kebab-case-slug}}`,
-      `description: {{one-line summary}}`,
+      `name: "{{short-kebab-case-slug}}"`,
+      `description: "{{one-line summary with YAML special characters escaped}}"`,
       `metadata:`,
-      `  type: {{user, feedback, project, reference}}`,
+      `  type: "{{user, feedback, project, reference}}"`,
       `---`,
       ``,
       `{{memory content}}`,
@@ -5211,16 +5192,15 @@ Check this list before writing \u2014 update an existing file rather than creati
   }
   /** Format a memory file: frontmatter (name/description/type) + body */
   formatMemoryFile(mem) {
-    return [
-      "---",
-      `name: ${mem.name}`,
-      `description: ${mem.description}`,
-      `type: ${mem.type}`,
-      "---",
-      "",
-      mem.body,
-      ""
-    ].join("\n");
+    const frontmatter = yaml3.dump(
+      { name: mem.name, description: mem.description, type: mem.type },
+      { forceQuotes: true, lineWidth: -1, noRefs: true, quotingType: '"' }
+    );
+    return `---
+${frontmatter}---
+
+${mem.body}
+`;
   }
 };
 
@@ -6666,7 +6646,7 @@ async function copyWorktreeIncludeFiles(repoRoot, worktreePath) {
 import { readdirSync as readdirSync5, readFileSync as readFileSync15, existsSync as existsSync13 } from "fs";
 import { homedir as homedir6 } from "os";
 import { join as join15 } from "path";
-import yaml3 from "js-yaml";
+import yaml4 from "js-yaml";
 import z7, { parse as parse5 } from "zod";
 
 // src/subagent/definition.ts
@@ -6766,7 +6746,7 @@ function parseAgentDefinition(content) {
   const frontmatter = content.slice(3, endIdx).trim();
   const body = content.slice(endIdx + 3).trim();
   try {
-    const raw = yaml3.load(frontmatter);
+    const raw = yaml4.load(frontmatter);
     const parsed = parse5(YamlFrontmatterSchema2, raw);
     return {
       name: parsed.name,
@@ -7905,7 +7885,7 @@ function serializeConversation(conversation) {
     if (msg.toolResults && msg.toolResults.length > 0) {
       entry.tool_results = msg.toolResults.map((tr) => ({
         tool_use_id: tr.toolUseId,
-        content: contentToText(tr.content),
+        content: tr.content,
         is_error: tr.isError || void 0
       }));
     }
@@ -8593,10 +8573,12 @@ var ToolSearchTool = class {
         return Promise.resolve({
           output: `Loaded ${String(mcpNames.length)} tool(s): ${mcpNames.join(", ")}. You can call them directly now.`,
           isError: false,
-          contentBlocks: mcpNames.map((name) => ({
-            type: "tool_reference",
-            tool_name: name
-          }))
+          contentBlocks: mcpNames.map(
+            (name) => ({
+              type: "tool_reference",
+              tool_name: name
+            })
+          )
         });
       }
       const schemas2 = tools2.map((t) => JSON.stringify(t.schema(), null, 2));
@@ -8816,7 +8798,7 @@ function emitStreamJson(event) {
         JSON.stringify({
           type: "tool_result",
           tool_name: event.toolName,
-          output: contentToText(event.output),
+          output: event.output,
           is_error: event.isError,
           elapsed: event.elapsed
         })
@@ -8914,7 +8896,7 @@ var AgentEventLogger = class {
         if (!ev.isError) {
           return;
         }
-        const output = contentToText(ev.output);
+        const output = ev.output;
         this.log.warn({
           event: "tool_result",
           tool: ev.toolName,
@@ -8954,7 +8936,7 @@ import z17 from "zod";
 import { readdirSync as readdirSync6, readFileSync as readFileSync21, existsSync as existsSync18, statSync as statSync11 } from "fs";
 import { homedir as homedir8 } from "os";
 import { join as join21 } from "path";
-import yaml4 from "js-yaml";
+import yaml5 from "js-yaml";
 import { parse as parse8, z as z13 } from "zod";
 var log30 = createChildLogger({ module: "skills" });
 var SkillCatalog = class {
@@ -9140,7 +9122,7 @@ function parseSkillFile(content) {
   const frontmatter = content.slice(3, endIdx).trim();
   const body = content.slice(endIdx + 3).trim();
   try {
-    const raw = yaml4.load(frontmatter);
+    const raw = yaml5.load(frontmatter);
     const data = parse8(YamlFrontmatterSchema3, raw);
     return {
       meta: {
@@ -10117,8 +10099,8 @@ async function createRemoteAgent(opts) {
       if (!client) {
         throw new Error("no llm client (provider not initialized)");
       }
-      const { PermissionChecker: PC } = await import("./checker-IIXJXQCB.js");
-      const { Agent: AgentClass } = await import("./agent-2AGRYN3R.js");
+      const { PermissionChecker: PC } = await import("./checker-6BW4222R.js");
+      const { Agent: AgentClass } = await import("./agent-GHXYOARN.js");
       const subConv = new ConversationManager();
       subConv.addUserMessage(prompt);
       const subAgent = new AgentClass({
@@ -10579,7 +10561,7 @@ var RemoteServer = class {
           data: {
             toolId: ev.toolId,
             toolName: ev.toolName,
-            output: contentToText(ev.output),
+            output: ev.output,
             isError: ev.isError,
             elapsed: ev.elapsed
           }
@@ -10983,7 +10965,8 @@ Explore the codebase and design your approach.`
           msg.toolResults.map((tr) => ({
             toolUseId: tr.toolUseId,
             content: tr.content,
-            isError: tr.isError ?? false
+            ...tr.contentBlocks?.length ? { contentBlocks: tr.contentBlocks } : {},
+            isError: tr.isError
           }))
         );
       } else if (msg.role === "user") {
@@ -11720,7 +11703,6 @@ export {
   ConfigError,
   ContextTooLongError,
   ConversationManager,
-  DANGEROUSLY_JSON,
   DEFAULT_EAGER_THRESHOLD_PERCENT,
   EDIT_FILE_DESCRIPTION,
   EditFileTool,
@@ -11744,6 +11726,7 @@ export {
   ListTeamsTool,
   LoadSkillTool,
   MAX_DIMENSION_PX,
+  MAX_HISTORY_ENTRIES,
   MAX_IMAGES_PER_MESSAGE,
   MAX_IMAGE_BYTES_PASSTHROUGH,
   MCPClient,
@@ -11791,6 +11774,7 @@ export {
   StreamingExecutor,
   SyntheticOutputTool,
   TEAMMATE_DISALLOWED_TOOLS,
+  TOOL_RESULT_PREVIEW_CHARS,
   TOOL_SEARCH_TOOL_NAME,
   TaskCreateTool2 as TaskCreateTool,
   TaskGetTool2 as TaskGetTool,
@@ -11912,6 +11896,7 @@ export {
   isSafeCommand,
   isShutdownRequest,
   isSpillReadback,
+  isToolResultContentBlock,
   listSessions,
   load,
   loadAgentDefinitions,
@@ -11939,6 +11924,7 @@ export {
   needsToolSearchBeta,
   newRequestId,
   newSessionId,
+  normalizeToolResultContentBlock,
   outputEfficiencySection,
   parse,
   parsePrintFlags,
@@ -11961,6 +11947,7 @@ export {
   recover,
   removeAgentWorktree,
   renderBody,
+  replaceToolResultContent,
   resetPlanPath,
   resolveAPIKey,
   resolveGitDir,
@@ -11991,6 +11978,7 @@ export {
   teamConfigPath,
   teamDir,
   teamsBaseDir,
+  toDisplayPreview,
   toTry,
   toneStyleSection,
   toolResultsToRecords,