adhdev 0.8.89 → 0.8.91

package/dist/cli/index.js

@@ -7830,10 +7830,11 @@ async function handleReadChat(h, args) {
       const parsedRecord = parsedStatus && typeof parsedStatus === "object" ? parsedStatus : null;
       const adapterStatus = adapter.getStatus();
       const shouldPreferAdapterMessages = Array.isArray(adapterStatus.messages) && 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;
       const title = typeof parsedRecord?.title === "string" ? parsedRecord.title : void 0;
@@ -11940,8 +11941,8 @@ function buildCliParseInput(options) {
     scope,
     runtimeSettings
   } = options;
-  const buffer = scope ? sliceFromOffset(accumulatedBuffer, scope.bufferStart) || accumulatedBuffer : accumulatedBuffer;
-  const rawBuffer = scope ? sliceFromOffset(accumulatedRawBuffer, scope.rawBufferStart) || accumulatedRawBuffer : accumulatedRawBuffer;
+  const buffer = scope ? sliceFromOffset(accumulatedBuffer, scope.bufferStart) : accumulatedBuffer;
+  const rawBuffer = scope ? sliceFromOffset(accumulatedRawBuffer, scope.rawBufferStart) : accumulatedRawBuffer;
   const screenText = terminalScreenText;
   const recentBuffer = buffer.slice(-1e3) || recentOutputBuffer;
   return {
@@ -11973,8 +11974,8 @@ function summarizeCliTraceMessages(messages, limit = 3) {
 }
 function buildCliTraceParseSnapshot(options) {
   const { accumulatedBuffer, accumulatedRawBuffer, responseBuffer, partialResponse, scope } = options;
-  const scopedBuffer = scope ? sliceFromOffset(accumulatedBuffer, scope.bufferStart) || accumulatedBuffer : accumulatedBuffer;
-  const scopedRawBuffer = scope ? sliceFromOffset(accumulatedRawBuffer, scope.rawBufferStart) || accumulatedRawBuffer : accumulatedRawBuffer;
+  const scopedBuffer = scope ? sliceFromOffset(accumulatedBuffer, scope.bufferStart) : accumulatedBuffer;
+  const scopedRawBuffer = scope ? sliceFromOffset(accumulatedRawBuffer, scope.rawBufferStart) : accumulatedRawBuffer;
   return {
     currentTurnScope: scope || null,
     responseBuffer: summarizeCliTraceText(responseBuffer, 1200),
@@ -12638,6 +12639,7 @@ var init_provider_cli_adapter = __esm({
       looksLikeClaudeGeneratingLine(line) {
         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;
@@ -12847,14 +12849,15 @@ var init_provider_cli_adapter = __esm({
           return;
         }
         const startupModal = this.getStartupConfirmationModal(screenText);
-        const modal = this.runParseApproval(tail) || startupModal;
-        const rawScriptStatus = this.runDetectStatus(tail);
-        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) => typeof button === "string" && button.trim()) ? parsedTranscript.activeModal : null;
+        const modal = this.runParseApproval(tail) || parsedModal || startupModal;
+        const rawScriptStatus = this.runDetectStatus(tail);
+        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,
           scope: this.currentTurnScope,
@@ -12864,6 +12867,7 @@ var init_provider_cli_adapter = __esm({
           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),
@@ -12950,7 +12954,7 @@ var init_provider_cli_adapter = __esm({
             `[${this.cliType}] settled diagnostics prompt=${JSON.stringify(this.currentTurnScope.prompt).slice(0, 140)} scriptStatus=${String(scriptStatus || "")} parsedStatus=${String(parsedTranscript?.status || "")} parsedMsgCount=${parsedMessages.length} lastParsedAssistant=${JSON.stringify(summarizeCliTraceText(lastParsedAssistant?.content || "", 120)).slice(0, 160)} visibleIdlePrompt=${String(visibleIdlePrompt)} visibleAssistantCandidate=${String(visibleAssistantCandidate)} responseBuffer=${JSON.stringify(summarizeCliTraceText(this.responseBuffer, 160)).slice(0, 220)} screen=${JSON.stringify(summarizeCliTraceText(screenText, 160)).slice(0, 220)}`
           );
         }
-        const shouldHoldGenerating = scriptStatus === "idle" && this.isWaitingForResponse && !modal && recentInteractiveActivity && !(visibleIdlePrompt && visibleAssistantCandidate);
+        const shouldHoldGenerating = scriptStatus === "idle" && this.isWaitingForResponse && !modal && recentInteractiveActivity && !(visibleIdlePrompt && visibleAssistantCandidate) && !(parsedTranscript?.status === "idle" && !!lastParsedAssistant);
         if (shouldHoldGenerating) {
           this.clearIdleFinishCandidate("hold_generating_recent_activity");
           this.setStatus("generating", "recent_activity_hold");
@@ -13018,7 +13022,7 @@ var init_provider_cli_adapter = __esm({
           const effectiveScreenText = screenText || this.accumulatedBuffer;
           const noActiveTurn = !this.currentTurnScope;
           const looksIdleChrome = /(^|\n)\s*[❯›>]\s*(?:\n|$)/m.test(effectiveScreenText) || /accept edits on/i.test(effectiveScreenText) && (/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") {
@@ -13352,11 +13356,17 @@ var init_provider_cli_adapter = __esm({
           return null;
         }
       }
+      projectEffectiveStatus(startupModal = null) {
+        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() {
         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],
@@ -14063,7 +14073,7 @@ ${data.message || ""}`.trim();
         }
         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)) {
@@ -14089,7 +14099,7 @@ ${data.message || ""}`.trim();
       getDebugState() {
         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,
@@ -38241,6 +38251,10 @@ var init_reporter = __esm({
         }
       }
       onStatusChange() {
+        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();
       }
       throttledReport() {
@@ -38338,10 +38352,12 @@ var init_reporter = __esm({
       }
       async sendUnifiedStatusReport(opts) {
         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.category === "ide");
         const cliStates = allStates.filter((s) => s.category === "cli");
@@ -38420,6 +38436,7 @@ var init_reporter = __esm({
           ...wsPayload,
           timestamp: void 0
         }));
+        if (!serverConnected || !serverConn) return;
         if (!opts?.forceServer && wsHash === this.lastServerStatusHash) {
           LOG.debug("Server", `skip duplicate status_report${opts?.reason ? ` (${opts.reason})` : ""}`);
           return;
@@ -86501,7 +86518,7 @@ var init_adhdev_daemon = __esm({
     init_version();
     init_src();
     init_runtime_defaults();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.89" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.91" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;