adhdev 0.9.17 → 0.9.18

package/dist/cli/index.js

@@ -13055,7 +13055,7 @@ var init_provider_cli_adapter = __esm({
       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);
@@ -13082,7 +13082,7 @@ var init_provider_cli_adapter = __esm({
       }
       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;
@@ -13098,7 +13098,7 @@ var init_provider_cli_adapter = __esm({
         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;
@@ -13274,7 +13274,7 @@ var init_provider_cli_adapter = __esm({
             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;
           LOG.info("CLI", `[${this.cliType}] Retrying submit key from settled parser (no assistant yet)`);
@@ -13364,7 +13364,7 @@ var init_provider_cli_adapter = __esm({
         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();
           }
@@ -13396,16 +13396,16 @@ var init_provider_cli_adapter = __esm({
           }
           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;
@@ -13463,9 +13463,7 @@ var init_provider_cli_adapter = __esm({
           }
           this.activeModal = null;
           this.lastApprovalResolvedAt = Date.now();
-          if (this.isWaitingForResponse) {
-            this.setStatus("generating", "approval_prompt_gone_idle_confirm");
-          }
+          this.setStatus("idle", "approval_prompt_gone_script_idle");
         }
         if (!this.isWaitingForResponse) {
           if (prevStatus !== "idle") {
@@ -13523,7 +13521,7 @@ var init_provider_cli_adapter = __esm({
         }
         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();
@@ -13561,7 +13559,7 @@ var init_provider_cli_adapter = __esm({
           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);
@@ -13707,10 +13705,13 @@ var init_provider_cli_adapter = __esm({
           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) {
@@ -14008,7 +14009,7 @@ var init_provider_cli_adapter = __esm({
       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) {
@@ -14132,7 +14133,7 @@ var init_provider_cli_adapter = __esm({
             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;
@@ -14175,7 +14176,7 @@ var init_provider_cli_adapter = __esm({
               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;
@@ -14460,6 +14461,9 @@ var init_provider_cli_adapter = __esm({
           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,
@@ -14512,7 +14516,10 @@ var init_provider_cli_adapter = __esm({
           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)
@@ -87239,7 +87246,7 @@ var init_adhdev_daemon = __esm({
     init_version();
     init_src();
     init_runtime_defaults();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.17" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.18" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;