yuanflow-cli 0.1.2 → 0.1.4

package/README.md

@@ -35,9 +35,11 @@ yuanflow-cli list douyin
 环境变量：
 
 ```bash
-YUANFLOW_TOKEN=<你的令牌>
+YUANCHUANG_API_TOKEN=<你的令牌>
 ```
 
+token 优先级：`--token` > `YUANCHUANG_API_TOKEN` > 本地 `config.token`。独立 CLI 用户可以使用环境变量或 `config set-token`；在 YuanFlow 主程序内使用时，token 由主程序认证系统注入，不需要手动配置。
+
 ## Skill 安装器
 
 ```bash

package/lib/skill-installer/agents.cjs

@@ -22,8 +22,15 @@ function defaultExists(targetPath) {
   return fs.existsSync(targetPath);
 }
 
+function joinTargetPath(baseDir, ...segments) {
+  if (typeof baseDir === 'string' && baseDir.startsWith('/')) {
+    return path.posix.join(baseDir, ...segments);
+  }
+  return path.join(baseDir, ...segments);
+}
+
 function getConfigHome(homeDir, env) {
-  return (env && env.XDG_CONFIG_HOME) || path.join(homeDir, '.config');
+  return (env && env.XDG_CONFIG_HOME) || joinTargetPath(homeDir, '.config');
 }
 
 function getCanonicalSkillsDir({
@@ -37,117 +44,117 @@ function getCanonicalSkillsDir({
 
 function buildAgentDefinitions({ homeDir = os.homedir(), env = process.env } = {}) {
   const configHome = getConfigHome(homeDir, env);
-  const codexHome = (env.CODEX_HOME || '').trim() || path.join(homeDir, '.codex');
-  const claudeHome = (env.CLAUDE_CONFIG_DIR || '').trim() || path.join(homeDir, '.claude');
+  const codexHome = (env.CODEX_HOME || '').trim() || joinTargetPath(homeDir, '.codex');
+  const claudeHome = (env.CLAUDE_CONFIG_DIR || '').trim() || joinTargetPath(homeDir, '.claude');
 
   return {
     codex: {
       name: 'codex',
       displayName: 'Codex',
       projectSkillsDir: '.agents/skills',
-      globalSkillsDir: path.join(codexHome, 'skills'),
+      globalSkillsDir: joinTargetPath(codexHome, 'skills'),
       markers: [codexHome],
     },
     'claude-code': {
       name: 'claude-code',
       displayName: 'Claude Code',
       projectSkillsDir: '.claude/skills',
-      globalSkillsDir: path.join(claudeHome, 'skills'),
+      globalSkillsDir: joinTargetPath(claudeHome, 'skills'),
       markers: [claudeHome],
     },
     cursor: {
       name: 'cursor',
       displayName: 'Cursor',
       projectSkillsDir: '.agents/skills',
-      globalSkillsDir: path.join(homeDir, '.cursor', 'skills'),
-      markers: [path.join(homeDir, '.cursor')],
+      globalSkillsDir: joinTargetPath(homeDir, '.cursor', 'skills'),
+      markers: [joinTargetPath(homeDir, '.cursor')],
     },
     trae: {
       name: 'trae',
       displayName: 'Trae',
       projectSkillsDir: '.trae/skills',
-      globalSkillsDir: path.join(homeDir, '.trae', 'skills'),
-      markers: [path.join(homeDir, '.trae')],
+      globalSkillsDir: joinTargetPath(homeDir, '.trae', 'skills'),
+      markers: [joinTargetPath(homeDir, '.trae')],
     },
     opencode: {
       name: 'opencode',
       displayName: 'OpenCode',
       projectSkillsDir: '.agents/skills',
-      globalSkillsDir: path.join(configHome, 'opencode', 'skills'),
-      markers: [path.join(configHome, 'opencode')],
+      globalSkillsDir: joinTargetPath(configHome, 'opencode', 'skills'),
+      markers: [joinTargetPath(configHome, 'opencode')],
     },
     'github-copilot': {
       name: 'github-copilot',
       displayName: 'GitHub Copilot',
       projectSkillsDir: '.agents/skills',
-      globalSkillsDir: path.join(homeDir, '.copilot', 'skills'),
-      markers: [path.join(homeDir, '.copilot')],
+      globalSkillsDir: joinTargetPath(homeDir, '.copilot', 'skills'),
+      markers: [joinTargetPath(homeDir, '.copilot')],
     },
     'gemini-cli': {
       name: 'gemini-cli',
       displayName: 'Gemini CLI',
       projectSkillsDir: '.agents/skills',
-      globalSkillsDir: path.join(homeDir, '.gemini', 'skills'),
-      markers: [path.join(homeDir, '.gemini')],
+      globalSkillsDir: joinTargetPath(homeDir, '.gemini', 'skills'),
+      markers: [joinTargetPath(homeDir, '.gemini')],
     },
     'kimi-cli': {
       name: 'kimi-cli',
       displayName: 'Kimi Code CLI',
       projectSkillsDir: '.agents/skills',
-      globalSkillsDir: path.join(configHome, 'agents', 'skills'),
-      markers: [path.join(homeDir, '.kimi')],
+      globalSkillsDir: joinTargetPath(configHome, 'agents', 'skills'),
+      markers: [joinTargetPath(homeDir, '.kimi')],
     },
     windsurf: {
       name: 'windsurf',
       displayName: 'Windsurf',
       projectSkillsDir: '.windsurf/skills',
-      globalSkillsDir: path.join(homeDir, '.codeium', 'windsurf', 'skills'),
-      markers: [path.join(homeDir, '.codeium', 'windsurf')],
+      globalSkillsDir: joinTargetPath(homeDir, '.codeium', 'windsurf', 'skills'),
+      markers: [joinTargetPath(homeDir, '.codeium', 'windsurf')],
     },
     openclaw: {
       name: 'openclaw',
       displayName: 'OpenClaw',
       projectSkillsDir: 'skills',
-      globalSkillsDir: path.join(homeDir, '.openclaw', 'skills'),
+      globalSkillsDir: joinTargetPath(homeDir, '.openclaw', 'skills'),
       markers: [
-        path.join(homeDir, '.openclaw'),
-        path.join(homeDir, '.clawdbot'),
-        path.join(homeDir, '.moltbot'),
+        joinTargetPath(homeDir, '.openclaw'),
+        joinTargetPath(homeDir, '.clawdbot'),
+        joinTargetPath(homeDir, '.moltbot'),
       ],
       resolveGlobalSkillsDir(currentHomeDir, exists = defaultExists) {
-        if (exists(path.join(currentHomeDir, '.openclaw'))) {
-          return path.join(currentHomeDir, '.openclaw', 'skills');
+        if (exists(joinTargetPath(currentHomeDir, '.openclaw'))) {
+          return joinTargetPath(currentHomeDir, '.openclaw', 'skills');
         }
-        if (exists(path.join(currentHomeDir, '.clawdbot'))) {
-          return path.join(currentHomeDir, '.clawdbot', 'skills');
+        if (exists(joinTargetPath(currentHomeDir, '.clawdbot'))) {
+          return joinTargetPath(currentHomeDir, '.clawdbot', 'skills');
         }
-        if (exists(path.join(currentHomeDir, '.moltbot'))) {
-          return path.join(currentHomeDir, '.moltbot', 'skills');
+        if (exists(joinTargetPath(currentHomeDir, '.moltbot'))) {
+          return joinTargetPath(currentHomeDir, '.moltbot', 'skills');
         }
 
-        return path.join(currentHomeDir, '.openclaw', 'skills');
+        return joinTargetPath(currentHomeDir, '.openclaw', 'skills');
       },
     },
     'trae-cn': {
       name: 'trae-cn',
       displayName: 'Trae CN',
       projectSkillsDir: '.trae/skills',
-      globalSkillsDir: path.join(homeDir, '.trae-cn', 'skills'),
-      markers: [path.join(homeDir, '.trae-cn')],
+      globalSkillsDir: joinTargetPath(homeDir, '.trae-cn', 'skills'),
+      markers: [joinTargetPath(homeDir, '.trae-cn')],
     },
     qoder: {
       name: 'qoder',
       displayName: 'Qoder',
       projectSkillsDir: '.qoder/skills',
-      globalSkillsDir: path.join(homeDir, '.qoder', 'skills'),
-      markers: [path.join(homeDir, '.qoder')],
+      globalSkillsDir: joinTargetPath(homeDir, '.qoder', 'skills'),
+      markers: [joinTargetPath(homeDir, '.qoder')],
     },
     'qwen-code': {
       name: 'qwen-code',
       displayName: 'Qwen Code',
       projectSkillsDir: '.qwen/skills',
-      globalSkillsDir: path.join(homeDir, '.qwen', 'skills'),
-      markers: [path.join(homeDir, '.qwen')],
+      globalSkillsDir: joinTargetPath(homeDir, '.qwen', 'skills'),
+      markers: [joinTargetPath(homeDir, '.qwen')],
     },
   };
 }

package/lib/skill-installer/repo-source.cjs

@@ -90,27 +90,20 @@ function resolveRepositoryRoot(extractDir) {
 }
 
 function resolveLocalSkillRoot(packageRoot) {
+  const localRoot = path.resolve(packageRoot, '..', 'YuanFlow-skill');
+  if (fs.existsSync(path.join(localRoot, 'SKILL.md'))) {
+    return localRoot;
+  }
+
   const packagedRoot = path.resolve(packageRoot, 'skills', 'yuanflow-skill');
   if (fs.existsSync(path.join(packagedRoot, 'SKILL.md'))) {
     return packagedRoot;
   }
 
-  const localRoot = path.resolve(packageRoot, '..', 'YuanFlow-skill');
-  if (fs.existsSync(path.join(localRoot, 'SKILL.md'))) {
-    return localRoot;
-  }
   return '';
 }
 
 async function prepareSkillSource({ packageRoot }) {
-  const localRoot = resolveLocalSkillRoot(packageRoot);
-  if (localRoot) {
-    return {
-      sourceRoot: localRoot,
-      cleanup() {},
-    };
-  }
-
   const repoConfig = readRepositoryConfig(packageRoot);
   const tempRoot = fs.mkdtempSync(path.join(os.tmpdir(), 'yuanflow-skill-'));
   const archiveFile = path.join(tempRoot, `${repoConfig.repo}-${repoConfig.ref}.tar.gz`);
@@ -138,6 +131,15 @@ async function prepareSkillSource({ packageRoot }) {
       cloneRepository({ repoConfig, targetDir: cloneDir });
       sourceRoot = resolveRepositoryRoot(cloneDir);
     } catch (gitError) {
+      const localRoot = resolveLocalSkillRoot(packageRoot);
+      if (localRoot) {
+        fs.rmSync(tempRoot, { recursive: true, force: true });
+        return {
+          sourceRoot: localRoot,
+          cleanup() {},
+        };
+      }
+
       const archiveMessage = archiveError instanceof Error ? archiveError.message : String(archiveError);
       const gitMessage = gitError instanceof Error ? gitError.message : String(gitError);
       throw new Error(`下载 skill 仓库失败。archive: ${archiveMessage}; git: ${gitMessage}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yuanflow-cli",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "YuanFlow API CLI and skill installer for supported AI coding agents.",
   "type": "module",
   "license": "MIT",

