@phnx-labs/agents-cli 1.22.53 → 1.22.54

package/dist/lib/session/discover.js

@@ -34,7 +34,7 @@ import { costOfUsage, costOfUsageNoCache } from '../pricing/index.js';
 import { machineForSessionFile } from './origin-machine.js';
 export { machineForSessionFile } from './origin-machine.js';
 import { mapBounded } from '../concurrency.js';
-import { getDB, getScanStampByPath, getScanStampsForPaths, getParserStatesForPaths, getDirLedgerForPaths, recordDirScans, recordScans, syncLabels, seedLabelsFromNames, syncTopics, upsertSessionsBatch, querySessions, countSessions, ftsSearch, tryClaimScan, releaseScan, scanInProgressByLivePid, cacheLinearProject, } from './db.js';
+import { getDB, getScanStampByPath, getScanStampsForPaths, getParserStatesForPaths, getDirLedgerForPaths, recordDirScans, recordScans, syncLabels, seedLabelsFromNames, syncTopics, upsertSessionsBatch, querySessions, countSessions, ftsSearch, getSessionById, tryClaimScan, releaseScan, scanInProgressByLivePid, cacheLinearProject, CONTENT_INDEX_VERSION, } from './db.js';
 import { buildRunNameMap } from './run-names.js';
 import { resolveLinearApiKey } from '../linear-cache.js';
 import { ToolCallCollector, collectClaudeToolCalls, collectCodexToolCalls, } from './tool-calls.js';
