@agent-webui/ai-desk-daemon 1.0.61-beta1 → 1.0.61-beta5

package/lib/daemon-registry.js

@@ -5,8 +5,12 @@ const http = require('http');
 const https = require('https');
 const crypto = require('crypto');
 
+const DEFAULT_REGISTRY_API_BASE_URL = 'https://desk.int.rclabenv.com/';
+
 function trim(value) {
-  return typeof value === 'string' ? value.trim() : '';
+  if (typeof value === 'string') return value.trim();
+  if (typeof value === 'number' && Number.isFinite(value)) return String(value);
+  return '';
 }
 
 function normalizeApiBaseUrl(value) {
@@ -15,21 +19,82 @@ function normalizeApiBaseUrl(value) {
   return raw.endsWith('/api/v1') ? raw : `${raw}/api/v1`;
 }
 
-function getRegistryConfig(env = process.env) {
+function parseTruthyEnv(value) {
+  const raw = trim(value).toLowerCase();
+  if (!raw) return null;
+  return raw === '1' || raw === 'true' || raw === 'yes' || raw === 'on';
+}
+
+function readRegistrySessionIdentity(homeDir = os.homedir()) {
+  const sessionPath = path.join(homeDir, '.aidesktop', 'session.json');
+  try {
+    if (!fs.existsSync(sessionPath)) return null;
+    const session = JSON.parse(fs.readFileSync(sessionPath, 'utf8'));
+    if (!session || typeof session !== 'object') return null;
+    const rcAccountId = trim(session.account_id || session.accountId);
+    const rcExtensionId = trim(session.extension_id || session.extensionId);
+    if (!rcAccountId || !rcExtensionId) return null;
+    return { rcAccountId, rcExtensionId };
+  } catch {
+    return null;
+  }
+}
+
+function readRegistryConfigFromDaemonConfig(homeDir = os.homedir()) {
+  const configPath = path.join(homeDir, '.aidesktop', 'daemon-config.json');
+  try {
+    if (!fs.existsSync(configPath)) return null;
+    const config = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+    const registry = config && typeof config === 'object' ? config.registry : null;
+    if (!registry || typeof registry !== 'object') return null;
+    const sessionIdentity = readRegistrySessionIdentity(homeDir);
+    const apiBaseUrl = normalizeApiBaseUrl(
+      registry.api_base_url || registry.apiBaseUrl || DEFAULT_REGISTRY_API_BASE_URL,
+    );
+    const rcAccountId = trim(registry.rc_account_id || registry.rcAccountId) ||
+      sessionIdentity?.rcAccountId || '';
+    const rcExtensionId = trim(registry.rc_extension_id || registry.rcExtensionId) ||
+      sessionIdentity?.rcExtensionId || '';
+    if (!apiBaseUrl || !rcAccountId || !rcExtensionId) return null;
+    return {
+      apiBaseUrl,
+      rcAccountId,
+      rcExtensionId,
+      rcUsername: trim(registry.rc_username || registry.rcUsername),
+      tlsInsecureSkipVerify: Boolean(registry.tls_insecure_skip_verify || registry.tlsInsecureSkipVerify),
+    };
+  } catch {
+    return null;
+  }
+}
+
+function getRegistryConfig(env = process.env, homeDir = os.homedir()) {
+  const daemonConfig = readRegistryConfigFromDaemonConfig(homeDir);
+  const sessionIdentity = readRegistrySessionIdentity(homeDir);
   const apiBaseUrl = normalizeApiBaseUrl(
     env.AI_DESK_API_BASE_URL || env.AI_DESK_BACKEND_API_URL || env.AI_DESK_BACKEND_URL,
-  );
-  const rcAccountId = trim(env.AI_DESK_RC_ACCOUNT_ID || env.rcAccountId);
-  const rcExtensionId = trim(env.AI_DESK_RC_EXTENSION_ID || env.rcExtensionId);
-  if (!apiBaseUrl || !rcAccountId || !rcExtensionId) {
-    return null;
+  ) || daemonConfig?.apiBaseUrl || normalizeApiBaseUrl(DEFAULT_REGISTRY_API_BASE_URL);
+  const rcAccountId = trim(env.AI_DESK_RC_ACCOUNT_ID || env.rcAccountId) ||
+    daemonConfig?.rcAccountId ||
+    sessionIdentity?.rcAccountId ||
+    '';
+  const rcExtensionId = trim(env.AI_DESK_RC_EXTENSION_ID || env.rcExtensionId) ||
+    daemonConfig?.rcExtensionId ||
+    sessionIdentity?.rcExtensionId ||
+    '';
+  if (apiBaseUrl && rcAccountId && rcExtensionId) {
+    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 || '',
+      tlsInsecureSkipVerify: tlsEnvValue === null
+        ? Boolean(daemonConfig?.tlsInsecureSkipVerify)
+        : tlsEnvValue,
+    };
   }
-  return {
-    apiBaseUrl,
-    rcAccountId,
-    rcExtensionId,
-    rcUsername: trim(env.AI_DESK_RC_USERNAME || env.rcUsername),
-  };
+  return null;
 }
 
 function registryStatePaths(homeDir = os.homedir()) {
@@ -88,6 +153,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,
@@ -96,16 +175,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,
   };
 }
 
