@sentry/junior 0.247.0 → 0.248.0

package/dist/{agent-runner-DsAFAKKs.js → agent-runner-CnlFtbzb.js}

@@ -1,30 +1,30 @@
-import { b as getGatewayApiKey, c as hasCompactedConversationContext, d as unwrapCurrentInstruction, f as escapeXml, g as getProviderErrorAttributes, h as findProviderError, i as completeText, l as isCompactionSummaryText, m as createProviderError, n as GEN_AI_SERVER_ADDRESS, o as resolveGatewayModel, p as ProviderError, r as completeObject, s as COMPACTION_SUMMARY_PREFIX, t as GEN_AI_PROVIDER_NAME, u as renderCurrentInstruction, v as isProviderRetryError, x as resolveGatewayCredential, y as MISSING_GATEWAY_CREDENTIALS_ERROR } from "./client-BVnfNd3D.js";
-import { C as withLogContext, F as normalizeIdentityEmail, I as isRecord$3, R as toOptionalString, a as extractGenAiUsageSummary, b as setTags, c as getLogContextAttributesForSpan, d as logException, f as logInfo, g as serializeGenAiAttribute, i as extractGenAiUsageAttributes, l as getTracePropagationHeaders, m as normalizeGenAiFinishReason, p as logWarn, u as logError, v as setSpanAttributes, w as withSpan, x as summarizeMessageText, y as setSpanStatus } from "./logging-CZEc8_v4.js";
+import { b as getGatewayApiKey, c as hasCompactedConversationContext, d as unwrapCurrentInstruction, f as escapeXml, g as getProviderErrorAttributes, h as findProviderError, i as completeText, l as isCompactionSummaryText, m as createProviderError, n as GEN_AI_SERVER_ADDRESS, o as resolveGatewayModel, p as ProviderError, r as completeObject, s as COMPACTION_SUMMARY_PREFIX, t as GEN_AI_PROVIDER_NAME, u as renderCurrentInstruction, v as isProviderRetryError, x as resolveGatewayCredential, y as MISSING_GATEWAY_CREDENTIALS_ERROR } from "./client-CWQtbizj.js";
+import { C as withLogContext, F as normalizeIdentityEmail, I as isRecord$3, R as toOptionalString, a as extractGenAiUsageSummary, b as setTags, c as getLogContextAttributesForSpan, d as logException, f as logInfo, g as serializeGenAiAttribute, i as extractGenAiUsageAttributes, l as getTracePropagationHeaders, m as normalizeGenAiFinishReason, p as logWarn, u as logError, v as setSpanAttributes, w as withSpan, x as summarizeMessageText, y as setSpanStatus } from "./logging-OpC2jwiV.js";
 import { m as startInactiveSpan, v as withActiveSpan } from "./sentry-CgWZM_kV.js";
-import { a as toCanonicalInputMessage, c as toGenAiPayloadMetadata, i as runWithConversationPrivacy, l as toGenAiPayloadTraceAttributes, o as toCanonicalOutputMessage, r as resolveConversationPrivacy, s as toGenAiMessagesTraceAttributes, t as canExposeConversationPayload } from "./conversation-privacy-D3TdVM9H.js";
-import { n as botConfig, v as normalizeSlackEmojiName } from "./config-CgWvImQL.js";
+import { a as toCanonicalInputMessage, c as toGenAiPayloadMetadata, i as runWithConversationPrivacy, l as toGenAiPayloadTraceAttributes, o as toCanonicalOutputMessage, r as resolveConversationPrivacy, s as toGenAiMessagesTraceAttributes, t as canExposeConversationPayload } from "./conversation-privacy-BsqXHVBz.js";
+import { n as botConfig, v as normalizeSlackEmojiName } from "./config-aitDvTQm.js";
 import { a as formatModelProfiles, c as profileConfig, i as formatModelProfile, l as TURN_REASONING_LEVELS, n as ModelProfileNotConfiguredError, o as modelIdForProfile, s as modelProfileSchema } from "./model-profile-BwU8mqwD.js";
 import { a as isUserActor, d as parseSlackTeamId, f as parseSlackUserId, g as parseSlackMessageTs, l as parseSlackChannelId, u as parseSlackChannelReferenceId } from "./actor-BTtLaeWy.js";
-import { N as parseDestination, T as hasAgentTurnUsage, c as getConversationEventStore, d as getDb, f as getSqlExecutor, l as getConversationMessageSearchStore, r as readActorIdentity, u as getConversationStore, x as addAgentTurnUsage } from "./viewer-BlAozHer.js";
+import { N as parseDestination, S as agentTurnCostUsd, T as hasAgentTurnUsage, c as getConversationEventStore, d as getDb, f as getSqlExecutor, l as getConversationMessageSearchStore, r as readActorIdentity, u as getConversationStore, x as addAgentTurnUsage } from "./viewer-CX41TWYr.js";
 import { a as juniorAgentInvocations, c as juniorIdentities, d as juniorDestinations, i as juniorAgentBindings, n as AGENT_INVOCATION_PARENT_MAILBOX_STATUSES, s as juniorConversations, t as AGENT_INVOCATION_MAILBOX_STATUSES } from "./agent-invocations-D_YoNnAn.js";
-import { C as juniorArtifacts, S as juniorAttachments, a as juniorSchedulerRuns, l as juniorStats, m as juniorConversationBriefs, y as juniorConversationAnnotations } from "./executor-DQazjeGA.js";
+import { C as juniorArtifacts, S as juniorAttachments, a as juniorSchedulerRuns, l as juniorStats, m as juniorConversationBriefs, y as juniorConversationAnnotations } from "./executor-oIZAkQZb.js";
 import { d as instructionActors, f as instructionProvenanceFor, p as sameActorIdentity, t as KNOWN_CONVERSATION_EVENT_TYPES, u as contextProvenance } from "./history-Nte1oVed.js";
 import { a as listReferenceFiles, c as soulPathCandidates, l as worldPathCandidates } from "./package-discovery-BVvSnQBB.js";
