@atlasharness/atlascode 0.1.37 → 0.1.39

package/dist/cli.js

@@ -135054,10 +135054,13 @@ function applyColor(text, color) {
   }
   return colorize(text, color, "foreground");
 }
-var CHALK_BOOSTED_FOR_XTERMJS, CHALK_CLAMPED_FOR_TMUX, RGB_REGEX, ANSI_REGEX, colorize = (str, color, type) => {
+var CHALK_BOOSTED_FOR_XTERMJS, CHALK_CLAMPED_FOR_TMUX, RGB_REGEX, ANSI_REGEX, BARE_ANSI_COLOR_NAMES, colorize = (str, color, type) => {
   if (!color) {
     return str;
   }
+  if (BARE_ANSI_COLOR_NAMES.has(color)) {
+    return colorize(str, `ansi:${color}`, type);
+  }
   if (color.startsWith("ansi:")) {
     const value = color.substring("ansi:".length);
     switch (value) {
@@ -135124,6 +135127,24 @@ var init_colorize = __esm(() => {
   CHALK_CLAMPED_FOR_TMUX = clampChalkLevelForTmux();
   RGB_REGEX = /^rgb\(\s?(\d+),\s?(\d+),\s?(\d+)\s?\)$/;
   ANSI_REGEX = /^ansi256\(\s?(\d+)\s?\)$/;
+  BARE_ANSI_COLOR_NAMES = new Set([
+    "black",
+    "red",
+    "green",
+    "yellow",
+    "blue",
+    "magenta",
+    "cyan",
+    "white",
+    "blackBright",
+    "redBright",
+    "greenBright",
+    "yellowBright",
+    "blueBright",
+    "magentaBright",
+    "cyanBright",
+    "whiteBright"
+  ]);
 });
 
 // src/tui/utils/earlyInput.ts
@@ -159664,7 +159685,14 @@ function resolveColor2(color, theme) {
   if (color.startsWith("rgb(") || color.startsWith("#") || color.startsWith("ansi256(") || color.startsWith("ansi:")) {
     return color;
   }
-  return theme[color];
+  const themed = theme[color];
+  if (themed !== undefined) {
+    return themed;
+  }
+  if (BARE_ANSI_COLOR_NAMES.has(color)) {
+    return color;
+  }
+  return;
 }
 function ThemedText(t0) {
   const $ = import_compiler_runtime7.c(10);
@@ -159723,6 +159751,7 @@ function ThemedText(t0) {
 var import_compiler_runtime7, import_react12, jsx_dev_runtime10, TextHoverColorContext;
 var init_ThemedText = __esm(() => {
   init_Text();
+  init_colorize();
   init_theme();
   init_ThemeProvider();
   import_compiler_runtime7 = __toESM(require_compiler_runtime(), 1);
@@ -419856,6 +419885,7 @@ __export(exports_sessionStorage, {
   clearAgentTranscriptSubdir: () => clearAgentTranscriptSubdir2,
   clearSessionMessagesCache: () => clearSessionMessagesCache2,
   clearSessionMetadata: () => clearSessionMetadata2,
+  countVisibleMessages: () => countVisibleMessages2,
   enrichLogs: () => enrichLogs,
   extractTeammateTranscriptsFromTasks: () => extractTeammateTranscriptsFromTasks,
   getAgentTranscript: () => getAgentTranscript,
@@ -419883,6 +419913,7 @@ __export(exports_sessionStorage, {
   loadAllSubagentTranscriptsFromDisk: () => loadAllSubagentTranscriptsFromDisk,
   loadFullLog: () => loadFullLog,
   loadMessageLogs: () => loadMessageLogs,
+  loadSameRepoAllMessageLogs: () => loadSameRepoAllMessageLogs,
   loadSameRepoMessageLogs: () => loadSameRepoMessageLogs,
   loadSameRepoMessageLogsProgressive: () => loadSameRepoMessageLogsProgressive,
   loadTranscriptFile: () => loadTranscriptFile2,
@@ -421829,6 +421860,21 @@ async function loadSameRepoMessageLogsProgressive(worktreePaths, limit, initialE
   });
   return { logs, allStatLogs, nextIndex };
 }
+async function loadSameRepoAllMessageLogs(worktreePaths) {
+  const r = await loadSameRepoMessageLogsProgressive(worktreePaths);
+  let logs = r.logs;
+  let nextIndex = r.nextIndex;
+  while (nextIndex < r.allStatLogs.length) {
+    const more = await enrichLogs(r.allStatLogs, nextIndex, INITIAL_ENRICH_COUNT);
+    logs = logs.concat(more.logs);
+    nextIndex = more.nextIndex;
+  }
+  logs = sortLogs2(logs);
+  logs.forEach((l, i) => {
+    l.value = i;
+  });
+  return logs;
+}
 async function getStatOnlyLogsForWorktrees(worktreePaths, limit) {
   const projectsDir = getProjectsDir3();
   if (worktreePaths.length <= 1) {
@@ -422027,7 +422073,7 @@ async function getSessionFilesWithMtime(projectDir) {
       sessionFilesMap.set(sessionId, {
         path: filePath,
         mtime: st.mtime.getTime(),
-        ctime: st.birthtime.getTime(),
+        birthtime: st.birthtime.getTime(),
         size: st.size
       });
     } catch {
@@ -422138,10 +422184,18 @@ async function readLiteMetadata(filePath, fileSize, buf) {
   const { head, tail } = await readHeadAndTail(filePath, fileSize, buf);
   if (!head)
     return { firstPrompt: "", isSidechain: false };
-  const isSidechain = head.includes('"isSidechain":true') || head.includes('"isSidechain": true');
+  const firstLine = head.split(`
+`, 1)[0] ?? "";
+  const isSidechain = firstLine.includes('"isSidechain":true') || firstLine.includes('"isSidechain": true');
   const projectPath = extractJsonStringField(head, "cwd");
   const teamName = extractJsonStringField(head, "teamName");
   const agentSetting = extractJsonStringField(head, "agentSetting");
+  const lastTimestamp = extractLastJsonStringField2(tail, "timestamp");
+  const firstTimestamp = extractJsonStringField(head, "timestamp");
+  const modeRaw = extractLastJsonStringField2(tail, "mode");
+  const mode = modeRaw === "coordinator" || modeRaw === "normal" ? modeRaw : undefined;
+  const agentName = extractLastJsonStringField2(tail, "agentName");
+  const agentColor = extractLastJsonStringField2(tail, "agentColor");
   const firstPrompt = extractLastJsonStringField2(tail, "lastPrompt") || extractFirstPromptFromChunk(head) || extractJsonStringFieldPrefix(head, "content", 200) || extractJsonStringFieldPrefix(head, "text", 200) || "";
   const customTitle = extractLastJsonStringField2(tail, "customTitle") ?? extractLastJsonStringField2(head, "customTitle") ?? extractLastJsonStringField2(tail, "aiTitle") ?? extractLastJsonStringField2(head, "aiTitle");
   const summary = extractLastJsonStringField2(tail, "summary");
@@ -422177,7 +422231,12 @@ async function readLiteMetadata(filePath, fileSize, buf) {
     worktreeName,
     prNumber,
     prUrl,
-    prRepository
+    prRepository,
+    firstTimestamp,
+    lastTimestamp,
+    mode,
+    agentName,
+    agentColor
   };
 }
 function extractFirstPromptFromChunk(chunk) {
@@ -422300,7 +422359,7 @@ async function getSessionFilesLite(projectDir, limit, projectPath) {
       isLite: true,
       fullPath: fileInfo.path,
       value: 0,
-      created: new Date(fileInfo.ctime),
+      created: new Date(fileInfo.birthtime),
       modified: new Date(fileInfo.mtime),
       firstPrompt: "",
       messageCount: 0,
@@ -422316,6 +422375,12 @@ async function getSessionFilesLite(projectDir, limit, projectPath) {
   });
   return sorted;
 }
+function parseLiteTimestamp(iso) {
+  if (!iso)
+    return;
+  const d = new Date(iso);
+  return Number.isNaN(d.getTime()) ? undefined : d;
+}
 async function enrichLog(log, readBuf) {
   if (!log.isLite || !log.fullPath)
     return log;
@@ -422331,10 +422396,15 @@ async function enrichLog(log, readBuf) {
     summary: meta.summary,
     tag: meta.tag,
     agentSetting: meta.agentSetting,
+    mode: meta.mode,
+    agentName: meta.agentName,
+    agentColor: meta.agentColor,
     prNumber: meta.prNumber,
     prUrl: meta.prUrl,
     prRepository: meta.prRepository,
     projectPath: meta.projectPath ?? log.projectPath,
+    created: parseLiteTimestamp(meta.firstTimestamp) ?? log.created,
+    modified: parseLiteTimestamp(meta.lastTimestamp) ?? log.modified,
     worktreeSession: meta.worktreeName ? {
       worktreeName: meta.worktreeName,
       originalCwd: "",
@@ -473564,14 +473634,207 @@ function formatShortActive(date) {
   const min = String(date.getMinutes()).padStart(2, "0");
   return `${m}/${d} ${h}:${min}`;
 }
-function SessionTreeScreen({ onBack, onResume }) {
+function formatActive(date, now) {
+  const ageMs = now - date.getTime();
+  const m = Math.floor(ageMs / 60000);
+  if (m < 1)
+    return "now";
+  if (m < 60)
+    return `${m}m`;
+  const h = Math.floor(m / 60);
+  if (h < 24)
+    return `${h}h`;
+  const d = Math.floor(h / 24);
+  if (d < 7)
+    return `${d}d`;
+  return formatShortActive(date);
+}
+function formatCreated(date) {
+  const m = date.getMonth() + 1;
+  const d = date.getDate();
+  return `${m}/${d}/${date.getFullYear()}`;
+}
+function computeColumnLayout(termCols) {
+  const NAME_MIN = 16;
+  const ACTIVE_SLOT = 12;
+  const CREATED_SLOT = 12;
+  const BRANCH_SLOT = 13;
+  const MSG_SLOT = 6;
+  const LEFT = 4;
+  const PAD = 4;
+  const budget = termCols - PAD - LEFT - ACTIVE_SLOT;
+  let showCreated = true;
+  let showBranch = true;
+  let showMsg = true;
+  if (budget < NAME_MIN + CREATED_SLOT + BRANCH_SLOT + MSG_SLOT) {
+    showMsg = false;
+    if (budget < NAME_MIN + CREATED_SLOT + BRANCH_SLOT) {
+      showBranch = false;
+      if (budget < NAME_MIN + CREATED_SLOT) {
+        showCreated = false;
+      }
+    }
+  }
+  let optional = 0;
+  if (showCreated)
+    optional += CREATED_SLOT;
+  if (showBranch)
+    optional += BRANCH_SLOT;
+  if (showMsg)
+    optional += MSG_SLOT;
+  const flagsSlot = Math.round(budget * 0.3);
+  const nameW = Math.max(NAME_MIN, budget - optional - flagsSlot);
+  return { nameW, showCreated, showBranch, showMsg };
+}
+function agentColorToThemeColor(agentColor, theme) {
+  const field = agentColor ? AGENT_COLOR_THEME_FIELD[agentColor] : undefined;
+  return field ? theme[field] : undefined;
+}
+function agentRowColors(log, isSelected, isFocused, isCurrent, theme) {
+  const identity = agentColorToThemeColor(log.agentColor, theme);
+  const rowColor = isSelected ? "magentaBright" : isFocused ? "cyan" : identity;
+  const dotGlyph = identity || isSelected || isCurrent ? "● " : "○ ";
+  const dotColor = isSelected ? "magentaBright" : identity !== undefined ? identity : isCurrent ? "cyan" : undefined;
+  return { rowColor, dotColor, dotGlyph };
+}
+function buildActionRow(state, title) {
+  switch (state.kind) {
+    case "confirm":
+      return { text: `✋ ${title} · [再按 f 确认 fork · 3s 自动取消]`, color: "yellow" };
+    case "forking":
+      return { text: `→ forking ${title}…`, color: "yellow" };
+    case "done":
+      return { text: `✓ 已创建分支 ${title}`, color: "green" };
+    case "error":
+      return { text: `✗ fork 失败 · ${state.message}`, color: "red" };
+    case "idle":
+    default:
+      return { text: SESSION_ROW_HINT };
+  }
+}
+function rowSlotCost(idx, expandedIdx) {
+  return idx === expandedIdx ? 2 : 1;
+}
+function slotPrefix(idx, expandedIdx, count) {
+  const n = Math.min(Math.max(idx, 0), count);
+  let slots = n;
+  if (expandedIdx !== null && expandedIdx < n)
+    slots += 1;
+  return slots;
+}
+function computeRenderWindow(count, offset, expandedIdx, visibleRows) {
+  if (count <= 0)
+    return { start: 0, end: 0 };
+  const start = Math.max(0, Math.min(offset, count - 1));
+  let end = start;
+  let slots = 0;
+  while (end < count) {
+    const cost = rowSlotCost(end, expandedIdx);
+    if (slots + cost > visibleRows)
+      break;
+    slots += cost;
+    end += 1;
+  }
+  return { start, end };
+}
+function clampWindowToCursor(focusedIdx, offset, expandedIdx, visibleRows, count) {
+  if (count <= 0 || visibleRows <= 0)
+    return 0;
+  const cursor = Math.max(0, Math.min(focusedIdx, count - 1));
+  let off = Math.max(0, Math.min(offset, count - 1));
+  for (let guard = 0;guard <= count + 1; guard++) {
+    const cStart = slotPrefix(cursor, expandedIdx, count);
+    if (cStart < slotPrefix(off, expandedIdx, count))
+      return cursor;
+    const win = computeRenderWindow(count, off, expandedIdx, visibleRows);
+    const cEnd = cStart + rowSlotCost(cursor, expandedIdx);
+    if (cEnd <= slotPrefix(win.end, expandedIdx, count))
+      return off;
+    off += 1;
+  }
+  return Math.max(0, count - 1);
+}
+function getSummaryLine(log) {
+  const s = (log.summary ?? "").trim();
+  if (s)
+    return s;
+  const fp = log.firstPrompt ? stripDisplayTagsAllowEmpty(log.firstPrompt) : "";
+  if (fp)
+    return fp;
+  return "（无摘要）";
+}
+function nextSortKey(current) {
+  const i = SESSION_SORT_KEYS.indexOf(current);
+  return SESSION_SORT_KEYS[(i + 1) % SESSION_SORT_KEYS.length];
+}
+function sortLogsBy(logs, key) {
+  const out = [...logs];
+  switch (key) {
+    case "modified":
+      out.sort((a, b) => b.modified.getTime() - a.modified.getTime());
+      break;
+    case "created":
+      out.sort((a, b) => b.created.getTime() - a.created.getTime());
+      break;
+    case "messages":
+      out.sort((a, b) => (b.messageCount ?? 0) - (a.messageCount ?? 0));
+      break;
+    case "title":
+      out.sort((a, b) => getLogDisplayTitle(a).localeCompare(getLogDisplayTitle(b)));
+      break;
+  }
+  return out;
+}
+function filterLogs(logs, query) {
+  const q = query.trim().toLowerCase();
+  if (!q)
+    return logs;
+  return logs.filter((l) => [
+    getLogDisplayTitle(l),
+    l.summary ?? "",
+    l.firstPrompt ?? "",
+    l.gitBranch ?? "",
+    l.tag ?? "",
+    l.agentSetting ?? "",
+    l.sessionId ?? ""
+  ].join(" ").toLowerCase().includes(q));
+}
+function makeLru(max) {
+  const m = new Map;
+  return {
+    get: (k) => m.get(k),
+    set: (k, v) => {
+      if (m.has(k))
+        m.delete(k);
+      m.set(k, v);
+      if (m.size > max) {
+        const oldest = m.keys().next().value;
+        if (oldest !== undefined)
+          m.delete(oldest);
+      }
+    },
+    has: (k) => m.has(k)
+  };
+}
+function SessionTreeScreen({
+  onBack,
+  onResume,
+  onAgenticSearch
+}) {
   const [logs, setLogs] = React134.useState([]);
   const [loading, setLoading] = React134.useState(true);
   const [focusedIdx, setFocusedIdx] = React134.useState(0);
   const [selectedIdx, setSelectedIdx] = React134.useState(null);
   const [rowStates, setRowStates] = React134.useState(new Map);
-  const [bottomMessage, setBottomMessage] = React134.useState(null);
   const [scrollOffset, setScrollOffset] = React134.useState(0);
+  const [expanded, setExpanded] = React134.useState(false);
+  const expandedIdx = expanded ? focusedIdx : null;
+  const [searchMode, setSearchMode] = React134.useState(false);
+  const [query, setQuery] = React134.useState("");
+  const [sortKey, setSortKey] = React134.useState("modified");
+  const [agenticResults, setAgenticResults] = React134.useState(null);
+  const exactCountCacheRef = React134.useRef(makeLru(64));
+  const [, bumpExactCounts] = React134.useReducer((x) => x + 1, 0);
   const confirmTimerRef = React134.useRef(null);
   const forkInFlightRef = React134.useRef(false);
   const fileMetaCacheRef = React134.useRef(new Map);
@@ -473585,16 +473848,7 @@ function SessionTreeScreen({ onBack, onResume }) {
   const loadLogs = React134.useCallback(async () => {
     const wt = getCurrentWorktreeSession2();
     const paths = wt ? [wt.worktreePath] : [getOriginalCwd()];
-    let l = await loadSameRepoMessageLogs(paths);
-    for (const log of l) {
-      if (log.customTitle || !log.sessionId)
-        continue;
-      const auto = deriveAutoTitle(log);
-      if (auto && log.fullPath) {
-        log.customTitle = auto;
-        saveCustomTitle(log.sessionId, auto, log.fullPath, "auto");
-      }
-    }
+    const l = await loadSameRepoAllMessageLogs(paths);
     for (const log of l) {
       if (log.messageCount === 0 && log.fullPath) {
         const meta = getSessionFileMeta(log);
@@ -473610,15 +473864,6 @@ function SessionTreeScreen({ onBack, onResume }) {
     setLogs(l);
     setLoading(false);
   }, []);
-  function deriveAutoTitle(log) {
-    const raw = log.firstPrompt ?? log.summary ?? "";
-    if (!raw.trim())
-      return null;
-    const cleaned = raw.replace(/<[^>]+>/g, "").replace(/\s+/g, " ").trim();
-    if (!cleaned)
-      return null;
-    return truncateToVisibleWidth(cleaned, 24);
-  }
   React134.useEffect(() => {
     loadLogs();
     return () => {
@@ -473650,7 +473895,6 @@ function SessionTreeScreen({ onBack, onResume }) {
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);
       setRowState(target.sessionId, { kind: "error", message });
-      setBottomMessage(message);
       setTimeout(() => setRowState(target.sessionId, { kind: "idle" }), 2000);
     } finally {
       forkInFlightRef.current = false;
@@ -473660,41 +473904,90 @@ function SessionTreeScreen({ onBack, onResume }) {
     setFocusedIdx(idx);
     setSelectedIdx(null);
   }
-  function clampScrollToCursor(idx, offset, visible) {
-    if (visible <= 0)
-      return offset;
-    if (idx < offset)
-      return idx;
-    if (idx >= offset + visible)
-      return idx - visible + 1;
-    return offset;
-  }
+  const computeViewLogs = React134.useCallback((base, q, sk, agentic) => {
+    const local = q ? filterLogs(base, q) : base;
+    const chosen = agentic && local.length === 0 ? agentic : local;
+    return sortLogsBy(chosen, sk);
+  }, []);
+  const ensureExactCount = React134.useCallback(async (log) => {
+    const sid = log.sessionId ?? "";
+    if (!sid)
+      return;
+    if (exactCountCacheRef.current.has(sid))
+      return;
+    try {
+      const full = isLiteLog(log) ? await loadFullLog(log) : log;
+      exactCountCacheRef.current.set(sid, countVisibleMessages2(full.messages));
+      bumpExactCounts();
+    } catch {}
+  }, [bumpExactCounts]);
   use_input_default((input, key, event) => {
     if (loading)
       return;
-    const current = logs[focusedIdx];
+    const view = computeViewLogs(logs, query, sortKey, agenticResults);
+    if (searchMode) {
+      if (key.backspace) {
+        setQuery((q) => q.slice(0, -1));
+        setAgenticResults(null);
+        setFocusedIdx(0);
+      } else if (key.escape || input === "/") {
+        setSearchMode(false);
+        setQuery("");
+        setAgenticResults(null);
+        setFocusedIdx(0);
+      } else if (key.return) {
+        if (onAgenticSearch && query.trim()) {
+          const localCount = filterLogs(logs, query).length;
+          if (localCount === 0) {
+            onAgenticSearch(query, logs).then((r) => setAgenticResults(r)).catch(() => {});
+          }
+        }
+      } else if (input.length === 1 && !key.ctrl && !key.meta && !key.backspace && !key.return && !key.escape && input >= " ") {
+        setQuery((q) => q + input);
+        setAgenticResults(null);
+        setFocusedIdx(0);
+      }
+      event.stopImmediatePropagation();
+      return;
+    }
+    const current = view[focusedIdx];
     if (!current)
       return;
     const state = rowStates.get(current.sessionId ?? "")?.kind ?? "idle";
     if (state === "forking")
       return;
+    if (input === "/") {
+      setSearchMode(true);
+      setQuery("");
+      setAgenticResults(null);
+      setFocusedIdx(0);
+      event.stopImmediatePropagation();
+      return;
+    } else if (input === "s") {
+      setSortKey((sk) => nextSortKey(sk));
+      setFocusedIdx(0);
+      setScrollOffset(0);
+      event.stopImmediatePropagation();
+      return;
+    }
     const termRows = process.stdout.rows ?? 24;
-    const HEADER_ROWS = 3;
-    const FOOTER_ROWS = 2;
     const visibleRows = Math.max(1, termRows - HEADER_ROWS - FOOTER_ROWS);
+    const clamp = (next, off) => clampWindowToCursor(next, off, expandedIdx, visibleRows, view.length);
     if (key.upArrow || key.wheelUp) {
       setSelectedIdx(null);
       setFocusedIdx((i) => {
         const next = Math.max(0, i - 1);
-        setScrollOffset((off) => clampScrollToCursor(next, off, visibleRows));
+        setScrollOffset((off) => clamp(next, off));
+        ensureExactCount(view[next]);
         return next;
       });
       event.stopImmediatePropagation();
     } else if (key.downArrow || key.wheelDown) {
       setSelectedIdx(null);
       setFocusedIdx((i) => {
-        const next = Math.min(logs.length - 1, i + 1);
-        setScrollOffset((off) => clampScrollToCursor(next, off, visibleRows));
+        const next = Math.min(view.length - 1, i + 1);
+        setScrollOffset((off) => clamp(next, off));
+        ensureExactCount(view[next]);
         return next;
       });
       event.stopImmediatePropagation();
@@ -473702,18 +473995,23 @@ function SessionTreeScreen({ onBack, onResume }) {
       setSelectedIdx(null);
       setFocusedIdx((i) => {
         const next = Math.max(0, i - visibleRows);
-        setScrollOffset((off) => clampScrollToCursor(next, off, visibleRows));
+        setScrollOffset((off) => clamp(next, off));
+        ensureExactCount(view[next]);
         return next;
       });
       event.stopImmediatePropagation();
     } else if (key.pageDown) {
       setSelectedIdx(null);
       setFocusedIdx((i) => {
-        const next = Math.min(logs.length - 1, i + visibleRows);
-        setScrollOffset((off) => clampScrollToCursor(next, off, visibleRows));
+        const next = Math.min(view.length - 1, i + visibleRows);
+        setScrollOffset((off) => clamp(next, off));
+        ensureExactCount(view[next]);
         return next;
       });
       event.stopImmediatePropagation();
+    } else if (input === "x") {
+      setExpanded((e) => e ? false : visibleRows >= 2);
+      event.stopImmediatePropagation();
     } else if (key.escape || input === "q") {
       onBack();
       event.stopImmediatePropagation();
@@ -473763,26 +474061,32 @@ function SessionTreeScreen({ onBack, onResume }) {
     }, undefined, true, undefined, this);
   }
   const currentSessionId = getSessionId();
+  const viewLogs = computeViewLogs(logs, query, sortKey, agenticResults);
   const termCols = process.stdout.columns ?? 100;
   const termRows = process.stdout.rows ?? 24;
-  const NARROW = termCols < 80;
+  const layout = computeColumnLayout(termCols);
   const CURSOR_W = 2;
   const ICON_W = 2;
-  const NAME_W = NARROW ? 20 : 28;
+  const NAME_W = layout.nameW;
+  const CREATED_W = 11;
   const ACTIVE_W = 11;
   const BRANCH_W = 12;
   const MSG_W = 5;
   const GAP = 1;
-  const showBranch = !NARROW;
-  const showMsg = !NARROW;
-  const HEADER_ROWS = NARROW ? 4 : 4;
-  const FOOTER_ROWS = 2;
+  const showCreated = layout.showCreated;
+  const showBranch = layout.showBranch;
+  const showMsg = layout.showMsg;
   const visibleRows = Math.max(1, termRows - HEADER_ROWS - FOOTER_ROWS);
-  const effectiveOffset = Math.min(scrollOffset, Math.max(0, logs.length - visibleRows));
-  const startIdx = effectiveOffset;
-  const endIdx = Math.min(logs.length, startIdx + visibleRows);
+  const effectiveOffset = Math.min(scrollOffset, Math.max(0, viewLogs.length - visibleRows));
+  const win = computeRenderWindow(viewLogs.length, effectiveOffset, expandedIdx, visibleRows);
+  const startIdx = win.start;
+  const endIdx = win.end;
   let fixedW = CURSOR_W + ICON_W + NAME_W + ACTIVE_W;
   let gapCount = 3;
+  if (showCreated) {
+    fixedW += CREATED_W;
+    gapCount++;
+  }
   if (showBranch) {
     fixedW += BRANCH_W;
     gapCount++;
@@ -473792,7 +474096,31 @@ function SessionTreeScreen({ onBack, onResume }) {
     gapCount++;
   }
   fixedW += gapCount * GAP;
-  const headerLine = "  " + "  " + padToVisibleWidth("名称", NAME_W) + " " + padToVisibleWidth("最近活跃", ACTIVE_W) + (showBranch ? " " + padToVisibleWidth("分支", BRANCH_W) : "") + (showMsg ? " " + padLeftToVisibleWidth("消息", MSG_W) : "");
+  const sortIndicator = ` · 排序:${SESSION_SORT_LABELS[sortKey]}`;
+  const filterIndicator = query ? ` · 过滤:"${query}"` : "";
+  const headerLine = truncateToVisibleWidth("  " + "  " + padToVisibleWidth("名称", NAME_W) + " " + (showCreated ? padToVisibleWidth("创建", CREATED_W) + " " : "") + padToVisibleWidth("最近活跃", ACTIVE_W) + (showBranch ? " " + padToVisibleWidth("分支", BRANCH_W) : "") + (showMsg ? " " + padLeftToVisibleWidth("消息", MSG_W) : "") + sortIndicator + filterIndicator, Math.max(10, termCols - 4));
+  const nowMs = Date.now();
+  const theme = getTheme(resolveThemeSetting(getGlobalConfig().theme));
+  const STATE_PRIORITY = {
+    forking: 4,
+    confirm: 3,
+    done: 2,
+    error: 1,
+    idle: 0
+  };
+  let activeState = { kind: "idle" };
+  let activeSid = "";
+  for (const [sid, s] of rowStates) {
+    if (STATE_PRIORITY[s.kind] > STATE_PRIORITY[activeState.kind]) {
+      activeState = s;
+      activeSid = sid;
+    }
+  }
+  const actionLog = activeSid ? logs.find((l) => l.sessionId === activeSid) : undefined;
+  const actionRow = buildActionRow(activeState, actionLog ? getLogDisplayTitle(actionLog) || "untitled" : "untitled");
+  const searchActionText = searchMode ? `搜索:"${query}"${onAgenticSearch ? " · enter 触发语义搜索" : ""} · esc 退出` : undefined;
+  const actionText = truncateToVisibleWidth(searchActionText ?? actionRow.text, Math.max(10, termCols - 4));
+  const actionColor = searchMode ? "cyan" : actionRow.color;
   return /* @__PURE__ */ jsx_dev_runtime424.jsxDEV(ThemedBox_default, {
     flexDirection: "column",
     paddingX: 2,
@@ -473819,15 +474147,15 @@ function SessionTreeScreen({ onBack, onResume }) {
             const isCurrent = sid === currentSessionId;
             const cached = fileMetaCacheRef.current.get(sid);
             const isBranch = cached?.isBranch ?? false;
-            const rowState = rowStates.get(sid)?.kind ?? "idle";
-            const rowStateObj = rowStates.get(sid);
             const cursor = isSelected ? "» " : isFocused ? "> " : "  ";
-            const statusIcon = isSelected || isCurrent ? "● " : "○ ";
+            const { rowColor, dotColor, dotGlyph } = agentRowColors(log, isSelected, isFocused, isCurrent, theme);
             const title = truncateToVisibleWidth(getLogDisplayTitle(log) || "untitled", NAME_W);
-            const active = formatShortActive(log.modified);
+            const created = formatCreated(log.created);
+            const active = formatActive(log.modified, nowMs);
             const branch = log.gitBranch ? truncateToVisibleWidth(log.gitBranch, BRANCH_W) : "—";
-            const msgCount = String(cached?.messageCount ?? log.messageCount ?? 0);
-            let line = cursor + statusIcon + padToVisibleWidth(title, NAME_W) + " " + padToVisibleWidth(active, ACTIVE_W);
+            const exactCount = exactCountCacheRef.current.get(sid);
+            const msgCount = String(exactCount ?? cached?.messageCount ?? log.messageCount ?? 0);
+            let line = cursor + dotGlyph + padToVisibleWidth(title, NAME_W) + " " + (showCreated ? padToVisibleWidth(created, CREATED_W) + " " : "") + padToVisibleWidth(active, ACTIVE_W);
             if (showBranch)
               line += " " + padToVisibleWidth(branch, BRANCH_W);
             if (showMsg)
@@ -473841,75 +474169,115 @@ function SessionTreeScreen({ onBack, onResume }) {
               flags += ` #${log.tag}`;
             if (log.agentSetting)
               flags += ` @${log.agentSetting}`;
-            let statusColor;
-            if (rowState === "confirm") {
-              flags += " [f 确认 fork]";
-              statusColor = "yellow";
-            } else if (rowState === "forking") {
-              flags += " → forking…";
-              statusColor = "yellow";
-            } else if (rowState === "done") {
-              flags += " ✓ 已创建分支";
-              statusColor = "green";
-            } else if (rowState === "error") {
-              flags += " ✗ fork 失败";
-              statusColor = "red";
+            if (log.mode === "coordinator")
+              flags += " [C]";
+            if (log.prNumber)
+              flags += ` [PR #${log.prNumber}]`;
+            if (log.fileSize)
+              flags += ` (${formatFileSize3(log.fileSize)})`;
+            if (log.worktreeSession?.worktreeName) {
+              flags += ` [wt:${log.worktreeSession.worktreeName}]`;
             }
             const maxFlags = termCols - 2 - fixedW;
             if (visibleWidth(flags) > maxFlags) {
               flags = truncateToVisibleWidth(flags, maxFlags);
             }
             line += " " + flags;
-            const color = rowStateObj && rowStateObj.kind !== "idle" ? statusColor : isSelected ? "magentaBright" : isFocused ? "cyan" : undefined;
-            return /* @__PURE__ */ jsx_dev_runtime424.jsxDEV(ThemedBox_default, {
-              noSelect: true,
-              onClick: () => handleRowClick(i),
-              children: /* @__PURE__ */ jsx_dev_runtime424.jsxDEV(ThemedText, {
-                color,
-                bold: isFocused || isSelected,
-                wrap: "truncate",
-                children: line
-              }, undefined, false, undefined, this)
-            }, sid || i, false, undefined, this);
+            const summaryLine = "    └ " + truncateToVisibleWidth(getSummaryLine(log), termCols - 4 - 6);
+            return /* @__PURE__ */ jsx_dev_runtime424.jsxDEV(React134.Fragment, {
+              children: [
+                /* @__PURE__ */ jsx_dev_runtime424.jsxDEV(ThemedBox_default, {
+                  noSelect: true,
+                  onClick: () => handleRowClick(i),
+                  children: /* @__PURE__ */ jsx_dev_runtime424.jsxDEV(ThemedBox_default, {
+                    flexDirection: "row",
+                    noSelect: true,
+                    children: [
+                      /* @__PURE__ */ jsx_dev_runtime424.jsxDEV(ThemedText, {
+                        color: rowColor,
+                        bold: isFocused || isSelected,
+                        children: line.slice(0, 2)
+                      }, undefined, false, undefined, this),
+                      /* @__PURE__ */ jsx_dev_runtime424.jsxDEV(ThemedText, {
+                        color: dotColor,
+                        bold: isFocused || isSelected,
+                        children: line.slice(2, 4)
+                      }, undefined, false, undefined, this),
+                      /* @__PURE__ */ jsx_dev_runtime424.jsxDEV(ThemedText, {
+                        color: rowColor,
+                        bold: isFocused || isSelected,
+                        wrap: "truncate",
+                        children: line.slice(4)
+                      }, undefined, false, undefined, this)
+                    ]
+                  }, undefined, true, undefined, this)
+                }, undefined, false, undefined, this),
+                i === expandedIdx && /* @__PURE__ */ jsx_dev_runtime424.jsxDEV(ThemedBox_default, {
+                  noSelect: true,
+                  children: /* @__PURE__ */ jsx_dev_runtime424.jsxDEV(ThemedText, {
+                    dimColor: true,
+                    wrap: "truncate",
+                    children: summaryLine
+                  }, undefined, false, undefined, this)
+                }, undefined, false, undefined, this)
+              ]
+            }, sid || i, true, undefined, this);
           }),
-          logs.length === 0 && /* @__PURE__ */ jsx_dev_runtime424.jsxDEV(ThemedText, {
+          viewLogs.length === 0 && /* @__PURE__ */ jsx_dev_runtime424.jsxDEV(ThemedText, {
             dimColor: true,
-            children: "No sessions found"
+            children: query ? `No sessions match "${query}"` : "No sessions found"
           }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this),
       /* @__PURE__ */ jsx_dev_runtime424.jsxDEV(ThemedBox_default, {
         marginTop: 1,
         children: /* @__PURE__ */ jsx_dev_runtime424.jsxDEV(ThemedText, {
-          dimColor: true,
-          children: "\uD83D\uDDB1 点击移动光标 · 滚轮/↑↓ 滚动 · enter 选中/进入 · f fork · q 返回"
-        }, undefined, false, undefined, this)
-      }, undefined, false, undefined, this),
-      bottomMessage && /* @__PURE__ */ jsx_dev_runtime424.jsxDEV(ThemedBox_default, {
-        marginTop: 1,
-        children: /* @__PURE__ */ jsx_dev_runtime424.jsxDEV(ThemedText, {
-          color: "red",
+          color: actionColor,
+          dimColor: !actionColor,
           wrap: "truncate",
-          children: [
-            "✗ ",
-            bottomMessage
-          ]
-        }, undefined, true, undefined, this)
+          children: actionText
+        }, undefined, false, undefined, this)
       }, undefined, false, undefined, this)
     ]
   }, undefined, true, undefined, this);
 }
-var React134, jsx_dev_runtime424;
+var React134, jsx_dev_runtime424, AGENT_COLOR_THEME_FIELD, SESSION_ROW_HINT = "\uD83D\uDDB1 点击移动光标 · 滚轮/↑↓ 滚动 · enter 选中/进入 · f fork · x 摘要 · q 返回", SESSION_SORT_KEYS, SESSION_SORT_LABELS, HEADER_ROWS = 4, FOOTER_ROWS = 2;
 var init_SessionTreeScreen = __esm(() => {
   init_ink2();
+  init_config6();
+  init_format2();
+  init_theme();
   init_sessionStorage();
   init_worktree4();
   init_bootstrap();
   init_log5();
+  init_displayTags();
   init_sessionStorage();
   init_branch();
   React134 = __toESM(require_react(), 1);
   jsx_dev_runtime424 = __toESM(require_jsx_dev_runtime(), 1);
+  AGENT_COLOR_THEME_FIELD = {
+    red: "red_FOR_SUBAGENTS_ONLY",
+    blue: "blue_FOR_SUBAGENTS_ONLY",
+    green: "green_FOR_SUBAGENTS_ONLY",
+    yellow: "yellow_FOR_SUBAGENTS_ONLY",
+    purple: "purple_FOR_SUBAGENTS_ONLY",
+    orange: "orange_FOR_SUBAGENTS_ONLY",
+    pink: "pink_FOR_SUBAGENTS_ONLY",
+    cyan: "cyan_FOR_SUBAGENTS_ONLY"
+  };
+  SESSION_SORT_KEYS = [
+    "modified",
+    "created",
+    "messages",
+    "title"
+  ];
+  SESSION_SORT_LABELS = {
+    modified: "最近活跃",
+    created: "创建",
+    messages: "消息数",
+    title: "名称"
+  };
 });
 
 // src/tui/components/DebugPanel/debugEventBuffer.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlasharness/atlascode",
-  "version": "0.1.37",
+  "version": "0.1.39",
   "description": "AtlasCode — Coding Agent for the domestic computing ecosystem (Ascend NPU + domestic LLM backends)",
   "bin": {
     "atlas": "dist/cli.js",