@sentry/junior 0.111.0 → 0.113.0

package/dist/{chunk-SL3ZKNLQ.js → chunk-DXRPHBOU.js}

@@ -4,7 +4,7 @@ import {
 } from "./chunk-MU6HHZEN.js";
 import {
   getStateAdapter
-} from "./chunk-PYKKM4MM.js";
+} from "./chunk-HMRVILWZ.js";
 import {
   contextProvenance,
   createSqlConversationEventStore,
@@ -15,20 +15,17 @@ import {
   instructionProvenanceFor,
   sanitizePostgresJson,
   withConversationEventLock
-} from "./chunk-ZRZ4SVWG.js";
+} from "./chunk-LLKDNPYV.js";
 import {
   sleep
 } from "./chunk-4ZNGQH7C.js";
 import {
   botConfig,
   escapeXml,
-  getPiMessageRole,
   resolveGatewayModel,
-  retainRuntimeTurnContext,
   standardModelId,
-  stripRuntimeTurnContext,
-  trimTrailingAssistantMessages
-} from "./chunk-NQLWOTY4.js";
+  unwrapCurrentInstruction
+} from "./chunk-RCBUZGIT.js";
 import {
   toStoredSlackActor
 } from "./chunk-C4MZ3GP5.js";
@@ -37,7 +34,7 @@ import {
   logException,
   logWarn,
   setSpanAttributes
-} from "./chunk-J7APPQIJ.js";
+} from "./chunk-36UJA3OD.js";
 import {
   isRecord,
   parseSlackMessageTs,
@@ -45,6 +42,111 @@ import {
   toOptionalString
 } from "./chunk-42WRQLJ6.js";
 
+// src/chat/turn-context-tag.ts
+var TURN_CONTEXT_TAG = "runtime-turn-context";
+
+// src/chat/pi/transcript.ts
+var RUNTIME_TURN_CONTEXT_START = `<${TURN_CONTEXT_TAG}>`;
+function userMessageContent(message) {
+  const record = message;
+  return record.role === "user" && Array.isArray(record.content) ? record.content : void 0;
+}
+function isRuntimeTurnContextPart(part) {
+  return part !== null && typeof part === "object" && part.type === "text" && typeof part.text === "string" && part.text.startsWith(RUNTIME_TURN_CONTEXT_START);
+}
+var EMBEDDED_THREAD_CONTEXT_TAGS = [
+  "recent-thread-messages",
+  "thread-compactions",
+  "thread-transcript",
+  "thread-background"
+];
+var EMBEDDED_THREAD_CONTEXT_PATTERN = new RegExp(
+  `<(${EMBEDDED_THREAD_CONTEXT_TAGS.join("|")})(?:\\s[^>]*)?>[\\s\\S]*?</\\1>`,
+  "g"
+);
+function isAssistantMessage(value) {
+  return typeof value === "object" && value !== null && value.role === "assistant";
+}
+function isToolResultMessage(value) {
+  return typeof value === "object" && value !== null && value.role === "toolResult";
+}
+function isToolResultError(result) {
+  if (!result || typeof result !== "object") return false;
+  return Boolean(result.isError);
+}
+function normalizeToolNameFromResult(result) {
+  if (!result || typeof result !== "object") return void 0;
+  const record = result;
+  if (typeof record.toolName === "string" && record.toolName.length > 0) {
+    return record.toolName;
+  }
+  if (typeof record.name === "string" && record.name.length > 0) {
+    return record.name;
+  }
+  return void 0;
+}
+function getPiMessageRole(value) {
+  if (!value || typeof value !== "object") {
+    return void 0;
+  }
+  const role = value.role;
+  return typeof role === "string" ? role : void 0;
+}
+function isContinuablePiBoundary(messages) {
+  const lastRole = getPiMessageRole(messages.at(-1));
+  return lastRole === "user" || lastRole === "toolResult";
+}
+function extractAssistantText(message) {
+  const content = message.content ?? [];
+  return content.filter(
+    (part) => part.type === "text" && typeof part.text === "string"
+  ).map((part) => part.text).join("\n");
+}
+function getTerminalAssistantMessages(messages) {
+  let lastNonAssistantIndex = -1;
+  for (let index = messages.length - 1; index >= 0; index -= 1) {
+    if (!isAssistantMessage(messages[index])) {
+      lastNonAssistantIndex = index;
+      break;
+    }
+  }
+  return messages.slice(lastNonAssistantIndex + 1).filter(isAssistantMessage);
+}
+function trimTrailingAssistantMessages(messages) {
+  let end = messages.length;
+  while (end > 0 && getPiMessageRole(messages[end - 1]) === "assistant") {
+    end -= 1;
+  }
+  return end === messages.length ? [...messages] : messages.slice(0, end);
+}
+function hasRuntimeTurnContext(messages) {
+  return messages.some(
+    (message) => userMessageContent(message)?.some(isRuntimeTurnContextPart)
+  );
+}
+function retainRuntimeTurnContext(messages) {
+  return messages.flatMap((message) => {
+    const runtimeContent = userMessageContent(message)?.filter(isRuntimeTurnContextPart) ?? [];
+    return runtimeContent.length > 0 ? [{ ...message, content: runtimeContent }] : [];
+  });
+}
+function instructionTextForProjection(text) {
+  const withoutContext = text.replace(EMBEDDED_THREAD_CONTEXT_PATTERN, "").trim();
+  return unwrapCurrentInstruction(withoutContext) ?? withoutContext;
+}
+function stripRuntimeTurnContext(messages) {
+  return messages.flatMap((message) => {
+    const content = userMessageContent(message);
+    if (!content) return [message];
+    const nextContent = content.filter(
+      (part) => !isRuntimeTurnContextPart(part)
+    );
+    if (nextContent.length === content.length) return [message];
+    if (nextContent.length === 0) return [];
+    return [{ ...message, content: nextContent }];
+  });
+}
+
 // src/chat/conversations/projection.ts
 import { isDeepStrictEqual } from "util";
 
@@ -1033,13 +1135,9 @@ function addDurationMs(prior, current) {
   }, void 0);
   return total;
 }