package/skills/yuanflow-skill/SKILL.md

@@ -14,6 +14,16 @@ description: Use when the user asks about social-media API workflows, platform d
 - 根目录这一份 `SKILL.md`
 - `yuanflow-cli/`
 
+## 环境判断
+
+执行本 Skill 前，先判断当前运行环境：
+
+1. 如果当前 Agent 可用 YuanFlow 内置工具，例如 `yuanflow_cli_call` 或 `yuanflow_gateway_request`，优先使用 YuanFlow 内置工具。不要要求用户安装 npm，也不要要求用户配置 token。
+2. 如果当前不在 YuanFlow 内，且本地可执行 `yuanflow-cli --help`，使用本地 CLI。
+3. 如果当前不在 YuanFlow 内，且本地没有 `yuanflow-cli`，再提示用户安装 `npm install -g yuanflow-cli`。
+
+不要在回复、日志或文件中暴露 token。
+
 ## 分流规则
 
 ### 1. 走 `yuanflow-cli`

package/skills/yuanflow-skill/yuanflow-cli/SKILL.md

@@ -17,7 +17,19 @@ description: Use when the user needs atomic API calls for social-media platforms
 - 用户要用 CLI 调接口并保存 JSON
 - 用户要让 Agent 稳定解析调用结果
 
