@adhdev/daemon-core 0.9.82-rc.185 → 0.9.82-rc.187

package/src/providers/spec/cli-adapter.ts

@@ -36,6 +36,14 @@ import {
     type InteractivePromptResponse,
 } from '../types/interactive-prompt.js';
 
+function stripAnsi(text: string): string {
+    // eslint-disable-next-line no-control-regex
+    return String(text || '')
+        .replace(/\x1B\][^\x07]*(?:\x07|\x1B\\)/g, '')
+        .replace(/\x1B[P^_X][\s\S]*?(?:\x07|\x1B\\)/g, '')
+        .replace(/\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g, '');
+}
+
 export class SpecCliAdapter implements CliAdapter {
     readonly cliType: string;
     readonly cliName: string;
@@ -129,15 +137,16 @@ export class SpecCliAdapter implements CliAdapter {
     }
 
     getStatus(): CliAdapterStatus {
-        if (this.exited) return { status: 'stopped', messages: [], activeModal: null, activeInteractivePrompt: this.activeInteractivePrompt };
-        if (!this.spawned) return { status: 'starting', messages: [], activeModal: null, activeInteractivePrompt: this.activeInteractivePrompt };
+        const sessionFields = this.providerSessionId ? { providerSessionId: this.providerSessionId } : {};
+        if (this.exited) return { status: 'stopped', messages: [], activeModal: null, activeInteractivePrompt: this.activeInteractivePrompt, ...sessionFields };
+        if (!this.spawned) return { status: 'starting', messages: [], activeModal: null, activeInteractivePrompt: this.activeInteractivePrompt, ...sessionFields };
 
         // Refresh native history lazily — the watch_path is cheap to stat,
         // but parsing a full session.jsonl every call would be wasteful.
         this.maybeRefreshNativeHistory();
 
         const state = this.latestState;
-        if (!state) return { status: 'starting', messages: [], activeModal: null, activeInteractivePrompt: this.activeInteractivePrompt };
+        if (!state) return { status: 'starting', messages: [], activeModal: null, activeInteractivePrompt: this.activeInteractivePrompt, ...sessionFields };
 
         const modal = this.latestModal;
         const lc = state.id.toLowerCase();
@@ -150,12 +159,13 @@ export class SpecCliAdapter implements CliAdapter {
                     buttons: modal.buttons.map(b => b.label),
                 },
                 activeInteractivePrompt: this.activeInteractivePrompt,
+                ...sessionFields,
             };
         }
         if (lc === 'busy' || lc === 'generating') {
-            return { status: 'generating', messages: [], activeModal: null, activeInteractivePrompt: this.activeInteractivePrompt };
+            return { status: 'generating', messages: [], activeModal: null, activeInteractivePrompt: this.activeInteractivePrompt, ...sessionFields };
         }
-        return { status: 'idle', messages: [], activeModal: null, activeInteractivePrompt: this.activeInteractivePrompt };
+        return { status: 'idle', messages: [], activeModal: null, activeInteractivePrompt: this.activeInteractivePrompt, ...sessionFields };
     }
 
     private maybeRefreshNativeHistory(): void {
@@ -165,10 +175,13 @@ export class SpecCliAdapter implements CliAdapter {
     }
 
     getScriptParsedStatus(): unknown {
+        const providerSessionId = this.extractProviderSessionIdFromScreen();
+        if (providerSessionId) this.providerSessionId = providerSessionId;
         const status = this.getStatus();
         return {
             ...status,
             messages: this.readClaudeScreenAssistantMessages(),
+            ...(this.providerSessionId ? { providerSessionId: this.providerSessionId } : {}),
         };
     }
 
@@ -345,6 +358,7 @@ export class SpecCliAdapter implements CliAdapter {
             displayName: this.spec.name,
             spawnedAtMs: this.spawnedAtMs,
             spawnedEnv: this.spawnedEnv,
+            ...(this.providerSessionId ? { providerSessionId: this.providerSessionId } : {}),
         };
     }
     updateRuntimeMeta(meta?: Record<string, unknown>): void {
@@ -419,6 +433,19 @@ export class SpecCliAdapter implements CliAdapter {
         }
     }
 
