@hydra-acp/cli 0.1.62 → 0.1.63

package/dist/cli.js

@@ -86,6 +86,12 @@ var init_paths = __esm({
       sessionDir: (id) => path.join(hydraHome(), "sessions", id),
       sessionFile: (id) => path.join(hydraHome(), "sessions", id, "meta.json"),
       historyFile: (id) => path.join(hydraHome(), "sessions", id, "history.jsonl"),
+      // Content-addressed store for heavy tool payload (diff bodies, stdout)
+      // externalized out of history.jsonl. One file per unique blob, named by
+      // its sha256, so repeated identical content (e.g. an agent re-emitting
+      // the same full-file diff on every status tick) dedupes to one file.
+      toolsDir: (id) => path.join(hydraHome(), "sessions", id, "tools"),
+      toolBlobFile: (id, hash) => path.join(hydraHome(), "sessions", id, "tools", hash),
       // Persisted prompt queue for a session. ndjson, one record per
       // entry. Survives daemon restarts so queued prompts get a chance to
       // run rather than being silently lost. Entries are removed BEFORE
@@ -499,6 +505,29 @@ var init_config = __esm({
       // suppress them — the TUI hotkey ^T toggles this at runtime without
       // persisting back to config.
       showThoughts: z.boolean().default(true),
+      // How the terminal renders East-Asian "Ambiguous" width glyphs (em-dash
+      // —, smart quotes “ ”, ellipsis …, middle-dot ·). Most modern terminals
+      // draw them 1 col wide ("narrow"); CJK-locale / legacy setups draw them 2
+      // cols wide ("wide"). Defaults to "wide": counting ambiguous glyphs as 2
+      // cols never overflows the right margin (the worst case is wrapping a
+      // column early on narrow terminals, which is benign), whereas "narrow"
+      // bleeds past the margin on wide terminals. The thought gutter uses an
+      // ASCII marker, so this no longer affects marker alignment either way.
+      ambiguousWidth: z.enum(["narrow", "wide"]).default("wide"),
+      // How the TUI receives tool payload on attach/replay.
+      //   "references" — the lean path (default): the daemon ships blob refs and
+      //                  the TUI fetches a diff/output body on demand when
+      //                  expanded, cutting replay size on tool-heavy sessions.
+      //                  Collapsed rows never fetch (they show a size hint), and
+      //                  old inline sessions/live turns are unaffected (no refs).
+      //   "inline"     — full content up front (the pre-externalization shape).
+      toolContent: z.enum(["inline", "references"]).default("references"),
+      // Unchanged context lines shown around each change in an expanded Edited
+      // diff. Some agents (e.g. pi) report edits as full-file old/new text via
+      // ACP "diff" content blocks; without hunking a 1-line edit would render
+      // the entire file. This bounds the context so only the changed region (±N
+      // lines) shows, with runs of unchanged lines collapsed to a marker.
+      diffContextLines: z.number().int().min(0).default(3),
       // Cap on entries kept in the cross-session global prompt-history file
       // (~/.hydra-acp/prompt-history). This is the ^P / ^R recall list
       // shared across all sessions; it's append-only on disk, so long-lived
@@ -614,6 +643,12 @@ var init_config = __esm({
       // a literal string ("~", "~/dev", "$HOME/work") so the config file is
       // portable across machines; expanded via expandHome at use time.
       defaultCwd: z.string().default("~"),
+      // Gzip externalized tool-content blobs at rest (tools/<sha256>.gz).
+      // Default true — text diffs/output compress ~3.5x and decompression is
+      // lazy (only on diff expand in references mode). Set false to write plain
+      // blobs instead, as an escape hatch if gzip CPU is ever a problem; reads
+      // transparently handle both, so flipping it only affects new writes.
+      compressToolContent: z.boolean().default(true),
       // Cap on cold sessions shown in CLI `sessions` listing and the TUI
       // picker. Live sessions are always included; cold are sorted by
       // recency and truncated to this count. `--all` overrides in the CLI.
@@ -635,6 +670,9 @@ var init_config = __esm({
         progressIndicator: true,
         defaultEnterAction: "amend",
         showThoughts: true,
+        ambiguousWidth: "wide",
+        toolContent: "references",
+        diffContextLines: 3,
         promptHistoryMaxEntries: 2e3,
         maxToolItems: 5,
         maxPlanItems: 5,
@@ -850,7 +888,7 @@ async function promptPassword(prompt) {
   if (!process.stdin.isTTY) {
     return readLineFromStdin();
   }
-  return new Promise((resolve8, reject) => {
+  return new Promise((resolve9, reject) => {
     const stdin = process.stdin;
     const wasRaw = stdin.isRaw === true;
     let buffer = "";
@@ -867,7 +905,7 @@ async function promptPassword(prompt) {
         if (byte === 10 || byte === 13) {
           process.stdout.write("\n");
           cleanup();
-          resolve8(buffer);
+          resolve9(buffer);
           return;
         }
         if (byte === 3) {
@@ -893,7 +931,7 @@ async function promptPassword(prompt) {
   });
 }
 function readLineFromStdin() {
-  return new Promise((resolve8, reject) => {
+  return new Promise((resolve9, reject) => {
     let buffer = "";
     process.stdin.setEncoding("utf8");
     const onData = (chunk) => {
@@ -902,7 +940,7 @@ function readLineFromStdin() {
       if (nl !== -1) {
         process.stdin.removeListener("data", onData);
         process.stdin.removeListener("error", onError);
-        resolve8(buffer.slice(0, nl).replace(/\r$/, ""));
+        resolve9(buffer.slice(0, nl).replace(/\r$/, ""));
       }
     };
     const onError = (err) => {
@@ -1102,6 +1140,9 @@ function extractHydraMeta(meta) {
   if (typeof obj.dripSpeed === "number" && obj.dripSpeed > 0) {
     out.dripSpeed = obj.dripSpeed;
   }
+  if (obj.toolContent === "inline" || obj.toolContent === "references") {
+    out.toolContent = obj.toolContent;
+  }
   if (obj.detachStatus === "detached") {
     out.detachStatus = obj.detachStatus;
   }
@@ -1736,9 +1777,9 @@ var init_connection = __esm({
         }
         const id = nanoid();
         const message = { jsonrpc: "2.0", id, method, params };
-        const response = new Promise((resolve8, reject) => {
+        const response = new Promise((resolve9, reject) => {
           this.pending.set(id, {
-            resolve: (result) => resolve8(result),
+            resolve: (result) => resolve9(result),
             reject
           });
           this.stream.send(message).catch((err) => {
@@ -2069,14 +2110,14 @@ var init_stream_buffer = __esm({
         if (cap === 0) {
           return Promise.resolve("timeout");
         }
-        return new Promise((resolve8) => {
+        return new Promise((resolve9) => {
           const waiter = {
             resolve: (outcome) => {
               if (waiter.timer !== void 0) {
                 clearTimeout(waiter.timer);
                 waiter.timer = void 0;
               }
-              resolve8(outcome);
+              resolve9(outcome);
             },
             timer: setTimeout(() => {
               const idx = this.waiters.indexOf(waiter);
@@ -2084,7 +2125,7 @@ var init_stream_buffer = __esm({
                 this.waiters.splice(idx, 1);
               }
               waiter.timer = void 0;
-              resolve8("timeout");
+              resolve9("timeout");
             }, cap)
           };
           this.waiters.push(waiter);
@@ -2287,8 +2328,8 @@ var init_stream_buffer = __esm({
         return out;
       }
       scheduleFileWrite(chunk) {
-        const path21 = this.filePath;
-        if (path21 === void 0) {
+        const path22 = this.filePath;
+        if (path22 === void 0) {
           return;
         }
         if (this.fileCapReached) {
@@ -2303,7 +2344,7 @@ var init_stream_buffer = __esm({
         const slice = chunk.length <= remaining ? chunk : chunk.subarray(0, remaining);
         this.fileBytesWritten += slice.length;
         const willHitCap = this.fileBytesWritten >= this.fileCapBytes;
-        this.fileWriteChain = this.fileWriteChain.then(() => fsp3.appendFile(path21, slice)).catch((err) => {
+        this.fileWriteChain = this.fileWriteChain.then(() => fsp3.appendFile(path22, slice)).catch((err) => {
           this.logWriteError?.(err);
         });
         if (willHitCap && !this.fileCapReached) {
@@ -2353,6 +2394,35 @@ var init_hydra_commands = __esm({
   }
 });
 
+// src/core/model-resolve.ts
+function trailingSegment(modelId) {
+  const slash = modelId.lastIndexOf("/");
+  const tail = slash === -1 ? modelId : modelId.slice(slash + 1);
+  return tail.toLowerCase();
+}
+function resolveModelId(requested, advertised) {
+  if (advertised.length === 0) {
+    return { kind: "none", requested };
+  }
+  if (advertised.some((m) => m.modelId === requested)) {
+    return { kind: "exact", modelId: requested };
+  }
+  const wantKey = trailingSegment(requested);
+  const candidates = advertised.map((m) => m.modelId).filter((id) => trailingSegment(id) === wantKey);
+  if (candidates.length === 1) {
+    return { kind: "resolved", modelId: candidates[0], requested };
+  }
+  if (candidates.length > 1) {
+    return { kind: "ambiguous", requested, candidates };
+  }
+  return { kind: "unknown", requested };
+}
+var init_model_resolve = __esm({
+  "src/core/model-resolve.ts"() {
+    "use strict";
+  }
+});
+
 // src/core/coalesce-replay.ts
 function coalesceReplay(entries) {
   if (entries.length === 0) {
@@ -2360,6 +2430,7 @@ function coalesceReplay(entries) {
   }
   const lastToolUpdateIndex = /* @__PURE__ */ new Map();
   const mergedToolContent = /* @__PURE__ */ new Map();
+  const carriedRawInput = /* @__PURE__ */ new Map();
   for (let i = 0; i < entries.length; i++) {
     const entry = entries[i];
     if (entry === void 0) {
@@ -2374,6 +2445,9 @@ function coalesceReplay(entries) {
       continue;
     }
     lastToolUpdateIndex.set(id, i);
+    if (upd.rawInput && typeof upd.rawInput === "object" && !Array.isArray(upd.rawInput) && Object.keys(upd.rawInput).length > 0) {
+      carriedRawInput.set(id, upd.rawInput);
+    }
     if (Array.isArray(upd.content) && upd.content.length > 0) {
       const buf = mergedToolContent.get(id);
       if (buf) {
@@ -2413,11 +2487,11 @@ function coalesceReplay(entries) {
       if (id !== void 0 && lastToolUpdateIndex.get(id) !== i) {
         continue;
       }
-      if (id !== void 0 && mergedToolContent.has(id)) {
-        out.push(withReplacedContent(entry, mergedToolContent.get(id) ?? []));
-      } else {
-        out.push(entry);
+      let emitted = id !== void 0 && mergedToolContent.has(id) ? withReplacedContent(entry, mergedToolContent.get(id) ?? []) : entry;
+      if (id !== void 0 && carriedRawInput.has(id) && !hasRawInput(emitted)) {
+        emitted = withRawInput(emitted, carriedRawInput.get(id));
       }
+      out.push(emitted);
       continue;
     }
     if (kind === "plan") {
@@ -2488,6 +2562,22 @@ function withReplacedContent(entry, content) {
     }
   };
 }
+function hasRawInput(entry) {
+  const update = readUpdate(entry);
+  const ri = update?.rawInput;
+  return !!ri && typeof ri === "object" && !Array.isArray(ri) && Object.keys(ri).length > 0;
+}
+function withRawInput(entry, rawInput) {
+  const params = entry.params ?? {};
+  const update = params.update ?? {};
+  return {
+    ...entry,
+    params: {
+      ...params,
+      update: { ...update, rawInput }
+    }
+  };
+}
 var init_coalesce_replay = __esm({
   "src/core/coalesce-replay.ts"() {
     "use strict";
@@ -2495,22 +2585,22 @@ var init_coalesce_replay = __esm({
 });
 
 // src/core/queue-store.ts
-import * as fs8 from "fs/promises";
+import * as fs9 from "fs/promises";
 async function rewriteQueue(sessionId, entries) {
   const file = paths.queueFile(sessionId);
   if (entries.length === 0) {
-    await fs8.unlink(file).catch(() => void 0);
+    await fs9.unlink(file).catch(() => void 0);
     return;
   }
-  await fs8.mkdir(paths.sessionDir(sessionId), { recursive: true });
+  await fs9.mkdir(paths.sessionDir(sessionId), { recursive: true });
   const body = entries.map((e) => JSON.stringify(e)).join("\n") + "\n";
-  await fs8.writeFile(file, body, "utf8");
+  await fs9.writeFile(file, body, "utf8");
 }
 async function loadQueue(sessionId) {
   const file = paths.queueFile(sessionId);
   let text;
   try {
-    text = await fs8.readFile(file, "utf8");
+    text = await fs9.readFile(file, "utf8");
   } catch (err) {
     if (err.code === "ENOENT") {
       return [];
@@ -2532,7 +2622,7 @@ async function loadQueue(sessionId) {
 }
 async function deleteQueue(sessionId) {
   const file = paths.queueFile(sessionId);
-  await fs8.unlink(file).catch(() => void 0);
+  await fs9.unlink(file).catch(() => void 0);
 }
 var init_queue_store = __esm({
   "src/core/queue-store.ts"() {
@@ -2840,6 +2930,7 @@ var init_session = __esm({
     "use strict";
     init_stream_buffer();
     init_hydra_commands();
+    init_model_resolve();
     init_coalesce_replay();
     init_queue_store();
     init_types();
@@ -3236,7 +3327,7 @@ var init_session = __esm({
             const claimIdx = i;
             const claimEnvelope = envelope;
             const claimOriginatedBy = new Set(originatedBy);
-            await new Promise((resolve8) => {
+            await new Promise((resolve9) => {
               const timer = setTimeout(() => {
                 if (this.pendingClaims.delete(token)) {
                   this.broadcastQueueNotification(
@@ -3247,14 +3338,14 @@ var init_session = __esm({
                     claimEnvelope,
                     /* @__PURE__ */ new Set([...claimOriginatedBy, t.name]),
                     claimIdx + 1
-                  ).then(resolve8);
+                  ).then(resolve9);
                 }
               }, TRANSFORMER_CLAIM_TIMEOUT_MS);
               if (typeof timer.unref === "function") {
                 timer.unref();
               }
               this.pendingClaims.set(token, {
-                resolve: () => resolve8(),
+                resolve: () => resolve9(),
                 timer,
                 transformerName: t.name,
                 method: "session/update",
@@ -3348,11 +3439,11 @@ var init_session = __esm({
       // Read the persisted history from disk. Returns [] if no history
       // file exists (fresh session, never prompted). Used by attach() and
       // the HTTP /history endpoint.
-      async getHistorySnapshot() {
+      async getHistorySnapshot(tools = "inline") {
         if (!this.historyStore) {
           return [];
         }
-        return this.historyStore.load(this.sessionId).catch(() => []);
+        return this.historyStore.load(this.sessionId, { tools }).catch(() => []);
       }
       // Subscribe to recordable broadcast entries — fires once per entry
       // that lands in history (so snapshot-shaped session_info/model/mode/
@@ -3402,7 +3493,7 @@ var init_session = __esm({
       }
       async loadReplay(historyPolicy, opts) {
         const maybeCoalesce = (entries) => opts.raw ? entries : coalesceReplay(entries);
-        const raw = await this.getHistorySnapshot();
+        const raw = await this.getHistorySnapshot(opts.toolContent ?? "inline");
         const state = this.buildStateSnapshotReplay();
         if (historyPolicy === "after_message") {
           const cutoff = opts.afterMessageId ? findMessageIdIndex(raw, opts.afterMessageId) : -1;
@@ -4132,7 +4223,7 @@ var init_session = __esm({
             const claimIdx = i;
             const claimEnvelope = envelope;
             const claimOriginatedBy = new Set(originatedBy);
-            return new Promise((resolve8) => {
+            return new Promise((resolve9) => {
               const timer = setTimeout(() => {
                 if (this.pendingClaims.delete(token)) {
                   this.broadcastQueueNotification(
@@ -4144,14 +4235,14 @@ var init_session = __esm({
                     claimEnvelope,
                     /* @__PURE__ */ new Set([...claimOriginatedBy, t.name]),
                     claimIdx + 1
-                  ).then(resolve8).catch(() => resolve8(defaultStopPayload(method)));
+                  ).then(resolve9).catch(() => resolve9(defaultStopPayload(method)));
                 }
               }, TRANSFORMER_CLAIM_TIMEOUT_MS);
               if (typeof timer.unref === "function") {
                 timer.unref();
               }
               this.pendingClaims.set(token, {
-                resolve: resolve8,
+                resolve: resolve9,
                 timer,
                 transformerName: t.name,
                 method,
@@ -5071,6 +5162,27 @@ ${text}
               sessionUpdate: "agent_message_chunk",
               content: { type: "text", text: `
 ${body}
+` },
+              _meta: { "hydra-acp": { synthetic: true } }
+            }
+          });
+          return { stopReason: "end_turn" };
+        }
+        const resolution = resolveModelId(arg, this.agentAdvertisedModels);
+        let modelId = arg;
+        if (resolution.kind === "resolved") {
+          modelId = resolution.modelId;
+        } else if (resolution.kind === "ambiguous" || resolution.kind === "unknown") {
+          const known = this.agentAdvertisedModels.map((m) => m.modelId).join("\n  ");
+          const reason = resolution.kind === "ambiguous" ? `"${arg}" matches multiple models: ${resolution.candidates.join(", ")}` : `"${arg}" is not an available model`;
+          this.recordAndBroadcast("session/update", {
+            sessionId: this.upstreamSessionId,
+            update: {
+              sessionUpdate: "agent_message_chunk",
+              content: { type: "text", text: `
+${reason}.
+Available models:
+  ${known}
 ` },
               _meta: { "hydra-acp": { synthetic: true } }
             }
@@ -5079,7 +5191,7 @@ ${body}
         }
         await this.forwardRequest("session/set_model", {
           sessionId: this.sessionId,
-          modelId: arg
+          modelId
         });
         return { stopReason: "end_turn" };
       }
@@ -5625,12 +5737,12 @@ ${body}
         this.clients.clear();
         if (this.streamBuffer !== void 0) {
           const buf = this.streamBuffer;
-          const path21 = this.streamFilePath;
+          const path22 = this.streamFilePath;
           this.streamBuffer = void 0;
           this.streamFilePath = void 0;
           buf.close();
-          if (path21 !== void 0) {
-            void buf.drainFileWrites().then(() => fsp4.unlink(path21).catch(() => void 0));
+          if (path22 !== void 0) {
+            void buf.drainFileWrites().then(() => fsp4.unlink(path22).catch(() => void 0));
           }
         }
         for (const handler of this.closeHandlers) {
@@ -5792,7 +5904,7 @@ ${body}
         }
         const clientParams = this.rewriteForClient(params);
         const toolCallId = extractToolCallId(clientParams);
-        return new Promise((resolve8, reject) => {
+        return new Promise((resolve9, reject) => {
           let settled = false;
           const outbound = [];
           const entry = { addClient: sendTo };
@@ -5831,7 +5943,7 @@ ${body}
                     update
                   }).catch(() => void 0);
                 }
-                resolve8(result);
+                resolve9(result);
               });
             }).catch((err) => {
               settle(() => reject(err));
@@ -5847,14 +5959,14 @@ ${body}
       // in flight, but doesn't emit prompt_queue_* broadcasts — clients
       // shouldn't see hydra's housekeeping in their chip list.
       async enqueuePrompt(task) {
-        return new Promise((resolve8, reject) => {
+        return new Promise((resolve9, reject) => {
           const entry = {
             kind: "internal",
             messageId: generateMessageId(),
             enqueuedAt: Date.now(),
             cancelled: false,
             task,
-            resolve: resolve8,
+            resolve: resolve9,
             reject
           };
           this.promptQueue.push(entry);
@@ -5873,7 +5985,7 @@ ${body}
         if (client.clientInfo?.name) originator.name = client.clientInfo.name;
         if (client.clientInfo?.version)
           originator.version = client.clientInfo.version;
-        return new Promise((resolve8, reject) => {
+        return new Promise((resolve9, reject) => {
           const entry = {
             kind: "user",
             messageId,
@@ -5882,7 +5994,7 @@ ${body}
             prompt: promptArray,
             enqueuedAt: Date.now(),
             cancelled: false,
-            resolve: resolve8,
+            resolve: resolve9,
             reject
           };
           this.promptQueue.push(entry);
@@ -6062,14 +6174,14 @@ ${body}
 // src/core/hydra-version.ts
 import { fileURLToPath } from "url";
 import * as path8 from "path";
-import * as fs11 from "fs";
+import * as fs12 from "fs";
 function resolveVersion() {
   try {
     let dir = path8.dirname(fileURLToPath(import.meta.url));
     for (let i = 0; i < 8; i += 1) {
       const candidate = path8.join(dir, "package.json");
-      if (fs11.existsSync(candidate)) {
-        const pkg = JSON.parse(fs11.readFileSync(candidate, "utf8"));
+      if (fs12.existsSync(candidate)) {
+        const pkg = JSON.parse(fs12.readFileSync(candidate, "utf8"));
         if (typeof pkg.version === "string" && pkg.version.length > 0 && (typeof pkg.name !== "string" || pkg.name.includes("hydra-acp"))) {
           return pkg.version;
         }
@@ -6094,12 +6206,12 @@ var init_hydra_version = __esm({
 });
 
 // src/tui/history.ts
-import { promises as fs14 } from "fs";
+import { promises as fs15 } from "fs";
 import * as path9 from "path";
 async function loadHistory(file) {
   let text;
   try {
-    text = await fs14.readFile(file, "utf8");
+    text = await fs15.readFile(file, "utf8");
   } catch (err) {
     if (err.code === "ENOENT") {
       return [];
@@ -6139,17 +6251,17 @@ function appendEntry(history, entry, cap = HISTORY_CAP) {
   return out;
 }
 async function saveHistory(file, history) {
-  await fs14.mkdir(path9.dirname(file), { recursive: true });
+  await fs15.mkdir(path9.dirname(file), { recursive: true });
   const lines = history.map((entry) => JSON.stringify(entry));
-  await fs14.writeFile(file, lines.length > 0 ? lines.join("\n") + "\n" : "");
+  await fs15.writeFile(file, lines.length > 0 ? lines.join("\n") + "\n" : "");
 }
 async function appendHistoryLine(file, entry) {
   const trimmed = entry.replace(/\n+$/, "");
   if (trimmed.length === 0) {
     return;
   }
-  await fs14.mkdir(path9.dirname(file), { recursive: true });
-  await fs14.appendFile(file, JSON.stringify(trimmed) + "\n", {
+  await fs15.mkdir(path9.dirname(file), { recursive: true });
+  await fs15.appendFile(file, JSON.stringify(trimmed) + "\n", {
     encoding: "utf8"
   });
 }
@@ -6422,6 +6534,23 @@ function isExitPlanModeTool(name) {
   const normalised = name.toLowerCase().replace(/[_\s-]/g, "");
   return normalised === "exitplanmode";
 }
+function readDiffField(value) {
+  if (typeof value === "string") {
+    return { text: value };
+  }
+  if (value && typeof value === "object" && !Array.isArray(value)) {
+    const v = value;
+    if (typeof v.__hydraBlob === "string") {
+      return {
+        ref: {
+          hash: v.__hydraBlob,
+          bytes: typeof v.bytes === "number" ? v.bytes : 0
+        }
+      };
+    }
+  }
+  return void 0;
+}
 function extractEditDiff(u) {
   const content = u.content;
   if (Array.isArray(content)) {
@@ -6433,16 +6562,18 @@ function extractEditDiff(u) {
       if (b.type !== "diff") {
         continue;
       }
-      const oldText = typeof b.oldText === "string" ? b.oldText : void 0;
-      const newText = typeof b.newText === "string" ? b.newText : void 0;
-      if (oldText === void 0 && newText === void 0) {
+      const oldField = readDiffField(b.oldText);
+      const newField = readDiffField(b.newText);
+      if (oldField === void 0 && newField === void 0) {
         continue;
       }
-      const path21 = typeof b.path === "string" ? b.path : void 0;
+      const path22 = typeof b.path === "string" ? b.path : void 0;
       return {
-        ...path21 !== void 0 ? { path: path21 } : {},
-        oldText: oldText ?? "",
-        newText: newText ?? ""
+        ...path22 !== void 0 ? { path: path22 } : {},
+        oldText: oldField?.text ?? "",
+        newText: newField?.text ?? "",
+        ...oldField?.ref ? { oldRef: oldField.ref } : {},
+        ...newField?.ref ? { newRef: newField.ref } : {}
       };
     }
   }
@@ -6510,8 +6641,35 @@ function mapToolCall(u) {
   if (diff !== null) {
     event.editDiff = diff;
   }
+  const detail = extractToolDetail(u);
+  if (detail !== void 0) {
+    event.detail = detail;
+  }
   return event;
 }
+function extractToolDetail(u) {
+  const rawInput = u.rawInput;
+  if (!rawInput || typeof rawInput !== "object" || Array.isArray(rawInput)) {
+    return void 0;
+  }
+  const r = rawInput;
+  if (typeof r.command === "string" && r.command.trim().length > 0) {
+    const firstLine3 = sanitizeSingleLine(r.command).trim();
+    const cmd = firstLine3.replace(/^cd\s+\S+\s+&&\s+/, "");
+    return clipHead(cmd, TOOL_DETAIL_MAX);
+  }
+  const path22 = typeof r.file_path === "string" ? r.file_path : typeof r.path === "string" ? r.path : void 0;
+  if (path22 !== void 0 && path22.length > 0) {
+    return clipTail(shortenHomePath(sanitizeSingleLine(path22)), TOOL_DETAIL_MAX);
+  }
+  return void 0;
+}
+function clipHead(s, max) {
+  return s.length > max ? `${s.slice(0, max - 1)}\u2026` : s;
+}
+function clipTail(s, max) {
+  return s.length > max ? `\u2026${s.slice(-(max - 1))}` : s;
+}
 function mapToolCallUpdate(u) {
   const toolCallId = readString(u, "toolCallId") ?? readString(u, "id");
   if (!toolCallId) {
@@ -6521,7 +6679,8 @@ function mapToolCallUpdate(u) {
   const title = rawTitle !== void 0 ? sanitizeSingleLine(rawTitle) : void 0;
   const status = readString(u, "status");
   const diff = extractEditDiff(u);
-  const meaningful = title !== void 0 || diff !== null || status === "completed" || status === "failed" || status === "rejected" || status === "cancelled";
+  const detail = extractToolDetail(u);
+  const meaningful = title !== void 0 || diff !== null || detail !== void 0 || status === "completed" || status === "failed" || status === "rejected" || status === "cancelled";
   if (!meaningful) {
     return null;
   }
@@ -6541,6 +6700,9 @@ function mapToolCallUpdate(u) {
   if (title !== void 0) {
     event.title = title;
   }
+  if (detail !== void 0) {
+    event.detail = detail;
+  }
   if (status !== void 0) {
     event.status = status;
   }
@@ -6693,11 +6855,13 @@ function readString(u, key) {
   const v = u[key];
   return typeof v === "string" ? v : void 0;
 }
-var STRIP_CONTROLS;
+var STRIP_CONTROLS, TOOL_DETAIL_MAX;
 var init_render_update = __esm({
   "src/core/render-update.ts"() {
     "use strict";
+    init_paths();
     STRIP_CONTROLS = /[\x00-\x08\x0b-\x1f\x7f]/g;
+    TOOL_DETAIL_MAX = 64;
   }
 });
 
@@ -6746,13 +6910,13 @@ function wsToMessageStream(ws) {
         throw new Error("ws is closed");
       }
       const text = JSON.stringify(message);
-      await new Promise((resolve8, reject) => {
+      await new Promise((resolve9, reject) => {
         ws.send(text, (err) => {
           if (err) {
             reject(err);
             return;
           }
-          resolve8();
+          resolve9();
         });
       });
     },
@@ -7354,7 +7518,7 @@ function formatEvent(event, options = {}) {
     case "agent-text":
       return formatBlock(event.text, "  ", "agent");
     case "agent-thought":
-      return formatBlock(event.text, "\xB7 ", "thought", "thought");
+      return formatBlock(event.text, "  ", "thought", "thought");
     case "tool-call":
     case "tool-call-update":
       return [];
@@ -7417,7 +7581,7 @@ function parseMarkdown(text, opts) {
     maxWidth
   } = opts;
   const out = [];
-  const lines = text.split("\n");
+  const lines = text.replace(/^\s+/, "").split("\n");
   let inCode = false;
   let codeLang = "";
   let codeBuffer = [];
@@ -7553,7 +7717,7 @@ function parseThoughtMarkdown(text) {
     proseStyle: "thought",
     highlightCode: false,
     prefixStyle: "thought",
-    firstPrefix: "\xB7 ",
+    firstPrefix: "  ",
     inlineOpts: { codeOpen: "^c", boldReset: "^-", codeReset: "^K" }
   });
 }
@@ -7848,7 +8012,7 @@ function highlightFencedBlock(lang, lines) {
   }));
 }
 function formatBlock(text, prefix, bodyStyle, prefixStyle, sentBy, fillRow) {
-  const lines = text.split("\n");
+  const lines = text.replace(/^\s+/, "").split("\n");
   const out = [];
   if (sentBy) {
     out.push({
@@ -7872,6 +8036,15 @@ function formatBlock(text, prefix, bodyStyle, prefixStyle, sentBy, fillRow) {
   }
   return out;
 }
+function formatDiffBytes(bytes) {
+  if (bytes < 1024) {
+    return `${bytes} B`;
+  }
+  if (bytes < 1024 * 1024) {
+    return `${Math.round(bytes / 1024)} KB`;
+  }
+  return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
+}
 function formatElapsed(ms) {
   const totalSec = Math.floor(ms / 1e3);
   if (totalSec < 60) {
@@ -7899,6 +8072,9 @@ function formatToolLine2(state, now = Date.now()) {
   } else {
     title = `${initial} \xB7 ${latest}`;
   }
+  if (state.detail && !title.includes(state.detail)) {
+    title = `${title} \xB7 ${state.detail}`;
+  }
   if (state.startedAt !== void 0) {
     const end = state.endedAt ?? now;
     title = `${title} \xB7 ${formatElapsed(end - state.startedAt)}`;
@@ -7920,17 +8096,27 @@ function formatToolLine2(state, now = Date.now()) {
   }
   return lines;
 }
-function formatEditDiffBlock(diff, mode) {
+function setDiffContextLines(n) {
+  diffContextLines = n >= 0 ? n : 0;
+}
+function formatEditDiffBlock(diff, mode, opts = {}) {
   const lines = [];
-  const counts = countDiffChanges(diff);
-  const summaryParts = [];
-  if (counts.added > 0) {
-    summaryParts.push(`+${counts.added}`);
-  }
-  if (counts.removed > 0) {
-    summaryParts.push(`-${counts.removed}`);
+  const deferred = diff.oldRef !== void 0 || diff.newRef !== void 0;
+  let summary;
+  if (deferred) {
+    const bytes = (diff.oldRef?.bytes ?? 0) + (diff.newRef?.bytes ?? 0);
+    summary = ` (~${formatDiffBytes(bytes)})`;
+  } else {
+    const counts = countDiffChanges(diff);
+    const summaryParts = [];
+    if (counts.added > 0) {
+      summaryParts.push(`+${counts.added}`);
+    }
+    if (counts.removed > 0) {
+      summaryParts.push(`-${counts.removed}`);
+    }
+    summary = summaryParts.length > 0 ? ` (${summaryParts.join(" ")})` : "";
   }
-  const summary = summaryParts.length > 0 ? ` (${summaryParts.join(" ")})` : "";
   const header = (open2) => ({
     prefix: "  ",
     body: `${open2 ? "\u25BE" : "\u25B8"} Edited ${sanitizeSingleLine(shortenHomePath(diff.path))}${summary}`,
@@ -7942,6 +8128,24 @@ function formatEditDiffBlock(diff, mode) {
     }
     return lines;
   }
+  if (deferred) {
+    if (diff.path) {
+      lines.push(header(true));
+      lines.push(
+        opts.deferredStatus === "error" ? {
+          prefix: "  ",
+          body: "\u26A0 failed to load diff",
+          bodyStyle: "tool-status-fail"
+        } : {
+          prefix: "  ",
+          body: "\u22EF fetching diff\u2026",
+          bodyStyle: "dim"
+        }
+      );
+      lines.unshift({ body: "" });
+    }
+    return lines;
+  }
   const body = buildUnifiedDiff(diff, { maxLines: Infinity });
   if (body.length === 0) {
     if (diff.path) {
@@ -7983,32 +8187,100 @@ function countDiffChanges(diff) {
   }
   return { added, removed };
 }
+function renderDiffOp(op) {
+  if (op.op === "=") {
+    return `  ${op.text}`;
+  }
+  return op.op === "-" ? `- ${op.text}` : `+ ${op.text}`;
+}
 function buildUnifiedDiff(diff, opts = {}) {
   const maxLines = opts.maxLines ?? EDIT_DIFF_MAX_LINES;
+  const ctx = opts.contextLines ?? diffContextLines;
   const { oldLines, newLines } = diffLinePair(diff);
   const ops = diffLines(oldLines, newLines);
+  const display = [];
+  if (!Number.isFinite(ctx)) {
+    for (const op of ops) {
+      display.push(renderDiffOp(op));
+    }
+  } else {
+    const hasChange = ops.some((o) => o.op !== "=");
+    if (!hasChange) {
+      return "";
+    }
+    const keep = new Array(ops.length).fill(false);
+    for (let i2 = 0; i2 < ops.length; i2++) {
+      if (ops[i2].op !== "=") {
+        const lo = Math.max(0, i2 - ctx);
+        const hi = Math.min(ops.length - 1, i2 + ctx);
+        for (let k = lo; k <= hi; k++) {
+          keep[k] = true;
+        }
+      }
+    }
+    let i = 0;
+    while (i < ops.length) {
+      if (keep[i]) {
+        display.push(renderDiffOp(ops[i]));
+        i++;
+        continue;
+      }
+      let j = i;
+      while (j < ops.length && !keep[j]) {
+        j++;
+      }
+      const skipped = j - i;
+      display.push(`  \u22EF ${skipped} unchanged line${skipped === 1 ? "" : "s"}`);
+      i = j;
+    }
+  }
   const rendered = [];
-  for (let idx = 0; idx < ops.length; idx++) {
-    const op = ops[idx];
-    const wouldTruncate = rendered.length >= maxLines - 1 && idx < ops.length - 1;
+  for (let idx = 0; idx < display.length; idx++) {
+    const wouldTruncate = rendered.length >= maxLines - 1 && idx < display.length - 1;
     if (wouldTruncate) {
-      const remaining = ops.length - idx;
+      const remaining = display.length - idx;
       rendered.push(`\u2026 ${remaining} more line${remaining === 1 ? "" : "s"}`);
       break;
     }
-    if (op.op === "=") {
-      rendered.push(`  ${op.text}`);
-    } else if (op.op === "-") {
-      rendered.push(`- ${op.text}`);
-    } else {
-      rendered.push(`+ ${op.text}`);
-    }
+    rendered.push(display[idx]);
   }
   return rendered.join("\n");
 }
 function diffLines(a, b) {
+  let start = 0;
+  const minLen = Math.min(a.length, b.length);
+  while (start < minLen && a[start] === b[start]) {
+    start++;
+  }
+  let endA = a.length;
+  let endB = b.length;
+  while (endA > start && endB > start && a[endA - 1] === b[endB - 1]) {
+    endA--;
+    endB--;
+  }
+  const out = [];
+  for (let k = 0; k < start; k++) {
+    out.push({ op: "=", text: a[k] });
+  }
+  out.push(...lcsDiff(a.slice(start, endA), b.slice(start, endB)));
+  for (let k = endA; k < a.length; k++) {
+    out.push({ op: "=", text: a[k] });
+  }
+  return out;
+}
+function lcsDiff(a, b) {
   const m = a.length;
   const n = b.length;
+  if (m === 0 || n === 0) {
+    const out2 = [];
+    for (const text of a) {
+      out2.push({ op: "-", text });
+    }
+    for (const text of b) {
+      out2.push({ op: "+", text });
+    }
+    return out2;
+  }
   const dp = Array.from(
     { length: m + 1 },
     () => new Array(n + 1).fill(0)
@@ -8245,7 +8517,7 @@ function toolStatusStyle(status) {
       return "tool-status-pending";
   }
 }
-var TABLE_MIN_COL, TABLE_PREFIX_WIDTH, TABLE_SEP_WIDTH, highlightChalk, HIGHLIGHT_THEME, EDIT_DIFF_MAX_LINES, PLAN_VISIBLE_LIMIT;
+var TABLE_MIN_COL, TABLE_PREFIX_WIDTH, TABLE_SEP_WIDTH, highlightChalk, HIGHLIGHT_THEME, EDIT_DIFF_MAX_LINES, diffContextLines, PLAN_VISIBLE_LIMIT;
 var init_format = __esm({
   "src/tui/format.ts"() {
     "use strict";
@@ -8280,6 +8552,7 @@ var init_format = __esm({
       name: highlightChalk.cyanBright
     };
     EDIT_DIFF_MAX_LINES = 40;
+    diffContextLines = Number.POSITIVE_INFINITY;
     PLAN_VISIBLE_LIMIT = 5;
   }
 });
@@ -8291,11 +8564,11 @@ function isResponse(msg) {
   return !("method" in msg) && "id" in msg && msg.id !== void 0;
 }
 async function openWs(url, subprotocols) {
-  return new Promise((resolve8, reject) => {
+  return new Promise((resolve9, reject) => {
     const ws = new WebSocket(url, subprotocols);
     const onOpen = () => {
       ws.off("error", onError);
-      resolve8(wsToMessageStream(ws));
+      resolve9(wsToMessageStream(ws));
     };
     const onError = (err) => {
       ws.off("open", onOpen);
@@ -8366,8 +8639,8 @@ var init_resilient_ws = __esm({
           throw new Error("resilient ws stream not connected");
         }
         const id = message.id;
-        const promise = new Promise((resolve8, reject) => {
-          this.pendingRequests.set(id, { resolve: resolve8, reject });
+        const promise = new Promise((resolve9, reject) => {
+          this.pendingRequests.set(id, { resolve: resolve9, reject });
         });
         try {
           await this.current.send(message);
@@ -8395,8 +8668,8 @@ var init_resilient_ws = __esm({
             this.bindStream(stream);
             const wasFirst = this.firstConnect;
             this.firstConnect = false;
-            this.connectGate = new Promise((resolve8) => {
-              this.releaseConnectGate = resolve8;
+            this.connectGate = new Promise((resolve9) => {
+              this.releaseConnectGate = resolve9;
             });
             try {
               if (this.opts.onConnect) {
@@ -8717,7 +8990,7 @@ var init_update_check = __esm({
 });
 
 // src/core/cwd.ts
-import * as fs23 from "fs/promises";
+import * as fs24 from "fs/promises";
 import * as path17 from "path";
 async function validateLocalCwd(input) {
   const trimmed = input.trim();
@@ -8727,7 +9000,7 @@ async function validateLocalCwd(input) {
   const resolved = path17.resolve(expandHome(trimmed));
   let stat5;
   try {
-    stat5 = await fs23.stat(resolved);
+    stat5 = await fs24.stat(resolved);
   } catch {
     return { ok: false, reason: `${resolved} does not exist` };
   }
@@ -8753,7 +9026,7 @@ async function pickInitialLocalCwd(sessionCwd) {
   }
   for (const candidate of candidates) {
     try {
-      const stat5 = await fs23.stat(candidate);
+      const stat5 = await fs24.stat(candidate);
       if (stat5.isDirectory()) {
         return candidate;
       }
@@ -8779,7 +9052,7 @@ async function completeLocalPath(input) {
   const resolvedDir = path17.resolve(expandHome(dirForRead));
   let entries;
   try {
-    const list = await fs23.readdir(resolvedDir, { withFileTypes: true });
+    const list = await fs24.readdir(resolvedDir, { withFileTypes: true });
     entries = list.map((e) => ({ name: e.name, isDir: e.isDirectory() }));
   } catch {
     return { prefix, basePrefix, matches: [] };
@@ -8918,6 +9191,17 @@ var init_input = __esm({
           this.col = text.length;
         }
       }
+      // Replace a [start, end) span on the current line with `text`, landing
+      // the cursor at the end of the inserted text. Used by file-path tab
+      // completion: the typed path token gets swapped for the completed one.
+      // Out-of-range bounds are clamped to the line length.
+      replaceRangeOnCurrentLine(start, end, text) {
+        const line = this.currentLine();
+        const s = Math.max(0, Math.min(start, line.length));
+        const e = Math.max(s, Math.min(end, line.length));
+        this.setCurrentLine(line.slice(0, s) + text + line.slice(e));
+        this.col = s + text.length;
+      }
       // Public seed for the buffer (used for Escape pre-fill). Treated like a
       // fresh draft: nav state and any saved draft are cleared, cursor lands
       // at the end so the user can edit immediately. Attachments restore
@@ -9999,7 +10283,12 @@ function writeBodyWithHighlight(termObj, text, style, term, activeCol = null, _a
   }
 }
 function bodyStyleUsesMarkup(style) {
-  return style === "agent" || style === "heading-1" || style === "heading-2" || style === "heading-3";
+  return style === "agent" || // Thoughts switched to the markup-interpreting writer (writeStyled's
+  // "thought" case uses term.brightBlack without .noFormat), so their
+  // caret spans (^ccode^K, ^+bold^-) are zero-width on screen. wrap/
+  // truncate must strip them too or thought lines wrap several columns
+  // short of the margin whenever they contain inline code/bold.
+  style === "thought" || style === "heading-1" || style === "heading-2" || style === "heading-3";
 }
 function writeStyled(term, text, style) {
   if (text.length === 0) {
@@ -10082,6 +10371,12 @@ function wrapAnsiBody(text, width) {
   }
   return wrapAnsi(text, width, { hard: true, trim: false }).split("\n");
 }
+function setAmbiguousWide(wide) {
+  ambiguousWide = wide;
+}
+function cellWidth(text) {
+  return stringWidth2(text, { ambiguousIsNarrow: !ambiguousWide });
+}
 function matchTkMarkupAt(text, i) {
   if (text.charCodeAt(i) !== 94) {
     return null;
@@ -10139,7 +10434,7 @@ function* segmentForWidth(text) {
       continue;
     }
     for (const { segment } of SEGMENTER.segment(text.slice(i, runEnd))) {
-      yield { text: segment, width: stringWidth2(segment) };
+      yield { text: segment, width: cellWidth(segment) };
     }
     i = runEnd;
   }
@@ -10233,7 +10528,7 @@ function wrapVisible(text, width, stripMarkup) {
 function graphemeSegments(text) {
   const out = [];
   for (const { segment } of SEGMENTER.segment(text)) {
-    out.push({ text: segment, width: stringWidth2(segment) });
+    out.push({ text: segment, width: cellWidth(segment) });
   }
   return out;
 }
@@ -10246,7 +10541,7 @@ function truncate(text, max, opts = {}) {
     return text;
   }
   if (!stripMarkup) {
-    const visible2 = stringWidth2(text);
+    const visible2 = cellWidth(text);
     if (visible2 <= max) {
       return text;
     }
@@ -10275,7 +10570,7 @@ function takeByWidth(text, budget) {
   let out = "";
   let used = 0;
   for (const { segment } of SEGMENTER.segment(text)) {
-    const w = stringWidth2(segment);
+    const w = cellWidth(segment);
     if (used + w > budget) {
       break;
     }
@@ -10540,7 +10835,7 @@ function mapCsiUToKeyName(code, mod) {
   }
   return null;
 }
-var SESSIONBAR_ROWS, BANNER_ROWS, SEPARATOR_ROWS, MAX_PROMPT_ROWS, MAX_QUEUED_ROWS, MAX_PERMISSION_ROWS, MAX_OPTIONS_ROWS, MAX_HELP_ROWS, MAX_COMPLETION_ROWS, MAX_CHIP_ROWS, CONFIRM_PROMPT_ROWS, DEFAULT_CONTENT_REPAINT_THROTTLE_MS, DEFAULT_MAX_SCROLLBACK_LINES, BARE_URL_RE, Screen, NON_ASCII, SEGMENTER, TK_MARKUP_STYLE_CHAR, shortId;
+var SESSIONBAR_ROWS, BANNER_ROWS, SEPARATOR_ROWS, MAX_PROMPT_ROWS, MAX_QUEUED_ROWS, MAX_PERMISSION_ROWS, MAX_OPTIONS_ROWS, MAX_HELP_ROWS, MAX_COMPLETION_ROWS, MAX_CHIP_ROWS, CONFIRM_PROMPT_ROWS, DEFAULT_CONTENT_REPAINT_THROTTLE_MS, DEFAULT_MAX_SCROLLBACK_LINES, BARE_URL_RE, Screen, NON_ASCII, SEGMENTER, ambiguousWide, TK_MARKUP_STYLE_CHAR, shortId;
 var init_screen = __esm({
   "src/tui/screen.ts"() {
     "use strict";
@@ -10569,6 +10864,9 @@ var init_screen = __esm({
       dispatcher;
       onKey;
       onBlockClick;
+      onBlockVisible;
+      // Keyed blocks awaiting a one-shot "became visible" notification.
+      pendingVisibleKeys = /* @__PURE__ */ new Set();
       lines = [];
       // Tracks contiguous blocks of lines that callers may want to mutate in
       // place (e.g. tool-call rows that update from "pending" to "completed",
@@ -10716,6 +11014,7 @@ var init_screen = __esm({
         this.dispatcher = opts.dispatcher;
         this.onKey = opts.onKey;
         this.onBlockClick = opts.onBlockClick;
+        this.onBlockVisible = opts.onBlockVisible;
         this.contentRepaintThrottleMs = opts.repaintThrottleMs ?? DEFAULT_CONTENT_REPAINT_THROTTLE_MS;
         this.maxScrollbackLines = opts.maxScrollbackLines ?? DEFAULT_MAX_SCROLLBACK_LINES;
         this.mouseEnabled = opts.mouse ?? false;
@@ -11721,7 +12020,11 @@ uncaught: ${err.stack ?? err.message}
       // plan to its eventual tail position, and the separator we're adding
       // here is for whatever content is *about* to be appended (which will
       // land at sticky.start and push the plan back via moveStickyToEnd).
-      ensureSeparator() {
+      // `bodyStyle` tags the inserted blank so a draw-time filter can drop it
+      // together with the block it precedes. Thoughts pass "thought" so the ^T
+      // hide-thoughts filter removes the gap above a hidden thought instead of
+      // leaving an orphaned blank line in scrollback.
+      ensureSeparator(bodyStyle) {
         if (this.lines.length === 0) {
           return;
         }
@@ -11736,6 +12039,9 @@ uncaught: ${err.stack ?? err.message}
           return;
         }
         const sep2 = { body: "" };
+        if (bodyStyle !== void 0) {
+          sep2.bodyStyle = bodyStyle;
+        }
         if (stickyAtEnd) {
           this.lines.splice(sticky.start, 0, sep2);
           sticky.start += 1;
@@ -12299,6 +12605,36 @@ uncaught: ${err.stack ?? err.message}
             }
           });
         }
+        if (this.onBlockVisible && this.pendingVisibleKeys.size > 0) {
+          const visible = /* @__PURE__ */ new Set();
+          for (const r of slice) {
+            if (r.blockKey !== void 0) {
+              visible.add(r.blockKey);
+            }
+          }
+          const fire = [];
+          for (const key of this.pendingVisibleKeys) {
+            if (visible.has(key)) {
+              fire.push(key);
+            }
+          }
+          for (const key of fire) {
+            this.pendingVisibleKeys.delete(key);
+            this.onBlockVisible(key);
+          }
+        }
+      }
+      // Register a keyed block to receive a single onBlockVisible callback the
+      // next time any of its rows are painted in the visible window. If it's
+      // already on screen the pending repaint fires it promptly; otherwise it
+      // waits until the block scrolls into view. No-op without an onBlockVisible
+      // handler.
+      notifyWhenVisible(key) {
+        if (!this.onBlockVisible) {
+          return;
+        }
+        this.pendingVisibleKeys.add(key);
+        this.scheduleRepaint();
       }
       queuedRows() {
         return Math.min(MAX_QUEUED_ROWS, this.queuedTexts.length);
@@ -12878,7 +13214,8 @@ uncaught: ${err.stack ?? err.message}
           }
         }
         const prefix = line.prefix ?? "";
-        const room = Math.max(1, width - prefix.length);
+        const prefixCols = cellWidth(prefix);
+        const room = Math.max(1, width - prefixCols);
         const stripMarkup = bodyStyleUsesMarkup(line.bodyStyle);
         const chunks = line.ansi ? wrapAnsiBody(line.body, room) : wrap(line.body, room, { stripMarkup });
         const wrapped = [];
@@ -12886,7 +13223,7 @@ uncaught: ${err.stack ?? err.message}
         for (let i = 0; i < chunks.length; i++) {
           const chunk = chunks[i] ?? "";
           const wrappedLine = {
-            prefix: i === 0 ? line.prefix : " ".repeat(prefix.length),
+            prefix: i === 0 ? line.prefix : " ".repeat(prefixCols),
             body: chunk
           };
           if (line.prefixStyle !== void 0) {
@@ -12927,7 +13264,7 @@ uncaught: ${err.stack ?? err.message}
         if (line.prefix) {
           writeStyled(this.term, line.prefix, line.prefixStyle ?? line.bodyStyle);
         }
-        const remaining = Math.max(0, width - (line.prefix?.length ?? 0));
+        const remaining = Math.max(0, width - cellWidth(line.prefix ?? ""));
         const stripMarkup = bodyStyleUsesMarkup(line.bodyStyle);
         const bodyText = line.ansi ? line.body : truncate(line.body, remaining, { stripMarkup });
         if (this.scrollbackHighlight !== null && !line.ansi) {
@@ -12943,7 +13280,7 @@ uncaught: ${err.stack ?? err.message}
           writeStyled(this.term, bodyText, line.bodyStyle);
         }
         if (line.fillRow) {
-          const visible = line.ansi ? stringWidth2(bodyText) : bodyText.length;
+          const visible = line.ansi ? stringWidth2(bodyText) : cellWidth(bodyText);
           const pad = remaining - visible;
           if (pad > 0) {
             writeStyled(this.term, " ".repeat(pad), line.bodyStyle);
@@ -12962,6 +13299,7 @@ uncaught: ${err.stack ?? err.message}
     };
     NON_ASCII = /[^\x20-\x7e]/;
     SEGMENTER = new Intl.Segmenter(void 0, { granularity: "grapheme" });
+    ambiguousWide = false;
     TK_MARKUP_STYLE_CHAR = /[a-zA-Z+\-:_!#/]/;
     shortId = stripHydraSessionPrefix;
   }
@@ -13166,7 +13504,7 @@ async function promptForImportAction(term, session) {
   };
   render();
   term.hideCursor();
-  return await new Promise((resolve8) => {
+  return await new Promise((resolve9) => {
     let resolved = false;
     const cleanup = () => {
       if (resolved) {
@@ -13181,7 +13519,7 @@ async function promptForImportAction(term, session) {
     };
     const finish = (value) => {
       cleanup();
-      resolve8(value);
+      resolve9(value);
     };
     const onResize = () => {
       if (resolved) {
@@ -13285,7 +13623,7 @@ async function promptForLaunchOrView(term, session, focus) {
   };
   render();
   term.hideCursor();
-  return await new Promise((resolve8) => {
+  return await new Promise((resolve9) => {
     let resolved = false;
     const cleanup = () => {
       resolved = true;
@@ -13293,7 +13631,7 @@ async function promptForLaunchOrView(term, session, focus) {
     const finish = (value) => {
       cleanup();
       focus.pop();
-      resolve8(value);
+      resolve9(value);
     };
     const onKey = (name, _m, data) => {
       if (name === "CTRL_C" || name === "CTRL_D") {
@@ -14228,7 +14566,7 @@ async function pickSession(term, opts) {
     }
   };
   renderFromScratch();
-  return await new Promise((resolve8) => {
+  return await new Promise((resolve9) => {
     let resolved = false;
     let autoRefreshTimer = null;
     let autoRefreshInFlight = false;
@@ -14315,7 +14653,7 @@ async function pickSession(term, opts) {
     };
     const tryAbort = () => {
       cleanup();
-      resolve8({ kind: currentSessionGone ? "exit" : "abort" });
+      resolve9({ kind: currentSessionGone ? "exit" : "abort" });
       return true;
     };
     const renderFingerprint = () => {
@@ -14495,7 +14833,7 @@ ${cells}`;
         onKey: (name) => {
           if (name === "CTRL_C") {
             cleanup();
-            resolve8({ kind: "abort" });
+            resolve9({ kind: "abort" });
             return;
           }
           popLayer();
@@ -14609,7 +14947,7 @@ ${cells}`;
               if (session.agentId !== void 0) {
                 result.agentId = session.agentId;
               }
-              resolve8(result);
+              resolve9(result);
               return;
             }
             void (async () => {
@@ -14620,7 +14958,7 @@ ${cells}`;
               }, focus);
               if (action === "cancel") {
                 cleanup();
-                resolve8({ kind: "abort" });
+                resolve9({ kind: "abort" });
                 return;
               }
               if (action === "back") return;
@@ -14633,7 +14971,7 @@ ${cells}`;
               if (session?.agentId !== void 0) {
                 result.agentId = session.agentId;
               }
-              resolve8(result);
+              resolve9(result);
             })();
             return;
           }
@@ -14794,9 +15132,9 @@ ${cells}`;
           cleanup();
           const text = composer.expandedText();
           if (text.trim().length === 0) {
-            resolve8({ kind: "new" });
+            resolve9({ kind: "new" });
           } else {
-            resolve8({ kind: "new", prompt: text });
+            resolve9({ kind: "new", prompt: text });
           }
           return;
         }
@@ -14920,7 +15258,7 @@ ${cells}`;
         }
         if (name === "c" || name === "C") {
           cleanup();
-          resolve8({ kind: "new" });
+          resolve9({ kind: "new" });
           return;
         }
         if (name === "q" || name === "Q") {
@@ -14977,7 +15315,7 @@ ${cells}`;
           if (session.agentId !== void 0) {
             result.agentId = session.agentId;
           }
-          resolve8(result);
+          resolve9(result);
           return;
         }
         if ((name === "f" || name === "F") && selectedIdx > 0) {
@@ -15000,7 +15338,7 @@ ${cells}`;
           if (session.upstreamSessionId !== void 0) {
             result.sourceUpstreamSessionId = session.upstreamSessionId;
           }
-          resolve8(result);
+          resolve9(result);
           return;
         }
         if ((name === "k" || name === "K") && selectedIdx > 0) {
@@ -15089,12 +15427,12 @@ ${cells}`;
         case "KP_ENTER": {
           cleanup();
           if (selectedIdx === 0) {
-            resolve8({ kind: "new" });
+            resolve9({ kind: "new" });
             return;
           }
           const session = visible[selectedIdx - 1];
           if (!session) {
-            resolve8({ kind: "abort" });
+            resolve9({ kind: "abort" });
             return;
           }
           const result = {
@@ -15104,7 +15442,7 @@ ${cells}`;
           if (session.agentId !== void 0) {
             result.agentId = session.agentId;
           }
-          resolve8(result);
+          resolve9(result);
           return;
         }
         case "ESCAPE":
@@ -15385,7 +15723,7 @@ async function promptForImportCwd(term, session, opts = {}) {
     }
   };
   render();
-  return await new Promise((resolve8) => {
+  return await new Promise((resolve9) => {
     let resolved = false;
     const cleanup = () => {
       if (resolved) {
@@ -15400,7 +15738,7 @@ async function promptForImportCwd(term, session, opts = {}) {
     };
     const finish = (value) => {
       cleanup();
-      resolve8(value);
+      resolve9(value);
     };
     const onResize = () => {
       if (resolved) {
@@ -15606,7 +15944,7 @@ async function promptForAgent(term, agents) {
   };
   render();
   term.hideCursor();
-  return await new Promise((resolve8) => {
+  return await new Promise((resolve9) => {
     let resolved = false;
     const cleanup = () => {
       if (resolved) {
@@ -15621,7 +15959,7 @@ async function promptForAgent(term, agents) {
     };
     const finish = (value) => {
       cleanup();
-      resolve8(value);
+      resolve9(value);
     };
     const onResize = () => {
       if (resolved) {
@@ -15717,7 +16055,7 @@ var init_agent_prompt = __esm({
 
 // src/tui/clipboard.ts
 import { spawn as nodeSpawn } from "child_process";
-import fs24 from "fs/promises";
+import fs25 from "fs/promises";
 import os6 from "os";
 import path19 from "path";
 async function readClipboard(envIn = {}) {
@@ -15758,7 +16096,7 @@ async function readMacOS(env) {
       return img;
     }
   } catch {
-    await fs24.unlink(tmpPath).catch(() => void 0);
+    await fs25.unlink(tmpPath).catch(() => void 0);
   }
   try {
     const buf = await runCapture(env.spawn, "pbpaste", []);
@@ -15873,9 +16211,9 @@ async function which(env, cmd) {
 }
 async function readFileAsAttachment(p, unlinkAfter) {
   try {
-    const buf = await fs24.readFile(p);
+    const buf = await fs25.readFile(p);
     if (unlinkAfter) {
-      await fs24.unlink(p).catch(() => void 0);
+      await fs25.unlink(p).catch(() => void 0);
     }
     if (buf.length === 0) {
       return { ok: false, reason: "no image on clipboard" };
@@ -15901,14 +16239,14 @@ async function readFileAsAttachment(p, unlinkAfter) {
   }
 }
 function run2(spawn7, cmd, args) {
-  return new Promise((resolve8, reject) => {
+  return new Promise((resolve9, reject) => {
     const proc = spawn7(cmd, args);
     proc.stdout?.on("data", () => void 0);
     proc.stderr?.on("data", () => void 0);
     proc.on("error", reject);
     proc.on("close", (code) => {
       if (code === 0) {
-        resolve8();
+        resolve9();
       } else {
         reject(new Error(`${cmd} exited ${code}`));
       }
@@ -15916,7 +16254,7 @@ function run2(spawn7, cmd, args) {
   });
 }
 function runCapture(spawn7, cmd, args) {
-  return new Promise((resolve8, reject) => {
+  return new Promise((resolve9, reject) => {
     const proc = spawn7(cmd, args);
     const chunks = [];
     let stdoutEnded = proc.stdout === null;
@@ -15928,7 +16266,7 @@ function runCapture(spawn7, cmd, args) {
       }
       settled = true;
       if (closedCode === 0) {
-        resolve8(Buffer.concat(chunks));
+        resolve9(Buffer.concat(chunks));
       } else {
         reject(new Error(`${cmd} exited ${closedCode}`));
       }
@@ -15974,6 +16312,109 @@ var init_clipboard = __esm({
   }
 });
 
+// src/tui/file-completion.ts
+import * as fs26 from "fs";
+import * as os7 from "os";
+import * as path20 from "path";
+function extractPathToken(line, col) {
+  let start = col;
+  while (start > 0) {
+    const ch = line[start - 1] ?? "";
+    if (/\s/.test(ch)) {
+      if (ch === " " && line[start - 2] === "\\") {
+        start -= 2;
+        continue;
+      }
+      break;
+    }
+    start -= 1;
+  }
+  if (start === col) {
+    return null;
+  }
+  return { token: line.slice(start, col), start };
+}
+function looksLikePath(token) {
+  if (token.length === 0) {
+    return false;
+  }
+  if (token.includes("/")) {
+    return true;
+  }
+  return token === "~" || token === "." || token === "..";
+}
+function unescapeToken(token) {
+  return token.replace(/\\ /g, " ");
+}
+function escapeToken(token) {
+  return token.replace(/ /g, "\\ ");
+}
+function splitToken(token) {
+  const slash = token.lastIndexOf("/");
+  if (slash === -1) {
+    return { dirPrefix: "", base: token };
+  }
+  return { dirPrefix: token.slice(0, slash + 1), base: token.slice(slash + 1) };
+}
+function resolveDir(dirPrefix, cwd) {
+  let p = dirPrefix.length === 0 ? "." : dirPrefix;
+  if (p === "~" || p.startsWith("~/")) {
+    p = os7.homedir() + p.slice(1);
+  }
+  return path20.isAbsolute(p) ? p : path20.resolve(cwd, p);
+}
+function readDir(dir) {
+  let dirents;
+  try {
+    dirents = fs26.readdirSync(dir, { withFileTypes: true });
+  } catch {
+    return null;
+  }
+  return dirents.map((d) => ({
+    name: d.name,
+    isDir: d.isDirectory()
+  }));
+}
+function completePathToken(token, cwd, listDir = readDir) {
+  if (!looksLikePath(token)) {
+    return null;
+  }
+  const raw = unescapeToken(token);
+  const { dirPrefix, base } = splitToken(raw);
+  const dir = resolveDir(dirPrefix, cwd);
+  const entries = listDir(dir);
+  if (entries === null) {
+    return null;
+  }
+  const showHidden = base.startsWith(".");
+  const matched = entries.filter(
+    (e) => e.name.startsWith(base) && (showHidden || !e.name.startsWith("."))
+  );
+  if (matched.length === 0) {
+    return null;
+  }
+  const candidates = matched.map((e) => e.isDir ? e.name + "/" : e.name);
+  if (matched.length === 1) {
+    const only = matched[0];
+    const completedBase = only.isDir ? only.name + "/" : only.name;
+    return {
+      replacement: escapeToken(dirPrefix + completedBase),
+      candidates
+    };
+  }
+  const common = longestCommonPrefix(matched.map((e) => e.name));
+  return {
+    replacement: escapeToken(dirPrefix + common),
+    candidates
+  };
+}
+var init_file_completion = __esm({
+  "src/tui/file-completion.ts"() {
+    "use strict";
+    init_completion();
+  }
+});
+
 // src/tui/reconnect-state.ts
 function parseReattachResponse(result) {
   const out = {};
@@ -16024,8 +16465,8 @@ var init_reconnect_state = __esm({
 import { appendFileSync, statSync as statSync2, renameSync as renameSync2 } from "fs";
 import { nanoid as nanoid3 } from "nanoid";
 import termkit from "terminal-kit";
-import fs25 from "fs/promises";
-import path20 from "path";
+import fs27 from "fs/promises";
+import path21 from "path";
 function parseResponseConfigOptions(raw) {
   if (!Array.isArray(raw)) {
     return void 0;
@@ -16441,10 +16882,10 @@ async function runSession(term, config, target, opts, exitHint, viewPrefs, picke
     if (pendingPermission.toolCallId && toolCallId && pendingPermission.toolCallId !== toolCallId) {
       return;
     }
-    const resolve8 = pendingPermission.resolve;
+    const resolve9 = pendingPermission.resolve;
     pendingPermission = null;
     screen.setPermissionPrompt(null);
-    resolve8(result ?? { outcome: { outcome: "cancelled" } });
+    resolve9(result ?? { outcome: { outcome: "cancelled" } });
   };
   const maybeDismissPermissionByToolUpdate = (update) => {
     if (!pendingPermission?.toolCallId) {
@@ -16478,14 +16919,14 @@ async function runSession(term, config, target, opts, exitHint, viewPrefs, picke
     if (!pendingPermission) {
       return;
     }
-    const { options, resolve: resolve8 } = pendingPermission;
+    const { options, resolve: resolve9 } = pendingPermission;
     pendingPermission = null;
     screen.setPermissionPrompt(null);
     if (optionId === null) {
-      resolve8({ outcome: { outcome: "cancelled" } });
+      resolve9({ outcome: { outcome: "cancelled" } });
       return;
     }
-    resolve8({ outcome: { outcome: "selected", optionId } });
+    resolve9({ outcome: { outcome: "selected", optionId } });
     void options;
   };
   conn.onRequest("session/request_permission", async (params) => {
@@ -16518,13 +16959,13 @@ async function runSession(term, config, target, opts, exitHint, viewPrefs, picke
       ]);
       return { outcome: { outcome: "cancelled" } };
     }
-    return new Promise((resolve8) => {
+    return new Promise((resolve9) => {
       pendingPermission = {
         title,
         detail,
         options,
         selectedIndex: 0,
-        resolve: resolve8,
+        resolve: resolve9,
         toolCallId
       };
       refreshPermissionPrompt();
@@ -16617,6 +17058,9 @@ async function runSession(term, config, target, opts, exitHint, viewPrefs, picke
     if (opts.readonly === true) {
       attachHydraMeta.readonly = true;
     }
+    if (config.tui.toolContent === "references") {
+      attachHydraMeta.toolContent = "references";
+    }
     if (opts.drip === true) {
       attachHydraMeta.replayMode = "drip";
       if (opts.dripSpeed !== void 0) {
@@ -16705,6 +17149,8 @@ async function runSession(term, config, target, opts, exitHint, viewPrefs, picke
   }
   let turnInFlight = null;
   let pendingPrefill = null;
+  setAmbiguousWide(config.tui.ambiguousWidth === "wide");
+  setDiffContextLines(config.tui.diffContextLines);
   const screen = new Screen({
     term,
     dispatcher,
@@ -16719,6 +17165,11 @@ async function runSession(term, config, target, opts, exitHint, viewPrefs, picke
     onBlockClick: (key) => {
       handleBlockClick(key);
     },
+    // Lazy-load deferred (references-mode) diff bodies only when the block
+    // scrolls into view.
+    onBlockVisible: (key) => {
+      handleBlockVisible(key);
+    },
     onKey: (events) => {
       for (const ev of events) {
         if (pendingPermission && tryHandlePermissionKey(ev)) {
@@ -16798,26 +17249,58 @@ async function runSession(term, config, target, opts, exitHint, viewPrefs, picke
     }
     return matches;
   };
+  let fileCompletions = [];
   const refreshCompletions = () => {
-    screen.setCompletions(currentCompletions());
+    const slash = currentCompletions();
+    if (slash.length > 0) {
+      fileCompletions = [];
+      screen.setCompletions(slash);
+      return;
+    }
+    screen.setCompletions(fileCompletions);
   };
   const tryHandleCompletionKey = (ev) => {
     if (ev.type !== "key" || ev.name !== "tab") {
+      if (fileCompletions.length > 0) {
+        fileCompletions = [];
+      }
       return false;
     }
     const matches = currentCompletions();
-    if (matches.length === 0) {
+    if (matches.length > 0) {
+      fileCompletions = [];
+      const firstLine3 = dispatcher.state().buffer[0] ?? "";
+      const next = computeTabCompletion({
+        matches: matches.map((m) => m.name),
+        firstLine: firstLine3
+      });
+      if (next === null) {
+        return true;
+      }
+      dispatcher.replaceFirstLine(next);
+      return true;
+    }
+    return tryHandleFileCompletion();
+  };
+  const tryHandleFileCompletion = () => {
+    const st = dispatcher.state();
+    const line = st.buffer[st.row] ?? "";
+    const tok = extractPathToken(line, st.col);
+    if (tok === null) {
       return false;
     }
-    const firstLine3 = dispatcher.state().buffer[0] ?? "";
-    const next = computeTabCompletion({
-      matches: matches.map((m) => m.name),
-      firstLine: firstLine3
-    });
-    if (next === null) {
-      return true;
+    const result = completePathToken(tok.token, resolvedCwd);
+    if (result === null) {
+      return false;
     }
-    dispatcher.replaceFirstLine(next);
+    if (result.replacement !== tok.token) {
+      dispatcher.replaceRangeOnCurrentLine(
+        tok.start,
+        st.col,
+        result.replacement
+      );
+    }
+    fileCompletions = result.candidates.length > 1 ? result.candidates.map((name) => ({ name })) : [];
     return true;
   };
   const tryHandleScrollbackSearchKey = (ev) => {
@@ -16937,8 +17420,8 @@ async function runSession(term, config, target, opts, exitHint, viewPrefs, picke
     }
   });
   let finishSession = null;
-  const sessionDone = new Promise((resolve8) => {
-    finishSession = resolve8;
+  const sessionDone = new Promise((resolve9) => {
+    finishSession = resolve9;
   });
   const cancelRemoteTurn = () => {
     conn.notify("session/cancel", { sessionId: resolvedSessionId }).catch(() => void 0);
@@ -17557,11 +18040,11 @@ async function runSession(term, config, target, opts, exitHint, viewPrefs, picke
       }
       const mimeType = mimeFromExtension(token);
       if (!mimeType) {
-        screen.notify(`unsupported image type: ${path20.basename(token)}`);
+        screen.notify(`unsupported image type: ${path21.basename(token)}`);
         continue;
       }
       try {
-        const buf = await fs25.readFile(token);
+        const buf = await fs27.readFile(token);
         if (buf.length > MAX_ATTACHMENT_BYTES) {
           screen.notify(
             `image too large (${formatSize(buf.length)}, max ${formatSize(MAX_ATTACHMENT_BYTES)})`
@@ -17571,13 +18054,13 @@ async function runSession(term, config, target, opts, exitHint, viewPrefs, picke
         dispatcher.addAttachment({
           mimeType,
           data: buf.toString("base64"),
-          name: path20.basename(token),
+          name: path21.basename(token),
           sizeBytes: buf.length
         });
         added++;
       } catch (err) {
         screen.notify(
-          `cannot read ${path20.basename(token)}: ${err.message}`
+          `cannot read ${path21.basename(token)}: ${err.message}`
         );
       }
     }
@@ -18132,7 +18615,7 @@ async function runSession(term, config, target, opts, exitHint, viewPrefs, picke
     if (text.length === 0)
       return;
     if (thoughtKey === null) {
-      screen.ensureSeparator();
+      screen.ensureSeparator("thought");
       thoughtKey = `thought:${thoughtSeq}`;
       thoughtSeq += 1;
       thoughtBuffer = "";
@@ -18250,7 +18733,7 @@ async function runSession(term, config, target, opts, exitHint, viewPrefs, picke
     toolsBlockStopReason = null;
     renderToolsBlock();
   };
-  const recordToolCall = (id, title, status, errorText, editDiff) => {
+  const recordToolCall = (id, title, status, errorText, editDiff, detail) => {
     const wasNew = !toolStates.has(id);
     const existing = toolStates.get(id);
     const state = existing ?? {
@@ -18262,6 +18745,9 @@ async function runSession(term, config, target, opts, exitHint, viewPrefs, picke
     if (existing && title !== void 0) {
       state.latestTitle = title;
     }
+    if (detail !== void 0 && state.detail === void 0) {
+      state.detail = detail;
+    }
     if (existing && status !== void 0) {
       state.status = status;
     }
@@ -18289,41 +18775,100 @@ async function runSession(term, config, target, opts, exitHint, viewPrefs, picke
       toolCallOrder.push(id);
     }
   };
-  const maybeRenderEditDiff = (toolCallId) => {
-    const key = `editdiff:${toolCallId}`;
-    const lines = (() => {
-      const mode = viewPrefs.showFileUpdates;
-      if (mode === "none") {
-        return null;
+  const fetchToolContent = async (hash) => {
+    try {
+      const res = await conn.request("hydra-acp/session/tool_content", {
+        sessionId: resolvedSessionId,
+        hash
+      });
+      return typeof res?.content === "string" ? res.content : null;
+    } catch {
+      return null;
+    }
+  };
+  const fetchingDiffs = /* @__PURE__ */ new Set();
+  const resolveDeferredDiff = (toolCallId, diff) => {
+    if (fetchingDiffs.has(toolCallId)) {
+      return;
+    }
+    if (diff.oldRef === void 0 && diff.newRef === void 0) {
+      return;
+    }
+    fetchingDiffs.add(toolCallId);
+    void (async () => {
+      const [oldText, newText] = await Promise.all([
+        diff.oldRef ? fetchToolContent(diff.oldRef.hash) : Promise.resolve(diff.oldText),
+        diff.newRef ? fetchToolContent(diff.newRef.hash) : Promise.resolve(diff.newText)
+      ]);
+      const failed = diff.oldRef !== void 0 && oldText === null || diff.newRef !== void 0 && newText === null;
+      if (failed) {
+        fetchingDiffs.delete(toolCallId);
+        const out = formatEditDiffBlock(diff, "diff", { deferredStatus: "error" });
+        if (out.length > 0) {
+          screen.upsertLines(`editdiff:${toolCallId}`, out);
+          screen.repaintNow();
+        }
+        return;
       }
-      const state = toolStates.get(toolCallId);
-      if (!state?.editDiff || state.status !== "completed") {
-        return null;
+      const resolved = {
+        ...diff.path !== void 0 ? { path: diff.path } : {},
+        oldText: oldText ?? "",
+        newText: newText ?? ""
+      };
+      renderedEditDiffs.set(toolCallId, resolved);
+      const st = toolStates.get(toolCallId);
+      if (st?.editDiff) {
+        st.editDiff = resolved;
       }
+      fetchingDiffs.delete(toolCallId);
       const override = editDiffOverrides.get(toolCallId);
-      if (override !== void 0) {
-        const out2 = formatEditDiffBlock(
-          state.editDiff,
-          override ? "diff" : "edit"
-        );
-        return out2.length > 0 ? out2 : null;
+      const mode = override === void 0 ? viewPrefs.showFileUpdates : override ? "diff" : "edit";
+      if (mode !== "none") {
+        renderEditDiffBlock(toolCallId, resolved, mode === "diff" ? "diff" : "edit");
+        screen.repaintNow();
       }
-      if (mode === "diff") {
-        const out2 = formatEditDiffBlock(state.editDiff, "diff");
-        return out2.length > 0 ? out2 : null;
-      }
-      const out = formatEditDiffBlock(state.editDiff, "edit");
-      return out.length > 0 ? out : null;
     })();
-    if (lines === null) {
+  };
+  const renderEditDiffBlock = (toolCallId, diff, mode) => {
+    const key = `editdiff:${toolCallId}`;
+    const out = formatEditDiffBlock(diff, mode);
+    if (out.length === 0) {
       screen.removeKey(key);
       return;
     }
-    const diff = toolStates.get(toolCallId)?.editDiff;
-    if (diff) {
-      renderedEditDiffs.set(toolCallId, diff);
+    screen.upsertLines(key, out);
+    if (mode === "diff" && (diff.oldRef !== void 0 || diff.newRef !== void 0)) {
+      screen.notifyWhenVisible(key);
     }
-    screen.upsertLines(key, lines);
+  };
+  const handleBlockVisible = (key) => {
+    if (!key.startsWith("editdiff:")) {
+      return;
+    }
+    const id = key.slice("editdiff:".length);
+    const diff = renderedEditDiffs.get(id);
+    if (diff && (diff.oldRef !== void 0 || diff.newRef !== void 0)) {
+      resolveDeferredDiff(id, diff);
+    }
+  };
+  const maybeRenderEditDiff = (toolCallId) => {
+    const key = `editdiff:${toolCallId}`;
+    const globalMode = viewPrefs.showFileUpdates;
+    const state = toolStates.get(toolCallId);
+    let mode;
+    if (globalMode === "none" || !state?.editDiff || state.status !== "completed") {
+      mode = null;
+    } else {
+      const override = editDiffOverrides.get(toolCallId);
+      mode = override !== void 0 ? override ? "diff" : "edit" : globalMode === "diff" ? "diff" : "edit";
+    }
+    if (mode === null) {
+      screen.removeKey(key);
+      return;
+    }
+    const diff = state.editDiff;
+    renderedEditDiffs.set(toolCallId, diff);
+    renderEditDiffBlock(toolCallId, diff, mode);
   };
   const reRenderAllEditDiffs = () => {
     const globalMode = viewPrefs.showFileUpdates;
@@ -18335,12 +18880,7 @@ async function runSession(term, config, target, opts, exitHint, viewPrefs, picke
         screen.removeKey(key);
         continue;
       }
-      const out = formatEditDiffBlock(diff, mode);
-      if (out.length === 0) {
-        screen.removeKey(key);
-      } else {
-        screen.upsertLines(key, out);
-      }
+      renderEditDiffBlock(toolCallId, diff, mode === "diff" ? "diff" : "edit");
     }
   };
   const handleBlockClick = (key) => {
@@ -18353,12 +18893,7 @@ async function runSession(term, config, target, opts, exitHint, viewPrefs, picke
       const current = editDiffOverrides.get(id) ?? viewPrefs.showFileUpdates === "diff";
       editDiffOverrides.set(id, !current);
       const next = !current ? "diff" : "edit";
-      const out = formatEditDiffBlock(diff, next);
-      if (out.length === 0) {
-        screen.removeKey(key);
-      } else {
-        screen.upsertLines(key, out);
-      }
+      renderEditDiffBlock(id, diff, next);
       screen.repaintNow();
       return;
     }
@@ -18512,7 +19047,8 @@ async function runSession(term, config, target, opts, exitHint, viewPrefs, picke
         event.title,
         event.status,
         void 0,
-        event.editDiff
+        event.editDiff,
+        event.detail
       );
       renderToolsBlock();
       maybeRenderEditDiff(event.toolCallId);
@@ -18540,7 +19076,8 @@ async function runSession(term, config, target, opts, exitHint, viewPrefs, picke
         event.title,
         event.status,
         event.errorText,
-        event.editDiff
+        event.editDiff,
+        event.detail
       );
       if (event.upstreamInterrupted) {
         upstreamInterruptedSeen = true;
@@ -18669,10 +19206,10 @@ async function runSession(term, config, target, opts, exitHint, viewPrefs, picke
   }
   const resetInFlightUiState = () => {
     if (pendingPermission) {
-      const resolve8 = pendingPermission.resolve;
+      const resolve9 = pendingPermission.resolve;
       pendingPermission = null;
       screen.setPermissionPrompt(null);
-      resolve8({ outcome: { outcome: "cancelled" } });
+      resolve9({ outcome: { outcome: "cancelled" } });
     }
     closeAgentText();
     closeThought();
@@ -18724,17 +19261,20 @@ async function runSession(term, config, target, opts, exitHint, viewPrefs, picke
         historyPolicy: useAfterMessage ? "after_message" : "none",
         ...useAfterMessage ? { afterMessageId: lastSeenMessageId } : {},
         clientInfo: { name: "hydra-acp-tui", version: HYDRA_VERSION },
-        ...upstreamSessionId !== void 0 ? {
-          _meta: {
-            [HYDRA_META_KEY]: {
-              resume: {
-                upstreamSessionId,
-                agentId: resolvedAgentId,
-                cwd: resolvedCwd
-              }
-            }
+        ...(() => {
+          const meta = {};
+          if (upstreamSessionId !== void 0) {
+            meta.resume = {
+              upstreamSessionId,
+              agentId: resolvedAgentId,
+              cwd: resolvedCwd
+            };
           }
-        } : {}
+          if (config.tui.toolContent === "references") {
+            meta.toolContent = "references";
+          }
+          return Object.keys(meta).length > 0 ? { _meta: { [HYDRA_META_KEY]: meta } } : {};
+        })()
       }
     };
     reconnectReplayBuffer = [];
@@ -19232,6 +19772,7 @@ var init_app = __esm({
     init_attachments();
     init_clipboard();
     init_completion();
+    init_file_completion();
     init_reconnect_state();
     init_render_update();
     init_format();
@@ -19239,7 +19780,7 @@ var init_app = __esm({
     HELP_ENTRIES_TAIL = [
       ["Alt+Enter", "newline in prompt"],
       ["Shift+Tab", "cycle agent modes (plan / accept-edits / etc.)"],
-      ["Tab", "indent \xB7 slash-command completion"],
+      ["Tab", "indent \xB7 slash-command / file-path completion"],
       null,
       ["\u2191 / \u2193", "prompt history \xB7 queue navigation"],
       ["\u2190/\u2192 Home/End", "cursor movement"],
@@ -19284,7 +19825,7 @@ var init_tui = __esm({
 // src/cli.ts
 import { readFileSync as readFileSync2 } from "fs";
 import { fileURLToPath as fileURLToPath2 } from "url";
-import { dirname as dirname8, resolve as resolve7 } from "path";
+import { dirname as dirname8, resolve as resolve8 } from "path";
 
 // src/cli/parse-args.ts
 var KNOWN_BOOLEAN_FLAGS = /* @__PURE__ */ new Set([
@@ -19481,7 +20022,7 @@ import { setTimeout as sleep2 } from "timers/promises";
 import chalk from "chalk";
 
 // src/daemon/server.ts
-import * as fs18 from "fs";
+import * as fs19 from "fs";
 import * as fsp7 from "fs/promises";
 import Fastify from "fastify";
 import websocketPlugin from "@fastify/websocket";
@@ -19500,16 +20041,117 @@ init_config();
 import pino from "pino";
 import createPinoRoll from "pino-roll";
 
+// src/core/tool-store.ts
+init_paths();
+import * as fs5 from "fs/promises";
+import { createHash } from "crypto";
+import { gzip as gzipCb, gunzip as gunzipCb } from "zlib";
+import { promisify } from "util";
+var gzip = promisify(gzipCb);
+var gunzip = promisify(gunzipCb);
+var SESSION_ID_PATTERN = /^[A-Za-z0-9_-]+$/;
+var HASH_PATTERN = /^[a-f0-9]{64}$/;
+var compressBlobs = true;
+function setToolBlobCompression(enabled) {
+  compressBlobs = enabled;
+}
+function safe(sessionId, hash) {
+  if (!SESSION_ID_PATTERN.test(sessionId)) {
+    return false;
+  }
+  return hash === void 0 || HASH_PATTERN.test(hash);
+}
+function gzPath(sessionId, hash) {
+  return `${paths.toolBlobFile(sessionId, hash)}.gz`;
+}
+async function putToolBlob(sessionId, text) {
+  if (!safe(sessionId)) {
+    return null;
+  }
+  const hash = createHash("sha256").update(text, "utf8").digest("hex");
+  const gzFile = gzPath(sessionId, hash);
+  const plainFile = paths.toolBlobFile(sessionId, hash);
+  for (const existing of [gzFile, plainFile]) {
+    try {
+      await fs5.access(existing);
+      return hash;
+    } catch {
+    }
+  }
+  await fs5.mkdir(paths.toolsDir(sessionId), { recursive: true });
+  const file = compressBlobs ? gzFile : plainFile;
+  const data = compressBlobs ? await gzip(Buffer.from(text, "utf8")) : Buffer.from(text, "utf8");
+  await fs5.writeFile(file, data, { mode: 384, flag: "wx" }).catch(async (err) => {
+    if (err.code !== "EEXIST") {
+      throw err;
+    }
+  });
+  return hash;
+}
+async function getToolBlob(sessionId, hash) {
+  if (!safe(sessionId, hash)) {
+    return null;
+  }
+  try {
+    const buf = await fs5.readFile(gzPath(sessionId, hash));
+    return (await gunzip(buf)).toString("utf8");
+  } catch {
+  }
+  try {
+    return await fs5.readFile(paths.toolBlobFile(sessionId, hash), "utf8");
+  } catch {
+    return null;
+  }
+}
+async function readToolBlobGz(sessionId, hash) {
+  if (!safe(sessionId, hash)) {
+    return null;
+  }
+  try {
+    return await fs5.readFile(gzPath(sessionId, hash));
+  } catch {
+  }
+  try {
+    const plain = await fs5.readFile(paths.toolBlobFile(sessionId, hash));
+    return await gzip(plain);
+  } catch {
+    return null;
+  }
+}
+async function writeToolBlobGz(sessionId, hash, gzBytes) {
+  if (!safe(sessionId, hash)) {
+    return;
+  }
+  const file = gzPath(sessionId, hash);
+  try {
+    await fs5.access(file);
+    return;
+  } catch {
+  }
+  await fs5.mkdir(paths.toolsDir(sessionId), { recursive: true });
+  await fs5.writeFile(file, gzBytes, { mode: 384, flag: "wx" }).catch((err) => {
+    if (err.code !== "EEXIST") {
+      throw err;
+    }
+  });
+}
+async function deleteToolBlobs(sessionId) {
+  if (!SESSION_ID_PATTERN.test(sessionId)) {
+    return;
+  }
+  await fs5.rm(paths.toolsDir(sessionId), { recursive: true, force: true }).catch(() => void 0);
+}
+
 // src/core/registry.ts
 init_paths();
 init_json_store();
-import * as fs6 from "fs/promises";
+import * as fs7 from "fs/promises";
 import * as path5 from "path";
 import { z as z2 } from "zod";
 
 // src/core/binary-install.ts
 init_paths();
-import * as fs5 from "fs";
+import * as fs6 from "fs";
 import * as fsp from "fs/promises";
 import * as path3 from "path";
 import { spawn } from "child_process";
@@ -19642,7 +20284,7 @@ async function downloadTo(args) {
     );
   }
   const total = Number(response.headers.get("content-length") ?? "0");
-  const out = fs5.createWriteStream(dest);
+  const out = fs6.createWriteStream(dest);
   const nodeStream = Readable.fromWeb(response.body);
   safeEmit(args.onProgress, {
     phase: "download_start",
@@ -19673,10 +20315,10 @@ async function downloadTo(args) {
       logSink(formatProgress(args.agentId, received, total));
     }
   });
-  await new Promise((resolve8, reject) => {
+  await new Promise((resolve9, reject) => {
     nodeStream.on("error", reject);
     out.on("error", reject);
-    out.on("finish", () => resolve8());
+    out.on("finish", () => resolve9());
     nodeStream.pipe(out);
   });
   logSink(formatProgress(
@@ -19728,14 +20370,14 @@ async function extract(archivePath, dest) {
   throw new Error(`Unsupported archive format: ${archivePath}`);
 }
 function run(cmd, args) {
-  return new Promise((resolve8, reject) => {
+  return new Promise((resolve9, reject) => {
     const child = spawn(cmd, args, {
       stdio: ["ignore", "ignore", "inherit"]
     });
     child.on("error", reject);
     child.on("exit", (code, signal) => {
       if (code === 0) {
-        resolve8();
+        resolve9();
         return;
       }
       reject(
@@ -19747,11 +20389,11 @@ function run(cmd, args) {
   });
 }
 async function hasCommand(name) {
-  return new Promise((resolve8) => {
+  return new Promise((resolve9) => {
     const finder = process.platform === "win32" ? "where" : "which";
     const child = spawn(finder, [name], { stdio: "ignore" });
-    child.on("error", () => resolve8(false));
-    child.on("exit", (code) => resolve8(code === 0));
+    child.on("error", () => resolve9(false));
+    child.on("exit", (code) => resolve9(code === 0));
   });
 }
 async function fileExists(p) {
@@ -19879,7 +20521,7 @@ function runNpmInstall(args) {
 }
 async function runNpmInstallOnce(args, attempt) {
   try {
-    await new Promise((resolve8, reject) => {
+    await new Promise((resolve9, reject) => {
       const registryArgs = args.registry ? ["--registry", args.registry] : [];
       let child;
       try {
@@ -19921,7 +20563,7 @@ async function runNpmInstallOnce(args, attempt) {
       });
       child.on("exit", (code, signal) => {
         if (code === 0) {
-          resolve8();
+          resolve9();
           return;
         }
         const reason = code !== null ? `exit code ${code}` : `signal ${signal ?? "unknown"}`;
@@ -20297,7 +20939,7 @@ async function agentInstallState(agent) {
 }
 async function fileExists3(p) {
   try {
-    await fs6.access(p);
+    await fs7.access(p);
     return true;
   } catch {
     return false;
@@ -20380,7 +21022,7 @@ async function planSpawn(agent, callerArgs = [], options = {}) {
 
 // src/core/agent-instance.ts
 import { spawn as spawn3 } from "child_process";
-import * as fs7 from "fs";
+import * as fs8 from "fs";
 import * as path6 from "path";
 
 // src/acp/framing.ts
@@ -20437,13 +21079,13 @@ function ndjsonStreamFromStdio(stdout, stdin) {
         throw new Error("stream is closed");
       }
       const line = JSON.stringify(message) + "\n";
-      await new Promise((resolve8, reject) => {
+      await new Promise((resolve9, reject) => {
         stdin.write(line, (err) => {
           if (err) {
             reject(err);
             return;
           }
-          resolve8();
+          resolve9();
         });
       });
     },
@@ -20602,8 +21244,8 @@ stderr: ${tail}` : reason;
 function openAgentLog(agentId) {
   try {
     const logPath = paths.agentLogFile(agentId);
-    fs7.mkdirSync(path6.dirname(logPath), { recursive: true });
-    const stream = fs7.createWriteStream(logPath, { flags: "a" });
+    fs8.mkdirSync(path6.dirname(logPath), { recursive: true });
+    const stream = fs8.createWriteStream(logPath, { flags: "a" });
     stream.on("error", () => void 0);
     return stream;
   } catch {
@@ -20612,7 +21254,7 @@ function openAgentLog(agentId) {
 }
 
 // src/core/session-manager.ts
-import * as fs15 from "fs/promises";
+import * as fs16 from "fs/promises";
 import * as os3 from "os";
 import * as path10 from "path";
 import { customAlphabet as customAlphabet3 } from "nanoid";
@@ -20621,7 +21263,7 @@ init_session();
 // src/core/session-store.ts
 init_paths();
 init_json_store();
-import * as fs9 from "fs/promises";
+import * as fs10 from "fs/promises";
 import * as path7 from "path";
 import { customAlphabet as customAlphabet2 } from "nanoid";
 import { z as z5 } from "zod";
@@ -20828,9 +21470,9 @@ var SessionRecord = z5.object({
   createdAt: z5.string(),
   updatedAt: z5.string()
 });
-var SESSION_ID_PATTERN = /^[A-Za-z0-9_-]+$/;
+var SESSION_ID_PATTERN2 = /^[A-Za-z0-9_-]+$/;
 function assertSafeId(id) {
-  if (!SESSION_ID_PATTERN.test(id)) {
+  if (!SESSION_ID_PATTERN2.test(id)) {
     throw new Error(`unsafe session id: ${id}`);
   }
 }
@@ -20843,7 +21485,7 @@ var SessionStore = class {
     });
   }
   async read(sessionId) {
-    if (!SESSION_ID_PATTERN.test(sessionId)) {
+    if (!SESSION_ID_PATTERN2.test(sessionId)) {
       return void 0;
     }
     const parsed = await readJsonSafe(paths.sessionFile(sessionId));
@@ -20857,11 +21499,11 @@ var SessionStore = class {
     }
   }
   async delete(sessionId) {
-    if (!SESSION_ID_PATTERN.test(sessionId)) {
+    if (!SESSION_ID_PATTERN2.test(sessionId)) {
       return;
     }
     try {
-      await fs9.unlink(paths.sessionFile(sessionId));
+      await fs10.unlink(paths.sessionFile(sessionId));
     } catch (err) {
       const e = err;
       if (e.code !== "ENOENT") {
@@ -20869,7 +21511,7 @@ var SessionStore = class {
       }
     }
     try {
-      await fs9.rmdir(paths.sessionDir(sessionId));
+      await fs10.rmdir(paths.sessionDir(sessionId));
     } catch (err) {
       const e = err;
       if (e.code !== "ENOENT" && e.code !== "ENOTEMPTY") {
@@ -20899,7 +21541,7 @@ var SessionStore = class {
   async list() {
     let entries;
     try {
-      entries = await fs9.readdir(paths.sessionsDir());
+      entries = await fs10.readdir(paths.sessionsDir());
     } catch (err) {
       const e = err;
       if (e.code === "ENOENT") {
@@ -20952,7 +21594,7 @@ function recordFromMemorySession(args) {
 // src/core/tombstone-store.ts
 init_paths();
 init_json_store();
-import * as fs10 from "fs/promises";
+import * as fs11 from "fs/promises";
 import { z as z6 } from "zod";
 var Tombstone = z6.object({
   version: z6.literal(1),
@@ -20981,7 +21623,7 @@ var TombstoneStore = class {
   }
   async has(agentId, upstreamSessionId) {
     try {
-      await fs10.access(paths.tombstoneFile(agentId, upstreamSessionId));
+      await fs11.access(paths.tombstoneFile(agentId, upstreamSessionId));
       return true;
     } catch {
       return false;
@@ -21019,7 +21661,7 @@ var TombstoneStore = class {
   }
   async remove(agentId, upstreamSessionId) {
     try {
-      await fs10.unlink(paths.tombstoneFile(agentId, upstreamSessionId));
+      await fs11.unlink(paths.tombstoneFile(agentId, upstreamSessionId));
     } catch (err) {
       const e = err;
       if (e.code !== "ENOENT") {
@@ -21027,7 +21669,7 @@ var TombstoneStore = class {
       }
     }
     try {
-      await fs10.rmdir(paths.tombstoneAgentDir(agentId));
+      await fs11.rmdir(paths.tombstoneAgentDir(agentId));
     } catch (err) {
       const e = err;
       if (e.code !== "ENOENT" && e.code !== "ENOTEMPTY") {
@@ -21041,7 +21683,7 @@ var TombstoneStore = class {
     }
     let agents;
     try {
-      agents = await fs10.readdir(paths.tombstonesDir());
+      agents = await fs11.readdir(paths.tombstonesDir());
     } catch (err) {
       const e = err;
       if (e.code === "ENOENT") {
@@ -21064,7 +21706,7 @@ var TombstoneStore = class {
   async listForAgent(agentId) {
     let files;
     try {
-      files = await fs10.readdir(paths.tombstoneAgentDir(agentId));
+      files = await fs11.readdir(paths.tombstoneAgentDir(agentId));
     } catch (err) {
       const e = err;
       if (e.code === "ENOENT") {
@@ -21099,7 +21741,7 @@ function shouldResurrectFromUpstream(tombstone, listingUpdatedAt) {
 }
 
 // src/core/synopsis-coordinator.ts
-import * as fs12 from "fs/promises";
+import * as fs13 from "fs/promises";
 
 // src/core/synopsis-agent.ts
 init_types();
@@ -21311,13 +21953,13 @@ ${SNAPSHOT_PROMPT}` : SNAPSHOT_PROMPT;
       return parsed;
     })();
     return await new Promise(
-      (resolve8, reject) => {
+      (resolve9, reject) => {
         timer = setTimeout(() => {
           timedOut = true;
           opts.logger?.warn(
             `synopsis: agent ${opts.agentId} timed out after ${timeoutMs}ms`
           );
-          resolve8(void 0);
+          resolve9(void 0);
         }, timeoutMs);
         timer.unref?.();
         work.then(
@@ -21326,7 +21968,7 @@ ${SNAPSHOT_PROMPT}` : SNAPSHOT_PROMPT;
               clearTimeout(timer);
             }
             if (!timedOut) {
-              resolve8(v);
+              resolve9(v);
             }
           },
           (err) => {
@@ -21418,10 +22060,10 @@ function extractFilesTouchedDetailed(history) {
       byTool.set(call.toolName, (byTool.get(call.toolName) ?? 0) + 1);
     }
   }
-  return [...fileTouches.entries()].map(([path21, byTool]) => {
+  return [...fileTouches.entries()].map(([path22, byTool]) => {
     const perTool = [...byTool.entries()].map(([name, count]) => ({ name, count })).sort((a, b) => b.count - a.count || a.name.localeCompare(b.name));
     const total = perTool.reduce((s, t) => s + t.count, 0);
-    return { path: path21, count: total, byTool: perTool };
+    return { path: path22, count: total, byTool: perTool };
   }).sort((a, b) => b.count - a.count || a.path.localeCompare(b.path));
 }
 function extractFilesTouched(history) {
@@ -21622,7 +22264,7 @@ var SynopsisCoordinator = class {
       });
       const modelId = this.opts.synopsisModel;
       const synopsisCwd = paths.sessionDir(sessionId);
-      await fs12.mkdir(synopsisCwd, { recursive: true }).catch(() => void 0);
+      await fs13.mkdir(synopsisCwd, { recursive: true }).catch(() => void 0);
       this.opts.logger?.info(
         `synopsis: start sessionId=${sessionId} agentId=${synopsisAgentId} historyLen=${history.length} model=${JSON.stringify(modelId ?? "(default)")} cwd=${synopsisCwd}`
       );
@@ -21726,8 +22368,217 @@ function describeFields(s) {
 
 // src/core/history-store.ts
 init_paths();
-import * as fs13 from "fs/promises";
-var SESSION_ID_PATTERN2 = /^[A-Za-z0-9_-]+$/;
+import * as fs14 from "fs/promises";
+
+// src/core/tool-content.ts
+function parseToolContentMode(raw) {
+  return raw === "summary" ? "summary" : "inline";
+}
+var SUMMARY_TEXT_CAP = 256;
+function applyToolContentMode(entries, mode) {
+  if (mode !== "summary") {
+    return entries;
+  }
+  return entries.map(summarizeEntry);
+}
+function summarizeEntry(entry) {
+  if (entry.method !== "session/update") {
+    return entry;
+  }
+  const params = entry.params;
+  if (!params || typeof params !== "object" || Array.isArray(params)) {
+    return entry;
+  }
+  const p = params;
+  const update = p.update;
+  if (!update || typeof update !== "object" || Array.isArray(update)) {
+    return entry;
+  }
+  const u = update;
+  if (u.sessionUpdate !== "tool_call" && u.sessionUpdate !== "tool_call_update") {
+    return entry;
+  }
+  const newUpdate = { ...u };
+  if (Array.isArray(u.content)) {
+    newUpdate.content = u.content.map(summarizeBlock);
+  }
+  const rawOutput = u.rawOutput;
+  if (rawOutput && typeof rawOutput === "object" && !Array.isArray(rawOutput)) {
+    const ro = rawOutput;
+    const slim = {};
+    if (ro.error !== void 0) {
+      slim.error = clip(ro.error);
+    }
+    if (ro.metadata !== void 0) {
+      slim.metadata = ro.metadata;
+    }
+    newUpdate.rawOutput = slim;
+  }
+  return { ...entry, params: { ...p, update: newUpdate } };
+}
+function isDiffBlock(block) {
+  return !!block && typeof block === "object" && !Array.isArray(block) && block.type === "diff";
+}
+function summarizeBlock(block) {
+  if (isDiffBlock(block)) {
+    const b2 = block;
+    const out2 = {
+      type: "diff",
+      oldText: "",
+      newText: ""
+    };
+    if (typeof b2.path === "string") {
+      out2.path = b2.path;
+    }
+    return out2;
+  }
+  if (!block || typeof block !== "object" || Array.isArray(block)) {
+    return block;
+  }
+  const b = block;
+  const out = { ...b };
+  if (typeof b.text === "string") {
+    out.text = clip(b.text);
+  }
+  if (typeof b.content === "string") {
+    out.content = clip(b.content);
+  } else if (b.content && typeof b.content === "object") {
+    out.content = summarizeBlock(b.content);
+  }
+  return out;
+}
+function clip(value) {
+  if (typeof value === "string" && value.length > SUMMARY_TEXT_CAP) {
+    const elided = value.length - SUMMARY_TEXT_CAP;
+    return `${value.slice(0, SUMMARY_TEXT_CAP)}\u2026[+${elided} chars omitted from summary export]`;
+  }
+  return value;
+}
+var TOOL_BLOB_THRESHOLD = 2048;
+function collectToolBlobHashes(entries) {
+  const out = /* @__PURE__ */ new Set();
+  const walk = (value) => {
+    if (isToolBlobRef(value)) {
+      out.add(value.__hydraBlob);
+      return;
+    }
+    if (Array.isArray(value)) {
+      for (const item of value) {
+        walk(item);
+      }
+      return;
+    }
+    if (value && typeof value === "object") {
+      for (const v of Object.values(value)) {
+        walk(v);
+      }
+    }
+  };
+  for (const entry of entries) {
+    walk(entry.params);
+  }
+  return out;
+}
+function isToolBlobRef(value) {
+  return !!value && typeof value === "object" && !Array.isArray(value) && typeof value.__hydraBlob === "string";
+}
+function isToolEntry(entry) {
+  if (entry.method !== "session/update") {
+    return false;
+  }
+  const params = entry.params;
+  if (!params || typeof params !== "object" || Array.isArray(params)) {
+    return false;
+  }
+  const update = params.update;
+  if (!update || typeof update !== "object" || Array.isArray(update)) {
+    return false;
+  }
+  const kind = update.sessionUpdate;
+  return kind === "tool_call" || kind === "tool_call_update";
+}
+async function externalizeToolEntry(entry, put) {
+  if (!isToolEntry(entry)) {
+    return entry;
+  }
+  const p = entry.params;
+  const update = p.update;
+  const newUpdate = await deepExternalize(update, put);
+  return { ...entry, params: { ...p, update: newUpdate } };
+}
+async function deepExternalize(value, put) {
+  if (typeof value === "string") {
+    if (value.length <= TOOL_BLOB_THRESHOLD) {
+      return value;
+    }
+    const hash = await put(value);
+    if (hash === null) {
+      return value;
+    }
+    const ref = { __hydraBlob: hash, bytes: value.length };
+    return ref;
+  }
+  if (Array.isArray(value)) {
+    const out = [];
+    for (const item of value) {
+      out.push(await deepExternalize(item, put));
+    }
+    return out;
+  }
+  if (value && typeof value === "object") {
+    const out = {};
+    for (const [k, v] of Object.entries(value)) {
+      out[k] = await deepExternalize(v, put);
+    }
+    return out;
+  }
+  return value;
+}
+async function expandToolRefs(entry, get) {
+  const params = entry.params;
+  if (!params || typeof params !== "object" || Array.isArray(params)) {
+    return entry;
+  }
+  const expanded = await deepExpand(params, get);
+  if (expanded === params) {
+    return entry;
+  }
+  return { ...entry, params: expanded };
+}
+async function deepExpand(value, get) {
+  if (isToolBlobRef(value)) {
+    const text = await get(value.__hydraBlob);
+    return text ?? "";
+  }
+  if (Array.isArray(value)) {
+    let changed = false;
+    const out = [];
+    for (const item of value) {
+      const next = await deepExpand(item, get);
+      if (next !== item) {
+        changed = true;
+      }
+      out.push(next);
+    }
+    return changed ? out : value;
+  }
+  if (value && typeof value === "object") {
+    let changed = false;
+    const out = {};
+    for (const [k, v] of Object.entries(value)) {
+      const next = await deepExpand(v, get);
+      if (next !== v) {
+        changed = true;
+      }
+      out[k] = next;
+    }
+    return changed ? out : value;
+  }
+  return value;
+}
+
+// src/core/history-store.ts
+var SESSION_ID_PATTERN3 = /^[A-Za-z0-9_-]+$/;
 var DEFAULT_MAX_ENTRIES = 1e3;
 var HistoryStore = class {
   // Serialize writes per session id so appends and rewrites don't
@@ -21739,26 +22590,34 @@ var HistoryStore = class {
     this.maxEntries = options.maxEntries ?? DEFAULT_MAX_ENTRIES;
   }
   async append(sessionId, entry) {
-    if (!SESSION_ID_PATTERN2.test(sessionId)) {
+    if (!SESSION_ID_PATTERN3.test(sessionId)) {
       return;
     }
     return this.enqueue(sessionId, async () => {
-      await fs13.mkdir(paths.sessionDir(sessionId), { recursive: true });
-      const line = JSON.stringify(entry) + "\n";
-      await fs13.appendFile(paths.historyFile(sessionId), line, {
+      await fs14.mkdir(paths.sessionDir(sessionId), { recursive: true });
+      const stored = await externalizeToolEntry(
+        entry,
+        (t) => putToolBlob(sessionId, t)
+      );
+      const line = JSON.stringify(stored) + "\n";
+      await fs14.appendFile(paths.historyFile(sessionId), line, {
         encoding: "utf8",
         mode: 384
       });
     });
   }
   async rewrite(sessionId, entries) {
-    if (!SESSION_ID_PATTERN2.test(sessionId)) {
+    if (!SESSION_ID_PATTERN3.test(sessionId)) {
       return;
     }
     return this.enqueue(sessionId, async () => {
-      await fs13.mkdir(paths.sessionDir(sessionId), { recursive: true });
-      const body = entries.length === 0 ? "" : entries.map((e) => JSON.stringify(e)).join("\n") + "\n";
-      await fs13.writeFile(paths.historyFile(sessionId), body, {
+      await fs14.mkdir(paths.sessionDir(sessionId), { recursive: true });
+      const stored = [];
+      for (const e of entries) {
+        stored.push(await externalizeToolEntry(e, (t) => putToolBlob(sessionId, t)));
+      }
+      const body = stored.length === 0 ? "" : stored.map((e) => JSON.stringify(e)).join("\n") + "\n";
+      await fs14.writeFile(paths.historyFile(sessionId), body, {
         encoding: "utf8",
         mode: 384
       });
@@ -21769,13 +22628,13 @@ var HistoryStore = class {
   // it's safe to invoke alongside ongoing writes; a no-op if the file is
   // already at or below the cap.
   async compact(sessionId, maxEntries) {
-    if (!SESSION_ID_PATTERN2.test(sessionId)) {
+    if (!SESSION_ID_PATTERN3.test(sessionId)) {
       return;
     }
     return this.enqueue(sessionId, async () => {
       let raw;
       try {
-        raw = await fs13.readFile(paths.historyFile(sessionId), "utf8");
+        raw = await fs14.readFile(paths.historyFile(sessionId), "utf8");
       } catch (err) {
         const e = err;
         if (e.code === "ENOENT") {
@@ -21788,23 +22647,29 @@ var HistoryStore = class {
         return;
       }
       const trimmed = lines.slice(-maxEntries);
-      await fs13.writeFile(paths.historyFile(sessionId), trimmed.join("\n") + "\n", {
+      await fs14.writeFile(paths.historyFile(sessionId), trimmed.join("\n") + "\n", {
         encoding: "utf8",
         mode: 384
       });
     });
   }
-  async load(sessionId) {
-    if (!SESSION_ID_PATTERN2.test(sessionId)) {
+  // `tools` selects how externalized tool content is materialized:
+  //   "inline" (default) — expand blob refs back to full content, so every
+  //                        consumer sees the original recorded shape.
+  //   "references"       — leave references in place (the lean form) for
+  //                        clients that fetch tool content on demand.
+  async load(sessionId, opts = {}) {
+    if (!SESSION_ID_PATTERN3.test(sessionId)) {
       return [];
     }
+    const expand = (opts.tools ?? "inline") === "inline";
     const pending = this.writeQueues.get(sessionId);
     if (pending) {
       await pending;
     }
     let raw;
     try {
-      raw = await fs13.readFile(paths.historyFile(sessionId), "utf8");
+      raw = await fs14.readFile(paths.historyFile(sessionId), "utf8");
     } catch (err) {
       const e = err;
       if (e.code === "ENOENT") {
@@ -21839,10 +22704,25 @@ var HistoryStore = class {
         recordedAt: obj.recordedAt
       });
     }
-    if (out.length > this.maxEntries) {
-      return out.slice(-this.maxEntries);
+    const kept = out.length > this.maxEntries ? out.slice(-this.maxEntries) : out;
+    if (!expand) {
+      return kept;
     }
-    return out;
+    const blobCache = /* @__PURE__ */ new Map();
+    const get = async (hash) => {
+      const cached2 = blobCache.get(hash);
+      if (cached2 !== void 0) {
+        return cached2;
+      }
+      const value = await getToolBlob(sessionId, hash);
+      blobCache.set(hash, value);
+      return value;
+    };
+    const inlined = [];
+    for (const entry of kept) {
+      inlined.push(await expandToolRefs(entry, get));
+    }
+    return inlined;
   }
   // Wait for every pending append/rewrite/compact across all sessions to
   // settle. Daemon shutdown calls this after closing sessions so the final
@@ -21858,20 +22738,21 @@ var HistoryStore = class {
     await Promise.allSettled(pending);
   }
   async delete(sessionId) {
-    if (!SESSION_ID_PATTERN2.test(sessionId)) {
+    if (!SESSION_ID_PATTERN3.test(sessionId)) {
       return;
     }
     return this.enqueue(sessionId, async () => {
       try {
-        await fs13.unlink(paths.historyFile(sessionId));
+        await fs14.unlink(paths.historyFile(sessionId));
       } catch (err) {
         const e = err;
         if (e.code !== "ENOENT") {
           throw err;
         }
       }
+      await deleteToolBlobs(sessionId);
       try {
-        await fs13.rmdir(paths.sessionDir(sessionId));
+        await fs14.rmdir(paths.sessionDir(sessionId));
       } catch (err) {
         const e = err;
         if (e.code !== "ENOENT" && e.code !== "ENOTEMPTY") {
@@ -21958,7 +22839,12 @@ var Bundle = z7.object({
   }),
   session: BundleSession,
   history: z7.array(HistoryEntrySchema),
-  promptHistory: z7.array(z7.string()).optional()
+  promptHistory: z7.array(z7.string()).optional(),
+  // Externalized tool-content blobs referenced by the history, present when
+  // the bundle was exported with tools=references. Map of sha256 → base64
+  // of the gzipped content. Restored to the session's tools/ store on
+  // import; the ref-form history hydrates from them.
+  toolBlobs: z7.record(z7.string()).optional()
 });
 function encodeBundle(params) {
   const bundle = {
@@ -21993,6 +22879,9 @@ function encodeBundle(params) {
   if (params.promptHistory !== void 0) {
     bundle.promptHistory = params.promptHistory;
   }
+  if (params.toolBlobs !== void 0 && Object.keys(params.toolBlobs).length > 0) {
+    bundle.toolBlobs = params.toolBlobs;
+  }
   return bundle;
 }
 function decodeBundle(raw) {
@@ -22000,6 +22889,7 @@ function decodeBundle(raw) {
 }
 
 // src/core/session-manager.ts
+init_model_resolve();
 init_types();
 init_hydra_version();
 init_queue_store();
@@ -22410,7 +23300,7 @@ var SessionManager = class {
   }
   async dirExists(cwd) {
     try {
-      return (await fs15.stat(cwd)).isDirectory();
+      return (await fs16.stat(cwd)).isDirectory();
     } catch {
       return false;
     }
@@ -22600,6 +23490,25 @@ var SessionManager = class {
     }
     return out;
   }
+  // Issue session/set_model for a seed model (defaultModels / --model) at
+  // bootstrap, logging success or a non-fatal rejection. `where` is the
+  // human-readable provenance string used in log lines. A bad id in config
+  // shouldn't break session creation, so a rejection is swallowed.
+  async applySeedModel(agent, sessionId, modelId, where) {
+    try {
+      await agent.connection.request("session/set_model", {
+        sessionId,
+        modelId
+      });
+      this.logger?.info(`${where}: session/set_model accepted`);
+      return true;
+    } catch (err) {
+      this.logger?.warn(
+        `${where} rejected by agent (${err.message}); session will use the agent's own default`
+      );
+      return false;
+    }
+  }
   // Bootstrap a fresh agent process: registry resolve → spawn → initialize
   // → session/new. Shared by create() and the /hydra agent path so both
   // go through the same env / capabilities / error-handling.
@@ -22648,23 +23557,31 @@ var SessionManager = class {
       const initialModels = extractInitialModels(newResult);
       const desired = params.model ?? this.defaultModels[params.agentId];
       if (desired && desired !== initialModel) {
-        const validates = initialModels.length === 0 || initialModels.some((m) => m.modelId === desired);
-        if (validates) {
-          try {
-            await agent.connection.request("session/set_model", {
-              sessionId: sessionIdRaw,
-              modelId: desired
-            });
+        const resolution = resolveModelId(desired, initialModels);
+        const where = params.model !== void 0 ? `model=${JSON.stringify(desired)}` : `defaultModels[${params.agentId}]=${JSON.stringify(desired)}`;
+        if (resolution.kind === "exact" || resolution.kind === "none") {
+          if (await this.applySeedModel(agent, sessionIdRaw, desired, where)) {
             initialModel = desired;
-          } catch (err) {
-            this.logger?.warn(
-              `defaultModels[${params.agentId}]=${JSON.stringify(desired)} rejected by agent (${err.message}); session will use ${JSON.stringify(initialModel)}`
-            );
           }
+        } else if (resolution.kind === "resolved") {
+          if (resolution.modelId === initialModel) {
+            initialModel = resolution.modelId;
+          } else if (await this.applySeedModel(
+            agent,
+            sessionIdRaw,
+            resolution.modelId,
+            `${where} resolved to ${JSON.stringify(resolution.modelId)}`
+          )) {
+            initialModel = resolution.modelId;
+          }
+        } else if (resolution.kind === "ambiguous") {
+          this.logger?.warn(
+            `${where} is ambiguous (trailing-segment matches [${resolution.candidates.join(", ")}]); skipping session/set_model, session will use ${JSON.stringify(initialModel)}`
+          );
         } else {
           const known = initialModels.map((m) => m.modelId).join(", ");
           this.logger?.warn(
-            `defaultModels[${params.agentId}]=${JSON.stringify(desired)} not in agent's availableModels ([${known}]); skipping session/set_model, session will use ${JSON.stringify(initialModel)}`
+            `${where} not in agent's availableModels ([${known}]); skipping session/set_model, session will use ${JSON.stringify(initialModel)}`
           );
         }
       }
@@ -22797,6 +23714,12 @@ var SessionManager = class {
   async loadHistory(sessionId) {
     return this.histories.load(sessionId);
   }
+  // Read a single externalized tool-content blob by sha256 (the lean
+  // `tools: "references"` fetch-on-expand path). Null if the session id or
+  // hash is malformed, or the blob isn't present.
+  async loadToolBlob(sessionId, hash) {
+    return getToolBlob(sessionId, hash);
+  }
   async loadFromDisk(sessionId) {
     const record = await this.store.read(sessionId);
     if (!record) {
@@ -23034,7 +23957,7 @@ var SessionManager = class {
   // disk. Backfills lineageId if the on-disk record pre-dates that
   // field. Returns undefined if the session doesn't exist. Callers
   // populate the bundle's exportedFrom metadata themselves.
-  async exportBundle(sessionId) {
+  async exportBundle(sessionId, opts = {}) {
     const record = await this.store.read(sessionId);
     if (!record) {
       return void 0;
@@ -23057,9 +23980,20 @@ var SessionManager = class {
       }).catch(() => void 0);
       withLineage = backfilled;
     }
-    const history = await this.histories.load(sessionId).catch(() => []);
+    const tools = opts.tools ?? "inline";
+    const history = await this.histories.load(sessionId, tools === "references" ? { tools: "references" } : {}).catch(() => []);
     const promptHistory = await loadPromptHistorySafely(sessionId);
-    return { record: withLineage, history, promptHistory };
+    if (tools !== "references") {
+      return { record: withLineage, history, promptHistory };
+    }
+    const toolBlobs = {};
+    for (const hash of collectToolBlobHashes(history)) {
+      const gz = await readToolBlobGz(sessionId, hash);
+      if (gz) {
+        toolBlobs[hash] = gz.toString("base64");
+      }
+    }
+    return { record: withLineage, history, promptHistory, toolBlobs };
   }
   // Create a local session from an imported bundle. Without `replace`,
   // a bundle with a lineageId we already have on disk throws
@@ -23220,9 +24154,18 @@ var SessionManager = class {
       args.sessionId,
       args.bundle.history
     );
+    if (args.bundle.toolBlobs) {
+      for (const [hash, b64] of Object.entries(args.bundle.toolBlobs)) {
+        await writeToolBlobGz(
+          args.sessionId,
+          hash,
+          Buffer.from(b64, "base64")
+        ).catch(() => void 0);
+      }
+    }
     const sourceMtime = new Date(args.bundle.session.updatedAt);
     if (!Number.isNaN(sourceMtime.getTime())) {
-      await fs15.utimes(paths.historyFile(args.sessionId), sourceMtime, sourceMtime).catch(() => void 0);
+      await fs16.utimes(paths.historyFile(args.sessionId), sourceMtime, sourceMtime).catch(() => void 0);
     }
     if (args.bundle.promptHistory && args.bundle.promptHistory.length > 0) {
       await saveHistory(
@@ -23869,7 +24812,7 @@ function findLastTurnComplete(history) {
 }
 async function loadPromptHistorySafely(sessionId) {
   try {
-    const raw = await fs15.readFile(paths.tuiHistoryFile(sessionId), "utf8");
+    const raw = await fs16.readFile(paths.tuiHistoryFile(sessionId), "utf8");
     const out = [];
     for (const line of raw.split("\n")) {
       if (line.length === 0) {
@@ -23890,7 +24833,7 @@ async function loadPromptHistorySafely(sessionId) {
 }
 async function historyStatus(sessionId) {
   try {
-    const st = await fs15.stat(paths.historyFile(sessionId));
+    const st = await fs16.stat(paths.historyFile(sessionId));
     return {
       mtime: new Date(st.mtimeMs).toISOString(),
       hasContent: st.size > 0
@@ -23911,7 +24854,7 @@ function effectiveInteractive(record, hasContent) {
 
 // src/core/child-supervisor.ts
 import { spawn as spawn4 } from "child_process";
-import * as fs16 from "fs";
+import * as fs17 from "fs";
 import * as fsp5 from "fs/promises";
 import * as path11 from "path";
 
@@ -24026,9 +24969,9 @@ var ChildSupervisor = class {
       } catch {
       }
       tasks.push(
-        new Promise((resolve8) => {
+        new Promise((resolve9) => {
           if (child.exitCode !== null || child.signalCode !== null) {
-            resolve8();
+            resolve9();
             return;
           }
           const timer = setTimeout(() => {
@@ -24036,11 +24979,11 @@ var ChildSupervisor = class {
               child.kill("SIGKILL");
             } catch {
             }
-            resolve8();
+            resolve9();
           }, STOP_GRACE_MS);
           child.on("exit", () => {
             clearTimeout(timer);
-            resolve8();
+            resolve9();
           });
         })
       );
@@ -24164,8 +25107,8 @@ var ChildSupervisor = class {
     if (child.exitCode !== null || child.signalCode !== null) {
       return;
     }
-    const exited = new Promise((resolve8) => {
-      entry.exitWaiters.push(resolve8);
+    const exited = new Promise((resolve9) => {
+      entry.exitWaiters.push(resolve9);
     });
     try {
       child.kill("SIGTERM");
@@ -24284,7 +25227,7 @@ var ChildSupervisor = class {
     }
     const cfg = entry.config;
     const command = cfg.command.length > 0 ? cfg.command : [cfg.name];
-    const logStream = fs16.createWriteStream(
+    const logStream = fs17.createWriteStream(
       this.adapter.paths.logFile(cfg.name),
       { flags: "a" }
     );
@@ -24340,7 +25283,7 @@ var ChildSupervisor = class {
     }
     if (typeof child.pid === "number") {
       try {
-        fs16.writeFileSync(
+        fs17.writeFileSync(
           this.adapter.paths.pidFile(cfg.name),
           `${child.pid}
 `,
@@ -24366,7 +25309,7 @@ var ChildSupervisor = class {
     });
     child.on("exit", (code, signal) => {
       try {
-        fs16.unlinkSync(this.adapter.paths.pidFile(cfg.name));
+        fs17.unlinkSync(this.adapter.paths.pidFile(cfg.name));
       } catch {
       }
       logStream.write(
@@ -24381,8 +25324,8 @@ var ChildSupervisor = class {
         entry.processToken = void 0;
       }
       const waiters = entry.exitWaiters.splice(0);
-      for (const resolve8 of waiters) {
-        resolve8();
+      for (const resolve9 of waiters) {
+        resolve9();
       }
       if (this.stopping || entry.manuallyStopped) {
         try {
@@ -24717,7 +25660,7 @@ init_hydra_version();
 init_paths();
 init_json_store();
 import * as path13 from "path";
-import { createHash, randomBytes as randomBytes2, timingSafeEqual } from "crypto";
+import { createHash as createHash2, randomBytes as randomBytes2, timingSafeEqual } from "crypto";
 var TOKEN_PREFIX = "hydra_session_";
 var DEFAULT_TTL_SEC = 60 * 60 * 24 * 30;
 var ID_LENGTH = 12;
@@ -24727,7 +25670,7 @@ function tokensFilePath() {
   return path13.join(paths.home(), "session-tokens.json");
 }
 function sha256Hex(input) {
-  return createHash("sha256").update(input).digest("hex");
+  return createHash2("sha256").update(input).digest("hex");
 }
 function randomHex(bytes) {
   return randomBytes2(bytes).toString("hex");
@@ -25844,15 +26787,21 @@ function registerSessionRoutes(app, manager, defaults) {
   app.get("/v1/sessions/:id/export", async (request, reply) => {
     const raw = request.params.id;
     const id = await manager.resolveCanonicalId(raw) ?? raw;
-    const exported = await manager.exportBundle(id);
+    const toolsRaw = request.query?.tools;
+    const toolMode = toolsRaw === "references" ? "references" : parseToolContentMode(toolsRaw);
+    const exported = await manager.exportBundle(
+      id,
+      toolMode === "references" ? { tools: "references" } : {}
+    );
     if (!exported) {
       reply.code(404).send({ error: "session not found" });
       return;
     }
     const bundle = encodeBundle({
       record: exported.record,
-      history: exported.history,
+      history: toolMode === "summary" ? applyToolContentMode(exported.history, "summary") : exported.history,
       promptHistory: exported.promptHistory.length > 0 ? exported.promptHistory : void 0,
+      ...exported.toolBlobs !== void 0 ? { toolBlobs: exported.toolBlobs } : {},
       hydraVersion: HYDRA_VERSION,
       machine: os4.hostname(),
       hydraHost: resolveHydraHost(defaults)
@@ -25864,6 +26813,17 @@ function registerSessionRoutes(app, manager, defaults) {
     );
     reply.code(200).send(bundle);
   });
+  app.get("/v1/sessions/:id/tools/:hash", async (request, reply) => {
+    const params = request.params;
+    const id = await manager.resolveCanonicalId(params.id) ?? params.id;
+    const blob = await manager.loadToolBlob(id, params.hash);
+    if (blob === null) {
+      reply.code(404).send({ error: "tool blob not found" });
+      return;
+    }
+    reply.header("Content-Type", "text/plain; charset=utf-8");
+    reply.code(200).send(blob);
+  });
   app.get("/v1/sessions/:id/transcript", async (request, reply) => {
     const raw = request.params.id;
     const id = await manager.resolveCanonicalId(raw) ?? raw;
@@ -26350,11 +27310,11 @@ import { z as z8 } from "zod";
 
 // src/core/password.ts
 init_paths();
-import * as fs17 from "fs/promises";
+import * as fs18 from "fs/promises";
 import * as path15 from "path";
 import { randomBytes as randomBytes3, scrypt, timingSafeEqual as timingSafeEqual2 } from "crypto";
-import { promisify } from "util";
-var scryptAsync = promisify(scrypt);
+import { promisify as promisify2 } from "util";
+var scryptAsync = promisify2(scrypt);
 function passwordHashPath() {
   return path15.join(paths.home(), "password-hash");
 }
@@ -26377,15 +27337,15 @@ async function setPassword(plaintext) {
   });
   const encoded = `scrypt$${DEFAULT_N}$${DEFAULT_R}$${DEFAULT_P}$${salt.toString("hex")}$${key.toString("hex")}
 `;
-  await fs17.mkdir(paths.home(), { recursive: true });
-  await fs17.writeFile(passwordHashPath(), encoded, {
+  await fs18.mkdir(paths.home(), { recursive: true });
+  await fs18.writeFile(passwordHashPath(), encoded, {
     encoding: "utf8",
     mode: 384
   });
 }
 async function hasPassword() {
   try {
-    const text = await fs17.readFile(passwordHashPath(), "utf8");
+    const text = await fs18.readFile(passwordHashPath(), "utf8");
     return text.trim().length > 0;
   } catch (err) {
     const e = err;
@@ -26401,7 +27361,7 @@ async function verifyPassword(plaintext) {
   }
   let line;
   try {
-    line = (await fs17.readFile(passwordHashPath(), "utf8")).trim();
+    line = (await fs18.readFile(passwordHashPath(), "utf8")).trim();
   } catch (err) {
     const e = err;
     if (e.code === "ENOENT") {
@@ -26523,6 +27483,7 @@ function remoteIp(request) {
 // src/daemon/acp-ws.ts
 init_connection();
 init_ws_stream();
+init_model_resolve();
 init_types();
 import { nanoid as nanoid2 } from "nanoid";
 init_hydra_version();
@@ -26778,13 +27739,13 @@ function registerAcpWsEndpoint(app, deps) {
             { code: JsonRpcErrorCodes.SessionNotFound }
           );
         }
-        return new Promise((resolve8) => {
+        return new Promise((resolve9) => {
           const entries = [];
           let unsubscribe;
           const finish = () => {
             clearTimeout(timer);
             unsubscribe?.();
-            resolve8({ entries });
+            resolve9({ entries });
           };
           unsubscribe = child.onBroadcast((entry) => {
             entries.push(entry);
@@ -26826,6 +27787,24 @@ function registerAcpWsEndpoint(app, deps) {
         return { ok: true };
       });
     }
+    connection.onRequest("hydra-acp/session/tool_content", async (raw) => {
+      const params = raw ?? {};
+      if (typeof params.sessionId !== "string" || typeof params.hash !== "string") {
+        throw Object.assign(
+          new Error("hydra-acp/session/tool_content requires sessionId and hash"),
+          { code: JsonRpcErrorCodes.InvalidParams }
+        );
+      }
+      const id = await deps.manager.resolveCanonicalId(params.sessionId) ?? params.sessionId;
+      const content = await deps.manager.loadToolBlob(id, params.hash);
+      if (content === null) {
+        throw Object.assign(
+          new Error("tool content not found"),
+          { code: JsonRpcErrorCodes.SessionNotFound }
+        );
+      }
+      return { content };
+    });
     connection.onRequest("session/new", async (raw) => {
       const params = SessionNewParams.parse(raw);
       const hydraMeta = extractHydraMeta(
@@ -27032,7 +28011,13 @@ function registerAcpWsEndpoint(app, deps) {
       const { entries: replay, appliedPolicy } = await session.attach(
         client,
         params.historyPolicy,
-        { afterMessageId: params.afterMessageId, raw: drip }
+        {
+          afterMessageId: params.afterMessageId,
+          raw: drip,
+          // Lean clients opt into ref-form tool content via _meta; default
+          // stays inline so existing/third-party clients are unaffected.
+          ...hydraAttach.toolContent !== void 0 ? { toolContent: hydraAttach.toolContent } : {}
+        }
       );
       state.attached.set(session.sessionId, {
         sessionId: session.sessionId,
@@ -27066,8 +28051,13 @@ function registerAcpWsEndpoint(app, deps) {
           }
         })();
       } else {
-        for (const note of replay) {
-          await connection.notify(note.method, note.params);
+        const REPLAY_FLUSH_EVERY = 200;
+        for (let i = 0; i < replay.length; i++) {
+          const note = replay[i];
+          const pending = connection.notify(note.method, note.params).catch(() => void 0);
+          if ((i + 1) % REPLAY_FLUSH_EVERY === 0) {
+            await pending;
+          }
         }
       }
       session.replayPendingPermissions(client);
@@ -27324,8 +28314,11 @@ function registerAcpWsEndpoint(app, deps) {
         return null;
       }
       app.log.info(decision.logMessage);
-      const { modelId } = rawParams;
-      const result = await decision.session.forwardRequest("session/set_model", rawParams);
+      const { modelId } = decision;
+      const result = await decision.session.forwardRequest("session/set_model", {
+        ...rawParams,
+        modelId
+      });
       decision.session.applyModelChange(modelId);
       return result;
     });
@@ -27547,36 +28540,47 @@ function decideSetModel(rawParams, manager) {
     };
   }
   const advertised = session.availableModels();
-  if (advertised.length === 0) {
+  const resolution = resolveModelId(params.modelId, advertised);
+  if (resolution.kind === "none") {
     return {
       kind: "ok",
       session,
+      modelId: params.modelId,
       logMessage: `session/set_model passthrough (no availableModels) sessionId=${params.sessionId} modelId=${JSON.stringify(params.modelId)}`
     };
   }
-  const match = advertised.find((m) => m.modelId === params.modelId);
-  if (!match) {
-    const known = advertised.map((m) => m.modelId).join(", ");
-    if (session.currentModel !== void 0 && session.currentModel.length > 0) {
-      return {
-        kind: "no_op",
-        session,
-        sessionId: params.sessionId,
-        currentModel: session.currentModel,
-        logMessage: `session/set_model no_op (resyncing client) sessionId=${params.sessionId} requested=${JSON.stringify(params.modelId)} actual=${JSON.stringify(session.currentModel)} agentId=${session.agentId} known=[${known}]`
-      };
-    }
+  if (resolution.kind === "exact") {
     return {
-      kind: "error",
-      code: JsonRpcErrorCodes.InvalidParams,
-      message: `model "${params.modelId}" is not in this session's availableModels (agent ${session.agentId}); known models: ${known}`,
-      logMessage: `session/set_model rejected sessionId=${params.sessionId} modelId=${JSON.stringify(params.modelId)} agentId=${session.agentId} known=[${known}] (no current model to fall back to)`
+      kind: "ok",
+      session,
+      modelId: params.modelId,
+      logMessage: `session/set_model accepted sessionId=${params.sessionId} modelId=${JSON.stringify(params.modelId)}`
+    };
+  }
+  if (resolution.kind === "resolved") {
+    return {
+      kind: "ok",
+      session,
+      modelId: resolution.modelId,
+      logMessage: `session/set_model resolved sessionId=${params.sessionId} requested=${JSON.stringify(params.modelId)} \u2192 ${JSON.stringify(resolution.modelId)}`
+    };
+  }
+  const known = advertised.map((m) => m.modelId).join(", ");
+  const detail = resolution.kind === "ambiguous" ? `ambiguous (trailing-segment matches [${resolution.candidates.join(", ")}])` : `not in availableModels`;
+  if (session.currentModel !== void 0 && session.currentModel.length > 0) {
+    return {
+      kind: "no_op",
+      session,
+      sessionId: params.sessionId,
+      currentModel: session.currentModel,
+      logMessage: `session/set_model no_op (resyncing client) sessionId=${params.sessionId} requested=${JSON.stringify(params.modelId)} ${detail} actual=${JSON.stringify(session.currentModel)} agentId=${session.agentId} known=[${known}]`
     };
   }
   return {
-    kind: "ok",
-    session,
-    logMessage: `session/set_model accepted sessionId=${params.sessionId} modelId=${JSON.stringify(params.modelId)}`
+    kind: "error",
+    code: JsonRpcErrorCodes.InvalidParams,
+    message: `model "${params.modelId}" is ${detail === "not in availableModels" ? "not in this session's availableModels" : detail} (agent ${session.agentId}); known models: ${known}`,
+    logMessage: `session/set_model rejected sessionId=${params.sessionId} modelId=${JSON.stringify(params.modelId)} ${detail} agentId=${session.agentId} known=[${known}] (no current model to fall back to)`
   };
 }
 function buildViewerResponseMeta(fromDisk) {
@@ -27714,8 +28718,8 @@ var McpTokenRegistry = class {
     }
     let resolveSession2;
     let rejectSession;
-    const sessionReady = new Promise((resolve8, reject) => {
-      resolveSession2 = resolve8;
+    const sessionReady = new Promise((resolve9, reject) => {
+      resolveSession2 = resolve9;
       rejectSession = reject;
     });
     sessionReady.catch(() => void 0);
@@ -28016,8 +29020,8 @@ function registerStdinMcpRoutes(app, tokenRegistry) {
       session = entry.session;
     } else {
       let timer;
-      const timeout = new Promise((resolve8) => {
-        timer = setTimeout(() => resolve8(void 0), SESSION_READY_TIMEOUT_MS);
+      const timeout = new Promise((resolve9) => {
+        timer = setTimeout(() => resolve9(void 0), SESSION_READY_TIMEOUT_MS);
       });
       const resolved = await Promise.race([
         entry.sessionReady.catch(() => void 0),
@@ -28270,8 +29274,8 @@ function registerExtensionMcpRoutes(app, tokenRegistry, extensionMcp, options =
     }
     if (entry.session === void 0) {
       let timer;
-      const timeout = new Promise((resolve8) => {
-        timer = setTimeout(() => resolve8(void 0), SESSION_READY_TIMEOUT_MS2);
+      const timeout = new Promise((resolve9) => {
+        timer = setTimeout(() => resolve9(void 0), SESSION_READY_TIMEOUT_MS2);
       });
       const resolved = await Promise.race([
         entry.sessionReady.catch(() => void 0),
@@ -28376,6 +29380,7 @@ async function startDaemon(config, serviceToken) {
     stderrTailBytes: config.daemon.agentStderrTailBytes,
     logger: agentLogger
   });
+  setToolBlobCompression(config.compressToolContent);
   const extensionCommands = new ExtensionCommandRegistry();
   const manager = new SessionManager(registry, spawner, void 0, {
     idleTimeoutMs: config.daemon.sessionIdleTimeoutSeconds * 1e3,
@@ -28507,7 +29512,7 @@ async function startDaemon(config, serviceToken) {
     setAgentPruneLogger(null);
     await app.close();
     try {
-      fs18.unlinkSync(paths.pidFile());
+      fs19.unlinkSync(paths.pidFile());
     } catch {
     }
     try {
@@ -28557,7 +29562,7 @@ init_daemon_bootstrap();
 init_hydra_version();
 
 // src/cli/commands/log-tail.ts
-import * as fs19 from "fs";
+import * as fs20 from "fs";
 import * as fsp8 from "fs/promises";
 async function runLogTail(logPath, argv, notFoundMessage) {
   const opts = parseLogTailFlags(argv);
@@ -28581,7 +29586,7 @@ async function runLogTail(logPath, argv, notFoundMessage) {
   process.stdout.write(`-- following ${logPath} --
 `);
   let pending = false;
-  const watcher = fs19.watch(logPath, () => {
+  const watcher = fs20.watch(logPath, () => {
     if (pending) {
       return;
     }
@@ -28609,10 +29614,10 @@ async function runLogTail(logPath, argv, notFoundMessage) {
       }
     });
   });
-  await new Promise((resolve8) => {
+  await new Promise((resolve9) => {
     const finish = () => {
       watcher.close();
-      resolve8();
+      resolve9();
     };
     process.once("SIGINT", finish);
     process.once("SIGTERM", finish);
@@ -28903,7 +29908,7 @@ init_remote_target();
 init_remote_url();
 init_session();
 init_discovery();
-import * as fs20 from "fs/promises";
+import * as fs21 from "fs/promises";
 import * as path16 from "path";
 init_session_row();
 async function runSessionsList(opts = {}) {
@@ -29026,18 +30031,19 @@ async function runSessionsRemove(id) {
   process.stdout.write(`Removed ${id}
 `);
 }
-async function runSessionsExport(id, outPath) {
+async function runSessionsExport(id, outPath, tools) {
   if (!id) {
     process.stderr.write(
-      "Usage: hydra-acp sessions export <session-id> [--out <file>]\n"
+      "Usage: hydra-acp sessions export <session-id> [--out <file>] [--tools inline|summary]\n"
     );
     process.exit(2);
   }
   const config = await loadConfig();
   const serviceToken = await loadServiceToken();
   const baseUrl = httpBase(config.daemon.host, config.daemon.port, !!config.daemon.tls);
+  const query = tools === "summary" ? "?tools=summary" : "";
   const response = await fetch(
-    `${baseUrl}/v1/sessions/${encodeURIComponent(id)}/export`,
+    `${baseUrl}/v1/sessions/${encodeURIComponent(id)}/export${query}`,
     {
       headers: { Authorization: `Bearer ${serviceToken}` }
     }
@@ -29057,8 +30063,8 @@ async function runSessionsExport(id, outPath) {
     return;
   }
   const resolved = outPath === "." ? deriveFilenameFrom(response, id) : outPath;
-  await fs20.mkdir(path16.dirname(path16.resolve(resolved)), { recursive: true });
-  await fs20.writeFile(resolved, body, { encoding: "utf8", mode: 384 });
+  await fs21.mkdir(path16.dirname(path16.resolve(resolved)), { recursive: true });
+  await fs21.writeFile(resolved, body, { encoding: "utf8", mode: 384 });
   process.stdout.write(`Wrote ${resolved}
 `);
 }
@@ -29105,21 +30111,21 @@ async function runSessionsTranscript(idOrFile, outPath) {
     return;
   }
   const resolved = outPath === "." ? defaultName : outPath;
-  await fs20.mkdir(path16.dirname(path16.resolve(resolved)), { recursive: true });
-  await fs20.writeFile(resolved, body, { encoding: "utf8", mode: 384 });
+  await fs21.mkdir(path16.dirname(path16.resolve(resolved)), { recursive: true });
+  await fs21.writeFile(resolved, body, { encoding: "utf8", mode: 384 });
   process.stdout.write(`Wrote ${resolved}
 `);
 }
 async function readBundleFileIfExists(arg) {
   try {
-    const stat5 = await fs20.stat(arg);
+    const stat5 = await fs21.stat(arg);
     if (!stat5.isFile()) {
       return null;
     }
   } catch {
     return null;
   }
-  const text = await fs20.readFile(arg, "utf8");
+  const text = await fs21.readFile(arg, "utf8");
   try {
     return { raw: JSON.parse(text) };
   } catch (err) {
@@ -29148,7 +30154,7 @@ async function runSessionsImport(file, opts = {}) {
   if (opts.cwd !== void 0) {
     const resolved = path16.resolve(opts.cwd);
     try {
-      const stat5 = await fs20.stat(resolved);
+      const stat5 = await fs21.stat(resolved);
       if (!stat5.isDirectory()) {
         process.stderr.write(`--cwd ${resolved} is not a directory
 `);
@@ -29165,7 +30171,7 @@ async function runSessionsImport(file, opts = {}) {
   if (file === "-") {
     body = await readStdin();
   } else {
-    body = await fs20.readFile(file, "utf8");
+    body = await fs21.readFile(file, "utf8");
   }
   let bundle;
   try {
@@ -29349,7 +30355,7 @@ function splitHostPort(input, defaultPort) {
 // src/cli/commands/sessions-info.ts
 init_config();
 init_service_token();
-import * as fs21 from "fs/promises";
+import * as fs22 from "fs/promises";
 
 // src/core/history-edits.ts
 init_render_update();
@@ -29393,8 +30399,8 @@ function aggregateFileEdits(history) {
     }
   }
   const out = [];
-  for (const [path21, agg] of byPath) {
-    out.push({ path: path21, hunks: agg.hunks, created: agg.created });
+  for (const [path22, agg] of byPath) {
+    out.push({ path: path22, hunks: agg.hunks, created: agg.created });
   }
   return out;
 }
@@ -29464,13 +30470,13 @@ function extractRawEdits(update) {
       if (b.type !== "diff") {
         continue;
       }
-      const path21 = typeof b.path === "string" ? b.path : void 0;
-      if (path21 === void 0) {
+      const path22 = typeof b.path === "string" ? b.path : void 0;
+      if (path22 === void 0) {
         continue;
       }
       const oldText = typeof b.oldText === "string" ? b.oldText : "";
       const newText = typeof b.newText === "string" ? b.newText : "";
-      out.push({ path: path21, oldText, newText });
+      out.push({ path: path22, oldText, newText });
     }
     if (out.length > 0) {
       return out;
@@ -29563,16 +30569,16 @@ function openPager(opts = {}) {
 `);
     }
   });
-  const childExited = new Promise((resolve8) => {
-    child.once("exit", () => resolve8());
-    child.once("error", () => resolve8());
+  const childExited = new Promise((resolve9) => {
+    child.once("exit", () => resolve9());
+    child.once("error", () => resolve9());
   });
   return {
     stream: wrapper,
     flush: async () => {
       if (childStdin.writable) {
-        await new Promise((resolve8) => {
-          wrapper.end(() => resolve8());
+        await new Promise((resolve9) => {
+          wrapper.end(() => resolve9());
         });
       }
       await childExited;
@@ -31542,7 +32548,7 @@ function maxLen5(headerCell, values) {
 }
 
 // src/shim/proxy.ts
-import * as fs22 from "fs";
+import * as fs23 from "fs";
 init_config();
 init_remote_target();
 init_daemon_bootstrap();
@@ -32017,10 +33023,10 @@ function wireLog(direction, msg) {
     wireLogChecked = true;
     try {
       wireLogPath = paths.shimWireLogFile();
-      fs22.mkdirSync(paths.home(), { recursive: true });
-      const st = fs22.statSync(wireLogPath, { throwIfNoEntry: false });
+      fs23.mkdirSync(paths.home(), { recursive: true });
+      const st = fs23.statSync(wireLogPath, { throwIfNoEntry: false });
       if (st && st.size > WIRE_LOG_MAX_BYTES) {
-        fs22.renameSync(wireLogPath, `${wireLogPath}.1`);
+        fs23.renameSync(wireLogPath, `${wireLogPath}.1`);
       }
     } catch {
       wireLogPath = null;
@@ -32036,7 +33042,7 @@ function wireLog(direction, msg) {
       dir: direction,
       msg
     }) + "\n";
-    fs22.appendFile(wireLogPath, line, () => void 0);
+    fs23.appendFile(wireLogPath, line, () => void 0);
   } catch {
   }
 }
@@ -32421,8 +33427,8 @@ async function runCatLoop(args) {
   };
   let exitCode = 0;
   let resolveDone;
-  const done = new Promise((resolve8) => {
-    resolveDone = resolve8;
+  const done = new Promise((resolve9) => {
+    resolveDone = resolve9;
   });
   let settled = false;
   const settle = async (code) => {
@@ -32729,11 +33735,11 @@ async function openOrAttachSession(conn, opts, useAutoStream) {
   return created.sessionId;
 }
 async function openWs2(url, subprotocols) {
-  return new Promise((resolve8, reject) => {
+  return new Promise((resolve9, reject) => {
     const ws = new WebSocket2(url, subprotocols);
     const onOpen = () => {
       ws.off("error", onError);
-      resolve8(ws);
+      resolve9(ws);
     };
     const onError = (err) => {
       ws.off("open", onOpen);
@@ -33010,7 +34016,8 @@ async function main() {
       }
       if (sub === "export") {
         const out = resolveOption(flags, "out");
-        await runSessionsExport(positional[2], out);
+        const tools = resolveOption(flags, "tools");
+        await runSessionsExport(positional[2], out, tools);
         return;
       }
       if (sub === "transcript") {
@@ -33341,7 +34348,7 @@ function readVersion() {
   try {
     const here = dirname8(fileURLToPath2(import.meta.url));
     const pkg = JSON.parse(
-      readFileSync2(resolve7(here, "../package.json"), "utf8")
+      readFileSync2(resolve8(here, "../package.json"), "utf8")
     );
     return pkg.version ?? "unknown";
   } catch {