oh-langfuse 0.1.79 → 0.1.80

package/scripts/codex-langfuse-setup.mjs

@@ -2,28 +2,28 @@ 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 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 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))) {
@@ -78,63 +78,63 @@ 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 });
-}
+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 });
+}
 
 function shQuote(s) {
   return `'${String(s).replace(/'/g, "'\"'\"'")}'`;
@@ -160,7 +160,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`);
@@ -175,7 +175,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;
   }
 
@@ -245,11 +245,11 @@ function listLocalCodexCliCandidates() {
   return candidates;
 }
 
-function listCliCandidatesFromPath(target) {
-  return listSystemCliCandidates(target);
-}
-
-function sortWindowsCliCandidates(candidates) {
+function listCliCandidatesFromPath(target) {
+  return listSystemCliCandidates(target);
+}
+
+function sortWindowsCliCandidates(candidates) {
   const extPriority = (candidate) => {
     const ext = path.extname(String(candidate || "")).toLowerCase();
     if (ext === ".cmd" || ext === ".bat" || ext === ".exe") return 0;
@@ -258,13 +258,13 @@ function sortWindowsCliCandidates(candidates) {
   return [...candidates].sort((a, b) => extPriority(a) - extPriority(b));
 }
 
-function resolveAgentCli({ target, preferred = "", shimDir = "" }) {
-  const candidates = [
-    preferred,
-    ...(target === "codex" ? listLocalCodexCliCandidates() : []),
-    ...defaultWindowsNpmCliCandidates(target),
-    ...listCliCandidatesFromPath(target)
-  ];
+function resolveAgentCli({ target, preferred = "", shimDir = "" }) {
+  const candidates = [
+    preferred,
+    ...(target === "codex" ? listLocalCodexCliCandidates() : []),
+    ...defaultWindowsNpmCliCandidates(target),
+    ...listCliCandidatesFromPath(target)
+  ];
   for (const candidate of candidates) {
     const found = existingCliCandidate(candidate, shimDir);
     if (found) return found;
@@ -318,7 +318,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 };
   }
 
@@ -350,7 +350,7 @@ function createAgentLauncher({ baseDir, target, executable }) {
       `${executable} %*`,
       ""
     ].join(os.EOL);
-    fs.writeFileSync(launcher, content, "utf8");
+    fs.writeFileSync(launcher, content, "utf8");
     return launcher;
   }
 
@@ -375,13 +375,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");
@@ -390,31 +390,31 @@ 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: "" };
-}
-
-function codexNotifyCommand({ python, pythonPath = "", hookPath }) {
-  if (pythonPath && process.platform !== "win32") {
-    const script = `if [ -n "\${PYTHONPATH:-}" ]; then export PYTHONPATH=${shQuote(pythonPath)}:"$PYTHONPATH"; else export PYTHONPATH=${shQuote(pythonPath)}; fi; exec ${shQuote(python)} ${shQuote(hookPath)}`;
-    return ["sh", "-c", script];
-  }
-  return [python, hookPath];
-}
+    );
+  } 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: "" };
+}
+
+function codexNotifyCommand({ python, pythonPath = "", hookPath }) {
+  if (pythonPath && process.platform !== "win32") {
+    const script = `if [ -n "\${PYTHONPATH:-}" ]; then export PYTHONPATH=${shQuote(pythonPath)}:"$PYTHONPATH"; else export PYTHONPATH=${shQuote(pythonPath)}; fi; exec ${shQuote(python)} ${shQuote(hookPath)}`;
+    return ["sh", "-c", script];
+  }
+  return [python, hookPath];
+}
 
 function updateCodexNotify(configPath, notifyCommand) {
   let content = fs.existsSync(configPath) ? fs.readFileSync(configPath, "utf8") : "";
@@ -473,14 +473,14 @@ async function main() {
     args.publicKey || process.env.LANGFUSE_PUBLIC_KEY || "pk-lf-da0c90a7-6e93-4eb7-bb86-c1047c8d187d";
   const secretKey =
     args.secretKey || process.env.LANGFUSE_SECRET_KEY || "sk-lf-0269b85d-bfdc-442c-bfa3-e737954e3315";
-  const baseUrl = normalizeLegacyBaseUrl(
-    args.langfuseBaseUrl ||
-    args.langfuseHost ||
-    args.host ||
-    process.env.LANGFUSE_BASEURL ||
-    process.env.LANGFUSE_HOST ||
-    DEFAULT_LANGFUSE_BASE_URL
-  );
+  const baseUrl = normalizeLegacyBaseUrl(
+    args.langfuseBaseUrl ||
+    args.langfuseHost ||
+    args.host ||
+    process.env.LANGFUSE_BASEURL ||
+    process.env.LANGFUSE_HOST ||
+    DEFAULT_LANGFUSE_BASE_URL
+  );
   const userId = normalizeUserId(args.userId || args.userid || "");
   if (!userId || typeof userId !== "string") {
     throw new Error("缺少参数：--userId=你的工号");
@@ -516,11 +516,11 @@ async function main() {
     userId,
   });
 
-  const pythonCmd = process.platform === "win32" ? "python" : "python3";
-  const notifyRuntime = args["skip-pip-install"]
-    ? { python: pythonCmd, pythonPath: "" }
-    : createOrUpdateLangfuseVenv({ baseDir: codexHome, pipIndexUrl });
-  updateCodexNotify(configPath, codexNotifyCommand({ python: notifyRuntime.python, pythonPath: notifyRuntime.pythonPath, hookPath: destHook }));
+  const pythonCmd = process.platform === "win32" ? "python" : "python3";
+  const notifyRuntime = args["skip-pip-install"]
+    ? { python: pythonCmd, pythonPath: "" }
+    : createOrUpdateLangfuseVenv({ baseDir: codexHome, pipIndexUrl });
+  updateCodexNotify(configPath, codexNotifyCommand({ python: notifyRuntime.python, pythonPath: notifyRuntime.pythonPath, hookPath: destHook }));
   const codexShimDir = path.join(codexHome, "bin");
   const realCodexCli = resolveAgentCli({ target: "codex", preferred: args.cmd || "", shimDir: codexShimDir });
   const directShim = writeAgentCommandShim({

package/scripts/json-utils.mjs

@@ -1,99 +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}`
-      );
-    }
-  }
-}
+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}`
+      );
+    }
+  }
+}