@botiverse/oar 0.0.10 → 0.1.0

package/dist/shared/session-kernel.js

@@ -1,64 +1,104 @@
 import { randomUUID } from "node:crypto";
+async function settle(decide, issued) {
+    try {
+        return await decide(issued);
+    }
+    catch (error) {
+        return { kind: "rejected", reason: error instanceof Error ? error.message : String(error) };
+    }
+}
+function deliver(observer, record) {
+    try {
+        observer(record);
+    }
+    catch {
+        // Observers are a side-tap; their failures must not touch the run.
+    }
+}
 export function createSessionKernel(sessionId = randomUUID()) {
     const observers = new Set();
+    const log = [];
+    const nodes = new Map([[sessionId, { id: sessionId }]]);
+    const edges = [];
     let seq = 0;
-    let activeTurn = null;
-    const fanOut = (turnId, body) => {
-        const event = {
-            sessionId,
-            turnId,
+    let exited = false;
+    let disposing = false;
+    const append = (build, at) => {
+        const spanId = at?.spanId;
+        const record = build({
+            sessionId: at?.sessionId ?? sessionId,
+            agentPath: at?.agentPath ?? [],
+            ...(spanId === undefined ? {} : { spanId }),
             seq,
             receivedAt: Date.now(),
-            ...body,
-        };
+        });
         seq += 1;
+        log.push(record);
+        if (record.kind === "response" && record.body.kind === "exited") {
+            exited = true;
+        }
+        if (record.kind === "request" && record.direction === "toRuntime" && record.body.kind === "dispose") {
+            disposing = true;
+        }
         for (const observer of observers) {
-            try {
-                observer(event);
-            }
-            catch {
-                // Observers are a side-tap; their failures must not touch the run.
-            }
+            deliver(observer, record);
         }
+        return record;
     };
-    const begin = () => {
-        if (activeTurn !== null && !activeTurn.settled()) {
-            return null;
+    const unreachable = () => {
+        if (exited) {
+            return { kind: "rejected", reason: "runtime exited" };
         }
-        const id = randomUUID();
-        let isSettled = false;
-        const { promise: outcome, resolve: resolveOutcome } = Promise.withResolvers();
-        const turn = {
-            id,
-            outcome,
-            settled: () => isSettled,
-            emit(body) {
-                if (!isSettled) {
-                    fanOut(id, body);
-                }
-            },
-            settle(result) {
-                if (!isSettled) {
-                    fanOut(id, { kind: "turn_ended", outcome: result });
-                    isSettled = true;
-                    resolveOutcome(result);
-                }
-            },
-        };
-        activeTurn = turn;
-        fanOut(id, { kind: "turn_started" });
-        return turn;
+        return disposing ? { kind: "rejected", reason: "session disposed" } : null;
     };
+    const request = (direction, body, at) => append((envelope) => ({ ...envelope, kind: "request", id: at?.id ?? randomUUID(), direction, body }), at);
+    const respond = (requestId, body, at) => append((envelope) => ({ ...envelope, kind: "response", requestId, body }), at);
     return {
         sessionId,
-        subscribe(observer) {
+        event: (body, at) => append((envelope) => ({ ...envelope, kind: "event", body }), at),
+        request,
+        respond,
+        async control(body, decide, at) {
+            const blocked = unreachable();
+            const issued = request("toRuntime", body, at);
+            const decided = blocked ?? await settle(decide, issued);
+            return { request: issued, response: respond(issued.id, decided, at) };
+        },
+        unreachable,
+        subscribe(observer, cursor) {
+            if (cursor !== undefined) {
+                if (cursor.sessionId !== sessionId) {
+                    throw new Error(`cursor belongs to session ${cursor.sessionId}, not ${sessionId}`);
+                }
+                for (const record of log) {
+                    if (record.seq > cursor.afterSeq) {
+                        deliver(observer, record);
+                    }
+                }
+            }
             observers.add(observer);
             return () => {
                 observers.delete(observer);
             };
         },
-        begin,
-        active: () => (activeTurn !== null && !activeTurn.settled() ? activeTurn : null),
+        records: () => log,
+        graph: () => ({ nodes: [...nodes.values()], edges: [...edges] }),
+        node(id) {
+            if (!nodes.has(id)) {
+                nodes.set(id, { id });
+            }
+        },
+        link(edge) {
+            if (!nodes.has(edge.parent)) {
+                nodes.set(edge.parent, { id: edge.parent });
+            }
+            if (!nodes.has(edge.child)) {
+                nodes.set(edge.child, { id: edge.child });
+            }
+            if (!edges.some((known) => known.parent === edge.parent && known.child === edge.child && known.via === edge.via)) {
+                edges.push(edge);
+            }
+        },
     };
 }
 //# sourceMappingURL=session-kernel.js.map

package/dist/shared/session-kernel.js.map

@@ -1 +1 @@
-{"version":3,"file":"session-kernel.js","sourceRoot":"","sources":["../../src/shared/session-kernel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAgCzC,MAAM,UAAU,mBAAmB,CAAC,YAAoB,UAAU,EAAE;IAClE,MAAM,SAAS,GAAG,IAAI,GAAG,EAAmB,CAAC;IAC7C,IAAI,GAAG,GAAG,CAAC,CAAC;IACZ,IAAI,UAAU,GAAsB,IAAI,CAAC;IAEzC,MAAM,MAAM,GAAG,CAAC,MAAc,EAAE,IAAsB,EAAQ,EAAE;QAC9D,MAAM,KAAK,GAAG;YACZ,SAAS;YACT,MAAM;YACN,GAAG;YACH,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE;YACtB,GAAG,IAAI;SACR,CAAC;QACF,GAAG,IAAI,CAAC,CAAC;QACT,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YACjC,IAAI,CAAC;gBACH,QAAQ,CAAC,KAAK,CAAC,CAAC;YAClB,CAAC;YAAC,MAAM,CAAC;gBACP,mEAAmE;YACrE,CAAC;QACH,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,KAAK,GAAG,GAAsB,EAAE;QACpC,IAAI,UAAU,KAAK,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC;YACjD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,EAAE,GAAG,UAAU,EAAE,CAAC;QACxB,IAAI,SAAS,GAAG,KAAK,CAAC;QACtB,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,aAAa,EAAe,CAAC;QAC3F,MAAM,IAAI,GAAe;YACvB,EAAE;YACF,OAAO;YACP,OAAO,EAAE,GAAG,EAAE,CAAC,SAAS;YACxB,IAAI,CAAC,IAAI;gBACP,IAAI,CAAC,SAAS,EAAE,CAAC;oBACf,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;gBACnB,CAAC;YACH,CAAC;YACD,MAAM,CAAC,MAAM;gBACX,IAAI,CAAC,SAAS,EAAE,CAAC;oBACf,MAAM,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;oBACpD,SAAS,GAAG,IAAI,CAAC;oBACjB,cAAc,CAAC,MAAM,CAAC,CAAC;gBACzB,CAAC;YACH,CAAC;SACF,CAAC;QACF,UAAU,GAAG,IAAI,CAAC;QAClB,MAAM,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,CAAC;QACrC,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF,OAAO;QACL,SAAS;QACT,SAAS,CAAC,QAAQ;YAChB,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACxB,OAAO,GAAG,EAAE;gBACV,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAC7B,CAAC,CAAC;QACJ,CAAC;QACD,KAAK;QACL,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,UAAU,KAAK,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC;KACjF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"session-kernel.js","sourceRoot":"","sources":["../../src/shared/session-kernel.ts"],"names":[],"mappings":"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"}

package/dist/voyage.d.ts

@@ -1,6 +1,5 @@
-import type { SessionEvent } from "./contracts/session.js";
-export declare const VOYAGE_FORMAT = "oar-voyage/1";
-export type SubmissionVia = "prompt" | "steer" | "queue";
+import type { SessionRecord } from "./contracts/session.js";
+export declare const VOYAGE_FORMAT = "oar-voyage/2";
 export interface VoyageHeader {
     readonly runtime: string;
     readonly model?: string;
@@ -10,12 +9,10 @@ export interface VoyageHeader {
     readonly recorder: string;
 }
 export declare function headerLine(header: VoyageHeader): string;
-export declare function submissionLine(at: number, via: SubmissionVia, text: string): string;
-export declare function eventLine(event: SessionEvent): string;
+export declare function recordLine(record: SessionRecord): string;
 export declare function endLine(at: number, reason: string): string;
 export interface VoyageRecorder {
-    submission(via: SubmissionVia, text: string): void;
-    event(event: SessionEvent): void;
+    record(record: SessionRecord): void;
     end(reason: string): void;
 }
 export declare function openVoyage(path: string, header: VoyageHeader): VoyageRecorder;

package/dist/voyage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"voyage.d.ts","sourceRoot":"","sources":["../src/voyage.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAS3D,eAAO,MAAM,aAAa,iBAAiB,CAAC;AAE5C,MAAM,MAAM,aAAa,GAAG,QAAQ,GAAG,OAAO,GAAG,OAAO,CAAC;AAEzD,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC3B;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,CAWvD;AAED,wBAAgB,cAAc,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAEnF;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,YAAY,GAAG,MAAM,CAErD;AAED,wBAAgB,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAE1D;AAED,MAAM,WAAW,cAAc;IAC7B,UAAU,CAAC,GAAG,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACnD,KAAK,CAAC,KAAK,EAAE,YAAY,GAAG,IAAI,CAAC;IACjC,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B;AAID,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,GAAG,cAAc,CAkB7E"}
+{"version":3,"file":"voyage.d.ts","sourceRoot":"","sources":["../src/voyage.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAU5D,eAAO,MAAM,aAAa,iBAAiB,CAAC;AAE5C,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC3B;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,CAWvD;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,aAAa,GAAG,MAAM,CAExD;AAED,wBAAgB,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAE1D;AAED,MAAM,WAAW,cAAc;IAC7B,MAAM,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI,CAAC;IACpC,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B;AAID,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,GAAG,cAAc,CAe7E"}

package/dist/voyage.js

@@ -1,11 +1,12 @@
 import { closeSync, openSync, writeSync } from "node:fs";
-// The oar-voyage/1 JSONL format: one JSON object per line, discriminated by
-// `kind`. Line 1 is `header`; `submission` marks each human input; `event`
-// wraps one raw SessionEvent verbatim (no filtering or re-timestamping);
-// `end` is the last line — a log without it is a truncated capture. All
-// timestamps are Unix epoch milliseconds on the same clock as `receivedAt`.
-// The format is defined and owned by oar; other tools may consume it.
-export const VOYAGE_FORMAT = "oar-voyage/1";
+// The oar-voyage/2 JSONL format: one JSON object per line, discriminated by
+// `kind`. Line 1 is `header`; `record` wraps one SessionRecord verbatim (no
+// filtering or re-timestamping: human inputs are in the stream already, as
+// request records); `end` is the last line; a log without it is a truncated
+// capture. All timestamps are Unix epoch milliseconds on the same clock as
+// `receivedAt`. The format is defined and owned by oar; other tools may
+// consume it.
+export const VOYAGE_FORMAT = "oar-voyage/2";
 export function headerLine(header) {
     return JSON.stringify({
         kind: "header",
@@ -18,17 +19,14 @@ export function headerLine(header) {
         recorder: header.recorder,
     });
 }
-export function submissionLine(at, via, text) {
-    return JSON.stringify({ kind: "submission", at, via, text });
-}
-export function eventLine(event) {
-    return JSON.stringify({ kind: "event", event });
+export function recordLine(record) {
+    return JSON.stringify({ kind: "record", record });
 }
 export function endLine(at, reason) {
     return JSON.stringify({ kind: "end", at, reason });
 }
-// Lines go through synchronous fd writes so their order — and everything
-// written so far — survives a crashing process; `end` closes the file.
+// Lines go through synchronous fd writes so their order, and everything
+// written so far, survives a crashing process; `end` closes the file.
 export function openVoyage(path, header) {
     const fd = openSync(path, "w");
     const write = (line) => {
@@ -36,11 +34,8 @@ export function openVoyage(path, header) {
     };
     write(headerLine(header));
     return {
-        submission(via, text) {
-            write(submissionLine(Date.now(), via, text));
-        },
-        event(event) {
-            write(eventLine(event));
+        record(record) {
+            write(recordLine(record));
         },
         end(reason) {
             write(endLine(Date.now(), reason));

package/dist/voyage.js.map

@@ -1 +1 @@
-{"version":3,"file":"voyage.js","sourceRoot":"","sources":["../src/voyage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAGzD,4EAA4E;AAC5E,2EAA2E;AAC3E,yEAAyE;AACzE,wEAAwE;AACxE,4EAA4E;AAC5E,sEAAsE;AAEtE,MAAM,CAAC,MAAM,aAAa,GAAG,cAAc,CAAC;AAa5C,MAAM,UAAU,UAAU,CAAC,MAAoB;IAC7C,OAAO,IAAI,CAAC,SAAS,CAAC;QACpB,IAAI,EAAE,QAAQ;QACd,MAAM,EAAE,aAAa;QACrB,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,GAAG,CAAC,MAAM,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;QAC9D,GAAG,EAAE,MAAM,CAAC,GAAG;QACf,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,QAAQ,EAAE,MAAM,CAAC,QAAQ;KAC1B,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,EAAU,EAAE,GAAkB,EAAE,IAAY;IACzE,OAAO,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;AAC/D,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,KAAmB;IAC3C,OAAO,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,OAAO,CAAC,EAAU,EAAE,MAAc;IAChD,OAAO,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;AACrD,CAAC;AAQD,yEAAyE;AACzE,uEAAuE;AACvE,MAAM,UAAU,UAAU,CAAC,IAAY,EAAE,MAAoB;IAC3D,MAAM,EAAE,GAAG,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC/B,MAAM,KAAK,GAAG,CAAC,IAAY,EAAQ,EAAE;QACnC,SAAS,CAAC,EAAE,EAAE,GAAG,IAAI,IAAI,CAAC,CAAC;IAC7B,CAAC,CAAC;IACF,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;IAC1B,OAAO;QACL,UAAU,CAAC,GAAG,EAAE,IAAI;YAClB,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;QAC/C,CAAC;QACD,KAAK,CAAC,KAAK;YACT,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;QAC1B,CAAC;QACD,GAAG,CAAC,MAAM;YACR,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC;YACnC,SAAS,CAAC,EAAE,CAAC,CAAC;QAChB,CAAC;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"voyage.js","sourceRoot":"","sources":["../src/voyage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAGzD,4EAA4E;AAC5E,4EAA4E;AAC5E,2EAA2E;AAC3E,4EAA4E;AAC5E,2EAA2E;AAC3E,wEAAwE;AACxE,cAAc;AAEd,MAAM,CAAC,MAAM,aAAa,GAAG,cAAc,CAAC;AAW5C,MAAM,UAAU,UAAU,CAAC,MAAoB;IAC7C,OAAO,IAAI,CAAC,SAAS,CAAC;QACpB,IAAI,EAAE,QAAQ;QACd,MAAM,EAAE,aAAa;QACrB,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,GAAG,CAAC,MAAM,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;QAC9D,GAAG,EAAE,MAAM,CAAC,GAAG;QACf,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,QAAQ,EAAE,MAAM,CAAC,QAAQ;KAC1B,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,MAAqB;IAC9C,OAAO,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;AACpD,CAAC;AAED,MAAM,UAAU,OAAO,CAAC,EAAU,EAAE,MAAc;IAChD,OAAO,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;AACrD,CAAC;AAOD,wEAAwE;AACxE,sEAAsE;AACtE,MAAM,UAAU,UAAU,CAAC,IAAY,EAAE,MAAoB;IAC3D,MAAM,EAAE,GAAG,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC/B,MAAM,KAAK,GAAG,CAAC,IAAY,EAAQ,EAAE;QACnC,SAAS,CAAC,EAAE,EAAE,GAAG,IAAI,IAAI,CAAC,CAAC;IAC7B,CAAC,CAAC;IACF,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;IAC1B,OAAO;QACL,MAAM,CAAC,MAAM;YACX,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;QAC5B,CAAC;QACD,GAAG,CAAC,MAAM;YACR,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC;YACnC,SAAS,CAAC,EAAE,CAAC,CAAC;QAChB,CAAC;KACF,CAAC;AACJ,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@botiverse/oar",
-  "version": "0.0.10",
-  "description": "Provider-independent contracts for observing agent runtimes",
+  "version": "0.1.0",
+  "description": "A programming interface for all agent harnesses: provider-independent contracts for controlling and observing agent runtimes",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -31,13 +31,12 @@
     "directory": "packages/oar"
   },
   "license": "Apache-2.0",
-  "optionalDependencies": {
-    "@earendil-works/pi-coding-agent": "^0.84.2"
-  },
   "dependencies": {
     "@agentclientprotocol/sdk": "^1.4.0",
     "cross-spawn": "^7.0.6",
-    "which": "^2.0.2"
+    "which": "^2.0.2",
+    "@earendil-works/pi-coding-agent": "^0.84.2",
+    "undici": "8.9.0"
   },
   "devDependencies": {
     "@types/cross-spawn": "^6.0.6",

package/dist/runtimes/codex/context-usage.d.ts

@@ -1,10 +0,0 @@
-import type { ContextUsage } from "../../contracts/session.js";
-import { type JsonRecord } from "../../shared/json.js";
-/**
- * Codex reports usage in the streaming thread/tokenUsage/updated notification
- * (cumulative). `total.inputTokens` is the context sent; codex does NOT
- * include the context window in this event, so contextWindow/percent stay
- * null unless a future field carries it. We cache the latest (last-wins).
- */
-export declare function codexContextUsageFromNotification(params: JsonRecord): ContextUsage | null;
-//# sourceMappingURL=context-usage.d.ts.map

package/dist/runtimes/codex/context-usage.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"context-usage.d.ts","sourceRoot":"","sources":["../../../src/runtimes/codex/context-usage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAsB,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAE3E;;;;;GAKG;AACH,wBAAgB,iCAAiC,CAAC,MAAM,EAAE,UAAU,GAAG,YAAY,GAAG,IAAI,CAOzF"}

package/dist/runtimes/codex/context-usage.js

@@ -1,16 +0,0 @@
-import { asNumber, asRecord } from "../../shared/json.js";
-/**
- * Codex reports usage in the streaming thread/tokenUsage/updated notification
- * (cumulative). `total.inputTokens` is the context sent; codex does NOT
- * include the context window in this event, so contextWindow/percent stay
- * null unless a future field carries it. We cache the latest (last-wins).
- */
-export function codexContextUsageFromNotification(params) {
-    const total = asRecord(asRecord(params.tokenUsage)?.total);
-    if (total === null) {
-        return null;
-    }
-    const tokens = asNumber(total.inputTokens);
-    return { tokens: tokens ?? null, contextWindow: null, percent: null };
-}
-//# sourceMappingURL=context-usage.js.map

package/dist/runtimes/codex/context-usage.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"context-usage.js","sourceRoot":"","sources":["../../../src/runtimes/codex/context-usage.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAmB,MAAM,sBAAsB,CAAC;AAE3E;;;;;GAKG;AACH,MAAM,UAAU,iCAAiC,CAAC,MAAkB;IAClE,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC,CAAC;IAC3D,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,IAAI,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;AACxE,CAAC"}