@sentry/junior 0.176.2 → 0.178.0

package/dist/api.js

@@ -41,12 +41,17 @@ import {
   workspaceListSchema,
   workspaceParamsSchema,
   workspaceSchema
-} from "./chunk-ELEAIRTG.js";
+} from "./chunk-TKB25A3L.js";
 import {
   appendAndEnqueueApiConversationMessage,
   authenticatePersonalToken,
+  conversationArchiveTimes,
+  conversationArchivedForEmail,
+  conversationArchivedForUser,
   conversationHasParticipantEmail,
   conversationHasParticipantUser,
+  conversationNotArchivedForEmail,
+  conversationNotArchivedForUser,
   createAndEnqueueApiConversation,
   createPersonalToken,
   createVercelAttachmentStorage,
@@ -59,15 +64,15 @@ import {
   revokePersonalToken,
   viewerConversationMembership,
   webActorFromEmail
-} from "./chunk-MNKXBIIA.js";
+} from "./chunk-PRDKO3QB.js";
 import {
   buildSentryConversationUrl,
   getWebAuthorization
-} from "./chunk-JRDM64UU.js";
+} from "./chunk-AVRWMQ4U.js";
 import {
   cancelHumanFacingPendingMessages,
   getConversation
-} from "./chunk-H5SVUUPE.js";
+} from "./chunk-BUGO42R6.js";
 import {
   readTaskExecutionByConversationId,
   readTaskExecutionDays,
@@ -75,8 +80,8 @@ import {
   readTaskExecutionSummaries,
   readTaskExecutions,
   readTaskRuns
-} from "./chunk-DBXTXY2Z.js";
-import "./chunk-AJ6M3LLM.js";
+} from "./chunk-4K6VNP3S.js";
+import "./chunk-G3CQEUHI.js";
 import {
   healthReportSchema,
   pluginOperationalReportFeedSchema,
@@ -101,19 +106,19 @@ import {
   listPublicScheduledTasksForTeams,
   readLiveAttachment,
   readStats
-} from "./chunk-WVDCJ26T.js";
+} from "./chunk-RGV6KHDM.js";
 import {
   parseSlackThreadId
-} from "./chunk-2PWBS4JK.js";
+} from "./chunk-22T3HB44.js";
 import {
   agentTurnUsageSchema,
   fallbackShortTitle,
   hasAgentTurnUsage,
   renderJuniorNativeConversationEvent
-} from "./chunk-B2RBW7CX.js";
+} from "./chunk-BFLMRTPD.js";
 import {
   getCachedSnapshot
-} from "./chunk-SZWILPFG.js";
+} from "./chunk-534BO42N.js";
 import "./chunk-PDO5BLNM.js";
 import {
   SANDBOX_RUNTIME,
@@ -134,7 +139,7 @@ import {
   updateWorkspace,
   withSlackRetries,
   workspaceRepoCheckoutPath
-} from "./chunk-TRG4RCTT.js";
+} from "./chunk-XWUJWHFD.js";
 import "./chunk-3Y47VMHV.js";
 import {
   decodeStoredConversationEvent,
@@ -142,26 +147,29 @@ import {
   getDb,
   getSqlExecutor,
   locationFromRow,
-  parseSessionSource
-} from "./chunk-MOVIDCPX.js";
+  parseSessionSource,
+  resolveRootConversationId
+} from "./chunk-XCNS3CXE.js";
 import {
+  conversationReadColumns,
   juniorConversationEvents,
+  juniorConversationParticipants,
   juniorConversations,
   juniorIdentities,
   juniorUsers
-} from "./chunk-2KSPJ6EE.js";
+} from "./chunk-ZCHHVTMF.js";
 import {
   create,
   hash
-} from "./chunk-KKY2R2QF.js";
-import "./chunk-RHNT2FYF.js";
-import "./chunk-LNV3NNDO.js";
+} from "./chunk-AQHSXA3J.js";
+import "./chunk-H6ZXBFGX.js";
+import "./chunk-3ZZEPLLB.js";
 import {
   juniorDestinations
 } from "./chunk-VFUK3X5B.js";
