adhdev 0.9.76-rc.7 → 0.9.76-rc.9

package/dist/cli/index.js

@@ -8917,6 +8917,14 @@ function getActiveChatOptions(profile) {
   if (profile === "full") return {};
   return LIVE_STATUS_ACTIVE_CHAT_OPTIONS;
 }
+function resolveSessionStatus(activeChat, providerStatus) {
+  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) {
   return profile !== "live";
 }
@@ -8972,9 +8980,7 @@ function buildIdeWorkspaceSession(state, cdpManagers, options) {
     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 },
@@ -9009,9 +9015,7 @@ function buildExtensionAgentSession(parent, ext, options) {
     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 },
@@ -9061,9 +9065,7 @@ function buildCliSession(state, options) {
     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 },
@@ -9111,9 +9113,7 @@ function buildAcpSession(state, options) {
     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 },
@@ -14635,8 +14635,9 @@ var init_provider_cli_adapter = __esm({
         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;
         return `${screenText}
@@ -90307,7 +90308,7 @@ var init_adhdev_daemon = __esm({
     init_version();
     init_src();
     init_runtime_defaults();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.76-rc.7" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.76-rc.9" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;
@@ -91143,6 +91144,19 @@ ${err?.stack || ""}`);
         void this.statusReporter?.sendUnifiedStatusReport({ forceServer: true, reason });
         void this.flushP2PDaemonMetadataSubscriptions();
       }
+      emitMeshCheckpointCompleteIfNeeded(commandType, result, normalizedData) {
+        if (commandType !== "git_checkpoint" || result?.success !== true || !this.meshManager) return;
+        const workspace = String(normalizedData.workspace ?? "");
+        const baseContext = {
+          workspace,
+          checkpoint_message: result.checkpoint?.message ?? String(normalizedData.message ?? ""),
+          commit: result.checkpoint?.commit ?? "",
+          source_session_id: String(normalizedData.targetSessionId ?? "")
+        };
+        void this.buildMeshCheckpointContext(workspace, baseContext).then((ctx) => {
+          this.meshManager.emit({ trigger: "git_checkpoint_complete", context: ctx });
+        });
+      }
       async handleCommand(msg, cmd, args) {
         const normalizedArgs = this.ensureInteractionContext(args);
         const interactionId = String(normalizedArgs._interactionId);
@@ -91177,6 +91191,10 @@ ${err?.stack || ""}`);
           if (cmd === "resolve_action" || cmd === "send_chat" || cmd === "read_chat") {
             void this.flushP2PSessionModalSubscriptions();
           }
+          if (cmd.startsWith("git_")) {
+            void this.flushP2PWorkspaceGitSubscriptions();
+          }
+          this.emitMeshCheckpointCompleteIfNeeded(cmd, result, normalizedArgs);
           this.sendResult(msg, result.success, { ...result, interactionId });
           recordDebugTrace({
             interactionId,
@@ -91258,18 +91276,7 @@ ${err?.stack || ""}`);
           if (cmdType.startsWith("git_")) {
             void this.flushP2PWorkspaceGitSubscriptions();
           }
-          if (cmdType === "git_checkpoint" && routed.success && this.meshManager) {
-            const workspace = String(normalizedData.workspace ?? "");
-            const baseContext = {
-              workspace,
-              checkpoint_message: routed.checkpoint?.message ?? String(normalizedData.message ?? ""),
-              commit: routed.checkpoint?.commit ?? "",
-              source_session_id: String(normalizedData.targetSessionId ?? "")
-            };
-            void this.buildMeshCheckpointContext(workspace, baseContext).then((ctx) => {
-              this.meshManager.emit({ trigger: "git_checkpoint_complete", context: ctx });
-            });
-          }
+          this.emitMeshCheckpointCompleteIfNeeded(cmdType, routed, normalizedData);
           return { ...routed, interactionId };
         } catch (e) {
           logCommand({ ts: (/* @__PURE__ */ new Date()).toISOString(), cmd: cmdType, source: "p2p", interactionId, success: false, error: e.message, durationMs: Date.now() - cmdStart });
@@ -91422,6 +91429,7 @@ ${err?.stack || ""}`);
             result = { success: true, result: relayResult };
           } else {
             result = await this.components.router.execute(command, normalizedArgs, "ipc");
+            this.emitMeshCheckpointCompleteIfNeeded(command, result, normalizedArgs);
           }
           ws.send(JSON.stringify({
             type: "ext:command_result",