@smithers-orchestrator/observability 0.21.0 → 0.23.0

package/package.json

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

package/src/_coreCorrelation/withCorrelationContext.js

@@ -11,5 +11,12 @@ import { mergeCorrelationContext } from "./mergeCorrelationContext.js";
  */
 export function withCorrelationContext(effect, patch) {
     const next = mergeCorrelationContext(correlationStorage.getStore(), patch);
-    return next ? effect.pipe(Effect.locally(correlationContextFiberRef, next)) : effect;
+    if (!next)
+        return effect;
+    const located = effect.pipe(Effect.locally(correlationContextFiberRef, next));
+    return Effect.acquireUseRelease(Effect.sync(() => {
+        const previous = correlationStorage.getStore();
+        correlationStorage.enterWith(next);
+        return previous;
+    }), () => located, (previous) => Effect.sync(() => correlationStorage.enterWith(previous)));
 }

package/src/_sessionFileResolvers.js

@@ -1,6 +1,6 @@
 import { readFile, readdir, stat } from "node:fs/promises";
 import { homedir } from "node:os";
-import { join } from "node:path";
+import { basename, join } from "node:path";
 
 /**
  * @param {string} dir
@@ -111,7 +111,7 @@ export async function resolveClaudeSessionFile(agent, cwd, sessionId) {
             if (info.isFile()) return direct;
         } catch {}
         const files = await listJsonlFiles(root);
-        const match = files.find((file) => file.endsWith(`/${sessionId}.jsonl`));
+        const match = files.find((file) => basename(file) === `${sessionId}.jsonl`);
         if (match) return match;
     }
     return null;
@@ -124,8 +124,13 @@ export async function resolveClaudeSessionFile(agent, cwd, sessionId) {
  * @returns {Promise<string | null>}
  */
 export async function resolveCodexSessionFile(agent, cwd, startedAtMs) {
-    const day = new Date(startedAtMs);
-    const dayRoots = buildCodexSessionRoots(agent).map((root) => join(root, String(day.getUTCFullYear()), String(day.getUTCMonth() + 1).padStart(2, "0"), String(day.getUTCDate()).padStart(2, "0")));
+    const dayFolders = new Set();
+    for (const offset of [-1, 0, 1]) {
+        const day = new Date(startedAtMs + offset * 24 * 60 * 60 * 1000);
+        dayFolders.add(join(String(day.getUTCFullYear()), String(day.getUTCMonth() + 1).padStart(2, "0"), String(day.getUTCDate()).padStart(2, "0")));
+        dayFolders.add(join(String(day.getFullYear()), String(day.getMonth() + 1).padStart(2, "0"), String(day.getDate()).padStart(2, "0")));
+    }
+    const dayRoots = buildCodexSessionRoots(agent).flatMap((root) => [...dayFolders].map((folder) => join(root, folder)));
     const candidates = (await Promise.all(dayRoots.map((root) => listJsonlFiles(root)))).flat();
     /** @type {{ file: string; delta: number } | null} */
     let best = null;

package/src/correlation.js

@@ -5,14 +5,38 @@ import { getCurrentCorrelationContext as getCoreCurrentCorrelationContext, merge
 
 export { correlationContextFiberRef, correlationContextToLogAnnotations, CorrelationContextLive, CorrelationContextService, getCurrentCorrelationContext, getCurrentCorrelationContextEffect, mergeCorrelationContext, runWithCorrelationContext, withCorrelationContext, withCurrentCorrelationContext, } from "./_coreCorrelation/index.js";
 /**
+ * Temporary compatibility shim for legacy, non-Effect callers.
+ *
+ * Unlike the FiberRef-based core implementation
+ * ({@link import("./_coreCorrelation/updateCurrentCorrelationContext.js").updateCurrentCorrelationContext}),
+ * which returns an Effect and sets a fresh merged context on the
+ * `correlationContextFiberRef`, this shim runs synchronously and applies the
+ * patch by **mutating the current context object in place** via
+ * `Object.assign(current, next)`. Any references already holding the current
+ * context object will observe the mutation. This in-place semantics is
+ * intentional and exists only to preserve behavior for callers that captured a
+ * context reference before the Effect-based API existed.
+ *
+ * If there is no current context, the patch is a no-op (nothing is created).
+ *
+ * @deprecated Prefer the Effect-returning
+ * `updateCurrentCorrelationContext` from
+ * `@smithers-orchestrator/observability` (the `_coreCorrelation` version),
+ * which does not mutate shared state. This shim will be removed once legacy
+ * callers migrate.
+ *
  * @param {CorrelationPatch} patch
+ * @returns {void}
  */
 export function updateCurrentCorrelationContext(patch) {
     const current = getCoreCurrentCorrelationContext();
     if (!current)
         return;
-    // TODO: replace this compatibility shim once legacy callers adopt the
-    // Effect-returning updateCurrentCorrelationContext from @smithers-orchestrator/observability.
+    // Compatibility shim: mutate the current context in place rather than
+    // setting a new FiberRef value. See the JSDoc above — this preserves
+    // behavior for legacy callers and is intentional, not a bug. Remove once
+    // those callers adopt the Effect-returning core
+    // updateCurrentCorrelationContext.
     const next = mergeCoreCorrelationContext(current, patch);
     if (!next)
         return;

package/src/index.d.ts

@@ -342,6 +342,7 @@ type SmithersEvent$2 = {
     nodeId: string;
     iteration: number;
     attempt: number;
+    toolCallId: string;
     toolName: string;
     seq: number;
     timestampMs: number;
@@ -351,6 +352,7 @@ type SmithersEvent$2 = {
     nodeId: string;
     iteration: number;
     attempt: number;
+    toolCallId: string;
     toolName: string;
     seq: number;
     status: "success" | "error";