@sentry/junior 0.164.0 → 0.165.0

package/dist/{chunk-YHCTPDXS.js → chunk-5WDDWMQ7.js}

@@ -2,7 +2,7 @@ import {
   getConversationEventStore,
   getDb,
   getSqlExecutor
-} from "./chunk-LPLVNMVN.js";
+} from "./chunk-RQQTOF3H.js";
 import {
   juniorConversationAnnotations,
   juniorConversationEvents,
@@ -10,7 +10,7 @@ import {
   juniorUsers,
   juniorWorkspaceRepos,
   juniorWorkspaces
-} from "./chunk-ZSNABC2E.js";
+} from "./chunk-IZHR2OES.js";
 import {
   SANDBOX_WORKSPACE_ROOT,
   runNonInteractiveCommand,
@@ -18,14 +18,14 @@ import {
 } from "./chunk-BVREIWBD.js";
 import {
   getStateAdapter
-} from "./chunk-BXBZDV3C.js";
+} from "./chunk-65B3PDY7.js";
 import {
   botConfig,
   completeObject,
   embedTexts,
   getSlackBotToken,
   standardModelId
-} from "./chunk-FX4PX3SA.js";
+} from "./chunk-FMOFCEAA.js";
 import {
   isActorUserId,
   parseActorUserId,
@@ -41,7 +41,7 @@ import {
   setSpanAttributes,
   setSpanStatus,
   withSpan
-} from "./chunk-VHSEMJTS.js";
+} from "./chunk-32CCG4WP.js";
 
 // src/chat/plugins/agent-hooks.ts
 import {
@@ -1277,8 +1277,7 @@ function normalizeWorkspaceRecipe(input) {
     }
     return {
       provider,
-      repo,
-      isPrimary: entry.isPrimary === true
+      repo
     };
   });
   const identities = /* @__PURE__ */ new Set();
@@ -1302,17 +1301,6 @@ function normalizeWorkspaceRecipe(input) {
     }
     checkoutPaths.add(key);
   }
-  const primaryCount = repos.filter((repo) => repo.isPrimary).length;
-  if (repos.length > 0 && primaryCount === 0) {
-    throw new WorkspaceValidationError(
-      "Select one primary repository for AGENTS.md instructions."
-    );
-  }
-  if (primaryCount > 1) {
-    throw new WorkspaceValidationError(
-      "A Workspace can have only one primary repository."
-    );
-  }
   return { name, setupScript, repos };
 }
 
@@ -1324,8 +1312,7 @@ function workspaceFromRows(row, repos) {
     setupScript: row.setupScript,
     repos: repos.map((repo) => ({
       provider: repo.provider,
-      repo: repo.repo,
-      isPrimary: repo.isPrimary
+      repo: repo.repo
     }))
   };
 }
@@ -1342,8 +1329,7 @@ async function replaceWorkspaceRepos(db, workspaceId, repos) {
     repos.map((repo) => ({
       workspaceId,
       provider: repo.provider,
-      repo: repo.repo,
-      isPrimary: repo.isPrimary
+      repo: repo.repo
     }))
   );
 }

package/dist/{chunk-BXBZDV3C.js → chunk-65B3PDY7.js}

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

package/dist/{chunk-5GLGQHO3.js → chunk-6OWVPXNO.js}

@@ -1,7 +1,7 @@
 // package.json
 var package_default = {
   name: "@sentry/junior",
-  version: "0.164.0",
+  version: "0.165.0",
   private: false,
   publishConfig: {
     access: "public"
@@ -65,6 +65,7 @@ var package_default = {
     typecheck: "tsc --noEmit",
     "skills:check": "node --test scripts/check-skills.test.mjs && node scripts/check-skills.mjs",
     "tool-annotations:check": "node --test scripts/check-tool-annotations.test.mjs && node scripts/check-tool-annotations.mjs",
+    "tool-error-classification:check": "node --test scripts/check-tool-error-classification.test.mjs && node scripts/check-tool-error-classification.mjs",
     "test:coverage": "vitest run --maxWorkers=4 --coverage --reporter=default --reporter=junit --outputFile.junit=coverage/results.junit.xml"
   },
   dependencies: {

package/dist/{chunk-XAIRI54J.js → chunk-6RZ6MMEK.js}

@@ -1,6 +1,6 @@
 import {
   createAndEnqueueAgentInvocation
-} from "./chunk-Y2B6AXZQ.js";
+} from "./chunk-SA5FVUWJ.js";
 import {
   actorFromRun,
   toolInvocationDestination

package/dist/{chunk-NAGI2XH3.js → chunk-6YXCG2XL.js}

@@ -8,14 +8,14 @@ import {
   getConversationStore,
   parseDestination,
   sameDestination
-} from "./chunk-LPLVNMVN.js";
+} from "./chunk-RQQTOF3H.js";
 import {
   getDefaultRedisStateAdapterFor,
   getStateAdapter
-} from "./chunk-BXBZDV3C.js";
+} from "./chunk-65B3PDY7.js";
 import {
   getChatConfig
-} from "./chunk-FX4PX3SA.js";
+} from "./chunk-FMOFCEAA.js";
 import {
   parseStoredSlackActor
 } from "./chunk-V7YE4WCP.js";
