@sentry/junior 0.165.0 → 0.167.0

package/dist/{agent-hooks-GSNL33UA.js → agent-hooks-KEHBR4DB.js}

@@ -13,19 +13,19 @@ import {
   getPlugins,
   setPlugins,
   validatePlugins
-} from "./chunk-5WDDWMQ7.js";
-import "./chunk-RQQTOF3H.js";
-import "./chunk-IZHR2OES.js";
+} from "./chunk-4KRDL4ZD.js";
+import "./chunk-PMULUKHL.js";
+import "./chunk-YVW44V5Y.js";
 import "./chunk-BVREIWBD.js";
-import "./chunk-65B3PDY7.js";
-import "./chunk-FMOFCEAA.js";
+import "./chunk-W72TSO24.js";
+import "./chunk-MKDIEH3C.js";
 import "./chunk-VFUK3X5B.js";
-import "./chunk-ZUKU2Y3J.js";
+import "./chunk-WZGOP5BZ.js";
 import "./chunk-V7YE4WCP.js";
-import "./chunk-32CCG4WP.js";
+import "./chunk-V7GGA4LW.js";
 import "./chunk-6GWA276C.js";
-import "./chunk-5T6WPPEI.js";
-import "./chunk-6OWVPXNO.js";
+import "./chunk-UFTE42ZF.js";
+import "./chunk-GIGUXRMY.js";
 import "./chunk-MLKGABMK.js";
 export {
   PluginHookDeniedError,

package/dist/api/schema/workspace.d.ts

@@ -4,6 +4,13 @@ export declare const workspaceRepoSchema: z.ZodObject<{
     repo: z.ZodString;
     checkoutPath: z.ZodString;
 }, z.core.$strict>;
+/** Install-wide baseline Sandbox snapshot used when no Workspace recipe is selected. */
+export declare const baselineSnapshotSchema: z.ZodObject<{
+    id: z.ZodString;
+    generatedAt: z.ZodISODateTime;
+    buildDurationMs: z.ZodNumber;
+    dependencyCount: z.ZodNumber;
+}, z.core.$strict>;
 export declare const workspaceSchema: z.ZodObject<{
     id: z.ZodString;
     name: z.ZodString;
@@ -16,9 +23,16 @@ export declare const workspaceSchema: z.ZodObject<{
     snapshot: z.ZodNullable<z.ZodObject<{
         id: z.ZodString;
         generatedAt: z.ZodISODateTime;
+        buildDurationMs: z.ZodNumber;
     }, z.core.$strict>>;
 }, z.core.$strict>;
 export declare const workspaceListSchema: z.ZodObject<{
+    baselineSnapshot: z.ZodNullable<z.ZodObject<{
+        id: z.ZodString;
+        generatedAt: z.ZodISODateTime;
+        buildDurationMs: z.ZodNumber;
+        dependencyCount: z.ZodNumber;
+    }, z.core.$strict>>;
     workspaces: z.ZodArray<z.ZodObject<{
         id: z.ZodString;
         name: z.ZodString;
@@ -31,6 +45,7 @@ export declare const workspaceListSchema: z.ZodObject<{
         snapshot: z.ZodNullable<z.ZodObject<{
             id: z.ZodString;
             generatedAt: z.ZodISODateTime;
+            buildDurationMs: z.ZodNumber;
         }, z.core.$strict>>;
     }, z.core.$strict>>;
 }, z.core.$strict>;
@@ -48,4 +63,5 @@ export declare const workspaceParamsSchema: z.ZodObject<{
 export declare const deleteWorkspaceResponseSchema: z.ZodObject<{
     deleted: z.ZodLiteral<true>;
 }, z.core.$strict>;
+export type BaselineSnapshotReport = z.infer<typeof baselineSnapshotSchema>;
 export type WorkspaceReport = z.infer<typeof workspaceSchema>;

package/dist/api/schema.d.ts

@@ -10,8 +10,8 @@ export { apiErrorSchema } from "./schema/common";
 export type { ApiError } from "./schema/common";
 export { createPersonalTokenBodySchema, createdPersonalTokenSchema, personalTokenListSchema, personalTokenMetadataSchema, personalTokenParamsSchema, revokePersonalTokenResponseSchema, } from "./schema/personal-token";
 export type { PersonalTokenMetadata } from "./schema/personal-token";
-export { deleteWorkspaceResponseSchema, workspaceBodySchema, workspaceListSchema, workspaceParamsSchema, workspaceRepoSchema, workspaceSchema, } from "./schema/workspace";
-export type { WorkspaceReport } from "./schema/workspace";
+export { baselineSnapshotSchema, deleteWorkspaceResponseSchema, workspaceBodySchema, workspaceListSchema, workspaceParamsSchema, workspaceRepoSchema, workspaceSchema, } from "./schema/workspace";
+export type { BaselineSnapshotReport, WorkspaceReport, } from "./schema/workspace";
 export { eventTaskSummarySchema, scheduledTaskSummarySchema, taskExecutionListSchema, taskExecutionSchema, taskExecutionStatusDaySchema, taskExecutionStatusSchema, taskListSchema, taskParamsSchema, taskRunListSchema, taskRunSchema, taskSummarySchema, } from "./schema/task";
 export type { TaskExecution, TaskExecutionDay, TaskExecutionList, TaskExecutionStatusDay, TaskList, TaskRun, TaskRunList, TaskSummary, } from "./schema/task";
 export { statSchema, statsReportSchema } from "./schema/stats";

package/dist/api/schema.js

@@ -5,6 +5,7 @@ import {
   apiErrorSchema,
   archiveConversationBodySchema,
   archiveConversationResponseSchema,
+  baselineSnapshotSchema,
   cancelConversationPendingMessagesBodySchema,
   cancelConversationPendingMessagesResponseSchema,
   conversationAuxiliaryCostsSchema,
@@ -58,7 +59,7 @@ import {
   workspaceParamsSchema,
   workspaceRepoSchema,
   workspaceSchema
-} from "../chunk-BEC542E6.js";
+} from "../chunk-UTMP45YM.js";
 import {
   healthReportSchema,
   pluginOperationalReportFeedSchema,
@@ -81,6 +82,7 @@ export {
   apiErrorSchema,
   archiveConversationBodySchema,
   archiveConversationResponseSchema,
+  baselineSnapshotSchema,
   cancelConversationPendingMessagesBodySchema,
   cancelConversationPendingMessagesResponseSchema,
   conversationAuxiliaryCostsSchema,

package/dist/api.js

@@ -41,7 +41,7 @@ import {
   workspaceListSchema,
   workspaceParamsSchema,
   workspaceSchema
-} from "./chunk-BEC542E6.js";
+} from "./chunk-UTMP45YM.js";
 import {
   appendAndEnqueueApiConversationMessage,
   authenticatePersonalToken,
@@ -59,15 +59,15 @@ import {
   revokePersonalToken,
   viewerConversationMembership,
   webActorFromEmail
-} from "./chunk-NPW6LM2X.js";
+} from "./chunk-5IR2ABRO.js";
 import {
   buildSentryConversationUrl,
   getWebAuthorization
-} from "./chunk-AEBF6AO2.js";
+} from "./chunk-2MPO25ZZ.js";
 import {
   cancelHumanFacingPendingMessages,
   getConversation
-} from "./chunk-6YXCG2XL.js";
+} from "./chunk-KE5ETKIR.js";
 import {
   readTaskExecutionByConversationId,
   readTaskExecutionDays,
@@ -75,8 +75,8 @@ import {
   readTaskExecutionSummaries,
   readTaskExecutions,
   readTaskRuns
-} from "./chunk-AQEBOQUC.js";
-import "./chunk-VDNNVTX2.js";
+} from "./chunk-O5J556I2.js";
+import "./chunk-2RSPCWAV.js";
 import {
   healthReportSchema,
   pluginOperationalReportFeedSchema,
@@ -102,21 +102,22 @@ import {
   listPublicScheduledTasksForTeams,
   readLiveAttachment,
   readStats
-} from "./chunk-HZDLOFO4.js";
+} from "./chunk-WHMDWHZX.js";
 import {
   parseSlackThreadId
-} from "./chunk-3V2EIQLT.js";
+} from "./chunk-TZHLY42G.js";
 import {
   agentTurnUsageSchema,
   fallbackShortTitle,
   hasAgentTurnUsage,
   renderJuniorNativeConversationEvent
-} from "./chunk-EA4UL5H2.js";
+} from "./chunk-KSQIE2R4.js";
 import "./chunk-3Y47VMHV.js";
 import {
+  create,
   getCachedSnapshot,
   hash
-} from "./chunk-BEHPIDVZ.js";
+} from "./chunk-5LZVDKQJ.js";
 import "./chunk-PDO5BLNM.js";
 import {
   WorkspaceValidationError,
@@ -136,7 +137,7 @@ import {
   updateWorkspace,
   withSlackRetries,
   workspaceRepoCheckoutPath
-} from "./chunk-5WDDWMQ7.js";
+} from "./chunk-4KRDL4ZD.js";
 import {
   decodeStoredConversationEvent,
   getConversationStore,
@@ -144,22 +145,22 @@ import {
   getSqlExecutor,
   locationFromRow,
   parseSessionSource
-} from "./chunk-RQQTOF3H.js";
+} from "./chunk-PMULUKHL.js";
 import {
   juniorConversationEvents,
   juniorConversations,
   juniorIdentities,
   juniorUsers
-} from "./chunk-IZHR2OES.js";
+} from "./chunk-YVW44V5Y.js";
 import "./chunk-BVREIWBD.js";
