tina4-nodejs 3.13.113 → 3.13.115

package/CLAUDE.md

@@ -13,13 +13,13 @@ Even if the skill text is not currently loaded, these are non-negotiable:
 
 The full discipline lives in `.claude/skills/tina4-maintainer/SKILL.md`; this block is the always-on floor.
 
-# CLAUDE.md - AI Developer Guide for tina4-nodejs (v3.13.113)
+# CLAUDE.md - AI Developer Guide for tina4-nodejs (v3.13.115)
 
 > This file helps AI assistants (Claude, Copilot, Cursor, etc.) understand and work on this codebase effectively.
 
 ## What This Project Is
 
-Tina4 for Node.js/TypeScript v3.13.113 - The Intelligent Native Application 4ramework. A convention-over-configuration structural paradigm. The developer writes TypeScript; Tina4 is invisible infrastructure.
+Tina4 for Node.js/TypeScript v3.13.115 - The Intelligent Native Application 4ramework. A convention-over-configuration structural paradigm. The developer writes TypeScript; Tina4 is invisible infrastructure.
 
 The philosophy: zero ceremony, batteries included, file system as source of truth.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tina4-nodejs",
-  "version": "3.13.113",
+  "version": "3.13.115",
   "type": "module",
   "description": "Tina4 for Node.js/TypeScript - native TypeScript conventions and shared Tina4 contracts",
   "keywords": [

package/packages/cli/dist/bin.js

@@ -36727,18 +36727,24 @@ async function runGlobalMiddlewarePass(middleware, req2, res) {
   if (!res.raw.writableEnded) res.raw.end();
   return true;
 }
-async function invokeRouteHandler(match, req2, res) {
-  const routeParams = req2.params || {};
-  const fnStr = match.handler.toString();
+function resolveHandlerArgs(handler, req2, res, routeParams) {
+  const fnStr = handler.toString();
   const argMatch = fnStr.match(/^(?:async\s*)?(?:function\s*\w*)?\s*\(([^)]*)\)/);
   const argNames = argMatch?.[1]?.split(",").map((a) => a.trim().replace(/[:=].*/, "")) ?? [];
   const filteredArgs = argNames.filter((n) => n.length > 0);
-  if (filteredArgs.length === 0) return await match.handler();
-  const args = filteredArgs.map((name) => {
+  if (filteredArgs.length === 0) return [];
+  let unmatchedPos = 0;
+  return filteredArgs.map((name) => {
     if (name in routeParams) return routeParams[name];
     if (name === "request" || name === "req") return req2;
-    return res;
+    if (name === "response" || name === "res") return res;
+    return unmatchedPos++ === 0 ? req2 : res;
   });
+}
+async function invokeRouteHandler(match, req2, res) {
+  const routeParams = req2.params || {};
+  const args = resolveHandlerArgs(match.handler, req2, res, routeParams);
+  if (args.length === 0) return await match.handler();
   return await match.handler(...args);
 }
 async function renderIfTemplateRoute(match, res, result) {
@@ -42043,6 +42049,8 @@ var init_aiClient = __esm({
     Ai = class {
       static chat(messages, options = {}) {
         this.validateMessages(messages);
+        if (options.tools !== void 0) this.validateTools(options.tools);
+        if (options.toolChoice !== void 0) this.validateToolChoice(options.toolChoice);
         const config = this.config("chat", options);
         const body = this.chatBody(config, messages, options);
         const headers = this.headers(config);
@@ -42072,15 +42080,31 @@ var init_aiClient = __esm({
       }
       /**
        * Validate role + content shape. Content may be a string OR a non-empty
-       * list of {type:'text'|'image', ...} parts (ADR-0060). Malformed parts
-       * fail fast with AiConfigError, never reaching the wire.
+       * list of {type:'text'|'image'|'tool_result', ...} parts (ADR-0060 +
+       * ADR-0061). The `tool` role is the OpenAI-style tool-result turn
+       * (ADR-0061). Malformed parts fail fast with AiConfigError, never
+       * reaching the wire.
        */
       static validateMessages(messages) {
         if (!Array.isArray(messages) || messages.length === 0) {
           throw new AiConfigError("AI messages must contain supported roles and string content");
         }
-        for (const message of messages) {
-          if (!message || !["system", "user", "assistant"].includes(message.role)) {
+        for (const raw of messages) {
+          if (!raw || typeof raw !== "object" || Array.isArray(raw)) {
+            throw new AiConfigError("AI messages must contain supported roles and string content");
+          }
+          const message = raw;
+          const role = message.role;
+          if (role === "tool") {
+            if (typeof message.tool_call_id !== "string" || message.tool_call_id.length === 0) {
+              throw new AiConfigError("AI tool message requires a non-empty string 'tool_call_id'");
+            }
+            if (typeof message.content !== "string") {
+              throw new AiConfigError("AI tool message requires a string 'content'");
+            }
+            continue;
+          }
+          if (role !== "system" && role !== "user" && role !== "assistant") {
             throw new AiConfigError("AI messages must contain supported roles and string content");
           }
           this.validateContent(message.content);
@@ -42111,11 +42135,64 @@ var init_aiClient = __esm({
             if (record.source.startsWith("data:") && !/^data:[^;,\s]+;base64,[A-Za-z0-9+/=]+$/.test(record.source)) {
               throw new AiConfigError("AI image data URI must be data:<media_type>;base64,<payload>");
             }
+          } else if (partType === "tool_result") {
+            if (typeof record.tool_use_id !== "string" || record.tool_use_id.length === 0) {
+              throw new AiConfigError("AI tool_result part requires a non-empty string 'tool_use_id'");
+            }
+            if (typeof record.content !== "string") {
+              throw new AiConfigError("AI tool_result part requires a string 'content'");
+            }
           } else {
             throw new AiConfigError(`AI content part has unknown type '${String(partType)}'`);
           }
         }
       }
+      /**
+       * Validate the outbound tool declarations (ADR-0061). Each tool needs a
+       * non-empty `name`, a string `description`, and a JSON-Schema-shaped
+       * `parameters` object. Malformed tools fail fast with AiConfigError,
+       * never reaching the wire.
+       */
+      static validateTools(tools) {
+        if (!Array.isArray(tools) || tools.length === 0) {
+          throw new AiConfigError("AI tools must be a non-empty list of {name, description, parameters}");
+        }
+        for (const tool of tools) {
+          if (!tool || typeof tool !== "object" || Array.isArray(tool)) {
+            throw new AiConfigError("AI tool must be an object with name, description, parameters");
+          }
+          const record = tool;
+          if (typeof record.name !== "string" || record.name.length === 0) {
+            throw new AiConfigError("AI tool requires a non-empty string 'name'");
+          }
+          if (typeof record.description !== "string") {
+            throw new AiConfigError("AI tool requires a string 'description'");
+          }
+          if (!record.parameters || typeof record.parameters !== "object" || Array.isArray(record.parameters)) {
+            throw new AiConfigError("AI tool requires a JSON-Schema object 'parameters'");
+          }
+        }
+      }
+      /**
+       * Validate the outbound tool_choice value (ADR-0061). The four accepted
+       * shapes are 'auto', 'none', 'required', and {name: 'x'}.
+       */
+      static validateToolChoice(choice) {
+        if (typeof choice === "string") {
+          if (choice !== "auto" && choice !== "none" && choice !== "required") {
+            throw new AiConfigError("AI toolChoice string must be 'auto', 'none', or 'required'");
+          }
+          return;
+        }
+        if (choice && typeof choice === "object" && !Array.isArray(choice)) {
+          const record = choice;
+          if (typeof record.name !== "string" || record.name.length === 0) {
+            throw new AiConfigError("AI toolChoice object requires a non-empty string 'name'");
+          }
+          return;
+        }
+        throw new AiConfigError("AI toolChoice must be 'auto'|'none'|'required' or {name: string}");
+      }
       static number(name, fallback, minimum) {
         const value = process.env[name] === void 0 ? fallback : Number(process.env[name]);
         if (!Number.isFinite(value) || value < minimum) throw new AiConfigError(`${name} must be numeric and at least ${minimum}`);
@@ -42164,25 +42241,100 @@ var init_aiClient = __esm({
       }
       /**
        * Build the provider-specific request body from a Tina4-shaped message
-       * list. Multimodal parts are translated per provider (ADR-0060):
-       *   - OpenAI/local: {type:'image_url', image_url:{url}}
-       *   - Anthropic:    {type:'image', source:{type:'base64'|'url', ...}}
+       * list plus optional tool declarations (ADR-0060 + ADR-0061).
+       *
+       * Content parts translate per provider:
+       *   - OpenAI/local: image → {type:'image_url', image_url:{url}}
+       *   - Anthropic:    image → {type:'image', source:{type:'base64'|'url', ...}}
        * String content is preserved verbatim in the OpenAI/local shape and
        * likewise for Anthropic (both accept a bare string).
+       *
+       * Tool-result turns are normalised to the current provider's expected
+       * shape (either the OpenAI `{role:"tool", tool_call_id, content}` turn or
+       * the Anthropic `{role:"user", content:[{type:"tool_result", ...}]}`
+       * turn), so an agent-loop written against Tina4 never has to fork on
+       * TINA4_AI_PROVIDER (ADR-0061 wire translation).
        */
       static chatBody(config, messages, options) {
-        const translate = (list) => list.map((message) => ({ role: message.role, content: this.translateContent(message.content, config.provider) }));
-        const body = { model: config.model, messages: translate(messages), stream: options.stream ?? false };
+        const normalized = this.normalizeMessagesForProvider(messages, config.provider);
+        const body = { model: config.model, messages: normalized, stream: options.stream ?? false };
         if (options.temperature !== void 0) body.temperature = options.temperature;
         if (options.maxTokens !== void 0) body.max_tokens = options.maxTokens;
         if (config.provider === "anthropic") {
-          const systemParts = messages.filter((message) => message.role === "system").map((message) => typeof message.content === "string" ? message.content : this.contentToPlainText(message.content));
-          body.messages = translate(messages.filter((message) => message.role !== "system"));
+          const systemParts = [];
+          for (const message of messages) {
+            if (message.role !== "system") continue;
+            const content = message.content;
+            systemParts.push(typeof content === "string" ? content : this.contentToPlainText(content));
+          }
+          body.messages = normalized.filter((message) => message.role !== "system");
           body.max_tokens = options.maxTokens ?? 1024;
           if (systemParts.length) body.system = systemParts.join("\n\n");
         }
+        this.applyTools(body, config.provider, options);
         return body;
       }
+      /**
+       * Normalise the Tina4-shaped messages into the provider's on-wire shape.
+       * The `tool` role and the `tool_result` content part are translated
+       * between the OpenAI and Anthropic forms so either input works against
+       * either provider (ADR-0061 return-path table).
+       */
+      static normalizeMessagesForProvider(messages, provider) {
+        const out = [];
+        for (const message of messages) {
+          if (message.role === "tool") {
+            if (provider === "anthropic") {
+              out.push({
+                role: "user",
+                content: [{ type: "tool_result", tool_use_id: message.tool_call_id, content: message.content }]
+              });
+            } else {
+              out.push({ role: "tool", tool_call_id: message.tool_call_id, content: message.content });
+            }
+            continue;
+          }
+          if (Array.isArray(message.content) && message.content.some((part) => part.type === "tool_result")) {
+            if (provider === "anthropic") {
+              out.push({ role: message.role, content: this.translateContent(message.content, provider) });
+            } else {
+              for (const part of message.content) {
+                if (part.type === "tool_result") {
+                  out.push({ role: "tool", tool_call_id: part.tool_use_id, content: part.content });
+                }
+              }
+            }
+            continue;
+          }
+          out.push({ role: message.role, content: this.translateContent(message.content, provider) });
+        }
+        return out;
+      }
+      /**
+       * Attach the outbound `tools` and `tool_choice` (ADR-0061 outbound
+       * translation tables) to the body in place. When toolChoice is 'none'
+       * on Anthropic (Anthropic has no "none" mode) the tools list is omitted
+       * entirely — the model cannot call what it cannot see.
+       */
+      static applyTools(body, provider, options) {
+        const choice = options.toolChoice;
+        const suppressToolsForAnthropic = provider === "anthropic" && choice === "none";
+        if (options.tools !== void 0 && !suppressToolsForAnthropic) {
+          body.tools = options.tools.map(
+            (tool) => provider === "anthropic" ? { name: tool.name, description: tool.description, input_schema: tool.parameters } : { type: "function", function: { name: tool.name, description: tool.description, parameters: tool.parameters } }
+          );
+        }
+        if (choice === void 0) return;
+        if (provider === "anthropic") {
+          if (choice === "none") return;
+          if (choice === "auto") body.tool_choice = { type: "auto" };
+          else if (choice === "required") body.tool_choice = { type: "any" };
+          else body.tool_choice = { type: "tool", name: choice.name };
+        } else {
+          if (typeof choice === "string") body.tool_choice = choice;
+          else body.tool_choice = { type: "function", function: { name: choice.name } };
+        }
+      }
       /**
        * Translate one message content value into the provider's on-wire shape.
        * A plain string is passed through (both providers accept a string
@@ -42193,6 +42345,7 @@ var init_aiClient = __esm({
         if (provider === "anthropic") {
           return content.map((part) => {
             if (part.type === "text") return { type: "text", text: part.text };
+            if (part.type === "tool_result") return { type: "tool_result", tool_use_id: part.tool_use_id, content: part.content };
             if (part.source.startsWith("data:")) {
               const parsed = this.parseDataUri(part.source);
               return { type: "image", source: { type: "base64", media_type: parsed.mediaType, data: parsed.data } };
@@ -42202,6 +42355,9 @@ var init_aiClient = __esm({
         }
         return content.map((part) => {
           if (part.type === "text") return { type: "text", text: part.text };
+          if (part.type === "tool_result") {
+            return { type: "text", text: part.content };
+          }
           return { type: "image_url", image_url: { url: part.source } };
         });
       }

package/packages/core/dist/index.js

@@ -36706,18 +36706,24 @@ async function runGlobalMiddlewarePass(middleware, req2, res) {
   if (!res.raw.writableEnded) res.raw.end();
   return true;
 }
-async function invokeRouteHandler(match, req2, res) {
-  const routeParams = req2.params || {};
-  const fnStr = match.handler.toString();
+function resolveHandlerArgs(handler, req2, res, routeParams) {
+  const fnStr = handler.toString();
   const argMatch = fnStr.match(/^(?:async\s*)?(?:function\s*\w*)?\s*\(([^)]*)\)/);
   const argNames = argMatch?.[1]?.split(",").map((a) => a.trim().replace(/[:=].*/, "")) ?? [];
   const filteredArgs = argNames.filter((n) => n.length > 0);
-  if (filteredArgs.length === 0) return await match.handler();
-  const args = filteredArgs.map((name) => {
+  if (filteredArgs.length === 0) return [];
+  let unmatchedPos = 0;
+  return filteredArgs.map((name) => {
     if (name in routeParams) return routeParams[name];
     if (name === "request" || name === "req") return req2;
-    return res;
+    if (name === "response" || name === "res") return res;
+    return unmatchedPos++ === 0 ? req2 : res;
   });
+}
+async function invokeRouteHandler(match, req2, res) {
+  const routeParams = req2.params || {};
+  const args = resolveHandlerArgs(match.handler, req2, res, routeParams);
+  if (args.length === 0) return await match.handler();
   return await match.handler(...args);
 }
 async function renderIfTemplateRoute(match, res, result) {
@@ -42004,6 +42010,8 @@ var init_aiClient = __esm({
     Ai = class {
       static chat(messages, options = {}) {
         this.validateMessages(messages);
+        if (options.tools !== void 0) this.validateTools(options.tools);
+        if (options.toolChoice !== void 0) this.validateToolChoice(options.toolChoice);
         const config = this.config("chat", options);
         const body = this.chatBody(config, messages, options);
         const headers = this.headers(config);
@@ -42033,15 +42041,31 @@ var init_aiClient = __esm({
       }
       /**
        * Validate role + content shape. Content may be a string OR a non-empty
-       * list of {type:'text'|'image', ...} parts (ADR-0060). Malformed parts
-       * fail fast with AiConfigError, never reaching the wire.
+       * list of {type:'text'|'image'|'tool_result', ...} parts (ADR-0060 +
+       * ADR-0061). The `tool` role is the OpenAI-style tool-result turn
+       * (ADR-0061). Malformed parts fail fast with AiConfigError, never
+       * reaching the wire.
        */
       static validateMessages(messages) {
         if (!Array.isArray(messages) || messages.length === 0) {
           throw new AiConfigError("AI messages must contain supported roles and string content");
         }
-        for (const message of messages) {
-          if (!message || !["system", "user", "assistant"].includes(message.role)) {
+        for (const raw of messages) {
+          if (!raw || typeof raw !== "object" || Array.isArray(raw)) {
+            throw new AiConfigError("AI messages must contain supported roles and string content");
+          }
+          const message = raw;
+          const role = message.role;
+          if (role === "tool") {
+            if (typeof message.tool_call_id !== "string" || message.tool_call_id.length === 0) {
+              throw new AiConfigError("AI tool message requires a non-empty string 'tool_call_id'");
+            }
+            if (typeof message.content !== "string") {
+              throw new AiConfigError("AI tool message requires a string 'content'");
+            }
+            continue;
+          }
+          if (role !== "system" && role !== "user" && role !== "assistant") {
             throw new AiConfigError("AI messages must contain supported roles and string content");
           }
           this.validateContent(message.content);
@@ -42072,11 +42096,64 @@ var init_aiClient = __esm({
             if (record.source.startsWith("data:") && !/^data:[^;,\s]+;base64,[A-Za-z0-9+/=]+$/.test(record.source)) {
               throw new AiConfigError("AI image data URI must be data:<media_type>;base64,<payload>");
             }
+          } else if (partType === "tool_result") {
+            if (typeof record.tool_use_id !== "string" || record.tool_use_id.length === 0) {
+              throw new AiConfigError("AI tool_result part requires a non-empty string 'tool_use_id'");
+            }
+            if (typeof record.content !== "string") {
+              throw new AiConfigError("AI tool_result part requires a string 'content'");
+            }
           } else {
             throw new AiConfigError(`AI content part has unknown type '${String(partType)}'`);
           }
         }
       }
+      /**
+       * Validate the outbound tool declarations (ADR-0061). Each tool needs a
+       * non-empty `name`, a string `description`, and a JSON-Schema-shaped
+       * `parameters` object. Malformed tools fail fast with AiConfigError,
+       * never reaching the wire.
+       */
+      static validateTools(tools) {
+        if (!Array.isArray(tools) || tools.length === 0) {
+          throw new AiConfigError("AI tools must be a non-empty list of {name, description, parameters}");
+        }
+        for (const tool of tools) {
+          if (!tool || typeof tool !== "object" || Array.isArray(tool)) {
+            throw new AiConfigError("AI tool must be an object with name, description, parameters");
+          }
+          const record = tool;
+          if (typeof record.name !== "string" || record.name.length === 0) {
+            throw new AiConfigError("AI tool requires a non-empty string 'name'");
+          }
+          if (typeof record.description !== "string") {
+            throw new AiConfigError("AI tool requires a string 'description'");
+          }
+          if (!record.parameters || typeof record.parameters !== "object" || Array.isArray(record.parameters)) {
+            throw new AiConfigError("AI tool requires a JSON-Schema object 'parameters'");
+          }
+        }
+      }
+      /**
+       * Validate the outbound tool_choice value (ADR-0061). The four accepted
+       * shapes are 'auto', 'none', 'required', and {name: 'x'}.
+       */
+      static validateToolChoice(choice) {
+        if (typeof choice === "string") {
+          if (choice !== "auto" && choice !== "none" && choice !== "required") {
+            throw new AiConfigError("AI toolChoice string must be 'auto', 'none', or 'required'");
+          }
+          return;
+        }
+        if (choice && typeof choice === "object" && !Array.isArray(choice)) {
+          const record = choice;
+          if (typeof record.name !== "string" || record.name.length === 0) {
+            throw new AiConfigError("AI toolChoice object requires a non-empty string 'name'");
+          }
+          return;
+        }
+        throw new AiConfigError("AI toolChoice must be 'auto'|'none'|'required' or {name: string}");
+      }
       static number(name, fallback, minimum) {
         const value = process.env[name] === void 0 ? fallback : Number(process.env[name]);
         if (!Number.isFinite(value) || value < minimum) throw new AiConfigError(`${name} must be numeric and at least ${minimum}`);
@@ -42125,25 +42202,100 @@ var init_aiClient = __esm({
       }
       /**
        * Build the provider-specific request body from a Tina4-shaped message
-       * list. Multimodal parts are translated per provider (ADR-0060):
-       *   - OpenAI/local: {type:'image_url', image_url:{url}}
-       *   - Anthropic:    {type:'image', source:{type:'base64'|'url', ...}}
+       * list plus optional tool declarations (ADR-0060 + ADR-0061).
+       *
+       * Content parts translate per provider:
+       *   - OpenAI/local: image → {type:'image_url', image_url:{url}}
+       *   - Anthropic:    image → {type:'image', source:{type:'base64'|'url', ...}}
        * String content is preserved verbatim in the OpenAI/local shape and
        * likewise for Anthropic (both accept a bare string).
+       *
+       * Tool-result turns are normalised to the current provider's expected
+       * shape (either the OpenAI `{role:"tool", tool_call_id, content}` turn or
+       * the Anthropic `{role:"user", content:[{type:"tool_result", ...}]}`
+       * turn), so an agent-loop written against Tina4 never has to fork on
+       * TINA4_AI_PROVIDER (ADR-0061 wire translation).
        */
       static chatBody(config, messages, options) {
-        const translate = (list) => list.map((message) => ({ role: message.role, content: this.translateContent(message.content, config.provider) }));
-        const body = { model: config.model, messages: translate(messages), stream: options.stream ?? false };
+        const normalized = this.normalizeMessagesForProvider(messages, config.provider);
+        const body = { model: config.model, messages: normalized, stream: options.stream ?? false };
         if (options.temperature !== void 0) body.temperature = options.temperature;
         if (options.maxTokens !== void 0) body.max_tokens = options.maxTokens;
         if (config.provider === "anthropic") {
-          const systemParts = messages.filter((message) => message.role === "system").map((message) => typeof message.content === "string" ? message.content : this.contentToPlainText(message.content));
-          body.messages = translate(messages.filter((message) => message.role !== "system"));
+          const systemParts = [];
+          for (const message of messages) {
+            if (message.role !== "system") continue;
+            const content = message.content;
+            systemParts.push(typeof content === "string" ? content : this.contentToPlainText(content));
+          }
+          body.messages = normalized.filter((message) => message.role !== "system");
           body.max_tokens = options.maxTokens ?? 1024;
           if (systemParts.length) body.system = systemParts.join("\n\n");
         }
+        this.applyTools(body, config.provider, options);
         return body;
       }
+      /**
+       * Normalise the Tina4-shaped messages into the provider's on-wire shape.
+       * The `tool` role and the `tool_result` content part are translated
+       * between the OpenAI and Anthropic forms so either input works against
+       * either provider (ADR-0061 return-path table).
+       */
+      static normalizeMessagesForProvider(messages, provider) {
+        const out = [];
+        for (const message of messages) {
+          if (message.role === "tool") {
+            if (provider === "anthropic") {
+              out.push({
+                role: "user",
+                content: [{ type: "tool_result", tool_use_id: message.tool_call_id, content: message.content }]
+              });
+            } else {
+              out.push({ role: "tool", tool_call_id: message.tool_call_id, content: message.content });
+            }
+            continue;
+          }
+          if (Array.isArray(message.content) && message.content.some((part) => part.type === "tool_result")) {
+            if (provider === "anthropic") {
+              out.push({ role: message.role, content: this.translateContent(message.content, provider) });
+            } else {
+              for (const part of message.content) {
+                if (part.type === "tool_result") {
+                  out.push({ role: "tool", tool_call_id: part.tool_use_id, content: part.content });
+                }
+              }
+            }
+            continue;
+          }
+          out.push({ role: message.role, content: this.translateContent(message.content, provider) });
+        }
+        return out;
+      }
+      /**
+       * Attach the outbound `tools` and `tool_choice` (ADR-0061 outbound
+       * translation tables) to the body in place. When toolChoice is 'none'
+       * on Anthropic (Anthropic has no "none" mode) the tools list is omitted
+       * entirely — the model cannot call what it cannot see.
+       */
+      static applyTools(body, provider, options) {
+        const choice = options.toolChoice;
+        const suppressToolsForAnthropic = provider === "anthropic" && choice === "none";
+        if (options.tools !== void 0 && !suppressToolsForAnthropic) {
+          body.tools = options.tools.map(
+            (tool) => provider === "anthropic" ? { name: tool.name, description: tool.description, input_schema: tool.parameters } : { type: "function", function: { name: tool.name, description: tool.description, parameters: tool.parameters } }
+          );
+        }
+        if (choice === void 0) return;
+        if (provider === "anthropic") {
+          if (choice === "none") return;
+          if (choice === "auto") body.tool_choice = { type: "auto" };
+          else if (choice === "required") body.tool_choice = { type: "any" };
+          else body.tool_choice = { type: "tool", name: choice.name };
+        } else {
+          if (typeof choice === "string") body.tool_choice = choice;
+          else body.tool_choice = { type: "function", function: { name: choice.name } };
+        }
+      }
       /**
        * Translate one message content value into the provider's on-wire shape.
        * A plain string is passed through (both providers accept a string
@@ -42154,6 +42306,7 @@ var init_aiClient = __esm({
         if (provider === "anthropic") {
           return content.map((part) => {
             if (part.type === "text") return { type: "text", text: part.text };
+            if (part.type === "tool_result") return { type: "tool_result", tool_use_id: part.tool_use_id, content: part.content };
             if (part.source.startsWith("data:")) {
               const parsed = this.parseDataUri(part.source);
               return { type: "image", source: { type: "base64", media_type: parsed.mediaType, data: parsed.data } };
@@ -42163,6 +42316,9 @@ var init_aiClient = __esm({
         }
         return content.map((part) => {
           if (part.type === "text") return { type: "text", text: part.text };
+          if (part.type === "tool_result") {
+            return { type: "text", text: part.content };
+          }
           return { type: "image_url", image_url: { url: part.source } };
         });
       }