oh-langfuse 0.1.20 → 0.1.21

package/README.md

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oh-langfuse",
-  "version": "0.1.20",
+  "version": "0.1.21",
   "private": false,
   "type": "module",
   "description": "Use npm scripts to configure Claude Code / OpenCode / Codex with Langfuse tracing.",
@@ -10,7 +10,15 @@
   },
   "files": [
     "bin",
-    "scripts",
+    "scripts/codex-langfuse-check.mjs",
+    "scripts/codex-langfuse-setup.mjs",
+    "scripts/json-utils.mjs",
+    "scripts/langfuse-check.mjs",
+    "scripts/langfuse-setup.mjs",
+    "scripts/opencode-langfuse-check.mjs",
+    "scripts/opencode-langfuse-run.mjs",
+    "scripts/opencode-langfuse-setup.mjs",
+    "scripts/resolve-opencode-cli.mjs",
     "langfuse_hook.py",
     "codex_langfuse_notify.py",
     "README.md",
@@ -20,8 +28,9 @@
   ],
   "scripts": {
     "start": "node bin/cli.js",
-    "check": "node --check bin/cli.js",
-    "pack:check": "npm pack --dry-run",
+    "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",
     "langfuse:setup": "node scripts/langfuse-setup.mjs",

package/scripts/real-self-verify.mjs

@@ -1,414 +0,0 @@
-import fs from "node:fs";
-import os from "node:os";
-import path from "node:path";
-import crypto from "node:crypto";
-import { spawnSync } from "node:child_process";
-import { fileURLToPath } from "node:url";
-import { resolveOpencodeCli } from "./resolve-opencode-cli.mjs";
-
-const rootDir = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
-const packageJson = JSON.parse(fs.readFileSync(path.join(rootDir, "package.json"), "utf8"));
-
-const DEFAULT_LANGFUSE_BASE_URL = "http://120.46.221.227:3000";
-const DEFAULT_LANGFUSE_PUBLIC_KEY = "pk-lf-da0c90a7-6e93-4eb7-bb86-c1047c8d187d";
-const DEFAULT_LANGFUSE_SECRET_KEY = "sk-lf-0269b85d-bfdc-442c-bfa3-e737954e3315";
-
-function parseArgs(argv) {
-  const args = { _: [] };
-  for (let i = 0; i < argv.length; i += 1) {
-    const raw = argv[i];
-    if (!raw.startsWith("--")) {
-      args._.push(raw);
-      continue;
-    }
-    const eq = raw.indexOf("=");
-    if (eq !== -1) {
-      args[raw.slice(2, eq)] = raw.slice(eq + 1);
-      continue;
-    }
-    const key = raw.slice(2);
-    const next = argv[i + 1];
-    if (next && !next.startsWith("--")) {
-      args[key] = next;
-      i += 1;
-    } else {
-      args[key] = true;
-    }
-  }
-  return args;
-}
-
-function printHelp() {
-  console.log(`${packageJson.name} real self verification`);
-  console.log("");
-  console.log("Usage:");
-  console.log("  npm run self:verify -- --targets=opencode --userId=h00613222");
-  console.log("  node scripts/real-self-verify.mjs --targets=claude,opencode,codex --userId=h00613222");
-  console.log("");
-  console.log("What it does:");
-  console.log("  1. Runs the real setup command for each target unless --skip-install is set.");
-  console.log("  2. Starts the actual Claude/OpenCode/Codex CLI with a unique validation marker.");
-  console.log("  3. Polls Langfuse Public API until that marker appears in traces/observations.");
-  console.log("");
-  console.log("Options:");
-  console.log("  --targets=opencode,claude,codex");
-  console.log("  --userId=<id>                    Required unless LANGFUSE_USER_ID is set.");
-  console.log("  --langfuseBaseUrl=<url>           Defaults to package default or LANGFUSE_BASEURL.");
-  console.log("  --publicKey=<key>                 Defaults to package default or LANGFUSE_PUBLIC_KEY.");
-  console.log("  --secretKey=<key>                 Defaults to package default or LANGFUSE_SECRET_KEY.");
-  console.log("  --marker=<text>                   Override generated validation marker.");
-  console.log("  --timeoutMs=180000                Langfuse polling timeout.");
-  console.log("  --triggerTimeoutMs=300000         Per CLI invocation timeout.");
-  console.log("  --skip-install                    Do not run setup first.");
-  console.log("  --skip-trigger                    Only install and poll for a pre-existing marker.");
-  console.log("  --allow-trigger-failure           Poll Langfuse even if the CLI command exits non-zero.");
-  console.log("  --opencodeCmd=<path>              Override OpenCode CLI path.");
-  console.log("  --claudeCmd=<path>                Override Claude CLI path.");
-  console.log("  --codexCmd=<path>                 Override Codex CLI path.");
-  console.log("  --prompt=<text>                   Override the validation prompt.");
-}
-
-function splitTargets(raw) {
-  const value = String(raw || "opencode").trim();
-  const out = value
-    .split(/[, ]+/)
-    .map((x) => x.trim().toLowerCase())
-    .filter(Boolean);
-  const allowed = new Set(["claude", "opencode", "codex"]);
-  for (const target of out) {
-    if (!allowed.has(target)) throw new Error(`Unsupported target: ${target}`);
-  }
-  return out.length ? [...new Set(out)] : ["opencode"];
-}
-
-function makeMarker() {
-  return `real-self-verify-${packageJson.name}-${Date.now()}-${crypto.randomBytes(4).toString("hex")}`;
-}
-
-function shellNeeded(command) {
-  return process.platform === "win32" && /\.(cmd|bat)$/i.test(command);
-}
-
-function run(command, args, options = {}) {
-  const result = spawnSync(command, args, {
-    cwd: options.cwd || rootDir,
-    env: { ...process.env, ...(options.env || {}) },
-    encoding: "utf8",
-    stdio: options.stdio || "pipe",
-    timeout: options.timeoutMs,
-    windowsHide: true,
-    shell: shellNeeded(command),
-  });
-  return {
-    command,
-    args,
-    status: result.status ?? (result.error ? 1 : 0),
-    stdout: result.stdout || "",
-    stderr: result.stderr || "",
-    error: result.error,
-    signal: result.signal,
-  };
-}
-
-function printRunResult(label, result) {
-  const status = result.status === 0 ? "OK" : "FAIL";
-  console.log(`[${status}] ${label}: ${result.command} ${result.args.join(" ")}`);
-  const text = `${result.stdout}\n${result.stderr}`.trim();
-  if (text) {
-    const clipped = text.length > 5000 ? `${text.slice(0, 5000)}\n...<clipped>` : text;
-    console.log(clipped);
-  }
-}
-
-function findOnPath(names) {
-  for (const name of names) {
-    const probe = run(name, ["--version"], { timeoutMs: 15000 });
-    if (probe.status === 0) return name;
-  }
-  return "";
-}
-
-function configFromArgs(args) {
-  return {
-    baseUrl:
-      String(args.langfuseBaseUrl || args.langfuseHost || args.host || process.env.LANGFUSE_BASEURL || process.env.LANGFUSE_HOST || DEFAULT_LANGFUSE_BASE_URL),
-    publicKey: String(args.publicKey || process.env.LANGFUSE_PUBLIC_KEY || DEFAULT_LANGFUSE_PUBLIC_KEY),
-    secretKey: String(args.secretKey || process.env.LANGFUSE_SECRET_KEY || DEFAULT_LANGFUSE_SECRET_KEY),
-    userId: String(args.userId || args.userid || process.env.LANGFUSE_USER_ID || process.env.CC_USER_ID || "").trim(),
-  };
-}
-
-function setupTarget(target, config, args) {
-  const cli = path.join(rootDir, "bin", "cli.js");
-  const setupArgs = [
-    cli,
-    "setup",
-    target,
-    "--yes",
-    `--userId=${config.userId}`,
-    `--langfuseBaseUrl=${config.baseUrl}`,
-    `--publicKey=${config.publicKey}`,
-    `--secretKey=${config.secretKey}`,
-  ];
-  if (args.npmRegistry) setupArgs.push(`--npmRegistry=${args.npmRegistry}`);
-  if (args.pipIndexUrl) setupArgs.push(`--pipIndexUrl=${args.pipIndexUrl}`);
-  if (args["skip-plugin-install"]) setupArgs.push("--skip-plugin-install");
-  if (args["no-set-env"]) setupArgs.push("--no-set-env");
-  if (args.cmd) setupArgs.push(`--cmd=${args.cmd}`);
-  const result = run(process.execPath, setupArgs, { stdio: "inherit", timeoutMs: Number(args.setupTimeoutMs || 600000) });
-  return result.status;
-}
-
-function validationPrompt(marker, target, customPrompt) {
-  if (customPrompt) return String(customPrompt).replaceAll("{marker}", marker).replaceAll("{target}", target);
-  return [
-    `This is an automated real self-verification run for ${packageJson.name}.`,
-    `Validation marker: ${marker}`,
-    "Reply with the validation marker exactly once and do not run tools.",
-  ].join("\n");
-}
-
-function triggerClaude(prompt, args, env) {
-  const cmd = String(args.claudeCmd || findOnPath(process.platform === "win32" ? ["claude.cmd", "claude"] : ["claude"]));
-  if (!cmd) return { status: 127, stdout: "", stderr: "Claude CLI not found. Set --claudeCmd=<path>.", command: "claude", args: [] };
-  const candidates = [
-    ["-p", prompt],
-    ["--print", prompt],
-  ];
-  let last = null;
-  for (const candidate of candidates) {
-    last = run(cmd, candidate, { env, timeoutMs: Number(args.triggerTimeoutMs || 300000) });
-    if (last.status === 0) return last;
-  }
-  return last;
-}
-
-function triggerOpenCode(prompt, args, env) {
-  const cmd = resolveOpencodeCli(args.opencodeCmd || args.cmd);
-  if (!cmd) return { status: 127, stdout: "", stderr: "OpenCode CLI not found. Set --opencodeCmd=<path>.", command: "opencode", args: [] };
-  const candidates = [
-    ["run", prompt],
-    ["run", "--print", prompt],
-    [prompt],
-  ];
-  let last = null;
-  for (const candidate of candidates) {
-    last = run(cmd, candidate, { env, timeoutMs: Number(args.triggerTimeoutMs || 300000) });
-    if (last.status === 0) return last;
-  }
-  return last;
-}
-
-function triggerCodex(prompt, args, env) {
-  const cmd = String(args.codexCmd || findOnPath(process.platform === "win32" ? ["codex.cmd", "codex"] : ["codex"]));
-  if (!cmd) return { status: 127, stdout: "", stderr: "Codex CLI not found. Set --codexCmd=<path>.", command: "codex", args: [] };
-  const candidates = [
-    ["exec", prompt],
-    ["exec", "--skip-git-repo-check", prompt],
-  ];
-  let last = null;
-  for (const candidate of candidates) {
-    last = run(cmd, candidate, { env, timeoutMs: Number(args.triggerTimeoutMs || 300000) });
-    if (last.status === 0) return last;
-  }
-  return last;
-}
-
-function apiBase(baseUrl) {
-  const trimmed = String(baseUrl || "").replace(/\/+$/, "");
-  return trimmed.endsWith("/api/public") ? trimmed : `${trimmed}/api/public`;
-}
-
-function basicAuth(publicKey, secretKey) {
-  return `Basic ${Buffer.from(`${publicKey}:${secretKey}`, "utf8").toString("base64")}`;
-}
-
-async function langfuseGet(config, pathname, params = {}) {
-  const url = new URL(`${apiBase(config.baseUrl)}${pathname}`);
-  for (const [key, value] of Object.entries(params)) {
-    if (value !== undefined && value !== null && String(value) !== "") url.searchParams.set(key, String(value));
-  }
-  const response = await fetch(url, {
-    headers: {
-      accept: "application/json",
-      authorization: basicAuth(config.publicKey, config.secretKey),
-    },
-  });
-  if (!response.ok) {
-    const body = await response.text().catch(() => "");
-    const error = new Error(`Langfuse API ${response.status} ${response.statusText}: ${body.slice(0, 500)}`);
-    error.status = response.status;
-    throw error;
-  }
-  return await response.json();
-}
-
-function dataArray(value) {
-  if (Array.isArray(value)) return value;
-  if (Array.isArray(value?.data)) return value.data;
-  if (Array.isArray(value?.items)) return value.items;
-  return [];
-}
-
-function containsMarker(value, marker) {
-  try {
-    return JSON.stringify(value).includes(marker);
-  } catch {
-    return false;
-  }
-}
-
-function idOf(value) {
-  return value?.id || value?.traceId || value?.trace_id || "";
-}
-
-async function findLangfuseMarker(config, marker, { since, target }) {
-  const baseParams = {
-    limit: 100,
-    fromTimestamp: since.toISOString(),
-  };
-  const traceQueries = [
-    { ...baseParams, userId: config.userId },
-    baseParams,
-  ];
-
-  for (const params of traceQueries) {
-    let traces;
-    try {
-      traces = await langfuseGet(config, "/traces", params);
-    } catch (error) {
-      if (error.status === 404) continue;
-      throw error;
-    }
-    for (const trace of dataArray(traces)) {
-      if (containsMarker(trace, marker)) return { kind: "trace-list", target, id: idOf(trace), item: trace };
-    }
-    for (const trace of dataArray(traces).slice(0, 25)) {
-      const id = idOf(trace);
-      if (!id) continue;
-      try {
-        const detail = await langfuseGet(config, `/traces/${encodeURIComponent(id)}`);
-        if (containsMarker(detail, marker)) return { kind: "trace-detail", target, id, item: detail };
-      } catch (error) {
-        if (error.status !== 404) throw error;
-      }
-    }
-  }
-
-  const observationQueries = [
-    ["/observations", { ...baseParams, userId: config.userId }],
-    ["/observations", baseParams],
-    ["/v2/observations", { ...baseParams, fields: "core,basic,usage", userId: config.userId }],
-    ["/v2/observations", { ...baseParams, fields: "core,basic,usage" }],
-  ];
-  for (const [pathname, params] of observationQueries) {
-    try {
-      const observations = await langfuseGet(config, pathname, params);
-      for (const observation of dataArray(observations)) {
-        if (containsMarker(observation, marker)) return { kind: pathname, target, id: idOf(observation), item: observation };
-      }
-    } catch (error) {
-      if (error.status === 404 || error.status === 400) continue;
-      throw error;
-    }
-  }
-
-  return null;
-}
-
-async function pollLangfuse(config, marker, options) {
-  const timeoutMs = Number(options.timeoutMs || 180000);
-  const pollMs = Number(options.pollMs || 5000);
-  const deadline = Date.now() + timeoutMs;
-  const since = options.since || new Date(Date.now() - 10 * 60 * 1000);
-  let lastError = null;
-
-  while (Date.now() <= deadline) {
-    try {
-      const found = await findLangfuseMarker(config, marker, { since, target: options.target });
-      if (found) return found;
-      console.log(`[WAIT] Langfuse has not returned marker yet (${marker}).`);
-    } catch (error) {
-      lastError = error;
-      console.log(`[WAIT] Langfuse query failed: ${error.message}`);
-    }
-    await new Promise((resolve) => setTimeout(resolve, pollMs));
-  }
-
-  if (lastError) throw new Error(`Timed out waiting for marker. Last Langfuse error: ${lastError.message}`);
-  throw new Error(`Timed out waiting for marker in Langfuse: ${marker}`);
-}
-
-async function main() {
-  const args = parseArgs(process.argv.slice(2));
-  if (args.help || args.h) {
-    printHelp();
-    return 0;
-  }
-
-  const config = configFromArgs(args);
-  if (!config.userId) throw new Error("Missing --userId or LANGFUSE_USER_ID. Real verification needs a user id to install and filter traces.");
-  const targets = splitTargets(args.targets || args.target || args._[0]);
-  const marker = String(args.marker || makeMarker());
-  const since = new Date();
-  const results = [];
-
-  console.log(`[INFO] Package: ${packageJson.name}@${packageJson.version}`);
-  console.log(`[INFO] Targets: ${targets.join(", ")}`);
-  console.log(`[INFO] Langfuse: ${config.baseUrl}`);
-  console.log(`[INFO] User ID: ${config.userId}`);
-  console.log(`[INFO] Marker: ${marker}`);
-  console.log("");
-
-  for (const target of targets) {
-    if (!args["skip-install"]) {
-      const code = setupTarget(target, config, args);
-      if (code !== 0) throw new Error(`Setup failed for ${target} with exit code ${code}.`);
-    }
-
-    const prompt = validationPrompt(marker, target, args.prompt);
-    const env = {
-      TRACE_TO_LANGFUSE: "true",
-      LANGFUSE_PUBLIC_KEY: config.publicKey,
-      LANGFUSE_SECRET_KEY: config.secretKey,
-      LANGFUSE_BASEURL: config.baseUrl,
-      LANGFUSE_HOST: config.baseUrl,
-      LANGFUSE_USER_ID: config.userId,
-      CC_USER_ID: config.userId,
-      CC_LANGFUSE_USER_ID: config.userId,
-      CODEX_LANGFUSE_USER_ID: config.userId,
-      OHAI_REAL_SELF_VERIFY_MARKER: marker,
-      OHAI_REAL_SELF_VERIFY_TARGET: target,
-    };
-
-    if (!args["skip-trigger"]) {
-      const trigger =
-        target === "claude"
-          ? triggerClaude(prompt, args, env)
-          : target === "opencode"
-            ? triggerOpenCode(prompt, args, env)
-            : triggerCodex(prompt, args, env);
-      printRunResult(`${target} trigger`, trigger);
-      if (trigger.status !== 0 && !args["allow-trigger-failure"]) {
-        throw new Error(`${target} trigger failed before Langfuse polling. Use --allow-trigger-failure to poll anyway.`);
-      }
-    }
-
-    const found = await pollLangfuse(config, marker, { ...args, since, target });
-    console.log(`[OK] Langfuse marker found for ${target}: ${found.kind} ${found.id || ""}`.trim());
-    results.push({ target, marker, langfuse: { kind: found.kind, id: found.id || "" } });
-  }
-
-  console.log("");
-  console.log(JSON.stringify({ ok: true, package: packageJson.name, marker, results }, null, 2));
-  return 0;
-}
-
-main()
-  .then((code) => {
-    process.exitCode = code;
-  })
-  .catch((error) => {
-    console.error(`[FAIL] ${error?.message || String(error)}`);
-    process.exitCode = 1;
-  });