@sentry/junior 0.95.0 → 0.97.0

package/dist/chunk-ON6YKIQ7.js

@@ -0,0 +1,260 @@
+import {
+  formatSlackConversationRedactedLabel,
+  resolveSlackConversationContextFromThreadId
+} from "./chunk-NG2AV7IB.js";
+import {
+  getDb,
+  juniorConversations,
+  juniorDestinations,
+  juniorIdentities
+} from "./chunk-35BNLDOJ.js";
+import {
+  parseSlackThreadId,
+  resolveConversationPrivacy
+} from "./chunk-LVA4I4H7.js";
+
+// src/api/conversations/list.query.ts
+import { asc, desc, eq, isNull } from "drizzle-orm";
+
+// src/api/conversations/shared.ts
+function slackStatsLocationLabel(input) {
+  const channelId = input.channel;
+  if (!channelId) return void 0;
+  if (input.channelNameRedacted && input.channelName) {
+    return input.channelName;
+  }
+  const name = input.channelName?.replace(/^#/, "");
+  if (channelId.startsWith("D")) return "Direct Message";
+  if (channelId.startsWith("C")) return name ? `#${name}` : "Public Channel";
+  if (channelId.startsWith("G")) {
+    if (name?.startsWith("mpdm-")) return "Group DM";
+    return "Private Channel";
+  }
+  return name || channelId;
+}
+function surfaceFallbackLabel(surface) {
+  if (surface === "scheduler") return "Scheduler";
+  if (surface === "api") return "API";
+  if (surface === "internal") return "Internal";
+  return "Conversation";
+}
+
+// src/api/conversations/projection.ts
+var HUNG_TURN_PROGRESS_MS = 5 * 60 * 1e3;
+var PRIVATE_CONVERSATION_LABEL = "Private Conversation";
+function privateConversationLabel(slackConversation) {
+  if (!slackConversation) {
+    return PRIVATE_CONVERSATION_LABEL;
+  }
+  return slackConversation.visibility === "private" ? formatSlackConversationRedactedLabel(slackConversation) ?? PRIVATE_CONVERSATION_LABEL : PRIVATE_CONVERSATION_LABEL;
+}
+function surfaceFromConversationId(conversationId) {
+  if (parseSlackThreadId(conversationId)) return "slack";
+  if (conversationId.startsWith("scheduler:")) return "scheduler";
+  if (conversationId.startsWith("api:")) return "api";
+  return "internal";
+}
+function surfaceFromSource(source, conversationId) {
+  if (source === "slack" || source === "api" || source === "scheduler") {
+    return source;
+  }
+  return surfaceFromConversationId(conversationId);
+}
+function actorIdentityReport(actor) {
+  if (!actor) return void 0;
+  const identity = {
+    ...actor.email !== void 0 ? { email: actor.email } : {},
+    ...actor.fullName !== void 0 ? { fullName: actor.fullName } : {},
+    ...actor.slackUserId !== void 0 ? { slackUserId: actor.slackUserId } : {},
+    ...actor.slackUserName !== void 0 ? { slackUserName: actor.slackUserName } : {}
+  };
+  return Object.keys(identity).length > 0 ? identity : void 0;
+}
+function statusFromConversation(conversation, nowMs) {
+  if (conversation.execution.status === "idle") {
+    return "completed";
+  }
+  if (conversation.execution.status === "failed") {
+    return "failed";
+  }
+  const updatedAtMs = conversation.execution.updatedAtMs ?? conversation.updatedAtMs;
+  if (conversation.execution.status === "running" && nowMs - updatedAtMs > HUNG_TURN_PROGRESS_MS) {
+    return "hung";
+  }
+  return "active";
+}
+function titleFromConversation(args) {
+  const slackThread = parseSlackThreadId(args.conversation.conversationId);
+  const effectiveChannelName = args.conversation.channelName;
+  const slackConversation = resolveSlackConversationContextFromThreadId({
+    threadId: args.conversation.conversationId,
+    channelName: effectiveChannelName
+  });
+  const privateLabel = resolveConversationPrivacy({
+    conversationId: args.conversation.conversationId,
+    visibility: args.conversation.visibility
+  }) !== "public" ? privateConversationLabel(slackConversation) : void 0;
+  return privateLabel ?? args.conversation.title ?? slackStatsLocationLabel({
+    channel: slackThread?.channelId,
+    channelName: effectiveChannelName
+  }) ?? surfaceFallbackLabel(args.surface);
+}
+function channelNameFromConversation(conversation) {
+  const effectiveChannelName = conversation.channelName;
+  const slackThread = parseSlackThreadId(conversation.conversationId);
+  if (!effectiveChannelName && !slackThread) {
+    return void 0;
+  }
+  const slackConversation = resolveSlackConversationContextFromThreadId({
+    threadId: conversation.conversationId,
+    channelName: effectiveChannelName
+  });
+  if (resolveConversationPrivacy({
+    conversationId: conversation.conversationId,
+    visibility: conversation.visibility
+  }) !== "public") {
+    return privateConversationLabel(slackConversation);
+  }
+  return effectiveChannelName;
+}
+function channelNameRedactedFromConversation(conversation) {
+  const effectiveChannelName = conversation.channelName;
+  const slackThread = parseSlackThreadId(conversation.conversationId);
+  if (!effectiveChannelName && !slackThread) {
+    return false;
+  }
+  return resolveConversationPrivacy({
+    conversationId: conversation.conversationId,
+    visibility: conversation.visibility
+  }) !== "public";
+}
+function conversationSummaryFromStoredConversation(args) {
+  const { conversation, durationMs, nowMs, usage } = args;
+  const surface = surfaceFromSource(
+    conversation.source,
+    conversation.conversationId
+  );
+  const actorIdentity = actorIdentityReport(conversation.actor);
+  const slackThread = parseSlackThreadId(conversation.conversationId);
+  const channelName = channelNameFromConversation(conversation);
+  const channelNameRedacted = channelNameRedactedFromConversation(conversation);
+  return {
+    conversationId: conversation.conversationId,
+    cumulativeDurationMs: durationMs,
+    displayTitle: titleFromConversation({ conversation, surface }),
+    lastProgressAt: new Date(
+      conversation.execution.updatedAtMs ?? conversation.updatedAtMs
+    ).toISOString(),
+    lastSeenAt: new Date(conversation.lastActivityAtMs).toISOString(),
+    startedAt: new Date(conversation.createdAtMs).toISOString(),
+    status: statusFromConversation(conversation, nowMs),
+    surface,
+    ...usage ? { cumulativeUsage: usage } : {},
+    ...actorIdentity ? { actorIdentity } : {},
+    ...slackThread ? { channel: slackThread.channelId } : {},
+    ...channelName ? { channelName } : {},
+    ...channelNameRedacted ? { channelNameRedacted: true } : {}
+  };
+}
+
+// src/api/conversations/list.query.ts
+var CONVERSATION_FEED_LIMIT = 50;
+async function conversationRows(db, limit) {
+  return db.select({
+    conversation: juniorConversations,
+    destinationVisibility: juniorDestinations.visibility,
+    identityDisplayName: juniorIdentities.displayName,
+    identityEmail: juniorIdentities.email,
+    identityHandle: juniorIdentities.handle,
+    identityProvider: juniorIdentities.provider,
+    identitySubjectId: juniorIdentities.providerSubjectId,
+    identityTenantId: juniorIdentities.providerTenantId
+  }).from(juniorConversations).leftJoin(
+    juniorDestinations,
+    eq(juniorDestinations.id, juniorConversations.destinationId)
+  ).leftJoin(
+    juniorIdentities,
+    eq(juniorIdentities.id, juniorConversations.actorIdentityId)
+  ).where(isNull(juniorConversations.parentConversationId)).orderBy(
+    desc(juniorConversations.lastActivityAt),
+    asc(juniorConversations.conversationId)
+  ).limit(limit);
+}
+function conversationFromRow(row) {
+  const value = row.conversation;
+  const actor = row.identityProvider === "slack" ? {
+    platform: "slack",
+    ...row.identityEmail ? { email: row.identityEmail } : {},
+    ...row.identityDisplayName ? { fullName: row.identityDisplayName } : {},
+    ...row.identitySubjectId ? { slackUserId: row.identitySubjectId } : {},
+    ...row.identityHandle ? { slackUserName: row.identityHandle } : {},
+    ...row.identityTenantId ? { teamId: row.identityTenantId } : {}
+  } : void 0;
+  return {
+    schemaVersion: 1,
+    conversationId: value.conversationId,
+    createdAtMs: value.createdAt.getTime(),
+    lastActivityAtMs: value.lastActivityAt.getTime(),
+    updatedAtMs: value.updatedAt.getTime(),
+    execution: {
+      status: value.executionStatus,
+      ...value.runId ? { runId: value.runId } : {},
+      ...value.executionUpdatedAt ? { updatedAtMs: value.executionUpdatedAt.getTime() } : {}
+    },
+    ...actor ? { actor } : {},
+    ...value.channelName ? { channelName: value.channelName } : {},
+    ...value.source ? { source: value.source } : {},
+    ...value.title ? { title: value.title } : {},
+    ...value.transcriptPurgedAt ? { transcriptPurgedAtMs: value.transcriptPurgedAt.getTime() } : {},
+    ...row.destinationVisibility ? {
+      visibility: row.destinationVisibility === "public" ? "public" : "private"
+    } : {}
+  };
+}
+async function readConversationRecordFromSql(conversationId) {
+  const db = getDb();
+  const rows = await db.select({
+    conversation: juniorConversations,
+    destinationVisibility: juniorDestinations.visibility,
+    identityDisplayName: juniorIdentities.displayName,
+    identityEmail: juniorIdentities.email,
+    identityHandle: juniorIdentities.handle,
+    identityProvider: juniorIdentities.provider,
+    identitySubjectId: juniorIdentities.providerSubjectId,
+    identityTenantId: juniorIdentities.providerTenantId
+  }).from(juniorConversations).leftJoin(
+    juniorDestinations,
+    eq(juniorDestinations.id, juniorConversations.destinationId)
+  ).leftJoin(
+    juniorIdentities,
+    eq(juniorIdentities.id, juniorConversations.actorIdentityId)
+  ).where(eq(juniorConversations.conversationId, conversationId)).limit(1);
+  const row = rows[0];
+  return row ? {
+    conversation: conversationFromRow(row),
+    durationMs: row.conversation.durationMs,
+    usage: row.conversation.usage
+  } : void 0;
+}
+async function readConversationFeedFromSql(limit = CONVERSATION_FEED_LIMIT) {
+  const nowMs = Date.now();
+  const rows = await conversationRows(getDb(), limit);
+  return {
+    conversations: rows.map(
+      (row) => conversationSummaryFromStoredConversation({
+        conversation: conversationFromRow(row),
+        durationMs: row.conversation.durationMs,
+        nowMs,
+        usage: row.conversation.usage ?? void 0
+      })
+    ),
+    generatedAt: new Date(nowMs).toISOString(),
+    source: "conversation_index"
+  };
+}
+
+export {
+  conversationSummaryFromStoredConversation,
+  readConversationRecordFromSql,
+  readConversationFeedFromSql
+};

package/dist/chunk-PDO5BLNM.js

@@ -0,0 +1,22 @@
+// src/usage-schema.ts
+import { z } from "zod";
+var usageCostSchema = z.object({
+  input: z.number().finite().nonnegative().optional(),
+  output: z.number().finite().nonnegative().optional(),
+  cacheRead: z.number().finite().nonnegative().optional(),
+  cacheWrite: z.number().finite().nonnegative().optional(),
+  total: z.number().finite().nonnegative().optional()
+}).strict();
+var usageSchema = z.object({
+  inputTokens: z.number().int().nonnegative().optional(),
+  outputTokens: z.number().int().nonnegative().optional(),
+  cachedInputTokens: z.number().int().nonnegative().optional(),
+  cacheCreationTokens: z.number().int().nonnegative().optional(),
+  reasoningTokens: z.number().int().nonnegative().optional(),
+  totalTokens: z.number().int().nonnegative().optional(),
+  cost: usageCostSchema.optional()
+}).strict();
+
+export {
+  usageSchema
+};

package/dist/chunk-QNVHH5PU.js

@@ -0,0 +1,20 @@
+import {
+  healthReportSchema
+} from "./chunk-CEA3A3UA.js";
+
+// src/handlers/health.ts
+function readHealthReport() {
+  return healthReportSchema.parse({
+    status: "ok",
+    service: "junior",
+    timestamp: (/* @__PURE__ */ new Date()).toISOString()
+  });
+}
+function GET() {
+  return Response.json(readHealthReport());
+}
+
+export {
+  readHealthReport,
+  GET
+};

package/dist/{chunk-XX4N4E6C.js → chunk-T533JLM3.js}

@@ -9,13 +9,11 @@ import {
   getPersistedThreadState,
   markTurnCompleted,
   mergeArtifactsState
-} from "./chunk-KDPCGVIT.js";
-import {
-  coerceThreadConversationState
-} from "./chunk-RAIB6WSG.js";
+} from "./chunk-WGXMTFNU.js";
 import {
+  coerceThreadConversationState,
   getAgentTurnSessionRecord
-} from "./chunk-WAGQ377B.js";
+} from "./chunk-WJOSZOON.js";
 import {
   generateConversationId,
   hydrateConversationMessages,
@@ -23,19 +21,19 @@ import {
   normalizeConversationText,
   updateConversationStats,
   upsertConversationMessage
-} from "./chunk-CRRBJ3JP.js";
+} from "./chunk-3F4OPKGF.js";
 import {
   createPluginEmbedder,
   createPluginModel,
   getPlugins
-} from "./chunk-NSCHU54X.js";
+} from "./chunk-5HLDPVYS.js";
 import {
   createPluginLogger,
   createPluginState
-} from "./chunk-E3E2XNCN.js";
+} from "./chunk-EOWXRY5E.js";
 import {
   getDb
-} from "./chunk-6ONME5IG.js";
+} from "./chunk-35BNLDOJ.js";
 import {
   GEN_AI_PROVIDER_NAME,
   botConfig,
@@ -46,10 +44,10 @@ import {
   isToolResultMessage,
   normalizeToolNameFromResult,
   stripRuntimeTurnContext
-} from "./chunk-GUE7HTNR.js";
+} from "./chunk-EEZCY5WX.js";
 import {
   buildTurnFailureResponse
-} from "./chunk-WPOJ443W.js";
+} from "./chunk-I35CTGPO.js";
 import {
   parseSlackMessageTs
 } from "./chunk-7FBGKXPE.js";