@@ -628,8 +628,15 @@ export function resolveSessionById(sessions, idQuery) {
 // Content-index search (FTS5-backed)
 // ---------------------------------------------------------------------------
 /**
- * Run an FTS5 search over the DB and intersect with the given session list,
- * preserving the existing SessionMeta[] contract so sessions.ts is unchanged.
+ * Run an FTS5 search over the DB and union hits with the given session list.
+ *
+ * The listing pool is a minority of the index — cwd-scoped, default-capped at
+ * 50, and skipping whole classes of indexed transcript — so intersecting FTS
+ * hits with it dropped grep-visible sessions that the index already found
+ * (PHNX-2767: `agents sessions "tmux pane"` returned 0 while the project
+ * transcripts matched). Hits already in the pool keep the caller's SessionMeta;
+ * hits the pool missed are hydrated from the index so a content query returns
+ * the transcript FTS matched.
  */
 export function searchContentIndex(sessions, query) {
     if (!query.trim())
@@ -640,13 +647,14 @@ export function searchContentIndex(sessions, query) {
     const byId = new Map(sessions.map(s => [s.id, s]));
     const result = new Map();
     for (const hit of hits) {
-        const session = byId.get(hit.sessionId);
+        const session = byId.get(hit.sessionId) ?? getSessionById(hit.sessionId);
         if (!session)
             continue;
         result.set(hit.sessionId, {
             ...session,
             _matchedTerms: hit.matchedTerms,
             _bm25Score: hit.score,
+            snippet: hit.snippet,
         });
     }
     return result;
@@ -678,6 +686,13 @@ export function filterChangedFiles(filePaths) {
  * stat. Same debounce and change-detection as filterChangedFiles; the raw
  * mtime is floored here so warm files match the ledger exactly as the stat path
  * does (Math.floor(stat.mtimeMs)).
+ *
+ * A file is also treated as "changed" — independent of (mtime, size) — when
+ * its ledger row's `extractor_version` is behind {@link CONTENT_INDEX_VERSION}.
+ * This is the lever that backfills a content-extractor improvement (e.g.
+ * indexing assistant answers, not just user prompts) into every already-scanned
+ * session on its next pass, without a `DELETE FROM scan_ledger` that would also
+ * discard the Claude/Codex resumable parser_state.
  */
 export function filterChangedEntries(entries) {
     const ledger = getScanStampsForPaths(entries.map(e => e.filePath));
@@ -689,10 +704,11 @@ export function filterChangedEntries(entries) {
             fileSize: entry.fileSize,
         };
         const prev = ledger.get(entry.filePath);
-        if (prev && prev.fileMtimeMs === scan.fileMtimeMs && prev.fileSize === scan.fileSize) {
+        const contentIndexStale = prev?.extractorVersion !== CONTENT_INDEX_VERSION;
+        if (prev && prev.fileMtimeMs === scan.fileMtimeMs && prev.fileSize === scan.fileSize && !contentIndexStale) {
             continue;
         }
-        if (prev && shouldDeferRecentAppend(prev, scan, now)) {
+        if (prev && !contentIndexStale && shouldDeferRecentAppend(prev, scan, now)) {
             continue;
         }
         out.push({ filePath: entry.filePath, scan });
@@ -1000,6 +1016,7 @@ async function scanRoutineArchivesIncremental(agent, onProgress) {
                 entries.push({
                     meta: result.meta,
                     content: result.content,
+                    assistantContent: result.assistantContent,
                     scan,
                     events: result.events,
                     toolCalls: result.toolCalls,
@@ -1152,6 +1169,7 @@ async function scanClaudeIncremental(onProgress) {
                     entries.push({
                         meta: result.meta,
                         content: result.content,
+                        assistantContent: result.assistantContent,
                         scan,
                         parserState: result.parserState,
                         contentText: result.contentText,
@@ -1185,7 +1203,12 @@ async function scanClaudeIncremental(onProgress) {
  * next scan.
  */
 async function readClaudeMeta(filePath, sessionId, scanStamp, priorRow, label) {
-    const prior = parsePriorClaudeState(priorRow);
+    // A prior continuation extracted at an older CONTENT_INDEX_VERSION is missing
+    // whatever the current extractor adds (e.g. assistant-answer text) — resuming
+    // from it would fold only the NEWLY appended lines into that gap, never
+    // backfilling the file's earlier assistant text. Treat it as absent so the
+    // file gets one full from-offset-0 reparse instead.
+    const prior = priorRow?.extractorVersion === CONTENT_INDEX_VERSION ? parsePriorClaudeState(priorRow) : null;
     const { scan, newState, toolCalls, mode } = await scanClaudeSessionResumable(filePath, prior, scanStamp.fileMtimeMs, scanStamp.fileSize, priorRow?.fileMtimeMs);
     if (mode === 'incremental')
         claudeIncrementalScanCount++;
@@ -1290,6 +1313,7 @@ async function readClaudeMeta(filePath, sessionId, scanStamp, priorRow, label) {
     return {
         meta,
         content: scan.contentText || '',
+        assistantContent: scan.assistantText || '',
         // Persist the continuation so the next scan of this file can resume from the
         // offset instead of a full reparse. content_text is the same accumulated user
         // doc, cached so the resume can hydrate userTexts without re-reading the file.
@@ -1431,6 +1455,7 @@ async function scanCodexIncremental(onProgress) {
                 entries.push({
                     meta: result.meta,
                     content: result.content,
+                    assistantContent: result.assistantContent,
                     scan,
                     parserState: result.parserState,
                     contentText: result.contentText,
@@ -1541,7 +1566,10 @@ export async function readCodexMeta(filePath, resolveAccount, currentVersion, sc
     let toolCalls;
     let toolIndexMode = 'replace';
     if (scanStamp) {
-        const prior = parsePriorCodexState(priorRow);
+        // See readClaudeMeta: a prior continuation from an older content extractor
+        // is missing what the current extractor adds, so it must not be resumed
+        // from — treat it as absent and force one full reparse.
+        const prior = priorRow?.extractorVersion === CONTENT_INDEX_VERSION ? parsePriorCodexState(priorRow) : null;
         const result = await scanCodexSessionResumable(filePath, prior, scanStamp.fileMtimeMs, scanStamp.fileSize, priorRow?.fileMtimeMs);
         if (result.mode === 'incremental')
             codexIncrementalScanCount++;
@@ -1597,6 +1625,7 @@ export async function readCodexMeta(filePath, resolveAccount, currentVersion, sc
     return {
         meta,
         content: scan.contentText || '',
+        assistantContent: scan.assistantText || '',
         // Persist the continuation so the next scan of this rollout resumes from the
         // offset instead of a full reparse; content_text caches the accumulated user
         // doc for the resume's hydrate. Absent when no stamp was supplied.
@@ -1675,7 +1704,7 @@ async function scanGeminiIncremental(onProgress) {
             const result = readGeminiMeta(filePath, hashDir, projectMap, currentVersion);
             if (result && !seen.has(result.meta.id)) {
                 seen.add(result.meta.id);
-                entries.push({ meta: result.meta, content: result.content, scan });
+                entries.push({ meta: result.meta, content: result.content, assistantContent: result.assistantContent, scan });
             }
             else {
                 // Gemini file without a sessionId — record scan so we don't re-parse it next run.
@@ -1729,6 +1758,7 @@ function readGeminiMeta(filePath, hashDir, projectMap, currentVersion) {
     let firstTsMs;
     let lastTsMs;
     const userTexts = [];
+    const assistantTexts = [];
     for (const message of messages) {
         if (message.type === 'user') {
             const text = extractGeminiMessageText(message.content);
@@ -1740,8 +1770,10 @@ function readGeminiMeta(filePath, hashDir, projectMap, currentVersion) {
             }
         }
         else if (message.type === 'gemini') {
-            if (extractGeminiMessageText(message.content)) {
+            const text = extractGeminiMessageText(message.content);
+            if (text) {
                 messageCount++;
+                assistantTexts.push(text);
             }
         }
         // Duration: messages carry a `timestamp` on most Gemini CLI versions.
@@ -1819,7 +1851,7 @@ function readGeminiMeta(filePath, hashDir, projectMap, currentVersion) {
         costUsdNoCache: sawCost ? costUsdNoCache : undefined,
         durationMs,
     };
-    return { meta, content: userTexts.join('\n') };
+    return { meta, content: userTexts.join('\n'), assistantContent: assistantTexts.join('\n') };
 }
 /** Build a hash-to-project mapping from Gemini's projects.json and history directories. */
 function buildGeminiProjectMap() {
@@ -2396,7 +2428,7 @@ async function scanRushIncremental(onProgress) {
             const sessionId = path.basename(path.dirname(filePath));
             const result = await readRushMeta(filePath, sessionId);
             if (result) {
-                entries.push({ meta: result.meta, content: result.content, scan });
+                entries.push({ meta: result.meta, content: result.content, assistantContent: result.assistantContent, scan });
             }
             else {
                 touched.push({ filePath, scan });
@@ -2428,7 +2460,7 @@ async function readRushMeta(filePath, sessionId) {
         topic: scan.topic,
         messageCount: scan.messageCount,
     };
-    return { meta, content: scan.contentText || '' };
+    return { meta, content: scan.contentText || '', assistantContent: scan.assistantText || '' };
 }
 /** Stream a Rush messages.jsonl file and extract scan-level metadata. */
 async function scanRushSession(filePath) {
@@ -2439,6 +2471,7 @@ async function scanRushSession(filePath) {
     let agentId;
     let messageCount = 0;
     const userTexts = [];
+    const assistantTexts = [];
     try {
         for await (const line of rl) {
             if (!line.trim())
@@ -2475,6 +2508,9 @@ async function scanRushSession(filePath) {
                 if (!topic)
                     topic = extractSessionTopic(cleaned);
             }
+            else if (parsed.role === 'assistant') {
+                assistantTexts.push(cleaned);
+            }
         }
     }
     finally {
@@ -2487,6 +2523,7 @@ async function scanRushSession(filePath) {
         agentId,
         messageCount,
         contentText: userTexts.length > 0 ? userTexts.join('\n') : undefined,
+        assistantText: assistantTexts.length > 0 ? assistantTexts.join('\n') : undefined,
     };
 }
 // ---------------------------------------------------------------------------
@@ -2529,7 +2566,7 @@ async function scanHermesIncremental(onProgress) {
             const result = readHermesMeta(filePath);
             if (result && !seen.has(result.meta.id)) {
                 seen.add(result.meta.id);
-                scanEntries.push({ meta: result.meta, content: result.content, scan });
+                scanEntries.push({ meta: result.meta, content: result.content, assistantContent: result.assistantContent, scan });
             }
             else {
                 touched.push({ filePath, scan });
@@ -2558,6 +2595,7 @@ function readHermesMeta(filePath) {
         return null;
     const messages = Array.isArray(session.messages) ? session.messages : [];
     const userTexts = [];
+    const assistantTexts = [];
     let topic;
     let messageCount = 0;
     for (const msg of messages) {
@@ -2570,6 +2608,9 @@ function readHermesMeta(filePath) {
             if (!topic)
                 topic = extractSessionTopic(text);
         }
+        else if (msg?.role === 'assistant') {
+            assistantTexts.push(text);
+        }
     }
     const stat = safeStatSync(filePath);
     const timestamp = typeof session.last_updated === 'string'
@@ -2592,7 +2633,7 @@ function readHermesMeta(filePath) {
         topic,
         messageCount: messageCount || (typeof session.message_count === 'number' ? session.message_count : undefined),
     };
-    return { meta, content: userTexts.join('\n') };
+    return { meta, content: userTexts.join('\n'), assistantContent: assistantTexts.join('\n') };
 }
 /**
  * Muse Code stores one session per directory under
@@ -2660,7 +2701,7 @@ function scanMuseIncremental(onProgress) {
             const result = readMuseMeta(filePath);
             if (result && !seen.has(result.meta.id)) {
                 seen.add(result.meta.id);
-                scanEntries.push({ meta: result.meta, content: result.content, scan });
+                scanEntries.push({ meta: result.meta, content: result.content, assistantContent: result.assistantContent, scan });
             }
             else {
                 touched.push({ filePath, scan });
@@ -2690,6 +2731,7 @@ function readMuseMeta(filePath) {
         return null;
     }
     const userTexts = [];
+    const assistantTexts = [];
     let topic;
     let messageCount = 0;
     let model;
@@ -2734,6 +2776,9 @@ function readMuseMeta(filePath) {
         const event = payload?.event ?? payload;
         if (event?.kind === 'assistant_message_committed' && typeof event.text === 'string') {
             messageCount++;
+            const text = event.text.trim();
+            if (text)
+                assistantTexts.push(text);
         }
         if (event?.kind === 'model_request_configured' && typeof event.model === 'string') {
             model = event.model;
@@ -2757,7 +2802,7 @@ function readMuseMeta(filePath) {
         topic,
         messageCount: messageCount || undefined,
     };
-    return { meta, content: userTexts.join('\n') };
+    return { meta, content: userTexts.join('\n'), assistantContent: assistantTexts.join('\n') };
 }
 /** Extract plain text from a Hermes message content field (string or list of parts). */
 function extractHermesMessageText(content) {
@@ -2805,7 +2850,7 @@ async function scanDroidIncremental(onProgress) {
             const result = await readDroidMeta(filePath, currentVersion);
             if (result && !seen.has(result.meta.id)) {
                 seen.add(result.meta.id);
-                entries.push({ meta: result.meta, content: result.content, scan });
+                entries.push({ meta: result.meta, content: result.content, assistantContent: result.assistantContent, scan });
             }
             else {
                 touched.push({ filePath, scan });
@@ -2868,7 +2913,7 @@ async function readDroidMeta(filePath, currentVersion) {
         costUsdNoCache: costUsd > 0 ? costUsdNoCache : undefined,
         durationMs: scan.durationMs,
     };
-    return { meta, content: scan.contentText || '' };
+    return { meta, content: scan.contentText || '', assistantContent: scan.assistantText || '' };
 }
 /** Read model + token usage from a Droid `<uuid>.settings.json` sidecar. */
 function readDroidSettings(settingsPath) {
@@ -2911,6 +2956,7 @@ async function scanDroidSession(filePath) {
     let firstTsMs;
     let lastTsMs;
     const userTexts = [];
+    const assistantTexts = [];
     try {
         for await (const line of rl) {
             if (!line.trim())
@@ -2960,6 +3006,9 @@ async function scanDroidSession(filePath) {
                 if (!firstUserTopic)
                     firstUserTopic = extractSessionTopic(text);
             }
+            else if (msg.role === 'assistant') {
+                assistantTexts.push(text);
+            }
         }
     }
     finally {
@@ -2981,6 +3030,7 @@ async function scanDroidSession(filePath) {
         durationMs,
         lastActivity: lastTsMs !== undefined ? new Date(lastTsMs).toISOString() : undefined,
         contentText: userTexts.length > 0 ? userTexts.join('\n') : undefined,
+        assistantText: assistantTexts.length > 0 ? assistantTexts.join('\n') : undefined,
     };
 }
 /** Extract plain text from a Droid message content field (Anthropic-shaped blocks). */
@@ -3026,6 +3076,7 @@ export function initClaudeParseState() {
         lastTsMs: undefined,
         seenAssistantIds: new Set(),
         userTexts: [],
+        assistantTexts: [],
         sawPrCreate: false,
         prUrl: undefined,
         prNumber: undefined,
@@ -3217,6 +3268,9 @@ export function applyClaudeLine(state, parsed) {
         return;
     state.seenAssistantIds.add(logicalId);
     state.messageCount++;
+    const assistantText = extractClaudeAssistantText(parsed);
+    if (assistantText)
+        state.assistantTexts.push(assistantText);
     const usageObj = parsed.message?.usage || parsed.usage;
     const usage = getClaudeUsageTotal(usageObj);
     if (usage !== null) {
@@ -3295,6 +3349,7 @@ export function finalizeClaudeScan(state) {
         durationMs,
         lastActivity: state.lastTsMs !== undefined ? new Date(state.lastTsMs).toISOString() : undefined,
         contentText: state.userTexts.length > 0 ? state.userTexts.join('\n') : undefined,
+        assistantText: state.assistantTexts.length > 0 ? state.assistantTexts.join('\n') : undefined,
         prUrl: state.prUrl,
         prNumber: state.prNumber,
         worktreeSlug: worktree?.slug,
@@ -3349,7 +3404,7 @@ export function serializeClaudeParserState(state, offset, jsonlDroppingOversized
         : allIds;
     const ticket = detectTicket(state.userTexts.join('\n') || undefined, state.gitBranch);
     return {
-        v: 4,
+        v: 5,
         subAgents: state.subAgents,
         backgroundShells: state.backgroundShells,
         offset,
@@ -3391,6 +3446,7 @@ export function serializeClaudeParserState(state, offset, jsonlDroppingOversized
         // not be persisted.
         ticketId: ticket?.id,
         contentText: state.userTexts.length > 0 ? state.userTexts.join('\n') : undefined,
+        assistantContentText: state.assistantTexts.length > 0 ? state.assistantTexts.join('\n') : undefined,
         checklistEvents: state.checklistEvents,
         recentDirectoriesTouched: state.recentDirectoriesTouched,
         toolCalls: state.toolCollector.snapshot(),
@@ -3449,6 +3505,9 @@ export function hydrateClaudeParseState(prior) {
         lastTsMs: prior.lastTsMs,
         seenAssistantIds: seen,
         userTexts: prior.contentText !== undefined && prior.contentText.length > 0 ? [prior.contentText] : [],
+        assistantTexts: prior.assistantContentText !== undefined && prior.assistantContentText.length > 0
+            ? [prior.assistantContentText]
+            : [],
         sawPrCreate: prior.sawPrCreate,
         prUrl: prior.prUrl,
         prNumber: prior.prNumber,
@@ -3592,7 +3651,7 @@ function parsePriorClaudeState(row) {
         return null;
     try {
         const parsed = JSON.parse(row.parserState);
-        if (parsed?.v !== 4 || typeof parsed.offset !== 'number' || parsed.toolCalls?.v !== 1)
+        if (parsed?.v !== 5 || typeof parsed.offset !== 'number' || parsed.toolCalls?.v !== 1)
             return null;
         return parsed;
     }
@@ -3629,6 +3688,7 @@ export function initCodexParseState() {
         firstTsMs: undefined,
         lastTsMs: undefined,
         userTexts: [],
+        assistantTexts: [],
         sawPrCreate: false,
         prUrl: undefined,
         prNumber: undefined,
@@ -3738,6 +3798,9 @@ function applyCodexLine(state, parsed) {
             if (!state.topic)
                 state.topic = extractSessionTopic(text);
         }
+        else {
+            state.assistantTexts.push(text);
+        }
         return;
     }
     if (parsed.type === 'event_msg' && parsed.payload?.type === 'token_count') {
@@ -3813,6 +3876,7 @@ function finalizeCodexScan(state) {
         durationMs,
         lastActivity: state.lastTsMs !== undefined ? new Date(state.lastTsMs).toISOString() : undefined,
         contentText: state.userTexts.length > 0 ? state.userTexts.join('\n') : undefined,
+        assistantText: state.assistantTexts.length > 0 ? state.assistantTexts.join('\n') : undefined,
         prUrl: state.prUrl,
         prNumber: state.prNumber,
         worktreeSlug: worktree?.slug,
@@ -3856,7 +3920,7 @@ async function scanCodexSession(filePath) {
 export function serializeCodexParserState(state, offset, jsonlDroppingOversizedLine = false) {
     const ticket = detectTicket(state.userTexts.join('\n') || undefined, state.gitBranch);
     return {
-        v: 2,
+        v: 3,
         offset,
         jsonlDroppingOversizedLine: jsonlDroppingOversizedLine || undefined,
         sessionId: state.sessionId,
@@ -3883,6 +3947,7 @@ export function serializeCodexParserState(state, offset, jsonlDroppingOversizedL
         // be persisted.
         ticketId: ticket?.id,
         contentText: state.userTexts.length > 0 ? state.userTexts.join('\n') : undefined,
+        assistantContentText: state.assistantTexts.length > 0 ? state.assistantTexts.join('\n') : undefined,
         checklistEvents: state.checklistEvents,
         recentDirectoriesTouched: state.recentDirectoriesTouched,
         toolCalls: state.toolCollector.snapshot(),
@@ -3913,6 +3978,9 @@ function hydrateCodexParseState(prior) {
         firstTsMs: prior.firstTsMs,
         lastTsMs: prior.lastTsMs,
         userTexts: prior.contentText !== undefined && prior.contentText.length > 0 ? [prior.contentText] : [],
+        assistantTexts: prior.assistantContentText !== undefined && prior.assistantContentText.length > 0
+            ? [prior.assistantContentText]
+            : [],
         sawPrCreate: prior.sawPrCreate,
         prUrl: prior.prUrl,
         prNumber: prior.prNumber,
@@ -4043,7 +4111,7 @@ function parsePriorCodexState(row) {
         return null;
     try {
         const parsed = JSON.parse(row.parserState);
-        if (parsed?.v !== 2 || typeof parsed.offset !== 'number' || parsed.toolCalls?.v !== 1)
+        if (parsed?.v !== 3 || typeof parsed.offset !== 'number' || parsed.toolCalls?.v !== 1)
             return null;
         return parsed;
     }
@@ -4144,6 +4212,29 @@ function extractClaudeUserText(parsed) {
 function isLocalCommandMessage(text) {
     return /<local-command-caveat>|<bash-(input|stdout|stderr)>/i.test(text);
 }
+/**
+ * Extract the assistant's own answer text from a Claude JSONL assistant event —
+ * the reply text blocks, skipping tool_use/tool_result blocks and an
+ * interrupted turn, mirroring {@link extractClaudeUserText}'s filters. Unlike
+ * the user side (which keeps only the first text block), a single assistant
+ * turn can legitimately carry multiple text blocks around tool calls, so every
+ * one is joined.
+ */
+function extractClaudeAssistantText(parsed) {
+    const content = parsed.message?.content;
+    if (typeof content === 'string') {
+        const text = content.trim();
+        return text && !text.startsWith('[Request interrupted') ? text : undefined;
+    }
+    if (!Array.isArray(content))
+        return undefined;
+    const text = content
+        .filter((block) => block.type === 'text')
+        .map((block) => String(block.text || '').trim())
+        .filter((value) => value && !value.startsWith('[Request interrupted'))
+        .join('\n');
+    return text || undefined;
+}
 /** Sum all token usage fields from a Claude assistant message's usage object. */
 function getClaudeUsageTotal(usage) {
     if (!usage || typeof usage !== 'object')
@@ -4308,7 +4399,7 @@ async function scanCursorIncremental(onProgress) {
             const result = readCursorMeta(filePath, currentVersion);
             if (result && !seen.has(result.meta.id)) {
                 seen.add(result.meta.id);
-                entries.push({ meta: result.meta, content: result.content, scan, events: result.events });
+                entries.push({ meta: result.meta, content: result.content, assistantContent: result.assistantContent, scan, events: result.events });
             }
             else {
                 touched.push({ filePath, scan });
@@ -4385,6 +4476,9 @@ export function readCursorMeta(filePath, currentVersion) {
     const userTexts = events
         .filter((event) => event.type === 'message' && event.role === 'user' && event.content)
         .map((event) => event.content);
+    const assistantTexts = events
+        .filter((event) => event.type === 'message' && event.role === 'assistant' && event.content)
+        .map((event) => event.content);
     const firstUserText = userTexts[0];
     const title = typeof chatMeta?.title === 'string'
         ? cleanGeneratedSessionLabel(chatMeta.title)
@@ -4404,7 +4498,7 @@ export function readCursorMeta(filePath, currentVersion) {
         messageCount: events.filter((event) => event.type === 'message').length,
         todos: extractTodoProgressFromEvents(events),
     };
-    return { meta, content: userTexts.join('\n'), events };
+    return { meta, content: userTexts.join('\n'), assistantContent: assistantTexts.join('\n'), events };
 }
 // ---------------------------------------------------------------------------
 // Kimi

package/dist/lib/session/insights.d.ts

@@ -85,6 +85,20 @@ export interface InsightFacets {
     assistantTurns: number;
     toolCount: number;
     errorCount: number;
+    /**
+     * Shell invocations bucketed by the actual executable + first subcommand token, not
+     * lumped under the harness tool name. `bucketKey` collapses each command to
+     * `git commit`, `gh pr`, `agents ssh`, `find`, `ssh→git pull`, … so the tool mix says
+     * which binary ran, not just that `Bash` did. Cross-harness: keyed on `e.command`,
+     * which the codex parser sets for `exec_command` too, so it is not Claude-`Bash`-only.
+     */
+    bashCommands: Record<string, number>;
+    /**
+     * Same bucketing for the shell command that was running when a tool call failed —
+     * turns one `failed tool loop: Bash` line into per-binary failure counts
+     * (`git reconcile`, `find`, `gh`) so the friction is attributable to a command.
+     */
+    bashCommandFailures: Record<string, number>;
     /** Deterministic evidence buckets used by the actions-forward report. */
     frictionSignals: Record<string, number>;
     correctionSignals: Record<string, number>;

package/dist/lib/session/insights.js

@@ -22,6 +22,7 @@
  */
 import { computeSummaryStats, shortenModel } from './render.js';
 import { classifyFileChanges, EDIT_TOOLS, WRITE_TOOLS } from './digest.js';
+import { bucketKey } from './bash-command.js';
 /** File extension → language label. Mirrors the set `/insights` attributes by. */
 const LANGUAGE_BY_EXT = {
     '.ts': 'TypeScript', '.tsx': 'TypeScript', '.mts': 'TypeScript', '.cts': 'TypeScript',
@@ -82,6 +83,7 @@ function emptyFacets() {
         shellCommandsSeen: 0,
         messageHours: new Array(24).fill(0), userTurns: 0, assistantTurns: 0,
         toolCount: 0, errorCount: 0,
+        bashCommands: {}, bashCommandFailures: {},
         frictionSignals: {}, correctionSignals: {}, automationSignals: {},
     };
 }
@@ -172,6 +174,9 @@ export function computeInsightFacets(events, timezoneOffsetMinutes = new Date().
     /** Shortened model id of the last assistant activity (for stall attribution). */
     let lastAssistantModel = null;
     let lastFailedTool = null;
+    // Most recent shell command seen per tool, so an `error` event (which carries the
+    // failing tool name but not its command) can attribute the failure to a binary.
+    const lastCommandByTool = {};
     for (const e of events) {
         const ts = new Date(e.timestamp).getTime();
         const hasTs = !Number.isNaN(ts);
@@ -191,16 +196,27 @@ export function computeInsightFacets(events, timezoneOffsetMinutes = new Date().
                     lastAssistantModel = m;
                 }
                 break;
-            case 'error':
+            case 'error': {
                 bump(f.errorCategories, categorizeError(e.content ?? e.output ?? ''));
                 if (e.tool && e.tool === lastFailedTool)
                     bump(f.frictionSignals, `failed tool loop: ${e.tool}`);
+                // Attribute the failure to the binary of that tool's most recent command,
+                // so `Bash` failures split into `git reconcile`/`find`/`gh` rather than one lump.
+                const failedCmd = e.tool ? lastCommandByTool[e.tool] : undefined;
+                if (failedCmd)
+                    bump(f.bashCommandFailures, bucketKey(failedCmd));
                 lastFailedTool = e.tool ?? null;
                 classifyFriction(e.content ?? e.output ?? '', f.frictionSignals);
                 break;
+            }
             case 'tool_result':
-                if (e.success !== false && e.outcome !== 'error')
+                if (e.success !== false && e.outcome !== 'error') {
                     lastFailedTool = null;
+                    // Drop the succeeded tool's remembered command so a later failing call that
+                    // carries no command of its own is not misattributed to this stale binary.
+                    if (e.tool)
+                        delete lastCommandByTool[e.tool];
+                }
                 break;
             case 'message':
                 if (e.role === 'assistant') {
@@ -277,6 +293,9 @@ export function computeInsightFacets(events, timezoneOffsetMinutes = new Date().
                     f.gitCommits += countGitOp(e.command, 'commit');
                     f.gitPushes += countGitOp(e.command, 'push');
                     classifyAutomation(e.command, f.automationSignals);
+                    bump(f.bashCommands, bucketKey(e.command));
+                    if (toolName)
+                        lastCommandByTool[toolName] = e.command;
                 }
                 break;
             }
@@ -430,6 +449,10 @@ export function mergeFacets(into, add) {
         bump(into.slashCommands, k, v);
     for (const [k, v] of Object.entries(add.errorCategories))
         bump(into.errorCategories, k, v);
+    for (const [k, v] of Object.entries(add.bashCommands ?? {}))
+        bump(into.bashCommands, k, v);
+    for (const [k, v] of Object.entries(add.bashCommandFailures ?? {}))
+        bump(into.bashCommandFailures, k, v);
     for (const [k, v] of Object.entries(add.frictionSignals ?? {}))
         bump(into.frictionSignals, k, v);
     for (const [k, v] of Object.entries(add.correctionSignals ?? {}))

package/dist/lib/session/linear.js

@@ -9,7 +9,7 @@
  *   2. `workspaceUrlKey` in the linear-cli config (`~/.linear-cli/config.json`).
  *
  * When neither is set the ticket stays plain text — it's still shown, just not
- * linked. This keeps the OSS CLI free of any Rush/workspace-specific string.
+ * linked. This keeps the published CLI free of any Rush/workspace-specific string.
  */
 import fs from 'node:fs';
 import os from 'node:os';

package/dist/lib/session/shell-programs.d.ts

@@ -9,6 +9,23 @@ export interface ShellProgramOccurrence {
     program: string;
     role: ShellProgramRole;
 }
+/**
+ * Harness tool NAMES that run a shell command — Claude's `Bash`, Codex's
+ * `exec_command`/`exec` (`exec` is newer gpt-5.6-sol), Droid's `Execute`, plus the
+ * generic `shell`/`run_shell_command`/`run_command`/`execute`. This is the single
+ * source of truth for "does this tool row carry a shell command?", consumed by the
+ * trajectory model (program resolution + command-arg extraction), the directory-touched
+ * scan in `state.ts`, the tool-call indexer, and stream rendering — replacing five
+ * hand-synced copies that had already drifted apart.
+ *
+ * Distinct from {@link SHELL_WRAPPERS}, which is interpreter binaries (`bash`, `sh`…)
+ * found INSIDE a command string, not the harness's tool name. Match through
+ * {@link isShellExecTool} so casing is normalized in one place — harnesses disagree on
+ * case (`Bash` vs `bash`, `Execute` vs `exec_command`).
+ */
+export declare const SHELL_EXEC_TOOLS: Set<string>;
+/** Case-insensitive membership test for {@link SHELL_EXEC_TOOLS}. */
+export declare function isShellExecTool(tool: string | undefined): boolean;
 /** Return a word only when Bash expansion cannot change its value. */
 export declare function staticShellWord(word: Word | undefined): string | undefined;
 /** Parse Bash without executing it and return every statically identifiable program. */

package/dist/lib/session/shell-programs.js

@@ -1,5 +1,26 @@
 import path from 'path';
 import { parse, } from 'unbash';
+/**
+ * Harness tool NAMES that run a shell command — Claude's `Bash`, Codex's
+ * `exec_command`/`exec` (`exec` is newer gpt-5.6-sol), Droid's `Execute`, plus the
+ * generic `shell`/`run_shell_command`/`run_command`/`execute`. This is the single
+ * source of truth for "does this tool row carry a shell command?", consumed by the
+ * trajectory model (program resolution + command-arg extraction), the directory-touched
+ * scan in `state.ts`, the tool-call indexer, and stream rendering — replacing five
+ * hand-synced copies that had already drifted apart.
+ *
+ * Distinct from {@link SHELL_WRAPPERS}, which is interpreter binaries (`bash`, `sh`…)
+ * found INSIDE a command string, not the harness's tool name. Match through
+ * {@link isShellExecTool} so casing is normalized in one place — harnesses disagree on
+ * case (`Bash` vs `bash`, `Execute` vs `exec_command`).
+ */
+export const SHELL_EXEC_TOOLS = new Set([
+    'bash', 'exec', 'execute', 'exec_command', 'run_command', 'run_shell_command', 'shell',
+]);
+/** Case-insensitive membership test for {@link SHELL_EXEC_TOOLS}. */
+export function isShellExecTool(tool) {
+    return tool !== undefined && SHELL_EXEC_TOOLS.has(tool.toLowerCase());
+}
 const SHELL_WRAPPERS = new Set(['bash', 'sh', 'zsh', 'dash', 'ksh']);
 const PROGRAM_WRAPPERS = new Set(['command', 'builtin', 'env', 'nohup', 'sudo']);
 const MAX_NESTED_DEPTH = 3;