@vellumai/assistant 0.8.4 → 0.8.5

package/src/daemon/conversation.ts

@@ -53,14 +53,13 @@ import {
   getConversation,
   getConversationOriginChannel,
   getConversationOverrideProfileFromRow,
-  setConversationCleanedAt,
+  setConversationHistoryStrippedAt,
 } from "../memory/conversation-crud.js";
 import { ConversationGraphMemory } from "../memory/graph/conversation-graph-memory.js";
 import { shouldExposePersonalMemory } from "../memory/v2/static-context.js";
 import { PermissionPrompter } from "../permissions/prompter.js";
 import { SecretPrompter } from "../permissions/secret-prompter.js";
 import type { UserDecision } from "../permissions/types.js";
-import { resolvePersonaContext } from "../prompts/persona-resolver.js";
 import { buildSystemPrompt } from "../prompts/system-prompt.js";
 import type { Message } from "../providers/types.js";
 import type { Provider } from "../providers/types.js";
@@ -492,19 +491,12 @@ export class Conversation {
       const resolved: ResolvedSystemPrompt = {
         systemPrompt: this.hasSystemPromptOverride
           ? systemPrompt
-          : (() => {
-              const persona = resolvePersonaContext(
-                this.currentTurnTrustContext,
-                this.currentTurnChannelCapabilities,
-              );
-              return buildSystemPrompt({
-                hasNoClient: this.hasNoClient,
-                userPersona: persona.userPersona,
-                channelPersona: persona.channelPersona,
-                userSlug: persona.userSlug,
-                onboardingContext: this.getOnboardingContext(),
-              });
-            })(),
+          : buildSystemPrompt({
+              hasNoClient: this.hasNoClient,
+              trustContext: this.currentTurnTrustContext,
+              channelCapabilities: this.currentTurnChannelCapabilities,
+              onboardingContext: this.getOnboardingContext(),
+            }),
       };
       if (configuredMaxTokens !== undefined) {
         resolved.maxTokens = configuredMaxTokens;
@@ -583,19 +575,12 @@ export class Conversation {
 
     const systemPrompt = this.hasSystemPromptOverride
       ? this.systemPrompt
-      : (() => {
-          const persona = resolvePersonaContext(
-            this.currentTurnTrustContext,
-            this.currentTurnChannelCapabilities,
-          );
-          return buildSystemPrompt({
-            hasNoClient: this.hasNoClient,
-            userPersona: persona.userPersona,
-            channelPersona: persona.channelPersona,
-            userSlug: persona.userSlug,
-            onboardingContext: this.getOnboardingContext(),
-          });
-        })();
+      : buildSystemPrompt({
+          hasNoClient: this.hasNoClient,
+          trustContext: this.currentTurnTrustContext,
+          channelCapabilities: this.currentTurnChannelCapabilities,
+          onboardingContext: this.getOnboardingContext(),
+        });
     const tools = buildToolDefinitions();
     const provider = this.provider;
 
@@ -1155,7 +1140,7 @@ export class Conversation {
     this.messages = stripped;
     await this.graphMemory.onCompacted(0);
     this.pendingPostCompactReinject = true;
-    setConversationCleanedAt(this.conversationId, Date.now());
+    setConversationHistoryStrippedAt(this.conversationId, Date.now());
     const estimatedInputTokens = this.contextWindowManager.estimateInputTokens(
       this.messages,
     );

package/src/daemon/disk-pressure-guard.ts

@@ -6,6 +6,7 @@ import { cancelBackgroundTools } from "../tools/background-tool-registry.js";
 import { getDiskUsageInfo } from "../util/disk-usage.js";
 import { getLogger } from "../util/logger.js";
 
+export const DISK_PRESSURE_WARNING_THRESHOLD_PERCENT = 80;
 export const DISK_PRESSURE_THRESHOLD_PERCENT = 95;
 export const DISK_PRESSURE_CHECK_INTERVAL_MS = 60_000;
 export const DISK_PRESSURE_OVERRIDE_CONFIRMATION = "I understand the risks";
@@ -15,7 +16,7 @@ export const DISK_PRESSURE_BLOCKED_CAPABILITIES = [
   "remote-ingress",
 ] as const;
 
-export type DiskPressureState = "disabled" | "ok" | "critical" | "unknown";
+export type DiskPressureState = "disabled" | "ok" | "warning" | "critical" | "unknown";
 
 export type DiskPressureBlockedCapability =
   (typeof DISK_PRESSURE_BLOCKED_CAPABILITIES)[number];
@@ -229,9 +230,10 @@ export function evaluateDiskPressureNow(): DiskPressureStatus {
     (usageInfo.usedMb / usageInfo.totalMb) * 100,
   );
   const isCritical = usagePercent >= DISK_PRESSURE_THRESHOLD_PERCENT;
+  const isWarning = !isCritical && usagePercent >= DISK_PRESSURE_WARNING_THRESHOLD_PERCENT;
   const lastCheckedAt = new Date().toISOString();
 
-  if (!isCritical) {
+  if (!isCritical && !isWarning) {
     return replaceStatus({
       ...OPEN_STATUS,
       usagePercent,
@@ -240,6 +242,16 @@ export function evaluateDiskPressureNow(): DiskPressureStatus {
     });
   }
 
+  if (isWarning) {
+    return replaceStatus({
+      ...OPEN_STATUS,
+      state: "warning",
+      usagePercent,
+      path: usageInfo.path,
+      lastCheckedAt,
+    });
+  }
+
   if (!state.status.locked) {
     cancelTerminalBackgroundToolsForLock();
   }

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

@@ -70,6 +70,7 @@ describe("projectProviderForWire", () => {
       "gemini-3.1-pro-preview-customtools",
       "gemini-3-flash-preview",
       "gemini-3.1-flash-lite-preview",
+      "gemini-3.1-flash-lite",
     ];
 
     expect(modelIds.filter((id) => id.startsWith("gemini-3"))).toEqual(

package/src/daemon/handlers/conversations.ts

@@ -36,7 +36,15 @@ export function handleConfirmationResponse(msg: ConfirmationResponse): void {
         undefined,
         { source: "button" },
       );
-      pendingInteractions.resolve(msg.requestId);
+      // Idempotent cleanup: the prompter's `resolveConfirmation` already
+      // resolved the interaction with the correct approved/rejected state
+      // before we reach here, so the entry is typically gone. This call is
+      // a safety net for paths where the prompter no-ops; map decision to
+      // state to keep the emitted event accurate when it does fire.
+      pendingInteractions.resolve(
+        msg.requestId,
+        decision === "allow" ? "approved" : "rejected",
+      );
       return;
     }
   }
@@ -49,13 +57,13 @@ export function handleConfirmationResponse(msg: ConfirmationResponse): void {
 /**
  * Clear all conversations and DB conversations. Returns the number of conversations cleared.
  */
-export function clearAllConversations(): number {
+export async function clearAllConversations(): Promise<number> {
   const cleared = clearAllActiveConversations();
   // Also clear DB conversations. When a new local connection triggers
   // sendInitialConversation, it auto-creates a conversation if none exist.
   // Without this DB clear, that auto-created row survives, contradicting
   // the "clear all conversations" intent.
-  clearAll();
+  await clearAll();
   return cleared;
 }
 

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

@@ -185,7 +185,7 @@ export class HostBrowserProxy {
       let detachAbort: () => void = () => {};
 
       const timer = setTimeout(() => {
-        pendingInteractions.resolve(requestId);
+        pendingInteractions.resolve(requestId, "cancelled");
         log.warn(
           { requestId, cdpMethod: input.cdpMethod },
           "Host browser proxy request timed out",
@@ -200,7 +200,7 @@ export class HostBrowserProxy {
       if (signal) {
         const onAbort = () => {
           if (pendingInteractions.get(requestId)) {
-            pendingInteractions.resolve(requestId);
+            pendingInteractions.resolve(requestId, "cancelled");
             try {
               broadcastMessage({
                 type: "host_browser_cancel",
@@ -229,7 +229,7 @@ export class HostBrowserProxy {
 
       try {
         if (!preferredClient) {
-          pendingInteractions.resolve(requestId);
+          pendingInteractions.resolve(requestId, "cancelled");
           reject(
             new Error(
               "host_browser send failed: no active extension connection",
@@ -244,7 +244,7 @@ export class HostBrowserProxy {
           { targetClientId: preferredClient.clientId },
         );
       } catch (err) {
-        pendingInteractions.resolve(requestId);
+        pendingInteractions.resolve(requestId, "cancelled");
         log.warn(
           { requestId, cdpMethod: input.cdpMethod, err },
           "Host browser proxy send failed",
@@ -256,7 +256,7 @@ export class HostBrowserProxy {
 
   dispose(): void {
     for (const entry of pendingInteractions.getByKind("host_browser")) {
-      pendingInteractions.resolve(entry.requestId);
+      pendingInteractions.resolve(entry.requestId, "cancelled");
       try {
         broadcastMessage({
           type: "host_browser_cancel",

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

@@ -195,7 +195,7 @@ export class HostCuProxy {
 
       const timer = setTimeout(() => {
         this._ownedRequests.delete(requestId);
-        pendingInteractions.resolve(requestId);
+        pendingInteractions.resolve(requestId, "cancelled");
         log.warn({ requestId, toolName }, "Host CU proxy request timed out");
         resolve({
           content: "Host CU proxy timed out waiting for client response",
@@ -207,7 +207,7 @@ export class HostCuProxy {
         const onAbort = () => {
           if (pendingInteractions.get(requestId)) {
             this._ownedRequests.delete(requestId);
-            pendingInteractions.resolve(requestId);
+            pendingInteractions.resolve(requestId, "cancelled");
             try {
               broadcastMessage(
                 {
@@ -263,7 +263,7 @@ export class HostCuProxy {
         );
       } catch (err) {
         this._ownedRequests.delete(requestId);
-        pendingInteractions.resolve(requestId);
+        pendingInteractions.resolve(requestId, "cancelled");
         log.warn({ requestId, toolName, err }, "Host CU proxy send failed");
         reject(err instanceof Error ? err : new Error(String(err)));
       }
@@ -447,7 +447,7 @@ export class HostCuProxy {
 
   dispose(): void {
     for (const requestId of this._ownedRequests) {
-      const entry = pendingInteractions.resolve(requestId);
+      const entry = pendingInteractions.resolve(requestId, "cancelled");
       if (!entry) continue;
       try {
         broadcastMessage(

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

@@ -136,7 +136,7 @@ export class HostFileProxy {
       let detachAbort: () => void = () => {};
 
       const timer = setTimeout(() => {
-        pendingInteractions.resolve(requestId);
+        pendingInteractions.resolve(requestId, "cancelled");
         log.warn(
           { requestId, operation: input.operation },
           "Host file proxy request timed out",
@@ -152,7 +152,7 @@ export class HostFileProxy {
       if (signal) {
         const onAbort = () => {
           if (pendingInteractions.get(requestId)) {
-            pendingInteractions.resolve(requestId);
+            pendingInteractions.resolve(requestId, "cancelled");
             try {
               broadcastMessage(
                 {
@@ -210,7 +210,7 @@ export class HostFileProxy {
           { targetClientId: resolvedTargetClientId },
         );
       } catch (err) {
-        pendingInteractions.resolve(requestId);
+        pendingInteractions.resolve(requestId, "cancelled");
         log.warn(
           { requestId, operation: input.operation, err },
           "Host file proxy send failed",
@@ -252,7 +252,7 @@ export class HostFileProxy {
 
   dispose(): void {
     for (const entry of pendingInteractions.getByKind("host_file")) {
-      pendingInteractions.resolve(entry.requestId);
+      pendingInteractions.resolve(entry.requestId, "cancelled");
       try {
         broadcastMessage(
           {

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

@@ -154,7 +154,7 @@ export abstract class HostProxyBase<TRequest, TResultPayload> {
       const timer = setTimeout(() => {
         this.pending.delete(requestId);
         detachAbort();
-        pendingInteractions.resolve(requestId);
+        pendingInteractions.resolve(requestId, "cancelled");
         log.warn(
           { requestId, toolName, kind: this.resultPendingKind },
           "Host proxy request timed out",
@@ -168,7 +168,7 @@ export abstract class HostProxyBase<TRequest, TResultPayload> {
             clearTimeout(timer);
             this.pending.delete(requestId);
             detachAbort();
-            pendingInteractions.resolve(requestId);
+            pendingInteractions.resolve(requestId, "cancelled");
             try {
               broadcastDynamic(
                 {
@@ -239,7 +239,7 @@ export abstract class HostProxyBase<TRequest, TResultPayload> {
         clearTimeout(timer);
         this.pending.delete(requestId);
         detachAbort();
-        pendingInteractions.resolve(requestId);
+        pendingInteractions.resolve(requestId, "cancelled");
         log.warn(
           { requestId, toolName, kind: this.resultPendingKind, err },
           "Host proxy send failed",
@@ -285,7 +285,7 @@ export abstract class HostProxyBase<TRequest, TResultPayload> {
     for (const [requestId, entry] of this.pending) {
       clearTimeout(entry.timer);
       entry.detachAbort();
-      pendingInteractions.resolve(requestId);
+      pendingInteractions.resolve(requestId, "cancelled");
       try {
         broadcastDynamic(
           {

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

@@ -205,7 +205,7 @@ export class HostTransferProxy {
 
           const timer = setTimeout(() => {
             this.transfers.delete(transferId);
-            pendingInteractions.resolve(requestId);
+            pendingInteractions.resolve(requestId, "cancelled");
             log.warn(
               { requestId, transferId, direction: "to_host" },
               "Host transfer proxy request timed out",
@@ -222,7 +222,7 @@ export class HostTransferProxy {
             const onAbort = () => {
               if (pendingInteractions.get(requestId)) {
                 this.transfers.delete(transferId);
-                pendingInteractions.resolve(requestId);
+                pendingInteractions.resolve(requestId, "cancelled");
                 try {
                   broadcastMessage(
                     {
@@ -301,7 +301,7 @@ export class HostTransferProxy {
             );
           } catch (err) {
             this.transfers.delete(transferId);
-            pendingInteractions.resolve(requestId);
+            pendingInteractions.resolve(requestId, "cancelled");
             log.warn(
               { requestId, transferId, err },
               "Host transfer proxy send failed",
@@ -396,7 +396,7 @@ export class HostTransferProxy {
 
       const timer = setTimeout(() => {
         this.transfers.delete(transferId);
-        pendingInteractions.resolve(requestId);
+        pendingInteractions.resolve(requestId, "cancelled");
         log.warn(
           { requestId, transferId, direction: "to_sandbox" },
           "Host transfer proxy request timed out",
@@ -413,7 +413,7 @@ export class HostTransferProxy {
         const onAbort = () => {
           if (pendingInteractions.get(requestId)) {
             this.transfers.delete(transferId);
-            pendingInteractions.resolve(requestId);
+            pendingInteractions.resolve(requestId, "cancelled");
             try {
               broadcastMessage(
                 {
@@ -487,7 +487,7 @@ export class HostTransferProxy {
         );
       } catch (err) {
         this.transfers.delete(transferId);
-        pendingInteractions.resolve(requestId);
+        pendingInteractions.resolve(requestId, "cancelled");
         log.warn(
           { requestId, transferId, err },
           "Host transfer proxy send failed",
@@ -622,14 +622,14 @@ export class HostTransferProxy {
 
     if (entry.overwrite !== true && existsSync(entry.filePath)) {
       const errorMsg = `Destination file already exists: ${entry.filePath}. Set overwrite to true to replace it.`;
-      const interaction = pendingInteractions.resolve(requestId);
+      const interaction = pendingInteractions.resolve(requestId, "answered");
       this.transfers.delete(transferId);
       interaction?.rpcResolve?.({ content: errorMsg, isError: true });
       return { accepted: false, error: errorMsg };
     }
 
     const cleanup = () => {
-      pendingInteractions.resolve(requestId);
+      pendingInteractions.resolve(requestId, "answered");
       this.transfers.delete(transferId);
     };
 
@@ -662,7 +662,7 @@ export class HostTransferProxy {
     if (!interaction) return;
     const transferId = interaction.metadata?.transferId as string | undefined;
     if (transferId) this.transfers.delete(transferId);
-    pendingInteractions.resolve(requestId);
+    pendingInteractions.resolve(requestId, "cancelled");
     try {
       broadcastMessage(
         {
@@ -718,7 +718,7 @@ export class HostTransferProxy {
     for (const entry of pendingInteractions.getByKind("host_transfer")) {
       const transferId = entry.metadata?.transferId as string | undefined;
       if (transferId) this.transfers.delete(transferId);
-      pendingInteractions.resolve(entry.requestId);
+      pendingInteractions.resolve(entry.requestId, "cancelled");
       try {
         broadcastMessage(
           {

package/src/daemon/lifecycle.ts

@@ -2,6 +2,7 @@ import { join } from "node:path";
 
 import { config as dotenvConfig } from "dotenv";
 
+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 +36,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 +50,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";
@@ -358,6 +360,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 +543,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 +841,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 +939,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) {
@@ -1270,11 +1271,11 @@ export async function runDaemon(): Promise<void> {
     })();
 
     if (config.auditLog.retentionDays > 0) {
-      try {
-        rotateToolInvocations(config.auditLog.retentionDays);
-      } catch (err) {
-        log.warn({ err }, "Audit log rotation failed");
-      }
+      void rotateToolInvocations(config.auditLog.retentionDays).catch(
+        (err) => {
+          log.warn({ err }, "Audit log rotation failed");
+        },
+      );
     }
 
     const workspaceHeartbeat = new WorkspaceHeartbeatService();
@@ -1291,6 +1292,7 @@ export async function runDaemon(): Promise<void> {
         }),
     });
     heartbeat.start();
+    registerBackgroundWakeRuntime({ scheduler, heartbeat });
     log.info(
       {
         enabled: heartbeatConfig.enabled,
@@ -1347,6 +1349,7 @@ export async function runDaemon(): Promise<void> {
       mcpManager,
       telemetryReporter,
       cleanupPidFile: () => {
+        stopGatewayFlagListener();
         stopDiskPressureGuardForLifecycle();
         cleanupPidFile();
       },

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

@@ -44,7 +44,6 @@ import type {
   ExecutionTarget,
   Tool,
   ToolContext,
-  ToolDefinition,
 } from "../tools/types.js";
 import { RiskLevel } from "../tools/types.js";
 import { getLogger } from "../util/logger.js";
@@ -132,15 +131,11 @@ function buildProxyTool(
   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",
@@ -149,7 +144,6 @@ function buildProxyTool(
     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

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

@@ -321,14 +321,12 @@ export interface GenerationHandoff {
   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.
+   * Database ID of the completed assistant turn — the id that survives
+   * query-time merging when a turn persists multiple assistant rows. Matches
+   * the row the messages route returns.
    */
-  displayMessageId?: string;
+  messageId?: string;
 }
 
 export interface ModelInfo {
@@ -404,10 +402,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;
@@ -556,6 +552,7 @@ export type ConversationErrorCode =
   | "PROVIDER_INVALID_KEY"
   | "MANAGED_KEY_INVALID"
   | "CONTEXT_TOO_LARGE"
+  | "BUDGET_YIELD_UNRECOVERED"
   | "CONVERSATION_ABORTED"
   | "CONVERSATION_PROCESSING_FAILED"
   | "DISK_SPACE_CRITICAL"

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 { RelationshipStateUpdated } from "../../events/relationship-state-updated.js";
 
 /**
  * Broadcast after the daemon successfully writes a fresh home activity

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

@@ -304,14 +304,12 @@ export interface MessageComplete {
   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.
+   * Database ID of the completed assistant turn — the id that survives
+   * query-time merging when a turn persists multiple assistant rows. Matches
+   * the row the messages route returns.
    */
-  displayMessageId?: string;
+  messageId?: string;
   /**
    * Distinguishes a real main-turn completion from auxiliary events such as
    * call transcripts, call summaries, and watch notifier outputs. Clients
@@ -426,17 +424,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;
 }
 
 /**