@vellumai/assistant 0.10.12 → 0.11.0-staging.2

package/src/daemon/handlers/config-channels.ts

@@ -30,7 +30,6 @@ import type { ContactChannel } from "../../contacts/types.js";
 import { ipcCallPersistent } from "../../ipc/gateway-client.js";
 import { getBindingByChannelChat } from "../../persistence/external-conversation-store.js";
 import { resolveGuardianName } from "../../prompts/user-reference.js";
-import { broadcastMessage } from "../../runtime/assistant-event-hub.js";
 import { DAEMON_INTERNAL_ASSISTANT_ID } from "../../runtime/assistant-scope.js";
 import {
   type ChannelReadinessService,
@@ -42,14 +41,11 @@ import {
 } from "../../runtime/channel-verification-service.js";
 import {
   cancelOutbound,
-  deliverVerificationEmail,
   deliverVerificationSlack,
   deliverVerificationTelegram,
   DESTINATION_RATE_WINDOW_MS,
   MAX_SENDS_PER_DESTINATION_WINDOW,
   normalizeTelegramDestination,
-  resendOutbound,
-  startOutbound,
 } from "../../runtime/verification-outbound-actions.js";
 import {
   composeVerificationSlack,
@@ -58,18 +54,48 @@ import {
 } from "../../runtime/verification-templates.js";
 import { getTelegramBotUsername } from "../../telegram/bot-username.js";
 import { normalizePhoneNumber } from "../../util/phone.js";
-import type {
-  ChannelVerificationSessionRequest,
-  ChannelVerificationSessionResponse,
-} from "../message-protocol.js";
 import { log } from "./shared.js";
 
-// -- Transport-agnostic result type (omits the `type` discriminant) --
-
-export type ChannelVerificationSessionResult = Omit<
-  ChannelVerificationSessionResponse,
-  "type"
->;
+// -- Channel verification result --
+//
+// The shape returned by the verification service functions and served by the
+// HTTP channel-verification routes.
+
+export interface ChannelVerificationSessionResult {
+  success: boolean;
+  secret?: string;
+  instruction?: string;
+  /** Present when action is 'status'. */
+  bound?: boolean;
+  guardianExternalUserId?: string;
+  /** The channel this status pertains to (e.g. "telegram", "phone"). Present when action is 'status'. */
+  channel?: ChannelId;
+  /** The assistant ID scoped to this status. Present when action is 'status'. */
+  assistantId?: string;
+  /** The delivery chat ID for the guardian (e.g. Telegram chat ID). Present when action is 'status' and bound is true. */
+  guardianDeliveryChatId?: string;
+  /** Optional channel username/handle for the bound guardian (for UI display). */
+  guardianUsername?: string;
+  /** Optional display name for the bound guardian (for UI display). */
+  guardianDisplayName?: string;
+  /** Whether a pending verification challenge exists for this (assistantId, channel). Used by relay setup to detect active voice verification sessions. */
+  hasPendingChallenge?: boolean;
+  error?: string;
+  /** Human-readable error detail (e.g. for already_bound failures). */
+  message?: string;
+  /** Conversation ID for outbound verification flows. */
+  verificationSessionId?: string;
+  /** Epoch ms when the verification session expires. */
+  expiresAt?: number;
+  /** Epoch ms after which a resend is allowed. */
+  nextResendAt?: number;
+  /** Number of sends for this session. */
+  sendCount?: number;
+  /** Telegram deep-link URL for bootstrap (M3 placeholder). */
+  telegramBootstrapUrl?: string;
+  /** True when the outbound session is still in pending_bootstrap state (Telegram handle flow). Prevents the client from clearing the bootstrap URL during status polling. */
+  pendingBootstrap?: boolean;
+}
 
 // ---------------------------------------------------------------------------
 // Readiness service singleton
@@ -570,123 +596,3 @@ export async function verifyTrustedContact(
     error: `Verification is not supported for channel type "${channel.type}"`,
   };
 }
-
-// ---------------------------------------------------------------------------
-// Channel verification session handler
-// ---------------------------------------------------------------------------
-
-export async function handleChannelVerificationSession(
-  msg: ChannelVerificationSessionRequest,
-): Promise<void> {
-  const channel = msg.channel ?? "telegram";
-
-  try {
-    if (msg.action === "create_session") {
-      if (msg.purpose === "trusted_contact" && !msg.contactChannelId) {
-        broadcastMessage({
-          type: "channel_verification_session_response",
-          success: false,
-          error: "contactChannelId is required for trusted_contact purpose",
-          channel,
-        });
-      } else if (msg.purpose === "trusted_contact") {
-        const result = await verifyTrustedContact(
-          msg.contactChannelId!,
-          DAEMON_INTERNAL_ASSISTANT_ID,
-        );
-        broadcastMessage({
-          type: "channel_verification_session_response",
-          ...result,
-        });
-      } else if (msg.destination) {
-        const result = await startOutbound({
-          channel,
-          destination: msg.destination,
-          rebind: msg.rebind,
-          originConversationId: msg.originConversationId,
-        });
-        if (result._pendingSlackDm) {
-          const { userId, text, assistantId: aid } = result._pendingSlackDm;
-          deliverVerificationSlack(userId, text, aid);
-        }
-        if (result._pendingEmail) {
-          const { to, text, subject, assistantId: aid } = result._pendingEmail;
-          deliverVerificationEmail(to, text, subject, aid);
-        }
-        const {
-          _pendingSlackDm: _,
-          _pendingEmail: __,
-          ...publicResult
-        } = result;
-        broadcastMessage({
-          type: "channel_verification_session_response",
-          ...publicResult,
-        });
-      } else {
-        const result = await createInboundChallenge(
-          channel,
-          msg.rebind,
-          msg.conversationId,
-        );
-        broadcastMessage({
-          type: "channel_verification_session_response",
-          ...result,
-        });
-      }
-    } else if (msg.action === "status") {
-      const result = await getVerificationStatus(channel);
-      broadcastMessage({
-        type: "channel_verification_session_response",
-        ...result,
-      });
-    } else if (msg.action === "cancel_session") {
-      await cancelOutbound({ channel });
-      await revokePendingSessions(channel);
-      broadcastMessage({
-        type: "channel_verification_session_response",
-        success: true,
-        channel,
-      });
-    } else if (msg.action === "revoke") {
-      const result = await revokeVerificationForChannel(channel);
-      broadcastMessage({
-        type: "channel_verification_session_response",
-        ...result,
-      });
-    } else if (msg.action === "resend_session") {
-      const result = await resendOutbound({
-        channel,
-        originConversationId: msg.originConversationId,
-      });
-      if (result._pendingSlackDm) {
-        const { userId, text, assistantId: aid } = result._pendingSlackDm;
-        deliverVerificationSlack(userId, text, aid);
-      }
-      if (result._pendingEmail) {
-        const { to, text, subject, assistantId: aid } = result._pendingEmail;
-        deliverVerificationEmail(to, text, subject, aid);
-      }
-      const { _pendingSlackDm: _, _pendingEmail: __, ...publicResult } = result;
-      broadcastMessage({
-        type: "channel_verification_session_response",
-        ...publicResult,
-      });
-    } else {
-      broadcastMessage({
-        type: "channel_verification_session_response",
-        success: false,
-        error: `Unknown action: ${String(msg.action)}`,
-        channel,
-      });
-    }
-  } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
-    log.error({ err }, "Failed to handle channel verification session");
-    broadcastMessage({
-      type: "channel_verification_session_response",
-      success: false,
-      error: message,
-      channel,
-    });
-  }
-}