@@ -23,7 +23,7 @@ import {
   isRecord,
   toOptionalNumber,
   toOptionalString
-} from "./chunk-VHSEMJTS.js";
+} from "./chunk-32CCG4WP.js";
 
 // src/chat/task-execution/state.ts
 import { randomUUID } from "crypto";

package/dist/{chunk-6BXV63YX.js → chunk-7J26TW64.js}

@@ -4,7 +4,7 @@ import {
 import {
   formatProviderLabel,
   startOAuthFlow
-} from "./chunk-JW23XD4I.js";
+} from "./chunk-FXX4NHOM.js";
 import {
   parseSandboxEgressAuthRequiredSignal
 } from "./chunk-7MA4HV4W.js";
@@ -12,16 +12,16 @@ import {
   abandonReplacedPendingAuth,
   canReusePendingAuthLink,
   recordAuthorizationRequested
-} from "./chunk-HHW6ZVIZ.js";
+} from "./chunk-EA4UL5H2.js";
 import {
   AGENT_INVOCATION_MAILBOX_STATUSES
-} from "./chunk-ZSNABC2E.js";
+} from "./chunk-IZHR2OES.js";
 import {
   TURN_REASONING_LEVELS
-} from "./chunk-FX4PX3SA.js";
+} from "./chunk-FMOFCEAA.js";
 import {
   pluginCatalogRuntime
-} from "./chunk-RULIISEI.js";
+} from "./chunk-7S2JVUWS.js";
 import {
   credentialContextSchema
 } from "./chunk-BDUENQD3.js";

package/dist/{chunk-RULIISEI.js → chunk-7S2JVUWS.js}

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

package/dist/{chunk-5FWQ73UZ.js → chunk-AEBF6AO2.js}

@@ -1,6 +1,6 @@
 import {
   getStateAdapter
-} from "./chunk-BXBZDV3C.js";
+} from "./chunk-65B3PDY7.js";
 import {
   getClient
 } from "./chunk-6GWA276C.js";

package/dist/{chunk-ZUTAGCPH.js → chunk-AQEBOQUC.js}

@@ -2,7 +2,7 @@ import {
   coerceThreadConversationState,
   getPersistedThreadState,
   persistThreadStateById
-} from "./chunk-2K25MRZK.js";
+} from "./chunk-VDNNVTX2.js";
 import {
   pluginTaskId,
   pluginTaskParamsSchema,
@@ -22,7 +22,7 @@ import {
   markTurnCompleted,
   normalizeToolNameFromResult,
   stripRuntimeTurnContext
-} from "./chunk-HHW6ZVIZ.js";
+} from "./chunk-EA4UL5H2.js";
 import {
   JUNIOR_THREAD_STATE_TTL_MS
 } from "./chunk-3Y47VMHV.js";
@@ -33,25 +33,25 @@ import {
   createPluginModel,
   createPluginState,
   getPlugins
-} from "./chunk-YHCTPDXS.js";
+} from "./chunk-5WDDWMQ7.js";
 import {
   getConversationStore,
   getDb,
   sameActorIdentity
-} from "./chunk-LPLVNMVN.js";
+} from "./chunk-RQQTOF3H.js";
 import {
   juniorConversations,
   juniorTaskExecutions
-} from "./chunk-ZSNABC2E.js";
+} from "./chunk-IZHR2OES.js";
 import {
   getStateAdapter
-} from "./chunk-BXBZDV3C.js";
+} from "./chunk-65B3PDY7.js";
 import {
   ProviderError,
   findProviderError,
   getProviderErrorAttributes,
   getProviderErrorUserMessage
-} from "./chunk-FX4PX3SA.js";
+} from "./chunk-FMOFCEAA.js";
 import {
   credentialSubjectSchema
 } from "./chunk-BDUENQD3.js";
