opencode-context-tree 0.1.1 → 0.2.1

package/dist/tui.js

@@ -66,7 +66,17 @@ function contextSizeOf(messages) {
   }
   return { tokens: lastAssistantInput + newer, estimated: newer > 0 };
 }
-function bandFor(tokens) {
+function bandFor(tokens, limit) {
+  if (limit && limit > 0) {
+    const r = tokens / limit;
+    if (r < 0.25)
+      return "low";
+    if (r < 0.6)
+      return "healthy";
+    if (r < 0.85)
+      return "filling";
+    return "red";
+  }
   if (tokens < 8000)
     return "low";
   if (tokens < 32000)
@@ -75,6 +85,12 @@ function bandFor(tokens) {
     return "filling";
   return "red";
 }
+function contextBar(tokens, limit, cells = 5) {
+  if (!(limit > 0))
+    return "";
+  const filled = tokens <= 0 ? 0 : Math.min(cells, Math.max(1, Math.round(tokens / limit * cells)));
+  return "\u2593".repeat(filled) + "\u2591".repeat(cells - filled);
+}
 function formatK(tokens) {
   if (tokens < 1000)
     return String(tokens);
@@ -82,7 +98,8 @@ function formatK(tokens) {
   return `${k.endsWith(".0") ? k.slice(0, -2) : k}k`;
 }
 function formatContext(size, limit) {
-  return `ctx ${size.estimated ? "~" : ""}${formatK(size.tokens)}${limit ? `/${formatK(limit)}` : ""} \xB7 ${bandFor(size.tokens)}`;
+  const bar = limit ? `${contextBar(size.tokens, limit)} ` : "";
+  return `ctx ${bar}${size.estimated ? "~" : ""}${formatK(size.tokens)}${limit ? `/${formatK(limit)}` : ""} \xB7 ${bandFor(size.tokens, limit)}`;
 }
 
 // src/shared/store.ts
@@ -19113,6 +19130,8 @@ function debug(event, data) {
 
 // src/tui/actions.ts
 import { createSignal } from "solid-js";
+import fs4 from "fs";
+import path3 from "path";
 
 // src/core/decision.ts
 var DECISION_SYSTEM = "You write concise engineering decision records. You are given the transcript of a side branch of a coding session. Do NOT continue the conversation. Output ONLY the record in the exact markdown template requested, nothing else.";
@@ -19181,6 +19200,55 @@ function decisionMessageText(record2, branchName) {
   return body.startsWith("## Decision:") ? `\u25C6 ${body}` : `\u25C6 ## Decision: ${branchName}
 ${body}`;
 }
+var BULLET = /^(\s*)[-*\u2022]\s+/;
+var HEADING = /^(\s*(?:\u25C6\s*)?)#{1,6}\s*/;
+function stripMarkdown(text) {
+  return text.replace(/[*`]/g, "");
+}
+function wrapLine(body, width, marker) {
+  const room = Math.max(1, width - marker.length);
+  const indent = " ".repeat(marker.length);
+  const lines = [];
+  let current = "";
+  for (const raw of body.split(/\s+/).filter(Boolean)) {
+    const word = raw.length > room ? `${raw.slice(0, Math.max(1, room - 1))}\u2026` : raw;
+    if (current === "")
+      current = word;
+    else if (current.length + 1 + word.length <= room)
+      current += ` ${word}`;
+    else {
+      lines.push(current);
+      current = word;
+    }
+  }
+  lines.push(current);
+  return lines.map((line, i) => `${i === 0 ? marker : indent}${line}`.trimEnd());
+}
+function renderDecision(text, width) {
+  const out = [];
+  for (const raw of text.replace(/\r/g, "").trim().split(`
+`)) {
+    const line = raw.trimEnd();
+    if (line.trim() === "") {
+      if (out.length > 0 && out[out.length - 1] !== "")
+        out.push("");
+      continue;
+    }
+    const bullet = BULLET.exec(line);
+    const marker = bullet ? `${bullet[1]}- ` : "";
+    const body = stripMarkdown(bullet ? line.slice(bullet[0].length) : line.replace(HEADING, "$1"));
+    out.push(...wrapLine(body, width, marker));
+  }
+  return out;
+}
+function decisionSummary(text) {
+  const lines = text.replace(/\r/g, "").split(`
+`).map((l) => stripMarkdown(l.replace(/^\s*\u25C6\s*/, "").replace(HEADING, "$1").replace(BULLET, "")).trim());
+  const heading = lines.find((l) => /^Decision:\s*\S/i.test(l));
+  const title = heading ? heading.replace(/^Decision:\s*/i, "").trim() : lines.find((l) => l !== "") ?? "";
+  const outcome = lines.find((l) => /^Outcome:\s*\S/i.test(l))?.replace(/^Outcome:\s*/i, "").trim();
+  return outcome ? { title, outcome } : { title };
+}
 function openSiblings(state, sessionID) {
   const me = state.sessions[sessionID];
   if (!me)
@@ -19562,19 +19630,67 @@ async function draftWithHelper(ctx, input2) {
   }
 }
 var MERGE_TRUST = "Your transcript is never rewritten; the record is appended to the trunk as a normal message.";
+var UNDO_KEY = "u";
 var MERGE_GATE_NOTICE = `Edit the \u25C6 decision record, then save to confirm (empty file or a non-zero exit aborts the merge).
 ${MERGE_TRUST}`;
-function mergeDialogTitle(branchName, trunkTitle) {
-  return `Merge \u2387 ${branchName} \u2192 ${trunkTitle ? clip(trunkTitle, 28) : "the trunk"}`;
+var DISCARD_NOTICE = `${MERGE_TRUST}
+The branch is only marked rejected \u2014 ${UNDO_KEY} (alias x) undoes it.`;
+var TRUNK_LABEL = "trunk";
+function mergeTargetOf(label, messages) {
+  const minimal = messages.map((m) => ({ info: m.role === "assistant" ? { role: "assistant", tokens: m.tokens } : { role: "user" }, parts: m.parts }));
+  return { label, turns: messages.filter((m) => m.role === "user").length, tokens: contextSizeOf(minimal).tokens };
+}
+function ownTurnCount(messages, anchor2) {
+  const anchorIndex = anchor2.messageID ? anchor2.parentMessageIDs.indexOf(anchor2.messageID) : -1;
+  return messages.slice(anchorIndex + 1).filter((m) => m.role === "user").length;
+}
+function mergeDialogTitle(branchName, target2) {
+  if (!target2 || typeof target2 === "string")
+    return `Merge \u2387 ${branchName} \u2192 the trunk`;
+  const where = target2.label === TRUNK_LABEL ? TRUNK_LABEL : `\u2387 ${clip(target2.label, 24)}`;
+  return `Merge \u2387 ${branchName} \u2192 ${where} (${plural(target2.turns, "turn")}, ~${formatK(target2.tokens)})`;
 }
 function mergeDialogOptions(input2) {
+  const folds = input2.turns === undefined ? "the branch" : plural(input2.turns, "turn");
   return [
-    { title: "Squash", value: "squash", description: "drafts a \u25C6 decision record you confirm" },
-    { title: "Squash without LLM", value: "squash-no-llm", description: "you write the record yourself" },
-    { title: "Discard", value: "discard", description: "rejected; nothing lands in the trunk" },
+    { title: "Squash", value: "squash", description: `1 model call \xB7 folds ${folds} into one \u25C6 record` },
+    { title: "Squash without LLM", value: "squash-no-llm", description: "you write it \xB7 no model call" },
+    { title: "Discard", value: "discard", description: "rejected \xB7 nothing lands in the trunk" },
     ...input2.siblings > 0 ? [{ title: "Tournament", value: "tournament", description: "compare sibling branches and keep one" }] : []
   ];
 }
+function confirmDialog(ctx, title, message) {
+  return new Promise((resolve) => {
+    ctx.api.ui.dialog.replace(() => ctx.api.ui.DialogConfirm({
+      title,
+      message,
+      onConfirm: () => {
+        resolve(true);
+        ctx.api.ui.dialog.clear();
+      },
+      onCancel: () => {
+        resolve(false);
+        ctx.api.ui.dialog.clear();
+      }
+    }), () => resolve(false));
+  });
+}
+function promptDialog(ctx, title, placeholder) {
+  return new Promise((resolve) => {
+    ctx.api.ui.dialog.replace(() => ctx.api.ui.DialogPrompt({
+      title,
+      placeholder,
+      onConfirm: (value) => {
+        resolve(value);
+        ctx.api.ui.dialog.clear();
+      },
+      onCancel: () => {
+        resolve(undefined);
+        ctx.api.ui.dialog.clear();
+      }
+    }), () => resolve(undefined));
+  });
+}
 async function mergeBranch(ctx, input2) {
   const treeId = ctx.store.ensureTree(input2.sessionID, "tui");
   const state = ctx.store.stateFor(treeId);
@@ -19585,16 +19701,33 @@ async function mergeBranch(ctx, input2) {
   const name = branch.name ?? "branch";
   debug("merge.start", { mode: input2.mode, sessionID: input2.sessionID, parentID });
   await abortIfBusy(ctx, input2.sessionID);
+  const parentMsgs = await ctx.api.client.session.messages({ sessionID: parentID, directory: ctx.directory }).catch(() => {
+    return;
+  });
+  const parentMessageIDs = (parentMsgs?.data ?? []).map((m) => String(m.info.id));
+  const own2 = await fetchOwnTranscript(ctx, input2.sessionID);
+  const turns = ownTurnCount(own2.messages, { messageID: branch.anchorMessageID, parentMessageIDs });
   if (input2.mode === "discard") {
-    record2(ctx, treeId, "branch.closed", { sessionID: input2.sessionID, status: "rejected", note: input2.note });
+    const ok = await confirmDialog(ctx, `Discard \u2387 ${name} (${plural(turns, "turn")})?`, DISCARD_NOTICE);
+    if (!ok) {
+      ctx.api.ui.toast({ variant: "warning", message: `\u2387 ${name} kept \u2014 nothing discarded` });
+      return;
+    }
+    let note = input2.note;
+    if (note === undefined) {
+      const answer = await promptDialog(ctx, "Why? (optional note on the close marker)", "dead end");
+      if (answer === undefined) {
+        ctx.api.ui.toast({ variant: "warning", message: `\u2387 ${name} kept \u2014 nothing discarded` });
+        return;
+      }
+      note = answer.trim() || undefined;
+    }
+    record2(ctx, treeId, "branch.closed", { sessionID: input2.sessionID, status: "rejected", note });
     await mirrorMetadata(ctx, input2.sessionID, { status: "rejected" });
     navigateToSession(ctx, parentID);
     ctx.api.ui.toast({ variant: "success", message: `\u2387 ${name} discarded \u2014 back on the trunk` });
     return parentID;
   }
-  const parentMsgs = await ctx.api.client.session.messages({ sessionID: parentID, directory: ctx.directory });
-  const parentMessageIDs = (parentMsgs.data ?? []).map((m) => String(m.info.id));
-  const own2 = await fetchOwnTranscript(ctx, input2.sessionID);
   const transcript = branchTranscriptText(own2, { messageID: branch.anchorMessageID, parentMessageIDs });
   const model = branch.branchModel ?? branch.trunkModel;
   const modelRef = model ? { providerID: model.split("/")[0], modelID: model.split("/").slice(1).join("/") } : undefined;
@@ -19654,23 +19787,43 @@ async function fetchOwnTranscript(ctx, sessionID) {
   return { sessionID, title: sessionID, status: "available", messages };
 }
 var BRANCH_DIALOG = { title: "Branch here \u2192 new OpenCode session", placeholder: "name, e.g. try-redis", modelTitle: "Model for this branch (Enter keeps the current one)" };
+var COPY_HINT = ".opencode/context-tree/last-copy.txt";
+function copyText(api2, text, directory) {
+  const renderer = api2.renderer;
+  if (text && renderer?.copyToClipboardOSC52?.(text))
+    return { target: "clipboard", hint: "clipboard" };
+  const file2 = path3.join(directory, COPY_HINT);
+  fs4.mkdirSync(path3.dirname(file2), { recursive: true });
+  fs4.writeFileSync(file2, text);
+  return { target: "file", hint: COPY_HINT };
+}
 function clip(text, max) {
   return text.length > max ? `${text.slice(0, max - 1)}\u2026` : text;
 }
+function plural(n, noun) {
+  return `${n} ${noun}${n === 1 ? "" : "s"}`;
+}
 
 // src/tui/route.tsx
-import { createComponent as _$createComponent } from "@opentui/solid";
-import { effect as _$effect } from "@opentui/solid";
-import { createTextNode as _$createTextNode } from "@opentui/solid";
 import { memo as _$memo } from "@opentui/solid";
+import { createTextNode as _$createTextNode } from "@opentui/solid";
+import { effect as _$effect } from "@opentui/solid";
+import { createComponent as _$createComponent } from "@opentui/solid";
 import { insertNode as _$insertNode } from "@opentui/solid";
 import { insert as _$insert } from "@opentui/solid";
 import { setProp as _$setProp } from "@opentui/solid";
 import { createElement as _$createElement } from "@opentui/solid";
+
+// src/shared/version.ts
+var PLUGIN_VERSION = "0.2.1";
+
+// src/tui/route.tsx
 import { For, Show, createEffect, createMemo, createSignal as createSignal2, on, onCleanup } from "solid-js";
 
 // src/core/actions.ts
 function planJump(row, ctx) {
+  if (row.kind === "separator")
+    return { kind: "noop", reason: "nothing to go to" };
   if (row.kind === "branch")
     return row.sessionID === ctx.currentSessionID ? { kind: "noop", reason: "you are here" } : { kind: "switch", sessionID: row.sessionID };
   const tr = ctx.transcripts[row.sessionID];
@@ -19698,15 +19851,33 @@ function planJump(row, ctx) {
 }
 
 // src/core/navigation.ts
+function scan(rows, index, dir) {
+  for (let i = index;i >= 0 && i < rows.length; i += dir)
+    if (rows[i].kind !== "separator")
+      return i;
+  return -1;
+}
 function moveSelection(rows, index, delta) {
   if (rows.length === 0)
     return -1;
-  const next = index + delta;
-  if (next < 0)
-    return 0;
-  if (next > rows.length - 1)
-    return rows.length - 1;
-  return next;
+  const dir = delta < 0 ? -1 : 1;
+  let i = Math.min(Math.max(index, 0), rows.length - 1);
+  for (let step = Math.abs(delta);step > 0; step--) {
+    const next = scan(rows, i + dir, dir);
+    if (next === -1)
+      break;
+    i = next;
+  }
+  if (rows[i].kind !== "separator")
+    return i;
+  const ahead = scan(rows, i, dir);
+  return ahead === -1 ? scan(rows, i, dir === 1 ? -1 : 1) : ahead;
+}
+function firstIndex(rows) {
+  return scan(rows, 0, 1);
+}
+function lastIndex(rows) {
+  return scan(rows, rows.length - 1, -1);
 }
 function nextBranchIndex(rows, index, dir) {
   if (rows.length === 0)
@@ -19729,39 +19900,40 @@ function toggleExpanded(expanded, sessionID) {
     next.add(sessionID);
   return next;
 }
-var FILTER_ORDER = ["default", "no-tools", "user-only", "labeled", "all"];
-function cycleFilter(filter) {
-  const idx = FILTER_ORDER.indexOf(filter);
-  return FILTER_ORDER[(idx + 1) % FILTER_ORDER.length];
-}
 function resolveSelection(view, preferredId, currentRowId, previousIndex) {
   if (view.rows.length === 0)
     return -1;
+  const land = (i) => {
+    const ahead = scan(view.rows, i, 1);
+    return ahead === -1 ? scan(view.rows, i, -1) : ahead;
+  };
   if (preferredId !== undefined) {
     const exact = view.indexById[preferredId];
     if (exact !== undefined)
-      return exact;
+      return land(exact);
     const owner = preferredId.split(":").slice(0, 2).join(":");
     for (let i = 0;i < view.rows.length; i++) {
       const row = view.rows[i];
+      if (row.kind === "separator")
+        continue;
       const rowOwner = row.kind === "branch" ? row.id : `${row.sessionID}:${row.messageID}`;
       if (rowOwner === owner)
         return i;
     }
   }
   if (previousIndex !== undefined && previousIndex >= 0)
-    return Math.min(previousIndex, view.rows.length - 1);
+    return land(Math.min(previousIndex, view.rows.length - 1));
   if (currentRowId !== undefined) {
     const idx = view.indexById[currentRowId];
     if (idx !== undefined)
-      return idx;
+      return land(idx);
   }
   if (view.currentRowId !== undefined) {
     const idx = view.indexById[view.currentRowId];
     if (idx !== undefined)
-      return idx;
+      return land(idx);
   }
-  return 0;
+  return land(0);
 }
 
 // src/core/transcript.ts
@@ -19833,6 +20005,7 @@ function messagePreview(message) {
 }
 
 // src/core/tree.ts
+var OFF_PATH_TEXT = "\u2500\u2500 not in this branch's context \u2500\u2500";
 var WARN_TOKENS = 1e4;
 function userText(message) {
   return message.parts.filter((p) => p.type === "text" && p.text).map((p) => p.text).join(`
@@ -19959,7 +20132,7 @@ function branchAllowed(filter) {
 function isCropped(ctx, messageID, partID) {
   return ctx.crops.some((c) => c.messageID === messageID && (c.partID === undefined || c.partID === partID));
 }
-function emitAssistantRows(ctx, sessionID, message, depth, gutter, out) {
+function emitAssistantRows(ctx, sessionID, message, depth, gutter, inContext, out) {
   if (message.summary) {
     if (!stepAllowed(ctx.filter, "text"))
       return;
@@ -19985,19 +20158,29 @@ function emitAssistantRows(ctx, sessionID, message, depth, gutter, out) {
       durationMs: durationOfParts(message.parts),
       isError: false,
       isCropped: false,
-      warn: tokens >= WARN_TOKENS
+      warn: tokens >= WARN_TOKENS,
+      inContext
     });
     return;
   }
+  const collapseThinking = ctx.filter !== "all";
+  const rows = [];
+  let thinkingMs;
   let first = true;
   for (const part of message.parts) {
     const kind = stepKind(part);
+    if (collapseThinking && kind === "reasoning") {
+      const ms = durationOfPart(part);
+      if (ms !== undefined)
+        thinkingMs = (thinkingMs ?? 0) + ms;
+      continue;
+    }
     const label = first ? ctx.labels[message.id] : undefined;
     if (!stepAllowed(ctx.filter, kind, Boolean(label)))
       continue;
     const { tokens, estimated } = stepTokensFor(part, message);
     first = false;
-    out.push({
+    rows.push({
       kind: "step",
       id: `${sessionID}:${message.id}:${part.id}`,
       sessionID,
@@ -20013,9 +20196,40 @@ function emitAssistantRows(ctx, sessionID, message, depth, gutter, out) {
       isError: part.state?.status === "error",
       isCropped: isCropped(ctx, message.id, part.id),
       warn: tokens >= WARN_TOKENS,
-      label
+      label,
+      inContext
     });
   }
+  if (rows.length > 0) {
+    if (thinkingMs !== undefined)
+      rows[0].thinkingMs = thinkingMs;
+  } else if (collapseThinking) {
+    const thinking = message.parts.filter((p) => stepKind(p) === "reasoning");
+    const label = ctx.labels[message.id];
+    if (thinking.length > 0 && stepAllowed(ctx.filter, "reasoning", Boolean(label))) {
+      const tokens = thinking.reduce((sum, p) => sum + stepTokensFor(p, message).tokens, 0);
+      rows.push({
+        kind: "step",
+        id: `${sessionID}:${message.id}:${thinking[0].id}`,
+        sessionID,
+        messageID: message.id,
+        partID: thinking[0].id,
+        depth,
+        gutter,
+        glyph: "\u25CB",
+        preview: partPreview(thinking[0]),
+        tokens,
+        estimated: thinking.some((p) => stepTokensFor(p, message).estimated),
+        durationMs: thinkingMs,
+        isError: false,
+        isCropped: isCropped(ctx, message.id, thinking[0].id),
+        warn: tokens >= WARN_TOKENS,
+        label,
+        inContext
+      });
+    }
+  }
+  out.push(...rows);
 }
 function shownExpanded(ctx, sessionID) {
   const flagged = ctx.expanded.has(sessionID);
@@ -20076,11 +20290,21 @@ function emitChildBranches(ctx, sessionID, anchorMessageID, depth, gutter, out)
     pushBranch(ctx, branch, depth, gutter, i === visible.length - 1, showHeaders, out);
   });
 }
+function forkAnchorOf(ctx, sessionID) {
+  const childID = ctx.onPathChild.get(sessionID);
+  return childID ? ctx.state.sessions[childID]?.anchorMessageID : undefined;
+}
 function walkSession(ctx, sessionID, messages, depth, gutter, turnStart, out) {
   const lastUserIndex = findLastUserIndex(messages, ctx.filter);
   const counter = { turn: turnStart };
   let inPluginCommand = false;
+  const forkAnchor = forkAnchorOf(ctx, sessionID);
+  let inContext = ctx.onPath.has(sessionID);
+  let separatorDue = inContext && forkAnchor === "";
+  if (separatorDue)
+    inContext = false;
   messages.forEach((message, i) => {
+    const before = out.length;
     if (message.role === "user") {
       inPluginCommand = hiddenPluginTurn(ctx.filter, message);
       if (!inPluginCommand) {
@@ -20106,14 +20330,23 @@ function walkSession(ctx, sessionID, messages, depth, gutter, turnStart, out) {
             isCurrent: sessionID === ctx.currentSessionID,
             isTip: i === lastUserIndex,
             isDecision,
-            isSummary
+            isSummary,
+            inContext
           });
         }
       }
     } else if (!inPluginCommand) {
-      emitAssistantRows(ctx, sessionID, message, depth, gutter, out);
+      emitAssistantRows(ctx, sessionID, message, depth, gutter, inContext, out);
     }
     emitChildBranches(ctx, sessionID, message.id, depth, gutter, out);
+    if (separatorDue && out.length > before) {
+      out.splice(before, 0, { kind: "separator", id: `separator:${sessionID}`, depth, gutter, text: OFF_PATH_TEXT });
+      separatorDue = false;
+    }
+    if (inContext && message.id === forkAnchor) {
+      inContext = false;
+      separatorDue = true;
+    }
   });
 }
 function rowSearchFields(row) {
@@ -20124,6 +20357,8 @@ function rowSearchFields(row) {
       return row.label ? [row.preview, row.label] : [row.preview];
     case "branch":
       return row.model ? [row.name, row.model, row.status] : [row.name, row.status];
+    case "separator":
+      return [];
   }
 }
 function rowMatches(row, needle) {
@@ -20156,17 +20391,17 @@ function applySearch(rows, search) {
   return rows.filter((_, i) => keep[i]);
 }
 function computeTotalTokens(transcript) {
-  let lastIndex = -1;
+  let lastIndex2 = -1;
   let lastInput = 0;
   transcript.messages.forEach((m, idx) => {
     if (m.role === "assistant" && typeof m.tokens?.input === "number") {
-      lastIndex = idx;
+      lastIndex2 = idx;
       lastInput = m.tokens.input;
     }
   });
   let counted = 0;
   let guessed = 0;
-  for (let i = Math.max(lastIndex, 0);i < transcript.messages.length; i++) {
+  for (let i = Math.max(lastIndex2, 0);i < transcript.messages.length; i++) {
     const m = transcript.messages[i];
     if (m.role === "user") {
       guessed += estimateTokens(userText(m));
@@ -20179,7 +20414,7 @@ function computeTotalTokens(transcript) {
       if (p.type === "tool" || typeof output2 !== "number")
         guessed += estimateTokens(partText2(p));
   }
-  return { tokens: lastInput + counted + guessed, estimated: lastIndex === -1 || guessed > 0 };
+  return { tokens: lastInput + counted + guessed, estimated: lastIndex2 === -1 || guessed > 0 };
 }
 function currentChainOf(state, currentSessionID) {
   return [...ancestorChainOf(state, currentSessionID), currentSessionID];
@@ -20231,7 +20466,7 @@ function buildTreeView(o) {
   let currentRowId;
   for (let i = rows.length - 1;i >= 0; i--) {
     const r = rows[i];
-    if (r.kind !== "branch" && r.sessionID === o.currentSessionID) {
+    if ((r.kind === "turn" || r.kind === "step") && r.sessionID === o.currentSessionID) {
       currentRowId = r.id;
       break;
     }
@@ -20323,111 +20558,141 @@ function spanOf(m) {
   const end = m.time.completed ?? m.parts.reduce((e, p) => Math.max(e, p.state?.time?.end ?? p.time?.end ?? 0), 0);
   return end > m.time.created ? end - m.time.created : 0;
 }
-function buildLanes(transcript, mode) {
-  const columns = [];
+var EVENT_GLYPH = "\u25AC";
+function ctreeKindOf2(message) {
+  for (const p of message.parts) {
+    const ctree = p.metadata?.["ctree"];
+    if (ctree?.kind)
+      return ctree.kind;
+  }
+  return;
+}
+function isContextMessage(message) {
+  return message.summary === true || ctreeKindOf2(message) === "summary";
+}
+function messageEvent(message, turn) {
+  const ms = spanOf(message);
+  return {
+    lane: "input",
+    kind: isContextMessage(message) ? "context" : "user",
+    messageID: message.id,
+    turn,
+    startMs: message.time.created,
+    ...ms > 0 ? { durationMs: ms } : {},
+    tokens: message.parts.reduce((s, p) => s + estimateTokens(p.text ?? ""), 0)
+  };
+}
+function partEvent(message, part, turn) {
+  const t = part.state?.time ?? part.time;
+  const base = {
+    messageID: message.id,
+    partID: part.id,
+    turn,
+    startMs: t?.start ?? message.time.created,
+    ...t?.start !== undefined && t?.end !== undefined ? { durationMs: Math.max(0, t.end - t.start) } : {}
+  };
+  if (part.type === "tool")
+    return { ...base, lane: "tools", kind: "tool", error: part.state?.status === "error", tokens: estimateTokens(part.state?.output ?? "") + estimateTokens(JSON.stringify(part.state?.input ?? "")) };
+  return { ...base, lane: "model", kind: part.type === "reasoning" ? "reasoning" : "text", tokens: estimateTokens(part.text ?? "") };
+}
+function eventsOf(transcript) {
+  const out = [];
   for (const turn of turnsOf(transcript.messages)) {
-    if (mode === "calls") {
-      let any2 = false;
-      for (const m of turn.assistants) {
-        for (const p of m.parts) {
-          if (p.type !== "tool")
-            continue;
-          any2 = true;
-          const out = p.state?.output ?? "";
-          const t = p.state?.time;
-          columns.push({ messageID: m.id, userMessageID: turn.user?.id, partID: p.id, turn: turn.index, input: m.tokens?.input ?? 0, output: 0, tool: estimateTokens(out), toolError: p.state?.status === "error", ms: t?.start !== undefined && t?.end !== undefined ? t.end - t.start : 0 });
-        }
-      }
-      if (!any2) {
-        const last2 = turn.assistants.at(-1);
-        columns.push({ messageID: last2?.id ?? turn.user?.id ?? "", userMessageID: turn.user?.id, turn: turn.index, input: last2?.tokens?.input ?? 0, output: last2?.tokens?.output ?? 0, tool: 0, toolError: false, ms: last2 ? spanOf(last2) : 0 });
-      }
-      continue;
-    }
-    const last = turn.assistants.at(-1);
-    let tool = 0;
-    let toolError = false;
-    let ms = 0;
-    let output2 = 0;
+    if (turn.user)
+      out.push(messageEvent(turn.user, turn.index));
     for (const m of turn.assistants) {
-      output2 += m.tokens?.output ?? 0;
-      ms += spanOf(m);
+      const context = isContextMessage(m);
+      if (context)
+        out.push(messageEvent(m, turn.index));
       for (const p of m.parts) {
-        if (p.type !== "tool")
+        const kind = stepKind(p);
+        if (kind === "other" || context && kind !== "tool")
           continue;
-        tool += estimateTokens(p.state?.output ?? "");
-        if (p.state?.status === "error")
-          toolError = true;
+        out.push(partEvent(m, p, turn.index));
       }
     }
-    columns.push({ messageID: last?.id ?? turn.user?.id ?? "", userMessageID: turn.user?.id, turn: turn.index, input: last?.tokens?.input ?? 0, output: output2, tool, toolError, ms });
   }
-  return { mode, columns };
+  return out;
 }
-var BLOCKS = ["\u2581", "\u2582", "\u2583", "\u2584", "\u2585", "\u2586", "\u2587", "\u2588"];
-function sparkline(values, width, scale) {
-  if (values.length === 0 || width <= 0)
-    return "";
-  const cells = fitColumns(values, width);
-  const max = Math.max(1, scale ?? 0, ...cells);
-  return cells.map((v) => v <= 0 ? " " : BLOCKS[Math.min(7, Math.floor(v / max * 7.999))]).join("");
+function gapBefore(events, i, mode) {
+  return mode === "turns" && events[i].turn !== events[i - 1].turn ? 2 : 1;
 }
-function fitColumns(values, width) {
-  if (values.length === 0)
-    return [];
-  if (values.length === width)
-    return values.slice();
-  const out = [];
-  if (values.length > width) {
-    const per = values.length / width;
-    for (let i = 0;i < width; i++) {
-      const a = Math.floor(i * per);
-      const b = Math.max(a + 1, Math.floor((i + 1) * per));
-      out.push(Math.max(...values.slice(a, b)));
-    }
-    return out;
+function firstFitting(events, mode, width) {
+  let cells = 0;
+  for (let i = events.length - 1;i >= 0; i--) {
+    const next = cells === 0 ? 1 : cells + 1 + gapBefore(events, i + 1, mode);
+    if (next > width)
+      return i + 1;
+    cells = next;
   }
-  const rep = width / values.length;
-  for (let i = 0;i < width; i++)
-    out.push(values[Math.min(values.length - 1, Math.floor(i / rep))]);
-  return out;
+  return 0;
 }
-function durationWeighted(lanes, width) {
-  const total = lanes.columns.reduce((s, c) => s + Math.max(1, c.ms), 0) || 1;
-  const input2 = [];
-  const output2 = [];
-  const tool = [];
-  const toolError = [];
-  const owner = [];
-  lanes.columns.forEach((c, i) => {
-    const cells = Math.max(1, Math.round(Math.max(1, c.ms) / total * width));
-    for (let k = 0;k < cells; k++) {
-      input2.push(c.input);
-      output2.push(c.output);
-      tool.push(c.tool);
-      toolError.push(c.toolError);
-      owner.push(i);
-    }
+function durationWidths(events, budget) {
+  const total = events.reduce((s, e) => s + Math.max(0, e.durationMs ?? 0), 0);
+  if (total <= 0)
+    return events.map(() => 1);
+  const widths = events.map((e) => Math.max(1, Math.round(Math.max(0, e.durationMs ?? 0) / total * budget)));
+  let over = widths.reduce((s, v) => s + v, 0) - budget;
+  while (over > 0) {
+    let widest = -1;
+    for (let i = 0;i < widths.length; i++)
+      if ((widths[i] ?? 0) > 1 && (widest < 0 || (widths[i] ?? 0) > (widths[widest] ?? 0)))
+        widest = i;
+    if (widest < 0)
+      break;
+    widths[widest] = (widths[widest] ?? 1) - 1;
+    over--;
+  }
+  return widths;
+}
+function buildEventStrip(transcript, mode, width) {
+  const w = Math.max(0, Math.floor(width));
+  const all = eventsOf(transcript);
+  const truncatedLeft = firstFitting(all, mode, w);
+  const events = all.slice(truncatedLeft);
+  const gaps = events.map((_, i) => i === 0 ? 0 : gapBefore(events, i, mode));
+  const widths = mode === "duration" ? durationWidths(events, w - gaps.reduce((s, g) => s + g, 0)) : events.map(() => 1);
+  const blank = () => Array.from({ length: w }, () => null);
+  const lanes = { input: blank(), model: blank(), tools: blank() };
+  const empty = { input: true, model: true, tools: true };
+  const spans = [];
+  let cursor = 0;
+  events.forEach((e, i) => {
+    const start = cursor + (gaps[i] ?? 0);
+    const end = Math.min(w, start + (widths[i] ?? 1));
+    for (let c = start;c < end; c++)
+      lanes[e.lane][c] = { lane: e.lane, eventIndex: i, glyph: EVENT_GLYPH, ...e.error ? { error: true } : {} };
+    spans.push({ start, end });
+    empty[e.lane] = false;
+    cursor = start + (widths[i] ?? 1);
   });
-  return { input: input2, output: output2, tool, toolError, columnAt: (cell) => owner[Math.min(owner.length - 1, Math.max(0, cell))] ?? 0 };
+  return { events, width: w, lanes, spans, empty, truncatedLeft };
 }
-function columnFor(lanes, messageID, partID) {
+function stripIndexFor(strip, messageID, partID) {
   if (partID) {
-    const i2 = lanes.columns.findIndex((c) => c.partID === partID);
-    if (i2 >= 0)
-      return i2;
+    const byPart = strip.events.findIndex((e) => e.partID === partID);
+    if (byPart >= 0)
+      return byPart;
   }
-  const i = lanes.columns.findIndex((c) => c.messageID === messageID || c.userMessageID === messageID);
-  return i >= 0 ? i : -1;
+  return strip.events.findIndex((e) => e.messageID === messageID);
 }
 
 // src/core/consumers.ts
+var THINKING = "(thinking)";
+var THINKING_NOTE = "provider reasoning \xB7 not croppable";
 function consumers(transcript, opts = {}) {
   const acc = new Map;
-  const add = (source, kind, tokens) => {
-    const c = acc.get(source) ?? { source, kind, tokens: 0, count: 0, share: 0 };
+  const add = (source, kind, tokens, message, part) => {
+    const c = acc.get(source) ?? { source, kind, tokens: 0, count: 0, share: 0, entries: [] };
     c.tokens += tokens;
     c.count += 1;
+    c.entries.push({
+      messageID: message.id,
+      partID: part.id,
+      tokens,
+      preview: partPreview(part),
+      croppable: part.type === "tool" && part.state?.status === "completed"
+    });
     acc.set(source, c);
   };
   for (const m of transcript.messages) {
@@ -20435,25 +20700,32 @@ function consumers(transcript, opts = {}) {
       if (opts.cropped?.has(p.id))
         continue;
       if (p.type === "tool")
-        add(p.tool ?? "tool", "tool", estimateTokens(p.state?.output ?? "") + estimateTokens(JSON.stringify(p.state?.input ?? "")));
+        add(p.tool ?? "tool", "tool", estimateTokens(p.state?.output ?? "") + estimateTokens(JSON.stringify(p.state?.input ?? "")), m, p);
       else if (p.type === "text") {
         const kind = p.metadata?.["ctree"]?.kind;
         if (kind === "decision")
-          add("\u25C6 decisions", "decision", estimateTokens(p.text ?? ""));
+          add("\u25C6 decisions", "decision", estimateTokens(p.text ?? ""), m, p);
         else if (kind === "summary")
-          add("\u25C7 branch summaries", "summary", estimateTokens(p.text ?? ""));
+          add("\u25C7 branch summaries", "summary", estimateTokens(p.text ?? ""), m, p);
         else if (m.role === "user")
-          add("\u25CF user prompts", "user", estimateTokens(p.text ?? ""));
+          add("\u25CF user prompts", "user", estimateTokens(p.text ?? ""), m, p);
         else if (m.summary)
-          add("\u25C7 compaction summaries", "summary", estimateTokens(p.text ?? ""));
+          add("\u25C7 compaction summaries", "summary", estimateTokens(p.text ?? ""), m, p);
         else
-          add("\u25CB assistant text", "assistant", estimateTokens(p.text ?? ""));
+          add("\u25CB assistant text", "assistant", estimateTokens(p.text ?? ""), m, p);
       } else if (p.type === "reasoning")
-        add("(thinking)", "reasoning", estimateTokens(p.text ?? ""));
+        add(THINKING, "reasoning", estimateTokens(p.text ?? ""), m, p);
     }
   }
   const total = [...acc.values()].reduce((s, c) => s + c.tokens, 0) || 1;
-  return [...acc.values()].map((c) => ({ ...c, share: c.tokens / total })).sort((a, b) => b.tokens - a.tokens);
+  const limit = opts.limit !== undefined && opts.limit > 0 ? opts.limit : undefined;
+  return [...acc.values()].map((c) => ({
+    ...c,
+    share: c.tokens / total,
+    ...limit === undefined ? {} : { shareOfWindow: c.tokens / limit },
+    ...c.kind === "reasoning" ? { note: THINKING_NOTE } : {},
+    entries: c.entries.sort((a, b) => b.tokens - a.tokens)
+  })).sort((a, b) => b.tokens - a.tokens);
 }
 function bar(share, width) {
   const n = Math.round(share * width);
@@ -20461,8 +20733,8 @@ function bar(share, width) {
 }
 
 // src/tui/route.tsx
-import fs4 from "fs";
-import path3 from "path";
+import fs5 from "fs";
+import path4 from "path";
 
 // src/core/cropplan.ts
 function sha8(text) {
@@ -20692,7 +20964,14 @@ function textOf(row) {
     return plain(row.preview);
   return `assistant: ${plain(row.preview)}`;
 }
+function thoughtOf(row) {
+  if (row.kind !== "step" || row.thinkingMs === undefined)
+    return "";
+  return ` \xB7 ${(row.thinkingMs / 1000).toFixed(row.thinkingMs < 1e4 ? 1 : 0)}s thought`;
+}
 function rowLine(row, width, here) {
+  if (row.kind === "separator")
+    return `${row.gutter}${row.text}`;
   const tokens = `${row.kind !== "branch" && row.estimated ? "~" : ""}${formatK(row.tokens)}`;
   const marker = here ? "  \u2190 here" : "";
   let body;
@@ -20705,32 +20984,82 @@ function rowLine(row, width, here) {
   } else {
     const flags = row.kind === "step" ? `${row.label ? ` [${row.label}]` : ""}${row.isCropped ? " \u2702" : ""}${row.warn ? " \u26A0" : ""}${row.isError ? " \u2717" : ""}` : row.label ? ` [${row.label}]` : "";
     const dur = row.kind === "step" && row.durationMs !== undefined ? ` ${(row.durationMs / 1000).toFixed(row.durationMs < 1e4 ? 1 : 0)}s` : "";
-    body = `${row.gutter}${glyphOf(row)} ${textOf(row)}${flags}${dur}${marker}`;
+    body = `${row.gutter}${glyphOf(row)} ${textOf(row)}${flags}${dur}${thoughtOf(row)}${marker}`;
   }
   return fitRow(body, tokens, width);
 }
+function segmentsOf(line, query, thought) {
+  const ranges = [];
+  if (query) {
+    const at = line.toLowerCase().indexOf(query.toLowerCase());
+    if (at >= 0)
+      ranges.push({
+        at,
+        len: query.length,
+        kind: "match"
+      });
+  }
+  if (thought) {
+    const at = line.lastIndexOf(thought);
+    if (at >= 0)
+      ranges.push({
+        at,
+        len: thought.length,
+        kind: "dim"
+      });
+  }
+  if (ranges.length === 0)
+    return [{
+      text: line,
+      kind: "plain"
+    }];
+  const out = [];
+  let cursor = 0;
+  for (const r of ranges.sort((a, b) => a.at - b.at)) {
+    if (r.at < cursor)
+      continue;
+    if (r.at > cursor)
+      out.push({
+        text: line.slice(cursor, r.at),
+        kind: "plain"
+      });
+    out.push({
+      text: line.slice(r.at, r.at + r.len),
+      kind: r.kind
+    });
+    cursor = r.at + r.len;
+  }
+  if (cursor < line.length)
+    out.push({
+      text: line.slice(cursor),
+      kind: "plain"
+    });
+  return out;
+}
 var DEFAULT_KEYS = {
   up: ["up", "k"],
   down: ["down", "j"],
   jump_up: ["shift+up", "shift+k"],
   jump_down: ["shift+down", "shift+j"],
-  first: ["g"],
+  half_up: ["ctrl+u"],
+  half_down: ["ctrl+d"],
+  first: ["gg"],
   last: ["shift+g"],
   prev_branch: ["["],
   next_branch: ["]"],
   fold: ["left", "h"],
   unfold: ["right", "l"],
-  toggle: ["e"],
+  toggle: ["tab", "e"],
   go: ["return"],
   branch: ["b"],
   crop: ["c"],
   crop_toggle_mode: ["t"],
   mark: ["space"],
   auto: ["a"],
-  undo: ["x"],
+  undo: ["u", "x"],
   merge: ["m"],
   inspector: ["i"],
-  consumers: ["u"],
+  consumers: ["s"],
   copy: ["y"],
   mode_duration: ["1"],
   mode_turns: ["2"],
@@ -20739,13 +21068,43 @@ var DEFAULT_KEYS = {
   decisions: ["shift+d"],
   export: ["shift+e"],
   label: ["shift+l"],
-  filter: ["f"],
+  filter_pick: ["f"],
+  filter_prev: ["shift+f"],
   search: ["/"],
+  search_next: ["n"],
+  search_prev: ["shift+n"],
   help: ["?", "shift+/"],
   back: ["q", "escape"]
 };
+var EMPTY_TRANSCRIPT = {
+  sessionID: "",
+  title: "",
+  status: "available",
+  messages: []
+};
 var NO_BRANCHES = "No branches yet \xB7 b forks here into a real OpenCode session; nothing is copied or deleted.";
-var HELP = ["? help \xB7 ? or esc closes", "Reading the screen \u2014 a whole-tree outline (Pi) fused with a trajectory (DSH)", "  the entire tree, oldest first: trunk at the left, branches nested at their fork point", "  \u25CF user: \u2026 \xB7 \u25CB assistant: \u2026 \xB7 \u2699 [bash $ \u2026] / [tool: arg] \u2192 out \xB7 \u25C6 decision \xB7 \u2263 summary", "  \u2387 = a branch: a real, separate OpenCode session, hung off the message it forked from", "  \u2502 \u251C \u2570 connectors draw the branch topology; \u2190 here marks the session you are in", "  \u25BE open / \u25B8 folded \u2014 the path to where you are is open by default; \u2192 \u2190 (or e) toggle a branch", "  right column is tokens; ~ means estimated \xB7 \u26A0 \u226510k \xB7 \u2702 cropped \xB7 \u2717 tool error", "Keys", "  move   \u2191\u2193 j k \xB7 J K by 20 \xB7 g G first/last \xB7 [ ] branch rows \xB7 \u2192 \u2190 e fold", "  act    \u23CE go/switch \xB7 b branch \xB7 m merge \xB7 c crop \xB7 x undo \xB7 L label \xB7 y copy", "         in crop mode: space mark \xB7 a auto \xB7 t result\u21C4turn \xB7 \u23CE apply \xB7 esc leave", "  DSH    i inspector (Status/Payload/Result/Timing) \xB7 1 2 3 lanes (Duration/Turns/Calls) \xB7 0 off", "  views  u consumers \xB7 D decisions \xB7 E export \xB7 f filter \xB7 / search \xB7 q back"];
+var HELP = [`? help \xB7 ? or esc closes \xB7 opencode-context-tree ${PLUGIN_VERSION}`, "Move", "  \u2191\u2193 j k \xB7 J K by 20 \xB7 ctrl+d ctrl+u half page \xB7 gg top \xB7 G bottom \xB7 [ ] branch rows", "  h l \u2190 \u2192 fold/unfold a branch \xB7 Tab (or e) toggle \xB7 / live search \xB7 n N next/prev match", "Act", "  \u23CE go \u2014 a \u2387 header switches to it \xB7 a user turn forks & prefills it \xB7 a step forks after it", "  b branch \xB7 m merge \xB7 c crop mode (space mark \xB7 a auto \xB7 t result\u21C4turn \xB7 \u23CE apply \xB7 esc leave)", "  u undo (alias x) \xB7 L label \xB7 y copy \xB7 E export decisions", "Views", "  i inspector \xB7 1 2 3 lanes (duration/turns/calls) \xB7 0 off \xB7 s consumers \xB7 D decisions \xB7 f F filter", "Legend", "  \u25CF user \xB7 \u25CB assistant \xB7 \u2699 tool step \xB7 \u25C6 decision \xB7 \u2263 summary \xB7 \u2387 branch (a real OpenCode session)", "  \u2502 \u251C \u2570 draw the topology \xB7 \u25BE open \u25B8 folded \xB7 \u2190 here is the session you are in", "  dim rows are not sent to the model; \u2500\u2500 not in this branch's context \u2500\u2500 is where your path forked", "  right column is tokens; ~ estimated \xB7 \u26A0 \u226510k \xB7 \u2702 cropped \xB7 \u2717 tool error", "  \u2387 colours: open green \xB7 squashed blue \xB7 rejected/discarded red \xB7 abandoned grey", "  lanes: Input green you / grey context \xB7 Model purple answer / grey thinking \xB7 Tools orange call / red failed"];
+var FILTERS = [{
+  title: "default",
+  value: "default",
+  description: "user turns, assistant text, tool steps"
+}, {
+  title: "no-tools",
+  value: "no-tools",
+  description: "hide \u2699 tool steps"
+}, {
+  title: "user-only",
+  value: "user-only",
+  description: "\u25CF user turns only"
+}, {
+  title: "labeled",
+  value: "labeled",
+  description: "labelled rows only"
+}, {
+  title: "all",
+  value: "all",
+  description: "everything, thinking parts included"
+}];
 function bindingsFor(overrides) {
   const out = [];
   for (const [cmd, keys] of Object.entries(DEFAULT_KEYS))
@@ -20777,6 +21136,8 @@ function TreeRoute(props) {
   const [expanded, setExpanded] = createSignal2(new Set(api2.kv.get(`ctree.expanded.${sessionID}`, [])));
   const [filter, setFilter] = createSignal2(api2.kv.get("ctree.filter", "default"));
   const [search, setSearch] = createSignal2("");
+  const [searchMode, setSearchMode] = createSignal2(false);
+  let searchBefore = "";
   const [selected, setSelected] = createSignal2(0);
   const [others, setOthers] = createSignal2({});
   const [busy, setBusy] = createSignal2();
@@ -20786,7 +21147,9 @@ function TreeRoute(props) {
   const [lanesOn, setLanesOn] = createSignal2(api2.kv.get("ctree.lanesOn", false));
   const [inspector, setInspector] = createSignal2(api2.kv.get("ctree.inspector", false));
   const [consumerIndex, setConsumerIndex] = createSignal2(0);
+  const [consumerOpen, setConsumerOpen] = createSignal2(new Set);
   const [decisionIndex, setDecisionIndex] = createSignal2(0);
+  const [decisionScroll, setDecisionScroll] = createSignal2(0);
   const [marked, setMarked] = createSignal2(new Set);
   const state = createMemo(() => {
     tick();
@@ -20901,19 +21264,23 @@ function TreeRoute(props) {
   api2.renderer.on("resize", onResize);
   onCleanup(() => void api2.renderer.off("resize", onResize));
   const cols = () => size().cols;
-  const height = () => Math.max(8, size().rows - 8 - (lanesOn() && size().rows >= 12 ? 3 : 0));
+  const helpHeight = () => panel() === "help" ? Math.min(HELP.length, Math.max(0, size().rows - 12)) : 0;
+  const height = () => Math.max(4, size().rows - 8 - (lanesOn() && size().rows >= 12 ? 3 : 0) - helpHeight());
   const width = () => Math.max(60, cols() - 4);
+  const overflow = () => view().rows.length > height() - 2;
+  const rowsHeight = () => overflow() ? height() - 2 : height();
   const windowStart = createMemo(() => {
-    const h = height();
+    const h = rowsHeight();
     const s = selected();
     const n = view().rows.length;
-    const start = Math.max(0, Math.min(s - Math.floor(h / 2), n - h));
-    return start;
+    return Math.max(0, Math.min(s - Math.floor(h / 2), n - h));
   });
-  const visible = createMemo(() => view().rows.slice(windowStart(), windowStart() + height()));
+  const visible = createMemo(() => view().rows.slice(windowStart(), windowStart() + rowsHeight()));
+  const hiddenAbove = () => windowStart();
+  const hiddenBelow = () => Math.max(0, view().rows.length - windowStart() - rowsHeight());
   const live = () => sessionID ? liveTranscript(api2, sessionID) : undefined;
   const currentMessageOf = (row) => {
-    if (row.kind === "branch")
+    if (row.kind === "branch" || row.kind === "separator")
       return;
     if (row.sessionID === sessionID)
       return row.messageID;
@@ -20958,10 +21325,35 @@ function TreeRoute(props) {
     const list = cropMode() === "result" ? resultCands() : turnCands();
     return list.filter((c) => m.has(markKey(c)));
   });
+  function modeForRow(row) {
+    if (row.kind === "step" && resultCands().some((c) => c.partID === (currentPartOf(row) ?? row.partID)))
+      return "result";
+    if (row.kind !== "branch" && row.kind !== "separator" && turnCands().some((c) => c.anchorMessageID === currentMessageOf(row)))
+      return "turn";
+    return;
+  }
+  const armed = () => {
+    const row = current();
+    const c = row ? candidateOf(row) : undefined;
+    if (!c)
+      return false;
+    const key = markKey(c);
+    return marked().has(`${key}:warned`) && !marked().has(key);
+  };
   function toggleMark() {
     const row = current();
     if (!row)
       return;
+    if (!cropMode()) {
+      const mode = modeForRow(row);
+      if (!mode) {
+        api2.ui.toast({
+          message: "nothing croppable on this row \u2014 c opens crop mode"
+        });
+        return;
+      }
+      setCropMode(mode);
+    }
     const c = candidateOf(row);
     debug("crop.mark", {
       row: row.id,
@@ -20993,6 +21385,13 @@ function TreeRoute(props) {
       next.add(key);
     setMarked(next);
   }
+  async function leaveCropMode() {
+    const n = selectedCandidates().length;
+    if (n > 0 && !await confirm(`Drop ${n} mark${n === 1 ? "" : "s"}?`, "Nothing has been cropped yet \u2014 the marks are lost, the transcript is untouched."))
+      return;
+    setCropMode(undefined);
+    setMarked(new Set);
+  }
   function autoMarkAll() {
     if (cropMode() !== "result")
       return;
@@ -21070,69 +21469,64 @@ function TreeRoute(props) {
     },
     parts: m.parts
   }))));
-  const band = () => bandFor(contextSize().tokens);
+  const band = () => bandFor(contextSize().tokens, contextLimit());
   const branchOfCurrent = () => sessionID ? state().sessions[sessionID] : undefined;
   const userTurns = () => (live()?.messages ?? []).filter((m) => m.role === "user").length;
-  const lanes = createMemo(() => live() ? buildLanes(live(), laneMode() === "duration" ? "turns" : laneMode()) : {
-    mode: laneMode(),
-    columns: []
-  });
   const laneWidth = () => Math.max(10, Math.min(width() - 46, 80));
-  const laneSeries = createMemo(() => {
-    const l = lanes();
-    if (laneMode() === "duration") {
-      const w = durationWeighted(l, laneWidth());
-      return {
-        input: w.input,
-        output: w.output,
-        tool: w.tool,
-        toolError: w.toolError,
-        cellFor: (col) => w.input.findIndex((_, i) => w.columnAt(i) === col)
-      };
-    }
-    const n = l.columns.length;
-    const cellFor = (col) => n === 0 ? -1 : Math.floor(col * laneWidth() / Math.max(n, laneWidth())) + (n < laneWidth() ? Math.floor(laneWidth() / n / 2) : 0);
-    return {
-      input: l.columns.map((c) => c.input),
-      output: l.columns.map((c) => c.output),
-      tool: l.columns.map((c) => c.tool),
-      toolError: l.columns.map((c) => c.toolError),
-      cellFor
-    };
-  });
-  const cursorCell = createMemo(() => {
+  const strip = createMemo(() => buildEventStrip(live() ?? EMPTY_TRANSCRIPT, laneMode(), laneWidth()));
+  const cursorEvents = createMemo(() => {
     const row = current();
-    if (!row || row.kind === "branch")
-      return -1;
+    const hit = new Set;
+    if (!row || row.kind === "branch" || row.kind === "separator")
+      return hit;
     const mid = currentMessageOf(row) ?? row.messageID;
     const pid = row.kind === "step" ? currentPartOf(row) ?? row.partID : undefined;
-    const col = columnFor(lanes(), mid, pid);
-    return col < 0 ? -1 : laneSeries().cellFor(col);
+    const own2 = stripIndexFor(strip(), mid, pid);
+    if (own2 >= 0)
+      hit.add(own2);
+    strip().events.forEach((e, i) => {
+      if (e.messageID !== mid)
+        return;
+      if (row.kind === "turn" ? e.lane === "input" : e.kind === "reasoning")
+        hit.add(i);
+    });
+    return hit;
   });
-  const laneLine = (values, scale) => {
-    const line = sparkline(fitColumns(values, laneWidth()), laneWidth(), scale);
-    const cur = cursorCell();
-    if (cur < 0 || cur >= line.length)
-      return line;
-    return `${line.slice(0, cur)}\u25AE${line.slice(cur + 1)}`;
-  };
-  const toolRuns = createMemo(() => {
-    const line = laneLine(laneSeries().tool);
-    const mask = fitColumns(laneSeries().toolError.map((e) => e ? 1 : 0), laneWidth());
+  const cellColor = (cell) => {
+    if (cell.error)
+      return t.error;
+    const e = strip().events[cell.eventIndex];
+    if (!e)
+      return t.textMuted;
+    if (e.lane === "tools")
+      return t.warning;
+    if (e.lane === "input")
+      return e.kind === "user" ? t.success : t.textMuted;
+    return e.kind === "reasoning" ? t.textMuted : t.accent;
+  };
+  const laneRuns = (lane) => {
+    const cur = cursorEvents();
     const runs = [];
-    for (let i = 0;i < line.length; i++) {
-      const error61 = (mask[i] ?? 0) > 0;
+    for (const cell of strip().lanes[lane]) {
+      const sel = cell !== null && cur.has(cell.eventIndex);
+      const color = cell === null ? t.textMuted : cellColor(cell);
+      const fg = sel ? t.background : color;
+      const bg = sel ? color : undefined;
       const last = runs[runs.length - 1];
-      if (last && last.error === error61)
-        last.text += line[i];
+      if (last && last.fg === fg && last.bg === bg)
+        last.text += cell?.glyph ?? " ";
       else
         runs.push({
-          text: line[i],
-          error: error61
+          text: cell?.glyph ?? " ",
+          fg,
+          bg
         });
     }
     return runs;
-  });
+  };
+  const inputRuns = createMemo(() => laneRuns("input"));
+  const modelRuns = createMemo(() => laneRuns("model"));
+  const toolRuns = createMemo(() => laneRuns("tools"));
   const contextLimit = createMemo(() => sessionID ? modelContextLimit(api2, sessionID) : undefined);
   const laneRoom = () => height() >= 12 && panel() === "tree";
   const showLanes = () => laneRoom() && lanesOn() && userTurns() >= 3;
@@ -21154,7 +21548,7 @@ function TreeRoute(props) {
   const noBranchesLines = () => NO_BRANCHES.length + 2 <= rowWidth() ? [NO_BRANCHES] : NO_BRANCHES.split(/(?<=;) /);
   const inspectorLines = createMemo(() => {
     const row = current();
-    if (!row)
+    if (!row || row.kind === "separator")
       return [];
     const w = inspectorWidth() - 3;
     const clip2 = (x) => x.length > w ? `${x.slice(0, w - 1)}\u2026` : x;
@@ -21201,19 +21595,37 @@ function TreeRoute(props) {
     const msg = tr?.messages.find((m) => m.id === row.messageID);
     const turn = view().rows.slice(0, view().indexById[row.id] + 1).filter((r) => r.kind === "turn").at(-1);
     if (row.kind === "turn") {
-      head(`${row.isDecision ? "\u25C6 decision" : row.isSummary ? "\u25C7 summary" : "\u25CF user"} \xB7 T${row.turn}`);
+      const text = msg?.parts.map((p) => p.text ?? "").join(`
+`) ?? row.preview;
+      if (row.isDecision) {
+        head(`\u25C6 ${decisionSummary(text).title}`);
+        kv("Tokens", `~${formatK(row.tokens)}`);
+        const lines = renderDecision(text, w);
+        for (const l of lines.slice(0, 16))
+          out.push({
+            fg: t.text,
+            text: l
+          });
+        if (lines.length > 16)
+          muted(`\u2026 ${lines.length - 16} more lines (y to copy)`);
+        return out;
+      }
+      head(`${row.isSummary ? "\u25C7 summary" : "\u25CF user"} \xB7 T${row.turn}`);
       if (row.label)
         kv("Label", row.label);
       kv("Tokens", `~${formatK(row.tokens)}`);
       kv("At", msg ? new Date(msg.time.created).toISOString().slice(11, 19) : "?");
-      block("Text", msg?.parts.map((p) => p.text ?? "").join(`
-`) ?? row.preview, 14);
+      if (!row.inContext)
+        muted("not in this branch's context");
+      block("Text", text, 14);
       return out;
     }
     const part = msg?.parts.find((p) => p.id === row.partID);
     const stepNo = msg ? msg.parts.filter((p) => p.type === "tool" || p.type === "text").findIndex((p) => p.id === row.partID) + 1 : 0;
     head(`${row.glyph} ${part?.type === "tool" ? part.tool : row.glyph === "\u25C7" ? "compaction" : "assistant"} \xB7 T${turn?.kind === "turn" ? turn.turn : "?"} \xB7 step ${stepNo}`);
     kv("Hierarchy", `T${turn?.kind === "turn" ? turn.turn : "?"} \u203A assistant \u203A step ${stepNo}`);
+    if (!row.inContext)
+      muted("not in this branch's context");
     if (part?.type === "tool") {
       const st = part.state;
       const dur = st?.time?.start !== undefined && st?.time?.end !== undefined ? `${st.time.end - st.time.start} ms` : "?";
@@ -21223,25 +21635,66 @@ function TreeRoute(props) {
       block("Result", String(st?.output ?? ""), 10);
       kv("Timing", st?.time?.start ? `started ${new Date(st.time.start).toISOString().slice(11, 23)} \xB7 ${dur} \xB7 session ts` : "n/a");
       const cand = resultCands().find((c) => c.partID === (currentPartOf(row) ?? row.partID));
-      kv("Crop", row.isCropped ? "\u2702 cropped (x to restore)" : cand ? cand.protections.length ? `protected: ${cand.protections.join(", ")}` : "c then space to stub this result" : "n/a");
+      kv("Crop", row.isCropped ? `\u2702 cropped (${UNDO_KEY} to restore)` : cand ? cand.protections.length ? `protected: ${cand.protections.join(", ")}` : "c then space to stub this result" : "n/a");
     } else {
       kv("Tokens", `~${formatK(row.tokens)}`);
       if (row.durationMs !== undefined)
         kv("Duration", `${(row.durationMs / 1000).toFixed(1)} s`);
+      if (row.thinkingMs !== undefined)
+        kv("Thought", `${(row.thinkingMs / 1000).toFixed(1)} s`);
       block("Text", part?.text ?? row.preview, 14);
     }
     return out;
   });
   const consumerRows = createMemo(() => live() ? consumers(live(), {
-    cropped: alreadyCropped()
+    cropped: alreadyCropped(),
+    limit: contextLimit()
   }) : []);
+  const consumerLines = createMemo(() => consumerRows().flatMap((c) => [{
+    bucket: c
+  }, ...consumerOpen().has(c.source) ? c.entries.map((e) => ({
+    bucket: c,
+    entry: e
+  })) : []]));
+  const consumerLine = () => consumerLines()[Math.min(consumerIndex(), consumerLines().length - 1)];
+  const consumerMax = () => Math.max(1, ...consumerRows().map((c) => c.tokens));
+  function toggleConsumer(open2) {
+    const line = consumerLine();
+    if (!line)
+      return;
+    const next = new Set(consumerOpen());
+    if (open2)
+      next.add(line.bucket.source);
+    else
+      next.delete(line.bucket.source);
+    setConsumerOpen(next);
+  }
+  function markConsumerEntry() {
+    const line = consumerLine();
+    if (!line)
+      return;
+    if (!line.entry) {
+      toggleConsumer(true);
+      return;
+    }
+    const cand = line.entry.croppable ? resultCands().find((r) => r.partID === line.entry?.partID) : undefined;
+    if (!cand)
+      return;
+    setCropMode("result");
+    const next = new Set(marked());
+    if (next.has(cand.partID))
+      next.delete(cand.partID);
+    else
+      next.add(cand.partID);
+    setMarked(next);
+  }
   function cropConsumer() {
-    const c = consumerRows()[consumerIndex()];
+    const c = consumerLine()?.bucket;
     setPanel("tree");
     if (!c || c.kind !== "tool") {
       setCropMode("result");
       api2.ui.toast({
-        message: c ? `${c.source} is not a tool result; mark rows by hand` : "nothing to crop"
+        message: c ? c.note ?? `${c.source} is not a tool result; mark rows by hand` : "nothing to crop"
       });
       return;
     }
@@ -21254,20 +21707,18 @@ function TreeRoute(props) {
   }
   function copySelected() {
     const row = current();
-    if (!row || row.kind === "branch")
+    if (!row || row.kind === "branch" || row.kind === "separator")
       return;
     const tr = row.sessionID === sessionID ? live() : others()[row.sessionID];
     const msg = tr?.messages.find((m) => m.id === row.messageID);
     const text = row.kind === "step" ? String(msg?.parts.find((p) => p.id === row.partID)?.state?.output ?? msg?.parts.find((p) => p.id === row.partID)?.text ?? "") : msg?.parts.map((p) => p.text ?? "").join(`
 `) ?? "";
-    const file2 = path3.join(directory, ".opencode", "context-tree", "last-copy.txt");
     try {
-      fs4.mkdirSync(path3.dirname(file2), {
-        recursive: true
-      });
-      fs4.writeFileSync(file2, text);
+      const {
+        hint
+      } = copyText(api2, text, directory);
       api2.ui.toast({
-        message: `saved ${text.length} chars \u2192 .opencode/context-tree/last-copy.txt`
+        message: `copied ${text.length} chars \u2192 ${hint}`
       });
     } catch (e) {
       api2.ui.toast({
@@ -21393,6 +21844,10 @@ function TreeRoute(props) {
       bump();
     }
   }
+  const sessionLabel = (id) => {
+    const name = state().sessions[id]?.name;
+    return name ? `\u2387 ${name}` : others()[id]?.title ?? api2.state.session.get(id)?.title ?? id;
+  };
   async function jump() {
     const row = current();
     if (!row || !sessionID)
@@ -21415,16 +21870,19 @@ function TreeRoute(props) {
         });
         return;
       }
-      if (plan.kind === "fork" && plan.mode === "redo") {
-        const ok = await confirm("Redo this turn on a new branch?", "The message is copied into the prompt; nothing is deleted.");
-        if (!ok)
-          return;
-      }
+      const from = sessionLabel(plan.sessionID);
+      const ok = await confirm(plan.kind === "switch" ? `Switch to ${from}?` : plan.mode === "redo" ? "Fork & prefill this turn?" : "Fork after this step?", plan.kind === "switch" ? `The session you are on now stays exactly as it is. ${UNDO_KEY} undoes this.` : `A new OpenCode session forks from ${from} at this point; nothing is deleted. ${UNDO_KEY} undoes this.`);
+      if (!ok)
+        return;
       const summary = await askSummary();
-      await executeJump(ctx, plan, {
+      const target2 = await executeJump(ctx, plan, {
         currentSessionID: sessionID,
         summary
       });
+      if (target2)
+        api2.ui.toast({
+          message: `moved to ${sessionLabel(target2)} \xB7 ${UNDO_KEY} undoes it`
+        });
     });
   }
   async function branch() {
@@ -21477,7 +21935,7 @@ function TreeRoute(props) {
   }
   async function label() {
     const row = current();
-    if (!row || row.kind === "branch")
+    if (!row || row.kind === "branch" || row.kind === "separator")
       return;
     const st = state();
     const existing = st.labels[row.messageID]?.label;
@@ -21495,7 +21953,7 @@ function TreeRoute(props) {
     const row = current();
     if (!row)
       return;
-    const target2 = row.kind === "branch" ? row.sessionID : row.depth > 0 ? row.sessionID : undefined;
+    const target2 = row.kind === "separator" ? undefined : row.kind === "branch" || row.depth > 0 ? row.sessionID : undefined;
     if (!target2)
       return;
     const shown = row.kind === "branch" ? row.expanded : true;
@@ -21529,14 +21987,18 @@ function TreeRoute(props) {
       return;
     }
     const siblings = Object.values(state().sessions).filter((x) => x.parentSessionID === b.parentSessionID && x.sessionID !== sessionID && x.status === "open").length;
-    const mode = await select(mergeDialogTitle(b.name ?? "branch", others()[b.parentSessionID]?.title), mergeDialogOptions({
-      siblings
+    const parent = others()[b.parentSessionID];
+    const target2 = mergeTargetOf(b.parentSessionID === state().root ? TRUNK_LABEL : state().sessions[b.parentSessionID]?.name ?? TRUNK_LABEL, parent?.messages ?? []);
+    const turns = ownTurnCount(live()?.messages ?? [], {
+      messageID: b.anchorMessageID,
+      parentMessageIDs: parent?.messages.map((m) => m.id) ?? []
+    });
+    const mode = await select(mergeDialogTitle(b.name ?? "branch", target2), mergeDialogOptions({
+      siblings,
+      turns
     }));
     if (!mode)
       return;
-    let note;
-    if (mode === "discard")
-      note = await prompt("Why? (optional note on the close marker)", "dead end") ?? undefined;
     const inApp = !hasEditor() ? async (draft) => {
       const ok = await confirm("Accept the drafted record as-is?", `${draft.slice(0, 400)}${draft.length > 400 ? "\u2026" : ""}
 
@@ -21549,7 +22011,6 @@ ${MERGE_TRUST}
       await mergeBranch(ctx, {
         sessionID,
         mode,
-        note,
         confirm: inApp
       });
     });
@@ -21561,9 +22022,9 @@ ${MERGE_TRUST}
       sessionID: d.sessionID,
       at: d.recordedAt
     }));
-    const file2 = path3.join(directory, "ctree-decisions.md");
+    const file2 = path4.join(directory, "ctree-decisions.md");
     try {
-      fs4.writeFileSync(file2, exportDecisions(records));
+      fs5.writeFileSync(file2, exportDecisions(records));
       api2.ui.toast({
         variant: "success",
         message: `wrote ${records.length} record${records.length === 1 ? "" : "s"} \u2192 ${file2}`
@@ -21579,7 +22040,7 @@ ${MERGE_TRUST}
     const d = decisions()[decisionIndex()];
     if (!d)
       return;
-    const idx = view().rows.findIndex((r) => r.kind !== "branch" && r.messageID === d.messageID);
+    const idx = view().rows.findIndex((r) => (r.kind === "turn" || r.kind === "step") && r.messageID === d.messageID);
     setPanel("tree");
     if (idx >= 0)
       setSelected(idx);
@@ -21588,125 +22049,251 @@ ${MERGE_TRUST}
         message: "that record lives in another session"
       });
   }
+  const treePanel = () => panel() === "tree";
+  const inCrop = () => cropMode() !== undefined;
+  const treeIdle = () => treePanel() && !inCrop();
+  const listPanel = () => treePanel() || panel() === "consumers";
+  function setFilterTo(next) {
+    setFilter(next);
+    api2.kv.set("ctree.filter", next);
+  }
+  async function pickFilter() {
+    const next = await select("Filter rows", FILTERS.map((f) => ({
+      title: `${f.value === filter() ? "\u25CF" : " "} ${f.title}`,
+      value: f.value,
+      description: f.description
+    })));
+    if (next)
+      setFilterTo(next);
+  }
+  function moveIndex(delta) {
+    if (panel() === "decisions") {
+      setDecisionIndex((i) => Math.min(Math.max(0, decisions().length - 1), Math.max(0, i + delta)));
+      setDecisionScroll(0);
+      return;
+    }
+    if (panel() === "consumers") {
+      setConsumerIndex((i) => Math.min(Math.max(0, consumerLines().length - 1), Math.max(0, i + delta)));
+      return;
+    }
+    setSelected((i) => moveSelection(view().rows, i, delta));
+  }
+  function halfPage(dir) {
+    const half = Math.max(1, Math.floor(height() / 2));
+    if (panel() === "decisions")
+      setDecisionScroll((s) => Math.max(0, s + dir * half));
+    else
+      moveIndex(dir * half);
+  }
+  function gotoEdge(dir) {
+    if (panel() === "decisions") {
+      setDecisionIndex(dir === -1 ? 0 : Math.max(0, decisions().length - 1));
+      setDecisionScroll(0);
+      return;
+    }
+    if (panel() === "consumers") {
+      setConsumerIndex(dir === -1 ? 0 : Math.max(0, consumerLines().length - 1));
+      return;
+    }
+    const i = dir === -1 ? firstIndex(view().rows) : lastIndex(view().rows);
+    if (i >= 0)
+      setSelected(i);
+  }
+  const matchIn = (line) => {
+    const q = search().trim().toLowerCase();
+    return q ? line.toLowerCase().indexOf(q) : -1;
+  };
+  function moveMatch(dir) {
+    const rows = view().rows;
+    const q = search().trim();
+    if (rows.length === 0 || !q)
+      return;
+    for (let step = 1;step <= rows.length; step++) {
+      const i = ((selected() + dir * step) % rows.length + rows.length) % rows.length;
+      if (rows[i].kind !== "separator" && matchIn(rowLine(rows[i], rowWidth(), false)) >= 0) {
+        setSelected(i);
+        return;
+      }
+    }
+    api2.ui.toast({
+      message: `no other row matches "${q}"`
+    });
+  }
+  function enterSearch() {
+    searchBefore = search();
+    setSearchMode(true);
+  }
+  function exitSearch(commit) {
+    if (!commit)
+      setSearch(searchBefore);
+    setSearchMode(false);
+  }
+  const stopTyping = api2.keymap.intercept("key", (input2) => {
+    if (!searchMode())
+      return;
+    const ev = input2.event;
+    if (ev.eventType === "release" || ev.ctrl || ev.meta)
+      return;
+    const take = () => input2.consume({
+      preventDefault: true,
+      stopPropagation: true
+    });
+    if (ev.name === "escape")
+      return void (exitSearch(false), take());
+    if (ev.name === "return" || ev.name === "enter")
+      return void (exitSearch(true), take());
+    if (ev.name === "backspace")
+      return void (setSearch((q) => q.slice(0, -1)), take());
+    const char = ev.sequence?.length === 1 && ev.sequence >= " " && ev.sequence !== "\x7F" ? ev.sequence : ev.name.length === 1 ? ev.name : undefined;
+    if (char === undefined)
+      return;
+    setSearch((q) => q + char);
+    take();
+  });
+  onCleanup(() => stopTyping());
   const off = api2.keymap.registerLayer({
     mode: "base",
     commands: [{
       name: "ctree.up",
       hidden: true,
-      run: () => panel() === "decisions" ? setDecisionIndex((i) => Math.max(0, i - 1)) : panel() === "consumers" ? setConsumerIndex((i) => Math.max(0, i - 1)) : setSelected((i) => moveSelection(view().rows, i, -1))
+      run: () => moveIndex(-1)
     }, {
       name: "ctree.down",
       hidden: true,
-      run: () => panel() === "decisions" ? setDecisionIndex((i) => Math.min(Math.max(0, decisions().length - 1), i + 1)) : panel() === "consumers" ? setConsumerIndex((i) => Math.min(Math.max(0, consumerRows().length - 1), i + 1)) : setSelected((i) => moveSelection(view().rows, i, 1))
+      run: () => moveIndex(1)
     }, {
       name: "ctree.jump_up",
       hidden: true,
-      run: () => setSelected((i) => moveSelection(view().rows, i, -20))
+      enabled: treePanel,
+      run: () => moveIndex(-20)
     }, {
       name: "ctree.jump_down",
       hidden: true,
-      run: () => setSelected((i) => moveSelection(view().rows, i, 20))
+      enabled: treePanel,
+      run: () => moveIndex(20)
+    }, {
+      name: "ctree.half_up",
+      hidden: true,
+      run: () => halfPage(-1)
+    }, {
+      name: "ctree.half_down",
+      hidden: true,
+      run: () => halfPage(1)
     }, {
       name: "ctree.first",
       hidden: true,
-      run: () => setSelected(0)
+      run: () => gotoEdge(-1)
     }, {
       name: "ctree.last",
       hidden: true,
-      run: () => setSelected(Math.max(0, view().rows.length - 1))
+      run: () => gotoEdge(1)
     }, {
       name: "ctree.prev_branch",
       hidden: true,
+      enabled: treePanel,
       run: () => setSelected((i) => nextBranchIndex(view().rows, i, -1))
     }, {
       name: "ctree.next_branch",
       hidden: true,
+      enabled: treePanel,
       run: () => setSelected((i) => nextBranchIndex(view().rows, i, 1))
     }, {
       name: "ctree.fold",
       hidden: true,
-      run: () => foldOrUnfold(false)
+      enabled: listPanel,
+      run: () => panel() === "consumers" ? toggleConsumer(false) : foldOrUnfold(false)
     }, {
       name: "ctree.unfold",
       hidden: true,
-      run: () => foldOrUnfold(true)
+      enabled: listPanel,
+      run: () => panel() === "consumers" ? toggleConsumer(true) : foldOrUnfold(true)
     }, {
       name: "ctree.toggle",
       hidden: true,
+      enabled: treePanel,
       run: () => foldOrUnfold(!(current()?.kind === "branch" && current().expanded))
     }, {
       name: "ctree.go",
       hidden: true,
-      run: () => void (panel() === "decisions" ? jumpToDecision() : panel() === "consumers" ? cropConsumer() : cropMode() ? applyMarked() : jump())
+      run: () => void (panel() === "decisions" ? jumpToDecision() : panel() === "consumers" ? toggleConsumer(!consumerOpen().has(consumerLine()?.bucket.source ?? "")) : cropMode() ? applyMarked() : jump())
     }, {
       name: "ctree.branch",
       hidden: true,
+      enabled: treeIdle,
       run: () => void branch()
     }, {
       name: "ctree.label",
       hidden: true,
+      enabled: treeIdle,
       run: () => void label()
     }, {
-      name: "ctree.filter",
+      name: "ctree.filter_pick",
       hidden: true,
-      run: () => {
-        const next = cycleFilter(filter());
-        setFilter(next);
-        api2.kv.set("ctree.filter", next);
-      }
+      enabled: () => !inCrop(),
+      run: () => void pickFilter()
+    }, {
+      name: "ctree.filter_prev",
+      hidden: true,
+      enabled: () => !inCrop(),
+      run: () => setFilterTo(FILTERS[(FILTERS.findIndex((f) => f.value === filter()) - 1 + FILTERS.length) % FILTERS.length].value)
     }, {
       name: "ctree.search",
       hidden: true,
-      run: () => void prompt("Search rows (empty to clear)", "bash, redis, label\u2026", search()).then((v) => {
-        if (v !== undefined)
-          setSearch(v.trim());
-      })
+      enabled: treeIdle,
+      run: () => enterSearch()
+    }, {
+      name: "ctree.search_next",
+      hidden: true,
+      enabled: treePanel,
+      run: () => moveMatch(1)
+    }, {
+      name: "ctree.search_prev",
+      hidden: true,
+      enabled: treePanel,
+      run: () => moveMatch(-1)
     }, {
       name: "ctree.crop",
       hidden: true,
+      enabled: listPanel,
       run: () => {
         if (panel() === "consumers") {
           cropConsumer();
           return;
         }
-        if (panel() !== "tree")
-          return;
-        if (cropMode()) {
-          setCropMode(undefined);
-          setMarked(new Set);
-        } else
+        if (cropMode())
+          leaveCropMode();
+        else
           setCropMode("result");
       }
     }, {
       name: "ctree.crop_toggle_mode",
       hidden: true,
-      run: () => {
-        if (!cropMode())
-          return;
-        setCropMode(cropMode() === "result" ? "turn" : "result");
-        setMarked(new Set);
-      }
+      enabled: inCrop,
+      run: () => setCropMode(cropMode() === "result" ? "turn" : "result")
     }, {
       name: "ctree.mark",
       hidden: true,
-      enabled: () => Boolean(cropMode()),
-      run: () => toggleMark()
+      enabled: listPanel,
+      run: () => panel() === "consumers" ? markConsumerEntry() : toggleMark()
     }, {
       name: "ctree.auto",
       hidden: true,
-      enabled: () => Boolean(cropMode()),
+      enabled: inCrop,
       run: () => autoMarkAll()
     }, {
       name: "ctree.undo",
       hidden: true,
+      enabled: treeIdle,
       run: () => void undo()
     }, {
       name: "ctree.merge",
       hidden: true,
+      enabled: treeIdle,
       run: () => void merge2()
     }, {
       name: "ctree.inspector",
       hidden: true,
+      enabled: () => !inCrop(),
       run: () => {
         setInspector(!inspector());
         api2.kv.set("ctree.inspector", inspector());
@@ -21714,26 +22301,32 @@ ${MERGE_TRUST}
     }, {
       name: "ctree.consumers",
       hidden: true,
+      enabled: () => !inCrop(),
       run: () => setPanel(panel() === "consumers" ? "tree" : "consumers")
     }, {
       name: "ctree.copy",
       hidden: true,
+      enabled: treeIdle,
       run: () => copySelected()
     }, {
       name: "ctree.mode_duration",
       hidden: true,
+      enabled: treePanel,
       run: () => setLane("duration")
     }, {
       name: "ctree.mode_turns",
       hidden: true,
+      enabled: treePanel,
       run: () => setLane("turns")
     }, {
       name: "ctree.mode_calls",
       hidden: true,
+      enabled: treePanel,
       run: () => setLane("calls")
     }, {
       name: "ctree.lanes_off",
       hidden: true,
+      enabled: treePanel,
       run: () => {
         setLanesOn(false);
         api2.kv.set("ctree.lanesOn", false);
@@ -21741,6 +22334,7 @@ ${MERGE_TRUST}
     }, {
       name: "ctree.decisions",
       hidden: true,
+      enabled: () => !inCrop(),
       run: () => setPanel(panel() === "decisions" ? "tree" : "decisions")
     }, {
       name: "ctree.export",
@@ -21760,8 +22354,11 @@ ${MERGE_TRUST}
           return;
         }
         if (cropMode()) {
-          setCropMode(undefined);
-          setMarked(new Set);
+          leaveCropMode();
+          return;
+        }
+        if (search()) {
+          setSearch("");
           return;
         }
         back();
@@ -21775,18 +22372,64 @@ ${MERGE_TRUST}
     const root = state().root;
     return (root && root !== sessionID ? others()[root]?.title : undefined) ?? sessionTitle();
   };
-  const where = () => {
+  const modeTag = () => cropMode() ? " \xB7 crop mode" : searchMode() ? " \xB7 search" : "";
+  const headLine = () => {
     const b = branchOfCurrent();
-    if (!b)
-      return "trunk";
-    return `\u2387 ${b.name ?? sessionTitle()} (${b.status}${b.model ? ` \xB7 ${b.model.split("/").pop()}` : ""})`;
+    const lead = "\u250C Context tree \xB7 ";
+    const where = b ? `\u2387 ${clip(b.name ?? sessionTitle(), 28)}${b.status === "open" ? "" : ` (${b.status})`} \u2190 ` : "";
+    const tail = b ? "" : " \xB7 trunk";
+    const room = cols() - 4 - formatContext(contextSize(), contextLimit()).length - modeTag().length - lead.length - where.length - tail.length - 3;
+    return `${lead}${where}${clip(title(), Math.max(8, room))}${tail}${modeTag()}   `;
+  };
+  const statusLine = () => {
+    const n = view().rows.length;
+    const pos = `${n ? Math.min(selected() + 1, n) : 0}/${n}`;
+    if (cropMode()) {
+      const a = armed();
+      return `\u2702 crop mode (${cropMode()}) \xB7 space mark \xB7 a auto \xB7 t result\u21C4turn \xB7 \u23CE apply \xB7 esc leave \xB7 marked ${selectedCandidates().length} ~${formatK(reclaimed(selectedCandidates()))}${a ? " \xB7 armed \u2014 space again to override" : ""}`;
+    }
+    if (searchMode())
+      return `search: ${search()}\u258F \xB7 ${pos} rows \xB7 \u23CE keeps it \xB7 esc clears`;
+    return `filter: ${filter()}${search() ? `   search: "${search()}"` : ""}${busy() ? `   \u2026 ${busy()}` : ""}   ${pos} rows`;
+  };
+  const goVerb = () => {
+    const row = current();
+    if (!row)
+      return "\u23CE go";
+    if (row.kind === "branch")
+      return row.isCurrent ? "\u23CE you are here" : `\u23CE switch to \u2387 ${clip(row.name, 20)}`;
+    if (row.kind === "separator")
+      return "\u23CE go";
+    if (row.id === view().currentRowId)
+      return "\u23CE you are here";
+    return row.kind === "turn" ? "\u23CE fork & prefill this turn" : "\u23CE fork after this step";
+  };
+  const footer = () => {
+    if (cropMode())
+      return "space mark  a auto  t result\u21C4turn  \u23CE apply  esc leave";
+    if (panel() === "decisions")
+      return "\u23CE jump to record  E export  q back";
+    if (panel() === "consumers")
+      return "\u23CE expand  space mark  c crop  q back";
+    if (panel() === "help")
+      return "esc/q back";
+    return `${goVerb()}  b branch  m merge  c crop  ${UNDO_KEY} undo  s consumers  ? help  q back`;
+  };
+  const showsTree = () => panel() === "tree" || panel() === "help";
+  const emptyText = () => {
+    const q = search().trim();
+    if (q)
+      return `no rows match "${q}" \xB7 esc clears`;
+    if (filter() !== "default")
+      return `no rows match filter: ${filter()} \xB7 f changes it`;
+    return "(no messages yet \u2014 chat first, then open the tree)";
   };
   return (() => {
-    var _el$ = _$createElement("box"), _el$2 = _$createElement("box"), _el$3 = _$createElement("text"), _el$4 = _$createElement("text"), _el$17 = _$createElement("text"), _el$18 = _$createTextNode(`\u2502 `), _el$19 = _$createTextNode(` `), _el$20 = _$createTextNode(` rows`), _el$31 = _$createElement("box"), _el$32 = _$createElement("box"), _el$34 = _$createElement("text"), _el$35 = _$createTextNode(`\u2514 `);
+    var _el$ = _$createElement("box"), _el$2 = _$createElement("box"), _el$3 = _$createElement("text"), _el$4 = _$createElement("text"), _el$16 = _$createElement("text"), _el$17 = _$createTextNode(`\u2502 `), _el$28 = _$createElement("box"), _el$29 = _$createElement("box"), _el$35 = _$createElement("text"), _el$36 = _$createTextNode(`\u2514 `);
     _$insertNode(_el$, _el$2);
-    _$insertNode(_el$, _el$17);
-    _$insertNode(_el$, _el$31);
-    _$insertNode(_el$, _el$34);
+    _$insertNode(_el$, _el$16);
+    _$insertNode(_el$, _el$28);
+    _$insertNode(_el$, _el$35);
     _$setProp(_el$, "flexDirection", "column");
     _$setProp(_el$, "padding", 1);
     _$setProp(_el$, "width", "100%");
@@ -21794,7 +22437,7 @@ ${MERGE_TRUST}
     _$insertNode(_el$2, _el$3);
     _$insertNode(_el$2, _el$4);
     _$setProp(_el$2, "flexDirection", "row");
-    _$insert(_el$3, () => `\u250C Context tree \xB7 ${title()} \xB7 ${where()}   `);
+    _$insert(_el$3, headLine);
     _$insert(_el$4, () => formatContext(contextSize(), contextLimit()));
     _$insert(_el$, _$createComponent(Show, {
       get when() {
@@ -21802,16 +22445,55 @@ ${MERGE_TRUST}
       },
       get children() {
         return [(() => {
-          var _el$5 = _$createElement("text"), _el$6 = _$createTextNode(`\u2502 Input `), _el$7 = _$createTextNode(` `), _el$8 = _$createTextNode(` \xB7 `), _el$9 = _$createTextNode(` \xB7 `);
+          var _el$5 = _$createElement("box"), _el$6 = _$createElement("text"), _el$7 = _$createElement("text");
           _$insertNode(_el$5, _el$6);
           _$insertNode(_el$5, _el$7);
-          _$insertNode(_el$5, _el$8);
-          _$insertNode(_el$5, _el$9);
-          _$insert(_el$5, () => laneLine(laneSeries().input, contextLimit()), _el$7);
-          _$insert(_el$5, () => laneMode() === "duration" ? "[1] Duration" : " 1  duration", _el$8);
-          _$insert(_el$5, () => laneMode() === "turns" ? "[2] Turns" : " 2  turns", _el$9);
-          _$insert(_el$5, () => laneMode() === "calls" ? "[3] Calls" : " 3  calls", null);
-          _$effect((_$p) => _$setProp(_el$5, "fg", t.info, _$p));
+          _$setProp(_el$5, "flexDirection", "row");
+          _$insert(_el$6, () => `\u2502 Input  ${strip().truncatedLeft > 0 ? `\u2026${strip().truncatedLeft}` : ""}`);
+          _$insert(_el$5, _$createComponent(Show, {
+            get when() {
+              return !strip().empty.input;
+            },
+            get fallback() {
+              return (() => {
+                var _el$37 = _$createElement("text");
+                _$insert(_el$37, () => "no input".padEnd(laneWidth()));
+                _$effect((_$p) => _$setProp(_el$37, "fg", t.textMuted, _$p));
+                return _el$37;
+              })();
+            },
+            get children() {
+              return _$createComponent(For, {
+                get each() {
+                  return inputRuns();
+                },
+                children: (r) => (() => {
+                  var _el$38 = _$createElement("text");
+                  _$insert(_el$38, () => r.text);
+                  _$effect((_p$) => {
+                    var { fg: _v$0, bg: _v$1 } = r;
+                    _v$0 !== _p$.e && (_p$.e = _$setProp(_el$38, "fg", _v$0, _p$.e));
+                    _v$1 !== _p$.t && (_p$.t = _$setProp(_el$38, "bg", _v$1, _p$.t));
+                    return _p$;
+                  }, {
+                    e: undefined,
+                    t: undefined
+                  });
+                  return _el$38;
+                })()
+              });
+            }
+          }), _el$7);
+          _$insert(_el$7, () => `   ${laneMode() === "duration" ? "[1] Duration" : " 1  duration"} \xB7 ${laneMode() === "turns" ? "[2] Turns" : " 2  turns"} \xB7 ${laneMode() === "calls" ? "[3] Calls" : " 3  calls"} \xB7 0 off`);
+          _$effect((_p$) => {
+            var { textMuted: _v$, textMuted: _v$2 } = t;
+            _v$ !== _p$.e && (_p$.e = _$setProp(_el$6, "fg", _v$, _p$.e));
+            _v$2 !== _p$.t && (_p$.t = _$setProp(_el$7, "fg", _v$2, _p$.t));
+            return _p$;
+          }, {
+            e: undefined,
+            t: undefined
+          });
           return _el$5;
         })(), _$createComponent(Show, {
           get when() {
@@ -21819,92 +22501,136 @@ ${MERGE_TRUST}
           },
           get children() {
             return [(() => {
-              var _el$0 = _$createElement("text"), _el$1 = _$createTextNode(`\u2502 Model `);
-              _$insertNode(_el$0, _el$1);
-              _$insert(_el$0, () => laneLine(laneSeries().output), null);
-              _$effect((_$p) => _$setProp(_el$0, "fg", t.accent, _$p));
-              return _el$0;
+              var _el$8 = _$createElement("box"), _el$9 = _$createElement("text");
+              _$insertNode(_el$8, _el$9);
+              _$setProp(_el$8, "flexDirection", "row");
+              _$insertNode(_el$9, _$createTextNode(`\u2502 Model  `));
+              _$insert(_el$8, _$createComponent(Show, {
+                get when() {
+                  return !strip().empty.model;
+                },
+                get fallback() {
+                  return (() => {
+                    var _el$39 = _$createElement("text");
+                    _$insert(_el$39, () => "no model steps".padEnd(laneWidth()));
+                    _$effect((_$p) => _$setProp(_el$39, "fg", t.textMuted, _$p));
+                    return _el$39;
+                  })();
+                },
+                get children() {
+                  return _$createComponent(For, {
+                    get each() {
+                      return modelRuns();
+                    },
+                    children: (r) => (() => {
+                      var _el$40 = _$createElement("text");
+                      _$insert(_el$40, () => r.text);
+                      _$effect((_p$) => {
+                        var { fg: _v$10, bg: _v$11 } = r;
+                        _v$10 !== _p$.e && (_p$.e = _$setProp(_el$40, "fg", _v$10, _p$.e));
+                        _v$11 !== _p$.t && (_p$.t = _$setProp(_el$40, "bg", _v$11, _p$.t));
+                        return _p$;
+                      }, {
+                        e: undefined,
+                        t: undefined
+                      });
+                      return _el$40;
+                    })()
+                  });
+                }
+              }), null);
+              _$effect((_$p) => _$setProp(_el$9, "fg", t.textMuted, _$p));
+              return _el$8;
             })(), (() => {
-              var _el$10 = _$createElement("box"), _el$11 = _$createElement("text"), _el$13 = _$createElement("text");
-              _$insertNode(_el$10, _el$11);
-              _$insertNode(_el$10, _el$13);
-              _$setProp(_el$10, "flexDirection", "row");
-              _$insertNode(_el$11, _$createTextNode(`\u2502 Tools `));
-              _$insert(_el$10, _$createComponent(For, {
-                get each() {
-                  return toolRuns();
+              var _el$1 = _$createElement("box"), _el$10 = _$createElement("text"), _el$12 = _$createElement("text");
+              _$insertNode(_el$1, _el$10);
+              _$insertNode(_el$1, _el$12);
+              _$setProp(_el$1, "flexDirection", "row");
+              _$insertNode(_el$10, _$createTextNode(`\u2502 Tools  `));
+              _$insert(_el$1, _$createComponent(Show, {
+                get when() {
+                  return !strip().empty.tools;
                 },
-                children: (run) => (() => {
-                  var _el$36 = _$createElement("text");
-                  _$insert(_el$36, () => run.text);
-                  _$effect((_$p) => _$setProp(_el$36, "fg", run.error ? t.error : t.warning, _$p));
-                  return _el$36;
-                })()
-              }), _el$13);
-              _$insertNode(_el$13, _$createTextNode(` i inspector \xB7 u consumers`));
+                get fallback() {
+                  return (() => {
+                    var _el$41 = _$createElement("text");
+                    _$insert(_el$41, () => "no tool calls".padEnd(laneWidth()));
+                    _$effect((_$p) => _$setProp(_el$41, "fg", t.textMuted, _$p));
+                    return _el$41;
+                  })();
+                },
+                get children() {
+                  return _$createComponent(For, {
+                    get each() {
+                      return toolRuns();
+                    },
+                    children: (r) => (() => {
+                      var _el$42 = _$createElement("text");
+                      _$insert(_el$42, () => r.text);
+                      _$effect((_p$) => {
+                        var { fg: _v$12, bg: _v$13 } = r;
+                        _v$12 !== _p$.e && (_p$.e = _$setProp(_el$42, "fg", _v$12, _p$.e));
+                        _v$13 !== _p$.t && (_p$.t = _$setProp(_el$42, "bg", _v$13, _p$.t));
+                        return _p$;
+                      }, {
+                        e: undefined,
+                        t: undefined
+                      });
+                      return _el$42;
+                    })()
+                  });
+                }
+              }), _el$12);
+              _$insertNode(_el$12, _$createTextNode(`   i inspector \xB7 s consumers`));
               _$effect((_p$) => {
-                var { warning: _v$, warning: _v$2 } = t;
-                _v$ !== _p$.e && (_p$.e = _$setProp(_el$11, "fg", _v$, _p$.e));
-                _v$2 !== _p$.t && (_p$.t = _$setProp(_el$13, "fg", _v$2, _p$.t));
+                var { textMuted: _v$3, textMuted: _v$4 } = t;
+                _v$3 !== _p$.e && (_p$.e = _$setProp(_el$10, "fg", _v$3, _p$.e));
+                _v$4 !== _p$.t && (_p$.t = _$setProp(_el$12, "fg", _v$4, _p$.t));
                 return _p$;
               }, {
                 e: undefined,
                 t: undefined
               });
-              return _el$10;
+              return _el$1;
             })()];
           }
         })];
       }
-    }), _el$17);
+    }), _el$16);
     _$insert(_el$, _$createComponent(Show, {
       get when() {
         return _$memo(() => !!(laneRoom() && lanesOn()))() && !showLanes();
       },
       get children() {
-        var _el$15 = _$createElement("text");
-        _$insertNode(_el$15, _$createTextNode(`\u2502 lanes appear after 3 turns`));
-        _$effect((_$p) => _$setProp(_el$15, "fg", t.textMuted, _$p));
-        return _el$15;
-      }
-    }), _el$17);
-    _$insertNode(_el$17, _el$18);
-    _$insertNode(_el$17, _el$19);
-    _$insertNode(_el$17, _el$20);
-    _$insert(_el$17, (() => {
-      var _c$ = _$memo(() => !!cropMode());
-      return () => _c$() ? `\u2702 crop mode (${cropMode()}) \xB7 space mark \xB7 a auto \xB7 t result\u21C4turn \xB7 \u23CE apply \xB7 esc leave \xB7 marked ${selectedCandidates().length} ~${formatK(reclaimed(selectedCandidates()))}` : `filter: ${filter()}`;
-    })(), _el$19);
-    _$insert(_el$17, (() => {
-      var _c$2 = _$memo(() => !!search());
-      return () => _c$2() ? `   search: "${search()}"` : "";
-    })(), _el$19);
-    _$insert(_el$17, (() => {
-      var _c$3 = _$memo(() => !!busy());
-      return () => _c$3() ? `   \u2026 ${busy()}` : "";
-    })(), _el$19);
-    _$insert(_el$17, () => view().rows.length, _el$20);
+        var _el$14 = _$createElement("text");
+        _$insertNode(_el$14, _$createTextNode(`\u2502 lanes appear after 3 turns`));
+        _$effect((_$p) => _$setProp(_el$14, "fg", t.textMuted, _$p));
+        return _el$14;
+      }
+    }), _el$16);
+    _$insertNode(_el$16, _el$17);
+    _$insert(_el$16, statusLine, null);
     _$insert(_el$, _$createComponent(Show, {
       get when() {
         return panel() === "decisions";
       },
       get children() {
         return [(() => {
-          var _el$21 = _$createElement("text"), _el$22 = _$createTextNode(`\u2502 \u25C6 decisions on this tree (`), _el$23 = _$createTextNode(`) \xB7 \u23CE jump to record \xB7 E export markdown \xB7 D back`);
-          _$insertNode(_el$21, _el$22);
-          _$insertNode(_el$21, _el$23);
-          _$insert(_el$21, () => decisions().length, _el$23);
-          _$effect((_$p) => _$setProp(_el$21, "fg", t.accent, _$p));
-          return _el$21;
+          var _el$18 = _$createElement("text"), _el$19 = _$createTextNode(`\u2502 \u25C6 decisions on this tree (`), _el$20 = _$createTextNode(`) \xB7 \u23CE jump to record \xB7 E export markdown \xB7 q back`);
+          _$insertNode(_el$18, _el$19);
+          _$insertNode(_el$18, _el$20);
+          _$insert(_el$18, () => decisions().length, _el$20);
+          _$effect((_$p) => _$setProp(_el$18, "fg", t.accent, _$p));
+          return _el$18;
         })(), _$createComponent(Show, {
           get when() {
             return decisions().length === 0;
           },
           get children() {
-            var _el$24 = _$createElement("text");
-            _$insertNode(_el$24, _$createTextNode(`\u2502 (none yet \u2014 /merge a branch to write one)`));
-            _$effect((_$p) => _$setProp(_el$24, "fg", t.textMuted, _$p));
-            return _el$24;
+            var _el$21 = _$createElement("text");
+            _$insertNode(_el$21, _$createTextNode(`\u2502 (none yet \u2014 /merge a branch to write one)`));
+            _$effect((_$p) => _$setProp(_el$21, "fg", t.textMuted, _$p));
+            return _el$21;
           }
         }), _$createComponent(For, {
           get each() {
@@ -21912,132 +22638,142 @@ ${MERGE_TRUST}
           },
           children: (d, i) => {
             const sel = () => i() === decisionIndex();
-            const lines = () => (d.text ?? "").split(`
-`).slice(0, sel() ? 12 : 1);
+            const body = () => renderDecision(d.text ?? "", width() - 6);
+            const room = () => Math.max(3, height() - decisions().length);
+            const start = () => Math.min(decisionScroll(), Math.max(0, body().length - room()));
+            const more = () => Math.max(0, body().length - start() - room());
             return (() => {
-              var _el$37 = _$createElement("box"), _el$38 = _$createElement("text"), _el$39 = _$createTextNode(` `), _el$40 = _$createTextNode(` \xB7 `);
-              _$insertNode(_el$37, _el$38);
-              _$setProp(_el$37, "flexDirection", "column");
-              _$insertNode(_el$38, _el$39);
-              _$insertNode(_el$38, _el$40);
-              _$insert(_el$38, () => sel() ? "\u203A" : "\u2502", _el$39);
-              _$insert(_el$38, () => d.hidden ? "\u25C7 (hidden from model) " : "\u25C6 ", _el$40);
-              _$insert(_el$38, () => d.branchName, _el$40);
-              _$insert(_el$38, () => new Date(d.recordedAt).toISOString().slice(0, 16).replace("T", " "), null);
-              _$insert(_el$38, (() => {
-                var _c$4 = _$memo(() => !!d.siblings.length);
-                return () => _c$4() ? ` \xB7 \u2717 ${d.siblings.map((x) => x.name).join(", ")}` : "";
+              var _el$43 = _$createElement("box"), _el$44 = _$createElement("text"), _el$45 = _$createTextNode(` `), _el$46 = _$createTextNode(` \xB7 `);
+              _$insertNode(_el$43, _el$44);
+              _$setProp(_el$43, "flexDirection", "column");
+              _$insertNode(_el$44, _el$45);
+              _$insertNode(_el$44, _el$46);
+              _$insert(_el$44, () => sel() ? "\u203A" : "\u2502", _el$45);
+              _$insert(_el$44, () => d.hidden ? "\u25C7 (hidden from model) " : "\u25C6 ", _el$46);
+              _$insert(_el$44, () => clip(decisionSummary(d.text ?? "").title || d.branchName, 48), _el$46);
+              _$insert(_el$44, () => new Date(d.recordedAt).toISOString().slice(0, 16).replace("T", " "), null);
+              _$insert(_el$44, (() => {
+                var _c$3 = _$memo(() => !!d.siblings.length);
+                return () => _c$3() ? ` \xB7 \u2717 ${d.siblings.map((x) => x.name).join(", ")}` : "";
               })(), null);
-              _$insert(_el$37, _$createComponent(For, {
+              _$insert(_el$43, _$createComponent(For, {
                 get each() {
-                  return _$memo(() => !!sel())() ? lines().slice(1) : [];
+                  return _$memo(() => !!sel())() ? body().slice(start(), start() + room()) : [];
                 },
                 children: (l) => (() => {
-                  var _el$41 = _$createElement("text"), _el$42 = _$createTextNode(`\u2502 `);
-                  _$insertNode(_el$41, _el$42);
-                  _$insert(_el$41, () => l.slice(0, width() - 6), null);
-                  _$effect((_$p) => _$setProp(_el$41, "fg", t.text, _$p));
-                  return _el$41;
+                  var _el$48 = _$createElement("text");
+                  _$insert(_el$48, `\u2502    ${l}`);
+                  _$effect((_$p) => _$setProp(_el$48, "fg", t.text, _$p));
+                  return _el$48;
                 })()
               }), null);
+              _$insert(_el$43, _$createComponent(Show, {
+                get when() {
+                  return _$memo(() => !!sel())() && more() > 0;
+                },
+                get children() {
+                  var _el$47 = _$createElement("text");
+                  _$insert(_el$47, () => `\u2502    \u2026 ${more()} more lines \u2193 (ctrl+d)`);
+                  _$effect((_$p) => _$setProp(_el$47, "fg", t.textMuted, _$p));
+                  return _el$47;
+                }
+              }), null);
               _$effect((_p$) => {
-                var _v$8 = sel() ? t.background : t.accent, _v$9 = sel() ? t.primary : undefined;
-                _v$8 !== _p$.e && (_p$.e = _$setProp(_el$38, "fg", _v$8, _p$.e));
-                _v$9 !== _p$.t && (_p$.t = _$setProp(_el$38, "bg", _v$9, _p$.t));
+                var _v$14 = sel() ? t.background : t.accent, _v$15 = sel() ? t.primary : undefined;
+                _v$14 !== _p$.e && (_p$.e = _$setProp(_el$44, "fg", _v$14, _p$.e));
+                _v$15 !== _p$.t && (_p$.t = _$setProp(_el$44, "bg", _v$15, _p$.t));
                 return _p$;
               }, {
                 e: undefined,
                 t: undefined
               });
-              return _el$37;
+              return _el$43;
             })();
           }
         })];
       }
-    }), _el$31);
+    }), _el$28);
     _$insert(_el$, _$createComponent(Show, {
       get when() {
         return panel() === "consumers";
       },
       get children() {
         return [(() => {
-          var _el$26 = _$createElement("text"), _el$27 = _$createTextNode(`\u2502 what's filling the context \xB7 `), _el$28 = _$createTextNode(` total \xB7 c crop \xB7 u/esc back`);
-          _$insertNode(_el$26, _el$27);
-          _$insertNode(_el$26, _el$28);
-          _$insert(_el$26, () => formatK(view().totalTokens), _el$28);
-          _$effect((_$p) => _$setProp(_el$26, "fg", t.accent, _$p));
-          return _el$26;
+          var _el$23 = _$createElement("text"), _el$24 = _$createTextNode(`\u2502 what's filling the context \xB7 `), _el$25 = _$createTextNode(` total \xB7 source \xB7 %tree \xB7 %window \xB7 tokens \xB7 entries`);
+          _$insertNode(_el$23, _el$24);
+          _$insertNode(_el$23, _el$25);
+          _$insert(_el$23, () => formatK(view().totalTokens), _el$25);
+          _$effect((_$p) => _$setProp(_el$23, "fg", t.accent, _$p));
+          return _el$23;
         })(), _$createComponent(For, {
           get each() {
-            return consumerRows();
+            return consumerLines();
           },
-          children: (c, i) => {
+          children: (line, i) => {
             const sel = () => i() === consumerIndex();
+            const c = line.bucket;
+            const fg = () => sel() ? t.background : line.entry ? t.textMuted : c.kind === "tool" ? t.warning : t.text;
+            const window = () => c.shareOfWindow === undefined ? "\u2013" : `${(c.shareOfWindow * 100).toFixed(0)}%`;
+            const entry = line.entry;
             return (() => {
-              var _el$43 = _$createElement("text"), _el$44 = _$createTextNode(` `), _el$45 = _$createTextNode(` `), _el$46 = _$createTextNode(` `), _el$47 = _$createTextNode(` `), _el$48 = _$createTextNode(` \xB7 `), _el$49 = _$createTextNode(` entr`);
-              _$insertNode(_el$43, _el$44);
-              _$insertNode(_el$43, _el$45);
-              _$insertNode(_el$43, _el$46);
-              _$insertNode(_el$43, _el$47);
-              _$insertNode(_el$43, _el$48);
-              _$insertNode(_el$43, _el$49);
-              _$insert(_el$43, () => sel() ? "\u203A" : "\u2502", _el$44);
-              _$insert(_el$43, () => c.source.padEnd(22).slice(0, 22), _el$45);
-              _$insert(_el$43, () => `${(c.share * 100).toFixed(0)}%`.padStart(4), _el$46);
-              _$insert(_el$43, () => bar(c.share, 24), _el$47);
-              _$insert(_el$43, () => formatK(c.tokens).padStart(6), _el$48);
-              _$insert(_el$43, () => c.count, _el$49);
-              _$insert(_el$43, () => c.count === 1 ? "y" : "ies", null);
+              var _el$49 = _$createElement("text"), _el$50 = _$createTextNode(` `);
+              _$insertNode(_el$49, _el$50);
+              _$insert(_el$49, () => sel() ? "\u203A" : "\u2502", _el$50);
+              _$insert(_el$49, () => entry ? fitRow(`    ${entry.croppable ? marked().has(entry.partID ?? "") ? "[x]" : "[ ]" : "   "} ${plain(entry.preview)}${entry.croppable ? "" : ` \xB7 ${c.note ?? "not a completed tool result"}`}`, formatK(entry.tokens), width() - 4) : `${consumerOpen().has(c.source) ? "\u25BE" : "\u25B8"} ${c.source.padEnd(20).slice(0, 20)} ${`${(c.share * 100).toFixed(0)}%`.padStart(4)} ${window().padStart(5)} ${bar(c.tokens / consumerMax(), 18)} ${formatK(c.tokens).padStart(6)} \xB7 ${c.count} entr${c.count === 1 ? "y" : "ies"}${c.note ? ` \xB7 ${c.note}` : ""}`, null);
               _$effect((_p$) => {
-                var _v$0 = sel() ? t.background : c.kind === "tool" ? t.warning : t.text, _v$1 = sel() ? t.primary : undefined;
-                _v$0 !== _p$.e && (_p$.e = _$setProp(_el$43, "fg", _v$0, _p$.e));
-                _v$1 !== _p$.t && (_p$.t = _$setProp(_el$43, "bg", _v$1, _p$.t));
+                var _v$16 = fg(), _v$17 = sel() ? t.primary : undefined;
+                _v$16 !== _p$.e && (_p$.e = _$setProp(_el$49, "fg", _v$16, _p$.e));
+                _v$17 !== _p$.t && (_p$.t = _$setProp(_el$49, "bg", _v$17, _p$.t));
                 return _p$;
               }, {
                 e: undefined,
                 t: undefined
               });
-              return _el$43;
+              return _el$49;
             })();
           }
         })];
       }
-    }), _el$31);
-    _$insert(_el$, _$createComponent(For, {
-      get each() {
-        return _$memo(() => panel() === "help")() ? HELP.slice(0, Math.max(6, size().rows - 5)) : [];
-      },
-      children: (l) => (() => {
-        var _el$50 = _$createElement("text"), _el$51 = _$createTextNode(`\u2502 `);
-        _$insertNode(_el$50, _el$51);
-        _$insert(_el$50, l, null);
-        _$effect((_$p) => _$setProp(_el$50, "fg", l.startsWith(" ") ? t.textMuted : t.accent, _$p));
-        return _el$50;
-      })()
-    }), _el$31);
+    }), _el$28);
     _$insert(_el$, _$createComponent(Show, {
       get when() {
-        return _$memo(() => panel() === "tree")() && view().rows.length === 0;
+        return _$memo(() => !!showsTree())() && view().rows.length === 0;
+      },
+      get children() {
+        var _el$26 = _$createElement("text"), _el$27 = _$createTextNode(`\u2502 `);
+        _$insertNode(_el$26, _el$27);
+        _$insert(_el$26, emptyText, null);
+        _$effect((_$p) => _$setProp(_el$26, "fg", t.textMuted, _$p));
+        return _el$26;
+      }
+    }), _el$28);
+    _$insertNode(_el$28, _el$29);
+    _$setProp(_el$28, "flexDirection", "row");
+    _$setProp(_el$28, "flexGrow", 1);
+    _$setProp(_el$29, "flexDirection", "column");
+    _$setProp(_el$29, "flexGrow", 1);
+    _$insert(_el$29, _$createComponent(Show, {
+      get when() {
+        return _$memo(() => !!showsTree())() && overflow();
       },
       get children() {
-        var _el$29 = _$createElement("text");
-        _$insertNode(_el$29, _$createTextNode(`\u2502 (no messages yet \u2014 chat first, then open the tree)`));
-        _$effect((_$p) => _$setProp(_el$29, "fg", t.textMuted, _$p));
-        return _el$29;
-      }
-    }), _el$31);
-    _$insertNode(_el$31, _el$32);
-    _$setProp(_el$31, "flexDirection", "row");
-    _$setProp(_el$31, "flexGrow", 1);
-    _$setProp(_el$32, "flexDirection", "column");
-    _$setProp(_el$32, "flexGrow", 1);
-    _$insert(_el$32, _$createComponent(For, {
+        var _el$30 = _$createElement("text"), _el$31 = _$createTextNode(`\u2502 `);
+        _$insertNode(_el$30, _el$31);
+        _$insert(_el$30, (() => {
+          var _c$ = _$memo(() => hiddenAbove() > 0);
+          return () => _c$() ? `\u2191 ${hiddenAbove()} more` : "";
+        })(), null);
+        _$effect((_$p) => _$setProp(_el$30, "fg", t.textMuted, _$p));
+        return _el$30;
+      }
+    }), null);
+    _$insert(_el$29, _$createComponent(For, {
       get each() {
-        return _$memo(() => panel() === "tree")() ? visible() : [];
+        return _$memo(() => !!showsTree())() ? visible() : [];
       },
       children: (row, i) => {
         const isSel = () => windowStart() + i() === selected();
-        const color = () => row.kind === "branch" ? statusColor(t, row) : row.kind === "turn" ? row.isDecision ? t.accent : t.text : row.isError ? t.error : row.warn ? t.warning : t.textMuted;
+        const color = () => row.kind === "separator" ? t.textMuted : row.kind === "branch" ? statusColor(t, row) : !row.inContext ? t.textMuted : row.kind === "turn" ? row.isDecision ? t.accent : t.text : row.isError ? t.error : row.warn ? t.warning : t.textMuted;
         const mark = () => {
           if (!cropMode())
             return "";
@@ -22048,70 +22784,139 @@ ${MERGE_TRUST}
           const prot = c.protections.filter((p) => p !== "too-small");
           return `${on2 ? "[x]" : "[ ]"}${prot.length ? "!" : " "}`;
         };
-        return (() => {
-          var _el$52 = _$createElement("text"), _el$53 = _$createTextNode(` `);
-          _$insertNode(_el$52, _el$53);
-          _$insert(_el$52, () => isSel() ? "\u203A" : "\u2502", _el$53);
-          _$insert(_el$52, mark, null);
-          _$insert(_el$52, () => rowLine(row, rowWidth(), row.id === view().currentRowId), null);
-          _$effect((_p$) => {
-            var _v$10 = isSel() ? t.background : color(), _v$11 = isSel() ? t.primary : undefined;
-            _v$10 !== _p$.e && (_p$.e = _$setProp(_el$52, "fg", _v$10, _p$.e));
-            _v$11 !== _p$.t && (_p$.t = _$setProp(_el$52, "bg", _v$11, _p$.t));
-            return _p$;
-          }, {
-            e: undefined,
-            t: undefined
-          });
-          return _el$52;
-        })();
+        const prefix = () => `${isSel() ? "\u203A" : "\u2502"} ${mark()}`;
+        const segs = () => segmentsOf(rowLine(row, rowWidth(), row.id === view().currentRowId), search().trim(), thoughtOf(row));
+        return _$createComponent(Show, {
+          get when() {
+            return segs().length > 1;
+          },
+          get fallback() {
+            return (() => {
+              var _el$53 = _$createElement("text");
+              _$insert(_el$53, prefix, null);
+              _$insert(_el$53, () => segs()[0]?.text, null);
+              _$effect((_p$) => {
+                var _v$20 = isSel() ? t.background : color(), _v$21 = isSel() ? t.primary : undefined;
+                _v$20 !== _p$.e && (_p$.e = _$setProp(_el$53, "fg", _v$20, _p$.e));
+                _v$21 !== _p$.t && (_p$.t = _$setProp(_el$53, "bg", _v$21, _p$.t));
+                return _p$;
+              }, {
+                e: undefined,
+                t: undefined
+              });
+              return _el$53;
+            })();
+          },
+          get children() {
+            var _el$51 = _$createElement("box"), _el$52 = _$createElement("text");
+            _$insertNode(_el$51, _el$52);
+            _$setProp(_el$51, "flexDirection", "row");
+            _$insert(_el$52, prefix);
+            _$insert(_el$51, _$createComponent(For, {
+              get each() {
+                return segs();
+              },
+              children: (s) => (() => {
+                var _el$54 = _$createElement("text");
+                _$insert(_el$54, () => s.text);
+                _$effect((_p$) => {
+                  var _v$22 = s.kind === "match" ? t.background : s.kind === "dim" ? t.textMuted : isSel() ? t.background : color(), _v$23 = s.kind === "match" ? t.accent : isSel() ? t.primary : undefined;
+                  _v$22 !== _p$.e && (_p$.e = _$setProp(_el$54, "fg", _v$22, _p$.e));
+                  _v$23 !== _p$.t && (_p$.t = _$setProp(_el$54, "bg", _v$23, _p$.t));
+                  return _p$;
+                }, {
+                  e: undefined,
+                  t: undefined
+                });
+                return _el$54;
+              })()
+            }), null);
+            _$effect((_p$) => {
+              var _v$18 = isSel() ? t.background : color(), _v$19 = isSel() ? t.primary : undefined;
+              _v$18 !== _p$.e && (_p$.e = _$setProp(_el$52, "fg", _v$18, _p$.e));
+              _v$19 !== _p$.t && (_p$.t = _$setProp(_el$52, "bg", _v$19, _p$.t));
+              return _p$;
+            }, {
+              e: undefined,
+              t: undefined
+            });
+            return _el$51;
+          }
+        });
+      }
+    }), null);
+    _$insert(_el$29, _$createComponent(Show, {
+      get when() {
+        return _$memo(() => !!showsTree())() && overflow();
+      },
+      get children() {
+        var _el$32 = _$createElement("text"), _el$33 = _$createTextNode(`\u2502 `);
+        _$insertNode(_el$32, _el$33);
+        _$insert(_el$32, (() => {
+          var _c$2 = _$memo(() => hiddenBelow() > 0);
+          return () => _c$2() ? `\u2026 ${hiddenBelow()} more \u2193` : "";
+        })(), null);
+        _$effect((_$p) => _$setProp(_el$32, "fg", t.textMuted, _$p));
+        return _el$32;
       }
     }), null);
-    _$insert(_el$32, _$createComponent(For, {
+    _$insert(_el$29, _$createComponent(For, {
+      get each() {
+        return _$memo(() => !!(showsTree() && view().rows.length > 0 && !view().rows.some((r) => r.kind === "branch")))() ? noBranchesLines() : [];
+      },
+      children: (l) => (() => {
+        var _el$55 = _$createElement("text"), _el$56 = _$createTextNode(`\u2502 `);
+        _$insertNode(_el$55, _el$56);
+        _$insert(_el$55, l, null);
+        _$effect((_$p) => _$setProp(_el$55, "fg", t.textMuted, _$p));
+        return _el$55;
+      })()
+    }), null);
+    _$insert(_el$29, _$createComponent(For, {
       get each() {
-        return _$memo(() => !!(panel() === "tree" && view().rows.length > 0 && !view().rows.some((r) => r.kind === "branch")))() ? noBranchesLines() : [];
+        return _$memo(() => panel() === "help")() ? HELP.slice(0, helpHeight()) : [];
       },
       children: (l) => (() => {
-        var _el$54 = _$createElement("text"), _el$55 = _$createTextNode(`\u2502 `);
-        _$insertNode(_el$54, _el$55);
-        _$insert(_el$54, l, null);
-        _$effect((_$p) => _$setProp(_el$54, "fg", t.textMuted, _$p));
-        return _el$54;
+        var _el$57 = _$createElement("text"), _el$58 = _$createTextNode(`\u2502 `);
+        _$insertNode(_el$57, _el$58);
+        _$insert(_el$57, l, null);
+        _$effect((_$p) => _$setProp(_el$57, "fg", l.startsWith(" ") ? t.textMuted : t.accent, _$p));
+        return _el$57;
       })()
     }), null);
-    _$insert(_el$31, _$createComponent(Show, {
+    _$insert(_el$28, _$createComponent(Show, {
       get when() {
         return showInspector();
       },
       get children() {
-        var _el$33 = _$createElement("box");
-        _$setProp(_el$33, "flexDirection", "column");
-        _$setProp(_el$33, "paddingLeft", 1);
-        _$insert(_el$33, _$createComponent(For, {
+        var _el$34 = _$createElement("box");
+        _$setProp(_el$34, "flexDirection", "column");
+        _$setProp(_el$34, "paddingLeft", 1);
+        _$insert(_el$34, _$createComponent(For, {
           get each() {
             return inspectorLines();
           },
           children: (l) => (() => {
-            var _el$56 = _$createElement("text"), _el$57 = _$createTextNode(`\u2503 `);
-            _$insertNode(_el$56, _el$57);
-            _$insert(_el$56, () => l.text, null);
-            _$effect((_$p) => _$setProp(_el$56, "fg", l.fg, _$p));
-            return _el$56;
+            var _el$59 = _$createElement("text"), _el$60 = _$createTextNode(`\u2503 `);
+            _$insertNode(_el$59, _el$60);
+            _$insert(_el$59, () => l.text, null);
+            _$effect((_$p) => _$setProp(_el$59, "fg", l.fg, _$p));
+            return _el$59;
           })()
         }));
-        _$effect((_$p) => _$setProp(_el$33, "width", inspectorWidth(), _$p));
-        return _el$33;
+        _$effect((_$p) => _$setProp(_el$34, "width", inspectorWidth(), _$p));
+        return _el$34;
       }
     }), null);
-    _$insertNode(_el$34, _el$35);
-    _$insert(_el$34, () => cropMode() ? "space mark  a auto  t result\u21C4turn  \u23CE apply  esc leave" : "\u23CE go  b branch  m merge  c crop  i inspector  1\xB72\xB73 lanes  x undo  ? help  q back", null);
+    _$insertNode(_el$35, _el$36);
+    _$insert(_el$35, footer, null);
     _$effect((_p$) => {
-      var { background: _v$3, primary: _v$4 } = t, _v$5 = t[BAND_KEY[band()]], _v$6 = cropMode() ? t.warning : t.textMuted, _v$7 = cropMode() ? t.warning : t.textMuted;
-      _v$3 !== _p$.e && (_p$.e = _$setProp(_el$, "backgroundColor", _v$3, _p$.e));
-      _v$4 !== _p$.t && (_p$.t = _$setProp(_el$3, "fg", _v$4, _p$.t));
-      _v$5 !== _p$.a && (_p$.a = _$setProp(_el$4, "fg", _v$5, _p$.a));
-      _v$6 !== _p$.o && (_p$.o = _$setProp(_el$17, "fg", _v$6, _p$.o));
-      _v$7 !== _p$.i && (_p$.i = _$setProp(_el$34, "fg", _v$7, _p$.i));
+      var { background: _v$5, primary: _v$6 } = t, _v$7 = t[BAND_KEY[band()]], _v$8 = cropMode() ? t.warning : searchMode() ? t.accent : t.textMuted, _v$9 = cropMode() ? t.warning : t.textMuted;
+      _v$5 !== _p$.e && (_p$.e = _$setProp(_el$, "backgroundColor", _v$5, _p$.e));
+      _v$6 !== _p$.t && (_p$.t = _$setProp(_el$3, "fg", _v$6, _p$.t));
+      _v$7 !== _p$.a && (_p$.a = _$setProp(_el$4, "fg", _v$7, _p$.a));
+      _v$8 !== _p$.o && (_p$.o = _$setProp(_el$16, "fg", _v$8, _p$.o));
+      _v$9 !== _p$.i && (_p$.i = _$setProp(_el$35, "fg", _v$9, _p$.i));
       return _p$;
     }, {
       e: undefined,
@@ -22342,7 +23147,7 @@ var tui = async (api2, rawOptions) => {
       adoptSoon();
   });
   api2.lifecycle?.onDispose(offCreated);
-  const promptDialog = (title, placeholder) => new Promise((resolve) => {
+  const promptDialog2 = (title, placeholder) => new Promise((resolve) => {
     api2.ui.dialog.replace(() => api2.ui.DialogPrompt({
       title,
       placeholder,
@@ -22399,7 +23204,7 @@ var tui = async (api2, rawOptions) => {
         if (!sessionID)
           return;
         await new Promise((r) => setTimeout(r, 30));
-        const name = await promptDialog(BRANCH_DIALOG.title, BRANCH_DIALOG.placeholder);
+        const name = await promptDialog2(BRANCH_DIALOG.title, BRANCH_DIALOG.placeholder);
         debug("branch.named", {
           name
         });
@@ -22437,7 +23242,7 @@ var tui = async (api2, rawOptions) => {
         const last = api2.state.session.messages(sessionID).at(-1);
         if (!last)
           return;
-        const value = await promptDialog("Label (empty to remove)", "checkpoint");
+        const value = await promptDialog2("Label (empty to remove)", "checkpoint");
         if (value === undefined)
           return;
         setLabel({
@@ -22482,11 +23287,20 @@ var tui = async (api2, rawOptions) => {
           });
           return;
         }
+        const parent = await fetchTranscript(api2, branch.parentSessionID, directory).catch(() => {
+          return;
+        });
+        const parentLabel = branch.parentSessionID === state.root ? TRUNK_LABEL : state.sessions[branch.parentSessionID]?.name ?? TRUNK_LABEL;
+        const turns = ownTurnCount(api2.state.session.messages(sessionID), {
+          messageID: branch.anchorMessageID,
+          parentMessageIDs: parent?.messages.map((m) => m.id) ?? []
+        });
         const mode = await new Promise((resolve) => {
           api2.ui.dialog.replace(() => api2.ui.DialogSelect({
-            title: mergeDialogTitle(branch.name ?? "branch", api2.state.session.get(branch.parentSessionID)?.title),
+            title: mergeDialogTitle(branch.name ?? "branch", parent ? mergeTargetOf(parentLabel, parent.messages) : undefined),
             options: mergeDialogOptions({
-              siblings: openSiblings(state, sessionID).length
+              siblings: openSiblings(state, sessionID).length,
+              turns
             }),
             onSelect: (o) => {
               resolve(o.value);
@@ -22581,6 +23395,8 @@ ${MERGE_TRUST}`,
           return store.stateForSession(props.session_id);
         });
         const branch = () => st()?.sessions[props.session_id];
+        const size = createMemo2(() => contextSizeOf(toMinimalMessages(api2.state.session.messages(props.session_id), api2.state.part)));
+        const limit = createMemo2(() => modelContextLimit(api2, props.session_id));
         const crops = () => st()?.activeCrops(props.session_id) ?? [];
         const hidden = () => crops().reduce((s, c) => s + c.targets.reduce((x, y) => x + y.estTokens, 0), 0);
         const siblings = () => Object.values(st()?.sessions ?? {}).filter((b) => b.parentSessionID === props.session_id && b.status === "open").length;
@@ -22591,9 +23407,10 @@ ${MERGE_TRUST}`,
           return `${b.status}${title && room > 3 ? ` \xB7 from "${clip(title, room)}"` : ""}`;
         };
         return (() => {
-          var _el$ = _$createElement2("box"), _el$2 = _$createElement2("text"), _el$3 = _$createElement2("b"), _el$8 = _$createElement2("text");
+          var _el$ = _$createElement2("box"), _el$2 = _$createElement2("text"), _el$3 = _$createElement2("b"), _el$7 = _$createElement2("text"), _el$9 = _$createElement2("text");
           _$insertNode2(_el$, _el$2);
-          _$insertNode2(_el$, _el$8);
+          _$insertNode2(_el$, _el$7);
+          _$insertNode2(_el$, _el$9);
           _$setProp2(_el$, "flexDirection", "column");
           _$insertNode2(_el$2, _el$3);
           _$insertNode2(_el$3, _$createTextNode2(`Context tree`));
@@ -22603,10 +23420,10 @@ ${MERGE_TRUST}`,
             },
             get fallback() {
               return (() => {
-                var _el$0 = _$createElement2("text");
-                _$insert2(_el$0, () => `trunk${siblings() ? ` \xB7 ${siblings()} branch${siblings() === 1 ? "" : "es"}` : ""}`);
-                _$effect2((_$p) => _$setProp2(_el$0, "fg", t.text, _$p));
-                return _el$0;
+                var _el$1 = _$createElement2("text");
+                _$insert2(_el$1, () => `trunk${siblings() ? ` \xB7 ${siblings()} branch${siblings() === 1 ? "" : "es"}` : ""}`);
+                _$effect2((_$p) => _$setProp2(_el$1, "fg", t.text, _$p));
+                return _el$1;
               })();
             },
             get children() {
@@ -22622,27 +23439,30 @@ ${MERGE_TRUST}`,
                 return _el$6;
               })()];
             }
-          }), _el$8);
+          }), _el$7);
+          _$insert2(_el$7, () => formatContext(size(), limit()));
           _$insert2(_el$, _$createComponent2(Show2, {
             get when() {
               return crops().length;
             },
             get children() {
-              var _el$7 = _$createElement2("text");
-              _$insert2(_el$7, () => `\u2702 ${crops().length} crop${crops().length === 1 ? "" : "s"} \xB7 ~${formatK(hidden())} hidden`);
-              _$effect2((_$p) => _$setProp2(_el$7, "fg", t.warning, _$p));
-              return _el$7;
+              var _el$8 = _$createElement2("text");
+              _$insert2(_el$8, () => `\u2702 ${crops().length} crop${crops().length === 1 ? "" : "s"} \xB7 ~${formatK(hidden())} hidden`);
+              _$effect2((_$p) => _$setProp2(_el$8, "fg", t.warning, _$p));
+              return _el$8;
             }
-          }), _el$8);
-          _$insertNode2(_el$8, _$createTextNode2(`/tree \xB7 ctrl+q`));
+          }), _el$9);
+          _$insertNode2(_el$9, _$createTextNode2(`/tree \xB7 ctrl+q`));
           _$effect2((_p$) => {
-            var { text: _v$, textMuted: _v$2 } = t;
+            var _v$ = t.text, _v$2 = t[BAND_COLOR[bandFor(size().tokens, limit())]], _v$3 = t.textMuted;
             _v$ !== _p$.e && (_p$.e = _$setProp2(_el$2, "fg", _v$, _p$.e));
-            _v$2 !== _p$.t && (_p$.t = _$setProp2(_el$8, "fg", _v$2, _p$.t));
+            _v$2 !== _p$.t && (_p$.t = _$setProp2(_el$7, "fg", _v$2, _p$.t));
+            _v$3 !== _p$.a && (_p$.a = _$setProp2(_el$9, "fg", _v$3, _p$.a));
             return _p$;
           }, {
             e: undefined,
-            t: undefined
+            t: undefined,
+            a: undefined
           });
           return _el$;
         })();
@@ -22650,12 +23470,12 @@ ${MERGE_TRUST}`,
       session_prompt_right: (_ctx, props) => {
         const t = api2.theme.current;
         const size = createMemo2(() => contextSizeOf(toMinimalMessages(api2.state.session.messages(props.session_id), api2.state.part)));
-        const band = () => bandFor(size().tokens);
         const branch = () => {
           journalRevision();
           return store.stateForSession(props.session_id)?.sessions[props.session_id];
         };
         const limit = createMemo2(() => modelContextLimit(api2, props.session_id));
+        const band = () => bandFor(size().tokens, limit());
         const reserve = () => api2.state.config.compaction?.reserved ?? 16384;
         const [trend, setTrend] = createSignal3("");
         let prevTokens = 0;
@@ -22711,7 +23531,7 @@ ${MERGE_TRUST}`,
             redNudged = true;
             api2.ui.toast({
               variant: "warning",
-              message: "context is in the red band (\u226564k) \u2014 consider /tree \u2192 c crop, or /merge a branch",
+              message: `context is in the red band (${limit() ? "\u226585% of the window" : "\u226564k"}) \u2014 consider /tree \u2192 c crop, or /merge a branch`,
               duration: 6000
             });
           } else if (b === "low" || b === "healthy")
@@ -22728,10 +23548,10 @@ ${MERGE_TRUST}`,
             guardNudged = false;
         });
         return (() => {
-          var _el$1 = _$createElement2("text");
-          _$insert2(_el$1, () => `${branch() ? `\u2387 ${branchLabel(api2, props.session_id, branch().name, 24)} \xB7 ` : ""}${formatContext(size(), limit())}${trend()}`);
-          _$effect2((_$p) => _$setProp2(_el$1, "fg", t[BAND_COLOR[band()]], _$p));
-          return _el$1;
+          var _el$10 = _$createElement2("text");
+          _$insert2(_el$10, () => `${branch() ? `\u2387 ${branchLabel(api2, props.session_id, branch().name, 24)} \xB7 ` : ""}${formatContext(size(), limit())}${trend()}`);
+          _$effect2((_$p) => _$setProp2(_el$10, "fg", t[BAND_COLOR[band()]], _$p));
+          return _el$10;
         })();
       }
     }