@sokeai/cli 1.0.11 → 1.0.14

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sokeai/cli",
-    "version": "1.0.11",
+    "version": "1.0.14",
     "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();
@@ -188,6 +189,108 @@ function syncSkillsToWorkclawRegistry() {
   } 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() {
+  const platform = os.platform();
+  const binDir = path.join(__dirname, '..', 'bin');
+  const binaryName = platform === 'win32' ? 'soke-cli.exe' : 'soke-cli';
+  const binaryPath = path.join(binDir, binaryName);
+  
+  if (!fs.existsSync(binaryPath)) return Promise.resolve();
+
+  // 我们不再弹窗询问，而是直接以静默模式尝试执行 setup-gui-env
+  // 这会尝试创建软链，如果没权限，它会默默失败（不会报错打断安装）
+  // 用户如果后面遇到 command not found，仍可以手动执行 soke-cli setup-gui-env
+  return new Promise((resolve) => {
+    try {
+      const runJsPath = path.join(__dirname, 'run.js');
+      const { spawn } = require('child_process');
+      const child = spawn(process.execPath, [runJsPath, 'setup-gui-env', '--silent'], {
+        stdio: 'ignore', // 静默执行，不污染 npm install 输出
+        detached: true
+      });
+      child.on('error', () => resolve());
+      child.on('exit', () => resolve());
+      
+      // 避免卡住
+      setTimeout(() => resolve(), 3000);
+    } catch (e) {
+      resolve();
+    }
+  });
+}
+
 // 平台映射
 const platformMap = {
   'darwin': 'darwin',
@@ -297,6 +400,9 @@ downloadFile(downloadURL, binaryPath)
       syncSkillsToWorkclawRegistry();
     } catch (_) {}
 
+    return maybeAssistGuiPath();
+  })
+  .then(() => {
     console.log('soke-cli 安装成功!');
     console.log(`二进制文件位置: ${binaryPath}`);
     console.log('\n使用方法:');

package/scripts/run.js

@@ -1,9 +1,97 @@
 #!/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' || process.platform === 'linux') {
+      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`);
+          
+          if (process.argv[3] !== '--silent') {
+            console.log(`执行上述命令后，再重新打开客户端即可。`);
+          }
+        }
+      } else {
+        console.log(`⚠️ 未找到源文件: ${binSource}`);
+      }
+      
+      if (process.argv[3] === '--silent') {
+        process.exit(0);
+      }
+
+      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 (process.platform === 'darwin') {
+          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✅ 环境变量已注入，但未自动重启应用。请手动从“启动台(Launchpad)”或“访达(Finder)”重新打开它。');
+        }
+        process.exit(0);
+      }, 1500);
+      return; // 异步等待中
+    } else if (process.platform === 'win32') {
+      console.log('检测到当前为 Windows 系统。');
+      
+      if (process.argv[3] === '--silent') {
+        process.exit(0);
+      }
+      
+      console.log('正在尝试重启 SokeClaw / WorkClaw...');
+      try { execSync('taskkill /F /IM SokeClaw.exe 2>nul'); } catch(e) {}
+      try { execSync('taskkill /F /IM WorkClaw.exe 2>nul'); } catch(e) {}
+      try { execSync('taskkill /F /IM Electron.exe 2>nul'); } catch(e) {}
+      
+      console.log('\n✅ Windows 环境下的全局包通常已在 PATH 中。客户端已被关闭，请手动重新打开它即可生效。');
+      process.exit(0);
+    } else {
+      console.log('\n⚠️ 目前 setup-gui-env 主要支持 macOS/Linux/Windows。');
+      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 +138,4 @@ child.on('exit', (code, signal) => {
 child.on('error', (err) => {
   console.error('执行 soke-cli 时出错:', err.message);
   process.exit(1);
-});
+});