-import "./chunk-65B3PDY7.js";
-import "./chunk-FMOFCEAA.js";
+import "./chunk-W72TSO24.js";
+import "./chunk-MKDIEH3C.js";
 import {
   juniorDestinations
 } from "./chunk-VFUK3X5B.js";
-import "./chunk-ZUKU2Y3J.js";
-import "./chunk-7S2JVUWS.js";
-import "./chunk-N2BRRIQZ.js";
+import "./chunk-WZGOP5BZ.js";
+import "./chunk-L63FA77C.js";
+import "./chunk-EWAG7BNE.js";
 import "./chunk-BDUENQD3.js";
 import {
   parseSlackChannelId,
@@ -169,12 +170,12 @@ import {
 import {
   logException,
   logWarn
-} from "./chunk-32CCG4WP.js";
+} from "./chunk-V7GGA4LW.js";
 import "./chunk-6GWA276C.js";
 import "./chunk-OOUNJNMR.js";
 import "./chunk-H4HBKISO.js";
-import "./chunk-5T6WPPEI.js";
-import "./chunk-6OWVPXNO.js";
+import "./chunk-UFTE42ZF.js";
+import "./chunk-GIGUXRMY.js";
 import "./chunk-MLKGABMK.js";
 
 // src/api.ts
@@ -4075,7 +4076,7 @@ async function readPeoplePluginReports(args) {
       source: "plugins"
     });
   }
