@vellumai/assistant 0.8.8 → 0.8.9-staging.2

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

@@ -1960,6 +1960,15 @@ export function refreshSurfacesForApp(
   return refreshed;
 }
 
+/**
+ * Strip a leading "Connect "/"Connected " verb from an OAuth provider label so
+ * a supplied displayName like "Connect Gmail" doesn't double the verb when
+ * prefixed (e.g. avoids "Connected Connect Gmail").
+ */
+function stripConnectVerb(label: string): string {
+  return label.replace(/^connect(?:ed)?\s+/i, "");
+}
+
 export function buildCompletionSummary(
   surfaceType: string | undefined,
   actionId: string,
@@ -2026,20 +2035,24 @@ export function buildCompletionSummary(
           : typeof data?.providerKey === "string"
             ? data.providerKey
             : "OAuth";
+    // Strip the verb once so every branch (connected/cancelled/failed/
+    // fallback) is normalized — a displayName like "Connect Gmail" must not
+    // produce "Cancelled Connect Gmail connection".
+    const label = stripConnectVerb(providerLabel);
     const accountLabel =
       typeof data?.accountLabel === "string" ? data.accountLabel : undefined;
     if (actionId === "connect" || data?.status === "connected") {
       return accountLabel
-        ? `Connected ${providerLabel}: ${accountLabel}`
-        : `Connected ${providerLabel}`;
+        ? `Connected ${label}: ${accountLabel}`
+        : `Connected ${label}`;
     }
     if (actionId === "cancel" || data?.status === "cancelled") {
-      return `Cancelled ${providerLabel} connection`;
+      return `Cancelled ${label} connection`;
     }
     if (data?.status === "error") {
-      return `${providerLabel} connection failed`;
+      return `${label} connection failed`;
     }
-    return `${providerLabel} connection ${actionId}`;
+    return `${label} connection ${actionId}`;
   }
   if (surfaceType === "list" && data) {
     const selectedIds = data.selectedIds as string[] | undefined;
@@ -2120,18 +2133,21 @@ function buildUserFacingLabel(
           : typeof data?.providerKey === "string"
             ? data.providerKey
             : "OAuth";
+    // Strip the verb once so every branch is normalized (e.g. a displayName
+    // like "Connect Gmail" must not produce "Connect Gmail connection failed").
+    const label = stripConnectVerb(providerLabel);
     const accountLabel =
       typeof data?.accountLabel === "string" ? data.accountLabel : undefined;
     if (actionId === "connect" || data?.status === "connected") {
       return accountLabel
-        ? `Connected ${providerLabel}: ${accountLabel}`
-        : `Connected ${providerLabel}`;
+        ? `Connected ${label}: ${accountLabel}`
+        : `Connected ${label}`;
     }
     if (actionId === "cancel" || data?.status === "cancelled") {
       return "Cancelled";
     }
     if (data?.status === "error") {
-      return `${providerLabel} connection failed`;
+      return `${label} connection failed`;
     }
     return `Selected: ${actionId}`;
   }

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,