@adhdev/daemon-core 0.6.69 → 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, {

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;