adhdev 0.6.68 → 0.6.69

package/dist/cli/index.js

@@ -27120,11 +27120,13 @@ ${data.message || ""}`.trim();
       buildManagedAcps: () => buildManagedAcps,
       buildManagedClis: () => buildManagedClis,
       buildManagedIdes: () => buildManagedIdes,
+      buildStatusSnapshot: () => buildStatusSnapshot,
       connectCdpManager: () => connectCdpManager,
       detectAllVersions: () => detectAllVersions,
       detectCLIs: () => detectCLIs,
       detectIDEs: () => detectIDEs,
       findCdpManager: () => findCdpManager,
+      forwardAgentStreamsToIdeInstance: () => forwardAgentStreamsToIdeInstance2,
       getAIExtensions: () => getAIExtensions,
       getAvailableIdeIds: () => getAvailableIdeIds,
       getHostMemorySnapshot: () => getHostMemorySnapshot,
@@ -33459,10 +33461,72 @@ ${next}`;
         LOG5.info("StopIDE", `IDE stopped: ${ideType} (processKill=${killProcess})`);
       }
     };
+    init_logger();
     var os10 = __toESM2(require("os"));
     init_config();
     init_workspaces();
-    init_logger();
+    function buildDetectedIdeInfos(detectedIdes, cdpManagers) {
+      return detectedIdes.filter((ide) => ide.installed !== false).map((ide) => ({
+        id: ide.id,
+        type: ide.id,
+        name: ide.displayName || ide.name || ide.id,
+        running: isCdpConnected(cdpManagers, ide.id),
+        ...ide.path ? { path: ide.path } : {}
+      }));
+    }
+    function buildAvailableProviders(providerLoader) {
+      return providerLoader.getAll().map((provider) => ({
+        type: provider.type,
+        name: provider.displayName || provider.type,
+        displayName: provider.displayName || provider.type,
+        icon: provider.icon || "\u{1F4BB}",
+        category: provider.category
+      }));
+    }
+    function buildStatusSnapshot(options) {
+      const cfg = loadConfig3();
+      const wsState = getWorkspaceState(cfg);
+      const memSnap = getHostMemorySnapshot();
+      const { managedIdes, managedClis, managedAcps } = buildAllManagedEntries(
+        options.allStates,
+        options.cdpManagers,
+        {
+          detectedIdes: options.detectedIdes.map((ide) => ({
+            id: ide.id,
+            installed: ide.installed !== false
+          }))
+        }
+      );
+      return {
+        instanceId: options.instanceId,
+        version: options.version,
+        daemonMode: options.daemonMode,
+        machine: {
+          hostname: os10.hostname(),
+          platform: os10.platform(),
+          arch: os10.arch(),
+          cpus: os10.cpus().length,
+          totalMem: memSnap.totalMem,
+          freeMem: memSnap.freeMem,
+          availableMem: memSnap.availableMem,
+          loadavg: os10.loadavg(),
+          uptime: os10.uptime(),
+          release: os10.release()
+        },
+        machineNickname: options.machineNickname ?? cfg.machineNickname ?? null,
+        timestamp: options.timestamp ?? Date.now(),
+        detectedIdes: buildDetectedIdeInfos(options.detectedIdes, options.cdpManagers),
+        ...options.p2p ? { p2p: options.p2p } : {},
+        managedIdes,
+        managedClis,
+        managedAcps,
+        workspaces: wsState.workspaces,
+        defaultWorkspaceId: wsState.defaultWorkspaceId,
+        defaultWorkspacePath: wsState.defaultWorkspacePath,
+        workspaceActivity: getWorkspaceActivity(cfg, 15),
+        availableProviders: buildAvailableProviders(options.providerLoader)
+      };
+    }
     var DaemonStatusReporter2 = class {
       deps;
       log;
@@ -33569,46 +33633,25 @@ ${next}`;
           allStates,
           this.deps.cdpManagers
         );
-        const cfg = loadConfig3();
-        const wsState = getWorkspaceState(cfg);
-        const memSnap = getHostMemorySnapshot();
         const payload = {
-          daemonMode: true,
-          version: this.deps.daemonVersion || "unknown",
-          workspaces: wsState.workspaces,
-          defaultWorkspaceId: wsState.defaultWorkspaceId,
-          defaultWorkspacePath: wsState.defaultWorkspacePath,
-          workspaceActivity: getWorkspaceActivity(cfg, 15),
-          machine: {
-            hostname: os10.hostname(),
-            platform: os10.platform(),
-            arch: os10.arch(),
-            cpus: os10.cpus().length,
-            totalMem: memSnap.totalMem,
-            freeMem: memSnap.freeMem,
-            availableMem: memSnap.availableMem,
-            loadavg: os10.loadavg(),
-            uptime: os10.uptime()
-          },
-          managedIdes,
-          managedClis,
-          managedAcps,
-          p2p: {
-            available: p2p?.isAvailable || false,
-            state: p2p?.connectionState || "unavailable",
-            peers: p2p?.connectedPeerCount || 0,
-            screenshotActive: p2p?.screenshotActive || false
-          },
+          ...buildStatusSnapshot({
+            allStates,
+            cdpManagers: this.deps.cdpManagers,
+            providerLoader: this.deps.providerLoader,
+            detectedIdes: this.deps.detectedIdes || [],
+            instanceId: this.deps.instanceId,
+            version: this.deps.daemonVersion || "unknown",
+            daemonMode: true,
+            timestamp: now,
+            p2p: {
+              available: p2p?.isAvailable || false,
+              state: p2p?.connectionState || "unavailable",
+              peers: p2p?.connectedPeerCount || 0,
+              screenshotActive: p2p?.screenshotActive || false
+            }
+          }),
           screenshotUsage: this.deps.getScreenshotUsage?.() || null,
-          connectedExtensions: [],
-          detectedIdes: this.deps.detectedIdes || [],
-          availableProviders: this.deps.providerLoader.getAll().map((p) => ({
-            type: p.type,
-            icon: p.icon || "\u{1F4BB}",
-            displayName: p.displayName || p.type,
-            category: p.category
-          })),
-          timestamp: now
+          connectedExtensions: []
         };
         const p2pSent = this.sendP2PPayload(payload);
         if (p2pSent) {
@@ -35621,6 +35664,21 @@ ${installInfo}`
         }
       }
     };
