@adhdev/daemon-core 0.6.69 → 0.6.71

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.6.69",
+  "version": "0.6.71",
   "description": "ADHDev daemon core — CDP, IDE detection, providers, command execution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -34,6 +34,7 @@
     "@xterm/xterm": "^6.0.0",
     "chalk": "^5.3.0",
     "conf": "^13.0.0",
+    "node-pty": "^1.1.0",
     "ws": "^8.19.0"
   },
   "devDependencies": {

package/src/cli-adapters/provider-cli-adapter.ts

@@ -654,6 +654,8 @@ export class ProviderCliAdapter implements CliAdapter {
                 /Quick safety check/i,
                 /Is this a project/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);
@@ -721,17 +723,46 @@ export class ProviderCliAdapter implements CliAdapter {
     }
 
     private evaluateSettled(): void {
-        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;
+        // detectStatus is the sole authority for status. parseApproval only enriches modal info.
+        const scriptStatus = rawScriptStatus;
         if (!scriptStatus) return;
 
         const prevStatus = this.currentStatus;
 
         if (scriptStatus === 'waiting_approval') {
+            // Auto-accept startup safety dialogs (e.g., "Claude Code'll be able to read, edit, and execute")
+            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;

package/src/config/config.ts

@@ -7,6 +7,7 @@
 import { homedir } from 'os';
 import { join } from 'path';
 import { existsSync, mkdirSync, readFileSync, writeFileSync, chmodSync } from 'fs';
+import { randomUUID } from 'crypto';
 import { migrateWorkspacesFromRecent } from './workspaces.js';
 import type { WorkspaceEntry } from './workspaces.js';
 import type { WorkspaceActivityEntry } from './workspace-activity.js';
@@ -64,12 +65,15 @@ export interface ADHDevConfig {
  // Machine nickname (user-customizable label for this machine)
     machineNickname: string | null;
 
- // Stable machine ID (prevents duplicate daemon entries when OS hostname changes dynamically)
+ // Stable local machine ID shared by standalone and cloud daemon modes
     machineId?: string;
 
  // Machine secret for server auth (replaces connectionToken)
     machineSecret?: string | null;
 
+ // Account-scoped registered machine row ID (cloud-side)
+    registeredMachineId?: string;
+
  // CLI launch history
     cliHistory: CliHistoryEntry[];
 
@@ -123,12 +127,44 @@ const DEFAULT_CONFIG: ADHDevConfig = {
     machineNickname: null,
     machineId: undefined,
     machineSecret: null,
+    registeredMachineId: undefined,
     cliHistory: [],
     providerSettings: {},
     ideSettings: {},
     disableUpstream: false,
 };
 
+const MACHINE_ID_PREFIX = 'mach_';
+
+export function generateMachineId(): string {
+    return `${MACHINE_ID_PREFIX}${randomUUID().replace(/-/g, '')}`;
+}
+
+export function isStableMachineId(machineId?: string | null): boolean {
+    return typeof machineId === 'string' && machineId.startsWith(MACHINE_ID_PREFIX);
+}
+
+function ensureMachineId(config: ADHDevConfig): { config: ADHDevConfig; changed: boolean } {
+    if (isStableMachineId(config.machineId)) {
+        return { config, changed: false };
+    }
+
+    // TODO(2026-04-06): Remove this legacy bridge after cloud clients have had
+    // time to persist registeredMachineId from the upgraded setup/login flow.
+    const legacyRegisteredMachineId = (!config.registeredMachineId && config.machineSecret && config.machineId)
+        ? config.machineId
+        : config.registeredMachineId;
+
+    return {
+        config: {
+            ...config,
+            machineId: generateMachineId(),
+            registeredMachineId: legacyRegisteredMachineId,
+        },
+        changed: true,
+    };
+}
+
 /**
  * Get the config directory path
  */
@@ -154,7 +190,11 @@ export function loadConfig(): ADHDevConfig {
     const configPath = getConfigPath();
 
     if (!existsSync(configPath)) {
-        return { ...DEFAULT_CONFIG };
+        const initialized = ensureMachineId({ ...DEFAULT_CONFIG });
+        try {
+            saveConfig(initialized.config);
+        } catch { /* ignore */ }
+        return initialized.config;
     }
 
     try {
@@ -166,30 +206,25 @@ export function loadConfig(): ADHDevConfig {
         }
         delete (merged as any).activeWorkspaceId;
         const hadStoredWorkspaces = Array.isArray(parsed.workspaces) && parsed.workspaces.length > 0;
-        migrateWorkspacesFromRecent(merged);
+        const ensured = ensureMachineId(merged);
+        const normalized = ensured.config as ADHDevConfig & { activeWorkspaceId?: string | null };
+        migrateWorkspacesFromRecent(normalized);
         
-        let configChanged = false;
-        if (!merged.machineId) {
-            const os = require('os');
-            const crypto = require('crypto');
-            const safeHostname = os.hostname().replace(/[^a-zA-Z0-9]/g, '_');
-            const machineHash = crypto.createHash('md5').update(os.hostname() + os.homedir()).digest('hex').slice(0, 8);
-            merged.machineId = `${safeHostname}_${machineHash}`;
-            configChanged = true;
-        }
+        let configChanged = ensured.changed;
 
-        if (!hadStoredWorkspaces && (merged.workspaces?.length || 0) > 0) {
+        if (!hadStoredWorkspaces && (normalized.workspaces?.length || 0) > 0) {
             configChanged = true;
         }
 
         if (configChanged) {
             try {
-                saveConfig(merged);
+                saveConfig(normalized);
             } catch { /* ignore */ }
         }
-        return merged;
+        return normalized;
     } catch {
-        return { ...DEFAULT_CONFIG };
+        const initialized = ensureMachineId({ ...DEFAULT_CONFIG });
+        return initialized.config;
     }
 }