package/src/daemon/handlers/config-model.ts

@@ -98,13 +98,21 @@ export function setImageGenModel(modelId: string, ctx: ModelSetContext): void {
   // Keep the derived provider in sync with the selected model so downstream
   // routing never sends a Gemini request to an OpenAI model (or vice versa).
   // The prefix logic is shared with workspace migration 006-services-config
-  // via providerForImageModelPrefix().
-  setServiceField(
-    raw,
-    "image-generation",
-    "provider",
-    providerForImageModelPrefix(modelId),
-  );
+  // via providerForImageModelPrefix(). Provider "vellum" is exempt: it is
+  // managed for every model (the backend derives from the model at request
+  // time), and rewriting it here would silently move a managed user onto a
+  // BYOK provider they may hold no key for.
+  const services = raw.services as
+    | Record<string, { provider?: string }>
+    | undefined;
+  if (services?.["image-generation"]?.provider !== "vellum") {
+    setServiceField(
+      raw,
+      "image-generation",
+      "provider",
+      providerForImageModelPrefix(modelId),
+    );
+  }
 
   const wasSuppressed = ctx.suppressConfigReload;
   ctx.setSuppressConfigReload(true);

package/src/daemon/handlers/conversations.ts

@@ -103,10 +103,12 @@ export function cancelGeneration(conversationId: string): boolean {
   conversation.abort(
     createAbortReason("user_cancel", "cancelGeneration", conversationId),
   );
-  // Also abort any child subagents spawned by this conversation.
+  // Also abort any in-flight child subagents spawned by this conversation.
   // Omit sendToClient to suppress parent notifications — the parent is
   // being cancelled, so enqueuing synthetic messages would trigger
-  // unwanted model activity after the user pressed stop.
+  // unwanted model activity after the user pressed stop. Terminal children
+  // stay readable: the conversation survives the stop, and its next turn may
+  // still `subagent_read` a completed child's result.
   getSubagentManager().abortAllForParent(conversationId);
   // Cancel any in-flight ACP agent sessions this conversation spawned, for the
   // same reason: a backgrounded ACP prompt would otherwise keep running (and

package/src/daemon/handlers/shared.ts

@@ -98,6 +98,26 @@ export interface RenderedHistoryContent {
   contentBlocks: ConversationContentBlock[];
 }
 
+/**
+ * One entry from Slack's `app_context` — an object the sender had open in
+ * Slack when they sent the message. `value` is an id string for the channel /
+ * canvas / list entity types and an object for `slack#/types/message_context`,
+ * which points at a specific message. Mirrors `sourceMetadata.appContext` on
+ * the gateway inbound contract; the values arrive unvalidated, so every
+ * consumer shape-checks before use.
+ */
+export interface SlackAppContextEntity {
+  type: string;
+  value: string | { messageTs?: string; channelId?: string };
+  teamId?: string;
+  enterpriseId?: string;
+}
+
+/** The sender's active Slack context for a single inbound message. */
+export interface SlackAppContext {
+  entities: SlackAppContextEntity[];
+}
+
 /**
  * Slack-specific metadata extracted at the inbound HTTP boundary and threaded
  * through to user-message persistence so the row can be tagged with a
@@ -130,6 +150,15 @@ export interface SlackInboundMessageMetadata {
   timestampTimezoneLabel?: string;
   /** Compact timezone label appended to the rendered speaker name. */
   speakerTimezoneLabel?: string;
+  /**
+   * What the sender had open in Slack when they sent this message. Carried
+   * here so it lands on the stored ingress payload alongside the rest of
+   * `slackInbound`, letting the retry sweep render a replayed turn with the
+   * same context the live turn saw. Not projected into `slackMeta`: the
+   * context is baked into the message content at ingress, so the transcript
+   * renderer already has it.
+   */
+  appContext?: SlackAppContext;
 }
 
 /**

package/src/daemon/host-proxy-base.ts

@@ -15,6 +15,7 @@
  */
 import { v4 as uuid } from "uuid";
 
+import type { AssistantEvent } from "../api/index.js";
 import type { HostProxyCapability } from "../channels/types.js";
 import {
   assistantEventHub,
@@ -24,23 +25,22 @@ import type { PendingInteraction } from "../runtime/pending-interactions.js";
 import * as pendingInteractions from "../runtime/pending-interactions.js";
 import { AssistantError, ErrorCode } from "../util/errors.js";
 import { getLogger } from "../util/logger.js";
-import type { ServerMessage } from "./message-protocol.js";
 
 const log = getLogger("host-proxy-base");
 
 /**
  * `broadcastMessage` is statically typed against the discriminated
- * `ServerMessage` union. The base class assembles envelopes from
+ * `AssistantEvent` union. The base class assembles envelopes from
  * constructor-supplied event names and untyped extra fields, so static
  * narrowing is impossible — subclasses are responsible for passing event
- * names that match a real `ServerMessage` variant.
+ * names that match a real `AssistantEvent` variant.
  */
 function broadcastDynamic(
   envelope: Record<string, unknown>,
   targetClientId?: string,
 ): void {
   broadcastMessage(
-    envelope as unknown as ServerMessage,
+    envelope as unknown as AssistantEvent,
     undefined,
     targetClientId ? { targetClientId } : undefined,
   );

package/src/daemon/lifecycle.ts

@@ -27,6 +27,7 @@ import { getDb } from "../persistence/db-connection.js";
 import { initializeDb } from "../persistence/db-init.js";
 import { startEmbeddingRuntimeManager } from "../persistence/embeddings/embedding-backend.js";
 import { maybeEnqueueLexicalBackfillOnUpgrade } from "../persistence/job-handlers/message-lexical-backfill.js";
+import { clearLifecycleQuiesce } from "../persistence/lifecycle-quiesce.js";
 import { startConsentRefresh } from "../platform/consent-cache.js";
 import { syncWorkspaceIdentityToPlatform } from "../platform/sync-identity.js";
 import { ensurePromptFiles } from "../prompts/system-prompt.js";
@@ -45,6 +46,7 @@ import {
 } from "../runtime/http-server.js";
 import { warmLocalGuardianPrincipalCache } from "../runtime/local-actor-identity.js";
 import { recoverInterruptedImport } from "../runtime/migrations/vbundle-streaming-importer.js";
+import { markCurrentProcessAsMainDaemon } from "../runtime/process-role.js";
 import { publishConfigChanged } from "../runtime/sync/resource-sync-events.js";
 import { recoverStaleSchedules } from "../schedule/schedule-recovery.js";
 import { startScheduler } from "../schedule/scheduler.js";
@@ -103,6 +105,11 @@ function loadDotEnv(): void {
 
 // Entry point for the daemon process itself
 export async function runDaemon(): Promise<void> {
+  // Identify this process as the daemon before anything can publish: it owns
+  // the event hub real clients subscribe to, so plugin-facing publishes made
+  // here fan out locally rather than routing to a daemon over IPC.
+  markCurrentProcessAsMainDaemon();
+
   const startupStartedAt = Date.now();
   // dotenv loads before the first log call so the lazy root logger
   // initializes against the final VELLUM_WORKSPACE_DIR / log path, not
@@ -242,6 +249,12 @@ export async function runDaemon(): Promise<void> {
   try {
     const { migrationsOk } = await initializeDb();
     dbReady = true;
+    // A quiesce lease can survive a stop that happened mid-drain; clear it so
+    // a fresh boot never starts with background work paused. Placed
+    // synchronously after DB init — before any await yields to the
+    // already-listening HTTP server — so it cannot delete a lease a client
+    // arms against THIS boot.
+    clearLifecycleQuiesce();
     // Floor the stream seq counter above every persisted conversation
     // anchor before turns can stamp events. Anchors are getCurrentSeq()
     // snapshots already served to clients, and a crashed process can have

package/src/daemon/message-protocol.ts

@@ -1,173 +1,37 @@
 /**
  * Message Protocol -- message types and serialization.
  *
- * All message types are defined in domain files under ./message-types/.
- * Each domain file exports `_<Domain>ClientMessages` and/or
- * `_<Domain>ServerMessages` type aliases. This file composes those
- * into the aggregate ClientMessage and ServerMessage unions.
- *
- * To add a new message type:
- *   1. Define its interface in the appropriate domain file.
- *   2. Add it to that file's _<Domain>ClientMessages or _<Domain>ServerMessages.
- * No changes needed here unless you're adding an entirely new domain file.
+ * Client message types are defined in domain files under ./message-types/;
+ * each exports a `_<Domain>ClientMessages` alias that this file composes into
+ * the aggregate `ClientMessage` union.
  */
 
 // Re-export domain modules (all individual types remain importable)
-export * from "./message-types/acp.js";
-export * from "./message-types/apps.js";
-export * from "./message-types/background-tools.js";
-export * from "./message-types/bookmarks.js";
 export * from "./message-types/computer-use.js";
-export * from "./message-types/contacts.js";
 export * from "./message-types/conversations.js";
 export * from "./message-types/diagnostics.js";
-export * from "./message-types/document-comments.js";
-export * from "./message-types/documents.js";
-export * from "./message-types/home.js";
 export * from "./message-types/host-app-control.js";
-export * from "./message-types/host-bash.js";
 export * from "./message-types/host-browser.js";
-export * from "./message-types/host-cu.js";
-export * from "./message-types/host-file.js";
-export * from "./message-types/host-transfer.js";
-export * from "./message-types/integrations.js";
-export * from "./message-types/memory.js";
 export * from "./message-types/messages.js";
 export * from "./message-types/notifications.js";
-export * from "./message-types/schedules.js";
-export * from "./message-types/settings.js";
 export * from "./message-types/shared.js";
 export * from "./message-types/skills.js";
-export * from "./message-types/subagents.js";
 export * from "./message-types/surfaces.js";
 export * from "./message-types/sync.js";
-export * from "./message-types/upgrades.js";
 export * from "./message-types/web-activity.js";
-export * from "./message-types/workflows.js";
-export * from "./message-types/workspace.js";
 
-// Import domain-level union aliases for composition
-import type { DiskPressureStatusChangedEvent } from "../api/events/disk-pressure-status-changed.js";
-import type { HookEvent } from "../api/events/hook-event.js";
-import type { _AcpServerMessages } from "./message-types/acp.js";
-import type { _AppsServerMessages } from "./message-types/apps.js";
-import type { _BackgroundToolsServerMessages } from "./message-types/background-tools.js";
-import type { _BookmarksServerMessages } from "./message-types/bookmarks.js";
-import type {
-  _ComputerUseClientMessages,
-  _ComputerUseServerMessages,
-} from "./message-types/computer-use.js";
-import type { _ContactsServerMessages } from "./message-types/contacts.js";
-import type {
-  _ConversationsClientMessages,
-  _ConversationsServerMessages,
-} from "./message-types/conversations.js";
+// Client-message domain aliases for the ClientMessage union.
+import type { _ComputerUseClientMessages } from "./message-types/computer-use.js";
 import type { _DiagnosticsClientMessages } from "./message-types/diagnostics.js";
-import type { _DocumentCommentsServerMessages } from "./message-types/document-comments.js";
-import type { _DocumentsServerMessages } from "./message-types/documents.js";
-import type { _HomeServerMessages } from "./message-types/home.js";
-import type { _HostAppControlServerMessages } from "./message-types/host-app-control.js";
-import type { _HostBashServerMessages } from "./message-types/host-bash.js";
-import type {
-  _HostBrowserClientMessages,
-  _HostBrowserServerMessages,
-} from "./message-types/host-browser.js";
-import type { _HostCuServerMessages } from "./message-types/host-cu.js";
-import type { _HostFileServerMessages } from "./message-types/host-file.js";
-import type { _HostTransferServerMessages } from "./message-types/host-transfer.js";
-import type { _HostUiSnapshotServerMessages } from "./message-types/host-ui-snapshot.js";
-import type {
-  _IntegrationsClientMessages,
-  _IntegrationsServerMessages,
-} from "./message-types/integrations.js";
-import type { _MemoryServerMessages } from "./message-types/memory.js";
-import type {
-  _MessagesClientMessages,
-  _MessagesServerMessages,
-} from "./message-types/messages.js";
-import type {
-  _NotificationsClientMessages,
-  _NotificationsServerMessages,
-} from "./message-types/notifications.js";
-import type { _SchedulesServerMessages } from "./message-types/schedules.js";
-import type { _SettingsServerMessages } from "./message-types/settings.js";
-import type { _SkillsServerMessages } from "./message-types/skills.js";
-import type {
-  _SubagentsClientMessages,
-  _SubagentsServerMessages,
-} from "./message-types/subagents.js";
-import type { _SurfacesServerMessages } from "./message-types/surfaces.js";
-import type { _SyncInvalidationServerMessages } from "./message-types/sync.js";
-import type { _UpgradesServerMessages } from "./message-types/upgrades.js";
-import type { _WorkflowsServerMessages } from "./message-types/workflows.js";
-import type {
-  _WorkspaceClientMessages,
-  _WorkspaceServerMessages,
-} from "./message-types/workspace.js";
-
-// === SubagentEvent -- defined here because it references ServerMessage ===
-
-/** Wraps any ServerMessage emitted by a subagent conversation for routing to the client. */
-export interface SubagentEvent {
-  type: "subagent_event";
-  subagentId: string;
-  conversationId: string;
-  event: ServerMessage;
-}
+import type { _HostBrowserClientMessages } from "./message-types/host-browser.js";
+import type { _MessagesClientMessages } from "./message-types/messages.js";
+import type { _NotificationsClientMessages } from "./message-types/notifications.js";
 
 // === Client -> Server aggregate union ===
 
 export type ClientMessage =
-  | _ConversationsClientMessages
   | _MessagesClientMessages
-  | _IntegrationsClientMessages
   | _ComputerUseClientMessages
   | _HostBrowserClientMessages
-  | _SubagentsClientMessages
-  | _WorkspaceClientMessages
   | _DiagnosticsClientMessages
   | _NotificationsClientMessages;
-
-// === Server -> Client aggregate union ===
-
-export type ServerMessage =
-  | _ConversationsServerMessages
-  | _MessagesServerMessages
-  | _SurfacesServerMessages
-  | _SkillsServerMessages
-  | _AppsServerMessages
-  | _IntegrationsServerMessages
-  | _ComputerUseServerMessages
-  | _ContactsServerMessages
-  | _SubagentsServerMessages
-  | _DocumentsServerMessages
-  | _DocumentCommentsServerMessages
-  | _SyncInvalidationServerMessages
-  | _HomeServerMessages
-  | _HostAppControlServerMessages
-  | _HostBashServerMessages
-  | _HostBrowserServerMessages
-  | _HostCuServerMessages
-  | _HostFileServerMessages
-  | _HostTransferServerMessages
-  | _HostUiSnapshotServerMessages
-  | _MemoryServerMessages
-  | _WorkspaceServerMessages
-  | _SchedulesServerMessages
-  | _SettingsServerMessages
-  | _NotificationsServerMessages
-  | _UpgradesServerMessages
-  | _AcpServerMessages
-  | _BackgroundToolsServerMessages
-  | _BookmarksServerMessages
-  | _WorkflowsServerMessages
-  | DiskPressureStatusChangedEvent
-  | HookEvent
-  | SubagentEvent;
-
-// === Contract schema ===
-
-export interface ContractSchema {
-  client: ClientMessage;
-  server: ServerMessage;
-}

package/src/daemon/message-types/computer-use.ts

@@ -4,12 +4,6 @@
 // single-sourced from their canonical `api/events` wire schemas; the shared
 // `RecordingOptions` shape is re-exported from there for barrel consumers.
 
-import type {
-  RecordingPauseEvent,
-  RecordingResumeEvent,
-  RecordingStartEvent,
-  RecordingStopEvent,
-} from "../../api/events/recording.js";
 import type { CommandIntent, UserMessageAttachment } from "./shared.js";
 
 export type { RecordingOptions } from "../../api/events/recording.js";
@@ -49,9 +43,3 @@ export interface RecordingStatus {
 // --- Domain-level union aliases (consumed by the barrel file) ---
 
 export type _ComputerUseClientMessages = TaskSubmit | RecordingStatus;
-
-export type _ComputerUseServerMessages =
-  | RecordingStartEvent
-  | RecordingStopEvent
-  | RecordingPauseEvent
-  | RecordingResumeEvent;