@agent-webui/ai-desk-daemon 1.0.61-beta7 → 1.0.62

package/bin/cli.js

@@ -11,13 +11,6 @@ const path = require('path');
 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 {
-  configureRegistryUrl,
-  getRegistryConfig,
-  reportLifecycle,
-  syncRegistryConfigToDaemonConfig,
-} = require('../lib/daemon-registry');
 const { upgradePackage } = require('../lib/self-upgrade');
 
 function wait(ms) {
@@ -135,74 +128,11 @@ function configureRequestedMode(mode) {
   });
 }
 
-async function reportRegistryLifecycle(event) {
-  try {
-    await reportLifecycle(event, {
-      port: Number(getPort()),
-      version: VERSION,
-    });
-  } catch (error) {
-    console.warn(chalk.yellow(`[registry] Failed to report daemon ${event}: ${error.message || error}`));
-  }
-}
-
-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')
   .version(VERSION);
 
-const registryCommand = program
-  .command('registry')
-  .description('Manage shared runtime registry backend settings');
-
-registryCommand
-  .command('set-url <url>')
-  .description('Persist the AI Desk backend URL used for daemon registry reporting')
-  .option('--insecure-skip-tls-verify', 'Skip TLS certificate verification for this registry URL')
-  .option('--strict-tls', 'Require strict TLS certificate verification for this registry URL')
-  .action((url, options) => {
-    try {
-      if (options.insecureSkipTlsVerify && options.strictTls) {
-        throw new Error('Use either --insecure-skip-tls-verify or --strict-tls, not both');
-      }
-      const tlsInsecureSkipVerify = options.insecureSkipTlsVerify
-        ? true
-        : (options.strictTls ? false : undefined);
-      const config = configureRegistryUrl(url, { tlsInsecureSkipVerify });
-      console.log(chalk.green('✓ Registry URL updated'));
-      console.log(`API base URL: ${config.apiBaseUrl}`);
-      console.log(`TLS verification: ${config.tlsInsecureSkipVerify ? 'skip for this URL' : 'strict'}`);
-      console.log(chalk.cyan('Restart the daemon for the new registry URL to be used by background heartbeats.'));
-    } catch (error) {
-      console.error(chalk.red('Failed to update registry URL:'), error.message);
-      process.exit(1);
-    }
-  });
-
-registryCommand
-  .command('status')
-  .description('Show the effective daemon registry backend settings')
-  .action(() => {
-    const config = getRegistryConfig();
-    if (!config) {
-      console.log(chalk.yellow('Registry reporting is disabled'));
-      return;
-    }
-    console.log(`API base URL: ${config.apiBaseUrl}`);
-    console.log(`RC account ID: ${config.rcAccountId || '(empty)'}`);
-    console.log(`RC extension ID: ${config.rcExtensionId || '(empty)'}`);
-    console.log(`RC username: ${config.rcUsername || '(empty)'}`);
-    console.log(`TLS verification: ${config.tlsInsecureSkipVerify ? 'skip for this URL' : 'strict'}`);
-  });
-
 // Start command
 program
   .command('start')
