@sentry/junior 0.84.1 → 0.85.0

package/dist/{agent-hooks-TFPY6V3T.js → agent-hooks-AV7CHLUO.js}

@@ -11,13 +11,13 @@ import {
   getPlugins,
   setPlugins,
   validatePlugins
-} from "./chunk-AL6ZFV7U.js";
-import "./chunk-CWMMGUWM.js";
-import "./chunk-QWKB6NJV.js";
+} from "./chunk-UVNV67EC.js";
+import "./chunk-MTE5NRPJ.js";
+import "./chunk-QTTTRBNB.js";
 import "./chunk-G3E7SCME.js";
-import "./chunk-MJ4E2PK7.js";
-import "./chunk-BAPRSWNW.js";
-import "./chunk-ALL7GG6U.js";
+import "./chunk-RUB77TGS.js";
+import "./chunk-C2PSUWK3.js";
+import "./chunk-BU2AWPEN.js";
 import "./chunk-DR75T7J3.js";
 import "./chunk-IXTBFABZ.js";
 import "./chunk-KF7522P3.js";

package/dist/app.js

@@ -68,7 +68,7 @@ import {
   updateConversationStats,
   uploadFilesToThread,
   upsertConversationMessage
-} from "./chunk-T2YRJZ5A.js";
+} from "./chunk-MHEV3T2Y.js";
 import {
   CONVERSATION_WORK_CHECK_IN_INTERVAL_MS,
   CONVERSATION_WORK_STALE_ENQUEUE_MS,
@@ -88,17 +88,17 @@ import {
   requestConversationContinuation,
   requestConversationWork,
   startConversationWork
-} from "./chunk-FPN7NYTE.js";
+} from "./chunk-EENOFKDN.js";
 import {
   JUNIOR_THREAD_STATE_TTL_MS,
   coerceThreadConversationState
 } from "./chunk-66NX7MNW.js";
-import "./chunk-LSG6PQF4.js";
+import "./chunk-FYPO4K7C.js";
 import {
   getVercelConversationWorkQueue,
   resolveConversationWorkQueueTopic,
   verifyConversationQueueMessage
-} from "./chunk-SBYMRDH7.js";
+} from "./chunk-ENEWQMRJ.js";
 import {
   PLUGIN_TASK_QUEUE_TOPIC,
   createVercelQueueClient,
@@ -111,12 +111,11 @@ import {
   resolveSlackChannelTypeFromMessage,
   resolveSlackConversationContext,
   setConversationTitle
-} from "./chunk-SVFA43LT.js";
+} from "./chunk-SSUEWAVS.js";
 import {
   abandonAgentTurnSessionRecord,
   buildSlackOutputMessage,
   commitMessages,
-  escapeXml,
   failAgentTurnSessionRecord,
   getAgentTurnSessionRecord,
   getInterruptionMarker,
@@ -127,7 +126,7 @@ import {
   recordAuthorizationCompleted,
   splitSlackReplyText,
   truncateStatusText
-} from "./chunk-JK7376UT.js";
+} from "./chunk-GY7L6VCT.js";
 import {
   validatePluginEgressCredentialHooks,
   validatePluginRegistrations
@@ -147,20 +146,20 @@ import {
   setPlugins,
   validatePlugins,
   verifySlackDirectCredentialSubject
-} from "./chunk-AL6ZFV7U.js";
+} from "./chunk-UVNV67EC.js";
 import {
   createPluginLogger,
   createPluginState
-} from "./chunk-CWMMGUWM.js";
+} from "./chunk-MTE5NRPJ.js";
 import {
   getConversationStore,
   getDb
-} from "./chunk-QWKB6NJV.js";
+} from "./chunk-QTTTRBNB.js";
 import "./chunk-G3E7SCME.js";
 import {
   acquireActiveLock,
   getStateAdapter
-} from "./chunk-MJ4E2PK7.js";
+} from "./chunk-RUB77TGS.js";
 import {
   SlackActionError,
   createSlackDestination,
@@ -173,13 +172,14 @@ import {
   parseDestination,
   requireSlackDestination,
   sameDestination
-} from "./chunk-BAPRSWNW.js";
+} from "./chunk-C2PSUWK3.js";
 import {
   FUNCTION_TIMEOUT_BUFFER_SECONDS,
   GEN_AI_PROVIDER_NAME,
   botConfig,
   completeObject,
   completeText,
+  escapeXml,
   getChatConfig,
   getRuntimeMetadata,
   getSlackBotToken,
@@ -191,8 +191,9 @@ import {
   normalizeSlackEmojiName,
   setSlackReactionConfig,
   stripRuntimeTurnContext,
-  trimTrailingAssistantMessages
-} from "./chunk-ALL7GG6U.js";
+  trimTrailingAssistantMessages,
+  unwrapCurrentInstruction
+} from "./chunk-BU2AWPEN.js";
 import {
   parseSlackThreadId,
   resolveSlackChannelIdFromMessage,
@@ -2349,16 +2350,58 @@ function normalizeGitHubCheckSuiteEvents(deliveryId, body) {
   });
 }
 
-// src/handlers/github-webhook/pull-request.ts
+// src/handlers/github-webhook/issue-comment.ts
 import { z as z4 } from "zod";