@@ -61,7 +61,7 @@ import {
 import {
   buildTurnFailureResponse,
   logWarn
-} from "./chunk-VHSEMJTS.js";
+} from "./chunk-32CCG4WP.js";
 
 // src/chat/runtime/delivered-turn-state.ts
 function buildDeliveredTurnStatePatch(args) {
@@ -87,7 +87,7 @@ import { pluginRunContextSchema } from "@sentry/junior-plugin-api";
 
 // src/chat/services/turn-session-routing.ts
 async function resolveTurnSessionRouting(args) {
-  const conversationStore = args.conversationStore ?? (await import("./db-32KRFS6L.js")).getConversationStore();
+  const conversationStore = args.conversationStore ?? (await import("./db-5TTEPMTY.js")).getConversationStore();
   const conversation = await conversationStore.get({
     conversationId: args.conversationId
   });

package/dist/{chunk-PU45BSBS.js → chunk-BEC542E6.js}

@@ -721,20 +721,23 @@ var revokePersonalTokenResponseSchema = z6.object({ revoked: z6.literal(true) })
 import { z as z7 } from "zod";
 var workspaceRepoInputSchema = z7.object({
   provider: z7.string(),
-  repo: z7.string(),
-  isPrimary: z7.boolean().optional()
+  repo: z7.string()
 }).strict();
 var workspaceRepoSchema = z7.object({
   provider: z7.string(),
   repo: z7.string(),
-  checkoutPath: z7.string(),
-  isPrimary: z7.boolean()
+  checkoutPath: z7.string()
+}).strict();
+var workspaceSnapshotSchema = z7.object({
+  id: z7.string(),
+  generatedAt: z7.iso.datetime()
 }).strict();
 var workspaceSchema = z7.object({
   id: z7.string().uuid(),
   name: z7.string(),
   setupScript: z7.string(),
-  repos: z7.array(workspaceRepoSchema)
+  repos: z7.array(workspaceRepoSchema),
+  snapshot: workspaceSnapshotSchema.nullable()
 }).strict();
 var workspaceListSchema = z7.object({ workspaces: z7.array(workspaceSchema) }).strict();
 var workspaceBodySchema = z7.object({

package/dist/{chunk-RJHZNPDH.js → chunk-BEHPIDVZ.js}

@@ -5,18 +5,18 @@ import {
 } from "./chunk-BVREIWBD.js";
 import {
   getStateAdapter
-} from "./chunk-BXBZDV3C.js";
+} from "./chunk-65B3PDY7.js";
 import {
   toOptionalTrimmed
-} from "./chunk-FX4PX3SA.js";
+} from "./chunk-FMOFCEAA.js";
 import {
   pluginCatalogRuntime
-} from "./chunk-RULIISEI.js";
+} from "./chunk-7S2JVUWS.js";
 import {
   setSpanAttributes,
   setSpanStatus,
   withSpan
-} from "./chunk-VHSEMJTS.js";
+} from "./chunk-32CCG4WP.js";
 
 // src/chat/sandbox/resources.ts
 var configuredResources;
@@ -1170,6 +1170,7 @@ export {
   bindSandboxFileSystem,
   createSandboxSession,
   stopSession,
+  getCachedSnapshot,
   resolve,
   isMissingError
 };

package/dist/{chunk-RYYEHWIL.js → chunk-DKO4RRGJ.js}

@@ -1,7 +1,7 @@
 import {
   FUNCTION_TIMEOUT_BUFFER_SECONDS,
   getChatConfig
-} from "./chunk-FX4PX3SA.js";
+} from "./chunk-FMOFCEAA.js";
 
 // src/chat/runtime/request-deadline.ts
 import { AsyncLocalStorage } from "async_hooks";

package/dist/{chunk-HHW6ZVIZ.js → chunk-EA4UL5H2.js}

