@smithers-orchestrator/observability 0.25.0 → 0.25.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smithers-orchestrator/observability",
-  "version": "0.25.0",
+  "version": "0.25.2",
   "description": "Concrete Smithers metrics, logging, tracing, and observability integrations",
   "type": "module",
   "sideEffects": false,
@@ -34,8 +34,7 @@
     "@effect/opentelemetry": "^0.63.0",
     "@effect/platform": "^0.96.0",
     "@effect/platform-bun": "^0.89.0",
-    "effect": "^3.21.1",
-    "@smithers-orchestrator/agents": "0.25.0"
+    "effect": "^3.21.1"
   },
   "devDependencies": {
     "@types/bun": "latest",

package/src/SmithersEvent.ts

@@ -121,7 +121,19 @@ export type SmithersEvent =
       after: RunState;
       timestampMs: number;
     }
-  | { type: "RunFinished"; runId: string; timestampMs: number }
+  | {
+      type: "RunFinished";
+      runId: string;
+      timestampMs: number;
+      /**
+       * Tasks that ended `failed` but were tolerated (continueOnFail / transient
+       * agent failures) so the run still finished. Present only when `> 0` — the
+       * run "succeeded" while these children failed. See `docs/runtime/run-state.mdx`.
+       */
+      failedChildren?: number;
+      /** Task state keys (`nodeId::iteration`) counted by `failedChildren`. */
+      failedChildKeys?: readonly string[];
+    }
   | { type: "RunFailed"; runId: string; error: unknown; timestampMs: number }
   | { type: "RunCancelled"; runId: string; timestampMs: number }
   | {

package/src/_traceEventNormalizers.js

@@ -1,6 +1,3 @@
-import { extractTextFromJsonValue } from "@smithers-orchestrator/agents/BaseCliAgent";
-import { normalizeTokenUsage } from "@smithers-orchestrator/agents/BaseCliAgent";
-
 /**
  * @typedef {import('./agentTrace.ts').AgentFamily} AgentFamily
  * @typedef {import('./agentTrace.ts').CanonicalAgentTraceEventKind} CanonicalAgentTraceEventKind
@@ -27,6 +24,77 @@ import { normalizeTokenUsage } from "@smithers-orchestrator/agents/BaseCliAgent"
  * }} NormalizedTraceBatch
  */
 
+/**
+ * @param {unknown} value
+ * @returns {string | undefined}
+ */
+function extractTextFromJsonValue(value) {
+    if (typeof value === "string") return value;
+    if (Array.isArray(value)) {
+        const text = value.map((item) => extractTextFromJsonValue(item) ?? "").join("");
+        return text || undefined;
+    }
+    if (!value || typeof value !== "object") return undefined;
+    const record = /** @type {Record<string, unknown>} */ (value);
+    if (typeof record.text === "string") return record.text;
+    if (typeof record.content === "string") return record.content;
+    if (typeof record.output_text === "string") return record.output_text;
+    if (Array.isArray(record.content)) {
+        const text = record.content.map((part) => extractTextFromJsonValue(part) ?? "").join("");
+        if (text) return text;
+    }
+    if (record.type === "text" && record.part) return extractTextFromJsonValue(record.part);
+    for (const field of ["response", "message", "result", "output", "data", "item"]) {
+        const text = extractTextFromJsonValue(record[field]);
+        if (text) return text;
+    }
+    return undefined;
+}
+
+/** @type {Record<string, ReadonlyArray<ReadonlyArray<string>>>} */
+const _usageFieldAliases = {
+    inputTokens: [["inputTokens"], ["promptTokens"], ["prompt_tokens"], ["input_tokens"], ["input"], ["models", "gemini", "tokens", "input"]],
+    outputTokens: [["outputTokens"], ["completionTokens"], ["completion_tokens"], ["output_tokens"], ["output"], ["models", "gemini", "tokens", "output"]],
+    cacheReadTokens: [["cacheReadTokens"], ["cache_read_input_tokens"], ["cached_input_tokens"], ["cache_read_tokens"], ["inputTokenDetails", "cacheReadTokens"]],
+    cacheWriteTokens: [["cacheWriteTokens"], ["cache_write_input_tokens"], ["cache_creation_input_tokens"], ["cache_write_tokens"], ["inputTokenDetails", "cacheWriteTokens"]],
+    reasoningTokens: [["reasoningTokens"], ["reasoning_tokens"], ["outputTokenDetails", "reasoningTokens"]],
+    totalTokens: [["totalTokens"], ["total_tokens"]],
+};
+
+/**
+ * @param {unknown} value
+ * @param {ReadonlyArray<string>} path
+ * @returns {unknown}
+ */
+function _readUsagePath(value, path) {
+    let current = value;
+    for (const segment of path) {
+        if (!current || typeof current !== "object") return undefined;
+        current = /** @type {Record<string, unknown>} */ (current)[segment];
+    }
+    return current;
+}
+
+/**
+ * @param {unknown} usage
+ * @returns {Record<string, number> | null}
+ */
+function normalizeTokenUsage(usage) {
+    if (!usage || typeof usage !== "object") return null;
+    /** @type {Record<string, number>} */
+    const normalized = {};
+    for (const [field, aliases] of Object.entries(_usageFieldAliases)) {
+        for (const path of aliases) {
+            const value = _readUsagePath(usage, path);
+            if (typeof value === "number") {
+                normalized[field] = value;
+                break;
+            }
+        }
+    }
+    return Object.values(normalized).some((v) => Number.isFinite(v) && v > 0) ? normalized : null;
+}
+
 /** @type {Record<string, MappedStructuredEvent>} */
 const piSimpleEventMap = {
     session: { kind: "session.start", payloadKind: "pi" },

package/src/_traceRedaction.js

@@ -6,7 +6,12 @@
 const rules = [
     {
         id: "api-key",
-        pattern: /\b(?:sk|pk)_[A-Za-z0-9_-]{8,}\b/g,
+        // Covers Stripe-style `sk_`/`pk_` AND the hyphenated provider keys
+        // Smithers actually drives: OpenAI `sk-…`/`sk-proj-…` and Anthropic
+        // `sk-ant-api03-…`. The separator after sk/pk may be `-` or `_`, and the
+        // body may contain further `-`/`_` segments (namespaces like `proj-`,
+        // `ant-`, `api03-`).
+        pattern: /\b(?:sk|pk)[-_][A-Za-z0-9][A-Za-z0-9_-]{7,}\b/g,
         replace: "[REDACTED_API_KEY]",
     },
     {
@@ -26,7 +31,10 @@ const rules = [
     },
     {
         id: "secret-ish",
-        pattern: /\b(?:api[_-]?key|token|secret|password)=([^\s"']+)/gi,
+        // Negative lookbehind (not `\b`) so an underscore-joined prefix like
+        // `ANTHROPIC_API_KEY=` still matches: `_` is a word char, so `\bapi`
+        // never fired after it, leaking env-style key dumps.
+        pattern: /(?<![A-Za-z0-9])(?:api[_-]?key|token|secret|password)=([^\s"']+)/gi,
         // No `replace` field: redactValue special-cases this rule by id and
         // rewrites the captured value itself, so a top-level replace is never read.
     },

package/src/index.d.ts

@@ -213,6 +213,14 @@ type SmithersEvent$2 = {
     type: "RunFinished";
     runId: string;
     timestampMs: number;
+    /**
+     * Tasks that ended `failed` but were tolerated (continueOnFail / transient
+     * agent failures) so the run still finished. Present only when `> 0` — the
+     * run "succeeded" while these children failed. See `docs/runtime/run-state.mdx`.
+     */
+    failedChildren?: number;
+    /** Task state keys (`nodeId::iteration`) counted by `failedChildren`. */
+    failedChildKeys?: readonly string[];
 } | {
     type: "RunFailed";
     runId: string;