zidane 5.9.3 → 5.9.6

package/dist/{tools-qS3yZYAX.js → tools-8Uxv5SLv.js}

@@ -1,12 +1,12 @@
 import { c as formatTaskStatus, f as buildContextBreakdown, h as utf8ByteLength, l as formatTaskSummary, n as stripLineNumberPrefixes, r as styleReplacementForVia, s as formatDuration, t as resolveOldString, u as previewLine } from "./edit-utils-DnfNoj16.js";
-import { a as createCursorOAuthProvider, c as anthropic, d as ANTHROPIC_EXTRA_MODELS, f as FAST_MODE_OPTIONS, n as openai, o as generatePkce, r as local, s as cerebras, t as openrouter } from "./providers-CezC9my7.js";
+import { a as createCursorOAuthProvider, c as anthropic, d as ANTHROPIC_EXTRA_MODELS, f as FAST_MODE_OPTIONS, n as openai, o as generatePkce, r as local, s as cerebras, t as openrouter } from "./providers-XY1GsF43.js";
 import { i as AgentProviderError, l as errorMessage, n as AgentBudgetExceededError, o as AgentToolPairingError, p as toTypedError, t as AgentAbortedError } from "./errors-B-GeaKTX.js";
-import { E as appendStaticSection, a as detectTurnInterruption, c as filterUnresolvedToolUses, k as renderSystemForWire, n as SYNTHETIC_TOOL_RESULT_PLACEHOLDER, o as ensureEndsWithUserMessage, s as ensureToolResultPairing } from "./messages-Dhva-Ewy.js";
+import { E as appendStaticSection, a as detectTurnInterruption, c as filterUnresolvedToolUses, k as renderSystemForWire, n as SYNTHETIC_TOOL_RESULT_PLACEHOLDER, o as ensureEndsWithUserMessage, s as ensureToolResultPairing } from "./messages-CutkEvp4.js";
 import { t as reconcileImageMediaType } from "./image-sniff-B7uFSNO1.js";
 import { n as createProcessContext } from "./contexts-BD2U_xpi.js";
-import { n as toolOutputByteLength, t as DEFAULT_AGENT_CLOCK } from "./types-BPw_i5vb.js";
+import { n as toolOutputBudgetByteLength, r as toolOutputByteLength, t as DEFAULT_AGENT_CLOCK } from "./types-DjlRVjWb.js";
 import { b as escapeXml, f as installAllowedToolsGate, g as validateResourcePath, n as resolveSkills, t as interpolateShellCommands, u as buildCatalog, y as createSkillActivationState } from "./interpolate-CmcrnzDZ.js";
-import { n as connectMcpServers } from "./mcp-adAkHM-0.js";
+import { n as connectMcpServers } from "./mcp-abU10KzB.js";
 import { n as flattenTurns, r as formatTokenUsage, t as effectiveInputFromTurn } from "./stats-DAKBEKjc.js";
 import { dirname, isAbsolute, join, resolve } from "node:path";
 import { createHooks } from "hookable";