@@ -215,9 +145,7 @@ program
     try {
       const mode = resolveRequestedMode(options) || 'native';
       const modeResult = configureRequestedMode(mode);
-      syncRegistryConfigForDaemonStart();
       start();
-      await reportRegistryLifecycle('start');
       if (mode === 'cli-anything' && modeResult?.runtimeInfo?.cliAnythingPath) {
         console.log(chalk.cyan(`CLI-Anything mode configured: ${modeResult.runtimeInfo.cliAnythingPath}`));
       } else if (mode === 'native') {
@@ -243,7 +171,7 @@ program
           const tail = startUnixLogFollow(logPath);
 
           // Handle Ctrl+C - stop the daemon
-          process.on('SIGINT', async () => {
+          process.on('SIGINT', () => {
             console.log(chalk.yellow('\n\n⏹ Stopping daemon...'));
             tail.kill();
 
@@ -251,7 +179,6 @@ program
               // Stop the daemon
               const { stop } = require('../lib/daemon-manager');
               stop();
-              await reportRegistryLifecycle('stop');
               console.log(chalk.green('✓ Daemon stopped successfully'));
             } catch (error) {
               console.error(chalk.red('✗ Failed to stop daemon:'), error.message);
@@ -265,7 +192,7 @@ program
 
           const pollInterval = startWindowsLogFollow(logPath);
 
-          process.on('SIGINT', async () => {
+          process.on('SIGINT', () => {
             clearInterval(pollInterval);
             console.log(chalk.yellow('\n\n⏹ Stopping daemon...'));
 
@@ -273,7 +200,6 @@ program
               // Stop the daemon
               const { stop } = require('../lib/daemon-manager');
               stop();
-              await reportRegistryLifecycle('stop');
               console.log(chalk.green('✓ Daemon stopped successfully'));
             } catch (error) {
               console.error(chalk.red('✗ Failed to stop daemon:'), error.message);
@@ -296,7 +222,6 @@ program
   .action(async () => {
     try {
       stop();
-      await reportRegistryLifecycle('stop');
       console.log(chalk.green('✓ Daemon stopped successfully'));
     } catch (error) {
       console.error(chalk.red('✗ Failed to stop daemon:'), error.message);
@@ -315,9 +240,7 @@ program
     try {
       const mode = resolveRequestedMode(options);
       const modeResult = configureRequestedMode(mode);
-      syncRegistryConfigForDaemonStart();
       restart();
-      await reportRegistryLifecycle('restart');
       if (mode === 'cli-anything' && modeResult?.runtimeInfo?.cliAnythingPath) {
         console.log(chalk.cyan(`CLI-Anything mode configured: ${modeResult.runtimeInfo.cliAnythingPath}`));
       } else if (mode === 'native') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-webui/ai-desk-daemon",
-  "version": "1.0.61-beta7",
+  "version": "1.0.62",
   "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-beta7",
-    "@agent-webui/ai-desk-daemon-darwin-x64": "1.0.61-beta7",
-    "@agent-webui/ai-desk-daemon-linux-arm64": "1.0.61-beta7",
-    "@agent-webui/ai-desk-daemon-linux-x64": "1.0.61-beta7",
-    "@agent-webui/ai-desk-daemon-win32-x64": "1.0.61-beta7",
-    "@agent-webui/ai-desk-python-darwin-arm64": "1.0.61-beta7",
-    "@agent-webui/ai-desk-python-darwin-x64": "1.0.61-beta7",
-    "@agent-webui/ai-desk-python-linux-arm64": "1.0.61-beta7",
-    "@agent-webui/ai-desk-python-linux-x64": "1.0.61-beta7",
-    "@agent-webui/ai-desk-python-win32-x64": "1.0.61-beta7"
+    "@agent-webui/ai-desk-daemon-darwin-arm64": "1.0.62",
+    "@agent-webui/ai-desk-daemon-darwin-x64": "1.0.62",
+    "@agent-webui/ai-desk-daemon-linux-arm64": "1.0.62",
+    "@agent-webui/ai-desk-daemon-linux-x64": "1.0.62",
+    "@agent-webui/ai-desk-daemon-win32-x64": "1.0.62",
+    "@agent-webui/ai-desk-python-darwin-arm64": "1.0.62",
+    "@agent-webui/ai-desk-python-darwin-x64": "1.0.62",
+    "@agent-webui/ai-desk-python-linux-arm64": "1.0.62",
+    "@agent-webui/ai-desk-python-linux-x64": "1.0.62",
+    "@agent-webui/ai-desk-python-win32-x64": "1.0.62"
   },
   "repository": {
     "type": "git",

package/lib/daemon-registry.js

@@ -1,392 +0,0 @@
-const fs = require('fs');
-const os = require('os');
-const path = require('path');
-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) {
-  if (typeof value === 'string') return value.trim();
-  if (typeof value === 'number' && Number.isFinite(value)) return String(value);
-  return '';
-}
-
-function normalizeApiBaseUrl(value) {
-  const raw = trim(value).replace(/\/+$/, '');
-  if (!raw) return '';
-  return raw.endsWith('/api/v1') ? raw : `${raw}/api/v1`;
-}
-
-function parseTruthyEnv(value) {
-  const raw = trim(value).toLowerCase();
-  if (!raw) return null;
-  return raw === '1' || raw === 'true' || raw === 'yes' || raw === 'on';
-}
-
-function isPrivateRegistryHost(hostname) {
-  const host = trim(hostname).toLowerCase();
-  return (
-    host === 'localhost' ||
-    host === '127.0.0.1' ||
-    host.endsWith('.local') ||
-    /^10\./.test(host) ||
-    /^192\.168\./.test(host) ||
-    /^172\.(1[6-9]|2\d|3[0-1])\./.test(host)
-  );
-}
-
-function inferTLSInsecureSkipVerify(apiBaseUrl) {
-  try {
-    const url = new URL(normalizeApiBaseUrl(apiBaseUrl));
-    if (url.protocol !== 'https:') return false;
-    if (url.hostname === 'desk.int.rclabenv.com') return false;
-    return isPrivateRegistryHost(url.hostname);
-  } catch {
-    return false;
-  }
-}
-
-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 apiBaseUrl = normalizeApiBaseUrl(session.api_base_url || session.apiBaseUrl);
-    const rcAccountId = trim(session.account_id || session.accountId);
-    const rcExtensionId = trim(session.extension_id || session.extensionId);
-    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;
-  }
-}
-
-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) return null;
-    return {
-      apiBaseUrl,
-      rcAccountId,
-      rcExtensionId,
-      rcUsername: trim(registry.rc_username || registry.rcUsername) || sessionIdentity?.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 envApiBaseUrl = normalizeApiBaseUrl(
-    env.AI_DESK_API_BASE_URL || env.AI_DESK_BACKEND_API_URL || env.AI_DESK_BACKEND_URL,
-  );
-  const apiBaseUrl = normalizeApiBaseUrl(
-    envApiBaseUrl ||
-    daemonConfig?.apiBaseUrl ||
-    sessionIdentity?.apiBaseUrl ||
-    DEFAULT_REGISTRY_API_BASE_URL,
-  );
-  const rcAccountId = trim(env.AI_DESK_RC_ACCOUNT_ID || env.rcAccountId) ||
-    sessionIdentity?.rcAccountId ||
-    daemonConfig?.rcAccountId ||
-    '';
-  const rcExtensionId = trim(env.AI_DESK_RC_EXTENSION_ID || env.rcExtensionId) ||
-    sessionIdentity?.rcExtensionId ||
-    daemonConfig?.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) ||
-        sessionIdentity?.rcUsername ||
-        daemonConfig?.rcUsername ||
-        '',
-      tlsInsecureSkipVerify: tlsEnvValue === null
-        ? Boolean(daemonConfig?.tlsInsecureSkipVerify ?? sessionIdentity?.tlsInsecureSkipVerify ?? inferTLSInsecureSkipVerify(apiBaseUrl))
-        : 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 configureRegistryUrl(apiBaseUrl, options = {}) {
-  const homeDir = options.homeDir || os.homedir();
-  const normalizedApiBaseUrl = normalizeApiBaseUrl(apiBaseUrl);
-  if (!normalizedApiBaseUrl) {
-    throw new Error('Registry URL is required');
-  }
-
-  let parsedUrl;
-  try {
-    parsedUrl = new URL(normalizedApiBaseUrl);
-  } catch {
-    throw new Error(`Invalid registry URL: ${apiBaseUrl}`);
-  }
-  if (parsedUrl.protocol !== 'http:' && parsedUrl.protocol !== 'https:') {
-    throw new Error(`Registry URL must use http or https: ${apiBaseUrl}`);
-  }
-
-  const configPath = daemonConfigPath(homeDir);
-  let daemonConfig = {};
-  try {
-    if (fs.existsSync(configPath)) {
-      const parsedConfig = JSON.parse(fs.readFileSync(configPath, 'utf8'));
-      if (parsedConfig && typeof parsedConfig === 'object') daemonConfig = parsedConfig;
-    }
-  } catch {
-    daemonConfig = {};
-  }
-
-  const tlsInsecureSkipVerify = typeof options.tlsInsecureSkipVerify === 'boolean'
-    ? options.tlsInsecureSkipVerify
-    : inferTLSInsecureSkipVerify(normalizedApiBaseUrl);
-
-  daemonConfig.registry = {
-    ...(daemonConfig.registry && typeof daemonConfig.registry === 'object' ? daemonConfig.registry : {}),
-    api_base_url: normalizedApiBaseUrl,
-    tls_insecure_skip_verify: tlsInsecureSkipVerify,
-  };
-
-  fs.mkdirSync(path.dirname(configPath), { recursive: true });
-  fs.writeFileSync(configPath, `${JSON.stringify(daemonConfig, null, 2)}\n`, 'utf8');
-
-  return {
-    apiBaseUrl: normalizedApiBaseUrl,
-    tlsInsecureSkipVerify,
-  };
-}
-
-function registryStatePaths(homeDir = os.homedir()) {
-  const root = path.join(homeDir, '.aidesktop');
-  return {
-    root,
-    instanceIdPath: path.join(root, 'daemon-instance-id'),
-    runStatePath: path.join(root, 'daemon-run-state.json'),
-  };
-}
-
-function ensureDaemonInstanceId(paths = registryStatePaths()) {
-  try {
-    fs.mkdirSync(paths.root, { recursive: true });
-    if (fs.existsSync(paths.instanceIdPath)) {
-      const existing = fs.readFileSync(paths.instanceIdPath, 'utf8').trim();
-      if (existing) return existing;
-    }
-    const next = `daemon-${crypto.randomUUID()}`;
-    fs.writeFileSync(paths.instanceIdPath, `${next}\n`, 'utf8');
-    return next;
-  } catch {
-    return `daemon-${crypto.randomUUID()}`;
-  }
-}
-
-function readRunState(paths = registryStatePaths()) {
-  try {
-    if (!fs.existsSync(paths.runStatePath)) return null;
-    const data = JSON.parse(fs.readFileSync(paths.runStatePath, 'utf8'));
-    return data && typeof data === 'object' ? data : null;
-  } catch {
-    return null;
-  }
-}
-
-function writeRunState(state, paths = registryStatePaths()) {
-  try {
-    fs.mkdirSync(paths.root, { recursive: true });
-    fs.writeFileSync(paths.runStatePath, `${JSON.stringify(state, null, 2)}\n`, 'utf8');
-  } catch {
-    // best effort only
-  }
-}
-
-function listIpAddresses() {
-  const out = [];
-  const interfaces = os.networkInterfaces();
-  for (const items of Object.values(interfaces)) {
-    for (const item of items || []) {
-      if (!item.internal && item.address) {
-        out.push(item.address);
-      }
-    }
-  }
-  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,
-  seq = 1,
-  port,
-  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,
-  };
-}
-
-function postJSON(urlString, payload, config) {
-  return new Promise((resolve, reject) => {
-    const url = new URL(urlString);
-    const body = JSON.stringify(payload);
-    const transport = url.protocol === 'https:' ? https : http;
-    const req = transport.request(
-      url,
-      {
-        method: 'POST',
-        ...(url.protocol === 'https:' && config.tlsInsecureSkipVerify
-          ? { agent: new https.Agent({ rejectUnauthorized: false }) }
-          : {}),
-        headers: {
-          'Content-Type': 'application/json',
-          'Content-Length': Buffer.byteLength(body),
-          ...(config.rcAccountId ? { rcAccountId: config.rcAccountId } : {}),
-          ...(config.rcExtensionId ? { rcExtensionId: config.rcExtensionId } : {}),
-          ...(config.rcUsername ? { rcUsername: config.rcUsername } : {}),
-        },
-        timeout: 3000,
-      },
-      (res) => {
-        res.resume();
-        res.on('end', () => {
-          if (res.statusCode >= 200 && res.statusCode < 300) {
-            resolve(true);
-          } else {
-            reject(new Error(`registry returned ${res.statusCode}`));
-          }
-        });
-      },
-    );
-    req.on('timeout', () => {
-      req.destroy(new Error('registry request timed out'));
-    });
-    req.on('error', reject);
-    req.write(body);
-    req.end();
-  });
-}
-
-async function reportLifecycle(event, { port, version, seq = 1 } = {}) {
-  const config = getRegistryConfig();
-  if (!config) return false;
-
-  const paths = registryStatePaths();
-  const daemonInstanceId = ensureDaemonInstanceId(paths);
-  let runState = readRunState(paths);
-  if (event === 'start' || event === 'restart' || !runState?.runId) {
-    runState = { runId: crypto.randomUUID(), seq: 0 };
-  }
-  runState.seq = Math.max(Number(runState.seq || 0) + 1, seq);
-  writeRunState(runState, paths);
-
-  const payload = buildLifecyclePayload({
-    event,
-    runId: runState.runId,
-    seq: runState.seq,
-    port,
-    version,
-    daemonInstanceId,
-  });
-  await postJSON(`${config.apiBaseUrl}/daemon-instances/lifecycle`, payload, config);
-  return true;
-}
-
-module.exports = {
-  buildLifecyclePayload,
-  configureRegistryUrl,
-  DEFAULT_REGISTRY_API_BASE_URL,
-  inferTLSInsecureSkipVerify,
-  getRegistryConfig,
-  syncRegistryConfigToDaemonConfig,
-  readRegistrySessionIdentity,
-  readRegistryConfigFromDaemonConfig,
-  registryStatePaths,
-  ensureDaemonInstanceId,
-  readRunState,
-  writeRunState,
-  listMacAddresses,
-  reportLifecycle,
-};