@@ -13,7 +13,7 @@ import {
   instructionProvenanceFor,
   sanitizePostgresJson,
   withConversationEventLock
-} from "./chunk-LPLVNMVN.js";
+} from "./chunk-RQQTOF3H.js";
 import {
   SANDBOX_REPOS_ROOT,
   SANDBOX_WORKSPACE_ROOT,
@@ -24,14 +24,14 @@ import {
   fenceLock,
   getStateAdapter,
   withLock
-} from "./chunk-BXBZDV3C.js";
+} from "./chunk-65B3PDY7.js";
 import {
   botConfig,
   completeText,
   escapeXml,
   resolveGatewayModel,
   unwrapCurrentInstruction
-} from "./chunk-FX4PX3SA.js";
+} from "./chunk-FMOFCEAA.js";
 import {
   parseSlackMessageTs,
   toStoredSlackActor
@@ -41,7 +41,7 @@ import {
   logException,
   logWarn,
   setSpanAttributes
-} from "./chunk-VHSEMJTS.js";
+} from "./chunk-32CCG4WP.js";
 
 // src/chat/turn-context-tag.ts
 var TURN_CONTEXT_TAG = "runtime-turn-context";
@@ -2054,9 +2054,9 @@ async function findGitRoot(fs, cwd) {
     current = parent;
   }
 }
