oh-langfuse 0.1.13 → 0.1.15

package/README.md

@@ -102,7 +102,25 @@ npx oh-langfuse@latest check codex
 并可写入用户级 `LANGFUSE_*` 环境变量。Windows 下会生成
 `launch-opencode-langfuse.cmd`，Linux/macOS 下会生成
 `launch-opencode-langfuse.sh`，用于在 shell 环境变量未生效时显式带
-Langfuse 配置启动 OpenCode。
+Langfuse 配置启动 OpenCode。安装器可以读取带注释或尾随逗号的
+`opencode.json`，合并配置后会写回标准 JSON。
+
+如果你在 WSL 里运行 OpenCode，就在 WSL shell 里直接执行安装和检查命令。
+此时配置会写入 WSL 用户自己的 `$HOME/.config/opencode`：
+
+```bash
+npx oh-langfuse@latest setup opencode --userId=h00613222
+npx oh-langfuse@latest check opencode
+```
+
+如果 `opencode.json` 原本是 JSONC 风格（例如带注释或尾随逗号），安装器会先兼容读取，
+再写回标准 JSON。
+
+如果你确实是在 Windows PowerShell 里远程配置 WSL，才需要使用 `--wsl`：
+
+```bash
+npx oh-langfuse@latest setup opencode --wsl=Ubuntu --userId=h00613222
+```
 
 ### Codex
 

package/bin/cli.js

