@qoder-ai/qodercli 0.2.2-beta.7 → 0.2.2-beta.9

package/bin/run.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-const { spawn } = require('child_process');
+const { spawnSync } = require('child_process');
 const path = require('path');
 const fs = require('fs');
 
@@ -7,26 +7,47 @@ const platform = process.platform;
 const arch = process.arch;
 const target = `${platform}-${arch}`;
 const pkgName = `@qoder-ai/qodercli-${target}`;
+const subPkgDir = pkgName.split('/')[1]; // e.g. "qodercli-win32-x64"
 
 // 查找平台子包中的二进制
 const BINARY_NAME = platform === 'win32' ? 'qodercli.exe' : 'qodercli';
 
-// 尝试多种路径：
-// 1. node_modules 中的子包（npm install 场景）
-// 2. 同级目录（开发/调试场景）
+// __dirname = .../node_modules/@qoder-ai/qodercli/bin/
+// npm global install 结构:
+//   prefix/node_modules/@qoder-ai/qodercli/       (主包)
+//   prefix/node_modules/@qoder-ai/qodercli-win32-x64/  (子包, 同级)
+// npm local install 结构:
+//   project/node_modules/@qoder-ai/qodercli/
+//   project/node_modules/@qoder-ai/qodercli-win32-x64/  (hoisted)
+//   或 project/node_modules/@qoder-ai/qodercli/node_modules/@qoder-ai/qodercli-win32-x64/  (nested)
+
 const candidates = [
+  // 同级 scope 目录下 (global + hoisted local)
+  path.join(__dirname, '..', '..', subPkgDir, 'bin', BINARY_NAME),
+  // nested in main package's node_modules
   path.join(__dirname, '..', 'node_modules', pkgName, 'bin', BINARY_NAME),
-  path.join(__dirname, '..', '..', pkgName.split('/')[1], 'bin', BINARY_NAME),
+  // 3 levels up (some pnpm/yarn structures)
   path.join(__dirname, '..', '..', '..', 'node_modules', pkgName, 'bin', BINARY_NAME),
-  path.join(__dirname, target, BINARY_NAME),
+  // npm global on Windows may place under node_modules directly
+  path.join(__dirname, '..', '..', '..', subPkgDir, 'bin', BINARY_NAME),
+  // resolve from require (most reliable for complex layouts)
 ];
 
+// Also try require.resolve to find the sub-package
+try {
+  const subPkgJson = require.resolve(`${pkgName}/package.json`, { paths: [path.join(__dirname, '..')] });
+  const subPkgBin = path.join(path.dirname(subPkgJson), 'bin', BINARY_NAME);
+  candidates.push(subPkgBin);
+} catch {}
+
 let binPath = null;
 for (const p of candidates) {
-  if (fs.existsSync(p)) {
-    binPath = p;
-    break;
-  }
+  try {
+    if (fs.existsSync(p)) {
+      binPath = p;
+      break;
+    }
+  } catch {}
 }
 
 if (!binPath) {
@@ -34,24 +55,31 @@ if (!binPath) {
   console.error('');
   console.error(`The platform-specific package "${pkgName}" does not appear to be installed.`);
   console.error('');
-  console.error('This usually means:');
-  console.error('  1. Your platform is not supported, or');
-  console.error('  2. The optional dependency was not installed (try: npm install --include=optional)');
+  console.error('__dirname:', __dirname);
+  console.error('Searched paths:');
+  candidates.forEach(p => console.error(`  - ${p} [${fs.existsSync(p) ? 'EXISTS' : 'NOT FOUND'}]`));
+  console.error('');
+  // List what's actually in the scope directory
+  const scopeDir = path.join(__dirname, '..', '..');
+  try {
+    console.error('Contents of scope dir (' + scopeDir + '):');
+    fs.readdirSync(scopeDir).forEach(f => console.error('  ' + f));
+  } catch (e) { console.error('  (cannot read: ' + e.message + ')'); }
   console.error('');
   console.error('Supported platforms: darwin-arm64, darwin-x64, linux-x64, linux-arm64, win32-x64');
+  console.error('Try: npm install -g @qoder-ai/qodercli --include=optional');
   process.exit(1);
 }
 
-const child = spawn(binPath, process.argv.slice(2), {
+// Use spawnSync for reliable cross-platform behavior
+const result = spawnSync(binPath, process.argv.slice(2), {
   stdio: 'inherit',
   windowsHide: false,
 });
 
-child.on('close', (code) => {
-  process.exit(code !== null ? code : 1);
-});
-
-child.on('error', (error) => {
-  console.error('Failed to execute qodercli:', error.message);
+if (result.error) {
+  console.error('Failed to execute qodercli:', result.error.message);
   process.exit(1);
-});
+}
+
+process.exit(result.status !== null ? result.status : 1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qoder-ai/qodercli",
-  "version": "0.2.2-beta.7",
+  "version": "0.2.2-beta.9",
   "description": "QoderCLI - AI-powered coding assistant",
   "private": false,
   "publishConfig": { "access": "public" },
@@ -8,11 +8,11 @@
   "files": ["bin/", "README.md", "LICENSE"],
   "engines": { "node": ">=14" },
   "optionalDependencies": {
-    "@qoder-ai/qodercli-darwin-arm64": "0.2.2-beta.7",
-    "@qoder-ai/qodercli-darwin-x64": "0.2.2-beta.7",
-    "@qoder-ai/qodercli-linux-x64": "0.2.2-beta.7",
-    "@qoder-ai/qodercli-linux-arm64": "0.2.2-beta.7",
-    "@qoder-ai/qodercli-win32-x64": "0.2.2-beta.7"
+    "@qoder-ai/qodercli-darwin-arm64": "0.2.2-beta.9",
+    "@qoder-ai/qodercli-darwin-x64": "0.2.2-beta.9",
+    "@qoder-ai/qodercli-linux-x64": "0.2.2-beta.9",
+    "@qoder-ai/qodercli-linux-arm64": "0.2.2-beta.9",
+    "@qoder-ai/qodercli-win32-x64": "0.2.2-beta.9"
   },
   "keywords": ["qoder", "ai", "cli", "coding", "assistant", "terminal"],
   "author": "Qoder AI",