@vellumai/assistant 0.8.3 → 0.8.5

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;
 }
 
@@ -202,6 +210,85 @@ export function deleteQueuedMessage(
   return { removed: false, reason: "message_not_found" };
 }
 
+/**
+ * Steer a conversation to a specific queued message.
+ * Promotes the message to the head of the queue, marks the conversation
+ * as needing tool-result repair, and aborts the current generation so the
+ * drain path picks up the promoted message.
+ *
+ * Returns `{ steered: true }` on success, or `{ steered: false, reason }` on failure.
+ */
+export function steerToMessage(
+  conversationId: string,
+  requestId: string,
+):
+  | { steered: true }
+  | {
+      steered: false;
+      reason:
+        | "conversation_not_found"
+        | "message_not_found"
+        | "not_processing";
+    } {
+  const conversation = findConversation(conversationId);
+  if (!conversation) {
+    log.warn(
+      { conversationId, requestId },
+      "No conversation found for steer_to_message",
+    );
+    return { steered: false, reason: "conversation_not_found" };
+  }
+
+  if (!conversation.isProcessing()) {
+    log.warn(
+      { conversationId, requestId },
+      "Cannot steer: conversation is not processing",
+    );
+    return { steered: false, reason: "not_processing" };
+  }
+
+  const promoted = conversation.queue.promoteToHead(requestId);
+  if (!promoted) {
+    log.warn(
+      { conversationId, requestId },
+      "Queued message not found for steering",
+    );
+    return { steered: false, reason: "message_not_found" };
+  }
+
+  // Mark the conversation for tool-result repair so the drain path can
+  // inject synthetic tool results for any pending tool_use blocks that
+  // were abandoned by the aborted generation.
+  conversation.pendingSteerRepair = true;
+
+  // Broadcast the steer event so clients can update their UI.
+  broadcastMessage({
+    type: "message_steered",
+    conversationId,
+    requestId,
+  });
+
+  log.info(
+    { conversationId, requestId },
+    "Steering to queued message — aborting current generation",
+  );
+
+  // Abort the in-flight generation. The agent loop's finally block calls
+  // drainQueue, which will pick up the promoted message at the head.
+  // Unlike abortConversation, we do NOT clear the queue or dispose
+  // prompters — we want the queue to drain with the promoted message first.
+  const reason = createAbortReason(
+    "preempted_by_new_message",
+    "steerToMessage",
+    conversationId,
+  );
+  conversation.abortController?.abort(reason);
+  // Deny pending confirmations so the abort unblocks immediately.
+  conversation.denyAllPendingConfirmations();
+
+  return { steered: true };
+}
+
 // ---------------------------------------------------------------------------
 // HTTP handler (delegates to shared logic)
 // ---------------------------------------------------------------------------

package/src/daemon/handlers/shared.ts

@@ -92,6 +92,19 @@ export interface HistorySurface {
   completionSummary?: string;
 }
 
