@pentoshi/clai 4.11.7 → 4.11.8

package/dist/agent/turn/loop/stream-session.js

@@ -0,0 +1,136 @@
+import { createThinkingStreamParser } from "../../../ui/thinking.js";
+import { parseAllToolCalls } from "../../tool-call-parser.js";
+import { canonicalizeTurnCall } from "./canonicalize-turn-call.js";
+import { fromWireName } from "../../../llm/tool-protocol.js";
+import { isProviderFailureStatus } from "../../../llm/key-rotation.js";
+const HEARTBEAT_MS = 10_000;
+const LARGE_ARGS_BYTES = 4096;
+const streamPhase = (state) => {
+    if (state.generatedTokens > 0 && !state.inThinking)
+        return "responding";
+    if (state.sawReasoning)
+        return "thinking";
+    return "waiting";
+};
+const emitStreamedTextCards = (ports, state, session) => {
+    const parsedCalls = parseAllToolCalls(state.accumulatedText);
+    while (state.streamedCallsCount < parsedCalls.length) {
+        const call = canonicalizeTurnCall(parsedCalls[state.streamedCallsCount], ports.mcpRuntime);
+        const eventId = ports.nextToolEventId();
+        session.callIds[state.streamedCallsCount] = eventId;
+        ports.markPrinted(eventId);
+        session.deferredToolCalls.push({ eventId, call, shown: true });
+        ports.writeToolCall(eventId, call);
+        ports.emitStatus(call.name);
+        state.streamedCallsCount += 1;
+    }
+};
+const applyThinkingTransitions = (ports, state, token) => {
+    if (state.typedReasoningOpen) {
+        state.typedReasoningOpen = false;
+        state.inThinking = false;
+        state.generatedTokens = 0;
+    }
+    if (!state.sawReasoning &&
+        /^\s*<think(?:ing)?\b/i.test(state.accumulatedText)) {
+        state.sawReasoning = true;
+        state.inThinking = true;
+        ports.emitStatus("thinking");
+    }
+    if (state.inThinking && /<\/think(?:ing)?>/i.test(token)) {
+        state.inThinking = false;
+        state.generatedTokens = 0;
+    }
+};
+const applyReasoningDelta = (ports, state, text) => {
+    state.streamedReasoningText += text;
+    state.typedReasoningOpen = true;
+    state.sawReasoning = true;
+    state.inThinking = true;
+    state.generatedTokens += 1;
+    if (!state.emittedThinkingStatus) {
+        state.emittedThinkingStatus = true;
+        ports.emitStatus("thinking");
+    }
+    ports.emitThinkingDelta(text);
+};
+const toolCallDeltaStatus = (name, argumentsBytes) => argumentsBytes && argumentsBytes >= LARGE_ARGS_BYTES
+    ? `${name} (${Math.round(argumentsBytes / 1024)}KB args)`
+    : name;
+export const createStreamSession = (ports) => {
+    const state = {
+        sawReasoning: false,
+        inThinking: false,
+        emittedThinkingStatus: false,
+        generatedTokens: 0,
+        accumulatedText: "",
+        streamedReasoningText: "",
+        typedReasoningOpen: false,
+        streamedCallsCount: 0,
+    };
+    const deferredToolCalls = [];
+    const streamedNativeCallNames = new Map();
+    const callIds = [];
+    const deltaParser = createThinkingStreamParser((text) => ports.emitAssistantDelta(text), (text) => {
+        if (!state.emittedThinkingStatus) {
+            state.emittedThinkingStatus = true;
+            ports.emitStatus("thinking");
+        }
+        ports.emitThinkingDelta(text);
+    });
+    const heartbeat = setInterval(() => {
+        ports.emitStatus(streamPhase(state));
+    }, HEARTBEAT_MS);
+    heartbeat.unref?.();
+    return {
+        accumulatedText: () => state.accumulatedText,
+        streamedReasoningText: () => state.streamedReasoningText,
+        sawReasoning: () => state.sawReasoning,
+        deferredToolCalls,
+        streamedNativeCallNames,
+        callIds,
+        onToken: (token) => {
+            deltaParser.push(token);
+            state.generatedTokens += 1;
+            state.accumulatedText += token;
+            if (!ports.nativeToolsAttached()) {
+                emitStreamedTextCards(ports, state, { deferredToolCalls, callIds });
+            }
+            applyThinkingTransitions(ports, state, token);
+        },
+        onStatus: (status) => {
+            const full = status.replace(/\s+/g, " ").trim();
+            if (!full)
+                return;
+            if (full.startsWith("ℹ")) {
+                ports.notify("info", full);
+                return;
+            }
+            if (isProviderFailureStatus(full)) {
+                ports.notify("warn", full);
+                return;
+            }
+            if (full.length > 80 && /error|failed|exception/i.test(full)) {
+                ports.notify("warn", full);
+                return;
+            }
+            ports.writeStatus(status);
+        },
+        onStreamEvent: (event) => {
+            if (event.type !== "reasoning_delta")
+                return;
+            applyReasoningDelta(ports, state, event.text);
+        },
+        onToolCallDelta: (delta) => {
+            if (!delta.name)
+                return;
+            const name = fromWireName(delta.name) ?? delta.name;
+            streamedNativeCallNames.set(delta.index, name);
+            ports.emitStatus(toolCallDeltaStatus(name, delta.argumentsBytes));
+        },
+        onSuccessfulRequest: ports.onSuccessfulRequest,
+        finishDeltaParser: () => deltaParser.finish(),
+        stopHeartbeat: () => clearInterval(heartbeat),
+    };
+};
+//# sourceMappingURL=stream-session.js.map

