@sentry/junior 0.117.0 → 0.118.0

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

@@ -31,7 +31,7 @@ import {
   toMcpProviderError,
   toolInvocationDestination,
   uploadFilesToConversation
-} from "./chunk-6G45D3YG.js";
+} from "./chunk-S6R23MFB.js";
 import {
   CooperativeTurnYieldError,
   JUNIOR_THREAD_STATE_TTL_MS,
@@ -73,7 +73,7 @@ import {
   stripRuntimeTurnContext,
   trimTrailingAssistantMessages,
   updateConversationStats
-} from "./chunk-27KWTFP6.js";
+} from "./chunk-PJPKHGLG.js";
 import {
   parseSandboxEgressAuthRequiredSignal,
   parseSandboxEgressPermissionDeniedSignal,
@@ -97,7 +97,10 @@ import {
   runNonInteractiveCommand,
   throwSandboxOperationError,
   wrapSandboxSetupError
-} from "./chunk-FAWBONPC.js";
+} from "./chunk-4LPPH7Y6.js";
+import {
+  incrementStat
+} from "./chunk-L72GDKSN.js";
 import {
   addAgentTurnUsage,
   hasAgentTurnUsage
@@ -106,30 +109,20 @@ import {
   privateTraceResultAttributes
 } from "./chunk-UIE3R5XU.js";
 import {
+  SlackActionError,
   createPluginHookRunner,
+  downloadPrivateSlackFile,
+  getFilePermalink,
   getPluginSystemPromptContributions,
   getPluginTools,
   getPluginUserPromptContributions,
-  getSlackToolContext,
-  resolveChannelCapabilities
-} from "./chunk-STUI6NIL.js";
-import {
-  SANDBOX_DATA_ROOT,
-  SANDBOX_SKILLS_ROOT,
-  SANDBOX_WORKSPACE_ROOT,
-  getStateAdapter,
-  sandboxSkillDir,
-  sandboxSkillFile
-} from "./chunk-KU6ALEJC.js";
-import {
-  SlackActionError,
-  downloadPrivateSlackFile,
-  getFilePermalink,
   getSlackClient,
+  getSlackToolContext,
   isConversationScopedChannel,
   normalizeSlackConversationId,
+  resolveChannelCapabilities,
   withSlackRetries
-} from "./chunk-YRWJ3KEU.js";
+} from "./chunk-GT2ZUALJ.js";
 import {
   KNOWN_CONVERSATION_EVENT_TYPES,
   contextProvenance,
@@ -138,10 +131,17 @@ import {
   getConversationStore,
   instructionActors,
   instructionProvenanceFor
-} from "./chunk-ZRQUQJUV.js";
+} from "./chunk-KC5EE27Y.js";
 import {
+  SANDBOX_DATA_ROOT,
+  SANDBOX_SKILLS_ROOT,
+  SANDBOX_WORKSPACE_ROOT,
+  getStateAdapter,
+  sandboxSkillDir,
+  sandboxSkillFile,
+  sandboxSkillPathResolution,
   sleep
-} from "./chunk-4ZNGQH7C.js";
+} from "./chunk-3N3FMCKN.js";
 import {
   ACTIVE_TURN_COMPACTION_SUMMARY_PREFIX,
   COMPACTION_SUMMARY_PREFIX,
@@ -172,7 +172,7 @@ import {
   renderCurrentInstruction,
   resolveGatewayModel,
   unwrapCurrentInstruction
-} from "./chunk-DS27ZBSP.js";
+} from "./chunk-PWRFTDTY.js";
 import {
   canExposeConversationPayload,
   parseSlackThreadId,
@@ -189,10 +189,10 @@ import {
   findSkillByName,
   loadSkillsByName,
   parseSkillInvocation
-} from "./chunk-AKG4TZNH.js";
+} from "./chunk-7GADTCNS.js";
 import {
   pluginCatalogRuntime
-} from "./chunk-CU7HTGNI.js";
+} from "./chunk-UXLYAVYL.js";
 import {
   CredentialUnavailableError,
   OAuthProviderError,
@@ -200,7 +200,7 @@ import {
   getOAuthProviderErrorAttributes,
   resolveAuthTokenPlaceholder,
   resolvePluginCommandEnv
-} from "./chunk-5O3JDQDG.js";
+} from "./chunk-3LGCVRBQ.js";
 import {
   credentialUserSubjectId
 } from "./chunk-W3U3YQYI.js";
