@osfactory/har 0.29.0 → 0.30.0

package/dist/index.js

@@ -132,10 +132,10 @@ var init_telemetry_config = __esm({
       traces: false
     };
     TELEMETRY_SIGNALS = [
-      "Traces (default): Cursor / Claude / Codex activity via opentelemetry-hooks \u2192 Mission Control",
+      "Traces (default): Cursor / Claude / Codex activity via @osfactory/otel-hook \u2192 Mission Control",
       "Logs/events (default): hook lifecycle logs without prompt bodies",
       "Metrics (default): token usage derived from span gen_ai.usage.* attributes",
-      "Prompts (default): user prompt text via IDE_OTEL_CAPTURE_TEXT (also fills Mission Control purpose); disable with har telemetry on --no-prompts",
+      "Prompts (default): user prompt text via otel-hook contentMode=raw (also fills Mission Control purpose); disable with har telemetry on --no-prompts",
       "Fallback: har control sync harvests local Claude/Codex session files when hooks telemetry is missing"
     ];
   }
@@ -6623,12 +6623,15 @@ var otel_hooks_exports = {};
 __export(otel_hooks_exports, {
   OTEL_HOOKS_AGENTS: () => OTEL_HOOKS_AGENTS,
   OTEL_HOOKS_PACKAGE: () => OTEL_HOOKS_PACKAGE,
+  OTEL_HOOKS_PROVIDERS: () => OTEL_HOOKS_PROVIDERS,
   buildOtelHooksConfig: () => buildOtelHooksConfig,
   disableOtelHooksExport: () => disableOtelHooksExport,
   ensureOtelHooks: () => ensureOtelHooks,
   getOtelHooksConfigPath: () => getOtelHooksConfigPath,
   getOtelHooksHome: () => getOtelHooksHome,
+  getOtelHooksStateDir: () => getOtelHooksStateDir,
   getOtelHooksWrapperPath: () => getOtelHooksWrapperPath,
+  parseResourceAttributesString: () => parseResourceAttributesString,
   rewriteHookCommandsToWrapper: () => rewriteHookCommandsToWrapper,
   writeOtelHooksConfig: () => writeOtelHooksConfig,
   writeOtelHooksWrapper: () => writeOtelHooksWrapper
@@ -6645,20 +6648,69 @@ function getOtelHooksConfigPath(hooksHome = getOtelHooksHome()) {
 function getOtelHooksWrapperPath(hooksHome = getOtelHooksHome()) {
   return path45.join(hooksHome, "run-otel-hook.sh");
 }
+function getOtelHooksStateDir(hooksHome = getOtelHooksHome()) {
+  return path45.join(hooksHome, "state");
+}
+function localOtelHookBin(hooksHome) {
+  return path45.join(hooksHome, "node_modules", ".bin", "otel-hook");
+}
+function installedPackageVersion(hooksHome) {
+  try {
+    const pkgPath = path45.join(
+      hooksHome,
+      "node_modules",
+      "@osfactory",
+      "otel-hook",
+      "package.json"
+    );
+    const pkg = JSON.parse(fs42.readFileSync(pkgPath, "utf8"));
+    return typeof pkg.version === "string" ? pkg.version : null;
+  } catch {
+    return null;
+  }
+}
+function pinnedVersion() {
+  const at2 = OTEL_HOOKS_PACKAGE.lastIndexOf("@");
+  return at2 > 0 ? OTEL_HOOKS_PACKAGE.slice(at2 + 1) : OTEL_HOOKS_PACKAGE;
+}
+function parseResourceAttributesString(raw) {
+  if (!raw?.trim()) return {};
+  const out = {};
+  for (const part of raw.split(",")) {
+    const trimmed = part.trim();
+    if (!trimmed) continue;
+    const eq = trimmed.indexOf("=");
+    if (eq <= 0) continue;
+    const key = trimmed.slice(0, eq).trim();
+    const value = trimmed.slice(eq + 1).trim();
+    if (!key || key === "service.name" || key === "service.namespace") continue;
+    out[key] = value;
+  }
+  return out;
+}
 function buildOtelHooksConfig(options) {
   const enabled = options?.enabled ?? isTelemetryEnabled();
   const signals2 = getTelemetrySignals();
   const apiUrl = (options?.apiUrl ?? getControlApiUrl()).replace(/\/$/, "");
+  const resourceAttributes = parseResourceAttributesString(options?.resourceAttributes);
+  const capturePrompts = enabled && signals2.prompts;
   return {
-    OTEL_EXPORTER_OTLP_ENDPOINT: enabled ? `${apiUrl}/api/otel/v1/traces` : null,
-    OTEL_EXPORTER_OTLP_PROTOCOL: "http/json",
-    OTEL_SERVICE_NAME: "har-ide-agent",
-    IDE_OTEL_BATCH_ON_STOP: "true",
-    IDE_OTEL_ENABLE_LOGS: enabled && signals2.logs ? "true" : "false",
-    IDE_OTEL_LOG_ALL_EVENTS: enabled && signals2.logs ? "true" : "false",
-    IDE_OTEL_CAPTURE_TEXT: enabled && signals2.prompts ? "true" : "false",
-    IDE_OTEL_MASK_PROMPTS: "false",
-    OTEL_RESOURCE_ATTRIBUTES: options?.resourceAttributes ?? null
+    exporter: {
+      enabled,
+      ...enabled ? { endpoint: `${apiUrl}/api/otel/v1/traces` } : {},
+      protocol: "http/protobuf",
+      serviceName: "har-ide-agent",
+      ...Object.keys(resourceAttributes).length > 0 ? { resourceAttributes } : {},
+      logs: {
+        enabled: enabled && signals2.logs,
+        ...enabled && signals2.logs ? { endpoint: `${apiUrl}/api/otel/v1/logs` } : {},
+        includeContent: capturePrompts
+      }
+    },
+    privacy: {
+      contentMode: capturePrompts ? "raw" : "omit",
+      allowRawContent: capturePrompts
+    }
   };
 }
 function writeOtelHooksConfig(config2, hooksHome = getOtelHooksHome()) {
@@ -6674,12 +6726,17 @@ function writeOtelHooksConfig(config2, hooksHome = getOtelHooksHome()) {
 }
 function writeOtelHooksWrapper(otelHookCommand, hooksHome = getOtelHooksHome()) {
   fs42.mkdirSync(hooksHome, { recursive: true });
+  fs42.mkdirSync(getOtelHooksStateDir(hooksHome), { recursive: true });
   const wrapperPath = getOtelHooksWrapperPath(hooksHome);
+  const configPath = getOtelHooksConfigPath(hooksHome);
+  const stateDir = getOtelHooksStateDir(hooksHome);
   const script = `#!/usr/bin/env bash
-# Managed by har telemetry \u2014 invokes opentelemetry-hooks with HAR config home.
+# Managed by har telemetry \u2014 invokes @osfactory/otel-hook with HAR config.
 set -euo pipefail
-export IDE_OTEL_HOOK_HOME="${hooksHome}"
-exec "${otelHookCommand}" "$@"
+exec "${otelHookCommand}" run \\
+  --config-file "${configPath}" \\
+  --state-dir "${stateDir}" \\
+  "$@"
 `;
   fs42.writeFileSync(wrapperPath, script, { mode: 493 });
   try {
@@ -6694,72 +6751,68 @@ function commandExists2(command2) {
   });
   return result.status === 0 && Boolean(result.stdout?.trim());
 }
-function resolveOtelHookCommand() {
-  if (commandExists2("otel-hook")) {
-    const which = (0, import_child_process10.spawnSync)("sh", ["-c", "command -v otel-hook"], { encoding: "utf8" });
-    return which.stdout?.trim() || "otel-hook";
-  }
+function resolveOtelHookCommand(hooksHome) {
+  const local = localOtelHookBin(hooksHome);
+  if (fs42.existsSync(local)) return local;
   return null;
 }
-function tryInstallPackage() {
-  if (commandExists2("uv")) {
-    const result = (0, import_child_process10.spawnSync)(
-      "uv",
-      ["tool", "install", "--force", OTEL_HOOKS_PACKAGE],
-      { encoding: "utf8", timeout: 18e4 }
-    );
-    if (result.status === 0) {
-      return { ok: true, detail: `uv tool install ${OTEL_HOOKS_PACKAGE}` };
-    }
-  }
-  if (commandExists2("pipx")) {
-    const result = (0, import_child_process10.spawnSync)("pipx", ["install", "--force", OTEL_HOOKS_PACKAGE], {
-      encoding: "utf8",
-      timeout: 18e4
-    });
-    if (result.status === 0) {
-      return { ok: true, detail: `pipx install ${OTEL_HOOKS_PACKAGE}` };
-    }
+function tryInstallPackage(hooksHome) {
+  fs42.mkdirSync(hooksHome, { recursive: true });
+  if (!commandExists2("npm")) {
     return {
       ok: false,
-      detail: `pipx install failed: ${(result.stderr || result.stdout || "").trim().slice(0, 400)}`
+      detail: "npm not found; install Node.js to use @osfactory/otel-hook"
     };
   }
-  if (commandExists2("pip3") || commandExists2("pip")) {
-    const pip = commandExists2("pip3") ? "pip3" : "pip";
-    const result = (0, import_child_process10.spawnSync)(
-      pip,
-      ["install", "--user", OTEL_HOOKS_PACKAGE],
-      { encoding: "utf8", timeout: 18e4 }
-    );
-    if (result.status === 0) {
-      return { ok: true, detail: `${pip} install --user ${OTEL_HOOKS_PACKAGE}` };
-    }
-    return {
-      ok: false,
-      detail: `${pip} install failed: ${(result.stderr || result.stdout || "").trim().slice(0, 400)}`
-    };
+  const result = (0, import_child_process10.spawnSync)(
+    "npm",
+    ["install", "--prefix", hooksHome, "--no-fund", "--no-audit", OTEL_HOOKS_PACKAGE],
+    { encoding: "utf8", timeout: 18e4 }
+  );
+  if (result.status === 0 && fs42.existsSync(localOtelHookBin(hooksHome))) {
+    return { ok: true, detail: `npm install --prefix ${hooksHome} ${OTEL_HOOKS_PACKAGE}` };
   }
   return {
     ok: false,
-    detail: "Neither uv, pipx, nor pip3/pip found; install Python tooling to use opentelemetry-hooks"
+    detail: `npm install ${OTEL_HOOKS_PACKAGE} failed: ${(result.stderr || result.stdout || "").trim().slice(0, 400)}`
   };
 }
-function runSetupAgent(agent, otelHookCommand, hooksHome) {
-  const result = (0, import_child_process10.spawnSync)(otelHookCommand, ["setup", "--agent", agent], {
-    encoding: "utf8",
-    env: {
-      ...process.env,
-      IDE_OTEL_HOOK_HOME: hooksHome
-    },
-    timeout: 6e4
-  });
+function uninstallLegacyPythonHooks() {
+  const attempts = [
+    ["uv", ["tool", "uninstall", "opentelemetry-hooks"]],
+    ["pipx", ["uninstall", "opentelemetry-hooks"]]
+  ];
+  for (const [cmd, args] of attempts) {
+    if (!commandExists2(cmd)) continue;
+    try {
+      (0, import_child_process10.spawnSync)(cmd, args, { encoding: "utf8", timeout: 6e4 });
+    } catch {
+    }
+  }
+}
+function runSetupProvider(providerId, otelHookCommand, wrapperPath) {
+  const hookCommand = `${wrapperPath} --provider ${providerId}`;
+  const result = (0, import_child_process10.spawnSync)(
+    otelHookCommand,
+    [
+      "setup",
+      "--provider",
+      providerId,
+      "--scope",
+      "global",
+      "--hook-command",
+      hookCommand,
+      "--managed-marker",
+      "otel-hook"
+    ],
+    { encoding: "utf8", timeout: 6e4 }
+  );
   if (result.status === 0) {
-    return { ok: true, detail: `setup --agent ${agent}` };
+    return { ok: true, detail: `setup --provider ${providerId}` };
   }
   return {
     ok: false,
-    detail: `setup --agent ${agent} failed: ${(result.stderr || result.stdout || "").trim().slice(0, 400)}`
+    detail: `setup --provider ${providerId} failed: ${(result.stderr || result.stdout || "").trim().slice(0, 400)}`
   };
 }
 function rewriteHookCommandsToWrapper(filePath, wrapperPath) {
@@ -6777,14 +6830,19 @@ function rewriteHookCommandsToWrapper(filePath, wrapperPath) {
     return false;
   }
   if (!parsed || typeof parsed !== "object") return false;
-  const quoted = JSON.stringify(wrapperPath);
   const rewriteCommand = (command2) => {
-    if (!command2.includes("otel-hook") && !command2.includes("otel_hook.py")) return command2;
+    if (!command2.includes("otel-hook") && !command2.includes("otel_hook.py") && !command2.includes("opentelemetry-hooks")) {
+      return command2;
+    }
     if (command2.includes(wrapperPath)) return command2;
-    return command2.replace(
-      /(?:^|[;&|]\s*)(?:env\s+[^=\s]+=\S+\s+)*(?:python3?\s+)?(?:\S*otel[_-]hook\S*)/,
-      (match) => match.replace(/(?:python3?\s+)?(?:\S*otel[_-]hook\S*)/, quoted.slice(1, -1))
+    const rewritten = command2.replace(
+      /(?:^|[;&|]\s*)(?:env\s+[^=\s]+=\S+\s+)*(?:python3?\s+)?(?:npx\s+)?(?:\S*otel[_-]hook\S*|\S*opentelemetry-hooks\S*)/,
+      (match) => match.replace(
+        /(?:python3?\s+)?(?:npx\s+)?(?:\S*otel[_-]hook\S*|\S*opentelemetry-hooks\S*)/,
+        wrapperPath
+      )
     );
+    return rewritten.replace(/(^|\s)--cursor(?=\s|$)/g, "$1--provider cursor").replace(/(^|\s)--claude(?=\s|$)/g, "$1--provider claude-code").replace(/(^|\s)--codex(?=\s|$)/g, "$1--provider codex");
   };
   const walk = (node) => {
     let changed = false;
@@ -6823,14 +6881,20 @@ function rewriteKnownHookRegistrations(wrapperPath) {
     }
   }
 }
+function providerLabel(id) {
+  if (id === "claude-code") return "claude";
+  if (id === "cursor") return "cursor";
+  return "codex";
+}
 function ensureOtelHooks(options) {
   const hooksHome = getOtelHooksHome();
   const errors = [];
-  const agentsSetup = [];
+  const providersSetup = [];
   fs42.mkdirSync(hooksHome, { recursive: true });
-  let otelHookCommand = resolveOtelHookCommand();
-  if (!otelHookCommand) {
-    const installed = tryInstallPackage();
+  let otelHookCommand = resolveOtelHookCommand(hooksHome);
+  const needsInstall = !otelHookCommand || installedPackageVersion(hooksHome) !== pinnedVersion();
+  if (needsInstall) {
+    const installed = tryInstallPackage(hooksHome);
     if (!installed.ok) {
       errors.push(installed.detail);
       const configPath2 = writeOtelHooksConfig(
@@ -6844,13 +6908,14 @@ function ensureOtelHooks(options) {
         wrapperPath: getOtelHooksWrapperPath(hooksHome),
         otelHookCommand: null,
         warning: installed.detail,
-        agentsSetup,
+        agentsSetup: [],
+        providersSetup,
         errors
       };
     }
-    otelHookCommand = resolveOtelHookCommand();
+    otelHookCommand = resolveOtelHookCommand(hooksHome);
     if (!otelHookCommand) {
-      errors.push("opentelemetry-hooks installed but otel-hook is not on PATH");
+      errors.push("@osfactory/otel-hook installed but otel-hook binary is missing");
       const configPath2 = writeOtelHooksConfig(
         buildOtelHooksConfig({ resourceAttributes: options?.resourceAttributes }),
         hooksHome
@@ -6862,41 +6927,64 @@ function ensureOtelHooks(options) {
         wrapperPath: getOtelHooksWrapperPath(hooksHome),
         otelHookCommand: null,
         warning: errors[errors.length - 1],
-        agentsSetup,
+        agentsSetup: [],
+        providersSetup,
         errors
       };
     }
   }
+  const resolvedCommand = otelHookCommand;
+  if (!resolvedCommand) {
+    errors.push("@osfactory/otel-hook binary is missing");
+    const configPath2 = writeOtelHooksConfig(
+      buildOtelHooksConfig({ resourceAttributes: options?.resourceAttributes }),
+      hooksHome
+    );
+    return {
+      ok: false,
+      hooksHome,
+      configPath: configPath2,
+      wrapperPath: getOtelHooksWrapperPath(hooksHome),
+      otelHookCommand: null,
+      warning: errors[errors.length - 1],
+      agentsSetup: [],
+      providersSetup,
+      errors
+    };
+  }
   const configPath = writeOtelHooksConfig(
     buildOtelHooksConfig({ resourceAttributes: options?.resourceAttributes }),
     hooksHome
   );
-  const wrapperPath = writeOtelHooksWrapper(otelHookCommand, hooksHome);
+  const wrapperPath = writeOtelHooksWrapper(resolvedCommand, hooksHome);
+  uninstallLegacyPythonHooks();
   if (options?.setupAgents !== false && isTelemetryEnabled()) {
-    for (const agent of OTEL_HOOKS_AGENTS) {
-      const setup = runSetupAgent(agent, otelHookCommand, hooksHome);
-      if (setup.ok) agentsSetup.push(agent);
+    for (const provider of OTEL_HOOKS_PROVIDERS) {
+      const setup = runSetupProvider(provider.id, resolvedCommand, wrapperPath);
+      if (setup.ok) providersSetup.push(provider.id);
       else errors.push(setup.detail);
     }
     rewriteKnownHookRegistrations(wrapperPath);
   }
+  const agentsSetup = providersSetup.map(providerLabel);
   const ok = errors.length === 0;
   return {
     ok,
     hooksHome,
     configPath,
     wrapperPath,
-    otelHookCommand,
-    message: ok ? `opentelemetry-hooks ready (${agentsSetup.join(", ") || "config only"}) \u2192 ${configPath}` : void 0,
+    otelHookCommand: resolvedCommand,
+    message: ok ? `@osfactory/otel-hook ready (${agentsSetup.join(", ") || "config only"}) \u2192 ${configPath}` : void 0,
     warning: errors.length ? errors.join("; ") : void 0,
     agentsSetup,
+    providersSetup,
     errors
   };
 }
 function disableOtelHooksExport() {
   return writeOtelHooksConfig(buildOtelHooksConfig({ enabled: false }));
 }
-var import_child_process10, fs42, os14, path45, OTEL_HOOKS_PACKAGE, OTEL_HOOKS_AGENTS;
+var import_child_process10, fs42, os14, path45, OTEL_HOOKS_PACKAGE, OTEL_HOOKS_PROVIDERS, OTEL_HOOKS_AGENTS;
 var init_otel_hooks = __esm({
   "src/core/otel-hooks.ts"() {
     "use strict";
@@ -6906,7 +6994,12 @@ var init_otel_hooks = __esm({
     path45 = __toESM(require("path"));
     init_control_config();
     init_telemetry_config();
-    OTEL_HOOKS_PACKAGE = "opentelemetry-hooks==0.14.0";
+    OTEL_HOOKS_PACKAGE = "@osfactory/otel-hook@0.1.1";
+    OTEL_HOOKS_PROVIDERS = [
+      { id: "cursor", label: "cursor" },
+      { id: "claude-code", label: "claude" },
+      { id: "codex", label: "codex" }
+    ];
     OTEL_HOOKS_AGENTS = ["cursor", "claude", "codex"];
   }
 });
@@ -51840,7 +51933,7 @@ function buildTelemetryEnvBlock(attrs) {
     ...attrs.attemptId ? [`HAR_ATTEMPT_ID=${attrs.attemptId}`] : [],
     `HAR_CONTROL_API_URL=${apiUrl}`,
     `OTEL_RESOURCE_ATTRIBUTES=${buildOtelResourceAttributes(attrs)}`,
-    "# Agent telemetry: opentelemetry-hooks \u2192 Mission Control (har telemetry on|off)"
+    "# Agent telemetry: @osfactory/otel-hook \u2192 Mission Control (har telemetry on|off)"
   ];
   return lines2.join("\n") + "\n";
 }
@@ -53224,7 +53317,7 @@ var RunService = class {
       const ensured = await ensureTelemetryInfrastructure({ startIfNeeded: true });
       if (ensured.message) {
         telemetryBanner += `${ensured.message}
-Usage from Cursor / Claude / Codex (opentelemetry-hooks) will appear under Worktrees. Disable: har telemetry off
+Usage from Cursor / Claude / Codex (@osfactory/otel-hook) will appear under Worktrees. Disable: har telemetry off
 `;
       }
       if (ensured.warning) {
@@ -53239,7 +53332,7 @@ Usage from Cursor / Claude / Codex (opentelemetry-hooks) will appear under Workt
         if (hooks.warning) telemetryBanner += `${hooks.warning}
 `;
       } catch (err) {
-        telemetryBanner += `opentelemetry-hooks setup skipped: ${err instanceof Error ? err.message : String(err)}
+        telemetryBanner += `@osfactory/otel-hook setup skipped: ${err instanceof Error ? err.message : String(err)}
 `;
       }
     }
@@ -66133,7 +66226,7 @@ async function handleOn(argv) {
     prompts: argv.prompts,
     traces: true
   });
-  success("Telemetry enabled. Cursor / Claude / Codex export via opentelemetry-hooks \u2192 Mission Control.");
+  success("Telemetry enabled. Cursor / Claude / Codex export via @osfactory/otel-hook \u2192 Mission Control.");
   info(
     `Signals: metrics=${preference.signals.metrics} logs=${preference.signals.logs} prompts=${preference.signals.prompts} traces=${preference.signals.traces}`
   );
@@ -66228,17 +66321,17 @@ async function handleInstallHooks() {
   if (result.warning) warn(result.warning);
   const hooks = ensureOtelHooks({ setupAgents: true });
   if (hooks.ok) {
-    success(hooks.message ?? "opentelemetry-hooks installed and agents registered");
+    success(hooks.message ?? "@osfactory/otel-hook installed and agents registered");
     info(`Config: ${hooks.configPath}`);
     info(`Wrapper: ${hooks.wrapperPath}`);
   } else {
-    error(hooks.warning ?? "Failed to install opentelemetry-hooks");
+    error(hooks.warning ?? "Failed to install @osfactory/otel-hook");
     process.exitCode = 1;
   }
 }
 var telemetryCommand = {
   command: "telemetry <subcommand>",
-  describe: "Agent usage telemetry (Cursor / Claude / Codex via opentelemetry-hooks \u2192 Mission Control)",
+  describe: "Agent usage telemetry (Cursor / Claude / Codex via @osfactory/otel-hook \u2192 Mission Control)",
   builder: (yargs) => yargs.command(
     "status",
     "Show telemetry preference and Mission Control reachability",
@@ -66248,7 +66341,7 @@ var telemetryCommand = {
     }
   ).command(
     "on",
-    "Enable full telemetry (incl. prompts), ensure Mission Control, install/configure opentelemetry-hooks",
+    "Enable full telemetry (incl. prompts), ensure Mission Control, install/configure @osfactory/otel-hook",
     (y2) => y2.option("prompts", {
       type: "boolean",
       default: true,
@@ -66274,7 +66367,7 @@ var telemetryCommand = {
     }
   ).command(
     "install-hooks",
-    "Install opentelemetry-hooks and register Cursor / Claude / Codex",
+    "Install @osfactory/otel-hook and register Cursor / Claude / Codex",
     () => {
     },
     () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@osfactory/har",
-  "version": "0.29.0",
+  "version": "0.30.0",
   "description": "LLM-powered CLI for reproducible agent development environments",
   "keywords": [
     "har",