@phnx-labs/agents-cli 1.22.52 → 1.22.54

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

@@ -104,6 +104,8 @@ interface ClaudeSessionScan {
     entrypoint?: string;
     /** Concatenated user message text, ready to hand to FTS5. */
     contentText?: string;
+    /** Concatenated assistant-answer text, ready to hand to FTS5's `assistant` column. */
+    assistantText?: string;
     /** Durable state signals persisted to the index by the session-state engine. */
     prUrl?: string;
     prNumber?: number;
@@ -154,6 +156,7 @@ interface CodexSessionScan {
     durationMs?: number;
     lastActivity?: string;
     contentText?: string;
+    assistantText?: string;
     prUrl?: string;
     prNumber?: number;
     worktreeSlug?: string;
@@ -347,8 +350,15 @@ export declare function looksLikeSessionId(query: string): boolean;
  */
 export declare function resolveSessionById(sessions: SessionMeta[], idQuery: string): SessionMeta[];
 /**
- * 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 declare function searchContentIndex(sessions: SessionMeta[], query: string): Map<string, SessionMeta>;
 /**
@@ -375,6 +385,13 @@ interface PreStatEntry {
  * 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 declare function filterChangedEntries(entries: PreStatEntry[]): Array<{
     filePath: string;
@@ -429,9 +446,11 @@ export declare function parseCodexThreadNameIndex(raw: string): Map<string, stri
 export declare function readCodexMeta(filePath: string, resolveAccount?: () => string | undefined, currentVersion?: string, scanStamp?: ScanStamp, priorRow?: {
     parserState: string | null;
     fileMtimeMs: number;
+    extractorVersion?: number | null;
 }): Promise<{
     meta: SessionMeta;
     content: string;
+    assistantContent: string;
     parserState?: string;
     contentText?: string;
     toolCalls?: IndexedToolCall[];
@@ -469,6 +488,10 @@ interface ClaudeParseState {
     lastTsMs?: number;
     seenAssistantIds: Set<string>;
     userTexts: string[];
+    /** Assistant-answer text (#PHNX content-search), accumulated the same way as
+     *  `userTexts` but indexed into session_text's own lower-weighted `assistant`
+     *  column instead of `content` — see BM25_WEIGHTS. */
+    assistantTexts: string[];
     sawPrCreate: boolean;
     prUrl?: string;
     prNumber?: number;
@@ -521,7 +544,7 @@ export declare function scanClaudeSession(filePath: string): Promise<ClaudeSessi
  * exact even when the recent window is smaller than the true count.
  */
 export interface ClaudeParserState {
-    v: 4;
+    v: 5;
     /**
      * Fan-out tallies carried across a RESUMED parse (RUSH-3091/3095). They must
      * live in the durable blob: the resumable parser reads only new bytes, so
@@ -566,6 +589,7 @@ export interface ClaudeParserState {
     spawnedTeam?: string;
     ticketId?: string;
     contentText?: string;
+    assistantContentText?: string;
     checklistEvents: SessionEvent[];
     recentDirectoriesTouched: string[];
     toolCalls: ToolCallCollectorSnapshot;
@@ -663,6 +687,8 @@ interface CodexParseState {
     firstTsMs?: number;
     lastTsMs?: number;
     userTexts: string[];
+    /** See ClaudeParseState.assistantTexts — same accumulate-and-lower-weight FTS treatment. */
+    assistantTexts: string[];
     sawPrCreate: boolean;
     prUrl?: string;
     prNumber?: number;
@@ -693,7 +719,7 @@ export declare function initCodexParseState(): CodexParseState;
  * finalize is identical after a resume.
  */
 export interface CodexParserState {
-    v: 2;
+    v: 3;
     offset: number;
     jsonlDroppingOversizedLine?: boolean;
     sessionId?: string;
@@ -716,6 +742,7 @@ export interface CodexParserState {
     spawnedTeam?: string;
     ticketId?: string;
     contentText?: string;
+    assistantContentText?: string;
     checklistEvents: SessionEvent[];
     recentDirectoriesTouched: string[];
     toolCalls: ToolCallCollectorSnapshot;
@@ -772,6 +799,7 @@ export declare function __resetCodexScanBranchCountsForTest(): void;
 export declare function readCursorMeta(filePath: string, currentVersion?: string): {
     meta: SessionMeta;
     content: string;
+    assistantContent: string;
     events: SessionEvent[];
 } | null;
 /** Parse a single Kimi session state.json file to extract session metadata. */

package/dist/lib/session/discover.js

@@ -26,7 +26,7 @@ import { getConfigSymlinkVersion } from '../installations/shims.js';
 import { SESSION_AGENTS } from './types.js';
 import { deriveShortId } from './short-id.js';
 import { buildClaudeAccountIndex, resolveClaudeAccount } from './claude-accounts.js';
-import { extractSessionTopic, extractSlashCommandName, extractSlashCommandFromToolInput, classifyUserPrompt } from './prompt.js';
+import { extractSessionTopic, extractSlashCommandName, extractSlashCommandFromToolInput, cleanGeneratedSessionLabel } from './prompt.js';
 import { isBackgroundShellStart, isSkillInvocation, extractSkills, extractSlashCommands, isSubAgentTool } from './highlights.js';
 import { parseAntigravity, parseCursor, splitSessionFilePath } from './parse.js';
 import { extractPrUrl, detectWorktree, detectTicket, isPrCreateCommand, detectSpawnedTeam, isTicketCreateTool, extractCreatedTicket, extractRecentDirectoriesTouched, extractTodoProgressFromEvents } from './state.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) {
@@ -3268,15 +3322,10 @@ export function finalizeClaudeScan(state) {
     // A topic is the first meaningful prompt. Harness-owned names travel in the
     // separate label field so consumers can replace an early topic once Claude's
     // generated title (or a later `/rename`) arrives.
-    // Claude's generated `ai-title` is derived from the first turn, so a session
-    // opened with a skill gets named after the injected "Base directory for this
-    // skill: …" line instead of its task — and that name then wins on every
-    // surface for the session's whole life. `classifyUserPrompt` reports `skill`
-    // only for that injected line, so collapse it to `/<skill>`. A `/rename`
-    // (`custom-title`) is the user's own words and is never rewritten.
-    const generated = classifyUserPrompt(state.aiTitle ?? '');
-    const label = state.customTitle
-        || (generated.kind === 'skill' ? generated.clean : state.aiTitle);
+    // Generated titles (Claude `ai-title`, Cursor `chatMeta.title`) go through
+    // one shared cleaner so a skill-preamble echo collapses to `/<skill>`. A
+    // `/rename` (`custom-title`) is the user's own words and is never rewritten.
+    const label = state.customTitle || cleanGeneratedSessionLabel(state.aiTitle);
     const worktree = detectWorktree(state.cwd, state.gitBranch);
     const ticket = detectTicket(state.userTexts.join('\n') || undefined, state.gitBranch);
     return {
@@ -3300,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,
@@ -3354,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,
@@ -3396,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(),
@@ -3454,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,
@@ -3597,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;
     }
@@ -3634,6 +3688,7 @@ export function initCodexParseState() {
         firstTsMs: undefined,
         lastTsMs: undefined,
         userTexts: [],
+        assistantTexts: [],
         sawPrCreate: false,
         prUrl: undefined,
         prNumber: undefined,
@@ -3743,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') {
@@ -3818,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,
@@ -3861,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,
@@ -3888,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(),
@@ -3918,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,
@@ -4048,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;
     }
@@ -4149,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')
@@ -4313,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 });
@@ -4390,9 +4476,12 @@ 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' && chatMeta.title.trim()
-        ? chatMeta.title.trim()
+    const title = typeof chatMeta?.title === 'string'
+        ? cleanGeneratedSessionLabel(chatMeta.title)
         : undefined;
     const meta = {
         id: sessionId,
@@ -4409,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