adhdev 0.9.69 → 0.9.71

package/dist/cli/index.js

@@ -8984,7 +8984,8 @@ function buildIdeWorkspaceSession(state, cdpManagers, options) {
     },
     errorMessage: state.errorMessage,
     errorReason: state.errorReason,
-    lastUpdated: state.lastUpdated
+    lastUpdated: state.lastUpdated,
+    settings: state.settings
   };
 }
 function buildExtensionAgentSession(parent, ext, options) {
@@ -9019,7 +9020,8 @@ function buildExtensionAgentSession(parent, ext, options) {
     },
     errorMessage: ext.errorMessage,
     errorReason: ext.errorReason,
-    lastUpdated: ext.lastUpdated
+    lastUpdated: ext.lastUpdated,
+    settings: ext.settings
   };
 }
 function shouldIncludeExtensionSession(ext) {
@@ -9085,7 +9087,8 @@ function buildCliSession(state, options) {
     },
     errorMessage: state.errorMessage,
     errorReason: state.errorReason,
-    lastUpdated: state.lastUpdated
+    lastUpdated: state.lastUpdated,
+    settings: state.settings
   };
 }
 function buildAcpSession(state, options) {
@@ -9119,7 +9122,8 @@ function buildAcpSession(state, options) {
     },
     errorMessage: state.errorMessage,
     errorReason: state.errorReason,
-    lastUpdated: state.lastUpdated
+    lastUpdated: state.lastUpdated,
+    settings: state.settings
   };
 }
 function buildSessionEntries(allStates, cdpManagers, options = {}) {
@@ -9583,6 +9587,8 @@ function getSendChatInputEnvelope(args) {
 function getHistorySessionId(h, args) {
   const explicit = typeof args?.historySessionId === "string" ? args.historySessionId.trim() : "";
   if (explicit) return explicit;
+  const explicitProviderSessionId = typeof args?.providerSessionId === "string" ? args.providerSessionId.trim() : "";
+  if (explicitProviderSessionId) return explicitProviderSessionId;
   const targetSessionId = typeof args?.targetSessionId === "string" ? args.targetSessionId.trim() : "";
   if (!targetSessionId) return void 0;
   const instance = h.ctx.instanceManager?.getInstance(targetSessionId);
@@ -10139,7 +10145,32 @@ async function handleReadChat(h, args) {
         ...coverage ? { coverage } : {}
       }, args);
     }
-    return { success: false, error: `${transport} adapter not found` };
+    const historyLimit = normalizeReadChatTailLimit(args);
+    try {
+      const agentStr = provider?.type || args?.agentType || getCurrentProviderType(h);
+      const workspace = typeof args?.workspace === "string" ? args.workspace : typeof h.currentSession?.workspace === "string" ? h.currentSession.workspace : void 0;
+      const history = readProviderChatHistory(agentStr, {
+        canonicalHistory: provider?.canonicalHistory,
+        historySessionId,
+        workspace,
+        offset: 0,
+        limit: historyLimit,
+        excludeRecentCount: 0,
+        historyBehavior: provider?.historyBehavior,
+        scripts: provider?.scripts
+      });
+      const historyProviderSessionId = typeof history?.providerSessionId === "string" ? history.providerSessionId : historySessionId;
+      return buildReadChatCommandResult({
+        messages: Array.isArray(history?.messages) ? history.messages : [],
+        status: "idle",
+        ...typeof history?.title === "string" ? { title: history.title } : {},
+        ...historyProviderSessionId ? { providerSessionId: historyProviderSessionId } : {},
+        ...provider?.historyBehavior?.transcriptAuthority === "provider" || provider?.historyBehavior?.transcriptAuthority === "daemon" ? { transcriptAuthority: (provider?.historyBehavior).transcriptAuthority } : {},
+        coverage: "tail"
+      }, args);
+    } catch (error48) {
+      return { success: false, error: error48?.message || `${transport} adapter not found` };
+    }
   }
   if (isExtensionTransport(transport)) {
     let extensionReadChatError = "";
@@ -16367,11 +16398,22 @@ var init_provider_cli_adapter = __esm({
           }
         }
       }