package/dist/agent/turn/loop/stream-session.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"stream-session.js","sourceRoot":"","sources":["../../../../src/agent/turn/loop/stream-session.ts"],"names":[],"mappings":"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"}

package/dist/agent/turn/loop/tool-call-recovery.d.ts

@@ -0,0 +1,25 @@
+import type { ChatMessage } from "../../../types.js";
+import type { SalvagedWrite } from "../../tool-call-parser.js";
+export interface SalvagedWriteOutcome {
+    readonly ok: boolean;
+    readonly bytesOnDisk: number;
+}
+export interface ToolCallRecoveryState {
+    bareToolJsonRetries: number;
+    truncatedToolRetries: number;
+    malformedFenceRetries: number;
+}
+export interface ToolCallRecoveryPorts {
+    readonly messages: ChatMessage[];
+    readonly toolsAttached: boolean;
+    readonly planModeWithoutPlan: boolean;
+    readonly notify: (level: "info" | "warn", message: string) => void;
+    readonly commitAssistantRetry: (text: string) => void;
+    readonly recoveryUserMessage: (content: string) => ChatMessage;
+    readonly applySalvagedWrite: (salvaged: SalvagedWrite) => Promise<SalvagedWriteOutcome>;
+}
+export type ToolCallRecoveryDecision = "retry" | "proceed";
+export declare const recoverMissingToolCall: (ports: ToolCallRecoveryPorts, state: ToolCallRecoveryState, input: {
+    readonly visible: string;
+    readonly bareArgsOnly: boolean;
+}) => Promise<ToolCallRecoveryDecision>;

package/dist/agent/turn/loop/tool-call-recovery.js

