oh-langfuse 0.1.21 → 0.1.22

package/README.md

@@ -2,7 +2,7 @@
 
 `oh-langfuse` 是用于给 Claude Code、OpenCode 和 Codex 配置 Langfuse 追踪的命令行工具。它提供交互式安装向导，也支持 `setup` / `check` 直接命令，方便在用户机器上安装、修复和校验配置。
 
-当前 npm 版本：`0.1.21`
+当前 npm 版本：`0.1.22`
 
 ## 能做什么
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oh-langfuse",
-  "version": "0.1.21",
+  "version": "0.1.22",
   "private": false,
   "type": "module",
   "description": "Use npm scripts to configure Claude Code / OpenCode / Codex with Langfuse tracing.",
@@ -20,16 +20,15 @@
     "scripts/opencode-langfuse-setup.mjs",
     "scripts/resolve-opencode-cli.mjs",
     "langfuse_hook.py",
-    "codex_langfuse_notify.py",
-    "README.md",
-    "CODEX_LANGFUSE_PLAN.md",
+    "codex_langfuse_notify.py",
+    "README.md",
+    "CODEX_LANGFUSE_PLAN.md",
     "setup-langfuse.bat",
     "setup-langfuse.sh"
   ],
   "scripts": {
     "start": "node bin/cli.js",
     "check": "node --check bin/cli.js",
-    "self:verify": "node scripts/real-self-verify.mjs",
     "pack:check": "npm pack --dry-run",
     "claude:setup": "node scripts/langfuse-setup.mjs",
     "claude:check": "node scripts/langfuse-check.mjs",

package/scripts/langfuse-check.mjs

@@ -14,6 +14,18 @@ function addResult(results, item, ok, detail, fix = "") {
   results.push({ item, ok, detail, fix });
 }
 
+function pythonExecutableInVenv(claudeDir) {
+  return process.platform === "win32"
+    ? path.join(claudeDir, "langfuse-venv", "Scripts", "python.exe")
+    : path.join(claudeDir, "langfuse-venv", "bin", "python");
+}
+
+function launcherPath(hooksDir) {
+  return process.platform === "win32"
+    ? path.join(hooksDir, "run-langfuse-hook.cmd")
+    : path.join(hooksDir, "run-langfuse-hook.sh");
+}
+
 function findLangfuseHook(settings) {
   const stopHooks = settings?.hooks?.Stop;
   if (!Array.isArray(stopHooks)) return null;
@@ -25,16 +37,14 @@ function findLangfuseHook(settings) {
       const command = typeof h.command === "string" ? h.command : "";
       const args = Array.isArray(h.args) ? h.args : [];
       const joined = [command, ...args].join(" ");
-      if (joined.includes("langfuse_hook.py")) return { command, args };
+      if (joined.includes("langfuse_hook.py") || joined.includes("run-langfuse-hook")) {
+        return { command, args };
+      }
     }
   }
   return null;
 }
 
-function hookUsesExecForm(hook) {
-  return !!(hook?.command && Array.isArray(hook.args) && hook.args.some((arg) => String(arg).includes("langfuse_hook.py")));
-}
-
 function pathExists(p) {
   return typeof p === "string" && p.length > 0 && fs.existsSync(p);
 }
