oh-langfuse 0.1.73 → 0.1.74

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oh-langfuse",
-  "version": "0.1.73",
+  "version": "0.1.74",
   "private": false,
   "type": "module",
   "description": "Use npm scripts to configure Claude Code / OpenCode / Codex with Langfuse tracing.",

package/scripts/opencode-langfuse-setup.mjs

@@ -1007,7 +1007,8 @@ function writeOpencodeCommandShim(opencodeDir, { publicKey, secretKey, baseUrl,
     cmd.push(...windowsGitPathBootstrap());
     cmd.push(windowsAutoUpdateCommand("opencode"));
     cmd.push(`set "OH_LANGFUSE_REAL_OPENCODE=${cmdSetValue(realOpencodeCli)}"`);
-    cmd.push('if exist "%OH_LANGFUSE_REAL_OPENCODE%" (');
+    cmd.push('echo "%OH_LANGFUSE_REAL_OPENCODE%" | findstr /I "\\node_modules\\opencode-ai\\bin\\opencode.exe" >nul');
+    cmd.push('if errorlevel 1 if exist "%OH_LANGFUSE_REAL_OPENCODE%" (');
     cmd.push('  call "%OH_LANGFUSE_REAL_OPENCODE%" %*');
     cmd.push("  exit /b %ERRORLEVEL%");
     cmd.push(")");
@@ -1023,10 +1024,6 @@ function writeOpencodeCommandShim(opencodeDir, { publicKey, secretKey, baseUrl,
     cmd.push('  call "%APPDATA%\\npm\\opencode.cmd" %*');
     cmd.push("  exit /b %ERRORLEVEL%");
     cmd.push(")");
-    cmd.push('if exist "%APPDATA%\\npm\\node_modules\\opencode-ai\\bin\\opencode.exe" (');
-    cmd.push('  call "%APPDATA%\\npm\\node_modules\\opencode-ai\\bin\\opencode.exe" %*');
-    cmd.push("  exit /b %ERRORLEVEL%");
-    cmd.push(")");
     cmd.push('if exist "%APPDATA%\\npm\\node_modules\\opencode-ai\\node_modules\\opencode-windows-x64\\bin\\opencode.exe" (');
     cmd.push('  call "%APPDATA%\\npm\\node_modules\\opencode-ai\\node_modules\\opencode-windows-x64\\bin\\opencode.exe" %*');
     cmd.push("  exit /b %ERRORLEVEL%");
@@ -1045,8 +1042,11 @@ function writeOpencodeCommandShim(opencodeDir, { publicKey, secretKey, baseUrl,
     cmd.push(")");
     cmd.push('for /f "delims=" %%O in (\'where.exe opencode 2^>nul\') do (');
     cmd.push('  if /I not "%%~fO"=="%~f0" (');
-    cmd.push('    call "%%O" %*');
-    cmd.push("    exit /b %ERRORLEVEL%");
+    cmd.push('    echo %%~fO | findstr /I "\\node_modules\\opencode-ai\\bin\\opencode.exe" >nul');
+    cmd.push("    if errorlevel 1 (");
+    cmd.push('      call "%%O" %*');
+    cmd.push("      exit /b %ERRORLEVEL%");
+    cmd.push("    )");
     cmd.push("  )");
     cmd.push(")");
     cmd.push("echo [ERROR] OpenCode CLI not found. Install OpenCode CLI first. 1>&2");

package/scripts/resolve-opencode-cli.mjs

@@ -3,18 +3,28 @@ import path from "node:path";
 import os from "node:os";
 import { spawnSync } from "node:child_process";
 import { listSystemCliCandidates } from "./cli-detection-utils.mjs";
-
-/**
+
+function isKnownBrokenWindowsOpencodeCandidate(candidate) {
+  if (process.platform !== "win32") return false;
+  const normalized = String(candidate || "").replace(/\//g, "\\").toLowerCase();
+  return normalized.endsWith("\\node_modules\\opencode-ai\\bin\\opencode.exe");
+}
+
+function usableCandidate(candidate) {
+  return candidate && !isKnownBrokenWindowsOpencodeCandidate(candidate) && fs.existsSync(candidate);
+}
+
+/**
  * OpenCode CLI 的官方安装脚本默认会把二进制放到 ~/.opencode/bin；
  * npm 全局安装则可能出现在 %AppData%\npm\opencode.cmd；PATH 也可能只认识 `opencode`。
  * @param {string|undefined} preferred --cmd=xxx 或可执行文件路径
  * @returns {string|null} 可执行的绝对路径，或仅在 PATH 中解析到则用 `opencode`
  */
 export function resolveOpencodeCli(preferred) {
-  if (typeof preferred === "string" && preferred.trim()) {
-    const p = preferred.trim();
-    if (fs.existsSync(p)) return path.resolve(p);
-  }
+  if (typeof preferred === "string" && preferred.trim()) {
+    const p = preferred.trim();
+    if (usableCandidate(p)) return path.resolve(p);
+  }
 
   const home = os.homedir();
 
@@ -30,7 +40,6 @@ export function resolveOpencodeCli(preferred) {
     if (process.env.APPDATA) {
       candidates.push(path.join(process.env.APPDATA, "npm", "opencode.cmd"));
       candidates.push(path.join(process.env.APPDATA, "npm", "opencode"));
-      candidates.push(path.join(process.env.APPDATA, "npm", "node_modules", "opencode-ai", "bin", "opencode.exe"));
       candidates.push(path.join(process.env.APPDATA, "npm", "node_modules", "opencode-ai", "node_modules", "opencode-windows-x64", "bin", "opencode.exe"));
       candidates.push(path.join(process.env.APPDATA, "npm", "node_modules", "opencode-ai", "node_modules", "opencode-windows-x64-baseline", "bin", "opencode.exe"));
       candidates.push(path.join(process.env.APPDATA, "npm", "node_modules", "opencode-windows-x64", "bin", "opencode.exe"));
@@ -42,17 +51,17 @@ export function resolveOpencodeCli(preferred) {
     candidates.push(path.join(home, ".local", "bin", "opencode"));
     candidates.push(...listSystemCliCandidates("opencode"));
   }
-
-  for (const c of candidates) {
-    if (c && fs.existsSync(c)) return c;
-  }
+
+  for (const c of candidates) {
+    if (usableCandidate(c)) return c;
+  }
 
   if (process.platform === "win32") {
     const r = spawnSync("where.exe", ["opencode"], { encoding: "utf8", windowsHide: true });
     if (r.status === 0 && r.stdout) {
-      const line = r.stdout.trim().split(/\r?\n/)[0]?.trim();
-      if (line && fs.existsSync(line)) return line;
-    }
+      const line = r.stdout.trim().split(/\r?\n/)[0]?.trim();
+      if (usableCandidate(line)) return line;
+    }
   } else {
     const r = spawnSync("which", ["opencode"], { encoding: "utf8" });
     if (r.status === 0 && r.stdout) {