@@ -224,7 +224,7 @@ import {
   summarizeMessageText,
   withLogContext,
   withSpan
-} from "./chunk-72Z3HNTQ.js";
+} from "./chunk-MLZFK4KP.js";
 import {
   parseSlackChannelId,
   parseSlackMessageTs,
@@ -1668,13 +1668,10 @@ function formatSkillEntry(skill) {
   lines.push("  </skill>");
   return lines;
 }
-function formatAvailableSkillsForPrompt(skills, invocation) {
+function formatAvailableSkillsForPrompt(skills) {
   const autoSelectable = skills.filter(
     (s) => s.disableModelInvocation !== true
   );
-  const invokedExplicitOnly = invocation ? skills.filter(
-    (s) => s.disableModelInvocation === true && s.name === invocation.skillName
-  ) : [];
   const sections = [];
   if (autoSelectable.length > 0) {
     const available = [
@@ -1687,17 +1684,6 @@ function formatAvailableSkillsForPrompt(skills, invocation) {
     available.push("</available-skills>");
     sections.push(available.join("\n"));
   }
-  if (invokedExplicitOnly.length > 0) {
-    const userCallable = [
-      "<user-callable-skills>",
-      "The user's current message explicitly references this skill by name. Load it when relevant to the request."
-    ];
-    for (const skill of invokedExplicitOnly) {
-      userCallable.push(...formatSkillEntry(skill));
-    }
-    userCallable.push("</user-callable-skills>");
-    sections.push(userCallable.join("\n"));
-  }
   return sections.length > 0 ? sections.join("\n") : null;
 }
 function formatActiveMcpCatalogsForPrompt(catalogs) {
@@ -1810,7 +1796,8 @@ var TOOL_CALL_STYLE_RULES = [
   "- Keep tool-call explanations separate from final answers; final answers should report results, evidence, or blockers."
 ];
 var SKILL_POLICY_RULES = [
-  "- Only load skills listed in `<available-skills>`, `<user-callable-skills>`, or named by `<explicit-skill-trigger>`. Never guess or invent a skill name.",
+  "- A `<skill>` block in the current user turn is already loaded. Follow its instructions directly and do not call `loadSkill` for that skill.",
+  "- Otherwise, only load skills listed in `<available-skills>`. Never guess or invent a skill name.",
   "- Load one skill at a time. After `loadSkill`, follow the instructions returned by that tool result."
 ];
 var EXECUTION_CONTRACT_RULES = [
@@ -1995,14 +1982,6 @@ function buildContextSection(params) {
       ])
     );
   }
-  if (params.invocation) {
-    blocks.push(
-      renderTag("explicit-skill-trigger", [
-        "Treat this skill as selected. Load it unless the tool says it is unavailable.",
-        `/${escapeXml(params.invocation.skillName)}`
-      ])
-    );
-  }
   const body = blocks.map((block) => block.join("\n")).join("\n\n");
   if (!body) {
     return null;
@@ -2012,8 +1991,7 @@ function buildContextSection(params) {
 function buildCapabilitiesSection(params) {
   const blocks = [];
   const availableSkills = formatAvailableSkillsForPrompt(
-    params.availableSkills,
-    params.invocation
+    params.availableSkills
   );
   if (availableSkills) {
     blocks.push(availableSkills);
@@ -2094,7 +2072,6 @@ function buildTurnContextPrompt(params) {
     includeSessionContext ? buildCapabilitiesSection({
       availableSkills: params.availableSkills,
       activeMcpCatalogs: params.activeMcpCatalogs ?? [],
-      invocation: params.invocation,
       toolGuidance: params.toolGuidance ?? []
     }) : null,
     pluginPromptContributions,
@@ -2102,8 +2079,7 @@ function buildTurnContextPrompt(params) {
       actor: params.actor,
       artifactState: params.artifactState,
       configuration: params.configuration,
-      dispatch: params.dispatch,
-      invocation: params.invocation
+      dispatch: params.dispatch
     }) : null,
     includeSessionContext ? buildRuntimeSection(params.runtime ?? {}) : null
   ].filter((section) => Boolean(section));
@@ -2146,6 +2122,17 @@ function buildUserTurnText(userInput, conversationContext, actor) {
     currentInstruction
   ].join("\n");
 }
+function renderExplicitSkillInstructions(skill) {
+  return [
+    "<skill>",
+    `<name>${escapeXml(skill.name)}</name>`,
+    `<path>${escapeXml(sandboxSkillFile(skill.name))}</path>`,
+    `<working_directory>${escapeXml(sandboxSkillDir(skill.name))}</working_directory>`,
+    `<path_resolution>${escapeXml(sandboxSkillPathResolution(skill.name))}</path_resolution>`,
+    skill.body,
+    "</skill>"
+  ].join("\n");
+}
 function encodeNonImageAttachmentForPrompt(attachment) {
   const base64 = attachment.data.toString("base64");
   const wasTruncated = base64.length > MAX_INLINE_ATTACHMENT_BASE64_CHARS;
@@ -2343,14 +2330,23 @@ async function assemblePrompt(args) {
   const source = args.routing.source;
   const hasPromptCheckpoint = args.resumedFromSessionRecord && args.existingTurnStartMessageIndex !== void 0;
   const shouldPromptAgent = !args.resumedFromSessionRecord || !hasPromptCheckpoint;
+  const requestContentParts = [
+    ...args.explicitSkill ? [
+      {
+        type: "text",
+        text: renderExplicitSkillInstructions(args.explicitSkill)
+      }
+    ] : [],
+    ...args.userContentParts
+  ];
   const promptHistoryMessages = shouldPromptAgent ? withoutTrailingUncheckpointedUserPrompt(
     args.priorPiMessages,
-    args.userContentParts
+    requestContentParts
   ) : args.existingSessionPiMessages;
   const replayedPromptContent = shouldPromptAgent && !args.resumedFromSessionRecord ? checkpointedPromptContent({
     messages: args.existingSessionPiMessages,
     turnStartMessageIndex: args.existingTurnStartMessageIndex,
-    userContentParts: args.userContentParts
+    userContentParts: requestContentParts
   }) : void 0;
   const needsBootstrapContextForPrompt = shouldPromptAgent && !replayedPromptContent && !hasRuntimeTurnContext(promptHistoryMessages);
   const systemPromptContributions = await getPluginSystemPromptContributions(source);
@@ -2376,7 +2372,6 @@ async function assemblePrompt(args) {
       destination: args.routing.destination,
       source
     } : void 0,
-    invocation: args.invocation,
     actor: isUserActor(args.currentActor) ? args.currentActor : void 0,
     artifactState: args.artifactState,
     configuration: args.configurationValues
@@ -2384,7 +2379,7 @@ async function assemblePrompt(args) {
   const turnContextParts = turnContextPrompt ? [{ type: "text", text: turnContextPrompt }] : [];
   const promptContentParts = replayedPromptContent ?? [
     ...turnContextParts,
-    ...args.userContentParts
+    ...requestContentParts
   ];
   const inputMessages = [
     {
@@ -3076,6 +3071,7 @@ import { Sandbox } from "@vercel/sandbox";
 // src/chat/sandbox/skill-sync.ts
 import fs3 from "fs/promises";
 import path3 from "path";
+var DIRECTORY_CREATE_CONCURRENCY = 8;
 function toPosixRelative(base, absolute) {
   return path3.relative(base, absolute).split(path3.sep).join("/");
 }
@@ -3150,6 +3146,16 @@ function collectDirectories(filesToWrite, workspaceRoot) {
     (directory) => directory === workspaceRoot || directory.startsWith(`${workspaceRoot}/`)
   ).sort((a, b) => a.length - b.length);
 }
+function groupDirectoriesByDepth(directories) {
+  const groups = /* @__PURE__ */ new Map();
+  for (const directory of directories) {
+    const depth = directory.split("/").filter(Boolean).length;
+    const group = groups.get(depth) ?? [];
+    group.push(directory);
+    groups.set(depth, group);
+  }
+  return [...groups.entries()].sort(([left], [right]) => left - right).map(([, group]) => group);
+}
 function resolveHostSkillPath(availableSkills, sandboxPath) {
   const normalizedPath = path3.posix.normalize(sandboxPath.trim());
   for (const skill of availableSkills) {
@@ -3219,13 +3225,21 @@ async function syncSkillsToSandbox(params) {
         },
         async () => {
           try {
-            for (const directory of directories) {
-              try {
-                await params.sandbox.mkDir(directory);
-              } catch (error) {
-                if (!isAlreadyExistsError(error)) {
-                  throw error;
-                }
+            for (const directoriesAtDepth of groupDirectoriesByDepth(
+              directories
+            )) {
+              for (let offset = 0; offset < directoriesAtDepth.length; offset += DIRECTORY_CREATE_CONCURRENCY) {
+                await Promise.all(
+                  directoriesAtDepth.slice(offset, offset + DIRECTORY_CREATE_CONCURRENCY).map(async (directory) => {
+                    try {
+                      await params.sandbox.mkDir(directory);
+                    } catch (error) {
+                      if (!isAlreadyExistsError(error)) {
+                        throw error;
+                      }
+                    }
+                  })
+                );
               }
             }
             await params.sandbox.writeFiles(filesToWrite);
@@ -3822,6 +3836,7 @@ var RIPGREP_EXCLUDED_GLOBS = [
   "!**/.git/**",
   "!**/node_modules/**"
 ];
+var DEFAULT_SEARCH_COMMAND_TIMEOUT_MS = 3e4;
 var SKIPPED_DIRECTORIES = /* @__PURE__ */ new Set([".git", "node_modules"]);
 function positiveInteger(value) {
   if (typeof value !== "number" || !Number.isFinite(value)) {
@@ -4409,7 +4424,7 @@ function createEditFileTool() {
 // src/chat/tools/sandbox/find-files.ts
 import path5 from "path";
 import { z as z5 } from "zod";
-var DEFAULT_FIND_LIMIT = 1e3;
+var DEFAULT_FIND_LIMIT = 100;
 async function findFiles(params) {
   if (!params.pattern.trim()) {
     throw new Error("pattern is required");
@@ -4420,6 +4435,7 @@ async function findFiles(params) {
     return await findFilesWithRipgrep({
       fs: params.fs,
       limit,
+      onTelemetry: params.onTelemetry,
       path: params.path,
       pattern: params.pattern,
       root,
@@ -4488,25 +4504,45 @@ async function findFilesWithRipgrep(params) {
     throw error;
   }
   const location = getRipgrepSearchLocation(params.root, rootIsDirectory);
-  const args = [
+  const ripgrepArgs = [
     "--files",
     "--null",
     "--hidden",
-    "--sort=path",
     "--glob",
     params.pattern
   ];
   for (const excludedGlob of RIPGREP_EXCLUDED_GLOBS) {
-    args.push("--glob", excludedGlob);
+    ripgrepArgs.push("--glob", excludedGlob);
   }
-  args.push("--", location.target);
+  ripgrepArgs.push("--", location.target);
   const result = await params.runCommand({
-    cmd: "rg",
-    args,
-    cwd: location.cwd
+    cmd: "bash",
+    args: [
+      "-c",
+      [
+        `rg "$@" | head -z -n ${params.limit + 1}`,
+        'statuses=("${PIPESTATUS[@]}")',
+        "if (( statuses[1] != 0 )); then",
+        '  exit "${statuses[1]}"',
+        "fi",
+        "if (( statuses[0] == 0 || statuses[0] == 1 || statuses[0] == 141 )); then",
+        "  exit 0",
+        "fi",
+        'exit "${statuses[0]}"'
+      ].join("\n"),
+      "find-files",
+      ...ripgrepArgs
+    ],
+    cwd: location.cwd,
+    timeoutMs: DEFAULT_SEARCH_COMMAND_TIMEOUT_MS
   });
-  if (result.exitCode !== 0 && result.exitCode !== 1) {
+  if (result.exitCode !== 0) {
     const detail = result.stderr.trim() || result.stdout.trim() || "command failed";
+    if (/error parsing glob|invalid glob/i.test(detail)) {
+      throw new ToolInputError(`Invalid glob pattern: ${params.pattern}`, {
+        cause: new Error(detail)
+      });
+    }
     throw new Error(`ripgrep file search failed: ${detail}`);
   }
   const allPaths = result.stdout.split("\0").filter(Boolean).map((filePath) => {
@@ -4530,7 +4566,7 @@ async function findFilesWithRipgrep(params) {
   const text = notices.length > 0 ? `${bounded.content}
 
 [${notices.join(" ")}]` : bounded.content;
-  return makeStructuredToolResult(
+  const response = makeStructuredToolResult(
     {
       ok: true,
       status: "success",
@@ -4547,6 +4583,19 @@ async function findFilesWithRipgrep(params) {
     },
     { content: [{ type: "text", text }] }
   );
+  params.onTelemetry?.({
+    emittedLineCount: relativePaths.length,
+    limit: params.limit,
+    limitReached,
+    parsedRecordCount: allPaths.length,
+    rawOutputBytes: Buffer.byteLength(result.stdout, "utf8"),
+    resultBytes: response.content.reduce(
+      (total, item) => total + (item.type === "text" ? Buffer.byteLength(item.text, "utf8") : 0),
+      0
+    ),
+    resultCount: relativePaths.length
+  });
+  return response;
 }
 function createFindFilesTool() {
   return zodTool({
@@ -4559,7 +4608,7 @@ function createFindFilesTool() {
       path: z5.string().min(1).describe(
         "Directory or file path in the sandbox workspace. Defaults to the workspace root."
       ).optional(),
-      limit: z5.coerce.number().int().min(1).describe("Maximum number of file paths to return. Defaults to 1000.").optional()
+      limit: z5.coerce.number().int().min(1).describe("Maximum number of file paths to return. Defaults to 100.").optional()
     }),
     outputSchema: juniorToolResultSchema,
     execute: async () => {
@@ -4612,6 +4661,7 @@ async function grepFiles(params) {
       ignoreCase: params.ignoreCase,
       limit,
       literal: params.literal,
+      onTelemetry: params.onTelemetry,
       path: params.path,
       pattern: params.pattern,
       root,
@@ -4759,7 +4809,13 @@ async function grepFilesWithRipgrep(params) {
     throw error;
   }
   const location = getRipgrepSearchLocation(params.root, rootIsDirectory);
-  const args = ["--json", "--line-number", "--hidden", "--sort=path"];
+  const args = [
+    "--json",
+    "--line-number",
+    "--hidden",
+    "--max-count",
+    String(params.limit + 1)
+  ];
   if (params.ignoreCase) {
     args.push("--ignore-case");
   }
@@ -4779,7 +4835,8 @@ async function grepFilesWithRipgrep(params) {
   const result = await params.runCommand({
     cmd: "rg",
     args,
-    cwd: location.cwd
+    cwd: location.cwd,
+    timeoutMs: DEFAULT_SEARCH_COMMAND_TIMEOUT_MS
   });
   if (result.exitCode !== 0 && result.exitCode !== 1) {
     const detail = result.stderr.trim() || result.stdout.trim() || "command failed";
@@ -4793,6 +4850,7 @@ async function grepFilesWithRipgrep(params) {
   const recordsByPath = /* @__PURE__ */ new Map();
   const pathOrder = [];
   let totalMatches = 0;
+  let parsedRecordCount = 0;
   for (const rawLine of normalizeToLf(result.stdout).split("\n")) {
     if (!rawLine) {
       continue;
@@ -4803,6 +4861,7 @@ async function grepFilesWithRipgrep(params) {
     } catch (error) {
       throw new Error("ripgrep returned invalid JSON output", { cause: error });
     }
+    parsedRecordCount += 1;
     if (record.type !== "match" && record.type !== "context") {
       continue;
     }
@@ -4884,7 +4943,7 @@ async function grepFilesWithRipgrep(params) {
   if (bounded.truncated) {
     notices.push(`${MAX_TEXT_CHARS} character output limit reached.`);
   }
-  return makeStructuredToolResult({
+  const response = makeStructuredToolResult({
     ok: true,
     status: "success",
     target: params.path ?? ".",
@@ -4903,6 +4962,19 @@ async function grepFilesWithRipgrep(params) {
     ...matchLimitReached ? { match_limit_reached: params.limit } : {},
     ...lineTruncated ? { line_truncated: true } : {}
   });
+  params.onTelemetry?.({
+    emittedLineCount: output.length,
+    limit: params.limit,
+    limitReached: matchLimitReached,
+    parsedRecordCount,
+    rawOutputBytes: Buffer.byteLength(result.stdout, "utf8"),
+    resultBytes: response.content.reduce(
+      (total, item) => total + (item.type === "text" ? Buffer.byteLength(item.text, "utf8") : 0),
+      0
+    ),
+    resultCount: matchCount
+  });
+  return response;
 }
 function createGrepTool() {
   return zodTool({
@@ -5242,11 +5314,12 @@ function createSandbox(options) {
     onSandboxPrepare: options.prepare,
     onSandboxRefChanged: options.onSandboxRefChanged
   });
-  const createToolCallContext = (signal) => {
+  const createToolCallContext = (signal, setToolCallSpanAttributes) => {
     let fileSystemPromise;
     let commandRunnerPromise;
     return {
       signal,
+      setToolCallSpanAttributes,
       fileSystem() {
         signal?.throwIfAborted();
         return fileSystemPromise ??= runtime.tools().then(({ fs: fs5 }) => {
@@ -5267,10 +5340,31 @@ function createSandbox(options) {
     };
   };
   const withSandboxSpan = (name, op, attributes, callback) => withSpan(name, op, traceContext, callback, attributes);
-  const withSandboxToolSpan = (name, op, attributes, callback) => withSandboxSpan(name, op, attributes, async () => {
+  const withSandboxToolSpan = (name, op, attributes, callback) => withSandboxSpan(name, op, attributes, async (setSpanAttributes2) => {
     await runtime.refreshNetworkPolicy(getTracePropagationHeaders());
-    return await callback();
+    return await callback(setSpanAttributes2);
+  });
+  const searchTelemetryAttributes = (telemetry) => ({
+    "app.sandbox.search.raw_output_bytes": telemetry.rawOutputBytes,
+    "app.sandbox.search.parsed_records": telemetry.parsedRecordCount,
+    "app.sandbox.search.result_count": telemetry.resultCount,
+    "app.sandbox.search.emitted_lines": telemetry.emittedLineCount,
+    "app.sandbox.search.result_bytes": telemetry.resultBytes,
+    "app.sandbox.search.limit": telemetry.limit,
+    "app.sandbox.search.limit_reached": telemetry.limitReached
   });
+  const recordSearchTelemetry = (telemetry, setSearchSpanAttributes, setToolCallSpanAttributes) => {
+    const attributes = searchTelemetryAttributes(telemetry);
+    for (const setAttributes of [
+      setSearchSpanAttributes,
+      setToolCallSpanAttributes
+    ]) {
+      try {
+        setAttributes?.(attributes);
+      } catch {
+      }
+    }
+  };
   const logSandboxBootRequest = (trigger, details = {}) => {
     if (runtime.sandboxRef()) {
       return;
@@ -5515,10 +5609,15 @@ function createSandbox(options) {
       {
         "app.sandbox.pattern.length": pattern.length
       },
-      async () => {
+      async (setSearchSpanAttributes) => {
         const response = await grepFiles({
           fs: fileSystem,
           runCommand: await context.commandRunner(),
+          onTelemetry: (telemetry) => recordSearchTelemetry(
+            telemetry,
+            setSearchSpanAttributes,
+            context.setToolCallSpanAttributes
+          ),
           pattern,
           ...typeof rawInput.path === "string" ? { path: rawInput.path } : {},
           ...typeof rawInput.glob === "string" ? { glob: rawInput.glob } : {},
@@ -5547,10 +5646,15 @@ function createSandbox(options) {
       {
         "app.sandbox.pattern.length": pattern.length
       },
-      async () => {
+      async (setSearchSpanAttributes) => {
         const response = await findFiles({
           fs: fileSystem,
           runCommand: await context.commandRunner(),
+          onTelemetry: (telemetry) => recordSearchTelemetry(
+            telemetry,
+            setSearchSpanAttributes,
+            context.setToolCallSpanAttributes
+          ),
           pattern,
           ...typeof rawInput.path === "string" ? { path: rawInput.path } : {},
           ...limit ? { limit } : {}
@@ -5583,7 +5687,10 @@ function createSandbox(options) {
   };
   const execute = async (params) => {
     const rawInput = params.input ?? {};
-    const context = createToolCallContext(params.signal);
+    const context = createToolCallContext(
+      params.signal,
+      params.setToolCallSpanAttributes
+    );
     const bashCommand2 = params.toolName === "bash" ? String(rawInput.command ?? "").trim() : void 0;
     if (params.toolName === "bash") {
       if (!bashCommand2) {
@@ -6912,7 +7019,7 @@ async function loadSkillFromHost(availableSkills, skillName) {
     skill_dir: skillDir,
     working_directory: skillDir,
     location: skillFilePath,
-    path_resolution: `Resolve relative paths in this skill against ${skillDir}. For bash commands from this skill, cd to ${skillDir} first or use absolute paths.`,
+    path_resolution: sandboxSkillPathResolution(skill.name),
     instructions: loaded.body
   };
 }
@@ -11056,7 +11163,7 @@ function createToolState(hooks, context) {
     }
   };
 }
-function createTools(availableSkills, hooks = {}, context) {
+function createTools(availableSkills, hooks = {}, context, options = {}) {
   const state = createToolState(hooks, context);
   const slackContext = getSlackToolContext(context);
   const slackSourceCapabilities = slackContext ? resolveChannelCapabilities(slackContext.sourceChannelId) : void 0;
@@ -11064,9 +11171,11 @@ function createTools(availableSkills, hooks = {}, context) {
     slackContext && slackSourceCapabilities?.canSendFiles
   );
   const tools = {
-    loadSkill: createLoadSkillTool(availableSkills, {
-      onSkillLoaded: hooks.onSkillLoaded
-    }),
+    ...options.includeLoadSkill === false ? {} : {
+      loadSkill: createLoadSkillTool(availableSkills, {
+        onSkillLoaded: hooks.onSkillLoaded
+      })
+    },
     reportProgress: createReportProgressTool(),
     systemTime: createSystemTimeTool(),
     bash: createBashTool(),
@@ -12175,7 +12284,8 @@ function createPiAgentTools(tools, sandbox, spanContext, onStatus, sandboxTools,
     const result = isSandbox ? await sandboxTools.execute({
       toolName,
       input: sandboxInput,
-      ...signal ? { signal } : {}
+      ...signal ? { signal } : {},
+      ...toolName === "grep" || toolName === "findFiles" ? { setToolCallSpanAttributes: setSpanAttributes2 } : {}
     }) : await toolDef.execute(toolInput, {
       experimental_context: sandbox,
       ...signal ? { signal } : {},
@@ -13322,6 +13432,27 @@ function createPluginEgress(deps) {
 }
 
 // src/chat/agent/tools.ts
+async function tryRecordSkillLoadStat(skill, spanContext) {
+  if (!process.env.DATABASE_URL) return;
+  try {
+    await incrementStat({
+      namespace: skill.pluginProvider ?? "junior",
+      metric: "skill_load",
+      name: skill.name
+    });
+  } catch (error) {
+    logWarn(
+      "skill_load_stat_failed",
+      spanContext,
+      {
+        "app.skill.name": skill.name,
+        "app.plugin.name": skill.pluginProvider,
+        "exception.message": error instanceof Error ? error.message : String(error)
+      },
+      "Failed to record skill load stat"
+    );
+  }
+}
 async function wireAgentTools(args) {
   const runSource = args.routing.source;
   const credentialUserId = args.routing.credentialContext ? credentialUserSubjectId(args.routing.credentialContext) : void 0;
@@ -13396,6 +13527,9 @@ async function wireAgentTools(args) {
   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.conversationId,
     userText: args.userInput,
@@ -13476,6 +13610,7 @@ async function wireAgentTools(args) {
         if (await mcpToolManager.activateForSkill(effective)) {
           await args.recordConnectedMcpProvider(effective.pluginProvider);
         }
+        await tryRecordSkillLoadStat(effective, args.spanContext);
         if (mcpAuth.getPendingPause()) {
           return void 0;
         }
@@ -13494,7 +13629,8 @@ async function wireAgentTools(args) {
         };
       }
     },
-    toolRuntimeContext
+    toolRuntimeContext,
+    { includeLoadSkill: !explicitSkillLoaded }
   );
   const plannedToolExposure = planToolExposure(
     tools
@@ -14541,6 +14677,7 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy, run
       skillSandbox,
       syncLoadedSkillNamesForResume
     });
+    const explicitSkill = invokedSkill ? activeSkills.find((skill) => skill.name === invokedSkill.name) ?? null : null;
     const { routerBlocks, userContentParts } = buildPromptInput(input);
     const preAgentPromptMessages = () => existingSessionRecord?.piMessages ?? [...input.piMessages ?? []];
     const storedTurnRoute = await loadTurnRoute({ conversationId, turnId });
@@ -14771,7 +14908,7 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy, run
       conversationPrivacy,
       existingSessionPiMessages: existingSessionRecord?.piMessages,
       existingTurnStartMessageIndex: existingSessionRecord?.turnStartMessageIndex,
-      invocation: skillInvocation,
+      explicitSkill,
       priorPiMessages,
       resumedFromSessionRecord,
       routing,