-  const { getPluginProfileReports } = await import("./agent-hooks-GSNL33UA.js");
+  const { getPluginProfileReports } = await import("./agent-hooks-KEHBR4DB.js");
   return pluginOperationalReportFeedSchema.parse({
     generatedAt: new Date(nowMs).toISOString(),
     reports: await getPluginProfileReports({
@@ -4629,6 +4630,34 @@ function createTaskRoutes() {
 
 // src/api/workspaces/routes.ts
 import { Hono as Hono7 } from "hono";
+function snapshotView(workspace) {
+  const recorded = workspace.snapshot;
+  if (!recorded) return null;
+  const profileHash = hash(SANDBOX_RUNTIME, workspace);
+  if (!profileHash || recorded.profileHash !== profileHash) return null;
+  return {
+    id: recorded.id,
+    generatedAt: recorded.generatedAt.toISOString(),
+    buildDurationMs: recorded.buildDurationMs
+  };
+}
+async function baselineSnapshotView() {
+  try {
+    const profile = create(SANDBOX_RUNTIME);
+    if (!profile) return null;
+    const cached = await getCachedSnapshot(profile.hash);
+    if (!cached) return null;
+    return {
+      id: cached.snapshotId,
+      generatedAt: new Date(cached.createdAtMs).toISOString(),
+      buildDurationMs: cached.buildDurationMs,
+      dependencyCount: cached.dependencyCount
+    };
+  } catch (error) {
+    logException(error, "sandbox.baseline_snapshot.read.failed");
+    return null;
+  }
+}
 function view(workspace) {
   return {
     id: workspace.id,
@@ -4642,27 +4671,10 @@ function view(workspace) {
     snapshot: null
   };
 }
-async function detailView(workspace) {
-  const profileHash = hash(SANDBOX_RUNTIME, workspace);
-  let snapshot = null;
-  if (profileHash) {
-    try {
-      const cached = await getCachedSnapshot(profileHash);
-      if (cached) {
-        snapshot = {
-          id: cached.snapshotId,
-          generatedAt: new Date(cached.createdAtMs).toISOString()
-        };
-      }
-    } catch (error) {
-      logException(error, "api.workspaces.snapshot_lookup.failed", {
-        "app.workspace.id": workspace.id
-      });
-    }
-  }
+function detailView(workspace) {
   return {
     ...view(workspace),
-    snapshot
+    snapshot: snapshotView(workspace)
   };
 }
 function handleValidationError(error) {
@@ -4674,8 +4686,13 @@ function handleValidationError(error) {
 function createWorkspaceRoutes() {
   const app = new Hono7();
   app.get("/", requireViewer, async () => {
+    const [baselineSnapshot, workspaces] = await Promise.all([
+      baselineSnapshotView(),
+      listWorkspaces(getDb())
+    ]);
     return jsonResponse(workspaceListSchema, {
-      workspaces: (await listWorkspaces(getDb())).map(view)
+      baselineSnapshot,
+      workspaces: workspaces.map(view)
     });
   });
   app.post(
@@ -4704,7 +4721,7 @@ function createWorkspaceRoutes() {
       const { id } = context.req.valid("param");
       const workspace = await getWorkspace(getDb(), id);
       if (!workspace) throwApiError(404, "Workspace not found.");
-      return jsonResponse(workspaceSchema, await detailView(workspace));
+      return jsonResponse(workspaceSchema, detailView(workspace));
     }
   );
   app.put(
@@ -4778,7 +4795,7 @@ function readDescriptionText(home) {
   }
 }
 async function readSkillReports() {
-  const { discoverSkills } = await import("./skills-F6PSLVSG.js");
+  const { discoverSkills } = await import("./skills-TG76W7TS.js");
   const skills = await discoverSkills();
   return skillReportsSchema.parse(
     skills.map((skill) => ({
@@ -4788,7 +4805,7 @@ async function readSkillReports() {
   );
 }
 async function readPlugins() {
-  const { pluginCatalogRuntime } = await import("./catalog-runtime-4ERDVI7V.js");
+  const { pluginCatalogRuntime } = await import("./catalog-runtime-7QFMBU2Q.js");
   return pluginsSchema.parse(
     pluginCatalogRuntime.getProviders().map((plugin) => ({
       configKeys: plugin.manifest.configKeys ?? [],
@@ -4801,7 +4818,7 @@ async function readPlugins() {
 async function readRuntimeInfoReport() {
   const [{ homeDir }, { pluginCatalogRuntime }, plugins, skills] = await Promise.all([
     import("./discovery-GUFTFBTL.js"),
-    import("./catalog-runtime-4ERDVI7V.js"),
+    import("./catalog-runtime-7QFMBU2Q.js"),
     readPlugins(),
     readSkillReports()
   ]);
@@ -4817,7 +4834,7 @@ async function readRuntimeInfoReport() {
 }
 async function readPluginOperationalReportFeed() {
   const nowMs = Date.now();
-  const { getPluginOperationalReports } = await import("./agent-hooks-GSNL33UA.js");
+  const { getPluginOperationalReports } = await import("./agent-hooks-KEHBR4DB.js");
   return pluginOperationalReportFeedSchema.parse({
     source: "plugins",
     generatedAt: new Date(nowMs).toISOString(),

package/dist/app.js

@@ -1,15 +1,15 @@
 import {
   processConversationWork
-} from "./chunk-FNNQCHOL.js";
+} from "./chunk-CU7YQNZ3.js";
 import {
   bindSpawnAgent
-} from "./chunk-6RZ6MMEK.js";
+} from "./chunk-BGRLZPMI.js";
 import {
   createAgentInvocationWorker,
   enqueueAgentInvocation,
   listPendingAgentInvocationMailboxAppends,
   routeAgentInvocationWork
-} from "./chunk-SA5FVUWJ.js";
+} from "./chunk-IHSPBOWG.js";
 import {
   GET as GET2,
   GET2 as GET3,
@@ -36,12 +36,12 @@ import {
   startSlackProcessingReaction,
   stripLeadingBotMention,
   wakePausedTurn
-} from "./chunk-T6BAHCT6.js";
+} from "./chunk-MV4LDMRG.js";
 import "./chunk-FA6POGLH.js";
 import {
   getTurnRequestDeadline,
   runWithTurnRequestDeadline
-} from "./chunk-DKO4RRGJ.js";
+} from "./chunk-6SJN7JZ3.js";
 import {
   GET,
   apiTurnIdForMessage,
@@ -58,8 +58,8 @@ import {
   resolveSlackConversationContext,
   routeApiTurnWork,
   webActorFromEmail
-} from "./chunk-NPW6LM2X.js";
-import "./chunk-AEBF6AO2.js";
+} from "./chunk-5IR2ABRO.js";
+import "./chunk-2MPO25ZZ.js";
 import {
   CONVERSATION_WORK_STALE_ENQUEUE_MS,
   appendAndEnqueueInboundMessage,
@@ -70,7 +70,7 @@ import {
   isInvalidConversationRecordError,
   listActiveConversationIds,
   removeActiveConversation
-} from "./chunk-6YXCG2XL.js";
+} from "./chunk-KE5ETKIR.js";
 import {
   buildDeliveredTurnStatePatch,
   claimDispatchMailboxAppend,
@@ -101,7 +101,7 @@ import {
   requireTurnFailureEventId,
   resolveTurnSessionRouting,
   scheduleSessionCompletedPluginTasks
-} from "./chunk-AQEBOQUC.js";
+} from "./chunk-O5J556I2.js";
 import {
   ConversationTurnLifecycleService,
   coerceThreadConversationState,
@@ -111,7 +111,7 @@ import {
   persistThreadRuntimeState,
   persistThreadState,
   persistThreadStateById
-} from "./chunk-VDNNVTX2.js";
+} from "./chunk-2RSPCWAV.js";
 import "./chunk-UTL3MHPC.js";
 import {
   getVercelConversationWorkQueue,
@@ -130,7 +130,7 @@ import {
 import {
   validatePluginEgressCredentialHooks,
   validatePluginRegistrations
-} from "./chunk-G72LBEMZ.js";
+} from "./chunk-WD7PVGMA.js";
 import {
   defineJuniorPlugins,
   pluginCatalogConfigFromEnv,
@@ -165,11 +165,11 @@ import {
   shouldEmitDevAgentTrace,
   shouldPropagateSandboxEgressTrace,
   unpublishedArtifactHeaders
-} from "./chunk-HPWZ4BJJ.js";
+} from "./chunk-CC4EYBUO.js";
 import {
   AuthorizationFlowDisabledError,
   PluginCredentialFailureError
-} from "./chunk-7J26TW64.js";
+} from "./chunk-PRV74X7E.js";
 import "./chunk-DIB4GX3G.js";
 import {
   createAgentRunner,
@@ -177,7 +177,7 @@ import {
   deleteMcpAuthSessionsForUserProvider,
   deleteMcpServerSessionId,
   deleteMcpStoredOAuthCredentials
-} from "./chunk-XOINKFDJ.js";
+} from "./chunk-GC3AKBNP.js";
 import {
   RetryableDeliveryError
 } from "./chunk-RF6J3DIO.js";
@@ -185,7 +185,7 @@ import {
   formatProviderLabel,
   postSlackMessage,
   startOAuthFlow
-} from "./chunk-FXX4NHOM.js";
+} from "./chunk-HIB3XTKR.js";
 import "./chunk-7MA4HV4W.js";
 import {
   getExperimentalFeatures,
@@ -199,16 +199,17 @@ import {
   logScheduledTaskRunSkipped,
   requestAttachmentDeletion,
   scheduledTaskRunAttributes
-} from "./chunk-HZDLOFO4.js";
+} from "./chunk-WHMDWHZX.js";
 import {
   parseSlackThreadId
-} from "./chunk-3V2EIQLT.js";
+} from "./chunk-TZHLY42G.js";
 import {
   ConversationTurnBoundaryError,
   CooperativeTurnYieldError,
   TurnInputCommitLostError,
   TurnInputDeferredError,
   abandonTurnRecord,
+  appendThreadContextMessages,
   buildConversationContext,
   buildDeterministicAssistantMessageId,
   buildDeterministicTurnId,
@@ -253,12 +254,12 @@ import {
   trimTrailingAssistantMessages,
   turnHasReply,
   upsertConversationMessage
-} from "./chunk-EA4UL5H2.js";
+} from "./chunk-KSQIE2R4.js";
 import "./chunk-3Y47VMHV.js";
 import {
   getSandboxResourceConfig,
   setSandboxResourceConfig
-} from "./chunk-BEHPIDVZ.js";
+} from "./chunk-5LZVDKQJ.js";
 import "./chunk-PDO5BLNM.js";
 import "./chunk-UIE3R5XU.js";
 import {
@@ -286,7 +287,7 @@ import {
   verifyEventTaskCredentialSubject,
   verifyScheduledTaskCredentialSubject,
   verifySlackDirectCredentialSubject
-} from "./chunk-5WDDWMQ7.js";
+} from "./chunk-4KRDL4ZD.js";
 import {
   contextProvenance,
   createSlackDestination,
@@ -299,13 +300,13 @@ import {
   requireSlackDestination,
   withConversationEventLock,
   withConversationMutationLock
-} from "./chunk-RQQTOF3H.js";
+} from "./chunk-PMULUKHL.js";
 import {
   juniorAgentBindings,
   juniorAgentInvocations,
   juniorConversationEvents,
   juniorConversations
-} from "./chunk-IZHR2OES.js";
+} from "./chunk-YVW44V5Y.js";
 import {
   sleep
 } from "./chunk-BVREIWBD.js";
@@ -313,7 +314,7 @@ import {
   acquireActiveLock,
   getStateAdapter,
   withActiveLock
-} from "./chunk-65B3PDY7.js";
+} from "./chunk-W72TSO24.js";
 import {
   STANDARD_MODEL_PROFILE,
   botConfig,
@@ -331,16 +332,16 @@ import {
   modelIdForProfile,
   setSlackReactionConfig,
   standardModelId
-} from "./chunk-FMOFCEAA.js";
+} from "./chunk-MKDIEH3C.js";
 import {
   juniorDestinations
 } from "./chunk-VFUK3X5B.js";
-import "./chunk-ZUKU2Y3J.js";
-import "./chunk-TCWPG5VL.js";
+import "./chunk-WZGOP5BZ.js";
+import "./chunk-WRBQL2AW.js";
 import {
   pluginCatalogRuntime
-} from "./chunk-7S2JVUWS.js";
-import "./chunk-N2BRRIQZ.js";
+} from "./chunk-L63FA77C.js";
+import "./chunk-EWAG7BNE.js";
 import {
   credentialContextForActor
 } from "./chunk-BDUENQD3.js";
@@ -372,7 +373,7 @@ import {
   withContext,
   withLogContext,
   withSpan
-} from "./chunk-32CCG4WP.js";
+} from "./chunk-V7GGA4LW.js";
 import {
   continueTrace
 } from "./chunk-6GWA276C.js";
@@ -380,10 +381,10 @@ import "./chunk-OOUNJNMR.js";
 import "./chunk-H4HBKISO.js";
 import {
   JUNIOR_PLUGIN_TASK_CALLBACK_ROUTE
-} from "./chunk-5T6WPPEI.js";
+} from "./chunk-UFTE42ZF.js";
 import {
   JUNIOR_VERSION
-} from "./chunk-6OWVPXNO.js";
+} from "./chunk-GIGUXRMY.js";
 import "./chunk-MLKGABMK.js";
 
 // src/app.ts
@@ -6152,7 +6153,7 @@ function parkedInputKey(message) {
   const text = first && typeof first === "object" && "text" in first ? String(first.text ?? "") : "";
   return `${message.timestamp}:${text}`;
 }
-function renderRecentThreadMessages(conversationContext, messages) {
+function renderRecentThreadMessageLines(conversationContext, messages) {
   const passiveMessages = messages.filter((queued) => {
     if (queued.explicitMention) {
       return false;
@@ -6161,35 +6162,33 @@ function renderRecentThreadMessages(conversationContext, messages) {
     return !slackTs || !conversationContext?.includes(`slack_ts="${slackTs}"`);
   });
   if (passiveMessages.length === 0) {
-    return void 0;
+    return [];
   }
-  const lines = ["<recent-thread-messages>"];
+  const lines = [];
   for (const queued of passiveMessages) {
     const actor = queuedInstructionActor(queued);
+    const author = escapeXml(actor?.authorName ?? "user");
     const attrs = [
-      actor?.authorId ? `author_id="${escapeXml(actor.authorId)}"` : void 0,
-      actor?.authorName ? `author_name="${escapeXml(actor.authorName)}"` : void 0,
+      `role="user"`,
+      `author="${author}"`,
+      actor?.authorId ? `actor_id="${escapeXml(actor.authorId)}"` : void 0,
       actor?.slackTs ? `slack_ts="${escapeXml(actor.slackTs)}"` : void 0
     ].filter((attr) => Boolean(attr)).join(" ");
+    const text = escapeXml(queued.userText.replace(/\s+/g, " "));
     lines.push(
-      attrs ? `  <message ${attrs}>` : "  <message>",
-      escapeXml(queued.userText),
+      `  <message ${attrs}>`,
+      `[user] ${author}: ${text}`,
       "  </message>"
     );
   }
-  lines.push("</recent-thread-messages>");
-  return lines.join("\n");
+  return lines;
 }
 function appendRecentThreadMessagesToContext(conversationContext, messages, options) {
-  const recentThreadMessages = renderRecentThreadMessages(
-    conversationContext,
-    messages
+  const baseContext = options?.includeConversationContext === false ? void 0 : conversationContext;
+  return appendThreadContextMessages(
+    baseContext,
+    renderRecentThreadMessageLines(conversationContext, messages)
   );
-  const contextParts = [
-    options?.includeConversationContext === false ? void 0 : conversationContext?.trim(),
-    recentThreadMessages
-  ].filter((part) => Boolean(part));
-  return contextParts.length > 0 ? contextParts.join("\n\n") : void 0;
 }
 function queuedInstructionActor(queued) {
   const actor = getMessageActorIdentity(queued.message);
@@ -6436,17 +6435,14 @@ function createReplyToThread(deps) {
                 text: queued.userText,
                 timestampMs: queued.message.metadata.dateSent.getTime(),
                 omittedImageAttachmentCount: !isVisionEnabled() && hasPotentialImageAttachment(attachments) ? countPotentialImageAttachments(attachments) : 0,
-                attachments: await deps.resolveUserAttachments(
-                  attachments,
-                  {
-                    threadId,
-                    actorId: isResourceEventSlackMessage(queued.message) ? void 0 : queued.message.author.userId,
-                    channelId,
-                    runId,
-                    conversation: preparedState.conversation,
-                    messageTs: getMessageTimestamp(queued.message)
-                  }
-                )
+                attachments: await deps.resolveUserAttachments(attachments, {
+                  threadId,
+                  actorId: isResourceEventSlackMessage(queued.message) ? void 0 : queued.message.author.userId,
+                  channelId,
+                  runId,
+                  conversation: preparedState.conversation,
+                  messageTs: getMessageTimestamp(queued.message)
+                })
               };
             })
           );
@@ -6989,7 +6985,9 @@ function createReplyToThread(deps) {
             slackConversation,
             source,
             destination,
-            publishExternally: shouldPublishExternally2(options.publishExternally),
+            publishExternally: shouldPublishExternally2(
+              options.publishExternally
+            ),
             ...destinationVisibility ? { destinationVisibility } : {},
             surface: options.execution?.surface ?? "slack",
             dispatch: options.execution?.dispatch,