@@ -0,0 +1,162 @@
+import { countToolFences, looksLikeTruncatedToolCall, salvageTruncatedWrite, } from "../../tool-call-parser.js";
+import { stripThinking } from "../../../ui/thinking.js";
+import { toolNudge } from "../../../prompts/index.js";
+const SENTINEL_TOOL_CALL = /<\|tool_call(?:s_section)?_begin\|>|<\|tool_call_argument_begin\|>|<[|｜]+DSML[|｜]+(?:tool_calls|invoke|parameter)\b|<[|｜]+tool[_▁](?:calls?[_▁]begin|sep)[|｜]+>/i;
+const FENCED_CALL_SHAPE = /```tool\s*\n[\s\S]*?"(?:name|args)"\s*:/i;
+const bareArgsNudge = (ports) => {
+    if (ports.planModeWithoutPlan) {
+        return ports.toolsAttached
+            ? "Your previous message was a bare JSON args object with no tool name, so NOTHING ran. " +
+                "In plan mode: call plan.create (or research tools) via the platform tool interface."
+            : "Your previous message was a bare JSON args object with no tool name and no ```tool fence, so NOTHING ran. " +
+                "In plan mode, call plan.create with a proper ```tool block when ready, e.g.:\n" +
+                '```tool\n{"name":"plan.create","args":{"goal":"…","detail":"…","tasks":["…"],"kind":"coding"}}\n```';
+    }
+    return ports.toolsAttached
+        ? "Your previous message was a bare JSON args object with no tool name, so NOTHING ran. " +
+            toolNudge(true) +
+            " Include the tool name and full args via the platform tool interface — do not use markdown fences."
+        : "Your previous message was a bare JSON args object with no tool name and no ```tool fence, so NOTHING ran. " +
+            "Reply with ONLY a fenced ```tool block of the form " +
+            '`{"name": "<tool>", "args": { ... }}`. For example, to read a PDF:\n' +
+            '```tool\n{"name":"pdf.read","args":{"path":"/abs/file.pdf"}}\n```\n' +
+            "Choose the correct tool name for the task and include those args.";
+};
+const sentinelNudge = (ports) => ports.toolsAttached
+    ? "Your previous tool call was malformed or truncated. " +
+        toolNudge(true) +
+        " Pass valid JSON arguments via the platform tool interface — do not use fence or sentinel markers."
+    : "Your previous tool call was malformed or truncated. " +
+        "Reply with ONLY a fenced ```tool block containing valid JSON " +
+        'of the form `{"name": "<tool>", "args": { ... }}`. ' +
+        "Do not use <|tool_call_begin|> markers.";
+const truncatedNudge = (ports) => ports.toolsAttached
+    ? "Your previous tool call was cut off before it finished — the JSON was incomplete, so NOTHING ran. " +
+        "Prefer ONE complete fs.write when it fits. If the file is too large: (1) fs.write the first large section, " +
+        "(2) fs.append the rest with expectedPriorBytes from the write receipt, (3) repeat with large chunks. " +
+        "Keep reasoning SHORT and call the tool via the platform interface. Do NOT claim a file was written until a tool call succeeds."
+    : "Your previous tool call was cut off before it finished — the JSON was incomplete, so NOTHING ran. " +
+        "Prefer ONE complete fs.write when it fits (~32k output tokens is a lot of file content if reasoning stays short). " +
+        "If the file is too large for one call:\n" +
+        "1. fs.write the first large section (as much as fits — hundreds+ of lines)\n" +
+        "2. fs.append the rest with expectedPriorBytes from the write receipt\n" +
+        "3. Repeat append only if still incomplete — large chunks, not ~100-line drips\n" +
+        "Keep reasoning SHORT — emit the ```tool block early. Do NOT claim a file was written until a tool call succeeds.";
+const malformedFenceNudge = (ports) => ports.toolsAttached
+    ? "Your previous tool call JSON was INVALID, so NOTHING ran. " +
+        "Common causes: unescaped newlines/quotes, unbalanced braces, or content too large. " +
+        toolNudge(true) +
+        " Prefer ONE complete fs.write when it fits; if cut off, continue with large fs.append + expectedPriorBytes. " +
+        "Do NOT claim any file was written until a tool call actually succeeds."
+    : "Your previous message contained a ```tool block, but its JSON was INVALID, so NOTHING ran. " +
+        "Common causes: unescaped newlines or quotes inside a string value, an extra or missing `}` / `]`, or content too large for the output window. " +
+        'Re-emit ONE valid ```tool block of the exact form {"name":"<tool>","args":{...}} with balanced braces. ' +
+        "IMPORTANT: Prefer ONE complete fs.write when it fits. Keep reasoning SHORT. " +
+        "Only if the output window cuts you off, continue with large fs.append chunks + expectedPriorBytes. " +
+        "Do NOT claim any file was written until a tool call actually succeeds.";
+const salvageContinuationNudge = (ports, salvaged, lineCount, priorBytes) => {
+    const toolName = salvaged.operation === "append" ? "fs.append" : "fs.write";
+    const head = `Your ${toolName} tool call was cut off at the token limit, but the system salvaged the partial content and wrote ${lineCount} lines (file is now ${priorBytes} bytes) to ${salvaged.path}. ` +
+        `The file ends with: ${JSON.stringify(salvaged.lastLine)}\n\n`;
+    return ports.toolsAttached
+        ? head +
+            `CONTINUE by calling fs.append with path=${JSON.stringify(salvaged.path)}, expectedPriorBytes=${priorBytes}, and content set to ONLY the next remaining chunk not already on disk. Keep each chunk under 24,000 characters and wait for its receipt before sending another. Use the platform tool interface — no markdown fences.`
+        : head +
+            `CONTINUE with one fs.append chunk under 24,000 characters, then wait for its receipt before sending another:\n` +
+            '```tool\n{"name":"fs.append","args":{"path":' +
+            JSON.stringify(salvaged.path) +
+            ',"expectedPriorBytes":' +
+            priorBytes +
+            ',"content":"...ONLY the remaining content not already on disk..."}}\n```\n' +
+            `expectedPriorBytes must match the receipt so append cannot double-write. ` +
+            `Do NOT re-read the full file; do NOT re-send content already saved.`;
+};
+const trySalvage = async (ports, visible, buildNudge, announce) => {
+    const salvaged = salvageTruncatedWrite(visible);
+    if (!salvaged)
+        return false;
+    try {
+        const outcome = await ports.applySalvagedWrite(salvaged);
+        if (!outcome.ok)
+            return false;
+        const lineCount = salvaged.content.split("\n").length;
+        ports.notify("info", announce(salvaged, lineCount));
+        ports.commitAssistantRetry(stripThinking(visible).visible);
+        ports.messages.push({
+            role: "user",
+            content: buildNudge(salvaged, outcome, lineCount),
+        });
+        return true;
+    }
+    catch {
+        return false;
+    }
+};
+const recoverBareArgs = (ports, state, visible) => {
+    state.bareToolJsonRetries += 1;
+    if (state.bareToolJsonRetries > 3)
+        return "proceed";
+    ports.notify("warn", ports.toolsAttached
+        ? "tool call missing its name — asking the model to call a tool properly"
+        : "tool call missing its name/fence — asking the model to re-emit a proper ```tool block");
+    ports.commitAssistantRetry(visible);
+    ports.messages.push(ports.recoveryUserMessage(bareArgsNudge(ports)));
+    return "retry";
+};
+const recoverSentinel = (ports, visible) => {
+    ports.notify("warn", "tool call was malformed or cut off — asking the model to retry in JSON form");
+    ports.commitAssistantRetry(visible);
+    ports.messages.push(ports.recoveryUserMessage(sentinelNudge(ports)));
+    return "retry";
+};
+const recoverTruncated = async (ports, state, visible) => {
+    state.truncatedToolRetries += 1;
+    if (state.truncatedToolRetries <= 5) {
+        const salvagedOk = await trySalvage(ports, visible, (salvaged, outcome, lineCount) => salvageContinuationNudge(ports, salvaged, lineCount, outcome.bytesOnDisk), (salvaged, lineCount) => `tool call was truncated — salvaged ${lineCount} lines and wrote to ${salvaged.path}`);
+        if (salvagedOk)
+            return "retry";
+    }
+    if (state.truncatedToolRetries > 3)
+        return "proceed";
+    ports.notify("warn", "tool call was cut off (output too long) — asking the model to retry safely");
+    ports.commitAssistantRetry(stripThinking(visible).visible);
+    ports.messages.push({ role: "user", content: truncatedNudge(ports) });
+    return "retry";
+};
+const recoverMalformedFence = async (ports, state, visible) => {
+    const salvagedOk = await trySalvage(ports, visible, (salvaged, _outcome, lineCount) => `The system extracted and wrote ${lineCount} lines to ${salvaged.path} from your malformed tool call. ` +
+        `The file content ends at: "${salvaged.lastLine}"\n\n` +
+        `If the file is complete, proceed with the next step. ` +
+        `If more content is needed, use one large fs.append with expectedPriorBytes from the write receipt (not tiny chunks).`, (salvaged, lineCount) => `malformed tool call salvaged — wrote ${lineCount} lines to ${salvaged.path}`);
+    if (salvagedOk)
+        return "retry";
+    state.malformedFenceRetries += 1;
+    if (state.malformedFenceRetries > 3)
+        return "proceed";
+    ports.notify("warn", "tool block present but its JSON didn't parse — asking the model to re-emit valid JSON");
+    ports.commitAssistantRetry(stripThinking(visible).visible);
+    ports.messages.push({ role: "user", content: malformedFenceNudge(ports) });
+    return "retry";
+};
+export const recoverMissingToolCall = async (ports, state, input) => {
+    if (input.bareArgsOnly) {
+        if (recoverBareArgs(ports, state, input.visible) === "retry")
+            return "retry";
+    }
+    if (SENTINEL_TOOL_CALL.test(input.visible)) {
+        return recoverSentinel(ports, input.visible);
+    }
+    if (looksLikeTruncatedToolCall(input.visible)) {
+        const decision = await recoverTruncated(ports, state, input.visible);
+        if (decision === "retry")
+            return "retry";
+    }
+    const hasFencedCallShape = countToolFences(input.visible) > 0 && FENCED_CALL_SHAPE.test(input.visible);
+    if (hasFencedCallShape) {
+        const decision = await recoverMalformedFence(ports, state, input.visible);
+        if (decision === "retry")
+            return "retry";
+    }
+    return "proceed";
+};
+//# sourceMappingURL=tool-call-recovery.js.map