-import { a as resolveAuthTokenPlaceholder, c as fetchWithBoundedOAuthErrorBodies, d as credentialContextForActor, f as credentialContextSchema, h as CredentialUnavailableError, i as resolvePluginHeaderEnvRefs, l as getOAuthProviderErrorAttributes, m as credentialUserSubjectId, o as resolvePluginCommandEnv, s as OAuthProviderError } from "./registry-CtaDOOM5.js";
-import { n as pluginCatalogRuntime } from "./catalog-runtime-DS1k7fUG.js";
-import { a as parseSkillInvocation, i as parseSkillFile, n as findSkillByName, r as loadSkillsByName, t as discoverSkills } from "./skills-DQy-mmBC.js";
-import { At as openConversationProjection, B as postSlackEphemeralMessage, Bt as recordTurnRoute, Et as loadLastModelProfile, F as slackMention, Ft as recordAuthorizationRequested, It as recordGuardianActionReviewed, J as saveTurnCheckpoint, Jt as fallbackShortTitle, K as continuableMessages, L as addReactionToMessage, Lt as recordMcpProviderConnected, M as formatSlackLink, Mt as recordAttachmentsDelivered, R as getSlackMessagePermalink, Tt as loadConversationProjection, U as uploadFilesToConversation, V as postSlackMessage, Yt as resolveTaskTitle, _t as retainRuntimeTurnContext, a as readScheduledAutomation, at as isTurnExecutionLimitExceededError, b as saveEventAutomation, bt as TURN_CONTEXT_TAG, cn as getAgentContextCompactionTriggerTokens, ct as getTerminalAssistantMessages, dn as piMessageFromHistoryItem, f as createEventAutomation, ft as isAssistantMessage, g as getEventAutomation, gt as normalizeToolNameFromResult, ht as isToolResultMessage, j as escapeSlackMrkdwnText, jt as recordAgentsInstructionsUpdated, k as automationRevision, kt as loadTurnRoute, ln as getAgentContextInputLimitTokens, lt as getUserMessageInstructionText, mt as isToolResultError, nt as TurnSliceLimitExceededError, o as saveScheduledAutomation, ot as extractAssistantText, p as deleteEventAutomation, pt as isContinuablePiBoundary, q as loadTurnCheckpoint, r as listScheduledAutomationsForTeam, rt as assertTurnToolCallLimit, sn as estimateTextTokens, st as getPiMessageRole, t as createScheduledAutomation, un as historyItemFromPiMessage, ut as hasRuntimeTurnContext, v as listEventAutomationsForTeam, vt as stripRuntimeTurnContext, wt as loadConnectedMcpProviders, x as setEventAutomationStatus, xt as ToolInputError, yt as trimTrailingAssistantMessages, z as openSlackDirectMessage, zt as recordToolExecutionStarted } from "./tasks-DMmRrIVl.js";
-import { A as getWorkspaceSnapshotBuilder, B as cancelWatch, Bt as isConversationScopedChannel, C as WorkspaceValidationError, D as setWorkspaceSnapshotBuild, E as setWorkspaceSnapshot, F as RESOURCE_SUBSCRIPTION_DEFAULT_TTL_MS, Ft as SlackActionError, G as findMatchingWatches, H as createTimerWatch, Ht as normalizeSlackConversationId, I as RESOURCE_SUBSCRIPTION_MAX_TTL_MS, It as downloadPrivateSlackFile, K as listWatches, L as RESOURCE_WATCH_TOOL_SOURCE, Lt as getFilePermalink, M as workspaceRepoCheckoutPath, Mt as defaultTimezone, N as resolveChannelCapabilities, Nt as resolveUserTimezone, O as SANDBOX_RUNTIME, Ot as saveObjectAnnotations, P as getSlackToolContext, R as STOP_WATCHING_TOOL_NAME, S as updateWorkspace, T as loadSnapshotsForProfile, U as createWatch, Vt as isDmChannel$1, W as deliverWatch, Wt as withSlackRetries, _ as deleteWorkspace, b as listWorkspaces, c as getPluginTools, g as createWorkspace, it as getDashboardTaskLink, j as tryWorkspaceRepoCheckoutPath, k as deleteWorkspaceSnapshotBuilders, kt as createPluginAnnotations, l as getPluginUserPromptContributions, lt as createPluginLogger, nt as getDashboardConversationLink, r as createPluginHookRunner, s as getPluginSystemPromptContributions, u as getPlugins, v as getWorkspace, w as invalidateReadySnapshot, wt as matchSlackAttachments, y as getWorkspaceByName, z as cancelSubscriptions, zt as getSlackClient } from "./agent-hooks-C72ByH0C.js";
-import { B as briefOutcomeStatusSchema, I as detectImageMediaType, L as isVisionImageMediaType, V as conversationBriefSchema, q as removedCardSchema, z as briefLinkSchema } from "./conversation-CYsbVFLx.js";
-import { A as SANDBOX_DATA_ROOT, D as fenceLock, E as acquireActiveLock, F as sandboxSkillFile, I as sandboxSkillPathResolution, M as SANDBOX_SKILLS_ROOT, N as SANDBOX_WORKSPACE_ROOT, O as withLock, P as sandboxSkillDir, _ as workspaceSnapshotNotReadyUserMessage, a as isAbortError, b as buildNonInteractiveShellScript, c as isSandboxCommandStreamInterruptedError, d as isSnapshottingError, f as throwSandboxOperationError, g as isWorkspaceSnapshotNotReadyError, h as getWorkspaceSnapshotNotReadyError, i as ensureDockerDaemon, j as SANDBOX_REPOS_ROOT, k as sleep, l as isSandboxMissingError, m as WorkspaceSnapshotNotReadyError, n as hash, o as isAlreadyExistsError, p as wrapSandboxSetupError, r as isStale, s as isSandboxApiTransientError, t as create, u as isSandboxUnavailableError, v as getVercelSandboxCredentials, w as getStateAdapter, x as runNonInteractiveCommand, y as buildCommandScript } from "./profile-aVLDAirh.js";
-import { n as canReusePendingAuthLink, t as abandonReplacedPendingAuth } from "./pending-auth-Oo5AQhaf.js";
+import { a as resolveAuthTokenPlaceholder, c as fetchWithBoundedOAuthErrorBodies, d as credentialContextForActor, f as credentialContextSchema, h as CredentialUnavailableError, i as resolvePluginHeaderEnvRefs, l as getOAuthProviderErrorAttributes, m as credentialUserSubjectId, o as resolvePluginCommandEnv, s as OAuthProviderError } from "./registry-fpIZHoqE.js";
+import { n as pluginCatalogRuntime } from "./catalog-runtime-CTBsdSam.js";
+import { a as parseSkillInvocation, i as parseSkillFile, n as findSkillByName, r as loadSkillsByName, t as discoverSkills } from "./skills-BgGiQt5Y.js";
+import { B as postSlackEphemeralMessage, Bt as recordMcpProviderConnected, Ct as TURN_CONTEXT_TAG, Dt as loadConnectedMcpProviders, F as slackMention, Ft as recordAttachmentsDelivered, Ht as recordToolExecutionStarted, J as saveTurnCheckpoint, K as continuableMessages, L as addReactionToMessage, M as formatSlackLink, Mt as loadTurnRoute, Nt as openConversationProjection, Ot as loadConversationProjection, Pt as recordAgentsInstructionsUpdated, Qt as resolveTaskTitle, R as getSlackMessagePermalink, Rt as recordAuthorizationRequested, St as trimTrailingAssistantMessages, U as uploadFilesToConversation, Ut as recordTurnRoute, V as postSlackMessage, Zt as fallbackShortTitle, _t as isToolResultError, a as readScheduledAutomation, at as TurnToolCallLimitExceededError, b as saveEventAutomation, bt as retainRuntimeTurnContext, ct as isTurnExecutionLimitExceededError, dn as getAgentContextCompactionTriggerTokens, dt as getTerminalAssistantMessages, f as createEventAutomation, fn as getAgentContextInputLimitTokens, ft as getUserMessageInstructionText, g as getEventAutomation, gt as isContinuablePiBoundary, ht as isAssistantMessage, it as TurnSliceLimitExceededError, j as escapeSlackMrkdwnText, k as automationRevision, kt as loadLastModelProfile, lt as extractAssistantText, mn as piMessageFromHistoryItem, nt as TURN_LIMIT_DISABLED_REASON, o as saveScheduledAutomation, p as deleteEventAutomation, pn as historyItemFromPiMessage, pt as hasRuntimeTurnContext, q as loadTurnCheckpoint, r as listScheduledAutomationsForTeam, rt as TurnBudgetExceededError, st as createTurnLimitGate, t as createScheduledAutomation, un as estimateTextTokens, ut as getPiMessageRole, v as listEventAutomationsForTeam, vt as isToolResultMessage, wt as ToolInputError, x as setEventAutomationStatus, xt as stripRuntimeTurnContext, yt as normalizeToolNameFromResult, z as openSlackDirectMessage, zt as recordGuardianActionReviewed } from "./tasks-DREdnhVP.js";
+import { A as getWorkspaceSnapshotBuilder, At as saveObjectAnnotations, B as STOP_WATCHING_TOOL_NAME, C as WorkspaceValidationError, D as setWorkspaceSnapshotBuild, E as setWorkspaceSnapshot, Et as matchSlackAttachments, F as isSlackMessageTurn, Ft as resolveUserTimezone, G as createWatch, H as cancelWatch, Ht as isConversationScopedChannel, I as slackMessageTurnDisabledReason, J as listWatches, K as deliverWatch, Kt as withSlackRetries, L as RESOURCE_SUBSCRIPTION_DEFAULT_TTL_MS, Lt as SlackActionError, M as workspaceRepoCheckoutPath, N as resolveChannelCapabilities, O as SANDBOX_RUNTIME, P as getSlackToolContext, Pt as defaultTimezone, R as RESOURCE_SUBSCRIPTION_MAX_TTL_MS, Rt as downloadPrivateSlackFile, S as updateWorkspace, T as loadSnapshotsForProfile, Ut as isDmChannel$1, V as cancelSubscriptions, Vt as getSlackClient, W as createTimerWatch, Wt as normalizeSlackConversationId, _ as deleteWorkspace, b as listWorkspaces, c as getPluginTools, dt as createPluginLogger, g as createWorkspace, it as getDashboardConversationLink, j as tryWorkspaceRepoCheckoutPath, jt as createPluginAnnotations, k as deleteWorkspaceSnapshotBuilders, l as getPluginUserPromptContributions, ot as getDashboardTaskLink, q as findMatchingWatches, r as createPluginHookRunner, s as getPluginSystemPromptContributions, u as getPlugins, v as getWorkspace, w as invalidateReadySnapshot, y as getWorkspaceByName, z as RESOURCE_WATCH_TOOL_SOURCE, zt as getFilePermalink } from "./agent-hooks-DWCHBPYw.js";
+import { B as briefLinkSchema, H as conversationBriefSchema, J as removedCardSchema, L as detectImageMediaType, R as isVisionImageMediaType, V as briefOutcomeStatusSchema } from "./conversation-Cjo9tHGm.js";
+import { A as SANDBOX_DATA_ROOT, D as fenceLock, E as acquireActiveLock, F as sandboxSkillFile, I as sandboxSkillPathResolution, M as SANDBOX_SKILLS_ROOT, N as SANDBOX_WORKSPACE_ROOT, O as withLock, P as sandboxSkillDir, _ as workspaceSnapshotNotReadyUserMessage, a as isAbortError, b as buildNonInteractiveShellScript, c as isSandboxCommandStreamInterruptedError, d as isSnapshottingError, f as throwSandboxOperationError, g as isWorkspaceSnapshotNotReadyError, h as getWorkspaceSnapshotNotReadyError, i as ensureDockerDaemon, j as SANDBOX_REPOS_ROOT, k as sleep, l as isSandboxMissingError, m as WorkspaceSnapshotNotReadyError, n as hash, o as isAlreadyExistsError, p as wrapSandboxSetupError, r as isStale, s as isSandboxApiTransientError, t as create, u as isSandboxUnavailableError, v as getVercelSandboxCredentials, w as getStateAdapter, x as runNonInteractiveCommand, y as buildCommandScript } from "./profile-Dfg76pvk.js";
+import { n as canReusePendingAuthLink, t as abandonReplacedPendingAuth } from "./pending-auth-D_nf121N.js";
 import { c as isTurnInputCommitLostError, i as TurnInputCommitLostError, r as CooperativeTurnYieldError, t as authorizationId } from "./oauth-authorization-BA4Dt6a7.js";
