@sentry/junior 0.118.0 → 0.120.0

package/dist/{chunk-7GADTCNS.js → chunk-EIVE6GL4.js}

@@ -1,12 +1,12 @@
 import {
   pluginCatalogRuntime
-} from "./chunk-UXLYAVYL.js";
+} from "./chunk-GNNV3UTY.js";
 import {
   logWarn
-} from "./chunk-MLZFK4KP.js";
+} from "./chunk-ALYQOZG7.js";
 import {
   skillRoots
-} from "./chunk-3V7OFJZC.js";
+} from "./chunk-H4HBKISO.js";
 
 // src/chat/skills.ts
 import fs from "fs/promises";

package/dist/{chunk-6K2QE2UI.js → chunk-ERYVNWNE.js}

@@ -25,13 +25,12 @@ import {
   patchMcpAuthSession,
   resolveBaseUrl,
   selectPluginGrant,
-  slackOutputPolicy,
   startOAuthFlow,
   surfaceFromRouting,
   toMcpProviderError,
   toolInvocationDestination,
   uploadFilesToConversation
-} from "./chunk-S6R23MFB.js";
+} from "./chunk-TKUCRFNX.js";
 import {
   CooperativeTurnYieldError,
   JUNIOR_THREAD_STATE_TTL_MS,
@@ -73,7 +72,7 @@ import {
   stripRuntimeTurnContext,
   trimTrailingAssistantMessages,
   updateConversationStats
-} from "./chunk-PJPKHGLG.js";
+} from "./chunk-JQWP6V22.js";
 import {
   parseSandboxEgressAuthRequiredSignal,
   parseSandboxEgressPermissionDeniedSignal,
@@ -97,10 +96,10 @@ import {
   runNonInteractiveCommand,
   throwSandboxOperationError,
   wrapSandboxSetupError
-} from "./chunk-4LPPH7Y6.js";
+} from "./chunk-DJDGDJDF.js";
 import {
   incrementStat
-} from "./chunk-L72GDKSN.js";
+} from "./chunk-6WX5SPI3.js";
 import {
   addAgentTurnUsage,
   hasAgentTurnUsage
@@ -122,7 +121,7 @@ import {
   normalizeSlackConversationId,
   resolveChannelCapabilities,
   withSlackRetries
-} from "./chunk-GT2ZUALJ.js";
+} from "./chunk-24B5R6OU.js";
 import {
   KNOWN_CONVERSATION_EVENT_TYPES,
   contextProvenance,
@@ -131,7 +130,7 @@ import {
   getConversationStore,
   instructionActors,
   instructionProvenanceFor
-} from "./chunk-KC5EE27Y.js";
+} from "./chunk-M243JMZH.js";
 import {
   SANDBOX_DATA_ROOT,
   SANDBOX_SKILLS_ROOT,
@@ -141,7 +140,7 @@ import {
   sandboxSkillFile,
   sandboxSkillPathResolution,
   sleep
-} from "./chunk-3N3FMCKN.js";
+} from "./chunk-ALAKN7LR.js";
 import {
   ACTIVE_TURN_COMPACTION_SUMMARY_PREFIX,
   COMPACTION_SUMMARY_PREFIX,
@@ -172,7 +171,7 @@ import {
   renderCurrentInstruction,
   resolveGatewayModel,
   unwrapCurrentInstruction
-} from "./chunk-PWRFTDTY.js";
+} from "./chunk-VURFJVFH.js";
 import {
   canExposeConversationPayload,
   parseSlackThreadId,
@@ -183,16 +182,16 @@ import {
   toGenAiMessagesTraceAttributes,
   toGenAiPayloadMetadata,
   toGenAiPayloadTraceAttributes
-} from "./chunk-FXOYURO4.js";
+} from "./chunk-HDFGNU5E.js";
 import {
   discoverSkills,
   findSkillByName,
   loadSkillsByName,
   parseSkillInvocation
-} from "./chunk-7GADTCNS.js";
+} from "./chunk-EIVE6GL4.js";
 import {
   pluginCatalogRuntime
-} from "./chunk-UXLYAVYL.js";
+} from "./chunk-GNNV3UTY.js";
 import {
   CredentialUnavailableError,
   OAuthProviderError,
@@ -200,7 +199,7 @@ import {
   getOAuthProviderErrorAttributes,
   resolveAuthTokenPlaceholder,
   resolvePluginCommandEnv
-} from "./chunk-3LGCVRBQ.js";
+} from "./chunk-XAI2HNAY.js";
 import {
   credentialUserSubjectId
 } from "./chunk-W3U3YQYI.js";
