@desplega.ai/agent-swarm 1.131.0 → 1.133.1

package/dist/{pi-mono-adapter-t091s27g.js → pi-mono-adapter-btvqmj58.js}

@@ -29,7 +29,7 @@ import {
   streamSimple,
   summarizeSession,
   validateToolArguments
-} from "./cli-0rcyq6d9.js";
+} from "./cli-5z2yhzvd.js";
 import {
   checkToolLoop,
   clearToolHistory
@@ -42,11 +42,14 @@ import {
   buildRatingsFromLlm,
   fetchRetrievalsForTask,
   postRatings
-} from "./cli-2wadx7p2.js";
+} from "./cli-f8dre4bz.js";
 import"./cli-e7d20cty.js";
 import {
   applyReasoningEffort
 } from "./cli-8whqavk2.js";
+import {
+  swarmRuntimeInstanceId
+} from "./cli-pzq5rjym.js";
 import {
   DEFAULT_OPENROUTER_BASE_URL,
   getOpenRouterBaseUrl
@@ -54,12 +57,13 @@ import {
 import {
   McpHttpClient
 } from "./cli-epan13p1.js";
-import"./cli-zsspvvm2.js";
+import"./cli-qys3rhhz.js";
+import"./cli-w1mp9jy7.js";
 import {
   init_secret_scrubber,
   scrubSecrets
 } from "./cli-4j2mrzag.js";
-import"./cli-5dsbcjjw.js";
+import"./cli-jqwnqx9m.js";
 import {
   require_signal_exit
 } from "./cli-ap1czx8f.js";
@@ -47994,11 +47998,11 @@ One of the following config files must be in the directory tree: "${p.ROOT_CONFI
         const r3 = _path().resolve(t3, e3).split(_path().sep);
         return new RegExp(["^", ...r3.map((e4, t4) => {
           const c = t4 === r3.length - 1;
-          return e4 === "**" ? c ? p : l3 : e4 === "*" ? c ? a : o : e4.startsWith("*.") ? i + escapeRegExp(e4.slice(1)) + (c ? s : n) : escapeRegExp(e4) + (c ? s : n);
+          return e4 === "**" ? c ? p : l3 : e4 === "*" ? c ? a : o : e4.startsWith("*.") ? i + escapeRegExp2(e4.slice(1)) + (c ? s : n) : escapeRegExp2(e4) + (c ? s : n);
         })].join(""));
       };
       const n = `\\${_path().sep}`, s = `(?:${n}|$)`, i = `[^${n}]+`, o = `(?:${i}${n})`, a = `(?:${i}${s})`, l3 = `${o}*?`, p = `${o}*?${a}?`;
-      function escapeRegExp(e3) {
+      function escapeRegExp2(e3) {
         return e3.replace(/[|\\{}()[\]^$+*?.]/g, "\\$&");
       }
     }, "./node_modules/.pnpm/@babel+core@7.29.0/node_modules/@babel/core/lib/config/plugin.js"(e2, t2, r2) {
@@ -93190,11 +93194,11 @@ var require_snapshot_recorder = __commonJS((exports, module) => {
   var { setTimeout: setTimeout2, clearTimeout: clearTimeout2 } = __require("node:timers");
   var { InvalidArgumentError, UndiciError } = require_errors2();
   var { hashId, isUrlExcludedFactory, normalizeHeaders, createHeaderFilters } = require_snapshot_utils();
-  function normalizeUrlForMatching(url, matchQuery, normalizeQuery) {
+  function normalizeUrlForMatching(url, matchQuery, normalizeQuery2) {
     if (matchQuery === false)
       return `${url.origin}${url.pathname}`;
-    if (normalizeQuery) {
-      const normalized = String(normalizeQuery(url.searchParams) ?? "");
+    if (normalizeQuery2) {
+      const normalized = String(normalizeQuery2(url.searchParams) ?? "");
       return normalized ? `${url.origin}${url.pathname}?${normalized}` : `${url.origin}${url.pathname}`;
     }
     return url.toString();
@@ -104574,6 +104578,14 @@ function parseArgs(args) {
     } else if (arg === "--theme" && i + 1 < args.length) {
       result.themes = result.themes ?? [];
       result.themes.push(args[++i]);
+    } else if (arg === "--use-theme") {
+      const themeName = args[i + 1];
+      if (themeName === undefined || themeName.startsWith("-")) {
+        result.diagnostics.push({ type: "error", message: "--use-theme requires a theme name" });
+      } else {
+        result.useTheme = themeName;
+        i++;
+      }
     } else if (arg === "--no-skills" || arg === "-ns") {
       result.noSkills = true;
     } else if (arg === "--no-prompt-templates" || arg === "-np") {
@@ -104691,6 +104703,7 @@ ${source_default.bold("Options:")}
   --prompt-template <path>       Load a prompt template file or directory (can be used multiple times)
   --no-prompt-templates, -np     Disable prompt template discovery and loading
   --theme <path>                 Load a theme file or directory (can be used multiple times)
+  --use-theme <name[/name]>      Set the initial interactive theme for this run
   --no-themes                    Disable theme discovery and loading
   --no-context-files, -nc        Disable AGENTS.md and CLAUDE.md discovery and loading
   --export <file>                Export session file to HTML and exit
@@ -109061,6 +109074,14 @@ var TUI_KEYBINDINGS = {
     defaultKeys: [],
     description: "Scroll viewport down half a page"
   },
+  "tui.altScreen.lineUp": {
+    defaultKeys: [],
+    description: "Scroll viewport up one line"
+  },
+  "tui.altScreen.lineDown": {
+    defaultKeys: [],
+    description: "Scroll viewport down one line"
+  },
   "tui.altScreen.previousPrompt": {
     defaultKeys: "ctrl+shift+up",
     description: "Jump to previous semantic prompt"
@@ -109069,6 +109090,22 @@ var TUI_KEYBINDINGS = {
     defaultKeys: "ctrl+shift+down",
     description: "Jump to next semantic prompt"
   },
+  "tui.altScreen.search": {
+    defaultKeys: "ctrl+shift+f",
+    description: "Search the primary scroll view"
+  },
+  "tui.altScreen.searchNext": {
+    defaultKeys: ["enter", "ctrl+g"],
+    description: "Select the next search match"
+  },
+  "tui.altScreen.searchPrevious": {
+    defaultKeys: ["shift+enter", "ctrl+shift+g"],
+    description: "Select the previous search match"
+  },
+  "tui.altScreen.searchClose": {
+    defaultKeys: "escape",
+    description: "Close transcript search"
+  },
   "tui.altScreen.top": { defaultKeys: "home", description: "Scroll viewport to top" },
   "tui.altScreen.bottom": { defaultKeys: "end", description: "Scroll viewport to bottom" }
 };
@@ -110207,6 +110244,9 @@ class TuiBase extends Container {
   hasOverlay() {
     return this.overlayStack.some((o) => this.isOverlayVisible(o));
   }
+  isOverlayFocused() {
+    return this.overlayStack.some((entry) => entry.component === this.focusedComponent && this.isOverlayVisible(entry));
+  }
   isOverlayVisible(entry) {
     if (entry.hidden)
       return false;
@@ -113806,6 +113846,15 @@ class LatexParser {
     }
     let command = "";
     const first = this.source[this.position] ?? "";
+    if (first === `
+` || first === "\r") {
+      this.position++;
+      if (first === "\r" && this.source[this.position] === `
+`) {
+        this.position++;
+      }
+      return " ";
+    }
     if (/[A-Za-z]/.test(first)) {
       const start = this.position;
       while (this.position < this.source.length && /[A-Za-z]/.test(this.source[this.position] ?? "")) {
@@ -114009,7 +114058,7 @@ class LatexParser {
     return value2;
   }
   parseRequiredArgumentValue() {
-    while (this.position < this.source.length && /[ \t]/.test(this.source[this.position] ?? "")) {
+    while (this.position < this.source.length && /\s/.test(this.source[this.position] ?? "")) {
       this.position++;
     }
     if (this.position >= this.source.length) {
@@ -114899,6 +114948,7 @@ class ScrollView extends Container {
   contentHeight = 0;
   currentViewportHeight = 0;
   followingEnd;
+  followSuppressedAtEnd = false;
   requestRenderCallback;
   transientScrollbarVisible = false;
   scrollbarActive = false;
@@ -114978,15 +115028,21 @@ class ScrollView extends Container {
     this.scrollbarActive = active;
     this.markScrollbarActivity();
   }
-  scrollTo(scrollTop) {
+  scrollTo(scrollTop, options = {}) {
     const requested = Number.isFinite(scrollTop) ? Math.trunc(scrollTop) : this.currentScrollTop;
     const maxScrollTop = Math.max(0, this.contentHeight - this.currentViewportHeight);
     const next = Math.max(0, Math.min(maxScrollTop, requested));
-    if (next === this.currentScrollTop)
+    const nextFollowSuppressedAtEnd = options.disableFollow === true && next === maxScrollTop;
+    const nextFollowingEnd = !nextFollowSuppressedAtEnd && this.followEnd && next === maxScrollTop;
+    if (next === this.currentScrollTop && nextFollowingEnd === this.followingEnd && nextFollowSuppressedAtEnd === this.followSuppressedAtEnd) {
       return;
+    }
+    const moved = next !== this.currentScrollTop;
     this.currentScrollTop = next;
-    this.followingEnd = this.followEnd && next === maxScrollTop;
-    this.markScrollbarActivity();
+    this.followingEnd = nextFollowingEnd;
+    this.followSuppressedAtEnd = nextFollowSuppressedAtEnd;
+    if (moved)
+      this.markScrollbarActivity();
     this.requestRenderCallback?.();
   }
   scrollBy(lines) {
@@ -114997,18 +115053,21 @@ class ScrollView extends Container {
     const start = this.followingEnd ? maxScrollTop : this.currentScrollTop;
     const next = Math.max(0, Math.min(maxScrollTop, start + requested));
     const moved = next - start;
+    const wasFollowingEnd = this.followingEnd;
     this.currentScrollTop = next;
     this.followingEnd = this.followEnd && next === maxScrollTop;
-    if (moved !== 0) {
+    this.followSuppressedAtEnd = false;
+    if (moved !== 0)
       this.markScrollbarActivity();
+    if (moved !== 0 || this.followingEnd !== wasFollowingEnd)
       this.requestRenderCallback?.();
-    }
     return requested - moved;
   }
   scrollToStart() {
     const changed = this.currentScrollTop !== 0 || this.followingEnd !== (this.followEnd && this.contentHeight <= this.currentViewportHeight);
     this.currentScrollTop = 0;
     this.followingEnd = this.followEnd && this.contentHeight <= this.currentViewportHeight;
+    this.followSuppressedAtEnd = false;
     if (changed) {
       this.markScrollbarActivity();
       this.requestRenderCallback?.();
@@ -115019,6 +115078,7 @@ class ScrollView extends Container {
     const changed = this.currentScrollTop !== next || this.followingEnd !== this.followEnd;
     this.currentScrollTop = next;
     this.followingEnd = this.followEnd;
+    this.followSuppressedAtEnd = false;
     if (changed) {
       this.markScrollbarActivity();
       this.requestRenderCallback?.();
@@ -115033,8 +115093,11 @@ class ScrollView extends Container {
       this.currentScrollTop = maxScrollTop;
     else
       this.currentScrollTop = Math.max(0, Math.min(this.currentScrollTop, maxScrollTop));
-    if (this.followEnd && this.currentScrollTop === maxScrollTop)
+    if (this.currentScrollTop < maxScrollTop)
+      this.followSuppressedAtEnd = false;
+    if (this.followEnd && this.currentScrollTop === maxScrollTop && !this.followSuppressedAtEnd) {
       this.followingEnd = true;
+    }
     if (this.contentHeight <= this.currentViewportHeight)
       this.hideTransientScrollbar();
   }
@@ -115293,6 +115356,8 @@ class VStack extends Stack {
 // node_modules/@earendil-works/pi-tui/dist/stdin-buffer.js
 import { EventEmitter } from "events";
 var ESC = "\x1B";
+var DEFAULT_SEQUENCE_TIMEOUT_MS = 50;
+var DEFAULT_ESCAPE_TIMEOUT_MS = 10;
 var BRACKETED_PASTE_START = "\x1B[200~";
 var BRACKETED_PASTE_END = "\x1B[201~";
 function isCompleteSequence(data) {
@@ -115433,12 +115498,14 @@ class StdinBuffer extends EventEmitter {
   buffer = "";
   timeout = null;
   timeoutMs;
+  escapeTimeoutMs;
   pasteMode = false;
   pasteBuffer = "";
   pendingKittyPrintableCodepoint;
   constructor(options = {}) {
     super();
-    this.timeoutMs = options.timeout ?? 10;
+    this.timeoutMs = options.timeout ?? DEFAULT_SEQUENCE_TIMEOUT_MS;
+    this.escapeTimeoutMs = options.escapeTimeout ?? DEFAULT_ESCAPE_TIMEOUT_MS;
   }
   process(data) {
     if (this.timeout) {
@@ -115512,12 +115579,13 @@ class StdinBuffer extends EventEmitter {
       this.emitDataSequence(sequence);
     }
     if (this.buffer.length > 0) {
+      const timeoutMs = this.buffer === ESC ? this.escapeTimeoutMs : this.timeoutMs;
       this.timeout = setTimeout(() => {
         const flushed = this.flush();
         for (const sequence of flushed) {
           this.emitDataSequence(sequence);
         }
-      }, this.timeoutMs);
+      }, timeoutMs);
     }
   }
   emitDataSequence(sequence) {
@@ -115650,6 +115718,19 @@ function normalizeNativeShiftEnterInput(data, shouldDetectNativeShiftEnter, isSh
     return NATIVE_SHIFT_ENTER_SEQUENCE;
   return data;
 }
+var DEFAULT_ESCAPE_TIMEOUT_MS2 = 10;
+var DEFAULT_SSH_ESCAPE_TIMEOUT_MS = 100;
+function resolveEscapeTimeoutMs(env = process.env) {
+  const configured = Number(env.PI_TUI_ESC_TIMEOUT);
+  if (Number.isFinite(configured) && configured > 0) {
+    return configured;
+  }
+  if (env.SSH_CONNECTION || env.SSH_TTY) {
+    return DEFAULT_SSH_ESCAPE_TIMEOUT_MS;
+  }
+  return DEFAULT_ESCAPE_TIMEOUT_MS2;
+}
+
 class ProcessTerminal {
   wasRaw = false;
   inputHandler;
@@ -115699,7 +115780,7 @@ class ProcessTerminal {
     this.queryAndEnableKittyProtocol();
   }
   setupStdinBuffer() {
-    this.stdinBuffer = new StdinBuffer({ timeout: 10 });
+    this.stdinBuffer = new StdinBuffer({ escapeTimeout: resolveEscapeTimeoutMs() });
     this.stdinBuffer.on("data", (sequence) => {
       const negotiationSequence = this.readKeyboardProtocolNegotiationSequence(sequence);
       if (negotiationSequence === "pending") {
@@ -115967,6 +116048,123 @@ class ProcessTerminal {
     return true;
   }
 }
+// node_modules/@earendil-works/pi-tui/dist/alt-screen-search.js
+var segmenter2 = getGraphemeSegmenter();
+function appendMappedText(text, span, corpus) {
+  corpus.text += text;
+  for (let index = 0;index < text.length; index++)
+    corpus.source.push(span);
+}
+function buildSearchCorpus(lines) {
+  const corpus = { text: "", source: [] };
+  let pendingSeparator = false;
+  for (let row = 0;row < lines.length; row++) {
+    const line = stripTerminalSequences(lines[row] ?? "");
+    let column = 0;
+    for (const grapheme of segmenter2.segment(line)) {
+      const text = grapheme.segment;
+      const width = visibleWidth(text);
+      if (/^\s+$/u.test(text)) {
+        if (corpus.text.length > 0)
+          pendingSeparator = true;
+        column += width;
+        continue;
+      }
+      if (pendingSeparator) {
+        appendMappedText(" ", undefined, corpus);
+        pendingSeparator = false;
+      }
+      appendMappedText(text, { row, startCol: column, endCol: column + width }, corpus);
+      column += width;
+    }
+    if (corpus.text.length > 0)
+      pendingSeparator = true;
+  }
+  return corpus;
+}
+function normalizeQuery(query) {
+  return query.replace(/\s+/gu, " ").trim();
+}
+function escapeRegExp(text) {
+  return text.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function findAltScreenSearchMatches(lines, query) {
+  const normalizedQuery = normalizeQuery(query);
+  if (!normalizedQuery)
+    return [];
+  const corpus = buildSearchCorpus(lines);
+  const expression = new RegExp(escapeRegExp(normalizedQuery), "giu");
+  const matches = [];
+  for (const match of corpus.text.matchAll(expression)) {
+    const start = match.index;
+    const end = start + match[0].length;
+    const segments = [];
+    for (let index = start;index < end; index++) {
+      const span = corpus.source[index];
+      if (!span)
+        continue;
+      const previous = segments[segments.length - 1];
+      if (previous && previous.row === span.row && span.startCol <= previous.endCol) {
+        previous.endCol = Math.max(previous.endCol, span.endCol);
+      } else {
+        segments.push({ ...span });
+      }
+    }
+    if (segments.length > 0)
+      matches.push({ segments });
+  }
+  return matches;
+}
+function getAltScreenSearchMatchKey(match) {
+  const first = match.segments[0];
+  const last = match.segments[match.segments.length - 1];
+  return first && last ? `${first.row}:${first.startCol}:${last.row}:${last.endCol}` : "";
+}
+
+class AltScreenSearchComponent {
+  input = new Input;
+  onQueryChange;
+  resultCount = 0;
+  resultIndex = -1;
+  _focused = false;
+  constructor(onQueryChange) {
+    this.onQueryChange = onQueryChange;
+  }
+  get focused() {
+    return this._focused;
+  }
+  set focused(value2) {
+    this._focused = value2;
+    this.input.focused = value2;
+  }
+  setResult(index, count) {
+    this.resultIndex = index;
+    this.resultCount = count;
+  }
+  handleInput(data) {
+    const previous = this.input.getValue();
+    this.input.handleInput(data);
+    const query = this.input.getValue();
+    if (query !== previous)
+      this.onQueryChange(query);
+  }
+  invalidate() {
+    this.input.invalidate();
+  }
+  render(width) {
+    const safeWidth = Math.max(1, width);
+    const label = " Find transcript";
+    const query = this.input.getValue();
+    const status = !query ? "" : this.resultCount === 0 ? "No matches " : `${this.resultIndex + 1}/${this.resultCount} `;
+    const labelWidth = visibleWidth(label);
+    const statusWidth = visibleWidth(status);
+    const gap = " ".repeat(Math.max(1, safeWidth - labelWidth - statusWidth));
+    const title = truncateToWidth(`${label}${gap}${status}`, safeWidth, "");
+    const padding = " ".repeat(Math.max(0, safeWidth - visibleWidth(title)));
+    return [`\x1B[7m${title}${padding}\x1B[27m`, ...this.input.render(safeWidth)];
+  }
+}
+
 // node_modules/@earendil-works/pi-tui/dist/components/alt-screen-flash.js
 var DEFAULT_DURATION_MS = 1000;
 
@@ -116227,10 +116425,11 @@ function paintBox(box, screen, totalWidth) {
         if (visibleRows < imageMetadata.rows)
           line = cropKittyImageLine(line, 0, visibleRows);
       }
-      if (isImageLine(line) && box.rect.x === 0 && box.rect.width >= totalWidth)
+      if (box.rect.x === 0 && box.rect.width >= totalWidth && (isImageLine(line) || !screen[row])) {
         screen[row] = line;
-      else
+      } else {
         screen[row] = compositeTuiLine(screen[row] ?? "", line, box.rect.x, box.rect.width, totalWidth);
+      }
     }
   }
   for (const child of box.children)
@@ -116359,12 +116558,16 @@ class TuiAltScreen extends TuiBase {
   selectionPressActive = false;
   scrollbarDrag;
   scrollbarHover;
+  activeSearch;
   pressedUrl;
   selectionDragged = false;
   wheelScrollLines;
   mouseEnabled;
+  searchMatchStyle;
+  searchCurrentMatchStyle;
   openUrl;
   onRightClickPaste;
+  copySelection;
   constructor(terminal, showHardwareCursor, logDirectory, options = {}) {
     super(terminal, showHardwareCursor, logDirectory);
     this.implicitDocument = {
@@ -116378,8 +116581,11 @@ class TuiAltScreen extends TuiBase {
     this.flashes = new AltScreenFlashContainer(() => this.requestRender());
     this.wheelScrollLines = Math.max(1, Math.floor(options.wheelScrollLines ?? 1));
     this.mouseEnabled = options.mouse ?? true;
+    this.searchMatchStyle = options.searchMatchStyle ?? ((text) => `\x1B[4m${text}\x1B[24m`);
+    this.searchCurrentMatchStyle = options.searchCurrentMatchStyle ?? ((text) => `\x1B[1;7m${text}\x1B[22;27m`);
     this.openUrl = options.openUrl;
     this.onRightClickPaste = options.onRightClickPaste;
+    this.copySelection = options.copySelection;
     this.addInputListener((data) => this.handleViewportInput(data));
   }
   get viewportTop() {
@@ -116433,6 +116639,7 @@ class TuiAltScreen extends TuiBase {
     this.terminal.write(`${ENTER_ALT_SCREEN}${DISABLE_AUTOWRAP}${this.mouseEnabled ? mouseSequence : ""}\x1B[2J\x1B[H\x1B[?25l`);
   }
   beforeTerminalStop(_options) {
+    this.closeSearch();
     this.stopSelectionAutoScroll();
     this.selectionPressActive = false;
     this.stopScrollbarHover();
@@ -116548,12 +116755,119 @@ class TuiAltScreen extends TuiBase {
       return;
     }
   }
+  openSearch() {
+    if (this.activeSearch) {
+      this.activeSearch.overlay?.focus();
+      return;
+    }
+    const component = new AltScreenSearchComponent((query) => this.updateSearchQuery(query));
+    const search = {
+      component,
+      query: "",
+      matches: [],
+      selectedIndex: -1,
+      anchorRow: this.getPrimaryScrollView().scrollTop,
+      selectionMode: "query"
+    };
+    this.activeSearch = search;
+    search.overlay = this.showOverlay(component, {
+      anchor: "top-right",
+      width: "40%",
+      minWidth: 24,
+      margin: 1
+    });
+  }
+  closeSearch() {
+    const search = this.activeSearch;
+    if (!search)
+      return;
+    this.activeSearch = undefined;
+    search.overlay?.hide();
+    this.requestRender();
+  }
+  updateSearchQuery(query) {
+    const search = this.activeSearch;
+    if (!search || query === search.query)
+      return;
+    const selected = search.matches[search.selectedIndex];
+    search.anchorRow = selected?.segments[0]?.row ?? this.getPrimaryScrollView().scrollTop;
+    search.query = query;
+    search.selectionMode = "query";
+    search.component.setResult(-1, 0);
+    this.requestRender();
+  }
+  navigateSearch(direction) {
+    const search = this.activeSearch;
+    if (!search?.query)
+      return;
+    search.selectionMode = direction < 0 ? "previous" : "next";
+    this.requestRender();
+  }
+  refreshSearch(layout) {
+    const search = this.activeSearch;
+    if (!search)
+      return false;
+    const scrollView = layout.primaryScrollView ?? this.implicitScrollView;
+    const box = getScrollViewBox(layout, scrollView);
+    const lines = box?.scrollContentLines;
+    if (!lines || !search.query.trim()) {
+      search.matches = [];
+      search.selectedIndex = -1;
+      search.selectedKey = undefined;
+      search.selectionMode = "retain";
+      search.component.setResult(-1, 0);
+      return false;
+    }
+    const shouldRevealSelection = search.selectionMode !== "retain";
+    const matches = findAltScreenSearchMatches(lines, search.query);
+    const exactIndex = search.selectedKey ? matches.findIndex((match) => getAltScreenSearchMatchKey(match) === search.selectedKey) : -1;
+    let selectedIndex = -1;
+    if (matches.length > 0) {
+      if (search.selectionMode === "query") {
+        selectedIndex = matches.findIndex((match) => (match.segments[0]?.row ?? 0) >= search.anchorRow);
+        if (selectedIndex < 0)
+          selectedIndex = 0;
+      } else if (search.selectionMode === "next") {
+        const baseIndex = exactIndex >= 0 ? exactIndex : Math.min(search.selectedIndex, matches.length - 1);
+        selectedIndex = baseIndex < 0 ? 0 : (baseIndex + 1) % matches.length;
+      } else if (search.selectionMode === "previous") {
+        const baseIndex = exactIndex >= 0 ? exactIndex : Math.min(search.selectedIndex, matches.length - 1);
+        selectedIndex = baseIndex < 0 ? matches.length - 1 : (baseIndex - 1 + matches.length) % matches.length;
+      } else {
+        selectedIndex = exactIndex >= 0 ? exactIndex : Math.min(Math.max(0, search.selectedIndex), matches.length - 1);
+      }
+    }
+    search.matches = matches;
+    search.selectedIndex = selectedIndex;
+    search.selectedKey = selectedIndex >= 0 ? getAltScreenSearchMatchKey(matches[selectedIndex]) : undefined;
+    search.selectionMode = "retain";
+    search.component.setResult(selectedIndex, matches.length);
+    if (!shouldRevealSelection)
+      return false;
+    const selected = matches[selectedIndex];
+    const firstSegment = selected?.segments[0];
+    const lastSegment = selected?.segments[selected.segments.length - 1];
+    if (!box || !firstSegment || !lastSegment || scrollView.viewportHeight <= 0)
+      return false;
+    const before = scrollView.scrollTop;
+    const visibleBottom = before + scrollView.viewportHeight - 1;
+    let target = before;
+    if (firstSegment.row < before || lastSegment.row > visibleBottom) {
+      target = firstSegment.row - Math.floor(scrollView.viewportHeight / 3);
+    }
+    scrollView.scrollTo(target, { disableFollow: true });
+    return scrollView.scrollTop !== before;
+  }
   flash(message, durationMs) {
     this.flashes.flash(message, durationMs);
   }
+  shouldDeferViewportInputToOverlay() {
+    return this.isOverlayFocused() && this.activeSearch?.overlay?.isFocused() !== true;
+  }
   handleViewportInput(data) {
     if (data === FOCUS_OUT) {
       const hadActiveSelection = this.selectionPressActive;
+      const hadNonEmptyActiveSelection = hadActiveSelection && this.getSelectionBounds() !== undefined;
       this.selectionPressActive = false;
       this.stopSelectionAutoScroll();
       this.stopScrollbarHover();
@@ -116565,15 +116879,18 @@ class TuiAltScreen extends TuiBase {
         this.selectionFocus = undefined;
         this.selectionGranularity = "character";
         this.selectionInitialRange = undefined;
+        if (hadNonEmptyActiveSelection)
+          this.requestRender();
       }
       this.lastClick = undefined;
-      this.requestRender();
       return { consume: true };
     }
     if (data === FOCUS_IN)
       return { consume: true };
     const wheelEvent = this.parseWheelEvent(data);
     if (wheelEvent) {
+      if (this.shouldDeferViewportInputToOverlay())
+        return;
       this.routeWheel(wheelEvent);
       return { consume: true };
     }
@@ -116592,6 +116909,30 @@ class TuiAltScreen extends TuiBase {
       return { consume: true };
     const keybindings = getKeybindings();
     const isRelease = isKeyRelease(data);
+    if (keybindings.matches(data, "tui.altScreen.search")) {
+      if (!isRelease)
+        this.openSearch();
+      return { consume: true };
+    }
+    if (this.activeSearch?.overlay?.isFocused()) {
+      if (keybindings.matches(data, "tui.altScreen.searchNext")) {
+        if (!isRelease)
+          this.navigateSearch(1);
+        return { consume: true };
+      }
+      if (keybindings.matches(data, "tui.altScreen.searchPrevious")) {
+        if (!isRelease)
+          this.navigateSearch(-1);
+        return { consume: true };
+      }
+      if (keybindings.matches(data, "tui.altScreen.searchClose")) {
+        if (!isRelease)
+          this.closeSearch();
+        return { consume: true };
+      }
+    }
+    if (this.shouldDeferViewportInputToOverlay())
+      return;
     if (keybindings.matches(data, "tui.altScreen.pageUp")) {
       if (!isRelease) {
         this.scrollBy(-Math.max(1, this.getPrimaryScrollView().viewportHeight - PAGE_SCROLL_OVERLAP));
@@ -116614,6 +116955,16 @@ class TuiAltScreen extends TuiBase {
         this.scrollBy(Math.max(1, Math.floor(this.getPrimaryScrollView().viewportHeight / 2)));
       return { consume: true };
     }
+    if (keybindings.matches(data, "tui.altScreen.lineUp")) {
+      if (!isRelease)
+        this.scrollBy(-1);
+      return { consume: true };
+    }
+    if (keybindings.matches(data, "tui.altScreen.lineDown")) {
+      if (!isRelease)
+        this.scrollBy(1);
+      return { consume: true };
+    }
     if (keybindings.matches(data, "tui.altScreen.previousPrompt")) {
       if (!isRelease)
         this.scrollToPrompt(-1);
@@ -116907,7 +117258,8 @@ class TuiAltScreen extends TuiBase {
     this.selectionDragPointer = undefined;
   }
   handleSelectionMouseEvent(event) {
-    if ((event.button & 3) !== 0)
+    const button = event.button & 3;
+    if (button !== 0 && !(event.release && button === 3))
       return;
     const anchorScrollView = this.selectionAnchor?.scrollView;
     const point = this.getSelectionPoint(event, anchorScrollView);
@@ -116983,7 +117335,7 @@ class TuiAltScreen extends TuiBase {
     }
     return { start: Math.max(minColumn, start), end: Math.min(maxColumn, end) };
   }
-  copySelectionToClipboard() {
+  async copySelectionToClipboard() {
     const selection = this.getSelectionBounds();
     if (!selection)
       return;
@@ -117006,9 +117358,83 @@ class TuiAltScreen extends TuiBase {
 `);
     if (text.length === 0)
       return;
+    if (this.copySelection) {
+      const ok = await this.copySelection(text);
+      this.flash(ok ? "Copied!" : "Copy failed");
+      return;
+    }
     this.terminal.write(`\x1B]52;c;${Buffer.from(text).toString("base64")}\x07`);
     this.flash("Copied!");
   }
+  applySearchTextHighlight(text, current) {
+    const style = current ? this.searchCurrentMatchStyle : this.searchMatchStyle;
+    let result = "";
+    let plainStart = 0;
+    let index = 0;
+    while (index < text.length) {
+      const ansi = extractAnsiCode(text, index);
+      if (!ansi) {
+        index += 1;
+        continue;
+      }
+      if (index > plainStart)
+        result += style(text.slice(plainStart, index));
+      result += ansi.code;
+      index += ansi.length;
+      plainStart = index;
+    }
+    if (plainStart < text.length)
+      result += style(text.slice(plainStart));
+    return result;
+  }
+  applySearchHighlights(screen, layout) {
+    const search = this.activeSearch;
+    if (!search || search.selectedIndex < 0 || search.matches.length === 0)
+      return screen;
+    const scrollView = layout.primaryScrollView ?? this.implicitScrollView;
+    const box = getScrollViewBox(layout, scrollView);
+    if (!box)
+      return screen;
+    const rangesByRow = new Map;
+    const scrollbarColumn = getScrollbarGeometry(box)?.column;
+    const minRow = Math.max(0, box.rect.y, box.clip.y);
+    const maxRow = Math.min(screen.length, box.rect.y + box.rect.height, box.clip.y + box.clip.height);
+    const minColumn = Math.max(0, box.rect.x, box.clip.x);
+    const maxColumn = Math.min(this.terminal.columns, box.rect.x + box.rect.width, box.clip.x + box.clip.width, scrollbarColumn ?? Number.POSITIVE_INFINITY);
+    for (let matchIndex = 0;matchIndex < search.matches.length; matchIndex++) {
+      for (const segment of search.matches[matchIndex].segments) {
+        const row = box.rect.y + segment.row - scrollView.scrollTop;
+        if (row < minRow || row >= maxRow)
+          continue;
+        const startCol = Math.max(minColumn, box.rect.x + segment.startCol);
+        const endCol = Math.min(maxColumn, box.rect.x + segment.endCol);
+        if (endCol <= startCol)
+          continue;
+        const ranges = rangesByRow.get(row) ?? [];
+        ranges.push({ startCol, endCol, current: matchIndex === search.selectedIndex });
+        rangesByRow.set(row, ranges);
+      }
+    }
+    const result = [...screen];
+    for (const [row, ranges] of rangesByRow) {
+      let line = result[row] ?? "";
+      if (isImageLine(line))
+        continue;
+      const lineWidth = visibleWidth(line);
+      for (const range of ranges.sort((a, b2) => b2.startCol - a.startCol)) {
+        const startCol = Math.min(range.startCol, lineWidth);
+        const endCol = Math.min(range.endCol, lineWidth);
+        if (endCol <= startCol)
+          continue;
+        const before = sliceByColumn(line, 0, startCol, true);
+        const highlighted = sliceByColumn(line, startCol, endCol - startCol, true);
+        const after = sliceByColumn(line, endCol, Math.max(0, lineWidth - endCol), true);
+        line = `${before}${this.applySearchTextHighlight(highlighted, range.current)}${after}`;
+      }
+      result[row] = line;
+    }
+    return result;
+  }
   applySelectionHighlight(text) {
     let result = "\x1B[7m";
     let index = 0;
@@ -117097,8 +117523,12 @@ class TuiAltScreen extends TuiBase {
     const width = Math.max(1, this.terminal.columns);
     const height = Math.max(1, this.terminal.rows);
     const root = this.layoutRoot ?? this.implicitScrollView;
-    const nextLayout = renderLayoutFrame(root, width, height, () => this.requestRender());
+    let nextLayout = renderLayoutFrame(root, width, height, () => this.requestRender());
+    if (this.refreshSearch(nextLayout)) {
+      nextLayout = renderLayoutFrame(root, width, height, () => this.requestRender());
+    }
     let screen = nextLayout.lines.map((line) => line.replace(OSC133_ZONE_PREFIX2, ""));
+    screen = this.applySearchHighlights(screen, nextLayout);
     screen = this.compositeOverlays(screen, width, height);
     if (screen.length > height)
       screen = screen.slice(screen.length - height);
@@ -117847,6 +118277,8 @@ var ThemeJsonSchema = exports_typebox.Object({
     thinkingText: ColorValueSchema,
     selectedBg: ColorValueSchema,
     scrollbarThumb: exports_typebox.Optional(ColorValueSchema),
+    searchMatchBg: exports_typebox.Optional(ColorValueSchema),
+    searchMatchText: exports_typebox.Optional(ColorValueSchema),
     userMessageBg: ColorValueSchema,
     userMessageText: ColorValueSchema,
     customMessageBg: ColorValueSchema,
@@ -118022,7 +118454,9 @@ function withThemeColorFallbacks(colors) {
   return {
     ...colors,
     thinkingMax: colors.thinkingMax ?? colors.thinkingXhigh,
-    scrollbarThumb: colors.scrollbarThumb ?? colors.selectedBg
+    scrollbarThumb: colors.scrollbarThumb ?? colors.selectedBg,
+    searchMatchBg: colors.searchMatchBg ?? colors.selectedBg,
+    searchMatchText: colors.searchMatchText ?? colors.text
   };
 }
 
@@ -118039,14 +118473,19 @@ class Theme {
     this.sourceInfo = options.sourceInfo;
     this.mode = mode;
     this.fgColors = new Map;
-    const colors = { ...fgColors, thinkingMax: fgColors.thinkingMax ?? fgColors.thinkingXhigh };
+    const colors = {
+      ...fgColors,
+      thinkingMax: fgColors.thinkingMax ?? fgColors.thinkingXhigh,
+      searchMatchText: fgColors.searchMatchText ?? fgColors.text
+    };
     for (const [key, value2] of Object.entries(colors)) {
       this.fgColors.set(key, fgAnsi(value2, mode));
     }
     this.bgColors = new Map;
     const backgrounds = {
       ...bgColors,
-      scrollbarThumb: bgColors.scrollbarThumb ?? bgColors.selectedBg
+      scrollbarThumb: bgColors.scrollbarThumb ?? bgColors.selectedBg,
+      searchMatchBg: bgColors.searchMatchBg ?? bgColors.selectedBg
     };
     for (const [key, value2] of Object.entries(backgrounds)) {
       this.bgColors.set(key, bgAnsi(value2, mode));
@@ -118262,6 +118701,7 @@ function createTheme(themeJson, mode, sourcePath) {
   const bgColorKeys = new Set([
     "selectedBg",
     "scrollbarThumb",
+    "searchMatchBg",
     "userMessageBg",
     "customMessageBg",
     "toolPendingBg",
@@ -120546,7 +120986,7 @@ class SessionManager {
       if (this.fileEntries.length === 0) {
         const explicitPath = this.sessionFile;
         if (statSync4(explicitPath).size > 0) {
-          throw new Error(`Session file is not a valid pi session: ${explicitPath}`);
+          throw new Error(`Session file is not a valid ${APP_NAME} session: ${explicitPath}`);
         }
         this.newSession();
         this.sessionFile = explicitPath;
@@ -122400,6 +122840,7 @@ __export(exports_dist2, {
   setDefaultStreamFn: () => setDefaultStreamFn,
   sessionEntryToContextMessages: () => sessionEntryToContextMessages2,
   serializeConversation: () => serializeConversation2,
+  scanningEntries: () => scanningEntries,
   sanitizeBinaryOutput: () => sanitizeBinaryOutput2,
   runAgentLoopContinue: () => runAgentLoopContinue,
   runAgentLoop: () => runAgentLoop,
@@ -122415,7 +122856,6 @@ __export(exports_dist2, {
   getOrUndefined: () => getOrUndefined,
   getOrThrow: () => getOrThrow,
   getLastAssistantUsage: () => getLastAssistantUsage2,
-  getFileSystemResultOrThrow: () => getFileSystemResultOrThrow,
   generateSummaryWithUsage: () => generateSummaryWithUsage2,
   generateSummary: () => generateSummary2,
   generateBranchSummary: () => generateBranchSummary2,
@@ -124192,10 +124632,10 @@ class Session {
     assertValidCursor(query.cursor?.afterSeq);
     return this.storage.findEntries(resultLimit === query.limit ? query : { ...query, limit: resultLimit });
   }
-  async queryBranchEntries(lane, query = {}, resultLimit = query.limit) {
+  async queryBranchEntries(defaultLane, query = {}, resultLimit = query.limit) {
     assertValidLimit(query.limit);
     assertValidCursor(query.cursor?.afterSeq);
-    const start = query.start ?? await this.getLeafIdForLane(lane);
+    const start = query.start ?? await this.getLeafIdForLane(defaultLane);
     if (start === null)
       return [];
     const storageQuery = resultLimit === query.limit ? query : { ...query, limit: resultLimit };
@@ -124232,15 +124672,88 @@ class Session {
   }
 }
 
+// node_modules/@earendil-works/pi-agent-core/dist/harness/types.js
+function ok(value2) {
+  return { ok: true, value: value2 };
+}
+function err(error) {
+  return { ok: false, error };
+}
+function getOrThrow(result) {
+  if (!result.ok)
+    throw result.error;
+  return result.value;
+}
+function getOrUndefined(result) {
+  return result.ok ? result.value : undefined;
+}
+function toError(error) {
+  if (error instanceof Error)
+    return error;
+  if (typeof error === "string")
+    return new Error(error);
+  try {
+    return new Error(JSON.stringify(error));
+  } catch {
+    return new Error(String(error));
+  }
+}
+
+class FileError extends Error {
+  code;
+  path;
+  constructor(code, message, path7, cause) {
+    super(message, cause === undefined ? undefined : { cause });
+    this.name = "FileError";
+    this.code = code;
+    this.path = path7;
+  }
+}
+
+class ExecutionError extends Error {
+  code;
+  constructor(code, message, cause) {
+    super(message, cause === undefined ? undefined : { cause });
+    this.name = "ExecutionError";
+    this.code = code;
+  }
+}
+
+class CompactionError extends Error {
+  code;
+  constructor(code, message, cause) {
+    super(message, cause === undefined ? undefined : { cause });
+    this.name = "CompactionError";
+    this.code = code;
+  }
+}
+
+class BranchSummaryError extends Error {
+  code;
+  constructor(code, message, cause) {
+    super(message, cause === undefined ? undefined : { cause });
+    this.name = "BranchSummaryError";
+    this.code = code;
+  }
+}
+
 // node_modules/@earendil-works/pi-agent-core/dist/harness/session/jsonl/errors.js
+class JsonlDecodeError extends Error {
+  kind;
+  constructor(kind, message, cause) {
+    super(message, cause === undefined ? undefined : { cause });
+    this.name = "JsonlDecodeError";
+    this.kind = kind;
+  }
+}
 function fileResult(result, message) {
   if (!result.ok) {
     throw new SessionError(result.error.code === "not_found" ? "not_found" : "storage", `${message}: ${result.error.message}`, result.error);
   }
   return result.value;
 }
-function invalidFile(path7, line, message, cause) {
-  return new SessionError("invalid_entry", `Invalid JSONL v4 session ${path7}: line ${line} ${message}`, cause);
+function invalidFile(path7, line, cause) {
+  return new SessionError("invalid_entry", `Invalid JSONL v4 session ${path7}: line ${line} ${cause.message}`, cause);
 }
 
 // node_modules/@earendil-works/pi-agent-core/dist/harness/session/jsonl/codec.js
@@ -124268,70 +124781,82 @@ var OPERATION_KINDS = new Set(["run", "compaction", "navigation"]);
 function isObject(value2) {
   return typeof value2 === "object" && value2 !== null && !Array.isArray(value2);
 }
-function parseObject(line, path7, lineNumber) {
+function parseObject(line) {
   let value2;
   try {
     value2 = JSON.parse(line);
   } catch (error) {
-    throw invalidFile(path7, lineNumber, "is not valid JSON", error instanceof Error ? error : undefined);
+    throw new JsonlDecodeError("syntax", "is not valid JSON", error instanceof Error ? error : undefined);
   }
   if (!isObject(value2))
-    throw invalidFile(path7, lineNumber, "is not a JSON object");
+    throw new JsonlDecodeError("schema", "is not a JSON object");
   return value2;
 }
-function requireString(value2, path7, line, field) {
+function requireString(value2, field) {
   if (typeof value2 !== "string")
-    throw invalidFile(path7, line, `has invalid ${field}`);
+    throw new JsonlDecodeError("schema", `has invalid ${field}`);
   return value2;
 }
-function requireSequence(value2, path7, line) {
-  if (!Number.isSafeInteger(value2) || value2 <= 0)
-    throw invalidFile(path7, line, "has invalid seq");
+function requireSequence(value2) {
+  if (!Number.isSafeInteger(value2) || value2 <= 0) {
+    throw new JsonlDecodeError("schema", "has invalid seq");
+  }
   return value2;
 }
-function requireTimestamp(value2, path7, line) {
-  if (!Number.isSafeInteger(value2) || value2 < 0)
-    throw invalidFile(path7, line, "has invalid timestamp");
+function requireTimestamp(value2) {
+  if (!Number.isSafeInteger(value2) || value2 < 0) {
+    throw new JsonlDecodeError("schema", "has invalid timestamp");
+  }
   return value2;
 }
-function requireNullableId(value2, path7, line, field) {
+function requireNullableId(value2, field) {
   if (value2 !== null && typeof value2 !== "string") {
-    throw invalidFile(path7, line, `has invalid ${field}`);
+    throw new JsonlDecodeError("schema", `has invalid ${field}`);
   }
   return value2;
 }
-function parseHeader(line, path7) {
-  const value2 = parseObject(line, path7, 1);
+function decodeHeader(line) {
+  const value2 = parseObject(line);
   if (value2.kind !== "header")
-    throw invalidFile(path7, 1, "is not a header");
+    throw new JsonlDecodeError("schema", "is not a header");
   if (value2.version !== 4)
-    throw invalidFile(path7, 1, "has unsupported session version");
+    throw new JsonlDecodeError("schema", "has unsupported session version");
   const parentSessionId = value2.parentSessionId;
   if (parentSessionId !== undefined && typeof parentSessionId !== "string") {
-    throw invalidFile(path7, 1, "has invalid parentSessionId");
+    throw new JsonlDecodeError("schema", "has invalid parentSessionId");
   }
   const legacyParentSessionPath = value2.legacyParentSessionPath;
   if (legacyParentSessionPath !== undefined && typeof legacyParentSessionPath !== "string") {
-    throw invalidFile(path7, 1, "has invalid legacyParentSessionPath");
+    throw new JsonlDecodeError("schema", "has invalid legacyParentSessionPath");
   }
   if (parentSessionId !== undefined && legacyParentSessionPath !== undefined) {
-    throw invalidFile(path7, 1, "has both parentSessionId and legacyParentSessionPath");
+    throw new JsonlDecodeError("schema", "has both parentSessionId and legacyParentSessionPath");
   }
   const metadataValue = value2.metadata;
-  if (metadataValue !== undefined && !isObject(metadataValue))
-    throw invalidFile(path7, 1, "has invalid metadata");
+  if (metadataValue !== undefined && !isObject(metadataValue)) {
+    throw new JsonlDecodeError("schema", "has invalid metadata");
+  }
   const metadata = metadataValue;
   return {
     kind: "header",
     version: 4,
-    id: requireString(value2.id, path7, 1, "id"),
-    createdAt: requireTimestamp(value2.createdAt, path7, 1),
-    cwd: requireString(value2.cwd, path7, 1, "cwd"),
+    id: requireString(value2.id, "id"),
+    createdAt: requireTimestamp(value2.createdAt),
+    cwd: requireString(value2.cwd, "cwd"),
     parentSessionId,
     legacyParentSessionPath,
     metadata
   };
 }
+function parseHeader(line) {
+  try {
+    return ok(decodeHeader(line));
+  } catch (error) {
+    if (error instanceof JsonlDecodeError)
+      return err(error);
+    throw error;
+  }
+}
 function encodeHeader(header) {
   return `${JSON.stringify(header)}
 `;
@@ -124349,73 +124874,97 @@ function metadataFromHeader(header, path7, modifiedAt) {
     ...header.metadata === undefined ? {} : { metadata: header.metadata }
   };
 }
-function parseMutation(line, path7, lineNumber) {
-  const value2 = parseObject(line, path7, lineNumber);
-  const seq = requireSequence(value2.seq, path7, lineNumber);
-  switch (value2.kind) {
-    case "entry": {
-      const lane = value2.lane === undefined ? undefined : requireString(value2.lane, path7, lineNumber, "lane");
-      const id = requireString(value2.id, path7, lineNumber, "id");
-      const type = requireString(value2.type, path7, lineNumber, "entry type");
-      if (!ENTRY_TYPES.has(type))
-        throw invalidFile(path7, lineNumber, `has unknown entry type ${type}`);
-      const parentId = requireNullableId(value2.parentId, path7, lineNumber, "parentId");
-      const timestamp = requireTimestamp(value2.timestamp, path7, lineNumber);
-      if (type === "custom")
-        requireString(value2.customType, path7, lineNumber, "customType");
-      const { kind: _kind, lane: _lane, ...entryFields } = value2;
-      const entry = { ...entryFields, id, type, parentId, seq, timestamp };
-      return lane === undefined ? { kind: "entry", entry } : { kind: "entry", lane, entry };
-    }
-    case "record": {
-      const id = requireString(value2.id, path7, lineNumber, "id");
-      const lane = requireString(value2.lane, path7, lineNumber, "lane");
-      const type = requireString(value2.type, path7, lineNumber, "record type");
-      if (!RECORD_TYPES.has(type))
-        throw invalidFile(path7, lineNumber, `has unknown record type ${type}`);
-      const timestamp = requireTimestamp(value2.timestamp, path7, lineNumber);
-      if (type === "operation_started") {
-        if (!isObject(value2.intent))
-          throw invalidFile(path7, lineNumber, "has invalid intent");
-        const operationKind = requireString(value2.intent.kind, path7, lineNumber, "operation kind");
-        if (!OPERATION_KINDS.has(operationKind)) {
-          throw invalidFile(path7, lineNumber, `has unknown operation kind ${operationKind}`);
-        }
-      }
-      if (type === "operation_finished")
-        requireString(value2.runId, path7, lineNumber, "runId");
-      const { kind: _kind, ...recordFields } = value2;
-      return {
-        kind: "record",
-        record: { ...recordFields, id, lane, type, seq, timestamp }
-      };
+function parseEntryMutation(value2, seq) {
+  const lane = value2.lane === undefined ? undefined : requireString(value2.lane, "lane");
+  const id = requireString(value2.id, "id");
+  const type = requireString(value2.type, "entry type");
+  if (!ENTRY_TYPES.has(type)) {
+    throw new JsonlDecodeError("schema", `has unknown entry type ${type}`);
+  }
+  const parentId = requireNullableId(value2.parentId, "parentId");
+  const timestamp = requireTimestamp(value2.timestamp);
+  if (type === "custom")
+    requireString(value2.customType, "customType");
+  const { kind: _kind, lane: _lane, ...entryFields } = value2;
+  const entry = { ...entryFields, id, type, parentId, seq, timestamp };
+  return lane === undefined ? { kind: "entry", entry } : { kind: "entry", lane, entry };
+}
+function parseRecordMutation(value2, seq) {
+  const id = requireString(value2.id, "id");
+  const lane = requireString(value2.lane, "lane");
+  const type = requireString(value2.type, "record type");
+  if (!RECORD_TYPES.has(type)) {
+    throw new JsonlDecodeError("schema", `has unknown record type ${type}`);
+  }
+  const timestamp = requireTimestamp(value2.timestamp);
+  if (type === "operation_started") {
+    if (!isObject(value2.intent))
+      throw new JsonlDecodeError("schema", "has invalid intent");
+    const operationKind = requireString(value2.intent.kind, "operation kind");
+    if (!OPERATION_KINDS.has(operationKind)) {
+      throw new JsonlDecodeError("schema", `has unknown operation kind ${operationKind}`);
+    }
+  }
+  if (type === "operation_finished")
+    requireString(value2.runId, "runId");
+  const { kind: _kind, ...recordFields } = value2;
+  return {
+    kind: "record",
+    record: { ...recordFields, id, lane, type, seq, timestamp }
+  };
+}
+function parseLaneMutation(value2, seq) {
+  return {
+    kind: "lane",
+    seq,
+    lane: requireString(value2.lane, "lane"),
+    leafId: requireNullableId(value2.leafId, "leafId")
+  };
+}
+function parseFactMutation(value2, seq) {
+  if (value2.fact === "name") {
+    if (value2.name !== undefined && typeof value2.name !== "string") {
+      throw new JsonlDecodeError("schema", "has invalid name");
+    }
+    return { kind: "fact", seq, fact: "name", name: value2.name };
+  }
+  if (value2.fact === "label") {
+    if (value2.label !== undefined && typeof value2.label !== "string") {
+      throw new JsonlDecodeError("schema", "has invalid label");
     }
+    return {
+      kind: "fact",
+      seq,
+      fact: "label",
+      targetId: requireString(value2.targetId, "targetId"),
+      label: value2.label
+    };
+  }
+  throw new JsonlDecodeError("schema", "has unknown fact type");
+}
+function decodeMutation(line) {
+  const value2 = parseObject(line);
+  const seq = requireSequence(value2.seq);
+  switch (value2.kind) {
+    case "entry":
+      return parseEntryMutation(value2, seq);
+    case "record":
+      return parseRecordMutation(value2, seq);
     case "lane":
-      return {
-        kind: "lane",
-        seq,
-        lane: requireString(value2.lane, path7, lineNumber, "lane"),
-        leafId: requireNullableId(value2.leafId, path7, lineNumber, "leafId")
-      };
+      return parseLaneMutation(value2, seq);
     case "fact":
-      if (value2.fact === "name") {
-        return { kind: "fact", seq, fact: "name", name: requireString(value2.name, path7, lineNumber, "name") };
-      }
-      if (value2.fact === "label") {
-        if (value2.label !== undefined && typeof value2.label !== "string") {
-          throw invalidFile(path7, lineNumber, "has invalid label");
-        }
-        return {
-          kind: "fact",
-          seq,
-          fact: "label",
-          targetId: requireString(value2.targetId, path7, lineNumber, "targetId"),
-          label: value2.label
-        };
-      }
-      throw invalidFile(path7, lineNumber, "has unknown fact type");
+      return parseFactMutation(value2, seq);
     default:
-      throw invalidFile(path7, lineNumber, "has unknown mutation kind");
+      throw new JsonlDecodeError("schema", "has unknown mutation kind");
+  }
+}
+function parseMutation(line) {
+  try {
+    return ok(decodeMutation(line));
+  } catch (error) {
+    if (error instanceof JsonlDecodeError)
+      return err(error);
+    throw error;
   }
 }
 function encodeMutation(mutation) {
@@ -124768,28 +125317,38 @@ class JsonlSessionStorage {
 `);
     if (physicalLines.at(-1) === "")
       physicalLines.pop();
-    if (physicalLines.length === 0 || !physicalLines[0])
-      throw invalidFile(path7, 1, "is missing a header");
-    const header = parseHeader(physicalLines[0], path7);
+    if (physicalLines.length === 0 || !physicalLines[0]) {
+      throw invalidFile(path7, 1, new JsonlDecodeError("schema", "is missing a header"));
+    }
+    const headerResult = parseHeader(physicalLines[0]);
+    if (!headerResult.ok)
+      throw invalidFile(path7, 1, headerResult.error);
     const fileInfo = fileResult(await fs5.fileInfo(path7), `Failed to read session metadata ${path7}`);
-    const storage = new JsonlSessionStorage(fs5, metadataFromHeader(header, path7, fileInfo.mtimeMs));
+    const storage = new JsonlSessionStorage(fs5, metadataFromHeader(headerResult.value, path7, fileInfo.mtimeMs));
     for (let index = 1;index < physicalLines.length; index++) {
       const line = physicalLines[index];
-      let mutation;
-      try {
-        mutation = parseMutation(line, path7, index + 1);
-      } catch (error) {
-        if (index !== physicalLines.length - 1 || !(error instanceof SessionError) || error.cause === undefined)
-          throw error;
-        const validPrefix = `${physicalLines.slice(0, index).join(`
+      const mutationResult = parseMutation(line);
+      if (!mutationResult.ok) {
+        const isTornTail = index === physicalLines.length - 1 && mutationResult.error.kind === "syntax";
+        if (isTornTail) {
+          const validPrefix = `${physicalLines.slice(0, index).join(`
 `)}
 `;
-        await publishFileAtomically(fs5, path7, async (tempPath) => {
-          fileResult(await fs5.writeFile(tempPath, validPrefix), `Failed to stage torn-tail repair ${path7}`);
-        });
-        return storage;
+          await publishFileAtomically(fs5, path7, async (tempPath) => {
+            fileResult(await fs5.writeFile(tempPath, validPrefix), `Failed to stage torn-tail repair ${path7}`);
+          });
+          return storage;
+        }
+        throw invalidFile(path7, index + 1, mutationResult.error);
+      }
+      try {
+        storage.applyMutation(mutationResult.value);
+      } catch (error) {
+        if (error instanceof SessionError && error.code === "invalid_entry") {
+          throw invalidFile(path7, index + 1, error);
+        }
+        throw error;
       }
-      storage.applyMutation(mutation, path7, index + 1);
     }
     if (!content.endsWith(`
 `)) {
@@ -124932,10 +125491,8 @@ class JsonlSessionStorage {
   async appendMutation(mutation) {
     fileResult(await this.fs.appendFile(this.metadata.path, encodeMutation(mutation)), `Failed to append session ${this.metadata.path}`);
   }
-  applyMutation(mutation, path7 = this.metadata.path, line = this.state.nextSequence + 1) {
-    this.state.applyMutation(mutation, (message) => {
-      throw invalidFile(path7, line, message);
-    });
+  applyMutation(mutation) {
+    this.state.applyMutation(mutation);
   }
 }
 
@@ -124946,9 +125503,53 @@ function validateSessionId(id) {
     throw new SessionError("invalid_payload", "Session id must be non-empty, contain only alphanumeric characters, '-', '_', and '.', and start and end with an alphanumeric character");
   }
 }
-function sessionDirectoryName(cwd) {
+function jsonlSessionDirectoryName(cwd) {
   return `--${cwd.replace(/^[/\\]/, "").replace(/[/\\:]/g, "-")}--`;
 }
+async function jsonlSessionsRoot(options) {
+  return fileResult(await options.fs.absolutePath(options.sessionsRoot), `Failed to resolve sessions root ${options.sessionsRoot}`);
+}
+async function jsonlSessionDirectory(fs5, sessionsRoot, cwd) {
+  return fileResult(await fs5.joinPath([sessionsRoot, jsonlSessionDirectoryName(cwd)]), `Failed to resolve sessions directory for ${cwd}`);
+}
+async function jsonlSessionDirectories(options, cwd) {
+  const sessionsRoot = await jsonlSessionsRoot(options);
+  if (cwd !== undefined) {
+    const resolvedCwd = fileResult(await options.fs.absolutePath(cwd), `Failed to resolve session cwd ${cwd}`);
+    const directory = await jsonlSessionDirectory(options.fs, sessionsRoot, resolvedCwd);
+    return fileResult(await options.fs.exists(directory), `Failed to check sessions directory ${directory}`) ? [directory] : [];
+  }
+  if (!fileResult(await options.fs.exists(sessionsRoot), `Failed to check sessions directory ${sessionsRoot}`))
+    return [];
+  return fileResult(await options.fs.listDir(sessionsRoot), `Failed to list sessions directory ${sessionsRoot}`).filter((entry) => entry.kind === "directory" || entry.kind === "symlink").map((entry) => entry.path);
+}
+async function listJsonlSessionMetadata(options, query = {}) {
+  const metadata = [];
+  for (const directory of await jsonlSessionDirectories(options, query.cwd)) {
+    const files = fileResult(await options.fs.listDir(directory), `Failed to list sessions directory ${directory}`).filter((entry) => entry.kind !== "directory" && entry.name.endsWith(".jsonl"));
+    for (const file of files) {
+      const [firstLine] = fileResult(await options.fs.readTextLines(file.path, { maxLines: 1 }), `Failed to read session header ${file.path}`);
+      if (!firstLine)
+        continue;
+      const headerResult = parseHeader(firstLine);
+      if (!headerResult.ok)
+        continue;
+      metadata.push(metadataFromHeader(headerResult.value, file.path, file.mtimeMs));
+    }
+  }
+  return metadata.sort((left, right) => right.modifiedAt - left.modifiedAt);
+}
+async function loadJsonlSessionStorage(options, metadata) {
+  if (!fileResult(await options.fs.exists(metadata.path), `Failed to check session ${metadata.path}`)) {
+    throw new SessionError("not_found", `Session not found: ${metadata.id}`);
+  }
+  const storage = await JsonlSessionStorage.load(options.fs, metadata.path);
+  const loadedMetadata = await storage.getMetadata();
+  if (loadedMetadata.id !== metadata.id) {
+    throw new SessionError("invalid_entry", `Session id does not match header: ${metadata.id}`);
+  }
+  return storage;
+}
 function sessionFileName(createdAt, id) {
   const timestamp = new Date(createdAt).toISOString().replace(/[:.]/g, "-");
   return `${timestamp}_${id}.jsonl`;
@@ -124957,14 +125558,18 @@ function sessionFileName(createdAt, id) {
 class JsonlSessionRepo {
   fs;
   sessionsRootInput;
+  activeCreateDestinations = new Set;
   rootPromise;
   constructor(options) {
     this.fs = options.fs;
     this.sessionsRootInput = options.sessionsRoot;
   }
   async create(options) {
-    const { header, path: path7 } = await this.prepareCreate(options);
-    return new Session(await JsonlSessionStorage.create(this.fs, path7, header));
+    const destination = await this.resolveCreateDestination(options);
+    return this.claimCreateDestination(destination, async () => {
+      const { header, path: path7 } = await this.prepareCreate(destination, options);
+      return new Session(await JsonlSessionStorage.create(this.fs, path7, header));
+    });
   }
   async open(metadata) {
     return new Session(await this.loadStorage(metadata));
@@ -124977,27 +125582,39 @@ class JsonlSessionRepo {
   }
   async fork(source, options) {
     const sourceStorage = await this.loadStorage(source);
-    const { header, path: path7 } = await this.prepareCreate({
+    const createOptions = {
       ...options,
       parentSessionId: options.parentSessionId ?? source.id
+    };
+    const destination = await this.resolveCreateDestination(createOptions);
+    return this.claimCreateDestination(destination, async () => {
+      const { header, path: path7 } = await this.prepareCreate(destination, createOptions);
+      return new Session(await sourceStorage.fork(path7, header, options));
     });
-    return new Session(await sourceStorage.fork(path7, header, options));
   }
   async loadStorage(metadata) {
-    if (!fileResult(await this.fs.exists(metadata.path), `Failed to check session ${metadata.path}`)) {
-      throw new SessionError("not_found", `Session not found: ${metadata.id}`);
-    }
-    const storage = await JsonlSessionStorage.load(this.fs, metadata.path);
-    const loadedMetadata = await storage.getMetadata();
-    if (loadedMetadata.id !== metadata.id) {
-      throw new SessionError("invalid_entry", `Session id does not match header: ${metadata.id}`);
-    }
-    return storage;
+    return loadJsonlSessionStorage({ fs: this.fs, sessionsRoot: this.sessionsRootInput }, metadata);
   }
-  async prepareCreate(options) {
+  async resolveCreateDestination(options) {
     const id = options.id ?? uuidv7();
     validateSessionId(id);
     const cwd = fileResult(await this.fs.absolutePath(options.cwd), `Failed to resolve session cwd ${options.cwd}`);
+    return { id, cwd };
+  }
+  async claimCreateDestination(destination, operation) {
+    const key = `${destination.cwd}\x00${destination.id}`;
+    if (this.activeCreateDestinations.has(key)) {
+      throw new SessionError("already_exists", `Session already exists: ${destination.id}`);
+    }
+    this.activeCreateDestinations.add(key);
+    try {
+      return await operation();
+    } finally {
+      this.activeCreateDestinations.delete(key);
+    }
+  }
+  async prepareCreate(destination, options) {
+    const { id, cwd } = destination;
     if (await this.sessionIdExists(id, cwd)) {
       throw new SessionError("already_exists", `Session already exists: ${id}`);
     }
@@ -125019,20 +125636,7 @@ class JsonlSessionRepo {
     return { header, path: path7 };
   }
   async listDirect(options) {
-    const directories = await this.sessionDirectories(options.cwd);
-    const metadata = [];
-    for (const directory of directories) {
-      const files = fileResult(await this.fs.listDir(directory), `Failed to list sessions directory ${directory}`).filter((entry) => entry.kind !== "directory" && entry.name.endsWith(".jsonl"));
-      for (const file of files) {
-        const content = fileResult(await this.fs.readTextFile(file.path), `Failed to read session header ${file.path}`);
-        const firstLine = content.split(`
-`, 1)[0];
-        if (!firstLine)
-          throw invalidFile(file.path, 1, "is missing a header");
-        metadata.push(metadataFromHeader(parseHeader(firstLine, file.path), file.path, file.mtimeMs));
-      }
-    }
-    return metadata.sort((left, right) => right.modifiedAt - left.modifiedAt);
+    return listJsonlSessionMetadata({ fs: this.fs, sessionsRoot: this.sessionsRootInput }, options);
   }
   async sessionIdExists(id, cwd) {
     const suffix = `_${id}.jsonl`;
@@ -125042,19 +125646,8 @@ class JsonlSessionRepo {
     const files = fileResult(await this.fs.listDir(directory), `Failed to list sessions directory ${directory}`);
     return files.some((entry) => entry.kind !== "directory" && entry.name.endsWith(suffix));
   }
-  async sessionDirectories(cwd) {
-    const root = await this.root();
-    if (cwd !== undefined) {
-      const resolvedCwd = fileResult(await this.fs.absolutePath(cwd), `Failed to resolve session cwd ${cwd}`);
-      const directory = await this.sessionDirectory(resolvedCwd);
-      return fileResult(await this.fs.exists(directory), `Failed to check sessions directory ${directory}`) ? [directory] : [];
-    }
-    if (!fileResult(await this.fs.exists(root), `Failed to check sessions directory ${root}`))
-      return [];
-    return fileResult(await this.fs.listDir(root), `Failed to list sessions directory ${root}`).filter((entry) => entry.kind === "directory" || entry.kind === "symlink").map((entry) => entry.path);
-  }
   async sessionDirectory(cwd) {
-    return fileResult(await this.fs.joinPath([await this.root(), sessionDirectoryName(cwd)]), `Failed to resolve sessions directory for ${cwd}`);
+    return fileResult(await this.fs.joinPath([await this.root(), jsonlSessionDirectoryName(cwd)]), `Failed to resolve sessions directory for ${cwd}`);
   }
   root() {
     this.rootPromise ??= this.fs.absolutePath(this.sessionsRootInput).then((result) => fileResult(result, `Failed to resolve sessions root ${this.sessionsRootInput}`));
@@ -125199,71 +125792,6 @@ class InMemorySessionRepo {
     return storage;
   }
 }
-// node_modules/@earendil-works/pi-agent-core/dist/harness/types.js
-function ok(value2) {
-  return { ok: true, value: value2 };
-}
-function err(error) {
-  return { ok: false, error };
-}
-function getOrThrow(result) {
-  if (!result.ok)
-    throw result.error;
-  return result.value;
-}
-function getOrUndefined(result) {
-  return result.ok ? result.value : undefined;
-}
-function toError(error) {
-  if (error instanceof Error)
-    return error;
-  if (typeof error === "string")
-    return new Error(error);
-  try {
-    return new Error(JSON.stringify(error));
-  } catch {
-    return new Error(String(error));
-  }
-}
-
-class FileError extends Error {
-  code;
-  path;
-  constructor(code, message, path7, cause) {
-    super(message, cause === undefined ? undefined : { cause });
-    this.name = "FileError";
-    this.code = code;
-    this.path = path7;
-  }
-}
-
-class ExecutionError extends Error {
-  code;
-  constructor(code, message, cause) {
-    super(message, cause === undefined ? undefined : { cause });
-    this.name = "ExecutionError";
-    this.code = code;
-  }
-}
-
-class CompactionError extends Error {
-  code;
-  constructor(code, message, cause) {
-    super(message, cause === undefined ? undefined : { cause });
-    this.name = "CompactionError";
-    this.code = code;
-  }
-}
-
-class BranchSummaryError extends Error {
-  code;
-  constructor(code, message, cause) {
-    super(message, cause === undefined ? undefined : { cause });
-    this.name = "BranchSummaryError";
-    this.code = code;
-  }
-}
-
 // node_modules/@earendil-works/pi-agent-core/dist/harness/compaction/utils.js
 function createFileOps2() {
   return {
@@ -126311,48 +126839,6 @@ function substituteArgs(content, args) {
 function formatPromptTemplateInvocation(template, args = []) {
   return substituteArgs(template.content, args);
 }
-// node_modules/@earendil-works/pi-agent-core/dist/harness/session/search.js
-function getFileSystemResultOrThrow(result, message) {
-  if (!result.ok) {
-    const code = result.error.code === "not_found" ? "not_found" : "storage";
-    throw new SessionError(code, `${message}: ${result.error.message}`, result.error);
-  }
-  return result.value;
-}
-
-class ScanningSessionSearch {
-  source;
-  constructor(source) {
-    this.source = source;
-  }
-  async search(options) {
-    const normalizedText = options.text.trim().toLowerCase();
-    if (!normalizedText)
-      return [];
-    const hits = [];
-    for (const metadata of await this.source.list()) {
-      const cwd = metadata.cwd;
-      if (options.cwd !== undefined && cwd !== options.cwd)
-        continue;
-      const session2 = await this.source.open(metadata);
-      for (const entry of await session2.findEntries({ order: "oldestFirst" })) {
-        const payload = JSON.stringify(entry);
-        if (!payload.toLowerCase().includes(normalizedText))
-          continue;
-        hits.push({
-          metadata,
-          entryId: entry.id,
-          timestamp: new Date(entry.timestamp).toISOString(),
-          snippet: payload
-        });
-      }
-    }
-    return hits;
-  }
-}
-function createScanningSessionSearch(source) {
-  return new ScanningSessionSearch(source);
-}
 // node_modules/@earendil-works/pi-agent-core/dist/harness/skills.js
 var import_ignore = __toESM(require_ignore(), 1);
 var MAX_NAME_LENGTH = 64;
@@ -128028,9 +128514,9 @@ function overlapCount(a, b2) {
   }
   return k;
 }
-function segment(string, segmenter2) {
+function segment(string, segmenter3) {
   const parts = [];
-  for (const segmentObj of Array.from(segmenter2.segment(string))) {
+  for (const segmentObj of Array.from(segmenter3.segment(string))) {
     const segment2 = segmentObj.segment;
     if (parts.length && /\s/.test(parts[parts.length - 1]) && /\s/.test(segment2)) {
       parts[parts.length - 1] += segment2;
@@ -128040,9 +128526,9 @@ function segment(string, segmenter2) {
   }
   return parts;
 }
-function trailingWs(string, segmenter2) {
-  if (segmenter2) {
-    return leadingAndTrailingWs(string, segmenter2)[1];
+function trailingWs(string, segmenter3) {
+  if (segmenter3) {
+    return leadingAndTrailingWs(string, segmenter3)[1];
   }
   let i;
   for (i = string.length - 1;i >= 0; i--) {
@@ -128052,21 +128538,21 @@ function trailingWs(string, segmenter2) {
   }
   return string.substring(i + 1);
 }
-function leadingWs(string, segmenter2) {
-  if (segmenter2) {
-    return leadingAndTrailingWs(string, segmenter2)[0];
+function leadingWs(string, segmenter3) {
+  if (segmenter3) {
+    return leadingAndTrailingWs(string, segmenter3)[0];
   }
   const match = string.match(/^\s*/);
   return match ? match[0] : "";
 }
-function leadingAndTrailingWs(string, segmenter2) {
-  if (!segmenter2) {
+function leadingAndTrailingWs(string, segmenter3) {
+  if (!segmenter3) {
     return [leadingWs(string), trailingWs(string)];
   }
-  if (segmenter2.resolvedOptions().granularity != "word") {
+  if (segmenter3.resolvedOptions().granularity != "word") {
     throw new Error('The segmenter passed must have a granularity of "word"');
   }
-  const segments = segment(string, segmenter2);
+  const segments = segment(string, segmenter3);
   const firstSeg = segments[0];
   const lastSeg = segments[segments.length - 1];
   const head = /\s/.test(firstSeg) ? firstSeg : "";
@@ -128089,11 +128575,11 @@ class WordDiff extends Diff {
   tokenize(value2, options = {}) {
     let parts;
     if (options.intlSegmenter) {
-      const segmenter2 = options.intlSegmenter;
-      if (segmenter2.resolvedOptions().granularity != "word") {
+      const segmenter3 = options.intlSegmenter;
+      if (segmenter3.resolvedOptions().granularity != "word") {
         throw new Error('The segmenter passed must have a granularity of "word"');
       }
-      parts = segment(value2, segmenter2);
+      parts = segment(value2, segmenter3);
     } else {
       parts = value2.match(tokenizeIncludingWhitespace) || [];
     }
@@ -128162,10 +128648,10 @@ function diffWords(oldStr, newStr, options) {
   }
   return wordDiff.diff(oldStr, newStr, options);
 }
-function dedupeWhitespaceInChangeObjects(startKeep, deletion, insertion, endKeep, segmenter2) {
+function dedupeWhitespaceInChangeObjects(startKeep, deletion, insertion, endKeep, segmenter3) {
   if (deletion && insertion) {
-    const [oldWsPrefix, oldWsSuffix] = leadingAndTrailingWs(deletion.value, segmenter2);
-    const [newWsPrefix, newWsSuffix] = leadingAndTrailingWs(insertion.value, segmenter2);
+    const [oldWsPrefix, oldWsSuffix] = leadingAndTrailingWs(deletion.value, segmenter3);
+    const [newWsPrefix, newWsSuffix] = leadingAndTrailingWs(insertion.value, segmenter3);
     if (startKeep) {
       const commonWsPrefix = longestCommonPrefix(oldWsPrefix, newWsPrefix);
       startKeep.value = replaceSuffix(startKeep.value, newWsPrefix, commonWsPrefix);
@@ -128180,15 +128666,15 @@ function dedupeWhitespaceInChangeObjects(startKeep, deletion, insertion, endKeep
     }
   } else if (insertion) {
     if (startKeep) {
-      const ws = leadingWs(insertion.value, segmenter2);
+      const ws = leadingWs(insertion.value, segmenter3);
       insertion.value = insertion.value.substring(ws.length);
     }
     if (endKeep) {
-      const ws = leadingWs(endKeep.value, segmenter2);
+      const ws = leadingWs(endKeep.value, segmenter3);
       endKeep.value = endKeep.value.substring(ws.length);
     }
   } else if (startKeep && endKeep) {
-    const newWsFull = leadingWs(endKeep.value, segmenter2), [delWsStart, delWsEnd] = leadingAndTrailingWs(deletion.value, segmenter2);
+    const newWsFull = leadingWs(endKeep.value, segmenter3), [delWsStart, delWsEnd] = leadingAndTrailingWs(deletion.value, segmenter3);
     const newWsStart = longestCommonPrefix(newWsFull, delWsStart);
     deletion.value = removePrefix(deletion.value, newWsStart);
     const newWsEnd = longestCommonSuffix(removePrefix(newWsFull, newWsStart), delWsEnd);
@@ -128196,13 +128682,13 @@ function dedupeWhitespaceInChangeObjects(startKeep, deletion, insertion, endKeep
     endKeep.value = replacePrefix(endKeep.value, newWsFull, newWsEnd);
     startKeep.value = replaceSuffix(startKeep.value, newWsFull, newWsFull.slice(0, newWsFull.length - newWsEnd.length));
   } else if (endKeep) {
-    const endKeepWsPrefix = leadingWs(endKeep.value, segmenter2);
-    const deletionWsSuffix = trailingWs(deletion.value, segmenter2);
+    const endKeepWsPrefix = leadingWs(endKeep.value, segmenter3);
+    const deletionWsSuffix = trailingWs(deletion.value, segmenter3);
     const overlap = maximumOverlap(deletionWsSuffix, endKeepWsPrefix);
     deletion.value = removeSuffix(deletion.value, overlap);
   } else if (startKeep) {
-    const startKeepWsSuffix = trailingWs(startKeep.value, segmenter2);
-    const deletionWsPrefix = leadingWs(deletion.value, segmenter2);
+    const startKeepWsSuffix = trailingWs(startKeep.value, segmenter3);
+    const deletionWsPrefix = leadingWs(deletion.value, segmenter3);
     const overlap = maximumOverlap(startKeepWsSuffix, deletionWsPrefix);
     deletion.value = removePrefix(deletion.value, overlap);
   }
@@ -129532,6 +130018,7 @@ function processProxyEvent(proxyEvent, partial) {
     case "toolcall_end": {
       const content = partial.content[proxyEvent.contentIndex];
       if (content?.type === "toolCall") {
+        Object.assign(content, proxyEvent.toolCall);
         delete content.partialJson;
         return {
           type: "toolcall_end",
@@ -129558,6 +130045,108 @@ function processProxyEvent(proxyEvent, partial) {
     }
   }
 }
+// node_modules/@earendil-works/pi-agent-core/dist/search/scanning.js
+function defaultSearchText(_metadata, entry, label) {
+  return label === undefined ? JSON.stringify(entry) : `${JSON.stringify(entry)} ${label}`;
+}
+async function* scanReadableEntries(readable, metadata, options, query = {}) {
+  const projectText = options.projectText ?? defaultSearchText;
+  const pageSize = query.limit ?? options.pageSize ?? 100;
+  let afterSeq = query.afterSeq ?? 0;
+  const entryTypes = query.entryTypes === undefined ? undefined : new Set(query.entryTypes);
+  while (true) {
+    const entries = await readable.findEntries({
+      order: "oldestFirst",
+      limit: pageSize,
+      cursor: { afterSeq },
+      type: query.entryTypes?.length === 1 ? query.entryTypes[0] : undefined
+    });
+    if (entries.length === 0)
+      break;
+    for (const entry of entries) {
+      if (entryTypes !== undefined && !entryTypes.has(entry.type))
+        continue;
+      const label = await readable.getLabel(entry.id);
+      yield {
+        entryId: entry.id,
+        seq: entry.seq,
+        type: entry.type,
+        timestamp: entry.timestamp,
+        text: projectText(metadata, entry, label),
+        fields: label === undefined ? undefined : { label }
+      };
+    }
+    afterSeq = entries[entries.length - 1]?.seq ?? afterSeq;
+    if (entries.length < pageSize)
+      break;
+  }
+}
+async function* scanningEntries(readable, options = {}) {
+  yield* scanReadableEntries(readable, await readable.getMetadata(), options);
+}
+async function* arraySource(readables) {
+  yield* readables;
+}
+function readablesFor(source, options) {
+  return typeof source === "function" ? source(options) : arraySource(source);
+}
+function defaultMatch(queryText, candidate) {
+  return candidate.text.toLowerCase().includes(queryText);
+}
+function throwIfAborted(signal) {
+  if (!signal?.aborted)
+    return;
+  if (signal.reason instanceof Error)
+    throw signal.reason;
+  const error = new Error("The operation was aborted");
+  error.name = "AbortError";
+  throw error;
+}
+function createDefaultScanningHit(metadata, candidate) {
+  return {
+    sessionId: metadata.id,
+    entryId: candidate.entryId,
+    timestamp: candidate.timestamp,
+    snippet: candidate.text
+  };
+}
+function createScanningSessionSearch(source, options = {}) {
+  const createHit = options.createHit ?? ((metadata, candidate) => createDefaultScanningHit(metadata, candidate));
+  return {
+    async* search(text, searchOptions = {}) {
+      const normalizedText = text.trim().toLowerCase();
+      if (!normalizedText || searchOptions.limit !== undefined && searchOptions.limit <= 0)
+        return;
+      if (searchOptions.entryTypes?.length === 0)
+        return;
+      let hitCount = 0;
+      const seenSessionIds = new Set;
+      const entryTypes = searchOptions.entryTypes === undefined ? undefined : new Set(searchOptions.entryTypes);
+      const sourceOptions = options.sourceOptions?.(normalizedText, searchOptions);
+      for await (const readable of readablesFor(source, sourceOptions)) {
+        throwIfAborted(searchOptions.signal);
+        const metadata = await readable.getMetadata();
+        if (seenSessionIds.has(metadata.id))
+          throw new Error(`Duplicate sessionId: ${metadata.id}`);
+        seenSessionIds.add(metadata.id);
+        for await (const candidate of scanReadableEntries(readable, metadata, options, {
+          entryTypes: searchOptions.entryTypes
+        })) {
+          throwIfAborted(searchOptions.signal);
+          if (entryTypes !== undefined && !entryTypes.has(candidate.type))
+            continue;
+          const matches = options.match?.(normalizedText, candidate, metadata) ?? defaultMatch(normalizedText, candidate);
+          if (!matches)
+            continue;
+          yield createHit(metadata, candidate);
+          hitCount += 1;
+          if (searchOptions.limit !== undefined && hitCount >= searchOptions.limit)
+            return;
+        }
+      }
+    }
+  };
+}
 // node_modules/@earendil-works/pi-ai/dist/oauth.js
 var exports_oauth = {};
 
@@ -132440,7 +133029,8 @@ ${content}
       prompt2 += formatSkillsForPrompt(skills2);
     }
     prompt2 += `
-Current working directory: ${promptCwd}`;
+Current working directory: ${promptCwd}
+`;
     return prompt2;
   }
   const readmePath = getReadmePath();
@@ -132571,6 +133161,15 @@ function truncateToVisualLines(text, maxVisualLines, width, paddingX = 0) {
   return { visualLines: truncatedLines, skippedCount };
 }
 
+// node_modules/@earendil-works/pi-coding-agent/dist/core/experimental.js
+var PREFER_STRICT_TOOL_SAMPLING = { type: "json_schema", strict: "prefer" };
+function areExperimentalFeaturesEnabled() {
+  return process.env.PI_EXPERIMENTAL === "1";
+}
+function getExperimentalToolSampling() {
+  return areExperimentalFeaturesEnabled() ? PREFER_STRICT_TOOL_SAMPLING : undefined;
+}
+
 // node_modules/@earendil-works/pi-coding-agent/dist/core/tools/output-accumulator.js
 import { randomBytes as randomBytes2 } from "node:crypto";
 import { createWriteStream as createWriteStream2 } from "node:fs";
@@ -133024,6 +133623,7 @@ function createBashToolDefinition(cwd, options) {
     promptSnippet: bashToolSystemPromptContribution.snippet,
     promptGuidelines: exposeSessionEnvironment ? [...bashToolSystemPromptContribution.guidelines] : undefined,
     parameters: bashSchema2,
+    constrainedSampling: getExperimentalToolSampling(),
     async execute(_toolCallId, { command, timeout }, signal, onUpdate, ctx) {
       const resolvedCommand = commandPrefix ? `${commandPrefix}
 ${command}` : command;
@@ -133918,36 +134518,37 @@ function createEditToolDefinition(cwd, options) {
     promptSnippet: editToolSystemPromptContribution.snippet,
     promptGuidelines: [...editToolSystemPromptContribution.guidelines],
     parameters: editSchema2,
+    constrainedSampling: getExperimentalToolSampling(),
     renderShell: "self",
     prepareArguments: prepareEditArguments2,
     async execute(_toolCallId, input, signal, _onUpdate, _ctx) {
       const { path: path8, edits } = validateEditInput2(input);
       const absolutePath = resolveToCwd(path8, cwd);
       return withFileMutationQueue2(absolutePath, async () => {
-        const throwIfAborted = () => {
+        const throwIfAborted2 = () => {
           if (signal?.aborted)
             throw new Error("Operation aborted");
         };
-        throwIfAborted();
+        throwIfAborted2();
         try {
           await ops.access(absolutePath);
         } catch (error) {
-          throwIfAborted();
+          throwIfAborted2();
           const errorMessage = error instanceof Error && "code" in error ? `Error code: ${error.code}` : String(error);
           throw new Error(`Could not edit file: ${path8}. ${errorMessage}.`);
         }
-        throwIfAborted();
+        throwIfAborted2();
         const buffer = await ops.readFile(absolutePath);
         const rawContent = buffer.toString("utf-8");
-        throwIfAborted();
+        throwIfAborted2();
         const { bom, text: content } = stripBom2(rawContent);
         const originalEnding = detectLineEnding2(content);
         const normalizedContent = normalizeToLF2(content);
         const { baseContent, newContent } = applyEditsToNormalizedContent2(normalizedContent, edits, path8);
-        throwIfAborted();
+        throwIfAborted2();
         const finalContent = bom + restoreLineEndings2(newContent, originalEnding);
         await ops.writeFile(absolutePath, finalContent);
-        throwIfAborted();
+        throwIfAborted2();
         const diffResult = generateDiffString2(baseContent, newContent);
         const patch = generateUnifiedPatch2(path8, baseContent, newContent);
         return {
@@ -134023,7 +134624,6 @@ import { spawn as spawn5 } from "child_process";
 import path8 from "path";
 
 // node_modules/@earendil-works/pi-coding-agent/dist/utils/tools-manager.js
-init_source();
 import { spawnSync as spawnSync3 } from "child_process";
 import { chmodSync, createWriteStream as createWriteStream3, existsSync as existsSync9, mkdirSync as mkdirSync3, readdirSync as readdirSync7, renameSync, rmSync } from "fs";
 import { arch, platform } from "os";
@@ -134300,7 +134900,7 @@ var TERMUX_PACKAGES = {
   fd: "fd",
   rg: "ripgrep"
 };
-async function ensureTool(tool, silent = false) {
+async function ensureTool(tool, onStatus) {
   const existingPath = getToolPath(tool);
   if (existingPath) {
     return existingPath;
@@ -134309,31 +134909,24 @@ async function ensureTool(tool, silent = false) {
   if (!config)
     return;
   if (isOfflineModeEnabled()) {
-    if (!silent) {
-      console.log(source_default.yellow(`${config.name} not found. Offline mode enabled, skipping download.`));
-    }
+    onStatus?.({ type: "warning", message: `${config.name} not found. Offline mode enabled, skipping download.` });
     return;
   }
   if (platform() === "android") {
     const pkgName = TERMUX_PACKAGES[tool] ?? tool;
-    if (!silent) {
-      console.log(source_default.yellow(`${config.name} not found. Install with: pkg install ${pkgName}`));
-    }
+    onStatus?.({ type: "warning", message: `${config.name} not found. Install with: pkg install ${pkgName}` });
     return;
   }
-  if (!silent) {
-    console.log(source_default.dim(`${config.name} not found. Downloading...`));
-  }
+  onStatus?.({ type: "info", message: `${config.name} not found. Downloading...` });
   try {
     const path8 = await downloadTool(tool);
-    if (!silent) {
-      console.log(source_default.dim(`${config.name} installed to ${path8}`));
-    }
+    onStatus?.({ type: "info", message: `${config.name} installed to ${path8}` });
     return path8;
   } catch (e) {
-    if (!silent) {
-      console.log(source_default.yellow(`Failed to download ${config.name}: ${e instanceof Error ? e.message : e}`));
-    }
+    onStatus?.({
+      type: "warning",
+      message: `Failed to download ${config.name}: ${e instanceof Error ? e.message : e}`
+    });
     return;
   }
 }
@@ -134488,7 +135081,7 @@ function createFindToolDefinition(cwd, options) {
               }));
               return;
             }
-            const fdPath = await ensureTool("fd", true);
+            const fdPath = await ensureTool("fd");
             if (signal?.aborted) {
               settle(() => reject(new Error("Operation aborted")));
               return;
@@ -134717,7 +135310,7 @@ function createGrepToolDefinition(cwd, options) {
         };
         (async () => {
           try {
-            const rgPath = await ensureTool("rg", true);
+            const rgPath = await ensureTool("rg");
             if (!rgPath) {
               settle(() => reject(new Error("ripgrep (rg) is not available and could not be downloaded")));
               return;
@@ -135312,6 +135905,7 @@ function createReadToolDefinition(cwd, options) {
     promptSnippet: readToolSystemPromptContribution.snippet,
     promptGuidelines: [...readToolSystemPromptContribution.guidelines],
     parameters: readSchema2,
+    constrainedSampling: getExperimentalToolSampling(),
     async execute(_toolCallId, { path: path10, offset, limit }, signal, _onUpdate, ctx) {
       return new Promise((resolve7, reject) => {
         if (signal?.aborted) {
@@ -135583,19 +136177,20 @@ function createWriteToolDefinition(cwd, options) {
     promptSnippet: writeToolSystemPromptContribution.snippet,
     promptGuidelines: [...writeToolSystemPromptContribution.guidelines],
     parameters: writeSchema2,
+    constrainedSampling: getExperimentalToolSampling(),
     async execute(_toolCallId, { path: path10, content }, signal, _onUpdate, _ctx) {
       const absolutePath = resolveToCwd(path10, cwd);
       const dir = dirname11(absolutePath);
       return withFileMutationQueue2(absolutePath, async () => {
-        const throwIfAborted = () => {
+        const throwIfAborted2 = () => {
           if (signal?.aborted)
             throw new Error("Operation aborted");
         };
-        throwIfAborted();
+        throwIfAborted2();
         await ops.mkdir(dir);
-        throwIfAborted();
+        throwIfAborted2();
         await ops.writeFile(absolutePath, content);
-        throwIfAborted();
+        throwIfAborted2();
         return {
           content: [{ type: "text", text: `Successfully wrote ${content.length} bytes to ${path10}` }],
           details: undefined
@@ -136515,7 +137110,7 @@ ${args}` : skillBlock;
     };
     if (options?.deliverAs === "nextTurn") {
       this._pendingNextTurnMessages.push(appMessage);
-    } else if (this.isStreaming) {
+    } else if (this.isStreaming && options?.triggerTurn !== false) {
       if (options?.deliverAs === "followUp") {
         this.agent.followUp(appMessage);
       } else {
@@ -136551,7 +137146,7 @@ ${args}` : skillBlock;
         images = undefined;
     }
     await this.prompt(text, {
-      expandPromptTemplates: false,
+      expandPromptTemplates: options?.expandPromptTemplates ?? false,
       streamingBehavior: options?.deliverAs,
       images,
       source: "extension"
@@ -137714,9 +138309,8 @@ ${command}` : command;
       percent
     };
   }
-  async exportToHtml(outputPath) {
-    const configuredThemeName = this.settingsManager.getTheme();
-    const themeName = configuredThemeName && getThemeByName(configuredThemeName) ? configuredThemeName : undefined;
+  async exportToHtml(outputPath, options = {}) {
+    const themeName = [options.themeName, this.settingsManager.getTheme()].find((candidate) => candidate !== undefined && getThemeByName(candidate) !== undefined);
     const toolRenderer = createToolHtmlRenderer({
       getToolDefinition: (name) => this.getToolDefinition(name),
       theme,
@@ -140412,6 +141006,7 @@ var OpenAIResponsesCompatSchema = exports_typebox.Object({
   supportsLongCacheRetention: exports_typebox.Optional(exports_typebox.Boolean()),
   supportsStrictMode: exports_typebox.Optional(exports_typebox.Boolean()),
   supportsOpenAIGrammarTools: exports_typebox.Optional(exports_typebox.Boolean()),
+  supportsAdditionalTools: exports_typebox.Optional(exports_typebox.Boolean()),
   supportsToolSearch: exports_typebox.Optional(exports_typebox.Boolean())
 });
 var AnthropicMessagesCompatSchema = exports_typebox.Object({
@@ -148268,6 +148863,14 @@ class SettingsManager {
     this.markModified("tuiMode");
     this.save();
   }
+  getFullscreenExitOutput() {
+    return this.settings.fullscreenExitOutput === "resume-hint" ? "resume-hint" : "transcript";
+  }
+  setFullscreenExitOutput(output) {
+    this.globalSettings.fullscreenExitOutput = output;
+    this.markModified("fullscreenExitOutput");
+    this.save();
+  }
   getFullscreenScrollbar() {
     const mode = this.settings.fullscreenScrollbar;
     return mode === "always" || mode === "hidden" ? mode : "auto";
@@ -148302,6 +148905,10 @@ class SettingsManager {
   getEnabledModels() {
     return this.settings.enabledModels;
   }
+  getDefaultTools() {
+    const tools2 = this.settings.defaultTools;
+    return tools2 ? [...tools2] : undefined;
+  }
   setEnabledModels(patterns) {
     this.globalSettings.enabledModels = patterns;
     this.markModified("enabledModels");
@@ -149729,10 +150336,11 @@ async function createAgentSession(options = {}) {
     thinkingLevel = clampThinkingLevel(model, thinkingLevel);
   }
   const defaultActiveToolNames = ["read", "bash", "edit", "write"];
+  const configuredDefaultToolNames = settingsManager.getDefaultTools();
   const allowedToolNames = options.tools ?? (options.noTools === "all" ? [] : undefined);
   const excludedToolNames = options.excludeTools;
   const excludedToolNameSet = excludedToolNames ? new Set(excludedToolNames) : undefined;
-  const initialActiveToolNames = (options.tools ? [...options.tools] : options.noTools ? [] : defaultActiveToolNames).filter((name) => !excludedToolNameSet?.has(name));
+  const initialActiveToolNames = (options.tools ?? (options.noTools ? [] : configuredDefaultToolNames ?? defaultActiveToolNames)).filter((name) => !excludedToolNameSet?.has(name));
   let agent2;
   const convertToLlmWithBlockImages = (messages2) => {
     const converted = convertToLlm(messages2);
@@ -150040,9 +150648,9 @@ init_source();
 class AuthCommandError extends Error {
 }
 var AUTH_COMMAND_USAGE = {
-  check: "pi auth check --provider <provider> [--json] [--credentials] [--no-refresh]",
-  api_key: "pi auth print-api-key --provider <provider> [--model <model>]",
-  bearer_token: "pi auth print-bearer-token --provider <provider> [--model <model>] [--min-expiry <duration>]"
+  check: `${APP_NAME} auth check --provider <provider> [--json] [--credentials] [--no-refresh]`,
+  api_key: `${APP_NAME} auth print-api-key --provider <provider> [--model <model>]`,
+  bearer_token: `${APP_NAME} auth print-bearer-token --provider <provider> [--model <model>] [--min-expiry <duration>]`
 };
 function getAuthCommandName(kind) {
   return kind === "check" ? "auth check" : kind === "api_key" ? "auth print-api-key" : "auth print-bearer-token";
@@ -150066,7 +150674,7 @@ function parseAuthCommand(args) {
     return;
   const kind = args[1] === "check" ? "check" : args[1] === "print-api-key" ? "api_key" : args[1] === "print-bearer-token" ? "bearer_token" : undefined;
   if (!kind) {
-    throw new AuthCommandError(`Unknown auth command "${args[1] ?? ""}". Use "pi auth print-api-key", "pi auth print-bearer-token", or "pi auth check".`);
+    throw new AuthCommandError(`Unknown auth command "${args[1] ?? ""}". Use "${APP_NAME} auth print-api-key", "${APP_NAME} auth print-bearer-token", or "${APP_NAME} auth check".`);
   }
   const commandArgs = [];
   let json = false;
@@ -150410,11 +151018,6 @@ init_source();
 // node_modules/@earendil-works/pi-coding-agent/dist/cli/startup-ui.js
 import { existsSync as existsSync20 } from "fs";
 
-// node_modules/@earendil-works/pi-coding-agent/dist/core/experimental.js
-function areExperimentalFeaturesEnabled() {
-  return process.env.PI_EXPERIMENTAL === "1";
-}
-
 // node_modules/@earendil-works/pi-coding-agent/dist/core/keybindings.js
 import { existsSync as existsSync19, readFileSync as readFileSync14 } from "fs";
 import { join as join30 } from "path";
@@ -152124,7 +152727,7 @@ function formatProjectTrustPrompt(cwd) {
   return `Trust project folder?
 ${cwd}
 
-This allows pi to load ${CONFIG_DIR_NAME} settings and resources, install missing project packages, and execute project extensions.`;
+This allows ${APP_NAME} to load ${CONFIG_DIR_NAME} settings and resources, install missing project packages, and execute project extensions.`;
 }
 async function selectProjectTrustOption(cwd, ctx) {
   const options = getProjectTrustOptions(cwd, { includeSessionOnly: true });
@@ -156824,7 +157427,7 @@ var WIDTHS = [
 ];
 
 // node_modules/grok-mermaid/dist/width.js
-var segmenter2 = new Intl.Segmenter("en", { granularity: "grapheme" });
+var segmenter3 = new Intl.Segmenter("en", { granularity: "grapheme" });
 var VS16 = 65039;
 var isRegionalIndicator = (cp) => cp >= 127462 && cp <= 127487;
 function codePointWidth(cp) {
@@ -156859,12 +157462,12 @@ function clusterWidth(cluster) {
   return vs16 || regional >= 2 ? 2 : w2;
 }
 function* measured(s) {
-  for (const { segment: segment2 } of segmenter2.segment(s))
+  for (const { segment: segment2 } of segmenter3.segment(s))
     yield [segment2, clusterWidth(segment2)];
 }
 function stringWidth(s) {
   let w2 = 0;
-  for (const { segment: segment2 } of segmenter2.segment(s))
+  for (const { segment: segment2 } of segmenter3.segment(s))
     w2 += clusterWidth(segment2);
   return w2;
 }
@@ -159537,6 +160140,39 @@ ${codeSpan(styledWarning)}
   };
 }
 
+// node_modules/@earendil-works/pi-coding-agent/dist/modes/interactive/model-catalog-refresh.js
+class ModelCatalogRefreshCoordinator {
+  activeByRuntime = new WeakMap;
+  refresh(modelRuntime, signal) {
+    signal.throwIfAborted();
+    let active = this.activeByRuntime.get(modelRuntime);
+    if (!active) {
+      const controller = new AbortController;
+      let created;
+      const operation = modelRuntime.refresh({ signal: controller.signal });
+      const promise = raceWithAbortSignal(operation, controller.signal).finally(() => {
+        if (this.activeByRuntime.get(modelRuntime) === created) {
+          this.activeByRuntime.delete(modelRuntime);
+        }
+      });
+      created = { controller, promise, waiters: 0 };
+      active = created;
+      this.activeByRuntime.set(modelRuntime, active);
+    }
+    active.waiters++;
+    return raceWithAbortSignal(active.promise, signal).finally(() => {
+      active.waiters--;
+      if (active.waiters === 0 && this.activeByRuntime.get(modelRuntime) === active) {
+        active.controller.abort();
+      }
+    });
+  }
+}
+var modelCatalogRefreshCoordinator = new ModelCatalogRefreshCoordinator;
+function refreshModelCatalogs(modelRuntime, signal) {
+  return modelCatalogRefreshCoordinator.refresh(modelRuntime, signal);
+}
+
 // node_modules/@earendil-works/pi-coding-agent/dist/modes/interactive/model-search.js
 function getModelSearchText(item) {
   const { id, provider } = item;
@@ -159656,7 +160292,7 @@ class ModelSelectorComponent extends Container {
       this.refreshAbortController.abort();
     }, timeoutMs);
     try {
-      const result2 = await this.modelRuntime.refresh({ signal: this.refreshAbortController.signal });
+      const result2 = await refreshModelCatalogs(this.modelRuntime, this.refreshAbortController.signal);
       if (this.closed)
         return;
       this.refreshStatusMessage = "";
@@ -160635,6 +161271,13 @@ class SettingsSelectorComponent extends Container {
         currentValue: config.tuiMode,
         values: ["regular", "fullscreen"]
       },
+      {
+        id: "fullscreen-exit-output",
+        label: "Fullscreen exit output",
+        description: "Print the transcript or only a session resume hint when exiting fullscreen mode",
+        currentValue: config.fullscreenExitOutput,
+        values: ["transcript", "resume-hint"]
+      },
       {
         id: "fullscreen-scrollbar",
         label: "Fullscreen scrollbar",
@@ -160826,6 +161469,9 @@ class SettingsSelectorComponent extends Container {
         case "tui-mode":
           callbacks.onTuiModeChange(newValue);
           break;
+        case "fullscreen-exit-output":
+          callbacks.onFullscreenExitOutputChange(newValue);
+          break;
         case "fullscreen-scrollbar":
           callbacks.onFullscreenScrollbarChange(newValue);
           break;
@@ -160938,6 +161584,8 @@ class IdleStatus {
 }
 
 // node_modules/@earendil-works/pi-coding-agent/dist/modes/interactive/components/tool-execution.js
+var FALLBACK_PREVIEW_LINES = 10;
+
 class ToolExecutionComponent extends Container {
   contentBox;
   contentText;
@@ -161042,7 +161690,17 @@ class ToolExecutionComponent extends Container {
     if (!output) {
       return;
     }
-    return new Text(theme.fg("toolOutput", output), 0, 0);
+    const lines = output.split(`
+`);
+    const displayLines = this.expanded ? lines : lines.slice(0, FALLBACK_PREVIEW_LINES);
+    const remaining = lines.length - displayLines.length;
+    let text = displayLines.map((line) => theme.fg("toolOutput", line)).join(`
+`);
+    if (remaining > 0) {
+      text += `${theme.fg("muted", `
+... (${remaining} more lines,`)} ${keyHint("app.tools.expand", "to expand")}${theme.fg("muted", ")")}`;
+    }
+    return new Text(text, 0, 0);
   }
   updateArgs(args) {
     this.args = args;
@@ -162496,19 +163154,21 @@ class UserMessageSelectorComponent extends Container {
 // node_modules/@earendil-works/pi-coding-agent/dist/modes/interactive/theme/theme-controller.js
 class InteractiveThemeController {
   ui;
-  settingsManager;
+  getSettingsManager;
   showError;
   onChanged;
+  currentThemeSetting;
   terminalTheme = detectTerminalBackgroundFromEnv().theme;
   activeThemeName;
   autoSyncEnabled = false;
   terminalColorSchemeUnsubscribe;
-  constructor(ui2, settingsManager, showError, onChanged) {
+  constructor(ui2, options) {
     this.ui = ui2;
-    this.settingsManager = settingsManager;
-    this.showError = showError;
-    this.onChanged = onChanged;
-    this.activeThemeName = resolveThemeSetting(this.settingsManager.getThemeSetting(), this.terminalTheme);
+    this.getSettingsManager = options.getSettingsManager;
+    this.showError = options.showError;
+    this.onChanged = options.onChanged;
+    this.currentThemeSetting = options.initialThemeSetting;
+    this.activeThemeName = resolveThemeSetting(this.currentThemeSetting ?? this.getSettingsManager().getThemeSetting(), this.terminalTheme);
     initTheme(this.activeThemeName, true);
     this.bindTerminalColorSchemeListener();
   }
@@ -162518,7 +163178,8 @@ class InteractiveThemeController {
     this.ui.setTerminalColorSchemeNotifications(this.autoSyncEnabled);
   }
   async applyFromSettings() {
-    const themeSetting = this.settingsManager.getThemeSetting();
+    const settingsManager = this.getSettingsManager();
+    const themeSetting = this.currentThemeSetting ?? settingsManager.getThemeSetting();
     const autoTheme = parseAutoThemeSetting(themeSetting);
     if (autoTheme) {
       this.terminalTheme = await detectTerminalThemeForAuto({ ui: this.ui, timeoutMs: 100 });
@@ -162536,13 +163197,24 @@ class InteractiveThemeController {
     if (!this.applyThemeName(detection.theme).success)
       return;
     if (detection.confidence === "high") {
-      this.settingsManager.setTheme(detection.theme);
-      await this.settingsManager.flush();
+      settingsManager.setTheme(detection.theme);
+      await settingsManager.flush();
     }
   }
+  getThemeSelection() {
+    return this.currentThemeSetting ?? this.getSettingsManager().getThemeSetting() ?? this.activeThemeName;
+  }
   setThemeName(themeName, showError = false) {
     this.setAutoSync(false);
-    return this.applyThemeName(themeName, showError);
+    const result2 = this.applyThemeName(themeName, showError);
+    if (result2.success) {
+      this.currentThemeSetting = themeName;
+    }
+    return result2;
+  }
+  async setThemeSetting(themeSetting) {
+    this.currentThemeSetting = themeSetting;
+    await this.applyFromSettings();
   }
   setThemeInstance(themeInstance) {
     this.setAutoSync(false);
@@ -162593,7 +163265,7 @@ Fell back to dark theme.`);
     if (!this.autoSyncEnabled)
       return;
     this.terminalTheme = terminalTheme;
-    const autoTheme = parseAutoThemeSetting(this.settingsManager.getThemeSetting());
+    const autoTheme = parseAutoThemeSetting(this.currentThemeSetting ?? this.getSettingsManager().getThemeSetting());
     if (!autoTheme) {
       this.setAutoSync(false);
       return;
@@ -162701,9 +163373,20 @@ function formatLoginProviderCompletionDescription(provider) {
 function createInteractiveTui(options) {
   const terminal = options.terminal ?? new ProcessTerminal;
   if (options.tuiMode === "fullscreen") {
+    const styleSearchMatch = (text) => theme.bg("searchMatchBg", theme.fg("searchMatchText", text));
     return new TuiAltScreen(terminal, options.showHardwareCursor, options.logDirectory, {
+      searchMatchStyle: (text) => theme.underline(styleSearchMatch(text)),
+      searchCurrentMatchStyle: (text) => theme.bold(theme.inverse(styleSearchMatch(text))),
       openUrl: openBrowser,
-      onRightClickPaste: options.onRightClickPaste
+      onRightClickPaste: options.onRightClickPaste,
+      copySelection: async (text) => {
+        try {
+          await copyToClipboard(text);
+          return true;
+        } catch {
+          return false;
+        }
+      }
     });
   }
   return new TuiMainScreen(terminal, options.showHardwareCursor, options.logDirectory);
@@ -162783,6 +163466,7 @@ class InteractiveMode {
   anthropicSubscriptionWarningShown = false;
   lastStatusSpacer = undefined;
   lastStatusText = undefined;
+  managedToolStatusStarted = false;
   streamingComponent = undefined;
   streamingMessage = undefined;
   pendingTools = new Map;
@@ -162843,6 +163527,7 @@ class InteractiveMode {
     });
     this.runtimeHost.setRebindSession(async () => {
       await this.rebindCurrentSession({ renderBeforeBind: true });
+      await this.themeController.applyFromSettings();
     });
     this.version = VERSION;
     this.renderer = createInteractiveTui({
@@ -162883,7 +163568,12 @@ class InteractiveMode {
     this.hideThinkingBlock = this.settingsManager.getHideThinkingBlock();
     this.outputPad = this.settingsManager.getOutputPad();
     setRegisteredThemes(this.session.resourceLoader.getThemes().themes);
-    this.themeController = new InteractiveThemeController(this.ui, this.settingsManager, (message) => this.showError(message), () => this.updateEditorBorderColor());
+    this.themeController = new InteractiveThemeController(this.ui, {
+      getSettingsManager: () => this.settingsManager,
+      showError: (message) => this.showError(message),
+      onChanged: () => this.updateEditorBorderColor(),
+      initialThemeSetting: options.initialThemeSetting
+    });
   }
   getAutocompleteSourceTag(sourceInfo) {
     if (!sourceInfo) {
@@ -163030,14 +163720,14 @@ class InteractiveMode {
       tui.setLayoutRoot(this.fullscreenLayoutRoot);
     }
   }
-  stopInteractiveTui() {
-    if (this.renderer.mode === "fullscreen") {
+  stopInteractiveTui(fullscreenExitOutput) {
+    if (this.renderer.mode === "fullscreen" && fullscreenExitOutput === "transcript") {
       while (this.renderer.hasOverlayEntries)
         this.renderer.hideOverlay();
       this.switchTuiMode("regular", false, false);
       this.renderer.renderNow();
     }
-    this.ui.stop();
+    this.ui.stop({ preserveScreen: this.renderer.mode === "fullscreen" });
   }
   switchTuiMode(mode, restoreProgress = true, startRenderer = true) {
     const previousUi = this.renderer;
@@ -163091,8 +163781,6 @@ class InteractiveMode {
       return;
     this.registerSignalHandlers();
     this.changelogMarkdown = this.getChangelogForDisplay();
-    const [fdPath] = await Promise.all([ensureTool("fd"), ensureTool("rg")]);
-    this.fdPath = fdPath;
     if (this.session.scopedModels.length > 0 && (this.options.verbose || !this.settingsManager.getQuietStartup())) {
       const modelList = this.session.scopedModels.map((sm) => {
         const thinkingStr = sm.thinkingLevel ? `:${sm.thinkingLevel}` : "";
@@ -163131,9 +163819,10 @@ class InteractiveMode {
       this.widgetContainerBelow,
       this.footerContainer
     ]);
+    this.defaultEditor.onAction("app.clear", () => this.handleCtrlC());
+    this.defaultEditor.onCtrlD = () => this.handleCtrlD();
+    this.defaultEditor.onSubmit = (text) => this.handleStartupSubmit(text);
     this.ui.setFocus(this.editor);
-    this.setupKeyHandlers();
-    this.setupEditorSubmitHandler();
     this.ui.start();
     this.isInitialized = true;
     await this.themeController.applyFromSettings();
@@ -163187,6 +163876,14 @@ ${onboarding}`, this.getStartupExpansionState(), 1, 0);
       this.headerContainer.addChild(this.builtInHeader);
     }
     this.ui.requestRender();
+    const [fdPath] = await Promise.all([
+      ensureTool("fd", (status) => this.showManagedToolStatus(status)),
+      ensureTool("rg", (status) => this.showManagedToolStatus(status))
+    ]);
+    this.fdPath = fdPath;
+    this.setupKeyHandlers();
+    this.setupEditorSubmitHandler();
+    this.ui.requestRender();
     await this.rebindCurrentSession();
     this.renderInitialMessages();
     onThemeChange(() => {
@@ -163213,7 +163910,7 @@ ${onboarding}`, this.getStartupExpansionState(), 1, 0);
     if (!process.env.PI_OFFLINE) {
       const controller = new AbortController;
       const timeout = setTimeout(() => controller.abort(), 15000);
-      this.session.modelRuntime.refresh({ signal: controller.signal }).then(() => this.updateAvailableProviderCount()).catch(() => {}).finally(() => clearTimeout(timeout));
+      refreshModelCatalogs(this.session.modelRuntime, controller.signal).then(() => this.updateAvailableProviderCount()).catch(() => {}).finally(() => clearTimeout(timeout));
     }
     checkForNewPiVersion(this.version).then((newRelease) => {
       if (newRelease) {
@@ -163923,7 +164620,7 @@ ${warningLines}`, 0, 0));
     const message = error instanceof Error ? error.message : String(error);
     this.showError(`${prefix}: ${message}`);
     stopThemeWatcher();
-    this.stop();
+    this.stop("transcript");
     process.exit(1);
   }
   renderCurrentSessionState() {
@@ -164590,6 +165287,10 @@ ${message}`, ["Yes", "No"], opts);
       }
     } catch {}
   }
+  handleStartupSubmit(text) {
+    this.editor.setText(text);
+    this.showStatus("Startup is still in progress");
+  }
   setupEditorSubmitHandler() {
     this.defaultEditor.onSubmit = async (text) => {
       text = text.trim();
@@ -165032,6 +165733,18 @@ ${message}`, ["Yes", "No"], opts);
     const textBlocks = typeof message.content === "string" ? [{ type: "text", text: message.content }] : message.content.filter((c) => c.type === "text");
     return textBlocks.map((c) => c.text).join("");
   }
+  showManagedToolStatus(status) {
+    if (!this.managedToolStatusStarted) {
+      this.chatContainer.addChild(new Spacer(1));
+      this.managedToolStatusStarted = true;
+    }
+    const message = status.type === "warning" ? `Warning: ${status.message}` : status.message;
+    const color = status.type === "warning" ? "warning" : "dim";
+    this.chatContainer.addChild(new Text(theme.fg(color, message), 1, 0));
+    this.lastStatusSpacer = undefined;
+    this.lastStatusText = undefined;
+    this.ui.requestRender();
+  }
   showStatus(message) {
     const children = this.chatContainer.children;
     const last = children.length > 0 ? children[children.length - 1] : undefined;
@@ -165324,7 +166037,7 @@ ${message}`, ["Yes", "No"], opts);
     try {
       this.ui.stop();
     } catch {}
-    console.error("pi exiting due to uncaughtException:");
+    console.error(`${APP_NAME} exiting due to uncaughtException:`);
     console.error(error);
     process.exit(1);
   }
@@ -165746,7 +166459,7 @@ ${packageLines}`, 1, 0));
         httpIdleTimeoutMs: this.settingsManager.getHttpIdleTimeoutMs(),
         thinkingLevel: this.session.thinkingLevel,
         availableThinkingLevels: this.session.getAvailableThinkingLevels(),
-        currentTheme: this.settingsManager.getThemeSetting() || "dark",
+        currentTheme: this.themeController.getThemeSelection() || "dark",
         terminalTheme: this.themeController.getTerminalTheme(),
         availableThemes: getAvailableThemes(),
         hideThinkingBlock: this.hideThinkingBlock,
@@ -165765,6 +166478,7 @@ ${packageLines}`, 1, 0));
         clearOnShrink: this.settingsManager.getClearOnShrink(),
         showTerminalProgress: this.settingsManager.getShowTerminalProgress(),
         tuiMode: this.ui.mode,
+        fullscreenExitOutput: this.settingsManager.getFullscreenExitOutput(),
         fullscreenScrollbar: this.settingsManager.getFullscreenScrollbar(),
         warnings: this.settingsManager.getWarnings()
       }, {
@@ -165820,7 +166534,7 @@ ${packageLines}`, 1, 0));
         },
         onThemeChange: (themeSetting) => {
           this.settingsManager.setTheme(themeSetting);
-          this.themeController.applyFromSettings();
+          this.themeController.setThemeSetting(themeSetting);
         },
         onThemePreview: (themeName) => this.themeController.preview(themeName),
         onHideThinkingBlockChange: (hidden) => {
@@ -165917,6 +166631,9 @@ ${packageLines}`, 1, 0));
             this.statusContainer.clear();
           this.showStatus(`TUI mode: ${mode}`);
         },
+        onFullscreenExitOutputChange: (output) => {
+          this.settingsManager.setFullscreenExitOutput(output);
+        },
         onFullscreenScrollbarChange: (mode) => {
           this.settingsManager.setFullscreenScrollbar(mode);
           this.applyFullscreenScrollbarSetting();
@@ -165966,7 +166683,7 @@ ${packageLines}`, 1, 0));
       controller.abort();
     }, 15000);
     try {
-      const result2 = await this.session.modelRuntime.refresh({ signal: controller.signal });
+      const result2 = await refreshModelCatalogs(this.session.modelRuntime, controller.signal);
       if (result2.aborted && timedOut) {
         this.showWarning("Model refresh timed out; searching cached models.");
       } else if (result2.errors.size > 0) {
@@ -166042,7 +166759,7 @@ ${packageLines}`, 1, 0));
         onSelect: (selection) => {
           trustStore.setMany(selection.updates);
           done();
-          this.showStatus(`Saved trust decision: ${selection.trusted ? "trusted" : "untrusted"}. Restart pi for this to take effect.`);
+          this.showStatus(`Saved trust decision: ${selection.trusted ? "trusted" : "untrusted"}. Restart ${APP_NAME} for this to take effect.`);
         },
         onCancel: () => {
           done();
@@ -166136,7 +166853,7 @@ ${packageLines}`, 1, 0));
           this.ui.requestRender();
         }
       });
-      this.session.modelRuntime.refresh({ signal: controller.signal }).then((result2) => {
+      refreshModelCatalogs(this.session.modelRuntime, controller.signal).then((result2) => {
         if (disposed)
           return;
         availableModels = [...this.session.modelRuntime.getAvailableSnapshot()];
@@ -166630,7 +167347,7 @@ ${packageLines}`, 1, 0));
       this.ui.requestRender();
     };
     const dialog = new LoginDialogComponent(this.ui, providerOption.id, () => restoreEditor(), providerOption.name, `${providerOption.name} setup`);
-    dialog.showInfo(`${providerOption.method?.name ?? "Authentication"} is configured outside pi.`, [], true);
+    dialog.showInfo(`${providerOption.method?.name ?? "Authentication"} is configured outside ${APP_NAME}.`, [], true);
     this.editorContainer.clear();
     this.editorContainer.addChild(dialog);
     this.ui.setFocus(dialog);
@@ -166848,7 +167565,9 @@ ${packageLines}`, 1, 0));
         const filePath = this.session.exportToJsonl(outputPath);
         this.showStatus(`Session exported to: ${filePath}`);
       } else {
-        const filePath = await this.session.exportToHtml(outputPath);
+        const filePath = await this.session.exportToHtml(outputPath, {
+          themeName: theme.name
+        });
         this.showStatus(`Session exported to: ${filePath}`);
       }
     } catch (error) {
@@ -166934,7 +167653,7 @@ ${packageLines}`, 1, 0));
     }
     const tmpFile = path12.join(os5.tmpdir(), "session.html");
     try {
-      await this.session.exportToHtml(tmpFile);
+      await this.session.exportToHtml(tmpFile, { themeName: theme.name });
     } catch (error) {
       this.showError(`Failed to export session: ${error instanceof Error ? error.message : "Unknown error"}`);
       return;
@@ -167356,7 +168075,7 @@ ${theme.fg("muted", debugLogPath)}`, 1, 1));
       await this.session.compact(customInstructions);
     } catch {}
   }
-  stop() {
+  stop(fullscreenExitOutput = this.settingsManager.getFullscreenExitOutput()) {
     this.disposeActiveSelector();
     if (this.settingsManager.getShowTerminalProgress()) {
       this.ui.terminal.setProgress(false);
@@ -167370,7 +168089,7 @@ ${theme.fg("muted", debugLogPath)}`, 1, 1));
       this.unsubscribe();
     }
     if (this.isInitialized) {
-      this.stopInteractiveTui();
+      this.stopInteractiveTui(fullscreenExitOutput);
       this.isInitialized = false;
     }
     this.unregisterSignalHandlers();
@@ -167381,12 +168100,15 @@ function toJsonEvent(event) {
   if (event.type !== "message_update") {
     return event;
   }
+  if (event.message.role !== "assistant") {
+    throw new Error("message_update message is not an assistant message");
+  }
   const assistantMessageEvent = event.assistantMessageEvent;
   if (!("partial" in assistantMessageEvent)) {
-    return { type: "message_update", assistantMessageEvent };
+    return { type: "message_update", usage: event.message.usage, assistantMessageEvent };
   }
   const { partial: _partial, ...deltaEvent } = assistantMessageEvent;
-  return { type: "message_update", assistantMessageEvent: deltaEvent };
+  return { type: "message_update", usage: event.message.usage, assistantMessageEvent: deltaEvent };
 }
 
 // node_modules/@earendil-works/pi-coding-agent/dist/modes/print-mode.js
@@ -169543,7 +170265,7 @@ function updateTargetIncludesSelf(target) {
 function updateTargetIncludesExtensions(target) {
   return target.type === "all" || target.type === "extensions";
 }
-async function refreshModelCatalogs(agentDir) {
+async function refreshModelCatalogs2(agentDir) {
   const controller = new AbortController;
   const timeout = setTimeout(() => controller.abort(), 15000);
   try {
@@ -169576,7 +170298,7 @@ function printSelfUpdateUnavailable(npmCommand, updatePackageTarget = PACKAGE_NA
   const entrypoint = process.argv[1];
   if (entrypoint) {
     console.error("");
-    console.error(`Location of pi executable: ${entrypoint}`);
+    console.error(`Location of ${APP_NAME} executable: ${entrypoint}`);
   }
 }
 function printSelfUpdateFallback(command) {
@@ -169807,7 +170529,7 @@ async function handlePackageCommand(args, runtimeOptions = {}) {
   }
   if (options.command === "update" && options.updateTarget?.type === "models") {
     try {
-      await refreshModelCatalogs(getAgentDir());
+      await refreshModelCatalogs2(getAgentDir());
     } catch (error) {
       const message = error instanceof Error ? error.message : "Unknown model catalog refresh error";
       console.error(source_default.red(`Error: ${message}`));
@@ -169955,7 +170677,7 @@ async function handlePackageCommand(args, runtimeOptions = {}) {
 }
 
 // node_modules/@earendil-works/pi-coding-agent/dist/main.js
-var EXTENSION_LOAD_FAILURE_HINT = 'Hint: Start without extensions using "pi -ne".';
+var EXTENSION_LOAD_FAILURE_HINT = `Hint: Start without extensions using "${APP_NAME} -ne".`;
 async function readPipedStdin() {
   if (process.stdin.isTTY) {
     return;
@@ -170392,6 +171114,9 @@ async function main(args, options) {
     await showFirstTimeSetup(startupSettingsManager);
     time("firstTimeSetup");
   }
+  if (appMode === "interactive" && parsed.useTheme !== undefined) {
+    startupSettingsManager.applyOverrides({ theme: parsed.useTheme });
+  }
   const envSessionDir = process.env[ENV_SESSION_DIR];
   const sessionDir = (parsed.sessionDir ? normalizePath(parsed.sessionDir) : undefined) ?? (envSessionDir ? expandTildePath(envSessionDir) : undefined) ?? startupSettingsManager.getSessionDir();
   let sessionManager = await createSessionManager(parsed, cwd, sessionDir, startupSettingsManager);
@@ -170592,7 +171317,8 @@ async function main(args, options) {
       initialImages,
       initialMessages: parsed.messages,
       verbose: parsed.verbose,
-      tuiMode: parsed.tuiMode
+      tuiMode: parsed.tuiMode,
+      initialThemeSetting: parsed.useTheme
     });
     if (startupBenchmark) {
       await interactiveMode.init();
@@ -171873,6 +172599,10 @@ class PiMonoAdapter {
     if (config.apiUrl && config.apiKey) {
       try {
         const mcpClient = new McpHttpClient(config.apiUrl, config.apiKey, config.agentId, config.taskId);
+        const runtimeInstanceId = swarmRuntimeInstanceId();
+        if (runtimeInstanceId) {
+          mcpClient.customHeaders["X-Runtime-Instance-ID"] = runtimeInstanceId;
+        }
         await mcpClient.initialize();
         const tools2 = await mcpClient.listTools();
         customTools = mcpToolsToDefinitions(mcpClient, tools2);