-import { a as isNoReplyMarker, i as NO_REPLY_MARKER, n as getAssistantReplyText, r as sanitizeAssistantText, t as decideReply } from "./assistant-reply-ChOzcTBS.js";
-import { C as registeredEventMatchSchema, D as requireSupportedEventMatch, E as requireEventIdentifier, I as readAutomationResult, L as remindMissingAutomationResult, M as FINISH_AUTOMATION_RUN_TOOL_NAME, N as automationResultSchema, S as pluginSupportsEvent, T as registeredResourceTypeSchema, _ as workspaceSnapshotWatch, b as eventNamespaceSchema, d as requireSlackChannelMessageScope, g as workspaceSnapshotFinishedEvent, h as WORKSPACE_SNAPSHOT_READY_EVENT, l as getEventCatalog, m as WORKSPACE_SNAPSHOT_FAILED_EVENT, n as markConversationsStopped, o as enqueueEventNotification, t as getConversationStoppedAtMs, v as automationEventCatalog, w as registeredEventTypeSchema, x as hasEventCatalogEntries } from "./session-stop-CAhBfBUT.js";
+import { a as isNoReplyMarker, i as NO_REPLY_MARKER, n as getAssistantReplyText, r as sanitizeAssistantText, t as decideReply } from "./assistant-reply-BxCi7V4v.js";
+import { C as registeredEventMatchSchema, D as requireSupportedEventMatch, E as requireEventIdentifier, I as readAutomationResult, L as remindMissingAutomationResult, M as FINISH_AUTOMATION_RUN_TOOL_NAME, N as automationResultSchema, S as pluginSupportsEvent, T as registeredResourceTypeSchema, _ as workspaceSnapshotWatch, b as eventNamespaceSchema, d as requireSlackChannelMessageScope, g as workspaceSnapshotFinishedEvent, h as WORKSPACE_SNAPSHOT_READY_EVENT, l as getEventCatalog, m as WORKSPACE_SNAPSHOT_FAILED_EVENT, n as markConversationsStopped, o as enqueueEventNotification, t as getConversationStoppedAtMs, v as automationEventCatalog, w as registeredEventTypeSchema, x as hasEventCatalogEntries } from "./session-stop-dyvsZDB0.js";
 import { i as isValidTimeZone, r as getZonedDateTimeParts } from "./cadence-D00SCzT1.js";
