@adhdev/daemon-core 0.9.35 → 0.9.37

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

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/session-host-core",
-  "version": "0.9.35",
+  "version": "0.9.37",
   "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.35",
+  "version": "0.9.37",
   "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

@@ -369,7 +369,17 @@ export class ProviderCliAdapter implements CliAdapter {
         return baseMessages.slice(-ProviderCliAdapter.PARSE_MESSAGE_TAIL_LIMIT);
     }
 
+    private messagesShareStableIdentity(left: any, right: any): boolean {
+        if (left === right) return true;
+        if (!left || !right) return false;
+        if ((left.role || '') !== (right.role || '')) return false;
+        if (left.id && right.id && String(left.id) === String(right.id)) return true;
+        if (typeof left.index === 'number' && typeof right.index === 'number' && left.index === right.index) return true;
+        return false;
+    }
+
     private messagesComparable(left: any, right: any): boolean {
+        if (this.messagesShareStableIdentity(left, right)) return true;
         if (!left || !right) return false;
         if ((left.role || '') !== (right.role || '')) return false;
         const leftText = normalizeComparableTranscriptText(left.content);
@@ -1665,11 +1675,12 @@ export class ProviderCliAdapter implements CliAdapter {
 
  // ─── Public API (CliAdapter) ───────────────────
 
-    getStatus(): CliSessionStatus {
-        const startupModal = this.startupParseGate ? this.runParseApproval(this.recentOutputBuffer) : null;
+    getStatus(options: { allowParse?: boolean } = {}): CliSessionStatus {
+        const allowParse = options.allowParse !== false;
+        const startupModal = allowParse && this.startupParseGate ? this.runParseApproval(this.recentOutputBuffer) : null;
         let effectiveStatus = this.projectEffectiveStatus(startupModal);
         let effectiveModal = startupModal || this.activeModal;
-        if (!startupModal && !effectiveModal && typeof this.cliScripts?.parseOutput === 'function') {
+        if (allowParse && !startupModal && !effectiveModal && typeof this.cliScripts?.parseOutput === 'function') {
             let parsed = this.getFreshParsedStatusCache();
             if (!parsed && effectiveStatus !== 'idle') {
                 const now = Date.now();
@@ -1723,6 +1734,82 @@ export class ProviderCliAdapter implements CliAdapter {
         this.syncMessageViews();
     }
 
+    private getSharedCommittedPrefixLength(parsedMessages: any[]): number {
+        const committedMessages = this.committedMessages;
+        const max = Math.min(parsedMessages.length, committedMessages.length);
+        let index = 0;
+        while (index < max && this.messagesShareStableIdentity(parsedMessages[index], committedMessages[index])) {
+            index += 1;
+        }
+        return index;
+    }
+
+    private hydrateCommittedPrefixForParsedStatus(parsedMessages: any[]): any[] | null {
+        const sharedPrefixLength = this.getSharedCommittedPrefixLength(parsedMessages);
+        if (sharedPrefixLength !== this.committedMessages.length) return null;
+
+        const committedHydratedMessages = this.committedMessages.map((message, index) => {
+            const timestamp = typeof message.timestamp === 'number' && Number.isFinite(message.timestamp)
+                ? message.timestamp
+                : (this.lastOutputAt || this.currentTurnScope?.startedAt || Date.now());
+            const contentValue = message.content;
+            return {
+                role: message.role,
+                content: typeof contentValue === 'string' ? contentValue : String(contentValue || ''),
+                timestamp,
+                receivedAt: typeof message.receivedAt === 'number' && Number.isFinite(message.receivedAt)
+                    ? message.receivedAt
+                    : timestamp,
+                kind: message.kind,
+                id: message.id || `msg_${index}`,
+                index: typeof message.index === 'number' ? message.index : index,
+                meta: message.meta,
+                senderName: message.senderName,
+            };
+        });
+        const extraMessages = parsedMessages.slice(sharedPrefixLength);
+        if (extraMessages.length === 0) return committedHydratedMessages;
+
+        const extraHydratedMessages = hydrateCliParsedMessages(extraMessages, {
+            committedMessages: [],
+            scope: this.currentTurnScope,
+            lastOutputAt: this.lastOutputAt,
+        }).map((message, offset) => ({
+            ...message,
+            id: message.id || `msg_${sharedPrefixLength + offset}`,
+            index: typeof message.index === 'number' ? message.index : sharedPrefixLength + offset,
+        }));
+        return [...committedHydratedMessages, ...extraHydratedMessages];
+    }
+
+    private hydrateParsedMessagesForStatus(parsedMessages: any[]): any[] {
+        return this.hydrateCommittedPrefixForParsedStatus(parsedMessages)
+            || hydrateCliParsedMessages(parsedMessages, {
+                committedMessages: this.committedMessages,
+                scope: this.currentTurnScope,
+                lastOutputAt: this.lastOutputAt,
+            });
+    }
+
+    private buildCommittedChatMessages(): any[] {
+        return this.committedMessages.map((message, index) => {
+            const contentValue = message.content;
+            return buildChatMessage({
+                role: message.role,
+                content: typeof contentValue === 'string' ? contentValue : String(contentValue || ''),
+                timestamp: message.timestamp,
+                kind: message.kind,
+                meta: message.meta,
+                senderName: message.senderName,
+                id: message.id || `msg_${index}`,
+                index: typeof message.index === 'number' ? message.index : index,
+                receivedAt: typeof message.receivedAt === 'number'
+                    ? message.receivedAt
+                    : message.timestamp,
+            });
+        });
+    }
+
     /**
      * Script-based full parse — returns ReadChatResult.
      * Called by command handler / dashboard for rich content rendering.
@@ -1765,7 +1852,7 @@ export class ProviderCliAdapter implements CliAdapter {
                 this.onStatusChange?.();
             }
         }
-        if (parsed && Array.isArray(parsed.messages)) {
+        if (parsed && Array.isArray(parsed.messages) && this.provider.allowInputDuringGeneration === true) {
             const hydratedForCommit = normalizeCliParsedMessages(parsed.messages, {
                 committedMessages: this.committedMessages,
                 scope: this.currentTurnScope,
@@ -1787,25 +1874,13 @@ export class ProviderCliAdapter implements CliAdapter {
             && this.currentStatus === 'idle';
         let result: any;
         if (parsed && Array.isArray(parsed.messages)) {
-            const parsedHydratedMessages = hydrateCliParsedMessages(parsed.messages, {
-                committedMessages: this.committedMessages,
-                scope: this.currentTurnScope,
-                lastOutputAt: this.lastOutputAt,
-            });
-            const committedHydratedMessages = this.committedMessages.map((message, index) => buildChatMessage({
-                ...message,
-                id: message.id || `msg_${index}`,
-                index: typeof message.index === 'number' ? message.index : index,
-                receivedAt: typeof message.receivedAt === 'number'
-                    ? message.receivedAt
-                    : message.timestamp,
-            }));
+            const parsedHydratedMessages = this.hydrateParsedMessagesForStatus(parsed.messages);
             const parsedLastAssistant = [...parsedHydratedMessages].reverse().find((message) => message.role === 'assistant' && typeof message.content === 'string' && message.content.trim());
             const shouldAdoptParsedIdleReplay =
                 !this.currentTurnScope
                 && !this.activeModal
                 && !!parsedLastAssistant
-                && parsedTranscriptIsRicherThanCommitted(parsedHydratedMessages, committedHydratedMessages)
+                && parsedTranscriptIsRicherThanCommitted(parsedHydratedMessages, this.committedMessages)
                 && (
                     this.currentStatus === 'idle'
                     || (
@@ -1816,11 +1891,23 @@ export class ProviderCliAdapter implements CliAdapter {
                     )
                 );
             if (shouldAdoptParsedIdleReplay) {
-                this.committedMessages = normalizeCliParsedMessages(parsed.messages, {
-                    committedMessages: this.committedMessages,
-                    scope: this.currentTurnScope,
-                    lastOutputAt: this.lastOutputAt,
-                });
+                this.committedMessages = this.getSharedCommittedPrefixLength(parsed.messages) === this.committedMessages.length
+                    ? parsedHydratedMessages.map((message) => ({
+                        role: message.role,
+                        content: typeof message.content === 'string' ? message.content : String(message.content || ''),
+                        timestamp: message.timestamp,
+                        receivedAt: message.receivedAt,
+                        kind: message.kind,
+                        id: message.id,
+                        index: message.index,
+                        meta: message.meta,
+                        senderName: message.senderName,
+                    }))
+                    : normalizeCliParsedMessages(parsed.messages, {
+                        committedMessages: this.committedMessages,
+                        scope: this.currentTurnScope,
+                        lastOutputAt: this.lastOutputAt,
+                    });
                 this.syncMessageViews();
                 if (this.currentStatus !== 'idle' || this.isWaitingForResponse) {
                     this.responseBuffer = '';
@@ -1835,25 +1922,15 @@ export class ProviderCliAdapter implements CliAdapter {
                     this.onStatusChange?.();
                 }
             }
-            const effectiveCommittedHydratedMessages = shouldAdoptParsedIdleReplay
-                ? this.committedMessages.map((message, index) => buildChatMessage({
-                    ...message,
-                    id: message.id || `msg_${index}`,
-                    index: typeof message.index === 'number' ? message.index : index,
-                    receivedAt: typeof message.receivedAt === 'number'
-                        ? message.receivedAt
-                        : message.timestamp,
-                }))
-                : committedHydratedMessages;
             const shouldPreferCommittedHistoryReplay =
                 !this.currentTurnScope
                 && !this.activeModal
-                && effectiveCommittedHydratedMessages.length > parsedHydratedMessages.length;
+                && this.committedMessages.length > parsedHydratedMessages.length;
             const shouldPreferCommittedIdleReplay =
                 shouldPreferCommittedMessages
                 && !shouldAdoptParsedIdleReplay;
             const hydratedMessages = (shouldPreferCommittedIdleReplay || shouldPreferCommittedHistoryReplay)
-                ? effectiveCommittedHydratedMessages
+                ? this.buildCommittedChatMessages()
                 : parsedHydratedMessages;
             result = {
                 id: parsed.id || 'cli_session',

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

@@ -31,37 +31,115 @@ export function hydrateCliParsedMessages(
 ): any[] {
     const { committedMessages, scope, lastOutputAt } = options;
     const referenceMessages = [...committedMessages];
-    const referenceComparables = referenceMessages.map((message) => normalizeComparableMessageContent(message?.content || ''));
+    const referenceComparables: Array<string | undefined> = new Array(referenceMessages.length);
     const usedReferenceIndexes = new Set<number>();
     const now = options.now ?? Date.now();
+    let exactReferenceIndexesByKey: Map<string, number[]> | null = null;
+    const exactReferenceCursorByKey = new Map<string, number>();
+
+    const hasFiniteTimestamp = (message: any): message is { timestamp: number } => (
+        typeof message?.timestamp === 'number' && Number.isFinite(message.timestamp)
+    );
+
+    const getReferenceComparable = (index: number): string => {
+        if (typeof referenceComparables[index] === 'string') return referenceComparables[index] || '';
+        const comparable = normalizeComparableMessageContent(referenceMessages[index]?.content || '');
+        referenceComparables[index] = comparable;
+        return comparable;
+    };
+
+    const messagesShareStableIdentity = (parsed: any, reference: any): boolean => {
+        if (!parsed || !reference) return false;
+        const parsedId = typeof parsed.id === 'string' ? parsed.id.trim() : '';
+        const referenceId = typeof reference.id === 'string' ? reference.id.trim() : '';
+        if (parsedId && referenceId && parsedId === referenceId) return true;
+        return typeof parsed.index === 'number'
+            && Number.isFinite(parsed.index)
+            && typeof reference.index === 'number'
+            && Number.isFinite(reference.index)
+            && parsed.index === reference.index;
+    };
+
+    const exactReferenceKey = (role: 'user' | 'assistant', comparable: string): string => `${role}\u0000${comparable}`;
+
+    const ensureExactReferenceIndex = (): Map<string, number[]> => {
+        if (exactReferenceIndexesByKey) return exactReferenceIndexesByKey;
+        const byKey = new Map<string, number[]>();
+        for (let i = 0; i < referenceMessages.length; i++) {
+            const candidate = referenceMessages[i];
+            if (!candidate || (candidate.role !== 'user' && candidate.role !== 'assistant') || !hasFiniteTimestamp(candidate)) continue;
+            const comparable = getReferenceComparable(i);
+            if (!comparable) continue;
+            const key = exactReferenceKey(candidate.role, comparable);
+            const indexes = byKey.get(key);
+            if (indexes) {
+                indexes.push(i);
+            } else {
+                byKey.set(key, [i]);
+            }
+        }
+        exactReferenceIndexesByKey = byKey;
+        return byKey;
+    };
+
+    const takeExactReferenceTimestamp = (role: 'user' | 'assistant', normalizedContent: string): number | undefined => {
+        const key = exactReferenceKey(role, normalizedContent);
+        const indexes = ensureExactReferenceIndex().get(key);
+        if (!indexes) return undefined;
+        let cursor = exactReferenceCursorByKey.get(key) || 0;
+        while (cursor < indexes.length) {
+            const candidateIndex = indexes[cursor];
+            cursor += 1;
+            if (usedReferenceIndexes.has(candidateIndex)) continue;
+            const candidate = referenceMessages[candidateIndex];
+            if (!candidate || candidate.role !== role || !hasFiniteTimestamp(candidate)) continue;
+            usedReferenceIndexes.add(candidateIndex);
+            exactReferenceCursorByKey.set(key, cursor);
+            return candidate.timestamp;
+        }
+        exactReferenceCursorByKey.set(key, cursor);
+        return undefined;
+    };
+
+    const findReferenceTimestamp = (message: any, role: 'user' | 'assistant', content: string, parsedIndex: number): number | undefined => {
+        const sameIndex = referenceMessages[parsedIndex];
+        if (
+            sameIndex
+            && !usedReferenceIndexes.has(parsedIndex)
+            && sameIndex.role === role
+            && hasFiniteTimestamp(sameIndex)
+            && messagesShareStableIdentity(message, sameIndex)
+        ) {
+            usedReferenceIndexes.add(parsedIndex);
+            return sameIndex.timestamp;
+        }
 
-    const findReferenceTimestamp = (role: 'user' | 'assistant', content: string, parsedIndex: number): number | undefined => {
         const normalizedContent = normalizeComparableMessageContent(content);
         if (!normalizedContent) return undefined;
 
-        const sameIndex = referenceMessages[parsedIndex];
         if (
             sameIndex
             && !usedReferenceIndexes.has(parsedIndex)
             && sameIndex.role === role
-            && referenceComparables[parsedIndex] === normalizedContent
-            && typeof sameIndex.timestamp === 'number'
-            && Number.isFinite(sameIndex.timestamp)
+            && getReferenceComparable(parsedIndex) === normalizedContent
+            && hasFiniteTimestamp(sameIndex)
         ) {
             usedReferenceIndexes.add(parsedIndex);
             return sameIndex.timestamp;
         }
 
+        const exactTimestamp = takeExactReferenceTimestamp(role, normalizedContent);
+        if (typeof exactTimestamp === 'number') return exactTimestamp;
+
         for (let i = 0; i < referenceMessages.length; i++) {
             if (usedReferenceIndexes.has(i)) continue;
             const candidate = referenceMessages[i];
             if (!candidate || candidate.role !== role) continue;
-            const candidateContent = referenceComparables[i];
+            const candidateContent = getReferenceComparable(i);
             if (!candidateContent) continue;
-            const exactMatch = candidateContent === normalizedContent;
             const fuzzyMatch = candidateContent.includes(normalizedContent) || normalizedContent.includes(candidateContent);
-            if (!exactMatch && !fuzzyMatch) continue;
-            if (typeof candidate.timestamp === 'number' && Number.isFinite(candidate.timestamp)) {
+            if (!fuzzyMatch) continue;
+            if (hasFiniteTimestamp(candidate)) {
                 usedReferenceIndexes.add(i);
                 return candidate.timestamp;
             }
@@ -78,7 +156,7 @@ export function hydrateCliParsedMessages(
             const parsedTimestamp = typeof message.timestamp === 'number' && Number.isFinite(message.timestamp)
                 ? message.timestamp
                 : undefined;
-            const referenceTimestamp = parsedTimestamp ?? findReferenceTimestamp(role, content, index);
+            const referenceTimestamp = parsedTimestamp ?? findReferenceTimestamp(message, role, content, index);
             const fallbackTimestamp = role === 'user'
                 ? (scope?.startedAt || now)
                 : (lastOutputAt || scope?.startedAt || now);

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

@@ -494,7 +494,7 @@ export class CliProviderInstance implements ProviderInstance {
     }
 
     getHotChatSessionState(): HotChatSessionState {
-        const adapterStatus = this.adapter.getStatus();
+        const adapterStatus = this.adapter.getStatus({ allowParse: false });
         const autoApproveActive = adapterStatus.status === 'waiting_approval' && this.shouldAutoApprove();
         const visibleStatus = autoApproveActive ? 'generating' : adapterStatus.status;
         const runtime = this.adapter.getRuntimeMetadata();