-var pullRequestWebhookSchema = z4.object({
+var issueCommentWebhookSchema = z4.object({
   action: z4.string(),
-  pull_request: z4.object({
-    merged: z4.boolean().optional(),
-    number: z4.number()
-  }),
+  comment: z4.object({
+    body: z4.string(),
+    user: z4.object({
+      login: z4.string().optional()
+    }).strip().optional()
+  }).strip(),
+  issue: z4.object({
+    number: z4.number(),
+    pull_request: z4.object({
+      url: z4.string().min(1)
+    }).strip().optional()
+  }).strip(),
   repository: z4.object({
     full_name: z4.string().min(1)
+  }).strip()
+}).strip();
+function normalizeGitHubIssueCommentEvent(deliveryId, body) {
+  const parsed = issueCommentWebhookSchema.safeParse(body);
+  if (!parsed.success || parsed.data.action !== "created" || !parsed.data.issue.pull_request) {
+    return void 0;
+  }
+  const eventType = "comment.created";
+  const resource = gitHubPullRequestResource({
+    pullRequestNumber: parsed.data.issue.number,
+    repositoryFullName: parsed.data.repository.full_name
+  });
+  const author = parsed.data.comment.user?.login;
+  return {
+    eventKey: gitHubEventKey(deliveryId, eventType),
+    eventType,
+    occurredAtMs: Date.now(),
+    provider: "github",
+    resourceRef: resource.resourceRef,
+    trustedSummary: `${resource.label} received a comment${author ? ` from ${author}` : ""}.`,
+    untrustedText: parsed.data.comment.body
+  };
+}
+
+// src/handlers/github-webhook/pull-request.ts
+import { z as z5 } from "zod";
+var pullRequestWebhookSchema = z5.object({
+  action: z5.string(),
+  pull_request: z5.object({
+    merged: z5.boolean().optional(),
+    number: z5.number()
+  }),
+  repository: z5.object({
+    full_name: z5.string().min(1)
   })
 });
 function normalizeGitHubPullRequestEvent(deliveryId, body) {
@@ -2382,21 +2425,60 @@ function normalizeGitHubPullRequestEvent(deliveryId, body) {
   };
 }
 
+// src/handlers/github-webhook/pull-request-review-comment.ts
+import { z as z6 } from "zod";
+var pullRequestReviewCommentWebhookSchema = z6.object({
+  action: z6.string(),
+  comment: z6.object({
+    body: z6.string(),
+    user: z6.object({
+      login: z6.string().optional()
+    }).strip().optional()
+  }).strip(),
+  pull_request: z6.object({
+    number: z6.number()
+  }).strip(),
+  repository: z6.object({
+    full_name: z6.string().min(1)
+  }).strip()
+}).strip();
+function normalizeGitHubPullRequestReviewCommentEvent(deliveryId, body) {
+  const parsed = pullRequestReviewCommentWebhookSchema.safeParse(body);
+  if (!parsed.success || parsed.data.action !== "created") {
+    return void 0;
+  }
+  const eventType = "review_comment.created";
+  const resource = gitHubPullRequestResource({
+    pullRequestNumber: parsed.data.pull_request.number,
+    repositoryFullName: parsed.data.repository.full_name
+  });
+  const author = parsed.data.comment.user?.login;
+  return {
+    eventKey: gitHubEventKey(deliveryId, eventType),
+    eventType,
+    occurredAtMs: Date.now(),
+    provider: "github",
+    resourceRef: resource.resourceRef,
+    trustedSummary: `${resource.label} received an inline review comment${author ? ` from ${author}` : ""}.`,
+    untrustedText: parsed.data.comment.body
+  };
+}
+
 // src/handlers/github-webhook/pull-request-review.ts
-import { z as z5 } from "zod";
-var pullRequestReviewWebhookSchema = z5.object({
-  action: z5.string(),
-  pull_request: z5.object({
-    number: z5.number()
+import { z as z7 } from "zod";
+var pullRequestReviewWebhookSchema = z7.object({
+  action: z7.string(),
+  pull_request: z7.object({
+    number: z7.number()
   }),
-  repository: z5.object({
-    full_name: z5.string().min(1)
+  repository: z7.object({
+    full_name: z7.string().min(1)
   }),
-  review: z5.object({
-    body: z5.string().optional().nullable(),
-    state: z5.string(),
-    user: z5.object({
-      login: z5.string().optional()
+  review: z7.object({
+    body: z7.string().optional().nullable(),
+    state: z7.string(),
+    user: z7.object({
+      login: z7.string().optional()
     }).optional()
   })
 });
@@ -2406,7 +2488,7 @@ function normalizeGitHubPullRequestReviewEvent(deliveryId, body) {
     return void 0;
   }
   const reviewState = parsed.data.review.state.toUpperCase();
-  const eventType = reviewState === "APPROVED" ? "review.approved" : reviewState === "CHANGES_REQUESTED" ? "review.changes_requested" : void 0;
+  const eventType = reviewState === "APPROVED" ? "review.approved" : reviewState === "CHANGES_REQUESTED" ? "review.changes_requested" : reviewState === "COMMENTED" ? "review.commented" : void 0;
   if (!eventType) {
     return void 0;
   }
@@ -2421,7 +2503,7 @@ function normalizeGitHubPullRequestReviewEvent(deliveryId, body) {
     occurredAtMs: Date.now(),
     provider: "github",
     resourceRef: resource.resourceRef,
-    trustedSummary: eventType === "review.approved" ? `${resource.label} was approved${reviewer ? ` by ${reviewer}` : ""}.` : `${resource.label} received requested changes${reviewer ? ` from ${reviewer}` : ""}.`,
+    trustedSummary: eventType === "review.approved" ? `${resource.label} was approved${reviewer ? ` by ${reviewer}` : ""}.` : eventType === "review.changes_requested" ? `${resource.label} received requested changes${reviewer ? ` from ${reviewer}` : ""}.` : `${resource.label} received a review comment${reviewer ? ` from ${reviewer}` : ""}.`,
     untrustedText: parsed.data.review.body ?? void 0
   };
 }
@@ -2457,6 +2539,20 @@ function normalizeGitHubResourceEvents(args) {
       );
       return event ? [event] : [];
     }
+    case "issue_comment": {
+      const event = normalizeGitHubIssueCommentEvent(
+        args.deliveryId,
+        args.body
+      );
+      return event ? [event] : [];
+    }
+    case "pull_request_review_comment": {
+      const event = normalizeGitHubPullRequestReviewCommentEvent(
+        args.deliveryId,
+        args.body
+      );
+      return event ? [event] : [];
+    }
     case "check_suite":
       return normalizeGitHubCheckSuiteEvents(args.deliveryId, args.body);
     default:
@@ -6913,14 +7009,14 @@ function registerVercelPluginTaskDevConsumer() {
 }
 
 // src/chat/services/subscribed-decision.ts
-import { z as z6 } from "zod";
-var replyDecisionSchema = z6.object({
-  should_reply: z6.boolean().describe("Whether Junior should respond to this thread message."),
-  should_unsubscribe: z6.boolean().describe(
+import { z as z8 } from "zod";
+var replyDecisionSchema = z8.object({
+  should_reply: z8.boolean().describe("Whether Junior should respond to this thread message."),
+  should_unsubscribe: z8.boolean().describe(
     "Whether Junior should unsubscribe from this thread because the user clearly asked it to stop participating."
   ),
-  confidence: z6.number().min(0).max(1).describe("Classifier confidence from 0 to 1."),
-  reason: z6.string().optional().describe("Short reason for the decision.")
+  confidence: z8.number().min(0).max(1).describe("Classifier confidence from 0 to 1."),
+  reason: z8.string().optional().describe("Short reason for the decision.")
 }).strict();
 var ROUTER_CONFIDENCE_THRESHOLD = 0.8;
 var ROUTER_CLASSIFIER_MAX_TOKENS = 240;
@@ -8059,10 +8155,12 @@ function textPart(value) {
 }
 function messageText(message) {
   const content = message.content;
+  const unwrapTask = message.role === "user";
+  const displayText = (text) => unwrapTask ? unwrapCurrentInstruction(text) ?? text : text;
   if (!Array.isArray(content)) {
-    return typeof content === "string" ? content : "";
+    return typeof content === "string" ? displayText(content) : "";
   }
-  return content.map(textPart).filter(Boolean).join("\n").trim();
+  return content.map(textPart).filter((text) => Boolean(text)).map(displayText).join("\n").trim();
 }
 function sanitizeText(text) {
   return text.replace(

package/dist/chat/current-instruction.d.ts

@@ -0,0 +1,6 @@
+/** Render the active user task in a stable prompt boundary. */
+export declare function renderCurrentInstruction(instruction: string): string;
+/** Read the exact body from a standalone current-task prompt boundary. */
+export declare function extractCurrentInstructionBody(text: string): string | undefined;
+/** Recover display text from the internal current-task prompt boundary. */
+export declare function unwrapCurrentInstruction(text: string): string | undefined;

package/dist/chat/respond-helpers.d.ts

@@ -43,8 +43,7 @@ export declare function toObservablePromptPart(part: {
 /** Truncate message text for log attributes. */
 export declare function summarizeMessageText(text: string): string;
 /**
- * Put prior thread text before the current instruction when no Pi history
- * exists. Structured thread XML is already a top-level prompt block.
+ * Keep thread text separate from the canonical active task boundary.
  */
 export declare function buildUserTurnText(userInput: string, conversationContext?: string): string;
 /** Encode a non-image attachment as base64 XML for the prompt. */

package/dist/{chunk-ALL7GG6U.js → chunk-BU2AWPEN.js}

@@ -13,6 +13,41 @@ import {
   withSpan
 } from "./chunk-KF7522P3.js";
 
+// src/chat/xml.ts
+function escapeXml(value) {
+  return value.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll('"', "&quot;").replaceAll("'", "&apos;");
+}
+
+// src/chat/current-instruction.ts
+var CURRENT_INSTRUCTION_TAG = "current-instruction";
+var CURRENT_INSTRUCTION_PATTERN = new RegExp(
+  `<${CURRENT_INSTRUCTION_TAG}>\\n([\\s\\S]*?)\\n</${CURRENT_INSTRUCTION_TAG}>`
+);
+var STANDALONE_CURRENT_INSTRUCTION_PATTERN = new RegExp(
+  `^<${CURRENT_INSTRUCTION_TAG}>\\n([\\s\\S]*?)\\n</${CURRENT_INSTRUCTION_TAG}>$`
+);
+function unescapeXml(value) {
+  return value.replaceAll("&quot;", '"').replaceAll("&apos;", "'").replaceAll("&gt;", ">").replaceAll("&lt;", "<").replaceAll("&amp;", "&");
+}
+function renderCurrentInstruction(instruction) {
+  return [
+    `<${CURRENT_INSTRUCTION_TAG}>`,
+    escapeXml(instruction),
+    `</${CURRENT_INSTRUCTION_TAG}>`
+  ].join("\n");
+}
+function extractCurrentInstructionBody(text) {
+  const match = text.match(STANDALONE_CURRENT_INSTRUCTION_PATTERN);
+  return match?.[1];
+}
+function unwrapCurrentInstruction(text) {
+  const match = text.match(CURRENT_INSTRUCTION_PATTERN);
+  if (!match) {
+    return void 0;
+  }
+  return unescapeXml(match[1]);
+}
+
 // src/chat/turn-context-tag.ts
 var TURN_CONTEXT_TAG = "runtime-turn-context";
 
@@ -109,15 +144,14 @@ function renderThreadContextForPrompt(context) {
 }
 function buildUserTurnText(userInput, conversationContext) {
   const trimmedContext = conversationContext?.trim();
+  const currentInstruction = renderCurrentInstruction(userInput);
   if (!trimmedContext) {
-    return userInput;
+    return currentInstruction;
   }
   return [
     renderThreadContextForPrompt(trimmedContext),
     "",
-    "<current-instruction>",
-    userInput,
-    "</current-instruction>"
+    currentInstruction
   ].join("\n");
 }
 function encodeNonImageAttachmentForPrompt(attachment) {
@@ -857,6 +891,10 @@ function setSlackReactionConfig(overrides) {
 
 export {
   toOptionalTrimmed,
+  escapeXml,
+  renderCurrentInstruction,
+  extractCurrentInstructionBody,
+  unwrapCurrentInstruction,
   TURN_CONTEXT_TAG,
   getSessionIdentifiers,
   isExecutionEscapeResponse,

package/dist/{chunk-BAPRSWNW.js → chunk-C2PSUWK3.js}

@@ -1,6 +1,6 @@
 import {
   getSlackBotToken
-} from "./chunk-ALL7GG6U.js";
+} from "./chunk-BU2AWPEN.js";
 import {
   isSlackConversationId,
   isSlackTeamId,

package/dist/{chunk-FPN7NYTE.js → chunk-EENOFKDN.js}

@@ -4,14 +4,14 @@ import {
 import {
   getDefaultRedisStateAdapterFor,
   getStateAdapter
-} from "./chunk-MJ4E2PK7.js";
+} from "./chunk-RUB77TGS.js";
 import {
   parseDestination,
   sameDestination
-} from "./chunk-BAPRSWNW.js";
+} from "./chunk-C2PSUWK3.js";
 import {
   getChatConfig
-} from "./chunk-ALL7GG6U.js";
+} from "./chunk-BU2AWPEN.js";
 import {
   parseStoredSlackRequester
 } from "./chunk-IXTBFABZ.js";

package/dist/{chunk-SBYMRDH7.js → chunk-ENEWQMRJ.js}

@@ -4,7 +4,7 @@ import {
 import {
   destinationKey,
   parseDestination
-} from "./chunk-BAPRSWNW.js";
+} from "./chunk-C2PSUWK3.js";
 
 // src/chat/task-execution/queue-signing.ts
 import { createHmac, timingSafeEqual } from "crypto";

package/dist/{chunk-LSG6PQF4.js → chunk-FYPO4K7C.js}

@@ -3,10 +3,10 @@ import {
 } from "./chunk-G3E7SCME.js";
 import {
   getStateAdapter
-} from "./chunk-MJ4E2PK7.js";
+} from "./chunk-RUB77TGS.js";
 import {
   toOptionalTrimmed
-} from "./chunk-ALL7GG6U.js";
+} from "./chunk-BU2AWPEN.js";
 import {
   pluginCatalogRuntime
 } from "./chunk-BQ3ITJA6.js";

package/dist/{chunk-JK7376UT.js → chunk-GY7L6VCT.js}

@@ -1,6 +1,6 @@
 import {
   getConversationStore
-} from "./chunk-QWKB6NJV.js";
+} from "./chunk-QTTTRBNB.js";
 import {
   SANDBOX_DATA_ROOT,
   SANDBOX_WORKSPACE_ROOT,
@@ -9,15 +9,16 @@ import {
 import {
   getConnectedStateContext,
   getStateAdapter
-} from "./chunk-MJ4E2PK7.js";
+} from "./chunk-RUB77TGS.js";
 import {
   parseDestination
-} from "./chunk-BAPRSWNW.js";
+} from "./chunk-C2PSUWK3.js";
 import {
   TURN_CONTEXT_TAG,
   botConfig,
+  escapeXml,
   getChatConfig
-} from "./chunk-ALL7GG6U.js";
+} from "./chunk-BU2AWPEN.js";
 import {
   parseRequester,
   storedSlackRequesterSchema,
@@ -658,11 +659,6 @@ async function commitMessages(args) {
   };
 }
 
-// src/chat/xml.ts
-function escapeXml(value) {
-  return value.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll('"', "&quot;").replaceAll("'", "&apos;");
-}
-
 // src/chat/prompt.ts
 import fs from "fs";
 import path from "path";
@@ -1651,7 +1647,7 @@ function buildTurnContextPrompt(params) {
   const sections = [
     `<${TURN_CONTEXT_TAG}>`,
     TURN_CONTEXT_HEADER,
-    "The current user instruction appears after this block in the same message.",
+    "The current user instruction appears after this block in `<current-instruction>` in the same message.",
     ...runtimeSections,
     `</${TURN_CONTEXT_TAG}>`
   ].filter((section) => Boolean(section));
@@ -2189,7 +2185,6 @@ export {
   normalizeSlackStatusText,
   splitSlackReplyText,
   buildSlackOutputMessage,
-  escapeXml,
   JUNIOR_PERSONALITY,
   buildPluginSystemPromptContributions,
   buildSystemPrompt,

package/dist/{chunk-T2YRJZ5A.js → chunk-MHEV3T2Y.js}

@@ -10,7 +10,7 @@ import {
   isSnapshotMissingError,
   resolveRuntimeDependencySnapshot,
   runNonInteractiveCommand
-} from "./chunk-LSG6PQF4.js";
+} from "./chunk-FYPO4K7C.js";
 import {
   pluginTaskId,
   pluginTaskParamsSchema,
@@ -22,7 +22,6 @@ import {
   buildPluginSystemPromptContributions,
   buildSystemPrompt,
   buildTurnContextPrompt,
-  escapeXml,
   getAgentTurnSessionRecord,
   loadConnectedMcpProviders,
   recordAuthorizationRequested,
@@ -31,7 +30,7 @@ import {
   recordSubagentStarted,
   recordToolExecutionStarted,
   upsertAgentTurnSessionRecord
-} from "./chunk-JK7376UT.js";
+} from "./chunk-GY7L6VCT.js";
 import {
   createPluginEmbedder,
   createPluginHookRunner,
@@ -42,14 +41,14 @@ import {
   getPlugins,
   getSlackToolContext,
   resolveChannelCapabilities
-} from "./chunk-AL6ZFV7U.js";
+} from "./chunk-UVNV67EC.js";
 import {
   createPluginLogger,
   createPluginState
-} from "./chunk-CWMMGUWM.js";
+} from "./chunk-MTE5NRPJ.js";
 import {
   getDb
-} from "./chunk-QWKB6NJV.js";
+} from "./chunk-QTTTRBNB.js";
 import {
   SANDBOX_DATA_ROOT,
   SANDBOX_SKILLS_ROOT,
@@ -60,7 +59,7 @@ import {
 import {
   acquireActiveLock,
   getStateAdapter
-} from "./chunk-MJ4E2PK7.js";
+} from "./chunk-RUB77TGS.js";
 import {
   SlackActionError,
   downloadPrivateSlackFile,
@@ -71,7 +70,7 @@ import {
   normalizeSlackConversationId,
   parseDestination,
   withSlackRetries
-} from "./chunk-BAPRSWNW.js";
+} from "./chunk-C2PSUWK3.js";
 import {
   GEN_AI_PROVIDER_NAME,
   GEN_AI_SERVER_ADDRESS,
@@ -82,7 +81,9 @@ import {
   completeObject,
   completeText,
   encodeNonImageAttachmentForPrompt,
+  escapeXml,
   extractAssistantText,
+  extractCurrentInstructionBody,
   getGatewayApiKey,
   getPiGatewayApiKey,
   getPiMessageRole,
@@ -98,13 +99,14 @@ import {
   nextProviderRetry,
   normalizeSlackEmojiName,
   normalizeToolNameFromResult,
+  renderCurrentInstruction,
   resolveGatewayModel,
   stripRuntimeTurnContext,
   summarizeMessageText,
   toObservablePromptPart,
   trimTrailingAssistantMessages,
   upsertActiveSkill
-} from "./chunk-ALL7GG6U.js";
+} from "./chunk-BU2AWPEN.js";
 import {
   parseSlackThreadId,
   resolveConversationPrivacy,
@@ -680,6 +682,7 @@ function markTurnFailed(args) {
 // src/chat/respond.ts
 import { Agent as Agent2 } from "@earendil-works/pi-agent-core";
 import { THREAD_STATE_TTL_MS as THREAD_STATE_TTL_MS4 } from "chat";
+import { z as z4 } from "zod";
 
 // src/chat/capabilities/catalog.ts
 var cachedCatalog;
@@ -10862,11 +10865,7 @@ function buildClassifierPrompt(args) {
       );
     }
   }
-  sections.push(
-    "<current-instruction>",
-    args.messageText.trim() || "[empty]",
-    "</current-instruction>"
-  );
+  sections.push(renderCurrentInstruction(args.messageText.trim() || "[empty]"));
   for (const block of args.currentTurnBlocks ?? []) {
     const trimmed = block.trim();
     if (!trimmed) {
@@ -12824,6 +12823,10 @@ function waitForAbortSettlement(promise, timeoutMs) {
 }
 var startupDiscoveryLogged = false;
 var MAX_ROUTER_ATTACHMENT_PREVIEW_CHARS = 2e3;
+var legacyStoredTextPartSchema = z4.object({
+  text: z4.string(),
+  type: z4.literal("text")
+}).strict();
 function buildOmittedImageAttachmentNotice(count) {
   return [
     "<omitted-image-attachments>",
@@ -12988,7 +12991,7 @@ function buildUserTurnInput(args) {
 }
 function buildSteeringPiMessage(message) {
   const { userContentParts } = buildUserTurnInput({
-    userTurnText: message.text,
+    userTurnText: buildUserTurnText(message.text),
     userAttachments: message.userAttachments,
     omittedImageAttachmentCount: message.omittedImageAttachmentCount ?? 0
   });
@@ -13006,11 +13009,45 @@ function withoutTrailingUncheckpointedUserPrompt(messages, userContentParts) {
   if (lastMessage?.role !== "user") {
     return messages;
   }
-  if (JSON.stringify(lastMessage.content) !== JSON.stringify(userContentParts)) {
+  const comparableLastMessage = stripRuntimeTurnContext([
+    lastMessage
+  ])[0];
+  if (!userPromptContentMatches(comparableLastMessage?.content, userContentParts)) {
     return messages;
   }
   return messages.slice(0, -1);
 }
+function userPromptContentMatches(storedContent, currentContent) {
+  if (JSON.stringify(storedContent) === JSON.stringify(currentContent)) {
+    return true;
+  }
+  if (!Array.isArray(storedContent)) {
+    return false;
+  }
+  if (storedContent.length !== currentContent.length) {
+    return false;
+  }
+  return storedContent.every((storedPart, index) => {
+    const currentPart = currentContent[index];
+    if (index === 0 && currentPart?.type === "text") {
+      const legacyTextPart = legacyStoredTextPartSchema.safeParse(storedPart);
+      if (legacyTextPart.success) {
+        return legacyTextPartMatchesCurrentText(
+          legacyTextPart.data.text,
+          currentPart.text
+        );
+      }
+    }
+    return JSON.stringify(storedPart) === JSON.stringify(currentPart);
+  });
+}
+function legacyTextPartMatchesCurrentText(storedText, currentText) {
+  const storedInstructionBody = extractCurrentInstructionBody(storedText);
+  if (storedInstructionBody !== void 0) {
+    return renderCurrentInstruction(storedInstructionBody) === currentText;
+  }
+  return renderCurrentInstruction(storedText) === currentText;
+}
 async function generateAssistantReply(messageText2, context) {
   const conversationPrivacy = resolveConversationPrivacy({
     channelId: context.correlation?.channelId,

package/dist/{chunk-CWMMGUWM.js → chunk-MTE5NRPJ.js}

@@ -1,6 +1,6 @@
 import {
   getStateAdapter
-} from "./chunk-MJ4E2PK7.js";
+} from "./chunk-RUB77TGS.js";
 import {
   logException,
   logInfo,

package/dist/{chunk-QWKB6NJV.js → chunk-QTTTRBNB.js}

@@ -1,10 +1,10 @@
 import {
   parseDestination,
   sameDestination
-} from "./chunk-BAPRSWNW.js";
+} from "./chunk-C2PSUWK3.js";
 import {
   getChatConfig
-} from "./chunk-ALL7GG6U.js";
+} from "./chunk-BU2AWPEN.js";
 import {
   parseStoredSlackRequester
 } from "./chunk-IXTBFABZ.js";

package/dist/{chunk-MJ4E2PK7.js → chunk-RUB77TGS.js}

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

package/dist/{chunk-SVFA43LT.js → chunk-SSUEWAVS.js}

@@ -1,9 +1,9 @@
 import {
   getStateAdapter
-} from "./chunk-MJ4E2PK7.js";
+} from "./chunk-RUB77TGS.js";
 import {
   normalizeSlackConversationId
-} from "./chunk-BAPRSWNW.js";
+} from "./chunk-C2PSUWK3.js";
 import {
   parseSlackThreadId
 } from "./chunk-DR75T7J3.js";

package/dist/{chunk-AL6ZFV7U.js → chunk-UVNV67EC.js}

@@ -1,10 +1,10 @@
 import {
   createPluginLogger,
   createPluginState
-} from "./chunk-CWMMGUWM.js";
+} from "./chunk-MTE5NRPJ.js";
 import {
   getDb
-} from "./chunk-QWKB6NJV.js";
+} from "./chunk-QTTTRBNB.js";
 import {
   SANDBOX_WORKSPACE_ROOT
 } from "./chunk-G3E7SCME.js";
@@ -13,12 +13,12 @@ import {
   isConversationScopedChannel,
   isDmChannel,
   normalizeSlackConversationId
-} from "./chunk-BAPRSWNW.js";
+} from "./chunk-C2PSUWK3.js";
 import {
   botConfig,
   completeObject,
   embedTexts
-} from "./chunk-ALL7GG6U.js";
+} from "./chunk-BU2AWPEN.js";
 import {
   isActorUserId,
   parseActorUserId

package/dist/cli/chat.js

@@ -130,10 +130,10 @@ async function configureLocalChatPlugins(pluginSet) {
     databaseModule
   ] = await Promise.all([
     import("../plugins-PZMDS7AT.js"),
-    import("../agent-hooks-TFPY6V3T.js"),
+    import("../agent-hooks-AV7CHLUO.js"),
     import("../catalog-runtime-XOD7YPRS.js"),
     import("../validation-MBNJKWPQ.js"),
-    import("../db-ELRCNB4A.js")
+    import("../db-S3HYBLUS.js")
   ]);
   const resolvedPluginSet = pluginSet === void 0 ? await loadLocalPluginSet() : pluginSet ?? void 0;
   const plugins = pluginsModule.pluginRuntimeRegistrationsFromPluginSet(resolvedPluginSet);
@@ -195,7 +195,7 @@ async function runPrompt(options, io, pluginSet) {
   defaultStateAdapterForLocalChat();
   await configureLocalChatPlugins(pluginSet);
   const conversationId = newRunConversationId();
-  const { runLocalAgentTurn } = await import("../runner-2XU6QQND.js");
+  const { runLocalAgentTurn } = await import("../runner-IMQH6V2B.js");
   const result = await runLocalAgentTurn(
     {
       conversationId,
@@ -219,7 +219,7 @@ async function runInteractive(io, pluginSet) {
   defaultStateAdapterForLocalChat();
   await configureLocalChatPlugins(pluginSet);
   const conversationId = newRunConversationId();
-  const { runLocalAgentTurn } = await import("../runner-2XU6QQND.js");
+  const { runLocalAgentTurn } = await import("../runner-IMQH6V2B.js");
   const rl = readline.createInterface({
     input: io.input,
     output: io.output,

package/dist/cli/plugins.js

@@ -10,17 +10,17 @@ import {
 import {
   setPlugins,
   validatePlugins
-} from "../chunk-AL6ZFV7U.js";
+} from "../chunk-UVNV67EC.js";
 import {
   createPluginLogger
-} from "../chunk-CWMMGUWM.js";
+} from "../chunk-MTE5NRPJ.js";
 import {
   getDb
-} from "../chunk-QWKB6NJV.js";
+} from "../chunk-QTTTRBNB.js";
 import "../chunk-G3E7SCME.js";
-import "../chunk-MJ4E2PK7.js";
-import "../chunk-BAPRSWNW.js";
-import "../chunk-ALL7GG6U.js";
+import "../chunk-RUB77TGS.js";
+import "../chunk-C2PSUWK3.js";
+import "../chunk-BU2AWPEN.js";
 import "../chunk-DR75T7J3.js";
 import {
   loadAppPluginSet

package/dist/cli/snapshot-warmup.js

@@ -1,11 +1,11 @@
 import {
   resolveRuntimeDependencySnapshot
-} from "../chunk-LSG6PQF4.js";
+} from "../chunk-FYPO4K7C.js";
 import "../chunk-G3E7SCME.js";
 import {
   disconnectStateAdapter
-} from "../chunk-MJ4E2PK7.js";
-import "../chunk-ALL7GG6U.js";
+} from "../chunk-RUB77TGS.js";
+import "../chunk-BU2AWPEN.js";
 import "../chunk-DR75T7J3.js";
 import {
   pluginCatalogRuntime

package/dist/cli/upgrade.js

@@ -4,7 +4,7 @@ import {
   recordConversationActivity,
   recordConversationExecution,
   requestConversationWork
-} from "../chunk-FPN7NYTE.js";
+} from "../chunk-EENOFKDN.js";
 import {
   JUNIOR_THREAD_STATE_TTL_MS,
   coerceThreadConversationState
@@ -18,23 +18,23 @@ import {
 import {
   createPluginLogger,
   createPluginState
-} from "../chunk-CWMMGUWM.js";
+} from "../chunk-MTE5NRPJ.js";
 import {
   createJuniorSqlExecutor,
   createSqlStore,
   getDb
-} from "../chunk-QWKB6NJV.js";
+} from "../chunk-QTTTRBNB.js";
 import {
   disconnectStateAdapter,
   getConnectedStateContext
-} from "../chunk-MJ4E2PK7.js";
+} from "../chunk-RUB77TGS.js";
 import {
   parseDestination,
   sameDestination
-} from "../chunk-BAPRSWNW.js";
+} from "../chunk-C2PSUWK3.js";
 import {
   getChatConfig
-} from "../chunk-ALL7GG6U.js";
+} from "../chunk-BU2AWPEN.js";
 import "../chunk-DR75T7J3.js";
 import {
   loadAppPluginSet

package/dist/{db-ELRCNB4A.js → db-S3HYBLUS.js}

@@ -2,9 +2,9 @@ import {
   closeDb,
   getConversationStore,
   getDb
-} from "./chunk-QWKB6NJV.js";
-import "./chunk-BAPRSWNW.js";
-import "./chunk-ALL7GG6U.js";
+} from "./chunk-QTTTRBNB.js";
+import "./chunk-C2PSUWK3.js";
+import "./chunk-BU2AWPEN.js";
 import "./chunk-DR75T7J3.js";
 import "./chunk-IXTBFABZ.js";
 import "./chunk-KF7522P3.js";

package/dist/handlers/github-webhook/issue-comment.d.ts

@@ -0,0 +1,3 @@
+import type { IngestResourceEventInput } from "@/chat/resource-events/ingest";
+/** Normalize GitHub `issue_comment` webhooks for PR-level comments. */
+export declare function normalizeGitHubIssueCommentEvent(deliveryId: string, body: unknown): IngestResourceEventInput | undefined;

package/dist/handlers/github-webhook/pull-request-review-comment.d.ts

@@ -0,0 +1,3 @@
+import type { IngestResourceEventInput } from "@/chat/resource-events/ingest";
+/** Normalize GitHub `pull_request_review_comment` webhooks for inline PR comments. */
+export declare function normalizeGitHubPullRequestReviewCommentEvent(deliveryId: string, body: unknown): IngestResourceEventInput | undefined;

package/dist/nitro.js

@@ -1,6 +1,6 @@
 import {
   resolveConversationWorkQueueTopic
-} from "./chunk-SBYMRDH7.js";
+} from "./chunk-ENEWQMRJ.js";
 import {
   PLUGIN_TASK_QUEUE_TOPIC
 } from "./chunk-KNFROR7R.js";
@@ -8,8 +8,8 @@ import {
   pluginCatalogConfigFromPluginSet,
   pluginRuntimeRegistrationsFromPluginSet
 } from "./chunk-SG5WAA7H.js";
-import "./chunk-BAPRSWNW.js";
-import "./chunk-ALL7GG6U.js";
+import "./chunk-C2PSUWK3.js";
+import "./chunk-BU2AWPEN.js";
 import "./chunk-DR75T7J3.js";
 import {
   loadPluginSetFromModule,

package/dist/reporting.js

@@ -6,26 +6,28 @@ import {
   getConversationDetails,
   getConversationDetailsForIds,
   resolveSlackConversationContextFromThreadId
-} from "./chunk-SVFA43LT.js";
+} from "./chunk-SSUEWAVS.js";
 import {
   buildSystemPrompt,
   getAgentTurnSessionRecord,
   listAgentTurnSessionSummariesForConversation,
   loadActivityEntries
-} from "./chunk-JK7376UT.js";
+} from "./chunk-GY7L6VCT.js";
 import {
   getPluginOperationalReports
-} from "./chunk-AL6ZFV7U.js";
-import "./chunk-CWMMGUWM.js";
+} from "./chunk-UVNV67EC.js";
+import "./chunk-MTE5NRPJ.js";
 import {
   getConversationStore
-} from "./chunk-QWKB6NJV.js";
+} from "./chunk-QTTTRBNB.js";
 import "./chunk-G3E7SCME.js";
 import {
   getStateAdapter
-} from "./chunk-MJ4E2PK7.js";
-import "./chunk-BAPRSWNW.js";
-import "./chunk-ALL7GG6U.js";
+} from "./chunk-RUB77TGS.js";
+import "./chunk-C2PSUWK3.js";
+import {
+  unwrapCurrentInstruction
+} from "./chunk-BU2AWPEN.js";
 import {
   canExposeConversationPayload,
   parseSlackThreadId,
@@ -783,9 +785,10 @@ function recordField(value, names) {
   }
   return void 0;
 }
-function normalizeTranscriptPart(part) {
+function normalizeTranscriptPart(part, options = {}) {
+  const displayText = (text) => options.unwrapCurrentTask ? unwrapCurrentInstruction(text) ?? text : text;
   if (typeof part === "string") {
-    return textPart(part);
+    return textPart(displayText(part));
   }
   if (!isRecord(part)) {
     return { type: "unknown", output: part };
@@ -794,7 +797,7 @@ function normalizeTranscriptPart(part) {
   if (rawType === "text") {
     const text = recordField(part, ["text", "content"]);
     return textPart(
-      typeof text === "string" ? text : JSON.stringify(text) ?? ""
+      typeof text === "string" ? displayText(text) : JSON.stringify(text) ?? ""
     );
   }
   if (rawType === "toolCall") {
@@ -851,7 +854,15 @@ function normalizeTranscriptMessage(message) {
   return {
     role,
     ...typeof record.timestamp === "number" ? { timestamp: record.timestamp } : {},
-    parts: role === "toolResult" ? [normalizeToolResultMessage(record)] : Array.isArray(content) ? content.map(normalizeTranscriptPart) : [normalizeTranscriptPart(content)]
+    parts: role === "toolResult" ? [normalizeToolResultMessage(record)] : Array.isArray(content) ? content.map(
+      (part) => normalizeTranscriptPart(part, {
+        unwrapCurrentTask: role === "user"
+      })
+    ) : [
+      normalizeTranscriptPart(content, {
+        unwrapCurrentTask: role === "user"
+      })
+    ]
   };
 }
 function transcriptRole(role) {

package/dist/{runner-2XU6QQND.js → runner-IMQH6V2B.js}

@@ -14,26 +14,26 @@ import {
   startActiveTurn,
   updateConversationStats,
   upsertConversationMessage
-} from "./chunk-T2YRJZ5A.js";
+} from "./chunk-MHEV3T2Y.js";
 import {
   coerceThreadConversationState
 } from "./chunk-66NX7MNW.js";
-import "./chunk-LSG6PQF4.js";
+import "./chunk-FYPO4K7C.js";
 import "./chunk-KNFROR7R.js";
 import {
   commitMessages,
   loadProjection
-} from "./chunk-JK7376UT.js";
-import "./chunk-AL6ZFV7U.js";
-import "./chunk-CWMMGUWM.js";
-import "./chunk-QWKB6NJV.js";
+} from "./chunk-GY7L6VCT.js";
+import "./chunk-UVNV67EC.js";
+import "./chunk-MTE5NRPJ.js";
+import "./chunk-QTTTRBNB.js";
 import "./chunk-G3E7SCME.js";
-import "./chunk-MJ4E2PK7.js";
-import "./chunk-BAPRSWNW.js";
+import "./chunk-RUB77TGS.js";
+import "./chunk-C2PSUWK3.js";
 import {
   stripRuntimeTurnContext,
   trimTrailingAssistantMessages
-} from "./chunk-ALL7GG6U.js";
+} from "./chunk-BU2AWPEN.js";
 import "./chunk-DR75T7J3.js";
 import "./chunk-64ACM6AP.js";
 import "./chunk-BQ3ITJA6.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/junior",
-  "version": "0.84.1",
+  "version": "0.85.0",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -70,7 +70,7 @@
     "pg": "^8.16.3",
     "yaml": "^2.9.0",
     "zod": "^4.4.3",
-    "@sentry/junior-plugin-api": "0.84.1"
+    "@sentry/junior-plugin-api": "0.85.0"
   },
   "devDependencies": {
     "@emnapi/core": "^1.10.0",
@@ -86,10 +86,10 @@
     "typescript": "^6.0.3",
     "vercel": "^54.4.0",
     "vitest": "^4.1.7",
-    "@sentry/junior-github": "0.84.1",
-    "@sentry/junior-testing": "0.0.0",
-    "@sentry/junior-memory": "0.84.1",
-    "@sentry/junior-scheduler": "0.84.1"
+    "@sentry/junior-github": "0.85.0",
+    "@sentry/junior-scheduler": "0.85.0",
+    "@sentry/junior-memory": "0.85.0",
+    "@sentry/junior-testing": "0.0.0"
   },
   "scripts": {
     "build": "tsup && tsc -p tsconfig.build.json --emitDeclarationOnly",