@superdurable/dex-agents 0.3.0 → 0.5.0

package/dist/src/tool-source-router.js

@@ -0,0 +1,380 @@
+// Copyright (c) 2026 Super Durable, Inc.
+//
+// Licensed under the Sustainable Use License 1.0.
+// You may not use this file except in compliance with the License.
+// See the LICENSE file in the repository root.
+//
+// SPDX-License-Identifier: LicenseRef-Sustainable-Use-1.0
+import { ToolExecutionError, } from "./agent-framework-runner.js";
+/**
+ * Default `AgentDefinition.toolSourceListingTimeoutMs`: 10 seconds. It is also the default time one model call of a
+ * framework adapter waits for each tool source's listing. Exported from the package root since 0.4.0.
+ */
+export const defaultToolSourceListingTimeoutMs = 10_000;
+const toolSourceMethods = ["listTools", "deferredToolCall", "executeDeferredToolCall", "pollToolTask"];
+const toolSourceReferenceKey = "reference";
+/**
+ * Serves {@link ToolSource}s from a framework runner, so their calls run in tool Steps as the built-in loop runner runs
+ * them.
+ *
+ * A framework adapter that implements {@link AgentFrameworkRunner} builds one router from its `toolSources`. In each
+ * `RunModel` it awaits {@link listSourceTools} and offers every listed tool to its framework as a native tool that
+ * never runs inside the model call. When the model calls one, the adapter returns {@link buildDeferredToolCall}, so
+ * the source picks the effect, the approval, and whether the call is an ordered write, and the router stores the
+ * source's name with the source's own `toolSourceReference`. The tool Step then reaches that source through
+ * {@link executeDeferredToolCall} on any Worker, with the full execution: the Step context, the heartbeat
+ * checkpoint, and the attempt. {@link toolCallStepOptions}, {@link pollToolTask}, and {@link cancelToolTask} route
+ * the same way. A runner whose `executeDeferredToolCall` returns only results, and so polls no tool tasks, uses
+ * {@link executeDeferredToolCallForResult} instead. `BuiltinLoopAgentRunner` uses a router too.
+ *
+ * Construction refuses a source without a {@link ToolSource} method or a non-blank, unique `sourceName`, and a
+ * name that a source declares through `declaredToolNames` when it repeats a local tool, a built-in tool, or another
+ * source's tool. Each listing refuses the same collisions among the listed names.
+ *
+ * @example
+ * ```ts
+ * const toolSources = new ToolSourceRouter([new ConnectorToolSource([refund])], {
+ *   sourceNameKey: "my_framework_tool_source",
+ *   localToolNames: new Set(Object.keys(frameworkTools)),
+ * });
+ * const listed = await toolSources.listSourceTools();
+ * const call = toolSources.buildDeferredToolCall(turn, listed.get("refund")!, modelCall);
+ * ```
+ * @since 0.4.0
+ */
+export class ToolSourceRouter {
+    toolSources;
+    toolSourcesByName;
+    sourceNameKey;
+    localToolNames;
+    localToolDescription;
+    listingTimeoutMs;
+    /** The last listing of each source, so estimates count its tools without listing again. */
+    lastListings = new Map();
+    /**
+     * Creates the router and checks the sources.
+     * @param toolSources - The sources, in the order the model sees their tools.
+     * @param options - The envelope key, the names source tools must not repeat, and the listing timeout.
+     * @throws {TypeError} When a source lacks a {@link ToolSource} method or a non-blank `sourceName`, two sources
+     * share a `sourceName`, `sourceNameKey` is blank, or a declared tool name repeats a local tool, a built-in tool, or
+     * another source's tool.
+     * @throws {RangeError} When `listingTimeoutMs` is not positive.
+     */
+    constructor(toolSources, options) {
+        if (typeof options.sourceNameKey !== "string" || options.sourceNameKey.trim() === "") {
+            throw new TypeError("ToolSourceRouterOptions.sourceNameKey must be a non-blank string");
+        }
+        for (const source of toolSources) {
+            const missing = toolSourceMethods.find((method) => typeof source?.[method] !== "function");
+            if (missing !== undefined) {
+                throw new TypeError(`tool source ${String(source)} has no ${missing} method`);
+            }
+        }
+        const toolSourcesByName = new Map();
+        for (const source of toolSources) {
+            if (typeof source.sourceName !== "string" || source.sourceName.trim() === "") {
+                throw new TypeError(`tool source ${String(source)} needs a non-blank sourceName`);
+            }
+            if (toolSourcesByName.has(source.sourceName)) {
+                throw new TypeError(`two tool sources are named ${source.sourceName}`);
+            }
+            toolSourcesByName.set(source.sourceName, source);
+        }
+        const listingTimeoutMs = options.listingTimeoutMs ?? defaultToolSourceListingTimeoutMs;
+        if (!(listingTimeoutMs > 0)) {
+            throw new RangeError("toolSourceListingTimeoutMs must be positive");
+        }
+        this.toolSources = [...toolSources];
+        this.toolSourcesByName = toolSourcesByName;
+        this.sourceNameKey = options.sourceNameKey;
+        this.localToolNames = new Set(options.localToolNames ?? []);
+        this.localToolDescription = options.localToolDescription ?? "a tool of the agent";
+        this.listingTimeoutMs = listingTimeoutMs;
+        this.refuseDeclaredToolNameCollisions(options.builtInToolNames ?? new Set());
+    }
+    /** Whether the router has at least one source. */
+    get hasToolSources() {
+        return this.toolSources.length > 0;
+    }
+    /**
+     * Returns the names the sources always list, from their optional `declaredToolNames`.
+     * @returns The names.
+     */
+    declaredToolNames() {
+        const names = new Set();
+        for (const source of this.toolSources) {
+            for (const toolName of source.declaredToolNames?.() ?? []) {
+                names.add(toolName);
+            }
+        }
+        return names;
+    }
+    /**
+     * Lists every source's tools for one model call, in source order.
+     *
+     * A source whose listing throws or takes longer than the listing timeout offers no tools in this call, with a
+     * warning, so a down server never fails a turn.
+     * @param builtInToolNames - The built-in tools enabled for this turn. Defaults to none.
+     * @returns The listed tools by name.
+     * @throws {TypeError} When a listed name repeats a local tool, an enabled built-in tool, or another source's tool.
+     */
+    async listSourceTools(builtInToolNames = new Set()) {
+        const listed = new Map();
+        for (const [index, source] of this.toolSources.entries()) {
+            for (const tool of await this.listOneSource(index, source)) {
+                this.refuseSourceToolName(tool.name, builtInToolNames, listed);
+                listed.set(tool.name, { source, tool });
+            }
+        }
+        return listed;
+    }
+    /**
+     * Returns each source's tools without I/O: its `cachedTools` when it has them, else this router's last listing.
+     * A name listed twice keeps its first source. Use it to estimate the model input.
+     * @returns The cached tools by name.
+     */
+    readCachedSourceTools() {
+        const cached = new Map();
+        for (const [index, source] of this.toolSources.entries()) {
+            const tools = source.cachedTools?.() ?? this.lastListings.get(index) ?? [];
+            for (const tool of tools) {
+                if (!cached.has(tool.name)) {
+                    cached.set(tool.name, { source, tool });
+                }
+            }
+        }
+        return cached;
+    }
+    /**
+     * Builds the deferred call for one model call of a listed source tool.
+     *
+     * The source's `deferredToolCall` decides the policy, the `ordered` flag, and its own reference. The router
+     * keeps all of it and wraps the reference with the source's name.
+     * @param turn - The `RunModel` context.
+     * @param listedTool - The listed tool the model called, from {@link listSourceTools} of this model call.
+     * @param modelCall - The model's tool call ID and its arguments as JSON text.
+     * @returns The deferred call to return in `ToolCallsRequested`.
+     */
+    buildDeferredToolCall(turn, listedTool, modelCall) {
+        const built = listedTool.source.deferredToolCall(turn, {
+            toolCallId: modelCall.toolCallId,
+            toolName: listedTool.tool.name,
+            arguments: modelCall.arguments,
+            listedTool: listedTool.tool,
+        });
+        return {
+            ...built,
+            toolSourceReference: writeToolSourceEnvelope(this.sourceNameKey, listedTool.source.sourceName, built.toolSourceReference),
+        };
+    }
+    /**
+     * Whether a source built this call, so its tool Step and polls go to a source. It reads only the record, so it
+     * answers even when that source is not configured on this Worker; {@link executeDeferredToolCall} then throws.
+     * @param toolCall - The call's record.
+     * @returns `true` when the record holds this router's envelope, or a reference while the router has sources.
+     */
+    isSourceToolCall(toolCall) {
+        if (readToolSourceEnvelope(this.sourceNameKey, toolCall.toolSourceReference) !== undefined) {
+            return true;
+        }
+        return (toolCall.toolSourceReference ?? undefined) !== undefined && this.hasToolSources;
+    }
+    /**
+     * Runs one call in its tool Step through the source that built it, with the source's own reference and every
+     * other field of `call` unchanged, such as the Step context, the heartbeat checkpoint, and the attempt.
+     * @param call - The deferred execution from the tool Step.
+     * @returns The source's outcome.
+     * @throws {RangeError} When no source built the call, or its source is not configured on this Worker, so the
+     * effect decides the outcome.
+     * @throws Any error of the source, such as `ToolExecutionError` or `ToolOutcomeUnknownError`.
+     */
+    async executeDeferredToolCall(call) {
+        const routed = this.requireToolSource(call.toolCall);
+        return routed.source.executeDeferredToolCall({
+            ...call,
+            toolCall: withToolSourceReference(call.toolCall, routed.reference),
+        });
+    }
+    /**
+     * Runs one call as {@link executeDeferredToolCall} does, for a runner that polls no tool tasks and asks no tool
+     * questions, so its `executeDeferredToolCall` returns only a `ToolExecutionResult`. Such a runner has no
+     * `pollToolTask`, so the session tells the source that it cannot start tasks. `ConnectorToolSource` returns only
+     * results.
+     * @param call - The deferred execution from the tool Step.
+     * @returns The source's result.
+     * @throws {ToolExecutionError} When the source asked the user a question. A question comes before any effect, so
+     * the call records `failed` and the model reads why.
+     * @throws {Error} When the source started a tool task anyway. The task may run, so the effect decides the outcome.
+     * @throws Any error of {@link executeDeferredToolCall}.
+     */
+    async executeDeferredToolCallForResult(call) {
+        const outcome = await this.executeDeferredToolCall(call);
+        if (!("kind" in outcome)) {
+            return outcome;
+        }
+        const toolName = call.toolCall.toolName;
+        if (outcome.kind === "tool_input_requested") {
+            throw new ToolExecutionError(`tool ${toolName} asked a question, which this agent cannot ask the user`);
+        }
+        throw new Error(`tool ${toolName} started a tool task, which this agent cannot poll`);
+    }
+    /**
+     * Polls a source's tool task once, through the source that built the call.
+     * @param poll - The call's record from `PollToolTask`.
+     * @returns The source's outcome.
+     * @throws {RangeError} When no source built the call. The task may still run, so `PollToolTask` retries and then
+     * records the call by its effect.
+     * @throws Any error of the source.
+     */
+    async pollToolTask(poll) {
+        const routed = this.requireToolSource(poll.toolCall);
+        return routed.source.pollToolTask({ ...poll, toolCall: withToolSourceReference(poll.toolCall, routed.reference) });
+    }
+    /**
+     * Cancels a source's task through the source that built the call; a source without `cancelToolTask` leaves its
+     * task running.
+     * @param cancellation - The abandoned call's record from `CancelToolTask`.
+     * @returns A Promise that resolves once the source took the cancellation.
+     * @throws {RangeError} When no source built the call.
+     * @throws Any error of the source.
+     */
+    async cancelToolTask(cancellation) {
+        const routed = this.requireToolSource(cancellation.toolCall);
+        await routed.source.cancelToolTask?.({
+            ...cancellation,
+            toolCall: withToolSourceReference(cancellation.toolCall, routed.reference),
+        });
+    }
+    /**
+     * Returns the source's options for one call's tool Step.
+     * @param toolCall - The record whose tool Step starts.
+     * @returns The source's options, or `undefined` when no source built the call or its source defines none.
+     * @throws {RangeError} When a source built the call but it is not configured on this Worker; the session then
+     * uses the defaults.
+     */
+    toolCallStepOptions(toolCall) {
+        const routed = this.routeToToolSource(toolCall);
+        return routed?.source.toolCallStepOptions?.(withToolSourceReference(toolCall, routed.reference));
+    }
+    refuseDeclaredToolNameCollisions(builtInToolNames) {
+        const declared = new Map();
+        for (const source of this.toolSources) {
+            const names = [...(source.declaredToolNames?.() ?? [])].sort();
+            for (const toolName of names) {
+                this.refuseSourceToolName(toolName, builtInToolNames, declared);
+            }
+            for (const toolName of names) {
+                declared.set(toolName, source);
+            }
+        }
+    }
+    refuseSourceToolName(toolName, builtInToolNames, otherSourceTools) {
+        if (builtInToolNames.has(toolName)) {
+            throw new TypeError(`tool ${toolName} uses the name of an enabled built-in tool`);
+        }
+        if (this.localToolNames.has(toolName)) {
+            throw new TypeError(`tool ${toolName} of a tool source uses the name of ${this.localToolDescription}`);
+        }
+        if (otherSourceTools.has(toolName)) {
+            throw new TypeError(`two tool sources list a tool named ${toolName}`);
+        }
+    }
+    async listOneSource(index, source) {
+        const listing = source.listTools();
+        // A listing that outlives this call keeps running; nobody else reads its error.
+        listing.catch(() => undefined);
+        let timer;
+        const timedOut = new Promise((resolve) => {
+            timer = setTimeout(() => resolve("timed_out"), this.listingTimeoutMs);
+        });
+        try {
+            const tools = await Promise.race([listing, timedOut]);
+            if (tools === "timed_out") {
+                console.warn(`tool source ${index} listed nothing within ${this.listingTimeoutMs} ms`);
+                return [];
+            }
+            this.lastListings.set(index, tools);
+            return tools;
+        }
+        catch (error) {
+            console.warn(`tool source ${index} could not list its tools: ${error instanceof Error ? error.message : String(error)}`);
+            return [];
+        }
+        finally {
+            clearTimeout(timer);
+        }
+    }
+    requireToolSource(toolCall) {
+        const routed = this.routeToToolSource(toolCall);
+        if (routed === undefined) {
+            throw new RangeError(`no tool source built the call of tool ${toolCall.toolName}`);
+        }
+        return routed;
+    }
+    routeToToolSource(toolCall) {
+        const envelope = readToolSourceEnvelope(this.sourceNameKey, toolCall.toolSourceReference);
+        if (envelope !== undefined) {
+            const source = this.toolSourcesByName.get(envelope.sourceName);
+            if (source === undefined) {
+                throw new RangeError(`tool source ${envelope.sourceName}, which built the call of tool ${toolCall.toolName}, is not configured on this Worker`);
+            }
+            return { source, reference: envelope.reference };
+        }
+        const reference = toolCall.toolSourceReference ?? undefined;
+        if (reference === undefined || this.toolSources.length === 0) {
+            return undefined;
+        }
+        const onlySource = this.toolSources.length === 1 ? this.toolSources[0] : undefined;
+        if (onlySource !== undefined) {
+            // A reference the source built itself, such as in a runner subclass.
+            return { source: onlySource, reference };
+        }
+        throw new RangeError(`cannot tell which tool source built the call of ${toolCall.toolName}`);
+    }
+}
+/**
+ * The router's `toolSourceReference`: the source's name under `sourceNameKey` and its own reference, as JSON text.
+ * @param sourceNameKey - The envelope key of the runner.
+ * @param sourceName - The building source's name.
+ * @param reference - The source's own reference, or `undefined`.
+ * @returns The envelope text.
+ */
+export function writeToolSourceEnvelope(sourceNameKey, sourceName, reference) {
+    return JSON.stringify({ [sourceNameKey]: sourceName, [toolSourceReferenceKey]: reference ?? null });
+}
+/**
+ * Reads an envelope that {@link writeToolSourceEnvelope} wrote with the same key.
+ * @param sourceNameKey - The envelope key of the runner.
+ * @param toolSourceReference - A record's `toolSourceReference`.
+ * @returns The source's name and its own reference, or `undefined` when the text is no such envelope.
+ */
+export function readToolSourceEnvelope(sourceNameKey, toolSourceReference) {
+    if (toolSourceReference === undefined || toolSourceReference === null) {
+        return undefined;
+    }
+    let envelope;
+    try {
+        envelope = JSON.parse(toolSourceReference);
+    }
+    catch {
+        return undefined;
+    }
+    if (typeof envelope !== "object" || envelope === null || Array.isArray(envelope)) {
+        return undefined;
+    }
+    const sourceName = envelope[sourceNameKey];
+    const reference = envelope[toolSourceReferenceKey];
+    if (typeof sourceName !== "string") {
+        return undefined;
+    }
+    if (reference !== null && reference !== undefined && typeof reference !== "string") {
+        return undefined;
+    }
+    return { sourceName, reference: reference ?? undefined };
+}
+/** The record as the source built it: its own reference instead of the router's envelope. */
+function withToolSourceReference(toolCall, reference) {
+    const { toolSourceReference: _envelope, ...rest } = toolCall;
+    return (reference === undefined ? rest : { ...rest, toolSourceReference: reference });
+}
+//# sourceMappingURL=tool-source-router.js.map

