@pentoshi/clai 3.5.1 → 3.7.2

package/dist/llm/tool-protocol.js

@@ -0,0 +1,278 @@
+/** Max argument JSON size while streaming (~32 MB). */
+export const MAX_TOOL_ARG_BYTES = 32 * 1024 * 1024;
+/** Primary wire form: dots → underscores, keep camelCase (fs.writeMany → fs_writeMany). */
+export function toWireName(canonical) {
+    return canonical.replace(/\./g, "_");
+}
+/**
+ * Full snake_case wire form models sometimes emit
+ * (fs.writeMany → fs_write_many). Used as a reverse alias only.
+ */
+export function toSnakeWireName(canonical) {
+    return canonical
+        .replace(/([a-z0-9])([A-Z])/g, "$1_$2")
+        .replace(/\./g, "_")
+        .toLowerCase();
+}
+/**
+ * Reverse wire → canonical for known tools. Unknown wires return undefined
+ * so the runner can surface a clear error.
+ */
+const wireToCanonical = new Map();
+export function registerWireName(canonical, wire) {
+    const w = wire ?? toWireName(canonical);
+    wireToCanonical.set(w, canonical);
+}
+/** Register primary wire + snake_case alias when they differ. */
+export function registerWireNamesFor(canonical) {
+    const wire = toWireName(canonical);
+    registerWireName(canonical, wire);
+    const snake = toSnakeWireName(canonical);
+    if (snake !== wire) {
+        registerWireName(canonical, snake);
+    }
+    return wire;
+}
+/**
+ * Strip model channel / commentary / XML junk from tool names
+ * (e.g. `fs.write<|channel|>commentary` → `fs.write`).
+ */
+export function sanitizeToolName(raw) {
+    let n = raw.trim();
+    if (!n)
+        return n;
+    // GPT-OSS / channel style: <|channel|>, <|tool_call_begin|>, …
+    n = n.replace(/<\|[^|]*\|>/g, "");
+    // XML-ish tags
+    n = n.replace(/<\/?[A-Za-z][^>]*>/g, "");
+    n = n.replace(/^(?:functions\.|tools\.|tool\.)/i, "");
+    n = n.replace(/:\d+$/, "");
+    // Drop trailing non-name junk after a clean dotted/underscored stem
+    n = n.replace(/[^A-Za-z0-9._-]+.*$/, "");
+    // Role words models glue after tags (fs.writecommentary)
+    n = n.replace(/(?:commentary|analysis|channel|tool_call|toolcall|final)$/i, "");
+    n = n.replace(/(?:[_./-]+(?:commentary|analysis|channel|final))+$/i, "");
+    n = n.trim().replace(/^[_./-]+|[_./-]+$/g, "");
+    return n;
+}
+/**
+ * Longest registered wire/canonical prefix match for polluted names.
+ * e.g. `fs_write_channel_commentary` → `fs_write` if registered.
+ */
+function longestRegisteredPrefix(cleaned) {
+    if (!cleaned)
+        return undefined;
+    if (wireToCanonical.has(cleaned))
+        return cleaned;
+    // Try stripping trailing segments after _ or .
+    let best;
+    for (const [wire] of wireToCanonical) {
+        if (cleaned === wire ||
+            cleaned.startsWith(wire + "_") ||
+            cleaned.startsWith(wire + ".") ||
+            cleaned.startsWith(wire + "<")) {
+            if (!best || wire.length > best.length)
+                best = wire;
+        }
+    }
+    return best;
+}
+export function fromWireName(wire) {
+    const cleaned = sanitizeToolName(wire);
+    if (!cleaned)
+        return undefined;
+    if (wireToCanonical.has(cleaned))
+        return wireToCanonical.get(cleaned);
+    // Polluted name that still starts with a registered wire form
+    const prefix = longestRegisteredPrefix(cleaned);
+    if (prefix)
+        return wireToCanonical.get(prefix);
+    // Also try original if sanitize changed nothing useful
+    if (wireToCanonical.has(wire))
+        return wireToCanonical.get(wire);
+    // Fallback: underscore → first-dot heuristic for unregistered names.
+    if (cleaned.includes("."))
+        return cleaned;
+    const idx = cleaned.indexOf("_");
+    if (idx <= 0)
+        return undefined;
+    return `${cleaned.slice(0, idx)}.${cleaned.slice(idx + 1).replace(/_/g, ".")}`;
+}
+export function parseToolArguments(raw) {
+    if (raw == null)
+        return {};
+    if (typeof raw === "object" && !Array.isArray(raw)) {
+        return raw;
+    }
+    if (typeof raw === "string") {
+        const t = raw.trim();
+        if (!t)
+            return {};
+        try {
+            const parsed = JSON.parse(t);
+            if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+                return parsed;
+            }
+            return { _parseError: true, _raw: t };
+        }
+        catch {
+            return { _parseError: true, _raw: t };
+        }
+    }
+    return {};
+}
+let syntheticToolCallSequence = 0;
+export function syntheticToolCallId(index) {
+    syntheticToolCallSequence += 1;
+    return `call_${index}_${Date.now().toString(36)}_${syntheticToolCallSequence.toString(36)}`;
+}
+export function isToolsUnsupportedError(error) {
+    const status = error && typeof error === "object" && "status" in error
+        ? Number(error.status)
+        : undefined;
+    const body = error && typeof error === "object" && "body" in error
+        ? String(error.body ?? "")
+        : "";
+    const message = error instanceof Error ? error.message : String(error);
+    const hay = `${message}\n${body}`.toLowerCase();
+    // Explicit capability rejections (any HTTP status).
+    if (/tools?\s+(is|are)\s+not\s+supported|does not support tools|function calling is not enabled|tool[_ ]?use is not supported|tools? not supported|tool calling is not supported|does not support function|function[_ ]?call(ing)? (is )?(not supported|disabled|unavailable)|unknown (request )?parameter ['"]?tools?|['"]tools?['"] is not (a )?valid|tool_choice.*(not supported|unknown|disabled)/i.test(hay)) {
+        return true;
+    }
+    // 400 bodies that mention tools — only when they clearly mean unsupported.
+    // Do NOT treat schema/arg validation as unsupported (no bare /tool/i).
+    if (status === 400 &&
+        /\btools?\b|\btool_choice\b|\bfunction[_ ]?call/i.test(hay)) {
+        if (/invalid schema|invalid argument|missing required|parse error|type error|validation|must be|expected/i.test(hay)) {
+            return false;
+        }
+        return /not support|unsupported|disabled|not enabled|not available|unknown parameter|unrecognized/i.test(hay);
+    }
+    return false;
+}
+export function mapToolChoiceToOpenAi(choice) {
+    if (choice === undefined || choice === "auto")
+        return "auto";
+    if (choice === "none")
+        return "none";
+    if (choice === "required")
+        return "required";
+    if (typeof choice === "object" && choice.type === "function") {
+        return {
+            type: "function",
+            function: { name: toWireName(choice.name) },
+        };
+    }
+    return "auto";
+}
+export function mapToolChoiceToAnthropic(choice) {
+    if (choice === undefined || choice === "auto")
+        return { type: "auto" };
+    if (choice === "none")
+        return { type: "none" };
+    if (choice === "required")
+        return { type: "any" };
+    if (typeof choice === "object" && choice.type === "function") {
+        return { type: "tool", name: toWireName(choice.name) };
+    }
+    return { type: "auto" };
+}
+export function mapToolChoiceToGemini(choice) {
+    if (choice === "none")
+        return { mode: "NONE" };
+    if (choice === "required")
+        return { mode: "ANY" };
+    if (typeof choice === "object" && choice.type === "function") {
+        return {
+            mode: "ANY",
+            allowedFunctionNames: [toWireName(choice.name)],
+        };
+    }
+    return { mode: "AUTO" };
+}
+/** Session-sticky models forced to text protocol after tools-unsupported. */
+const textOnlyModels = new Set();
+export function textOnlyKey(provider, model) {
+    return `${provider}::${model}`;
+}
+export function markTextOnlyModel(provider, model) {
+    textOnlyModels.add(textOnlyKey(provider, model));
+}
+export function isTextOnlyModel(provider, model) {
+    return textOnlyModels.has(textOnlyKey(provider, model));
+}
+export function clearTextOnlyModels() {
+    textOnlyModels.clear();
+}
+/** Accumulate OpenAI-style streaming tool_calls deltas by index. */
+export function accumulateOpenAiToolCallDelta(state, entry) {
+    const index = entry.index ?? 0;
+    let acc = state.get(index);
+    if (!acc) {
+        acc = { arguments: "" };
+        state.set(index, acc);
+    }
+    const hadName = Boolean(acc.name);
+    if (entry.id)
+        acc.id = entry.id;
+    if (entry.function?.name) {
+        const nextName = sanitizeToolName(entry.function.name) || entry.function.name;
+        // X2: if this index already has a different clean name, do not clobber
+        // args with a second tool's payload — keep the first name.
+        if (acc.name &&
+            nextName &&
+            acc.name !== nextName &&
+            sanitizeToolName(acc.name) !== sanitizeToolName(nextName)) {
+            // Ignore subsequent name flips on the same index (stream corruption).
+        }
+        else {
+            acc.name = nextName;
+        }
+    }
+    if (typeof entry.function?.arguments === "string") {
+        acc.arguments += entry.function.arguments;
+        if (acc.arguments.length > MAX_TOOL_ARG_BYTES) {
+            throw new Error(`Tool call arguments exceeded ${MAX_TOOL_ARG_BYTES} bytes — split the file or reduce content size.`);
+        }
+    }
+    return {
+        index,
+        ...(acc.id !== undefined ? { id: acc.id } : {}),
+        ...(acc.name !== undefined ? { name: acc.name } : {}),
+        nameBecameKnown: Boolean(acc.name) && !hadName,
+        argumentsBytes: acc.arguments.length,
+    };
+}
+export function finalizeOpenAiToolCalls(state) {
+    const indices = [...state.keys()].sort((a, b) => a - b);
+    const out = [];
+    for (const index of indices) {
+        const acc = state.get(index);
+        const wire = acc.name ?? "";
+        const canonical = fromWireName(wire) ?? wire;
+        const rawArguments = acc.arguments;
+        const args = parseToolArguments(rawArguments);
+        out.push({
+            id: acc.id ?? syntheticToolCallId(index),
+            name: canonical,
+            args,
+            ...(rawArguments ? { rawArguments } : {}),
+        });
+    }
+    return out;
+}
+export function parseOpenAiMessageToolCalls(toolCalls) {
+    if (!toolCalls?.length)
+        return [];
+    return toolCalls.map((tc, i) => {
+        const wire = tc.function?.name ?? "";
+        const rawArguments = tc.function?.arguments ?? "";
+        return {
+            id: tc.id ?? syntheticToolCallId(i),
+            name: fromWireName(wire) ?? wire,
+            args: parseToolArguments(rawArguments),
+            ...(rawArguments ? { rawArguments } : {}),
+        };
+    });
+}
+//# sourceMappingURL=tool-protocol.js.map

