@adhdev/daemon-standalone 0.9.16 → 0.9.18

package/dist/index.js

@@ -30347,7 +30347,7 @@ var require_dist2 = __commonJS({
           armApprovalExitTimeout() {
             if (this.approvalExitTimeout) clearTimeout(this.approvalExitTimeout);
             this.approvalExitTimeout = setTimeout(() => {
-              if (this.currentStatus !== "waiting_approval") return;
+              if (!this.hasActionableApproval()) return;
               const tail = this.recentOutputBuffer;
               const screenText = this.terminalScreen.getText() || "";
               const modal = this.runParseApproval(tail);
@@ -30374,7 +30374,7 @@ var require_dist2 = __commonJS({
           }
           shouldRetryFinishResponse(commitResult) {
             if (!this.currentTurnScope) return false;
-            if (this.currentStatus === "waiting_approval" || this.activeModal) return false;
+            if (this.hasActionableApproval()) return false;
             if (this.finishRetryCount >= _ProviderCliAdapter.MAX_FINISH_RETRIES) return false;
             if (commitResult.hasAssistant && commitResult.assistantContent.trim()) return false;
             if (this.runDetectStatus(this.recentOutputBuffer) !== "idle") return false;
@@ -30390,7 +30390,7 @@ var require_dist2 = __commonJS({
             return quietForMs < holdMs || screenStableMs < holdMs;
           }
           shouldDeferIdleTimeoutFinish() {
-            if (!this.isWaitingForResponse || this.currentStatus === "waiting_approval") {
+            if (!this.isWaitingForResponse || this.hasActionableApproval()) {
               return false;
             }
             const latestStatus = this.runDetectStatus(this.recentOutputBuffer) || this.currentStatus;
@@ -30566,7 +30566,7 @@ var require_dist2 = __commonJS({
                 scope: this.currentTurnScope
               })
             });
-            if (this.currentTurnScope && !lastParsedAssistant && !this.submitRetryUsed && this.ptyProcess && this.currentStatus !== "waiting_approval" && promptLikelyVisible(screenText, normalizedPromptSnippet) && !this.hasMeaningfulResponseBuffer(normalizedPromptSnippet)) {
+            if (this.currentTurnScope && !lastParsedAssistant && !this.submitRetryUsed && this.ptyProcess && !this.hasActionableApproval() && promptLikelyVisible(screenText, normalizedPromptSnippet) && !this.hasMeaningfulResponseBuffer(normalizedPromptSnippet)) {
               this.submitRetryUsed = true;
               this.responseSettleIgnoreUntil = Date.now() + this.timeouts.outputSettle + 400;
               LOG2.info("CLI", `[${this.cliType}] Retrying submit key from settled parser (no assistant yet)`);
@@ -30656,7 +30656,7 @@ var require_dist2 = __commonJS({
             this.setStatus("generating", "recent_activity_hold");
             if (this.idleTimeout) clearTimeout(this.idleTimeout);
             this.idleTimeout = setTimeout(() => {
-              if (this.isWaitingForResponse && this.currentStatus !== "waiting_approval") {
+              if (this.isWaitingForResponse && !this.hasActionableApproval()) {
                 if (this.shouldDeferIdleTimeoutFinish()) return;
                 this.finishResponse();
               }
@@ -30688,16 +30688,16 @@ var require_dist2 = __commonJS({
               }
               this.activeModal = null;
               if (this.isWaitingForResponse) {
-                this.setStatus("generating", inCooldown ? "approval_cooldown_ignore" : "approval_prompt_gone");
+                this.setStatus("idle", inCooldown ? "approval_cooldown_non_actionable" : "approval_prompt_gone_non_actionable");
                 if (this.idleTimeout) clearTimeout(this.idleTimeout);
                 this.idleTimeout = setTimeout(() => {
-                  if (this.isWaitingForResponse && this.currentStatus !== "waiting_approval") {
+                  if (this.isWaitingForResponse && !this.hasActionableApproval()) {
                     if (this.shouldDeferIdleTimeoutFinish()) return;
                     this.finishResponse();
                   }
                 }, this.timeouts.generatingIdle);
               } else {
-                this.setStatus("idle", inCooldown ? "approval_cooldown_ignore" : "approval_prompt_gone");
+                this.setStatus("idle", inCooldown ? "approval_cooldown_non_actionable" : "approval_prompt_gone_non_actionable");
               }
               this.onStatusChange?.();
               return;
@@ -30755,6 +30755,7 @@ var require_dist2 = __commonJS({
               }
               this.activeModal = null;
               this.lastApprovalResolvedAt = Date.now();
+              this.setStatus("idle", "approval_prompt_gone_script_idle");
             }
             if (!this.isWaitingForResponse) {
               if (prevStatus !== "idle") {
@@ -30812,7 +30813,7 @@ var require_dist2 = __commonJS({
             }
             if (this.idleTimeout) clearTimeout(this.idleTimeout);
             this.idleTimeout = setTimeout(() => {
-              if (this.isWaitingForResponse && this.currentStatus !== "waiting_approval") {
+              if (this.isWaitingForResponse && !this.hasActionableApproval()) {
                 if (this.shouldDeferIdleTimeoutFinish()) return;
                 this.clearIdleFinishCandidate("idle_timeout_finish");
                 this.finishResponse();
@@ -30850,7 +30851,7 @@ var require_dist2 = __commonJS({
               if (this.finishRetryTimer) clearTimeout(this.finishRetryTimer);
               this.finishRetryTimer = setTimeout(() => {
                 this.finishRetryTimer = null;
-                if (this.isWaitingForResponse && this.currentStatus !== "waiting_approval") {
+                if (this.isWaitingForResponse && !this.hasActionableApproval()) {
                   this.finishResponse();
                 }
               }, _ProviderCliAdapter.FINISH_RETRY_DELAY_MS);
@@ -30996,10 +30997,13 @@ var require_dist2 = __commonJS({
               return null;
             }
           }
+          hasActionableApproval(startupModal = null) {
+            return !!(startupModal || this.activeModal);
+          }
           projectEffectiveStatus(startupModal = null) {
             if (this.parseErrorMessage) return "error";
-            if (startupModal || this.activeModal) return "waiting_approval";
-            if (this.isWaitingForResponse && this.currentTurnScope && this.currentStatus === "idle") return "generating";
+            if (this.hasActionableApproval(startupModal)) return "waiting_approval";
+            if (this.isWaitingForResponse && this.currentTurnScope && this.currentStatus !== "stopped") return "generating";
             return this.currentStatus;
           }
           suppressStaleParsedApproval(parsed, recentBuffer, screenText) {
@@ -31297,7 +31301,7 @@ var require_dist2 = __commonJS({
           async sendMessage(text) {
             if (!this.ptyProcess) throw new Error(`${this.cliName} is not running`);
             const allowInputDuringGeneration = this.provider.allowInputDuringGeneration === true;
-            const allowInterventionPrompt = allowInputDuringGeneration && this.isWaitingForResponse && this.currentStatus !== "waiting_approval";
+            const allowInterventionPrompt = allowInputDuringGeneration && this.isWaitingForResponse && !this.hasActionableApproval();
             if (this.startupParseGate) {
               const deadline = Date.now() + 1e4;
               while (this.startupParseGate && Date.now() < deadline) {
@@ -31421,7 +31425,7 @@ var require_dist2 = __commonJS({
                 const retrySubmitIfStuck = (attempt) => {
                   this.submitRetryTimer = null;
                   if (!this.ptyProcess || !this.isWaitingForResponse || this.submitRetryUsed) return;
-                  if (this.currentStatus === "waiting_approval") return;
+                  if (this.hasActionableApproval()) return;
                   if (this.hasMeaningfulResponseBuffer(normalizedPromptSnippet)) return;
                   const screenText2 = this.terminalScreen.getText();
                   if (!promptLikelyVisible(screenText2, normalizedPromptSnippet)) return;
@@ -31464,7 +31468,7 @@ var require_dist2 = __commonJS({
                   this.submitRetryTimer = setTimeout(() => {
                     this.submitRetryTimer = null;
                     if (!this.ptyProcess || !this.isWaitingForResponse || this.submitRetryUsed) return;
-                    if (this.currentStatus === "waiting_approval") return;
+                    if (this.hasActionableApproval()) return;
                     if (this.hasMeaningfulResponseBuffer(normalizedPromptSnippet)) return;
                     const screenText = this.terminalScreen.getText();
                     if (!promptLikelyVisible(screenText, normalizedPromptSnippet)) return;
@@ -31749,6 +31753,9 @@ var require_dist2 = __commonJS({
               name: this.cliName,
               providerResolution: this.providerResolutionMeta,
               status: effectiveStatus,
+              projectedStatus: effectiveStatus,
+              rawStatus: this.currentStatus,
+              lifecycleStatus: this.isWaitingForResponse ? "awaiting_response" : "idle",
               ready: effectiveReady,
               startupParseGate: this.startupParseGate,
               spawnAt: this.spawnAt,
@@ -31801,7 +31808,10 @@ var require_dist2 = __commonJS({
               screenText: summarizeCliTraceText(this.terminalScreen.getText(), 4e3),
               recentOutputBuffer: summarizeCliTraceText(this.recentOutputBuffer, 1e3),
               responseBuffer: summarizeCliTraceText(this.responseBuffer, 1200),
-              status: this.currentStatus,
+              status: this.projectEffectiveStatus(),
+              projectedStatus: this.projectEffectiveStatus(),
+              rawStatus: this.currentStatus,
+              lifecycleStatus: this.isWaitingForResponse ? "awaiting_response" : "idle",
               activeModal: this.activeModal,
               currentTurnScope: this.currentTurnScope,
               messages: summarizeCliTraceMessages(this.committedMessages, 5)