package/dist/src/tool-source-router.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-source-router.js","sourceRoot":"","sources":["../../src/tool-source-router.ts"],"names":[],"mappings":"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"}

package/dist/src/ui-stream/agent-event-json.d.ts

@@ -18,7 +18,8 @@ export declare function convertAgentEventToJson(event: AgentEvent): AgentEventJs
  * Use it when a browser shared with Python backends reads the snapshot. It is the `get_agent_snapshot` wire
  * format without the fields only the session's Steps use. Messages leave out `framework_item`, the
  * framework's replay data, which can hold the agent's instructions. Tool calls leave out
- * `tool_source_reference`, `trace_context`, `input_continuation`, `input_answers`, and `task_answer_pending`.
+ * `tool_source_reference`, `trace_context`, `input_continuation`, `input_answers`, `task_answer_pending`, and
+ * `runner_tool_state`.
  *
  * `session_settings` is included as stored, so the browser sees the settings the next turn starts with. Keep
  * anything a browser must not see out of session settings, or remove the key before serving the JSON.

package/dist/src/ui-stream/agent-event-json.js

@@ -34,6 +34,7 @@ const workerOnlyToolCallFieldNames = new Set([
     "input_continuation",
     "input_answers",
     "task_answer_pending",
+    "runner_tool_state",
 ]);
 /**
  * Converts an `AgentSnapshot` to the snake_case JSON a browser reads, the same JSON the Python core produces.
@@ -41,7 +42,8 @@ const workerOnlyToolCallFieldNames = new Set([
  * Use it when a browser shared with Python backends reads the snapshot. It is the `get_agent_snapshot` wire
  * format without the fields only the session's Steps use. Messages leave out `framework_item`, the
  * framework's replay data, which can hold the agent's instructions. Tool calls leave out
- * `tool_source_reference`, `trace_context`, `input_continuation`, `input_answers`, and `task_answer_pending`.
+ * `tool_source_reference`, `trace_context`, `input_continuation`, `input_answers`, `task_answer_pending`, and
+ * `runner_tool_state`.
  *
  * `session_settings` is included as stored, so the browser sees the settings the next turn starts with. Keep
  * anything a browser must not see out of session settings, or remove the key before serving the JSON.

package/dist/src/ui-stream/agent-event-json.js.map

@@ -1 +1 @@
-{"version":3,"file":"agent-event-json.js","sourceRoot":"","sources":["../../../src/ui-stream/agent-event-json.ts"],"names":[],"mappings":"AAAA,yCAAyC;AACzC,EAAE;AACF,kDAAkD;AAClD,mEAAmE;AACnE,+CAA+C;AAC/C,EAAE;AACF,0DAA0D;AAE1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAIjE;;;;;;;;;;GAUG;AACH,MAAM,UAAU,uBAAuB,CAAC,KAAiB;IACvD,OAAO;QACL,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,OAAO,EAAE,KAAK,CAAC,MAAM;QACrB,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,iBAAiB,EAAE,KAAK,CAAC,eAAe;QACxC,OAAO,EAAE,KAAK,CAAC,OAAO;KACvB,CAAC;AACJ,CAAC;AAED,sFAAsF;AACtF,MAAM,2BAA2B,GAAwB,IAAI,GAAG,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC;AACrF,MAAM,4BAA4B,GAAwB,IAAI,GAAG,CAAC;IAChE,uBAAuB;IACvB,eAAe;IACf,oBAAoB;IACpB,eAAe;IACf,qBAAqB;CACtB,CAAC,CAAC;AAEH;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,0BAA0B,CAAC,QAAuB;IAChE,MAAM,YAAY,GAAG,mBAAmB,CAAC,QAAQ,CAA4B,CAAC;IAC9E,OAAO;QACL,GAAG,YAAY;QACf,QAAQ,EAAG,YAAY,CAAC,UAAU,CAA+B,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAChF,cAAc,CAAC,OAAO,EAAE,2BAA2B,CAAC,CACrD;QACD,UAAU,EAAG,YAAY,CAAC,YAAY,CAA+B,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CACrF,cAAc,CAAC,QAAQ,EAAE,4BAA4B,CAAC,CACvD;KACF,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CACrB,KAA8B,EAC9B,UAA+B;IAE/B,OAAO,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AACvG,CAAC"}
+{"version":3,"file":"agent-event-json.js","sourceRoot":"","sources":["../../../src/ui-stream/agent-event-json.ts"],"names":[],"mappings":"AAAA,yCAAyC;AACzC,EAAE;AACF,kDAAkD;AAClD,mEAAmE;AACnE,+CAA+C;AAC/C,EAAE;AACF,0DAA0D;AAE1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAIjE;;;;;;;;;;GAUG;AACH,MAAM,UAAU,uBAAuB,CAAC,KAAiB;IACvD,OAAO;QACL,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,OAAO,EAAE,KAAK,CAAC,MAAM;QACrB,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,iBAAiB,EAAE,KAAK,CAAC,eAAe;QACxC,OAAO,EAAE,KAAK,CAAC,OAAO;KACvB,CAAC;AACJ,CAAC;AAED,sFAAsF;AACtF,MAAM,2BAA2B,GAAwB,IAAI,GAAG,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC;AACrF,MAAM,4BAA4B,GAAwB,IAAI,GAAG,CAAC;IAChE,uBAAuB;IACvB,eAAe;IACf,oBAAoB;IACpB,eAAe;IACf,qBAAqB;IACrB,mBAAmB;CACpB,CAAC,CAAC;AAEH;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,0BAA0B,CAAC,QAAuB;IAChE,MAAM,YAAY,GAAG,mBAAmB,CAAC,QAAQ,CAA4B,CAAC;IAC9E,OAAO;QACL,GAAG,YAAY;QACf,QAAQ,EAAG,YAAY,CAAC,UAAU,CAA+B,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAChF,cAAc,CAAC,OAAO,EAAE,2BAA2B,CAAC,CACrD;QACD,UAAU,EAAG,YAAY,CAAC,YAAY,CAA+B,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CACrF,cAAc,CAAC,QAAQ,EAAE,4BAA4B,CAAC,CACvD;KACF,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CACrB,KAA8B,EAC9B,UAA+B;IAE/B,OAAO,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AACvG,CAAC"}

package/dist/src/ui-stream/agent-ui-messages.d.ts

@@ -23,11 +23,19 @@ export interface AgentSessionUIMessages {
  * assistant and tool messages of one turn become one assistant message with ID
  * {@link agentAssistantUIMessageId}: a `step-start` part before each model call, a text part per model
  * text, and a dynamic tool part per tool call. A stored tool result shows the text the model saw, so a
- * failed or rejected call appears as `output-available` with that text. A turn-failure note is a stored
- * user message and appears as one.
+ * failed or rejected call appears as `output-available` with that text. A turn-failure, steered, or cancelled
+ * note is the last stored user message of a turn that has ended, and it appears as a user message. Any other user
+ * message after the turn's first model output, such as the message of a built-in loop continuation, is not shown;
+ * it starts the step of the next model call, also while that call is still running, as the UI stream does.
+ * Changed in 0.5.0: such a message no longer appears as a user message that splits the turn.
+ *
+ * The UI stream starts a step for every `RunModel` Step, and this function one for every model call. They differ
+ * only where a `RunModel` makes no model call, such as when `decideTurnContinuation` ends a turn after its tools:
+ * the stream then sends one more `start-step` and `finish-step` with no visible part, which leaves no part in the
+ * AI SDK message, so the message still matches the converted snapshot.
  *
  * The session stores a turn's messages when the turn ends, or after each model call for a runner such as
- * the Stepwise runner. For the active turn the function shows each tool call of `snapshot.toolCalls` once in
+ * the built-in loop runner. For the active turn the function shows each tool call of `snapshot.toolCalls` once in
  * the turn's assistant message: a stored call without a result takes the record's state, and a call not
  * stored yet is added. Approvals waiting for `resolve_interrupt` are `approval-requested`, running calls
  * are `input-available` or `approval-responded`, and finished calls show their result. The active turn's

package/dist/src/ui-stream/agent-ui-messages.js

@@ -17,11 +17,19 @@ import { encodeAgentUIStreamCursor } from "./agent-ui-stream-cursor.js";
  * assistant and tool messages of one turn become one assistant message with ID
  * {@link agentAssistantUIMessageId}: a `step-start` part before each model call, a text part per model
  * text, and a dynamic tool part per tool call. A stored tool result shows the text the model saw, so a
- * failed or rejected call appears as `output-available` with that text. A turn-failure note is a stored
- * user message and appears as one.
+ * failed or rejected call appears as `output-available` with that text. A turn-failure, steered, or cancelled
+ * note is the last stored user message of a turn that has ended, and it appears as a user message. Any other user
+ * message after the turn's first model output, such as the message of a built-in loop continuation, is not shown;
+ * it starts the step of the next model call, also while that call is still running, as the UI stream does.
+ * Changed in 0.5.0: such a message no longer appears as a user message that splits the turn.
+ *
+ * The UI stream starts a step for every `RunModel` Step, and this function one for every model call. They differ
+ * only where a `RunModel` makes no model call, such as when `decideTurnContinuation` ends a turn after its tools:
+ * the stream then sends one more `start-step` and `finish-step` with no visible part, which leaves no part in the
+ * AI SDK message, so the message still matches the converted snapshot.
  *
  * The session stores a turn's messages when the turn ends, or after each model call for a runner such as
- * the Stepwise runner. For the active turn the function shows each tool call of `snapshot.toolCalls` once in
+ * the built-in loop runner. For the active turn the function shows each tool call of `snapshot.toolCalls` once in
  * the turn's assistant message: a stored call without a result takes the record's state, and a call not
  * stored yet is added. Approvals waiting for `resolve_interrupt` are `approval-requested`, running calls
  * are `input-available` or `approval-responded`, and finished calls show their result. The active turn's
@@ -38,9 +46,14 @@ import { encodeAgentUIStreamCursor } from "./agent-ui-stream-cursor.js";
  */
 export function convertAgentSnapshotToUIMessages(snapshot) {
     const uiMessages = [];
+    const activeTurnId = snapshot.state?.activeTurnId ?? null;
     let assistantMessage;
-    for (const message of snapshot.messages) {
+    for (const [index, message] of snapshot.messages.entries()) {
         if (message.role === "user") {
+            if (assistantMessage?.turnId === message.turnId && !isTurnEndingNote(snapshot, index, activeTurnId)) {
+                assistantMessage.startModelCall();
+                continue;
+            }
             assistantMessage = undefined;
             uiMessages.push({
                 id: agentUserUIMessageId(message.sequence),
@@ -55,7 +68,6 @@ export function convertAgentSnapshotToUIMessages(snapshot) {
         }
         assistantMessage.appendStoredMessage(message);
     }
-    const activeTurnId = snapshot.state?.activeTurnId ?? null;
     if (activeTurnId !== null && snapshot.toolCalls.length > 0) {
         if (assistantMessage?.turnId !== activeTurnId) {
             assistantMessage = new AgentAssistantUIMessageBuilder(activeTurnId);
@@ -65,6 +77,13 @@ export function convertAgentSnapshotToUIMessages(snapshot) {
     }
     return uiMessages;
 }
+/** Whether a user message after the turn's model output is a note: the last stored message of an ended turn. */
+function isTurnEndingNote(snapshot, index, activeTurnId) {
+    const message = snapshot.messages[index];
+    const following = snapshot.messages[index + 1];
+    const isLastOfTurn = following === undefined || following.turnId !== message.turnId;
+    return isLastOfTurn && message.turnId !== activeTurnId;
+}
 /**
  * Reads an agent session as AI SDK messages and the UI stream resume token of its active turn.
  *
@@ -108,6 +127,11 @@ class AgentAssistantUIMessageBuilder {
             parts: [{ type: "step-start" }],
         };
     }
+    /** Starts the step of a model call that follows a user message within the turn. */
+    startModelCall() {
+        this.message.parts.push({ type: "step-start" });
+        this.isAfterToolResult = false;
+    }
     appendStoredMessage(message) {
         if (message.role === "tool") {
             this.appendToolResult(message);

package/dist/src/ui-stream/agent-ui-messages.js.map

@@ -1 +1 @@
-{"version":3,"file":"agent-ui-messages.js","sourceRoot":"","sources":["../../../src/ui-stream/agent-ui-messages.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"agent-ui-messages.js","sourceRoot":"","sources":["../../../src/ui-stream/agent-ui-messages.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdurable/dex-agents",
-  "version": "0.3.0",
+  "version": "0.5.0",
   "description": "Durable agent sessions for Dex, shared by the Dex TypeScript agent framework adapters",
   "license": "LicenseRef-Sustainable-Use-1.0",
   "repository": {
@@ -38,10 +38,18 @@
       "types": "./dist/src/mcp/index.d.ts",
       "import": "./dist/src/mcp/index.js"
     },
+    "./connectors": {
+      "types": "./dist/src/connectors/index.d.ts",
+      "import": "./dist/src/connectors/index.js"
+    },
     "./ui-stream": {
       "types": "./dist/src/ui-stream/index.d.ts",
       "import": "./dist/src/ui-stream/index.js"
     },
+    "./builtin-loop": {
+      "types": "./dist/src/builtin-loop/index.d.ts",
+      "import": "./dist/src/builtin-loop/index.js"
+    },
     "./stepwise": {
       "types": "./dist/src/stepwise/index.d.ts",
       "import": "./dist/src/stepwise/index.js"
@@ -49,6 +57,10 @@
     "./ai-sdk": {
       "types": "./dist/src/ai-sdk/index.d.ts",
       "import": "./dist/src/ai-sdk/index.js"
+    },
+    "./s3": {
+      "types": "./dist/src/s3/index.d.ts",
+      "import": "./dist/src/s3/index.js"
     }
   },
   "scripts": {
@@ -58,27 +70,37 @@
     "test:long": "npm run build && node --test --test-concurrency=1 --test-timeout=1800000 'dist/test/long/*.integration.test.js'"
   },
   "peerDependencies": {
+    "@aws-sdk/client-s3": "^3.700.0",
     "@modelcontextprotocol/sdk": "^1.32.2",
     "@opentelemetry/api": "^1.3.0",
-    "@superdurable/dex": "1.38.0",
+    "@superdurable/connectors-sdk": "0.9.0",
+    "@superdurable/dex": "1.45.0",
     "ai": "^7.0.159"
   },
   "peerDependenciesMeta": {
+    "@aws-sdk/client-s3": {
+      "optional": true
+    },
     "@modelcontextprotocol/sdk": {
       "optional": true
     },
     "@opentelemetry/api": {
       "optional": true
     },
+    "@superdurable/connectors-sdk": {
+      "optional": true
+    },
     "ai": {
       "optional": true
     }
   },
   "devDependencies": {
+    "@aws-sdk/client-s3": "3.1155.0",
     "@modelcontextprotocol/sdk": "1.32.2",
     "@opentelemetry/api": "1.9.1",
     "@opentelemetry/sdk-trace-base": "2.12.0",
-    "@superdurable/dex": "1.38.0",
+    "@superdurable/connectors-sdk": "0.9.0",
+    "@superdurable/dex": "1.45.0",
     "@types/node": "22.20.5",
     "ai": "7.0.159",
     "typescript": "5.9.3",