package/dist/agent/turn/loop/tool-call-recovery.js.map

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

package/dist/agent/turn/loop/unrun-calls.d.ts

@@ -0,0 +1,12 @@
+import type { ChatMessage, ToolResult } from "../../../types.js";
+import type { BoundCall } from "../contracts.js";
+import type { RoundState } from "./round-state.js";
+export interface UnrunCallPorts {
+    readonly round: RoundState;
+    readonly messages: ChatMessage[];
+    readonly useNativeHistory: boolean;
+    readonly eventIdFor: (index: number) => string;
+    readonly wasPrinted: (uiId: string) => boolean;
+    readonly emitToolResult: (uiId: string, result: ToolResult, contextOutput: string) => void;
+}
+export declare const settleUnrunCalls: (ports: UnrunCallPorts, toRun: readonly BoundCall[]) => void;

package/dist/agent/turn/loop/unrun-calls.js

@@ -0,0 +1,27 @@
+import { appendToolResult } from "../../tool-history.js";
+const settlementReason = (round) => round.aborted
+    ? "Cancelled — turn aborted before this call ran."
+    : round.awaitingPlanApproval
+        ? "Deferred — waiting for plan approval."
+        : "Cancelled — not executed.";
+export const settleUnrunCalls = (ports, toRun) => {
+    for (let index = 0; index < toRun.length; index += 1) {
+        const bound = toRun[index];
+        if (ports.round.recordedNativeIds.has(bound.id))
+            continue;
+        const uiId = ports.eventIdFor(index);
+        const reason = settlementReason(ports.round);
+        const result = { ok: false, output: reason, exitCode: 130 };
+        if (ports.wasPrinted(uiId))
+            ports.emitToolResult(uiId, result, reason);
+        const content = `Tool ${bound.call.name} result (exit=130, ok=false):\n${reason}`;
+        if (ports.useNativeHistory) {
+            appendToolResult(ports.messages, bound.id, content, bound.call.name, false);
+            ports.round.recordedNativeIds.add(bound.id);
+        }
+        else {
+            ports.messages.push({ role: "tool", content });
+        }
+    }
+};
+//# sourceMappingURL=unrun-calls.js.map