+    function forwardAgentStreamsToIdeInstance2(instanceManager, ideType, streams) {
+      const ideInstance = instanceManager.getInstance(`ide:${ideType}`);
+      if (!ideInstance?.onEvent) return;
+      for (const stream of streams) {
+        ideInstance.onEvent("stream_update", {
+          extensionType: stream.agentType,
+          streams: [stream],
+          messages: stream.messages || [],
+          status: stream.status || "idle",
+          activeModal: stream.activeModal || null,
+          model: stream.model || void 0,
+          mode: stream.mode || void 0
+        });
+      }
+    }
     init_logger();
     var ProviderInstanceManager = class {
       instances = /* @__PURE__ */ new Map();
@@ -40909,7 +40967,7 @@ var init_adhdev_daemon = __esm({
     fs3 = __toESM(require("fs"));
     path2 = __toESM(require("path"));
     import_chalk = __toESM(require("chalk"));
-    pkgVersion = "0.6.68";
+    pkgVersion = "0.6.69";
     if (pkgVersion === "unknown") {
       try {
         const possiblePaths = [
@@ -41004,20 +41062,8 @@ ${err?.stack || ""}`);
             if (this.ideType === "unknown") this.ideType = ideType;
           },
           onStreamsUpdated: (ideType, streams) => {
-            const ideInstance = this.components?.instanceManager?.getInstance(`ide:${ideType}`);
-            if (ideInstance?.onEvent) {
-              for (const stream of streams) {
-                ideInstance.onEvent("stream_update", {
-                  extensionType: stream.agentType,
-                  streams: [stream],
-                  messages: stream.messages || [],
-                  status: stream.status || "idle",
-                  activeModal: stream.activeModal || null,
-                  model: stream.model || void 0,
-                  mode: stream.mode || void 0
-                });
-              }
-            }
+            if (!this.components) return;
+            (0, import_daemon_core4.forwardAgentStreamsToIdeInstance)(this.components.instanceManager, ideType, streams);
           }
         });
         this.components.providerLoader.fetchLatest().then(({ updated }) => {
@@ -41122,9 +41168,8 @@ ${err?.stack || ""}`);
           cdpManagers: this.components.cdpManagers,
           p2p: this.p2p,
           providerLoader: this.components.providerLoader,
-          adapters: this.components.cliManager.adapters,
           detectedIdes: this.components.detectedIdes.value,
-          ideType: this.ideType,
+          instanceId,
           daemonVersion: pkgVersion,
           instanceManager: this.components.instanceManager,
           getScreenshotUsage: () => this.screenshotController?.getUsageStats() || null