@adhdev/daemon-core 0.9.76-rc.7 → 0.9.76-rc.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.9.76-rc.7",
+  "version": "0.9.76-rc.9",
   "description": "ADHDev daemon core — CDP, IDE detection, providers, command execution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

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

@@ -266,9 +266,10 @@ export class ProviderCliAdapter implements CliAdapter {
         const currentSnapshot = normalizeScreenSnapshot(screenText);
         const lastSnapshot = this.lastScreenSnapshot;
         if (!lastSnapshot || lastSnapshot === currentSnapshot) return screenText;
-        const staleSnapshotLooksActive = /\besc to (?:interrupt|stop)\b|Enter to interrupt, Ctrl\+C to cancel/i.test(lastSnapshot);
-        const currentScreenLooksIdle = /(?:^|\n|\r)\s*[❯›>]\s*(?:\n|\r|$)/.test(screenText)
-            && !/\besc to (?:interrupt|stop)\b|Enter to interrupt, Ctrl\+C to cancel/i.test(screenText);
+        const activeScreenPattern = /\besc to (?:interrupt|stop)\b|Enter to interrupt, Ctrl\+C to cancel|Enter to confirm\s*[·•-]\s*Esc to cancel|\b(?:MCP servers?|tool calls?)\b[^\n\r]{0,160}\brequire approval\b/i;
+        const staleSnapshotLooksActive = activeScreenPattern.test(lastSnapshot);
+        const currentScreenLooksIdle = /(?:^|\n|\r)\s*[❯›>]\s*(?:Try\s+["“][^\n\r"”]+["”])?\s*(?:\n|\r|$)/.test(screenText)
+            && !activeScreenPattern.test(screenText);
         if (staleSnapshotLooksActive && currentScreenLooksIdle) return screenText;
         if (currentSnapshot.length >= lastSnapshot.length) return screenText;
         // Terminal screen reads can miss a just-rendered completed Hermes box while

package/src/status/builders.ts

@@ -43,6 +43,19 @@ function getActiveChatOptions(profile: SessionEntryProfile): NormalizeActiveChat
     return LIVE_STATUS_ACTIVE_CHAT_OPTIONS;
 }
 
+function resolveSessionStatus(
+    activeChat: { status?: string | null; activeModal?: { buttons?: unknown[] | null } | null } | null | undefined,
+    providerStatus?: string | null,
+) {
+    const chatStatus = normalizeManagedStatus(activeChat?.status, { activeModal: activeChat?.activeModal || null });
+    const topLevelStatus = normalizeManagedStatus(providerStatus, { activeModal: activeChat?.activeModal || null });
+
+    if (chatStatus === 'waiting_approval' || topLevelStatus === 'waiting_approval') return 'waiting_approval';
+    if (chatStatus === 'generating' || topLevelStatus === 'generating') return 'generating';
+    if (topLevelStatus !== 'idle') return topLevelStatus;
+    return chatStatus;
+}
+
 function shouldIncludeSessionControls(profile: SessionEntryProfile): boolean {
     return profile !== 'live';
 }
@@ -170,9 +183,7 @@ function buildIdeWorkspaceSession(
         providerName: state.name,
         kind: 'workspace',
         transport: 'cdp-page',
-        status: normalizeManagedStatus(activeChat?.status || state.status, {
-            activeModal: activeChat?.activeModal || null,
-        }),
+        status: resolveSessionStatus(activeChat, state.status),
         title,
         workspace,
         ...(git && { git }),
@@ -212,9 +223,7 @@ function buildExtensionAgentSession(
         providerSessionId: ext.providerSessionId,
         kind: 'agent',
         transport: 'cdp-webview',
-        status: normalizeManagedStatus(activeChat?.status || ext.status, {
-            activeModal: activeChat?.activeModal || null,
-        }),
+        status: resolveSessionStatus(activeChat, ext.status),
         title: activeChat?.title || ext.name,
         workspace,
         ...(git && { git }),
@@ -277,9 +286,7 @@ function buildCliSession(state: CliProviderState, options: SessionEntryBuildOpti
         providerSessionId: state.providerSessionId,
         kind: 'agent',
         transport: 'pty',
-        status: normalizeManagedStatus(activeChat?.status || state.status, {
-            activeModal: activeChat?.activeModal || null,
-        }),
+        status: resolveSessionStatus(activeChat, state.status),
         title: activeChat?.title || state.name,
         workspace,
         ...(git && { git }),
@@ -328,9 +335,7 @@ function buildAcpSession(state: AcpProviderState, options: SessionEntryBuildOpti
         providerName: state.name,
         kind: 'agent',
         transport: 'acp',
-        status: normalizeManagedStatus(activeChat?.status || state.status, {
-            activeModal: activeChat?.activeModal || null,
-        }),
+        status: resolveSessionStatus(activeChat, state.status),
         title: activeChat?.title || state.name,
         workspace,
         ...(git && { git }),