package/dist/agent/turn/loop/unrun-calls.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"unrun-calls.js","sourceRoot":"","sources":["../../../../src/agent/turn/loop/unrun-calls.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAezD,MAAM,gBAAgB,GAAG,CAAC,KAAiB,EAAU,EAAE,CACrD,KAAK,CAAC,OAAO;IACX,CAAC,CAAC,gDAAgD;IAClD,CAAC,CAAC,KAAK,CAAC,oBAAoB;QAC1B,CAAC,CAAC,uCAAuC;QACzC,CAAC,CAAC,2BAA2B,CAAC;AAEpC,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,KAAqB,EACrB,KAA2B,EACrB,EAAE;IACR,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QACrD,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAE,CAAC;QAC5B,IAAI,KAAK,CAAC,KAAK,CAAC,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YAAE,SAAS;QAC1D,MAAM,IAAI,GAAG,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QACrC,MAAM,MAAM,GAAG,gBAAgB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC7C,MAAM,MAAM,GAAe,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC;QACxE,IAAI,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC;YAAE,KAAK,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QACvE,MAAM,OAAO,GAAG,QAAQ,KAAK,CAAC,IAAI,CAAC,IAAI,kCAAkC,MAAM,EAAE,CAAC;QAClF,IAAI,KAAK,CAAC,gBAAgB,EAAE,CAAC;YAC3B,gBAAgB,CACd,KAAK,CAAC,QAAQ,EACd,KAAK,CAAC,EAAE,EACR,OAAO,EACP,KAAK,CAAC,IAAI,CAAC,IAAI,EACf,KAAK,CACN,CAAC;YACF,KAAK,CAAC,KAAK,CAAC,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC9C,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;QACjD,CAAC;IACH,CAAC;AACH,CAAC,CAAC"}

