@adhdev/daemon-core 0.9.43 → 0.9.45

package/dist/launch/macos-app-process.d.ts

@@ -0,0 +1,2 @@
+export declare function isMacAppProcessArgs(args: string, appPath: string): boolean;
+export declare function findMacAppProcessPids(psOutput: string, appPaths: readonly string[]): number[];

package/dist/providers/cli-provider-instance.d.ts

@@ -55,6 +55,8 @@ export declare class CliProviderInstance implements ProviderInstance {
     private lastCanonicalHermesWatchPath;
     private lastCanonicalClaudeRebuildMtimeMs;
     private lastCanonicalClaudeCheckAt;
+    private lastCanonicalCodexRebuildMtimeMs;
+    private lastCanonicalCodexCheckAt;
     private cachedSqliteDb;
     private cachedSqliteDbPath;
     private cachedSqliteDbMissingUntil;

package/dist/providers/contracts.d.ts

@@ -31,6 +31,9 @@ export interface ReadChatResult {
     controlValues?: Record<string, string | number | boolean>;
     /** Flexible always-visible metadata for compact/live surfaces. */
     summaryMetadata?: ProviderSummaryMetadata;
+    /** Provider-owned transcript authority/coverage hints for daemon/dashboard sync. */
+    transcriptAuthority?: 'provider' | 'daemon';
+    coverage?: 'full' | 'tail' | 'current-turn';
     /** Provider-driven UI effects derived from chat state */
     effects?: ProviderEffect[];
 }
@@ -506,13 +509,23 @@ export interface ProviderCanonicalHistoryConfig {
      * Native history format.
      * - 'hermes-json': single JSON file per session (~/.hermes/sessions/session_{{sessionId}}.json)
      * - 'claude-jsonl': JSONL transcript under ~/.claude/projects/
+     * - 'codex-jsonl': rollout JSONL transcript under ~/.codex/sessions/YYYY/MM/DD/
      */
-    format: 'hermes-json' | 'claude-jsonl';
+    format: 'hermes-json' | 'claude-jsonl' | 'codex-jsonl';
     /**
      * Path to the native history file. Supports ~ and {{sessionId}} placeholder.
      * e.g. "~/.hermes/sessions/session_{{sessionId}}.json"
      */
     watchPath: string;
+    /**
+     * How ADHDev should use native history.
+     * - 'native-source': provider-native files are canonical; ADHDev reads them directly and keeps only in-memory/thin projections.
+     * - 'materialized-mirror': transitional compatibility mode; native files are rewritten into ~/.adhdev/history before read/list.
+     * - 'disabled': ignore native history and use ADHDev mirror only.
+     *
+     * Omitted mode defaults to 'native-source'.
+     */
+    mode?: 'native-source' | 'materialized-mirror' | 'disabled';
 }
 /**
  * Auto-implement spawn config — controls how the provider is spawned for autonomous AI-driven

package/node_modules/@adhdev/session-host-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/session-host-core",
-  "version": "0.9.43",
+  "version": "0.9.45",
   "description": "ADHDev local session host core \u2014 session registry, protocol, buffers",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.9.43",
+  "version": "0.9.45",
   "description": "ADHDev daemon core \u2014 CDP, IDE detection, providers, command execution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/cli-adapters/provider-cli-adapter.ts

@@ -171,6 +171,88 @@ export function appendBoundedText(current: string, chunk: string, maxChars: numb
     return current.slice(-keepFromCurrent) + chunk;
 }
 
+const COMMITTED_ACTIVITY_PREFIX_BLOCK_RE = /^(?:📖|💻|🔎|📚|📋|✏️|📝|🔧|🛠️|⚙️)\s+(.+)$/;
+
+function isLikelyCommittedActivityPrefixContinuation(line: string): boolean {
+    const trimmed = String(line || '').trim();
+    if (!trimmed) return false;
+    if (COMMITTED_ACTIVITY_PREFIX_BLOCK_RE.test(trimmed)) return false;
+    if (/\s/.test(trimmed)) return false;
+    if (/[가-힣]/.test(trimmed)) return false;
+    if (trimmed.length > 96) return false;
+    return /^[A-Za-z0-9_./:@+%=-]+$/.test(trimmed);
+}
+
+function parseCommittedActivityPrefixBlock(lines: string[], index: number): { label: string; nextIndex: number } | null {
+    const first = String(lines[index] || '').trim();
+    if (!COMMITTED_ACTIVITY_PREFIX_BLOCK_RE.test(first)) return null;
+    const parts = [first];
+    let nextIndex = index + 1;
+    while (nextIndex < lines.length && isLikelyCommittedActivityPrefixContinuation(lines[nextIndex])) {
+        parts.push(String(lines[nextIndex] || '').trim());
+        nextIndex += 1;
+    }
+    return { label: parts.join(''), nextIndex };
+}
+
+export function sanitizeCliStandardMessageContent(content: unknown): string {
+    const source = String(content || '').trim();
+    if (!source) return '';
+    const lines = source.split(/\r?\n/);
+    if (lines.length < 4) return source;
+
+    const counts = new Map<string, number>();
+    for (let index = 0; index < lines.length; index += 1) {
+        const block = parseCommittedActivityPrefixBlock(lines, index);
+        if (!block) continue;
+        counts.set(block.label, (counts.get(block.label) || 0) + 1);
+        index = block.nextIndex - 1;
+    }
+
+    const repeatedLabels = new Set(
+        Array.from(counts.entries())
+            .filter(([, count]) => count >= 3)
+            .map(([label]) => label),
+    );
+    if (repeatedLabels.size === 0) return source;
+
+    const stripped: string[] = [];
+    let removed = 0;
+    for (let index = 0; index < lines.length; index += 1) {
+        const block = parseCommittedActivityPrefixBlock(lines, index);
+        if (block && repeatedLabels.has(block.label)) {
+            removed += 1;
+            index = block.nextIndex - 1;
+            continue;
+        }
+        stripped.push(lines[index]);
+    }
+
+    const next = stripped.join('\n').replace(/\n{3,}/g, '\n\n').trim();
+    return removed >= 3 && next.length >= 80 ? next : source;
+}
+
+function sanitizeCommittedMessageForDisplay<T extends { role?: string; kind?: string; content?: unknown }>(message: T): T {
+    if (!message || message.role !== 'assistant' || (message.kind || 'standard') !== 'standard') return message;
+    const content = sanitizeCliStandardMessageContent(message.content);
+    if (content === message.content) return message;
+    return { ...message, content };
+}
+
+export function trimLastAssistantEchoForCliMessages(messages: CliChatMessage[], prompt: string | undefined): void {
+    if (!prompt) return;
+    for (let index = messages.length - 1; index >= 0; index -= 1) {
+        const message = messages[index];
+        if (!message || message.role !== 'assistant' || typeof message.content !== 'string') continue;
+        if ((message.kind || 'standard') !== 'standard') continue;
+        message.content = trimPromptEchoPrefix(message.content, prompt);
+        if (!message.content.trim()) {
+            messages.splice(index, 1);
+        }
+        return;
+    }
+}
+
 // ─── Adapter ────────────────────────────────────────
 
 export class ProviderCliAdapter implements CliAdapter {
@@ -360,7 +442,16 @@ export class ProviderCliAdapter implements CliAdapter {
         return null;
     }
 
+    private providerOwnsTranscript(): boolean {
+        return this.provider.transcriptAuthority === 'provider';
+    }
+
+    private shouldUseFullProviderTranscriptContext(): boolean {
+        return this.providerOwnsTranscript() && this.provider.transcriptContext === 'full';
+    }
+
     private selectParseBaseMessages(baseMessages: CliChatMessage[]): CliChatMessage[] {
+        if (this.shouldUseFullProviderTranscriptContext()) return baseMessages;
         if (baseMessages.length <= ProviderCliAdapter.PARSE_MESSAGE_TAIL_LIMIT) return baseMessages;
         return baseMessages.slice(-ProviderCliAdapter.PARSE_MESSAGE_TAIL_LIMIT);
     }
@@ -400,7 +491,12 @@ export class ProviderCliAdapter implements CliAdapter {
         const tailFirst = parseBaseMessages[0];
         if (tailFirst && this.messagesComparable(parsedFirst, tailFirst)) {
             const prefixLength = fullBaseMessages.length - parseBaseMessages.length;
-            return [...fullBaseMessages.slice(0, prefixLength), ...parsedMessages];
+            const prefix = fullBaseMessages.slice(0, prefixLength);
+            const shouldSanitizePrefix = !!this.currentTurnScope || this.currentStatus !== 'idle' || !!this.activeModal;
+            const nextPrefix = shouldSanitizePrefix
+                ? prefix.map((message) => sanitizeCommittedMessageForDisplay(message))
+                : prefix;
+            return [...nextPrefix, ...parsedMessages];
         }
 
         return [...fullBaseMessages, ...parsedMessages];
@@ -971,9 +1067,7 @@ export class ProviderCliAdapter implements CliAdapter {
     }
 
     private trimLastAssistantEcho(messages: CliChatMessage[], prompt: string | undefined): void {
-        if (!prompt) return;
-        const last = [...messages].reverse().find((m) => m.role === 'assistant' && typeof m.content === 'string');
-        if (last) last.content = trimPromptEchoPrefix(last.content, prompt);
+        trimLastAssistantEchoForCliMessages(messages, prompt);
     }
 
     private clearAllTimers(): void {
@@ -1808,10 +1902,14 @@ export class ProviderCliAdapter implements CliAdapter {
 
     private buildCommittedChatMessages(): any[] {
         return this.committedMessages.map((message, index) => {
-            const contentValue = message.content;
+            const rawContentValue = message.content;
+            const rawContent = typeof rawContentValue === 'string' ? rawContentValue : String(rawContentValue || '');
+            const content = message.role === 'assistant' && (message.kind || 'standard') === 'standard'
+                ? sanitizeCliStandardMessageContent(rawContent)
+                : rawContent;
             return buildChatMessage({
                 role: message.role,
-                content: typeof contentValue === 'string' ? contentValue : String(contentValue || ''),
+                content,
                 timestamp: message.timestamp,
                 kind: message.kind,
                 meta: message.meta,
@@ -1956,6 +2054,7 @@ export class ProviderCliAdapter implements CliAdapter {
                 messages: hydratedMessages,
                 activeModal: parsed.activeModal ?? this.activeModal,
                 providerSessionId: typeof parsed.providerSessionId === 'string' ? parsed.providerSessionId : undefined,
+                ...(this.providerOwnsTranscript() ? { transcriptAuthority: 'provider', coverage: this.shouldUseFullProviderTranscriptContext() ? 'full' : 'tail' } : {}),
             };
         } else {
             const messages = [...this.committedMessages];

package/src/cli-adapters/provider-cli-shared.ts

@@ -31,6 +31,8 @@ export interface ParsedSession {
     messages: any[];
     modal: { message: string; buttons: string[] } | null;
     parsedStatus: string | null;
+    transcriptAuthority?: 'provider' | 'daemon';
+    coverage?: 'full' | 'tail' | 'current-turn';
 }
 
 export interface CliScripts {
@@ -122,6 +124,10 @@ export interface CliProviderModule {
     submitStrategy?: 'wait_for_echo' | 'immediate';
     /** Allow sending another prompt while the CLI is still generating so users can intervene mid-turn. */
     allowInputDuringGeneration?: boolean;
+    /** When provider-owned, daemon treats provider parser output as canonical transcript authority. */
+    transcriptAuthority?: 'provider' | 'daemon';
+    /** Full context lets provider-owned parsers canonicalize retained history instead of daemon prefix stitching. */
+    transcriptContext?: 'full' | 'tail';
     scripts?: CliScripts;
     spawn: {
         command: string;

package/src/commands/chat-commands.ts

@@ -9,7 +9,7 @@ import { flattenContent, normalizeInputEnvelope, type InputEnvelope, type Provid
 import { assertProviderSupportsDeclaredInput, assertTextOnlyInput } from '../providers/provider-input-support.js';
 import { validateReadChatResultPayload } from '../providers/read-chat-contract.js';
 import type { ProviderInstance } from '../providers/provider-instance.js';
-import { readChatHistory } from '../config/chat-history.js';
+import { readProviderChatHistory } from '../config/chat-history.js';
 import { LOG } from '../logging/logger.js';
 import { recordDebugTrace } from '../logging/debug-trace.js';
 import { buildChatMessageSignature } from '../chat/chat-signatures.js';
@@ -564,7 +564,20 @@ export async function handleChatHistory(h: CommandHelpers, args: any): Promise<C
             const visibleCount = Array.isArray(status?.messages) ? status.messages.length : 0;
             if (visibleCount > excludeRecentCount) excludeRecentCount = visibleCount;
         }
-        const result = readChatHistory(agentStr, offset || 0, limit || 30, historySessionId, excludeRecentCount);
+        const workspace = typeof args?.workspace === 'string'
+            ? args.workspace
+            : typeof (h.currentSession as any)?.workspace === 'string'
+                ? (h.currentSession as any).workspace
+                : undefined;
+        const result = readProviderChatHistory(agentStr, {
+            canonicalHistory: provider?.canonicalHistory,
+            historySessionId,
+            workspace,
+            offset: offset || 0,
+            limit: limit || 30,
+            excludeRecentCount,
+            historyBehavior: provider?.historyBehavior,
+        });
         return { success: true, ...result, agent: agentStr };
     } catch (e: any) {
         return { success: false, error: e.message };
@@ -595,8 +608,11 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
                 ? parsedStatus as Record<string, any>
                 : null;
             const adapterStatus = adapter.getStatus();
+            const parsedIsProviderAuthoritative = parsedRecord?.transcriptAuthority === 'provider'
+                || parsedRecord?.coverage === 'full';
             const shouldPreferAdapterMessages =
-                Array.isArray(adapterStatus.messages)
+                !parsedIsProviderAuthoritative
+                && Array.isArray(adapterStatus.messages)
                 && adapterStatus.messages.length > 0
                 && Array.isArray(parsedRecord?.messages)
                 && adapterStatus.messages.length > parsedRecord.messages.length;
@@ -619,6 +635,12 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
             const providerSessionId = typeof parsedRecord?.providerSessionId === 'string'
                 ? parsedRecord.providerSessionId
                 : undefined;
+            const transcriptAuthority = parsedRecord?.transcriptAuthority === 'provider' || parsedRecord?.transcriptAuthority === 'daemon'
+                ? parsedRecord.transcriptAuthority
+                : undefined;
+            const coverage = parsedRecord?.coverage === 'full' || parsedRecord?.coverage === 'tail' || parsedRecord?.coverage === 'current-turn'
+                ? parsedRecord.coverage
+                : undefined;
             if (status) {
                 LOG.debug('Command', `[read_chat] cli-like resolved provider=${adapter.cliType} target=${String(args?.targetSessionId || '')} adapterStatus=${String(adapterStatus.status || '')} parsedStatus=${String(parsedRecord?.status || '')} shouldPreferAdapterMessages=${String(shouldPreferAdapterMessages)} adapterMsgCount=${Array.isArray(adapterStatus.messages) ? adapterStatus.messages.length : 0} parsedMsgCount=${Array.isArray(parsedRecord?.messages) ? parsedRecord.messages.length : 0} returnedMsgCount=${Array.isArray((status as any).messages) ? (status as any).messages.length : 0}`);
                 return buildReadChatCommandResult({
@@ -638,6 +660,8 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
                     },
                     ...(title ? { title } : {}),
                     ...(providerSessionId ? { providerSessionId } : {}),
+                    ...(transcriptAuthority ? { transcriptAuthority } : {}),
+                    ...(coverage ? { coverage } : {}),
                 }, args);
             }
         }

