zidane 6.2.32 → 6.2.33

package/dist/acp-cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { It as resolveStorageDirs, ut as basic_default } from "./agent-CHtfwiSc.js";
+import { It as resolveStorageDirs, ut as basic_default } from "./agent-CdnYdiRY.js";
 import { r as createProcessContext } from "./contexts-o8y5B3Tm.js";
 import { createSandboxContext } from "./contexts/sandbox.js";
 import { m as openaiCompat } from "./openai-compat-pHI0kBWH.js";
@@ -10,7 +10,7 @@ import { cerebras } from "./providers/cerebras.js";
 import { t as xai } from "./xai-BwhzoehX.js";
 import { openai } from "./providers/openai.js";
 import { openrouter } from "./providers/openrouter.js";
-import { d as StartUsageError, f as buildStartLocalOptions, h as startProviderNames, i as withAcpDefaultTools, m as startLocalArgOptions, p as parseStartArgValues, t as runAcpStdioServer } from "./acp-BOXBhzMv.js";
+import { d as StartUsageError, f as buildStartLocalOptions, h as startProviderNames, i as withAcpDefaultTools, m as startLocalArgOptions, p as parseStartArgValues, t as runAcpStdioServer } from "./acp-DlgMFlUN.js";
 import { f as credKeyOf, i as readCredentials, l as BUILTIN_PROVIDERS, r as credentialsPath, t as detectAuth, y as modelsForDescriptor } from "./auth-up7hgE9H.js";
 import { createDaytonaProvider } from "./contexts/daytona.js";
 import { createDockerContext } from "./contexts/docker.js";

package/dist/acp.d.ts

@@ -1,4 +1,4 @@
-import { Ef as SessionContentBlock, Gd as AgentBehavior, Qf as ToolDef, Rf as ToolResultContent, Sm as Provider, Wi as Agent, _f as PromptPart, _p as Session, of as McpServerConfig, qf as TurnUsage, qi as AgentOptions, t as Preset, xp as SessionStore } from "./index-DZxVqh6L.js";
+import { Ef as SessionContentBlock, Gd as AgentBehavior, Qf as ToolDef, Rf as ToolResultContent, Sm as Provider, Wi as Agent, _f as PromptPart, _p as Session, of as McpServerConfig, qf as TurnUsage, qi as AgentOptions, t as Preset, xp as SessionStore } from "./index-LLXx0VRf.js";
 import { c as ExecutionContext } from "./types-BDccavwj.js";
 import { Readable, Writable } from "node:stream";
 

package/dist/acp.js

@@ -1,2 +1,2 @@
-import { _ as createJsonRpcConnection, a as wrapToolsForAcpClient, c as sessionBlocksToAcp, g as JsonRpcRemoteError, i as withAcpDefaultTools, l as stopReasonFromRun, n as AcpProtocolError, o as acpMcpServersToZidane, r as createAcpServer, s as acpPromptToPromptParts, t as runAcpStdioServer, u as toolResultToAcpContent } from "./acp-BOXBhzMv.js";
+import { _ as createJsonRpcConnection, a as wrapToolsForAcpClient, c as sessionBlocksToAcp, g as JsonRpcRemoteError, i as withAcpDefaultTools, l as stopReasonFromRun, n as AcpProtocolError, o as acpMcpServersToZidane, r as createAcpServer, s as acpPromptToPromptParts, t as runAcpStdioServer, u as toolResultToAcpContent } from "./acp-DlgMFlUN.js";
 export { AcpProtocolError, JsonRpcRemoteError, acpMcpServersToZidane, acpPromptToPromptParts, createAcpServer, createJsonRpcConnection, runAcpStdioServer, sessionBlocksToAcp, stopReasonFromRun, toolResultToAcpContent, withAcpDefaultTools, wrapToolsForAcpClient };

package/dist/{agent-CHtfwiSc.js → agent-CdnYdiRY.js}

@@ -10881,6 +10881,18 @@ function wrapProviderError(err, ctx) {
 	}
 	return wrapped;
 }