package/dist/agent/turn/loop/wire-occurrences.d.ts

@@ -0,0 +1,31 @@
+import type { ToolCall, ToolResult } from "../../../types.js";
+export interface ExecutedOccurrence {
+    readonly call: ToolCall;
+    readonly result: ToolResult;
+    readonly contextOutput: string;
+    readonly ok: boolean;
+}
+export interface ReplayedOccurrence extends ExecutedOccurrence {
+    readonly suppressedRepeat: true;
+}
+export interface WireOccurrencePorts {
+    readonly isPrinted: (eventId: string) => boolean;
+    readonly writeToolCall: (eventId: string, call: ToolCall) => void;
+    readonly markPrinted: (eventId: string) => void;
+    readonly emitToolStart: (eventId: string) => void;
+    readonly writeToolOutput: (eventId: string, chunk: string) => void;
+    readonly emitToolResult: (eventId: string, result: ToolResult, contextOutput: string) => void;
+}
+export declare const DUPLICATE_WIRE_CALL_NOTICE: string;
+export interface WireOccurrenceLedger {
+    readonly replay: (wireId: string | undefined, call: ToolCall, eventId: string) => ReplayedOccurrence | undefined;
+    readonly remember: (wireId: string | undefined, executed: {
+        call: ToolCall;
+        result: ToolResult;
+        contextOutput: string;
+        ok: boolean;
+        aborted?: boolean | undefined;
+        suppressedRepeat?: boolean | undefined;
+    }) => void;
+}
+export declare const createWireOccurrenceLedger: (ports: WireOccurrencePorts) => WireOccurrenceLedger;

package/dist/agent/turn/loop/wire-occurrences.js

@@ -0,0 +1,45 @@
+export const DUPLICATE_WIRE_CALL_NOTICE = "This exact provider tool call already executed this turn. " +
+    "The earlier result is replayed below; the tool did not run again.";
+export const createWireOccurrenceLedger = (ports) => {
+    const executed = new Map();
+    return {
+        replay: (wireId, call, eventId) => {
+            const prior = wireId ? executed.get(wireId) : undefined;
+            if (!prior)
+                return undefined;
+            const output = `${DUPLICATE_WIRE_CALL_NOTICE}\n\n${prior.contextOutput}`;
+            const result = {
+                ...prior.result,
+                output,
+                suppressedRepeat: true,
+            };
+            if (!ports.isPrinted(eventId)) {
+                ports.writeToolCall(eventId, call);
+                ports.markPrinted(eventId);
+                ports.emitToolStart(eventId);
+            }
+            ports.writeToolOutput(eventId, output.endsWith("\n") ? output : `${output}\n`);
+            ports.emitToolResult(eventId, result, output);
+            return {
+                call,
+                result,
+                contextOutput: output,
+                ok: prior.ok,
+                suppressedRepeat: true,
+            };
+        },
+        remember: (wireId, result) => {
+            if (!wireId || executed.has(wireId))
+                return;
+            if (!result.ok || result.aborted || result.suppressedRepeat)
+                return;
+            executed.set(wireId, {
+                call: result.call,
+                result: result.result,
+                contextOutput: result.contextOutput,
+                ok: result.ok,
+            });
+        },
+    };
+};
+//# sourceMappingURL=wire-occurrences.js.map

