@sokeai/cli 1.0.13 → 1.0.14

package/package.json

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

package/scripts/install.js

@@ -262,52 +262,33 @@ function ensureSymlink(targetPath, sourcePath) {
 }
 
 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}`);
+  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();
     }
-    return;
-  }
-
-  console.log(`请执行以下命令完成配置（需要 sudo）：`);
-  console.log(`sudo ln -sf "${shimPath}" "${selectedTarget}"`);
+  });
 }
 
 // 平台映射

package/scripts/run.js

@@ -13,18 +13,7 @@ if (process.argv[2] === 'setup-gui-env') {
     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）
+    if (process.platform === 'darwin' || process.platform === 'linux') {
       const binSource = path.join(nodeDir, 'soke-cli');
       const binTarget = '/usr/local/bin/soke-cli';
       
@@ -41,14 +30,18 @@ if (process.argv[2] === 'setup-gui-env') {
           console.log(`请手动在终端执行以下命令（可能需要输入密码）:`);
           console.log(`\n  sudo ln -sf "${binSource}" "${binTarget}"\n`);
           
-          // 如果这里没法创建，sokeclaw 可能还是找不到，提示一下
-          console.log(`执行上述命令后，再重新打开 SokeClaw 即可。`);
-          process.exit(0);
+          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) {}
@@ -57,24 +50,40 @@ if (process.argv[2] === 'setup-gui-env') {
       // 等待进程退出
       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 (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✅ 环境变量已注入，但未找到 SokeClaw 应用。请手动从“启动台(Launchpad)”或“访达(Finder)”重新打开它。');
+          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 平台。Windows/Linux 用户请手动将 Node/npm bin 目录加入系统环境变量。');
+      console.log('\n⚠️ 目前 setup-gui-env 主要支持 macOS/Linux/Windows。');
       process.exit(0);
     }
   } catch (error) {