oh-langfuse 0.1.65 → 0.1.66

package/package.json

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

package/scripts/opencode-langfuse-setup.mjs

@@ -106,10 +106,14 @@ function psQuote(s) {
   return `'${String(s).replace(/'/g, "''")}'`;
 }
 
-function cmdQuote(s) {
-  return `"${String(s).replace(/"/g, '""')}"`;
-}
-
+function cmdQuote(s) {
+  return `"${String(s).replace(/"/g, '""')}"`;
+}
+
+function cmdSetValue(s) {
+  return String(s).replace(/"/g, '""');
+}
+
 function writeLangfusePluginUserConfig({ userId }) {
   const home = os.homedir();
   const dir = path.join(home, ".config", "opencode-plugin-langfuse");
@@ -943,39 +947,70 @@ function writeWindowsUpdateCheckScript(dir) {
   return p;
 }
 
-function writeOpencodeCommandShim(opencodeDir, { publicKey, secretKey, baseUrl, userId, realOpencodeCli }) {
-  const shimDir = path.join(opencodeDir, "bin");
-  ensureDir(shimDir);
-  if (process.platform === "win32") {
-    const shim = path.join(shimDir, "opencode.cmd");
+function writeOpencodeCommandShim(opencodeDir, { publicKey, secretKey, baseUrl, userId, realOpencodeCli }) {
+  const shimDir = path.join(opencodeDir, "bin");
+  ensureDir(shimDir);
+  if (process.platform === "win32") {
+    const shim = path.join(shimDir, "opencode.cmd");
     const cmd = ["@echo off", "REM Auto-generated by scripts/opencode-langfuse-setup.mjs"];
     cmd.push("set OH_LANGFUSE_OPENCODE_SHIM=1");
     cmd.push(`set LANGFUSE_PUBLIC_KEY=${publicKey}`);
     cmd.push(`set LANGFUSE_SECRET_KEY=${secretKey}`);
     cmd.push(`set LANGFUSE_BASEURL=${baseUrl}`);
-    if (userId) cmd.push(`set LANGFUSE_USER_ID=${userId}`);
-    cmd.push(...windowsGitPathBootstrap());
-    cmd.push(windowsAutoUpdateCommand("opencode"));
-    cmd.push(`call ${cmdQuote(realOpencodeCli)} %*`);
-    cmd.push("exit /b %ERRORLEVEL%");
-    fs.writeFileSync(shim, cmd.join("\r\n") + "\r\n", "utf8");
-    return { shim, shimDir };
-  }
-
-  const shim = path.join(shimDir, "opencode");
-  const lines = [
-    "#!/usr/bin/env sh",
-    "# Auto-generated by scripts/opencode-langfuse-setup.mjs",
-    "set -eu",
-    "export OH_LANGFUSE_OPENCODE_SHIM=1",
+    if (userId) cmd.push(`set LANGFUSE_USER_ID=${userId}`);
+    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('  call "%OH_LANGFUSE_REAL_OPENCODE%" %*');
+    cmd.push("  exit /b %ERRORLEVEL%");
+    cmd.push(")");
+    cmd.push('if exist "%USERPROFILE%\\.opencode\\bin\\opencode.exe" (');
+    cmd.push('  call "%USERPROFILE%\\.opencode\\bin\\opencode.exe" %*');
+    cmd.push("  exit /b %ERRORLEVEL%");
+    cmd.push(")");
+    cmd.push('if exist "%USERPROFILE%\\.opencode\\bin\\opencode.cmd" (');
+    cmd.push('  call "%USERPROFILE%\\.opencode\\bin\\opencode.cmd" %*');
+    cmd.push("  exit /b %ERRORLEVEL%");
+    cmd.push(")");
+    cmd.push('if exist "%APPDATA%\\npm\\opencode.cmd" (');
+    cmd.push('  call "%APPDATA%\\npm\\opencode.cmd" %*');
+    cmd.push("  exit /b %ERRORLEVEL%");
+    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("  )");
+    cmd.push(")");
+    cmd.push("call npx.cmd -y opencode@latest %*");
+    cmd.push("exit /b %ERRORLEVEL%");
+    fs.writeFileSync(shim, cmd.join("\r\n") + "\r\n", "utf8");
+    return { shim, shimDir };
+  }
+
+  const shim = path.join(shimDir, "opencode");
+  const quotedRealOpencodeCli = shQuote(realOpencodeCli);
+  const lines = [
+    "#!/usr/bin/env sh",
+    "# Auto-generated by scripts/opencode-langfuse-setup.mjs",
+    "set -eu",
+    "export OH_LANGFUSE_OPENCODE_SHIM=1",
     `export LANGFUSE_PUBLIC_KEY=${shQuote(publicKey)}`,
-    `export LANGFUSE_SECRET_KEY=${shQuote(secretKey)}`,
-    `export LANGFUSE_BASEURL=${shQuote(baseUrl)}`,
-    userId ? `export LANGFUSE_USER_ID=${shQuote(userId)}` : null,
-    unixAutoUpdateCommand("opencode"),
-    `exec ${shQuote(realOpencodeCli)} "$@"`,
-    ""
-  ].filter(Boolean);
+    `export LANGFUSE_SECRET_KEY=${shQuote(secretKey)}`,
+    `export LANGFUSE_BASEURL=${shQuote(baseUrl)}`,
+    userId ? `export LANGFUSE_USER_ID=${shQuote(userId)}` : null,
+    unixAutoUpdateCommand("opencode"),
+    `OH_LANGFUSE_REAL_OPENCODE=${quotedRealOpencodeCli}`,
+    'if [ -x "$OH_LANGFUSE_REAL_OPENCODE" ]; then exec "$OH_LANGFUSE_REAL_OPENCODE" "$@"; fi',
+    'if [ -x "$HOME/.opencode/bin/opencode" ]; then exec "$HOME/.opencode/bin/opencode" "$@"; fi',
+    'if command -v opencode >/dev/null 2>&1; then',
+    '  resolved="$(command -v opencode)"',
+    '  if [ "$resolved" != "$0" ]; then exec "$resolved" "$@"; fi',
+    "fi",
+    'exec npx -y opencode@latest "$@"',
+    ""
+  ].filter(Boolean);
   fs.writeFileSync(shim, lines.join("\n"), "utf8");
   fs.chmodSync(shim, 0o755);
   return { shim, shimDir };