@adhdev/daemon-core 0.8.89 → 0.8.91

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

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

@@ -677,6 +677,7 @@ export class ProviderCliAdapter implements CliAdapter {
     private looksLikeClaudeGeneratingLine(line: string): boolean {
         const trimmed = String(line || '').trim();
         if (!trimmed) return false;
+        if (/^⏵⏵\s+accept edits on/i.test(trimmed)) return false;
         if (/esc to (cancel|interrupt|stop)/i.test(trimmed)) return true;
         if (/^[✻✶✳✢✽⠂⠐⠒⠓⠦⠴⠶⠷⠿]+\s+\S+.*\b(?:thinking|thought for \d+s?)\b/i.test(trimmed)) return true;
         if (/^[✻✶✳✢✽⠂⠐⠒⠓⠦⠴⠶⠷⠿]+\s+[A-Z][A-Za-z-]{3,}ing\b.*(?:…|\.{3})/u.test(trimmed)) return true;
@@ -922,15 +923,22 @@ export class ProviderCliAdapter implements CliAdapter {
             return;
         }
         const startupModal = this.getStartupConfirmationModal(screenText);
-        const modal = this.runParseApproval(tail) || startupModal;
-        const rawScriptStatus = this.runDetectStatus(tail);
-        // detectStatus is the sole authority for status. parseApproval only enriches modal info.
-        const scriptStatus = startupModal ? 'waiting_approval' : rawScriptStatus;
         const parsedTranscript = this.parseCurrentTranscript(
             this.committedMessages,
             this.responseBuffer,
             this.currentTurnScope,
         );
+        const parsedModal = parsedTranscript?.activeModal && Array.isArray(parsedTranscript.activeModal.buttons) && parsedTranscript.activeModal.buttons.some((button: any) => typeof button === 'string' && button.trim())
+            ? parsedTranscript.activeModal
+            : null;
+        const modal = this.runParseApproval(tail) || parsedModal || startupModal;
+        const rawScriptStatus = this.runDetectStatus(tail);
+        // detectStatus is the primary authority for status, but if the parsed transcript
+        // already surfaced actionable approval buttons, promote that state so runtime
+        // status and resolve_action stay aligned with the visible prompt.
+        const scriptStatus = startupModal
+            ? 'waiting_approval'
+            : (parsedModal && parsedTranscript?.status === 'waiting_approval' ? 'waiting_approval' : rawScriptStatus);
         const parsedMessages = Array.isArray(parsedTranscript?.messages)
             ? normalizeCliParsedMessages(parsedTranscript.messages, {
                 committedMessages: this.committedMessages,
@@ -942,6 +950,9 @@ export class ProviderCliAdapter implements CliAdapter {
             return;
         }
         const lastParsedAssistant = [...parsedMessages].reverse().find((message) => message.role === 'assistant');
+        const parsedShowsLiveAssistantProgress = parsedTranscript?.status === 'generating'
+            && !!lastParsedAssistant
+            && parsedMessages.length > this.committedMessages.length;
         const normalizedPromptSnippet = normalizePromptText(this.submitRetryPromptSnippet || this.currentTurnScope?.prompt || '');
         this.recordTrace('settled', {
             tail: summarizeCliTraceText(tail, 500),
@@ -1049,7 +1060,8 @@ export class ProviderCliAdapter implements CliAdapter {
             && this.isWaitingForResponse
             && !modal
             && recentInteractiveActivity
-            && !(visibleIdlePrompt && visibleAssistantCandidate);
+            && !(visibleIdlePrompt && visibleAssistantCandidate)
+            && !(parsedTranscript?.status === 'idle' && !!lastParsedAssistant);
 
         if (shouldHoldGenerating) {
             this.clearIdleFinishCandidate('hold_generating_recent_activity');
@@ -1124,7 +1136,7 @@ export class ProviderCliAdapter implements CliAdapter {
                     && (/Update available!/i.test(screenText)
                         || /\/effort/i.test(screenText)
                         || /^.*➜\s+\S+/m.test(effectiveScreenText)));
-            if (prevStatus === 'idle' && !this.isWaitingForResponse && noActiveTurn && !modal && looksIdleChrome) {
+            if (prevStatus === 'idle' && !this.isWaitingForResponse && noActiveTurn && !modal && looksIdleChrome && !parsedShowsLiveAssistantProgress) {
                 return;
             }
             if (prevStatus === 'waiting_approval') {
@@ -1461,14 +1473,19 @@ export class ProviderCliAdapter implements CliAdapter {
         }
     }
 
+    private projectEffectiveStatus(startupModal: { message: string; buttons: string[] } | null = null): CliSessionStatus['status'] {
+        if (this.parseErrorMessage) return 'error';
+        if (startupModal) return 'waiting_approval';
+        if (this.isWaitingForResponse && this.currentTurnScope && this.currentStatus === 'idle') return 'generating';
+        return this.currentStatus;
+    }
+
  // ─── Public API (CliAdapter) ───────────────────
 
     getStatus(): CliSessionStatus {
         const screenText = this.terminalScreen.getText() || '';
         const startupModal = this.startupParseGate ? this.getStartupConfirmationModal(screenText) : null;
-        const effectiveStatus = this.parseErrorMessage
-            ? 'error'
-            : (startupModal ? 'waiting_approval' : this.currentStatus);
+        const effectiveStatus = this.projectEffectiveStatus(startupModal);
         return {
             status: effectiveStatus,
             messages: [...this.committedMessages],
@@ -2201,7 +2218,7 @@ export class ProviderCliAdapter implements CliAdapter {
         }
         this.setStatus('generating', 'approval_resolved');
         this.onStatusChange?.();
-        const startupTrustModal = /Quick safety check|project trust|trust (?:this project|the contents of this directory|the files in this folder)/i.test(String(modal?.message || ''));
+        const startupTrustModal = /Quick safety check|project trust|Confirm Claude Code project trust|trust (?:this project|the contents of this directory|the files in this folder)/i.test(String(modal?.message || ''));
         if (startupTrustModal && buttonIndex in this.approvalKeys) {
             this.ptyProcess.write(`${this.approvalKeys[buttonIndex]}\r`);
         } else if (this.shouldResolveModalWithEnter(modal, buttonIndex)) {
@@ -2228,7 +2245,7 @@ export class ProviderCliAdapter implements CliAdapter {
     getDebugState(): Record<string, any> {
         const screenText = sanitizeTerminalText(this.terminalScreen.getText());
         const startupModal = this.startupParseGate ? this.getStartupConfirmationModal(screenText) : null;
-        const effectiveStatus = startupModal ? 'waiting_approval' : this.currentStatus;
+        const effectiveStatus = this.projectEffectiveStatus(startupModal);
         const effectiveReady = this.ready || !!startupModal;
         return {
             type: this.cliType,

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

@@ -139,10 +139,10 @@ export function buildCliParseInput(options: {
         runtimeSettings,
     } = options;
     const buffer = scope
-        ? (sliceFromOffset(accumulatedBuffer, scope.bufferStart) || accumulatedBuffer)
+        ? sliceFromOffset(accumulatedBuffer, scope.bufferStart)
         : accumulatedBuffer;
     const rawBuffer = scope
-        ? (sliceFromOffset(accumulatedRawBuffer, scope.rawBufferStart) || accumulatedRawBuffer)
+        ? sliceFromOffset(accumulatedRawBuffer, scope.rawBufferStart)
         : accumulatedRawBuffer;
     const screenText = terminalScreenText;
     const recentBuffer = buffer.slice(-1000) || recentOutputBuffer;
@@ -189,10 +189,10 @@ export function buildCliTraceParseSnapshot(options: {
 }): Record<string, any> {
     const { accumulatedBuffer, accumulatedRawBuffer, responseBuffer, partialResponse, scope } = options;
     const scopedBuffer = scope
-        ? (sliceFromOffset(accumulatedBuffer, scope.bufferStart) || accumulatedBuffer)
+        ? sliceFromOffset(accumulatedBuffer, scope.bufferStart)
         : accumulatedBuffer;
     const scopedRawBuffer = scope
-        ? (sliceFromOffset(accumulatedRawBuffer, scope.rawBufferStart) || accumulatedRawBuffer)
+        ? sliceFromOffset(accumulatedRawBuffer, scope.rawBufferStart)
         : accumulatedRawBuffer;
     return {
         currentTurnScope: scope || null,

package/src/commands/chat-commands.ts

@@ -491,13 +491,17 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
                 && adapterStatus.messages.length > 0
                 && Array.isArray(parsedRecord?.messages)
                 && adapterStatus.messages.length > parsedRecord.messages.length;
+            const parsedShowsApproval = hasNonEmptyModalButtons(parsedRecord?.activeModal)
+                && parsedRecord?.status === 'waiting_approval';
             const status = parsedRecord
                 ? {
                     ...parsedRecord,
                     messages: shouldPreferAdapterMessages ? adapterStatus.messages : parsedRecord.messages,
-                    status: adapterStatus.status !== 'idle'
-                        ? adapterStatus.status
-                        : (parsedRecord.status || adapterStatus.status),
+                    status: parsedShowsApproval
+                        ? parsedRecord.status
+                        : (adapterStatus.status !== 'idle'
+                            ? adapterStatus.status
+                            : (parsedRecord.status || adapterStatus.status)),
                     activeModal: parsedRecord.activeModal || adapterStatus.activeModal,
                 }
                 : adapterStatus;

package/src/status/reporter.ts

@@ -91,6 +91,11 @@ export class DaemonStatusReporter {
     }
 
     onStatusChange(): void {
+        if (this.deps.p2p?.isConnected) {
+            this.resetP2PHash();
+            this.sendUnifiedStatusReport({ p2pOnly: true, reason: 'status-change' })
+                .catch(e => LOG.warn('Status', `Immediate P2P status send failed: ${e?.message}`));
+        }
         this.throttledReport();
     }
 
@@ -215,10 +220,12 @@ export class DaemonStatusReporter {
 
     async sendUnifiedStatusReport(opts?: { p2pOnly?: boolean; forceServer?: boolean; reason?: string }): Promise<void> {
         const { serverConn, p2p } = this.deps;
-        if (!serverConn?.isConnected()) return;
+        const serverConnected = !!serverConn?.isConnected();
+        const p2pConnected = !!p2p?.isConnected;
+        if (!serverConnected && !p2pConnected) return;
         this.lastStatusSentAt = Date.now();
         const now = this.lastStatusSentAt;
-        const target = opts?.p2pOnly ? 'P2P' : 'P2P+Server';
+        const target = opts?.p2pOnly ? 'P2P' : (serverConnected ? 'P2P+Server' : 'P2P');
 
         const allStates = this.deps.instanceManager.collectAllStates();
         const ideStates = allStates.filter((s): s is IdeProviderState => s.category === 'ide');
@@ -316,6 +323,7 @@ export class DaemonStatusReporter {
             ...wsPayload,
             timestamp: undefined,
         }));
+        if (!serverConnected || !serverConn) return;
         if (!opts?.forceServer && wsHash === this.lastServerStatusHash) {
             LOG.debug('Server', `skip duplicate status_report${opts?.reason ? ` (${opts.reason})` : ''}`);
             return;