package/dist/agent/turn/loop/wire-occurrences.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"wire-occurrences.js","sourceRoot":"","sources":["../../../../src/agent/turn/loop/wire-occurrences.ts"],"names":[],"mappings":"AA0BA,MAAM,CAAC,MAAM,0BAA0B,GACrC,4DAA4D;IAC5D,mEAAmE,CAAC;AAqBtE,MAAM,CAAC,MAAM,0BAA0B,GAAG,CACxC,KAA0B,EACJ,EAAE;IACxB,MAAM,QAAQ,GAAG,IAAI,GAAG,EAA8B,CAAC;IACvD,OAAO;QACL,MAAM,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;YAChC,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YACxD,IAAI,CAAC,KAAK;gBAAE,OAAO,SAAS,CAAC;YAC7B,MAAM,MAAM,GAAG,GAAG,0BAA0B,OAAO,KAAK,CAAC,aAAa,EAAE,CAAC;YACzE,MAAM,MAAM,GAAe;gBACzB,GAAG,KAAK,CAAC,MAAM;gBACf,MAAM;gBACN,gBAAgB,EAAE,IAAI;aACvB,CAAC;YACF,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC9B,KAAK,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;gBACnC,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;gBAC3B,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;YAC/B,CAAC;YACD,KAAK,CAAC,eAAe,CACnB,OAAO,EACP,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI,CAC/C,CAAC;YACF,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;YAC9C,OAAO;gBACL,IAAI;gBACJ,MAAM;gBACN,aAAa,EAAE,MAAM;gBACrB,EAAE,EAAE,KAAK,CAAC,EAAE;gBACZ,gBAAgB,EAAE,IAAI;aACvB,CAAC;QACJ,CAAC;QACD,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE;YAC3B,IAAI,CAAC,MAAM,IAAI,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC;gBAAE,OAAO;YAC5C,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,gBAAgB;gBAAE,OAAO;YACpE,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE;gBACnB,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,aAAa,EAAE,MAAM,CAAC,aAAa;gBACnC,EAAE,EAAE,MAAM,CAAC,EAAE;aACd,CAAC,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC,CAAC"}

package/dist/agent/turn/mcp-agent-tools.d.ts

@@ -0,0 +1,17 @@
+import type { ToolCall, ToolResult } from "../../types.js";
+import type { McpRuntime } from "../../mcp/runtime.js";
+import type { SingleToolResult } from "./contracts.js";
+export interface McpAgentToolPorts {
+    readonly askMode: boolean;
+    readonly showCall: (toolEventId: string, call: ToolCall) => void;
+    readonly writeOutput: (toolEventId: string, chunk: string) => void;
+    readonly emitResult: (toolEventId: string, result: ToolResult, contextOutput: string) => void;
+    readonly confirm: (call: ToolCall) => Promise<boolean>;
+    readonly recordAttempt: (call: ToolCall, ok: boolean, output: string) => void;
+}
+export declare const mcpAgentToolTarget: (args: Record<string, unknown>) => string | readonly string[] | undefined;
+export declare const runMcpAgentTool: (mcp: McpRuntime, call: ToolCall) => Promise<ToolResult>;
+export declare const mcpAgentOutput: (call: ToolCall, result: ToolResult) => string;
+export declare const isReadOnlyMcpAgentTool: (call: ToolCall) => boolean;
+export declare const createMcpAgentToolExecutor: (ports: McpAgentToolPorts) => (runtime: McpRuntime, call: ToolCall, toolEventId: string) => Promise<SingleToolResult>;
+export declare const createMcpAgentCallFailure: (ports: McpAgentToolPorts) => (toolEventId: string, call: ToolCall, reason: string, cancelled?: boolean) => SingleToolResult;

package/dist/agent/turn/mcp-agent-tools.js

@@ -0,0 +1,69 @@
+export const mcpAgentToolTarget = (args) => {
+    if (Array.isArray(args.servers)) {
+        return args.servers.filter((entry) => typeof entry === "string");
+    }
+    if (typeof args.server === "string")
+        return args.server;
+    return undefined;
+};
+export const runMcpAgentTool = async (mcp, call) => {
+    const args = call.args ?? {};
+    if (call.name === "mcp.list")
+        return mcp.agentList();
+    if (call.name === "mcp.tools") {
+        return mcp.agentTools(typeof args.server === "string" ? args.server : undefined);
+    }
+    if (call.name === "mcp.enable")
+        return mcp.agentEnable(mcpAgentToolTarget(args));
+    if (call.name === "mcp.connect") {
+        return mcp.agentConnect(typeof args.server === "string" ? args.server : "");
+    }
+    return mcp.agentLogin(typeof args.server === "string" ? args.server : "");
+};
+export const mcpAgentOutput = (call, result) => {
+    const text = result.output.trim();
+    if (text.length > 0)
+        return text;
+    return result.ok
+        ? `${call.name} completed successfully with no textual output.`
+        : `${call.name} failed with no textual output (exit ${result.exitCode ?? 1}).`;
+};
+export const isReadOnlyMcpAgentTool = (call) => call.name === "mcp.list" || call.name === "mcp.tools";
+const failCall = (ports, toolEventId, call, reason, cancelled = false) => {
+    ports.showCall(toolEventId, call);
+    const result = { ok: false, output: reason, exitCode: 1 };
+    const body = cancelled ? `cancelled: ${reason}` : reason;
+    ports.writeOutput(toolEventId, `${body}\n`);
+    ports.emitResult(toolEventId, result, reason);
+    return {
+        ok: false,
+        call,
+        result,
+        contextOutput: reason,
+        ...(cancelled ? { blockOrCancel: true } : {}),
+    };
+};
+const execute = async (ports, runtime, call, toolEventId) => {
+    const readOnly = isReadOnlyMcpAgentTool(call);
+    if (!readOnly && ports.askMode) {
+        return failCall(ports, toolEventId, call, `${call.name} is not available in ask mode because it changes MCP session state. Switch to agent mode.`);
+    }
+    if (!readOnly && !(await ports.confirm(call))) {
+        return failCall(ports, toolEventId, call, "Cancelled.", true);
+    }
+    ports.showCall(toolEventId, call);
+    const result = await runMcpAgentTool(runtime, call);
+    const shown = mcpAgentOutput(call, result);
+    ports.recordAttempt(call, result.ok, shown);
+    ports.writeOutput(toolEventId, `${shown}\n`);
+    ports.emitResult(toolEventId, { ...result, output: shown }, shown);
+    return {
+        ok: result.ok,
+        call,
+        result: { ...result, output: shown },
+        contextOutput: shown,
+    };
+};
+export const createMcpAgentToolExecutor = (ports) => (runtime, call, toolEventId) => execute(ports, runtime, call, toolEventId);
+export const createMcpAgentCallFailure = (ports) => (toolEventId, call, reason, cancelled = false) => failCall(ports, toolEventId, call, reason, cancelled);
+//# sourceMappingURL=mcp-agent-tools.js.map