@@ -224,7 +223,7 @@ import {
   summarizeMessageText,
   withLogContext,
   withSpan
-} from "./chunk-MLZFK4KP.js";
+} from "./chunk-ALYQOZG7.js";
 import {
   parseSlackChannelId,
   parseSlackMessageTs,
@@ -238,7 +237,7 @@ import {
   listReferenceFiles,
   soulPathCandidates,
   worldPathCandidates
-} from "./chunk-3V7OFJZC.js";
+} from "./chunk-H4HBKISO.js";
 
 // src/chat/configuration/defaults.ts
 var installDefaults = {};
@@ -1861,13 +1860,11 @@ function buildOutputSection(platform) {
       "</output>"
     ].join("\n");
   }
-  const openTag = `<output format="slack-markdown" max_inline_chars="${slackOutputPolicy.maxInlineChars}" max_inline_lines="${slackOutputPolicy.maxInlineLines}">`;
   return [
-    openTag,
+    `<output format="slack-markdown">`,
+    "- Default to the shortest complete reply\u2014usually 1\u20135 sentences and under 800 characters. Include only the outcome, decisive evidence, and any blocker or required next action. If useful detail would exceed that, put it in a Slack canvas and reply with the link. An explicit user request for detail overrides this target.",
     "- Start with the answer or result, not internal process narration.",
     "- Use Slack-flavored Markdown: **bold** section labels, `code`, [text](url) links, bullet lists, and fenced code blocks. No hash-prefixed headings and no tables. When the answer primarily lists several URLs, show each URL bare instead of as a labeled link.",
-    "- Default to one compact thread reply containing the conclusion and only decisive evidence or action. Do not split an explainer across multiple Slack messages.",
-    "- Put plans, research, and other long or multi-section explainers in a Slack canvas; reply with one or two short sentences plus the link, without recapping the canvas.",
     "- End every turn with a final user-facing markdown response unless the Slack action rules allow a no-reply completion.",
     "</output>"
   ].join("\n");
@@ -6493,6 +6490,7 @@ var McpToolManager = class {
     try {
       const client = await this.getClient(plugin);
       const tools = this.filterListedTools(plugin, await client.listTools());
+      this.assertWrappedToolsAvailable(plugin, tools);
       this.toolsByProvider.set(
         provider,
         tools.map((tool) => this.toManagedTool(plugin, client, tool))
@@ -6543,8 +6541,26 @@ var McpToolManager = class {
         `Plugin ${plugin.manifest.name} MCP discovery missing allowlisted tools: ${missingTools.join(", ")}`
       );
     }
-    const allowedToolSet = new Set(allowedTools);
-    return tools.filter((tool) => allowedToolSet.has(tool.name));
+    const loadedToolSet = /* @__PURE__ */ new Set([
+      ...allowedTools,
+      ...plugin.manifest.mcp?.wrappedTools ?? []
+    ]);
+    return tools.filter((tool) => loadedToolSet.has(tool.name));
+  }
+  assertWrappedToolsAvailable(plugin, tools) {
+    const wrappedTools = plugin.manifest.mcp?.wrappedTools ?? [];
+    if (wrappedTools.length === 0) {
+      return;
+    }
+    const availableToolNames = new Set(tools.map((tool) => tool.name));
+    const missingTools = wrappedTools.filter(
+      (toolName) => !availableToolNames.has(toolName)
+    );
+    if (missingTools.length > 0) {
+      throw new Error(
+        `Plugin ${plugin.manifest.name} MCP discovery missing wrapped tools: ${missingTools.join(", ")}`
+      );
+    }
   }
   async getClient(plugin) {
     const existing = this.clientsByProvider.get(plugin.manifest.name);
@@ -6630,8 +6646,13 @@ var McpToolManager = class {
                   "gen_ai.tool.call.result": resultAttribute
                 });
               }