@@ -118,6 +200,9 @@ function postJSON(urlString, payload, config) {
       url,
       {
         method: 'POST',
+        ...(url.protocol === 'https:' && config.tlsInsecureSkipVerify
+          ? { agent: new https.Agent({ rejectUnauthorized: false }) }
+          : {}),
         headers: {
           'Content-Type': 'application/json',
           'Content-Length': Buffer.byteLength(body),
@@ -174,10 +259,14 @@ async function reportLifecycle(event, { port, version, seq = 1 } = {}) {
 
 module.exports = {
   buildLifecyclePayload,
+  DEFAULT_REGISTRY_API_BASE_URL,
   getRegistryConfig,
+  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-beta1",
+  "version": "1.0.61-beta5",
   "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-beta1",
-    "@agent-webui/ai-desk-daemon-darwin-x64": "1.0.61-beta1",
-    "@agent-webui/ai-desk-daemon-linux-arm64": "1.0.61-beta1",
-    "@agent-webui/ai-desk-daemon-linux-x64": "1.0.61-beta1",
-    "@agent-webui/ai-desk-daemon-win32-x64": "1.0.61-beta1",
-    "@agent-webui/ai-desk-python-darwin-arm64": "1.0.61-beta1",
-    "@agent-webui/ai-desk-python-darwin-x64": "1.0.61-beta1",
-    "@agent-webui/ai-desk-python-linux-arm64": "1.0.61-beta1",
-    "@agent-webui/ai-desk-python-linux-x64": "1.0.61-beta1",
-    "@agent-webui/ai-desk-python-win32-x64": "1.0.61-beta1"
+    "@agent-webui/ai-desk-daemon-darwin-arm64": "1.0.61-beta5",
+    "@agent-webui/ai-desk-daemon-darwin-x64": "1.0.61-beta5",
+    "@agent-webui/ai-desk-daemon-linux-arm64": "1.0.61-beta5",
+    "@agent-webui/ai-desk-daemon-linux-x64": "1.0.61-beta5",
+    "@agent-webui/ai-desk-daemon-win32-x64": "1.0.61-beta5",
+    "@agent-webui/ai-desk-python-darwin-arm64": "1.0.61-beta5",
+    "@agent-webui/ai-desk-python-darwin-x64": "1.0.61-beta5",
+    "@agent-webui/ai-desk-python-linux-arm64": "1.0.61-beta5",
+    "@agent-webui/ai-desk-python-linux-x64": "1.0.61-beta5",
+    "@agent-webui/ai-desk-python-win32-x64": "1.0.61-beta5"
   },
   "repository": {
     "type": "git",