-## 安装和更新
+## 调用方式选择
+
+优先级如下：
+
+1. YuanFlow 内置工具：如果当前工具列表里存在 `yuanflow_cli_call`，使用它调用社媒接口。
+2. YuanFlow 网关工具：如果只有 `yuanflow_gateway_request`，可用它访问受控服务接口。
+3. 本地 CLI：如果当前环境可执行 `yuanflow-cli --help`，使用本地 CLI。
+4. 安装提示：只有以上都不可用时，才提示用户安装 `npm install -g yuanflow-cli`。
+
+在 YuanFlow 主程序内，不要提示用户配置 token；token 由主程序 KEY 认证注入。
+在外部 Agent 环境中，使用环境变量 `YUANCHUANG_API_TOKEN`，也可以使用本地 `config set-token`。
+
+## 外部 Agent 安装和更新
 
 要求 Node.js 20 或更高版本。
 
@@ -44,7 +56,13 @@ npm view yuanflow-cli version
 yuanflow-cli --help
 ```
 
-## 配置
+## 外部 Agent 配置
+
+独立 CLI 使用时，可以通过环境变量或本地 config 保存 token。token 优先级是：`--token` > `YUANCHUANG_API_TOKEN` > 本地 `config.token`。
+
+```powershell
+$env:YUANCHUANG_API_TOKEN="<你的令牌>"
+```
 
 保存 Yuan API 令牌和服务地址：
 
@@ -63,13 +81,13 @@ yuanflow-cli douyin video-detail "https://v.douyin.com/xxx/" --token <你的令
 或用环境变量：
 
 ```powershell
