@rynx-ai/runtime 0.1.0 → 0.1.10-beta.2

package/dist/codex-app-server/forwarder.d.ts

@@ -1,5 +1,5 @@
 /**
- * Persistent codex session forwarder — the heart of omnigent's codex-native
+ * Persistent codex session forwarder — the heart of reference implementation's codex-native
  * model, ported to rynx. It subscribes to a session's app-server for the whole
  * session lifetime (not just one turn) and maps every thread notification to a
  * typed {@link AgentEvent}, so turns started by ANY client — the web composer OR
@@ -10,9 +10,9 @@
  * (or a fatal error) closes it. The turn's codex `turnId` is surfaced on
  * {@link CodexForwarderSink.onTurnStart} so the normalizer's `responseId` is
  * DETERMINISTIC (`resp_codex_<turnId>`) — the same turn always maps to the same
- * response id across snapshot/live, so items converge (omnigent's `codex_{turnId}`).
+ * response id across snapshot/live, so items converge (reference implementation's `codex_{turnId}`).
  *
- * omnigent's subscribe-then-mirror model (verified against real codex 0.142.5):
+ * reference implementation's subscribe-then-mirror model (verified against real codex 0.142.5):
  * the app-server delivers a thread's item/turn notifications to a connection that
  * has `thread/resume`d it. A fresh TUI-created thread has no rollout until its
  * first turn, so resume is parked until {@link CodexForwarderSink.onThreadActive}
@@ -21,7 +21,7 @@
  * {@link CodexSessionForwarder.replayBackfill}. Backfill and the live stream are
  * de-duplicated by codex item id.
  */
