@lightcone-ai/daemon 0.9.78 → 0.10.0

package/src/index.js

@@ -7,26 +7,44 @@ import { releaseProfileLocksForProcess } from './profile-lock.js';
 
 const { version } = createRequire(import.meta.url)('../package.json');
 
-// ── CLI args ──────────────────────────────────────────────────────────────────
-const args = process.argv.slice(2);
-let cliServerUrl = '';
-let cliApiKey    = '';
-
-for (let i = 0; i < args.length; i++) {
-  if (args[i] === '--server-url' && args[i + 1]) cliServerUrl = args[++i];
-  if (args[i] === '--api-key'    && args[i + 1]) cliApiKey    = args[++i];
-  if (args[i] === '--help' || args[i] === '-h') {
-    console.log('Usage: lightcone-daemon --server-url <url> --api-key <key>');
-    process.exit(0);
+function parseArgs(raw) {
+  const opts = { _: [] };
+  for (let i = 0; i < raw.length; i++) {
+    const arg = raw[i];
+    if (arg.startsWith('--')) {
+      const next = raw[i + 1];
+      if (next && !next.startsWith('--')) {
+        opts[arg] = next;
+        i++;
+      } else {
+        opts[arg] = true;
+      }
+    } else {
+      opts._.push(arg);
+    }
   }
+  return opts;
+}
+
+function printUsage() {
+  console.log('Usage:');
+  console.log('  lightcone-daemon --server-url <url> --api-key <key>');
+}
+
+// ── CLI args ──────────────────────────────────────────────────────────────────
+const argv = process.argv.slice(2);
+const opts = parseArgs(argv);
+if (opts['--help'] || opts['-h']) {
+  printUsage();
+  process.exit(0);
 }
 
-const SERVER_URL      = cliServerUrl || process.env.SERVER_URL      || 'http://localhost:8779';
-const MACHINE_API_KEY = cliApiKey    || process.env.MACHINE_API_KEY || '';
+const SERVER_URL = String(opts['--server-url'] || process.env.SERVER_URL || 'http://localhost:8779').trim();
+const MACHINE_API_KEY = String(opts['--api-key'] || process.env.MACHINE_API_KEY || '').trim();
 
 if (!MACHINE_API_KEY) {
   console.error('Error: API key is required.');
-  console.error('Usage: lightcone-daemon --server-url <url> --api-key <key>');
+  printUsage();
   process.exit(1);
 }
 
@@ -54,7 +72,7 @@ async function shutdown(signal) {
   process.exit(0);
 }
 
-process.on('SIGINT',  () => { shutdown('SIGINT'); });
+process.on('SIGINT', () => { shutdown('SIGINT'); });
 process.on('SIGTERM', () => { shutdown('SIGTERM'); });
-process.on('SIGHUP',  () => { shutdown('SIGHUP'); });
+process.on('SIGHUP', () => { shutdown('SIGHUP'); });
 process.on('exit', () => { releaseProfileLocksForProcess(); });

package/src/lease-window.js

@@ -0,0 +1,8 @@
+export function classifyLeaseWindow(validUntil, nowMs = Date.now(), graceMs = 5000) {
+  const validUntilMs = Date.parse(validUntil ?? '');
+  if (!Number.isFinite(validUntilMs)) return 'expired';
+  if (nowMs <= validUntilMs) return 'valid';
+  if (nowMs <= validUntilMs + Math.max(0, Number(graceMs) || 0)) return 'grace';
+  return 'expired';
+}
+

package/src/mcp-config.js

@@ -1,14 +1,42 @@
 import { profileDir } from './browser-login.js';
+import { resolveMcpServerEntrypoint } from '../../src/mcp/registry.js';
+
+const LEGACY_MCP_PATH_TOKENS = Object.freeze({
+  '{mysql_mcp_path}': 'mysql',
+  '{workspace_migrate_mcp_path}': 'workspace-migrate',
+  '{platform_mcp_path}': 'platform',
+  '{publisher_mcp_path}': 'publisher',
+  '{research_fetch_mcp_path}': 'research-fetch',
+  '{market_data_query_mcp_path}': 'market-data-query',
+  '{company_fundamentals_mcp_path}': 'company-fundamentals',
+  '{industry_report_mcp_path}': 'industry-report',
+  '{risk_metrics_mcp_path}': 'risk-metrics',
+  '{compliance_check_mcp_path}': 'compliance-check',
+  '{portfolio_read_mcp_path}': 'portfolio-read',
+  '{portfolio_analysis_mcp_path}': 'portfolio-analysis',
+});
+
+function resolveMcpPathToken(arg) {
+  if (typeof arg !== 'string') return null;
+
+  const trimmed = arg.trim();
+  if (!trimmed.startsWith('{') || !trimmed.endsWith('}')) return null;
+
+  const legacyId = LEGACY_MCP_PATH_TOKENS[trimmed] ?? null;
+  const dynamicMatch = trimmed.match(/^\{mcp_path:([a-z0-9][a-z0-9_-]*)\}$/i);
+  const serverId = legacyId ?? (dynamicMatch ? dynamicMatch[1].toLowerCase() : null);
+  if (!serverId) return null;
+
+  const entrypointPath = resolveMcpServerEntrypoint(serverId, { strict: true });
+  if (!entrypointPath) {
+    throw new Error(`MCP server '${serverId}' is not registered in manifest registry`);
+  }
+  return entrypointPath;
+}
 
 function resolveSkillArg(arg, config) {
-  if (arg === '{mysql_mcp_path}')
-    return new URL('../../mcp-servers/mysql/index.js', import.meta.url).pathname;
-  if (arg === '{workspace_migrate_mcp_path}')
-    return new URL('../../mcp-servers/workspace-migrate/index.js', import.meta.url).pathname;
-  if (arg === '{platform_mcp_path}')
-    return new URL('../../mcp-servers/platform/index.js', import.meta.url).pathname;
-  if (arg === '{publisher_mcp_path}')
-    return new URL('../mcp-servers/publisher/index.js', import.meta.url).pathname;
+  const resolvedMcpPath = resolveMcpPathToken(arg);
+  if (resolvedMcpPath) return resolvedMcpPath;
   if (arg === '{xhs_profile_dir}')
     return profileDir('xhs', config.userId ?? 'default');
   if (arg === '{douyin_profile_dir}')
@@ -18,15 +46,27 @@ function resolveSkillArg(arg, config) {
   return arg;
 }
 
-function baseEnvForServer(serverKey, { serverUrl, authToken, agentId, workspaceDir }) {
+function baseEnvForServer(serverKey, { serverUrl, authToken, agentId, workspaceId, workspaceDir }) {
   if (serverKey === 'workspace-migrate') {
     return { SERVER_URL: serverUrl, MACHINE_API_KEY: authToken, AGENT_ID: agentId };
   }
-  if (serverKey === 'publisher' || serverKey === 'platform') {
+  if (
+    serverKey === 'publisher'
+    || serverKey === 'platform'
+    || serverKey === 'research-fetch'
+    || serverKey === 'market-data-query'
+    || serverKey === 'company-fundamentals'
+    || serverKey === 'industry-report'
+    || serverKey === 'risk-metrics'
+    || serverKey === 'compliance-check'
+    || serverKey === 'portfolio-read'
+    || serverKey === 'portfolio-analysis'
+  ) {
     return {
       SERVER_URL: serverUrl,
       MACHINE_API_KEY: authToken,
       AGENT_ID: agentId,
+      WORKSPACE_ID: workspaceId ?? '',
       WORKSPACE_DIR: workspaceDir,
     };
   }
@@ -35,9 +75,9 @@ function baseEnvForServer(serverKey, { serverUrl, authToken, agentId, workspaceD
 
 export function buildSkillMcpServers({
   skills,
-  credentialGrants,
   config,
   agentId,
+  workspaceId,
   workspaceDir,
   serverUrl,
   authToken,
@@ -61,19 +101,10 @@ export function buildSkillMcpServers({
       args: resolvedArgs,
       env: {
         ...resolvedEnv,
-        ...baseEnvForServer(mc.server, { serverUrl, authToken, agentId, workspaceDir }),
+        ...baseEnvForServer(mc.server, { serverUrl, authToken, agentId, workspaceId, workspaceDir }),
       },
     };
   }
 
-  for (const skill of (skills ?? [])) {
-    if (!skill.mcpConfig?.platform) continue;
-    const grant = (credentialGrants ?? []).find(g => g.platform === skill.mcpConfig.platform);
-    if (!grant) continue;
-    const serverKey = skill.mcpConfig.server;
-    if (!mcpServers[serverKey]) continue;
-    mcpServers[serverKey].env = { ...(mcpServers[serverKey].env ?? {}), ...(grant.envVars ?? {}) };
-  }
-
   return mcpServers;
 }