@adhdev/daemon-core 0.9.82-rc.49 → 0.9.82-rc.491

package/src/providers/acp-provider-instance.ts

@@ -51,7 +51,9 @@ import { normalizeContent, flattenContent, normalizeInputEnvelope } from './cont
 import { assertProviderSupportsDeclaredInput, getEffectiveMessageInputSupport } from './provider-input-support.js';
 import type { ProviderInstance, ProviderState, AcpProviderState, ProviderErrorReason, ProviderEvent, InstanceContext, SessionModalState } from './provider-instance.js';
 import { StatusMonitor } from './status-monitor.js';
+import { ManualAttendanceTracker } from './manual-attendance.js';
 import { buildLegacyModelModeSummaryMetadata } from './summary-metadata.js';
+import { workingDirBasename } from './working-dir.js';
 import {
     buildAssistantChatMessage,
     buildChatMessage,
@@ -287,6 +289,8 @@ export class AcpProviderInstance implements ProviderInstance {
     private partialBlocks: ContentBlock[] = [];
     /** Tool calls collected during current turn */
     private turnToolCalls: ToolCallInfo[] = [];
+ /** Guard: prevent concurrent sendPrompt calls from racing on shared state */
+    private _sendPromptInFlight = false;
 
  // Error tracking
     private errorMessage: string | null = null;
@@ -326,8 +330,8 @@ export class AcpProviderInstance implements ProviderInstance {
         this.settings = context.settings || {};
         this.monitor.updateConfig({
             approvalAlert: this.settings.approvalAlert !== false,
-            longGeneratingAlert: this.settings.longGeneratingAlert !== false,
-            longGeneratingThresholdSec: this.settings.longGeneratingThresholdSec || 180,
+            noProgressAlert: (this.settings.noProgressAlert ?? this.settings.longGeneratingAlert) !== false,
+            noProgressThresholdSec: this.settings.noProgressThresholdSec ?? this.settings.longGeneratingThresholdSec ?? 180,
         });
 
         await this.spawnAgent();
@@ -343,7 +347,7 @@ export class AcpProviderInstance implements ProviderInstance {
     }
 
     getSessionModalState(): SessionModalState {
-        const dirName = this.workingDir.split('/').filter(Boolean).pop() || 'session';
+        const dirName = workingDirBasename(this.workingDir);
         return {
             id: this.instanceId,
             status: this.currentStatus,
@@ -356,7 +360,7 @@ export class AcpProviderInstance implements ProviderInstance {
     }
 
     getState(): AcpProviderState {
-        const dirName = this.workingDir.split('/').filter(Boolean).pop() || 'session';
+        const dirName = workingDirBasename(this.workingDir);
 
         const recentMessages = normalizeChatMessages(this.messages.map(m => {
             const content = m.content;
@@ -671,8 +675,8 @@ export class AcpProviderInstance implements ProviderInstance {
         this.settings = { ...this.settings, ...newSettings };
         this.monitor.updateConfig({
             approvalAlert: this.settings.approvalAlert !== false,
-            longGeneratingAlert: this.settings.longGeneratingAlert !== false,
-            longGeneratingThresholdSec: this.settings.longGeneratingThresholdSec || 180,
+            noProgressAlert: (this.settings.noProgressAlert ?? this.settings.longGeneratingAlert) !== false,
+            noProgressThresholdSec: this.settings.noProgressThresholdSec ?? this.settings.longGeneratingThresholdSec ?? 180,
         });
         this.log.info(`[${this.type}] Settings updated: ${Object.keys(newSettings).join(', ')}`);
     }
@@ -842,7 +846,12 @@ export class AcpProviderInstance implements ProviderInstance {
                 }
 
                 // ─── Auto-approve: skip user confirmation ───
-                if (this.settings.autoApprove !== false) {
+                // Held while a human is actively attending this session (manual
+                // attendance) so they can decide the permission themselves; falls
+                // through to the waiting_approval manual path below. A background
+                // worker is never attended, so its delegated auto-approve fires
+                // as before.
+                if (this.settings.autoApprove !== false && !this.manualAttendance.isAttended()) {
                     const toolTitle = tc.title || tc.toolCallId || 'tool call';
                     this.log.info(`[${this.type}] Auto-approving: ${toolTitle}`);
                     this.appendSystemMessage(`Auto-approved: ${toolTitle}`);
@@ -1002,7 +1011,11 @@ export class AcpProviderInstance implements ProviderInstance {
             }
         } catch (e: any) {
             this.log.warn(`[${this.type}] session/new failed: ${e?.message}`);
-            this.currentStatus = 'idle';
+            if (!this.errorReason) {
+                this.errorReason = 'init_failed';
+                this.errorMessage = `ACP session creation failed: ${e?.message}`;
+            }
+            this.currentStatus = 'error';
         }
     }
 
@@ -1012,6 +1025,12 @@ export class AcpProviderInstance implements ProviderInstance {
             return;
         }
 
+        if (this._sendPromptInFlight) {
+            this.log.warn(`[${this.type}] sendPrompt already in flight — dropping concurrent request`);
+            throw new Error('ACP sendPrompt already in flight');
+        }
+        this._sendPromptInFlight = true;
+
  // Build prompt content
         const promptParts: any[] = contentBlocks && contentBlocks.length > 0
             ? contentBlocks.map((b) => {
@@ -1098,6 +1117,8 @@ export class AcpProviderInstance implements ProviderInstance {
             this.finalizeAssistantMessage();
             this.currentStatus = 'idle';
             this.detectStatusTransition();
+        } finally {
+            this._sendPromptInFlight = false;
         }
     }
 
@@ -1113,6 +1134,17 @@ export class AcpProviderInstance implements ProviderInstance {
 
     private permissionResolvers: ((approved: boolean) => void)[] = [];
 
+    // Provider-common manual-attendance signal: while a human is actively driving
+    // this session from the dashboard, auto-approve holds so they can decide on
+    // the permission request themselves. Background workers are never attended →
+    // delegated auto-approve is unaffected.
+    private readonly manualAttendance = new ManualAttendanceTracker();
+
+    /** @see ProviderInstance.noteManualInteraction */
+    noteManualInteraction(now = Date.now()): void {
+        this.manualAttendance.note(now);
+    }
+
     async resolvePermission(approved: boolean): Promise<void> {
         const resolver = this.permissionResolvers.shift();
         if (resolver) {
@@ -1490,7 +1522,7 @@ export class AcpProviderInstance implements ProviderInstance {
     private detectStatusTransition(): void {
         const now = Date.now();
         const newStatus = this.currentStatus;
-        const dirName = this.workingDir.split('/').filter(Boolean).pop() || 'session';
+        const dirName = workingDirBasename(this.workingDir);
         const chatTitle = `${this.provider.name} · ${dirName}`;
         const progressFingerprint = newStatus === 'generating'
             ? `${this.partialContent}::${JSON.stringify(this.partialBlocks)}::${JSON.stringify(this.activeToolCalls.map(t => ({ name: t.name, status: t.status })))}`.slice(-2000)
@@ -1518,7 +1550,8 @@ export class AcpProviderInstance implements ProviderInstance {
 
  // Monitor check
         const agentKey = `${this.type}:acp`;
-        const monitorEvents = this.monitor.check(agentKey, newStatus, now, progressFingerprint);
+        const approvalPending = newStatus === 'waiting_approval';
+        const monitorEvents = this.monitor.check(agentKey, newStatus, now, progressFingerprint, approvalPending);
         for (const me of monitorEvents) {
             this.pushEvent({ event: me.type, agentKey: me.agentKey, message: me.message, elapsedSec: me.elapsedSec, timestamp: me.timestamp });
         }

package/src/providers/approval-utils.d.ts

@@ -4,4 +4,9 @@ export declare function pickApprovalButton(buttons: string[] | null | undefined,
     index: number;
     label: string;
 };
+export declare function pickAutoApprovalButton(buttons: string[] | null | undefined): {
+    index: number;
+    label: string;
+};
+export declare function hasNegativeApprovalOption(buttons: string[] | null | undefined): boolean;
 export declare function formatAutoApprovalMessage(modalMessage?: string, buttonLabel?: string): string;

package/src/providers/approval-utils.ts

@@ -16,7 +16,7 @@ const DEFAULT_APPROVAL_POSITIVE_HINTS = [
     'always allow',
 ];
 
-function normalizeApprovalLabel(value: string): string {
+export function normalizeApprovalLabel(value: string): string {
     return String(value || '')
         .toLowerCase()
         .replace(/^[\s\[(<{]*\d+(?:\s*[.)\]}>:-]|\s)+/, '')
@@ -24,6 +24,65 @@ function normalizeApprovalLabel(value: string): string {
         .trim();
 }
 
+function isNegativeApprovalLabel(value: string): boolean {
+    const label = normalizeApprovalLabel(value);
+    return /^(no|deny|reject|cancel|skip|exit|stop)\b/.test(label)
+        || /\bwithout\b/.test(label)
+        || /\bdo not\b/.test(label);
+}
+
+/**
+ * True when any of the given button labels reads as a decline/negative option
+ * (No / Deny / Cancel / Skip / …). Used as the second half of an approval-modal
+ * structural anchor: a real approval modal offers BOTH an affirmative and a
+ * decline, which distinguishes it from a generic numbered menu or prose list.
+ */
+export function hasNegativeApprovalOption(buttons: string[] | null | undefined): boolean {
+    return (buttons || []).some((button) => isNegativeApprovalLabel(String(button || '')));
+}
+
+/**
+ * True when a button reliably identifies a tool-CONSENT modal on its own — a
+ * scoped permission-grant affirmative such as:
+ *   - "Yes, allow all edits in tmp/ during this session"
+ *   - "Yes, and don't ask again for example.com"
+ *   - "Yes, allow reading from etc/ from this project"
+ *   - "Always allow"
+ *
+ * These options only ever appear in a genuine approval/permission prompt; a
+ * /model or /mode picker ("1. Default  2. Opus  3. Sonnet") never offers a
+ * "grant this scope" choice. They therefore serve as a SECOND reliable
+ * structural anchor alongside {@link hasNegativeApprovalOption}.
+ *
+ * Why this exists (tall-diff fallback, #137): when a Write/Edit diff is tall,
+ * the trailing decline option ("3. No") can scroll off the bottom of the
+ * captured PTY frame, leaving only "1. Yes" + "2. Yes, allow … this session".
+ * hasNegativeApprovalOption then reads false and the auto-approve gate bails —
+ * a delegated worker sits forever on a modal it could safely have approved. The
+ * grant-scope affirmative lets the gate recognize the consent modal WITHOUT
+ * seeing the off-frame decline. The gate still selects the plain "Yes"
+ * (allow-once) via pickApprovalButton, never the broader grant, and the settle
+ * gate still requires a stable modal — so a half-rendered frame never fires.
+ * Kept deliberately narrow so no picker/confirm modal can trip it.
+ */
+export function hasReliableApprovalAffirmative(buttons: string[] | null | undefined): boolean {
+    return (buttons || []).some((button) => {
+        const label = normalizeApprovalLabel(String(button || ''));
+        if (!label) return false;
+        // "always allow …" as a standalone grant option.
+        if (/^always allow\b/.test(label)) return true;
+        // "yes, …" scoped grants: allow / always allow / don't ask again / etc.
+        // (normalizeApprovalLabel strips the apostrophe, so "don't" → "don t").
+        if (/^yes\b/.test(label)) {
+            if (/\ballow\b/.test(label)) return true;
+            if (/\bask again\b/.test(label)) return true;
+            if (/\bduring this session\b/.test(label)) return true;
+            if (/\bfrom this project\b/.test(label)) return true;
+        }
+        return false;
+    });
+}
+
 export function getApprovalPositiveHints(provider?: Pick<ProviderModule, 'approvalPositiveHints'> | null): string[] {
     const customHints = Array.isArray(provider?.approvalPositiveHints)
         ? provider.approvalPositiveHints
@@ -39,24 +98,32 @@ export function pickApprovalButton(
 ): { index: number; label: string } {
     const labels = (buttons || []).map((button) => String(button || '').trim()).filter(Boolean);
     if (labels.length === 0) {
-        return { index: 0, label: 'Approve' };
+        return { index: -1, label: '' };
     }
 
     const normalizedButtons = labels.map((label) => normalizeApprovalLabel(label));
     const hints = getApprovalPositiveHints(provider);
 
     for (const hint of hints) {
-        const exactIndex = normalizedButtons.findIndex((label) => label === hint);
+        const exactIndex = normalizedButtons.findIndex((label, index) => label === hint && !isNegativeApprovalLabel(labels[index]));
         if (exactIndex >= 0) return { index: exactIndex, label: labels[exactIndex] };
 
-        const prefixIndex = normalizedButtons.findIndex((label) => label.startsWith(hint));
+        const prefixIndex = normalizedButtons.findIndex((label, index) => label.startsWith(hint) && !isNegativeApprovalLabel(labels[index]));
         if (prefixIndex >= 0) return { index: prefixIndex, label: labels[prefixIndex] };
 
-        const includeIndex = normalizedButtons.findIndex((label) => label.includes(hint));
+        const includeIndex = normalizedButtons.findIndex((label, index) => label.includes(hint) && !isNegativeApprovalLabel(labels[index]));
         if (includeIndex >= 0) return { index: includeIndex, label: labels[includeIndex] };
     }
 
-    return { index: 0, label: labels[0] };
+    return { index: -1, label: '' };
+}
+
+export function pickAutoApprovalButton(
+    buttons: string[] | null | undefined,
+): { index: number; label: string } {
+    const labels = (buttons || []).map((button) => String(button || '').trim());
+    const index = labels.findIndex(Boolean);
+    return index >= 0 ? { index, label: labels[index] } : { index: -1, label: '' };
 }
 
 export function formatAutoApprovalMessage(modalMessage?: string, buttonLabel?: string): string {
@@ -65,3 +132,30 @@ export function formatAutoApprovalMessage(modalMessage?: string, buttonLabel?: s
     if (cleanMessage) lines.push(cleanMessage);
     return lines.join('\n');
 }
+
+/**
+ * Returns true when the given text (e.g. last assistant message content, or
+ * the tail of the PTY screen) looks like an active approval/input prompt
+ * rather than a completed assistant response. Used to prevent false
+ * idle/completion events when Claude Code surfaces a "Do you want to proceed?"
+ * style prompt that the PTY parser captures as an assistant turn while the
+ * session is still awaiting user input.
+ */
+export function looksLikeActiveApprovalPromptText(content: string): boolean {
+    const text = content.trim();
+    if (!text || text.length > 2000) return false;
+    const hasApprovalQuestion = /do you want to (?:proceed|allow|run|make this edit|create)/i.test(text)
+        || /this command requires approval/i.test(text)
+        || /quick safety check/i.test(text)
+        || /is this a project you trust/i.test(text);
+    const hasNumberedChoices = /^\s*[❯›>]?\s*1[.)]\s+(?:yes|allow|proceed|run)/im.test(text)
+        || /^\s*1[.)]\s+yes\b/im.test(text);
+    if (hasApprovalQuestion && hasNumberedChoices) return true;
+    const lastLines = text.split(/\r?\n/).slice(-12).join('\n');
+    const hasDontAskAgain = /yes.*don'?t ask again/i.test(lastLines)
+        || /yes.*always allow/i.test(lastLines);
+    const hasNoOption = /^\s*[❯›>]?\s*\d+[.)]\s+no\b/im.test(lastLines);
+    if (hasDontAskAgain && hasNoOption) return true;
+    if (/what do you want to do\?/i.test(text) && /^\s*\d+[.)]\s+\S/m.test(text)) return true;
+    return false;
+}

package/src/providers/chat-message-normalization.ts

@@ -1,7 +1,7 @@
 import type { ChatMessage } from '../types.js';
 import { flattenContent } from './contracts.js';
 
-export const DEFAULT_FINAL_SUMMARY_MAX_CHARS = 4_000;
+export const DEFAULT_FINAL_SUMMARY_MAX_CHARS = 16_000;
 
 export function extractFinalSummaryFromMessages(
   messages: ChatMessage[] | null | undefined,
@@ -20,20 +20,142 @@ export function extractFinalSummaryFromMessages(
     }
   }
 
-  // Fallback: last user-facing message of any role
+  // Completion summaries must describe the assistant/model result. If no
+  // user-facing assistant/model message exists yet (for example, only the
+  // dispatched user prompt is visible), return empty instead of echoing the
+  // prompt as a misleading finalSummary.
+  return '';
+}
+
+export function readChatMessageTimestampMs(message: ChatMessage | null | undefined): number | undefined {
+  if (!message) return undefined;
+  const record = message as ChatMessage & Record<string, unknown>;
+  for (const value of [record.timestamp, record.createdAt, record.created_at, record.updatedAt, record.time, record.receivedAt]) {
+    if (typeof value === 'number' && Number.isFinite(value)) {
+      // Heuristic seconds-vs-ms detection mirrors the mesh transcript reader.
+      return value > 10_000_000_000 ? value : value * 1000;
+    }
+    if (typeof value === 'string' && value.trim()) {
+      const ms = new Date(value.trim()).getTime();
+      if (Number.isFinite(ms)) return ms;
+    }
+  }
+  return undefined;
+}
+
+function readChatMessageTimestampIso(message: ChatMessage | null | undefined): string | undefined {
+  const ms = readChatMessageTimestampMs(message);
+  return typeof ms === 'number' ? new Date(ms).toISOString() : undefined;
+}
+
+/**
+ * Turn-scoped variant of extractFinalSummaryFromMessages. Selects the last
+ * user-facing assistant/model bubble whose own timestamp is at/after the
+ * producing turn's start (`minTimestampMs`). This is the NOTIF Defect-B fix:
+ * a completion event's finalSummary must describe the turn THAT completed, not
+ * the prior task's last bubble. For native-source providers (claude-cli) the
+ * external transcript holds the ENTIRE session history filtered only by session
+ * start, so a completion debounce that fires before the producing turn's final
+ * assistant bubble has landed would otherwise echo the previous task's tail.
+ * A message whose timestamp predates the turn start is skipped; if no in-turn
+ * assistant bubble exists yet, returns '' (weak/empty) — never the stale tail.
+ *
+ * Mirrors the reconcile path's transcriptAfterDispatch guard (mesh-events-stale):
+ * a bubble only counts if its timestamp proves it was produced after the turn began.
+ * When `minTimestampMs` is undefined the behaviour is identical to the unscoped
+ * extractor (no turn boundary known → no filtering).
+ */
+export function extractFinalSummaryFromMessagesAfter(
+  messages: ChatMessage[] | null | undefined,
+  minTimestampMs: number | undefined,
+  maxChars: number = DEFAULT_FINAL_SUMMARY_MAX_CHARS,
+): string {
+  if (!Array.isArray(messages) || messages.length === 0) return '';
+  const hasBoundary = typeof minTimestampMs === 'number' && Number.isFinite(minTimestampMs);
+
   for (let i = messages.length - 1; i >= 0; i--) {
     const msg = messages[i];
     if (!msg) continue;
+    if (hasBoundary) {
+      // A bubble carrying a timestamp BEFORE the producing turn's start belongs to
+      // a prior task — skip it. A bubble with no parseable timestamp cannot be
+      // proven stale, so it is kept (the unscoped fallback) rather than dropped.
+      const ts = readChatMessageTimestampMs(msg);
+      if (typeof ts === 'number' && ts < (minTimestampMs as number)) continue;
+    }
     const classification = classifyChatMessageVisibility(msg);
-    if (classification.isUserFacing) {
+    if (classification.isUserFacing && (msg.role === 'assistant' || msg.role === 'model')) {
       const text = flattenContent(msg.content).trim();
       if (text) return text.slice(0, maxChars);
     }
   }
-
   return '';
 }
 
+/**
+ * Like extractFinalSummaryFromMessages but also returns the ISO timestamp of the
+ * selected final assistant/model message. Completion reconciliation needs the
+ * timestamp to prove the transcript was produced AFTER the dispatch — without it
+ * reconcileDirectDispatchCompletionFromTranscript rejects non-JSON summaries as
+ * "transcript_not_proven_after_dispatch". The summary selection is identical so the
+ * timestamp always belongs to the message whose text became the summary.
+ */
+export function extractFinalAssistantSummaryEvidence(
+  messages: ChatMessage[] | null | undefined,
+  maxChars: number = DEFAULT_FINAL_SUMMARY_MAX_CHARS,
+): { finalSummary: string; transcriptMessageAt?: string } {
+  const turnEnd = selectFinalAssistantTurnEndMessage(messages);
+  if (!turnEnd) return { finalSummary: '' };
+  return {
+    finalSummary: flattenContent(turnEnd.content).trim().slice(0, maxChars),
+    transcriptMessageAt: readChatMessageTimestampIso(turnEnd),
+  };
+}
+
+/**
+ * EARLYNOTIFY-GATEBYPASS (a)/(b) — the shared turn-finality selector for the completion
+ * final-assistant judgement, so the ~duplicated "which bubble is the turn's final answer"
+ * logic is decided ONE way (UNIFY A-6).
+ *
+ * Returns the message that qualifies as the turn's FINAL assistant bubble, or null when the
+ * transcript does not (yet) prove a turn end. The rule is a NON-EMPTY LATEST user-facing
+ * assistant/model bubble:
+ *   - Scanning from the end, the FIRST user-facing assistant/model bubble encountered IS the
+ *     turn-end candidate. If it is EMPTY (a streaming placeholder / mid-turn narration whose
+ *     text has not landed), the turn is still in flight → return null. Crucially we do NOT walk
+ *     back past that empty bubble to promote an EARLIER assistant narration to "final" (the
+ *     Defect-B walk-back).
+ *   - Trailing activity/internal bubbles (tool/thought/status) are skipped — they are not the
+ *     assistant's user-facing answer.
+ *   - A trailing user-facing USER message (a freshly dispatched task with no reply yet) means the
+ *     assistant did not have the last word — no earlier bubble is promoted here; callers that must
+ *     still reach a prior turn's tail use the timestamp-scoped extractor instead.
+ *
+ * A bare snapshot-idle with an arbitrary non-empty tail therefore does NOT qualify as a turn end;
+ * only a genuine latest-assistant bubble does. Turn-finality signals that live OUTSIDE the
+ * transcript (a committed generating→idle FSM transition, a self-attributing final_summary_json,
+ * or a continuous-idle streak) are enforced by the callers (the CLI completion gate, the reconcile
+ * grace gate) on top of this structural check.
+ */
+export function selectFinalAssistantTurnEndMessage(
+  messages: ChatMessage[] | null | undefined,
+): ChatMessage | null {
+  if (!Array.isArray(messages) || messages.length === 0) return null;
+  for (let i = messages.length - 1; i >= 0; i--) {
+    const msg = messages[i];
+    if (!msg) continue;
+    const classification = classifyChatMessageVisibility(msg);
+    if (!classification.isUserFacing) continue; // skip tool/thought/status activity + internal
+    if (msg.role === 'assistant' || msg.role === 'model') {
+      // The latest user-facing assistant bubble: it is the turn end iff it has real text.
+      return flattenContent(msg.content).trim() ? msg : null;
+    }
+    // A user (or other role) had the last user-facing word → the assistant turn is not complete.
+    return null;
+  }
+  return null;
+}
+
 export const BUILTIN_CHAT_MESSAGE_KINDS = ['standard', 'thought', 'tool', 'terminal', 'system'] as const;
 
 export type BuiltinChatMessageKind = typeof BUILTIN_CHAT_MESSAGE_KINDS[number];

package/src/providers/cli-provider-effect-format.ts

@@ -0,0 +1,53 @@
+// Provider-effect dedup and message-formatting helpers extracted from
+// cli-provider-instance.ts. Pure move — no behavior change. None of these used
+// any instance state; they were private methods invoked only within the class.
+
+export function getEffectDedupKey(effect: { id?: string; type: string; message?: { content?: unknown }; toast?: { message?: string }; notification?: { title?: string; body?: string } }): string {
+    if (effect.id) return `provider_effect:${effect.id}`;
+    if (effect.type === 'message') {
+        const content = typeof effect.message?.content === 'string'
+            ? effect.message.content
+            : JSON.stringify(effect.message?.content || '');
+        return `provider_effect:message:${content}`;
+    }
+    if (effect.type === 'notification') {
+        return `provider_effect:notification:${effect.notification?.title || ''}:${effect.notification?.body || ''}`;
+    }
+    return `provider_effect:toast:${effect.toast?.message || ''}`;
+}
+
+export function getPersistedEffectContent(effect: { type: string; message?: { content?: unknown }; toast?: { message?: string }; notification?: { title?: string; body?: string; bubbleContent?: unknown } }): string | null {
+    if (effect.type === 'message') {
+        return typeof effect.message?.content === 'string'
+            ? effect.message.content
+            : JSON.stringify(effect.message?.content || '');
+    }
+    if (effect.type === 'toast') {
+        return effect.toast?.message || null;
+    }
+    if (effect.type === 'notification') {
+        if (typeof effect.notification?.bubbleContent === 'string') return effect.notification.bubbleContent;
+        if (typeof effect.notification?.title === 'string' && effect.notification.title.trim()) {
+            return `${effect.notification.title}\n${effect.notification.body || ''}`.trim();
+        }
+        return effect.notification?.body || null;
+    }
+    return null;
+}
+
+export function formatApprovalRequestMessage(modalMessage?: string, buttons?: string[]): string {
+    const lines = ['Approval requested'];
+    const cleanMessage = String(modalMessage || '').trim();
+    if (cleanMessage) lines.push(cleanMessage);
+    const labels = (buttons || []).map((button) => String(button || '').trim()).filter(Boolean);
+    if (labels.length > 0) {
+        lines.push(labels.map((label) => `[${label}]`).join(' '));
+    }
+    return lines.join('\n');
+}
+
+export function formatMarkerTimestamp(timestamp: number): string {
+    const date = new Date(timestamp);
+    const pad = (value: number) => String(value).padStart(2, '0');
+    return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}:${pad(date.getSeconds())}`;
+}

package/src/providers/cli-provider-history-dedup.ts

@@ -0,0 +1,75 @@
+/**
+ * CLI provider persisted-history dedup — incremental append computation.
+ *
+ * Pure move out of cli-provider-instance.ts (no behavior change): the
+ * shared-prefix diff that turns a full parsed transcript into the newly-added
+ * tail to append to the persisted chat history. cli-provider-instance
+ * re-exports buildIncrementalHistoryAppendMessages so existing importers/tests
+ * keep their path.
+ */
+
+import { flattenContent } from './contracts.js';
+
+export type PersistableCliHistoryMessage = {
+    role: string;
+    content: string;
+    kind?: string;
+    senderName?: string;
+    receivedAt?: number;
+};
+
+function normalizePersistableCliHistoryContent(content: unknown): string {
+    return flattenContent(content as any).replace(/\s+/g, ' ').trim();
+}
+
+function buildPersistableCliHistorySignature(message: PersistableCliHistoryMessage): string {
+    return [
+        String(message.role || ''),
+        String(message.kind || ''),
+        String(message.senderName || ''),
+        normalizePersistableCliHistoryContent(message.content),
+    ].join('|');
+}
+
+function hasSamePersistableCliHistoryIdentity(a: PersistableCliHistoryMessage, b: PersistableCliHistoryMessage): boolean {
+    return String(a?.role || '') === String(b?.role || '')
+        && String(a?.kind || '') === String(b?.kind || '')
+        && String(a?.senderName || '') === String(b?.senderName || '')
+        && String(a?.content || '') === String(b?.content || '');
+}
+
+export function buildIncrementalHistoryAppendMessages(
+    previousMessages: PersistableCliHistoryMessage[],
+    currentMessages: PersistableCliHistoryMessage[],
+): PersistableCliHistoryMessage[] {
+    if (!Array.isArray(currentMessages) || currentMessages.length === 0) return [];
+    if (!Array.isArray(previousMessages) || previousMessages.length === 0) return currentMessages;
+
+    const comparableLength = Math.min(previousMessages.length, currentMessages.length);
+    let sharedPrefixLength = 0;
+    while (
+        sharedPrefixLength < comparableLength
+        && hasSamePersistableCliHistoryIdentity(previousMessages[sharedPrefixLength], currentMessages[sharedPrefixLength])
+    ) {
+        sharedPrefixLength += 1;
+    }
+
+    if (sharedPrefixLength === currentMessages.length) return [];
+    if (sharedPrefixLength === previousMessages.length) return currentMessages.slice(sharedPrefixLength);
+
+    // Rare fallback: preserve the older whitespace-normalized behavior only when
+    // the cheap identity check detects a changed prefix. Recomputing normalized
+    // signatures for the full transcript on every idle status poll was a CPU
+    // hot path for long CLI sessions.
+    while (
+        sharedPrefixLength < comparableLength
+        && buildPersistableCliHistorySignature(previousMessages[sharedPrefixLength])
+            === buildPersistableCliHistorySignature(currentMessages[sharedPrefixLength])
+    ) {
+        sharedPrefixLength += 1;
+    }
+
+    if (sharedPrefixLength === currentMessages.length) return [];
+    if (sharedPrefixLength === previousMessages.length) return currentMessages.slice(sharedPrefixLength);
+    return currentMessages;
+}