package/dist/chunk-UAMKJPDF.js

@@ -0,0 +1,11 @@
+// src/api/schema.ts
+import { z } from "zod";
+var conversationParamsSchema = z.object({ conversationId: z.string().min(1) }).strict();
+var subagentParamsSchema = conversationParamsSchema.extend({ subagentId: z.string().min(1) }).strict();
+var personParamsSchema = z.object({ email: z.string().trim().min(1) }).strict();
+
+export {
+  conversationParamsSchema,
+  subagentParamsSchema,
+  personParamsSchema
+};

package/dist/chunk-VFH4ZKZT.js

@@ -0,0 +1,66 @@
+import {
+  actorIdentitySchema,
+  conversationStatsItemSchema,
+  conversationSummaryReportSchema
+} from "./chunk-LUAE4MGW.js";
+
+// src/api/people/schema.ts
+import { z } from "zod";
+var peopleConversationSummaryReportSchema = conversationSummaryReportSchema.omit({
+  cumulativeUsage: true,
+  sentryTraceUrl: true,
+  traceId: true
+});
+var peopleConversationStatsItemSchema = conversationStatsItemSchema.omit({ costUsd: true });
+var actorActivityDayReportSchema = z.object({
+  active: z.number(),
+  conversations: z.number(),
+  date: z.string(),
+  durationMs: z.number(),
+  failed: z.number(),
+  hung: z.number(),
+  tokens: z.number().optional()
+}).strict();
+var actorTotalsReportSchema = z.object({
+  active: z.number(),
+  activeDays: z.number(),
+  conversations: z.number(),
+  durationMs: z.number(),
+  failed: z.number(),
+  hung: z.number(),
+  tokens: z.number().optional()
+}).strict();
+var identifiedActorSchema = actorIdentitySchema.extend({ email: z.string().min(1) }).strict();
+var actorSummaryReportSchema = actorTotalsReportSchema.extend({
+  firstSeenAt: z.string(),
+  lastSeenAt: z.string(),
+  actor: identifiedActorSchema
+}).strict();
+var actorDirectoryReportSchema = z.object({
+  generatedAt: z.string(),
+  people: z.array(actorSummaryReportSchema),
+  sampleLimit: z.number(),
+  sampleSize: z.number(),
+  source: z.literal("conversation_index"),
+  truncated: z.boolean()
+}).strict();
+var actorProfileReportSchema = z.object({
+  activityDays: z.array(actorActivityDayReportSchema),
+  generatedAt: z.string(),
+  locations: z.array(peopleConversationStatsItemSchema),
+  recentConversations: z.array(peopleConversationSummaryReportSchema),
+  actor: identifiedActorSchema,
+  sampleLimit: z.number(),
+  sampleSize: z.number(),
+  source: z.literal("conversation_index"),
+  surfaces: z.array(peopleConversationStatsItemSchema),
+  totals: actorTotalsReportSchema,
+  truncated: z.boolean(),
+  windowEnd: z.string(),
+  windowStart: z.string()
+}).strict();
+
+export {
+  actorDirectoryReportSchema,
+  actorProfileReportSchema
+};