+      getParsedDebugState() {
+        if (this.startupParseGate || typeof this.cliScripts?.parseSession !== "function") return null;
+        try {
+          const parsed = this.getScriptParsedStatus();
+          return parsed && typeof parsed === "object" ? parsed : null;
+        } catch {
+          return null;
+        }
+      }
       getDebugState() {
         const screenText = sanitizeTerminalText(this.terminalScreen.getText());
         const startupModal = this.startupParseGate ? this.runParseApproval(this.recentOutputBuffer) : null;
         const effectiveStatus = this.projectEffectiveStatus(startupModal);
         const effectiveReady = this.ready || !!startupModal;
+        const parsedDebugState = this.getParsedDebugState();
+        const parsedMessages = Array.isArray(parsedDebugState?.messages) ? parsedDebugState.messages : [];
         return {
           type: this.cliType,
           name: this.cliName,
@@ -16384,8 +16426,18 @@ var init_provider_cli_adapter = __esm({
           startupParseGate: this.startupParseGate,
           spawnAt: this.spawnAt,
           workingDir: this.workingDir,
-          messages: [],
-          messageCount: 0,
+          messages: parsedMessages,
+          messageCount: parsedMessages.length,
+          parsedStatus: parsedDebugState ? {
+            id: parsedDebugState.id,
+            status: parsedDebugState.status,
+            title: parsedDebugState.title,
+            providerSessionId: parsedDebugState.providerSessionId,
+            transcriptAuthority: parsedDebugState.transcriptAuthority,
+            coverage: parsedDebugState.coverage,
+            activeModal: parsedDebugState.activeModal,
+            messageCount: parsedMessages.length
+          } : null,
           screenText: screenText.slice(-4e3),
           currentTurnScope: this.currentTurnScope,
           startupBuffer: this.startupBuffer.slice(-4e3),
@@ -16719,7 +16771,7 @@ var init_cli_provider_instance = __esm({
           this.errorMessage = void 0;
           this.errorReason = void 0;
         }
-        const autoApproveActive = adapterStatus.status === "waiting_approval" && this.shouldAutoApprove();
+        const autoApproveActive = this.maybeAutoApproveStatus(adapterStatus, Date.now());
         const visibleStatus = parseErrorMessage ? "error" : autoApproveActive ? "generating" : adapterStatus.status;
         const parsedProviderSessionId = normalizeProviderSessionId(
           this.provider,
@@ -16912,12 +16964,8 @@ var init_cli_provider_instance = __esm({
         }
         this.applyProviderResponse(parsed.payload, { phase: "immediate" });
       }
-      detectStatusTransition() {
-        const now = Date.now();
-        const adapterStatus = this.adapter.getStatus({ allowParse: false });
-        const parsedStatus = null;
-        const rawStatus = adapterStatus.status;
-        const autoApproveActive = rawStatus === "waiting_approval" && this.shouldAutoApprove();
+      maybeAutoApproveStatus(adapterStatus, now = Date.now()) {
+        const autoApproveActive = adapterStatus?.status === "waiting_approval" && this.shouldAutoApprove();
         if (autoApproveActive && !this.autoApproveBusy) {
           this.autoApproveBusy = true;
           if (this.autoApproveBusyTimer) clearTimeout(this.autoApproveBusyTimer);
@@ -16925,12 +16973,21 @@ var init_cli_provider_instance = __esm({
             this.autoApproveBusy = false;
             this.autoApproveBusyTimer = null;
           }, 2e3);
-          const { index: buttonIndex, label: buttonLabel } = pickApprovalButton(adapterStatus.activeModal?.buttons, this.provider);
-          this.recordAutoApproval(adapterStatus.activeModal?.message, buttonLabel, now);
+          const modal = adapterStatus.activeModal;
+          const { index: buttonIndex, label: buttonLabel } = pickApprovalButton(modal?.buttons, this.provider);
+          this.recordAutoApproval(modal?.message, buttonLabel, now);
           setTimeout(() => {
             this.adapter.resolveModal(buttonIndex);
           }, 0);
         }
+        return autoApproveActive;
+      }
+      detectStatusTransition() {
+        const now = Date.now();
+        const adapterStatus = this.adapter.getStatus({ allowParse: false });
+        const parsedStatus = null;
+        const rawStatus = adapterStatus.status;
+        const autoApproveActive = this.maybeAutoApproveStatus(adapterStatus, now);
         const newStatus = autoApproveActive ? "generating" : rawStatus;
         const dirName = this.workingDir.split("/").filter(Boolean).pop() || "session";
         const chatTitle = `${this.provider.name} \xB7 ${dirName}`;
@@ -35336,7 +35393,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
             resolvedDir,
             resolvedCliArgs,
             resolvedProvider,
-            this.providerLoader.getSettings(normalizedType),
+            { ...this.providerLoader.getSettings(normalizedType), ...options?.settingsOverride || {} },
             false,
             {
               providerSessionId: sessionBinding.providerSessionId,
@@ -35590,7 +35647,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
               dir,
               args?.cliArgs,
               args?.initialModel,
-              { resumeSessionId: args?.resumeSessionId }
+              { resumeSessionId: args?.resumeSessionId, settingsOverride: args?.settings }
             );
             return {
               success: true,
@@ -41475,11 +41532,16 @@ var init_router = __esm({
             const cliType = typeof args?.cliType === "string" ? args.cliType.trim() : "claude-cli";
             if (!meshId) return { success: false, error: "meshId required" };
             try {
-              const { getMesh: getMesh3 } = await Promise.resolve().then(() => (init_mesh_config(), mesh_config_exports));
               const { buildCoordinatorSystemPrompt: buildCoordinatorSystemPrompt2 } = await Promise.resolve().then(() => (init_coordinator_prompt(), coordinator_prompt_exports));
-              const mesh = getMesh3(meshId);
+              let mesh;
+              if (args?.inlineMesh && typeof args.inlineMesh === "object") {
+                mesh = args.inlineMesh;
+              } else {
+                const { getMesh: getMesh3 } = await Promise.resolve().then(() => (init_mesh_config(), mesh_config_exports));
+                mesh = getMesh3(meshId);
+              }
               if (!mesh) return { success: false, error: "Mesh not found" };
-              if (mesh.nodes.length === 0) return { success: false, error: "No nodes in mesh" };
+              if (!Array.isArray(mesh.nodes) || mesh.nodes.length === 0) return { success: false, error: "No nodes in mesh" };
               const workspace = mesh.nodes[0].workspace;
               const providerMeta = this.deps.providerLoader.resolve?.(cliType) || this.deps.providerLoader.getMeta(cliType);
               const coordinatorSetup = resolveMeshCoordinatorSetup({
@@ -41547,10 +41609,20 @@ var init_router = __esm({
               } catch {
                 systemPrompt = `You are a Repo Mesh Coordinator for "${mesh.name}". Use the adhdev-mesh MCP tools (mesh_status, mesh_list_nodes, mesh_send_task, mesh_read_chat, mesh_launch_session, etc.) to orchestrate work across ${mesh.nodes.length} node(s).`;
               }
+              const cliArgs = [];
+              if (systemPrompt) {
+                cliArgs.push("--append-system-prompt", systemPrompt);
+              }
+              if (cliType === "claude-cli") {
+                cliArgs.push("--mcp-config", coordinatorSetup.configPath);
+              }
               const launchResult = await this.deps.cliManager.handleCliCommand("launch_cli", {
                 cliType,
                 dir: workspace,
-                initialPrompt: systemPrompt
+                cliArgs: cliArgs.length > 0 ? cliArgs : void 0,
+                settings: {
+                  meshCoordinatorFor: meshId
+                }
               });
               if (!launchResult?.success) {
                 return { success: false, error: launchResult?.error || "Failed to launch CLI session" };
@@ -41861,7 +41933,8 @@ var init_reporter = __esm({
             workspace: session.workspace ?? null,
             title: session.title,
             cdpConnected: session.cdpConnected,
-            summaryMetadata: session.summaryMetadata
+            summaryMetadata: session.summaryMetadata,
+            settings: session.settings
           })),
           p2p: payload.p2p,
           timestamp: now
@@ -49441,6 +49514,51 @@ var init_registry = __esm({
   }
 });
 
+// ../../oss/packages/daemon-core/src/mesh/mesh-events.ts
+function setupMeshEventForwarding(components) {
+  components.instanceManager.onEvent((event) => {
+    if (event.event !== "agent:generating_completed" && event.event !== "agent:waiting_approval") return;
+    const instanceId = event.instanceId;
+    if (!instanceId) return;
+    const sourceInstance = components.instanceManager.getInstance(instanceId);
+    if (!sourceInstance || sourceInstance.category !== "cli") return;
+    const state = sourceInstance.getState();
+    const workspace = state.workspace;
+    if (!workspace) return;
+    const mesh = getMeshByRepo(workspace);
+    if (!mesh) return;
+    const allInstances = components.instanceManager.getByCategory("cli");
+    const coordinatorInstances = allInstances.filter((inst) => {
+      const instState = inst.getState();
+      if (instState.settings?.meshCoordinatorFor !== mesh.id) return false;
+      if (instState.instanceId === instanceId) return false;
+      return true;
+    });
+    if (coordinatorInstances.length === 0) return;
+    const targetNode = mesh.nodes.find((n) => n.workspace === workspace);
+    const nodeLabel = targetNode ? `Node '${targetNode.id}'` : `Agent at ${workspace}`;
+    let messageText = "";
+    if (event.event === "agent:generating_completed") {
+      messageText = `[System] ${nodeLabel} has completed its task and is now idle. You may use mesh_read_chat to review its progress.`;
+    } else if (event.event === "agent:waiting_approval") {
+      messageText = `[System] ${nodeLabel} is waiting for approval to proceed. You may use mesh_read_chat and mesh_approve to handle it.`;
+    }
+    if (!messageText) return;
+    for (const coord of coordinatorInstances) {
+      const coordState = coord.getState();
+      LOG.info("MeshEvents", `Forwarding event from ${workspace} to coordinator ${coordState.instanceId}`);
+      coord.onEvent("send_message", { input: { text: messageText, textFallback: messageText } });
+    }
+  });
+}
+var init_mesh_events = __esm({
+  "../../oss/packages/daemon-core/src/mesh/mesh-events.ts"() {
+    "use strict";
+    init_mesh_config();
+    init_logger();
+  }
+});
+
 // ../../oss/packages/daemon-core/src/boot/daemon-lifecycle.ts
 async function initDaemonComponents(config2) {
   installGlobalInterceptor();
@@ -49599,7 +49717,7 @@ async function initDaemonComponents(config2) {
   });
   poller.start();
   instanceManager.startTicking(config2.tickIntervalMs ?? 5e3);
-  return {
+  const components = {
     providerLoader,
     instanceManager,
     cliManager,
@@ -49613,6 +49731,8 @@ async function initDaemonComponents(config2) {
     detectedIdes: detectedIdesRef,
     refreshProviderAvailability
   };
+  setupMeshEventForwarding(components);
+  return components;
 }
 async function startDaemonDevSupport(options) {
   const devServer = new DevServer({
@@ -49688,6 +49808,7 @@ var init_daemon_lifecycle = __esm({
     init_runtime_defaults();
     init_config();
     init_git_commands();
+    init_mesh_events();
   }
 });
 
@@ -90057,7 +90178,7 @@ var init_adhdev_daemon = __esm({
     init_version();
     init_src();
     init_runtime_defaults();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.69" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.71" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;