@vocmarket/voc-skill 0.3.29 → 0.3.31

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "voc-intelligence",
   "description": "VOC intelligence skills for Claude Code: end-to-end VOC business workflows, Xiaohongshu and Douyin trend reports, live social VOC collection, Fmode Doubao image analysis, token/recharge checks, evidence-card outputs, prioritized issue pools, single-problem deep dives, competitor maps, 7-day content plans, VOC-backed speaking script co-creation, boss/operator action plans, and multi-turn memory.",
-  "version": "0.3.29",
+  "version": "0.3.31",
   "author": {
     "name": "nkkj-BrainHack"
   }

package/bin/claude-voc.js

@@ -3,12 +3,18 @@ const fs = require('fs');
 const os = require('os');
 const path = require('path');
 const { spawnSync } = require('child_process');
+const { ensureActivated } = require('../mcp/src/core/activation');
+const { readNewApiToken } = require('../mcp/src/core/credentials');
 
 const SOURCE_ROOT = path.resolve(__dirname, '..');
 const WORKSPACE_ROOT = process.cwd();
 const DEFAULT_TARGET = path.join(os.homedir(), '.claude', 'plugins', 'voc-intelligence');
 const WORKSPACE_TARGET = path.join(WORKSPACE_ROOT, '.claude', 'plugins', 'voc-intelligence');
 const WORKSPACE_PLUGINS_ROOT = path.join(WORKSPACE_ROOT, '.claude', 'plugins');
