@agent-webui/ai-desk-daemon 1.0.61-beta4 → 1.0.61-beta6

package/bin/cli.js

@@ -12,7 +12,7 @@ const { start, stop, restart, status } = require('../lib/daemon-manager');
 const { getLogPath } = require('../lib/platform');
 const { VERSION } = require('../lib/platform');
 const { getPort } = require('../lib/config');
-const { reportLifecycle } = require('../lib/daemon-registry');
+const { reportLifecycle, syncRegistryConfigToDaemonConfig } = require('../lib/daemon-registry');
 const { upgradePackage } = require('../lib/self-upgrade');
 
 function wait(ms) {
@@ -141,6 +141,14 @@ async function reportRegistryLifecycle(event) {
   }
 }
 
+function syncRegistryConfigForDaemonStart() {
+  try {
+    syncRegistryConfigToDaemonConfig();
+  } catch (error) {
+    console.warn(chalk.yellow(`[registry] Failed to sync daemon registry config: ${error.message || error}`));
+  }
+}
+
 program
   .name('aidesk')
   .description('AI Desk Daemon - CLI tool for managing the AI Desk daemon service')
@@ -158,6 +166,7 @@ program
     try {
       const mode = resolveRequestedMode(options) || 'native';
       const modeResult = configureRequestedMode(mode);
+      syncRegistryConfigForDaemonStart();
       start();
       await reportRegistryLifecycle('start');
       if (mode === 'cli-anything' && modeResult?.runtimeInfo?.cliAnythingPath) {
@@ -257,6 +266,7 @@ program
     try {
       const mode = resolveRequestedMode(options);
       const modeResult = configureRequestedMode(mode);
+      syncRegistryConfigForDaemonStart();
       restart();
       await reportRegistryLifecycle('restart');
       if (mode === 'cli-anything' && modeResult?.runtimeInfo?.cliAnythingPath) {

package/lib/daemon-registry.js

@@ -31,10 +31,15 @@ function readRegistrySessionIdentity(homeDir = os.homedir()) {
     if (!fs.existsSync(sessionPath)) return null;
     const session = JSON.parse(fs.readFileSync(sessionPath, 'utf8'));
     if (!session || typeof session !== 'object') return null;
+    const apiBaseUrl = normalizeApiBaseUrl(session.api_base_url || session.apiBaseUrl);
     const rcAccountId = trim(session.account_id || session.accountId);
     const rcExtensionId = trim(session.extension_id || session.extensionId);
-    if (!rcAccountId || !rcExtensionId) return null;
-    return { rcAccountId, rcExtensionId };
+    const rcUsername = trim(session.rc_username || session.rcUsername);
+    const tlsInsecureSkipVerify = Boolean(
+      session.tls_insecure_skip_verify || session.tlsInsecureSkipVerify,
+    );
+    if (!apiBaseUrl && !rcAccountId && !rcExtensionId && !rcUsername) return null;
+    return { apiBaseUrl, rcAccountId, rcExtensionId, rcUsername, tlsInsecureSkipVerify };
   } catch {
     return null;
   }
@@ -55,12 +60,12 @@ function readRegistryConfigFromDaemonConfig(homeDir = os.homedir()) {
       sessionIdentity?.rcAccountId || '';
     const rcExtensionId = trim(registry.rc_extension_id || registry.rcExtensionId) ||
       sessionIdentity?.rcExtensionId || '';
-    if (!apiBaseUrl || !rcAccountId || !rcExtensionId) return null;
+    if (!apiBaseUrl) return null;
     return {
       apiBaseUrl,
       rcAccountId,
       rcExtensionId,
-      rcUsername: trim(registry.rc_username || registry.rcUsername),
+      rcUsername: trim(registry.rc_username || registry.rcUsername) || sessionIdentity?.rcUsername || '',
       tlsInsecureSkipVerify: Boolean(registry.tls_insecure_skip_verify || registry.tlsInsecureSkipVerify),
     };
   } catch {
@@ -71,32 +76,75 @@ function readRegistryConfigFromDaemonConfig(homeDir = os.homedir()) {
 function getRegistryConfig(env = process.env, homeDir = os.homedir()) {
   const daemonConfig = readRegistryConfigFromDaemonConfig(homeDir);
   const sessionIdentity = readRegistrySessionIdentity(homeDir);
-  const apiBaseUrl = normalizeApiBaseUrl(
+  const envApiBaseUrl = normalizeApiBaseUrl(
     env.AI_DESK_API_BASE_URL || env.AI_DESK_BACKEND_API_URL || env.AI_DESK_BACKEND_URL,
-  ) || daemonConfig?.apiBaseUrl || normalizeApiBaseUrl(DEFAULT_REGISTRY_API_BASE_URL);
+  );
+  const hasSessionUserIdentity = Boolean(sessionIdentity?.rcAccountId || sessionIdentity?.rcExtensionId);
+  const apiBaseUrl = normalizeApiBaseUrl(
+    envApiBaseUrl ||
+    sessionIdentity?.apiBaseUrl ||
+    daemonConfig?.apiBaseUrl ||
+    (hasSessionUserIdentity ? DEFAULT_REGISTRY_API_BASE_URL : ''),
+  );
   const rcAccountId = trim(env.AI_DESK_RC_ACCOUNT_ID || env.rcAccountId) ||
-    daemonConfig?.rcAccountId ||
     sessionIdentity?.rcAccountId ||
+    daemonConfig?.rcAccountId ||
     '';
   const rcExtensionId = trim(env.AI_DESK_RC_EXTENSION_ID || env.rcExtensionId) ||
-    daemonConfig?.rcExtensionId ||
     sessionIdentity?.rcExtensionId ||
+    daemonConfig?.rcExtensionId ||
     '';
-  if (apiBaseUrl && rcAccountId && rcExtensionId) {
+  if (apiBaseUrl) {
     const tlsEnvValue = parseTruthyEnv(env.AI_DESK_TLS_INSECURE_SKIP_VERIFY);
     return {
       apiBaseUrl,
       rcAccountId,
       rcExtensionId,
-      rcUsername: trim(env.AI_DESK_RC_USERNAME || env.rcUsername) || daemonConfig?.rcUsername || '',
+      rcUsername: trim(env.AI_DESK_RC_USERNAME || env.rcUsername) ||
+        sessionIdentity?.rcUsername ||
+        daemonConfig?.rcUsername ||
+        '',
       tlsInsecureSkipVerify: tlsEnvValue === null
-        ? Boolean(daemonConfig?.tlsInsecureSkipVerify)
+        ? Boolean(sessionIdentity?.tlsInsecureSkipVerify ?? daemonConfig?.tlsInsecureSkipVerify)
         : tlsEnvValue,
     };
   }
   return null;
 }
 
+function daemonConfigPath(homeDir = os.homedir()) {
+  return path.join(homeDir, '.aidesktop', 'daemon-config.json');
+}
+
+function syncRegistryConfigToDaemonConfig(env = process.env, homeDir = os.homedir()) {
+  const config = getRegistryConfig(env, homeDir);
+  if (!config) return null;
+
+  const configPath = daemonConfigPath(homeDir);
+  let daemonConfig = {};
+  try {
+    if (fs.existsSync(configPath)) {
+      const parsed = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+      if (parsed && typeof parsed === 'object') daemonConfig = parsed;
+    }
+  } catch {
+    daemonConfig = {};
+  }
+
+  daemonConfig.registry = {
+    ...(daemonConfig.registry && typeof daemonConfig.registry === 'object' ? daemonConfig.registry : {}),
+    api_base_url: config.apiBaseUrl,
+    rc_account_id: config.rcAccountId,
+    rc_extension_id: config.rcExtensionId,
+    rc_username: config.rcUsername,
+    tls_insecure_skip_verify: Boolean(config.tlsInsecureSkipVerify),
+  };
+
+  fs.mkdirSync(path.dirname(configPath), { recursive: true });
+  fs.writeFileSync(configPath, `${JSON.stringify(daemonConfig, null, 2)}\n`, 'utf8');
+  return config;
+}
+
 function registryStatePaths(homeDir = os.homedir()) {
   const root = path.join(homeDir, '.aidesktop');
   return {
@@ -153,6 +201,20 @@ function listIpAddresses() {
   return [...new Set(out)];
 }
 
+function listMacAddresses() {
+  const out = [];
+  const interfaces = os.networkInterfaces();
+  for (const items of Object.values(interfaces)) {
+    for (const item of items || []) {
+      const mac = trim(item.mac).toLowerCase();
+      if (!item.internal && mac && mac !== '00:00:00:00:00:00') {
+        out.push(mac);
+      }
+    }
+  }
+  return [...new Set(out)];
+}
+
 function buildLifecyclePayload({
   event,
   runId,
@@ -161,16 +223,19 @@ function buildLifecyclePayload({
   version,
   daemonInstanceId,
 }) {
+  const macAddresses = listMacAddresses();
   return {
     daemonInstanceId,
     runId,
     event,
     seq,
+    machineId: macAddresses[0] || daemonInstanceId,
     hostname: os.hostname(),
     osUsername: os.userInfo().username,
     daemonVersion: version,
     port,
     ipAddresses: listIpAddresses(),
+    macAddresses,
   };
 }
 
@@ -189,8 +254,8 @@ function postJSON(urlString, payload, config) {
         headers: {
           'Content-Type': 'application/json',
           'Content-Length': Buffer.byteLength(body),
-          rcAccountId: config.rcAccountId,
-          rcExtensionId: config.rcExtensionId,
+          ...(config.rcAccountId ? { rcAccountId: config.rcAccountId } : {}),
+          ...(config.rcExtensionId ? { rcExtensionId: config.rcExtensionId } : {}),
           ...(config.rcUsername ? { rcUsername: config.rcUsername } : {}),
         },
         timeout: 3000,
@@ -244,11 +309,13 @@ module.exports = {
   buildLifecyclePayload,
   DEFAULT_REGISTRY_API_BASE_URL,
   getRegistryConfig,
+  syncRegistryConfigToDaemonConfig,
   readRegistrySessionIdentity,
   readRegistryConfigFromDaemonConfig,
   registryStatePaths,
   ensureDaemonInstanceId,
   readRunState,
   writeRunState,
+  listMacAddresses,
   reportLifecycle,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-webui/ai-desk-daemon",
-  "version": "1.0.61-beta4",
+  "version": "1.0.61-beta6",
   "description": "AI Desk Daemon - CLI tool for managing the AI Desk daemon service",
   "workspaces": [
     "packages/*"
@@ -39,16 +39,16 @@
     "chalk": "^4.1.2"
   },
   "optionalDependencies": {
-    "@agent-webui/ai-desk-daemon-darwin-arm64": "1.0.61-beta4",
-    "@agent-webui/ai-desk-daemon-darwin-x64": "1.0.61-beta4",
-    "@agent-webui/ai-desk-daemon-linux-arm64": "1.0.61-beta4",
-    "@agent-webui/ai-desk-daemon-linux-x64": "1.0.61-beta4",
-    "@agent-webui/ai-desk-daemon-win32-x64": "1.0.61-beta4",
-    "@agent-webui/ai-desk-python-darwin-arm64": "1.0.61-beta4",
-    "@agent-webui/ai-desk-python-darwin-x64": "1.0.61-beta4",
-    "@agent-webui/ai-desk-python-linux-arm64": "1.0.61-beta4",
-    "@agent-webui/ai-desk-python-linux-x64": "1.0.61-beta4",
-    "@agent-webui/ai-desk-python-win32-x64": "1.0.61-beta4"
+    "@agent-webui/ai-desk-daemon-darwin-arm64": "1.0.61-beta6",
+    "@agent-webui/ai-desk-daemon-darwin-x64": "1.0.61-beta6",
+    "@agent-webui/ai-desk-daemon-linux-arm64": "1.0.61-beta6",
+    "@agent-webui/ai-desk-daemon-linux-x64": "1.0.61-beta6",
+    "@agent-webui/ai-desk-daemon-win32-x64": "1.0.61-beta6",
+    "@agent-webui/ai-desk-python-darwin-arm64": "1.0.61-beta6",
+    "@agent-webui/ai-desk-python-darwin-x64": "1.0.61-beta6",
+    "@agent-webui/ai-desk-python-linux-arm64": "1.0.61-beta6",
+    "@agent-webui/ai-desk-python-linux-x64": "1.0.61-beta6",
+    "@agent-webui/ai-desk-python-win32-x64": "1.0.61-beta6"
   },
   "repository": {
     "type": "git",