@vellumai/assistant 0.4.41 → 0.4.43

package/src/calls/call-domain.ts

@@ -14,14 +14,16 @@ import {
   getTwilioStatusCallbackUrl,
   getTwilioVoiceWebhookUrl,
 } from "../inbound/public-ingress-urls.js";
+import { getConversation } from "../memory/conversation-crud.js";
 import { getOrCreateConversation } from "../memory/conversation-key-store.js";
 import { queueGenerateConversationTitle } from "../memory/conversation-title-service.js";
 import { upsertBinding } from "../memory/external-conversation-store.js";
 import { revokeScopedApprovalGrantsForContext } from "../memory/scoped-approval-grants.js";
 import { DAEMON_INTERNAL_ASSISTANT_ID } from "../runtime/assistant-scope.js";
-import { isGuardian } from "../runtime/channel-guardian-service.js";
+import { isGuardian } from "../runtime/channel-verification-service.js";
 import { getSecureKey } from "../security/secure-keys.js";
 import { getLogger } from "../util/logger.js";
+import { upsertActiveCallLease } from "./active-call-lease.js";
 import { isDeniedNumber } from "./call-constants.js";
 import { addPointerMessage } from "./call-pointer-messages.js";
 import { getCallController, unregisterCallController } from "./call-state.js";
@@ -40,11 +42,27 @@ import { activeRelayConnections } from "./relay-server.js";
 import { getTwilioConfig } from "./twilio-config.js";
 import { TwilioConversationRelayProvider } from "./twilio-provider.js";
 import type { CallSession } from "./types.js";
+import { preflightVoiceIngress } from "./voice-ingress-preflight.js";
 
 const log = getLogger("call-domain");
 
 const E164_REGEX = /^\+\d+$/;
 
