@lightcone-ai/daemon 0.9.60 → 0.9.62

package/src/agent-manager.js

@@ -5,7 +5,8 @@ import path from 'path';
 import { buildSystemPrompt } from './drivers/claude.js';
 import { buildCodexSpawn, buildCodexSystemPrompt, parseCodexLine } from './drivers/codex.js';
 import { buildKimiSpawn, buildKimiInitMessages, parseKimiLine, encodeKimiStdin } from './drivers/kimi.js';
-import { startSession, stopSession, profileDir } from './browser-login.js';
+import { startSession, stopSession } from './browser-login.js';
+import { buildSkillMcpServers } from './mcp-config.js';
 
 export class AgentManager {
   constructor({ serverUrl, machineApiKey }) {
@@ -135,6 +136,7 @@ export class AgentManager {
       const kimiSpawn = buildKimiSpawn({
         config, agentId, teamId, workspaceDir, chatBridgePath,
         serverUrl: this.serverUrl, machineApiKey: this.machineApiKey, skills,
+        credentialGrants,
       });
 
       console.log(`[AgentManager] Spawning kimi for ${config.displayName ?? agentId} team=${teamName ?? teamId ?? 'none'} (session=${kimiSpawn.sessionId})`);
@@ -185,6 +187,7 @@ export class AgentManager {
         machineApiKey: this.machineApiKey,
         prompt: startupPrompt,
         skills,
+        credentialGrants,
       });
 
       console.log(`[AgentManager] Spawning codex for ${config.displayName ?? agentId} team=${teamName ?? teamId ?? 'none'} (session=${config.sessionId ?? 'new'})`);
@@ -226,60 +229,15 @@ export class AgentManager {
         },
       };
 
-      // Derive MCP servers from skills with mcp_config
-      const agentEnv = config.envVars ?? {};
-      for (const skill of skills) {
-        if (!skill.mcpConfig) continue;
-        const mc = skill.mcpConfig;
-        if (mcpServers[mc.server]) continue; // already added
-        const resolvedArgs = (mc.args ?? []).map(a => {
-          if (a === '{mysql_mcp_path}')
-            return new URL('../../mcp-servers/mysql/index.js', import.meta.url).pathname;
-          if (a === '{workspace_migrate_mcp_path}')
-            return new URL('../../mcp-servers/workspace-migrate/index.js', import.meta.url).pathname;
-          if (a === '{platform_mcp_path}')
-            return new URL('../../mcp-servers/platform/index.js', import.meta.url).pathname;
-          if (a === '{xhs_profile_dir}')
-            return profileDir('xhs', config.userId ?? 'default');
-          if (a === '{douyin_profile_dir}')
-            return profileDir('douyin', config.userId ?? 'default');
-          if (a === '{kuaishou_profile_dir}')
-            return profileDir('kuaishou', config.userId ?? 'default');
-          if (a === '{publisher_mcp_path}')
-            return new URL('../mcp-servers/publisher/index.js', import.meta.url).pathname;
-          return a;
-        });
-        const resolvedEnv = {};
-        for (const envKey of (mc.env ?? [])) {
-          resolvedEnv[envKey] = agentEnv[envKey] ?? process.env[envKey] ?? '';
-        }
-        // Inject platform vars for MCP servers that need to call back to the server
-        if (mc.server === 'workspace-migrate') {
-          resolvedEnv.SERVER_URL = this.serverUrl;
-          resolvedEnv.MACHINE_API_KEY = config.authToken;
-          resolvedEnv.AGENT_ID = agentId;
-        }
-        mcpServers[mc.server] = {
-          command: mc.command,
-          args: resolvedArgs,
-          env: resolvedEnv,
-        };
-      }
-
-      // Inject credential env vars into the matching MCP server
-      // Credentials are keyed by platform; the skill's mcp_config carries a 'platform' field
-      for (const skill of skills) {
-        if (!skill.mcpConfig) continue;
-        const platform = skill.mcpConfig.platform;
-        if (!platform) continue;
-        const grant = credentialGrants.find(g => g.platform === platform);
-        if (!grant) continue;
-        const serverKey = skill.mcpConfig.server;
-        if (mcpServers[serverKey]) {
-          mcpServers[serverKey].env = { ...(mcpServers[serverKey].env ?? {}), ...grant.envVars };
-          console.log(`[AgentManager] Injected ${Object.keys(grant.envVars).length} credential env(s) for platform=${platform} into MCP server '${serverKey}'`);
-        }
-      }
+      Object.assign(mcpServers, buildSkillMcpServers({
+        skills,
+        credentialGrants,
+        config,
+        agentId,
+        workspaceDir,
+        serverUrl: this.serverUrl,
+        authToken: config.authToken,
+      }));
 
       const mcpConfig = { mcpServers };
       console.log(`[AgentManager] MCP servers for ${config.displayName ?? agentId}: ${Object.keys(mcpServers).join(', ')}`);

package/src/browser-login.js

@@ -10,6 +10,7 @@ import { accessSync, constants as fsConstants, rmSync, existsSync, mkdirSync, wr
 import path from 'path';
 import http from 'http';
 import { WebSocket } from 'ws';
+import { acquireProfileLock } from './profile-lock.js';
 
 // ── Platform configs ──────────────────────────────────────────────────────────
 
@@ -20,9 +21,41 @@ export const PLATFORM_CONFIGS = {
     loginUrl: 'https://creator.xiaohongshu.com',
     // Creator login page defaults to password login; click QR tab first
     qrTabSelector: ['.qrcode-box', '[class*="qrcode"]', '[class*="scan-login"]', '[class*="qr-login"]'],
-    getSessionValue: (cookies) => cookies.find(c => c.name === 'web_session')?.value ?? null,
+    qrFallbackScript: `
+      const loginBox = document.querySelector('.login-box-container') || document.body;
+      const boxRect = loginBox.getBoundingClientRect();
+      const visible = (e) => {
+        const r = e.getBoundingClientRect();
+        const cs = getComputedStyle(e);
+        return r.width >= 35 && r.width <= 110
+          && r.height >= 35 && r.height <= 110
+          && r.left >= boxRect.left
+          && r.top >= boxRect.top
+          && r.right <= boxRect.right + 4
+          && r.bottom <= boxRect.bottom + 4
+          && cs.display !== 'none'
+          && cs.visibility !== 'hidden';
+      };
+      const elements = [...loginBox.querySelectorAll('img, canvas, svg, [role="img"], div, span, button')].filter(visible);
+      const corner = elements
+        .map(e => ({ e, r: e.getBoundingClientRect() }))
+        .filter(({ r }) => r.top <= boxRect.top + 120 && r.right >= boxRect.right - 140)
+        .sort((a, b) => (b.r.right + boxRect.top - b.r.top) - (a.r.right + boxRect.top - a.r.top))[0]?.e;
+      if (corner) {
+        const target = corner.closest('button, [role="button"], a, div') || corner;
+        target.click();
+        return 'corner-qr-icon';
+      }
+      return null;
+    `,
+    getSessionValue: (cookies) =>
+      cookies.find(c => c.name === 'access-token-creator.xiaohongshu.com')?.value
+      ?? cookies.find(c => c.name === 'galaxy_creator_session_id')?.value
+      ?? cookies.find(c => c.name === 'galaxy.creator.beaker.session.id')?.value
+      ?? cookies.find(c => c.name === 'customer-sso-sid')?.value
+      ?? null,
     isLoggedIn: (cookies, baseline) => {
-      const val = cookies.find(c => c.name === 'web_session')?.value ?? null;
+      const val = PLATFORM_CONFIGS.xhs.getSessionValue(cookies);
       return val !== null && val !== baseline;
     },
   },
@@ -101,117 +134,134 @@ export class BrowserLoginSession {
     this._screenshotTimer = null;
     this._loginCheckTimer = null;
     this._profileDir = null;
+    this._profileLock = null;
   }
 
   async start(connection, userId) {
     this._profileDir = profileDir(this._platform, userId);
+    this._profileLock = await acquireProfileLock(this._platform, this._profileDir, {
+      owner: `browser-login:${this._platform}`,
+      timeoutMs: 10_000,
+      staleMs: 10 * 60 * 1000,
+    });
 
-    // Wipe the profile dir before each login so stale cookies can't fool the login check.
-    // This is safe — these dirs are single-platform dedicated profiles; fresh start is correct.
-    try { if (existsSync(this._profileDir)) rmSync(this._profileDir, { recursive: true, force: true }); } catch {}
-    try { mkdirSync(this._profileDir, { recursive: true }); } catch {}
-
-    // Kill any process holding the CDP port
     try {
-      if (process.platform !== 'win32') {
-        execSync(`lsof -ti:${CDP_PORT} | xargs kill -9`, { stdio: 'ignore' });
-      }
-    } catch {}
-    await sleep(300);
+      // Wipe the profile dir before each login so stale cookies can't fool the login check.
+      // This is safe — these dirs are single-platform dedicated profiles; fresh start is correct.
+      try { if (existsSync(this._profileDir)) rmSync(this._profileDir, { recursive: true, force: true }); } catch {}
+      try { mkdirSync(this._profileDir, { recursive: true }); } catch {}
 
-    // Clean up stale Chrome lock files
-    for (const lockFile of ['SingletonLock', 'SingletonCookie', 'SingletonSocket']) {
-      const p = path.join(this._profileDir, lockFile);
-      try { if (existsSync(p)) rmSync(p, { force: true }); } catch {}
-    }
-
-    this._proc = spawn(CHROME_BIN, [
-      `--remote-debugging-port=${CDP_PORT}`,
-      '--no-sandbox',
-      '--disable-dev-shm-usage',
-      '--headless=new',
-      `--user-data-dir=${this._profileDir}`,
-      '--window-size=1280,900',
-      '--disable-blink-features=AutomationControlled',
-      '--disable-infobars',
-      '--disable-component-extensions-with-background-pages',
-      '--use-mock-keychain',
-      '--password-store=basic',
-      '--user-agent=Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36',
-      'about:blank',
-    ], { stdio: 'ignore', detached: false });
-
-    this._proc.on('error', (err) => {
-      console.error(`[BrowserLogin][${this._platform}] Chrome spawn error: ${err.message}`);
-      this._stopTimers();
-      connection.send({ type: 'browser:login_error', platform: this._platform, error: `Chrome 启动失败: ${err.message}` });
-    });
+      // Kill any process holding the CDP port
+      try {
+        if (process.platform !== 'win32') {
+          execSync(`lsof -ti:${CDP_PORT} | xargs kill -9`, { stdio: 'ignore' });
+        }
+      } catch {}
+      await sleep(300);
 
-    this._proc.on('exit', (code, signal) => {
-      console.log(`[BrowserLogin][${this._platform}] Chrome exited (code=${code} signal=${signal})`);
-      this._stopTimers();
-    });
+      // Clean up stale Chrome lock files
+      for (const lockFile of ['SingletonLock', 'SingletonCookie', 'SingletonSocket']) {
+        const p = path.join(this._profileDir, lockFile);
+        try { if (existsSync(p)) rmSync(p, { force: true }); } catch {}
+      }
 
-    // Poll for CDP readiness (up to 15s)
-    let ready = false;
-    for (let i = 0; i < 30; i++) {
-      await sleep(500);
-      try {
-        await httpGet(`http://localhost:${CDP_PORT}/json/version`);
-        ready = true;
-        break;
-      } catch { /* not ready yet */ }
-    }
-    if (!ready) throw new Error('Chrome CDP did not become ready in time');
+      this._proc = spawn(CHROME_BIN, [
+        `--remote-debugging-port=${CDP_PORT}`,
+        '--no-sandbox',
+        '--disable-dev-shm-usage',
+        '--headless=new',
+        `--user-data-dir=${this._profileDir}`,
+        '--window-size=1280,900',
+        '--disable-blink-features=AutomationControlled',
+        '--disable-infobars',
+        '--disable-component-extensions-with-background-pages',
+        '--use-mock-keychain',
+        '--password-store=basic',
+        '--user-agent=Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36',
+        'about:blank',
+      ], { stdio: 'ignore', detached: false });
+
+      this._proc.on('error', (err) => {
+        console.error(`[BrowserLogin][${this._platform}] Chrome spawn error: ${err.message}`);
+        this._stopTimers();
+        if (this._profileLock) { this._profileLock.release(); this._profileLock = null; }
+        connection.send({ type: 'browser:login_error', platform: this._platform, error: `Chrome 启动失败: ${err.message}` });
+      });
 
-    const pagesJson = await httpGet(`http://localhost:${CDP_PORT}/json`);
-    const pages = JSON.parse(pagesJson);
-    const page = pages.find(p => p.type === 'page') ?? pages[0];
-    if (!page?.webSocketDebuggerUrl) throw new Error('No page websocket URL from CDP');
+      this._proc.on('exit', (code, signal) => {
+        console.log(`[BrowserLogin][${this._platform}] Chrome exited (code=${code} signal=${signal})`);
+        this._stopTimers();
+        if (this._profileLock) { this._profileLock.release(); this._profileLock = null; }
+      });
 
-    await this._connect(page.webSocketDebuggerUrl);
+      // Poll for CDP readiness (up to 15s)
+      let ready = false;
+      for (let i = 0; i < 30; i++) {
+        await sleep(500);
+        try {
+          await httpGet(`http://localhost:${CDP_PORT}/json/version`);
+          ready = true;
+          break;
+        } catch { /* not ready yet */ }
+      }
+      if (!ready) throw new Error('Chrome CDP did not become ready in time');
 
-    await this.send('Page.enable', {});
-    await this.send('Network.enable', {});
-    await this.send('Page.addScriptToEvaluateOnNewDocument', {
-      source: `Object.defineProperty(navigator, 'webdriver', { get: () => undefined });`,
-    });
+      const pagesJson = await httpGet(`http://localhost:${CDP_PORT}/json`);
+      const pages = JSON.parse(pagesJson);
+      const page = pages.find(p => p.type === 'page') ?? pages[0];
+      if (!page?.webSocketDebuggerUrl) throw new Error('No page websocket URL from CDP');
 
-    await this.send('Page.navigate', { url: this._config.loginUrl });
+      await this._connect(page.webSocketDebuggerUrl);
 
-    // Wait for page to settle
-    await sleep(4000);
+      await this.send('Page.enable', {});
+      await this.send('Network.enable', {});
+      await this.send('Page.addScriptToEvaluateOnNewDocument', {
+        source: `Object.defineProperty(navigator, 'webdriver', { get: () => undefined });`,
+      });
 
-    // Try to click the QR scan login tab if present (some platforms default to password login)
-    if (this._config.qrTabSelector) {
-      try {
-        const selectors = this._config.qrTabSelector;
-        await this.send('Runtime.evaluate', {
-          expression: `(function() {
-            const sels = ${JSON.stringify(selectors)};
-            for (const s of sels) {
-              const el = document.querySelector(s);
-              if (el) { el.click(); return s; }
-            }
+      await this.send('Page.navigate', { url: this._config.loginUrl });
+
+      // Wait for page to settle
+      await sleep(4000);
+
+      // Try to click the QR scan login tab if present (some platforms default to password login)
+      if (this._config.qrTabSelector) {
+        try {
+          const selectors = this._config.qrTabSelector;
+          const qrResult = await this.send('Runtime.evaluate', {
+            expression: `(function() {
+              const sels = ${JSON.stringify(selectors)};
+              for (const s of sels) {
+                const el = document.querySelector(s);
+                if (el) { el.click(); return s; }
+              }
             // Also try text-based search
             const all = [...document.querySelectorAll('a,button,span,div')];
             const el = all.find(e => e.innerText?.trim() === '扫码登录' || e.innerText?.trim() === '二维码登录');
             if (el) { el.click(); return 'text:' + el.innerText.trim(); }
+            ${this._config.qrFallbackScript ?? ''}
             return null;
           })()`,
-          returnByValue: true,
-        });
-        await sleep(1000);
-      } catch {}
-    }
+            returnByValue: true,
+          });
+          console.log(`[BrowserLogin][${this._platform}] QR switch result: ${qrResult.result?.value ?? 'not-found'}`);
+          await sleep(1000);
+        } catch (err) {
+          console.error(`[BrowserLogin][${this._platform}] QR switch failed: ${err.message}`);
+        }
+      }
 
-    // Record baseline session cookie value.
-    // XHS sets an anonymous web_session on first visit — we only trigger login_complete
-    // when the value CHANGES (real login replaces it with an authenticated session).
-    const baselineCookies = await this.send('Network.getAllCookies', {});
-    const baselineSession = this._config.getSessionValue(baselineCookies.cookies ?? []);
+      // Record baseline session cookie value.
+      // XHS sets an anonymous web_session on first visit — we only trigger login_complete
+      // when the value CHANGES (real login replaces it with an authenticated session).
+      const baselineCookies = await this.send('Network.getAllCookies', {});
+      const baselineSession = this._config.getSessionValue(baselineCookies.cookies ?? []);
 
-    this._startPolling(connection, baselineSession);
+      this._startPolling(connection, baselineSession);
+    } catch (err) {
+      if (this._profileLock) { this._profileLock.release(); this._profileLock = null; }
+      throw err;
+    }
   }
 
   _connect(wsUrl) {
@@ -323,6 +373,7 @@ export class BrowserLoginSession {
     await sleep(1000);
     if (this._ws) { try { this._ws.close(); } catch {} this._ws = null; }
     if (this._proc) { try { this._proc.kill('SIGKILL'); } catch {} this._proc = null; }
+    if (this._profileLock) { this._profileLock.release(); this._profileLock = null; }
   }
 }
 

package/src/chat-bridge.js

@@ -439,11 +439,11 @@ server.tool('execute_approved_action',
       const data = await api('POST', `/actions/${action_id}/execute`, {});
       if (data.error) return { isError: true, content: [{ type: 'text', text: `Failed: ${data.error}` }] };
       return { content: [{ type: 'text', text:
-        `Action approved. Now call the appropriate platform tool to actually perform the operation.\n` +
+        `Action approved. Now call the appropriate platform tool with approval_action_id="${action_id}" to actually perform the operation.\n` +
         `actionType=${data.actionType} platform=${data.platform}\n` +
         `Payload: ${JSON.stringify(data.payload)}\n\n` +
-        `For xhs_post: call publish_content(platform="xhs", ...) with the payload fields above.\n` +
-        `For douyin_post: call publish_content(platform="douyin", ...).\n` +
+        `For xhs_post: call publish_content(platform="xhs", approval_action_id="${action_id}", ...) with the payload fields above.\n` +
+        `For douyin_post: call publish_content(platform="douyin", approval_action_id="${action_id}", ...).\n` +
         `For x_post: call post_tweet(...).`
       }]};
     } catch (err) {

package/src/drivers/codex.js

@@ -2,6 +2,7 @@ import { execSync } from 'child_process';
 import { existsSync } from 'fs';
 import path from 'path';
 import { buildSystemPrompt as buildClaudeSystemPrompt } from './claude.js';
+import { buildSkillMcpServers } from '../mcp-config.js';
 
 function buildChatBridgeArgs(chatBridgePath, { agentId, teamId, serverUrl, authToken }) {
   const args = [
@@ -62,7 +63,7 @@ export function buildCodexSystemPrompt(config, agentId) {
 }
 
 export function buildCodexSpawn({
-  config, agentId, teamId, workspaceDir, chatBridgePath, serverUrl, machineApiKey, prompt, skills,
+  config, agentId, teamId, workspaceDir, chatBridgePath, serverUrl, machineApiKey, prompt, skills, credentialGrants,
 }) {
   ensureGitRepo(workspaceDir);
 
@@ -89,31 +90,31 @@ export function buildCodexSpawn({
     '-c', 'mcp_servers.chat.tool_timeout_sec=300',
   );
 
-  // Derive MCP servers from skills with mcpConfig
-  const agentEnv = config.envVars ?? {};
-  for (const skill of (skills ?? [])) {
-    if (!skill.mcpConfig) continue;
-    const mc = skill.mcpConfig;
-    const resolvedArgs = (mc.args ?? []).map(a =>
-      a === '{mysql_mcp_path}'
-        ? new URL('../../mcp-servers/mysql/index.js', import.meta.url).pathname
-        : a
-    );
-    // For codex, MCP servers use env wrapper for env vars
-    const envPairs = (mc.env ?? []).map(k => `${k}=${agentEnv[k] ?? process.env[k] ?? ''}`);
+  const skillMcpServers = buildSkillMcpServers({
+    skills,
+    credentialGrants,
+    config,
+    agentId,
+    workspaceDir,
+    serverUrl,
+    authToken: config.authToken || machineApiKey,
+  });
+
+  for (const [serverKey, mc] of Object.entries(skillMcpServers)) {
+    const envPairs = Object.entries(mc.env ?? {}).map(([k, v]) => `${k}=${v ?? ''}`);
     if (envPairs.length > 0) {
       args.push(
-        '-c', `mcp_servers.${quote(mc.server)}.command=${quote('env')}`,
-        '-c', `mcp_servers.${quote(mc.server)}.args=${quote([...envPairs, mc.command, ...resolvedArgs])}`,
-        '-c', `mcp_servers.${quote(mc.server)}.enabled=true`
-      );
-    } else {
-      args.push(
-        '-c', `mcp_servers.${quote(mc.server)}.command=${quote(mc.command)}`,
-        '-c', `mcp_servers.${quote(mc.server)}.args=${quote(resolvedArgs)}`,
-        '-c', `mcp_servers.${quote(mc.server)}.enabled=true`
+        '-c', `mcp_servers.${quote(serverKey)}.command=${quote('env')}`,
+        '-c', `mcp_servers.${quote(serverKey)}.args=${quote([...envPairs, mc.command, ...(mc.args ?? [])])}`,
+        '-c', `mcp_servers.${quote(serverKey)}.enabled=true`
       );
+      continue;
     }
+    args.push(
+      '-c', `mcp_servers.${quote(serverKey)}.command=${quote(mc.command)}`,
+      '-c', `mcp_servers.${quote(serverKey)}.args=${quote(mc.args ?? [])}`,
+      '-c', `mcp_servers.${quote(serverKey)}.enabled=true`
+    );
   }
 
   const model = normalizeCodexModel(config.model);

package/src/drivers/kimi.js

@@ -2,6 +2,7 @@ import { randomUUID } from 'crypto';
 import { existsSync, writeFileSync } from 'fs';
 import path from 'path';
 import { buildSystemPrompt as buildClaudeSystemPrompt } from './claude.js';
+import { buildSkillMcpServers } from '../mcp-config.js';
 
 const KIMI_WIRE_PROTOCOL_VERSION = '1.3';
 const KIMI_SYSTEM_PROMPT_FILE = '.lightcone-kimi-system.md';
@@ -12,7 +13,7 @@ const KIMI_MCP_FILE = '.lightcone-kimi-mcp.json';
  * Build Kimi CLI spawn args and config files.
  * Returns { args, env, setupFiles() } ready for spawn('kimi', args, { env }).
  */
-export function buildKimiSpawn({ config, agentId, teamId, workspaceDir, chatBridgePath, serverUrl, machineApiKey, skills }) {
+export function buildKimiSpawn({ config, agentId, teamId, workspaceDir, chatBridgePath, serverUrl, machineApiKey, skills, credentialGrants }) {
   const isResume = !!config.sessionId;
   const sessionId = config.sessionId || randomUUID();
 
@@ -51,23 +52,15 @@ export function buildKimiSpawn({ config, agentId, teamId, workspaceDir, chatBrid
     },
   };
 
-  // Derive MCP servers from skills with mcpConfig
-  const agentEnv = config.envVars ?? {};
-  for (const skill of (skills ?? [])) {
-    if (!skill.mcpConfig) continue;
-    const mc = skill.mcpConfig;
-    if (mcpServers[mc.server]) continue;
-    const resolvedArgs = (mc.args ?? []).map(a =>
-      a === '{mysql_mcp_path}'
-        ? new URL('../../mcp-servers/mysql/index.js', import.meta.url).pathname
-        : a
-    );
-    const resolvedEnv = {};
-    for (const envKey of (mc.env ?? [])) {
-      resolvedEnv[envKey] = agentEnv[envKey] ?? process.env[envKey] ?? '';
-    }
-    mcpServers[mc.server] = { command: mc.command, args: resolvedArgs, env: resolvedEnv };
-  }
+  Object.assign(mcpServers, buildSkillMcpServers({
+    skills,
+    credentialGrants,
+    config,
+    agentId,
+    workspaceDir,
+    serverUrl,
+    authToken: config.authToken || machineApiKey,
+  }));
 
   writeFileSync(mcpConfigPath, JSON.stringify({ mcpServers }), 'utf8');
 

package/src/mcp-config.js

@@ -0,0 +1,79 @@
+import { profileDir } from './browser-login.js';
+
+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;
+  if (arg === '{xhs_profile_dir}')
+    return profileDir('xhs', config.userId ?? 'default');
+  if (arg === '{douyin_profile_dir}')
+    return profileDir('douyin', config.userId ?? 'default');
+  if (arg === '{kuaishou_profile_dir}')
+    return profileDir('kuaishou', config.userId ?? 'default');
+  return arg;
+}
+
+function baseEnvForServer(serverKey, { serverUrl, authToken, agentId, workspaceDir }) {
+  if (serverKey === 'workspace-migrate') {
+    return { SERVER_URL: serverUrl, MACHINE_API_KEY: authToken, AGENT_ID: agentId };
+  }
+  if (serverKey === 'publisher' || serverKey === 'platform') {
+    return {
+      SERVER_URL: serverUrl,
+      MACHINE_API_KEY: authToken,
+      AGENT_ID: agentId,
+      WORKSPACE_DIR: workspaceDir,
+    };
+  }
+  return {};
+}
+
+export function buildSkillMcpServers({
+  skills,
+  credentialGrants,
+  config,
+  agentId,
+  workspaceDir,
+  serverUrl,
+  authToken,
+}) {
+  const mcpServers = {};
+  const agentEnv = config.envVars ?? {};
+
+  for (const skill of (skills ?? [])) {
+    if (!skill.mcpConfig) continue;
+    const mc = skill.mcpConfig;
+    if (mcpServers[mc.server]) continue;
+
+    const resolvedArgs = (mc.args ?? []).map(arg => resolveSkillArg(arg, config));
+    const resolvedEnv = {};
+    for (const envKey of (mc.env ?? [])) {
+      resolvedEnv[envKey] = agentEnv[envKey] ?? process.env[envKey] ?? '';
+    }
+
+    mcpServers[mc.server] = {
+      command: mc.command,
+      args: resolvedArgs,
+      env: {
+        ...resolvedEnv,
+        ...baseEnvForServer(mc.server, { serverUrl, authToken, agentId, 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;
+}