-async function findSingleRepositoryDirectory(fs) {
+async function listRepositoryDirectories(fs) {
   if (!await directoryExists(fs, SANDBOX_REPOS_ROOT)) {
-    return void 0;
+    return [];
   }
   const entries = await fs.readdir(SANDBOX_REPOS_ROOT);
   const repositories = [];
@@ -2064,12 +2064,11 @@ async function findSingleRepositoryDirectory(fs) {
     const candidate = path2.posix.join(SANDBOX_REPOS_ROOT, entry);
     if (await directoryExists(fs, candidate) && await pathExists(fs, path2.posix.join(candidate, ".git"))) {
       repositories.push(candidate);
-      if (repositories.length > 1) {
-        return void 0;
-      }
     }
   }
-  return repositories[0];
+  return repositories.sort(
+    (left, right) => left < right ? -1 : left > right ? 1 : 0
+  );
 }
 async function readInstructionFile(fs, filePath) {
   try {
@@ -2098,7 +2097,10 @@ async function resolveRepositoryInstructions(args) {
   }
   directories.reverse();
   const sources = [];
-  let remaining = MAX_REPOSITORY_INSTRUCTIONS_BYTES;
+  let remaining = Math.max(
+    0,
+    args.maxBytes ?? MAX_REPOSITORY_INSTRUCTIONS_BYTES
+  );
   for (const directory of directories) {
     if (remaining <= 0) {
       break;
@@ -2116,10 +2118,67 @@ async function resolveRepositoryInstructions(args) {
   if (sources.length === 0) {
     return void 0;
   }
-  const text = sources.map((source) => source.content).join("\n\n");
+  const text = formatInstructionSources(sources);
   const fingerprint = createHash2("sha256").update(JSON.stringify({ directory: args.cwd, sources })).digest("hex");
   return { directory: args.cwd, fingerprint, sources, text };
 }
+function formatInstructionSources(sources) {
+  if (sources.length === 1) {
+    return sources[0].content;
+  }
+  return sources.map(
+    (source) => `## ${path2.posix.dirname(source.path)}
+
+${source.content}`
+  ).join("\n\n");
+}
+function mergeRepositoryInstructions(bundles) {
+  if (bundles.length === 0) {
+    return void 0;
+  }
+  if (bundles.length === 1) {
+    return bundles[0];
+  }
+  const sources = bundles.flatMap((bundle) => bundle.sources);
+  const text = formatInstructionSources(sources);
+  const fingerprint = createHash2("sha256").update(
+    JSON.stringify({
+      directories: bundles.map((bundle) => bundle.directory ?? null),
+      sources
+    })
+  ).digest("hex");
+  return { fingerprint, sources, text };
+}
+async function resolveRepositoryInstructionsForDirectories(args) {
+  const uniqueDirectories = [
+    ...new Set(
+      args.directories.filter(
+        (directory) => directory === SANDBOX_WORKSPACE_ROOT || directory.startsWith(`${SANDBOX_WORKSPACE_ROOT}/`)
+      )
+    )
+  ].sort((left, right) => left < right ? -1 : left > right ? 1 : 0);
+  let remaining = MAX_REPOSITORY_INSTRUCTIONS_BYTES;
+  const bundles = [];
+  for (const directory of uniqueDirectories) {
+    if (remaining <= 0) {
+      break;
+    }
+    const instructions = await resolveRepositoryInstructions({
+      cwd: directory,
+      fs: args.fs,
+      maxBytes: remaining
+    });
+    if (!instructions) {
+      continue;
+    }
+    bundles.push(instructions);
+    remaining -= instructions.sources.reduce(
+      (total, source) => total + Buffer.byteLength(source.content, "utf8"),
+      0
+    );
+  }
+  return mergeRepositoryInstructions(bundles);
+}
 function renderAgentsInstructions(args) {
   const directory = args.directory ? ` for ${args.directory}` : "";
   return `# AGENTS.md instructions${directory}
@@ -3231,8 +3290,8 @@ export {
   collectFiles,
   AGENTS_REPLACEMENT_NOTICE,
   AGENTS_REMOVAL_NOTICE,
-  findSingleRepositoryDirectory,
-  resolveRepositoryInstructions,
+  listRepositoryDirectories,
+  resolveRepositoryInstructionsForDirectories,
   renderAgentsInstructions,
   buildAgentsInstructionsMessage,
   findVisibleAgentsInstructions,

package/dist/{chunk-FX4PX3SA.js → chunk-FMOFCEAA.js}

@@ -3,7 +3,7 @@ import {
   toCanonicalInputMessage,
   toCanonicalOutputMessage,
   toGenAiMessagesTraceAttributes
-} from "./chunk-RBV4JHCP.js";
+} from "./chunk-ZUKU2Y3J.js";
 import {
   extractGenAiUsageAttributes,
   logException,
@@ -11,7 +11,7 @@ import {
   normalizeGenAiFinishReason,
   serializeGenAiAttribute,
   withSpan
-} from "./chunk-VHSEMJTS.js";
+} from "./chunk-32CCG4WP.js";
 
 // src/chat/services/provider-error.ts
 var ProviderError = class extends Error {

package/dist/{chunk-CGCNFEAU.js → chunk-FNNQCHOL.js}

@@ -1,6 +1,6 @@
 import {
   getTurnRequestDeadline
-} from "./chunk-RYYEHWIL.js";
+} from "./chunk-DKO4RRGJ.js";
 import {
   CONVERSATION_WORK_CHECK_IN_INTERVAL_MS,
   CONVERSATION_WORK_MAX_RETRIES,
@@ -21,20 +21,20 @@ import {
   releaseConversationWork,
   requestAnotherSlice,
   startConversationWork
-} from "./chunk-NAGI2XH3.js";
+} from "./chunk-6YXCG2XL.js";
 import {
   ConversationQueueMessageRejectedError
 } from "./chunk-JAL3CH4G.js";
 import {
   getChatConfig,
   isProviderRetryError
-} from "./chunk-FX4PX3SA.js";
+} from "./chunk-FMOFCEAA.js";
 import {
   logException,
   logInfo,
   logWarn,
   withLogContext
-} from "./chunk-VHSEMJTS.js";
+} from "./chunk-32CCG4WP.js";
 
 // src/chat/task-execution/worker.ts
 var CONVERSATION_WORK_DEFER_DELAY_MS = 15e3;

package/dist/{chunk-JW23XD4I.js → chunk-FXX4NHOM.js}

@@ -5,19 +5,19 @@ import {
   isDmChannel,
   normalizeSlackConversationId,
   withSlackRetries
-} from "./chunk-YHCTPDXS.js";
+} from "./chunk-5WDDWMQ7.js";
 import {
   parseDestination
-} from "./chunk-LPLVNMVN.js";
+} from "./chunk-RQQTOF3H.js";
 import {
   getStateAdapter
-} from "./chunk-BXBZDV3C.js";
+} from "./chunk-65B3PDY7.js";
 import {
   normalizeSlackEmojiName
-} from "./chunk-FX4PX3SA.js";
+} from "./chunk-FMOFCEAA.js";
 import {
   pluginCatalogRuntime
-} from "./chunk-RULIISEI.js";
+} from "./chunk-7S2JVUWS.js";
 import {
   parseSlackMessageTs,
   parseSlackUserId
@@ -26,7 +26,7 @@ import {
   isRecord,
   logInfo,
   logWarn
-} from "./chunk-VHSEMJTS.js";
+} from "./chunk-32CCG4WP.js";
 
 // src/chat/slack/outbound.ts
 var MAX_SLACK_MESSAGE_TEXT_CHARS = 4e4;

package/dist/{chunk-4GTOFUQF.js → chunk-G72LBEMZ.js}

@@ -1,6 +1,6 @@
 import {
   pluginCatalogRuntime
-} from "./chunk-RULIISEI.js";
+} from "./chunk-7S2JVUWS.js";
 
 // src/chat/plugins/validation.ts
 import { isDeepStrictEqual } from "util";