+/**
+ * Positional reference to a file attachment captured while walking the
+ * content array. The index of an entry in `RenderedHistoryContent.attachments`
+ * is what `contentOrder` references as `attachment:N`.
+ */
+export interface HistoryAttachmentRef {
+  /** Stable DB attachment id when persisted on the file block (`_attachmentId`). */
+  attachmentId?: string;
+  filename: string;
+  mimeType: string;
+  sizeBytes: number;
+}
+
 export interface RenderedHistoryContent {
   text: string;
   toolCalls: HistoryToolCall[];
@@ -99,12 +112,18 @@ export interface RenderedHistoryContent {
   toolCallsBeforeText: boolean;
   /** Text segments split by tool-call boundaries. */
   textSegments: string[];
-  /** Content block ordering using "text:N", "tool:N", "surface:N" encoding. */
+  /** Content block ordering using "text:N", "tool:N", "surface:N", "attachment:N" encoding. */
   contentOrder: string[];
   /** UI surfaces (widgets) embedded in the message. */
   surfaces: HistorySurface[];
   /** Thinking segments extracted from thinking blocks. */
   thinkingSegments: string[];
+  /**
+   * File attachments captured in content order. Index `N` matches an
+   * `attachment:N` entry in `contentOrder`. Callers align their DB-sourced
+   * attachment metadata to this ordering for inline placement.
+   */
+  attachments: HistoryAttachmentRef[];
 }
 
 /**
@@ -115,6 +134,8 @@ export interface RenderedHistoryContent {
 export interface SlackInboundMessageMetadata {
   /** Slack channel id (conversation external id) — recorded as `channelId`. */
   channelId: string;
+  /** Human-readable Slack channel name, when the gateway supplied it. */
+  channelName?: string;
   /** Slack `ts` for this message — required so persistence can record `channelTs`. */
   channelTs: string;
   /** Parent `thread_ts` when the message lives inside a thread; absent for top-level. */
@@ -123,6 +144,18 @@ export interface SlackInboundMessageMetadata {
   displayName?: string;
   /** Canonical Slack external user id for the sender, when available. */
   actorExternalUserId?: string;
+  /** Raw Slack profile timezone for the sender, when supplied. */
+  actorTimezone?: string;
+  /** Compact Slack profile timezone label for the sender, when supplied. */
+  actorTimezoneLabel?: string;
+  /** Raw Slack profile timezone offset in seconds, when supplied. */
+  actorTimezoneOffsetSeconds?: number;
+  /** Timezone used to render this message's timestamp. */
+  timestampTimezone?: string;
+  /** Compact label for the rendered timestamp timezone. */
+  timestampTimezoneLabel?: string;
+  /** Compact timezone label appended to the rendered speaker name. */
+  speakerTimezoneLabel?: string;
 }
 
 /**
@@ -144,8 +177,6 @@ export interface ConversationCreateOptions {
   authContext?: AuthContext;
   /** Whether this turn can block on interactive approval prompts. */
   isInteractive?: boolean;
-  /** Slack-only non-persisted notice injected into the active model turn. */
-  slackRuntimeContextNotice?: string;
   /**
    * Persisted user-facing content. When present, storage/UI use this value
    * while the model-facing turn continues to use `content`.
@@ -192,22 +223,42 @@ function clampAttachmentText(text: string): string {
   return `${text.slice(0, HISTORY_ATTACHMENT_TEXT_LIMIT)}<truncated />`;
 }
 
-function renderFileBlockForHistory(block: Record<string, unknown>): string {
+interface FileBlockMetadata {
+  mediaType: string;
+  filename: string;
+  sizeBytes: number;
+}
+
+function extractFileBlockMetadata(
+  block: Record<string, unknown>,
+): FileBlockMetadata {
   const source = isRecord(block.source) ? block.source : null;
-  const mediaType =
-    source && typeof source.media_type === "string"
-      ? source.media_type
-      : "application/octet-stream";
-  const filename =
-    source && typeof source.filename === "string"
-      ? source.filename
-      : "attachment";
-  const sizeBytes =
-    source && typeof source.data === "string"
-      ? estimateBase64Bytes(source.data)
-      : 0;
-  const summaryParts = [`[File attachment] ${filename}`, `type=${mediaType}`];
-  if (sizeBytes > 0) summaryParts.push(`size=${formatBytes(sizeBytes)}`);
+  return {
+    mediaType:
+      source && typeof source.media_type === "string"
+        ? source.media_type
+        : "application/octet-stream",
+    filename:
+      source && typeof source.filename === "string"
+        ? source.filename
+        : "attachment",
+    sizeBytes:
+      source && typeof source.data === "string"
+        ? estimateBase64Bytes(source.data)
+        : 0,
+  };
+}
+
+function renderFileBlockForHistory(
+  block: Record<string, unknown>,
+  meta: FileBlockMetadata,
+): string {
+  const summaryParts = [
+    `[File attachment] ${meta.filename}`,
+    `type=${meta.mediaType}`,
+  ];
+  if (meta.sizeBytes > 0)
+    summaryParts.push(`size=${formatBytes(meta.sizeBytes)}`);
 
   const extractedText =
     typeof block.extracted_text === "string" ? block.extracted_text.trim() : "";
@@ -237,11 +288,13 @@ export function renderHistoryContent(content: unknown): RenderedHistoryContent {
       contentOrder: text ? ["text:0"] : [],
       surfaces: [],
       thinkingSegments: [],
+      attachments: [],
     };
   }
 
   const textParts: string[] = [];
   const attachmentParts: string[] = [];
+  const attachments: HistoryAttachmentRef[] = [];
   const toolCalls: HistoryToolCall[] = [];
   const surfaces: HistorySurface[] = [];
   const thinkingSegments: string[] = [];
@@ -351,7 +404,19 @@ export function renderHistoryContent(content: unknown): RenderedHistoryContent {
       continue;
     }
     if (block.type === "file") {
-      attachmentParts.push(renderFileBlockForHistory(block));
+      const meta = extractFileBlockMetadata(block);
+      attachmentParts.push(renderFileBlockForHistory(block, meta));
+      finalizeSegment();
+      const ref: HistoryAttachmentRef = {
+        filename: meta.filename,
+        mimeType: meta.mediaType,
+        sizeBytes: meta.sizeBytes,
+      };
+      if (typeof block._attachmentId === "string" && block._attachmentId) {
+        ref.attachmentId = block._attachmentId;
+      }
+      attachments.push(ref);
+      contentOrder.push(`attachment:${attachments.length - 1}`);
       continue;
     }
     if (block.type === "image") {
@@ -495,17 +560,14 @@ export function renderHistoryContent(content: unknown): RenderedHistoryContent {
           matched.imageData = imageDataList[0];
           matched.imageDataList = imageDataList;
         }
-      } else {
-        toolCalls.push({
-          name: "unknown",
-          input: {},
-          result: resultContent,
-          isError,
-          ...(imageDataList.length > 0
-            ? { imageData: imageDataList[0], imageDataList }
-            : {}),
-        });
       }
+      // Orphan tool_result with no matching tool_use — drop it. Synthesizing
+      // a "name: 'unknown'" phantom entry rendered in chat as "Used unknown"
+      // / "Completed 1 step" with no context, with a timestamp later than
+      // the assistant's final answer. Most commonly orphans appear when
+      // context-window compaction trims the parent tool_use block while
+      // leaving the paired tool_result. Losing the orphan's result content
+      // is correct: without the parent we can't tell the user what tool ran.
       continue;
     }
   }
@@ -541,6 +603,7 @@ export function renderHistoryContent(content: unknown): RenderedHistoryContent {
     contentOrder,
     surfaces,
     thinkingSegments,
+    attachments,
   };
 }
 

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

@@ -185,7 +185,7 @@ export class HostBashProxy extends HostProxyBase<
       timedOut: boolean;
     },
   ): void {
-    pendingInteractions.resolve(requestId);
+    pendingInteractions.resolve(requestId, "answered");
     this.resolve(requestId, response);
   }
 }

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)));
       }
@@ -280,7 +280,7 @@ export class HostCuProxy {
     observation: CuObservationResult,
   ): ToolExecutionResult | undefined {
     this._ownedRequests.delete(requestId);
-    const interaction = pendingInteractions.resolve(requestId);
+    const interaction = pendingInteractions.resolve(requestId, "answered");
     if (!interaction?.rpcResolve) {
       log.warn({ requestId }, "No pending host CU request for response");
       return undefined;
@@ -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",
@@ -227,7 +227,7 @@ export class HostFileProxy {
     requestId: string,
     response: { content: string; isError: boolean; imageData?: string },
   ): void {
-    const interaction = pendingInteractions.resolve(requestId);
+    const interaction = pendingInteractions.resolve(requestId, "answered");
     if (!interaction?.rpcResolve) {
       log.warn({ requestId }, "No pending host file request for response");
       return;
@@ -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",
@@ -508,7 +508,7 @@ export class HostTransferProxy {
       errorMessage?: string;
     },
   ): void {
-    const interaction = pendingInteractions.resolve(requestId);
+    const interaction = pendingInteractions.resolve(requestId, "answered");
     if (!interaction?.rpcResolve) {
       log.warn({ requestId }, "No pending host transfer request for response");
       return;
@@ -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(
           {