oh-langfuse 0.1.79 → 0.1.80

package/scripts/langfuse-check.mjs

@@ -14,19 +14,19 @@ 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 fallbackPythonCommand() {
-  return process.platform === "win32" ? "python" : "python3";
-}
-
-function isolatedPythonPath(claudeDir) {
-  return path.join(claudeDir, "langfuse-python");
-}
+function pythonExecutableInVenv(claudeDir) {
+  return process.platform === "win32"
+    ? path.join(claudeDir, "langfuse-venv", "Scripts", "python.exe")
+    : path.join(claudeDir, "langfuse-venv", "bin", "python");
+}
+
+function fallbackPythonCommand() {
+  return process.platform === "win32" ? "python" : "python3";
+}
+
+function isolatedPythonPath(claudeDir) {
+  return path.join(claudeDir, "langfuse-python");
+}
 
 function launcherPath(hooksDir) {
   return process.platform === "win32"
@@ -71,18 +71,18 @@ function pathExists(p) {
   return typeof p === "string" && p.length > 0 && fs.existsSync(p);
 }
 
-function checkPythonLangfuseImport(pythonPath, extraPythonPath = "") {
-  if (!pathExists(pythonPath) && pythonPath !== "python3" && pythonPath !== "python") return { ok: false, detail: "python executable missing" };
-  const env = { ...process.env };
-  if (extraPythonPath) {
-    env.PYTHONPATH = process.env.PYTHONPATH ? `${extraPythonPath}${path.delimiter}${process.env.PYTHONPATH}` : extraPythonPath;
-  }
-  const result = spawnSync(pythonPath, ["-c", "import langfuse; print('OK')"], {
-    encoding: "utf8",
-    timeout: 15000,
-    windowsHide: true,
-    env
-  });
+function checkPythonLangfuseImport(pythonPath, extraPythonPath = "") {
+  if (!pathExists(pythonPath) && pythonPath !== "python3" && pythonPath !== "python") return { ok: false, detail: "python executable missing" };
+  const env = { ...process.env };
+  if (extraPythonPath) {
+    env.PYTHONPATH = process.env.PYTHONPATH ? `${extraPythonPath}${path.delimiter}${process.env.PYTHONPATH}` : extraPythonPath;
+  }
+  const result = spawnSync(pythonPath, ["-c", "import langfuse; print('OK')"], {
+    encoding: "utf8",
+    timeout: 15000,
+    windowsHide: true,
+    env
+  });
   if (result.status === 0) return { ok: true, detail: "OK" };
   const err = `${result.stderr || result.stdout || result.error?.message || "unknown error"}`.trim();
   return { ok: false, detail: err || "import failed" };
@@ -93,11 +93,11 @@ 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 fallbackTarget = isolatedPythonPath(claudeDir);
-  const logPath = path.join(claudeDir, "state", "langfuse_hook.log");
+  const pyPath = path.join(hooksDir, "langfuse_hook.py");
+  const expectedLauncher = launcherPath(hooksDir);
+  const expectedPython = pythonExecutableInVenv(claudeDir);
+  const fallbackTarget = isolatedPythonPath(claudeDir);
+  const logPath = path.join(claudeDir, "state", "langfuse_hook.log");
 
   const results = [];
 
@@ -152,26 +152,26 @@ function main() {
     "Run setup again. Claude Code should execute the generated Python hook command."
   );
 
-  addResult(
-    results,
-    "hook python executable",
-    pathExists(expectedPython) || fs.existsSync(fallbackTarget),
-    pathExists(expectedPython) ? expectedPython : `${fallbackPythonCommand()} with PYTHONPATH=${fallbackTarget}`,
-    "Run setup again to recreate the Python venv."
-  );
-
-  const importCheck = pathExists(expectedPython)
-    ? checkPythonLangfuseImport(expectedPython)
-    : checkPythonLangfuseImport(fallbackPythonCommand(), fallbackTarget);
-  addResult(
-    results,
-    "python package langfuse",
-    importCheck.ok,
-    importCheck.detail,
-    pathExists(expectedPython)
-      ? `Run: ${expectedPython} -m pip install -U langfuse`
-      : "Run setup again to install langfuse into the isolated PYTHONPATH target."
-  );
+  addResult(
+    results,
+    "hook python executable",
+    pathExists(expectedPython) || fs.existsSync(fallbackTarget),
+    pathExists(expectedPython) ? expectedPython : `${fallbackPythonCommand()} with PYTHONPATH=${fallbackTarget}`,
+    "Run setup again to recreate the Python venv."
+  );
+
+  const importCheck = pathExists(expectedPython)
+    ? checkPythonLangfuseImport(expectedPython)
+    : checkPythonLangfuseImport(fallbackPythonCommand(), fallbackTarget);
+  addResult(
+    results,
+    "python package langfuse",
+    importCheck.ok,
+    importCheck.detail,
+    pathExists(expectedPython)
+      ? `Run: ${expectedPython} -m pip install -U langfuse`
+      : "Run setup again to install langfuse into the isolated PYTHONPATH target."
+  );
 
   addResult(results, "hook log path", true, logPath);
 

package/scripts/langfuse-setup.mjs

@@ -2,30 +2,30 @@ import fs from "node:fs";
 import fsp from "node:fs/promises";
 import path from "node:path";
 import os from "node:os";
-import { execFileSync, spawnSync } from "node:child_process";
-import { fileURLToPath } from "node:url";
-import { defaultWindowsNpmCliCandidates, listSystemCliCandidates } from "./cli-detection-utils.mjs";
-import { writeRuntimeInstallRecord } from "./runtime-state-utils.mjs";
-
-const packageRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
-const packageJson = JSON.parse(fs.readFileSync(path.join(packageRoot, "package.json"), "utf8"));
-
-const DEFAULT_LANGFUSE_BASE_URL = "https://metrics.openharmonyinsight.cn";
-const LEGACY_LANGFUSE_BASE_URLS = new Set([
-  "http://120.46.221.227:3000",
-  "https://120.46.221.227:3000",
-]);
-const USER_ID_PATTERN = /^[a-z](?:\d{8}|wx\d{7})$/;
-const USER_ID_PATTERN_TEXT = "^[a-z](?:\\d{8}|wx\\d{7})$";
-
-function normalizeLegacyBaseUrl(baseUrl) {
-  const value = String(baseUrl || "").trim().replace(/\/+$/, "");
-  return LEGACY_LANGFUSE_BASE_URLS.has(value) ? DEFAULT_LANGFUSE_BASE_URL : baseUrl;
-}
-
-function normalizeUserId(v) {
-  return String(v || "").trim();
-}
+import { execFileSync, spawnSync } from "node:child_process";
+import { fileURLToPath } from "node:url";
+import { defaultWindowsNpmCliCandidates, listSystemCliCandidates } from "./cli-detection-utils.mjs";
+import { writeRuntimeInstallRecord } from "./runtime-state-utils.mjs";
+
+const packageRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
+const packageJson = JSON.parse(fs.readFileSync(path.join(packageRoot, "package.json"), "utf8"));
+
+const DEFAULT_LANGFUSE_BASE_URL = "https://metrics.openharmonyinsight.cn";
+const LEGACY_LANGFUSE_BASE_URLS = new Set([
+  "http://120.46.221.227:3000",
+  "https://120.46.221.227:3000",
+]);
+const USER_ID_PATTERN = /^[a-z](?:\d{8}|wx\d{7})$/;
+const USER_ID_PATTERN_TEXT = "^[a-z](?:\\d{8}|wx\\d{7})$";
+
+function normalizeLegacyBaseUrl(baseUrl) {
+  const value = String(baseUrl || "").trim().replace(/\/+$/, "");
+  return LEGACY_LANGFUSE_BASE_URLS.has(value) ? DEFAULT_LANGFUSE_BASE_URL : baseUrl;
+}
+
+function normalizeUserId(v) {
+  return String(v || "").trim();
+}
 
 function assertValidUserId(userId) {
   if (!USER_ID_PATTERN.test(normalizeUserId(userId))) {
@@ -172,7 +172,7 @@ function writeAutoUpdateHelper(target) {
   const helperDir = autoUpdateHelperDir();
   ensureDir(helperDir);
   const runtimePath = autoUpdateRuntimePath();
-  const fallbackArgs = ["-y", "--registry=https://registry.npmjs.org/", "oh-langfuse@latest", "auto-update", target, "--skip-check", "--startup-status"];
+  const fallbackArgs = ["-y", "--registry=https://registry.npmjs.org/", "oh-langfuse@latest", "auto-update", target, "--skip-check", "--startup-status"];
 
   if (process.platform === "win32") {
     const helper = path.join(helperDir, `oh-langfuse-auto-update-${target}.cmd`);
@@ -187,7 +187,7 @@ function writeAutoUpdateHelper(target) {
       "exit /b 0",
       ""
     ];
-    fs.writeFileSync(helper, lines.join(os.EOL), "utf8");
+    fs.writeFileSync(helper, lines.join(os.EOL), "utf8");
     return helper;
   }
 
@@ -232,16 +232,16 @@ function existingCliCandidate(candidate, shimDir) {
   }
 }
 
-function listCliCandidatesFromPath(target) {
-  return listSystemCliCandidates(target);
-}
-
-function resolveAgentCli({ target, preferred = "", shimDir = "" }) {
-  const candidates = [
-    preferred,
-    ...defaultWindowsNpmCliCandidates(target),
-    ...listCliCandidatesFromPath(target)
-  ];
+function listCliCandidatesFromPath(target) {
+  return listSystemCliCandidates(target);
+}
+
+function resolveAgentCli({ target, preferred = "", shimDir = "" }) {
+  const candidates = [
+    preferred,
+    ...defaultWindowsNpmCliCandidates(target),
+    ...listCliCandidatesFromPath(target)
+  ];
   for (const candidate of candidates) {
     const found = existingCliCandidate(candidate, shimDir);
     if (found) return found;
@@ -295,7 +295,7 @@ function writeAgentCommandShim({ baseDir, target, executable, realCli, publicKey
       "exit /b %ERRORLEVEL%",
       ""
     ].filter(Boolean).join(os.EOL);
-    fs.writeFileSync(shim, content, "utf8");
+    fs.writeFileSync(shim, content, "utf8");
     return { shim, shimDir };
   }
 
@@ -327,7 +327,7 @@ function createAgentLauncher({ baseDir, target, executable }) {
       `${executable} %*`,
       ""
     ].join(os.EOL);
-    fs.writeFileSync(launcher, content, "utf8");
+    fs.writeFileSync(launcher, content, "utf8");
     return launcher;
   }
 
@@ -350,87 +350,87 @@ function pythonExecutableInVenv(venvDir) {
     : path.join(venvDir, "bin", "python");
 }
 
-function pythonEnv(extraPythonPath = "") {
-  const env = { ...process.env, PYTHONUTF8: "1" };
-  if (extraPythonPath) {
-    env.PYTHONPATH = process.env.PYTHONPATH ? `${extraPythonPath}${path.delimiter}${process.env.PYTHONPATH}` : extraPythonPath;
-  }
-  return env;
-}
-
-function pythonCanImport(pythonCmd, moduleName, extraPythonPath = "") {
-  try {
-    execFileSync(pythonCmd, ["-c", `import ${moduleName}`], { stdio: "ignore", encoding: "utf8", env: pythonEnv(extraPythonPath) });
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-function installLangfuseIntoTargetDir({ pythonCmd, baseDir, pipIndexUrl }) {
-  const targetDir = path.join(baseDir, "langfuse-python");
-  ensureDir(targetDir);
-  console.log(`Installing Python package into isolated target: ${targetDir}`);
-  execFileSync(
-    pythonCmd,
-    ["-m", "pip", "install", "--target", targetDir, "--upgrade", "langfuse", "-i", pipIndexUrl],
-    { stdio: "inherit", encoding: "utf8", env: pythonEnv() }
-  );
-  if (!pythonCanImport(pythonCmd, "langfuse", targetDir)) {
-    throw new Error(`langfuse was installed into ${targetDir}, but ${pythonCmd} still cannot import it with PYTHONPATH.`);
-  }
-  return { python: pythonCmd, pythonPath: targetDir };
-}
-
-function runPipInstallWithFallback({ pythonCmd, baseDir, pipIndexUrl }) {
-  const attempts = [
-    () => installLangfuseIntoTargetDir({ pythonCmd, baseDir, pipIndexUrl }),
-    () => installLangfuseIntoTargetDir({ pythonCmd: "python3", baseDir, pipIndexUrl }),
-    () => installLangfuseIntoTargetDir({ pythonCmd: "python", baseDir, pipIndexUrl })
-  ];
-
-  const errors = [];
-  for (const attempt of attempts) {
-    try {
-      return attempt();
-    } catch (error) {
-      errors.push(error?.message || String(error));
-    }
-  }
-
-  throw new Error(
-    `Failed to install langfuse into isolated Python target. Last errors: ${errors.join(" | ")}`
-  );
-}
-
-function installLangfuseWithSystemPython({ pythonCmd, baseDir, pipIndexUrl }) {
-  console.log("Python venv is unavailable; falling back to isolated PYTHONPATH install for langfuse.");
-  return runPipInstallWithFallback({ pythonCmd, baseDir, pipIndexUrl });
-}
-
-async function createHookLauncher({ hooksDir, hookPython, hookPythonPath = "", pyPath }) {
-  if (process.platform === "win32") {
-    const launcher = path.join(hooksDir, "run-langfuse-hook.cmd");
-    const content = [
-      "@echo off",
-      hookPythonPath ? `set PYTHONPATH=${hookPythonPath};%PYTHONPATH%` : null,
-      `${cmdQuote(hookPython)} ${cmdQuote(pyPath)}`,
-      ""
-    ].filter(Boolean).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",
-    hookPythonPath ? `if [ -n "\${PYTHONPATH:-}" ]; then export PYTHONPATH=${shQuote(hookPythonPath)}:"$PYTHONPATH"; else export PYTHONPATH=${shQuote(hookPythonPath)}; fi` : null,
-    `exec ${shQuote(hookPython)} ${shQuote(pyPath)}`,
-    ""
-  ].filter(Boolean).join("\n");
-  await fsp.writeFile(launcher, content, "utf8");
-  fs.chmodSync(launcher, 0o755);
-  return launcher;
+function pythonEnv(extraPythonPath = "") {
+  const env = { ...process.env, PYTHONUTF8: "1" };
+  if (extraPythonPath) {
+    env.PYTHONPATH = process.env.PYTHONPATH ? `${extraPythonPath}${path.delimiter}${process.env.PYTHONPATH}` : extraPythonPath;
+  }
+  return env;
+}
+
+function pythonCanImport(pythonCmd, moduleName, extraPythonPath = "") {
+  try {
+    execFileSync(pythonCmd, ["-c", `import ${moduleName}`], { stdio: "ignore", encoding: "utf8", env: pythonEnv(extraPythonPath) });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function installLangfuseIntoTargetDir({ pythonCmd, baseDir, pipIndexUrl }) {
+  const targetDir = path.join(baseDir, "langfuse-python");
+  ensureDir(targetDir);
+  console.log(`Installing Python package into isolated target: ${targetDir}`);
+  execFileSync(
+    pythonCmd,
+    ["-m", "pip", "install", "--target", targetDir, "--upgrade", "langfuse", "-i", pipIndexUrl],
+    { stdio: "inherit", encoding: "utf8", env: pythonEnv() }
+  );
+  if (!pythonCanImport(pythonCmd, "langfuse", targetDir)) {
+    throw new Error(`langfuse was installed into ${targetDir}, but ${pythonCmd} still cannot import it with PYTHONPATH.`);
+  }
+  return { python: pythonCmd, pythonPath: targetDir };
+}
+
+function runPipInstallWithFallback({ pythonCmd, baseDir, pipIndexUrl }) {
+  const attempts = [
+    () => installLangfuseIntoTargetDir({ pythonCmd, baseDir, pipIndexUrl }),
+    () => installLangfuseIntoTargetDir({ pythonCmd: "python3", baseDir, pipIndexUrl }),
+    () => installLangfuseIntoTargetDir({ pythonCmd: "python", baseDir, pipIndexUrl })
+  ];
+
+  const errors = [];
+  for (const attempt of attempts) {
+    try {
+      return attempt();
+    } catch (error) {
+      errors.push(error?.message || String(error));
+    }
+  }
+
+  throw new Error(
+    `Failed to install langfuse into isolated Python target. Last errors: ${errors.join(" | ")}`
+  );
+}
+
+function installLangfuseWithSystemPython({ pythonCmd, baseDir, pipIndexUrl }) {
+  console.log("Python venv is unavailable; falling back to isolated PYTHONPATH install for langfuse.");
+  return runPipInstallWithFallback({ pythonCmd, baseDir, pipIndexUrl });
+}
+
+async function createHookLauncher({ hooksDir, hookPython, hookPythonPath = "", pyPath }) {
+  if (process.platform === "win32") {
+    const launcher = path.join(hooksDir, "run-langfuse-hook.cmd");
+    const content = [
+      "@echo off",
+      hookPythonPath ? `set PYTHONPATH=${hookPythonPath};%PYTHONPATH%` : null,
+      `${cmdQuote(hookPython)} ${cmdQuote(pyPath)}`,
+      ""
+    ].filter(Boolean).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",
+    hookPythonPath ? `if [ -n "\${PYTHONPATH:-}" ]; then export PYTHONPATH=${shQuote(hookPythonPath)}:"$PYTHONPATH"; else export PYTHONPATH=${shQuote(hookPythonPath)}; fi` : null,
+    `exec ${shQuote(hookPython)} ${shQuote(pyPath)}`,
+    ""
+  ].filter(Boolean).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" }) {
@@ -441,13 +441,13 @@ function createOrUpdateLangfuseVenv({ baseDir, pipIndexUrl = "https://pypi.tuna.
   if (!fs.existsSync(venvPython)) {
     console.log(`Creating Python virtual environment: ${venvDir}`);
     try {
-      execFileSync(pythonCmd, ["-m", "venv", venvDir], { stdio: "inherit", encoding: "utf8", env: { ...process.env, PYTHONUTF8: "1" } });
-    } catch (e) {
-      if (process.platform !== "win32") {
-        return installLangfuseWithSystemPython({ pythonCmd, baseDir, pipIndexUrl });
-      }
-      throw new Error("Failed to create Python venv. Please confirm Python venv support is available.");
-    }
+      execFileSync(pythonCmd, ["-m", "venv", venvDir], { stdio: "inherit", encoding: "utf8", env: { ...process.env, PYTHONUTF8: "1" } });
+    } catch (e) {
+      if (process.platform !== "win32") {
+        return installLangfuseWithSystemPython({ pythonCmd, baseDir, pipIndexUrl });
+      }
+      throw new Error("Failed to create Python venv. Please confirm Python venv support is available.");
+    }
   }
 
   console.log("Installing/updating Python package in venv: langfuse");
@@ -456,23 +456,23 @@ function createOrUpdateLangfuseVenv({ baseDir, pipIndexUrl = "https://pypi.tuna.
       venvPython,
       ["-m", "pip", "install", "-U", "langfuse", "-i", pipIndexUrl],
       { stdio: "inherit", encoding: "utf8", env: { ...process.env, PYTHONUTF8: "1" } }
-    );
-  } catch (e) {
-    if (process.platform !== "win32") {
-      return installLangfuseWithSystemPython({ pythonCmd, baseDir, pipIndexUrl });
-    }
-    throw new Error(`Failed to install langfuse in venv: ${venvPython} -m pip install -U langfuse -i ${pipIndexUrl}`);
-  }
-
-  if (!pythonCanImport(venvPython, "langfuse")) {
-    if (process.platform !== "win32") {
-      return installLangfuseWithSystemPython({ pythonCmd, baseDir, pipIndexUrl });
-    }
-    throw new Error(`langfuse was installed in venv, but cannot be imported by ${venvPython}`);
-  }
-
-  return { python: venvPython, pythonPath: "" };
-}
+    );
+  } catch (e) {
+    if (process.platform !== "win32") {
+      return installLangfuseWithSystemPython({ pythonCmd, baseDir, pipIndexUrl });
+    }
+    throw new Error(`Failed to install langfuse in venv: ${venvPython} -m pip install -U langfuse -i ${pipIndexUrl}`);
+  }
+
+  if (!pythonCanImport(venvPython, "langfuse")) {
+    if (process.platform !== "win32") {
+      return installLangfuseWithSystemPython({ pythonCmd, baseDir, pipIndexUrl });
+    }
+    throw new Error(`langfuse was installed in venv, but cannot be imported by ${venvPython}`);
+  }
+
+  return { python: venvPython, pythonPath: "" };
+}
 
 async function main() {
   const args = parseArgs(process.argv.slice(2));
@@ -483,14 +483,14 @@ async function main() {
   }
   assertValidUserId(userId);
 
-  const langfuseHost = normalizeLegacyBaseUrl(
-    args.langfuseBaseUrl ||
-    args.langfuseHost ||
-    args.host ||
-    process.env.LANGFUSE_BASEURL ||
-    process.env.LANGFUSE_HOST ||
-    DEFAULT_LANGFUSE_BASE_URL
-  );
+  const langfuseHost = normalizeLegacyBaseUrl(
+    args.langfuseBaseUrl ||
+    args.langfuseHost ||
+    args.host ||
+    process.env.LANGFUSE_BASEURL ||
+    process.env.LANGFUSE_HOST ||
+    DEFAULT_LANGFUSE_BASE_URL
+  );
 
   const publicKey =
     args.publicKey || process.env.LANGFUSE_PUBLIC_KEY || "pk-lf-da0c90a7-6e93-4eb7-bb86-c1047c8d187d";
@@ -554,9 +554,9 @@ async function main() {
   if (nextPyText !== pyText) {
     await fsp.writeFile(pyPath, nextPyText, "utf8");
   }
-  const hookRuntime = createOrUpdateLangfuseVenv({ baseDir: claudeDir, pipIndexUrl });
-  const hookPython = hookRuntime.python;
-  const hookLauncher = await createHookLauncher({ hooksDir, hookPython, hookPythonPath: hookRuntime.pythonPath, pyPath });
+  const hookRuntime = createOrUpdateLangfuseVenv({ baseDir: claudeDir, pipIndexUrl });
+  const hookPython = hookRuntime.python;
+  const hookLauncher = await createHookLauncher({ hooksDir, hookPython, hookPythonPath: hookRuntime.pythonPath, pyPath });
   const claudeShimDir = path.join(claudeDir, "bin");
   const realClaudeCli = resolveAgentCli({ target: "claude", preferred: args.cmd || "", shimDir: claudeShimDir });
   const directShim = writeAgentCommandShim({