package/dist/agent/turn/mcp-agent-tools.js.map

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

package/dist/agent/turn/message-assembly.d.ts

@@ -0,0 +1,14 @@
+import type { ChatImage, ChatMessage } from "../../types.js";
+export interface TurnMessageInput {
+    readonly prompt: string;
+    readonly displayPrompt: string | null | undefined;
+    readonly images: readonly ChatImage[] | undefined;
+    readonly history: readonly ChatMessage[] | undefined;
+    readonly systemPrompt: string;
+    readonly requestContext: string;
+}
+export interface AssembledTurnMessages {
+    readonly messages: ChatMessage[];
+    readonly requestContextMessage: string;
+}
+export declare const assembleTurnMessages: (input: TurnMessageInput) => AssembledTurnMessages;

package/dist/agent/turn/message-assembly.js

@@ -0,0 +1,22 @@
+import { REQUEST_CONTEXT_PREFIX } from "../../llm/system-messages.js";
+export const assembleTurnMessages = (input) => {
+    const hideUserBubble = input.displayPrompt === null || input.displayPrompt === "";
+    const userMessage = {
+        role: "user",
+        content: input.prompt,
+        ...(hideUserBubble ? { internal: true } : {}),
+    };
+    if (input.images && input.images.length > 0) {
+        userMessage.images = [...input.images];
+    }
+    const requestContextMessage = `${REQUEST_CONTEXT_PREFIX}\n${input.requestContext}`;
+    return {
+        requestContextMessage,
+        messages: [
+            { role: "system", content: input.systemPrompt },
+            ...(input.history ?? []),
+            userMessage,
+        ],
+    };
+};
+//# sourceMappingURL=message-assembly.js.map

package/dist/agent/turn/message-assembly.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"message-assembly.js","sourceRoot":"","sources":["../../../src/agent/turn/message-assembly.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAgBtE,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,KAAuB,EACA,EAAE;IACzB,MAAM,cAAc,GAClB,KAAK,CAAC,aAAa,KAAK,IAAI,IAAI,KAAK,CAAC,aAAa,KAAK,EAAE,CAAC;IAC7D,MAAM,WAAW,GAAgB;QAC/B,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,KAAK,CAAC,MAAM;QACrB,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC9C,CAAC;IACF,IAAI,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5C,WAAW,CAAC,MAAM,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;IACzC,CAAC;IACD,MAAM,qBAAqB,GAAG,GAAG,sBAAsB,KAAK,KAAK,CAAC,cAAc,EAAE,CAAC;IACnF,OAAO;QACL,qBAAqB;QACrB,QAAQ,EAAE;YACR,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,CAAC,YAAY,EAAE;YAC/C,GAAG,CAAC,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC;YACxB,WAAW;SACZ;KACF,CAAC;AACJ,CAAC,CAAC"}