package/dist/{chunk-KDPCGVIT.js → chunk-WGXMTFNU.js}

@@ -1,27 +1,26 @@
 import {
-  buildConversationStatePatch
-} from "./chunk-RAIB6WSG.js";
-import {
+  JUNIOR_THREAD_STATE_TTL_MS,
   abandonAgentTurnSessionRecord,
+  addAgentTurnUsage,
+  buildConversationStatePatch,
   getAgentTurnSessionRecord,
   upsertAgentTurnSessionRecord
-} from "./chunk-WAGQ377B.js";
+} from "./chunk-WJOSZOON.js";
 import {
-  JUNIOR_THREAD_STATE_TTL_MS,
   persistConversationMessages
-} from "./chunk-CRRBJ3JP.js";
+} from "./chunk-3F4OPKGF.js";
 import {
   sleep
-} from "./chunk-CZEX6KIQ.js";
+} from "./chunk-4ZNGQH7C.js";
 import {
   getPiMessageRole,
   getStateAdapter,
   trimTrailingAssistantMessages
-} from "./chunk-GUE7HTNR.js";
+} from "./chunk-EEZCY5WX.js";
 import {
   getActiveTraceId,
   logException
-} from "./chunk-WPOJ443W.js";
+} from "./chunk-I35CTGPO.js";
 import {
   isRecord,
   toOptionalString
@@ -93,61 +92,6 @@ function markTurnFailed(args) {
   args.updateConversationStats(args.conversation);
 }
 
-// src/chat/usage.ts
-var COMPONENT_USAGE_FIELDS = [
-  "inputTokens",
-  "outputTokens",
-  "cachedInputTokens",
-  "cacheCreationTokens"
-];
-function hasAgentTurnUsage(usage) {
-  return Boolean(
-    usage && Object.values(usage).some(
-      (value) => typeof value === "number" && Number.isFinite(value)
-    )
-  );
-}
-function getFiniteCount(value) {
-  return typeof value === "number" && Number.isFinite(value) ? Math.max(0, Math.floor(value)) : void 0;
-}
-function getComponentTotal(usage) {
-  let total;
-  for (const field of COMPONENT_USAGE_FIELDS) {
-    const value = getFiniteCount(usage[field]);
-    if (value === void 0) continue;
-    total = (total ?? 0) + value;
-  }
-  return total;
-}
-function addAgentTurnUsage(...usages) {
-  const components = {};
-  let componentTotal;
-  let totalOnlyTokens;
-  for (const usage of usages) {
-    if (!usage) continue;
-    const usageComponentTotal = getComponentTotal(usage);
-    if (usageComponentTotal !== void 0) {
-      componentTotal = (componentTotal ?? 0) + usageComponentTotal;
-      for (const field of COMPONENT_USAGE_FIELDS) {
-        const value = getFiniteCount(usage[field]);
-        if (value === void 0) continue;
-        components[field] = (components[field] ?? 0) + value;
-      }
-      continue;
-    }
-    const totalTokens = getFiniteCount(usage.totalTokens);
-    if (totalTokens !== void 0) {
-      totalOnlyTokens = (totalOnlyTokens ?? 0) + totalTokens;
-    }
-  }
-  if (totalOnlyTokens !== void 0) {
-    return {
-      totalTokens: totalOnlyTokens + (componentTotal ?? 0)
-    };
-  }
-  return hasAgentTurnUsage(components) ? components : void 0;
-}
-
 // src/chat/services/persist-retry.ts
 var PERSIST_ATTEMPTS = 3;
 async function persistWithRetry(persist) {
@@ -178,7 +122,7 @@ function logSessionRecordError(error, eventName, args, attributes, message) {
       slackChannelId: args.logContext.channelId,
       runId: args.logContext.runId,
       assistantUserName: args.logContext.assistantUserName,
-      modelId: args.logContext.modelId
+      modelId: args.modelId
     },
     {
       "app.ai.resume_conversation_id": args.conversationId,
@@ -244,7 +188,7 @@ async function persistRunningSessionRecord(args) {
       ...args.trailingMessageProvenance ? { trailingMessageProvenance: args.trailingMessageProvenance } : {},
       ...args.surface ?? latestSessionRecord?.surface ? { surface: args.surface ?? latestSessionRecord?.surface } : {},
       ...args.loadedSkillNames ? { loadedSkillNames: args.loadedSkillNames } : {},
-      ...args.modelId ? { modelId: args.modelId } : {},
+      modelId: args.modelId,
       ...args.reasoningLevel ? { reasoningLevel: args.reasoningLevel } : {},
       ...args.actor ?? latestSessionRecord?.actor ? { actor: args.actor ?? latestSessionRecord?.actor } : {},
       ...getActiveTraceId() ?? latestSessionRecord?.traceId ? { traceId: getActiveTraceId() ?? latestSessionRecord?.traceId } : {},
@@ -280,7 +224,7 @@ async function persistCompletedSessionRecord(args) {
       "Completed session record requires a slice id from the caller or the latest stored record"
     );
   }
-  const modelId = latestSessionRecord?.modelId ?? args.modelId ?? args.logContext.modelId;
+  const modelId = args.modelId;
   const reasoningLevel = args.reasoningLevel ?? latestSessionRecord?.reasoningLevel;
   const target = {
     ...args.channelName ?? latestSessionRecord?.channelName ? { channelName: args.channelName ?? latestSessionRecord?.channelName } : {},
@@ -304,7 +248,7 @@ async function persistCompletedSessionRecord(args) {
     ...args.loadedSkillNames ?? latestSessionRecord?.loadedSkillNames ? {
       loadedSkillNames: args.loadedSkillNames ?? latestSessionRecord?.loadedSkillNames
     } : {},
-    ...modelId ? { modelId } : {},
+    modelId,
     ...reasoningLevel ? { reasoningLevel } : {},
     ...args.actor ?? latestSessionRecord?.actor ? { actor: args.actor ?? latestSessionRecord?.actor } : {},
     ...getActiveTraceId() ?? latestSessionRecord?.traceId ? { traceId: getActiveTraceId() ?? latestSessionRecord?.traceId } : {},
@@ -330,7 +274,7 @@ async function completeDeliveredTurn(args) {
     allMessages: args.messages,
     loadedSkillNames: args.loadedSkillNames,
     logContext: args.logContext,
-    modelId: args.logContext.modelId,
+    modelId: args.modelId,
     actor: args.actor,
     reasoningLevel: args.reasoningLevel,
     surface: args.surface,
@@ -370,7 +314,7 @@ async function persistAuthPauseSessionRecord(args) {
       piMessages,
       ...args.surface ?? latestSessionRecord?.surface ? { surface: args.surface ?? latestSessionRecord?.surface } : {},
       ...args.loadedSkillNames ? { loadedSkillNames: args.loadedSkillNames } : {},
-      ...args.modelId ?? latestSessionRecord?.modelId ? { modelId: args.modelId ?? latestSessionRecord?.modelId } : {},
+      modelId: args.modelId,
       ...args.reasoningLevel ?? latestSessionRecord?.reasoningLevel ? {
         reasoningLevel: args.reasoningLevel ?? latestSessionRecord?.reasoningLevel
       } : {},
@@ -434,7 +378,7 @@ async function persistTimeoutSessionRecord(args) {
         piMessages,
         ...args.surface ?? latestSessionRecord?.surface ? { surface: args.surface ?? latestSessionRecord?.surface } : {},
         ...args.loadedSkillNames ? { loadedSkillNames: args.loadedSkillNames } : {},
-        ...args.modelId ?? latestSessionRecord?.modelId ? { modelId: args.modelId ?? latestSessionRecord?.modelId } : {},
+        modelId: args.modelId,
         ...args.reasoningLevel ?? latestSessionRecord?.reasoningLevel ? {
           reasoningLevel: args.reasoningLevel ?? latestSessionRecord?.reasoningLevel
         } : {},
@@ -458,7 +402,7 @@ async function persistTimeoutSessionRecord(args) {
       piMessages,
       ...args.surface ?? latestSessionRecord?.surface ? { surface: args.surface ?? latestSessionRecord?.surface } : {},
       ...args.loadedSkillNames ? { loadedSkillNames: args.loadedSkillNames } : {},
-      ...args.modelId ?? latestSessionRecord?.modelId ? { modelId: args.modelId ?? latestSessionRecord?.modelId } : {},
+      modelId: args.modelId,
       ...args.reasoningLevel ?? latestSessionRecord?.reasoningLevel ? {
         reasoningLevel: args.reasoningLevel ?? latestSessionRecord?.reasoningLevel
       } : {},
@@ -514,7 +458,7 @@ async function persistYieldSessionRecord(args) {
       piMessages,
       ...args.surface ?? latestSessionRecord?.surface ? { surface: args.surface ?? latestSessionRecord?.surface } : {},
       ...args.loadedSkillNames ? { loadedSkillNames: args.loadedSkillNames } : {},
-      ...args.modelId ?? latestSessionRecord?.modelId ? { modelId: args.modelId ?? latestSessionRecord?.modelId } : {},
+      modelId: args.modelId,
       ...args.reasoningLevel ?? latestSessionRecord?.reasoningLevel ? {
         reasoningLevel: args.reasoningLevel ?? latestSessionRecord?.reasoningLevel
       } : {},
@@ -993,8 +937,6 @@ export {
   markTurnClosed,
   markTurnCompleted,
   markTurnFailed,
-  hasAgentTurnUsage,
-  addAgentTurnUsage,
   persistWithRetry,
   loadTurnSessionRecord,
   persistRunningSessionRecord,