-import type { AgentEvent } from "@rynx-ai/core";
+import type { AgentEvent, UserContentPart } from "@rynx-ai/core";
 import type { CodexAppServerClient } from "./client.js";
 import type { ResumedTurn } from "./protocol.js";
 export interface CodexForwarderSink {
@@ -36,30 +36,47 @@ export interface CodexForwarderSink {
     onTurnError(error: Error): void;
     /** The user's turn text (sourced from codex's `userMessage` item), so a
      *  co-driving TUI's prompt is recorded even though this process never injected it. */
-    onUserMessage?(text: string): void;
+    onUserMessage?(content: string | UserContentPart[]): void;
     /** A thread was announced on the app-server (a `--remote` TUI creating a thread,
      *  or a resume). The host persists the id + starts the subscribe loop. */
     onThreadStarted?(threadId: string): void;
     /** The thread showed activity (a turn/item began, so its rollout now exists).
-     *  Fired once; lets a parked `thread/resume` retry (omnigent's ready signal). */
+     *  Fired once; lets a parked `thread/resume` retry (reference implementation's ready signal). */
     onThreadActive?(): void;
 }
+export interface CodexSessionForwarderOptions {
+    /** Some Codex-lineage runtimes publish the final item one frame after
+     * `turn/completed`. Keep the Turn open briefly so that item cannot create a
+     * second, permanently-running response. */
+    turnCompletionGraceMs?: number;
+    /** Some runtimes complete the final assistant message before publishing the
+     * preceding reasoning item. Briefly hold that message so canonical item order
+     * remains reasoning -> final answer. */
+    assistantMessageGraceMs?: number;
+    /** Surface Traex's provider-capacity queue as a canonical running status. */
+    surfaceQueueStatus?: boolean;
+}
 export declare class CodexSessionForwarder {
     private readonly client;
     private readonly sink;
+    private readonly options;
     private unsubscribe;
     private turnOpen;
     private currentTurnIdValue;
     private currentThreadIdValue;
     private activeSignaled;
+    private completionTimer;
+    private assistantMessageTimer;
+    private deferredAssistantMessage;
+    private pendingCompletion;
     /** Completed-item dedup keys already mirrored (live vs resume backfill). Key =
      *  `threadId:turnId:item.id`; anonymous items use a per-(thread,turn) position
-     *  counter. Mirrors omnigent `_completed_item_key` + `synced_item_keys`. */
+     *  counter. Mirrors reference implementation `_completed_item_key` + `synced_item_keys`. */
     private readonly seenCompletedItems;
     /** Per-(thread,turn) position counter for items lacking a stable codex id
-     *  (peek-then-advance; advanced only on a successful claim). omnigent anon path. */
+     *  (peek-then-advance; advanced only on a successful claim). reference implementation anon path. */
     private readonly anonCounters;
-    constructor(client: CodexAppServerClient, sink: CodexForwarderSink);
+    constructor(client: CodexAppServerClient, sink: CodexForwarderSink, options?: CodexSessionForwarderOptions);
     /** Begin mirroring. Idempotent. */
     start(): void;
     stop(): void;
@@ -78,14 +95,23 @@ export declare class CodexSessionForwarder {
      */
     replayBackfill(turns: ResumedTurn[]): void;
     private handle;
+    private scheduleCompletion;
+    private refreshCompletionGrace;
+    private flushPendingCompletion;
+    private settle;
     /** Map + emit one completed codex item, deduped by a TOTAL key and routing the
      *  user echo to {@link CodexForwarderSink.onUserMessage}. Shared by live + backfill. */
     private processCompletedItem;
+    private claimCompletedItem;
+    private emitCompletedItem;
+    private shouldDeferAssistantMessage;
+    private deferAssistantMessage;
+    private flushDeferredAssistantMessage;
     /** Build a total dedup key for one completed item. Stable-id items use
      *  `threadId:turnId:item.id` — identical across replay + live, so the second
      *  delivery is dropped. Items without a codex id fall back to a per-(thread,turn)
      *  position counter (peeked here; advanced only on a successful claim, via
-     *  {@link advanceAnonCounter}). Mirrors omnigent `_completed_item_key`. */
+     *  {@link advanceAnonCounter}). Mirrors reference implementation `_completed_item_key`. */
     private completedItemKey;
     private advanceAnonCounter;
     private ensureTurn;

package/dist/codex-app-server/forwarder.js

@@ -1,3 +1,4 @@
+import { codexUserContent } from "../input-resources.js";
 import { mapCodexItem, mapCodexNotification } from "./mapping.js";
 function threadIdFrom(params) {
     const p = params;
@@ -7,19 +8,20 @@ function turnIdFrom(params) {
     const p = params;
     return p?.turnId ?? p?.turn?.id;
 }
-function userMessageText(item) {
+function userMessageContent(item) {
     if (item.type !== "userMessage")
         return undefined;
-    const content = item.content ?? [];
-    const text = content
-        .filter((c) => c.type === "text" && typeof c.text === "string")
-        .map((c) => c.text)
-        .join("")
-        .trim();
-    return text || undefined;
+    const parts = codexUserContent(item.content);
+    if (parts.length === 0)
+        return undefined;
+    if (parts.every((part) => part.type === "input_text")) {
+        const text = parts.map((part) => part.text).join("").trim();
+        return text || undefined;
+    }
+    return parts;
 }
 /** Whether a notification implies the thread is now active (its first turn has
- *  begun, so the rollout exists). Mirrors omnigent's `_event_indicates_thread_active`. */
+ *  begun, so the rollout exists). Mirrors reference implementation's `_event_indicates_thread_active`. */
 function indicatesActive(method, params) {
     if (method.startsWith("turn/") || method.startsWith("item/"))
         return true;
@@ -32,21 +34,27 @@ function indicatesActive(method, params) {
 export class CodexSessionForwarder {
     client;
     sink;
+    options;
     unsubscribe = null;
     turnOpen = false;
     currentTurnIdValue = null;
     currentThreadIdValue = null;
     activeSignaled = false;
+    completionTimer = null;
+    assistantMessageTimer = null;
+    deferredAssistantMessage = null;
+    pendingCompletion = null;
     /** Completed-item dedup keys already mirrored (live vs resume backfill). Key =
      *  `threadId:turnId:item.id`; anonymous items use a per-(thread,turn) position
-     *  counter. Mirrors omnigent `_completed_item_key` + `synced_item_keys`. */
+     *  counter. Mirrors reference implementation `_completed_item_key` + `synced_item_keys`. */
     seenCompletedItems = new Set();
     /** Per-(thread,turn) position counter for items lacking a stable codex id
-     *  (peek-then-advance; advanced only on a successful claim). omnigent anon path. */
+     *  (peek-then-advance; advanced only on a successful claim). reference implementation anon path. */
     anonCounters = new Map();
-    constructor(client, sink) {
+    constructor(client, sink, options = {}) {
         this.client = client;
         this.sink = sink;
+        this.options = options;
     }
     /** Begin mirroring. Idempotent. */
     start() {
@@ -59,6 +67,8 @@ export class CodexSessionForwarder {
     stop() {
         this.unsubscribe?.();
         this.unsubscribe = null;
+        this.flushPendingCompletion();
+        this.flushDeferredAssistantMessage();
         if (this.turnOpen) {
             this.turnOpen = false;
             this.sink.onTurnEnd();
@@ -91,8 +101,14 @@ export class CodexSessionForwarder {
             this.ensureTurn();
             for (const item of turn.items ?? [])
                 this.processCompletedItem(item);
+            if (turn.status === "inProgress")
+                continue;
+            const mapped = mapCodexNotification("turn/completed", { turn });
             this.turnOpen = false;
-            this.sink.onTurnEnd();
+            if (mapped.fatalError)
+                this.sink.onTurnError(mapped.fatalError);
+            else
+                this.sink.onTurnEnd(mapped.usage);
         }
     }
     handle(method, params) {
@@ -110,63 +126,165 @@ export class CodexSessionForwarder {
             this.activeSignaled = true;
             this.sink.onThreadActive?.();
         }
+        // `queue/status` is a Traex extension. Keep the shared Codex forwarder
+        // behavior unchanged unless the Traex host explicitly opts in.
+        if (method === "queue/status" && !this.options.surfaceQueueStatus)
+            return;
         const carriedTurnId = turnIdFrom(params);
-        if (carriedTurnId)
-            this.currentTurnIdValue = carriedTurnId;
         if (method === "turn/started") {
+            this.flushPendingCompletion();
+            this.flushDeferredAssistantMessage();
+            if (carriedTurnId)
+                this.currentTurnIdValue = carriedTurnId;
             this.ensureTurn();
             return;
         }
+        if (carriedTurnId)
+            this.currentTurnIdValue = carriedTurnId;
         // Completed items (user echo, assistant, tool, reasoning) go through the
         // deduped path so a resume backfill and the live stream never double them.
         if (method === "item/completed") {
             const item = params?.item;
             if (item) {
+                if (this.shouldDeferAssistantMessage(item)) {
+                    this.deferAssistantMessage(item);
+                    this.refreshCompletionGrace();
+                    return;
+                }
+                // A late reasoning item belongs before the held final answer. Any other
+                // completed item establishes that the held message was not final and
+                // must retain its original position.
+                if (item.type !== "reasoning")
+                    this.flushDeferredAssistantMessage();
                 this.processCompletedItem(item);
+                this.refreshCompletionGrace();
                 return;
             }
         }
         const mapped = mapCodexNotification(method, params);
-        if (mapped.events.length || mapped.turnCompleted || mapped.fatalError) {
+        // Provider startup/onboarding notifications that rynx does not model map
+        // to runtime_debug. They are telemetry, not evidence of a model Turn. In
+        // particular, Traex emits hook-trust lifecycle notifications while merely
+        // resuming a TUI; opening a response for those leaves Chat permanently
+        // running because no turn/completed will follow.
+        const canonicalEvents = mapped.events.filter((event) => event.type !== "runtime_debug");
+        if (canonicalEvents.some((event) => event.type !== "reasoning_delta" && event.type !== "reasoning_completed")) {
+            this.flushDeferredAssistantMessage();
+        }
+        if (canonicalEvents.length || mapped.turnCompleted || mapped.fatalError) {
             this.ensureTurn();
         }
-        for (const event of mapped.events) {
+        for (const event of canonicalEvents) {
             this.sink.onEvent(event);
         }
         if (mapped.fatalError) {
-            this.turnOpen = false;
-            this.sink.onTurnError(mapped.fatalError);
+            this.scheduleCompletion({ kind: "error", error: mapped.fatalError });
             return;
         }
         if (mapped.turnCompleted) {
-            this.turnOpen = false;
-            this.sink.onTurnEnd(mapped.usage);
+            this.scheduleCompletion({ kind: "end", ...(mapped.usage ? { usage: mapped.usage } : {}) });
+        }
+        else {
+            this.refreshCompletionGrace();
+        }
+    }
+    scheduleCompletion(completion) {
+        const graceMs = this.options.turnCompletionGraceMs ?? 0;
+        if (graceMs <= 0) {
+            this.settle(completion);
+            return;
         }
+        this.pendingCompletion = completion;
+        this.refreshCompletionGrace();
+    }
+    refreshCompletionGrace() {
+        if (!this.pendingCompletion)
+            return;
+        const graceMs = this.options.turnCompletionGraceMs ?? 0;
+        if (graceMs <= 0)
+            return;
+        if (this.completionTimer)
+            clearTimeout(this.completionTimer);
+        this.completionTimer = setTimeout(() => this.flushPendingCompletion(), graceMs);
+        this.completionTimer.unref?.();
+    }
+    flushPendingCompletion() {
+        if (this.completionTimer)
+            clearTimeout(this.completionTimer);
+        this.completionTimer = null;
+        const completion = this.pendingCompletion;
+        this.pendingCompletion = null;
+        if (completion)
+            this.settle(completion);
+    }
+    settle(completion) {
+        this.flushDeferredAssistantMessage();
+        this.turnOpen = false;
+        if (completion.kind === "error")
+            this.sink.onTurnError(completion.error);
+        else
+            this.sink.onTurnEnd(completion.usage);
     }
     /** Map + emit one completed codex item, deduped by a TOTAL key and routing the
      *  user echo to {@link CodexForwarderSink.onUserMessage}. Shared by live + backfill. */
     processCompletedItem(item) {
+        if (!this.claimCompletedItem(item))
+            return;
+        this.emitCompletedItem(item);
+    }
+    claimCompletedItem(item) {
         const { key, isAnon } = this.completedItemKey(item);
         if (this.seenCompletedItems.has(key))
-            return;
+            return false;
         this.seenCompletedItems.add(key);
         if (isAnon)
             this.advanceAnonCounter();
-        this.ensureTurn();
-        const userText = userMessageText(item);
-        if (userText !== undefined) {
-            this.sink.onUserMessage?.(userText);
+        return true;
+    }
+    emitCompletedItem(item) {
+        const userContent = userMessageContent(item);
+        if (userContent !== undefined) {
+            this.ensureTurn();
+            this.sink.onUserMessage?.(userContent);
             return;
         }
         const mapped = mapCodexItem("item/completed", item);
-        for (const event of mapped.events)
+        const canonicalEvents = mapped.events.filter((event) => event.type !== "runtime_debug");
+        if (canonicalEvents.length === 0)
+            return;
+        this.ensureTurn();
+        for (const event of canonicalEvents)
             this.sink.onEvent(event);
     }
+    shouldDeferAssistantMessage(item) {
+        if ((this.options.assistantMessageGraceMs ?? 0) <= 0 || item.type !== "agentMessage") {
+            return false;
+        }
+        return Boolean(item.text?.trim());
+    }
+    deferAssistantMessage(item) {
+        if (!this.claimCompletedItem(item))
+            return;
+        this.flushDeferredAssistantMessage();
+        this.deferredAssistantMessage = item;
+        const graceMs = this.options.assistantMessageGraceMs ?? 0;
+        this.assistantMessageTimer = setTimeout(() => this.flushDeferredAssistantMessage(), graceMs);
+        this.assistantMessageTimer.unref?.();
+    }
+    flushDeferredAssistantMessage() {
+        if (this.assistantMessageTimer)
+            clearTimeout(this.assistantMessageTimer);
+        this.assistantMessageTimer = null;
+        const item = this.deferredAssistantMessage;
+        this.deferredAssistantMessage = null;
+        if (item)
+            this.emitCompletedItem(item);
+    }
     /** Build a total dedup key for one completed item. Stable-id items use
      *  `threadId:turnId:item.id` — identical across replay + live, so the second
      *  delivery is dropped. Items without a codex id fall back to a per-(thread,turn)
      *  position counter (peeked here; advanced only on a successful claim, via
-     *  {@link advanceAnonCounter}). Mirrors omnigent `_completed_item_key`. */
+     *  {@link advanceAnonCounter}). Mirrors reference implementation `_completed_item_key`. */
     completedItemKey(item) {
         const threadId = this.currentThreadIdValue ?? "thread";
         const turnId = this.currentTurnIdValue ?? "turn";

package/dist/codex-app-server/mapping.d.ts

@@ -2,7 +2,7 @@
  * Pure codex app-server notification → {@link AgentEvent} mapping. Extracted from
  * the executor so BOTH the per-turn executor and the persistent session
  * forwarder (which mirrors every thread turn — web- AND TUI-initiated — into the
- * canonical log, omnigent's codex-native model) share one mapping.
+ * canonical log, reference implementation's codex-native model) share one mapping.
  */
 import type { AgentEvent } from "@rynx-ai/core";
 import type { ThreadItem } from "./protocol.js";

package/dist/codex-app-server/mapping.js

@@ -1,3 +1,34 @@
+function turnError(error, fallback) {
+    if (typeof error === "string" && error.trim())
+        return new Error(error);
+    if (error && typeof error === "object" && "message" in error) {
+        const message = error.message;
+        if (typeof message === "string" && message.trim())
+            return new Error(message);
+    }
+    return new Error(fallback);
+}
+function webSearchInput(item) {
+    const action = item.action;
+    if (action?.type === "search") {
+        return {
+            id: item.id,
+            query: action.query || item.query,
+            ...(action.queries?.length ? { queries: action.queries } : {}),
+        };
+    }
+    if (action?.type === "openPage") {
+        return { id: item.id, url: action.url ?? "" };
+    }
+    if (action?.type === "findInPage") {
+        return {
+            id: item.id,
+            url: action.url ?? "",
+            pattern: action.pattern ?? "",
+        };
+    }
+    return { id: item.id, query: item.query };
+}
 /** Map one thread item (`item/started` | `item/completed`) to events. */
 export function mapCodexItem(method, item) {
     const events = [];
@@ -68,13 +99,15 @@ export function mapCodexItem(method, item) {
             return { events };
         }
         case "webSearch": {
+            const webSearch = item;
             events.push({
                 type: "tool",
                 event: isStart ? "on_tool_start" : "on_tool_end",
                 name: "web_search",
-                input: isStart
-                    ? { id: item.id, query: item.query }
-                    : undefined,
+                // `item/started` commonly has an empty top-level query. The completed
+                // item carries the real operation in `action`; pass that richer input
+                // through so the canonical layer can append a same-call argument update.
+                input: isStart || isEnd ? webSearchInput(webSearch) : undefined,
                 output: isEnd ? { id: item.id } : undefined,
                 data: { method, item },
             });
@@ -112,12 +145,27 @@ export function mapCodexNotification(method, params) {
     switch (typed.method) {
         case "thread/started":
             return { events };
+        case "serverRequest/resolved":
+            // Interaction lifecycle is handled by CodexAppServerClient. It is not
+            // model output and must never open or close a Turn in the forwarder.
+            return { events };
         case "turn/started":
             return { events };
         case "turn/completed": {
             const turnPayload = typed.params?.turn;
-            if (turnPayload?.status === "failed" && turnPayload.error?.message) {
-                return { events, fatalError: new Error(turnPayload.error.message), turnCompleted: true };
+            if (turnPayload?.status === "failed") {
+                return {
+                    events,
+                    fatalError: turnError(turnPayload.error, "Codex turn failed"),
+                    turnCompleted: true,
+                };
+            }
+            if (turnPayload?.status === "interrupted") {
+                return {
+                    events,
+                    fatalError: turnError(turnPayload.error, "Codex turn was interrupted"),
+                    turnCompleted: true,
+                };
             }
             return { events, turnCompleted: true };
         }
@@ -174,6 +222,17 @@ export function mapCodexNotification(method, params) {
             const p = typed.params;
             return { events, usage: p.tokenUsage };
         }
+        case "queue/status": {
+            const p = typed.params;
+            if (p.state === "ready") {
+                events.push({ type: "status" });
+                return { events };
+            }
+            const note = p.message?.trim()
+                || (p.position === null ? "Waiting for provider capacity." : `Your queue position is ${p.position}.`);
+            events.push({ type: "status", statusKind: "queue", note });
+            return { events };
+        }
         case "error": {
             const p = typed.params;
             if (p.willRetry) {