+function postFailedCallPointer(
+  conversationId: string,
+  phoneNumber: string,
+  reason: string,
+): void {
+  addPointerMessage(conversationId, "failed", phoneNumber, {
+    reason,
+  }).catch((pointerErr) => {
+    log.warn(
+      { conversationId, err: pointerErr },
+      "Failed to post call-failed pointer message",
+    );
+  });
+}
+
 // ── Result types ─────────────────────────────────────────────────────
 
 export interface StartCallResult {
@@ -280,7 +298,7 @@ export function createInboundVoiceSession(
 
   upsertBinding({
     conversationId: voiceConversationId,
-    sourceChannel: "voice",
+    sourceChannel: "phone",
     externalChatId: callSid,
   });
 
@@ -294,7 +312,7 @@ export function createInboundVoiceSession(
   updateCallSession(session.id, { providerCallSid: callSid });
   session.providerCallSid = callSid;
 
-  const callerIsGuardian = isGuardian(assistantId, "voice", fromNumber);
+  const callerIsGuardian = isGuardian(assistantId, "phone", fromNumber);
   const metadataHints: string[] = [
     callerIsGuardian
       ? "Caller is the guardian"
@@ -312,7 +330,7 @@ export function createInboundVoiceSession(
     conversationId: voiceConversationId,
     context: {
       origin: "voice_inbound",
-      sourceChannel: "voice",
+      sourceChannel: "phone",
       assistantId,
       systemHint: `Inbound call from ${fromNumber}`,
       metadataHints,
@@ -387,12 +405,11 @@ export async function startCall(
   let sessionId: string | null = null;
 
   try {
-    const ingressConfig = loadConfig();
-    const provider = new TwilioConversationRelayProvider();
+    const config = loadConfig();
 
     // Resolve which phone number to use as caller ID
     const identityResult = await resolveCallerIdentity(
-      ingressConfig,
+      config,
       callerIdentityMode,
     );
     if (!identityResult.ok) {
@@ -400,6 +417,23 @@ export async function startCall(
     }
     const fromNumber = identityResult.fromNumber;
 
+    if (!getConversation(conversationId)) {
+      return {
+        ok: false,
+        error: `Invalid conversationId: no conversation found with ID ${conversationId}`,
+        status: 400,
+      };
+    }
+
+    const preflightResult = await preflightVoiceIngress();
+    if (!preflightResult.ok) {
+      postFailedCallPointer(conversationId, phoneNumber, preflightResult.error);
+      return preflightResult;
+    }
+
+    const ingressConfig = preflightResult.ingressConfig;
+    const provider = new TwilioConversationRelayProvider();
+
     const session = createCallSession({
       conversationId,
       provider: "twilio",
@@ -423,7 +457,7 @@ export async function startCall(
 
     upsertBinding({
       conversationId: voiceConversationId,
-      sourceChannel: "voice",
+      sourceChannel: "phone",
       externalChatId: session.id,
     });
 
@@ -438,7 +472,7 @@ export async function startCall(
       conversationId: voiceConversationId,
       context: {
         origin: "voice_outbound",
-        sourceChannel: "voice",
+        sourceChannel: "phone",
         assistantId,
         systemHint: `Outbound call to ${phoneNumber}`,
         triggerTextSnippet: task,
@@ -478,6 +512,8 @@ export async function startCall(
       "twilio_status",
     );
 
+    upsertActiveCallLease({ callSessionId: session.id });
+
     const { callSid } = await provider.initiateCall({
       from: fromNumber,
       to: phoneNumber,
@@ -531,15 +567,7 @@ export async function startCall(
       });
     }
 
-    // Post a failure pointer message in the initiating conversation
-    addPointerMessage(conversationId, "failed", phoneNumber, {
-      reason: msg,
-    }).catch((pointerErr) => {
-      log.warn(
-        { conversationId, err: pointerErr },
-        "Failed to post call-failed pointer message",
-      );
-    });
+    postFailedCallPointer(conversationId, phoneNumber, msg);
 
     return { ok: false, error: `Error initiating call: ${msg}`, status: 500 };
   }
@@ -857,17 +885,17 @@ export async function relayInstruction(
   return { ok: true };
 }
 
-// ── Guardian verification call ───────────────────────────────────────
+// ── Verification call ─────────────────────────────────────────────────
 
-export type StartGuardianVerificationCallInput = {
+export type StartVerificationCallInput = {
   phoneNumber: string;
-  guardianVerificationSessionId: string;
+  verificationSessionId: string;
   assistantId?: string;
   /** Origin conversation ID so completion/failure pointers can route back. */
   originConversationId?: string;
 };
 
-export type StartGuardianVerificationCallResult =
+export type StartVerificationCallResult =
   | { ok: true; callSessionId: string; callSid: string }
   | CallError;
 
@@ -875,14 +903,13 @@ export type StartGuardianVerificationCallResult =
  * Initiate an outbound call to the guardian's phone for verification.
  *
  * Creates a minimal call session with a voice channel binding and
- * passes `guardianVerificationSessionId` as a custom parameter so the
+ * passes `verificationSessionId` as a custom parameter so the
  * relay server can detect this is a guardian verification call.
  */
-export async function startGuardianVerificationCall(
-  input: StartGuardianVerificationCallInput,
-): Promise<StartGuardianVerificationCallResult> {
-  const { phoneNumber, guardianVerificationSessionId, originConversationId } =
-    input;
+export async function startVerificationCall(
+  input: StartVerificationCallInput,
+): Promise<StartVerificationCallResult> {
+  const { phoneNumber, verificationSessionId, originConversationId } = input;
 
   if (!phoneNumber || !E164_REGEX.test(phoneNumber)) {
     return {
@@ -904,16 +931,22 @@ export async function startGuardianVerificationCall(
       return { ok: false, error: identityResult.error, status: 400 };
     }
 
+    const preflightResult = await preflightVoiceIngress();
+    if (!preflightResult.ok) {
+      return preflightResult;
+    }
+    const ingressConfig = preflightResult.ingressConfig;
+
     // Create a minimal conversation so the call session has a valid FK,
     // and bind it to the voice channel so it never appears as an unbound
     // desktop thread.
-    const convKey = `guardian-verify:${guardianVerificationSessionId}`;
+    const convKey = `guardian-verify:${verificationSessionId}`;
     const { conversationId } = getOrCreateConversation(convKey);
 
     upsertBinding({
       conversationId,
-      sourceChannel: "voice",
-      externalChatId: `guardian-verify:${guardianVerificationSessionId}`,
+      sourceChannel: "phone",
+      externalChatId: `guardian-verify:${verificationSessionId}`,
     });
 
     const session = createCallSession({
@@ -921,31 +954,33 @@ export async function startGuardianVerificationCall(
       provider: "twilio",
       fromNumber: identityResult.fromNumber,
       toNumber: phoneNumber,
-      callMode: "guardian_verification",
-      guardianVerificationSessionId,
+      callMode: "verification",
+      verificationSessionId,
       initiatedFromConversationId: originConversationId,
     });
     sessionId = session.id;
 
     const webhookUrl = await resolveCallbackUrl(
-      () => getTwilioVoiceWebhookUrl(config, session.id),
+      () => getTwilioVoiceWebhookUrl(ingressConfig, session.id),
       "webhooks/twilio/voice",
       "twilio_voice",
       { callSessionId: session.id },
     );
     const statusCallbackUrl = await resolveCallbackUrl(
-      () => getTwilioStatusCallbackUrl(config),
+      () => getTwilioStatusCallbackUrl(ingressConfig),
       "webhooks/twilio/status",
       "twilio_status",
     );
 
+    upsertActiveCallLease({ callSessionId: session.id });
+
     const { callSid } = await provider.initiateCall({
       from: identityResult.fromNumber,
       to: phoneNumber,
       webhookUrl,
       statusCallbackUrl,
       customParams: {
-        guardianVerificationSessionId,
+        verificationSessionId,
       },
     });
 
@@ -955,7 +990,7 @@ export async function startGuardianVerificationCall(
       {
         callSessionId: session.id,
         callSid,
-        guardianVerificationSessionId,
+        verificationSessionId,
         to: phoneNumber,
       },
       "Guardian verification call initiated",
@@ -965,7 +1000,7 @@ export async function startGuardianVerificationCall(
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
     log.error(
-      { err, phoneNumber, guardianVerificationSessionId },
+      { err, phoneNumber, verificationSessionId },
       "Failed to initiate guardian verification call",
     );
 

package/src/calls/call-pointer-message-composer.ts

@@ -14,8 +14,8 @@ export type CallPointerMessageScenario =
   | "started"
   | "completed"
   | "failed"
-  | "guardian_verification_succeeded"
-  | "guardian_verification_failed";
+  | "verification_succeeded"
+  | "verification_failed";
 
 export interface CallPointerMessageContext {
   scenario: CallPointerMessageScenario;
@@ -83,12 +83,12 @@ export function getPointerFallbackMessage(
       return context.reason
         ? `\u{1F4DE} Call to ${context.phoneNumber} failed: ${context.reason}.`
         : `\u{1F4DE} Call to ${context.phoneNumber} failed.`;
-    case "guardian_verification_succeeded": {
-      const ch = context.channel ?? "voice";
+    case "verification_succeeded": {
+      const ch = context.channel ?? "phone";
       return `\u{2705} Guardian verification (${ch}) for ${context.phoneNumber} succeeded.`;
     }
-    case "guardian_verification_failed": {
-      const ch = context.channel ?? "voice";
+    case "verification_failed": {
+      const ch = context.channel ?? "phone";
       return context.reason
         ? `\u{274C} Guardian verification (${ch}) for ${context.phoneNumber} failed: ${context.reason}.`
         : `\u{274C} Guardian verification (${ch}) for ${context.phoneNumber} failed.`;

package/src/calls/call-pointer-messages.ts

@@ -9,7 +9,12 @@
  * written directly to the conversation store.
  */
 
-import * as conversationStore from "../memory/conversation-store.js";
+import {
+  addMessage,
+  getConversationOriginChannel,
+  getConversationRecentProvenanceTrustClass,
+  getConversationThreadType,
+} from "../memory/conversation-crud.js";
 import { getLogger } from "../util/logger.js";
 import {
   buildPointerInstruction,
@@ -23,8 +28,8 @@ export type PointerEvent =
   | "started"
   | "completed"
   | "failed"
-  | "guardian_verification_succeeded"
-  | "guardian_verification_failed";
+  | "verification_succeeded"
+  | "verification_failed";
 
 export type PointerAudienceMode = "auto" | "trusted" | "untrusted";
 
@@ -86,18 +91,14 @@ function resolvePointerAudienceTrust(conversationId: string): boolean {
     // trusted contacts who initiate calls from gateway channels (e.g. WhatsApp)
     // where the conversation itself isn't a desktop-origin private thread.
     const provenance =
-      conversationStore.getConversationRecentProvenanceTrustClass(
-        conversationId,
-      );
+      getConversationRecentProvenanceTrustClass(conversationId);
     if (provenance === "guardian" || provenance === "trusted_contact")
       return true;
 
-    const threadType =
-      conversationStore.getConversationThreadType(conversationId);
+    const threadType = getConversationThreadType(conversationId);
     if (threadType === "private") return true;
 
-    const originChannel =
-      conversationStore.getConversationOriginChannel(conversationId);
+    const originChannel = getConversationOriginChannel(conversationId);
     if (originChannel === "vellum") return true;
   } catch {
     // Conversation may not exist or DB may be unavailable — default untrusted.
@@ -145,8 +146,8 @@ export async function addPointerMessage(
     started: "started",
     completed: "completed",
     failed: "failed",
-    guardian_verification_succeeded: "succeeded",
-    guardian_verification_failed: "failed",
+    verification_succeeded: "succeeded",
+    verification_failed: "failed",
   };
   const outcomeKeyword = eventOutcomeKeywords[event];
   if (outcomeKeyword) requiredFacts.push(outcomeKeyword);
@@ -185,7 +186,7 @@ export async function addPointerMessage(
   // desktop thread. Do not set userMessageChannel — doing so would mark the
   // conversation's origin channel as voice, causing it to leak into the
   // desktop thread list as a channel-bound session.
-  await conversationStore.addMessage(
+  await addMessage(
     conversationId,
     "assistant",
     JSON.stringify([{ type: "text", text }]),

package/src/calls/call-recovery.ts

@@ -8,6 +8,7 @@
  */
 
 import { getLogger } from "../util/logger.js";
+import { reconcileActiveCallLeases } from "./active-call-lease.js";
 import { isTerminalState } from "./call-state-machine.js";
 import {
   expirePendingQuestions,
@@ -80,6 +81,7 @@ export async function reconcileCallsOnStartup(
   log: Logger = defaultLog,
 ): Promise<void> {
   const recoverableCalls = listRecoverableCalls();
+  reconcileActiveCallLeases(recoverableCalls);
 
   if (recoverableCalls.length === 0) {
     log.info("No recoverable calls found at startup");

package/src/calls/call-store.ts

@@ -9,6 +9,7 @@ import {
 } from "../memory/schema.js";
 import { getLogger } from "../util/logger.js";
 import { cast, createRowMapper } from "../util/row-mapper.js";
+import { syncActiveCallLeaseFromSession } from "./active-call-lease.js";
 import { validateTransition } from "./call-state-machine.js";
 import type {
   CallEvent,
@@ -35,7 +36,7 @@ const parseCallSession = createRowMapper<
   task: "task",
   status: { from: "status", transform: cast<CallSession["status"]>() },
   callMode: { from: "callMode", transform: cast<CallSession["callMode"]>() },
-  guardianVerificationSessionId: "guardianVerificationSessionId",
+  verificationSessionId: "verificationSessionId",
   callerIdentityMode: "callerIdentityMode",
   callerIdentitySource: "callerIdentitySource",
   initiatedFromConversationId: "initiatedFromConversationId",
@@ -79,7 +80,7 @@ export function createCallSession(opts: {
   toNumber: string;
   task?: string;
   callMode?: string;
-  guardianVerificationSessionId?: string;
+  verificationSessionId?: string;
   callerIdentityMode?: string;
   callerIdentitySource?: string;
   initiatedFromConversationId?: string;
@@ -96,7 +97,7 @@ export function createCallSession(opts: {
     task: opts.task ?? null,
     status: "initiated" as const,
     callMode: (opts.callMode ?? null) as CallSession["callMode"],
-    guardianVerificationSessionId: opts.guardianVerificationSessionId ?? null,
+    verificationSessionId: opts.verificationSessionId ?? null,
     callerIdentityMode: opts.callerIdentityMode ?? null,
     callerIdentitySource: opts.callerIdentitySource ?? null,
     initiatedFromConversationId: opts.initiatedFromConversationId ?? null,
@@ -168,8 +169,12 @@ export function updateCallSession(
       | "initiatedFromConversationId"
     >
   >,
+  opts?: { beforeLeaseSync?: () => void },
 ): void {
   const db = getDb();
+  const shouldSyncActiveLease =
+    Object.prototype.hasOwnProperty.call(updates, "providerCallSid") ||
+    Object.prototype.hasOwnProperty.call(updates, "status");
 
   // Validate status transition when a new status is provided
   if (updates.status) {
@@ -198,6 +203,19 @@ export function updateCallSession(
     .set({ ...updates, updatedAt: Date.now() })
     .where(eq(callSessions.id, id))
     .run();
+
+  opts?.beforeLeaseSync?.();
+
+  if (shouldSyncActiveLease) {
+    try {
+      syncActiveCallLeaseFromSession(getCallSession(id));
+    } catch (err) {
+      log.warn(
+        { callSessionId: id, err },
+        "Failed to sync active call lease from session update",
+      );
+    }
+  }
 }
 
 // ── Recovery queries ─────────────────────────────────────────────────
@@ -380,31 +398,6 @@ export function recordProcessedCallback(
   );
 }
 
-/**
- * Try to record a processed callback. Returns true if this is a new callback
- * (inserted successfully). Returns false if the callback was already processed
- * (dedupe key already exists), indicating a replay.
- *
- * Uses INSERT ... ON CONFLICT DO NOTHING pattern for atomicity.
- *
- * @deprecated Use claimCallback + releaseCallbackClaim instead to
- * atomically claim a callback and release on failure.
- */
-export function tryRecordProcessedCallback(
-  dedupeKey: string,
-  callSessionId: string,
-): boolean {
-  return (
-    rawRun(
-      `INSERT OR IGNORE INTO processed_callbacks (id, dedupe_key, call_session_id, created_at) VALUES (?, ?, ?, ?)`,
-      uuid(),
-      dedupeKey,
-      callSessionId,
-      Date.now(),
-    ) > 0
-  );
-}
-
 /**
  * Atomically claim a callback for processing. Returns a unique claim ID
  * (string) if this caller won the claim, or null if another caller already

package/src/calls/guardian-action-sweep.ts

@@ -5,11 +5,11 @@
  * timestamp:
  * 1. Expires the request and all its deliveries in the store
  * 2. Expires the associated pending question so the call-side timeout fires
- * 3. Sends expiry notices to external delivery destinations (telegram, sms)
+ * 3. Sends expiry notices to external delivery destinations (telegram)
  * 4. Adds an expiry message to mac guardian thread conversations
  */
 
-import { addMessage } from "../memory/conversation-store.js";
+import { addMessage } from "../memory/conversation-crud.js";
 import {
   expireGuardianActionRequest,
   getDeliveriesByRequestId,
@@ -32,7 +32,7 @@ let sweepInProgress = false;
 /**
  * Send expiry notices to all delivery destinations for a guardian action
  * request. Handles both vellum/mac thread messages and external channel
- * replies (telegram, sms).
+ * replies (telegram, slack).
  *
  * Deliveries must be captured *before* their status is changed to 'expired'
  * so the sent/pending filter still matches.
@@ -67,9 +67,7 @@ export async function sendGuardianExpiryNotices(
       );
 
       if (
-        (delivery.destinationChannel === "vellum" ||
-          delivery.destinationChannel === "macos" ||
-          delivery.destinationChannel === "mac") &&
+        delivery.destinationChannel === "vellum" &&
         delivery.destinationConversationId
       ) {
         // Add expiry message to vellum guardian thread.
@@ -78,9 +76,9 @@ export async function sendGuardianExpiryNotices(
           "assistant",
           JSON.stringify([{ type: "text", text: expiryText }]),
           {
-            userMessageChannel: "voice",
+            userMessageChannel: "phone",
             assistantMessageChannel: "vellum",
-            userMessageInterface: "voice",
+            userMessageInterface: "phone",
             assistantMessageInterface: "vellum",
           },
         );

package/src/calls/guardian-dispatch.ts

@@ -136,7 +136,7 @@ async function dispatchGuardianQuestionInner(
     const request = createCanonicalGuardianRequest({
       kind: "pending_question",
       sourceType: "voice",
-      sourceChannel: "voice",
+      sourceChannel: "phone",
       conversationId,
       callSessionId,
       pendingQuestionId: pendingQuestion.id,
@@ -203,7 +203,7 @@ async function dispatchGuardianQuestionInner(
       request.requestCode ?? request.id.slice(0, 6).toUpperCase();
     const signalResult = await emitNotificationSignal({
       sourceEventName: "guardian.question",
-      sourceChannel: "voice",
+      sourceChannel: "phone",
       sourceSessionId: callSessionId,
       attentionHints: {
         requiresAction: true,
@@ -249,10 +249,6 @@ async function dispatchGuardianQuestionInner(
         continue;
       }
 
-      if (result.channel !== "telegram" && result.channel !== "sms") {
-        continue;
-      }
-
       const delivery = createCanonicalGuardianDelivery({
         requestId: request.id,
         destinationChannel: result.channel,

package/src/calls/relay-access-wait.ts

@@ -251,7 +251,7 @@ export function emitAccessRequestCallbackHandoff(
   if (fromNumber) {
     try {
       const contactResult = findContactChannel({
-        channelType: "voice",
+        channelType: "phone",
         externalUserId: fromNumber,
         externalChatId: fromNumber,
       });
@@ -277,7 +277,7 @@ export function emitAccessRequestCallbackHandoff(
 
   void emitNotificationSignal({
     sourceEventName: "ingress.access_request.callback_handoff",
-    sourceChannel: "voice",
+    sourceChannel: "phone",
     sourceSessionId,
     attentionHints: {
       requiresAction: false,
@@ -289,7 +289,7 @@ export function emitAccessRequestCallbackHandoff(
       requestId: params.accessRequestId,
       requestCode: canonicalRequest?.requestCode ?? null,
       callSessionId: params.callSessionId,
-      sourceChannel: "voice",
+      sourceChannel: "phone",
       reason: params.reason,
       callbackOptIn: true,
       callerPhoneNumber: fromNumber,
@@ -297,7 +297,7 @@ export function emitAccessRequestCallbackHandoff(
       requesterExternalUserId: fromNumber,
       requesterChatId: fromNumber,
       requesterMemberId,
-      requesterMemberSourceChannel: requesterMemberId ? "voice" : null,
+      requesterMemberSourceChannel: requesterMemberId ? "phone" : null,
     },
     dedupeKey,
   })