@@ -492,6 +492,13 @@ function commonLangfuseArgs(config) {
 function optionalInstallerArgs(options) {
   return [...(hasValue(options.pipIndexUrl) ? [`--pipIndexUrl=${options.pipIndexUrl}`] : [])];
 }
+
+function opencodePlatformArgs(options) {
+  return [
+    ...(options.wsl ? [typeof options.wsl === "string" ? `--wsl=${options.wsl}` : "--wsl"] : []),
+    ...(hasValue(options.wslDistro) ? [`--wslDistro=${options.wslDistro}`] : [])
+  ];
+}
 
 async function confirmAction(rl, title, rows, options) {
   clearScreen();
@@ -538,6 +545,7 @@ async function setupOpenCode(rl, options) {
   const args = [
     ...commonLangfuseArgs(config),
     ...(hasValue(options.npmRegistry) ? [`--npmRegistry=${options.npmRegistry}`] : []),
+    ...opencodePlatformArgs(options),
     ...(!setEnv ? ["--no-set-env"] : []),
     ...(!installPlugin ? ["--skip-plugin-install"] : []),
     ...(hasValue(cliPath) ? [`--cmd=${cliPath}`] : [])
@@ -548,9 +556,10 @@ async function setupOpenCode(rl, options) {
     [
       labelValue("User ID", config.userId || "<none>", config.userId ? t.teal : t.muted),
       labelValue("User env vars", setEnv ? "write" : "skip", setEnv ? t.teal : t.gold),
-      labelValue("Plugin install", installPlugin ? "install/update" : "skip", installPlugin ? t.teal : t.gold),
-      labelValue("CLI path", cliPath || "auto-detect", t.blue),
-      labelValue("Config file", "~/.config/opencode/opencode.json", t.violet)
+      labelValue("Plugin install", installPlugin ? "install/update" : "skip", installPlugin ? t.teal : t.gold),
+      labelValue("CLI path", cliPath || "auto-detect", t.blue),
+      labelValue("Target runtime", options.wsl ? `WSL${typeof options.wsl === "string" ? ` (${options.wsl})` : ""}` : "current OS", t.violet),
+      labelValue("Config file", "~/.config/opencode/opencode.json", t.violet)
     ],
     options
   );
@@ -588,11 +597,11 @@ function checkClaude(options, { clear = true } = {}) {
   return runNodeScript("langfuse-check.mjs", [], options);
 }
 
-function checkOpenCode(options, { clear = true } = {}) {
-  if (clear) clearScreen();
-  renderBrand(options);
-  return runNodeScript("opencode-langfuse-check.mjs", [], options);
-}
+function checkOpenCode(options, { clear = true } = {}) {
+  if (clear) clearScreen();
+  renderBrand(options);
+  return runNodeScript("opencode-langfuse-check.mjs", opencodePlatformArgs(options), options);
+}
 
 function checkCodex(options, { clear = true } = {}) {
   if (clear) clearScreen();
@@ -704,6 +713,7 @@ function printHelp() {
   ]);
   renderSection("Options", [
     `${paint("--dry-run", t.gold)}  Preview actions without writing files or installing packages.`,
+    `${paint("--wsl[=DISTRO]", t.gold)}  Configure/check OpenCode inside WSL from Windows.`,
     `${paint("--npmRegistry=URL", t.gold)}  Use a specific npm registry when installing the OpenCode plugin.`,
     `${paint("--pipIndexUrl=URL", t.gold)}  Use a specific pip index for Python Langfuse installs.`,
     `${paint("--help", t.gold)}     Show this help.`
@@ -714,6 +724,8 @@ async function main() {
   const args = parseArgs(process.argv.slice(2));
   const options = {
     dryRun: !!args["dry-run"],
+    wsl: args.wsl || !!(args.wslDistro || args["wsl-distro"]),
+    wslDistro: args.wslDistro || args["wsl-distro"] || "",
     npmRegistry: args.npmRegistry || "",
     pipIndexUrl: args.pipIndexUrl || ""
   };

package/package.json

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

package/scripts/json-utils.mjs

@@ -0,0 +1,99 @@
+export function stripBom(s) {
+  if (typeof s !== "string" || s.length === 0) return s;
+  return s.charCodeAt(0) === 0xfeff ? s.slice(1) : s;
+}
+
+function stripJsonComments(text) {
+  let out = "";
+  let inString = false;
+  let escaped = false;
+
+  for (let i = 0; i < text.length; i += 1) {
+    const c = text[i];
+    const n = text[i + 1];
+
+    if (inString) {
+      out += c;
+      if (escaped) escaped = false;
+      else if (c === "\\") escaped = true;
+      else if (c === '"') inString = false;
+      continue;
+    }
+
+    if (c === '"') {
+      inString = true;
+      out += c;
+      continue;
+    }
+
+    if (c === "/" && n === "/") {
+      while (i < text.length && text[i] !== "\n" && text[i] !== "\r") i += 1;
+      if (i < text.length) out += text[i];
+      continue;
+    }
+
+    if (c === "/" && n === "*") {
+      i += 2;
+      while (i < text.length - 1 && !(text[i] === "*" && text[i + 1] === "/")) {
+        out += text[i] === "\n" || text[i] === "\r" ? text[i] : " ";
+        i += 1;
+      }
+      i += 1;
+      continue;
+    }
+
+    out += c;
+  }
+
+  return out;
+}
+
+function removeTrailingCommas(text) {
+  let out = "";
+  let inString = false;
+  let escaped = false;
+
+  for (let i = 0; i < text.length; i += 1) {
+    const c = text[i];
+
+    if (inString) {
+      out += c;
+      if (escaped) escaped = false;
+      else if (c === "\\") escaped = true;
+      else if (c === '"') inString = false;
+      continue;
+    }
+
+    if (c === '"') {
+      inString = true;
+      out += c;
+      continue;
+    }
+
+    if (c === ",") {
+      let j = i + 1;
+      while (j < text.length && /\s/.test(text[j])) j += 1;
+      if (text[j] === "}" || text[j] === "]") continue;
+    }
+
+    out += c;
+  }
+
+  return out;
+}
+
+export function parseJsonRelaxed(text, filePath = "JSON file") {
+  const raw = stripBom(text);
+  try {
+    return JSON.parse(raw);
+  } catch (strictError) {
+    const relaxed = removeTrailingCommas(stripJsonComments(raw));
+    try {
+      return JSON.parse(relaxed);
+    } catch (relaxedError) {
+      throw new Error(
+        `Cannot parse ${filePath}: ${relaxedError.message}. Original JSON.parse error: ${strictError.message}`
+      );
+    }
+  }
+}

package/scripts/opencode-langfuse-check.mjs

@@ -1,10 +1,18 @@
 import fs from "node:fs";
 import path from "node:path";
 import os from "node:os";
-
-function stripBom(s) {
-  if (typeof s !== "string" || s.length === 0) return s;
-  return s.charCodeAt(0) === 0xfeff ? s.slice(1) : s;
+import { parseJsonRelaxed, stripBom } from "./json-utils.mjs";
+import { runOhLangfuseInWsl, shouldRunInWsl } from "./wsl-utils.mjs";
+
+function parseArgs(argv) {
+  const args = {};
+  for (const raw of argv) {
+    if (!raw.startsWith("--")) continue;
+    const eq = raw.indexOf("=");
+    if (eq === -1) args[raw.slice(2)] = true;
+    else args[raw.slice(2, eq)] = raw.slice(eq + 1);
+  }
+  return args;
 }
 
 function readTextIfExists(p) {
@@ -15,7 +23,7 @@ function readTextIfExists(p) {
 function readJsonIfExists(p) {
   const txt = readTextIfExists(p);
   if (!txt.trim()) return null;
-  return JSON.parse(txt);
+  return parseJsonRelaxed(txt, p);
 }
 
 function hasPlugin(pluginField, name) {
@@ -190,6 +198,10 @@ function main() {
 }
 
 try {
+  const args = parseArgs(process.argv.slice(2));
+  if (shouldRunInWsl(args)) {
+    process.exit(runOhLangfuseInWsl(args, ["npx", "-y", "oh-langfuse@latest", "check", "opencode"]));
+  }
   main();
 } catch (e) {
   console.error(e?.message || String(e));

package/scripts/opencode-langfuse-setup.mjs

@@ -1,7 +1,9 @@
 import fs from "node:fs";
-import path from "node:path";
-import os from "node:os";
+import path from "node:path";
+import os from "node:os";
 import { spawn, spawnSync } from "node:child_process";
+import { parseJsonRelaxed, stripBom } from "./json-utils.mjs";
+import { runOhLangfuseInWsl, shouldRunInWsl } from "./wsl-utils.mjs";
 
 function parseArgs(argv) {
   const args = {};
@@ -21,18 +23,12 @@ function ensureDir(p) {
   fs.mkdirSync(p, { recursive: true });
 }
 
-function stripBom(s) {
-  if (typeof s !== "string" || s.length === 0) return s;
-  // Handle UTF-8 BOM (U+FEFF) which breaks JSON.parse on some files.
-  return s.charCodeAt(0) === 0xfeff ? s.slice(1) : s;
-}
-
-function readJsonIfExists(p) {
-  if (!fs.existsSync(p)) return null;
-  const txt = stripBom(fs.readFileSync(p, "utf8"));
-  if (!txt.trim()) return null;
-  return JSON.parse(txt);
-}
+function readJsonIfExists(p) {
+  if (!fs.existsSync(p)) return null;
+  const txt = stripBom(fs.readFileSync(p, "utf8"));
+  if (!txt.trim()) return null;
+  return parseJsonRelaxed(txt, p);
+}
 
 function writeJsonPretty(p, obj) {
   fs.writeFileSync(p, JSON.stringify(obj, null, 2) + os.EOL, "utf8");
@@ -420,8 +416,26 @@ function updateShellConfig({ publicKey, secretKey, baseUrl, userId }) {
 }
 
 async function main() {
-  const args = parseArgs(process.argv.slice(2));
-  const setEnv = !args["no-set-env"];
+  const args = parseArgs(process.argv.slice(2));
+  if (shouldRunInWsl(args)) {
+    const forwarded = [
+      "npx",
+      "-y",
+      "oh-langfuse@latest",
+      "setup",
+      "opencode",
+      ...(args.langfuseBaseUrl ? [`--langfuseBaseUrl=${args.langfuseBaseUrl}`] : []),
+      ...(args.publicKey ? [`--publicKey=${args.publicKey}`] : []),
+      ...(args.secretKey ? [`--secretKey=${args.secretKey}`] : []),
+      ...(args.userId || args.userid ? [`--userId=${args.userId || args.userid}`] : []),
+      ...(args.npmRegistry ? [`--npmRegistry=${args.npmRegistry}`] : []),
+      ...(args["no-set-env"] ? ["--no-set-env"] : []),
+      ...(args["skip-plugin-install"] ? ["--skip-plugin-install"] : [])
+    ];
+    process.exit(runOhLangfuseInWsl(args, forwarded));
+  }
+
+  const setEnv = !args["no-set-env"];
   const skipPluginInstall =
     !!(args["skip-plugin-install"] || args.skipNpmInstall || process.env.OPENCODE_SKIP_PLUGIN_INSTALL);
 

package/scripts/wsl-utils.mjs

@@ -0,0 +1,39 @@
+import { spawnSync } from "node:child_process";
+
+export function shouldRunInWsl(args) {
+  return process.platform === "win32" && !!(args.wsl || args.wslDistro || args["wsl-distro"]);
+}
+
+function wslDistro(args) {
+  if (typeof args.wsl === "string" && args.wsl.trim() && args.wsl.trim().toLowerCase() !== "true") {
+    return args.wsl.trim();
+  }
+  if (typeof args.wslDistro === "string" && args.wslDistro.trim()) return args.wslDistro.trim();
+  if (typeof args["wsl-distro"] === "string" && args["wsl-distro"].trim()) return args["wsl-distro"].trim();
+  return "";
+}
+
+function shQuote(value) {
+  return `'${String(value).replace(/'/g, "'\"'\"'")}'`;
+}
+
+export function runOhLangfuseInWsl(args, ohLangfuseArgs) {
+  const distro = wslDistro(args);
+  const wslArgs = [];
+  if (distro) wslArgs.push("-d", distro);
+  wslArgs.push("--", "sh", "-lc", ohLangfuseArgs.map(shQuote).join(" "));
+
+  console.log(
+    distro
+      ? `Forwarding OpenCode Langfuse command to WSL distro: ${distro}`
+      : "Forwarding OpenCode Langfuse command to the default WSL distro"
+  );
+
+  const r = spawnSync("wsl.exe", wslArgs, { stdio: "inherit", windowsHide: true });
+  if (r.error) {
+    console.error(r.error.message);
+    console.error("WSL is not available from this Windows session. Run the same oh-langfuse command inside WSL instead.");
+    return 1;
+  }
+  return r.status ?? 1;
+}