@osfactory/har 0.13.0 → 0.14.0

package/dist/index.js

@@ -23129,6 +23129,22 @@ var AgentSessionUsageSchema = external_exports.object({
 var SyncUsageInputSchema = external_exports.object({
   usage: external_exports.array(AgentSessionUsageSchema)
 });
+var AgentSessionEventSchema = external_exports.object({
+  sessionKey: external_exports.string().min(1),
+  agentId: external_exports.number().int().min(HAR_AGENT_SLOT_MIN),
+  agentTool: AgentToolSchema,
+  eventName: external_exports.string().min(1),
+  sequence: external_exports.number().int().nonnegative().default(0),
+  timestamp: external_exports.string(),
+  attributes: external_exports.record(external_exports.unknown()).optional(),
+  promptText: external_exports.string().nullable().optional(),
+  responseText: external_exports.string().nullable().optional(),
+  rawTruncated: external_exports.string().nullable().optional(),
+  source: external_exports.enum(["otel", "harvest"]).default("otel")
+});
+var SyncSessionEventsInputSchema = external_exports.object({
+  events: external_exports.array(AgentSessionEventSchema)
+});
 
 // src/harness/manifest.ts
 var GENERATOR_VERSION = "0.4.0";
@@ -23367,7 +23383,7 @@ async function handleAgentSkills(options) {
   const { repoPath, mode } = options;
   if (options.enabled === false) return false;
   let targets;
-  if (options.agents !== void 0) {
+  if (typeof options.agents === "string") {
     targets = parseAgentTargets(options.agents);
   } else {
     targets = detectAgentTargets(repoPath);
@@ -29915,6 +29931,18 @@ function createRemoteExecutor(apiUrl, apiKey) {
 var fs33 = __toESM(require("fs"));
 var os9 = __toESM(require("os"));
 var path33 = __toESM(require("path"));
+var DEFAULT_SIGNALS_ON = {
+  metrics: true,
+  logs: true,
+  prompts: false,
+  traces: false
+};
+var DEFAULT_SIGNALS_OFF = {
+  metrics: false,
+  logs: false,
+  prompts: false,
+  traces: false
+};
 function getPreferencePath() {
   if (process.env.HAR_TELEMETRY_CONFIG_PATH) {
     return path33.resolve(process.env.HAR_TELEMETRY_CONFIG_PATH);
@@ -29928,24 +29956,41 @@ function parseEnvOverride(raw) {
   if (["1", "true", "on", "yes", "enabled"].includes(normalized)) return true;
   return void 0;
 }
+function normalizeSignals(enabled, raw) {
+  if (!enabled) return { ...DEFAULT_SIGNALS_OFF };
+  return {
+    metrics: raw?.metrics !== false,
+    logs: raw?.logs !== false,
+    prompts: raw?.prompts === true,
+    traces: raw?.traces === true
+  };
+}
 function readTelemetryPreference() {
   const preferencePath = getPreferencePath();
   try {
     if (!fs33.existsSync(preferencePath)) {
-      return { enabled: true };
+      return { enabled: true, signals: { ...DEFAULT_SIGNALS_ON } };
     }
     const parsed = JSON.parse(fs33.readFileSync(preferencePath, "utf8"));
+    const enabled = parsed.enabled !== false;
     return {
-      enabled: parsed.enabled !== false,
+      enabled,
+      signals: normalizeSignals(enabled, parsed.signals),
       updatedAt: typeof parsed.updatedAt === "string" ? parsed.updatedAt : void 0
     };
   } catch {
-    return { enabled: true };
+    return { enabled: true, signals: { ...DEFAULT_SIGNALS_ON } };
   }
 }
-function writeTelemetryPreference(enabled) {
+function writeTelemetryPreference(enabled, signals) {
+  const current = readTelemetryPreference();
+  const nextSignals = normalizeSignals(enabled, {
+    ...current.signals,
+    ...signals
+  });
   const preference = {
     enabled,
+    signals: enabled ? nextSignals : { ...DEFAULT_SIGNALS_OFF },
     updatedAt: (/* @__PURE__ */ new Date()).toISOString()
   };
   const preferencePath = getPreferencePath();
@@ -29958,12 +30003,18 @@ function isTelemetryEnabled() {
   if (envOverride !== void 0) return envOverride;
   return readTelemetryPreference().enabled;
 }
+function getTelemetrySignals() {
+  if (!isTelemetryEnabled()) return { ...DEFAULT_SIGNALS_OFF };
+  return readTelemetryPreference().signals;
+}
 function getTelemetryPreferencePath() {
   return getPreferencePath();
 }
 var TELEMETRY_SIGNALS = [
-  "Claude Code: tokens (input/output/cache) and estimated USD cost via OTEL metrics",
-  "Codex CLI: token usage via OTEL metrics (no native USD; harvest fills gaps)",
+  "Metrics (default): tokens and estimated USD cost via OTEL metrics",
+  "Logs/events (default): session events (tool calls, api_request) without prompt bodies",
+  "Prompts (opt-in): user/assistant text via OTEL_LOG_USER_PROMPTS \u2014 har telemetry on --prompts",
+  "Traces (opt-in): thin span ingest when CLAUDE_CODE_ENHANCED_TELEMETRY_BETA=1",
   "Fallback: har control sync harvests local Claude/Codex session files when OTEL is missing"
 ];
 
@@ -30006,13 +30057,31 @@ function buildTelemetryEnvBlock(attrs, options) {
   ];
   const injectOtel = isTelemetryEnabled() && options?.otelReady !== false;
   if (injectOtel) {
+    const signals = getTelemetrySignals();
     lines.push(
       "# HAR telemetry \u2192 Mission Control OTLP (disable: har telemetry off)",
       "CLAUDE_CODE_ENABLE_TELEMETRY=1",
-      "OTEL_METRICS_EXPORTER=otlp",
       "OTEL_EXPORTER_OTLP_PROTOCOL=http/json",
       `OTEL_EXPORTER_OTLP_ENDPOINT=${apiUrl}/api/otel`
     );
+    if (signals.metrics) {
+      lines.push("OTEL_METRICS_EXPORTER=otlp");
+    }
+    if (signals.logs) {
+      lines.push("OTEL_LOGS_EXPORTER=otlp");
+    }
+    if (signals.prompts) {
+      lines.push(
+        "OTEL_LOG_USER_PROMPTS=1",
+        "OTEL_LOG_ASSISTANT_RESPONSES=1"
+      );
+    }
+    if (signals.traces) {
+      lines.push(
+        "OTEL_TRACES_EXPORTER=otlp",
+        "CLAUDE_CODE_ENHANCED_TELEMETRY_BETA=1"
+      );
+    }
   }
   return lines.join("\n") + "\n";
 }
@@ -30111,19 +30180,12 @@ function extractClaudeUsageFromRecords(records) {
   }
   return { tokensInput, tokensOutput, tokensCacheRead, tokensCacheCreation, costUsd };
 }
-function harvestClaudeUsage(slot) {
+function findMatchingClaudeTranscripts(slot) {
   const targets = [slot.workDir, slot.worktreePath].filter(Boolean);
-  if (targets.length === 0) return null;
+  if (targets.length === 0) return [];
   const root = claudeProjectsRoot();
-  if (!fs35.existsSync(root)) return null;
-  const sessionKey = buildSessionKey({
-    branch: slot.branch,
-    agentId: slot.agentId,
-    suffix: slot.suffix,
-    createdAt: slot.sessionCreatedAt
-  });
-  let best = null;
-  let bestMtime = 0;
+  if (!fs35.existsSync(root)) return [];
+  const matches = [];
   for (const entry of fs35.readdirSync(root, { withFileTypes: true })) {
     if (!entry.isDirectory()) continue;
     const projectDir = path35.join(root, entry.name);
@@ -30143,16 +30205,70 @@ function harvestClaudeUsage(slot) {
         }
       }
       if (!cwdHit) continue;
-      const usage2 = extractClaudeUsageFromRecords(records);
-      if (usage2.tokensInput + usage2.tokensOutput + usage2.tokensCacheRead === 0 && (usage2.costUsd == null || usage2.costUsd === 0)) {
-        continue;
-      }
-      if (stat.mtimeMs >= bestMtime) {
-        bestMtime = stat.mtimeMs;
-        best = usage2;
-      }
+      matches.push({ filePath, records, mtimeMs: stat.mtimeMs });
     }
   }
+  return matches.sort((a2, b2) => b2.mtimeMs - a2.mtimeMs);
+}
+function extractPromptEvents(records, sessionKey, slot) {
+  const events = [];
+  let sequence = 0;
+  for (const record2 of records) {
+    if (!record2 || typeof record2 !== "object") continue;
+    const payload = record2;
+    const typ = String(payload.type ?? "");
+    const message = payload.message;
+    const role = String(message?.role ?? payload.role ?? "");
+    let text = null;
+    const content = message?.content ?? payload.content;
+    if (typeof content === "string") text = content;
+    else if (Array.isArray(content)) {
+      text = content.map((part) => {
+        if (typeof part === "string") return part;
+        if (part && typeof part === "object" && typeof part.text === "string") {
+          return part.text;
+        }
+        return "";
+      }).filter(Boolean).join("\n");
+    }
+    if (!text || text.trim().length === 0) continue;
+    const isUser = typ === "user" || role === "user" || typ === "human" || Boolean(payload.userType);
+    const isAssistant = typ === "assistant" || role === "assistant";
+    if (!isUser && !isAssistant) continue;
+    sequence += 1;
+    const timestamp = typeof payload.timestamp === "string" ? payload.timestamp : typeof payload.ts === "string" ? payload.ts : (/* @__PURE__ */ new Date()).toISOString();
+    events.push({
+      sessionKey,
+      agentId: slot.agentId,
+      agentTool: "claude_code",
+      eventName: isUser ? "claude_code.user_prompt" : "claude_code.assistant_response",
+      sequence,
+      timestamp,
+      promptText: isUser ? text.slice(0, 8e3) : null,
+      responseText: isAssistant ? text.slice(0, 8e3) : null,
+      rawTruncated: text.slice(0, 4e3),
+      source: "harvest"
+    });
+  }
+  return events;
+}
+function harvestClaudeUsage(slot) {
+  const matches = findMatchingClaudeTranscripts(slot);
+  const sessionKey = buildSessionKey({
+    branch: slot.branch,
+    agentId: slot.agentId,
+    suffix: slot.suffix,
+    createdAt: slot.sessionCreatedAt
+  });
+  let best = null;
+  for (const match of matches) {
+    const usage2 = extractClaudeUsageFromRecords(match.records);
+    if (usage2.tokensInput + usage2.tokensOutput + usage2.tokensCacheRead === 0 && (usage2.costUsd == null || usage2.costUsd === 0)) {
+      continue;
+    }
+    best = usage2;
+    break;
+  }
   if (!best) return null;
   const now = (/* @__PURE__ */ new Date()).toISOString();
   const tokensTotal = best.tokensInput + best.tokensOutput + best.tokensCacheRead + best.tokensCacheCreation;
@@ -30174,6 +30290,18 @@ function harvestClaudeUsage(slot) {
     lastSeenAt: now
   };
 }
+function harvestClaudeEvents(slot) {
+  if (!getTelemetrySignals().prompts) return [];
+  const matches = findMatchingClaudeTranscripts(slot);
+  if (matches.length === 0) return [];
+  const sessionKey = buildSessionKey({
+    branch: slot.branch,
+    agentId: slot.agentId,
+    suffix: slot.suffix,
+    createdAt: slot.sessionCreatedAt
+  });
+  return extractPromptEvents(matches[0].records, sessionKey, slot).slice(-40);
+}
 
 // src/core/usage-harvest/codex.ts
 var fs36 = __toESM(require("fs"));
@@ -30300,6 +30428,9 @@ function harvestUsageForSlot(slot) {
   if (codex) out.push(codex);
   return out;
 }
+function harvestEventsForSlot(slot) {
+  return harvestClaudeEvents(slot);
+}
 
 // src/core/control-sync.ts
 async function postJson(url, body, dryRun) {
@@ -30454,6 +30585,21 @@ async function syncRepoRunsAndSlots(apiUrl, repoId, repoPath, dryRun) {
         const usageBody = SyncUsageInputSchema.parse({ usage: usage2 });
         await postJson(`${apiUrl}/api/repos/${repoId}/usage`, usageBody, dryRun);
       }
+      const events = status.slots.flatMap(
+        (slot) => harvestEventsForSlot({
+          agentId: slot.agentId,
+          workDir: slot.workDir,
+          worktreePath: slot.worktreePath,
+          branch: slot.branch,
+          suffix: slot.suffix,
+          sessionCreatedAt: slot.sessionCreatedAt,
+          repoPath
+        })
+      );
+      if (events.length > 0) {
+        const eventsBody = SyncSessionEventsInputSchema.parse({ events });
+        await postJson(`${apiUrl}/api/repos/${repoId}/events`, eventsBody, dryRun);
+      }
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);
       process.stderr.write(`[har control] usage harvest skipped: ${message}
@@ -31109,19 +31255,14 @@ var envCommand = {
       describe: "Auto-apply AGENT.md proposal without prompting (--auto only)"
     }).option("cursor-rule", {
       type: "boolean",
-      default: false,
-      describe: "Create .cursor/rules/har-workflow.mdc without prompting"
-    }).option("no-cursor-rule", {
-      type: "boolean",
-      default: false,
-      describe: "Skip Cursor rule scaffolding"
+      // No default: unset → prompt/auto-detect; --cursor-rule → true; --no-cursor-rule → false
+      // (do not declare a separate --no-cursor-rule option — yargs negation owns that.)
+      describe: "Create .cursor/rules/har-workflow.mdc without prompting (use --no-cursor-rule to skip)"
     }).option("agents", {
       type: "string",
-      describe: "Scaffold agent skills for these targets (comma-separated: claude,cursor,codex); auto-detected when omitted"
-    }).option("no-agents", {
-      type: "boolean",
-      default: false,
-      describe: "Skip agent skills scaffolding"
+      // --no-agents is yargs negation of this string option (sets agents=false). Do not
+      // declare a separate --no-agents boolean — it collides and crashes parseAgentTargets.
+      describe: "Scaffold agent skills for these targets (comma-separated: claude,cursor,codex); auto-detected when omitted; --no-agents to skip"
     }),
     handleInit
   ).command(
@@ -31140,19 +31281,11 @@ var envCommand = {
       describe: "Adaptation summary to store in the manifest (--finalize only)"
     }).option("cursor-rule", {
       type: "boolean",
-      default: false,
-      describe: "Create .cursor/rules/har-workflow.mdc without prompting"
-    }).option("no-cursor-rule", {
-      type: "boolean",
-      default: false,
-      describe: "Skip Cursor rule scaffolding"
+      // No default: unset → prompt/auto-detect; --cursor-rule → true; --no-cursor-rule → false
+      describe: "Create .cursor/rules/har-workflow.mdc without prompting (use --no-cursor-rule to skip)"
     }).option("agents", {
       type: "string",
-      describe: "Scaffold agent skills for these targets (comma-separated: claude,cursor,codex); auto-detected when omitted"
-    }).option("no-agents", {
-      type: "boolean",
-      default: false,
-      describe: "Skip agent skills scaffolding"
+      describe: "Scaffold agent skills for these targets (comma-separated: claude,cursor,codex); auto-detected when omitted; --no-agents to skip"
     }),
     handleMaintain
   ).command(
@@ -31328,14 +31461,13 @@ async function handleInit(argv) {
     recordRepoForControlSync(repoPath);
     await handleCursorRule({
       repoPath,
-      cursorRule: resolveCursorRuleFlag(argv.cursorRule, argv.noCursorRule),
+      cursorRule: resolveCursorRuleFlag(argv.cursorRule),
       autoYes: argv.yes,
       mode: "init"
     });
     await handleAgentSkills({
       repoPath,
-      agents: argv.agents,
-      enabled: argv.noAgents ? false : void 0,
+      ...resolveAgentsScaffoldOptions(argv.agents),
       autoYes: argv.yes,
       force: argv.force,
       mode: "init"
@@ -31401,14 +31533,13 @@ async function handleMaintain(argv) {
     }
     await handleCursorRule({
       repoPath,
-      cursorRule: resolveCursorRuleFlag(argv.cursorRule, argv.noCursorRule),
+      cursorRule: resolveCursorRuleFlag(argv.cursorRule),
       autoYes: argv.yes,
       mode: "maintain"
     });
     await handleAgentSkills({
       repoPath,
-      agents: argv.agents,
-      enabled: argv.noAgents ? false : void 0,
+      ...resolveAgentsScaffoldOptions(argv.agents),
       autoYes: argv.yes,
       mode: "maintain"
     });
@@ -31417,10 +31548,13 @@ async function handleMaintain(argv) {
     process.exit(1);
   }
 }
-function resolveCursorRuleFlag(cursorRule, noCursorRule) {
-  if (noCursorRule) return false;
-  if (cursorRule) return true;
-  return void 0;
+function resolveCursorRuleFlag(cursorRule) {
+  return cursorRule;
+}
+function resolveAgentsScaffoldOptions(agents) {
+  if (agents === false) return { enabled: false };
+  if (typeof agents === "string") return { agents };
+  return {};
 }
 function emitManualAdaptationPrompt(repoPath, mode, profile = "default", bundleReport) {
   const prompt = mode === "init" ? buildInitAdaptationPrompt(repoPath, profile) : buildMaintainAdaptationPrompt(repoPath, bundleReport);
@@ -40163,18 +40297,20 @@ function printSignals() {
 async function handleStatus3(argv) {
   const preference = readTelemetryPreference();
   const enabled = isTelemetryEnabled();
+  const signals = getTelemetrySignals();
   const apiUrl = getControlApiUrl();
   const reachable = enabled ? await isControlApiReachable(apiUrl) : false;
   const payload = {
     enabled,
     preferenceEnabled: preference.enabled,
+    signals,
     preferencePath: getTelemetryPreferencePath(),
     updatedAt: preference.updatedAt ?? null,
     envOverride: process.env.HAR_TELEMETRY ?? null,
     controlApiUrl: apiUrl,
     controlReachable: reachable,
     otelEndpoint: `${apiUrl.replace(/\/$/, "")}/api/otel`,
-    signals: [...TELEMETRY_SIGNALS]
+    signalDescriptions: [...TELEMETRY_SIGNALS]
   };
   if (argv.json) {
     process.stdout.write(`${JSON.stringify(payload, null, 2)}
@@ -40184,21 +40320,33 @@ async function handleStatus3(argv) {
   header("har telemetry status");
   info(`Enabled:       ${enabled ? "yes" : "no"}${process.env.HAR_TELEMETRY ? " (HAR_TELEMETRY override)" : ""}`);
   info(`Preference:    ${getTelemetryPreferencePath()}${preference.updatedAt ? ` (updated ${preference.updatedAt})` : " (default on)"}`);
+  info(
+    `Signals:       metrics=${signals.metrics} logs=${signals.logs} prompts=${signals.prompts} traces=${signals.traces}`
+  );
   info(`Mission Control: ${apiUrl} (${reachable ? "reachable" : "not reachable"})`);
   info(`OTLP endpoint: ${payload.otelEndpoint}`);
   printSignals();
 }
-async function handleOn() {
+async function handleOn(argv) {
   header("har telemetry on");
-  writeTelemetryPreference(true);
+  const preference = writeTelemetryPreference(true, {
+    prompts: argv.prompts === true ? true : void 0,
+    traces: argv.traces === true ? true : void 0
+  });
   success("Telemetry enabled (opt-out). Agent usage will be stored in local Mission Control.");
+  info(
+    `Signals: metrics=${preference.signals.metrics} logs=${preference.signals.logs} prompts=${preference.signals.prompts} traces=${preference.signals.traces}`
+  );
+  if (preference.signals.prompts) {
+    warn("Prompt/response text will leave the agent machine for local Mission Control storage.");
+  }
   printSignals();
   const result = await ensureTelemetryInfrastructure({ startIfNeeded: true });
   if (result.message) success(result.message);
   if (result.warning) warn(result.warning);
   if (result.otelReady) {
     info(`OTLP ingest: ${result.apiUrl.replace(/\/$/, "")}/api/otel`);
-    info("Usage appears under Mission Control \u2192 Worktrees. Disable: har telemetry off");
+    info("Usage appears under Mission Control \u2192 Worktrees / Usage. Disable: har telemetry off");
   }
 }
 async function handleOff() {
@@ -40308,10 +40456,20 @@ var telemetryCommand = {
   ).command(
     "on",
     "Enable telemetry (default) and ensure Mission Control is running",
-    () => {
-    },
-    () => {
-      void handleOn();
+    (y2) => y2.option("prompts", {
+      type: "boolean",
+      default: false,
+      describe: "Opt in to shipping user/assistant prompt text to Mission Control"
+    }).option("traces", {
+      type: "boolean",
+      default: false,
+      describe: "Opt in to thin OTEL traces ingest (Claude beta)"
+    }),
+    (argv) => {
+      void handleOn({
+        prompts: argv.prompts,
+        traces: argv.traces
+      });
     }
   ).command(
     "off",

package/package.json

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