@vellumai/assistant 0.10.3 → 0.10.4-staging.1

package/src/runtime/routes/__tests__/global-search-routes.test.ts

@@ -33,13 +33,12 @@ function makeContact(
     id: "ct_1",
     displayName: "Alice",
     notes: null,
+    role: "contact",
     lastInteraction: null,
     interactionCount: 0,
     createdAt: 1,
     updatedAt: 1,
-    role: "contact",
     contactType: "human",
-    principalId: null,
     userFile: null,
     channels: [],
     ...overrides,

package/src/runtime/routes/__tests__/surface-action-routes.test.ts

@@ -66,8 +66,9 @@ mock.module("../../../contacts/guardian-delivery-reader.js", () => ({
   ) => list.find((g) => g.channelType === channelType && g.status === "active"),
 }));
 
+// Member ACL rides on memberRecord via the member-verdict cache; no local
+// contact here.
 mock.module("../../../contacts/contact-store.js", () => ({
-  findGuardianForChannel: (_channelType: string) => null,
   findContactByAddress: () => null,
 }));
 

package/src/runtime/routes/contact-routes.ts

@@ -78,15 +78,24 @@ function withChannelCompat<T extends { channels: { address: string }[] }>(
   };
 }
 
-/** Compose both response transforms (guardian display name + channel compat). */
+/** Compose both response transforms (guardian display name + channel compat).
+ * Also coerces nullable gateway-sourced fields to their DB defaults so the
+ * response satisfies the strict enum schema even in degraded mode (assistant
+ * DB unreachable → gateway soft-fail join produces nulls).
+ */
 function prepareContactResponse<
   T extends {
     role: string;
     displayName: string;
+    contactType?: string | null;
     channels: { address: string }[];
   },
 >(contact: T): T {
-  return withChannelCompat(withGuardianNameOverride(contact));
+  const coerced =
+    contact.contactType == null
+      ? { ...contact, contactType: "human" as T["contactType"] }
+      : contact;
+  return withChannelCompat(withGuardianNameOverride(coerced));
 }
 
 const VALID_CONTACT_TYPES: readonly ContactType[] = ["human", "assistant"];