+    private extractProviderSessionIdFromScreen(): string | undefined {
+        if (this.cliType !== 'codex-cli') return this.providerSessionId;
+        let screenText = '';
+        try {
+            screenText = this.driver.snapshot();
+        } catch {
+            return this.providerSessionId;
+        }
+        const clean = stripAnsi(screenText);
+        const match = clean.match(/(?:gpt-|o\d|codex-)[^\n·]*·[^\n·]*·\s*([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})/i);
+        return match?.[1] || this.providerSessionId;
+    }
+
     private readClaudeScreenAssistantMessages(): ChatMessage[] {
         if (this.cliType !== 'claude-cli') return [];
         let screenText = '';

package/src/providers/spec/evaluator.ts

@@ -231,8 +231,18 @@ export function evaluate(spec: CliSpec, screenText: string): SpecEvaluation {
     for (const st of spec.states) {
         const { matched, title } = matchState(st, sections, screenText, trace);
         if (!matched) continue;
+        const extractedModal = extractModal(st, sections, screenText, title, trace);
+        // If the state declares modal_buttons but extraction failed (button
+        // count below min_count, or text-was-mistaken-for-modal), do not
+        // promote the state. Otherwise we would surface a phantom approval
+        // built from arbitrary screen text — see claude-cli numbered-list
+        // false-positive on 2026-06-07.
+        if (st.modal_buttons && !extractedModal) {
+            trace.push({ kind: 'state_skip', text: `state[${st.id}] matched but modal_buttons extraction failed — not promoting` });
+            continue;
+        }
         activeState = { id: st.id, label: st.label, title };
-        modal = extractModal(st, sections, screenText, title, trace);
+        modal = extractedModal;
         break;
     }
 

package/src/providers/spec/native-history-executor.ts

@@ -58,6 +58,7 @@ export interface NativeHistoryMessage {
     content: string;
     receivedAt: number;
     kind?: string;
+    workspace?: string;
 }
 
 export interface NativeHistoryResult {
@@ -66,6 +67,7 @@ export interface NativeHistoryResult {
     sourcePath: string;
     sourceMtimeMs: number;
     nativeHistoryCoverage?: 'full' | 'partial' | 'best-effort';
+    workspace?: string;
 }
 
 const UUID_RE = /([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})/i;
@@ -87,6 +89,7 @@ function executeJsonl(src: NativeHistoryJsonlSource, input: NativeHistoryInput):
 
     const windowMs = typeof src.recent_window_ms === 'number' ? src.recent_window_ms : 5 * 60_000;
     const filePat = src.file_pattern ? globToRegex(src.file_pattern) : /.*\.jsonl$/;
+    const requestedSessionId = readRequestedSessionId(input);
 
     // path can be:
     //   - a concrete file  → used as-is
@@ -112,7 +115,8 @@ function executeJsonl(src: NativeHistoryJsonlSource, input: NativeHistoryInput):
     const workspaceHint = typeof input.workspace === 'string' && input.workspace.trim() ? input.workspace.trim() : '';
     let sourcePath: string | null = null;
     if (resolved.includes('*')) {
-        sourcePath = pickSessionBoundFileAcrossGlob(resolved, filePat, windowMs, sessionFloor, workspaceHint)
+        sourcePath = pickExactSessionFileAcrossGlob(resolved, filePat, requestedSessionId)
+            || pickSessionBoundFileAcrossGlob(resolved, filePat, windowMs, sessionFloor, workspaceHint)
             || newestRecentFileAcrossGlob(resolved, filePat, windowMs, sessionFloor);
     } else {
         let stat: fs.Stats | null = null;
@@ -120,18 +124,18 @@ function executeJsonl(src: NativeHistoryJsonlSource, input: NativeHistoryInput):
         if (stat && stat.isFile()) {
             sourcePath = resolved;
         } else if (stat && stat.isDirectory()) {
-            sourcePath = pickSessionBoundFile(resolved, filePat, windowMs, sessionFloor, workspaceHint)
-                || newestRecentFile(resolved, filePat, windowMs, sessionFloor);
+            sourcePath = pickExactSessionFile(resolved, filePat, requestedSessionId)
+                || (requestedSessionId ? null : pickSessionBoundFile(resolved, filePat, windowMs, sessionFloor, workspaceHint))
+                || (requestedSessionId ? null : newestRecentFile(resolved, filePat, windowMs, sessionFloor));
         }
         // Date-templated directories (e.g. ~/.codex/sessions/{yyyy}/{mm}/{dd})
-        // expand to today's UTC dir. A session started before UTC midnight
-        // keeps appending to its previous-day file, so today's dir never
-        // contains the live transcript. When the templated dir is empty
-        // or doesn't exist yet, walk the last 3 UTC days at the same depth
-        // and pick the newest matching rollout across all of them.
+        // can drift from the provider's chosen calendar day because CLIs
+        // disagree on local-vs-UTC date buckets. Search nearby date dirs
+        // before falling back to non-exact matching.
         if (!sourcePath && hasDateTemplateSegment(src.path)) {
-            sourcePath = pickSessionBoundFileAcrossDateWindow(src.path, input, filePat, windowMs, sessionFloor, workspaceHint)
-                || newestRecentFileAcrossDateWindow(src.path, input, filePat, windowMs, sessionFloor);
+            sourcePath = pickExactSessionFileAcrossDateWindow(src.path, input, filePat, requestedSessionId)
+                || (requestedSessionId ? null : pickSessionBoundFileAcrossDateWindow(src.path, input, filePat, windowMs, sessionFloor, workspaceHint))
+                || (requestedSessionId ? null : newestRecentFileAcrossDateWindow(src.path, input, filePat, windowMs, sessionFloor));
         }
     }
     if (!sourcePath) return null;
@@ -139,6 +143,7 @@ function executeJsonl(src: NativeHistoryJsonlSource, input: NativeHistoryInput):
     const mtime = safeMtimeMs(sourcePath);
     const lines = readJsonlLines(sourcePath);
     if (lines.length === 0) return null;
+    const transcriptWorkspace = readSessionMetaWorkspace(lines);
 
     // session id: filename uuid or extracted from first record
     let providerSessionId: string | undefined;
@@ -150,7 +155,7 @@ function executeJsonl(src: NativeHistoryJsonlSource, input: NativeHistoryInput):
         if (m) providerSessionId = m[1];
     }
 
-    const requested = input.providerSessionId || '';
+    const requested = requestedSessionId || '';
     if (requested && providerSessionId && providerSessionId !== requested) return null;
 
     const filter = src.message_filter ? compileWhere(src.message_filter.where) : null;
@@ -159,7 +164,10 @@ function executeJsonl(src: NativeHistoryJsonlSource, input: NativeHistoryInput):
         const rec = lines[i];
         if (filter && !filter(rec)) continue;
         const msg = projectMessage(rec, src.message_map, i, lines.length, mtime);
-        if (msg) messages.push(msg);
+        if (msg) {
+            if (transcriptWorkspace) msg.workspace = transcriptWorkspace;
+            messages.push(msg);
+        }
     }
     if (messages.length === 0) return null;
 
@@ -169,9 +177,19 @@ function executeJsonl(src: NativeHistoryJsonlSource, input: NativeHistoryInput):
         sourcePath,
         sourceMtimeMs: mtime,
         nativeHistoryCoverage: 'full',
+        workspace: transcriptWorkspace,
     };
 }
 