-function isContinuableBoundary(messages) {
-  const lastRole = getPiMessageRole(messages.at(-1));
-  return lastRole === "user" || lastRole === "toolResult";
-}
 function resumableBoundary(messages, fallbackMessages) {
   const current = trimTrailingAssistantMessages(messages);
-  if (current.length > 0 && isContinuableBoundary(current)) {
+  if (current.length > 0 && isContinuablePiBoundary(current)) {
     return current;
   }
   return trimTrailingAssistantMessages(fallbackMessages ?? []);
@@ -1059,7 +1157,7 @@ async function loadTurnSessionRecord(ctx) {
   };
 }
 async function persistRunningSessionRecord(args) {
-  if (args.messages.length === 0 || !isContinuableBoundary(args.messages)) {
+  if (args.messages.length === 0 || !isContinuablePiBoundary(args.messages)) {
     return false;
   }
   try {
@@ -1184,7 +1282,7 @@ async function persistAuthPauseSessionRecord(args) {
       args.messages,
       latestSessionRecord?.piMessages
     );
-    if (piMessages.length > 0 && !isContinuableBoundary(piMessages)) {
+    if (piMessages.length > 0 && !isContinuablePiBoundary(piMessages)) {
       return void 0;
     }
     return await upsertAgentTurnSessionRecord({
@@ -1241,7 +1339,7 @@ async function persistContinuationSessionRecord(args) {
       args.messages,
       latestSessionRecord?.piMessages
     );
-    if (piMessages.length === 0 || !isContinuableBoundary(piMessages)) {
+    if (piMessages.length === 0 || !isContinuablePiBoundary(piMessages)) {
       return void 0;
     }
     const cumulativeDurationMs = addDurationMs(
@@ -1322,17 +1420,14 @@ async function persistContinuationSessionRecord(args) {
 }
 async function persistYieldSessionRecord(args) {
   try {
+    const piMessages = [...args.messages];
+    if (piMessages.length === 0 || !isContinuablePiBoundary(piMessages)) {
+      return void 0;
+    }
     const latestSessionRecord = await getAgentTurnSessionRecord(
       args.conversationId,
       args.sessionId
     );
-    const piMessages = resumableBoundary(
-      args.messages,
-      latestSessionRecord?.piMessages
-    );
-    if (piMessages.length === 0 || !isContinuableBoundary(piMessages)) {
-      return void 0;
-    }
     return await upsertAgentTurnSessionRecord({
       ...args.channelName ?? latestSessionRecord?.channelName ? { channelName: args.channelName ?? latestSessionRecord?.channelName } : {},
       conversationId: args.conversationId,
@@ -2533,6 +2628,20 @@ function isPendingAuthLatestRequest(conversation, pendingAuth) {
 }
 
 export {
+  TURN_CONTEXT_TAG,
+  isAssistantMessage,
+  isToolResultMessage,
+  isToolResultError,
+  normalizeToolNameFromResult,
+  getPiMessageRole,
+  isContinuablePiBoundary,
+  extractAssistantText,
+  getTerminalAssistantMessages,
+  trimTrailingAssistantMessages,
+  hasRuntimeTurnContext,
+  retainRuntimeTurnContext,
+  instructionTextForProjection,
+  stripRuntimeTurnContext,
   loadProjection,
   loadConversationProjection,
   openConversationProjection,

package/dist/{chunk-OOLU34J4.js → chunk-H5ON7XTE.js}

@@ -1,18 +1,28 @@
 import {
   CooperativeTurnYieldError,
   JUNIOR_THREAD_STATE_TTL_MS,
+  TURN_CONTEXT_TAG,
   TurnInputCommitLostError,
   TurnSliceLimitExceededError,
   abandonReplacedPendingAuth,
   canReusePendingAuthLink,
   estimateTextTokens,
+  extractAssistantText,
   getAgentContextCompactionTriggerTokens,
   getInterruptionMarker,
+  getPiMessageRole,
+  getTerminalAssistantMessages,
+  hasRuntimeTurnContext,
+  isAssistantMessage,
+  isContinuablePiBoundary,
+  isToolResultError,
+  isToolResultMessage,
   isTurnInputCommitLostError,
   loadConnectedMcpProviders,
   loadConversationProjection,
   loadTurnSessionRecord,
   mergeArtifactsState,
+  normalizeToolNameFromResult,
   openConversationProjection,
   persistAuthPauseSessionRecord,
   persistContinuationSessionRecord,
@@ -21,8 +31,11 @@ import {
   recordAuthorizationRequested,
   recordMcpProviderConnected,
   recordToolExecutionStarted,
+  retainRuntimeTurnContext,
+  stripRuntimeTurnContext,
+  trimTrailingAssistantMessages,
   updateConversationStats
-} from "./chunk-SL3ZKNLQ.js";
+} from "./chunk-DXRPHBOU.js";
 import {
   buildNonInteractiveShellScript,
   createSandboxSession,
@@ -39,7 +52,7 @@ import {
   runNonInteractiveCommand,
   throwSandboxOperationError,
   wrapSandboxSetupError
-} from "./chunk-B45FPP2A.js";
+} from "./chunk-4VKFQPCW.js";
 import {
   addAgentTurnUsage,
   hasAgentTurnUsage
@@ -56,7 +69,7 @@ import {
   getPlugins,
   getSlackToolContext,
   resolveChannelCapabilities
-} from "./chunk-QQIVLZW4.js";
+} from "./chunk-YJ44UT7D.js";
 import {
   SANDBOX_DATA_ROOT,
   SANDBOX_SKILLS_ROOT,
@@ -65,7 +78,7 @@ import {
   getStateAdapter,
   sandboxSkillDir,
   sandboxSkillFile
-} from "./chunk-PYKKM4MM.js";
+} from "./chunk-HMRVILWZ.js";
 import {
   SlackActionError,
   downloadPrivateSlackFile,
@@ -75,7 +88,7 @@ import {
   isDmChannel,
   normalizeSlackConversationId,
   withSlackRetries
-} from "./chunk-IFAHK54X.js";
+} from "./chunk-QTS66GMR.js";
 import {
   contextProvenance,
   getConversationEventStore,
@@ -85,7 +98,7 @@ import {
   instructionActors,
   instructionProvenanceFor,
   parseDestination
-} from "./chunk-ZRZ4SVWG.js";
+} from "./chunk-LLKDNPYV.js";
 import {
   sleep
 } from "./chunk-4ZNGQH7C.js";
@@ -99,36 +112,25 @@ import {
   MODEL_HANDOFF_SUMMARY_PREFIX,
   ModelProfileNotConfiguredError,
   STANDARD_MODEL_PROFILE,
-  TURN_CONTEXT_TAG,
   TURN_REASONING_LEVELS,
   botConfig,
   completeObject,
   completeText,
+  createProviderError,
   escapeXml,
-  extractAssistantText,
   getGatewayApiKey,
   getPiGatewayApiKey,
-  getTerminalAssistantMessages,
   hasCompactedConversationContext,
-  hasRuntimeTurnContext,
-  isAssistantMessage,
   isCompactionSummaryText,
   isProviderRetryError,
-  isToolResultError,
-  isToolResultMessage,
   modelIdForProfile,
   modelProfileSchema,
-  nextProviderRetry,
   normalizeSlackEmojiName,
-  normalizeToolNameFromResult,
   profileConfig,
   renderCurrentInstruction,
   resolveGatewayModel,
-  retainRuntimeTurnContext,
-  stripRuntimeTurnContext,
-  trimTrailingAssistantMessages,
   unwrapCurrentInstruction
-} from "./chunk-NQLWOTY4.js";
+} from "./chunk-RCBUZGIT.js";
 import {
   parseSlackThreadId,
   resolveConversationPrivacy,
@@ -144,17 +146,17 @@ import {
   findSkillByName,
   loadSkillsByName,
   parseSkillInvocation
-} from "./chunk-BTRNMS6A.js";
+} from "./chunk-4WZ7YKDF.js";
 import {
   pluginCatalogRuntime
-} from "./chunk-WSRBFHPX.js";
+} from "./chunk-LR2SKL5Y.js";
 import {
   CredentialUnavailableError,
   credentialContextSchema,
   credentialUserSubjectId,
   resolveAuthTokenPlaceholder,
   resolvePluginCommandEnv
-} from "./chunk-XQAYFRWT.js";
+} from "./chunk-OXE5ZUTS.js";
 import {
   isUserActor
 } from "./chunk-C4MZ3GP5.js";
@@ -175,7 +177,7 @@ import {
   summarizeMessageText,
   withLogContext,
   withSpan
-} from "./chunk-J7APPQIJ.js";
+} from "./chunk-36UJA3OD.js";
 import {
   isRecord,
   parseSlackChannelId,
@@ -274,7 +276,6 @@ function shouldPropagateSandboxEgressTrace(host, config = {}) {
 
 // src/chat/agent/index.ts
 import { Agent } from "@earendil-works/pi-agent-core";
-import { isRetryableAssistantError } from "@earendil-works/pi-ai";
 
 // src/chat/sandbox/skill-sandbox.ts
 import fs from "fs/promises";
@@ -613,6 +614,9 @@ function shouldEmitDevAgentTrace() {
   return process.env.NODE_ENV === "development";
 }
 
+// src/chat/services/turn-result.ts
+import { isRetryableAssistantError } from "@earendil-works/pi-ai";
+
 // src/chat/no-reply.ts
 var NO_REPLY_MARKER = "[[NO_REPLY]]";
 function isNoReplyMarker(text) {
@@ -827,7 +831,10 @@ function buildTurnResult(input) {
     usage,
     stopReason,
     errorMessage,
-    providerError: void 0
+    providerError: resolvedOutcome === "provider_error" && errorMessage ? createProviderError(errorMessage, {
+      modelId,
+      retryable: lastAssistant !== void 0 && isAssistantMessage(lastAssistant) && isRetryableAssistantError(lastAssistant)
+    }) : void 0
   };
   return {
     text: primaryText,
@@ -838,6 +845,40 @@ function buildTurnResult(input) {
   };
 }
 
+// src/chat/services/provider-retry.ts
+import {
+  isRetryableAssistantError as isRetryableAssistantError2
+} from "@earendil-works/pi-ai";
+var PROVIDER_RETRY_DELAYS_MS = [2e3, 4e3, 8e3];
+var MAX_PROVIDER_RETRY_DELAY_MS = 6e4;
+function nextProviderRetry(args) {
+  const backoffMs = PROVIDER_RETRY_DELAYS_MS[args.attempt];
+  const errorMessage = args.failure?.errorMessage;
+  if (backoffMs === void 0 || !args.failure || !errorMessage) {
+    return void 0;
+  }
+  const providerError = createProviderError(errorMessage, {
+    retryable: true
+  });
+  const hasRetrySignal = isRetryableAssistantError2(args.failure) || providerError.status === 408;
+  if (!hasRetrySignal || !providerError.retryable) {
+    return void 0;
+  }
+  const delayMs = Math.min(
+    MAX_PROVIDER_RETRY_DELAY_MS,
+    Math.max(backoffMs, providerError.retryAfterMs ?? 0)
+  );
+  const messages = trimTrailingAssistantMessages(args.messages);
+  if (messages.length === args.messages.length) {
+    return void 0;
+  }
+  const tailRole = getPiMessageRole(messages.at(-1));
+  if (tailRole !== "user" && tailRole !== "toolResult") {
+    return void 0;
+  }
+  return { delayMs, messages };
+}
+
 // src/chat/tool-support/structured-result.ts
 import { z } from "zod";
 var juniorToolContinuationSchema = z.object({
@@ -1201,7 +1242,8 @@ var AuthorizationPauseError = class extends Error {
   kind;
   provider;
   providerDisplayName;
-  constructor(kind, provider, providerDisplayName, disposition) {
+  requestText;
+  constructor(kind, provider, providerDisplayName, disposition, requestText) {
     super(
       kind === "mcp" ? `MCP authorization started for ${provider}` : `Plugin authorization started for ${provider}`
     );
@@ -1210,6 +1252,7 @@ var AuthorizationPauseError = class extends Error {
     this.kind = kind;
     this.provider = provider;
     this.providerDisplayName = providerDisplayName;
+    this.requestText = requestText;
   }
 };
 var AuthPausePersistenceError = class extends Error {
@@ -8317,6 +8360,11 @@ async function deliverResourceEventSubscription(input) {
 // src/chat/tools/resource-events.ts
 var DEFAULT_TTL_MS = 14 * 24 * 60 * 60 * 1e3;
 var MAX_TTL_MS = 30 * 24 * 60 * 60 * 1e3;
+var STOP_WATCHING_TOOL_NAME = "stopWatchingResources";
+var RESOURCE_WATCH_TOOL_SOURCE = {
+  id: "resource-watches",
+  description: "Inspect or stop resource watches for the current conversation."
+};
 var subscribeInputSchema = z18.object({
   resourceRef: z18.string().describe("Opaque resource ref copied from a subscribable tool result."),
   provider: z18.string().describe("Provider that owns the resource ref."),
@@ -8332,11 +8380,6 @@ var subscribeInputSchema = z18.object({
     "How long to keep the subscription active. Defaults to 14 days and is capped at 30 days."
   ).optional()
 });
-var cancelInputSchema = z18.object({
-  subscriptionId: z18.string().describe(
-    "Subscription id returned by subscribeToResourceEvents or listResourceEventSubscriptions."
-  )
-});
 function requireConversationContext(context) {
   if (!context.conversationId) {
     throw new Error("Resource event subscriptions require a conversation");
@@ -8403,7 +8446,14 @@ function createSubscribeToResourceEventsTool(context) {
         subscription_status: subscription.status,
         resourceRef: subscription.resourceRef,
         events: subscription.events,
-        expiresAtMs: subscription.expiresAtMs
+        expiresAtMs: subscription.expiresAtMs,
+        stop_watching: {
+          execution_tool: "executeTool",
+          execution_example: {
+            tool_name: STOP_WATCHING_TOOL_NAME,
+            arguments: {}
+          }
+        }
       };
       return {
         ok: true,
@@ -8417,6 +8467,8 @@ function createSubscribeToResourceEventsTool(context) {
 function createListResourceEventSubscriptionsTool(context) {
   return zodTool({
     description: "List active resource event subscriptions for the current conversation.",
+    exposure: "deferred",
+    source: RESOURCE_WATCH_TOOL_SOURCE,
     inputSchema: z18.object({}),
     outputSchema: juniorToolResultSchema,
     async execute() {
@@ -8445,23 +8497,18 @@ function createListResourceEventSubscriptionsTool(context) {
     }
   });
 }
-function createCancelResourceEventSubscriptionTool(context) {
+function createStopWatchingResourcesTool(context) {
   return zodTool({
-    description: "Cancel a resource event subscription for the current conversation.",
-    inputSchema: cancelInputSchema,
+    description: "Stop every resource watch for the current conversation. Infer the user's intent from context instead of requiring a special command, and call this tool before confirming that watching stopped.",
+    exposure: "deferred",
+    source: RESOURCE_WATCH_TOOL_SOURCE,
+    inputSchema: z18.object({}),
     outputSchema: juniorToolResultSchema,
-    async execute(input) {
+    async execute() {
       const conversationId = requireConversationContext(context);
-      const subscription = await cancelResourceEventSubscription({
-        conversationId,
-        id: input.subscriptionId
-      });
-      if (!subscription) {
-        throw new Error("Resource event subscription was not found");
-      }
+      await cancelSubscriptions({ conversationId });
       const details = {
-        id: subscription.id,
-        subscription_status: subscription.status
+        watching_status: "stopped"
       };
       return {
         ok: true,
@@ -8472,6 +8519,16 @@ function createCancelResourceEventSubscriptionTool(context) {
     }
   });
 }
+function createResourceEventTools(context) {
+  if (!canUseResourceEventSubscriptionTools(context)) {
+    return {};
+  }
+  return {
+    subscribeToResourceEvents: createSubscribeToResourceEventsTool(context),
+    listResourceEventSubscriptions: createListResourceEventSubscriptionsTool(context),
+    [STOP_WATCHING_TOOL_NAME]: createStopWatchingResourcesTool(context)
+  };
+}
 
 // src/chat/slack/channel.ts
 async function listChannelMessages(input) {
@@ -11409,7 +11466,8 @@ function createTools(availableSkills, hooks = {}, context) {
     ),
     webFetch: createWebFetchTool(hooks, {
       canSendFilesToActiveConversation
-    })
+    }),
+    ...createResourceEventTools(context)
   };
   if (hooks.writeGeneratedArtifacts) {
     tools.imageGenerate = createImageGenerateTool(
@@ -11426,11 +11484,6 @@ function createTools(availableSkills, hooks = {}, context) {
   if (context.handoff) {
     tools.handoff = createHandoffTool(context.handoff);
   }
-  if (canUseResourceEventSubscriptionTools(context)) {
-    tools.subscribeToResourceEvents = createSubscribeToResourceEventsTool(context);
-    tools.listResourceEventSubscriptions = createListResourceEventSubscriptionsTool(context);
-    tools.cancelResourceEventSubscription = createCancelResourceEventSubscriptionTool(context);
-  }
   if (context.mcpToolManager) {
     tools.searchMcpTools = createSearchMcpToolsTool(context.mcpToolManager);
     tools.callMcpTool = createCallMcpToolTool(context.mcpToolManager);
@@ -11845,8 +11898,8 @@ import { PluginToolInputError } from "@sentry/junior-plugin-api";
 
 // src/chat/services/plugin-auth-orchestration.ts
 var PluginAuthorizationPauseError = class extends AuthorizationPauseError {
-  constructor(provider, providerDisplayName, disposition) {
-    super("plugin", provider, providerDisplayName, disposition);
+  constructor(provider, providerDisplayName, disposition, requestText) {
+    super("plugin", provider, providerDisplayName, disposition, requestText);
   }
 };
 var PluginCredentialFailureError = class extends Error {
@@ -11957,7 +12010,8 @@ function createPluginAuthOrchestration(input) {
     pendingPause = new PluginAuthorizationPauseError(
       provider,
       providerLabel,
-      reusingPendingLink ? "link_already_sent" : "link_sent"
+      reusingPendingLink ? "link_already_sent" : "link_sent",
+      input.userMessage
     );
     input.abortAgent();
     throw pendingPause;
@@ -12094,10 +12148,12 @@ import { z as z41 } from "zod";
 var EXECUTE_TOOL_NAME = "executeTool";
 function createExecuteToolTool() {
   return zodTool({
-    description: "Execute any catalog tool by exact tool_name from searchTools. Put tool-specific parameters inside arguments.",
+    description: "Execute any catalog tool by exact tool_name from searchTools or a tool-result execution hint. Put tool-specific parameters inside arguments.",
     executionMode: "sequential",
     inputSchema: z41.object({
-      tool_name: z41.string().min(1).describe("Exact catalog tool_name returned by searchTools."),
+      tool_name: z41.string().min(1).describe(
+        "Exact catalog tool_name returned by searchTools or a tool-result execution hint."
+      ),
       arguments: z41.record(z41.string(), z41.unknown()).describe(
         'Arguments matching the selected catalog tool schema, for example { "query": "..." }.'
       ).optional()
@@ -13187,8 +13243,8 @@ async function finalizeMcpAuthorization(provider, authSessionId, authorizationCo
 
 // src/chat/services/mcp-auth-orchestration.ts
 var McpAuthorizationPauseError = class extends AuthorizationPauseError {
-  constructor(provider, providerDisplayName, disposition) {
-    super("mcp", provider, providerDisplayName, disposition);
+  constructor(provider, providerDisplayName, disposition, requestText) {
+    super("mcp", provider, providerDisplayName, disposition, requestText);
   }
 };
 function authorizationId2(args) {
@@ -13319,7 +13375,8 @@ function createMcpAuthOrchestration(input) {
     pendingPause = new McpAuthorizationPauseError(
       provider,
       providerLabel,
-      reusingPendingLink ? "link_already_sent" : "link_sent"
+      reusingPendingLink ? "link_already_sent" : "link_sent",
+      input.userMessage
     );
     input.abortAgent();
     return true;
@@ -14408,6 +14465,7 @@ async function wireAgentTools(args) {
     destination: args.routing.destination,
     source: runSource,
     threadTs: args.routing.source.platform === "slack" ? args.routing.source.threadTs : void 0,
+    userMessage: args.userInput,
     pendingAuth: args.state.pendingAuth,
     recordPendingAuth: args.durability.recordPendingAuth,
     authorizationFlowMode: args.policy.authorizationFlowMode,
@@ -14699,7 +14757,11 @@ function createResumeState(args) {
       if (!args.durability.shouldYield?.()) {
         return void 0;
       }
-      resumeMessages = this.getResumeSnapshot(currentMessages);
+      const nextResumeMessages = this.getResumeSnapshot(currentMessages);
+      if (!isContinuablePiBoundary(nextResumeMessages)) {
+        return void 0;
+      }
+      resumeMessages = nextResumeMessages;
       return new CooperativeTurnYieldError(
         `Agent turn yielded at a safe boundary after ${currentDurationMs()}ms`
       );
@@ -14723,6 +14785,7 @@ function createResumeState(args) {
         return {
           status: "awaiting_auth",
           providerDisplayName: pause.providerDisplayName,
+          ...pause.requestText ? { requestText: pause.requestText } : {},
           ...usage ? { usage } : {}
         };
       } catch (error) {
@@ -15913,8 +15976,8 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy, run
               }
               const providerRetry = nextProviderRetry({
                 attempt,
-                messages: agent.state.messages,
-                retryableFailure: lastAssistant !== void 0 && isRetryableAssistantError(lastAssistant)
+                failure: lastAssistant,
+                messages: agent.state.messages
               });
               if (!providerRetry) {
                 break;

package/dist/{chunk-PYKKM4MM.js → chunk-HMRVILWZ.js}

@@ -1,6 +1,6 @@
 import {
   getChatConfig
-} from "./chunk-NQLWOTY4.js";
+} from "./chunk-RCBUZGIT.js";
 
 // src/chat/state/adapter.ts
 import { createMemoryState } from "@chat-adapter/state-memory";