@@ -1958,6 +1958,10 @@ function formatValue(value) {
 //#endregion
 //#region src/loop.ts
 const IMAGE_OMITTED_MARKER = "[image omitted — model does not support vision]";
+function documentOmittedMarker(doc) {
+	const sizeLabel = doc.encoding === "base64" ? `${doc.data.length} b64 bytes` : `${doc.data.length} chars`;
+	return `[document omitted — model does not support document attachments: ${doc.name ? `${doc.name}, ` : ""}${doc.mediaType}, ${sizeLabel}]`;
+}
 /**
 * Canonical tool_result text emitted when a tool call is interrupted by the
 * user mid-flight (Esc / Ctrl-C / external `AbortSignal`). Mirrors Claude
@@ -2339,16 +2343,17 @@ function applyPairingRepair(ctx, messages, turnId) {
 	return repaired;
 }
 function sanitizeStoredToolResults(provider, messages) {
-	if (provider.meta.capabilities?.vision !== false) return messages;
+	if (provider.meta.capabilities?.vision !== false && provider.meta.capabilities?.documents === true) return messages;
 	return messages.map((msg) => {
 		let changed = false;
 		const newContent = msg.content.map((block) => {
 			if (block.type !== "tool_result" || typeof block.output === "string") return block;
+			const output = sanitizeToolOutputForProvider(provider, block.output);
+			if (output === block.output) return block;
 			changed = true;
-			const flattened = block.output.map((b) => b.type === "image" ? IMAGE_OMITTED_MARKER : b.text).join("\n");
 			return {
 				...block,
-				output: flattened
+				output
 			};
 		});
 		return changed ? {
@@ -3024,10 +3029,10 @@ async function executeTurn(ctx, turn, priorUsage) {
 				const name = nameById.get(r.id);
 				if (typeof name === "string" && excludeSet.has(name)) return sum;
 			}
-			return sum + toolOutputByteLength(r.content);
+			return sum + toolOutputBudgetByteLength(r.content);
 		}, 0);
 		if (totalBytes > ctx.toolOutputBudget) {
-			const warning = `[Tool output budget exceeded: ${totalBytes} bytes returned in this turn (cap: ${ctx.toolOutputBudget}). Summarize the salient findings before calling more tools.]`;
+			const warning = `[Tool output budget exceeded: ${totalBytes} text-equivalent bytes returned in this turn (cap: ${ctx.toolOutputBudget}). Summarize the salient findings before calling more tools.]`;
 			const userMsg = ctx.provider.userMessage(warning);
 			ctx.turns.push({
 				id: await ctx.generateTurnId(),
@@ -3066,9 +3071,32 @@ async function executeTurn(ctx, turn, priorUsage) {
 * shape as narrow as possible.
 */
 function stripImagesForNonVision(provider, output) {
+	return sanitizeToolOutputForProvider(provider, output);
+}
+function sanitizeToolOutputForProvider(provider, output) {
 	if (typeof output === "string") return output;
-	if (provider.meta.capabilities?.vision !== false) return output;
-	return output.map((b) => b.type === "image" ? IMAGE_OMITTED_MARKER : b.text).join("\n");
+	if (provider.meta.capabilities?.vision !== false && provider.meta.capabilities?.documents === true) return output;
+	let changed = false;
+	const sanitized = output.map((block) => {
+		if (block.type === "image" && provider.meta.capabilities?.vision === false) {
+			changed = true;
+			return {
+				type: "text",
+				text: IMAGE_OMITTED_MARKER
+			};
+		}
+		if (block.type === "document" && provider.meta.capabilities?.documents !== true) {
+			changed = true;
+			return {
+				type: "text",
+				text: documentOmittedMarker(block)
+			};
+		}
+		return block;
+	});
+	if (!changed) return output;
+	if (sanitized.every((block) => block.type === "text")) return sanitized.map((block) => block.text).join("\n");
+	return sanitized;
 }
 /**
 * Build the per-call base for every `tool:*` hook ctx (and the
@@ -5506,6 +5534,7 @@ function resolveBehavior(agentBehavior, runBehavior) {
 		readLineNumbers: runBehavior?.readLineNumbers ?? agentBehavior?.readLineNumbers,
 		elideStaleReads: runBehavior?.elideStaleReads ?? agentBehavior?.elideStaleReads,
 		toolDisclosure: runBehavior?.toolDisclosure ?? agentBehavior?.toolDisclosure ?? "eager",
+		mcpToolNameSeparator: runBehavior?.mcpToolNameSeparator ?? agentBehavior?.mcpToolNameSeparator ?? "_",
 		toolSearch: runBehavior?.toolSearch ?? agentBehavior?.toolSearch,
 		surfaceMcpInstructions: runBehavior?.surfaceMcpInstructions ?? agentBehavior?.surfaceMcpInstructions ?? true,
 		persistThreshold: runBehavior?.persistThreshold ?? agentBehavior?.persistThreshold,
@@ -5541,6 +5570,35 @@ function resolveServerForTool(toolName, servers) {
 	}
 	return best;
 }
+function resolveMcpToolParts(canonicalName, servers) {
+	const server = resolveServerForTool(canonicalName, servers);
+	if (server) {
+		const prefix = `mcp_${server.name}_`;
+		return {
+			server: server.name,
+			tool: canonicalName.slice(prefix.length)
+		};
+	}
+	if (!canonicalName.startsWith("mcp_")) return void 0;
+	const tail = canonicalName.slice(4);
+	const sep = tail.indexOf("_");
+	if (sep <= 0 || sep >= tail.length - 1) return void 0;
+	return {
+		server: tail.slice(0, sep),
+		tool: tail.slice(sep + 1)
+	};
+}
+function buildMcpToolNameSeparatorAliases(mcpToolNames, servers, separator) {
+	if (separator === "_") return void 0;
+	const aliases = {};
+	for (const canonicalName of mcpToolNames) {
+		const parts = resolveMcpToolParts(canonicalName, servers);
+		if (!parts) continue;
+		const wireName = `mcp${separator}${parts.server}${separator}${parts.tool}`;
+		if (wireName !== canonicalName) aliases[canonicalName] = wireName;
+	}
+	return Object.keys(aliases).length > 0 ? aliases : void 0;
+}
 /**
 * Partition a tool registry into eager and lazy buckets.
 *
@@ -5893,7 +5951,7 @@ function createAgent({ provider, name: agentName, system: agentSystem, tools: ag
 			const thinking = options.thinking ?? "off";
 			const model = options.model ?? provider.meta.defaultModel;
 			const resolvedBehavior = resolveBehavior(agentBehavior, options.behavior);
-			const { maxConcurrentTools, toolBatchExecutor, shouldRethrowToolError, maxTurns, maxCostUsd, maxTotalTokens, maxTokens, retry, thinkingBudget, modelOptions: behaviorModelOptions, schema, cache, toolOutputBudget, toolOutputBudgetExcludeTools, compactStrategy, compactThreshold, compactKeepTurns, thinkingDecay, dedupTools, toolBudgets, repeatGuard, elideStaleReads, toolDisclosure, toolSearch, surfaceMcpInstructions, persistThreshold, persistExcludeTools, persistDir, persistMaxBytes, strictToolPairing, maxConsecutivePauseTurns, persistTurns } = resolvedBehavior;
+			const { maxConcurrentTools, toolBatchExecutor, shouldRethrowToolError, maxTurns, maxCostUsd, maxTotalTokens, maxTokens, retry, thinkingBudget, modelOptions: behaviorModelOptions, schema, cache, toolOutputBudget, toolOutputBudgetExcludeTools, compactStrategy, compactThreshold, compactKeepTurns, thinkingDecay, dedupTools, toolBudgets, repeatGuard, elideStaleReads, toolDisclosure, mcpToolNameSeparator, toolSearch, surfaceMcpInstructions, persistThreshold, persistExcludeTools, persistDir, persistMaxBytes, strictToolPairing, maxConsecutivePauseTurns, persistTurns } = resolvedBehavior;
 			const modelOptions = options.modelOptions ?? behaviorModelOptions;
 			let system = options.system || agentSystem || "You are a helpful assistant.";
 			const baseSystemForBreakdown = renderSystemForWire(system);
@@ -5903,6 +5961,11 @@ function createAgent({ provider, name: agentName, system: agentSystem, tools: ag
 				...mcpConnection.tools
 			} : sourceTools;
 			const mcpToolNames = options.tools === void 0 && mcpConnection ? new Set(Object.keys(mcpConnection.tools)) : /* @__PURE__ */ new Set();
+			const generatedMcpToolAliases = buildMcpToolNameSeparatorAliases(mcpToolNames, mcpServers, mcpToolNameSeparator);
+			const effectiveToolAliases = generatedMcpToolAliases ? {
+				...generatedMcpToolAliases,
+				...toolAliases ?? {}
+			} : toolAliases;
 			const mergedWithSkills = options.tools === void 0 && !!resolvedSkills && resolvedSkills.length > 0 && skillsConfig?.tool !== false ? {
 				skills_use: createSkillsUseTool({
 					catalog: resolvedSkills,
@@ -5925,9 +5988,9 @@ function createAgent({ provider, name: agentName, system: agentSystem, tools: ag
 			if (toolsPreSearch.shell === shell) toolsPreSearch.shell = createShellTool({
 				allowBackground: typeof resolvedBehavior?.tasksDir === "string" && resolvedBehavior.tasksDir.length > 0 && resolvedBehavior.disableBackgroundTasks !== true,
 				registeredCanonicals: new Set(Object.keys(toolsPreSearch)),
-				...toolAliases ? { toolAliases } : {}
+				...effectiveToolAliases ? { toolAliases: effectiveToolAliases } : {}
 			});
-			const disclosure = partitionToolDisclosure(toolsPreSearch, mcpToolNames, mcpServers, toolDisclosure, toolAliases);
+			const disclosure = partitionToolDisclosure(toolsPreSearch, mcpToolNames, mcpServers, toolDisclosure, effectiveToolAliases);
 			const unlocked = new Set(disclosure.eagerCanonicalNames);
 			const initialUnlocked = new Set(disclosure.eagerCanonicalNames);
 			const dynamicUnlockOrder = [];
@@ -5956,7 +6019,7 @@ function createAgent({ provider, name: agentName, system: agentSystem, tools: ag
 				unlocked.add(toolSearchTool.spec.name);
 				initialUnlocked.add(toolSearchTool.spec.name);
 			}
-			const discoveryToolName = shouldInjectToolSearch ? "tool_search" : hostDefinedToolSearch ? toolAliases?.tool_search ?? "tool_search" : null;
+			const discoveryToolName = shouldInjectToolSearch ? "tool_search" : hostDefinedToolSearch ? effectiveToolAliases?.tool_search ?? "tool_search" : null;
 			let searchableCatalogText;
 			if (disclosure.lazyEntries.length > 0) {
 				searchableCatalogText = buildSearchableCatalog(disclosure.lazyEntries, { discoveryToolName });
@@ -5966,7 +6029,7 @@ function createAgent({ provider, name: agentName, system: agentSystem, tools: ag
 				const section = renderMcpInstructionsSection(mcpConnection.instructions);
 				if (section.length > 0) system = appendStaticSection(system, section);
 			}
-			const aliasMaps = buildAliasMaps(toolAliases, Object.keys(tools));
+			const aliasMaps = buildAliasMaps(effectiveToolAliases, Object.keys(tools));
 			augmentMcpDoubleUnderscoreAliases(aliasMaps, Object.keys(tools));
 			let formattedToolsCache = null;
 			function buildFormattedTools() {
@@ -6148,7 +6211,7 @@ function createAgent({ provider, name: agentName, system: agentSystem, tools: ag
 					agentName,
 					agentSystem,
 					agentTools: sourceTools,
-					agentToolAliases: toolAliases,
+					agentToolAliases: effectiveToolAliases,
 					agentMcpServers: mcpServers,
 					agentSkills,
 					agentBehavior: resolvedBehavior,
@@ -7428,18 +7491,18 @@ function decodedBase64ByteLength(b64) {
 const DEFAULT_LINE_LIMIT = 2e3;
 const DEFAULT_BYTE_CAP = 262144;
 /**
-* Hard upper bound on raw image bytes we'll inline as a base64 image block.
+* Hard upper bound on raw attachment bytes we'll inline as a base64 block.
 * Above this, we return a marker instead — the model won't get useful
 * information from a 10 MB+ screenshot rendered as one tool result, and
 * the wire bill gets ugly. Override via the `maxBytes` parameter on the
 * tool call.
 */
-const DEFAULT_IMAGE_BYTE_CAP = 5 * 1024 * 1024;
+const DEFAULT_ATTACHMENT_BYTE_CAP = 5 * 1024 * 1024;
 const readFile$1 = {
 	isConcurrencySafe: true,
 	spec: {
 		name: "read_file",
-		description: "Read a file by path. Returns lines [offset..offset+limit). Default offset=1, limit=2000. Each line is prefixed with its 1-indexed line number followed by a tab (e.g. `42\\tconst foo = bar`); the prefix is metadata, not part of the file. Mirrors Claude Code's `cat -n`-style compact output for token efficiency. A trailing footer explains how to read the rest when truncated. Binary files return a short marker rather than mojibake.",
+		description: "Read a file by path. Text files return lines [offset..offset+limit). Default offset=1, limit=2000. Each line is prefixed with its 1-indexed line number followed by a tab (e.g. `42\\tconst foo = bar`); the prefix is metadata, not part of the file. Mirrors Claude Code's `cat -n`-style compact output for token efficiency. A trailing footer explains how to read the rest when truncated. Images (png/jpg/gif/webp) and PDFs return structured attachments for capable models; other binary files return a short marker rather than mojibake.",
 		inputSchema: {
 			type: "object",
 			properties: {
@@ -7457,7 +7520,7 @@ const readFile$1 = {
 				},
 				maxBytes: {
 					type: "integer",
-					description: "Hard byte cap on file content read, regardless of line count. Default: 262144. Set 0 for unlimited. The rendered output may be slightly larger than this cap when `lineNumbers` is on (each line carries a `<N>\\t` prefix)."
+					description: "Hard byte cap on file content read, regardless of line count. Default: 262144 for text, 5242880 for image/PDF attachments. Set 0 for unlimited. The rendered output may be slightly larger than this cap when `lineNumbers` is on (each line carries a `<N>\\t` prefix)."
 				},
 				lineNumbers: {
 					type: "boolean",
@@ -7470,7 +7533,7 @@ const readFile$1 = {
 	async execute({ path, offset, limit, maxBytes, lineNumbers }, ctx) {
 		const extMedia = imageMediaTypeFor(path);
 		if (extMedia) {
-			const sizeCap = maxBytes !== void 0 ? normalizeInteger(maxBytes, DEFAULT_IMAGE_BYTE_CAP) : DEFAULT_IMAGE_BYTE_CAP;
+			const sizeCap = maxBytes !== void 0 ? normalizeInteger(maxBytes, DEFAULT_ATTACHMENT_BYTE_CAP) : DEFAULT_ATTACHMENT_BYTE_CAP;
 			try {
 				const { base64, byteLength } = await readFileAsBase64(ctx.execution, ctx.handle, path);
 				if (sizeCap > 0 && byteLength > sizeCap) return `[image too large to inline: ${path}, ${byteLength} bytes (cap ${sizeCap}). Raise maxBytes, or use shell to inspect.]`;
@@ -7488,6 +7551,28 @@ const readFile$1 = {
 				return `Image read failed: ${path} — ${errorMessage(err)}.${hint}`;
 			}
 		}
+		const docMedia = documentMediaTypeFor(path);
+		if (docMedia) {
+			const sizeCap = maxBytes !== void 0 ? normalizeInteger(maxBytes, DEFAULT_ATTACHMENT_BYTE_CAP) : DEFAULT_ATTACHMENT_BYTE_CAP;
+			try {
+				const { base64, byteLength } = await readFileAsBase64(ctx.execution, ctx.handle, path);
+				if (sizeCap > 0 && byteLength > sizeCap) return `[document too large to attach: ${path}, ${byteLength} bytes (cap ${sizeCap}). Raise maxBytes, or use shell/read text extraction to inspect.]`;
+				if (docMedia === "application/pdf" && !isPdfBase64(base64)) return `[binary file: ${path}, ${byteLength} bytes; extension suggests PDF but file header does not start with %PDF-]`;
+				return [{
+					type: "text",
+					text: `Document: ${path} (${byteLength} bytes, ${docMedia})`
+				}, {
+					type: "document",
+					mediaType: docMedia,
+					data: base64,
+					encoding: "base64",
+					name: fileNameForPath(path)
+				}];
+			} catch (err) {
+				const hint = await suggestionFor(ctx.execution, ctx.handle, path);
+				return `Document read failed: ${path} — ${errorMessage(err)}.${hint}`;
+			}
+		}
 		let raw;
 		try {
 			raw = await ctx.execution.readFile(ctx.handle, path);
@@ -7570,6 +7655,19 @@ function normalizeInteger(value, fallback) {
 	if (value < 0) return fallback;
 	return Math.floor(value);
 }
+function documentMediaTypeFor(path) {
+	const dot = path.lastIndexOf(".");
+	if (dot === -1) return void 0;
+	return path.slice(dot + 1).toLowerCase() === "pdf" ? "application/pdf" : void 0;
+}
+function fileNameForPath(path) {
+	const normalized = path.replace(/\\/g, "/");
+	const slash = normalized.lastIndexOf("/");
+	return slash === -1 ? normalized : normalized.slice(slash + 1);
+}
+function isPdfBase64(base64) {
+	return Buffer.from(base64.slice(0, 16), "base64").toString("ascii").startsWith("%PDF-");
+}
 //#endregion
 //#region src/tools/shell-kill.ts
 const shellKill = {
@@ -8145,4 +8243,4 @@ const writeFile$1 = {
 //#endregion
 export { resolvePersistDir as A, credKeyOf as B, validateToolArgs as C, cleanupPersistedSession as D, buildPersistedStub as E, resolveReadStateMap as F, localDescriptor as G, enabledModelOptions as H, BUILTIN_PROVIDERS as I, modelsForDescriptor as J, modelOptionsFor as K, OUTPUT_RESERVE_TOKENS as L, getReadState as M, hashContent as N, maybePersistToolResult as O, readStateKey as P, restoreModelOptions as Q, anthropicDescriptor as R, TOOL_USE_SKIPPED_MESSAGE as S, PERSISTENCE_PREVIEW_BYTES as T, getContextWindow as U, effectiveContextWindow as V, getModelInfo as W, openrouterDescriptor as X, openaiDescriptor as Y, piIdOf as Z, createShellTool as _, multiEdit as a, SHELL_CASCADE_CANCEL_MESSAGE as b, grep as c, createAgent as d, createToolSearchTool as f, createSkillsReadTool as g, alwaysQuote as h, readFile$1 as i, resolveTasksDir as j, resolveMcpWarningsDir as k, glob$1 as l, createSkillsRunScriptTool as m, createSpawnTool as n, listFiles as o, createSkillsUseTool as p, modelSupportsReasoning as q, shellKill as r, createInteractionTool as s, writeFile$1 as t, edit as u, shell as v, PERSISTED_STUB_PREFIX as w, TOOL_USE_CANCELLED_MESSAGE as x, INTERRUPT_MESSAGE_FOR_TOOL_USE as y, cerebrasDescriptor as z };
 
-//# sourceMappingURL=tools-qS3yZYAX.js.map
+//# sourceMappingURL=tools-8Uxv5SLv.js.map