package/src/commands/router.ts

@@ -23,7 +23,7 @@ import { loadState, saveState } from '../config/state-store.js';
 import { resolveIdeLaunchWorkspace } from '../config/workspaces.js';
 import { appendRecentActivity, getRecentActivity, markSessionSeen, dismissSessionNotification, markSessionNotificationUnread } from '../config/recent-activity.js';
 import { getSavedProviderSessions } from '../config/saved-sessions.js';
-import { listSavedHistorySessions } from '../config/chat-history.js';
+import { listProviderHistorySessions } from '../config/chat-history.js';
 import { detectIDEs } from '../detection/ide-detector.js';
 import { detectCLI } from '../detection/cli-detector.js';
 import { SessionRegistry } from '../sessions/registry.js';
@@ -525,14 +525,19 @@ export class DaemonCommandRouter {
                 const wantsAll = args?.all === true;
                 const offset = wantsAll ? 0 : Math.max(0, Number(args?.offset) || 0);
                 const limit = wantsAll ? Number.MAX_SAFE_INTEGER : Math.max(1, Math.min(100, Number(args?.limit) || 30));
-                const { sessions: historySessions, hasMore } = listSavedHistorySessions(providerType, { offset, limit });
+                const providerMeta = this.deps.providerLoader.getMeta(providerType);
+                const { sessions: historySessions, hasMore, source } = listProviderHistorySessions(providerType, {
+                    canonicalHistory: providerMeta?.canonicalHistory,
+                    offset,
+                    limit,
+                    historyBehavior: providerMeta?.historyBehavior,
+                });
                 const state = loadState();
                 const savedSessions = getSavedProviderSessions(state, { providerType, kind });
                 const recentSessions = getRecentActivity(state, 200)
                     .filter(entry => entry.providerType === providerType && entry.kind === kind && entry.providerSessionId);
                 const savedSessionById = new Map(savedSessions.map(entry => [entry.providerSessionId, entry]));
                 const recentSessionById = new Map(recentSessions.map(entry => [entry.providerSessionId!, entry]));
-                const providerMeta = this.deps.providerLoader.getMeta(providerType);
                 const canResumeById = supportsExplicitSessionResume(providerMeta?.resume);
 
                 return {
@@ -557,6 +562,7 @@ export class DaemonCommandRouter {
                         };
                     }),
                     hasMore,
+                    source,
                 };
             }