@@ -99,6 +108,13 @@ function isContactType(value: string): value is ContactType {
 // Response schemas (drive OpenAPI spec → codegen → typed SDK)
 // ---------------------------------------------------------------------------
 
+// Channel ACL fields (status/policy/verifiedAt/verifiedVia/revokedReason/
+// blockedReason) are gateway-owned and present ONLY on gateway-relayed reads
+// (`contacts_list_rich`/`contacts_get_rich`). Daemon-native filtered reads
+// (search / contactType) omit them, so they are `.optional()`. Contact-level
+// `role` is stored locally (NOT NULL, default "contact") and returned on all
+// paths. INFO telemetry (lastSeenAt/interactionCount/lastInteraction) is
+// locally hydrated on every read path and stays required.
 const contactChannelSchema = z.object({
   id: z.string(),
   contactId: z.string(),
@@ -107,23 +123,23 @@ const contactChannelSchema = z.object({
   isPrimary: z.boolean(),
   /** @deprecated Echoes `address` for backwards compatibility with older macOS clients. */
   externalUserId: z.string().nullable(),
-  status: z.string(),
-  policy: z.string(),
-  verifiedAt: z.number().nullable(),
-  verifiedVia: z.string().nullable(),
+  status: z.string().optional(),
+  policy: z.string().optional(),
+  verifiedAt: z.number().nullable().optional(),
+  verifiedVia: z.string().nullable().optional(),
   lastSeenAt: z.number().nullable(),
   interactionCount: z.number(),
   lastInteraction: z.number().nullable(),
-  revokedReason: z.string().nullable(),
-  blockedReason: z.string().nullable(),
+  revokedReason: z.string().nullable().optional(),
+  blockedReason: z.string().nullable().optional(),
 });
 
 const contactSchema = z.object({
   id: z.string(),
   displayName: z.string(),
-  role: z.string(),
+  role: z.enum(["guardian", "contact"]),
   notes: z.string().nullable().optional(),
-  contactType: z.string().nullable().optional(),
+  contactType: z.enum(["human", "assistant"]),
   lastInteraction: z.number().nullable().optional(),
   interactionCount: z.number(),
   createdAt: z.number(),
@@ -142,10 +158,7 @@ const contactSchema = z.object({
  * a relay failure surfaces as an error rather than reading ACL from the
  * assistant DB.
  */
-async function relayListContacts(
-  limit: number,
-  role: ContactRole | undefined,
-) {
+async function relayListContacts(limit: number, role: ContactRole | undefined) {
   try {
     const result = await ipcCallPersistent("contacts_list_rich", {
       limit,
@@ -188,7 +201,6 @@ export async function handleListContacts(queryParams: Record<string, string>) {
       query,
       channelAddress,
       channelType,
-      role,
       contactType,
       limit,
     });
@@ -206,7 +218,7 @@ export async function handleListContacts(queryParams: Record<string, string>) {
     log.debug(
       "handleListContacts: contactType-filtered read served daemon-native (gateway-native contactType filtering is design-blocked, pending ACL classification)",
     );
-    const contacts = listContacts(limit, role, contactType);
+    const contacts = listContacts(limit, contactType);
     return {
       ok: true,
       contacts: contacts.map(prepareContactResponse),
@@ -254,7 +266,9 @@ export async function handleGetContact(contactId: string) {
 // ~5s fallback plus IPC overhead on both nested hops. (List/revoke keep the default.)
 const INVITE_CREATE_RELAY_TIMEOUT_MS = 30_000;
 
-export async function handleListInvites({ queryParams = {} }: RouteHandlerArgs) {
+export async function handleListInvites({
+  queryParams = {},
+}: RouteHandlerArgs) {
   try {
     const result = (await ipcCallPersistent("invites_list", {
       ...(queryParams.sourceChannel
@@ -294,7 +308,9 @@ export async function handleCreateInvite({ body = {} }: RouteHandlerArgs) {
   }
 }
 
-export async function handleRevokeInvite({ pathParams = {} }: RouteHandlerArgs) {
+export async function handleRevokeInvite({
+  pathParams = {},
+}: RouteHandlerArgs) {
   try {
     const result = (await ipcCallPersistent("invites_revoke", {
       id: pathParams.id,
@@ -312,9 +328,7 @@ export async function handleRevokeInvite({ pathParams = {} }: RouteHandlerArgs)
  * `invites_redeem_voice` method. Wraps the identity-bound
  * `redeemVoiceInviteCode` path.
  */
-export async function handleRedeemVoiceInvite({
-  body = {},
-}: RouteHandlerArgs) {
+export async function handleRedeemVoiceInvite({ body = {} }: RouteHandlerArgs) {
   const callerExternalUserId = body.callerExternalUserId as string | undefined;
   const code = body.code as string | undefined;
 
@@ -348,9 +362,7 @@ export async function handleRedeemVoiceInvite({
  * `invites_redeem_token` method. Wraps the generic `redeemIngressInvite`
  * token path.
  */
-export async function handleRedeemTokenInvite({
-  body = {},
-}: RouteHandlerArgs) {
+export async function handleRedeemTokenInvite({ body = {} }: RouteHandlerArgs) {
   const result = await redeemIngressInvite({
     token: body.token as string | undefined,
     externalUserId: body.externalUserId as string | undefined,
@@ -641,7 +653,10 @@ export const ROUTES: RouteDefinition[] = [
       // No-filter "search" is a list read — relay to the gateway so it returns
       // the same source-of-truth data as `contacts list`.
       if (!hasFilter) {
-        const { contacts } = await relayListContacts(parsed.limit ?? 50, undefined);
+        const { contacts } = await relayListContacts(
+          parsed.limit ?? 50,
+          undefined,
+        );
         return contacts;
       }
 

package/src/runtime/routes/conversation-list-routes.ts

@@ -31,6 +31,7 @@ import {
 import type { ConversationType } from "../../memory/conversation-types.js";
 import { getBindingsForConversations } from "../../memory/external-conversation-store.js";
 import { listGroups } from "../../memory/group-crud.js";
+import { channelBindingSchema } from "../../messaging/channel-binding-schema.js";
 import { UserError } from "../../util/errors.js";
 import { getLogger } from "../../util/logger.js";
 import { ACTOR_PRINCIPALS } from "../auth/route-policy.js";
@@ -86,35 +87,6 @@ const assistantAttentionSchema = z.object({
     .optional(),
 });
 
-const slackThreadSchema = z.object({
-  channelId: z.string(),
-  threadTs: z.string(),
-  link: z
-    .object({
-      appUrl: z.string().optional(),
-      webUrl: z.string().optional(),
-    })
-    .optional(),
-});
-
-const slackChannelSchema = z.object({
-  channelId: z.string(),
-  name: z.string().optional(),
-  link: z.object({ webUrl: z.string() }).optional(),
-});
-
-const channelBindingSchema = z.object({
-  sourceChannel: z.string(),
-  externalChatId: z.string(),
-  externalChatName: z.string().optional(),
-  externalThreadId: z.string().optional(),
-  externalUserId: z.string().nullable(),
-  displayName: z.string().nullable(),
-  username: z.string().nullable(),
-  slackThread: slackThreadSchema.optional(),
-  slackChannel: slackChannelSchema.optional(),
-});
-
 const forkParentSchema = z.object({
   conversationId: z.string(),
   messageId: z.string(),

package/src/runtime/routes/conversation-routes.ts

@@ -90,9 +90,11 @@ import {
   addMessage,
   extractImageSourcePaths,
   getConversation,
+  getConversationPersistedSeq,
   getMessages,
   getMessagesPaginated,
   hasMessages,
+  isConversationProcessing,
   type MessageRow,
   provenanceFromTrustContext,
   setConversationInferenceProfile,
@@ -122,7 +124,6 @@ import {
 } from "../../util/platform.js";
 import { silentlyWithLog } from "../../util/silently.js";
 import { assistantEventHub, broadcastMessage } from "../assistant-event-hub.js";
-import { getPersistedSeq } from "../assistant-stream-state.js";
 import { ACTOR_PRINCIPALS } from "../auth/route-policy.js";
 import {
   type GuardianPendingScope,
@@ -393,6 +394,8 @@ function buildSlackHistoryMessage(
       : {}),
     ...(messageLink ? { messageLink } : {}),
     ...(threadLink ? { threadLink } : {}),
+    ...(slackMeta.eventKind ? { eventKind: slackMeta.eventKind } : {}),
+    ...(slackMeta.reaction ? { reaction: slackMeta.reaction } : {}),
   };
 }
 
@@ -657,6 +660,7 @@ export function handleListMessages({
         oldestTimestamp: null,
         oldestMessageId: null,
         seq: null,
+        processing: false,
       };
     }
     return { messages: [] };
@@ -1006,11 +1010,19 @@ export function handleListMessages({
   });
 
   // Snapshot↔stream alignment token: the `seq` of the last event whose
-  // content is durably persisted for this conversation in the current
-  // daemon process. Returned on every resolved-conversation response so a
-  // client can apply only stream events with a higher `seq`. Null when
-  // nothing has been persisted in-process (cold/aged-out/post-restart).
-  const persistedSeq = getPersistedSeq(resolvedConversationId);
+  // content is durably persisted for this conversation, read from the
+  // `conversations.seq` column. Returned on every resolved-conversation
+  // response so a client can apply only stream events with a higher `seq`.
+  // Null when nothing has been persisted (the conversation was created before
+  // any stream activity, or predates the column) -- the client cold-starts.
+  const persistedSeq = getConversationPersistedSeq(resolvedConversationId);
+
+  // Authoritative "is the agent mid-turn?" signal, sourced from the
+  // `processing_started_at` column (persisted, survives daemon restarts).
+  // Clients use this to distinguish a live turn still in flight from a
+  // turn that silently died — without it, a dropped SSE stream leaves the
+  // UI spinning forever with no way to learn the server is actually idle.
+  const processing = isConversationProcessing(resolvedConversationId);
 
   if (isPaginated) {
     // Prefer the page's oldest visible row (the documented cursor semantic).
@@ -1034,6 +1046,7 @@ export function handleListMessages({
         oldestTimestamp: oldestTimestamp ?? null,
         oldestMessageId: oldestMessageId ?? null,
         seq: persistedSeq,
+        processing,
       };
     }
 
@@ -1043,10 +1056,11 @@ export function handleListMessages({
       ...(oldestTimestamp != null ? { oldestTimestamp } : {}),
       ...(oldestMessageId != null ? { oldestMessageId } : {}),
       seq: persistedSeq,
+      processing,
     };
   }
 
-  return { messages, seq: persistedSeq };
+  return { messages, seq: persistedSeq, processing };
 }
 
 /**
@@ -2688,6 +2702,12 @@ export const ROUTES: RouteDefinition[] = [
         .describe(
           "Global SSE `seq` of the last event whose content is durably persisted for this conversation in the current daemon process. A client can align this snapshot with the `/events` stream by applying only events with `seq` greater than this value. Null when no events have been persisted in this process (cold conversation, after a daemon restart, or when the conversation has aged out of the in-memory map) — clients should cold-start in that case. Absent on older daemons that predate this field.",
         ),
+      processing: z
+        .boolean()
+        .optional()
+        .describe(
+          "Whether the agent is currently mid-turn for this conversation, sourced authoritatively from the persisted `processing_started_at` column. `true` means a turn is in flight; `false` means the conversation is idle. Clients use this to recover from a dropped SSE stream: if a turn appears to be running locally but the server reports `processing: false`, the turn has ended (or died) and the UI should stop waiting rather than spin indefinitely. Absent on older daemons that predate this field.",
+        ),
     }),
     handler: (args) => handleListMessages(args),
   },

package/src/runtime/routes/inbound-stages/acl-enforcement.ts

@@ -9,10 +9,6 @@ import { isInviteCodeRedemptionEnabled } from "../../../channels/config.js";
 import type { ChannelId } from "../../../channels/types.js";
 import { getGuardianDelivery } from "../../../contacts/guardian-delivery-reader.js";
 import { channelStatusToMemberStatus } from "../../../contacts/member-status.js";
-import type {
-  ContactChannel,
-  ContactWithChannels,
-} from "../../../contacts/types.js";
 import { deleteInbound, recordInbound } from "../../../memory/delivery-crud.js";
 import { markProcessed } from "../../../memory/delivery-status.js";
 import {
@@ -96,12 +92,6 @@ export interface AclEnforcementParams {
   effectiveAdmissionPolicy?: AdmissionPolicy;
 }
 
-/** Resolved contact + channel pair from ACL enforcement. */
-export type ResolvedMember = {
-  contact: ContactWithChannels;
-  channel: ContactChannel;
-};
-
 export interface AclResult {
   resolvedMember: VerdictMember | null;
   /** When set, the caller must return this response immediately. */

package/src/runtime/routes/inbound-stages/background-dispatch.ts

@@ -8,7 +8,6 @@
  * focused on orchestration.
  */
 import type { ChannelId, InterfaceId } from "../../../channels/types.js";
-import { findGuardianForChannel } from "../../../contacts/contact-store.js";
 import {
   getGuardianDelivery,
   guardianForChannel,
@@ -964,17 +963,14 @@ function startTrustedContactApprovalNotifier(params: {
 
         if (info && !globalNotifiedApprovalRequestIds.has(info.requestId)) {
           globalNotifiedApprovalRequestIds.set(info.requestId, conversationId);
-          // Gateway-resolved guardian display name with the transitional
-          // local fallback on null/no-match (display-only). Removed in Combo 11.
+          // Gateway-resolved guardian display name (display-only).
           const guardians = await getGuardianDelivery({
             channelTypes: [sourceChannel],
           });
-          const gatewayDisplayName = guardians
-            ? guardianForChannel(guardians, sourceChannel)?.displayName
+          const displayName = guardians
+            ? (guardianForChannel(guardians, sourceChannel)?.displayName ??
+              undefined)
             : undefined;
-          const displayName =
-            gatewayDisplayName ??
-            findGuardianForChannel(sourceChannel)?.contact.displayName;
           const guardianName = resolveGuardianName(displayName);
           const waitingText = `Waiting for ${guardianName}'s approval...`;
           try {

package/src/runtime/routes/inbound-stages/reaction-intercept.ts

@@ -18,6 +18,7 @@
 import type { SourceMetadata } from "@vellumai/gateway-client";
 
 import type { ChannelId, InterfaceId } from "../../../channels/types.js";
+import { getGuardianDeliveryFresh } from "../../../contacts/guardian-delivery-reader.js";
 import { getDiskPressureStatus } from "../../../daemon/disk-pressure-guard.js";
 import { classifyDiskPressureTurnPolicy } from "../../../daemon/disk-pressure-policy.js";
 import { addMessage } from "../../../memory/conversation-crud.js";
@@ -35,6 +36,7 @@ import {
 import { getLogger } from "../../../util/logger.js";
 import { DAEMON_INTERNAL_ASSISTANT_ID } from "../../assistant-scope.js";
 import type { ApprovalConversationGenerator } from "../../http-types.js";
+import { setMemberVerdict } from "../../member-verdict-cache.js";
 import { resolveTrustContext } from "../../trust-context-resolver.js";
 import { handleGuardianReplyIntercept } from "./guardian-reply-intercept.js";
 
@@ -126,6 +128,23 @@ export async function handleSlackReactionIntercept(
     approvalConversationGenerator,
   } = params;
 
+  // Warm the channel-specific guardian-delivery cache before the SYNC trust
+  // resolve below. The sync resolver reads the IO-free cache snapshot; on a
+  // cold process only `vellum` is warmed at startup, so a Slack guardian
+  // reaction would otherwise misclassify as `unknown` and drop. Read fresh:
+  // gateway-side binding writes don't invalidate the daemon cache, so a stale
+  // empty snapshot would otherwise survive the TTL. This await runs in the
+  // already-async intercept, off the sync resolver's hot path.
+  await getGuardianDeliveryFresh({ channelTypes: [sourceChannel] });
+
+  // Reactions carry the gateway-stamped verdict but skip getInboundTrustVerdict,
+  // which warms the member-verdict cache the sync resolver reads. Seed it from
+  // the stamped verdict so an active non-guardian contact's reaction resolves
+  // instead of failing closed to `unknown` on a cold cache.
+  if (sourceMetadata?.trustVerdict) {
+    setMemberVerdict(sourceChannel, rawSenderId, sourceMetadata.trustVerdict);
+  }
+
   // Classify the reactor. No timezone enrichment — reactions never drive an
   // agent turn, so only the trust class / guardian principal matter.
   const trustCtx = resolveTrustContext({

package/src/runtime/routes/settings-routes.ts

@@ -15,6 +15,7 @@ import {
 } from "../../config/env.js";
 import { loadRawConfig, saveRawConfig } from "../../config/loader.js";
 import { loadSkillCatalog } from "../../config/skills.js";
+import { getGuardianDelivery } from "../../contacts/guardian-delivery-reader.js";
 import { findConversation } from "../../daemon/conversation-registry.js";
 import {
   computeGatewayTarget,
@@ -303,8 +304,12 @@ async function handleOAuthConnectStart({ body = {} }: RouteHandlerArgs) {
 // Workspace files (list/read)
 // ---------------------------------------------------------------------------
 
-function getWorkspaceFiles(): string[] {
+async function getWorkspaceFiles(): Promise<string[]> {
   const files = ["IDENTITY.md", "SOUL.md", "skills/"];
+  // Warm the vellum guardian-delivery cache so the sync persona resolution
+  // below hits a fresh key instead of falling back to default.md on a cold or
+  // TTL-expired cache.
+  await getGuardianDelivery({ channelTypes: ["vellum"] });
   const guardianPath = resolveGuardianPersonaPath();
   if (guardianPath) {
     files.push(`users/${basename(guardianPath)}`);
@@ -312,9 +317,9 @@ function getWorkspaceFiles(): string[] {
   return files;
 }
 
-function handleWorkspaceFilesList() {
+async function handleWorkspaceFilesList() {
   const base = getWorkspaceDir();
-  const files = getWorkspaceFiles().map((name) => ({
+  const files = (await getWorkspaceFiles()).map((name) => ({
     path: name,
     name,
     exists: pathExists(join(base, name)),

package/src/runtime/services/conversation-serializer.ts

@@ -8,7 +8,6 @@
  */
 
 import { parseChannelId } from "../../channels/types.js";
-import { getConfig } from "../../config/loader.js";
 import { normalizeConversationType } from "../../daemon/message-types/shared.js";
 import {
   type AttentionState,
@@ -24,10 +23,7 @@ import {
 } from "../../memory/conversation-crud.js";
 import type { ExternalConversationBinding } from "../../memory/external-conversation-store.js";
 import { getBindingsForConversations } from "../../memory/external-conversation-store.js";
-import {
-  buildSlackMessageDeepLinks,
-  buildSlackWebChannelUrl,
-} from "../../messaging/providers/slack/deep-link.js";
+import { buildChannelBindingMetadata } from "../../messaging/channel-binding-metadata.js";
 
 // ---------------------------------------------------------------------------
 // Helpers
@@ -126,48 +122,7 @@ function resolveSerializedGroupId(
 }
 
 function buildChannelBinding(binding: ExternalConversationBinding) {
-  const externalChatName =
-    binding.externalChatName?.trim() ||
-    (binding.sourceChannel === "slack" ? binding.externalChatId : undefined);
-  const slackConfig =
-    binding.sourceChannel === "slack" ? getConfig().slack : undefined;
-  const slackThreadLink =
-    slackConfig && binding.externalThreadId
-      ? buildSlackMessageDeepLinks({
-          teamId: slackConfig.teamId,
-          teamUrl: slackConfig.teamUrl,
-          channelId: binding.externalChatId,
-          messageTs: binding.externalThreadId,
-        })
-      : undefined;
-  const slackThread =
-    binding.sourceChannel === "slack" && binding.externalThreadId
-      ? {
-          channelId: binding.externalChatId,
-          threadTs: binding.externalThreadId,
-          ...(slackThreadLink ? { link: slackThreadLink } : {}),
-        }
-      : undefined;
-  const slackChannelWebUrl = slackConfig
-    ? buildSlackWebChannelUrl({
-        teamUrl: slackConfig.teamUrl,
-        channelId: binding.externalChatId,
-      })
-    : undefined;
-  const slackChannel =
-    binding.sourceChannel === "slack"
-      ? {
-          channelId: binding.externalChatId,
-          name: externalChatName,
-          ...(slackChannelWebUrl
-            ? {
-                link: {
-                  webUrl: slackChannelWebUrl,
-                },
-              }
-            : {}),
-        }
-      : undefined;
+  const externalChatName = binding.externalChatName?.trim() || undefined;
 
   return {
     sourceChannel: binding.sourceChannel,
@@ -179,8 +134,10 @@ function buildChannelBinding(binding: ExternalConversationBinding) {
     externalUserId: binding.externalUserId,
     displayName: binding.displayName,
     username: binding.username,
-    ...(slackThread ? { slackThread } : {}),
-    ...(slackChannel ? { slackChannel } : {}),
+    // Channel-specific enrichment (e.g. Slack deep links) is contributed by
+    // the source channel's binding-metadata builder, keeping this serializer
+    // channel-agnostic.
+    ...buildChannelBindingMetadata(binding),
   };
 }
 

package/src/runtime/slack-block-formatting.ts

@@ -118,21 +118,6 @@ export function textToSlackBlocks(text: string): KnownBlock[] | undefined {
   return blocks.length > 0 ? blocks : undefined;
 }
 
-/**
- * Detect whether a callback URL points to the gateway's Slack delivery endpoint.
- */
-export function isSlackCallbackUrl(callbackUrl: string): boolean {
-  try {
-    const url = new URL(callbackUrl);
-    return (
-      url.pathname === "/deliver/slack" ||
-      url.pathname.startsWith("/deliver/slack?")
-    );
-  } catch {
-    return false;
-  }
-}
-
 // ---------------------------------------------------------------------------
 // Internals
 // ---------------------------------------------------------------------------