-$env:YUANFLOW_TOKEN="<你的令牌>"
+$env:YUANCHUANG_API_TOKEN="<你的令牌>"
 yuanflow-cli douyin hot-search
 ```
 
 ## Agent 调用规则
 
-给 AI Agent 使用时，先查命令和 schema，再调用接口。
+给 AI Agent 使用时，先查命令和 schema，再调用接口。YuanFlow 内置环境下，优先调用 `yuanflow_cli_call`；外部 Agent 环境下，优先调用 `yuanflow-cli`。
 
 ```powershell
 yuanflow-cli commands list
@@ -205,3 +223,4 @@ yuanflow-cli bilibili video-detail "https://www.bilibili.com/video/BVxxx" -o bil
 - 调真实接口前，先用 `--dry-run` 核对 URL、method、headers 和 body。
 - Agent 自动处理结果时，统一加 `--format agent-json`。
 - 不要把 token 写进文档、日志或最终回复。
+- 不要要求用户提供或粘贴 token。

package/src/cli.js

@@ -367,6 +367,8 @@ function printHelp() {
 
 说明：
   所有请求都会调用 Yuan API 的 /social/*path，并使用 Authorization: Bearer <token>。
+  token 优先级：--token > YUANCHUANG_API_TOKEN > 本地 config.token。
+  YuanFlow 主程序内使用时，token 由主程序认证系统注入，不需要手动配置。
   AI Agent 推荐使用 --format agent-json 获取稳定 JSON 外壳。
 `);
 }

package/src/request.js

@@ -5,14 +5,14 @@ import { findEndpointByPath, normalizeSocialPath } from './registry.js';
 export async function callEndpoint(socialPath, options = {}) {
   const config = await readConfig();
   const baseUrl = cleanBaseUrl(options.baseUrl || config.baseUrl);
-  const token = options.token || config.token || process.env.YUANFLOW_TOKEN || '';
+  const token = options.token || process.env.YUANCHUANG_API_TOKEN || config.token || '';
   const normalizedPath = normalizeSocialPath(socialPath);
   const endpoint = findEndpointByPath(normalizedPath);
   const method = options.method || endpoint?.method || 'POST';
   const url = new URL(`/social${normalizedPath}`, baseUrl);
 
   if (!token) {
-    throw new Error('缺少 token。请先执行 yuanflow-cli config set-token <你的令牌>');
+    throw new Error('缺少 token。请设置 YUANCHUANG_API_TOKEN，或执行 yuanflow-cli config set-token <你的令牌>');
   }
 
   const body = await resolveBody(options);