+function readSessionMetaWorkspace(lines: any[]): string | undefined {
+    for (const record of lines.slice(0, 5)) {
+        if (String(record?.type ?? '') !== 'session_meta') continue;
+        const cwd = typeof record?.payload?.cwd === 'string' ? record.payload.cwd.trim() : '';
+        if (cwd) return cwd;
+    }
+    return undefined;
+}
+
 function readJsonlLines(p: string): any[] {
     let text: string;
     try { text = fs.readFileSync(p, 'utf8'); } catch { return []; }
@@ -292,9 +310,9 @@ function expandPath(template: string, input: NativeHistoryInput): string | null
         cwd: workspaceResolved,
         cwd_dashed: workspaceResolved.replace(/\//g, '-'),
         session_id: input.providerSessionId || input.sessionId || input.historySessionId || '',
-        yyyy: String(now.getUTCFullYear()),
-        mm: String(now.getUTCMonth() + 1).padStart(2, '0'),
-        dd: String(now.getUTCDate()).padStart(2, '0'),
+        yyyy: String(now.getFullYear()),
+        mm: String(now.getMonth() + 1).padStart(2, '0'),
+        dd: String(now.getDate()).padStart(2, '0'),
     };
     // Replace {var}. If a referenced variable is empty (e.g. session_id
     // before the agent has allocated one), return null so the caller
@@ -393,12 +411,10 @@ function hasDateTemplateSegment(template: string): boolean {
 }
 
 /**
- * Walk the last N UTC days of a date-templated path (e.g.
+ * Walk nearby local calendar days of a date-templated path (e.g.
  * `~/.codex/sessions/{yyyy}/{mm}/{dd}`) and return the newest matching
- * file across all of them. Codex sessions started just before UTC
- * midnight keep writing to their original day's file even after the
- * date rolls over, so today's expanded dir alone misses the live
- * transcript.
+ * file across all of them. Providers differ on local-vs-UTC date buckets,
+ * so today's expanded dir alone can miss a live transcript.
  */
 function newestRecentFileAcrossDateWindow(
     template: string,
@@ -409,8 +425,8 @@ function newestRecentFileAcrossDateWindow(
 ): string | null {
     const cutoff = Math.max(Date.now() - windowMs, sessionFloorMs);
     let best: { p: string; mtime: number } | null = null;
-    for (let dayOffset = 0; dayOffset < 3; dayOffset += 1) {
-        const dayMs = Date.now() - dayOffset * 24 * 60 * 60 * 1000;
+    for (const dayOffset of [0, -1, 1, -2, 2]) {
+        const dayMs = Date.now() + dayOffset * 24 * 60 * 60 * 1000;
         const dayInput: NativeHistoryInput = { ...input, sessionStartedAtMs: sessionFloorMs };
         const resolved = expandPathForDate(template, dayInput, new Date(dayMs));
         if (!resolved) continue;
@@ -448,9 +464,9 @@ function expandPathForDate(template: string, input: NativeHistoryInput, day: Dat
         cwd: workspaceResolved,
         cwd_dashed: workspaceResolved.replace(/\//g, '-'),
         session_id: input.providerSessionId || input.sessionId || input.historySessionId || '',
-        yyyy: String(day.getUTCFullYear()),
-        mm: String(day.getUTCMonth() + 1).padStart(2, '0'),
-        dd: String(day.getUTCDate()).padStart(2, '0'),
+        yyyy: String(day.getFullYear()),
+        mm: String(day.getMonth() + 1).padStart(2, '0'),
+        dd: String(day.getDate()).padStart(2, '0'),
     };
     let missing = false;
     out = out.replace(/\{([a-zA-Z_][a-zA-Z0-9_]*)\}/g, (_m, name) => {
@@ -481,6 +497,56 @@ function safeMtimeMs(p: string): number {
     try { return Math.floor(fs.statSync(p).mtimeMs); } catch { return 0; }
 }
 
+function readRequestedSessionId(input: NativeHistoryInput): string {
+    const raw = input.providerSessionId || input.sessionId || input.historySessionId || '';
+    const value = typeof raw === 'string' ? raw.trim() : '';
+    return UUID_RE.test(value) ? value : '';
+}
+
+function filenameUuid(filePath: string): string {
+    const match = path.basename(filePath).match(UUID_RE);
+    return match?.[1] || '';
+}
+
+function pickExactSessionFile(dir: string, pattern: RegExp, requestedSessionId: string): string | null {
+    if (!requestedSessionId) return null;
+    const files = listMatchingFiles(dir, pattern)
+        .filter(p => filenameUuid(p).toLowerCase() === requestedSessionId.toLowerCase())
+        .sort((a, b) => safeMtimeMs(b) - safeMtimeMs(a));
+    return files[0] || null;
+}
+
+function pickExactSessionFileAcrossGlob(template: string, pattern: RegExp, requestedSessionId: string): string | null {
+    if (!requestedSessionId) return null;
+    const dirs = expandDirGlob(template);
+    const matches: string[] = [];
+    for (const d of dirs) {
+        const found = pickExactSessionFile(d, pattern, requestedSessionId);
+        if (found) matches.push(found);
+    }
+    matches.sort((a, b) => safeMtimeMs(b) - safeMtimeMs(a));
+    return matches[0] || null;
+}
+
+function pickExactSessionFileAcrossDateWindow(
+    template: string,
+    input: NativeHistoryInput,
+    pattern: RegExp,
+    requestedSessionId: string,
+): string | null {
+    if (!requestedSessionId) return null;
+    const matches: string[] = [];
+    for (const dayOffset of [0, -1, 1, -2, 2]) {
+        const dayMs = Date.now() + dayOffset * 24 * 60 * 60 * 1000;
+        const resolved = expandPathForDate(template, input, new Date(dayMs));
+        if (!resolved) continue;
+        const found = pickExactSessionFile(resolved, pattern, requestedSessionId);
+        if (found) matches.push(found);
+    }
+    matches.sort((a, b) => safeMtimeMs(b) - safeMtimeMs(a));
+    return matches[0] || null;
+}
+
 // ────────────────────────────────────────────────────────────────────────────
 // Per-session rollout binding
 //
@@ -624,8 +690,8 @@ function pickSessionBoundFileAcrossDateWindow(
     if (!sessionFloorMs || !workspaceHint) return null;
     const cutoff = Math.max(Date.now() - windowMs, sessionFloorMs - SPAWN_BIND_GRACE_MS);
     const files: string[] = [];
-    for (let dayOffset = 0; dayOffset < 3; dayOffset += 1) {
-        const dayMs = sessionFloorMs - dayOffset * 24 * 60 * 60 * 1000;
+    for (const dayOffset of [0, -1, 1, -2, 2]) {
+        const dayMs = sessionFloorMs + dayOffset * 24 * 60 * 60 * 1000;
         const dayInput: NativeHistoryInput = { ...input, sessionStartedAtMs: sessionFloorMs };
         const resolved = expandPathForDate(template, dayInput, new Date(dayMs));
         if (!resolved) continue;

package/src/providers/types/interactive-prompt.ts

@@ -217,7 +217,19 @@ function parseClaudeHeaderlessInteractiveTuiQuestion(page: ClaudeInteractiveTuiP
   let question = '';
   for (let i = firstOptionIndex - 1; i >= 0; i -= 1) {
     const candidate = lines[i].trim();
-    if (!candidate || /^─+$/.test(candidate) || /^[☐☒]\s+/.test(candidate)) continue;
+    if (!candidate || /^─+$/.test(candidate)) continue;
+    // Standalone ☐/☒ markers (decorative section dividers in the headered
+    // variant) are not the question — keep skipping them.
+    if (/^[☐☒]\s*$/.test(candidate)) continue;
+    // The headerless variant introduced in claude-cli >=2.1 prefixes the
+    // actual question with `☐ ` (e.g. "☐ RPS R1 1라운드 — …"). Previously
+    // we skipped any ☐/☒ line and returned null, never opening the picker.
+    // Strip the marker so the dashboard label matches the on-screen text.
+    const markerMatch = candidate.match(/^[☐☒]\s+(.+)$/);
+    if (markerMatch) {
+      question = markerMatch[1].trim();
+      break;
+    }
     question = candidate;
     break;
   }