-import { a as createSandboxSession, c as postinstall, d as getSandboxResources, i as bindSandboxFileSystem, l as setSnapshotSpanAttributes, n as isMissingError, o as stopSession, r as resolve$1, s as dependencies } from "./resolve-Bdw4hu7s.js";
-import { a as getVercelConversationWorkQueue, f as getTurnRequestDeadline, n as sendNextWorkspaceSnapshotJob, r as sendWorkspaceSnapshotJob } from "./job-queue-BEUqRhjC.js";
-import { E as stopConversationWork } from "./store-DjLA8GKs.js";
+import { a as createSandboxSession, c as postinstall, d as getSandboxResources, i as bindSandboxFileSystem, l as setSnapshotSpanAttributes, n as isMissingError, o as stopSession, r as resolve$1, s as dependencies } from "./resolve-LMCZhQVg.js";
+import { a as getVercelConversationWorkQueue, f as getTurnRequestDeadline, n as sendNextWorkspaceSnapshotJob, r as sendWorkspaceSnapshotJob } from "./job-queue-DyA2AEnY.js";
+import { E as stopConversationWork } from "./store-OMQAFrJG.js";
 import { F as taskOutcomeInputSchema, M as compileScheduleIntent, N as scheduleIntentSchema, O as automationInstructionToolSchema, T as SCHEDULED_AUTOMATION_SYSTEM_ACTOR, j as ScheduleIntentError, k as automationTitleSchema } from "./automation-gznOMaQ2.js";
 import { r as isExperimentalFeatureEnabled } from "./experimental-Qn9rKLgx.js";
 import { n as privateTraceResultAttributes } from "./private-trace-result-BLvBjy_e.js";
@@ -43,6 +43,7 @@ import { Agent, estimateContextTokens } from "@earendil-works/pi-agent-core";
 import fs from "node:fs/promises";
 import fs$1 from "node:fs";
 import { isRetryableAssistantError } from "@earendil-works/pi-ai";
+import { Kind } from "@sinclair/typebox";
 import { Sandbox } from "@vercel/sandbox";
 import { Bash, defineCommand } from "just-bash";
 import { structuredPatch } from "diff";
@@ -55,7 +56,6 @@ import https from "node:https";
 import net from "node:net";
 import { NodeHtmlMarkdown } from "node-html-markdown";
 import { Value } from "@sinclair/typebox/value";
-import { Kind } from "@sinclair/typebox";
 import { SignJWT, importPKCS8 } from "jose";
 //#region src/chat/configuration/defaults.ts
 let installDefaults = {};
@@ -1345,6 +1345,29 @@ var AuthorizationFlowDisabledError = class extends Error {
 	}
 };
 //#endregion
