oh-langfuse 0.1.14 → 0.1.16

package/README.md

@@ -102,18 +102,21 @@ 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。
 
-如果你在 Windows 里执行安装命令、但实际在 WSL 里运行 OpenCode，请使用
-`--wsl` 将配置写入 WSL 的 `$HOME/.config/opencode`，而不是 Windows 的
-`C:\Users\<you>\.config\opencode`：
+如果你在 WSL 里运行 OpenCode，就在 WSL shell 里直接执行安装和检查命令。
+此时配置会写入 WSL 用户自己的 `$HOME/.config/opencode`：
 
 ```bash
-npx oh-langfuse@latest setup opencode --wsl --userId=h00613222
-npx oh-langfuse@latest check opencode --wsl
+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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oh-langfuse",
-  "version": "0.1.14",
+  "version": "0.1.16",
   "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,6 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import os from "node:os";
+import { parseJsonRelaxed, stripBom } from "./json-utils.mjs";
 import { runOhLangfuseInWsl, shouldRunInWsl } from "./wsl-utils.mjs";
 
 function parseArgs(argv) {
@@ -14,11 +15,6 @@ function parseArgs(argv) {
   return args;
 }
 
-function stripBom(s) {
-  if (typeof s !== "string" || s.length === 0) return s;
-  return s.charCodeAt(0) === 0xfeff ? s.slice(1) : s;
-}
-
 function readTextIfExists(p) {
   if (!fs.existsSync(p)) return "";
   return stripBom(fs.readFileSync(p, "utf8"));
@@ -27,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) {

package/scripts/opencode-langfuse-setup.mjs

@@ -2,6 +2,7 @@ import fs from "node:fs";
 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) {
@@ -22,26 +23,41 @@ 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 writeJsonPretty(p, obj) {
-  fs.writeFileSync(p, JSON.stringify(obj, null, 2) + os.EOL, "utf8");
-}
+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 isObject(x) {
-  return x && typeof x === "object" && !Array.isArray(x);
-}
+function writeJsonPretty(p, obj) {
+  fs.writeFileSync(p, JSON.stringify(obj, null, 2) + os.EOL, "utf8");
+}
+
+const colorEnabled = process.stdout.isTTY && process.env.NO_COLOR !== "1";
+const ansi = (code) => (colorEnabled ? `\x1b[${code}m` : "");
+const colors = {
+  reset: ansi(0),
+  bold: ansi(1),
+  cyan: ansi(36),
+  green: ansi(32),
+  yellow: ansi(33),
+  dim: ansi(2)
+};
+
+function paint(text, ...styles) {
+  if (!colorEnabled) return String(text);
+  return `${styles.join("")}${text}${colors.reset}`;
+}
+
+function printCommandHint(label, command) {
+  console.log(paint(label, colors.yellow, colors.bold));
+  console.log(`${paint(">", colors.green, colors.bold)} ${paint(command, colors.cyan, colors.bold)}`);
+}
+
+function isObject(x) {
+  return x && typeof x === "object" && !Array.isArray(x);
+}
 
 function deepMerge(target, src) {
   if (!isObject(target) || !isObject(src)) return src;
@@ -527,7 +543,7 @@ async function main() {
   const unixLauncher = writeUnixLauncherSh(opencodeDir, { publicKey, secretKey, baseUrl, userId });
   if (unixLauncher) {
     console.log(`已生成启动脚本（含 LANGFUSE 环境变量）：${unixLauncher}`);
-    console.log(`如果新终端仍读不到环境变量，可运行：${unixLauncher}`);
+    printCommandHint("如果新终端仍读不到环境变量，可运行：", unixLauncher);
   }
 
   if (setEnv) {
@@ -556,14 +572,14 @@ async function main() {
       if (r.status === 0) {
         console.log("环境变量已生效：");
         console.log(r.stdout);
-      } else {
-        console.log("提示：环境变量已写入配置文件，请运行以下命令使其生效：");
-        console.log(`source ${configPath}`);
-      }
-    }
-  }
-
-  console.log("完成。可运行：`npx oh-langfuse@latest check opencode` 校验。");
+      } else {
+        printCommandHint("提示：环境变量已写入配置文件，请运行以下命令使其生效：", `source ${configPath}`);
+      }
+    }
+  }
+
+  console.log(paint("完成。", colors.green, colors.bold));
+  printCommandHint("可运行以下命令校验：", "npx oh-langfuse@latest check opencode");
 }
 
 try {