@sokeai/cli 1.0.8 → 1.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sokeai/cli",
-    "version": "1.0.8",
+    "version": "1.0.13",
     "description": "授客AI官方CLI工具 - 支持AI Agent Skills",
     "bin": {
         "soke-cli": "scripts/run.js"

package/scripts/install.js

@@ -3,6 +3,7 @@ const path = require('path');
 const fs = require('fs');
 const https = require('https');
 const { execSync } = require('child_process');
+const readline = require('readline');
 
 const platform = os.platform();
 const arch = os.arch();
@@ -88,6 +89,227 @@ function syncSkillsToSokeclawWorkspace() {
   }
 }
 
+function upsertSkillRegistryEntry(registry, entry) {
+  if (!registry || typeof registry !== 'object') return;
+  if (!Array.isArray(registry.skills)) registry.skills = [];
+
+  const idx = registry.skills.findIndex((s) => s && s.id === entry.id);
+  if (idx >= 0) {
+    registry.skills[idx] = { ...registry.skills[idx], ...entry };
+    return;
+  }
+
+  registry.skills.push(entry);
+}
+
+function syncSkillsToWorkclawRegistry() {
+  const homeDir = os.homedir();
+  const workclawRootDir = path.join(homeDir, '.workclaw');
+  const workclawSkillsDir = path.join(workclawRootDir, 'skills');
+  const registryPath = path.join(workclawSkillsDir, 'registry.json');
+
+  if (!fs.existsSync(workclawRootDir)) return;
+  try {
+    fs.mkdirSync(workclawSkillsDir, { recursive: true });
+  } catch (_) {
+    return;
+  }
+
+  const packageRoot = path.join(__dirname, '..');
+  const packagedSkillsDir = path.join(packageRoot, 'skills');
+  if (!fs.existsSync(packagedSkillsDir)) return;
+
+  let registry;
+  try {
+    registry = JSON.parse(fs.readFileSync(registryPath, 'utf8'));
+  } catch (_) {
+    registry = { version: 1, migrations: {}, skills: [] };
+  }
+
+  if (registry.version == null) registry.version = 1;
+  if (!registry.migrations) registry.migrations = {};
+
+  const existingSkills = Array.isArray(registry.skills) ? registry.skills : [];
+  const existingInstallPaths = existingSkills
+    .map((s) => s?.install?.path)
+    .filter((p) => typeof p === 'string');
+
+  const workclawSkillInstallDir = workclawSkillsDir;
+
+  const defaultSourceType =
+    typeof existingSkills[0]?.source?.type === 'string' && existingSkills[0]?.source?.type
+      ? existingSkills[0].source.type
+      : 'local';
+
+  const skillNames = ['soke-shared', 'soke-exam'];
+  for (const skillName of skillNames) {
+    const src = path.join(packagedSkillsDir, skillName);
+    const dest = path.join(workclawSkillInstallDir, skillName);
+    if (fs.existsSync(src)) copyDirRecursive(src, dest);
+  }
+
+  upsertSkillRegistryEntry(registry, {
+    id: 'skill:soke-exam',
+    name: 'soke-exam',
+    displayName: '授客考试管理',
+    description: '授客考试管理：查询考试、考试分类、考试用户成绩、考试详情。',
+    source: { type: defaultSourceType, slug: '', url: '' },
+    install: {
+      path: path.join(workclawSkillInstallDir, 'soke-exam'),
+      installedAt: '',
+      updatedAt: '',
+      version: '1.0.0'
+    },
+    state: { enabled: true, health: 'ok', lastError: '' },
+    runtime: { supported: ['openclaw'], enabled: ['openclaw'], primary: 'openclaw' },
+    security: { riskLevel: 'normal', requiresApproval: false },
+    metadata: { emoji: '📝', homepage: '', requires: { bins: ['soke-cli'] } }
+  });
+
+  upsertSkillRegistryEntry(registry, {
+    id: 'skill:soke-shared',
+    name: 'soke-shared',
+    displayName: 'soke-shared 共享规则',
+    description: '授客CLI共享基础：配置、登录、权限管理、错误处理、安全规则。',
+    source: { type: defaultSourceType, slug: '', url: '' },
+    install: {
+      path: path.join(workclawSkillInstallDir, 'soke-shared'),
+      installedAt: '',
+      updatedAt: '',
+      version: '1.0.0'
+    },
+    state: { enabled: true, health: 'ok', lastError: '' },
+    runtime: { supported: ['openclaw'], enabled: ['openclaw'], primary: 'openclaw' },
+    security: { riskLevel: 'normal', requiresApproval: false },
+    metadata: { emoji: '🔧', homepage: '', requires: {} }
+  });
+
+  try {
+    fs.writeFileSync(registryPath, JSON.stringify(registry, null, 2));
+  } catch (_) {}
+}
+
+function isLikelyInteractiveInstall() {
+  if (!process.stdin.isTTY) return false;
+  if (!process.stdout.isTTY) return false;
+  if (process.env.CI) return false;
+  if (process.env.npm_config_yes === 'true') return false;
+  return true;
+}
+
+function promptYesNo(message) {
+  return new Promise((resolve) => {
+    const rl = readline.createInterface({
+      input: process.stdin,
+      output: process.stdout
+    });
+
+    rl.question(message, (answer) => {
+      rl.close();
+      const normalized = String(answer || '').trim().toLowerCase();
+      resolve(normalized === 'y' || normalized === 'yes');
+    });
+  });
+}
+
+function detectNpmGlobalBinDir() {
+  const prefix = process.env.npm_config_prefix;
+  if (typeof prefix === 'string' && prefix.length > 0) {
+    const binDir = platform === 'win32' ? prefix : path.join(prefix, 'bin');
+    return binDir;
+  }
+  return null;
+}
+
+function detectSokeCliShimPath() {
+  const binDir = detectNpmGlobalBinDir();
+  if (!binDir) return null;
+
+  const candidates =
+    platform === 'win32'
+      ? [path.join(binDir, 'soke-cli.cmd'), path.join(binDir, 'soke-cli.exe')]
+      : [path.join(binDir, 'soke-cli')];
+
+  for (const candidate of candidates) {
+    if (fs.existsSync(candidate)) return candidate;
+  }
+  return null;
+}
+
+function getPreferredLinkTargetPaths() {
+  if (platform === 'win32') return [];
+  return ['/usr/local/bin/soke-cli', '/opt/homebrew/bin/soke-cli'];
+}
+
+function ensureSymlink(targetPath, sourcePath) {
+  try {
+    const existing = fs.lstatSync(targetPath);
+    if (existing.isSymbolicLink()) {
+      const currentTarget = fs.readlinkSync(targetPath);
+      if (currentTarget === sourcePath) return { ok: true, changed: false };
+      fs.unlinkSync(targetPath);
+    } else {
+      return { ok: false, changed: false, reason: 'exists_non_symlink' };
+    }
+  } catch (_) {}
+
+  try {
+    fs.symlinkSync(sourcePath, targetPath);
+    return { ok: true, changed: true };
+  } catch (err) {
+    return { ok: false, changed: false, reason: err && err.message ? err.message : 'failed' };
+  }
+}
+
+async function maybeAssistGuiPath() {
+  if (!isLikelyInteractiveInstall()) return;
+
+  const shimPath = detectSokeCliShimPath();
+  if (!shimPath) return;
+
+  const targets = getPreferredLinkTargetPaths();
+  if (targets.length === 0) return;
+
+  let selectedTarget = null;
+  for (const t of targets) {
+    const dir = path.dirname(t);
+    if (fs.existsSync(dir)) {
+      selectedTarget = t;
+      break;
+    }
+  }
+  if (!selectedTarget) selectedTarget = targets[0];
+
+  const dir = path.dirname(selectedTarget);
+  let dirWritable = false;
+  try {
+    fs.accessSync(dir, fs.constants.W_OK);
+    dirWritable = true;
+  } catch (_) {}
+
+  const question = dirWritable
+    ? `检测到你可能在 sokeclaw（GUI）里遇到 “command not found: soke-cli”。是否创建链接 ${selectedTarget} 指向 ${shimPath} 以便 GUI 可直接找到？(y/N) `
+    : `检测到你可能在 sokeclaw（GUI）里遇到 “command not found: soke-cli”。是否输出一条需要 sudo 的命令来创建链接 ${selectedTarget} 指向 ${shimPath}？(y/N) `;
+
+  const ok = await promptYesNo(question);
+  if (!ok) return;
+
+  if (dirWritable) {
+    const res = ensureSymlink(selectedTarget, shimPath);
+    if (res.ok) {
+      console.log(`已配置：${selectedTarget} -> ${shimPath}`);
+    } else if (res.reason === 'exists_non_symlink') {
+      console.log(`跳过：${selectedTarget} 已存在且不是软链接。`);
+    } else {
+      console.log(`创建软链接失败：${res.reason}`);
+    }
+    return;
+  }
+
+  console.log(`请执行以下命令完成配置（需要 sudo）：`);
+  console.log(`sudo ln -sf "${shimPath}" "${selectedTarget}"`);
+}
+
 // 平台映射
 const platformMap = {
   'darwin': 'darwin',
@@ -193,6 +415,13 @@ downloadFile(downloadURL, binaryPath)
       syncSkillsToSokeclawWorkspace();
     } catch (_) {}
 