+/**
+* Operation names carried by watchdog `OperationTimeoutError`s. Shared
+* between the watchdog racer (`streamWithWatchdogs`) and the retry
+* classifier so the retry carve-out can't silently detach from the errors
+* it targets when a label is renamed.
+*/
+const PROVIDER_WATCHDOG_OPERATIONS = {
+	"first response": "provider first response",
+	"total stream": "provider total stream",
+	"stream inactivity": "provider stream inactivity"
+};
+const PROVIDER_WATCHDOG_OPERATION_SET = new Set(Object.values(PROVIDER_WATCHDOG_OPERATIONS));
 function providerWatchdogTimeouts(ctx) {
 	return {
 		startTimeoutMs: resolveTimeoutMs(ctx.providerStreamStartTimeoutMs, DEFAULT_PROVIDER_STREAM_START_TIMEOUT_MS, ctx.maxWallMs),
@@ -11030,10 +11042,22 @@ async function streamWithWatchdogs(ctx, options, callbacks, turnId, opts) {
 		if (idleTimer) clearTimeout(idleTimer);
 		unlinkParentAbort();
 	};
+	let lastActivityAt = 0;
+	const armIdleTimer = (delayMs) => {
+		idleTimer = setTimeout(() => {
+			if (settled) return;
+			const idleMs = Date.now() - lastActivityAt;
+			if (idleMs < idleTimeoutMs) {
+				armIdleTimer(idleTimeoutMs - idleMs);
+				return;
+			}
+			onIdleTimeout?.();
+		}, delayMs);
+	};
 	const recordActivity = () => {
 		if (idleTimeoutMs <= 0 || settled) return;
-		if (idleTimer) clearTimeout(idleTimer);
-		idleTimer = setTimeout(() => onIdleTimeout?.(), idleTimeoutMs);
+		lastActivityAt = Date.now();
+		if (idleTimer === void 0) armIdleTimer(idleTimeoutMs);
 	};
 	const markFirstObserved = () => {
 		recordActivity();
@@ -11056,21 +11080,23 @@ async function streamWithWatchdogs(ctx, options, callbacks, turnId, opts) {
 				markFirstObserved();
 				callbacks.onText(delta);
 			},
-			...callbacks.onThinking ? { onThinking(delta) {
+			onThinking(delta) {
 				if (settled) return;
 				markFirstObserved();
 				callbacks.onThinking?.(delta);
-			} } : {},
-			...callbacks.onServerToolUse ? { onServerToolUse(block) {
+			},
+			onServerToolUse(block) {
+				opts?.onServerToolActivity?.();
 				if (settled) return;
 				markFirstObserved();
 				callbacks.onServerToolUse?.(block);
-			} } : {},
-			...callbacks.onServerToolResult ? { onServerToolResult(block) {
+			},
+			onServerToolResult(block) {
+				opts?.onServerToolActivity?.();
 				if (settled) return;
 				markFirstObserved();
 				callbacks.onServerToolResult?.(block);
-			} } : {},
+			},
 			onToolCallDelta() {
 				if (settled) return;
 				markFirstObserved();
@@ -11078,7 +11104,7 @@ async function streamWithWatchdogs(ctx, options, callbacks, turnId, opts) {
 			}
 		});
 	} catch (err) {
-		unlinkParentAbort();
+		cleanup();
 		throw err;
 	}
 	streamPromise.catch(() => {});
@@ -11086,7 +11112,7 @@ async function streamWithWatchdogs(ctx, options, callbacks, turnId, opts) {
 		const failTimeout = (kind, timeoutMs) => {
 			if (settled) return;
 			settled = true;
-			const err = new OperationTimeoutError(`provider ${kind}`, timeoutMs, kind === "stream inactivity" ? `Provider stream timed out: no stream events for ${timeoutMs}ms (turn ${turnId}).` : `Provider stream timed out waiting for ${kind} after ${timeoutMs}ms (turn ${turnId}).`);
+			const err = new OperationTimeoutError(PROVIDER_WATCHDOG_OPERATIONS[kind], timeoutMs, kind === "stream inactivity" ? `Provider stream timed out: no stream events for ${timeoutMs}ms (turn ${turnId}).` : `Provider stream timed out waiting for ${kind} after ${timeoutMs}ms (turn ${turnId}).`);
 			attemptAbort.abort(err);
 			cleanup();
 			reject(err);
@@ -11131,11 +11157,12 @@ const ERROR_PLACEHOLDER_MAX = 280;
 * suffix. Falls back to the original generic placeholder when no message
 * can be extracted.
 */
-function buildStreamErrorPlaceholder(err) {
+function buildStreamErrorPlaceholder(err, midOutput = false) {
+	const prefix = midOutput ? "Streaming failed mid-output" : "Streaming failed before any output";
 	const raw = errorMessage(err).trim();
-	if (raw.length === 0) return "[✗ Streaming failed before any output.]";
+	if (raw.length === 0) return `[✗ ${prefix}.]`;
 	const oneLine = raw.replace(/\s+/g, " ");
-	return `[✗ Streaming failed before any output: ${oneLine.length > ERROR_PLACEHOLDER_MAX ? `${oneLine.slice(0, ERROR_PLACEHOLDER_MAX - 1).trimEnd()}…` : oneLine}]`;
+	return `[✗ ${prefix}: ${oneLine.length > ERROR_PLACEHOLDER_MAX ? `${oneLine.slice(0, ERROR_PLACEHOLDER_MAX - 1).trimEnd()}…` : oneLine}]`;
 }
 function buildCumulativeUsage(prior, turnUsage) {
 	const cost = prior.priorCost + (turnUsage.cost ?? 0);
@@ -11588,6 +11615,7 @@ async function executeTurn(ctx, turn, priorUsage) {
 	streamOptions.messages = ensureEndsWithUserMessage(streamOptions.messages, ctx.provider);
 	let currentText = "";
 	let currentThinking = "";
+	let serverToolActivity = false;
 	const streamStartedAt = Date.now();
 	let turnTtftMs;
 	const markTurnTtft = () => {
@@ -11650,15 +11678,20 @@ async function executeTurn(ctx, turn, priorUsage) {
 				onOAuthRefresh(refreshCtx) {
 					return ctx.hooks.callHook("oauth:refresh", refreshCtx);
 				}
-			}, turnId, attempt > 1 ? { startTimeoutCapMs: RETRY_STREAM_START_TIMEOUT_CAP_MS } : void 0);
+			}, turnId, {
+				...attempt > 1 ? { startTimeoutCapMs: RETRY_STREAM_START_TIMEOUT_CAP_MS } : {},
+				onServerToolActivity: () => {
+					serverToolActivity = true;
+				}
+			});
 			break;
 		} catch (caught) {
 			let terminalErr = caught;
 			let wasAborted = ctx.signal.aborted || caught instanceof Error && caught.name === "AbortError";
 			const classified = !wasAborted ? ctx.provider.classifyError?.(caught) : null;
 			const isRetryable = classified?.kind === "provider_error" && classified.retryable === true;
-			const cleanSlate = currentText === "" && currentThinking === "";
-			const isStreamWatchdogTimeout = !wasAborted && caught instanceof OperationTimeoutError && (caught.operation === "provider first response" || caught.operation === "provider total stream" || caught.operation === "provider stream inactivity");
+			const cleanSlate = currentText === "" && currentThinking === "" && !serverToolActivity;
+			const isStreamWatchdogTimeout = !wasAborted && caught instanceof OperationTimeoutError && PROVIDER_WATCHDOG_OPERATION_SET.has(caught.operation);
 			const canRetry = !wasAborted && (isRetryable || isStreamWatchdogTimeout) && cleanSlate && attempt < retryCfg.maxAttempts;
 			const retryAfterMs = canRetry ? extractRetryAfterMs(caught) : void 0;
 			const hasNextTarget = ctx.targets !== void 0 && (ctx.activeTargetIndex ?? 0) + 1 < ctx.targets.length;
@@ -11766,13 +11799,10 @@ async function executeTurn(ctx, turn, priorUsage) {
 				input: 0,
 				output: 0
 			};
-			const placeholderText = wasAborted ? "[⏹ Streaming was aborted.]" : buildStreamErrorPlaceholder(terminalErr);
-			const errorContent = currentText ? [{
-				type: "text",
-				text: currentText
-			}] : [{
+			const placeholderText = wasAborted ? "[⏹ Streaming was aborted.]" : buildStreamErrorPlaceholder(terminalErr, currentText !== "");
+			const errorContent = [{
 				type: "text",
-				text: placeholderText
+				text: currentText ? `${currentText}\n\n${placeholderText}` : placeholderText
 			}];
 			const errorTurn = {
 				id: turnId,
@@ -15500,4 +15530,4 @@ function createAgent(rawOptions) {
 //#endregion
 export { buildExtensionRegistry as $, defaultExtensionScanPaths as $t, buildUpToCompactPrompt as A, listFiles as At, createExtensionPromptBridge as B, KEYBINDING_KEY_COL_WIDTH as Bt, BASE_INSTRUCTIONS as C, tailTruncate as Ct, buildFromCompactPrompt as D, createModelSearchTool as Dt, buildCompactPrompt as E, multiEdit as Et, summaryToTurn as F, validateToolArgs as Ft, parseExtensionInstallSource as G, matchesBinding as Gt, fetchExtensionSource as H, formatBindingForDisplay as Ht, truncateHeadForPtlRetry as I, resolveStorageDirs as It, updateInstalledExtension as J, readKeybindings as Jt, readExtensionInstallProvenance as K, mergeKeybindings as Kt, CompactInvalidInputError as L, DEFAULT_KEYBINDINGS as Lt, anchorPreviewFor as M, grep as Mt, sliceForCompaction as N, glob as Nt, buildFullCompactPrompt as O, formatModelLine as Ot, stripImagesFromTurns as P, edit as Pt, buildExtensionPreset as Q, ENTRY_CANDIDATES as Qt, CompactPromptTooLongError as R, KEYBINDING_DEFS as Rt, compactConversation as S, shell as St, TRAILER as T, looksBinary as Tt, installExtensionFromSpec as U, groupBindings as Ut, ExtensionInstallError as V, ensureKeybindingsFile as Vt, listExtensionCandidates as W, keybindingsPath as Wt, registerExtensionHostModules as X, resolveExtensionKeybindings as Xt, createExtensionHud as Y, readKeybindingsRaw as Yt, discoverAndBuildExtensionRegistry as Z, stripJsonComments as Zt, resolveTasksDir as _, shouldAutoCompact as _n, createSkillsUseTool as _t, SHELL_CASCADE_CANCEL_MESSAGE as a, defineExtension as an, createExtensionHostRuntimeBridge as at, selectFilesFromSession as b, normalizeShellCommand as bn, shellKill as bt, applyCompactSummaryCutoff as c, isValidExtensionConfigItem as cn, definePreset as ct, buildPersistedStub as d, resolveExtensionConfigValue as dn, writeFile$1 as dt, discoverExtensions as en, composeExtensionPreset as et, cleanupPersistedSession as f, sanitizeExtensionConfigActionPatch as fn, WAIT_TASK_TIMED_OUT_PREFIX as ft, resolvePersistDir as g, effectiveContextWindow as gn, isSpawnTool as gt, resolveMcpWarningsDir as h, OUTPUT_RESERVE_TOKENS as hn, createSpawnTool as ht, INTERRUPT_MESSAGE_FOR_TOOL_USE as i, scanExtensionDirectories as in, partitionExtensionCatalog as it, ANCHOR_PREVIEW_MAX_CHARS as j, createInteractionTool as jt, buildTailCompactPrompt as k, matchModelEntries as kt, PERSISTED_STUB_PREFIX as l, isValidExtensionConfigValue as ln, basicTools as lt, rehomePersistedStubs as m, AUTO_COMPACT_MIN_GROWTH_FRACTION as mn, createToolSearchTool as mt, normalizeProviders as n, isExtensionDefinition as nn, filterExtensionRegistry as nt, TOOL_USE_CANCELLED_MESSAGE as o, clampExtensionConfigNumber as on, createWorkspaceSurface as ot, maybePersistToolResult as p, toWireConfigSchema as pn, waitTask as pt, removeInstalledExtension as q, parseBindingSpec as qt, resolveModelTargets as r, parseExtensionScanPathEnv as rn, mergeContributions as rt, TOOL_USE_SKIPPED_MESSAGE as s, coerceExtensionConfigInput as sn, composePresets as st, createAgent as t, inlineLoadedExtension as tn, disposeExtensionRegistry as tt, PERSISTENCE_PREVIEW_BYTES as u, resolveExtensionConfig as un, basic_default as ut, buildPostCompactAttachments as v, defaultRepeatGuardNormalize as vn, createSkillsRunScriptTool as vt, NO_TOOLS_PREAMBLE as w, readFile$1 as wt, selectRecentFiles as x, stableStringify as xn, createShellTool as xt, selectFilesFromReadState as y, defaultRepeatGuardTracked as yn, createSkillsReadTool as yt, EMPTY_EXTENSION_REGISTRY as z, KEYBINDING_DEF_BY_ACTION as zt };
 
-//# sourceMappingURL=agent-CHtfwiSc.js.map
+//# sourceMappingURL=agent-CdnYdiRY.js.map