@phnx-labs/agents-cli 1.22.66 → 1.22.69

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

@@ -71,6 +71,7 @@ interface ClaudeSessionScan {
     version?: string;
     model?: string;
     topic?: string;
+    firstUserMessage?: string;
     /** Harness-owned session name (`/rename` or Claude's generated `ai-title`). */
     label?: string;
     messageCount: number;
@@ -135,6 +136,7 @@ interface CodexSessionScan {
     version?: string;
     model?: string;
     topic?: string;
+    firstUserMessage?: string;
     messageCount: number;
     tokenCount?: number;
     /** Real generated (output) tokens, excluding cache-read/-write context. */
@@ -418,6 +420,7 @@ interface ClaudeParseState {
     version?: string;
     model?: string;
     topic?: string;
+    firstUserMessage?: string;
     customTitle?: string;
     aiTitle?: string;
     entrypoint?: string;
@@ -492,7 +495,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: 5;
+    v: 6;
     /**
      * 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
@@ -512,6 +515,7 @@ export interface ClaudeParserState {
     entrypoint?: string;
     firstTsMs?: number;
     topic?: string;
+    firstUserMessage?: string;
     customTitle?: string;
     aiTitle?: string;
     plan?: string;
@@ -629,6 +633,7 @@ interface CodexParseState {
     version?: string;
     model?: string;
     topic?: string;
+    firstUserMessage?: string;
     messageCount: number;
     tokenCount?: number;
     lastTotalTokenUsage?: any;
@@ -667,7 +672,7 @@ export declare function initCodexParseState(): CodexParseState;
  * finalize is identical after a resume.
  */
 export interface CodexParserState {
-    v: 3;
+    v: 4;
     offset: number;
     jsonlDroppingOversizedLine?: boolean;
     sessionId?: string;
@@ -677,6 +682,7 @@ export interface CodexParserState {
     version?: string;
     model?: string;
     topic?: string;
+    firstUserMessage?: string;
     messageCount: number;
     tokenCount?: number;
     lastTotalTokenUsage?: any;
@@ -743,6 +749,8 @@ export declare function __codexScanBranchCountsForTest(): {
 };
 /** Test seam: reset the Codex parse-branch counters to observe a scan from a clean slate. */
 export declare function __resetCodexScanBranchCountsForTest(): void;
+/** Extract the version number from a managed versions/<agent>/<version>/... path under either repo. */
+export declare function extractVersionFromManagedPath(agent: SessionAgentId, sourcePath?: string): string | undefined;
 /** Parse one Cursor transcript and enrich it with the matching chat meta.json. */
 export declare function readCursorMeta(filePath: string, currentVersion?: string): {
     meta: SessionMeta;
@@ -765,11 +773,12 @@ export declare function readKimiMeta(filePath: string, priorRow?: {
  * from `offset` + adding the appended tail's deltas equals a full parse.
  */
 export interface KimiParserState {
-    v: 1;
+    v: 2;
     offset: number;
     messageCount: number;
     tokenCount: number;
     outputTokens: number;
+    firstUserMessage?: string;
 }
 /**
  * Incrementally parse Kimi's wire.jsonl for message-count and token counters,

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, cleanGeneratedSessionLabel } from './prompt.js';
+import { cleanFirstUserMessage, 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';
@@ -1200,6 +1200,7 @@ async function readClaudeMeta(filePath, sessionId, scanStamp, priorRow, label) {
             accountKey: acct.key,
             accountOrg: acct.orgName ?? undefined,
             topic: scan.topic,
+            firstUserMessage: scan.firstUserMessage,
             // The live sessions metadata file contains only user `/rename` values;
             // prefer it when present, then fall back to the title parsed from JSONL.
             label: label || scan.label,
@@ -1256,6 +1257,7 @@ async function readClaudeMeta(filePath, sessionId, scanStamp, priorRow, label) {
             costUsdNoCache: scan.costUsdNoCache,
             durationMs: scan.durationMs,
             topic: scan.topic,
+            firstUserMessage: scan.firstUserMessage,
             isTeamOrigin,
             prUrl: scan.prUrl,
             prNumber: scan.prNumber,
@@ -1565,6 +1567,7 @@ export async function readCodexMeta(filePath, resolveAccount, currentVersion, sc
         version: resolveSessionVersion('codex', filePath, scan.version, currentVersion),
         model: scan.model,
         topic: scan.topic,
+        firstUserMessage: scan.firstUserMessage,
         messageCount: scan.messageCount,
         tokenCount: scan.tokenCount,
         outputTokens: scan.outputTokens,
@@ -1804,6 +1807,7 @@ function readGeminiMeta(filePath, hashDir, projectMap, currentVersion) {
         version: resolveSessionVersion('gemini', filePath, embeddedVersion, currentVersion),
         model: sessionModel,
         topic,
+        firstUserMessage: userTexts.map(cleanFirstUserMessage).find((text) => !!text),
         messageCount,
         tokenCount: sawTokenCount ? tokenCount : undefined,
         outputTokens: sawTokenCount ? outputTokens : undefined,
@@ -2046,7 +2050,13 @@ async function scanOpenCodeIncremental(onProgress) {
         fileSize: stat.size,
     };
     const prev = getScanStampByPath(OPENCODE_DB);
-    if (prev && prev.fileMtimeMs === currentScan.fileMtimeMs && prev.fileSize === currentScan.fileSize) {
+    const extractorUpgrade = prev != null && prev.extractorVersion !== CONTENT_INDEX_VERSION;
+    // OpenCode has a shared database rather than one transcript file per session,
+    // so this container-level gate must honor extractor-version invalidation too.
+    if (prev &&
+        prev.fileMtimeMs === currentScan.fileMtimeMs &&
+        prev.fileSize === currentScan.fileSize &&
+        prev.extractorVersion === CONTENT_INDEX_VERSION) {
         return;
     }
     const currentVersion = await getCurrentAgentVersion('opencode');
@@ -2123,7 +2133,7 @@ async function scanOpenCodeIncremental(onProgress) {
       ) stats ON stats.session_id = s.id
       WHERE s.parent_id IS NULL
       ORDER BY time_created DESC
-      LIMIT 1000;
+      ${extractorUpgrade ? '' : 'LIMIT 1000'};
     `.replace(/\n/g, ' ');
         const account = getOpenCodeAccount();
         const rows = db.prepare(query).all();
@@ -2154,11 +2164,31 @@ async function scanOpenCodeIncremental(onProgress) {
             const prevStamp = priorStamps.get(c.filePath);
             return !prevStamp
                 || prevStamp.fileMtimeMs !== c.scan.fileMtimeMs
-                || prevStamp.fileSize !== c.scan.fileSize;
+                || prevStamp.fileSize !== c.scan.fileSize
+                || prevStamp.extractorVersion !== CONTENT_INDEX_VERSION;
         });
+        // Role lives on the message row and the genuine user text lives on its
+        // ordered text parts. Poisoned JSON is ignored per row, never per database.
+        const firstUserStmt = db.prepare(`
+      SELECT json_extract(p.data, '$.text') AS text
+      FROM part p
+      WHERE p.message_id = (
+        SELECT m.id FROM message m
+        WHERE m.session_id = ?
+          AND json_valid(m.data) AND json_extract(m.data, '$.role') = 'user'
+        ORDER BY m.time_created ASC
+        LIMIT 1
+      )
+      AND json_valid(p.data) AND json_extract(p.data, '$.type') = 'text'
+      ORDER BY p.time_created ASC
+    `);
         const entries = [];
         for (const { row, id, filePath, scan } of changed) {
             const title = typeof row.title === 'string' ? row.title : '';
+            const firstUserMessage = firstUserStmt.all(id)
+                .map((part) => (typeof part.text === 'string' ? part.text : ''))
+                .join('')
+                .trim() || undefined;
             const directory = typeof row.directory === 'string' ? row.directory : '';
             const version = typeof row.version === 'string' ? row.version : '';
             const timeCreated = asInt(row.time_created);
@@ -2212,6 +2242,7 @@ async function scanOpenCodeIncremental(onProgress) {
                 version: resolveSessionVersion('opencode', OPENCODE_DB, version || undefined, currentVersion),
                 account,
                 topic,
+                firstUserMessage,
                 model,
                 costUsd,
                 durationMs,
@@ -2420,6 +2451,7 @@ async function readRushMeta(filePath, sessionId) {
         project: scan.agentId,
         filePath,
         topic: scan.topic,
+        firstUserMessage: scan.firstUserMessage,
         messageCount: scan.messageCount,
     };
     return { meta, content: scan.contentText || '', assistantContent: scan.assistantText || '' };
@@ -2430,6 +2462,7 @@ async function scanRushSession(filePath) {
     const rl = readline.createInterface({ input: stream, crlfDelay: Infinity });
     let timestamp;
     let topic;
+    let firstUserMessage;
     let agentId;
     let messageCount = 0;
     const userTexts = [];
@@ -2467,6 +2500,8 @@ async function scanRushSession(filePath) {
             messageCount++;
             if (parsed.role === 'user') {
                 userTexts.push(cleaned);
+                if (!firstUserMessage)
+                    firstUserMessage = cleanFirstUserMessage(cleaned);
                 if (!topic)
                     topic = extractSessionTopic(cleaned);
             }
@@ -2482,6 +2517,7 @@ async function scanRushSession(filePath) {
     return {
         timestamp,
         topic,
+        firstUserMessage,
         agentId,
         messageCount,
         contentText: userTexts.length > 0 ? userTexts.join('\n') : undefined,
@@ -2559,6 +2595,7 @@ function readHermesMeta(filePath) {
     const userTexts = [];
     const assistantTexts = [];
     let topic;
+    let firstUserMessage;
     let messageCount = 0;
     for (const msg of messages) {
         const text = extractHermesMessageText(msg?.content);
@@ -2567,6 +2604,8 @@ function readHermesMeta(filePath) {
         messageCount++;
         if (msg?.role === 'user') {
             userTexts.push(text);
+            if (!firstUserMessage)
+                firstUserMessage = cleanFirstUserMessage(text);
             if (!topic)
                 topic = extractSessionTopic(text);
         }
@@ -2593,6 +2632,7 @@ function readHermesMeta(filePath) {
         version: model,
         model,
         topic,
+        firstUserMessage,
         messageCount: messageCount || (typeof session.message_count === 'number' ? session.message_count : undefined),
     };
     return { meta, content: userTexts.join('\n'), assistantContent: assistantTexts.join('\n') };
@@ -2695,6 +2735,7 @@ function readMuseMeta(filePath) {
     const userTexts = [];
     const assistantTexts = [];
     let topic;
+    let firstUserMessage;
     let messageCount = 0;
     let model;
     let project;
@@ -2731,6 +2772,8 @@ function readMuseMeta(filePath) {
             if (cmd?.kind === 'turn_submit' && typeof cmd.prompt === 'string' && cmd.prompt.trim()) {
                 messageCount++;
                 userTexts.push(cmd.prompt.trim());
+                if (!firstUserMessage)
+                    firstUserMessage = cleanFirstUserMessage(cmd.prompt.trim());
                 if (!topic)
                     topic = extractSessionTopic(cmd.prompt.trim());
             }
@@ -2762,6 +2805,7 @@ function readMuseMeta(filePath) {
         filePath,
         model,
         topic,
+        firstUserMessage,
         messageCount: messageCount || undefined,
     };
     return { meta, content: userTexts.join('\n'), assistantContent: assistantTexts.join('\n') };
@@ -2865,6 +2909,7 @@ async function readDroidMeta(filePath, currentVersion) {
         version: resolveSessionVersion('droid', filePath, undefined, currentVersion),
         model,
         topic: scan.topic,
+        firstUserMessage: scan.firstUserMessage,
         messageCount: scan.messageCount,
         tokenCount,
         outputTokens: settings.usage?.outputTokens,
@@ -2913,6 +2958,7 @@ async function scanDroidSession(filePath) {
     let title;
     let sessionTitle;
     let firstUserTopic;
+    let firstUserMessage;
     let model;
     let messageCount = 0;
     let firstTsMs;
@@ -2965,6 +3011,8 @@ async function scanDroidSession(filePath) {
             messageCount++;
             if (msg.role === 'user') {
                 userTexts.push(text);
+                if (!firstUserMessage)
+                    firstUserMessage = cleanFirstUserMessage(text);
                 if (!firstUserTopic)
                     firstUserTopic = extractSessionTopic(text);
             }
@@ -2987,6 +3035,7 @@ async function scanDroidSession(filePath) {
         // Prefer Droid's auto-title, then the raw first-prompt title, then the
         // derived first-user-message topic.
         topic: sessionTitle || title || firstUserTopic,
+        firstUserMessage,
         model,
         messageCount,
         durationMs,
@@ -3020,6 +3069,7 @@ export function initClaudeParseState() {
         version: undefined,
         model: undefined,
         topic: undefined,
+        firstUserMessage: undefined,
         customTitle: undefined,
         aiTitle: undefined,
         entrypoint: undefined,
@@ -3202,6 +3252,8 @@ export function applyClaudeLine(state, parsed) {
     if (parsed.type === 'user') {
         const text = extractClaudeUserText(parsed);
         if (text) {
+            if (!state.firstUserMessage)
+                state.firstUserMessage = cleanFirstUserMessage(text);
             state.messageCount++;
             state.userTexts.push(text);
             if (!state.topic)
@@ -3297,6 +3349,7 @@ export function finalizeClaudeScan(state) {
         version: state.version,
         model: state.model,
         topic: state.topic,
+        firstUserMessage: state.firstUserMessage,
         label,
         entrypoint: state.entrypoint,
         messageCount: state.messageCount,
@@ -3366,7 +3419,7 @@ export function serializeClaudeParserState(state, offset, jsonlDroppingOversized
         : allIds;
     const ticket = detectTicket(state.userTexts.join('\n') || undefined, state.gitBranch);
     return {
-        v: 5,
+        v: 6,
         subAgents: state.subAgents,
         backgroundShells: state.backgroundShells,
         offset,
@@ -3379,6 +3432,7 @@ export function serializeClaudeParserState(state, offset, jsonlDroppingOversized
         entrypoint: state.entrypoint,
         firstTsMs: state.firstTsMs,
         topic: state.topic,
+        firstUserMessage: state.firstUserMessage,
         customTitle: state.customTitle,
         aiTitle: state.aiTitle,
         plan: state.plan,
@@ -3449,6 +3503,7 @@ export function hydrateClaudeParseState(prior) {
         version: prior.version,
         model: prior.model,
         topic: prior.topic,
+        firstUserMessage: prior.firstUserMessage,
         customTitle: prior.customTitle,
         aiTitle: prior.aiTitle,
         entrypoint: prior.entrypoint,
@@ -3613,7 +3668,7 @@ function parsePriorClaudeState(row) {
         return null;
     try {
         const parsed = JSON.parse(row.parserState);
-        if (parsed?.v !== 5 || typeof parsed.offset !== 'number' || parsed.toolCalls?.v !== 1)
+        if (parsed?.v !== 6 || typeof parsed.offset !== 'number' || parsed.toolCalls?.v !== 1)
             return null;
         return parsed;
     }
@@ -3644,6 +3699,7 @@ export function initCodexParseState() {
         version: undefined,
         model: undefined,
         topic: undefined,
+        firstUserMessage: undefined,
         messageCount: 0,
         tokenCount: undefined,
         lastTotalTokenUsage: undefined,
@@ -3748,7 +3804,8 @@ function applyCodexLine(state, parsed) {
         return;
     }
     if (parsed.type === 'response_item' && parsed.payload?.type === 'message') {
-        const role = parsed.payload.role === 'user' || parsed.payload.role === 'developer'
+        const payloadRole = parsed.payload.role;
+        const role = payloadRole === 'user' || payloadRole === 'developer'
             ? 'user'
             : 'assistant';
         const text = extractCodexMessageText(parsed.payload.content, role);
@@ -3756,9 +3813,17 @@ function applyCodexLine(state, parsed) {
             return;
         state.messageCount++;
         if (role === 'user') {
-            state.userTexts.push(text);
+            const genuine = cleanFirstUserMessage(text);
+            if (!genuine)
+                return;
+            state.userTexts.push(genuine);
+            // Codex records developer instructions as response_item messages too.
+            // They remain searchable for compatibility, but only an actual user role
+            // may become the session's first request.
+            if (payloadRole === 'user' && !state.firstUserMessage)
+                state.firstUserMessage = genuine;
             if (!state.topic)
-                state.topic = extractSessionTopic(text);
+                state.topic = extractSessionTopic(genuine);
         }
         else {
             state.assistantTexts.push(text);
@@ -3827,6 +3892,7 @@ function finalizeCodexScan(state) {
         version: state.version,
         model: state.model,
         topic: state.topic,
+        firstUserMessage: state.firstUserMessage,
         messageCount: state.messageCount,
         tokenCount: state.tokenCount,
         outputTokens,
@@ -3882,7 +3948,7 @@ async function scanCodexSession(filePath) {
 export function serializeCodexParserState(state, offset, jsonlDroppingOversizedLine = false) {
     const ticket = detectTicket(state.userTexts.join('\n') || undefined, state.gitBranch);
     return {
-        v: 3,
+        v: 4,
         offset,
         jsonlDroppingOversizedLine: jsonlDroppingOversizedLine || undefined,
         sessionId: state.sessionId,
@@ -3892,6 +3958,7 @@ export function serializeCodexParserState(state, offset, jsonlDroppingOversizedL
         version: state.version,
         model: state.model,
         topic: state.topic,
+        firstUserMessage: state.firstUserMessage,
         messageCount: state.messageCount,
         tokenCount: state.tokenCount,
         lastTotalTokenUsage: state.lastTotalTokenUsage,
@@ -3934,6 +4001,7 @@ function hydrateCodexParseState(prior) {
         version: prior.version,
         model: prior.model,
         topic: prior.topic,
+        firstUserMessage: prior.firstUserMessage,
         messageCount: prior.messageCount,
         tokenCount: prior.tokenCount,
         lastTotalTokenUsage: prior.lastTotalTokenUsage,
@@ -4073,7 +4141,7 @@ function parsePriorCodexState(row) {
         return null;
     try {
         const parsed = JSON.parse(row.parserState);
-        if (parsed?.v !== 3 || typeof parsed.offset !== 'number' || parsed.toolCalls?.v !== 1)
+        if (parsed?.v !== 4 || typeof parsed.offset !== 'number' || parsed.toolCalls?.v !== 1)
             return null;
         return parsed;
     }
@@ -4208,7 +4276,7 @@ function getClaudeUsageTotal(usage) {
         usage.cache_read_input_tokens,
     ]);
 }
-/** Extract text from Codex message content blocks, filtering out system instructions for user messages. */
+/** Extract text from Codex message content blocks; the caller classifies user scaffolding. */
 function extractCodexMessageText(contentBlocks, role) {
     if (!Array.isArray(contentBlocks))
         return undefined;
@@ -4217,14 +4285,7 @@ function extractCodexMessageText(contentBlocks, role) {
         : contentBlocks.filter((block) => block.type === 'output_text');
     const text = matches
         .map((block) => String(block.text || '').trim())
-        .find((value) => {
-        if (!value)
-            return false;
-        if (role === 'user' && (value.length >= 2000 || value.includes('<permissions instructions>') || value.startsWith('# AGENTS.md instructions'))) {
-            return false;
-        }
-        return true;
-    });
+        .find((value) => !!value);
     return text || undefined;
 }
 /** Trim and normalize a version string, returning undefined for empty values. */
@@ -4233,11 +4294,18 @@ function normalizeVersion(version) {
     return trimmed ? trimmed : undefined;
 }
 /** Extract the version number from a managed versions/<agent>/<version>/... path under either repo. */
-function extractVersionFromManagedPath(agent, sourcePath) {
+export function extractVersionFromManagedPath(agent, sourcePath) {
     if (!sourcePath)
         return undefined;
     const candidates = [sourcePath, safeRealpathSync(sourcePath) || ''];
     const markers = [`/.agents/versions/${agent}/`, `/.agents-system/versions/${agent}/`];
+    // Codex is relocated by CODEX_HOME to `~/.agents/.codex-homes/<version>/`
+    // (shims.ts `codexHomeShimBash`), NOT the `versions/<agent>/<version>/home/…`
+    // layout every other isolated agent uses — so its rollout transcripts live
+    // under `.codex-homes/<version>/sessions/…` and the markers above never match,
+    // leaving `version` NULL and native resume degraded to `/continue` (PHNX-3626).
+    if (agent === 'codex')
+        markers.push('/.agents/.codex-homes/');
     for (const candidate of candidates) {
         if (!candidate)
             continue;
@@ -4585,16 +4653,30 @@ export function readKimiMeta(filePath, priorRow) {
         project,
         filePath,
         topic,
+        firstUserMessage: newState.firstUserMessage,
         messageCount,
         tokenCount: tokenCount > 0 ? tokenCount : undefined,
         outputTokens: outputTokens > 0 ? outputTokens : undefined,
     };
     return { meta, content: lastPrompt || '', parserState: JSON.stringify(newState) };
 }
+function kimiWireUserText(event) {
+    if (event?.type !== 'context.append_message' || event?.message?.role !== 'user')
+        return undefined;
+    const content = event.message.content;
+    const raw = typeof content === 'string'
+        ? content
+        : Array.isArray(content)
+            ? content.map((part) => typeof part === 'string' ? part : typeof part?.text === 'string' ? part.text : '').join('\n')
+            : '';
+    return cleanFirstUserMessage(raw);
+}
 /** Fold one parsed Kimi wire event into the additive counters, in place. */
 function applyKimiWireEvent(acc, event) {
     if (event.type === 'context.append_message') {
         acc.messageCount++;
+        if (!acc.firstUserMessage)
+            acc.firstUserMessage = kimiWireUserText(event);
     }
     else if (event.type === 'usage.record' && event.usage) {
         // Kimi usage structure: inputOther + output + inputCacheRead + inputCacheCreation
@@ -4624,7 +4706,7 @@ export function parseKimiWireMetricsIncremental(sessionDir, prior) {
     if (!stat) {
         // No wire.jsonl (yet): zero counters, offset 0 so a later append is a clean
         // full parse.
-        return { messageCount: 0, tokenCount: 0, outputTokens: 0, newState: { v: 1, offset: 0, messageCount: 0, tokenCount: 0, outputTokens: 0 } };
+        return { messageCount: 0, tokenCount: 0, outputTokens: 0, newState: { v: 2, offset: 0, messageCount: 0, tokenCount: 0, outputTokens: 0 } };
     }
     // INCREMENTAL only when a usable prior exists AND the file grew past its
     // offset; otherwise FULL from byte 0 with fresh counters (cold start OR the
@@ -4643,8 +4725,8 @@ export function parseKimiWireMetricsIncremental(sessionDir, prior) {
     const canIncrement = prior !== null && stat.size > prior.offset;
     const fromOffset = canIncrement ? prior.offset : 0;
     const acc = canIncrement
-        ? { messageCount: prior.messageCount, tokenCount: prior.tokenCount, outputTokens: prior.outputTokens }
-        : { messageCount: 0, tokenCount: 0, outputTokens: 0 };
+        ? { messageCount: prior.messageCount, tokenCount: prior.tokenCount, outputTokens: prior.outputTokens, firstUserMessage: prior.firstUserMessage }
+        : { messageCount: 0, tokenCount: 0, outputTokens: 0, firstUserMessage: undefined };
     let consumedBytes = 0;
     let fd;
     try {
@@ -4699,7 +4781,7 @@ export function parseKimiWireMetricsIncremental(sessionDir, prior) {
         messageCount: acc.messageCount,
         tokenCount: acc.tokenCount,
         outputTokens: acc.outputTokens,
-        newState: { v: 1, offset: fromOffset + consumedBytes, messageCount: acc.messageCount, tokenCount: acc.tokenCount, outputTokens: acc.outputTokens },
+        newState: { v: 2, offset: fromOffset + consumedBytes, messageCount: acc.messageCount, tokenCount: acc.tokenCount, outputTokens: acc.outputTokens, firstUserMessage: acc.firstUserMessage },
     };
 }
 /**
@@ -4713,7 +4795,7 @@ function parsePriorKimiState(row) {
         return null;
     try {
         const parsed = JSON.parse(row.parserState);
-        if (parsed?.v !== 1 || typeof parsed.offset !== 'number')
+        if (parsed?.v !== 2 || typeof parsed.offset !== 'number')
             return null;
         return parsed;
     }
@@ -4790,6 +4872,84 @@ async function scanGrokIncremental(onProgress) {
     upsertSessionsBatch(scanEntries);
     recordScans(touched);
 }
+/**
+ * Bounded read of a Grok `chat_history.jsonl` for the genuine full first user
+ * turn (PHNX-3621 leftover from #3359). Grok's cheap scan reads only
+ * `summary.json` (a LARGE-transcript harness whose full message log is
+ * deliberately not parsed on the hot tick), but the first turn is at the START
+ * of the log, so a bounded prefix read recovers it without paying the full-file
+ * cost. Production logs lead with a `type:system` record, then a huge
+ * `<user_info>` user dump (no `synthetic_reason`), then a `synthetic_reason`
+ * reminder, then the originating turn at `prompt_index: 0` wrapped in
+ * `<user_query>`. Skip that scaffolding and prefer `prompt_index` when present.
+ * Returns undefined when no genuine user turn appears within the budget.
+ */
+function readGrokFirstUserMessage(sessionDir, maxBytes = 262_144) {
+    const historyPath = path.join(sessionDir, 'chat_history.jsonl');
+    let fd;
+    try {
+        const stat = safeStatSync(historyPath);
+        if (!stat)
+            return undefined;
+        const bytesToRead = Math.min(maxBytes, stat.size);
+        if (bytesToRead <= 0)
+            return undefined;
+        const buf = Buffer.allocUnsafe(bytesToRead);
+        fd = fs.openSync(historyPath, 'r');
+        let read = 0;
+        while (read < bytesToRead) {
+            const n = fs.readSync(fd, buf, read, bytesToRead - read, read);
+            if (n <= 0)
+                break;
+            read += n;
+        }
+        const chunk = buf.subarray(0, read).toString('utf-8');
+        // Drop a trailing partial line so we never parse half a JSON record.
+        const lastNl = chunk.lastIndexOf('\n');
+        const complete = lastNl === -1 ? chunk : chunk.slice(0, lastNl);
+        let firstGenuine;
+        for (const line of complete.split('\n')) {
+            if (!line.trim())
+                continue;
+            let msg;
+            try {
+                msg = JSON.parse(line);
+            }
+            catch {
+                continue;
+            }
+            if (msg?.type !== 'user')
+                continue;
+            if (msg.synthetic_reason)
+                continue;
+            const raw = msg.content;
+            const text = typeof raw === 'string'
+                ? raw
+                : Array.isArray(raw)
+                    ? raw.map((p) => (typeof p?.text === 'string' ? p.text : '')).join('')
+                    : '';
+            const genuine = cleanFirstUserMessage(text);
+            if (!genuine)
+                continue;
+            if (msg.prompt_index != null)
+                return genuine;
+            if (!firstGenuine)
+                firstGenuine = genuine;
+        }
+        return firstGenuine;
+    }
+    catch {
+        return undefined;
+    }
+    finally {
+        if (fd !== undefined) {
+            try {
+                fs.closeSync(fd);
+            }
+            catch { /* already closed / gone */ }
+        }
+    }
+}
 /** Parse a single Grok session summary.json into session metadata. */
 export function readGrokMeta(filePath, currentVersion) {
     let summary;
@@ -4842,6 +5002,7 @@ export function readGrokMeta(filePath, currentVersion) {
         filePath,
         version: resolveSessionVersion('grok', filePath, embeddedVersion, currentVersion),
         topic,
+        firstUserMessage: readGrokFirstUserMessage(sessionDir),
         messageCount,
     };
     return { meta, content: topic || '' };

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

@@ -1,3 +1,16 @@
+/**
+ * Team prefixes that match the key shape but are not trackers — unit strings and
+ * common acronyms. Canonical here (the Linear module) so both the URL linkifier
+ * and the session-transcript ticket detector (`detectTicket` in `state.ts`) agree
+ * on what is a real key rather than each keeping its own copy.
+ */
+export declare const LINEAR_KEY_DENYLIST: ReadonlySet<string>;
+/**
+ * Every distinct real Linear key mentioned in free text, in first-seen order.
+ * Honours {@link LINEAR_KEY_DENYLIST} so `UTF-8` / `X86-64` never count. Used to
+ * linkify ticket ids an owner ping only names in prose (no `session.ticketId`).
+ */
+export declare function linearIssueKeys(text: string | undefined): string[];
 /** The configured Linear workspace slug, or undefined when unknown. Cached per process. */
 export declare function linearWorkspace(): string | undefined;
 /** Canonical Linear issue URL for a tracker key, or undefined if unresolvable. */