@vellumai/assistant 0.8.7 → 0.8.8-dev.202606052332.17fc8ea

package/src/daemon/conversation-slash.ts

@@ -14,43 +14,24 @@ import { getVisibleProviderCatalog } from "../providers/provider-catalog-visibil
 export type SlashResolution =
   | { kind: "passthrough"; content: string }
   | { kind: "unknown"; message: string }
-  | { kind: "compact"; targetInputTokensOverride?: number }
+  | { kind: "compact" }
   | { kind: "clean" };
 
-const COMPACT_USAGE_HINT =
-  "Usage: `/compact [<tokens>]` (e.g. `/compact 30000`, `/compact 30k`, `/compact 1m`).";
+type CompactParse = { kind: "compact" } | { kind: "unknown"; message: string };
 
-type CompactParse =
-  | { kind: "compact"; targetInputTokensOverride?: number }
-  | { kind: "unknown"; message: string };
-
-const TOKEN_COUNT_PATTERN = /^(\d+(?:\.\d+)?)([km])?$/i;
 const COMPACT_COMMAND_PATTERN = /^\/compact(?:\s+(.+?))?\s*$/i;
 
-function parseTokenCount(input: string): number | null {
-  const match = input.match(TOKEN_COUNT_PATTERN);
-  if (!match) return null;
-  const value = Number.parseFloat(match[1]);
-  if (!Number.isFinite(value) || value <= 0) return null;
-  const suffix = match[2]?.toLowerCase();
-  const multiplier = suffix === "m" ? 1_000_000 : suffix === "k" ? 1_000 : 1;
-  const tokens = Math.floor(value * multiplier);
-  return tokens > 0 ? tokens : null;
-}
-
 function parseCompactCommand(trimmed: string): CompactParse | null {
   const match = trimmed.match(COMPACT_COMMAND_PATTERN);
   if (!match) return null;
   const rest = match[1]?.trim();
-  if (!rest) return { kind: "compact" };
-  const tokens = parseTokenCount(rest);
-  if (tokens == null) {
+  if (rest) {
     return {
       kind: "unknown",
-      message: `Unrecognized argument to \`/compact\`: \`${rest}\`. ${COMPACT_USAGE_HINT}`,
+      message: `\`/compact\` does not take arguments. Usage: \`/compact\`.`,
     };
   }
-  return { kind: "compact", targetInputTokensOverride: tokens };
+  return { kind: "compact" };
 }
 
 type CleanParse = { kind: "clean" } | { kind: "unknown"; message: string };
@@ -448,7 +429,7 @@ export async function resolveSlash(
     return await resolveModelList();
   }
 
-  // Handle /compact command (with optional `<tokens>` override).
+  // Handle /compact command (summarize history; takes no arguments).
   const compactParse = parseCompactCommand(trimmed);
   if (compactParse) return compactParse;
 

package/src/daemon/conversation-store.ts

@@ -27,99 +27,18 @@ import { ProviderNotConfiguredError } from "../util/errors.js";
 import { getSandboxWorkingDir } from "../util/platform.js";
 import { Conversation } from "./conversation.js";
 import type { ConversationEvictor } from "./conversation-evictor.js";
+import {
+  allConversations,
+  clearConversations,
+  conversationCount,
+  conversationIds,
+  deleteConversation,
+  findConversation,
+  setConversation,
+} from "./conversation-registry.js";
 import type { ConversationCreateOptions } from "./handlers/shared.js";
 import { buildTransportHints } from "./transport-hints.js";
 
-// ── Private store ──────────────────────────────────────────────────
-
-const conversations = new Map<string, Conversation>();
-
-// ── Read helpers ───────────────────────────────────────────────────
-
-export function findConversation(
-  conversationId: string,
-): Conversation | undefined {
-  return conversations.get(conversationId);
-}
-
-export function findConversationBySurfaceId(
-  surfaceId: string,
-): Conversation | undefined {
-  // Fast path: exact surfaceId match in surfaceState
-  for (const c of conversations.values()) {
-    if (c.surfaceState.has(surfaceId)) return c;
-  }
-
-  // Fallback: standalone app surfaces use "app-open-{appId}" IDs that
-  // were never part of any conversation.  Extract the appId and find
-  // a conversation whose surfaceState has a surface for that app.
-  const appOpenPrefix = "app-open-";
-  if (surfaceId.startsWith(appOpenPrefix)) {
-    const appId = surfaceId.slice(appOpenPrefix.length);
-    for (const c of conversations.values()) {
-      for (const [, state] of c.surfaceState.entries()) {
-        const data = state.data as unknown as Record<string, unknown>;
-        if (data?.appId === appId) {
-          // Register this surfaceId so subsequent lookups are O(1)
-          c.surfaceState.set(surfaceId, state);
-          return c;
-        }
-      }
-    }
-  }
-
-  return undefined;
-}
-
-function conversationCount(): number {
-  return conversations.size;
-}
-
-/** Iterate over all active conversations. */
-export function allConversations(): IterableIterator<Conversation> {
-  return conversations.values();
-}
-
-/** Iterate over all [id, conversation] entries. */
-export function conversationEntries(): IterableIterator<
-  [string, Conversation]
-> {
-  return conversations.entries();
-}
-
-/** Iterate over all active conversation IDs. */
-function conversationIds(): IterableIterator<string> {
-  return conversations.keys();
-}
-
-// ── Write helpers ──────────────────────────────────────────────────
-
-export function setConversation(
-  conversationId: string,
-  conversation: Conversation,
-): void {
-  conversations.set(conversationId, conversation);
-}
-
-export function deleteConversation(conversationId: string): boolean {
-  return conversations.delete(conversationId);
-}
-
-export function clearConversations(): void {
-  conversations.clear();
-}
-
-// ── Underlying Map (for the evictor, which takes a mutable ref) ───
-
-/**
- * Expose the raw Map for the {@link ConversationEvictor}, which needs
- * a mutable reference to delete entries during sweeps. No other code
- * should use this — prefer the named helpers above.
- */
-export function getConversationMap(): Map<string, Conversation> {
-  return conversations;
-}
-
 // ── Per-conversation persistent options ────────────────────────────
 
 const conversationOptions = new Map<string, ConversationCreateOptions>();

package/src/daemon/conversation-surfaces.ts

@@ -38,10 +38,13 @@ import type { HostAppControlProxy } from "./host-app-control-proxy.js";
 import type { HostCuProxy } from "./host-cu-proxy.js";
 import type {
   CardSurfaceData,
+  ChoiceSurfaceData,
   ConfirmationSurfaceData,
+  CopyBlockSurfaceData,
   DynamicPageSurfaceData,
   FormSurfaceData,
   ListSurfaceData,
+  OAuthConnectSurfaceData,
   ServerMessage,
   SurfaceData,
   SurfaceType,
@@ -395,6 +398,107 @@ function normalizeTaskProgressCardPatch(
   return normalizedPatch;
 }
 
+function normalizeChoiceShowData(
+  rawData: Record<string, unknown>,
+): ChoiceSurfaceData {
+  const options = Array.isArray(rawData.options)
+    ? rawData.options
+        .filter((option): option is Record<string, unknown> =>
+          isPlainObject(option),
+        )
+        .map((option) => {
+          const id = typeof option.id === "string" ? option.id.trim() : "";
+          const title =
+            typeof option.title === "string"
+              ? option.title.trim()
+              : typeof option.label === "string"
+                ? option.label.trim()
+                : "";
+          if (!id || !title) return null;
+          return {
+            id,
+            title,
+            ...(typeof option.description === "string"
+              ? { description: option.description }
+              : {}),
+            ...(option.recommended === true ? { recommended: true } : {}),
+            ...(isPlainObject(option.data)
+              ? { data: option.data as Record<string, unknown> }
+              : {}),
+          };
+        })
+        .filter(
+          (option): option is NonNullable<typeof option> => option !== null,
+        )
+    : [];
+
+  return {
+    ...(typeof rawData.description === "string"
+      ? { description: rawData.description }
+      : {}),
+    options,
+    selectionMode: rawData.selectionMode === "multiple" ? "multiple" : "single",
+    ...(typeof rawData.submitLabel === "string"
+      ? { submitLabel: rawData.submitLabel }
+      : {}),
+    ...(typeof rawData.commitOnSelect === "boolean"
+      ? { commitOnSelect: rawData.commitOnSelect }
+      : {}),
+  };
+}
+
+function normalizeCopyBlockShowData(
+  rawData: Record<string, unknown>,
+): CopyBlockSurfaceData {
+  return {
+    text: typeof rawData.text === "string" ? rawData.text : "",
+    ...(typeof rawData.label === "string" ? { label: rawData.label } : {}),
+    ...(typeof rawData.language === "string"
+      ? { language: rawData.language }
+      : {}),
+  };
+}
+
+function normalizeOAuthConnectShowData(
+  rawData: Record<string, unknown>,
+): OAuthConnectSurfaceData {
+  return {
+    providerKey:
+      typeof rawData.providerKey === "string" ? rawData.providerKey.trim() : "",
+    ...(typeof rawData.displayName === "string"
+      ? { displayName: rawData.displayName }
+      : {}),
+    ...(typeof rawData.description === "string"
+      ? { description: rawData.description }
+      : {}),
+    ...(typeof rawData.logoUrl === "string" || rawData.logoUrl === null
+      ? { logoUrl: rawData.logoUrl }
+      : {}),
+  };
+}
+
+function buildChoiceActions(data: ChoiceSurfaceData): Array<{
+  id: string;
+  label: string;
+  style?: string;
+  data?: Record<string, unknown>;
+}> {
+  return data.options.map((option) => ({
+    id: option.id,
+    label: option.title,
+    style: option.recommended ? "primary" : "secondary",
+    data: {
+      choiceId: option.id,
+      choiceTitle: option.title,
+      selectedIds: [option.id],
+      selectedTitles: [option.title],
+      ...(option.description ? { choiceDescription: option.description } : {}),
+      ...(option.recommended ? { recommended: true } : {}),
+      ...(option.data ?? {}),
+    },
+  }));
+}
+
 function isTaskProgressCardData(data: SurfaceData | Record<string, unknown>) {
   return (data as Record<string, unknown>).template === "task_progress";
 }
@@ -1699,6 +1803,8 @@ export async function handleSurfaceAction(
   // been accepted. Deferred until after rejection check so the surface stays
   // active and retryable if the queue was full.
   const ONE_SHOT_SURFACE_TYPES = [
+    "choice",
+    "oauth_connect",
     "form",
     "confirmation",
     "file_upload",
@@ -1860,6 +1966,12 @@ export function buildCompletionSummary(
   data?: Record<string, unknown>,
   surfaceData?: Record<string, unknown>,
 ): string {
+  const selectedTitles = Array.isArray(data?.selectedTitles)
+    ? data.selectedTitles.filter(
+        (title): title is string => typeof title === "string",
+      )
+    : [];
+
   if (surfaceType === "confirmation") {
     if (actionId === "cancel") {
       const cancelLabel =
@@ -1892,6 +2004,43 @@ export function buildCompletionSummary(
   if (surfaceType === "form") {
     return "Submitted";
   }
+  if (surfaceType === "choice" && data) {
+    const choiceTitle =
+      typeof data.choiceTitle === "string" ? data.choiceTitle : undefined;
+    if (choiceTitle) return `User chose: "${choiceTitle}"`;
+    if (selectedTitles.length === 1)
+      return `User chose: "${selectedTitles[0]}"`;
+    if (selectedTitles.length > 1) {
+      return `User chose ${selectedTitles.length} options: ${selectedTitles
+        .map((title) => `"${title}"`)
+        .join(", ")}`;
+    }
+    return `User chose: ${actionId}`;
+  }
+  if (surfaceType === "oauth_connect") {
+    const providerLabel =
+      typeof data?.providerLabel === "string"
+        ? data.providerLabel
+        : typeof data?.displayName === "string"
+          ? data.displayName
+          : typeof data?.providerKey === "string"
+            ? data.providerKey
+            : "OAuth";
+    const accountLabel =
+      typeof data?.accountLabel === "string" ? data.accountLabel : undefined;
+    if (actionId === "connect" || data?.status === "connected") {
+      return accountLabel
+        ? `Connected ${providerLabel}: ${accountLabel}`
+        : `Connected ${providerLabel}`;
+    }
+    if (actionId === "cancel" || data?.status === "cancelled") {
+      return `Cancelled ${providerLabel} connection`;
+    }
+    if (data?.status === "error") {
+      return `${providerLabel} connection failed`;
+    }
+    return `${providerLabel} connection ${actionId}`;
+  }
   if (surfaceType === "list" && data) {
     const selectedIds = data.selectedIds as string[] | undefined;
     const actionSuffix = actionId ? ` (action: ${actionId})` : "";
@@ -1922,6 +2071,11 @@ function buildUserFacingLabel(
   surfaceData?: Record<string, unknown>,
 ): string {
   const count = (data?.selectedIds as string[] | undefined)?.length;
+  const selectedTitles = Array.isArray(data?.selectedTitles)
+    ? data.selectedTitles.filter(
+        (title): title is string => typeof title === "string",
+      )
+    : [];
 
   if (surfaceType === "confirmation") {
     if (actionId === "cancel") {
@@ -1948,6 +2102,39 @@ function buildUserFacingLabel(
     return `Selected: ${actionId}`;
   }
   if (surfaceType === "form") return "Submitted";
+  if (surfaceType === "choice") {
+    const choiceTitle =
+      typeof data?.choiceTitle === "string" ? data.choiceTitle : undefined;
+    if (choiceTitle) return choiceTitle;
+    if (selectedTitles.length === 1) return selectedTitles[0];
+    if (selectedTitles.length > 1)
+      return `Selected ${selectedTitles.length} options`;
+    return "Selected";
+  }
+  if (surfaceType === "oauth_connect") {
+    const providerLabel =
+      typeof data?.providerLabel === "string"
+        ? data.providerLabel
+        : typeof data?.displayName === "string"
+          ? data.displayName
+          : typeof data?.providerKey === "string"
+            ? data.providerKey
+            : "OAuth";
+    const accountLabel =
+      typeof data?.accountLabel === "string" ? data.accountLabel : undefined;
+    if (actionId === "connect" || data?.status === "connected") {
+      return accountLabel
+        ? `Connected ${providerLabel}: ${accountLabel}`
+        : `Connected ${providerLabel}`;
+    }
+    if (actionId === "cancel" || data?.status === "cancelled") {
+      return "Cancelled";
+    }
+    if (data?.status === "error") {
+      return `${providerLabel} connection failed`;
+    }
+    return `Selected: ${actionId}`;
+  }
 
   // Table / list selection actions
   if (count) {
@@ -2213,11 +2400,17 @@ export async function surfaceProxyResolver(
     const data = (
       surfaceType === "card"
         ? normalizeCardShowData(input, rawData)
-        : surfaceType === "dynamic_page"
-          ? normalizeDynamicPageShowData(input, rawData)
-          : rawData
+        : surfaceType === "choice"
+          ? normalizeChoiceShowData(rawData)
+          : surfaceType === "copy_block"
+            ? normalizeCopyBlockShowData(rawData)
+            : surfaceType === "oauth_connect"
+              ? normalizeOAuthConnectShowData(rawData)
+              : surfaceType === "dynamic_page"
+                ? normalizeDynamicPageShowData(input, rawData)
+                : rawData
     ) as SurfaceData;
-    const actions = input.actions as
+    const inputActions = input.actions as
       | Array<{
           id: string;
           label: string;
@@ -2225,8 +2418,33 @@ export async function surfaceProxyResolver(
           data?: Record<string, unknown>;
         }>
       | undefined;
+    const actions =
+      surfaceType === "choice"
+        ? buildChoiceActions(data as ChoiceSurfaceData)
+        : inputActions;
     // Interactive surfaces default to awaiting user action.
     const hasActions = Array.isArray(actions) && actions.length > 0;
+    if (surfaceType === "choice" && !hasActions) {
+      return {
+        content:
+          "choice surfaces require at least one option with both id and title.",
+        isError: true,
+      };
+    }
+    const oauthProviderKey =
+      surfaceType === "oauth_connect"
+        ? (data as unknown as Record<string, unknown>).providerKey
+        : undefined;
+    if (
+      surfaceType === "oauth_connect" &&
+      (typeof oauthProviderKey !== "string" ||
+        oauthProviderKey.trim().length === 0)
+    ) {
+      return {
+        content: "oauth_connect surfaces require data.providerKey.",
+        isError: true,
+      };
+    }
     const isInteractive =
       surfaceType === "card"
         ? hasActions

package/src/daemon/conversation-tool-setup.ts

@@ -11,14 +11,12 @@ import {
   type InterfaceId,
   supportsHostProxy,
 } from "../channels/types.js";
-import { isHttpAuthDisabled } from "../config/env.js";
 import { getIsPlatform } from "../config/env-registry.js";
 import { getConfig } from "../config/loader.js";
 import { getBindingByConversation } from "../memory/external-conversation-store.js";
 import type { PermissionPrompter } from "../permissions/prompter.js";
 import type { SecretPrompter } from "../permissions/secret-prompter.js";
 import type { Message, ToolDefinition } from "../providers/types.js";
-import type { TrustClass } from "../runtime/actor-trust-resolver.js";
 import { assistantEventHub } from "../runtime/assistant-event-hub.js";
 import { registerConversationSender } from "../tools/browser/browser-screencast.js";
 import type { ToolExecutor } from "../tools/executor.js";
@@ -48,27 +46,10 @@ import {
 } from "./doordash-steps.js";
 import type { ServerMessage, UiSurfaceShow } from "./message-protocol.js";
 import { runPostExecutionSideEffects } from "./tool-side-effects.js";
-import type { TrustContext } from "./trust-context.js";
+import { resolveTrustClass } from "./trust-context.js";
 
 const log = getLogger("conversation-tool-setup");
 
-/**
- * Resolve the effective trust class for tool execution.
- *
- * When HTTP auth is disabled (dev bypass), always returns `'guardian'`
- * so that control-plane gates don't block local development.
- *
- * When no trust context is available (e.g. desktop-only conversations that
- * don't go through channel trust resolution), defaults to `'unknown'`
- * to fail-closed.
- */
-export function resolveTrustClass(
-  trustContext: TrustContext | undefined,
-): TrustClass {
-  if (isHttpAuthDisabled()) return "guardian";
-  return trustContext?.trustClass ?? "unknown";
-}
-
 import { isAssistantFeatureFlagEnabled } from "../config/assistant-feature-flags.js";
 import { AUTO_PROFILE_KEY } from "../config/seed-inference-profiles.js";
 import {
@@ -97,7 +78,6 @@ export function createToolExecutor(
   input: Record<string, unknown>,
   onOutput?: (chunk: string) => void,
   toolUseId?: string,
-  turnContext?: import("../plugins/types.js").TurnContext,
 ) => Promise<ToolExecutionResult> {
   // Register the conversation's sendToClient for browser screencast surface messages
   registerConversationSender(ctx.conversationId, (msg) =>
@@ -109,7 +89,6 @@ export function createToolExecutor(
     input: Record<string, unknown>,
     onOutput?: (chunk: string) => void,
     toolUseId?: string,
-    turnContext?: import("../plugins/types.js").TurnContext,
   ) => {
     const { name: executionName, input: executionInput } =
       resolveToolInvocationAlias(name, input, ctx.allowedToolNames);
@@ -257,12 +236,7 @@ export function createToolExecutor(
         };
       }
 
-      const result = await executor.execute(
-        toolName,
-        toolInput,
-        toolContext,
-        turnContext,
-      );
+      const result = await executor.execute(toolName, toolInput, toolContext);
       if (toolContext.approvedViaPrompt) {
         ctx.approvedViaPromptThisTurn = true;
       }
@@ -276,7 +250,6 @@ export function createToolExecutor(
       executionName,
       executionInput,
       toolContext,
-      turnContext,
     );
     if (toolContext.approvedViaPrompt) {
       ctx.approvedViaPromptThisTurn = true;

package/src/daemon/conversation-workspace.ts

@@ -4,6 +4,7 @@ import { getConversation } from "../memory/conversation-crud.js";
 import { resolveConversationDirectoryPaths } from "../memory/conversation-directories.js";
 import { renderWorkspaceTopLevelContext } from "../workspace/top-level-renderer.js";
 import { scanTopLevelDirectories } from "../workspace/top-level-scanner.js";
+import { findConversationOrSubagent } from "./conversation-registry.js";
 
 /**
  * Subset of Conversation state that workspace context helpers need.
@@ -25,6 +26,22 @@ export interface WorkspaceConversationContext {
   hostUsername?: string;
 }
 
+/**
+ * Resolve the live workspace top-level block for a conversation, refreshing
+ * the dirty-guarded cache first so a workspace-mutating tool's
+ * `markWorkspaceTopLevelDirty` from the prior turn is picked up. Returns `null`
+ * when no live conversation is found (no active conversation, or a context with
+ * no conversation id) or when the rendered context is empty.
+ */
+export function resolveWorkspaceTopLevelContext(
+  conversationId: string | undefined,
+): string | null {
+  const conversation = findConversationOrSubagent(conversationId);
+  if (!conversation) return null;
+  refreshWorkspaceTopLevelContextIfNeeded(conversation);
+  return conversation.workspaceTopLevelContext;
+}
+
 /** Refresh workspace top-level directory context if needed. */
 export function refreshWorkspaceTopLevelContextIfNeeded(
   ctx: WorkspaceConversationContext,