@adhdev/daemon-core 0.9.76-rc.42 → 0.9.76-rc.44

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.9.76-rc.42",
+  "version": "0.9.76-rc.44",
   "description": "ADHDev daemon core — CDP, IDE detection, providers, command execution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -50,7 +50,7 @@
     "@agentclientprotocol/sdk": "^0.16.1",
     "@xterm/xterm": "^6.0.0",
     "chalk": "^5.3.0",
-    "chokidar": "^5.0.0",
+    "chokidar": "^4.0.3",
     "conf": "^13.0.0",
     "js-yaml": "^4.1.1",
     "node-pty": "^1.2.0-beta.12",

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

@@ -1918,7 +1918,21 @@ export class ProviderCliAdapter implements CliAdapter {
             ? String(parsedStatusBeforeSend.status)
             : '';
         if (!allowInputDuringGeneration && (parsedSessionStatus === 'generating' || parsedSessionStatus === 'long_generating')) {
-            throw new Error(`${this.cliName} is still processing the previous prompt`);
+            const parsedModal = parsedStatusBeforeSend?.activeModal ?? parsedStatusBeforeSend?.modal ?? null;
+            const parsedHasActionableModal = Boolean(
+                parsedModal
+                && Array.isArray(parsedModal.buttons)
+                && parsedModal.buttons.some((candidate: unknown) => typeof candidate === 'string' && candidate.trim()),
+            );
+            const terminalLooksIdle = this.currentStatus === 'idle'
+                && this.runDetectStatus(this.recentOutputBuffer) === 'idle'
+                && !this.isWaitingForResponse
+                && !this.currentTurnScope
+                && !this.hasActionableApproval()
+                && !parsedHasActionableModal;
+            if (!terminalLooksIdle) {
+                throw new Error(`${this.cliName} is still processing the previous prompt`);
+            }
         }
         if (this.isWaitingForResponse && !allowInputDuringGeneration) {
             if (!this.clearStaleIdleResponseGuard('send_message_guard')) {

package/src/commands/chat-commands.ts

@@ -1642,11 +1642,26 @@ export async function handleResolveAction(h: CommandHelpers, args: any): Promise
             && status.activeModal.buttons.some((candidate) => typeof candidate === 'string' && candidate.trim())
             ? status.activeModal
             : null;
-        const effectiveModal = statusModal || surfacedModal;
-        const effectiveStatus = status?.status === 'waiting_approval' || targetState?.activeChat?.status === 'waiting_approval'
+        const parsedStatus = !statusModal && !surfacedModal && typeof adapter.getScriptParsedStatus === 'function'
+            ? (() => {
+                try {
+                    return parseMaybeJson(adapter.getScriptParsedStatus());
+                } catch {
+                    return null;
+                }
+            })()
+            : null;
+        const parsedModal = parsedStatus?.status === 'waiting_approval'
+            && parsedStatus?.activeModal
+            && Array.isArray(parsedStatus.activeModal.buttons)
+            && parsedStatus.activeModal.buttons.some((candidate: unknown) => typeof candidate === 'string' && candidate.trim())
+            ? parsedStatus.activeModal
+            : null;
+        const effectiveModal = statusModal || surfacedModal || parsedModal;
+        const effectiveStatus = status?.status === 'waiting_approval' || targetState?.activeChat?.status === 'waiting_approval' || parsedStatus?.status === 'waiting_approval'
             ? 'waiting_approval'
             : status?.status;
-        LOG.info('Command', `[resolveAction] CLI PTY gate target=${String(args?.targetSessionId || '')} rawStatus=${String(status?.status || '')} effectiveStatus=${String(effectiveStatus || '')} statusModal=${statusModal ? 'yes' : 'no'} surfacedModal=${surfacedModal ? 'yes' : 'no'} instance=${targetInstance ? 'yes' : 'no'}`);
+        LOG.info('Command', `[resolveAction] CLI PTY gate target=${String(args?.targetSessionId || '')} rawStatus=${String(status?.status || '')} effectiveStatus=${String(effectiveStatus || '')} statusModal=${statusModal ? 'yes' : 'no'} surfacedModal=${surfacedModal ? 'yes' : 'no'} parsedModal=${parsedModal ? 'yes' : 'no'} instance=${targetInstance ? 'yes' : 'no'}`);
         if (!effectiveModal) {
             return { success: false, error: 'Not in approval state' };
         }