@bolt-foundry/gambit-core 0.8.6 → 1.0.0-rc.2

package/script/src/runtime.js

@@ -35,13 +35,16 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RunCanceledError = void 0;
 exports.isGambitEndSignal = isGambitEndSignal;
+exports.stringifyResponseOutput = stringifyResponseOutput;
 exports.isRunCanceledError = isRunCanceledError;
 exports.runDeck = runDeck;
+exports.runDeckResponses = runDeckResponses;
 // deno-lint-ignore-file gambit/no-unexplained-as-unknown
 const dntShim = __importStar(require("../_dnt.shims.js"));
 const path = __importStar(require("../deps/jsr.io/@std/path/1.1.4/mod.js"));
 const constants_js_1 = require("./constants.js");
 const loader_js_1 = require("./loader.js");
+const text_js_1 = require("./text.js");
 const permissions_js_1 = require("./permissions.js");
 const runtime_exec_host_js_1 = require("./runtime_exec_host.js");
 const runtime_worker_host_js_1 = require("./runtime_worker_host.js");
@@ -57,6 +60,19 @@ function randomId(prefix) {
     // Keep IDs short enough for OpenAI/OpenRouter tool_call id limits (~40 chars).
     return `${prefix}-${suffix}`;
 }
+function stringifyResponseOutput(output) {
+    const parts = [];
+    for (const item of output) {
+        if (item.type !== "message" || item.role !== "assistant")
+            continue;
+        for (const content of item.content) {
+            if (content.type === "output_text") {
+                parts.push(content.text);
+            }
+        }
+    }
+    return parts.join("");
+}
 const WORKER_SANDBOX_ENV = "GAMBIT_DECK_WORKER_SANDBOX";
 const WORKER_TIMEOUT_MESSAGE = "Timeout exceeded";
 const RUN_CANCELED_MESSAGE = "Run canceled";
