oh-langfuse 0.1.33 → 0.1.35

package/README.md

@@ -2,7 +2,7 @@
 
 `oh-langfuse` 是用于给 Claude Code、OpenCode 和 Codex 配置 Langfuse 追踪的命令行工具。它提供交互式安装向导，也支持 `setup` / `check` 直接命令，方便在用户机器上安装、修复和校验配置。
 
-当前 npm 版本：`0.1.33`
+当前 npm 版本：`0.1.35`
 
 ## 能做什么
 
@@ -40,6 +40,8 @@ npx oh-langfuse@latest check codex
 
 OpenCode 生成的 `launch-opencode-langfuse.*` 会在启动 agent 前执行一次更新检测：如果 npm 上的 `oh-langfuse@latest` 高于本机 runtime 版本，会提示是否更新；用户确认后才会运行 `npx oh-langfuse@latest update opencode`。Claude Code 和 Codex 也会生成对应 launcher：
 
+OpenCode setup 还会生成 `~/.config/opencode/bin/opencode` / `opencode.cmd` 命令包装器，并把该目录写入用户 PATH。新开终端后直接运行 `opencode`，也会先检测 `oh-langfuse` runtime 是否需要更新，再转发到真实 OpenCode CLI。
+
 - `~/.claude/launch-claude-langfuse.cmd` / `~/.claude/launch-claude-langfuse.sh`
 - `~/.codex/launch-codex-langfuse.cmd` / `~/.codex/launch-codex-langfuse.sh`
 
@@ -53,22 +55,23 @@ npx oh-langfuse@latest auto-update codex
 
 ## Skill 使用量统计
 
-工具会为每次识别到的 skill 使用额外写入一条 observation：
+工具会为每次识别到的 skill 使用额外写入一条通用 observation，skill 名称放在 metadata 中：
 
 ```text
-Skill Use / <skill_name>
+Observation Name: Skill Use
+metadata.skill_name: <skill_name>
+metadata.skill_use_count: 1
 ```
 
-Dashboard 中统计各 skill 使用量可配置：
+Dashboard 中统计全部 skill 使用量可配置：
 
 ```text
 View: Observations
 Metric: Count
-Filter: Observation Name contains Skill Use /
-Breakdown Dimension: Observation Name
+Filter: Observation Name equals Skill Use
 ```
 
-`AI Interaction` 仍然保留 `skill_use_count`、`skill_names`、`skill_names_json` 和 `skill_names_csv`，用于查看单次交互的效率汇总。为避免极端情况下产生过多 observation，OpenCode 每次交互最多记录 20 个去重后的 skill 使用事件。
+如果当前 Langfuse Dashboard 支持 metadata 维度，可用 `metadata.skill_name` 做 Breakdown 来看各 skill 使用量；否则可用 Metrics API 或导出数据按 `metadata.skill_name` 聚合。`AI Interaction` 仍然保留 `skill_use_count`、`skill_names`、`skill_names_json` 和 `skill_names_csv`，用于查看单次交互的效率汇总。为避免极端情况下产生过多 observation，OpenCode 每次交互最多记录 20 个去重后的 skill 使用事件。
 
 本地开发运行：
 

package/codex_langfuse_notify.py

