@vellumai/assistant 0.8.4 → 0.8.6

package/src/daemon/lifecycle.ts

@@ -2,6 +2,8 @@ import { join } from "node:path";
 
 import { config as dotenvConfig } from "dotenv";
 
+import { refreshBackgroundWakeIntent } from "../background-wake/publisher.js";
+import { registerBackgroundWakeRuntime } from "../background-wake/runtime-registry.js";
 import { setPointerMessageProcessor } from "../calls/call-pointer-messages.js";
 import { reconcileCallsOnStartup } from "../calls/call-recovery.js";
 import { setRelayBroadcast } from "../calls/relay-server.js";
@@ -35,6 +37,10 @@ import { HeartbeatService } from "../heartbeat/heartbeat-service.js";
 import { startHomeContentRefresh } from "../home/home-content-refresh.js";
 import { backfillRelationshipStateIfMissing } from "../home/relationship-state-writer.js";
 import { closeSentry, initSentry, setSentryDeviceId } from "../instrument.js";
+import {
+  startGatewayFlagListener,
+  stopGatewayFlagListener,
+} from "../ipc/gateway-flag-listener.js";
 import { getMcpServerManager } from "../mcp/manager.js";
 import {
   getAttachmentsByIds,
@@ -45,16 +51,13 @@ import { deleteMessageById, getMessages } from "../memory/conversation-crud.js";
 import { getDb } from "../memory/db-connection.js";
 import { initializeDb } from "../memory/db-init.js";
 import { selectEmbeddingBackend } from "../memory/embedding-backend.js";
-import { enqueueMemoryJob } from "../memory/jobs-store.js";
+import { enqueueMemoryJob, isMemoryEnabled } from "../memory/jobs-store.js";
 import { startMemoryJobsWorker } from "../memory/jobs-worker.js";
 import { initQdrantClient, resolveQdrantUrl } from "../memory/qdrant-client.js";
 import { QdrantManager } from "../memory/qdrant-manager.js";
 import { rotateToolInvocations } from "../memory/tool-usage-store.js";
 import { sweepConceptPageFrontmatter } from "../memory/v2/frontmatter-sweep.js";
-import {
-  emitNotificationSignal,
-  registerBroadcastFn,
-} from "../notifications/emit-signal.js";
+import { emitNotificationSignal } from "../notifications/emit-signal.js";
 import { backfillManualTokenConnections } from "../oauth/manual-token-connection.js";
 import { seedOAuthProviders } from "../oauth/seed-providers.js";
 import { installPluginRuntime } from "../plugins/external-api.js";
@@ -71,6 +74,7 @@ import {
 import { RuntimeHttpServer } from "../runtime/http-server.js";
 import { recoverInterruptedImport } from "../runtime/migrations/vbundle-streaming-importer.js";
 import { registerSecretsDeps } from "../runtime/routes/secrets-deps.js";
+import { publishConversationListChanged } from "../runtime/sync/resource-sync-events.js";
 import { recoverStaleSchedules } from "../schedule/schedule-recovery.js";
 import { startScheduler } from "../schedule/scheduler.js";
 import {
@@ -358,6 +362,8 @@ export async function runDaemon(): Promise<void> {
       log.warn({ err }, "Background feature flag init failed"),
     );
 
+    startGatewayFlagListener();
+
     log.info("Daemon startup: initializing DB");
     ensurePromptFiles();
 
@@ -539,11 +545,12 @@ export async function runDaemon(): Promise<void> {
       }
     } // end if (dbReady)
 
-    // Populate the managed-connection cache so buildIntegrationSection()
-    // can include platform-managed OAuth connections (e.g. Twitter) in the
-    // system prompt's "Connected Services" section from the first turn.
-    // This is an HTTP-only call with no DB dependency, so it runs regardless
-    // of dbReady. A periodic refresh keeps the cache current when users
+    // Populate the managed-connection cache so the `14-connected-services`
+    // bundled section (rendered by `renderConnectedServices()` in
+    // system-sections.ts) can include platform-managed OAuth connections
+    // (e.g. Twitter) in the system prompt from the first turn.  This is
+    // an HTTP-only call with no DB dependency, so it runs regardless of
+    // dbReady.  A periodic refresh keeps the cache current when users
     // connect/disconnect managed providers while the assistant is running.
     void refreshManagedConnectionCache().catch((err) =>
       log.warn(
@@ -836,7 +843,7 @@ export async function runDaemon(): Promise<void> {
             // If a destructive migration occurred, enqueue a rebuild_index job
             // to re-embed all memory items from the SQLite cache.
             const { migrated } = await qdrantClient.ensureCollection();
-            if (migrated) {
+            if (migrated && isMemoryEnabled()) {
               enqueueMemoryJob("rebuild_index", {});
               log.info(
                 "Qdrant collection was migrated — enqueued rebuild_index job",
@@ -934,10 +941,6 @@ export async function runDaemon(): Promise<void> {
     registerWatcherProviders();
     registerMessagingProviders();
 
-    // Register the broadcast function for the notification signal pipeline's
-    // macOS adapter so it can deliver notification_intent messages to clients.
-    registerBroadcastFn((msg) => broadcastMessage(msg));
-
     try {
       recoverStaleSchedules();
     } catch (err) {
@@ -1017,6 +1020,7 @@ export async function runDaemon(): Promise<void> {
           scheduleJobId: info.scheduleJobId,
           title: info.title,
         });
+        publishConversationListChanged("created");
       },
     );
 
@@ -1081,13 +1085,11 @@ export async function runDaemon(): Promise<void> {
           // its own finally block.
           conversation.toolsDisabledDepth++;
           try {
-            const messageId = await conversation.persistUserMessage(
-              instruction,
-              [],
-              undefined,
-              { pointerInstruction: true },
-              "[Call status event]",
-            );
+            const { id: messageId } = await conversation.persistUserMessage({
+              content: instruction,
+              metadata: { pointerInstruction: true },
+              displayContent: "[Call status event]",
+            });
 
             // Helper: roll back persisted messages on failure, then reload
             // in-memory history from the (now cleaned) DB. Reloading avoids
@@ -1270,11 +1272,9 @@ export async function runDaemon(): Promise<void> {
     })();
 
     if (config.auditLog.retentionDays > 0) {
-      try {
-        rotateToolInvocations(config.auditLog.retentionDays);
-      } catch (err) {
+      void rotateToolInvocations(config.auditLog.retentionDays).catch((err) => {
         log.warn({ err }, "Audit log rotation failed");
-      }
+      });
     }
 
     const workspaceHeartbeat = new WorkspaceHeartbeatService();
@@ -1291,6 +1291,8 @@ export async function runDaemon(): Promise<void> {
         }),
     });
     heartbeat.start();
+    registerBackgroundWakeRuntime({ scheduler, heartbeat });
+    refreshBackgroundWakeIntent("daemon-startup");
     log.info(
       {
         enabled: heartbeatConfig.enabled,
@@ -1347,6 +1349,7 @@ export async function runDaemon(): Promise<void> {
       mcpManager,
       telemetryReporter,
       cleanupPidFile: () => {
+        stopGatewayFlagListener();
         stopDiskPressureGuardForLifecycle();
         cleanupPidFile();
       },

package/src/daemon/mcp-reload-service.ts

@@ -82,7 +82,7 @@ async function doReload(): Promise<McpReloadResult> {
           serverConfig,
           manager,
         );
-        const accepted = registerMcpTools(mcpTools);
+        const accepted = registerMcpTools(serverId, mcpTools);
         const acceptedNames = accepted.map((t) => t.name);
         toolCount += accepted.length;
         servers.push({

package/src/daemon/meet-manifest-loader.ts

@@ -40,12 +40,7 @@ import type { SkillRoute } from "../runtime/skill-route-registry.js";
 import { registerSkillRoute } from "../runtime/skill-route-registry.js";
 import { getRepoSkillsDir } from "../skills/catalog-install.js";
 import { registerExternalTools } from "../tools/registry.js";
-import type {
-  ExecutionTarget,
-  Tool,
-  ToolContext,
-  ToolDefinition,
-} from "../tools/types.js";
+import type { ExecutionTarget, Tool, ToolContext } from "../tools/types.js";
 import { RiskLevel } from "../tools/types.js";
 import { getLogger } from "../util/logger.js";
 import { getSkillRuntimePath } from "../util/platform.js";
@@ -130,26 +125,15 @@ function serializeToolContext(context: ToolContext): Record<string, unknown> {
 function buildProxyTool(
   entry: ManifestToolEntry,
   supervisor: MeetHostSupervisor,
-  manifestHash: string,
 ): Tool {
-  const definition: ToolDefinition = {
-    name: entry.name,
-    description: entry.description,
-    input_schema: (entry.input_schema as object) ?? {},
-  };
   const risk = coerceRiskLevel(entry.risk, entry.name);
   return {
     name: entry.name,
     description: entry.description,
+    input_schema: (entry.input_schema as object) ?? {},
     category: entry.category,
     defaultRiskLevel: risk,
-    executionMode: "proxy",
     executionTarget: "host" as ExecutionTarget,
-    origin: "skill",
-    ownerSkillId: MEET_SKILL_ID,
-    ownerSkillBundled: true,
-    ownerSkillVersionHash: manifestHash,
-    getDefinition: () => definition,
     execute: async (input, context) => {
       // `dispatchTool` ensures the meet-host child is up + connected
       // before sending the frame, so callers don't need a separate
@@ -324,7 +308,10 @@ export interface MeetManifestLoaderDeps {
   /** Override for the manifest path resolver. */
   manifestPath?: string;
   /** Override for {@link registerExternalTools}. */
-  registerTools?: (provider: () => Tool[]) => void;
+  registerTools?: (
+    owner: { kind: "skill" | "plugin" | "mcp"; id: string },
+    provider: () => Tool[],
+  ) => void;
   /** Override for {@link registerSkillRoute}. */
   registerRoute?: (route: SkillRoute) => unknown;
   /** Override for {@link registerShutdownHook}. */
@@ -367,11 +354,11 @@ export async function loadMeetManifestProxies(
 
   // Tool provider resolves the full proxy list lazily so the tool manifest
   // reflects the manifest file at `initializeTools()` time — same timing
-  // contract as the in-process skill's provider closure.
-  registerTools(() =>
-    manifest.tools.map((entry) =>
-      buildProxyTool(entry, supervisor, manifest.sourceHash),
-    ),
+  // contract as the in-process skill's provider closure. Owner is recorded
+  // up-front so `getToolOwner(name)` returns the meet-join skill id without
+  // the tool object having to carry it.
+  registerTools({ kind: "skill", id: MEET_SKILL_ID }, () =>
+    manifest.tools.map((entry) => buildProxyTool(entry, supervisor)),
   );
 
   for (const entry of manifest.routes) {

package/src/daemon/message-types/conversations.ts

@@ -1,5 +1,7 @@
 // Conversation lifecycle, auth, model config, and history types.
 
+import type { GenerationCancelledEvent } from "../../api/events/generation-cancelled.js";
+import type { GenerationHandoffEvent } from "../../api/events/generation-handoff.js";
 import type {
   ChannelId,
   HostProxyInterfaceId,
@@ -309,28 +311,6 @@ export interface AssistantStatusMessage {
   keyFingerprint?: string;
 }
 
-export interface GenerationCancelled {
-  type: "generation_cancelled";
-  conversationId?: string;
-}
-
-export interface GenerationHandoff {
-  type: "generation_handoff";
-  conversationId: string;
-  requestId?: string;
-  queuedCount: number;
-  attachments?: UserMessageAttachment[];
-  attachmentWarnings?: string[];
-  /** Database ID of the final persisted assistant row, if any. */
-  messageId?: string;
-  /**
-   * Database ID used by clients for the rendered assistant bubble. Tool turns
-   * may persist multiple assistant rows; this matches the history row that
-   * survives query-time merging.
-   */
-  displayMessageId?: string;
-}
-
 export interface ModelInfo {
   type: "model_info";
   conversationId?: string;
@@ -404,10 +384,8 @@ export interface HistoryResponse {
   type: "history_response";
   conversationId: string;
   messages: Array<{
-    /** Database ID used by clients for the rendered message bubble. */
+    /** Database ID used by clients for the rendered message. */
     id?: string;
-    /** Concrete persisted row ID for row-scoped actions such as TTS/fork. */
-    daemonMessageId?: string;
     role: string;
     text: string;
     timestamp: number;
@@ -460,6 +438,20 @@ export interface UsageUpdate {
   contextWindowMaxTokens?: number;
 }
 
+/**
+ * Emitted after each LLM call with per-call token deltas and estimated cost.
+ * Clients accumulate these additively for live-updating usage metrics.
+ * This is a UI-only hint — it does not persist to DB or affect billing.
+ */
+export interface UsageProgress {
+  type: "usage_progress";
+  conversationId: string;
+  inputTokens: number;
+  outputTokens: number;
+  estimatedCost: number;
+  model: string;
+}
+
 export interface UsageResponse {
   type: "usage_response";
   totalInputTokens: number;
@@ -556,6 +548,8 @@ export type ConversationErrorCode =
   | "PROVIDER_INVALID_KEY"
   | "MANAGED_KEY_INVALID"
   | "CONTEXT_TOO_LARGE"
+  | "BUDGET_YIELD_UNRECOVERED"
+  | "MAX_TOKENS_REACHED"
   | "CONVERSATION_ABORTED"
   | "CONVERSATION_PROCESSING_FAILED"
   | "DISK_SPACE_CRITICAL"
@@ -648,12 +642,13 @@ export type _ConversationsServerMessages =
   | AuthResult
   | PongMessage
   | AssistantStatusMessage
-  | GenerationCancelled
-  | GenerationHandoff
+  | GenerationCancelledEvent
+  | GenerationHandoffEvent
   | ModelInfo
   | HistoryResponse
   | UndoComplete
   | UsageUpdate
+  | UsageProgress
   | UsageResponse
   | ContextCompacted
   | CompactionCircuitOpen

package/src/daemon/message-types/document-comments.ts

@@ -1,50 +1,14 @@
 // Document comment event types (Server → Client).
 
-export interface DocumentCommentCreated {
-  type: "document_comment_created";
-  conversationId: string;
-  surfaceId: string;
-  comment: {
-    id: string;
-    surfaceId: string;
-    author: string;
-    content: string;
-    anchorStart?: number;
-    anchorEnd?: number;
-    anchorText?: string;
-    parentCommentId?: string;
-    status: string;
-    createdAt: number;
-    updatedAt: number;
-  };
-}
-
-export interface DocumentCommentResolved {
-  type: "document_comment_resolved";
-  conversationId: string;
-  surfaceId: string;
-  commentId: string;
-  resolvedBy: string;
-}
-
-export interface DocumentCommentReopened {
-  type: "document_comment_reopened";
-  conversationId: string;
-  surfaceId: string;
-  commentId: string;
-}
-
-export interface DocumentCommentDeleted {
-  type: "document_comment_deleted";
-  conversationId: string;
-  surfaceId: string;
-  commentId: string;
-}
+import type { DocumentCommentCreatedEvent } from "../../api/events/document-comment-created.js";
+import type { DocumentCommentDeletedEvent } from "../../api/events/document-comment-deleted.js";
+import type { DocumentCommentReopenedEvent } from "../../api/events/document-comment-reopened.js";
+import type { DocumentCommentResolvedEvent } from "../../api/events/document-comment-resolved.js";
 
 // --- Domain-level union alias (consumed by the barrel file) ---
 
 export type _DocumentCommentsServerMessages =
-  | DocumentCommentCreated
-  | DocumentCommentResolved
-  | DocumentCommentReopened
-  | DocumentCommentDeleted;
+  | DocumentCommentCreatedEvent
+  | DocumentCommentResolvedEvent
+  | DocumentCommentReopenedEvent
+  | DocumentCommentDeletedEvent;

package/src/daemon/message-types/home.ts

@@ -7,19 +7,7 @@
  * just enough metadata to invalidate a cache and trigger a refetch.
  */
 
-/**
- * Broadcast after the daemon successfully writes a fresh
- * `relationship-state.json` snapshot to disk. Subscribers should
- * refetch `GET /v1/home/state` to read the new state.
- *
- * Only emitted on the success branch of the writer — if the
- * underlying `writeFileSync` throws, this event is NOT published.
- */
-export interface RelationshipStateUpdated {
-  type: "relationship_state_updated";
-  /** ISO-8601 timestamp of the newly-written state's `updatedAt` field. */
-  updatedAt: string;
-}
+import type { RelationshipStateUpdatedEvent } from "../../api/events/relationship-state-updated.js";
 
 /**
  * Broadcast after the daemon successfully writes a fresh home activity
@@ -37,4 +25,4 @@ export interface HomeFeedUpdated {
   newItemCount: number;
 }
 
-export type _HomeServerMessages = RelationshipStateUpdated | HomeFeedUpdated;
+export type _HomeServerMessages = RelationshipStateUpdatedEvent | HomeFeedUpdated;

package/src/daemon/message-types/integrations.ts

@@ -1,5 +1,6 @@
 // External service integrations: Slack, Telegram, Vercel, ingress, guardian.
 
+import type { OpenUrlEvent } from "../../api/events/open-url.js";
 import type { ChannelId } from "../../channels/types.js";
 
 // === Client → Server ===
@@ -206,12 +207,6 @@ export interface OAuthConnectResultResponse {
   error?: string;
 }
 
-export interface OpenUrl {
-  type: "open_url";
-  url: string;
-  title?: string;
-}
-
 export interface NavigateSettings {
   type: "navigate_settings";
   tab: string;
@@ -250,7 +245,7 @@ export type _IntegrationsServerMessages =
   | IntegrationListResponse
   | IntegrationConnectResult
   | OAuthConnectResultResponse
-  | OpenUrl
+  | OpenUrlEvent
   | NavigateSettings
   | ShowPlatformLogin
   | PlatformDisconnected;

package/src/daemon/message-types/messages.ts

@@ -1,5 +1,9 @@
 // User/assistant messages, tool results, confirmations, secrets, errors, and generation lifecycle.
 
+import type { AssistantTextDeltaEvent } from "../../api/events/assistant-text-delta.js";
+import type { AssistantTurnStartEvent } from "../../api/events/assistant-turn-start.js";
+import type { MessageCompleteEvent } from "../../api/events/message-complete.js";
+import type { ToolUseStartEvent } from "../../api/events/tool-use-start.js";
 import type { ChannelId, InterfaceId } from "../../channels/types.js";
 import type { CommandIntent, UserMessageAttachment } from "./shared.js";
 import type { ToolActivityMetadata } from "./web-activity.js";
@@ -72,25 +76,13 @@ export interface UserMessageEcho {
   clientMessageId?: string;
 }
 
-export interface AssistantTextDelta {
-  type: "assistant_text_delta";
-  text: string;
-  conversationId?: string;
-}
-
 export interface AssistantThinkingDelta {
   type: "assistant_thinking_delta";
   thinking: string;
   conversationId?: string;
-}
-
-export interface ToolUseStart {
-  type: "tool_use_start";
-  toolName: string;
-  input: Record<string, unknown>;
-  conversationId?: string;
-  /** The tool_use block ID for client-side correlation. */
-  toolUseId?: string;
+  /** Database ID of the assistant message this thinking delta belongs to.
+   *  Same semantics as `AssistantTextDeltaEvent.messageId`. */
+  messageId?: string;
 }
 
 export interface ToolOutputChunk {
@@ -103,6 +95,9 @@ export interface ToolOutputChunk {
   subToolInput?: string;
   subToolIsError?: boolean;
   subToolId?: string;
+  /** Database ID of the assistant message that owns the parent tool_use
+   *  block. Same semantics as `AssistantTextDeltaEvent.messageId`. */
+  messageId?: string;
 }
 
 export interface ToolUsePreviewStart {
@@ -110,6 +105,9 @@ export interface ToolUsePreviewStart {
   toolUseId: string;
   toolName: string;
   conversationId?: string;
+  /** Database ID of the assistant message that owns this tool_use block.
+   *  Same semantics as `AssistantTextDeltaEvent.messageId`. */
+  messageId?: string;
 }
 
 export interface ToolInputDelta {
@@ -119,6 +117,9 @@ export interface ToolInputDelta {
   conversationId?: string;
   /** The tool_use block ID for client-side correlation. */
   toolUseId?: string;
+  /** Database ID of the assistant message that owns this tool_use block.
+   *  Same semantics as `AssistantTextDeltaEvent.messageId`. */
+  messageId?: string;
 }
 
 export interface ToolResult {
@@ -140,6 +141,9 @@ export interface ToolResult {
   imageDataList?: string[];
   /** The tool_use block ID for client-side correlation. */
   toolUseId?: string;
+  /** Database ID of the assistant message that owns the parent tool_use
+   *  block. Same semantics as `AssistantTextDeltaEvent.messageId`. */
+  messageId?: string;
   /** Risk level from the classifier ("low" | "medium" | "high" | "unknown"). */
   riskLevel?: string;
   /** Human-readable reason for the risk classification. */
@@ -299,28 +303,6 @@ export interface QuestionRequest {
   toolUseId?: string;
 }
 
-export interface MessageComplete {
-  type: "message_complete";
-  conversationId?: string;
-  attachments?: UserMessageAttachment[];
-  attachmentWarnings?: string[];
-  /** Database ID of the final persisted assistant row, if any. */
-  messageId?: string;
-  /**
-   * Database ID used by clients for the rendered assistant bubble. Tool turns
-   * may persist multiple assistant rows; this matches the history row that
-   * survives query-time merging.
-   */
-  displayMessageId?: string;
-  /**
-   * Distinguishes a real main-turn completion from auxiliary events such as
-   * call transcripts, call summaries, and watch notifier outputs. Clients
-   * gate turn-completion side effects (e.g. the task_complete sound) on
-   * `source !== "aux"`. Absent is treated as main for backwards compatibility.
-   */
-  source?: "main" | "aux";
-}
-
 export interface ErrorMessage {
   type: "error";
   conversationId?: string;
@@ -426,17 +408,11 @@ export type InteractionResolutionState =
 export interface InteractionResolved {
   type: "interaction_resolved";
   requestId: string;
-  /**
-   * Conversation key for the interaction. The daemon's internal conversation
-   * id and the web client's conversation key coincide today (see
-   * `conversation-key-store.ts`); the field is named after the client-facing
-   * concept.
-   */
-  conversationKey: string;
+  /** Conversation id the interaction belongs to. */
+  conversationId: string;
   state: InteractionResolutionState;
   /** Kind of the resolved interaction (e.g. "confirmation", "secret", "host_bash"). */
   kind: string;
-  conversationId?: string;
 }
 
 /**
@@ -545,9 +521,10 @@ export type _MessagesClientMessages =
 
 export type _MessagesServerMessages =
   | UserMessageEcho
-  | AssistantTextDelta
+  | AssistantTurnStartEvent
+  | AssistantTextDeltaEvent
   | AssistantThinkingDelta
-  | ToolUseStart
+  | ToolUseStartEvent
   | ToolUsePreviewStart
   | ToolOutputChunk
   | ToolInputDelta
@@ -555,7 +532,7 @@ export type _MessagesServerMessages =
   | ConfirmationRequest
   | SecretRequest
   | QuestionRequest
-  | MessageComplete
+  | MessageCompleteEvent
   | ErrorMessage
   | MessageQueued
   | MessageDequeued

package/src/daemon/message-types/subagents.ts

@@ -12,6 +12,12 @@ export interface SubagentSpawned {
   label: string;
   objective: string;
   isFork?: boolean;
+  /**
+   * Tool-use id of the `skill_execute` call that spawned this subagent. Lets
+   * the client anchor the inline subagent card to the exact spawn tool call,
+   * independent of the (reconcile-volatile) parent message id.
+   */
+  parentToolUseId?: string;
 }
 
 export interface SubagentStatusChanged {

package/src/daemon/message-types/sync.ts

@@ -7,6 +7,8 @@ export const SYNC_TAGS = {
   assistantSounds: "assistant:self:sounds",
   assistantSchedules: "assistant:self:schedules",
   conversationsList: "conversations:list",
+  featureFlagsClient: "feature-flags:client",
+  featureFlagsAssistant: "feature-flags:assistant",
 } as const;
 
 export type KnownSyncInvalidationTag =
@@ -24,6 +26,14 @@ export type SyncInvalidationTag =
 export interface SyncChangedMessage {
   type: "sync_changed";
   tags: SyncInvalidationTag[];
+  /**
+   * Optional identifier of the client that originated the change. When set,
+   * the server fan-out and clients themselves can suppress self-echoes so
+   * the originating tab/process doesn't reinvalidate its own cache off its
+   * own mutation. Daemon-internal emits (agent loop, FS watcher, cron) leave
+   * this unset so the event fans out to every subscriber as before.
+   */
+  originClientId?: string;
 }
 
 export const SyncInvalidationTagSchema = z.string().min(1);
@@ -32,6 +42,7 @@ export const SyncChangedMessageSchema = z
   .object({
     type: z.literal("sync_changed"),
     tags: z.array(SyncInvalidationTagSchema).min(1),
+    originClientId: z.string().min(1).optional(),
   })
   .strict();
 
@@ -49,11 +60,14 @@ export function conversationMetadataSyncTag(
 
 export function buildSyncChangedMessage(
   tags: SyncInvalidationTag[],
+  originClientId?: string,
 ): SyncChangedMessage {
   const dedupedTags = Array.from(new Set(tags));
+  const trimmedOrigin = originClientId?.trim();
   const parsed = SyncChangedMessageSchema.parse({
     type: "sync_changed",
     tags: dedupedTags,
+    ...(trimmedOrigin ? { originClientId: trimmedOrigin } : {}),
   });
   return parsed as SyncChangedMessage;
 }