-import "./chunk-HLEE6JNT.js";
-import "./chunk-ESIS6NVJ.js";
-import "./chunk-2XQ45FB2.js";
+import "./chunk-KEQAA42D.js";
+import "./chunk-ABLODWPO.js";
+import "./chunk-D3UJTX4U.js";
 import "./chunk-CGA4ERJ5.js";
 import {
   parseSlackChannelId,
@@ -171,12 +179,12 @@ import {
 import {
   logException,
   logWarn
-} from "./chunk-PLJ3UO67.js";
+} from "./chunk-UGWBJAGN.js";
 import "./chunk-6GWA276C.js";
 import "./chunk-OOUNJNMR.js";
 import "./chunk-H4HBKISO.js";
-import "./chunk-LY6QWCJI.js";
-import "./chunk-FLBOMXLS.js";
+import "./chunk-AGJ4OQ2V.js";
+import "./chunk-IQRPDKPJ.js";
 import "./chunk-MLKGABMK.js";
 
 // src/api.ts
@@ -231,33 +239,91 @@ var requireViewer = createMiddleware(
 );
 
 // src/api/conversations/archive.ts
-import { and, eq, isNotNull } from "drizzle-orm";
-async function archiveIfUnchanged(args) {
-  const db = getDb();
-  const rows = await db.update(juniorConversations).set({ archivedAt: args.archived ? /* @__PURE__ */ new Date() : null }).where(
+import { and, eq, isNotNull, sql } from "drizzle-orm";
+async function setViewerArchive(args) {
+  const executor = getSqlExecutor();
+  return await executor.transaction(async () => {
+    const db = executor.db();
+    const [root] = await db.select({ lastActivityAt: juniorConversations.lastActivityAt }).from(juniorConversations).where(eq(juniorConversations.conversationId, args.rootConversationId)).limit(1).for("update");
+    if (!root) return { status: "missing" };
+    if (args.archived) {
+      if (root.lastActivityAt.getTime() !== Date.parse(args.lastSeenAt)) {
+        return { status: "conflict" };
+      }
+      const archivedAt = /* @__PURE__ */ new Date();
+      const lastMessageAt = new Date(args.lastSeenAt);
+      await db.insert(juniorConversationParticipants).values({
+        archivedAt,
+        lastMessageAt,
+        rootConversationId: args.rootConversationId,
+        userId: args.userId
+      }).onConflictDoUpdate({
+        target: [
+          juniorConversationParticipants.userId,
+          juniorConversationParticipants.rootConversationId
+        ],
+        set: {
+          archivedAt,
+          lastMessageAt: sql`greatest(${juniorConversationParticipants.lastMessageAt}, excluded.last_message_at)`
+        }
+      });
+      return { archivedAt: archivedAt.toISOString(), status: "updated" };
+    }
+    await db.update(juniorConversationParticipants).set({ archivedAt: null }).where(
+      and(
+        eq(juniorConversationParticipants.userId, args.userId),
+        eq(
+          juniorConversationParticipants.rootConversationId,
+          args.rootConversationId
+        ),
+        isNotNull(juniorConversationParticipants.archivedAt)
+      )
+    );
+    return { archivedAt: null, status: "updated" };
+  });
+}
+async function readConversationArchivedAt(viewer, conversationId) {
+  const rootConversationId = await resolveRootConversationId(
+    getSqlExecutor(),
+    conversationId
+  );
+  const [row] = await getDb().select({ archivedAt: juniorConversationParticipants.archivedAt }).from(juniorConversationParticipants).where(
     and(
-      eq(juniorConversations.conversationId, args.conversationId),
-      args.archived ? eq(juniorConversations.lastActivityAt, new Date(args.lastSeenAt)) : isNotNull(juniorConversations.archivedAt)
+      eq(juniorConversationParticipants.userId, viewer.id),
+      eq(
+        juniorConversationParticipants.rootConversationId,
+        rootConversationId
+      )
     )
-  ).returning({ conversationId: juniorConversations.conversationId });
-  if (rows.length > 0) return "updated";
-  const [existing] = await db.select({
-    archivedAt: juniorConversations.archivedAt,
-    conversationId: juniorConversations.conversationId
-  }).from(juniorConversations).where(eq(juniorConversations.conversationId, args.conversationId)).limit(1);
-  if (!existing) return "not_found";
-  if (!args.archived && existing.archivedAt === null) return "updated";
-  return "conflict";
-}
-async function archiveConversation(conversationId, body) {
-  const result = await archiveIfUnchanged({ ...body, conversationId });
-  if (result === "not_found") {
+  ).limit(1);
+  return row?.archivedAt?.getTime();
+}
+async function archiveConversation(viewer, conversationId, body) {
+  const access = await readConversationAccessFromSql(
+    getDb(),
+    [conversationId],
+    viewer
+  );
+  if (!access.get(conversationId)?.isParticipant) {
     throwApiError(404, "Conversation not found.");
   }
-  if (result === "conflict") {
-    throwApiError(409, "Conversation received new activity.");
+  const rootConversationId = await resolveRootConversationId(
+    getSqlExecutor(),
+    conversationId
+  );
+  const result = await setViewerArchive({
+    archived: body.archived,
+    lastSeenAt: body.lastSeenAt,
+    rootConversationId,
+    userId: viewer.id
+  });
+  if (result.status === "updated") {
+    return { archivedAt: result.archivedAt };
+  }
+  if (result.status === "missing") {
+    throwApiError(404, "Conversation not found.");
   }
-  return { archived: body.archived };
+  throwApiError(409, "Conversation received new activity.");
 }
 
 // src/api/conversations/attachments.ts
@@ -480,31 +546,31 @@ async function resolveSlackTeamDomains(teamIds) {
 }
 
 // src/chat/pi/sql-model-usage.ts
-import { and as and2, eq as eq2, sql } from "drizzle-orm";
-var message = sql`${juniorConversationEvents.payload}`;
-var usage = sql`${message}->'usage'`;
-var cost = sql`${usage}->'cost'`;
+import { and as and2, eq as eq2, sql as sql2 } from "drizzle-orm";
+var message = sql2`${juniorConversationEvents.payload}`;
+var usage = sql2`${message}->'usage'`;
+var cost = sql2`${usage}->'cost'`;
 function nonnegativeNumber(source, field, fallbackField, floor = false) {
-  const value = (name) => sql`case
+  const value = (name) => sql2`case
       when jsonb_typeof(${source}->${name}) = 'number'
         and (${source}->>${name})::numeric >= 0
-      then ${floor ? sql`floor((${source}->>${name})::numeric)` : sql`(${source}->>${name})::numeric`}
+      then ${floor ? sql2`floor((${source}->>${name})::numeric)` : sql2`(${source}->>${name})::numeric`}
     end`;
   const primary = value(field);
-  return fallbackField ? sql`coalesce(${primary}, ${value(fallbackField)})` : sql`${primary}`;
+  return fallbackField ? sql2`coalesce(${primary}, ${value(fallbackField)})` : sql2`${primary}`;
 }
 function token(field, fallbackField) {
   return nonnegativeNumber(usage, field, fallbackField, true);
 }
 function summed(value) {
-  return sql`sum(${value})::double precision`;
+  return sql2`sum(${value})::double precision`;
 }
 function summedCost(value) {
-  return sql`round(sum(${value}), 12)::double precision`;
+  return sql2`round(sum(${value}), 12)::double precision`;
 }
 function messageTotalTokens(args) {
   const { input, output, cacheRead, cacheWrite } = args;
-  return sql`case
+  return sql2`case
     when ${input} is not null
       or ${output} is not null
       or ${cacheRead} is not null
@@ -547,7 +613,7 @@ function usageFromRow(row) {
   return hasAgentTurnUsage(result) ? agentTurnUsageSchema.parse(result) : void 0;
 }
 async function readConversationModelUsageFromSql(executor, options) {
-  const modelId = sql`case
+  const modelId = sql2`case
     when position('/' in coalesce(${message}->>'model', '')) > 0
       then ${message}->>'model'
     else concat(${message}->>'provider', '/', ${message}->>'model')
@@ -586,10 +652,10 @@ async function readConversationModelUsageFromSql(executor, options) {
     and2(
       options.includeDescendants ? eq2(juniorConversations.rootConversationId, options.conversationId) : eq2(juniorConversationEvents.conversationId, options.conversationId),
       eq2(juniorConversationEvents.type, "assistant_message"),
-      sql`jsonb_typeof(${message}->'provider') = 'string'`,
-      sql`jsonb_typeof(${message}->'model') = 'string'`,
-      sql`coalesce(${message}->>'provider', '') <> ''`,
-      sql`coalesce(${message}->>'model', '') <> ''`
+      sql2`jsonb_typeof(${message}->'provider') = 'string'`,
+      sql2`jsonb_typeof(${message}->'model') = 'string'`,
+      sql2`coalesce(${message}->>'provider', '') <> ''`,
+      sql2`coalesce(${message}->>'model', '') <> ''`
     )
   ).groupBy(modelId).orderBy(modelId);
   return rows.flatMap((row) => {
@@ -654,7 +720,7 @@ import {
   getTableColumns,
   inArray,
   lt,
-  sql as sql2
+  sql as sql3
 } from "drizzle-orm";
 
 // src/api/conversations/events.ts
@@ -1065,7 +1131,7 @@ async function readConversationEventRows(executor, args) {
   return executor.db().select({
     ...conversationEventColumns,
     // Replacement history is model context, never dashboard report data.
-    payload: sql2`case
+    payload: sql3`case
         when ${juniorConversationEvents.type} in ('compaction', 'handoff')
         then jsonb_set(
           ${juniorConversationEvents.payload},
@@ -1083,11 +1149,11 @@ async function readConversationEventRows(executor, args) {
         args.types ?? [...conversationReportSourceEventTypes]
       ),
       args.subagentInvocationIds === void 0 ? void 0 : inArray(
-        sql2`${juniorConversationEvents.payload}->>'subagentInvocationId'`,
+        sql3`${juniorConversationEvents.payload}->>'subagentInvocationId'`,
         args.subagentInvocationIds
       ),
       args.toolCallIds === void 0 ? void 0 : inArray(
-        sql2`${juniorConversationEvents.payload}->>'toolCallId'`,
+        sql3`${juniorConversationEvents.payload}->>'toolCallId'`,
         args.toolCallIds
       )
     )
@@ -1167,7 +1233,7 @@ async function readConversationEventPage(executor, args) {
 }
 
 // src/api/conversations/list.ts
-import { and as and7, asc as asc2, desc as desc2, eq as eq7, isNotNull as isNotNull4, isNull as isNull3 } from "drizzle-orm";
+import { and as and7, asc as asc2, desc as desc2, eq as eq7, isNull as isNull3, sql as sql7 } from "drizzle-orm";
 
 // src/api/conversations/shared.ts
 function slackStatsLocationLabel(input) {
@@ -1341,7 +1407,7 @@ function conversationSummaryFromStoredConversation(args) {
     ...usage3 ? { cumulativeUsage: usage3 } : {},
     ...actorIdentity ? { actorIdentity } : {},
     ...sourceUrl ? { sourceUrl } : {},
-    ...conversation.archivedAtMs ? { archivedAt: new Date(conversation.archivedAtMs).toISOString() } : {},
+    archivedAt: args.archivedAtMs === void 0 ? null : new Date(args.archivedAtMs).toISOString(),
     ...slackThread ? { channel: slackThread.channelId } : {},
     ...channelName ? { channelName } : {},
     ...channelNameRedacted ? { channelNameRedacted: true } : {},
@@ -1350,7 +1416,7 @@ function conversationSummaryFromStoredConversation(args) {
 }
 
 // src/api/conversations/usage.ts
-import { and as and4, eq as eq4, inArray as inArray2, isNull, sql as sql3 } from "drizzle-orm";
+import { and as and4, eq as eq4, inArray as inArray2, isNull, sql as sql4 } from "drizzle-orm";
 import { alias } from "drizzle-orm/pg-core";
 var usage2 = juniorConversations.usage;
 var metricRootConversation = alias(
@@ -1364,10 +1430,10 @@ var componentFields = [
   "cacheCreationTokens"
 ];
 function summedUsageNumber(field) {
-  return sql3`sum((${usage2}->>${field})::double precision)::double precision`;
+  return sql4`sum((${usage2}->>${field})::double precision)::double precision`;
 }
 function summedCostNumber(field) {
-  return sql3`round(
+  return sql4`round(
     sum((${usage2}->'cost'->>${field})::numeric),
     12
   )::double precision`;
@@ -1397,7 +1463,7 @@ function usageFromAggregate(row) {
 }
 async function readRootConversationMetricsFromSql(db, rootConversationIds) {
   if (rootConversationIds.length === 0) return /* @__PURE__ */ new Map();
-  const hasComponents = sql3`coalesce(
+  const hasComponents = sql4`coalesce(
     ${usage2}->>'inputTokens',
     ${usage2}->>'outputTokens',
     ${usage2}->>'cachedInputTokens',
@@ -1405,12 +1471,12 @@ async function readRootConversationMetricsFromSql(db, rootConversationIds) {
   ) is not null`;
   const rows = await db.select({
     rootConversationId: juniorConversations.rootConversationId,
-    durationMs: sql3`coalesce(sum(${juniorConversations.durationMs}), 0)::double precision`,
+    durationMs: sql4`coalesce(sum(${juniorConversations.durationMs}), 0)::double precision`,
     inputTokens: summedUsageNumber("inputTokens"),
     outputTokens: summedUsageNumber("outputTokens"),
     cachedInputTokens: summedUsageNumber("cachedInputTokens"),
     cacheCreationTokens: summedUsageNumber("cacheCreationTokens"),
-    totalOnlyTokens: sql3`sum(
+    totalOnlyTokens: sql4`sum(
         case
           when not (${hasComponents})
           then (${usage2}->>'totalTokens')::double precision
@@ -1460,7 +1526,7 @@ import {
   isNotNull as isNotNull2,
   isNull as isNull2,
   or,
-  sql as sql4
+  sql as sql5
 } from "drizzle-orm";
 import { alias as alias2 } from "drizzle-orm/pg-core";
 var auxiliaryRootConversation = alias2(
@@ -1468,7 +1534,7 @@ var auxiliaryRootConversation = alias2(
   "auxiliary_root_conversation"
 );
 function eventCost() {
-  return sql4`CASE
+  return sql5`CASE
     WHEN ${juniorConversationEvents.type} = 'structured_event'
       AND jsonb_typeof(${juniorConversationEvents.payload}->'content'->'costUsd') = 'number'
       THEN (${juniorConversationEvents.payload}->'content'->>'costUsd')::numeric
@@ -1481,16 +1547,16 @@ function eventCost() {
 async function readConversationAuxiliaryCostsFromSql(db, conversationIds, options) {
   if (conversationIds.length === 0) return /* @__PURE__ */ new Map();
   const selectedIds = [...conversationIds];
-  const conversationId = options.includeDescendants ? sql4`coalesce(
+  const conversationId = options.includeDescendants ? sql5`coalesce(
         ${auxiliaryRootConversation.conversationId},
         ${juniorConversations.conversationId}
-      )` : sql4`${juniorConversations.conversationId}`;
-  const namespace = sql4`CASE
+      )` : sql5`${juniorConversations.conversationId}`;
+  const namespace = sql5`CASE
     WHEN ${juniorConversationEvents.type} = 'structured_event'
       THEN ${juniorConversationEvents.payload}->>'namespace'
     ELSE 'junior'
   END`;
-  const name = sql4`CASE
+  const name = sql5`CASE
     WHEN ${juniorConversationEvents.type} = 'structured_event'
       THEN ${juniorConversationEvents.payload}->>'name'
     ELSE ${juniorConversationEvents.type}
@@ -1505,10 +1571,10 @@ async function readConversationAuxiliaryCostsFromSql(db, conversationIds, option
   ) : inArray3(juniorConversations.conversationId, selectedIds);
   const rows = await db.select({
     conversationId,
-    costUsd: sql4`round(sum(${cost2}), 12)::double precision`.mapWith(
+    costUsd: sql5`round(sum(${cost2}), 12)::double precision`.mapWith(
       Number
     ),
-    events: sql4`count(*)::integer`.mapWith(Number),
+    events: sql5`count(*)::integer`.mapWith(Number),
     name,
     namespace
   }).from(juniorConversationEvents).innerJoin(
@@ -1540,7 +1606,7 @@ async function readConversationAuxiliaryCostsFromSql(db, conversationIds, option
           "turn_routed"
         ])
       ),
-      sql4`${cost2} >= 0`
+      sql5`${cost2} >= 0`
     )
   ).groupBy(conversationId, namespace, name).orderBy(conversationId, namespace, name);
   const result = /* @__PURE__ */ new Map();
@@ -1687,15 +1753,15 @@ function isConversationPriority(conversation, nowMs) {
 }
 
 // src/api/conversations/user-message-activity.ts
-import { and as and6, eq as eq6, inArray as inArray4, isNotNull as isNotNull3, or as or2, sql as sql5 } from "drizzle-orm";
+import { and as and6, eq as eq6, inArray as inArray4, isNotNull as isNotNull3, or as or2, sql as sql6 } from "drizzle-orm";
 async function readLastUserMessageAtByConversation(db, conversationIds) {
   if (conversationIds.length === 0) return /* @__PURE__ */ new Map();
-  const authority = sql5`${juniorConversationEvents.payload}->'provenance'->>'authority'`;
-  const actorPlatform = sql5`${juniorConversationEvents.payload}->'provenance'->'actor'->>'platform'`;
-  const role = sql5`${juniorConversationEvents.payload}->>'role'`;
+  const authority = sql6`${juniorConversationEvents.payload}->'provenance'->>'authority'`;
+  const actorPlatform = sql6`${juniorConversationEvents.payload}->'provenance'->'actor'->>'platform'`;
+  const role = sql6`${juniorConversationEvents.payload}->>'role'`;
   const rows = await db.select({
     conversationId: juniorConversationEvents.conversationId,
-    lastUserMessageAt: sql5`max(${juniorConversationEvents.createdAt})`
+    lastUserMessageAt: sql6`max(${juniorConversationEvents.createdAt})`
   }).from(juniorConversationEvents).where(
     and6(
       inArray4(juniorConversationEvents.conversationId, conversationIds),
@@ -1703,7 +1769,7 @@ async function readLastUserMessageAtByConversation(db, conversationIds) {
         and6(
           eq6(juniorConversationEvents.type, "user_message"),
           eq6(authority, "instruction"),
-          sql5`${actorPlatform} in ('slack', 'local', 'web')`
+          sql6`${actorPlatform} in ('slack', 'local', 'web')`
         ),
         and6(
           eq6(juniorConversationEvents.type, "message"),
@@ -1723,22 +1789,28 @@ async function readLastUserMessageAtByConversation(db, conversationIds) {
 
 // src/api/conversations/list.ts
 var CONVERSATION_FEED_LIMIT = 50;
-function conversationFeedMembershipFilter(filter) {
-  if (!filter) return void 0;
+function conversationFeedMembershipFilter(status, filter) {
+  if (!filter) return status === "archived" ? sql7`false` : void 0;
   if (filter.kind === "viewer") {
-    return viewerConversationMembership({
-      actorMatch: eq7(juniorIdentities.userId, filter.userId),
-      participantMatch: conversationHasParticipantUser(filter.userId)
-    });
+    return and7(
+      viewerConversationMembership({
+        actorMatch: eq7(juniorIdentities.userId, filter.userId),
+        participantMatch: conversationHasParticipantUser(filter.userId)
+      }),
+      status === "archived" ? conversationArchivedForUser(filter.userId) : conversationNotArchivedForUser(filter.userId)
+    );
   }
-  return viewerConversationMembership({
-    actorMatch: eq7(juniorUsers.primaryEmailNormalized, filter.email),
-    participantMatch: conversationHasParticipantEmail(filter.email)
-  });
+  return and7(
+    viewerConversationMembership({
+      actorMatch: eq7(juniorUsers.primaryEmailNormalized, filter.email),
+      participantMatch: conversationHasParticipantEmail(filter.email)
+    }),
+    status === "archived" ? conversationArchivedForEmail(filter.email) : conversationNotArchivedForEmail(filter.email)
+  );
 }
 async function conversationRows(db, limit, status, filter) {
   return db.select({
-    conversation: juniorConversations,
+    conversation: conversationReadColumns(),
     destination: juniorDestinations,
     identityDisplayName: juniorIdentities.displayName,
     identityEmail: juniorIdentities.email,
@@ -1756,8 +1828,7 @@ async function conversationRows(db, limit, status, filter) {
   ).leftJoin(juniorUsers, eq7(juniorUsers.id, juniorIdentities.userId)).where(
     and7(
       isNull3(juniorConversations.parentConversationId),
-      status === "archived" ? isNotNull4(juniorConversations.archivedAt) : isNull3(juniorConversations.archivedAt),
-      conversationFeedMembershipFilter(filter)
+      conversationFeedMembershipFilter(status, filter)
     )
   ).orderBy(
     desc2(juniorConversations.lastActivityAt),
@@ -1793,7 +1864,6 @@ function conversationFromRow(row) {
     },
     ...actor ? { actor } : {},
     ...location ? { location } : {},
-    ...value.archivedAt ? { archivedAtMs: value.archivedAt.getTime() } : {},
     ...value.channelName ? { channelName: value.channelName } : {},
     ...value.source ? { source: value.source } : {},
     ...sessionSource ? { sessionSource } : {},
@@ -1804,7 +1874,7 @@ function conversationFromRow(row) {
 async function readConversationRecordFromSql(conversationId) {
   const db = getDb();
   const rows = await db.select({
-    conversation: juniorConversations,
+    conversation: conversationReadColumns(),
     destination: juniorDestinations,
     identityDisplayName: juniorIdentities.displayName,
     identityEmail: juniorIdentities.email,
@@ -1847,11 +1917,12 @@ function conversationFeedFilter(options) {
 async function readConversationFeedFromSql(options = {}) {
   const nowMs = Date.now();
   const db = getDb();
+  const filter = conversationFeedFilter(options);
   const rows = await conversationRows(
     db,
     options.limit ?? CONVERSATION_FEED_LIMIT,
     options.status ?? "active",
-    conversationFeedFilter(options)
+    filter
   );
   const conversations = rows.map((row) => conversationFromRow(row));
   const conversationIds = conversations.map(
@@ -1859,6 +1930,7 @@ async function readConversationFeedFromSql(options = {}) {
   );
   const [
     accessByConversation,
+    archiveTimesByConversation,
     annotationsByConversation,
     auxiliaryCostsByRoot,
     metricsByRoot,
@@ -1867,6 +1939,11 @@ async function readConversationFeedFromSql(options = {}) {
     lastUserMessageAtByConversation
   ] = await Promise.all([
     readConversationAccessFromSql(db, conversationIds, options.viewer),
+    conversationArchiveTimes(
+      db,
+      conversationIds,
+      filter?.kind === "viewer" ? { userId: filter.userId } : filter?.kind === "actorEmail" ? { email: filter.email } : void 0
+    ),
     listConversationAnnotationsById(db, conversationIds),
     readConversationAuxiliaryCostsFromSql(db, conversationIds, {
       includeDescendants: true
@@ -1897,7 +1974,11 @@ async function readConversationFeedFromSql(options = {}) {
       const row = rows[index];
       const access = accessByConversation.get(conversation.conversationId);
       const metrics = metricsByRoot.get(conversation.conversationId);
+      const archivedAtMs = archiveTimesByConversation.get(
+        conversation.conversationId
+      );
       const summary = conversationSummaryFromStoredConversation({
+        ...archivedAtMs === void 0 ? {} : { archivedAtMs },
         conversation,
         access,
         auxiliaryCosts: auxiliaryCostsByRoot.get(conversation.conversationId),
@@ -2480,6 +2561,7 @@ function projectConversationDetail(args) {
   return {
     ...conversationSummaryFromStoredConversation({
       access: args.access,
+      ...args.archivedAtMs === void 0 ? {} : { archivedAtMs: args.archivedAtMs },
       auxiliaryCosts: args.auxiliaryCosts,
       conversation,
       durationMs: args.durationMs,
@@ -2508,6 +2590,7 @@ function projectConversationDetail(args) {
 async function readConversationDetailFromSql(conversationId, options) {
   const record = await readConversationRecordFromSql(conversationId);
   if (!record) return void 0;
+  const archivedAtMs = options.viewer ? await readConversationArchivedAt(options.viewer, conversationId) : void 0;
   const executor = getSqlExecutor();
   const includeDescendantMetrics = record.rootConversationId === conversationId;
   const [
@@ -2550,6 +2633,7 @@ async function readConversationDetailFromSql(conversationId, options) {
   return projectConversationDetail({
     ...record,
     access,
+    ...archivedAtMs === void 0 ? {} : { archivedAtMs },
     annotations,
     auxiliaryCosts: auxiliaryCostsByConversation.get(conversationId),
     durationMs: metrics?.durationMs ?? record.durationMs,
@@ -2791,20 +2875,20 @@ async function requireConversationPendingMessages(conversationId, options = {})
 }
 
 // src/api/conversations/stats.query.ts
-import { and as and9, eq as eq9, gte, isNull as isNull4, lte, sql as sql7 } from "drizzle-orm";
+import { and as and9, eq as eq9, gte, isNull as isNull4, lte, sql as sql9 } from "drizzle-orm";
 import { alias as alias3 } from "drizzle-orm/pg-core";
 
 // src/api/conversations/aggregate.ts
-import { sql as sql6 } from "drizzle-orm";
+import { sql as sql8 } from "drizzle-orm";
 function usageTokenValue(source, field) {
-  return sql6`CASE
+  return sql8`CASE
     WHEN ${source.usage}->>${field} IS NOT NULL
       THEN (${source.usage}->>${field})::double precision
     ELSE NULL
   END`;
 }
 function tokenValue(source) {
-  return sql6`
+  return sql8`
     CASE
       WHEN COALESCE(
         ${source.usage}->>'inputTokens',
@@ -2823,7 +2907,7 @@ function tokenValue(source) {
   `;
 }
 function costValue(source) {
-  return sql6`
+  return sql8`
     CASE
       WHEN ${source.usage}->'cost'->>'total' IS NOT NULL
         THEN (${source.usage}->'cost'->>'total')::double precision
@@ -2844,34 +2928,34 @@ function costValue(source) {
 function conversationAggregateColumns(sources) {
   const metrics = sources?.metrics ?? juniorConversations;
   const roots = sources?.roots ?? juniorConversations;
-  const conversationCount = sources ? sql6`COUNT(DISTINCT ${roots.conversationId})` : sql6`COUNT(*)`;
+  const conversationCount = sources ? sql8`COUNT(DISTINCT ${roots.conversationId})` : sql8`COUNT(*)`;
   return {
-    active: sql6`${conversationCount} FILTER (
+    active: sql8`${conversationCount} FILTER (
       WHERE ${roots.executionStatus} NOT IN ('idle', 'failed')
     )::integer`,
-    conversations: sql6`${conversationCount}::integer`,
-    cachedInputTokens: sql6`SUM(${usageTokenValue(metrics, "cachedInputTokens")})::double precision`,
-    costUsd: sql6`SUM(${costValue(metrics)})::double precision`,
-    durationMs: sql6`COALESCE(SUM(${metrics.durationMs}), 0)::double precision`,
-    failed: sql6`${conversationCount} FILTER (
+    conversations: sql8`${conversationCount}::integer`,
+    cachedInputTokens: sql8`SUM(${usageTokenValue(metrics, "cachedInputTokens")})::double precision`,
+    costUsd: sql8`SUM(${costValue(metrics)})::double precision`,
+    durationMs: sql8`COALESCE(SUM(${metrics.durationMs}), 0)::double precision`,
+    failed: sql8`${conversationCount} FILTER (
       WHERE ${roots.executionStatus} = 'failed'
     )::integer`,
-    inputTokens: sql6`SUM(${usageTokenValue(metrics, "inputTokens")})::double precision`,
-    tokens: sql6`SUM(${tokenValue(metrics)})::double precision`
+    inputTokens: sql8`SUM(${usageTokenValue(metrics, "inputTokens")})::double precision`,
+    tokens: sql8`SUM(${tokenValue(metrics)})::double precision`
   };
 }
 function conversationRangeColumns() {
   return {
-    firstSeenAt: sql6`MIN(${juniorConversations.createdAt})`.mapWith(
+    firstSeenAt: sql8`MIN(${juniorConversations.createdAt})`.mapWith(
       juniorConversations.createdAt
     ),
-    lastSeenAt: sql6`MAX(${juniorConversations.lastActivityAt})`.mapWith(
+    lastSeenAt: sql8`MAX(${juniorConversations.lastActivityAt})`.mapWith(
       juniorConversations.lastActivityAt
     )
   };
 }
 function conversationActiveDaysColumn() {
-  return sql6`COUNT(DISTINCT (${juniorConversations.lastActivityAt} AT TIME ZONE 'UTC')::date)::integer`;
+  return sql8`COUNT(DISTINCT (${juniorConversations.lastActivityAt} AT TIME ZONE 'UTC')::date)::integer`;
 }
 
 // src/api/conversations/stats.query.ts
@@ -3012,7 +3096,7 @@ function guardianStats(rows, endMs) {
 }
 async function aggregateStats(db, start, end) {
   const where = statsWhere(start, end);
-  const activityDate = sql7`TO_CHAR(
+  const activityDate = sql9`TO_CHAR(
     ${juniorConversations.lastActivityAt} AT TIME ZONE 'UTC',
     'YYYY-MM-DD'
   )`;
@@ -3093,23 +3177,23 @@ async function aggregateStats(db, start, end) {
   return { actorRows, locationRows, metricRows, totals: totalsRows[0] };
 }
 async function aggregateGuardianStats(db, start, end) {
-  const date = sql7`TO_CHAR(
+  const date = sql9`TO_CHAR(
     ${juniorConversationEvents.createdAt} AT TIME ZONE 'UTC',
     'YYYY-MM-DD'
   )`;
-  const decision = sql7`${juniorConversationEvents.payload}->>'decision'`;
-  const cost2 = sql7`CASE
+  const decision = sql9`${juniorConversationEvents.payload}->>'decision'`;
+  const cost2 = sql9`CASE
     WHEN jsonb_typeof(${juniorConversationEvents.payload}->'costUsd') = 'number'
       THEN (${juniorConversationEvents.payload}->>'costUsd')::double precision
     ELSE NULL
   END`;
   return await db.select({
-    allow: sql7`COUNT(*) FILTER (WHERE ${decision} = 'allow')::integer`,
-    ask: sql7`COUNT(*) FILTER (WHERE ${decision} = 'ask')::integer`,
-    costUsd: sql7`SUM(${cost2})::double precision`,
+    allow: sql9`COUNT(*) FILTER (WHERE ${decision} = 'allow')::integer`,
+    ask: sql9`COUNT(*) FILTER (WHERE ${decision} = 'ask')::integer`,
+    costUsd: sql9`SUM(${cost2})::double precision`,
     date,
-    deny: sql7`COUNT(*) FILTER (WHERE ${decision} = 'deny')::integer`,
-    requests: sql7`COUNT(*)::integer`
+    deny: sql9`COUNT(*) FILTER (WHERE ${decision} = 'deny')::integer`,
+    requests: sql9`COUNT(*)::integer`
   }).from(juniorConversationEvents).where(
     and9(
       eq9(juniorConversationEvents.type, "guardian_action_reviewed"),
@@ -3230,6 +3314,7 @@ function createConversationRoutes(options) {
   );
   app.patch(
     "/:conversationId/archive",
+    requireViewer,
     validateRequest(
       "param",
       conversationParamsSchema,
@@ -3241,11 +3326,12 @@ function createConversationRoutes(options) {
       "Invalid request body."
     ),
     async (context) => {
+      const viewer = context.get("viewer");
       const { conversationId } = context.req.valid("param");
       const body = context.req.valid("json");
       return jsonResponse(
         archiveConversationResponseSchema,
-        await archiveConversation(conversationId, body)
+        await archiveConversation(viewer, conversationId, body)
       );
     }
   );
@@ -3374,7 +3460,7 @@ function createConversationRoutes(options) {
 import { Hono as Hono2 } from "hono";
 
 // src/api/locations/query.ts
-import { and as and10, asc as asc3, desc as desc3, eq as eq10, gte as gte2, isNull as isNull5, sql as sql8 } from "drizzle-orm";
+import { and as and10, asc as asc3, desc as desc3, eq as eq10, gte as gte2, isNull as isNull5, sql as sql10 } from "drizzle-orm";
 import { alias as alias4 } from "drizzle-orm/pg-core";
 
 // src/api/conversations/reporting.ts
@@ -3546,12 +3632,12 @@ async function directoryRows(db) {
   ).where(topLevelWhere()).groupBy(...locationGroupBy());
 }
 async function directoryActivityRows(db, start) {
-  const date = sql8`TO_CHAR(
+  const date = sql10`TO_CHAR(
     ${juniorConversations.lastActivityAt} AT TIME ZONE 'UTC',
     'YYYY-MM-DD'
   )`;
   return db.select({
-    conversations: sql8`COUNT(*)::integer`,
+    conversations: sql10`COUNT(*)::integer`,
     date,
     visibility: juniorDestinations.visibility
   }).from(juniorConversations).leftJoin(
@@ -3630,7 +3716,7 @@ async function recentLocationRows(db, locationId) {
     createdAt: juniorConversations.createdAt,
     destinationId: juniorDestinations.id,
     durationMs: juniorConversations.durationMs,
-    email: sql8`COALESCE(
+    email: sql10`COALESCE(
         ${juniorUsers.primaryEmailNormalized},
         ${juniorIdentities.email}
       )`,
@@ -3639,7 +3725,7 @@ async function recentLocationRows(db, locationId) {
     fullName: juniorUsers.displayName,
     handle: juniorIdentities.handle,
     lastActivityAt: juniorConversations.lastActivityAt,
-    providerSubjectId: sql8`CASE
+    providerSubjectId: sql10`CASE
         WHEN ${juniorIdentities.provider} = 'slack'
           THEN ${juniorIdentities.providerSubjectId}
         ELSE NULL
@@ -3654,12 +3740,7 @@ async function recentLocationRows(db, locationId) {
   ).leftJoin(
     juniorIdentities,
     eq10(juniorIdentities.id, juniorConversations.actorIdentityId)
-  ).leftJoin(juniorUsers, eq10(juniorUsers.id, juniorIdentities.userId)).where(
-    and10(
-      publicLocationWhere(locationId),
-      isNull5(juniorConversations.archivedAt)
-    )
-  ).orderBy(
+  ).leftJoin(juniorUsers, eq10(juniorUsers.id, juniorIdentities.userId)).where(publicLocationWhere(locationId)).orderBy(
     desc3(juniorConversations.lastActivityAt),
     asc3(juniorConversations.conversationId)
   ).limit(RECENT_LIMIT);
@@ -3671,7 +3752,7 @@ async function readLocationDetailFromSql(locationId, options = {}) {
   const start = new Date(end);
   start.setUTCDate(start.getUTCDate() - (ACTIVITY_DAYS - 1));
   const where = publicLocationWhere(locationId);
-  const activityDate = sql8`TO_CHAR(
+  const activityDate = sql10`TO_CHAR(
     ${juniorConversations.lastActivityAt} AT TIME ZONE 'UTC',
     'YYYY-MM-DD'
   )`;
@@ -3837,10 +3918,10 @@ function createLocationRoutes() {
 import { Hono as Hono3 } from "hono";
 
 // src/api/people/list.query.ts
-import { and as and12, eq as eq12, gte as gte3, sql as sql10 } from "drizzle-orm";
+import { and as and12, eq as eq12, gte as gte3, sql as sql12 } from "drizzle-orm";
 
 // src/api/people/shared.ts
-import { and as and11, asc as asc4, desc as desc4, eq as eq11, isNull as isNull6, notExists, or as or4, sql as sql9 } from "drizzle-orm";
+import { and as and11, asc as asc4, desc as desc4, eq as eq11, isNull as isNull6, notExists, or as or4, sql as sql11 } from "drizzle-orm";
 import { alias as alias5 } from "drizzle-orm/pg-core";
 var RECENT_LIMIT2 = 25;
 var ACTIVITY_DAYS2 = 365;
@@ -3943,7 +4024,7 @@ function verifiedActorWhere(email) {
   return and11(
     eq11(juniorIdentities.provider, "slack"),
     eq11(juniorIdentities.emailVerified, true),
-    sql9`${juniorUsers.primaryEmailNormalized} IS NOT NULL`,
+    sql11`${juniorUsers.primaryEmailNormalized} IS NOT NULL`,
     normalizedEmail ? eq11(juniorUsers.primaryEmailNormalized, normalizedEmail) : void 0
   );
 }
@@ -3971,9 +4052,7 @@ async function recentActorRows(email) {
   ).innerJoin(juniorUsers, eq11(juniorUsers.id, juniorIdentities.userId)).leftJoin(
     juniorDestinations,
     eq11(juniorDestinations.id, juniorConversations.destinationId)
-  ).where(
-    and11(verifiedActorWhere(email), isNull6(juniorConversations.archivedAt))
-  ).orderBy(
+  ).where(verifiedActorWhere(email)).orderBy(
     desc4(juniorConversations.lastActivityAt),
     asc4(juniorConversations.conversationId)
   ).limit(RECENT_LIMIT2);
@@ -4001,7 +4080,7 @@ function directoryActivityDays2(rows, nowMs) {
 async function readPeopleListFromSql() {
   const nowMs = Date.now();
   const { end, start } = activityWindow(nowMs);
-  const activityDate = sql10`TO_CHAR(
+  const activityDate = sql12`TO_CHAR(
     ${juniorConversations.lastActivityAt} AT TIME ZONE 'UTC',
     'YYYY-MM-DD'
   )`;
@@ -4009,8 +4088,8 @@ async function readPeopleListFromSql() {
     getDb().select({
       email: juniorUsers.primaryEmailNormalized,
       fullName: juniorUsers.displayName,
-      slackUserId: sql10`MAX(${juniorIdentities.providerSubjectId})`,
-      slackUserName: sql10`MAX(${juniorIdentities.handle})`,
+      slackUserId: sql12`MAX(${juniorIdentities.providerSubjectId})`,
+      slackUserName: sql12`MAX(${juniorIdentities.handle})`,
       activeDays: conversationActiveDaysColumn(),
       ...peopleTreeAggregateColumns,
       ...conversationRangeColumns()
@@ -4019,8 +4098,8 @@ async function readPeopleListFromSql() {
       eq12(juniorIdentities.id, juniorConversations.actorIdentityId)
     ).innerJoin(juniorUsers, eq12(juniorUsers.id, juniorIdentities.userId)).leftJoin(peopleTreeConversation, peopleTreeMetricsJoin()).where(verifiedActorWhere()).groupBy(juniorUsers.primaryEmailNormalized, juniorUsers.displayName),
     getDb().select({
-      activePeople: sql10`COUNT(DISTINCT ${juniorUsers.id})::int`,
-      conversations: sql10`COUNT(*)::int`,
+      activePeople: sql12`COUNT(DISTINCT ${juniorUsers.id})::int`,
+      conversations: sql12`COUNT(*)::int`,
       date: activityDate
     }).from(juniorConversations).innerJoin(
       juniorIdentities,
@@ -4079,7 +4158,7 @@ async function readPeoplePluginReports(args) {
       source: "plugins"
     });
   }
-  const { getPluginProfileReports } = await import("./agent-hooks-LQZFBXBK.js");
+  const { getPluginProfileReports } = await import("./agent-hooks-PBT4NNBV.js");
   return pluginOperationalReportFeedSchema.parse({
     generatedAt: new Date(nowMs).toISOString(),
     reports: await getPluginProfileReports({
@@ -4092,7 +4171,7 @@ async function readPeoplePluginReports(args) {
 }
 
 // src/api/people/profile.query.ts
-import { and as and13, eq as eq13, gte as gte4, sql as sql11 } from "drizzle-orm";
+import { and as and13, eq as eq13, gte as gte4, sql as sql13 } from "drizzle-orm";
 function emptyProfile(email, nowMs) {
   const end = new Date(nowMs);
   end.setUTCHours(0, 0, 0, 0);
@@ -4127,7 +4206,7 @@ function addAggregate2(map, label, row) {
   map.set(label, item);
 }
 function surfaceExpression() {
-  return sql11`CASE
+  return sql13`CASE
     WHEN ${juniorConversations.source} IN ('api', 'scheduler', 'slack')
       THEN ${juniorConversations.source}
     WHEN ${juniorConversations.conversationId} LIKE 'slack:%' THEN 'slack'
@@ -4156,17 +4235,17 @@ async function readPeopleProfileFromSql(email, options = {}) {
   const where = verifiedActorWhere(normalizedEmail);
   const metricsJoin = peopleTreeMetricsJoin();
   const surface = surfaceExpression();
-  const activityDate = sql11`TO_CHAR(
+  const activityDate = sql13`TO_CHAR(
     ${juniorConversations.lastActivityAt} AT TIME ZONE 'UTC',
     'YYYY-MM-DD'
   )`;
-  const channel = sql11`SPLIT_PART(${juniorConversations.conversationId}, ':', 2)`;
+  const channel = sql13`SPLIT_PART(${juniorConversations.conversationId}, ':', 2)`;
   const [totalsRows, dayRows, locationRows, surfaceRows, recentRows] = await Promise.all([
     getDb().select({
       email: juniorUsers.primaryEmailNormalized,
       fullName: juniorUsers.displayName,
-      slackUserId: sql11`MAX(${juniorIdentities.providerSubjectId})`,
-      slackUserName: sql11`MAX(${juniorIdentities.handle})`,
+      slackUserId: sql13`MAX(${juniorIdentities.providerSubjectId})`,
+      slackUserName: sql13`MAX(${juniorIdentities.handle})`,
       activeDays: conversationActiveDaysColumn(),
       ...peopleTreeAggregateColumns
     }).from(juniorConversations).innerJoin(
@@ -4279,7 +4358,7 @@ async function readPeopleProfile(email, options = {}) {
 }
 
 // src/api/people/spend.query.ts
-import { and as and14, eq as eq14, gte as gte5, lte as lte2, sql as sql12 } from "drizzle-orm";
+import { and as and14, eq as eq14, gte as gte5, lte as lte2, sql as sql14 } from "drizzle-orm";
 var SEVEN_DAY_OFFSET = 6;
 var THIRTY_DAY_OFFSET = 29;
 function addUsd2(current, next) {
@@ -4298,7 +4377,7 @@ function spendWindow(nowMs) {
 async function readPersonalSpendFromSql(email, nowMs = Date.now()) {
   const normalizedEmail = normalizeEmail(email);
   const { end, sevenDayStart, thirtyDayStart } = spendWindow(nowMs);
-  const activityDate = sql12`TO_CHAR(
+  const activityDate = sql14`TO_CHAR(
     ${juniorConversations.lastActivityAt} AT TIME ZONE 'UTC',
     'YYYY-MM-DD'
   )`;
@@ -4798,7 +4877,7 @@ function readDescriptionText(home) {
   }
 }
 async function readSkillReports() {
-  const { discoverSkills } = await import("./skills-5YY7QYV6.js");
+  const { discoverSkills } = await import("./skills-U5KQ66EM.js");
   const skills = await discoverSkills();
   return skillReportsSchema.parse(
     skills.map((skill) => ({
@@ -4808,7 +4887,7 @@ async function readSkillReports() {
   );
 }
 async function readPlugins() {
-  const { pluginCatalogRuntime } = await import("./catalog-runtime-P3DBC3XM.js");
+  const { pluginCatalogRuntime } = await import("./catalog-runtime-M7QGKPFZ.js");
   return pluginsSchema.parse(
     pluginCatalogRuntime.getProviders().map((plugin) => ({
       configKeys: plugin.manifest.configKeys ?? [],
@@ -4821,7 +4900,7 @@ async function readPlugins() {
 async function readRuntimeInfoReport() {
   const [{ homeDir }, { pluginCatalogRuntime }, plugins, skills] = await Promise.all([
     import("./discovery-GUFTFBTL.js"),
-    import("./catalog-runtime-P3DBC3XM.js"),
+    import("./catalog-runtime-M7QGKPFZ.js"),
     readPlugins(),
     readSkillReports()
   ]);
@@ -4837,7 +4916,7 @@ async function readRuntimeInfoReport() {
 }
 async function readPluginOperationalReportFeed() {
   const nowMs = Date.now();
-  const { getPluginOperationalReports } = await import("./agent-hooks-LQZFBXBK.js");
+  const { getPluginOperationalReports } = await import("./agent-hooks-PBT4NNBV.js");
   return pluginOperationalReportFeedSchema.parse({
     source: "plugins",
     generatedAt: new Date(nowMs).toISOString(),