@bolt-foundry/gambit-core 0.7.0 → 0.8.0

package/esm/src/runtime.js

@@ -156,7 +156,8 @@ function extractInitInput(state) {
         return undefined;
     for (let i = state.messages.length - 1; i >= 0; i--) {
         const msg = state.messages[i];
-        if (msg.role === "tool" && msg.name === GAMBIT_TOOL_INIT) {
+        if (msg.type === "message" && msg.role === "tool" &&
+            msg.name === GAMBIT_TOOL_INIT) {
             const content = msg.content;
             if (typeof content !== "string")
                 return undefined;
@@ -280,7 +281,10 @@ async function runLlmDeck(ctx) {
     const systemPrompt = buildSystemPrompt(deck);
     const refToolCallId = randomId("call");
     const messages = ctx.state?.messages
-        ? ctx.state.messages.map(sanitizeMessage)
+        ? ctx.state.messages
+            .map(coerceToMessageItem)
+            .filter((item) => item !== null)
+            .map(sanitizeMessageItem)
         : [];
     const resumed = messages.length > 0;
     const sendInit = Boolean(inputProvided) && input !== undefined && !resumed;
@@ -297,7 +301,7 @@ async function runLlmDeck(ctx) {
         trace: ctx.trace,
         stream: ctx.stream,
         onStreamText: ctx.onStreamText,
-        pushMessages: (msgs) => messages.push(...msgs.map(sanitizeMessage)),
+        pushMessages: (msgs) => messages.push(...msgs.map(sanitizeMessageItem)),
     });
     let streamingBuffer = "";
     let streamingCommitted = false;
@@ -309,7 +313,11 @@ async function runLlmDeck(ctx) {
         ctx.onStreamText?.(chunk);
     };
     if (!resumed) {
-        messages.push(sanitizeMessage({ role: "system", content: systemPrompt }));
+        messages.push(sanitizeMessageItem({
+            type: "message",
+            role: "system",
+            content: systemPrompt,
+        }));
         if (sendInit) {
             ctx.trace?.({
                 type: "tool.call",
@@ -319,7 +327,8 @@ async function runLlmDeck(ctx) {
                 args: {},
                 parentActionCallId: actionCallId,
             });
-            messages.push(sanitizeMessage({
+            messages.push(sanitizeMessageItem({
+                type: "message",
                 role: "assistant",
                 content: null,
                 tool_calls: [{
@@ -330,7 +339,8 @@ async function runLlmDeck(ctx) {
                             arguments: "{}",
                         },
                     }],
-            }), sanitizeMessage({
+            }), sanitizeMessageItem({
+                type: "message",
                 role: "tool",
                 name: GAMBIT_TOOL_INIT,
                 tool_call_id: refToolCallId,
@@ -347,7 +357,8 @@ async function runLlmDeck(ctx) {
         }
     }
     if (initialUserMessage !== undefined) {
-        const userMessage = sanitizeMessage({
+        const userMessage = sanitizeMessageItem({
+            type: "message",
             role: "user",
             content: formatInputForUser(initialUserMessage),
         });
@@ -395,44 +406,65 @@ async function runLlmDeck(ctx) {
                 stream: ctx.stream,
                 messageCount: messages.length,
                 toolCount: tools.length,
-                messages: messages.map(sanitizeMessage),
+                messages: messages.map(sanitizeMessageItem),
                 tools,
                 stateMessages,
                 parentActionCallId: ctx.parentActionCallId,
             });
-            const result = await modelProvider.chat({
+            const result = await modelProvider.responses({
                 model,
-                messages,
+                input: messages,
                 tools,
                 stream: ctx.stream,
                 state: ctx.state,
                 params: toProviderParams(deck.modelParams),
-                onStreamText: (ctx.onStreamText || deck.handlers?.onIdle)
-                    ? wrappedOnStreamText
+                onStreamEvent: (ctx.onStreamText || deck.handlers?.onIdle)
+                    ? (event) => {
+                        switch (event.type) {
+                            case "response.output_text.delta":
+                                wrappedOnStreamText(event.delta);
+                                break;
+                            case "response.refusal.delta":
+                                if (event.delta)
+                                    wrappedOnStreamText(event.delta);
+                                break;
+                            case "response.refusal.done":
+                                if (event.refusal)
+                                    wrappedOnStreamText(event.refusal);
+                                break;
+                            default:
+                                break;
+                        }
+                    }
                     : undefined,
             });
             idleController.touch();
-            const message = result.message;
+            const message = messageItemFromResponse(result.output);
+            const toolCalls = extractToolCalls(result.output, message);
             ctx.trace?.({
                 type: "model.result",
                 runId,
                 actionCallId,
                 deckPath: deck.path,
                 model,
-                finishReason: result.finishReason,
-                message: sanitizeMessage(message),
-                toolCalls: result.toolCalls,
+                finishReason: result.finishReason ?? "stop",
+                message: sanitizeMessageItem(message),
+                toolCalls,
                 stateMessages: result.updatedState?.messages?.length,
                 parentActionCallId: ctx.parentActionCallId,
             });
             const computeState = (updated) => {
                 const base = updated ??
-                    { runId, messages: messages.map(sanitizeMessage) };
+                    { runId, messages: messages.map(sanitizeMessageItem) };
                 const mergedMessages = base.messages && base.messages.length > 0
-                    ? base.messages.map(sanitizeMessage)
-                    : messages.map(sanitizeMessage);
+                    ? sanitizeResponseItems(base.messages)
+                    : messages.map(sanitizeMessageItem);
                 const priorRefs = updated?.messageRefs ?? ctx.state?.messageRefs ?? [];
-                const messageRefs = mergedMessages.map((m, idx) => priorRefs[idx] ?? { id: randomId("msg"), role: m.role });
+                const messageRefs = mergedMessages.map((m, idx) => priorRefs[idx] ?? {
+                    id: randomId("msg"),
+                    type: m.type,
+                    role: m.type === "message" ? m.role : undefined,
+                });
                 const feedback = updated?.feedback ?? ctx.state?.feedback;
                 const traces = updated?.traces ?? ctx.state?.traces;
                 return {
@@ -444,16 +476,20 @@ async function runLlmDeck(ctx) {
                     traces,
                 };
             };
-            if (result.toolCalls && result.toolCalls.length > 0) {
+            if (toolCalls && toolCalls.length > 0) {
                 let responded = false;
                 let respondValue;
                 let endSignal;
                 const appendedMessages = [];
                 if (!streamingCommitted && streamingBuffer) {
-                    messages.push(sanitizeMessage({ role: "assistant", content: streamingBuffer }));
+                    messages.push(sanitizeMessageItem({
+                        type: "message",
+                        role: "assistant",
+                        content: streamingBuffer,
+                    }));
                     streamingCommitted = true;
                 }
-                for (const call of result.toolCalls) {
+                for (const call of toolCalls) {
                     if (respondEnabled && call.name === GAMBIT_TOOL_RESPOND) {
                         const status = typeof call.args?.status === "number"
                             ? call.args.status
@@ -492,6 +528,7 @@ async function runLlmDeck(ctx) {
                         });
                         const toolContent = JSON.stringify(call.args ?? {});
                         appendedMessages.push({
+                            type: "message",
                             role: "assistant",
                             content: null,
                             tool_calls: [{
@@ -504,6 +541,7 @@ async function runLlmDeck(ctx) {
                                 }],
                         });
                         appendedMessages.push({
+                            type: "message",
                             role: "tool",
                             tool_call_id: call.id,
                             name: call.name,
@@ -547,6 +585,7 @@ async function runLlmDeck(ctx) {
                         });
                         const toolContent = JSON.stringify(call.args ?? {});
                         appendedMessages.push({
+                            type: "message",
                             role: "assistant",
                             content: null,
                             tool_calls: [{
@@ -559,6 +598,7 @@ async function runLlmDeck(ctx) {
                                 }],
                         });
                         appendedMessages.push({
+                            type: "message",
                             role: "tool",
                             tool_call_id: call.id,
                             name: call.name,
@@ -628,6 +668,7 @@ async function runLlmDeck(ctx) {
                         parentActionCallId: actionCallId,
                     });
                     appendedMessages.push({
+                        type: "message",
                         role: "assistant",
                         content: null,
                         tool_calls: [{
@@ -640,13 +681,16 @@ async function runLlmDeck(ctx) {
                             }],
                     });
                     appendedMessages.push({
+                        type: "message",
                         role: "tool",
                         tool_call_id: call.id,
                         name: call.name,
                         content: toolResult.toolContent,
                     });
                     if (toolResult.extraMessages?.length) {
-                        appendedMessages.push(...toolResult.extraMessages);
+                        appendedMessages.push(...toolResult.extraMessages
+                            .map(coerceToMessageItem)
+                            .filter((item) => item !== null));
                     }
                     ctx.trace?.({
                         type: "action.end",
@@ -658,7 +702,7 @@ async function runLlmDeck(ctx) {
                     });
                 }
                 if (appendedMessages.length) {
-                    messages.push(...appendedMessages.map(sanitizeMessage));
+                    messages.push(...appendedMessages.map(sanitizeMessageItem));
                     idleController.touch();
                 }
                 if (ctx.onStateUpdate) {
@@ -695,13 +739,13 @@ async function runLlmDeck(ctx) {
                 throw new Error("Model stopped early (length) with no content");
             }
             if (message.content !== null && message.content !== undefined) {
-                messages.push(sanitizeMessage(message));
+                messages.push(sanitizeMessageItem(message));
                 if (ctx.onStateUpdate) {
                     const state = computeState(result.updatedState);
                     ctx.onStateUpdate(state);
                 }
                 if (ctx.parentActionCallId !== undefined &&
-                    (!result.toolCalls || result.toolCalls.length === 0)) {
+                    (!toolCalls || toolCalls.length === 0)) {
                     ctx.trace?.({
                         type: "monolog",
                         runId,
@@ -828,7 +872,7 @@ async function handleToolCall(call, ctx) {
                 initialUserMessage: undefined,
             });
             if (envelope.length) {
-                extraMessages.push(...envelope.map(sanitizeMessage));
+                extraMessages.push(...envelope.map(sanitizeMessageItem));
             }
             ctx.idle?.touch();
         }
@@ -907,7 +951,7 @@ async function handleToolCall(call, ctx) {
                     initialUserMessage: undefined,
                 });
                 if (envelope.length) {
-                    extraMessages.push(...envelope.map(sanitizeMessage));
+                    extraMessages.push(...envelope.map(sanitizeMessageItem));
                 }
                 ctx.idle?.touch();
             }
@@ -918,6 +962,7 @@ async function handleToolCall(call, ctx) {
     }
     const completeEventId = randomId("event");
     extraMessages.push({
+        type: "message",
         role: "assistant",
         content: null,
         tool_calls: [{
@@ -929,6 +974,7 @@ async function handleToolCall(call, ctx) {
                 },
             }],
     }, {
+        type: "message",
         role: "tool",
         tool_call_id: completeEventId,
         name: GAMBIT_TOOL_COMPLETE,
@@ -1003,6 +1049,7 @@ async function runBusyHandler(args) {
             logger.log(message);
         }
         return [{
+                type: "message",
                 role: "assistant",
                 content: `${message} (elapsed ${elapsedMs}ms)`,
             }];
@@ -1057,8 +1104,9 @@ function createIdleController(args) {
                     stream: args.stream,
                     onStreamText: args.onStreamText,
                 });
-                if (envelope.length)
-                    args.pushMessages(envelope.map(sanitizeMessage));
+                if (envelope.length) {
+                    args.pushMessages(envelope.map(sanitizeMessageItem));
+                }
             }
             catch {
                 // ignore idle handler errors
@@ -1143,6 +1191,7 @@ async function runIdleHandler(args) {
             logger.log(message);
         }
         return [{
+                type: "message",
                 role: "assistant",
                 content: `${message} (idle for ${elapsedMs}ms)`,
             }];
@@ -1215,6 +1264,7 @@ async function maybeHandleError(args) {
         const callId = randomId("event");
         const extraMessages = [
             {
+                type: "message",
                 role: "assistant",
                 content: null,
                 tool_calls: [{
@@ -1227,6 +1277,7 @@ async function maybeHandleError(args) {
                     }],
             },
             {
+                type: "message",
                 role: "tool",
                 tool_call_id: callId,
                 name: GAMBIT_TOOL_COMPLETE,
@@ -1258,6 +1309,7 @@ async function maybeHandleError(args) {
         const callId = randomId("event");
         const extraMessages = [
             {
+                type: "message",
                 role: "assistant",
                 content: null,
                 tool_calls: [{
@@ -1270,6 +1322,7 @@ async function maybeHandleError(args) {
                     }],
             },
             {
+                type: "message",
                 role: "tool",
                 tool_call_id: callId,
                 name: GAMBIT_TOOL_COMPLETE,
@@ -1302,11 +1355,62 @@ function formatInputForUser(input) {
         return String(input);
     }
 }
-function sanitizeMessage(msg) {
-    const toolCalls = msg.tool_calls && msg.tool_calls.length > 0
-        ? msg.tool_calls
+function sanitizeMessageItem(item) {
+    const toolCalls = item.tool_calls && item.tool_calls.length > 0
+        ? item.tool_calls
         : undefined;
-    return { ...msg, tool_calls: toolCalls };
+    return { ...item, tool_calls: toolCalls };
+}
+function sanitizeResponseItems(items) {
+    return items.map((item) => item.type === "message" ? sanitizeMessageItem(item) : item);
+}
+function coerceToMessageItem(item) {
+    if (item.type === "message")
+        return item;
+    if (item.type === "output_text") {
+        return { type: "message", role: "assistant", content: item.text };
+    }
+    return null;
+}
+function messageItemFromResponse(output) {
+    const messageItem = output.find((item) => item.type === "message");
+    if (messageItem && messageItem.type === "message")
+        return messageItem;
+    const textItem = output.find((item) => item.type === "output_text");
+    if (textItem && textItem.type === "output_text") {
+        return { type: "message", role: "assistant", content: textItem.text };
+    }
+    return { type: "message", role: "assistant", content: null };
+}
+function safeJsonArgs(str) {
+    try {
+        const parsed = JSON.parse(str);
+        if (parsed && typeof parsed === "object") {
+            return parsed;
+        }
+    }
+    catch {
+        // ignore bad tool args
+    }
+    return {};
+}
+function extractToolCalls(output, message) {
+    const responseCalls = output.filter((item) => item.type === "function_call");
+    if (responseCalls.length > 0) {
+        return responseCalls.map((item) => ({
+            id: item.call_id,
+            name: item.name,
+            args: safeJsonArgs(item.arguments),
+        }));
+    }
+    const messageCalls = message.tool_calls ?? [];
+    if (messageCalls.length === 0)
+        return undefined;
+    return messageCalls.map((call) => ({
+        id: call.id,
+        name: call.function.name,
+        args: safeJsonArgs(call.function.arguments),
+    }));
 }
 async function buildToolDefs(deck) {
     const defs = [];

package/esm/src/state.d.ts

@@ -1,7 +1,7 @@
-import type { ModelMessage, TraceEvent } from "./types.js";
+import type { OpenResponseItem, OpenResponseMessageItem, TraceEvent } from "./types.js";
 export type SavedState = {
     runId: string;
-    messages: Array<ModelMessage>;
+    messages: Array<OpenResponseItem>;
     meta?: Record<string, unknown>;
     messageRefs?: Array<MessageRef>;
     feedback?: Array<FeedbackEntry>;
@@ -11,7 +11,8 @@ export type SavedState = {
 };
 export type MessageRef = {
     id: string;
-    role: ModelMessage["role"];
+    type: OpenResponseItem["type"];
+    role?: OpenResponseMessageItem["role"];
 };
 export type FeedbackEntry = {
     id: string;

package/esm/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,UAAU,EAAE,MAAM,YAAY,CAAC;AAE3D,MAAM,MAAM,UAAU,GAAG;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;IAC9B,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;CAC5B,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;AAEF,wBAAgB,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS,CAclE;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":"AAEA,OAAO,KAAK,EACV,gBAAgB,EAChB,uBAAuB,EACvB,UAAU,EACX,MAAM,YAAY,CAAC;AAEpB,MAAM,MAAM,UAAU,GAAG;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAClC,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,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAC/B,IAAI,CAAC,EAAE,uBAAuB,CAAC,MAAM,CAAC,CAAC;CACxC,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;AAEF,wBAAgB,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS,CAclE;AAED,wBAAgB,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,QAK5D"}