@@ -484,6 +500,7 @@ async function runDeck(opts) {
                     initialUserMessage: opts.initialUserMessage,
                     parentActionCallId: opts.parentActionCallId,
                     modelProvider: opts.modelProvider,
+                    modelResolver: opts.modelResolver,
                     input: resolvedInput,
                     defaultModel: opts.defaultModel,
                     modelOverride: opts.modelOverride,
@@ -516,6 +533,7 @@ async function runDeck(opts) {
                     runId,
                     parentActionCallId: opts.parentActionCallId,
                     modelProvider: opts.modelProvider,
+                    modelResolver: opts.modelResolver,
                     input: resolvedInput,
                     inputProvided: opts.inputProvided ?? true,
                     initialUserMessage: opts.initialUserMessage,
@@ -548,7 +566,7 @@ async function runDeck(opts) {
         const deck = opts.runtimeTools?.length
             ? {
                 ...loadedDeck,
-                tools: [...loadedDeck.tools, ...opts.runtimeTools],
+                tools: Array.from([...loadedDeck.tools, ...opts.runtimeTools].reduce((byName, tool) => byName.set(tool.name, tool), new Map()).values()),
             }
             : loadedDeck;
         const permissions = (0, permissions_js_1.resolveEffectivePermissions)({
@@ -609,6 +627,7 @@ async function runDeck(opts) {
                 runId,
                 parentActionCallId: opts.parentActionCallId,
                 modelProvider: opts.modelProvider,
+                modelResolver: opts.modelResolver,
                 input: validatedInput,
                 inputProvided: opts.inputProvided ?? true,
                 initialUserMessage: opts.initialUserMessage,
@@ -655,6 +674,7 @@ async function runDeck(opts) {
                 runId,
                 parentActionCallId: opts.parentActionCallId,
                 modelProvider: opts.modelProvider,
+                modelResolver: opts.modelResolver,
                 input: validatedInput,
                 inputProvided: opts.inputProvided ?? true,
                 initialUserMessage: opts.initialUserMessage,
@@ -692,6 +712,7 @@ async function runDeck(opts) {
             initialUserMessage: opts.initialUserMessage,
             parentActionCallId: opts.parentActionCallId,
             modelProvider: opts.modelProvider,
+            modelResolver: opts.modelResolver,
             input: validatedInput,
             defaultModel: opts.defaultModel,
             modelOverride: opts.modelOverride,
@@ -732,6 +753,57 @@ async function runDeck(opts) {
         }
     }
 }
+async function runDeckResponses(opts) {
+    const runId = opts.runId ?? opts.state?.runId ?? randomId("run");
+    const traceEvents = [];
+    const responseEvents = [];
+    let output = [];
+    let state = opts.state;
+    let usage;
+    let finishReason;
+    const trace = (event) => {
+        traceEvents.push(event);
+        if (event.type === "model.result" &&
+            event.mode === "responses" &&
+            !event.parentActionCallId) {
+            output = event.responseItems ?? [];
+            usage = event.usage;
+            finishReason = event.finishReason;
+        }
+        if (event.type === "model.stream.event" ||
+            event.type.startsWith("response.")) {
+            responseEvents.push(event);
+        }
+        opts.trace?.(event);
+    };
+    const onStateUpdate = (nextState) => {
+        state = nextState;
+        opts.onStateUpdate?.(nextState);
+    };
+    const legacyResult = await runDeck({
+        ...opts,
+        runId,
+        responsesMode: true,
+        trace,
+        onStateUpdate,
+    });
+    const effects = traceEvents.filter((event) => event.type === "action.start" ||
+        event.type === "action.end" ||
+        event.type === "tool.call" ||
+        event.type === "tool.result");
+    return {
+        runId,
+        status: "completed",
+        output,
+        traceEvents,
+        responseEvents,
+        state,
+        usage,
+        finishReason,
+        effects,
+        legacyResult,
+    };
+}
 function toProviderParams(params) {
     if (!params)
         return undefined;
@@ -758,7 +830,7 @@ function toProviderParams(params) {
     return Object.keys(out).length ? out : undefined;
 }
 async function resolveModelChoice(args) {
-    const resolver = args.modelProvider.resolveModel;
+    const resolver = args.modelResolver?.resolveModel;
     if (resolver) {
         return await resolver({
             model: args.model,
@@ -778,11 +850,8 @@ async function resolveModelChoice(args) {
     }
     return { model: args.model, params: args.params };
 }
-function shouldExposeProviderToolArray(model) {
-    const normalized = model.trim().toLowerCase();
-    if (!normalized)
-        return true;
-    return normalized !== "codex-cli" && !normalized.startsWith("codex-cli/");
+function shouldExposeProviderToolArray(_model) {
+    return true;
 }
 function resolveContextSchema(deck) {
     return deck.contextSchema ?? deck.inputSchema;
@@ -962,7 +1031,7 @@ function messagesFromResponseItems(items) {
     const callNameById = new Map();
     for (const item of items) {
         if (item.type === "message") {
-            const text = item.content.map((part) => part.text).join("");
+            const text = (0, text_js_1.joinTextParts)(item.content.map((part) => part.text));
             messages.push({
                 role: item.role,
                 content: text || null,
@@ -2015,7 +2084,7 @@ function mapResponseOutput(output) {
     return {
         message: {
             role: "assistant",
-            content: textParts.length ? textParts.join("") : null,
+            content: textParts.length ? (0, text_js_1.joinTextParts)(textParts) : null,
         },
         toolCalls: toolCalls.length ? toolCalls : undefined,
     };
@@ -2079,6 +2148,7 @@ async function runComputeDeck(ctx) {
             initialUserMessage: ctx.initialUserMessage,
             parentActionCallId: ctx.parentActionCallId,
             modelProvider: ctx.modelProvider,
+            modelResolver: ctx.modelResolver,
             input: ctx.input,
             defaultModel: ctx.defaultModel,
             modelOverride: ctx.modelOverride,
@@ -2835,54 +2905,11 @@ async function runLlmDeckInWorker(ctx) {
                 ctx.onStreamText?.(msg.chunk);
                 return;
             }
-            if (msg.type === "model.chat.request") {
-                (async () => {
-                    const controller = new AbortController();
-                    modelRequestControllers.set(msg.requestId, controller);
-                    try {
-                        const result = await ctx.modelProvider.chat({
-                            ...msg.input,
-                            signal: mergeAbortSignals(ctx.signal, controller.signal),
-                            onStreamText: (chunk) => {
-                                worker.postMessage({
-                                    type: "model.chat.stream",
-                                    requestId: msg.requestId,
-                                    chunk,
-                                });
-                            },
-                        });
-                        worker.postMessage({
-                            type: "model.chat.result",
-                            requestId: msg.requestId,
-                            result,
-                        });
-                    }
-                    catch (err) {
-                        worker.postMessage({
-                            type: "model.chat.error",
-                            requestId: msg.requestId,
-                            error: {
-                                source: "model",
-                                name: err instanceof Error ? err.name : undefined,
-                                message: err instanceof Error ? err.message : String(err),
-                                code: err?.code,
-                            },
-                        });
-                    }
-                    finally {
-                        modelRequestControllers.delete(msg.requestId);
-                    }
-                })();
-                return;
-            }
             if (msg.type === "model.responses.request") {
                 (async () => {
                     const controller = new AbortController();
                     modelRequestControllers.set(msg.requestId, controller);
                     try {
-                        if (!ctx.modelProvider.responses) {
-                            throw new Error("Responses API unavailable for current model provider");
-                        }
                         const result = await ctx.modelProvider.responses({
                             ...msg.input,
                             signal: mergeAbortSignals(ctx.signal, controller.signal),
@@ -2925,8 +2952,8 @@ async function runLlmDeckInWorker(ctx) {
             if (msg.type === "model.resolveModel.request") {
                 (async () => {
                     try {
-                        const result = ctx.modelProvider.resolveModel
-                            ? await ctx.modelProvider.resolveModel(msg.input)
+                        const result = ctx.modelResolver?.resolveModel
+                            ? await ctx.modelResolver.resolveModel(msg.input)
                             : {
                                 model: Array.isArray(msg.input.model)
                                     ? msg.input.model[0]
@@ -3138,6 +3165,7 @@ async function runComputeDeckInWorker(ctx) {
                             path: req.payload.path,
                             input: req.payload.input,
                             modelProvider: ctx.modelProvider,
+                            modelResolver: ctx.modelResolver,
                             isRoot: false,
                             guardrails: ctx.guardrails,
                             depth: ctx.depth + 1,
@@ -3418,6 +3446,7 @@ async function runComputeDeckInProcess(ctx) {
                 path: childPath,
                 input: opts.input,
                 modelProvider: ctx.modelProvider,
+                modelResolver: ctx.modelResolver,
                 isRoot: false,
                 guardrails: ctx.guardrails,
                 depth: ctx.depth + 1,
@@ -3481,8 +3510,7 @@ async function runLlmDeck(ctx) {
     const { deck, guardrails, depth, modelProvider, input, runId, inputProvided, initialUserMessage, } = ctx;
     const actionCallId = randomId("action");
     const start = performance.now();
-    const useResponses = Boolean(ctx.responsesMode) ||
-        ctx.state?.format === "responses";
+    const useResponses = true;
     const validateResponseItemEmission = createResponseItemEmissionValidator(deck);
     const intermediateEmitter = ctx.parentActionCallId !== undefined
         ? createIntermediateChildResponseEmitter({
@@ -3637,6 +3665,7 @@ async function runLlmDeck(ctx) {
                 model: modelCandidate,
                 params: toProviderParams(deck.modelParams),
                 modelProvider,
+                modelResolver: ctx.modelResolver,
                 deckPath: deck.path,
             });
             const model = resolved.model;
@@ -3665,144 +3694,93 @@ async function runLlmDeck(ctx) {
                 parentActionCallId: ctx.parentActionCallId,
             });
             let responseOutputItems;
-            const responses = modelProvider.responses;
             const projectedToolCalls = new Set();
             const projectedToolResults = new Set();
             const projectedToolNames = new Map();
             const canonicalizeStreamEvent = createCanonicalStreamEventController();
-            const result = (useResponses && responses)
-                ? await (async () => {
-                    const responseItems = responseItemsFromMessages(messages);
-                    let sawDelta = false;
-                    const response = await responses({
-                        request: {
-                            model,
-                            input: responseItems,
-                            tools: providerResponseTools,
-                            text: responseTextConfig,
-                            stream: ctx.stream,
-                            params: providerParams,
-                        },
-                        state: ctx.state,
-                        deckPath: deck.path,
-                        signal: ctx.signal,
-                        onStreamEvent: (ctx.trace || ctx.onStreamText || deck.handlers?.onIdle)
-                            ? (event) => {
-                                const normalizedEvent = validateResponseEventItems(event, validateResponseItemEmission);
-                                const streamEvent = canonicalizeStreamEvent(normalizedEvent);
-                                if (!streamEvent)
-                                    return;
-                                if (ctx.trace) {
-                                    const handledAsResponse = traceOpenResponsesStreamEvent({
-                                        streamEvent,
-                                        runId,
-                                        actionCallId,
-                                        deckPath: deck.path,
-                                        model,
-                                        parentActionCallId: ctx.parentActionCallId,
-                                        trace: ctx.trace,
-                                    });
-                                    if (!handledAsResponse) {
-                                        ctx.trace({
-                                            type: "model.stream.event",
-                                            runId,
-                                            actionCallId,
-                                            deckPath: deck.path,
-                                            model,
-                                            event: streamEvent,
-                                            parentActionCallId: ctx.parentActionCallId,
-                                        });
-                                    }
-                                    projectStreamToolTraceEvents({
-                                        streamEvent,
-                                        runId,
-                                        parentActionCallId: actionCallId,
-                                        trace: ctx.trace,
-                                        emittedCalls: projectedToolCalls,
-                                        emittedResults: projectedToolResults,
-                                        toolNames: projectedToolNames,
-                                    });
-                                }
-                                const eventType = typeof streamEvent.type === "string"
-                                    ? streamEvent.type
-                                    : "";
-                                if (eventType === "response.output_text.delta") {
-                                    sawDelta = true;
-                                    const delta = typeof streamEvent.delta === "string"
-                                        ? streamEvent.delta
-                                        : "";
-                                    if (delta)
-                                        wrappedOnStreamText(delta);
-                                }
-                                else if (eventType === "response.output_text.done" && !sawDelta) {
-                                    const text = typeof streamEvent.text === "string"
-                                        ? streamEvent.text
-                                        : "";
-                                    if (text)
-                                        wrappedOnStreamText(text);
-                                }
-                            }
-                            : undefined,
-                    });
-                    responseOutputItems = validateResponseOutputItems(response.output ?? [], validateResponseItemEmission, "response.output");
-                    const mapped = mapResponseOutput(responseOutputItems);
-                    return {
-                        message: mapped.message,
-                        finishReason: mapped.toolCalls?.length ? "tool_calls" : "stop",
-                        toolCalls: mapped.toolCalls,
-                        usage: response.usage,
-                        updatedState: response.updatedState,
-                    };
-                })()
-                : await modelProvider.chat({
-                    model,
-                    messages,
-                    tools,
-                    stream: ctx.stream,
+            const result = await (async () => {
+                const responseItems = responseItemsFromMessages(messages);
+                let sawDelta = false;
+                const response = await modelProvider.responses({
+                    request: {
+                        model,
+                        input: responseItems,
+                        tools: providerResponseTools,
+                        text: responseTextConfig,
+                        stream: ctx.stream,
+                        params: providerParams,
+                    },
                     state: ctx.state,
                     deckPath: deck.path,
                     signal: ctx.signal,
-                    params: providerParams,
-                    onStreamText: (ctx.onStreamText || deck.handlers?.onIdle)
-                        ? wrappedOnStreamText
-                        : undefined,
-                    onStreamEvent: ctx.trace
+                    onStreamEvent: (ctx.trace || ctx.onStreamText || deck.handlers?.onIdle)
                         ? (event) => {
-                            const streamEvent = canonicalizeStreamEvent(event);
+                            const normalizedEvent = validateResponseEventItems(event, validateResponseItemEmission);
+                            const streamEvent = canonicalizeStreamEvent(normalizedEvent);
                             if (!streamEvent)
                                 return;
-                            const handledAsResponse = traceOpenResponsesStreamEvent({
-                                streamEvent,
-                                runId,
-                                actionCallId,
-                                deckPath: deck.path,
-                                model,
-                                parentActionCallId: ctx.parentActionCallId,
-                                trace: ctx.trace,
-                            });
-                            if (!handledAsResponse) {
-                                ctx.trace?.({
-                                    type: "model.stream.event",
+                            if (ctx.trace) {
+                                const handledAsResponse = traceOpenResponsesStreamEvent({
+                                    streamEvent,
                                     runId,
                                     actionCallId,
                                     deckPath: deck.path,
                                     model,
-                                    event: streamEvent,
                                     parentActionCallId: ctx.parentActionCallId,
+                                    trace: ctx.trace,
+                                });
+                                if (!handledAsResponse) {
+                                    ctx.trace({
+                                        type: "model.stream.event",
+                                        runId,
+                                        actionCallId,
+                                        deckPath: deck.path,
+                                        model,
+                                        event: streamEvent,
+                                        parentActionCallId: ctx.parentActionCallId,
+                                    });
+                                }
+                                projectStreamToolTraceEvents({
+                                    streamEvent,
+                                    runId,
+                                    parentActionCallId: actionCallId,
+                                    trace: ctx.trace,
+                                    emittedCalls: projectedToolCalls,
+                                    emittedResults: projectedToolResults,
+                                    toolNames: projectedToolNames,
                                 });
                             }
-                            projectStreamToolTraceEvents({
-                                streamEvent,
-                                runId,
-                                parentActionCallId: actionCallId,
-                                trace: ctx.trace,
-                                emittedCalls: projectedToolCalls,
-                                emittedResults: projectedToolResults,
-                                toolNames: projectedToolNames,
-                            });
+                            const eventType = typeof streamEvent.type === "string"
+                                ? streamEvent.type
+                                : "";
+                            if (eventType === "response.output_text.delta") {
+                                sawDelta = true;
+                                const delta = typeof streamEvent.delta === "string"
+                                    ? streamEvent.delta
+                                    : "";
+                                if (delta)
+                                    wrappedOnStreamText(delta);
+                            }
+                            else if (eventType === "response.output_text.done" && !sawDelta) {
+                                const text = typeof streamEvent.text === "string"
+                                    ? streamEvent.text
+                                    : "";
+                                if (text)
+                                    wrappedOnStreamText(text);
+                            }
                         }
                         : undefined,
                 });
+                responseOutputItems = validateResponseOutputItems(response.output ?? [], validateResponseItemEmission, "response.output");
+                const mapped = mapResponseOutput(responseOutputItems);
+                return {
+                    message: mapped.message,
+                    finishReason: mapped.toolCalls?.length ? "tool_calls" : "stop",
+                    toolCalls: mapped.toolCalls,
+                    usage: response.usage,
+                    updatedState: response.updatedState,
+                };
+            })();
             idleController.touch();
             let message = result.message;
             ctx.trace?.({
@@ -4705,6 +4683,7 @@ async function handleToolCall(call, ctx) {
                     path: action.path,
                     input: actionInput,
                     modelProvider: ctx.modelProvider,
+                    modelResolver: ctx.modelResolver,
                     isRoot: false,
                     guardrails: ctx.guardrails,
                     depth: ctx.depth + 1,
@@ -4804,6 +4783,7 @@ async function handleToolCall(call, ctx) {
                 path: action.path,
                 input: actionInput,
                 modelProvider: ctx.modelProvider,
+                modelResolver: ctx.modelResolver,
                 isRoot: false,
                 guardrails: ctx.guardrails,
                 depth: ctx.depth + 1,
@@ -4853,6 +4833,7 @@ async function handleToolCall(call, ctx) {
                 parentActionCallId: ctx.parentActionCallId,
                 handlerPath: busyCfg.path,
                 modelProvider: ctx.modelProvider,
+                modelResolver: ctx.modelResolver,
                 guardrails: ctx.guardrails,
                 depth: ctx.depth,
                 defaultModel: ctx.defaultModel,
@@ -4954,6 +4935,7 @@ async function handleToolCall(call, ctx) {
                     parentActionCallId: ctx.parentActionCallId,
                     handlerPath: busyCfg.path,
                     modelProvider: ctx.modelProvider,
+                    modelResolver: ctx.modelResolver,
                     guardrails: ctx.guardrails,
                     depth: ctx.depth,
                     defaultModel: ctx.defaultModel,
@@ -5043,6 +5025,7 @@ async function runBusyHandler(args) {
             path: args.handlerPath,
             input,
             modelProvider: args.modelProvider,
+            modelResolver: args.modelResolver,
             isRoot: false,
             guardrails: args.guardrails,
             depth: args.depth + 1,
@@ -5136,6 +5119,7 @@ function createIdleController(args) {
                     runId: args.runId,
                     parentActionCallId: args.parentActionCallId,
                     modelProvider: args.modelProvider,
+                    modelResolver: args.modelResolver,
                     guardrails: args.guardrails,
                     depth: args.depth,
                     defaultModel: args.defaultModel,
@@ -5210,6 +5194,7 @@ async function runIdleHandler(args) {
             path: args.handlerPath,
             input,
             modelProvider: args.modelProvider,
+            modelResolver: args.modelResolver,
             isRoot: false,
             guardrails: args.guardrails,
             depth: args.depth + 1,
@@ -5289,6 +5274,7 @@ async function maybeHandleError(args) {
             path: handlerPath,
             input: envelopeInput,
             modelProvider: args.ctx.modelProvider,
+            modelResolver: args.ctx.modelResolver,
             isRoot: false,
             guardrails: args.ctx.guardrails,
             depth: args.ctx.depth + 1,

package/script/src/state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../../src/src/state.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAEzE,MAAM,MAAM,UAAU,GAAG;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;IAC9B,MAAM,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IAC9B,KAAK,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,WAAW,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IAChC,QAAQ,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC;IAChC,MAAM,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IAC3B,KAAK,CAAC,EAAE,YAAY,CAAC;IACrB,iBAAiB,CAAC,EAAE,aAAa,CAAC;CACnC,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;IAC3B,MAAM,CAAC,EAAE,UAAU,GAAG,QAAQ,GAAG,UAAU,CAAC;CAC7C,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AA2CF,wBAAgB,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS,CAsBlE;AAED,wBAAgB,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,QAK5D"}
+{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../../src/src/state.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAEzE,MAAM,MAAM,UAAU,GAAG;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;IAC9B,MAAM,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IAC9B,KAAK,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,WAAW,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IAChC,QAAQ,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC;IAChC,MAAM,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IAC3B,KAAK,CAAC,EAAE,YAAY,CAAC;IACrB,iBAAiB,CAAC,EAAE,aAAa,CAAC;CACnC,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;IAC3B,MAAM,CAAC,EAAE,UAAU,GAAG,QAAQ,GAAG,UAAU,CAAC;CAC7C,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AA2CF,wBAAgB,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS,CAsBlE;AAED,wBAAgB,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,QAK5D"}

package/script/src/state.js

@@ -37,6 +37,7 @@ exports.loadState = loadState;
 exports.saveState = saveState;
 const dntShim = __importStar(require("../_dnt.shims.js"));
 const path = __importStar(require("../deps/jsr.io/@std/path/1.1.4/mod.js"));
+const text_js_1 = require("./text.js");
 function deriveMessagesFromItems(items) {
     const messages = [];
     const callNameById = new Map();
@@ -44,10 +45,10 @@ function deriveMessagesFromItems(items) {
         if (item.type === "message") {
             const text = item.content
                 .map((part) => part.text)
-                .join("");
+                .filter(Boolean);
             messages.push({
                 role: item.role,
-                content: text || null,
+                content: text.length ? (0, text_js_1.joinTextParts)(text) : null,
             });
             continue;
         }

package/script/src/text.d.ts

@@ -0,0 +1,2 @@
+export declare function joinTextParts(parts: Array<string>): string;
+//# sourceMappingURL=text.d.ts.map

package/script/src/text.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"text.d.ts","sourceRoot":"","sources":["../../src/src/text.ts"],"names":[],"mappings":"AAAA,wBAAgB,aAAa,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,MAAM,CAE1D"}

package/script/src/text.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.joinTextParts = joinTextParts;
+function joinTextParts(parts) {
+    return parts.filter(Boolean).join("");
+}

package/script/src/types.d.ts

@@ -119,6 +119,7 @@ export type BaseDefinition = {
 export type DeckDefinition<Input = unknown> = BaseDefinition & {
     kind: "gambit.deck";
     modelParams?: ModelParams;
+    workloop?: unknown;
     tools?: ReadonlyArray<ExternalToolDefinition>;
     responseItemExtensions?: ReadonlyArray<ResponseItemExtensionDefinition>;
     handlers?: HandlersConfig;
@@ -559,7 +560,7 @@ export type ResponseEvent = {
     payload: Record<string, JSONValue>;
 };
 export type ModelProvider = {
-    responses?: (input: {
+    responses: (input: {
         request: CreateResponseRequest;
         state?: SavedState;
         deckPath?: string;
@@ -567,6 +568,8 @@ export type ModelProvider = {
         onStreamEvent?: (event: ResponseEvent) => void;
         onTraceEvent?: (event: ProviderTraceEvent) => void;
     }) => Promise<CreateResponseResponse>;
+};
+export type ModelResolver = {
     resolveModel?: (input: {
         model: string | Array<string>;
         params?: Record<string, unknown>;
@@ -575,38 +578,6 @@ export type ModelProvider = {
         model: string;
         params?: Record<string, unknown>;
     }>;
-    chat: (input: {
-        model: string;
-        messages: Array<ModelMessage>;
-        tools?: Array<ToolDefinition>;
-        stream?: boolean;
-        state?: SavedState;
-        deckPath?: string;
-        signal?: AbortSignal;
-        onStreamText?: (chunk: string) => void;
-        onStreamEvent?: (event: Record<string, JSONValue>) => void;
-        onTraceEvent?: (event: ProviderTraceEvent) => void;
-        /**
-         * Provider-specific pass-through parameters (e.g. OpenAI chat completion
-         * fields like temperature/max_tokens).
-         */
-        params?: Record<string, unknown>;
-    }) => Promise<{
-        message: ModelMessage;
-        finishReason: "stop" | "tool_calls" | "length";
-        toolCalls?: Array<{
-            id: string;
-            name: string;
-            args: Record<string, JSONValue>;
-        }>;
-        updatedState?: SavedState;
-        usage?: {
-            promptTokens: number;
-            completionTokens: number;
-            totalTokens: number;
-            reasoningTokens?: number;
-        };
-    }>;
 };
 export type ProviderTraceEvent = TraceEvent | (Omit<Extract<TraceEvent, {
     type: "tool.call";