@@ -655,7 +655,7 @@ def emit_codex_turn(
 
             for skill in skill_usages:
                 with langfuse.start_as_current_observation(
-                    name=f"Skill Use / {skill['name']}",
+                    name="Skill Use",
                     metadata={
                         "source": "codex",
                         "user_id": user_id or "",

package/langfuse_hook.py

@@ -689,7 +689,7 @@ def emit_turn(
 
             for skill in skill_usages:
                 with langfuse.start_as_current_observation(
-                    name=f"Skill Use / {skill['name']}",
+                    name="Skill Use",
                     metadata={
                         "source": "claude",
                         "user_id": user_id or "",

package/package.json

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

package/scripts/opencode-langfuse-setup.mjs

@@ -6,6 +6,7 @@ import { fileURLToPath } from "node:url";
 import { parseJsonRelaxed, stripBom } from "./json-utils.mjs";
 import { shouldSuppressAgentLogLine } from "./log-filter-utils.mjs";
 import { writeRuntimeInstallRecord } from "./runtime-state-utils.mjs";
+import { resolveOpencodeCli } from "./resolve-opencode-cli.mjs";
 
 const USER_ID_PATTERN = /^[a-z](?:\d{8}|wx\d{7})$/;
 const USER_ID_PATTERN_TEXT = "^[a-z](?:\\d{8}|wx\\d{7})$";
@@ -101,9 +102,13 @@ function removePlugins(existing, names) {
   return [];
 }
 
-function psQuote(s) {
-  return `'${String(s).replace(/'/g, "''")}'`;
-}
+function psQuote(s) {
+  return `'${String(s).replace(/'/g, "''")}'`;
+}
+
+function cmdQuote(s) {
+  return `"${String(s).replace(/"/g, '""')}"`;
+}
 
 function writeLangfusePluginUserConfig({ userId }) {
   const home = os.homedir();
@@ -463,7 +468,7 @@ function getPatchedLangfuseDistIndexJs() {
     "  };",
     "  const emitSkillUseSpans = ({ skillNames, sessionId, messageId, interactionId }) => {",
     "    for (const skillName of skillNames.slice(0, MAX_SKILL_USE_SPANS_PER_INTERACTION)) {",
-    "      const span = metricsTracer.startSpan(`Skill Use / ${skillName}`);",
+    "      const span = metricsTracer.startSpan('Skill Use');",
     '      span.setAttribute("oh.langfuse.source", "opencode");',
     '      span.setAttribute("oh.langfuse.user_id", userId || "");',
     '      span.setAttribute("oh.langfuse.metrics_schema_version", "1.0");',
@@ -605,6 +610,48 @@ function shQuote(s) {
   return `'${String(s).replace(/'/g, "'\"'\"'")}'`;
 }
 
+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("where npx >nul 2>nul");
+    cmd.push("if %ERRORLEVEL% EQU 0 (");
+    cmd.push("  call npx -y oh-langfuse@latest auto-update opencode --skip-check");
+    cmd.push(")");
+    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",
+    `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,
+    'if command -v npx >/dev/null 2>&1; then',
+    '  npx -y oh-langfuse@latest auto-update opencode --skip-check || true',
+    "fi",
+    `exec ${shQuote(realOpencodeCli)} "$@"`,
+    ""
+  ].filter(Boolean);
+  fs.writeFileSync(shim, lines.join("\n"), "utf8");
+  fs.chmodSync(shim, 0o755);
+  return { shim, shimDir };
+}
+
 function writeUnixLauncherSh(opencodeDir, { publicKey, secretKey, baseUrl, userId }) {
   if (process.platform === "win32") return null;
   const p = path.join(opencodeDir, "launch-opencode-langfuse.sh");
@@ -733,13 +780,29 @@ function runNpmInstallCapture(npmArgs) {
   });
 }
 
+function npmInstallLooksLikeMissingVersion(result) {
+  const text = `${result?.stdout || ""}\n${result?.stderr || ""}\n${result?.error?.message || ""}`.toLowerCase();
+  return text.includes("etarget") || text.includes("notarget") || text.includes("no matching version found");
+}
+
+function isOfficialNpmRegistry(registry) {
+  return /^https?:\/\/registry\.npmjs\.org\/?$/i.test(String(registry || "").trim());
+}
+
 async function runNpmInstallOrThrow({ opencodeDir, pkgName = "opencode-plugin-langfuse", npmRegistry = "" }) {
-  const npmArgs = ["install", pkgName, "--prefix", opencodeDir];
+  const npmArgs = ["install", pkgName, "--prefix", opencodeDir, "--package-lock=false", "--no-save"];
   if (npmRegistry) npmArgs.push("--registry", npmRegistry);
   const cliJs = getNpmCliJsPath();
   console.log(`使用 npm：${fs.existsSync(cliJs) ? `node ${cliJs}` : getNpmExecutable()}`);
   console.log("Installing OpenCode Langfuse plugin. This can take a few minutes on slow networks...");
-  const r = await runNpmInstallCapture(npmArgs);
+  let r = await runNpmInstallCapture(npmArgs);
+  if (!r.error && r.status !== 0 && npmInstallLooksLikeMissingVersion(r) && !isOfficialNpmRegistry(npmRegistry)) {
+    console.error("");
+    console.error("npm registry appears to be missing a package version. Retrying with https://registry.npmjs.org/ ...");
+    const retryArgs = ["install", pkgName, "--prefix", opencodeDir, "--package-lock=false", "--no-save", "--registry", "https://registry.npmjs.org/"];
+    r = await runNpmInstallCapture(retryArgs);
+    if (!r.error && r.status === 0) return;
+  }
   if (!r.error && r.status === 0) return;
   printNpmDiagnostics();
   const npmLabel = fs.existsSync(cliJs) ? `node ${cliJs}` : getNpmExecutable();
@@ -749,18 +812,45 @@ async function runNpmInstallOrThrow({ opencodeDir, pkgName = "opencode-plugin-la
   );
 }
 
-function setWindowsUserEnv({ publicKey, secretKey, baseUrl }) {
-  const cmd = [
+function setWindowsUserEnv({ publicKey, secretKey, baseUrl }) {
+  const cmd = [
     "$ErrorActionPreference = 'Stop';",
     `[Environment]::SetEnvironmentVariable('LANGFUSE_PUBLIC_KEY', ${psQuote(publicKey)}, 'User');`,
     `[Environment]::SetEnvironmentVariable('LANGFUSE_SECRET_KEY', ${psQuote(secretKey)}, 'User');`,
     `[Environment]::SetEnvironmentVariable('LANGFUSE_BASEURL', ${psQuote(baseUrl)}, 'User');`
   ].join(" ");
   const r = spawnSync("powershell", ["-NoProfile", "-Command", cmd], { stdio: "inherit" });
-  if (r.status !== 0) {
-    throw new Error("写入用户级环境变量失败（PowerShell SetEnvironmentVariable）。");
-  }
-}
+  if (r.status !== 0) {
+    throw new Error("写入用户级环境变量失败（PowerShell SetEnvironmentVariable）。");
+  }
+}
+
+function prependWindowsUserPath(dir) {
+  if (process.platform !== "win32") return false;
+  const cmd = [
+    "$ErrorActionPreference = 'Stop';",
+    `$dir = ${psQuote(dir)};`,
+    "$current = [Environment]::GetEnvironmentVariable('Path', 'User');",
+    "$parts = @();",
+    "if ($current) { $parts = $current -split ';' | Where-Object { $_ -and $_.Trim() } }",
+    "$exists = $false;",
+    "foreach ($part in $parts) { if ([string]::Equals($part.TrimEnd('\\'), $dir.TrimEnd('\\'), [StringComparison]::OrdinalIgnoreCase)) { $exists = $true } }",
+    "if (-not $exists) {",
+    "  $next = (@($dir) + $parts) -join ';';",
+    "  [Environment]::SetEnvironmentVariable('Path', $next, 'User');",
+    "}"
+  ].join(" ");
+  const r = spawnSync("powershell", ["-NoProfile", "-Command", cmd], { stdio: "inherit" });
+  if (r.status !== 0) {
+    throw new Error("写入用户 PATH 失败：无法把 OpenCode Langfuse shim 加入 PATH。");
+  }
+  const currentParts = String(process.env.PATH || "").split(path.delimiter);
+  const normalized = dir.replace(/[\\/]+$/, "").toLowerCase();
+  if (!currentParts.some((part) => part && part.replace(/[\\/]+$/, "").toLowerCase() === normalized)) {
+    process.env.PATH = `${dir}${path.delimiter}${process.env.PATH || ""}`;
+  }
+  return true;
+}
 
 function getShellConfigPath() {
   const shell = process.env.SHELL || "/bin/bash";
@@ -770,7 +860,7 @@ function getShellConfigPath() {
   return path.join(os.homedir(), ".bashrc");
 }
 
-function updateShellConfig({ publicKey, secretKey, baseUrl, userId }) {
+function updateShellConfig({ publicKey, secretKey, baseUrl, userId, pathPrepend = "" }) {
   const configPath = getShellConfigPath();
   const marker = "# === Langfuse OpenCode Setup ===";
   const endMarker = "# === End Langfuse OpenCode Setup ===";
@@ -793,11 +883,12 @@ function updateShellConfig({ publicKey, secretKey, baseUrl, userId }) {
   const envBlock = [
     "",
     marker,
-    `export LANGFUSE_PUBLIC_KEY="${publicKey}"`,
-    `export LANGFUSE_SECRET_KEY="${secretKey}"`,
-    `export LANGFUSE_BASEURL="${baseUrl}"`,
-    userId ? `export LANGFUSE_USER_ID="${userId}"` : null,
-    endMarker,
+    `export LANGFUSE_PUBLIC_KEY="${publicKey}"`,
+    `export LANGFUSE_SECRET_KEY="${secretKey}"`,
+    `export LANGFUSE_BASEURL="${baseUrl}"`,
+    userId ? `export LANGFUSE_USER_ID="${userId}"` : null,
+    pathPrepend ? `export PATH="${pathPrepend}:$PATH"` : null,
+    endMarker,
     ""
   ].filter(Boolean).join("\n");
 
@@ -888,7 +979,15 @@ async function main() {
     plugin: mergePluginList(basePlugins, langfusePluginPath)
   };
   const merged = deepMerge(existing, desired);
-  writeJsonPretty(opencodeJsonPath, merged);
+  writeJsonPretty(opencodeJsonPath, merged);
+  let realOpencodeCli = resolveOpencodeCli(args.cmd);
+  const shimDir = path.join(opencodeDir, "bin");
+  if (realOpencodeCli) {
+    const relativeToShim = path.relative(path.resolve(shimDir), path.resolve(realOpencodeCli));
+    if (relativeToShim && !relativeToShim.startsWith("..") && !path.isAbsolute(relativeToShim)) {
+      realOpencodeCli = "";
+    }
+  }
   console.log(`已更新：${opencodeJsonPath}`);
 
   const launcher = writeWindowsLauncherCmd(opencodeDir, { publicKey, secretKey, baseUrl, userId });
@@ -902,6 +1001,15 @@ async function main() {
     printCommandHint("如果新终端仍读不到环境变量，可运行：", unixLauncher);
   }
 
+  let opencodeShim = null;
+  if (realOpencodeCli) {
+    opencodeShim = writeOpencodeCommandShim(opencodeDir, { publicKey, secretKey, baseUrl, userId, realOpencodeCli });
+    console.log(`OpenCode command shim ready: ${opencodeShim.shim}`);
+    console.log(`Real OpenCode CLI: ${realOpencodeCli}`);
+  } else {
+    console.log("OpenCode CLI not found; skipped opencode command shim.");
+  }
+
   let shellConfigPathWritten = "";
   if (setEnv) {
     if (process.platform === "win32") {
@@ -912,12 +1020,16 @@ async function main() {
           "$ErrorActionPreference = 'Stop';",
           `[Environment]::SetEnvironmentVariable('LANGFUSE_USER_ID', ${psQuote(userId)}, 'User');`
         ].join(" ");
-        spawnSync("powershell", ["-NoProfile", "-Command", cmd], { stdio: "inherit" });
-      }
+        spawnSync("powershell", ["-NoProfile", "-Command", cmd], { stdio: "inherit" });
+      }
+      if (opencodeShim?.shimDir) {
+        prependWindowsUserPath(opencodeShim.shimDir);
+        console.log(`已将 OpenCode Langfuse shim 加入用户 PATH：${opencodeShim.shimDir}`);
+      }
       console.log("提示：新开一个终端后环境变量才会对应用生效。");
     } else {
       console.log("正在写入环境变量到 shell 配置文件 …");
-      const configPath = updateShellConfig({ publicKey, secretKey, baseUrl, userId });
+      const configPath = updateShellConfig({ publicKey, secretKey, baseUrl, userId, pathPrepend: opencodeShim?.shimDir || "" });
       shellConfigPathWritten = configPath;
       console.log(`已更新：${configPath}`);