@@ -56,15 +66,17 @@ function main() {
   const claudeDir = path.join(userHome, ".claude");
   const hooksDir = path.join(claudeDir, "hooks");
   const settingsPath = path.join(claudeDir, "settings.json");
+  const pyPath = path.join(hooksDir, "langfuse_hook.py");
+  const expectedLauncher = launcherPath(hooksDir);
+  const expectedPython = pythonExecutableInVenv(claudeDir);
   const logPath = path.join(claudeDir, "state", "langfuse_hook.log");
 
   const results = [];
 
   addResult(results, "Claude config dir", fs.existsSync(claudeDir), claudeDir, "Run: npx oh-langfuse@latest setup claude");
   addResult(results, "hooks dir", fs.existsSync(hooksDir), hooksDir, "Run setup again to install the hook script.");
-
-  const pyPath = path.join(hooksDir, "langfuse_hook.py");
   addResult(results, "hook script", fs.existsSync(pyPath), pyPath, "Run setup again to copy langfuse_hook.py.");
+  addResult(results, "hook launcher", fs.existsSync(expectedLauncher), expectedLauncher, "Run setup again to create the launcher script.");
 
   const settings = readJsonIfExists(settingsPath);
   addResult(results, "settings.json", !!settings, settingsPath, "Run setup again to write Claude settings.");
@@ -78,7 +90,6 @@ function main() {
     "CC_LANGFUSE_BASE_URL",
     "LANGFUSE_BASEURL"
   ];
-
   const missingEnv = neededEnv.filter((k) => !env || typeof env[k] === "undefined" || env[k] === "");
   addResult(
     results,
@@ -99,42 +110,31 @@ function main() {
   const hook = findLangfuseHook(settings);
   addResult(results, "hooks.Stop contains Langfuse", !!hook, hook ? "OK" : "missing", "Run setup again to register the Stop hook.");
 
-  const execFormOk = hookUsesExecForm(hook);
+  const launcherFormOk = !!hook && path.normalize(hook.command) === path.normalize(expectedLauncher) && !hook.args?.length;
   addResult(
     results,
     "hook command form",
-    process.platform === "win32" ? execFormOk : !!hook,
-    execFormOk ? "exec form command + args" : hook ? "legacy shell-form command" : "missing",
-    process.platform === "win32"
-      ? "Run setup again. Windows should use command plus args so paths are not parsed by Git Bash/PowerShell."
-      : "Run setup again to refresh the hook command."
+    launcherFormOk,
+    launcherFormOk ? "launcher command" : hook ? "legacy command form" : "missing",
+    "Run setup again. Claude Code should execute the generated run-langfuse-hook launcher directly."
   );
 
-  if (hook) {
-    addResult(
-      results,
-      "hook python executable",
-      pathExists(hook.command),
-      hook.command || "missing",
-      "Run setup again to recreate the Python venv and write an absolute python path."
-    );
-    const hookScriptPath = execFormOk ? String(hook.args.find((arg) => String(arg).includes("langfuse_hook.py")) || "") : pyPath;
-    addResult(
-      results,
-      "hook args script",
-      pathExists(hookScriptPath),
-      hookScriptPath || "missing",
-      "Run setup again so the hook args point at langfuse_hook.py."
-    );
-    const importCheck = checkPythonLangfuseImport(hook.command);
-    addResult(
-      results,
-      "python package langfuse",
-      importCheck.ok,
-      importCheck.detail,
-      `Run: ${hook.command} -m pip install -U langfuse`
-    );
-  }
+  addResult(
+    results,
+    "hook python executable",
+    pathExists(expectedPython),
+    expectedPython,
+    "Run setup again to recreate the Python venv."
+  );
+
+  const importCheck = checkPythonLangfuseImport(expectedPython);
+  addResult(
+    results,
+    "python package langfuse",
+    importCheck.ok,
+    importCheck.detail,
+    `Run: ${expectedPython} -m pip install -U langfuse`
+  );
 
   addResult(results, "hook log path", true, logPath);
 

package/scripts/langfuse-setup.mjs

@@ -127,15 +127,46 @@ function normalizeWinPathForClaude(p) {
   return p.replace(/\\/g, "/");
 }
 
-function quoteCommandArg(s) {
-  return `"${String(s).replace(/"/g, '\\"')}"`;
-}
-
-function pythonExecutableInVenv(venvDir) {
-  return process.platform === "win32"
-    ? path.join(venvDir, "Scripts", "python.exe")
-    : path.join(venvDir, "bin", "python");
-}
+function quoteCommandArg(s) {
+  return `"${String(s).replace(/"/g, '\\"')}"`;
+}
+
+function cmdQuote(s) {
+  return `"${String(s).replace(/"/g, '""')}"`;
+}
+
+function shQuote(s) {
+  return `'${String(s).replace(/'/g, "'\\''")}'`;
+}
+
+function pythonExecutableInVenv(venvDir) {
+  return process.platform === "win32"
+    ? path.join(venvDir, "Scripts", "python.exe")
+    : path.join(venvDir, "bin", "python");
+}
+
+async function createHookLauncher({ hooksDir, hookPython, pyPath }) {
+  if (process.platform === "win32") {
+    const launcher = path.join(hooksDir, "run-langfuse-hook.cmd");
+    const content = [
+      "@echo off",
+      `${cmdQuote(hookPython)} ${cmdQuote(pyPath)}`,
+      ""
+    ].join(os.EOL);
+    await fsp.writeFile(launcher, content, "utf8");
+    return launcher;
+  }
+
+  const launcher = path.join(hooksDir, "run-langfuse-hook.sh");
+  const content = [
+    "#!/usr/bin/env sh",
+    `exec ${shQuote(hookPython)} ${shQuote(pyPath)}`,
+    ""
+  ].join("\n");
+  await fsp.writeFile(launcher, content, "utf8");
+  fs.chmodSync(launcher, 0o755);
+  return launcher;
+}
 
 function createOrUpdateLangfuseVenv({ baseDir, pipIndexUrl = "https://pypi.tuna.tsinghua.edu.cn/simple" }) {
   const venvDir = path.join(baseDir, "langfuse-venv");
@@ -241,12 +272,13 @@ async function main() {
   const nextPyText = setOrReplaceUserId(pyText, userId);
   if (nextPyText !== pyText) {
     await fsp.writeFile(pyPath, nextPyText, "utf8");
-  }
+  }
   const hookPython = createOrUpdateLangfuseVenv({ baseDir: claudeDir, pipIndexUrl });
-
-  // 4) 合并写入 settings.json
-  const settingsPath = path.join(claudeDir, "settings.json");
-  const existing = readJsonIfExists(settingsPath) ?? {};
+  const hookLauncher = await createHookLauncher({ hooksDir, hookPython, pyPath });
+
+  // 4) 合并写入 settings.json
+  const settingsPath = path.join(claudeDir, "settings.json");
+  const existing = readJsonIfExists(settingsPath) ?? {};
 
   const desired = {
     env: {
@@ -267,8 +299,7 @@ async function main() {
           hooks: [
             {
               type: "command",
-              command: hookPython,
-              args: [pyPath]
+              command: hookLauncher
             }
           ]
         }