+              const providerContent = boundMcpContent(
+                toAgentToolContent(result)
+              );
               return {
-                content: toModelVisibleMcpContent(result)
+                content: toModelVisibleMcpContent(result),
+                providerContent,
+                ...result.structuredContent !== void 0 ? { structuredContent: result.structuredContent } : {}
               };
             } catch (error) {
               if (error instanceof McpAuthorizationRequiredError && await this.handleAuthorizationRequired(
@@ -6642,7 +6663,9 @@ var McpToolManager = class {
                   { type: "text", text: "Authorization pending." }
                 ];
                 return {
-                  content: parkedContent
+                  authorizationPending: true,
+                  content: parkedContent,
+                  providerContent: parkedContent
                 };
               }
               const errorAttributes = {
@@ -6695,10 +6718,59 @@ var McpToolManager = class {
       if (options.provider && provider !== options.provider) {
         continue;
       }
-      resolved.push(...this.toolsByProvider.get(provider) ?? []);
+      const wrappedTools = new Set(
+        this.pluginsByProvider.get(provider)?.manifest.mcp?.wrappedTools ?? []
+      );
+      resolved.push(
+        ...(this.toolsByProvider.get(provider) ?? []).filter(
+          (tool) => !wrappedTools.has(tool.rawName)
+        )
+      );
     }
     return resolved;
   }
+  /** Call one active provider tool declared for plugin-owned wrapping. */
+  async callWrappedTool(provider, rawName, args, options) {
+    if (!this.activeProviders.has(provider)) {
+      throw new McpToolError(`MCP provider is not active: ${provider}`);
+    }
+    const wrappedTools = new Set(
+      this.pluginsByProvider.get(provider)?.manifest.mcp?.wrappedTools ?? []
+    );
+    if (!wrappedTools.has(rawName)) {
+      throw new McpToolError(
+        `Plugin ${provider} cannot call unwrapped MCP tool ${rawName}`
+      );
+    }
+    const tool = (this.toolsByProvider.get(provider) ?? []).find(
+      (candidate) => candidate.rawName === rawName
+    );
+    if (!tool) {
+      throw new McpToolError(
+        `MCP provider ${provider} does not expose tool ${rawName}`
+      );
+    }
+    let result;
+    try {
+      result = await tool.execute(args, {
+        conversationPrivacy: "private",
+        ...options?.toolCallId ? { toolCallId: options.toolCallId } : {}
+      });
+    } catch (error) {
+      if (error instanceof McpToolError) {
+        return { status: "error", message: error.message };
+      }
+      throw error;
+    }
+    if (result.authorizationPending) {
+      return { status: "authorization_pending" };
+    }
+    return {
+      status: "success",
+      content: result.providerContent ?? result.content,
+      ...result.structuredContent !== void 0 ? { structuredContent: result.structuredContent } : {}
+    };
+  }
   toToolDescriptor(tool) {
     return {
       name: tool.name,
@@ -8647,20 +8719,156 @@ function extractCanvasId(input) {
   }
 }
 
-// src/chat/slack/tools/canvas/api.ts
+// src/chat/slack/tools/canvas/markdown.ts
+function getListType(marker) {
+  return /^\d/.test(marker) ? "numbered" : "bullet";
+}
+function getPlainListMarker(marker, type) {
+  return type === "numbered" ? `${marker.match(/^\d+/)?.[0] ?? "1"}:` : "\u2022";
+}
+function getIndentWidth(whitespace, startColumn = 0) {
+  let column = startColumn;
+  for (const character of whitespace) {
+    column += character === "	" ? 4 - column % 4 : 1;
+  }
+  return column - startColumn;
+}
+function getLineIndent(line) {
+  return getIndentWidth(line.match(/^[ \t]*/)?.[0] ?? "");
+}
+function getFence(line) {
+  const match = line.match(/^([ \t]*)(`{3,}|~{3,})(.*)$/);
+  const run = match?.[2];
+  if (!run) return void 0;
+  return {
+    fence: {
+      marker: run[0],
+      length: run.length
+    },
+    indent: getIndentWidth(match[1] ?? ""),
+    suffix: match[3] ?? ""
+  };
+}
+function isListBlockIndent(indent, listItems2) {
+  return listItems2.some(
+    (item) => indent >= item.contentIndent && indent <= item.contentIndent + 3
+  );
+}
+function canOpenFence(fenceLine, listItems2) {
+  return fenceLine.indent <= 3 || isListBlockIndent(fenceLine.indent, listItems2);
+}
+function unwrapNestedBlockquote(line, listItems2, maxQuoteDepth = Number.POSITIVE_INFINITY) {
+  const match = line.match(/^([ \t]+)((?:>[ \t]*)+)(.*)$/);
+  if (!match || !isListBlockIndent(getIndentWidth(match[1] ?? ""), listItems2)) {
+    return { line, quoteDepth: 0 };
+  }
+  let quotePrefix = match[2] ?? "";
+  const quoteDepth = Math.min(
+    quotePrefix.match(/>/g)?.length ?? 0,
+    maxQuoteDepth
+  );
+  for (let index = 0; index < quoteDepth; index += 1) {
+    quotePrefix = quotePrefix.replace(/^>[ \t]*/, "");
+  }
+  return {
+    line: `${match[1]}${quotePrefix}${match[3]}`,
+    quoteDepth
+  };
+}
 function normalizeCanvasMarkdown(markdown) {
   let normalizedHeadingCount = 0;
-  const normalized = markdown.split("\n").map(
-    (line) => line.replace(/^(#{4,})(?=\s)/, () => {
+  let normalizedMixedListCount = 0;
+  let unwrappedBlockquoteCount = 0;
+  let openFence;
+  const listItems2 = [];
+  const lines = markdown.split("\n").map((originalLine) => {
+    if (openFence) {
+      const unwrapped2 = openFence.quoteDepth > 0 ? unwrapNestedBlockquote(
+        originalLine,
+        listItems2,
+        openFence.quoteDepth
+      ) : { line: originalLine, quoteDepth: 0 };
+      if (unwrapped2.quoteDepth > 0) {
+        unwrappedBlockquoteCount += 1;
+      }
+      const fenceLine2 = getFence(unwrapped2.line);
+      if (fenceLine2?.fence.marker === openFence.marker && fenceLine2.fence.length >= openFence.length && !fenceLine2.suffix.trim()) {
+        openFence = void 0;
+      }
+      return unwrapped2.line;
+    }
+    const unwrapped = unwrapNestedBlockquote(originalLine, listItems2);
+    if (unwrapped.quoteDepth > 0) {
+      unwrappedBlockquoteCount += 1;
+    }
+    const line = unwrapped.line;
+    const fenceLine = getFence(line);
+    if (fenceLine && canOpenFence(fenceLine, listItems2)) {
+      const rootListContentIndent2 = listItems2[0]?.contentIndent;
+      if (rootListContentIndent2 !== void 0 && fenceLine.indent < rootListContentIndent2) {
+        listItems2.length = 0;
+      }
+      openFence = {
+        ...fenceLine.fence,
+        quoteDepth: unwrapped.quoteDepth
+      };
+      return line;
+    }
+    const listMatch = line.match(/^([ \t]*)([-+*]|\d+[.)])([ \t]+)(.*)$/);
+    if (listMatch) {
+      const [, whitespace = "", marker = "", gap = "", rawContent = ""] = listMatch;
+      const indent = getIndentWidth(whitespace);
+      const type = getListType(marker);
+      const markerEnd = indent + getIndentWidth(marker);
+      const contentIndent = markerEnd + getIndentWidth(gap, markerEnd);
+      const contentMatch = rawContent.match(/^(?:>[ \t]*)+(.*)$/);
+      const content = contentMatch?.[1] ?? rawContent;
+      if (contentMatch) {
+        unwrappedBlockquoteCount += 1;
+      }
+      while (listItems2.length > 0 && listItems2[listItems2.length - 1].indent >= indent) {
+        listItems2.pop();
+      }
+      const parent = listItems2[listItems2.length - 1];
+      if (parent && (parent.unwrapped || parent.type !== type)) {
+        listItems2.push({
+          contentIndent,
+          indent,
+          type: parent.type,
+          unwrapped: true
+        });
+        normalizedMixedListCount += 1;
+        return `${whitespace}${getPlainListMarker(marker, type)}${gap}${content}`;
+      }
+      listItems2.push({ contentIndent, indent, type, unwrapped: false });
+      return contentMatch ? `${whitespace}${marker}${gap}${content}` : line;
+    }
+    const rootListContentIndent = listItems2[0]?.contentIndent;
+    if (rootListContentIndent !== void 0 && line.trim() && getLineIndent(line) < rootListContentIndent) {
+      listItems2.length = 0;
+    }
+    const headingMatch = line.match(/^([ \t]*)#{4,}(?=[ \t])/);
+    const headingIndent = headingMatch ? getIndentWidth(headingMatch[1] ?? "") : void 0;
+    if (headingMatch && headingIndent !== void 0 && (headingIndent <= 3 || isListBlockIndent(headingIndent, listItems2))) {
       normalizedHeadingCount += 1;
-      return "###";
-    })
-  ).join("\n");
+      return line.replace(
+        /^([ \t]*)#{4,}(?=[ \t])/,
+        (_, indent) => `${indent}###`
+      );
+    }
+    return line;
+  });
+  const normalizedCount = normalizedHeadingCount + normalizedMixedListCount + unwrappedBlockquoteCount;
   return {
-    markdown: normalized,
-    normalizedHeadingCount
+    markdown: lines.join("\n"),
+    normalizedCount,
+    normalizedHeadingCount,
+    normalizedMixedListCount,
+    unwrappedBlockquoteCount
   };
 }
+
+// src/chat/slack/tools/canvas/api.ts
 async function createCanvas(input) {
   const client = getSlackClient();
   const normalizedChannelId = normalizeSlackConversationId(input.channelId);
@@ -8684,8 +8892,10 @@ async function createCanvas(input) {
         "app.slack.canvas.has_channel_id": Boolean(input.channelId),
         "app.slack.canvas.title_length": input.title.length,
         "app.slack.canvas.markdown_length": normalizedContent.markdown.length,
-        "app.slack.canvas.markdown_normalized": normalizedContent.normalizedHeadingCount > 0,
-        "app.slack.canvas.normalized_heading_count": normalizedContent.normalizedHeadingCount
+        "app.slack.canvas.markdown_normalized": normalizedContent.normalizedCount > 0,
+        "app.slack.canvas.normalized_heading_count": normalizedContent.normalizedHeadingCount,
+        "app.slack.canvas.normalized_mixed_list_count": normalizedContent.normalizedMixedListCount,
+        "app.slack.canvas.unwrapped_blockquote_count": normalizedContent.unwrappedBlockquoteCount
       }
     }
   );