+const CODEX_PROJECT_TARGET = path.join(WORKSPACE_ROOT, '.codex', 'plugins', 'voc-intelligence');
+const CODEX_GLOBAL_TARGET = path.join(os.homedir(), '.codex', 'plugins', 'voc-intelligence');
+const PORTABLE_WORKSPACE_TARGET = path.join(WORKSPACE_ROOT, '.vocmarket', 'plugins', 'voc-intelligence');
+const VOCMARKET_CREDENTIALS = path.join(os.homedir(), '.vocmarket', 'credentials.json');
 const MIN_NODE_MAJOR = 18;
 
 const EXCLUDED_DIRS = new Set([
@@ -34,6 +40,7 @@ function usage() {
     'Usage:',
     '  claude-voc install',
     '  claude-voc workspace',
+    '  claude-voc workspace --activate --channel <name>',
     '  claude-voc install --workspace --smoke',
     '  claude-voc check',
     '  claude-voc smoke',
@@ -43,6 +50,7 @@ function usage() {
     'npx:',
     '  npx @vocmarket/voc-skill install',
     '  npx @vocmarket/voc-skill workspace --smoke',
+    '  npx @vocmarket/voc-skill workspace --activate   (其他 AI 编程器渠道专用：安装并按状态弹付费)',
     '',
     'Options:',
     '  --workspace      Install into ./.claude/plugins/voc-intelligence',
@@ -50,6 +58,9 @@ function usage() {
     '  --force          Allow overwriting an existing custom target',
     '  --skip-install   Skip npm install after copying files',
     '  --smoke          Run sample/preference/MCP smoke checks after install',
+    '  --activate       安装后按 token 状态激活：无 token 弹付费/登录页，有 token 直接放行（外部 AI IDE 专用，不影响 --smoke）',
+    '  --channel <name> 安装渠道（claude-code/codex/workbuddy/fmode-studio）',
+    '  --scope <name>   Codex 安装范围（project/global，默认 project）',
     '  --help, -h       Show help'
   ].join('\n');
 }
@@ -65,6 +76,11 @@ function parseArgs(argv) {
     target: DEFAULT_TARGET,
     skipInstall: false,
     smoke: false,
+    activate: false,
+    channel: 'external',
+    scope: 'project',
+    targetExplicit: false,
+    workspaceRequested: first === 'workspace' || first === 'install-workspace',
     force: false,
     help: false
   };
@@ -78,25 +94,67 @@ function parseArgs(argv) {
     const token = argv[i];
     if (token === '--target') {
       opts.target = argv[++i];
+      opts.targetExplicit = true;
     } else if (token.startsWith('--target=')) {
       opts.target = token.slice('--target='.length);
+      opts.targetExplicit = true;
     } else if (token === '--workspace') {
       opts.target = WORKSPACE_TARGET;
+      opts.workspaceRequested = true;
     } else if (token === '--force') {
       opts.force = true;
     } else if (token === '--skip-install') {
       opts.skipInstall = true;
     } else if (token === '--smoke') {
       opts.smoke = true;
+    } else if (token === '--activate') {
+      opts.activate = true;
+    } else if (token === '--channel') {
+      opts.channel = argv[++i];
+    } else if (token.startsWith('--channel=')) {
+      opts.channel = token.slice('--channel='.length);
+    } else if (token === '--scope') {
+      opts.scope = argv[++i];
+    } else if (token.startsWith('--scope=')) {
+      opts.scope = token.slice('--scope='.length);
     } else if (token === '--help' || token === '-h') {
       opts.help = true;
     }
   }
 
+  opts.channel = normalizeInstallChannel(opts.channel);
+  opts.scope = normalizeInstallScope(opts.channel, opts.scope);
+  if (opts.workspaceRequested && !opts.targetExplicit) {
+    opts.target = defaultTargetFor(opts.channel, opts.scope);
+  }
   opts.target = path.resolve(expandHome(opts.target));
   return opts;
 }
 
+function normalizeInstallChannel(value) {
+  const channel = String(value || 'claude-code').trim().toLowerCase();
+  if (channel === 'external') return 'claude-code';
+  if (!['claude-code', 'codex', 'workbuddy', 'fmode-studio'].includes(channel)) {
+    throw new Error(`Unsupported install channel: ${channel}`);
+  }
+  return channel;
+}
+
+function normalizeInstallScope(channel, value) {
+  if (channel !== 'codex') return 'project';
+  const scope = String(value || 'project').trim().toLowerCase();
+  if (!['project', 'global'].includes(scope)) {
+    throw new Error(`Unsupported Codex install scope: ${scope}`);
+  }
+  return scope;
+}
+
+function defaultTargetFor(channel, scope) {
+  if (channel === 'codex') return scope === 'global' ? CODEX_GLOBAL_TARGET : CODEX_PROJECT_TARGET;
+  if (channel === 'workbuddy') return PORTABLE_WORKSPACE_TARGET;
+  return WORKSPACE_TARGET;
+}
+
 function run(command, args, cwd) {
   const useCmd = process.platform === 'win32' && command === 'npm';
   const executable = useCmd ? 'cmd.exe' : command;
@@ -171,8 +229,13 @@ function isSafeWorkspaceTarget(targetDir) {
   return isInside(WORKSPACE_PLUGINS_ROOT, targetDir);
 }
 
+function isSafeManagedTarget(targetDir) {
+  return [WORKSPACE_TARGET, CODEX_PROJECT_TARGET, CODEX_GLOBAL_TARGET, PORTABLE_WORKSPACE_TARGET]
+    .some(candidate => path.resolve(candidate) === path.resolve(targetDir));
+}
+
 function canOverwriteTarget(targetDir, opts) {
-  return opts.force || isSafeDefaultTarget(targetDir) || isSafeWorkspaceTarget(targetDir);
+  return opts.force || isSafeDefaultTarget(targetDir) || isSafeWorkspaceTarget(targetDir) || isSafeManagedTarget(targetDir);
 }
 
 function shouldCopyEntry(entry) {
@@ -249,9 +312,8 @@ function readJsonIfExists(filePath) {
   return JSON.parse(fs.readFileSync(filePath, 'utf8'));
 }
 
-function writeWorkspaceMcpConfig(targetDir) {
-  const mcpConfigPath = path.join(WORKSPACE_ROOT, '.mcp.json');
-  const existing = readJsonIfExists(mcpConfigPath);
+function writeJsonMcpConfig(configPath, targetDir) {
+  const existing = readJsonIfExists(configPath);
   const mcpConfig = {
     ...existing,
     mcpServers: {
@@ -263,7 +325,99 @@ function writeWorkspaceMcpConfig(targetDir) {
       }
     }
   };
-  fs.writeFileSync(mcpConfigPath, `${JSON.stringify(mcpConfig, null, 2)}\n`, 'utf8');
+  ensureDir(path.dirname(configPath));
+  fs.writeFileSync(configPath, `${JSON.stringify(mcpConfig, null, 2)}\n`, 'utf8');
+}
+
+function writeWorkspaceMcpConfig(targetDir) {
+  const mcpConfigPath = path.join(WORKSPACE_ROOT, '.mcp.json');
+  writeJsonMcpConfig(mcpConfigPath, targetDir);
+}
+
+function tomlString(value) {
+  return JSON.stringify(String(value));
+}
+
+function upsertCodexProjectMcp(targetDir, workspaceRoot = WORKSPACE_ROOT) {
+  const configPath = path.join(workspaceRoot, '.codex', 'config.toml');
+  const original = fs.existsSync(configPath) ? fs.readFileSync(configPath, 'utf8') : '';
+  const lines = original.replace(/\r\n/g, '\n').split('\n');
+  const kept = [];
+  let skipping = false;
+  for (const line of lines) {
+    const table = line.match(/^\s*\[([^\]]+)]\s*(?:#.*)?$/);
+    if (table) {
+      skipping = table[1] === 'mcp_servers.voc' || table[1].startsWith('mcp_servers.voc.');
+    }
+    if (!skipping) kept.push(line);
+  }
+  while (kept.length && !kept[kept.length - 1].trim()) kept.pop();
+  const serverPath = path.join(targetDir, 'mcp', 'src', 'server.js');
+  const block = [
+    '[mcp_servers.voc]',
+    'command = "node"',
+    `args = [${tomlString(serverPath)}]`,
+    `cwd = ${tomlString(targetDir)}`
+  ];
+  ensureDir(path.dirname(configPath));
+  fs.writeFileSync(configPath, `${kept.concat(kept.length ? [''] : [], block).join('\n')}\n`, 'utf8');
+  return configPath;
+}
+
+function runCapture(command, args, cwd = WORKSPACE_ROOT) {
+  const useCmd = process.platform === 'win32';
+  const executable = useCmd ? 'cmd.exe' : command;
+  const finalArgs = useCmd ? ['/d', '/s', '/c', command, ...args] : args;
+  return spawnSync(executable, finalArgs, {
+    cwd,
+    encoding: 'utf8',
+    stdio: ['ignore', 'pipe', 'pipe'],
+    maxBuffer: 1024 * 1024 * 10
+  });
+}
+
+function registerCodexGlobalMcp(targetDir) {
+  const getResult = runCapture('codex', ['mcp', 'get', 'voc']);
+  if (!getResult.error && getResult.status === 0) {
+    const removeResult = runCapture('codex', ['mcp', 'remove', 'voc']);
+    if (removeResult.error || removeResult.status !== 0) {
+      throw new Error('Unable to update the existing Codex VOC MCP registration');
+    }
+  }
+  const serverPath = path.join(targetDir, 'mcp', 'src', 'server.js');
+  const addResult = runCapture('codex', ['mcp', 'add', 'voc', '--', 'node', serverPath]);
+  if (addResult.error || addResult.status !== 0) {
+    const detail = String(addResult.stderr || addResult.error?.message || '').trim();
+    throw new Error(`Codex MCP registration failed${detail ? `: ${detail}` : ''}`);
+  }
+}
+
+function copyPackagedSkills(targetDir, destinationRoot) {
+  const sourceRoot = path.join(targetDir, 'skills');
+  ensureDir(destinationRoot);
+  let copied = 0;
+  for (const entry of fs.readdirSync(sourceRoot, { withFileTypes: true })) {
+    if (!entry.isDirectory()) continue;
+    const destination = path.join(destinationRoot, entry.name);
+    removeDirResilient(destination);
+    copied += copyDirRecursive(path.join(sourceRoot, entry.name), destination);
+  }
+  return copied;
+}
+
+function persistNeutralCredential(credentialsPath = VOCMARKET_CREDENTIALS) {
+  const token = readNewApiToken();
+  if (!token) return false;
+  const existing = readJsonIfExists(credentialsPath);
+  ensureDir(path.dirname(credentialsPath));
+  fs.writeFileSync(credentialsPath, `${JSON.stringify({ ...existing, fmodeApiKey: token }, null, 2)}\n`, {
+    encoding: 'utf8',
+    mode: 0o600
+  });
+  try {
+    fs.chmodSync(credentialsPath, 0o600);
+  } catch {}
+  return true;
 }
 
 function asForwardSlash(filePath) {
@@ -604,11 +758,10 @@ function writeWorkspaceSkillEntries(targetDir) {
   fs.copyFileSync(path.join(targetDir, 'skills', 'voc-api-catalog', 'SKILL.md'), path.join(apiCatalogSkillDir, 'SKILL.md'));
 }
 
-function writeWorkspaceActivation(targetDir) {
-  if (!isSafeWorkspaceTarget(targetDir)) return;
+function writeClaudeWorkspaceActivation(targetDir) {
   writeWorkspaceMcpConfig(targetDir);
   writeWorkspaceSkillEntries(targetDir);
-  console.log('Wrote workspace MCP config: .\\.mcp.json');
+  console.log('Wrote Claude/Fmode workspace MCP config: .\\.mcp.json');
   console.log('Wrote workspace skill entry: .\\.claude\\skills\\xiaohongshu-trend-intelligence\\SKILL.md');
   console.log('Wrote workspace skill entry: .\\.claude\\skills\\douyin-trend-intelligence\\SKILL.md');
   console.log('Wrote workspace skill entry: .\\.claude\\skills\\voc-issue-pool\\SKILL.md');
@@ -621,26 +774,71 @@ function writeWorkspaceActivation(targetDir) {
   console.log('Wrote workspace skill entry: .\\.claude\\skills\\voc-api-catalog\\SKILL.md');
 }
 
-function printNextSteps(targetDir) {
-  const workspaceMode = isSafeWorkspaceTarget(targetDir);
+function writeWorkspaceActivation(targetDir, opts) {
+  if (!opts.workspaceRequested) return;
+  if (opts.channel === 'codex') {
+    const skillRoot = opts.scope === 'global'
+      ? path.join(os.homedir(), '.codex', 'skills')
+      : path.join(WORKSPACE_ROOT, '.codex', 'skills');
+    copyPackagedSkills(targetDir, skillRoot);
+    if (opts.scope === 'global') {
+      registerCodexGlobalMcp(targetDir);
+      console.log('Registered VOC MCP with Codex user config.');
+      console.log(`Installed Codex user skills: ${skillRoot}`);
+    } else {
+      const configPath = upsertCodexProjectMcp(targetDir);
+      console.log(`Registered VOC MCP with Codex project config: ${configPath}`);
+      console.log(`Installed Codex project skills: ${skillRoot}`);
+    }
+    return;
+  }
+  if (opts.channel === 'workbuddy') {
+    writeWorkspaceMcpConfig(targetDir);
+    const skillRoot = path.join(WORKSPACE_ROOT, '.workbuddy', 'skills');
+    copyPackagedSkills(targetDir, skillRoot);
+    console.log('Wrote portable WorkBuddy MCP registration: .\\.mcp.json');
+    console.log('Installed WorkBuddy workspace skills: .\\.workbuddy\\skills');
+    return;
+  }
+  writeClaudeWorkspaceActivation(targetDir);
+}
+
+async function verifyVocToolDiscovery(targetDir) {
+  const { Client } = require('@modelcontextprotocol/sdk/client/index.js');
+  const { StdioClientTransport } = require('@modelcontextprotocol/sdk/client/stdio.js');
+  const { version } = require('../package.json');
+  const client = new Client({ name: 'voc-installer-verification', version });
+  const transport = new StdioClientTransport({
+    command: process.execPath,
+    args: [path.join(targetDir, 'mcp', 'src', 'server.js')],
+    cwd: targetDir,
+    stderr: 'pipe'
+  });
+  await client.connect(transport);
+  try {
+    const result = await client.listTools();
+    const names = (result.tools || []).map(tool => tool.name);
+    const discovered = names.filter(name => name.startsWith('voc_api_'));
+    if (!discovered.length) {
+      throw new Error('MCP started, but no voc_api_* tool was discovered');
+    }
+    console.log(`Verified MCP tool discovery (no data request): ${discovered.join(', ')}`);
+    return discovered;
+  } finally {
+    await client.close();
+  }
+}
+
+function printNextSteps(targetDir, opts) {
+  const workspaceMode = opts.workspaceRequested;
   console.log('');
   console.log('Install complete.');
   console.log('');
   if (workspaceMode) {
-    console.log('VSCode workspace mode is ready.');
+    console.log(`${opts.channel} ${opts.scope} mode is ready.`);
     console.log('');
     console.log('Generated project files:');
-    console.log('  .\\.mcp.json');
-    console.log('  .\\.claude\\skills\\xiaohongshu-trend-intelligence\\SKILL.md');
-    console.log('  .\\.claude\\skills\\douyin-trend-intelligence\\SKILL.md');
-    console.log('  .\\.claude\\skills\\voc-issue-pool\\SKILL.md');
-    console.log('  .\\.claude\\skills\\voc-problem-deep-dive\\SKILL.md');
-    console.log('  .\\.claude\\skills\\voc-content-plan\\SKILL.md');
-    console.log('  .\\.claude\\skills\\voc-speaking-script\\SKILL.md');
-    console.log('  .\\.claude\\skills\\voc-competitor-map\\SKILL.md');
-    console.log('  .\\.claude\\skills\\voc-business-workflow\\SKILL.md');
-    console.log('  .\\.claude\\skills\\fmode-image-analysis\\SKILL.md');
-    console.log('  .\\.claude\\plugins\\voc-intelligence');
+    console.log(`  ${targetDir}`);
     console.log('');
     console.log('Restart the VSCode Claude Code session if it was already open.');
   } else {
@@ -664,7 +862,7 @@ function printNextSteps(targetDir) {
   console.log(`Install target: ${targetDir}`);
 }
 
-function install(opts) {
+async function install(opts) {
   checkNodeVersion();
   if (path.resolve(SOURCE_ROOT) !== path.resolve(opts.target)) {
     if (fs.existsSync(opts.target)) {
@@ -680,7 +878,7 @@ function install(opts) {
 
   assertInstalled(opts.target);
   writeMcpConfig(opts.target);
-  writeWorkspaceActivation(opts.target);
+  writeWorkspaceActivation(opts.target, opts);
 
   if (!opts.skipInstall) {
     console.log('Installing runtime dependencies...');
@@ -694,7 +892,11 @@ function install(opts) {
     run(process.execPath, ['install.js', '--check', '--no-next'], opts.target);
   }
 
-  printNextSteps(opts.target);
+  if (opts.activate) {
+    persistNeutralCredential();
+    await verifyVocToolDiscovery(opts.target);
+  }
+  printNextSteps(opts.target, opts);
 }
 
 function check(opts) {
@@ -716,7 +918,7 @@ function printPath(opts) {
   }
 }
 
-function main() {
+async function main() {
   const directCommand = process.argv[2];
   if (directCommand === 'image' || directCommand === 'fmode-image') {
     run(process.execPath, ['mcp/src/tools/fmode-image-analysis.js', ...process.argv.slice(3)], SOURCE_ROOT);
@@ -728,17 +930,33 @@ function main() {
     console.log(usage());
     return;
   }
-  if (opts.command === 'install') return install(opts);
+  if (opts.command === 'install') {
+    await install(opts);
+    if (opts.activate) {
+      await ensureActivated({ channel: opts.channel });
+    }
+    return;
+  }
   if (opts.command === 'check') return check(opts);
   if (opts.command === 'smoke') return smoke(opts);
   if (opts.command === 'path') return printPath(opts);
   throw new Error(`Unknown command: ${opts.command}\n\n${usage()}`);
 }
 
-try {
-  main();
-} catch (error) {
-  console.error('');
-  console.error(`claude-voc failed: ${error.message}`);
-  process.exit(1);
+if (require.main === module) {
+  main().catch((error) => {
+    console.error('');
+    console.error(`claude-voc failed: ${error.message}`);
+    process.exit(1);
+  });
 }
+
+module.exports = {
+  parseArgs,
+  normalizeInstallChannel,
+  normalizeInstallScope,
+  defaultTargetFor,
+  upsertCodexProjectMcp,
+  verifyVocToolDiscovery,
+  persistNeutralCredential
+};

package/mcp/src/core/activation.js

@@ -0,0 +1,104 @@
+'use strict';
+
+// 安装收尾激活检查（仅供外部 AI IDE 渠道的 `workspace --activate` 调用）。
+//
+// 设计要点（与 voc-api-catalog 计费链一致，复用同一套凭证解析，绝不另建路径）：
+// - 复用 credentials.js 的 readNewApiToken()（sk- 主链）/ readVocToken()（r: 会话回退）。
+// - 按「是否已有可用 token」这一状态触发，而不是按命令触发：
+//     * 已检测到 token（飞马 UI 已写入，或 Claude Code 已配 sk-）→ 打印「✅ 已激活」，不弹浏览器。
+//     * 完全没有 token（现场新教练）→ 安装收尾立刻打开充值/登录页，避免进入取数流程后才弹、空耗 token。
+// - 不主动发计费请求做探测（探测会真扣费）；余额不足留给真实取数时由 catalog 的 402 分支处理。
+// - VOC_OPEN_PAYMENT=0 可强制关闭弹窗（CI / 冒烟 / 无头环境）。
+// - 始终把 URL 打印到终端兜底；并追加 &channel=&src=install 做渠道归因。
+// - token 绝不回显到终端 / 日志。
+
+const { spawn } = require('child_process');
+const { readNewApiToken, readVocToken } = require('./credentials');
+const { buildVocRechargeInfo } = require('./payment-links');
+
+function appendAttribution(rawUrl, channel, src) {
+  try {
+    const url = new URL(rawUrl);
+    if (channel) url.searchParams.set('channel', String(channel));
+    if (src) url.searchParams.set('src', String(src));
+    return url.toString();
+  } catch {
+    return rawUrl;
+  }
+}
+
+function openBrowser(url) {
+  try {
+    let command;
+    let args;
+    if (process.platform === 'win32') {
+      command = 'cmd';
+      // 空字符串是 start 的窗口标题占位，避免带引号的 URL 被当成标题
+      args = ['/d', '/s', '/c', 'start', '', url];
+    } else if (process.platform === 'darwin') {
+      command = 'open';
+      args = [url];
+    } else {
+      command = 'xdg-open';
+      args = [url];
+    }
+    const child = spawn(command, args, { stdio: 'ignore', detached: true });
+    child.on('error', () => {});
+    child.unref();
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+// channel: 渠道名（claude-code / codex / workbuddy），用于付费归因
+// src: 来源标记，默认 install
+async function ensureActivated({ channel = 'external', src = 'install' } = {}) {
+  if (process.env.VOC_OPEN_PAYMENT === '0') {
+    console.log('');
+    console.log('VOC_OPEN_PAYMENT=0：已跳过激活弹窗（CI/无头环境）。');
+    return { status: 'skipped' };
+  }
+
+  const newApiToken = readNewApiToken();
+  const vocToken = readVocToken();
+
+  if (newApiToken || vocToken) {
+    console.log('');
+    console.log('✅ 已激活：检测到 VOC 计费/会话 token，可直接开始取数，无需充值。');
+    console.log('（若取数时返回 402 余额不足，再按工具提示充值即可。）');
+    return { status: 'activated' };
+  }
+
+  // 完全没有 token：现场新用户。打开充值/登录页，引导先付费再进流程。
+  // 无 token 时 buildVocRechargeInfo 不会发起网络请求（resolveVocUserId 对空 token 直接返回）。
+  let recharge;
+  try {
+    recharge = await buildVocRechargeInfo({ token: '' });
+  } catch {
+    recharge = {};
+  }
+  const primaryUrl = appendAttribution(
+    recharge.recommendedPackageUrl || recharge.paymentUrl || 'https://app.fmode.cn/dev/apig-pay/',
+    channel,
+    src
+  );
+
+  console.log('');
+  console.log('⚠️  尚未检测到 VOC token —— 你还没有激活。');
+  console.log('为避免进入取数流程后才发现需要付费、白白消耗 token，请先在浏览器完成登录并充值/开通：');
+  console.log(`  ${primaryUrl}`);
+  if (recharge.paymentUrl) {
+    console.log(`  （充值入口：${appendAttribution(recharge.paymentUrl, channel, src)}）`);
+  }
+  console.log('完成付费后，再让 AI 进入取数/报告流程。');
+  console.log('如本机无法自动打开浏览器，请手动复制上面的链接到浏览器打开。');
+
+  const opened = openBrowser(primaryUrl);
+  if (!opened) {
+    console.log('（自动打开浏览器失败，请手动打开上面的链接。）');
+  }
+  return { status: 'needs_activation', url: primaryUrl };
+}
+
+module.exports = { ensureActivated, openBrowser, appendAttribution };

package/mcp/src/core/credentials.js

@@ -149,6 +149,7 @@ function readXiaohongshuToken(input = {}) {
 //   → Claude Code env（进程注入 + ~/.claude/settings.json）的 ANTHROPIC_AUTH_TOKEN（sk-、且 base 指向 fmode）。
 function readNewApiToken(input = {}) {
   const workspaceEnv = readEnvLocalFiles();
+  const vocMarketCreds = readJsonMaybe(path.join(os.homedir(), '.vocmarket', 'credentials.json'));
   const claudeCreds = readJsonMaybe(path.join(os.homedir(), '.claude', 'voc-credentials.json'));
   const fmodeConfig = readFmodeConfig();
   const claudeEnv = readClaudeSettingsEnv();
@@ -165,6 +166,9 @@ function readNewApiToken(input = {}) {
     process.env.NEW_API_TOKEN,
     process.env.FMODE_API_KEY,
     process.env.FMODE_API_TOKEN,
+    vocMarketCreds.fmodeApiKey,
+    vocMarketCreds.fmodeApiToken,
+    vocMarketCreds.newApiToken,
     claudeCreds.fmodeApiKey,
     claudeCreds.fmodeApiToken,
     fmodeConfig.newapiToken,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vocmarket/voc-skill",
-  "version": "0.3.29",
+  "version": "0.3.31",
   "description": "Claude Code VOC intelligence skills for Xiaohongshu and Douyin trend reports, live social VOC collection, Fmode image analysis, single-issue deep dives, boss/operator action plans, and multi-turn memory.",
   "type": "commonjs",
   "bin": {
@@ -29,7 +29,8 @@
     "voc:business-workflow": "node mcp/src/tools/voc-business-workflow-run.js --brand 示例品牌A --industry 家居定制 --platform douyin --collection-mode sample --keywords \"家居定制怎么选,第一次买怎么对比,售后\" --assistant-message-only",
     "mcp:start": "node mcp/src/server.js",
     "mcp:smoke": "node scripts/smoke-mcp.js",
-    "acceptance": "node scripts/acceptance.js"
+    "acceptance": "node scripts/acceptance.js",
+    "acceptance:installer": "node scripts/installer-acceptance.js"
   },
   "files": [
     ".claude-plugin/",

package/scripts/acceptance.js

@@ -13,6 +13,7 @@ function main() {
   run('npm', ['run', 'fmode:image:smoke'], ROOT);
   run('npm', ['run', 'smoke:package'], ROOT);
   run('npm', ['run', 'mcp:smoke'], ROOT);
+  run('npm', ['run', 'acceptance:installer'], ROOT);
   run('npm', ['pack', '--dry-run'], ROOT);
 
   const workspace = fs.mkdtempSync(path.join(os.tmpdir(), 'voc-workspace-install-'));

package/scripts/installer-acceptance.js

@@ -0,0 +1,79 @@
+#!/usr/bin/env node
+'use strict';
+
+const assert = require('assert');
+const fs = require('fs');
+const os = require('os');
+const path = require('path');
+const {
+  parseArgs,
+  normalizeInstallChannel,
+  normalizeInstallScope,
+  upsertCodexProjectMcp,
+  verifyVocToolDiscovery,
+  persistNeutralCredential
+} = require('../bin/claude-voc');
+
+async function main() {
+  const tempRoot = fs.mkdtempSync(path.join(os.tmpdir(), 'voc-installer-acceptance-'));
+  const targetDir = path.join(tempRoot, '.codex', 'plugins', 'voc-intelligence');
+  const configDir = path.join(tempRoot, '.codex');
+  const configPath = path.join(configDir, 'config.toml');
+  const credentialsPath = path.join(tempRoot, '.vocmarket', 'credentials.json');
+  const previousToken = process.env.FMODE_API_KEY;
+
+  try {
+    assert.strictEqual(normalizeInstallChannel('CODEX'), 'codex');
+    assert.strictEqual(normalizeInstallScope('codex', 'global'), 'global');
+    assert.strictEqual(normalizeInstallScope('workbuddy', 'global'), 'project');
+
+    const options = parseArgs(['workspace', '--activate', '--channel=codex', '--scope=global']);
+    assert.strictEqual(options.activate, true);
+    assert.strictEqual(options.smoke, false);
+    assert.strictEqual(options.channel, 'codex');
+    assert.strictEqual(options.scope, 'global');
+
+    fs.mkdirSync(configDir, { recursive: true });
+    fs.writeFileSync(configPath, [
+      'model = "gpt-test"',
+      '',
+      '[mcp_servers.existing]',
+      'command = "existing-command"',
+      '',
+      '[mcp_servers.voc]',
+      'command = "old-command"',
+      ''
+    ].join('\n'));
+    upsertCodexProjectMcp(targetDir, tempRoot);
+    const config = fs.readFileSync(configPath, 'utf8');
+    assert.match(config, /model = "gpt-test"/);
+    assert.match(config, /\[mcp_servers\.existing]/);
+    assert.strictEqual((config.match(/\[mcp_servers\.voc]/g) || []).length, 1);
+    assert.ok(config.includes('mcp\\\\src\\\\server.js') || config.includes('mcp/src/server.js'));
+
+    process.env.FMODE_API_KEY = 'sk-installer_acceptance-123456789';
+    assert.strictEqual(persistNeutralCredential(credentialsPath), true);
+    const credentials = JSON.parse(fs.readFileSync(credentialsPath, 'utf8'));
+    assert.strictEqual(credentials.fmodeApiKey, process.env.FMODE_API_KEY);
+
+    const tools = await verifyVocToolDiscovery(path.resolve(__dirname, '..'));
+    assert.ok(tools.includes('voc_api_search'));
+    assert.ok(tools.includes('voc_api_doc'));
+    assert.ok(tools.includes('voc_api_call'));
+
+    console.log(JSON.stringify({
+      status: 'ok',
+      checks: ['channels', 'no-smoke activation', 'Codex TOML merge', 'neutral credentials', 'MCP ListTools'],
+      discoveredTools: tools
+    }, null, 2));
+  } finally {
+    if (previousToken === undefined) delete process.env.FMODE_API_KEY;
+    else process.env.FMODE_API_KEY = previousToken;
+    fs.rmSync(tempRoot, { recursive: true, force: true });
+  }
+}
+
+main().catch(error => {
+  console.error(error.message);
+  process.exit(1);
+});

package/skill-package-manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-code-voc-intelligence",
-  "version": "0.3.29",
+  "version": "0.3.31",
   "capabilities": {
     "summary": "三类情报源同源接入：①社媒内容 ②国内电商+创作者情报 ③海外选品。统一 search→doc→call、鉴权计费一致。",
     "channels": [
@@ -123,4 +123,4 @@
   "workspaceInstallCommand": "npx @vocmarket/voc-skill workspace --smoke",
   "workspaceInstallTarget": ".claude/plugins/voc-intelligence",
   "installHint": "Supports three delivery modes: unzip and run node install.js, install globally into ~/.claude/plugins/voc-intelligence, or install into the current workspace. Workspace mode writes .mcp.json plus .claude/skills/* entries for trend intelligence, issue pool, deep dive, competitor map, content plan, speaking script, VOC business workflow, and Fmode image analysis so VSCode Claude Code can discover the workflows without relying only on --plugin-dir."
-}
+}