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

package/script/src/openai_compat.js

@@ -50,9 +50,9 @@ function normalizeContent(content) {
         return content;
     if (!Array.isArray(content))
         return String(content);
-    return content
+    return (0, gambit_core_1.joinTextParts)(content
         .map((c) => (typeof c === "string" ? c : (c.text ?? "")))
-        .join("");
+        .filter(Boolean));
 }
 function normalizeMessages(input) {
     return input.map((m) => ({
@@ -65,6 +65,88 @@ function normalizeMessages(input) {
             : undefined,
     }));
 }
+function responseItemsFromMessages(messages) {
+    return messages.flatMap((message) => {
+        if (message.role === "tool") {
+            return [{
+                    type: "function_call_output",
+                    call_id: message.tool_call_id ?? randomId("tool"),
+                    output: message.content ?? "",
+                }];
+        }
+        const items = [];
+        if (message.content) {
+            items.push({
+                type: "message",
+                role: message.role,
+                content: [{
+                        type: message.role === "assistant" ? "output_text" : "input_text",
+                        text: message.content,
+                    }],
+            });
+        }
+        if (message.role === "assistant" && message.tool_calls?.length) {
+            for (const toolCall of message.tool_calls) {
+                items.push({
+                    type: "function_call",
+                    call_id: toolCall.id,
+                    name: toolCall.function.name,
+                    arguments: toolCall.function.arguments,
+                });
+            }
+        }
+        if (items.length)
+            return items;
+        return {
+            type: "message",
+            role: message.role,
+            content: [],
+        };
+    });
+}
+function responseOutputToChatResult(output) {
+    const textParts = [];
+    const toolCalls = [];
+    for (const item of output) {
+        if (item.type === "message" && item.role === "assistant") {
+            for (const part of item.content) {
+                if (part.type === "output_text" || part.type === "summary_text" ||
+                    part.type === "reasoning_text") {
+                    textParts.push(part.text);
+                }
+            }
+        }
+        if (item.type === "function_call") {
+            let args = {};
+            try {
+                const parsed = JSON.parse(item.arguments || "{}");
+                if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+                    args = parsed;
+                }
+            }
+            catch {
+                args = {};
+            }
+            toolCalls.push({ id: item.call_id, name: item.name, args });
+        }
+    }
+    const message = {
+        role: "assistant",
+        content: textParts.length ? (0, gambit_core_1.joinTextParts)(textParts) : null,
+        tool_calls: toolCalls.length
+            ? toolCalls.map((call) => ({
+                id: call.id,
+                type: "function",
+                function: { name: call.name, arguments: JSON.stringify(call.args) },
+            }))
+            : undefined,
+    };
+    return {
+        message,
+        finishReason: toolCalls.length ? "tool_calls" : "stop",
+        toolCalls: toolCalls.length ? toolCalls : undefined,
+    };
+}
 function providerParamsFromRequest(req) {
     const out = {};
     if (req.temperature !== undefined)
@@ -168,6 +250,14 @@ function warnIfSystemMismatch(args) {
     exports.logger.warn(`[gambit] chatCompletionsWithDeck: request includes a system message that does not match the deck prompt (${args.deckPath})`);
 }
 function toolResultContent(result) {
+    if (result && typeof result === "object" &&
+        "legacyResult" in result &&
+        "output" in result) {
+        const text = (0, gambit_core_1.stringifyResponseOutput)(result.output);
+        if (text)
+            return text;
+        return toolResultContent(result.legacyResult);
+    }
     if (typeof result === "string")
         return result;
     try {
@@ -240,15 +330,25 @@ async function chatCompletionsWithDeck(args) {
             (() => {
                 throw new Error("No model provided");
             })();
-        const result = await args.modelProvider.chat({
-            model,
-            messages,
-            tools: tools.length ? tools : undefined,
-            stream: Boolean(args.request.stream),
+        const response = await args.modelProvider.responses({
+            request: {
+                model,
+                input: responseItemsFromMessages(messages),
+                tools: tools.length ? tools : undefined,
+                stream: Boolean(args.request.stream),
+                params: providerParamsFromRequest(args.request),
+            },
             deckPath: deck.path,
-            onStreamText: args.onStreamText,
-            params: providerParamsFromRequest(args.request),
+            onStreamEvent: (event) => {
+                if (event.type === "response.output_text.delta") {
+                    args.onStreamText?.(event.delta);
+                }
+            },
         });
+        const result = {
+            ...responseOutputToChatResult(response.output),
+            usage: response.usage,
+        };
         messages.push(result.message);
         if (result.toolCalls && result.toolCalls.length > 0) {
             const gambitCalls = result.toolCalls.filter((c) => gambit.toolNameSet.has(c.name));
@@ -296,7 +396,7 @@ async function chatCompletionsWithDeck(args) {
                         type: "openai_compat.action.permissions",
                         permissions: actionPermissions.trace,
                     });
-                    const childResult = await (0, gambit_core_1.runDeck)({
+                    const childResult = await (0, gambit_core_1.runDeckResponses)({
                         path: actionPath,
                         input: call.args,
                         modelProvider: args.modelProvider,

package/script/src/providers/claude_code.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"claude_code.d.ts","sourceRoot":"","sources":["../../../src/src/providers/claude_code.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAIV,YAAY,EACZ,aAAa,EAKb,UAAU,EACX,MAAM,2BAA2B,CAAC;AAEnC,eAAO,MAAM,kBAAkB,qBAAqB,CAAC;AACrD,eAAO,MAAM,iBAAiB,oBAAoB,CAAC;AAMnD,KAAK,aAAa,GAAG;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,UAAU,CAAC;IACnB,MAAM,EAAE,UAAU,CAAC;CACpB,CAAC;AAEF,KAAK,aAAa,GAAG,CAAC,KAAK,EAAE;IAC3B,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACvC,KAAK,OAAO,CAAC,aAAa,CAAC,CAAC;AA2gB7B,wBAAgB,wBAAwB,CAAC,IAAI,CAAC,EAAE;IAC9C,UAAU,CAAC,EAAE,aAAa,CAAC;CAC5B,GAAG,aAAa,CA4MhB;AAED,wBAAgB,0BAA0B,CAAC,KAAK,EAAE;IAChD,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,QAAQ,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;CAC/B,GAAG,KAAK,CAAC,MAAM,CAAC,CA2BhB;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,GAAG;IAC5D,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE;QACN,YAAY,EAAE,MAAM,CAAC;QACrB,gBAAgB,EAAE,MAAM,CAAC;QACzB,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;CACH,CAEA"}
+{"version":3,"file":"claude_code.d.ts","sourceRoot":"","sources":["../../../src/src/providers/claude_code.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAIV,YAAY,EACZ,aAAa,EAKb,UAAU,EACX,MAAM,2BAA2B,CAAC;AAGnC,eAAO,MAAM,kBAAkB,qBAAqB,CAAC;AACrD,eAAO,MAAM,iBAAiB,oBAAoB,CAAC;AAMnD,KAAK,aAAa,GAAG;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,UAAU,CAAC;IACnB,MAAM,EAAE,UAAU,CAAC;CACpB,CAAC;AAEF,KAAK,aAAa,GAAG,CAAC,KAAK,EAAE;IAC3B,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACvC,KAAK,OAAO,CAAC,aAAa,CAAC,CAAC;AA2gB7B,wBAAgB,wBAAwB,CAAC,IAAI,CAAC,EAAE;IAC9C,UAAU,CAAC,EAAE,aAAa,CAAC;CAC5B,GAAG,aAAa,CAkOhB;AAED,wBAAgB,0BAA0B,CAAC,KAAK,EAAE;IAChD,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,QAAQ,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;CAC/B,GAAG,KAAK,CAAC,MAAM,CAAC,CA2BhB;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,GAAG;IAC5D,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE;QACN,YAAY,EAAE,MAAM,CAAC;QACrB,gBAAgB,EAAE,MAAM,CAAC;QACzB,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;CACH,CAEA"}

package/script/src/providers/claude_code.js

@@ -38,6 +38,7 @@ exports.createClaudeCodeProvider = createClaudeCodeProvider;
 exports.parseClaudeCodeArgsForTest = parseClaudeCodeArgsForTest;
 exports.parseClaudeCodeStdoutForTest = parseClaudeCodeStdoutForTest;
 const dntShim = __importStar(require("../../_dnt.shims.js"));
+const gambit_core_1 = require("@bolt-foundry/gambit-core");
 exports.CLAUDE_CODE_PREFIX = "claude-code-cli/";
 exports.CLAUDE_CODE_ALIAS = "claude-code-cli";
 const CLAUDE_CODE_BIN_ENV = "GAMBIT_CLAUDE_CODE_BIN";
@@ -139,7 +140,7 @@ function extractAssistantTextFromClaudeMessage(message) {
                 parts.push(text);
         }
     }
-    return parts.join("").trim();
+    return (0, gambit_core_1.joinTextParts)(parts).trim();
 }
 function extractBestText(input) {
     if (typeof input === "string" && input.trim())
@@ -467,7 +468,7 @@ function responseItemsToChatMessages(items, instructions) {
     }
     for (const item of items) {
         if (item.type === "message") {
-            const content = item.content.map((part) => part.text).join("");
+            const content = (0, gambit_core_1.joinTextParts)(item.content.map((part) => part.text));
             messages.push({ role: item.role, content });
             continue;
         }
@@ -699,7 +700,6 @@ function createClaudeCodeProvider(opts) {
             }
             return response;
         },
-        chat: runChat,
     };
 }
 function parseClaudeCodeArgsForTest(input) {

package/script/src/providers/codex.d.ts

@@ -1,4 +1,4 @@
-import type { JSONValue, ModelMessage, ModelProvider, ResponseItem, SavedState } from "@bolt-foundry/gambit-core";
+import type { JSONValue, ModelMessage, ModelProvider, ResponseItem, SavedState, ToolDefinition } from "@bolt-foundry/gambit-core";
 import type { CodexChatgptAuthTokens } from "../codex_auth.js";
 export declare const CODEX_PREFIX = "codex-cli/";
 type CodexAssistantMessage = {
@@ -8,6 +8,7 @@ type CodexAssistantMessage = {
 type AppServerTurnRunnerInput = {
     model: string;
     messages: Array<ModelMessage>;
+    tools?: Array<ToolDefinition>;
     state?: SavedState;
     params?: Record<string, unknown>;
     deckPath?: string;
@@ -56,6 +57,16 @@ export declare function codexConfigArgsForTest(input: {
     instructions?: string;
 }): Array<string>;
 export declare function safeJsonForTest(text: string): Record<string, JSONValue>;
+export declare function appServerRequestResultForTest(input: {
+    method: string;
+    params: Record<string, unknown>;
+}): Promise<{
+    result?: Record<string, JSONValue>;
+    error?: {
+        code: number;
+        message: string;
+    };
+}>;
 export declare function sanitizeCodexSpawnArgsForTest(args: Array<string>): Array<string>;
 export declare function extractCodexConfigValuesForTest(args: Array<string>, flag: string, prefix?: string): Array<string>;
 export {};

package/script/src/providers/codex.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../../src/src/providers/codex.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../../src/src/providers/codex.ts"],"names":[],"mappings":"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"}

package/script/src/providers/codex.js

@@ -41,6 +41,7 @@ exports.codexInstructionsForMessagesForTest = codexInstructionsForMessagesForTes
 exports.promptForCodexTurnForTest = promptForCodexTurnForTest;
 exports.codexConfigArgsForTest = codexConfigArgsForTest;
 exports.safeJsonForTest = safeJsonForTest;
+exports.appServerRequestResultForTest = appServerRequestResultForTest;
 exports.sanitizeCodexSpawnArgsForTest = sanitizeCodexSpawnArgsForTest;
 exports.extractCodexConfigValuesForTest = extractCodexConfigValuesForTest;
 const dntShim = __importStar(require("../../_dnt.shims.js"));
@@ -58,13 +59,14 @@ const CODEX_REASONING_SUMMARY_ENV = "GAMBIT_CODEX_REASONING_SUMMARY";
 const CODEX_VERBOSITY_ENV = "GAMBIT_CODEX_VERBOSITY";
 const CODEX_BIN_ENV = "GAMBIT_CODEX_BIN";
 const CODEX_SKIP_SANDBOX_CONFIG_ENV = "GAMBIT_CODEX_SKIP_SANDBOX_CONFIG";
+const CODEX_DISABLE_WEBSOCKETS_ENV = "GAMBIT_CODEX_DISABLE_WEBSOCKETS";
 const CODEX_DANGEROUS_BYPASS_ENV = "GAMBIT_CODEX_DANGEROUSLY_BYPASS_APPROVALS_AND_SANDBOX";
 const MCP_DENO_BIN_ENV = "GAMBIT_MCP_DENO_BIN";
 const MCP_ROOT_DECK_PATH_ENV = "GAMBIT_MCP_ROOT_DECK_PATH";
 const EXTERNAL_TOOL_BRIDGE_ENV = "GAMBIT_EXTERNAL_TOOL_BRIDGE";
 const MCP_DEBUG_LOG_PATH_ENV = "GAMBIT_MCP_DEBUG_LOG_PATH";
 const DENO_DIR_ENV = "DENO_DIR";
-const DEBUG_MCP_ENV = "BOLT_FOUNDRY_DESKTOP_CHIEF_RUNTIME_DEBUG_MCP";
+const DEBUG_MCP_ENV = "GAMBIT_MCP_DEBUG";
 const MCP_SERVER_PATH = (() => {
     try {
         const moduleUrl = new URL(globalThis[Symbol.for("import-meta-ponyfill-commonjs")](require, module).url);
@@ -158,13 +160,24 @@ function shouldDebugMcpBridge() {
     const raw = dntShim.Deno.env.get(DEBUG_MCP_ENV)?.trim().toLowerCase();
     return raw === "1" || raw === "true" || raw === "yes";
 }
+function isCodexNativeOrGambitBuiltinTool(name) {
+    return new Set([
+        "apply_patch",
+        "exec",
+        "gambit_consume_async_action",
+        "gambit_emit_output_item",
+        "grep_files",
+        "list_dir",
+        "read_file",
+    ]).has(name);
+}
 function logCodexMcpDebug(event, details) {
     if (!shouldDebugMcpBridge())
         return;
     globalThis.console.error("[gambit-codex-mcp]", event, details ?? {});
 }
 function codexMcpDebugLogPath(cwd) {
-    return path.join(cwd, ".boltfoundry", "runtime", "chief-runtime", "gambit-mcp-debug.log");
+    return path.join(cwd, ".workloop", "runtime", "chief-runtime", "gambit-mcp-debug.log");
 }
 function mcpServerDenoBin() {
     return dntShim.Deno.env.get(MCP_DENO_BIN_ENV)?.trim() || "deno";
@@ -202,6 +215,14 @@ function shouldSkipCodexSandboxConfig(params) {
     const envRaw = dntShim.Deno.env.get(CODEX_SKIP_SANDBOX_CONFIG_ENV);
     return Boolean(envRaw && parseTruthy(envRaw));
 }
+function shouldDisableCodexWebsockets() {
+    // Newer Codex releases reserve built-in provider IDs, so overriding
+    // `model_providers.openai.supports_websockets` now prevents app-server
+    // startup. Keep the env var harmless while the old transport workaround ages
+    // out.
+    dntShim.Deno.env.get(CODEX_DISABLE_WEBSOCKETS_ENV);
+    return false;
+}
 function tomlString(value) {
     return `"${value.replaceAll("\\", "\\\\").replaceAll('"', '\\"')}"`;
 }
@@ -289,6 +310,9 @@ function codexAdditionalConfigArgs(params) {
 function codexConfigArgs(input) {
     const args = [];
     args.push(...codexAdditionalConfigArgs(input.params));
+    if (shouldDisableCodexWebsockets()) {
+        args.push("-c", "model_providers.openai.supports_websockets=false");
+    }
     args.push("-c", `approval_policy=${tomlString("never")}`);
     const pathEnv = dntShim.Deno.env.get("PATH")?.trim();
     if (pathEnv) {
@@ -397,7 +421,15 @@ async function prepareCodexMcpRootDeck(input) {
         return {};
     }
     const deck = await (0, gambit_core_1.loadDeck)(rootDeckPath);
-    if (deck.actionDecks.length === 0) {
+    const deckActionNames = new Set(deck.actionDecks.map((action) => action.name));
+    const deckToolNames = new Set(deck.tools.map((tool) => tool.name));
+    const extraExternalTools = (input.tools ?? [])
+        .map((tool) => tool.function)
+        .filter((tool) => tool &&
+        !isCodexNativeOrGambitBuiltinTool(tool.name) &&
+        !deckActionNames.has(tool.name) &&
+        !deckToolNames.has(tool.name));
+    if (deck.actionDecks.length === 0 && extraExternalTools.length === 0) {
         logCodexMcpDebug("prepareRootDeck:reuseOriginal", {
             actionCount: 0,
             deckPath: rootDeckPath,
@@ -431,15 +463,28 @@ async function prepareCodexMcpRootDeck(input) {
         }
         frontmatter.push("");
     }
+    for (const externalTool of extraExternalTools) {
+        frontmatter.push("[[tools]]");
+        frontmatter.push(`name = ${tomlString(externalTool.name)}`);
+        if (typeof externalTool.description === "string" &&
+            externalTool.description.trim()) {
+            frontmatter.push(`description = ${tomlString(externalTool.description.trim())}`);
+        }
+        frontmatter.push("");
+    }
     frontmatter.push("+++", "", "Codex MCP tool surface.");
     await dntShim.Deno.writeTextFile(tempDeckPath, frontmatter.join("\n"));
     logCodexMcpDebug("prepareRootDeck:synthesized", {
         actionCount: deck.actionDecks.length,
         actionNames: deck.actionDecks.map((action) => action.name),
+        extraToolNames: extraExternalTools.map((tool) => tool.name),
         rootDeckPath,
         synthesizedDeckPath: tempDeckPath,
-        toolCount: deck.tools.length,
-        toolNames: deck.tools.map((tool) => tool.name),
+        toolCount: deck.tools.length + extraExternalTools.length,
+        toolNames: [
+            ...deck.tools.map((tool) => tool.name),
+            ...extraExternalTools.map((tool) => tool.name),
+        ],
     });
     return {
         deckPath: tempDeckPath,
@@ -488,14 +533,22 @@ async function appServerRequestResult(input) {
     }
     if (input.method === "account/chatgptAuthTokens/refresh") {
         const bridge = requireCodexHostAuthBridge();
-        const refreshed = await bridge.refreshAuthTokens({
-            previousAccountId: typeof input.params.previousAccountId === "string"
-                ? input.params.previousAccountId
-                : null,
-            reason: typeof input.params.reason === "string" && input.params.reason
-                ? input.params.reason
-                : "account/chatgptAuthTokens/refresh",
-        });
+        let refreshed;
+        try {
+            refreshed = await bridge.refreshAuthTokens({
+                previousAccountId: typeof input.params.previousAccountId === "string"
+                    ? input.params.previousAccountId
+                    : null,
+                reason: typeof input.params.reason === "string" && input.params.reason
+                    ? input.params.reason
+                    : "account/chatgptAuthTokens/refresh",
+            });
+        }
+        catch (error) {
+            return {
+                error: appServerHostRequestFailure(error),
+            };
+        }
         return {
             result: {
                 accessToken: refreshed.accessToken,
@@ -512,6 +565,14 @@ async function appServerRequestResult(input) {
         },
     };
 }
+function appServerHostRequestFailure(error) {
+    return {
+        code: -32000,
+        message: error instanceof Error && error.message
+            ? error.message
+            : String(error),
+    };
+}
 async function bootstrapCodexExternalAuth(input) {
     if (!codexHostAuthBridge) {
         return;
@@ -994,7 +1055,15 @@ async function defaultAppServerTurnRunner(input) {
                             method,
                             params: safeJsonObjectFromRecord(params),
                         });
-                        const response = await appServerRequestResult({ method, params });
+                        let response;
+                        try {
+                            response = await appServerRequestResult({ method, params });
+                        }
+                        catch (error) {
+                            response = {
+                                error: appServerHostRequestFailure(error),
+                            };
+                        }
                         (0, codex_app_server_debug_js_1.logCodexAppServerDebug)("message:host_response", {
                             method,
                             requestId,
@@ -1395,7 +1464,7 @@ function extractTextParts(value) {
 function extractCodexItemText(record) {
     return typeof record.text === "string"
         ? record.text
-        : extractTextParts(record.content).join("");
+        : (0, gambit_core_1.joinTextParts)(extractTextParts(record.content));
 }
 function requireCodexAssistantItemId(input) {
     const itemId = typeof input.record.id === "string"
@@ -1504,7 +1573,7 @@ function emitCodexReasoningEvents(input) {
     if (payloadType === "item.delta") {
         const deltaText = typeof record.text === "string"
             ? record.text
-            : extractTextParts(record.content).join("");
+            : (0, gambit_core_1.joinTextParts)(extractTextParts(record.content));
         if (deltaText) {
             input.emit({
                 type: "response.reasoning.delta",
@@ -1518,7 +1587,7 @@ function emitCodexReasoningEvents(input) {
     if (payloadType === "item.completed" || payloadType === "item.done") {
         const doneText = typeof record.text === "string"
             ? record.text
-            : extractTextParts(record.content).join("");
+            : (0, gambit_core_1.joinTextParts)(extractTextParts(record.content));
         input.emit({
             type: "response.reasoning.done",
             output_index: outputIndex,
@@ -1612,7 +1681,7 @@ function responseItemsToChatMessages(items, instructions) {
     }
     for (const item of items) {
         if (item.type === "message") {
-            const content = item.content.map((part) => part.text).join("");
+            const content = (0, gambit_core_1.joinTextParts)(item.content.map((part) => part.text));
             messages.push({ role: item.role, content });
             continue;
         }
@@ -1900,11 +1969,13 @@ function createCodexProvider(opts) {
         const cwd = codexRunCwd({ deckPath: input.deckPath });
         const preparedMcpRoot = await prepareCodexMcpRootDeck({
             deckPath: input.deckPath,
+            tools: input.tools,
         });
         try {
             const result = await runAppServerTurn({
                 model: input.model,
                 messages: input.messages,
+                tools: input.tools,
                 state: input.state,
                 params: input.params,
                 deckPath: preparedMcpRoot.deckPath ?? input.deckPath,
@@ -1916,7 +1987,7 @@ function createCodexProvider(opts) {
                 cwd,
                 priorThreadId,
             });
-            const assistantText = result.assistantMessages.map((message) => message.text).join("");
+            const assistantText = (0, gambit_core_1.joinTextParts)(result.assistantMessages.map((message) => message.text));
             if (input.stream && input.onStreamText && assistantText &&
                 !assistantState.sawAssistantTextStream) {
                 input.onStreamText(assistantText);
@@ -1941,15 +2012,6 @@ function createCodexProvider(opts) {
             await preparedMcpRoot.cleanup?.();
         }
     };
-    const runChat = async (input) => {
-        const result = await runCodexTurn(input);
-        return {
-            message: result.message,
-            finishReason: result.finishReason,
-            updatedState: result.updatedState,
-            usage: result.usage,
-        };
-    };
     return {
         async responses(input) {
             const streamHandler = input.onStreamEvent
@@ -1982,6 +2044,7 @@ function createCodexProvider(opts) {
             const result = await runCodexTurn({
                 model: input.request.model,
                 messages: responseItemsToChatMessages(input.request.input, input.request.instructions),
+                tools: input.request.tools,
                 stream: input.request.stream,
                 params: input.request.params,
                 state: input.state,
@@ -2097,7 +2160,6 @@ function createCodexProvider(opts) {
             }
             return response;
         },
-        chat: runChat,
     };
 }
 function normalizeCodexModelForTest(model) {
@@ -2115,6 +2177,9 @@ function codexConfigArgsForTest(input) {
 function safeJsonForTest(text) {
     return safeJsonObject(text);
 }
+async function appServerRequestResultForTest(input) {
+    return await appServerRequestResult(input);
+}
 function sanitizeCodexSpawnArgsForTest(args) {
     return sanitizeCodexSpawnArgsForDebug(args);
 }

package/script/src/providers/google.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"google.d.ts","sourceRoot":"","sources":["../../../src/src/providers/google.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAIV,aAAa,EAId,MAAM,2BAA2B,CAAC;AAEnC,eAAO,MAAM,aAAa,YAAY,CAAC;AAIvC,KAAK,YAAY,GAAG;IAClB,IAAI,EAAE;QACJ,WAAW,EAAE;YACX,MAAM,EAAE,CACN,MAAM,EAAE,OAAO,EACf,OAAO,CAAC,EAAE;gBAAE,MAAM,CAAC,EAAE,WAAW,CAAA;aAAE,KAC/B,OAAO,CAAC,OAAO,CAAC,CAAC;SACvB,CAAC;KACH,CAAC;CACH,CAAC;AA8IF,wBAAgB,oBAAoB,CAAC,IAAI,EAAE;IACzC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,YAAY,CAAC;CACvB,GAAG,aAAa,CA6XhB"}
+{"version":3,"file":"google.d.ts","sourceRoot":"","sources":["../../../src/src/providers/google.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAIV,aAAa,EAId,MAAM,2BAA2B,CAAC;AAGnC,eAAO,MAAM,aAAa,YAAY,CAAC;AAIvC,KAAK,YAAY,GAAG;IAClB,IAAI,EAAE;QACJ,WAAW,EAAE;YACX,MAAM,EAAE,CACN,MAAM,EAAE,OAAO,EACf,OAAO,CAAC,EAAE;gBAAE,MAAM,CAAC,EAAE,WAAW,CAAA;aAAE,KAC/B,OAAO,CAAC,OAAO,CAAC,CAAC;SACvB,CAAC;KACH,CAAC;CACH,CAAC;AA8IF,wBAAgB,oBAAoB,CAAC,IAAI,EAAE;IACzC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,YAAY,CAAC;CACvB,GAAG,aAAa,CA+OhB"}