@@ -8761,8 +8971,10 @@ async function writeCanvasMarkdown(input) {
         "app.slack.canvas.canvas_id_prefix": input.canvasId.slice(0, 1),
         "app.slack.canvas.operation": "replace",
         "app.slack.canvas.markdown_length": normalizedContent.markdown.length,
-        "app.slack.canvas.markdown_normalized": normalizedContent.normalizedHeadingCount > 0,
-        "app.slack.canvas.normalized_heading_count": normalizedContent.normalizedHeadingCount
+        "app.slack.canvas.markdown_normalized": normalizedContent.normalizedCount > 0,
+        "app.slack.canvas.normalized_heading_count": normalizedContent.normalizedHeadingCount,
+        "app.slack.canvas.normalized_mixed_list_count": normalizedContent.normalizedMixedListCount,
+        "app.slack.canvas.unwrapped_blockquote_count": normalizedContent.unwrappedBlockquoteCount
       }
     }
   );
@@ -14084,7 +14296,8 @@ async function summarizeContext(args, deps) {
     "- The immediate next action",
     "- Durable constraints, user preferences, IDs, URLs, artifacts, sandbox references, auth state, and unresolved blockers",
     "",
-    "Do not write a user-facing reply, announce a plan, or imply that the task is complete unless the source history proves it is complete."
+    "Do not write a user-facing reply or announce a plan.",
+    "Treat the task as complete only when the source history contains concrete evidence that every requested outcome occurred. Do not infer completion from intent, plans, progress, intermediate artifacts, or adjacent tool activity. If evidence is missing or ambiguous, preserve the task as unfinished and state the next required action."
   ] : [
     "You are performing a CONTEXT CHECKPOINT COMPACTION for Junior.",
     "Create a concise continuation summary for the agent that will continue this Slack thread.",

package/dist/{chunk-UXLYAVYL.js → chunk-GNNV3UTY.js}

@@ -1,6 +1,6 @@
 import {
   createPluginCatalogRuntime
-} from "./chunk-3LGCVRBQ.js";
+} from "./chunk-XAI2HNAY.js";
 
 // src/chat/plugins/catalog-runtime.ts
 var pluginCatalogRuntime = createPluginCatalogRuntime();