package/dist/llm/tool-protocol.js.map

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

package/dist/modes/agent.d.ts

@@ -1,4 +1,4 @@
-import type { ChatMessage, ChatImage, ProviderId, ToolCall } from "../types.js";
+import type { ChatMessage, ChatImage, Mode, ProviderId, ToolCall } from "../types.js";
 import type { AgentEvent } from "../agent/events.js";
 import { parseToolCall, createSessionPolicy, type ConfirmPort, type SessionPolicy } from "../agent/runner.js";
 export interface AgentOptions {
@@ -23,6 +23,7 @@ export interface AgentOptions {
     onEvent?: ((event: AgentEvent) => void) | undefined;
     onMessages?: ((messages: ChatMessage[]) => void) | undefined;
     confirm?: ConfirmPort | undefined;
+    mode?: Mode | undefined;
 }
 export { parseToolCall, createSessionPolicy };
 export type { SessionPolicy };

package/dist/modes/agent.js

@@ -1,6 +1,8 @@
-import { runAgentLoop, parseToolCall, createSessionPolicy, } from "../agent/runner.js";
+import { renderTurnOutcome } from "../agent/turn-outcome.js";
+import { runAgentTurn, parseToolCall, createSessionPolicy, } from "../agent/runner.js";
 export { parseToolCall, createSessionPolicy };
 export async function runAgent(prompt, options = {}) {
-    return runAgentLoop(prompt, options);
+    const outcome = await runAgentTurn(prompt, options);
+    return renderTurnOutcome(outcome);
 }
 //# sourceMappingURL=agent.js.map

package/dist/modes/agent.js.map

@@ -1 +1 @@
-{"version":3,"file":"agent.js","sourceRoot":"","sources":["../../src/modes/agent.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,YAAY,EACZ,aAAa,EACb,mBAAmB,GAGpB,MAAM,oBAAoB,CAAC;AAwB5B,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,CAAC;AAG9C,MAAM,CAAC,KAAK,UAAU,QAAQ,CAC5B,MAAc,EACd,UAAwB,EAAE;IAE1B,OAAO,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AACvC,CAAC"}
+{"version":3,"file":"agent.js","sourceRoot":"","sources":["../../src/modes/agent.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EACL,YAAY,EACZ,aAAa,EACb,mBAAmB,GAGpB,MAAM,oBAAoB,CAAC;AAyB5B,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,CAAC;AAG9C,MAAM,CAAC,KAAK,UAAU,QAAQ,CAC5B,MAAc,EACd,UAAwB,EAAE;IAE1B,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpD,OAAO,iBAAiB,CAAC,OAAO,CAAC,CAAC;AACpC,CAAC"}

package/dist/modes/ask.d.ts

@@ -1,11 +1,5 @@
 import type { ChatMessage, ChatImage, ProviderId } from "../types.js";
 import type { AgentEvent } from "../agent/events.js";
-/**
- * Signal raised when the model, while in ask mode, tries to call a mutating
- * tool (run a command, write a file, install a package, …). Ask mode is
- * read-only, so instead of leaking the raw tool-call JSON as the "answer" we
- * surface this so the caller can offer to switch into agent mode.
- */
 export interface AskActionRequired {
     /** The original prompt, so the caller can re-run it in agent mode. */
     prompt: string;
@@ -20,19 +14,7 @@ export interface AskOptions {
     history?: ChatMessage[] | undefined;
     signal?: AbortSignal | undefined;
     images?: ChatImage[] | undefined;
-    /**
-     * Invoked when the task needs actions ask mode can't perform. When set, the
-     * research loop returns an empty string and lets the caller drive the
-     * follow-up (e.g. prompt to switch to agent mode). When unset, ask mode
-     * falls back to a clean explanatory message instead of raw tool-call text.
-     */
     onActionRequired?: ((info: AskActionRequired) => void) | undefined;
-    /**
-     * Optional event sink for live research activity. Ask mode emits
-     * `tool-call`/`tool-result` events for each read-only research tool it runs
-     * (web.search, web.fetch, …) so the UI can show what it's searching or
-     * fetching, mirroring agent-mode tool cards.
-     */
     onEvent?: ((event: AgentEvent) => void) | undefined;
 }
 export declare function runAsk(prompt: string, options?: AskOptions): Promise<string>;

package/dist/modes/ask.js

@@ -1,10 +1,14 @@
 import { streamWithProvider } from "../llm/router.js";
+import { resolveToolDialect } from "../llm/capabilities.js";
+import { syntheticToolCallId } from "../llm/tool-protocol.js";
 import { renderAskSystemPrompt } from "../prompts/index.js";
 import { getConfig } from "../store/config.js";
 import { ensureProviderConfigured } from "../commands/providers.js";
 import { loadProjectContext } from "../store/project.js";
 import { parseAllToolCalls, formatToolArgs, looksLikePromptLeak } from "../agent/runner.js";
 import { runToolCall } from "../tools/registry.js";
+import { getToolDefinitions } from "../tools/definitions.js";
+import { appendAssistantWithTools, appendToolResult, } from "../agent/tool-history.js";
 /** Strip tool-call markup so only the model's prose preamble remains. */
 function stripToolCallSyntax(text) {
     return text
@@ -42,12 +46,6 @@ function researchResultSummary(call, ok) {
             return "done";
     }
 }
-/**
- * Read-only tools ask mode is allowed to call during its research loop.
- * Everything here is non-mutating: web lookups and local file inspection
- * only. Ask mode never runs shell commands, installs packages, or writes
- * files.
- */
 const ASK_RESEARCH_TOOLS = new Set([
     "web.search",
     "web.fetch",
@@ -88,17 +86,19 @@ async function buildAskMessages(prompt, options) {
     const config = getConfig();
     const provider = options.provider ?? config.defaultProvider;
     await ensureProviderConfigured(provider);
+    const model = options.model ?? config.defaultModel;
     const projectContext = await loadProjectContext();
+    const native = resolveToolDialect(provider, model, config.toolCalling) !== "none";
     const systemPrompt = projectContext
-        ? `${renderAskSystemPrompt()}\n\nProject context from .clai/context.md:\n${projectContext}`
-        : renderAskSystemPrompt();
+        ? `${renderAskSystemPrompt({ nativeTools: native })}\n\nProject context from .clai/context.md:\n${projectContext}`
+        : renderAskSystemPrompt({ nativeTools: native });
     const userMessage = { role: "user", content: prompt };
     if (options.images && options.images.length > 0) {
         userMessage.images = options.images;
     }
     return {
         provider,
-        model: options.model ?? config.defaultModel,
+        model,
         messages: [
             { role: "system", content: systemPrompt },
             ...(options.history ?? []),
@@ -106,13 +106,6 @@ async function buildAskMessages(prompt, options) {
         ],
     };
 }
-/**
- * Find where (if anywhere) a tool-call block begins in `text`. Ask mode
- * streams each model round to the live display, but a round may turn out to
- * be a tool call rather than prose. We mirror tokens to the screen only up to
- * the point a tool-call delimiter appears, so raw tool JSON never streams to
- * the user. Returns -1 when no tool-call marker is present.
- */
 function toolCallStartIndex(text) {
     const indicators = [
         /```\s*tool/i,
@@ -130,24 +123,18 @@ function toolCallStartIndex(text) {
     }
     return min;
 }
-/**
- * Run one model round as a stream, mirroring visible prose tokens to `onToken`
- * as they arrive (so the user sees the answer build up live) while suppressing
- * anything from a tool-call delimiter onward. Returns the round's full raw
- * text so the caller can detect/parse tool calls. Providers without a native
- * stream fall back to a single onToken call inside streamWithProvider.
- */
 async function streamAskRound(request, messages, onToken) {
     let full = "";
     let forwardedLen = 0;
     let suppressed = false;
-    await streamWithProvider({ ...request, messages }, (token) => {
+    const completion = await streamWithProvider({ ...request, messages }, (token) => {
         full += token;
         if (suppressed)
             return;
+        // When native tools are attached, do not suppress prose on fence markers
+        // (there should be none); still suppress if the model emits fences anyway.
         const toolAt = toolCallStartIndex(full);
         if (toolAt >= 0) {
-            // Forward only the clean prefix before the tool-call marker, once.
             if (toolAt > forwardedLen)
                 onToken(full.slice(forwardedLen, toolAt));
             forwardedLen = full.length;
@@ -159,23 +146,30 @@ async function streamAskRound(request, messages, onToken) {
             forwardedLen = full.length;
         }
     });
-    return full;
+    const text = full || completion.text;
+    if (completion.toolCalls?.length) {
+        return {
+            text,
+            toolCalls: completion.toolCalls.map((tc) => ({
+                name: tc.name,
+                args: tc.args,
+            })),
+            nativeIds: completion.toolCalls.map((tc) => tc.id),
+        };
+    }
+    return { text };
 }
-/**
- * Drive ask mode to its final answer.
- *
- * Ask mode is non-agentic for the user — there is no plan, no confirmations,
- * no system changes — but it MAY ground its answer in current facts via a
- * bounded loop of read-only tools (web.search/web.fetch/tool.batch and
- * read-only fs.*). Each round is streamed to `onToken`: prose answers appear
- * live, and rounds that turn out to be tool calls are suppressed mid-stream so
- * raw tool JSON never reaches the screen. The returned string is always the
- * clean final answer, which callers treat as authoritative even if the live
- * stream briefly showed a tool-call preamble.
- */
 async function resolveAskAnswer(originalPrompt, provider, model, messages, options, onToken) {
     const config = getConfig();
     const maxTokens = config.thinking?.enabled ? 8_192 : 4_096;
+    const native = resolveToolDialect(provider, model, config.toolCalling) !== "none";
+    // Research tools + agent.handoff (meta; not executed as research — action UX).
+    const askDefs = native
+        ? [
+            ...getToolDefinitions({ askMode: true }).filter((d) => ASK_RESEARCH_TOOLS.has(d.name)),
+            ...getToolDefinitions({ names: ["agent.handoff"] }),
+        ]
+        : undefined;
     const baseRequest = {
         provider,
         model,
@@ -183,6 +177,9 @@ async function resolveAskAnswer(originalPrompt, provider, model, messages, optio
         maxTokens,
         thinking: config.thinking,
         ...(options.signal ? { signal: options.signal } : {}),
+        ...(askDefs?.length
+            ? { tools: askDefs, toolChoice: "auto" }
+            : {}),
     };
     // Surface research activity (web.search/web.fetch/…) to the UI as tool
     // events so the user can see what's being searched/fetched.
@@ -219,34 +216,26 @@ async function resolveAskAnswer(originalPrompt, provider, model, messages, optio
             role: "user",
             content: `Fresh web.search was run before answering because the user requested current/web-backed information.\n` +
                 `Query: ${query}\nResult:\n${truncateToolOutput(output, "web.search")}\n\n` +
-                "Answer from these current results. If the result is insufficient or contradictory, call web.search/web.fetch again before answering. Cite URLs you used.",
+                "Answer from these current results. Prefer high-trust hosts (.gov, major news). Treat a single junk/contradictory snippet as unverified until confirmed. If insufficient, call web.search/web.fetch again before answering. Your final answer MUST cite 1–3 URLs from tool results.",
         });
     }
     for (let round = 0; round < ASK_MAX_RESEARCH_ROUNDS; round += 1) {
         options.signal?.throwIfAborted();
-        const text = await streamAskRound(baseRequest, messages, onToken);
-        // ── Prompt-leak guard ──────────────────────────────────────────────
-        // If the model's response contains distinctive system-prompt markers,
-        // it is repeating its instructions (e.g. in response to "repeat your
-        // instructions verbatim"). Any ```tool blocks in that output are
-        // EXAMPLES from the prompt, not real tool requests. Treat the whole
-        // response as a final text answer to avoid executing stale examples.
+        const roundResult = await streamAskRound(baseRequest, messages, onToken);
+        const text = roundResult.text;
         if (looksLikePromptLeak(text)) {
             return text;
         }
-        const allCalls = parseAllToolCalls(text);
+        // Prefer native toolCalls; fall back to text fences.
+        const allCalls = roundResult.toolCalls?.length
+            ? roundResult.toolCalls
+            : parseAllToolCalls(text);
+        const nativeIds = roundResult.nativeIds ??
+            allCalls.map((_, i) => syntheticToolCallId(i));
         const calls = allCalls.filter((call) => ASK_RESEARCH_TOOLS.has(call.name));
         if (calls.length === 0) {
-            // No allowed research tool requested. If the model instead asked for a
-            // mutating/action tool, this is an agent task — surface it rather than
-            // returning the raw tool-call JSON as the answer.
             const actionCalls = allCalls.filter((call) => !ASK_RESEARCH_TOOLS.has(call.name));
             if (actionCalls.length > 0) {
-                // The model signals it wants to act either via an explicit
-                // `agent.handoff` call (preferred — see the ask system prompt) or by
-                // emitting a real mutating tool call. Pull the reason out of a handoff
-                // when present, and never surface "agent.handoff" itself as a tool the
-                // user would recognize.
                 const handoff = actionCalls.find((call) => call.name === "agent.handoff" || call.name === "agent.run");
                 const reason = handoff && typeof handoff.args.reason === "string"
                     ? handoff.args.reason.trim()
@@ -279,8 +268,19 @@ async function resolveAskAnswer(originalPrompt, provider, model, messages, optio
         }
         // Record the model's tool-call turn, then run the read-only tools and
         // feed their outputs back so the next round can synthesize.
-        messages.push({ role: "assistant", content: text });
-        for (const call of calls.slice(0, ASK_MAX_TOOLS_PER_ROUND)) {
+        if (roundResult.toolCalls?.length) {
+            appendAssistantWithTools(messages, stripToolCallSyntax(text), roundResult.toolCalls.map((c, i) => ({
+                id: nativeIds[i] ?? syntheticToolCallId(i),
+                name: c.name,
+                args: c.args,
+            })));
+        }
+        else {
+            messages.push({ role: "assistant", content: text });
+        }
+        for (const [callIndex, call] of calls
+            .slice(0, ASK_MAX_TOOLS_PER_ROUND)
+            .entries()) {
             options.signal?.throwIfAborted();
             const id = `ask-${(toolSeq += 1)}`;
             emit({
@@ -308,19 +308,27 @@ async function resolveAskAnswer(originalPrompt, provider, model, messages, optio
                 ok,
                 summary: researchResultSummary(call, ok),
             });
-            messages.push({
-                role: "user",
-                content: `Result of ${call.name}(${JSON.stringify(call.args)}):\n${truncateToolOutput(output, call.name)}`,
-            });
+            const resultBody = `Result of ${call.name}(${JSON.stringify(call.args)}):\n${truncateToolOutput(output, call.name)}`;
+            if (roundResult.toolCalls?.length) {
+                const sourceIndex = allCalls.indexOf(call);
+                appendToolResult(messages, nativeIds[sourceIndex] ?? syntheticToolCallId(callIndex), resultBody, call.name, ok);
+            }
+            else {
+                messages.push({
+                    role: "user",
+                    content: resultBody,
+                });
+            }
         }
     }
     // Round cap reached — force a tool-free final answer from what we gathered.
     options.signal?.throwIfAborted();
     messages.push({
         role: "user",
-        content: "Stop researching now. Using only what you have already gathered above, give your final answer to the original question. Do NOT call any more tools.",
+        content: "Stop researching now. Using only what you have already gathered above, give your final answer to the original question. Do NOT call any more tools. Prefer high-trust sources; only claim a page confirms a fact if that fact appears in the tool output; include 1–3 source URLs from the results above.",
     });
-    return streamAskRound(baseRequest, messages, onToken);
+    const finalRound = await streamAskRound(baseRequest, messages, onToken);
+    return finalRound.text;
 }
 export async function runAsk(prompt, options = {}) {
     const request = await buildAskMessages(prompt, options);
@@ -329,9 +337,6 @@ export async function runAsk(prompt, options = {}) {
 }
 export async function runAskStream(prompt, onToken, options = {}) {
     const request = await buildAskMessages(prompt, options);
-    // The answer is streamed to onToken live (with tool-call rounds suppressed),
-    // and the returned string is the authoritative final answer for callers that
-    // commit/persist it.
     return resolveAskAnswer(prompt, request.provider, request.model, request.messages, options, onToken);
 }
 //# sourceMappingURL=ask.js.map