+    try {
+      syncSkillsToWorkclawRegistry();
+    } catch (_) {}
+
+    return maybeAssistGuiPath();
+  })
+  .then(() => {
     console.log('soke-cli 安装成功!');
     console.log(`二进制文件位置: ${binaryPath}`);
     console.log('\n使用方法:');

package/scripts/run.js

@@ -1,9 +1,88 @@
 #!/usr/bin/env node
 
-const { spawn } = require('child_process');
+const { spawn, execSync } = require('child_process');
 const path = require('path');
 const fs = require('fs');
 
+// 特殊命令拦截：修复 sokeclaw 的 GUI PATH 问题
+if (process.argv[2] === 'setup-gui-env') {
+  console.log('正在为 SokeClaw GUI 注入环境变量 PATH...');
+  try {
+    // 获取 node 和当前脚本的绝对路径目录，这通常也是 soke-cli 所在的 bin 目录
+    const nodeDir = path.dirname(process.execPath);
+    const cliDir = path.dirname(process.argv[1]);
+    
+    let targetPath = '';
+    if (process.platform === 'darwin') {
+      // 提取现有的系统 PATH
+      const sysPath = execSync('sysctl -n getenv PATH 2>/dev/null || echo ""', { encoding: 'utf8' }).trim();
+      const currentPath = process.env.PATH || '';
+      
+      // 合并并去重 PATH
+      const pathSet = new Set([nodeDir, cliDir, ...currentPath.split(':'), ...sysPath.split(':')].filter(Boolean));
+      targetPath = Array.from(pathSet).join(':');
+      
+      console.log(`注入的 PATH: ${targetPath.substring(0, 100)}...`);
+      // launchctl setenv 在新版 macOS 中如果不在 login context 下可能提示 Not privileged，
+      // 我们改用软链到 GUI 默认 PATH /usr/local/bin 的方式来解决（如果不可写则提示 sudo）
+      const binSource = path.join(nodeDir, 'soke-cli');
+      const binTarget = '/usr/local/bin/soke-cli';
+      
+      if (fs.existsSync(binSource)) {
+        try {
+          // 尝试创建软链
+          if (fs.existsSync(binTarget)) {
+            try { fs.unlinkSync(binTarget); } catch(e) {}
+          }
+          fs.symlinkSync(binSource, binTarget);
+          console.log(`✅ 成功创建软链: ${binTarget} -> ${binSource}`);
+        } catch (linkError) {
+          console.log(`\n⚠️ 权限不足，无法自动创建 /usr/local/bin 软链。`);
+          console.log(`请手动在终端执行以下命令（可能需要输入密码）:`);
+          console.log(`\n  sudo ln -sf "${binSource}" "${binTarget}"\n`);
+          
+          // 如果这里没法创建，sokeclaw 可能还是找不到，提示一下
+          console.log(`执行上述命令后，再重新打开 SokeClaw 即可。`);
+          process.exit(0);
+        }
+      } else {
+        console.log(`⚠️ 未找到源文件: ${binSource}`);
+      }
+      
+      console.log('尝试重启 SokeClaw / WorkClaw...');
+      try { execSync('killall SokeClaw 2>/dev/null'); } catch(e) {}
+      try { execSync('killall WorkClaw 2>/dev/null'); } catch(e) {}
+      try { execSync('killall Electron 2>/dev/null'); } catch(e) {}
+      
+      // 等待进程退出
+      setTimeout(() => {
+        let launched = false;
+        if (fs.existsSync('/Applications/SokeClaw.app')) {
+          execSync('open "/Applications/SokeClaw.app"');
+          launched = true;
+        } else if (fs.existsSync('/Applications/WorkClaw.app')) {
+          execSync('open "/Applications/WorkClaw.app"');
+          launched = true;
+        }
+        
+        if (launched) {
+          console.log('\n✅ 修复完成！SokeClaw 已重启。现在你应该可以在里面使用 /skill soke-exam 了。');
+        } else {
+          console.log('\n✅ 环境变量已注入，但未找到 SokeClaw 应用。请手动从“启动台(Launchpad)”或“访达(Finder)”重新打开它。');
+        }
+        process.exit(0);
+      }, 1500);
+      return; // 异步等待中
+    } else {
+      console.log('\n⚠️ 目前 setup-gui-env 仅支持 macOS 平台。Windows/Linux 用户请手动将 Node/npm bin 目录加入系统环境变量。');
+      process.exit(0);
+    }
+  } catch (error) {
+    console.error('修复过程中出现错误:', error.message);
+    process.exit(1);
+  }
+}
+
 // 获取二进制文件路径
 const platform = process.platform;
 const binaryName = platform === 'win32' ? 'soke-cli.exe' : 'soke-cli';
@@ -50,4 +129,4 @@ child.on('exit', (code, signal) => {
 child.on('error', (err) => {
   console.error('执行 soke-cli 时出错:', err.message);
   process.exit(1);
-});
+});

package/skills/soke-exam/SKILL.md

@@ -1,5 +1,6 @@
 ---
 name: soke-exam
+summary: 授客考试管理（考试列表/分类/考试用户成绩/详情），通过 soke-cli 查询
 version: 1.0.0
 description: "授客考试管理：查询考试、考试用户和成绩。查询考试列表、考试分类、考试用户成绩、考试详情。当用户需要查询考试成绩、查看考试列表、查询考试用户信息、查看考试分类时使用。"
 metadata:

package/skills/soke-shared/SKILL.md

@@ -1,5 +1,6 @@
 ---
 name: soke-shared
+summary: 授客CLI共享基础（配置/登录/权限/错误处理/安全规则）
 version: 1.0.0
 description: "授客CLI共享基础：应用配置初始化、认证登录（auth login）、权限管理、错误处理、安全规则。当用户需要第一次配置（soke-cli config init）、使用登录授权（soke-cli auth login）、遇到权限不足、或首次使用soke-cli时触发。"
 ---