+//#region src/chat/tools/definition.ts
+/** Distinguish legacy TypeBox schemas from JSON Schema projected from Zod. */
+function isTypeBoxInputSchema(schema) {
+	return typeof schema === "object" && schema !== null && Kind in schema;
+}
+/** Tool error text for a call to a tool that is disabled in this Turn. */
+function disabledToolMessage(toolName, reason) {
+	return `${toolName} is disabled in this Turn. ${reason} Do not call it again in this Turn.`;
+}
+/**
+* Disable tools for this Turn without removing them from the tool list.
+*
+* The tool adapter rejects their calls, and the Turn context lists them. An
+* unset reason keeps the tools enabled.
+*/
+function disableTools(tools, reason) {
+	if (!reason) return tools;
+	return Object.fromEntries(Object.entries(tools).map(([name, tool]) => [name, {
+		...tool,
+		disabledReason: reason
+	}]));
+}
+//#endregion
 //#region src/chat/agent/types.ts
 /** Resume the agent turn after a transient or ambiguous delivery failure. */
 var RetryableDeliveryError = class extends Error {
@@ -1996,6 +2019,13 @@ function buildPluginPromptContributionsSection(contributions) {
 	for (const contribution of contributions) lines.push(`  <plugin-contribution plugin="${escapeXml(contribution.pluginName)}" id="${escapeXml(contribution.id)}">`, escapeXml(contribution.text.trim()), "  </plugin-contribution>");
 	return renderTagBlock("plugin-context", lines.join("\n"));
 }
+function buildDisabledToolsSection(tools) {
+	if (!tools || tools.length === 0) return null;
+	const namesByReason = /* @__PURE__ */ new Map();
+	for (const tool of tools) namesByReason.set(tool.reason, [...namesByReason.get(tool.reason) ?? [], tool.name]);
+	const lines = ["These tools are disabled in this Turn. Do not call them.", ...[...namesByReason].map(([reason, names]) => `- ${names.map((name) => `\`${name}\``).join(", ")}: ${reason}`)];
+	return renderTagBlock("disabled-tools", escapeXml(lines.join("\n")));
+}
 /** Render plugin system prompt additions under a core-owned wrapper. */
 function buildPluginSystemPromptContributions(contributions) {
 	if (contributions.length === 0) return null;
@@ -2035,7 +2065,8 @@ function buildSystemPrompt(platform, mode = "conversation") {
 function buildTurnContextPrompt(params) {
 	const includeSessionContext = params.includeSessionContext ?? true;
 	const pluginPromptContributions = buildPluginPromptContributionsSection(params.pluginPromptContributions);
-	if (!includeSessionContext && !pluginPromptContributions) return null;
+	const disabledTools = buildDisabledToolsSection(params.disabledTools);
+	if (!includeSessionContext && !pluginPromptContributions && !disabledTools) return null;
 	const runtimeSections = [
 		includeSessionContext ? buildCapabilitiesSection({
 			availableSkills: params.availableSkills,
@@ -2043,6 +2074,7 @@ function buildTurnContextPrompt(params) {
 			toolGuidance: params.toolGuidance ?? []
 		}) : null,
 		pluginPromptContributions,
+		disabledTools,
 		includeSessionContext ? buildContextSection({
 			actor: params.actor,
 			configuration: params.configuration,
@@ -2346,9 +2378,11 @@ async function assemblePrompt(args) {
 		context: args.toolRuntimeContext,
 		turnId: args.turnId
 	});
-	const turnContextPrompt = needsBootstrapContextForPrompt || pluginUserPromptContributions.length > 0 ? buildTurnContextPrompt({
+	const disabledTools = !shouldPromptAgent || replayedPrompt ? [] : args.disabledTools;
+	const turnContextPrompt = needsBootstrapContextForPrompt || pluginUserPromptContributions.length > 0 || disabledTools.length > 0 ? buildTurnContextPrompt({
 		availableSkills: args.availableSkills,
 		activeMcpCatalogs: args.activeMcpCatalogs,
+		disabledTools,
 		includeSessionContext: needsBootstrapContextForPrompt,
 		pluginPromptContributions: pluginUserPromptContributions,
 		toolGuidance: args.toolGuidance,
@@ -4663,9 +4697,13 @@ function createSandboxRuntime(options) {
 			if (activeWorkspace?.id === workspace.id && dependencyProfileHash === nextProfileHash) return;
 			if (acquiringSandbox) await getOrAcquireSandbox(signal);
 			const previous = activeSandbox;
+			signal?.throwIfAborted();
+			const switching = new AbortController();
+			const stopSwitching = () => switching.abort(signal?.reason);
+			signal?.addEventListener("abort", stopSwitching, { once: true });
 			let candidate;
 			try {
-				candidate = await createSandboxCandidate(workspace, nextProfileHash, signal);
+				candidate = await createSandboxCandidate(workspace, nextProfileHash, switching.signal);
 				await probeSession(candidate.session);
 				signal?.throwIfAborted();
 				await extendKeepAlive(candidate.session);
@@ -4674,6 +4712,8 @@ function createSandboxRuntime(options) {
 			} catch (error) {
 				await stopSession(candidate?.session);
 				throw error;
+			} finally {
+				signal?.removeEventListener("abort", stopSwitching);
 			}
 			if (keepAliveTimer) {
 				clearTimeout(keepAliveTimer);
@@ -8290,15 +8330,46 @@ async function listChildAgents(parentConversationId) {
 	const stoppedAtMs = new Map(stops.map((row) => [row.conversationId, row.stoppedAt?.getTime()]));
 	return [...byChild.entries()].map(([childConversationId, invocations]) => childAgentFromInvocations(invocations, resultInvocationIds, stoppedAtMs.get(childConversationId))).sort((left, right) => right.updatedAtMs - left.updatedAtMs);
 }
+/**
+* List the agents that one Conversation can see. A root Conversation sees
+* only its child agents. A child agent also sees itself, its parent, and the
+* other child agents of its parent.
+*/
+async function listAgentRelatives(input) {
+	const { conversationId, parentConversationId } = input;
+	const [children, family, parent] = await Promise.all([
+		listChildAgents(conversationId),
+		parentConversationId ? listChildAgents(parentConversationId) : [],
+		parentConversationId ? getConversationStore().get({ conversationId: parentConversationId }) : void 0
+	]);
+	const self = family.find((agent) => agent.childConversationId === conversationId);
+	return {
+		children,
+		...parent ? { parent: {
+			conversationId: parent.conversationId,
+			status: parent.execution.status,
+			updatedAtMs: parent.execution.updatedAtMs ?? parent.updatedAtMs
+		} } : void 0,
+		...self ? { self } : void 0,
+		siblings: family.filter((agent) => agent.childConversationId !== conversationId)
+	};
+}
 //#endregion
 //#region src/chat/tools/runtime/list-agents.ts
 const TASK_MAX_LENGTH = 1e3;
 const ERROR_MAX_LENGTH = 500;
+/** How a listed agent relates to the conversation that lists it. */
+const AGENT_RELATIONS = [
+	"self",
+	"parent",
+	"child",
+	"sibling"
+];
 /**
-* What a child agent does now. The words match the Conversation execution
+* What an agent does now. The words match the Conversation execution
 * status, plus `stopped` after stopAgent.
 */
-const CHILD_AGENT_STATUSES = [
+const LISTED_AGENT_STATUSES = [
 	"pending",
 	"running",
 	"paused",
@@ -8316,23 +8387,45 @@ function childAgentStatus(agent) {
 		case "failed": return "idle";
 	}
 }
+function parentAgentStatus(agent) {
+	return agent.status === "failed" ? "idle" : agent.status;
+}
 function truncate(text, maxLength) {
 	return text.length > maxLength ? `${text.slice(0, maxLength)}…` : text;
 }
-const listAgentsOutputSchema = juniorToolOutputSchema.extend({ agents: z.array(z.object({
-	conversation_id: z.string().min(1).describe("Child conversation ID. Pass it to searchConversationEvents to read the child's history."),
-	name: agentNameSchema.optional().describe("Child-agent name. Pass it to messageAgent."),
-	status: z.enum(CHILD_AGENT_STATUSES).describe("What the child agent does now. pending: waiting to run. running or paused: working. idle: finished its work and waits for a message. stopped: stopAgent stopped it."),
-	last_result: z.enum(CHILD_AGENT_RESULTS).optional().describe("How the latest finished task of the child agent ended"),
-	task: z.string().describe("Latest task given to the child agent"),
+const listedAgentSchema = z.object({
+	relation: z.enum(AGENT_RELATIONS).describe("self: this conversation. parent: the agent that started it. child: an agent that it started. sibling: another child of its parent."),
+	conversation_id: z.string().min(1).describe("Agent conversation ID. Pass it to searchConversationEvents to read the agent's history."),
+	name: agentNameSchema.optional().describe("Agent name given by its parent. Pass the name of a child agent to messageAgent."),
+	status: z.enum(LISTED_AGENT_STATUSES).describe("What the agent does now. pending: waiting to run. running or paused: working. idle: finished its work and waits for a message. stopped: stopAgent stopped it."),
+	last_result: z.enum(CHILD_AGENT_RESULTS).optional().describe("How the latest finished task of the agent ended"),
+	task: z.string().optional().describe("Latest task that its parent gave the agent. Not shown for the parent."),
 	title: z.string().optional().describe("Short display title of the latest task"),
-	error: z.string().optional().describe("Why the child agent is blocked, failed, or stopped"),
+	error: z.string().optional().describe("Why the agent is blocked, failed, or stopped"),
 	updated_at: z.string().describe("Time of the latest change")
-}).strict()).describe("Child agents of this conversation, newest activity first") });
-/** Create the read-only tool that lists the child agents of one conversation. */
-function createListAgentsTool(conversationId) {
+}).strict();
+function listedChildAgent(relation, agent) {
+	return {
+		relation,
+		conversation_id: agent.childConversationId,
+		...agent.agentName ? { name: agent.agentName } : void 0,
+		status: childAgentStatus(agent),
+		...agent.lastResult ? { last_result: agent.lastResult } : void 0,
+		task: truncate(agent.task, TASK_MAX_LENGTH),
+		...agent.title ? { title: agent.title } : void 0,
+		...agent.errorMessage ? { error: truncate(agent.errorMessage, ERROR_MAX_LENGTH) } : void 0,
+		updated_at: new Date(agent.updatedAtMs).toISOString()
+	};
+}
+const listAgentsOutputSchema = juniorToolOutputSchema.extend({ agents: z.array(listedAgentSchema).describe("This conversation, its parent, its child agents, then its siblings. Child agents and siblings show the newest activity first.") });
+/**
+* Create the read-only tool that lists the agents one conversation can see:
+* its child agents and, for a child agent, itself, its parent, and its
+* siblings.
+*/
+function createListAgentsTool(context) {
 	return zodTool({
-		description: "List the child agents that this conversation started, with the state recorded by the runtime. Use it to check which child agents are still working, or to find a child agent before you give it more work with messageAgent. Results still arrive as new tasks; do not poll with this tool.",
+		description: "List the agents that this conversation can see, with the state recorded by the runtime: the child agents it started and, for a child agent, itself, its parent, and its siblings. Use it to check which agents are still working, to see what your siblings work on, or to find a child agent before you give it more work with messageAgent. Results still arrive as new tasks; do not poll with this tool.",
 		annotations: {
 			destructiveHint: false,
 			idempotentHint: true,
@@ -8341,16 +8434,20 @@ function createListAgentsTool(conversationId) {
 		},
 		inputSchema: z.object({}).strict(),
 		outputSchema: listAgentsOutputSchema,
-		execute: async () => ({ agents: (await listChildAgents(conversationId)).map((agent) => ({
-			conversation_id: agent.childConversationId,
-			...agent.agentName ? { name: agent.agentName } : void 0,
-			status: childAgentStatus(agent),
-			...agent.lastResult ? { last_result: agent.lastResult } : void 0,
-			task: truncate(agent.task, TASK_MAX_LENGTH),
-			...agent.title ? { title: agent.title } : void 0,
-			...agent.errorMessage ? { error: truncate(agent.errorMessage, ERROR_MAX_LENGTH) } : void 0,
-			updated_at: new Date(agent.updatedAtMs).toISOString()
-		})) })
+		execute: async () => {
+			const { children, parent, self, siblings } = await listAgentRelatives(context);
+			return { agents: [
+				...self ? [listedChildAgent("self", self)] : [],
+				...parent ? [{
+					relation: "parent",
+					conversation_id: parent.conversationId,
+					status: parentAgentStatus(parent),
+					updated_at: new Date(parent.updatedAtMs).toISOString()
+				}] : [],
+				...children.map((agent) => listedChildAgent("child", agent)),
+				...siblings.map((agent) => listedChildAgent("sibling", agent))
+			] };
+		}
 	});
 }
 //#endregion
@@ -9585,15 +9682,15 @@ function createUpdateEventAutomationTool(context, catalog) {
 }
 //#endregion
 //#region src/chat/tools/event-automations.ts
-/** Build event automation tools for an interactive Slack actor. */
+/** Build event automation tools for a Conversation with a Slack Location. */
 function createEventAutomationTools(context, catalog) {
-	if (context.source.kind !== "slack" || context.destination.platform !== "slack" || context.actor?.platform !== "slack") return {};
-	return {
+	if (!getSlackToolContext(context)) return {};
+	return disableTools({
 		createEventAutomation: createEventAutomationTool(context, catalog),
 		listEventAutomations: createListEventAutomationsTool(context, catalog),
 		updateEventAutomation: createUpdateEventAutomationTool(context, catalog),
 		deleteEventAutomation: createDeleteEventAutomationTool(context, catalog)
-	};
+	}, slackMessageTurnDisabledReason(context));
 }
 //#endregion
 //#region src/chat/scheduled-automations/telemetry.ts
@@ -10252,26 +10349,28 @@ function createSlackScheduleUpdateAutomationTool(context) {
 //#endregion
 //#region src/chat/tools/scheduled-automations.ts
 function scheduledAutomationToolContext(context) {
-	if (context.source.kind !== "slack" || context.destination.platform !== "slack" || context.actor?.platform !== "slack" || !context.resolveActorIdentity) return;
+	const slackMessageTurn = isSlackMessageTurn(context) ? {
+		actor: context.actor,
+		source: context.source
+	} : void 0;
 	return {
 		conversationId: context.conversationId,
-		actor: context.actor,
-		source: context.source,
-		users: { resolveActor: context.resolveActorIdentity },
+		...slackMessageTurn,
+		users: { resolveActor: context.resolveActorIdentity ?? (async () => void 0) },
 		...context.userText ? { userText: context.userText } : void 0
 	};
 }
-/** Build scheduled-automation tools for an interactive Slack actor. */
+/** Build scheduled-automation tools for a Conversation with a Slack Location. */
 function createScheduledAutomationTools(context) {
+	if (!getSlackToolContext(context)) return {};
 	const taskContext = scheduledAutomationToolContext(context);
-	if (!taskContext) return {};
-	return {
+	return disableTools({
 		slackScheduleCreateAutomation: createSlackScheduleCreateAutomationTool(taskContext),
 		slackScheduleListAutomations: createSlackScheduleListAutomationsTool(taskContext),
 		slackScheduleUpdateAutomation: createSlackScheduleUpdateAutomationTool(taskContext),
 		slackScheduleDeleteAutomation: createSlackScheduleDeleteAutomationTool(taskContext),
 		slackScheduleRunAutomationNow: createSlackScheduleRunAutomationNowTool(taskContext)
-	};
+	}, slackMessageTurnDisabledReason(context));
 }
 //#endregion
 //#region src/chat/slack/channel.ts
@@ -15030,7 +15129,12 @@ function createToolState() {
 		}
 	};
 }
-/** Build the model-facing tool registry from runtime-owned context and capabilities. */
+/**
+* Build the model-facing tool registry from runtime-owned context and capabilities.
+*
+* Choose tools from the Conversation, not from one Turn, so the cached tool
+* list stays the same. Use `disableTools` when a Turn cannot use a tool.
+*/
 function createTools(availableSkills, hooks = {}, context, options = {}) {
 	const state = createToolState();
 	const slackContext = getSlackToolContext(context);
@@ -15038,7 +15142,7 @@ function createTools(availableSkills, hooks = {}, context, options = {}) {
 	const canSendFilesToActiveConversation = Boolean(slackContext ? slackLocationCapabilities?.canSendFiles : context.attachmentStorage);
 	const eventCatalog = getEventCatalog();
 	const tools = {
-		...options.includeLoadSkill === false ? void 0 : { loadSkill: createLoadSkillTool(availableSkills, { onSkillLoaded: hooks.onSkillLoaded }) },
+		loadSkill: createLoadSkillTool(availableSkills, { onSkillLoaded: hooks.onSkillLoaded }),
 		updatePlan: createUpdatePlanTool(),
 		reportProgress: createReportProgressTool(),
 		systemTime: createSystemTimeTool(),
@@ -15096,9 +15200,12 @@ function createTools(availableSkills, hooks = {}, context, options = {}) {
 	if (context.spawnAgent) {
 		if (!context.spawnAgentProfiles) throw new Error("spawnAgent is missing its configured model profiles");
 		tools.spawnAgent = createSpawnAgentTool(context.spawnAgent, context.spawnAgentProfiles);
-		tools.listAgents = createListAgentsTool(context.conversationId);
 		tools.stopAgent = createStopAgentTool(context.conversationId);
 	}
+	if (context.spawnAgent || context.messageAgent) tools.listAgents = createListAgentsTool({
+		conversationId: context.conversationId,
+		parentConversationId: context.parentConversationId
+	});
 	if (context.messageAgent) tools.messageAgent = createMessageAgentTool(context.messageAgent);
 	if (context.parentConversationId) tools[REPORT_BLOCKED_TOOL_NAME] = createReportBlockedTool();
 	if (context.automation) tools[FINISH_AUTOMATION_RUN_TOOL_NAME] = createFinishAutomationRunTool(context.automation);
@@ -15120,7 +15227,7 @@ function createTools(availableSkills, hooks = {}, context, options = {}) {
 			provider: "slack",
 			providerTenantId: slackContext.teamId
 		}, context.conversationId);
-		if (context.source.kind === "slack") tools.slackPublicSearch = createSlackPublicSearchTool(context.slackActionToken);
+		Object.assign(tools, disableTools({ slackPublicSearch: createSlackPublicSearchTool(context.slackActionToken) }, context.slackActionToken ? void 0 : "Slack gives a search token only for a new message or mention."));
 		const identityProviders = ["slack", ...getOAuthAccountProviders().filter((provider) => provider !== "slack")];
 		tools.userLookup = createUserLookupTool(slackContext.teamId, identityProviders);
 		tools.slackListCreate = createSlackListCreateTool(state);
@@ -15137,7 +15244,7 @@ function createTools(availableSkills, hooks = {}, context, options = {}) {
 			storage: context.attachmentStorage
 		} : void 0);
 		tools.slackChannelListMessages = createSlackChannelListMessagesTool(slackContext);
-		if (context.source.kind === "slack" && locationCapabilities.canAddReactions) tools.addReaction = createSlackMessageAddReactionTool(slackContext, state);
+		if (locationCapabilities.canAddReactions) Object.assign(tools, disableTools({ addReaction: createSlackMessageAddReactionTool(slackContext, state) }, slackContext.messageTs ? void 0 : "It needs a Slack message in this Turn to react to."));
 	}
 	for (const [name, pluginTool] of Object.entries(getPluginTools(context, options.pluginSandbox))) {
 		if (tools[name]) throw new Error(`Plugin tool "${name}" conflicts with a core tool`);
@@ -15188,12 +15295,6 @@ function latestProgressStatus(messages) {
 	}
 }
 //#endregion
-//#region src/chat/tools/definition.ts
-/** Distinguish legacy TypeBox schemas from JSON Schema projected from Zod. */
-function isTypeBoxInputSchema(schema) {
-	return typeof schema === "object" && schema !== null && Kind in schema;
-}
-//#endregion
 //#region src/chat/tool-support/catalog-tool-call.ts
 function schemaErrorText(schema, value) {
 	const firstError = [...Value.Errors(schema, value)][0];
@@ -16064,6 +16165,7 @@ function createPiAgentTools(tools, sandbox, spanContext, onStatus, sandboxTools,
 	const executeDefinition = async (args) => {
 		const { toolCallId, params, signal, setSpanAttributes, toolDef, toolName } = args;
 		if (typeof toolDef.execute !== "function") throw new Error(`Tool ${toolName} does not define an executor.`);
+		if (toolDef.disabledReason) throw new ToolInputError(disabledToolMessage(toolName, toolDef.disabledReason));
 		const beforeTool = agentHooks ? await agentHooks.beforeToolExecute({
 			name: toolName,
 			input: params
@@ -18028,7 +18130,6 @@ async function wireAgentTools(args) {
 	});
 	const getPendingAuthPause = () => pluginAuth.getPendingPause() ?? mcpAuth.getPendingPause();
 	const loadableSkills = args.availableSkills.filter((skill) => skill.disableModelInvocation !== true || skill.name === args.invokedSkill?.name);
-	const explicitSkillLoaded = Boolean(args.invokedSkill && args.activeSkills.some((skill) => skill.name === args.invokedSkill?.name));
 	const commonToolRuntimeContext = {
 		conversationId: args.run.conversationId,
 		...args.run.parentConversationId ? { parentConversationId: args.run.parentConversationId } : void 0,
@@ -18117,11 +18218,12 @@ async function wireAgentTools(args) {
 			upsertActiveSkill(args.activeSkills, effective);
 			await tryRecordSkillLoadStat(effective);
 		}
-	}, toolRuntimeContext, {
-		includeLoadSkill: !explicitSkillLoaded,
-		pluginSandbox: createPluginToolSandbox(agentSandbox, { handleAuthSignal: pluginAuth.maybeHandleAuthSignal })
-	});
+	}, toolRuntimeContext, { pluginSandbox: createPluginToolSandbox(agentSandbox, { handleAuthSignal: pluginAuth.maybeHandleAuthSignal }) });
 	const plannedToolExposure = planToolExposure(tools);
+	const disabledTools = Object.entries(tools).flatMap(([name, definition]) => definition.disabledReason ? [{
+		name,
+		reason: definition.disabledReason
+	}] : []);
 	const toolGuidance = Object.entries(plannedToolExposure.directTools).map(([name, definition]) => ({
 		name,
 		promptGuidelines: definition.promptGuidelines,
@@ -18188,6 +18290,7 @@ async function wireAgentTools(args) {
 				});
 			}
 		},
+		disabledTools,
 		toolGuidance,
 		toolRuntimeContext
 	};
@@ -18222,6 +18325,7 @@ function createResumeState(args) {
 	let turnContexts = [];
 	let turnStartMessageIndex;
 	let cumulativeToolCallCount = args.checkpoint.record?.cumulativeToolCallCount ?? 0;
+	let turnLimitWrappedUp = args.checkpoint.record?.turnLimitWrappedUp ?? false;
 	let advancedPastResume = !args.checkpoint.resumed;
 	let resumedBoundaryKey = "";
 	if (args.checkpoint.resumed && args.checkpoint.record.piMessages.length) {
@@ -18238,6 +18342,7 @@ function createResumeState(args) {
 		channelName: args.channelName,
 		credentialSubject: args.credentialSubject,
 		cumulativeToolCallCount,
+		...turnLimitWrappedUp ? { turnLimitWrappedUp } : void 0,
 		destination: args.destination,
 		dispatchId: args.dispatchId,
 		source: args.runSource,
@@ -18260,11 +18365,22 @@ function createResumeState(args) {
 		setBeforeMessageCount(count) {
 			beforeMessageCount = count;
 		},
-		/** Admit one tool call against the durable turn total, or throw the limit. */
-		admitToolCall() {
-			const next = cumulativeToolCallCount + 1;
-			assertTurnToolCallLimit(next, botConfig.maxToolCallsPerTurn);
-			cumulativeToolCallCount = next;
+		/** Usage that earlier slices of this turn saved. */
+		get priorSliceUsage() {
+			return args.checkpoint.record?.cumulativeUsage;
+		},
+		/** True once a step of this turn hit a limit and wrapped up. */
+		get turnLimitWrappedUp() {
+			return turnLimitWrappedUp;
+		},
+		/** Save the wrap-up so later slices stop instead of wrapping up again. */
+		markTurnLimitWrappedUp() {
+			turnLimitWrappedUp = true;
+		},
+		/** Charge one tool call to the durable turn total and return the total. */
+		countToolCall() {
+			cumulativeToolCallCount += 1;
+			return cumulativeToolCallCount;
 		},
 		setTurnContexts(contexts) {
 			turnContexts = contexts;
@@ -19373,6 +19489,8 @@ async function executeAgentRunInPrivacyContext(run, conversationPrivacy, runLogC
 		activeModelProfile = routedModelProfile;
 		activeModelId = routedModelId;
 		let pendingPiHookError;
+		let discardedRetryUsage;
+		const turnLimitGate = createTurnLimitGate(runResume.turnLimitWrappedUp);
 		const currentAgentMessages = () => agent ? [...agent.state.messages] : [];
 		const usageSinceCurrentBoundary = (messages) => {
 			const usage = extractGenAiUsageSummary(...messages.slice(runResume.beforeMessageCount).filter(isAssistantMessage));
@@ -19518,6 +19636,7 @@ async function executeAgentRunInPrivacyContext(run, conversationPrivacy, runLogC
 			run,
 			spanContext,
 			turnId,
+			disabledTools: wiring.disabledTools,
 			toolGuidance: wiring.toolGuidance,
 			toolRuntimeContext: wiring.toolRuntimeContext,
 			userContentParts
@@ -19618,24 +19737,39 @@ async function executeAgentRunInPrivacyContext(run, conversationPrivacy, runLogC
 				...streamFn ? { base: streamFn } : void 0
 			}),
 			steeringMode: "all",
-			beforeToolCall: async ({ assistantMessage }) => {
+			beforeToolCall: async ({ assistantMessage, toolCall }) => {
 				const toolCalls = assistantMessage.content.filter((part) => part.type === "toolCall");
 				const exclusiveTool = exclusiveToolName(toolCalls);
 				if (exclusiveTool && toolCalls.length !== 1) return {
 					block: true,
 					reason: `${exclusiveTool} must be the only tool call in its assistant message; reissue it alone`
 				};
-				try {
-					runResume.admitToolCall();
-				} catch (error) {
-					const limitError = error instanceof Error ? error : new Error(String(error));
-					pendingPiHookError ??= limitError;
+				const toolCallCount = runResume.countToolCall();
+				const turnCostUsd = agentTurnCostUsd(addAgentTurnUsage(runResume.priorSliceUsage, priorPhaseUsage, discardedRetryUsage, usageSinceCurrentBoundary(currentAgentMessages()))) ?? 0;
+				const overBudget = turnCostUsd >= botConfig.maxTurnCostUsd;
+				const decision = turnLimitGate({
+					assistantMessage,
+					overLimit: overBudget || toolCallCount > botConfig.maxToolCallsPerTurn
+				});
+				if (decision === "allow") return;
+				if (decision === "wrap_up") {
+					runResume.markTurnLimitWrappedUp();
+					logWarn("agent.turn.limit.wrap_up", {
+						"app.ai.cost.total_usd": turnCostUsd,
+						"app.ai.tool_call_count": toolCallCount
+					});
 					return {
 						block: true,
-						reason: limitError.message,
-						terminate: true
+						reason: disabledToolMessage(toolCall.name, TURN_LIMIT_DISABLED_REASON)
 					};
 				}
+				const limitError = toolCallCount > botConfig.maxToolCallsPerTurn && !overBudget ? new TurnToolCallLimitExceededError(botConfig.maxToolCallsPerTurn) : new TurnBudgetExceededError(botConfig.maxTurnCostUsd);
+				pendingPiHookError ??= limitError;
+				return {
+					block: true,
+					reason: limitError.message,
+					terminate: true
+				};
 			},
 			afterToolCall: async ({ isError, result, toolCall }, signal) => {
 				const timedOutResult = runResume.timedOut && signal?.aborted ? projectTimedOutToolResult(result) : void 0;
@@ -19648,6 +19782,7 @@ async function executeAgentRunInPrivacyContext(run, conversationPrivacy, runLogC
 			prepareNextTurnWithContext: async (nextTurn, hookSignal) => {
 				try {
 					const handoffUpdate = applyPendingHandoff();
+					if (hookSignal?.aborted) return handoffUpdate;
 					const contextUpdate = await repositoryInstructionsContext.applyUpdate(handoffUpdate, nextTurn.context);
 					const pendingMessages = await drainSteeringMessages();
 					const capacityUpdate = await applyActiveContextCompaction(contextUpdate ? currentAgentMessages() : nextTurn.context.messages, hookSignal, pendingMessages, true);
@@ -19807,7 +19942,7 @@ async function executeAgentRunInPrivacyContext(run, conversationPrivacy, runLogC
 				}] : void 0, false, Boolean(contextMessage)), () => compactionAbortController.abort());
 				if (shouldPromptAgent && handoffApplied && !capacityUpdate) await runResume.requireDurableInputCheckpoint([...agent.state.messages, freshPromptMessage]);
 				run = shouldPromptAgent && !capacityUpdate ? agent.prompt(freshPromptMessage) : agent.continue();
-				let discardedRetryUsage;
+				discardedRetryUsage = void 0;
 				let actionConfirmationRetryUsed = false;
 				let automationResultReminderUsed = !requireAutomationResult;
 				let providerRetryAttempt = 0;
@@ -20021,7 +20156,7 @@ function createAgentRunner(execute, options) {
 			} } : void 0
 		};
 		if (run.instruction.storedAttachments?.length) {
-			const { loadInputImages } = await import("./images-C3e5E-p_.js").then((n) => n.n);
+			const { loadInputImages } = await import("./images-Dzh3RBXY.js").then((n) => n.n);
 			const storage = nextRun.environment?.attachmentStorage;
 			if (!storage) throw new Error("Attachment storage is unavailable.");
 			nextRun.instruction = {