@adhdev/daemon-core 0.6.68 → 0.6.70

package/dist/index.d.ts

@@ -170,6 +170,7 @@ interface ADHDevConfig {
     machineNickname: string | null;
     machineId?: string;
     machineSecret?: string | null;
+    registeredMachineId?: string;
     cliHistory: CliHistoryEntry[];
     providerSettings: Record<string, Record<string, any>>;
     ideSettings: Record<string, {
@@ -2264,15 +2265,8 @@ interface StatusReporterDeps {
         resolve(type: string): any;
         getAll(): any[];
     };
-    adapters: Map<string, {
-        cliType: string;
-        cliName: string;
-        workingDir: string;
-        getStatus(): any;
-        getPartialResponse(): string;
-    }>;
     detectedIdes: any[];
-    ideType: string;
+    instanceId: string;
     daemonVersion?: string;
     instanceManager: {
         collectAllStates(): ProviderState[];
@@ -2378,6 +2372,44 @@ declare function buildAllManagedEntries(allStates: ProviderState[], cdpManagers:
     managedAcps: ManagedAcpEntry[];
 };
 
+/**
+ * Shared status snapshot builders.
+ *
+ * Used by:
+ * - DaemonStatusReporter (cloud)
+ * - daemon-standalone HTTP/WS status responses
+ */
+
+interface StatusSnapshotOptions {
+    allStates: ProviderState[];
+    cdpManagers: Map<string, unknown>;
+    providerLoader: {
+        getAll(): Array<{
+            type: string;
+            icon?: string;
+            displayName?: string;
+            category: 'ide' | 'extension' | 'cli' | 'acp';
+        }>;
+    };
+    detectedIdes: Array<{
+        id: string;
+        name?: string;
+        displayName?: string;
+        installed?: boolean;
+        path?: string;
+    }>;
+    instanceId: string;
+    version: string;
+    daemonMode: boolean;
+    timestamp?: number;
+    p2p?: StatusReportPayload['p2p'];
+    machineNickname?: string | null;
+}
+interface StatusSnapshot extends StatusReportPayload {
+    availableProviders: AvailableProviderInfo[];
+}
+declare function buildStatusSnapshot(options: StatusSnapshotOptions): StatusSnapshot;
+
 /**
  * ADHDev Daemon — unified logger (v2)
  *
@@ -2534,6 +2566,15 @@ declare function getAvailableIdeIds(): string[];
 declare const DEFAULT_DAEMON_PORT = 19222;
 declare const DAEMON_WS_PATH = "/ipc";
 
+/**
+ * Shared helper for forwarding agent stream snapshots into the IDE instance.
+ *
+ * Both cloud and standalone daemons use the same InstanceManager wiring.
+ */
+declare function forwardAgentStreamsToIdeInstance(instanceManager: {
+    getInstance: (key: string) => any;
+}, ideType: string, streams: any[]): void;
+
 /**
  * ProviderCliAdapter — Script-based CLI Adapter
  *
@@ -3121,4 +3162,4 @@ declare function initDaemonComponents(config: DaemonInitConfig): Promise<DaemonC
  */
 declare function shutdownDaemonComponents(components: DaemonComponents): Promise<void>;
 
-export { type AcpConfigOption, type AcpMode, AcpProviderInstance, type AcpProviderState, type ActiveChatData, type AgentEntry, AgentStreamPoller, type AgentStreamPollerDeps, type AvailableProviderInfo, CdpDomHandlers, type CdpInitializerConfig, type CdpScannerOptions, type CdpSetupContext, type CdpTargetFilter, type ChatMessage, type CliAdapter, CliProviderInstance, type CliProviderState, type CommandContext, type CommandResult$1 as CommandResult, type CommandRouterDeps, type CommandRouterResult, type CommandResult$2 as CoreCommandResult, DAEMON_WS_PATH, DEFAULT_DAEMON_PORT, DaemonAgentStreamManager, DaemonCdpInitializer, DaemonCdpManager, DaemonCdpScanner, DaemonCliManager, DaemonCommandHandler, DaemonCommandRouter, type DaemonComponents, type DaemonCoreOptions, type DaemonEvent, type DaemonInitConfig, DaemonStatusReporter, type DetectedIde, type DetectedIdeInfo, DevServer, type ExtensionInfo$1 as ExtensionInfo, type ExtensionProviderState, type HostMemorySnapshot, type IDEInfo, type IDaemonCore, IdeProviderInstance, type IdeProviderState, type ExtensionInfo as InstallerExtensionInfo, LOG, type LogEntry, type LogLevel, type MachineInfo, type ManagedAcpEntry, type ManagedAgentStream, type ManagedCliEntry, type ManagedIdeEntry, ProviderCliAdapter, type ProviderConfig, type ProviderErrorReason, type ProviderInfo, ProviderInstanceManager, ProviderLoader, type ProviderModule, type ProviderStatus, type ProviderVersionInfo, type ScopedLogger, type SetupIdeInstanceOptions, type StatusReportPayload, type StatusResponse, type SystemInfo, VersionArchive, type VersionHistory, type WorkspaceActivity, type WorkspaceEntry, addCliHistory, buildAllManagedEntries, buildManagedAcps, buildManagedClis, buildManagedIdes, connectCdpManager, detectAllVersions, detectCLIs, detectIDEs, findCdpManager, getAIExtensions, getAvailableIdeIds, getHostMemorySnapshot, getLogLevel, getRecentCommands, getRecentLogs, getWorkspaceActivity, getWorkspaceState, hasCdpManager, initDaemonComponents, installExtensions, installGlobalInterceptor, isCdpConnected, isExtensionInstalled, isIdeRunning, isSetupComplete, killIdeProcess, launchIDE, launchWithCdp, loadConfig, logCommand, markSetupComplete, probeCdpPort, readChatHistory, registerExtensionProviders, resetConfig, saveConfig, setLogLevel, setupIdeInstance, shutdownDaemonComponents, updateConfig };
+export { type AcpConfigOption, type AcpMode, AcpProviderInstance, type AcpProviderState, type ActiveChatData, type AgentEntry, AgentStreamPoller, type AgentStreamPollerDeps, type AvailableProviderInfo, CdpDomHandlers, type CdpInitializerConfig, type CdpScannerOptions, type CdpSetupContext, type CdpTargetFilter, type ChatMessage, type CliAdapter, CliProviderInstance, type CliProviderState, type CommandContext, type CommandResult$1 as CommandResult, type CommandRouterDeps, type CommandRouterResult, type CommandResult$2 as CoreCommandResult, DAEMON_WS_PATH, DEFAULT_DAEMON_PORT, DaemonAgentStreamManager, DaemonCdpInitializer, DaemonCdpManager, DaemonCdpScanner, DaemonCliManager, DaemonCommandHandler, DaemonCommandRouter, type DaemonComponents, type DaemonCoreOptions, type DaemonEvent, type DaemonInitConfig, DaemonStatusReporter, type DetectedIde, type DetectedIdeInfo, DevServer, type ExtensionInfo$1 as ExtensionInfo, type ExtensionProviderState, type HostMemorySnapshot, type IDEInfo, type IDaemonCore, IdeProviderInstance, type IdeProviderState, type ExtensionInfo as InstallerExtensionInfo, LOG, type LogEntry, type LogLevel, type MachineInfo, type ManagedAcpEntry, type ManagedAgentStream, type ManagedCliEntry, type ManagedIdeEntry, ProviderCliAdapter, type ProviderConfig, type ProviderErrorReason, type ProviderInfo, ProviderInstanceManager, ProviderLoader, type ProviderModule, type ProviderStatus, type ProviderVersionInfo, type ScopedLogger, type SetupIdeInstanceOptions, type StatusReportPayload, type StatusResponse, type StatusSnapshot, type StatusSnapshotOptions, type SystemInfo, VersionArchive, type VersionHistory, type WorkspaceActivity, type WorkspaceEntry, addCliHistory, buildAllManagedEntries, buildManagedAcps, buildManagedClis, buildManagedIdes, buildStatusSnapshot, connectCdpManager, detectAllVersions, detectCLIs, detectIDEs, findCdpManager, forwardAgentStreamsToIdeInstance, getAIExtensions, getAvailableIdeIds, getHostMemorySnapshot, getLogLevel, getRecentCommands, getRecentLogs, getWorkspaceActivity, getWorkspaceState, hasCdpManager, initDaemonComponents, installExtensions, installGlobalInterceptor, isCdpConnected, isExtensionInstalled, isIdeRunning, isSetupComplete, killIdeProcess, launchIDE, launchWithCdp, loadConfig, logCommand, markSetupComplete, probeCdpPort, readChatHistory, registerExtensionProviders, resetConfig, saveConfig, setLogLevel, setupIdeInstance, shutdownDaemonComponents, updateConfig };

package/dist/index.js

@@ -217,14 +217,36 @@ var config_exports = {};
 __export(config_exports, {
   addCliHistory: () => addCliHistory,
   generateConnectionToken: () => generateConnectionToken,
+  generateMachineId: () => generateMachineId,
   getConfigDir: () => getConfigDir,
   isSetupComplete: () => isSetupComplete,
+  isStableMachineId: () => isStableMachineId,
   loadConfig: () => loadConfig,
   markSetupComplete: () => markSetupComplete,
   resetConfig: () => resetConfig,
   saveConfig: () => saveConfig,
   updateConfig: () => updateConfig
 });
+function generateMachineId() {
+  return `${MACHINE_ID_PREFIX}${(0, import_crypto2.randomUUID)().replace(/-/g, "")}`;
+}
+function isStableMachineId(machineId) {
+  return typeof machineId === "string" && machineId.startsWith(MACHINE_ID_PREFIX);
+}
+function ensureMachineId(config) {
+  if (isStableMachineId(config.machineId)) {
+    return { config, changed: false };
+  }
+  const legacyRegisteredMachineId = !config.registeredMachineId && config.machineSecret && config.machineId ? config.machineId : config.registeredMachineId;
+  return {
+    config: {
+      ...config,
+      machineId: generateMachineId(),
+      registeredMachineId: legacyRegisteredMachineId
+    },
+    changed: true
+  };
+}
 function getConfigDir() {
   const dir = (0, import_path.join)((0, import_os.homedir)(), ".adhdev");
   if (!(0, import_fs.existsSync)(dir)) {
@@ -238,7 +260,12 @@ function getConfigPath() {
 function loadConfig() {
   const configPath = getConfigPath();
   if (!(0, import_fs.existsSync)(configPath)) {
-    return { ...DEFAULT_CONFIG };
+    const initialized = ensureMachineId({ ...DEFAULT_CONFIG });
+    try {
+      saveConfig(initialized.config);
+    } catch {
+    }
+    return initialized.config;
   }
   try {
     const raw = (0, import_fs.readFileSync)(configPath, "utf-8");
@@ -249,28 +276,23 @@ function loadConfig() {
     }
     delete merged.activeWorkspaceId;
     const hadStoredWorkspaces = Array.isArray(parsed.workspaces) && parsed.workspaces.length > 0;
-    migrateWorkspacesFromRecent(merged);
-    let configChanged = false;
-    if (!merged.machineId) {
-      const os15 = require("os");
-      const crypto5 = require("crypto");
-      const safeHostname = os15.hostname().replace(/[^a-zA-Z0-9]/g, "_");
-      const machineHash = crypto5.createHash("md5").update(os15.hostname() + os15.homedir()).digest("hex").slice(0, 8);
-      merged.machineId = `${safeHostname}_${machineHash}`;
-      configChanged = true;
-    }
-    if (!hadStoredWorkspaces && (merged.workspaces?.length || 0) > 0) {
+    const ensured = ensureMachineId(merged);
+    const normalized = ensured.config;
+    migrateWorkspacesFromRecent(normalized);
+    let configChanged = ensured.changed;
+    if (!hadStoredWorkspaces && (normalized.workspaces?.length || 0) > 0) {
       configChanged = true;
     }
     if (configChanged) {
       try {
-        saveConfig(merged);
+        saveConfig(normalized);
       } catch {
       }
     }
-    return merged;
+    return normalized;
   } catch {
-    return { ...DEFAULT_CONFIG };
+    const initialized = ensureMachineId({ ...DEFAULT_CONFIG });
+    return initialized.config;
   }
 }
 function saveConfig(config) {
@@ -344,13 +366,14 @@ function addCliHistory(entry) {
   config.cliHistory = filtered.slice(0, 20);
   saveConfig(config);
 }
-var import_os, import_path, import_fs, DEFAULT_CONFIG;
+var import_os, import_path, import_fs, import_crypto2, DEFAULT_CONFIG, MACHINE_ID_PREFIX;
 var init_config = __esm({
   "src/config/config.ts"() {
     "use strict";
     import_os = require("os");
     import_path = require("path");
     import_fs = require("fs");
+    import_crypto2 = require("crypto");
     init_workspaces();
     DEFAULT_CONFIG = {
       serverUrl: "https://api.adhf.dev",
@@ -374,11 +397,13 @@ var init_config = __esm({
       machineNickname: null,
       machineId: void 0,
       machineSecret: null,
+      registeredMachineId: void 0,
       cliHistory: [],
       providerSettings: {},
       ideSettings: {},
       disableUpstream: false
     };
+    MACHINE_ID_PREFIX = "mach_";
   }
 });
 
@@ -1092,7 +1117,9 @@ var init_provider_cli_adapter = __esm({
             /Do you trust the files/i,
             /Quick safety check/i,
             /Is this a project/i,
-            /Enter to confirm/i
+            /Enter to confirm/i,
+            /be able to read, edit, and execute/i,
+            /Security guide/i
           ];
           if (dialogPatterns.some((p) => p.test(this.startupBuffer))) {
             setTimeout(() => this.ptyProcess?.write("\r"), this.timeouts.dialogAccept);
@@ -1149,15 +1176,41 @@ var init_provider_cli_adapter = __esm({
         }, 6e4);
       }
       evaluateSettled() {
-        if (this.submitPendingUntil > Date.now()) return;
-        if (this.responseSettleIgnoreUntil > Date.now()) return;
+        const now = Date.now();
+        if (this.submitPendingUntil > now || this.responseSettleIgnoreUntil > now) {
+          const delayTime = Math.max(this.submitPendingUntil - now, this.responseSettleIgnoreUntil - now) + 50;
+          if (this.settleTimer) clearTimeout(this.settleTimer);
+          this.settleTimer = setTimeout(() => {
+            this.settleTimer = null;
+            this.settledBuffer = this.recentOutputBuffer;
+            this.evaluateSettled();
+          }, delayTime);
+          return;
+        }
         const tail = this.settledBuffer;
         const modal = this.runParseApproval(tail);
         const rawScriptStatus = this.runDetectStatus(tail);
-        const scriptStatus = rawScriptStatus === "waiting_approval" || modal ? "waiting_approval" : rawScriptStatus;
+        const scriptStatus = rawScriptStatus;
         if (!scriptStatus) return;
         const prevStatus = this.currentStatus;
         if (scriptStatus === "waiting_approval") {
+          const modalMessage = modal?.message || "";
+          const screenText = this.terminalScreen.getText() || this.accumulatedBuffer;
+          const autoAcceptPatterns = [
+            /be able to read, edit, and execute/i,
+            /Security guide/i,
+            /Enter to confirm/i,
+            /Quick safety check/i,
+            /Do you trust the files/i,
+            /Is this a project/i
+          ];
+          if (autoAcceptPatterns.some((p) => p.test(modalMessage) || p.test(screenText))) {
+            LOG.info("CLI", `[${this.cliType}] Auto-accepting startup dialog: ${modalMessage.slice(0, 80)}`);
+            setTimeout(() => this.ptyProcess?.write("\r"), 200);
+            this.lastApprovalResolvedAt = Date.now();
+            this.activeModal = null;
+            return;
+          }
           const inCooldown = this.lastApprovalResolvedAt && Date.now() - this.lastApprovalResolvedAt < this.timeouts.approvalCooldown;
           if (!inCooldown) {
             this.isWaitingForResponse = true;
@@ -1666,11 +1719,13 @@ __export(index_exports, {
   buildManagedAcps: () => buildManagedAcps,
   buildManagedClis: () => buildManagedClis,
   buildManagedIdes: () => buildManagedIdes,
+  buildStatusSnapshot: () => buildStatusSnapshot,
   connectCdpManager: () => connectCdpManager,
   detectAllVersions: () => detectAllVersions,
   detectCLIs: () => detectCLIs,
   detectIDEs: () => detectIDEs,
   findCdpManager: () => findCdpManager,
+  forwardAgentStreamsToIdeInstance: () => forwardAgentStreamsToIdeInstance,
   getAIExtensions: () => getAIExtensions,
   getAvailableIdeIds: () => getAvailableIdeIds,
   getHostMemorySnapshot: () => getHostMemorySnapshot,
@@ -8061,10 +8116,76 @@ var DaemonCommandRouter = class {
 };
 
 // src/status/reporter.ts
+init_logger();
+
+// src/status/snapshot.ts
 var os10 = __toESM(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 = loadConfig();
+  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)
+  };
+}
+
+// src/status/reporter.ts
 var DaemonStatusReporter = class {
   deps;
   log;
@@ -8171,46 +8292,25 @@ var DaemonStatusReporter = class {
       allStates,
       this.deps.cdpManagers
     );
-    const cfg = loadConfig();
-    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) {
@@ -10246,6 +10346,23 @@ var AgentStreamPoller = class {
   }
 };
 
+// src/agent-stream/forward.ts
+function forwardAgentStreamsToIdeInstance(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
+    });
+  }
+}
+
 // src/providers/provider-instance-manager.ts
 init_logger();
 var ProviderInstanceManager = class {
@@ -14267,11 +14384,13 @@ async function shutdownDaemonComponents(components) {
   buildManagedAcps,
   buildManagedClis,
   buildManagedIdes,
+  buildStatusSnapshot,
   connectCdpManager,
   detectAllVersions,
   detectCLIs,
   detectIDEs,
   findCdpManager,
+  forwardAgentStreamsToIdeInstance,
   getAIExtensions,
   getAvailableIdeIds,
   getHostMemorySnapshot,