oh-langfuse 0.1.16 → 0.1.17

package/README.md

@@ -109,19 +109,18 @@ Langfuse 配置启动 OpenCode。安装器可以读取带注释或尾随逗号
 此时配置会写入 WSL 用户自己的 `$HOME/.config/opencode`：
 
 ```bash
-npx oh-langfuse@latest setup opencode --userId=h00613222
+npx oh-langfuse@latest setup opencode --userId=h00613222 --yes
 npx oh-langfuse@latest check opencode
 ```
 
+安装完成后会自动执行一次 `check opencode`。如果检查提示当前终端缺少
+`LANGFUSE_*`，请新开一个 WSL 终端，或执行安装器提示的 `source ~/.bashrc`
+/ `source ~/.zshrc`，也可以直接使用生成的
+`~/.config/opencode/launch-opencode-langfuse.sh` 启动 OpenCode。
+
 如果 `opencode.json` 原本是 JSONC 风格（例如带注释或尾随逗号），安装器会先兼容读取，
 再写回标准 JSON。
 
-如果你确实是在 Windows PowerShell 里远程配置 WSL，才需要使用 `--wsl`：
-
-```bash
-npx oh-langfuse@latest setup opencode --wsl=Ubuntu --userId=h00613222
-```
-
 ### Codex
 
 安装 `codex_langfuse_notify.py`，创建 `~/.codex/langfuse-venv`，安装 Python

package/bin/cli.js

@@ -451,22 +451,27 @@ async function askMultiChoice(rl, label, choices, options = {}) {
     .map((idx) => choices[idx].value);
 }
 
