skill-market-cli 1.0.1 → 1.1.0

package/src/commands/update.js

@@ -28,6 +28,7 @@ async function update(skillId, options) {
     let description = options.description || existingSkill.purpose;
     let tags = options.tags ? options.tags.split(',').map(t => t.trim()) : existingSkill.tags;
     let usageExamples = existingSkill.usageExamples || [];
+    let model = options.model || existingSkill.model;
 
     // 如果提供了文件，读取新的 SKILL.md
     if (options.file) {
@@ -79,15 +80,43 @@ async function update(skillId, options) {
       return;
     }
 
-    // 执行更新
-    console.log(chalk.blue('\n📤 Updating...\n'));
+    // 执行更新（走后端 /skill/ai/update：全字段非空、tags 与 usageExamples 不可为空数组）
+    console.log(chalk.blue('\n正在更新…\n'));
+
+    const tagsFinal =
+      Array.isArray(tags) && tags.length > 0
+        ? tags.map((t) => String(t).trim()).filter(Boolean)
+        : ['general'];
+    const modelFinal =
+      model && String(model).trim() ? String(model).trim() : 'deepseek-chat';
+    const rootUrlFinal =
+      existingSkill.rootUrl && String(existingSkill.rootUrl).trim()
+        ? String(existingSkill.rootUrl).trim()
+        : 'https://example.com/SKILL.md';
+
+    if (!usageExamples || usageExamples.length === 0) {
+      console.error(
+        chalk.red(
+          '当前 Skill 没有用法示例（usageExamples），AI 渠道更新要求至少一条示例。请先在网页中补充后再试。'
+        )
+      );
+      process.exit(1);
+    }
+    const examplesOk = usageExamples.every(
+      (ex) => ex && String(ex.prompt || '').trim()
+    );
+    if (!examplesOk) {
+      console.error(chalk.red('存在空的用法示例 prompt，请修正后再试。'));
+      process.exit(1);
+    }
 
     const data = {
-      name,
-      purpose: description,
-      rootUrl: existingSkill.rootUrl,
-      tags,
-      usageExamples
+      name: String(name).trim(),
+      purpose: String(description).trim(),
+      rootUrl: rootUrlFinal,
+      tags: tagsFinal,
+      usageExamples,
+      model: modelFinal
     };
 
     const response = await apiClient.updateSkill(skillId, data);

package/src/commands/upload.js

@@ -2,174 +2,298 @@ const fs = require('fs-extra');
 const path = require('path');
 const chalk = require('chalk');
 const inquirer = require('inquirer');
-const YAML = require('yaml');
 const { isLoggedIn } = require('../auth/token-store');
 const apiClient = require('../api/client');
+const { runExampleAndCollect } = require('../lib/run-example-collect');
+const {
+  parseSkillMarkdown,
+  loadDotSkillExamples,
+  promptOnlyExamples
+} = require('../lib/skill-upload-helpers');
 
-async function upload(skillPath, options) {
+/**
+ * 交互补全：名称、描述、标签、模型、rootUrl、用户案例 + 可选运行采集轨迹
+ */
+async function upload(skillPath, options = {}) {
   if (!isLoggedIn()) {
-    console.error(chalk.red('❌ Please login first: skill-market-cli login\n'));
+    console.error(chalk.red('请先登录：skill-market-cli login\n'));
     process.exit(1);
   }
 
-  // 检查路径
   if (!fs.existsSync(skillPath)) {
-    console.error(chalk.red(`❌ Path not found: ${skillPath}`));
+    console.error(chalk.red(`路径不存在：${skillPath}`));
     process.exit(1);
   }
 
-  // 确定 SKILL.md 文件路径
   let skillFilePath;
   const stats = fs.statSync(skillPath);
-  
   if (stats.isDirectory()) {
     skillFilePath = path.join(skillPath, 'SKILL.md');
     if (!fs.existsSync(skillFilePath)) {
-      console.error(chalk.red(`❌ SKILL.md not found in directory: ${skillPath}`));
+      console.error(chalk.red(`目录中未找到 SKILL.md：${skillPath}`));
       process.exit(1);
     }
   } else {
     skillFilePath = skillPath;
   }
 
-  console.log(chalk.blue('📖 Reading SKILL.md...\n'));
-  
-  // 读取并解析 SKILL.md
+  const skillDir = path.dirname(skillFilePath);
+  console.log(chalk.gray(`读取：${skillFilePath}\n`));
+
   const skillContent = fs.readFileSync(skillFilePath, 'utf-8');
-  const { frontmatter, examples } = parseSkillFile(skillContent);
+  const { frontmatter, examples: examplesFromMd } = parseSkillMarkdown(skillContent);
 
-  // 收集信息
   let name = options.name || frontmatter?.name;
-  let description = options.description || frontmatter?.purpose || frontmatter?.description;
-  let tags = options.tags ? options.tags.split(',').map(t => t.trim()) : (frontmatter?.tags || []);
+  let description =
+    options.description || frontmatter?.purpose || frontmatter?.description;
+  let tags = options.tags
+    ? options.tags.split(',').map((t) => t.trim())
+    : frontmatter?.tags || [];
   let model = options.model || frontmatter?.model;
   let rootUrl = frontmatter?.rootUrl;
 
-  // 如果缺少必要信息，询问用户
-  const questions = [];
-  
-  if (!name) {
-    questions.push({
-      type: 'input',
-      name: 'name',
-      message: 'Skill name:',
-      validate: input => input.length > 0 || 'Name is required'
-    });
+  const fromJson = loadDotSkillExamples(skillDir);
+  let usageExamples = fromJson;
+
+  if (!usageExamples || usageExamples.length === 0) {
+    const raw = promptOnlyExamples(examplesFromMd);
+    if (raw.length > 0) {
+      usageExamples = raw.map((ex) => ({
+        prompt: ex.prompt,
+        aiResponses: ex.aiResponses || [],
+        model: ex.model || model || ''
+      }));
+    }
   }
-  
-  if (!description) {
-    questions.push({
-      type: 'input',
-      name: 'description',
-      message: 'Purpose/Description:',
-      validate: input => input.length > 0 || 'Description is required'
-    });
+
+  const needName = !name || !String(name).trim();
+  const needDesc = !description || !String(description).trim();
+  if (needName || needDesc) {
+    const answers = await inquirer.prompt(
+      [
+        needName && {
+          type: 'input',
+          name: 'name',
+          message: 'Skill 名称（必填）：',
+          validate: (input) => (input && String(input).trim() ? true : '不能为空')
+        },
+        needDesc && {
+          type: 'input',
+          name: 'description',
+          message: '用途 / 描述（必填）：',
+          validate: (input) => (input && String(input).trim() ? true : '不能为空')
+        }
+      ].filter(Boolean)
+    );
+    if (answers.name) name = answers.name;
+    if (answers.description) description = answers.description;
   }
 
-  if (questions.length > 0) {
-    const answers = await inquirer.prompt(questions);
-    name = name || answers.name;
-    description = description || answers.description;
+  // 模型默认值（用于采集与提交）
+  if (!model || !String(model).trim()) {
+    const { m } = await inquirer.prompt([
+      {
+        type: 'input',
+        name: 'm',
+        message: '推荐模型（用于案例采集与提交，建议与线上一致）：',
+        default: 'deepseek-chat'
+      }
+    ]);
+    model = m || 'deepseek-chat';
   }
 
-  // 如果没有 examples，询问是否运行案例采集
-  let usageExamples = examples;
-  if (!usageExamples || usageExamples.length === 0) {
-    const { runExamples } = await inquirer.prompt([{
-      type: 'confirm',
-      name: 'runExamples',
-      message: 'No usage examples found. Do you want to run example collection now?',
-      default: true
-    }]);
-
-    if (runExamples) {
-      console.log(chalk.gray('\nPlease run: skill-market-cli run-example ' + skillPath));
-      console.log(chalk.gray('Then upload again with the collected examples.\n'));
-      return;
-    }
+  const modelFinal = String(model).trim();
+
+  // 必须有至少一条「用户案例」且含轨迹：若无则交互式收集
+  usageExamples = await ensureUsageExamplesWithTrace({
+    initial: usageExamples,
+    model: modelFinal
+  });
+
+  if (!tags || tags.length === 0) {
+    const { tagStr } = await inquirer.prompt([
+      {
+        type: 'input',
+        name: 'tagStr',
+        message: '标签（逗号分隔，至少一个）：',
+        default: 'general',
+        validate: (input) =>
+          input && String(input).trim() ? true : '至少填写一个标签'
+      }
+    ]);
+    tags = tagStr.split(',').map((t) => t.trim()).filter(Boolean);
+  }
+
+  if (!rootUrl || !String(rootUrl).trim()) {
+    const { ru } = await inquirer.prompt([
+      {
+        type: 'input',
+        name: 'ru',
+        message: 'SKILL 根资源 URL（可填 GitHub raw 或本地文件）：',
+        default: `file://${path.resolve(skillFilePath)}`
+      }
+    ]);
+    rootUrl = ru || `file://${path.resolve(skillFilePath)}`;
   }
 
-  // 确认上传
-  console.log(chalk.gray('\n--- Upload Summary ---'));
-  console.log(`Name: ${chalk.bold(name)}`);
-  console.log(`Description: ${description}`);
-  console.log(`Tags: ${tags.join(', ') || 'none'}`);
-  console.log(`Model: ${model || 'not specified'}`);
-  console.log(`Examples: ${usageExamples?.length || 0}`);
-  console.log();
+  console.log(chalk.gray('\n--- 上传摘要 ---'));
+  console.log(`名称：${chalk.bold(name)}`);
+  console.log(`描述：${description}`);
+  console.log(`标签：${tags.join(', ')}`);
+  console.log(`模型：${modelFinal}`);
+  console.log(`rootUrl：${rootUrl}`);
+  console.log(`案例条数：${usageExamples.length}（每条含 prompt + 轨迹）`);
+  console.log('');
 
-  const { confirm } = await inquirer.prompt([{
-    type: 'confirm',
-    name: 'confirm',
-    message: 'Upload this skill?',
-    default: true
-  }]);
+  let confirm = options.yes === true;
+  if (!confirm) {
+    const ans = await inquirer.prompt([
+      {
+        type: 'confirm',
+        name: 'confirm',
+        message: '确认提交到 Skill Market？',
+        default: true
+      }
+    ]);
+    confirm = ans.confirm;
+  }
 
   if (!confirm) {
-    console.log(chalk.yellow('Upload cancelled.\n'));
+    console.log(chalk.yellow('已取消上传。\n'));
     return;
   }
 
-  // 上传
+  // 写入 .skill-examples.json 便于复查与再次上传
+  try {
+    const outPath = path.join(skillDir, '.skill-examples.json');
+    fs.writeJsonSync(
+      outPath,
+      {
+        model: modelFinal,
+        examples: usageExamples.map((e) => ({
+          prompt: e.prompt,
+          aiResponses: e.aiResponses,
+          model: e.model || modelFinal
+        }))
+      },
+      { spaces: 2 }
+    );
+    console.log(chalk.gray(`已保存本地示例与轨迹：${outPath}`));
+  } catch {
+    // ignore
+  }
+
   try {
-    console.log(chalk.blue('\n📤 Uploading...\n'));
+    console.log(chalk.gray('\n正在上传…\n'));
 
+    const tagsFinal = tags.map((t) => String(t).trim()).filter(Boolean);
     const data = {
-      name,
-      purpose: description,
-      rootUrl: rootUrl || '',
-      tags,
-      usageExamples: usageExamples || [],
-      model
+      name: String(name).trim(),
+      purpose: String(description).trim(),
+      rootUrl: String(rootUrl).trim(),
+      tags: tagsFinal,
+      usageExamples,
+      model: modelFinal
     };
 
     const response = await apiClient.uploadSkill(data);
 
     if (response.code === 200) {
-      console.log(chalk.green('✅ Skill uploaded successfully!'));
-      console.log(chalk.cyan(`📝 Skill ID: ${response.data.id}`));
-      console.log();
+      console.log(chalk.green('上传成功'));
+      console.log(chalk.gray(`Skill ID：${response.data.id}`));
+      console.log('');
     } else {
-      console.error(chalk.red('❌ Upload failed:'), response.data || 'Unknown error');
+      console.error(chalk.red('上传失败：'), response.data || '未知错误');
       process.exit(1);
     }
   } catch (error) {
-    console.error(chalk.red('❌ Upload error:'), error.message);
+    console.error(chalk.red('上传出错：'), error.message);
     process.exit(1);
   }
 }
 
-// 解析 SKILL.md 文件
-function parseSkillFile(content) {
-  let frontmatter = null;
-  let examples = [];
-
-  // 解析 front matter
-  const frontmatterMatch = content.match(/^---\s*\n([\s\S]*?)\n---\s*(?:\n|$)/);
-  if (frontmatterMatch) {
-    try {
-      frontmatter = YAML.parse(frontmatterMatch[1]);
-    } catch (e) {
-      // 忽略解析错误
+/**
+ * 保证至少一条案例；若仅有 prompt 无轨迹，则询问是否运行采集
+ */
+async function ensureUsageExamplesWithTrace({ initial, model }) {
+  let list = Array.isArray(initial) ? [...initial] : [];
+
+  const hasTrace = (ex) =>
+    ex &&
+    ex.prompt &&
+    String(ex.prompt).trim() &&
+    Array.isArray(ex.aiResponses) &&
+    ex.aiResponses.length > 0;
+
+  const valid = list.filter((ex) => ex && String(ex.prompt || '').trim());
+  const allHaveTrace = valid.length > 0 && valid.every(hasTrace);
+
+  if (allHaveTrace) {
+    return valid.map((ex) => ({
+      prompt: String(ex.prompt).trim(),
+      aiResponses: ex.aiResponses,
+      model: ex.model || model
+    }));
+  }
+
+  if (valid.length > 0 && !allHaveTrace) {
+    console.log(chalk.gray('检测到 SKILL.md 中已有案例文本，但缺少轨迹。将逐条运行采集。\n'));
+    const out = [];
+    for (const ex of valid) {
+      const trace = await runExampleAndCollect(ex.prompt, model);
+      out.push({
+        prompt: String(ex.prompt).trim(),
+        aiResponses: trace,
+        model
+      });
     }
+    return out;
   }
 
-  // 解析 usage examples（如果文件中有）
-  const examplesMatch = content.match(/## Usage Examples?\s*\n([\s\S]*?)(?=##|$)/i);
-  if (examplesMatch) {
-    // 简单解析示例 - 可以根据实际格式改进
-    const exampleText = examplesMatch[1];
-    const exampleBlocks = exampleText.split(/\n\n+/).filter(b => b.trim());
-    
-    examples = exampleBlocks.map(block => {
-      const lines = block.split('\n').filter(l => l.trim());
-      return {
-        prompt: lines.join('\n')
-      };
+  console.log(
+    chalk.yellow(
+      '上传至 Skill Market 需要至少一条「用户案例」及对应采集轨迹（thinking / toolcall / message）。\n'
+    )
+  );
+
+  const collected = [];
+  let addMore = true;
+  while (addMore) {
+    const { promptText } = await inquirer.prompt([
+      {
+        type: 'input',
+        name: 'promptText',
+        message: '请输入一条用户测试案例（终端可多行请用 \\n 分段，或分多次添加）：',
+        validate: (input) =>
+          input && String(input).trim() ? true : '案例内容不能为空'
+      }
+    ]);
+
+    const aiResponses = await runExampleAndCollect(promptText.trim(), model);
+
+    collected.push({
+      prompt: promptText.trim(),
+      aiResponses,
+      model
     });
+
+    const { again } = await inquirer.prompt([
+      {
+        type: 'confirm',
+        name: 'again',
+        message: '是否再添加一条用户案例？',
+        default: false
+      }
+    ]);
+    addMore = again;
+  }
+
+  if (collected.length === 0) {
+    console.error(chalk.red('未提供任何用户案例，无法上传。'));
+    process.exit(1);
   }
 
-  return { frontmatter, examples };
+  return collected;
 }
 
 module.exports = upload;

package/src/config/server-modes.js

@@ -0,0 +1,43 @@
+const { setServerConfig, getConfig, saveConfig } = require('../auth/token-store');
+
+const SERVER_MODES = {
+  production: {
+    baseURL: 'https://kirigaya.cn',
+    apiBase: 'https://kirigaya.cn/api'
+  },
+  development: {
+    baseURL: 'http://localhost:8080',
+    apiBase: 'http://localhost:8080/api'
+  }
+};
+
+function normalizeMode(raw) {
+  if (raw == null || raw === '') return 'production';
+  const m = String(raw).toLowerCase().trim();
+  if (m === 'production' || m === 'prod') return 'production';
+  if (m === 'development' || m === 'dev') return 'development';
+  return null;
+}
+
+function applyServerMode(modeRaw) {
+  const mode = normalizeMode(modeRaw);
+  if (!mode) {
+    throw new Error(`无效的 --mode：「${modeRaw}」。请使用 production 或 development。`);
+  }
+  setServerConfig(SERVER_MODES[mode]);
+  const config = getConfig();
+  config.mode = mode;
+  saveConfig(config);
+  return mode;
+}
+
+function getServerModesHelp() {
+  return 'production (https://kirigaya.cn) | development (http://localhost:8080)';
+}
+
+module.exports = {
+  SERVER_MODES,
+  normalizeMode,
+  applyServerMode,
+  getServerModesHelp
+};

package/src/index.js

@@ -10,33 +10,61 @@ const update = require('./commands/update');
 const remove = require('./commands/delete');
 const runExample = require('./commands/run-example');
 const { getConfig } = require('./auth/token-store');
+const { applyServerMode, getServerModesHelp } = require('./config/server-modes');
+const apiClient = require('./api/client');
 
 const program = new Command();
 
 program
   .name('skill-market-cli')
-  .description('CLI tool for managing skills on Skill Market')
+  .description(`Skill Market 命令行：管理技能与登录
+
+全局网络（对所有子命令生效）：
+  --mode <环境>   ${getServerModesHelp()}
+                 未指定时优先使用 ~/.skill-market-cli/config.json 中保存的环境（登录后写入），否则为 production。
+
+示例：
+  skill-market-cli --mode development login
+  skill-market-cli login --mode development
+  node bin/skill-market-cli.js list --mode development`)
   .version(pkg.version, '-v, --version')
   .option('-c, --config <path>', 'config file path')
-  .hook('preAction', (thisCommand) => {
-    // 显示欢迎信息
-    const config = getConfig();
-    if (config.user && thisCommand.args[0] !== 'login') {
-      console.log(chalk.gray(`Logged in as: ${config.user.name}`));
-    }
-  });
+  .option('--mode <environment>', getServerModesHelp());
+
+program.hook('preAction', () => {
+  const opts = program.opts();
+  const config = getConfig();
+  const effectiveMode =
+    opts.mode !== undefined && opts.mode !== null && opts.mode !== ''
+      ? opts.mode
+      : (config.mode || 'production');
+  try {
+    applyServerMode(effectiveMode);
+    apiClient.reinit();
+  } catch (e) {
+    console.error(chalk.red(e.message));
+    process.exit(1);
+  }
+});
+
+program.hook('preAction', (thisCommand) => {
+  const config = getConfig();
+  if (config.user && thisCommand.args[0] !== 'login') {
+    console.log(chalk.gray(`已登录：${config.user.name}`));
+  }
+});
 
 // Login command
 program
   .command('login')
-  .description('Login to Skill Market')
-  .option('--no-open', 'Do not open browser automatically')
+  .description('浏览器 OAuth 登录（使用全局 --mode 指向的环境）')
+  .option('--no-open', '不自动打开浏览器，仅打印授权链接')
   .action(login);
 
 // Logout command
 program
   .command('logout')
-  .description('Logout from Skill Market')
+  .description('清除本地登录状态并尝试撤销服务端令牌')
   .action(logout);
 
 // List command
@@ -54,11 +82,12 @@ program
 program
   .command('upload <path>')
   .alias('up')
-  .description('Upload a new skill')
+  .description('上传 Skill（交互补全字段；用户案例 + 自动采集轨迹后提交 AI 渠道）')
   .option('-n, --name <name>', 'Skill name')
   .option('-d, --description <desc>', 'Skill description/purpose')
   .option('-t, --tags <tags>', 'Tags (comma separated)')
   .option('-m, --model <model>', 'Recommended model')
+  .option('-y, --yes', '非交互：跳过最终确认，适合脚本/CI')
   .action(upload);
 
 // Update command
@@ -100,7 +129,7 @@ program
     if (fs.existsSync(guidePath)) {
       console.log(fs.readFileSync(guidePath, 'utf-8'));
     } else {
-      console.log(chalk.yellow('Guide not found. Please visit https://kirigaya.cn/ktools/skillmanager'));
+      console.log(chalk.yellow('未找到本地指南，请访问：https://kirigaya.cn/ktools/skillmanager'));
     }
   });
 

package/src/lib/run-example-collect.js

@@ -0,0 +1,44 @@
+const chalk = require('chalk');
+
+/**
+ * 对用户 prompt 执行一次「示例运行」，采集 AI 侧轨迹（thinking / toolcall / message）。
+ * 生产环境可替换为真实模型 API；当前为可预测的模拟数据，便于联调。
+ */
+async function runExampleAndCollect(prompt, model) {
+  const modelLabel = model && String(model).trim() ? String(model).trim() : 'default';
+
+  console.log(chalk.gray('\n正在运行用户案例以采集轨迹与输出…'));
+  console.log(chalk.gray(`推荐模型：${modelLabel}`));
+
+  const simulatedResponses = [
+    {
+      type: 'thinking',
+      content: `分析用户请求：「${prompt}」。将拆解步骤并调用合适工具完成目标。`
+    },
+    {
+      type: 'toolcall',
+      toolName: 'read_file',
+      toolInput: { path: './README.md' }
+    },
+    {
+      type: 'toolcall',
+      toolName: 'write_file',
+      toolInput: {
+        path: './output.txt',
+        content: `已处理：${prompt}`
+      }
+    },
+    {
+      type: 'message',
+      content: `已根据你的请求完成处理：「${prompt}」。\n\n步骤摘要：\n1. 理解需求\n2. 读取上下文\n3. 生成结果\n\n以上为演示轨迹，上传时将一并提交。`
+    }
+  ];
+
+  await new Promise((resolve) => setTimeout(resolve, 400));
+
+  console.log(chalk.gray(`已采集 ${simulatedResponses.length} 条轨迹节点（thinking / toolcall / message）。`));
+
+  return simulatedResponses;
+}
+
+module.exports = { runExampleAndCollect };