-function langfuseConfig() {
-  return {
-    baseUrl: envDefault("LANGFUSE_BASEURL", envDefault("LANGFUSE_HOST", DEFAULT_LANGFUSE_BASE_URL)),
-    publicKey: envDefault("LANGFUSE_PUBLIC_KEY", DEFAULT_LANGFUSE_PUBLIC_KEY),
-    secretKey: envDefault("LANGFUSE_SECRET_KEY", DEFAULT_LANGFUSE_SECRET_KEY),
-    userId: envDefault("LANGFUSE_USER_ID", envDefault("CC_USER_ID", ""))
-  };
-}
-
-async function collectLangfuseConfig(rl, { requireUserId = false } = {}) {
-  const config = langfuseConfig();
-  renderSection("Langfuse Target", [
-    labelValue("Base URL", config.baseUrl, t.teal),
-    labelValue("Public Key", config.publicKey, t.blue),
-    labelValue("Secret Key", "configured", t.teal)
-  ]);
+function langfuseConfig(overrides = {}) {
+  const config = {
+    baseUrl: envDefault("LANGFUSE_BASEURL", envDefault("LANGFUSE_HOST", DEFAULT_LANGFUSE_BASE_URL)),
+    publicKey: envDefault("LANGFUSE_PUBLIC_KEY", DEFAULT_LANGFUSE_PUBLIC_KEY),
+    secretKey: envDefault("LANGFUSE_SECRET_KEY", DEFAULT_LANGFUSE_SECRET_KEY),
+    userId: envDefault("LANGFUSE_USER_ID", envDefault("CC_USER_ID", ""))
+  };
+  for (const [key, value] of Object.entries(overrides)) {
+    if (hasValue(value)) config[key] = value;
+  }
+  return config;
+}
+
+async function collectLangfuseConfig(rl, { requireUserId = false, overrides = {} } = {}) {
+  const config = langfuseConfig(overrides);
+  renderSection("Langfuse Target", [
+    labelValue("Base URL", config.baseUrl, t.teal),
+    labelValue("Public Key", config.publicKey, t.blue),
+    labelValue("Secret Key", "configured", t.teal)
+  ]);
+  if (requireUserId && hasValue(config.userId)) return config;
   config.userId = await askText(rl, "User ID / employee number, for example h00613222", {
     defaultValue: requireUserId ? "" : config.userId,
     required: requireUserId
@@ -474,11 +479,11 @@ async function collectLangfuseConfig(rl, { requireUserId = false } = {}) {
   return config;
 }
 
-async function collectSharedConfig(rl, options) {
-  clearScreen();
-  renderBrand(options);
-  return await collectLangfuseConfig(rl, { requireUserId: true });
-}
+async function collectSharedConfig(rl, options) {
+  clearScreen();
+  renderBrand(options);
+  return await collectLangfuseConfig(rl, { requireUserId: true, overrides: options.configOverrides });
+}
 
 function commonLangfuseArgs(config) {
   return [
@@ -493,27 +498,22 @@ 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) {
+async function confirmAction(rl, title, rows, options) {
   clearScreen();
   renderBrand(options);
   renderSection(title, rows);
-  if (options.dryRun) return true;
+  if (options.dryRun || options.yes) return true;
   console.log("");
   return await askYesNo(rl, "Continue with these changes", { defaultValue: true });
 }
 
-async function setupClaude(rl, options) {
-  while (!(await ensureEnvironment(rl, "claude", options))) {}
-  clearScreen();
-  renderBrand(options);
-  const config = options.config || (await collectLangfuseConfig(rl, { requireUserId: true }));
+async function setupClaude(rl, options) {
+  if (!options.dryRun) {
+    while (!(await ensureEnvironment(rl, "claude", options))) {}
+  }
+  clearScreen();
+  renderBrand(options);
+  const config = options.config || (await collectLangfuseConfig(rl, { requireUserId: true, overrides: options.configOverrides }));
   const defaultHook = path.join(rootDir, "langfuse_hook.py");
   const pyPath = fs.existsSync(defaultHook) ? defaultHook : path.join(rootDir, "langfuse_hook.py");
 
@@ -528,26 +528,29 @@ async function setupClaude(rl, options) {
       labelValue("Python package", "langfuse", t.gold)
     ],
     options
-  );
-  if (!ok) return 0;
-  return runNodeScript("langfuse-setup.mjs", args, options);
-}
-
+  );
+  if (!ok) return 0;
+  const code = runNodeScript("langfuse-setup.mjs", args, options);
+  if (code === 0 && !options.dryRun && !options.skipCheck) return checkClaude(options, { clear: false });
+  return code;
+}
+
 async function setupOpenCode(rl, options) {
-  while (!(await ensureEnvironment(rl, "opencode", options))) {}
-  clearScreen();
-  renderBrand(options);
-  const config = options.config || (await collectLangfuseConfig(rl, { requireUserId: true }));
-  const setEnv = true;
-  const installPlugin = true;
-  const cliPath = "";
+  if (!options.dryRun) {
+    while (!(await ensureEnvironment(rl, "opencode", options))) {}
+  }
+  clearScreen();
+  renderBrand(options);
+  const config = options.config || (await collectLangfuseConfig(rl, { requireUserId: true, overrides: options.configOverrides }));
+  const setEnv = !options.noSetEnv;
+  const installPlugin = !options.skipPluginInstall;
+  const cliPath = options.cmd || "";
 
   const args = [
     ...commonLangfuseArgs(config),
     ...(hasValue(options.npmRegistry) ? [`--npmRegistry=${options.npmRegistry}`] : []),
-    ...opencodePlatformArgs(options),
     ...(!setEnv ? ["--no-set-env"] : []),
-    ...(!installPlugin ? ["--skip-plugin-install"] : []),
+    ...(!installPlugin ? ["--skip-plugin-install"] : []),
     ...(hasValue(cliPath) ? [`--cmd=${cliPath}`] : [])
   ];
   const ok = await confirmAction(
@@ -555,23 +558,27 @@ async function setupOpenCode(rl, options) {
     "OpenCode Langfuse Setup",
     [
       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("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("Target runtime", options.wsl ? `WSL${typeof options.wsl === "string" ? ` (${options.wsl})` : ""}` : "current OS", t.violet),
+      labelValue("Target runtime", "current shell", t.violet),
       labelValue("Config file", "~/.config/opencode/opencode.json", t.violet)
     ],
     options
-  );
-  if (!ok) return 0;
-  return runNodeScript("opencode-langfuse-setup.mjs", args, options);
-}
-
-async function setupCodex(rl, options) {
-  while (!(await ensureEnvironment(rl, "codex", options))) {}
-  clearScreen();
-  renderBrand(options);
-  const config = options.config || (await collectLangfuseConfig(rl, { requireUserId: true }));
+  );
+  if (!ok) return 0;
+  const code = runNodeScript("opencode-langfuse-setup.mjs", args, options);
+  if (code === 0 && !options.dryRun && !options.skipCheck) return checkOpenCode(options, { clear: false });
+  return code;
+}
+
+async function setupCodex(rl, options) {
+  if (!options.dryRun) {
+    while (!(await ensureEnvironment(rl, "codex", options))) {}
+  }
+  clearScreen();
+  renderBrand(options);
+  const config = options.config || (await collectLangfuseConfig(rl, { requireUserId: true, overrides: options.configOverrides }));
   const defaultHook = path.join(rootDir, "codex_langfuse_notify.py");
   const pyPath = fs.existsSync(defaultHook) ? defaultHook : path.join(rootDir, "codex_langfuse_notify.py");
 
@@ -586,10 +593,12 @@ async function setupCodex(rl, options) {
       labelValue("Python package", "langfuse", t.gold)
     ],
     options
-  );
-  if (!ok) return 0;
-  return runNodeScript("codex-langfuse-setup.mjs", args, options);
-}
+  );
+  if (!ok) return 0;
+  const code = runNodeScript("codex-langfuse-setup.mjs", args, options);
+  if (code === 0 && !options.dryRun && !options.skipCheck) return checkCodex(options, { clear: false });
+  return code;
+}
 
 function checkClaude(options, { clear = true } = {}) {
   if (clear) clearScreen();
@@ -600,7 +609,7 @@ function checkClaude(options, { clear = true } = {}) {
 function checkOpenCode(options, { clear = true } = {}) {
   if (clear) clearScreen();
   renderBrand(options);
-  return runNodeScript("opencode-langfuse-check.mjs", opencodePlatformArgs(options), options);
+  return runNodeScript("opencode-langfuse-check.mjs", [], options);
 }
 
 function checkCodex(options, { clear = true } = {}) {
@@ -713,9 +722,14 @@ 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("--userId=ID", t.gold)}  Provide the Langfuse user id without prompting.`,
+    `${paint("--langfuseBaseUrl=URL", t.gold)}  Override the Langfuse base URL.`,
+    `${paint("--publicKey=KEY", t.gold)}  Override the Langfuse public key.`,
+    `${paint("--secretKey=KEY", t.gold)}  Override the Langfuse secret key.`,
+    `${paint("--yes", t.gold)}  Accept setup changes without the confirmation prompt.`,
     `${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("--skip-check", t.gold)}  Do not run the target check after a successful setup.`,
     `${paint("--help", t.gold)}     Show this help.`
   ]);
 }
@@ -724,10 +738,19 @@ 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 || ""
+    pipIndexUrl: args.pipIndexUrl || "",
+    yes: !!(args.yes || args.y),
+    noSetEnv: !!args["no-set-env"],
+    skipPluginInstall: !!(args["skip-plugin-install"] || args.skipNpmInstall),
+    skipCheck: !!args["skip-check"],
+    cmd: args.cmd || "",
+    configOverrides: {
+      baseUrl: args.langfuseBaseUrl || args.langfuseHost || args.host || "",
+      publicKey: args.publicKey || "",
+      secretKey: args.secretKey || "",
+      userId: args.userId || args.userid || ""
+    }
   };
   const [cmd, target] = args._;
 

package/package.json

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

package/scripts/opencode-langfuse-check.mjs

@@ -2,7 +2,6 @@ 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) {
   const args = {};
@@ -198,10 +197,7 @@ function main() {
 }
 
 try {
-  const args = parseArgs(process.argv.slice(2));
-  if (shouldRunInWsl(args)) {
-    process.exit(runOhLangfuseInWsl(args, ["npx", "-y", "oh-langfuse@latest", "check", "opencode"]));
-  }
+  parseArgs(process.argv.slice(2));
   main();
 } catch (e) {
   console.error(e?.message || String(e));

package/scripts/opencode-langfuse-setup.mjs

@@ -3,7 +3,6 @@ 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 = {};
@@ -438,23 +437,6 @@ function updateShellConfig({ publicKey, secretKey, baseUrl, userId }) {
 
 async function main() {
   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 =
@@ -546,7 +528,8 @@ async function main() {
     printCommandHint("如果新终端仍读不到环境变量，可运行：", unixLauncher);
   }
 
-  if (setEnv) {
+  let shellConfigPathWritten = "";
+  if (setEnv) {
     if (process.platform === "win32") {
       console.log("写入用户级环境变量：LANGFUSE_PUBLIC_KEY / LANGFUSE_SECRET_KEY / LANGFUSE_BASEURL …");
       setWindowsUserEnv({ publicKey, secretKey, baseUrl: baseUrl });
@@ -560,7 +543,8 @@ async function main() {
       console.log("提示：新开一个终端后环境变量才会对应用生效。");
     } else {
       console.log("正在写入环境变量到 shell 配置文件 …");
-      const configPath = updateShellConfig({ publicKey, secretKey, baseUrl, userId });
+      const configPath = updateShellConfig({ publicKey, secretKey, baseUrl, userId });
+      shellConfigPathWritten = configPath;
       console.log(`已更新：${configPath}`);
 
       // 自动 source 配置文件
@@ -580,9 +564,21 @@ async function main() {
 
   console.log(paint("完成。", colors.green, colors.bold));
   printCommandHint("可运行以下命令校验：", "npx oh-langfuse@latest check opencode");
+  if (process.platform !== "win32") {
+    console.log("");
+    console.log("Important for WSL/Linux:");
+    console.log("This installer wrote LANGFUSE_* to your shell rc file, but it cannot update an already-open parent shell.");
+    if (shellConfigPathWritten) {
+      printCommandHint("Before starting OpenCode from this same terminal, run:", `source ${shellConfigPathWritten}`);
+    }
+    if (unixLauncher) {
+      printCommandHint("Or start OpenCode with the generated launcher:", unixLauncher);
+    }
+    console.log("Opening a new WSL terminal also loads the variables for normal shell setups.");
+  }
 }
-
-try {
+
+try {
   await main();
 } catch (e) {
   console.error(e?.message || String(e));

package/scripts/wsl-utils.mjs

@@ -1,39 +0,0 @@
-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;
-}