@vellumai/assistant 0.5.1 → 0.5.2

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

@@ -100,6 +100,8 @@ export interface DynamicPageSurfaceData {
   width?: number;
   height?: number;
   appId?: string;
+  /** Filesystem directory name for this app (may differ from `appId`). */
+  dirName?: string;
   reloadGeneration?: number;
   status?: string;
   preview?: DynamicPagePreview;

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

@@ -0,0 +1,23 @@
+/** Broadcast to connected clients when a service group update is about to begin. */
+export interface ServiceGroupUpdateStarting {
+  type: "service_group_update_starting";
+  /** The version being upgraded to. */
+  targetVersion: string;
+  /** Estimated seconds of downtime. */
+  expectedDowntimeSeconds: number;
+}
+
+/** Broadcast to connected clients when a service group update has completed. */
+export interface ServiceGroupUpdateComplete {
+  type: "service_group_update_complete";
+  /** The version that was installed (may differ from target if rolled back). */
+  installedVersion: string;
+  /** Whether the update succeeded or rolled back. */
+  success: boolean;
+  /** If rolled back, the version reverted to. */
+  rolledBackToVersion?: string;
+}
+
+export type _UpgradesServerMessages =
+  | ServiceGroupUpdateStarting
+  | ServiceGroupUpdateComplete;

package/src/daemon/server.ts

@@ -6,6 +6,7 @@ import {
   getAcpSessionManager,
   setBroadcastToAllClients,
 } from "../acp/index.js";
+import { enrichMessageWithSourcePaths } from "../agent/attachments.js";
 import {
   createAssistantMessage,
   createUserMessage,
@@ -34,12 +35,14 @@ import {
 } from "../memory/canonical-guardian-store.js";
 import {
   addMessage,
+  getConversation,
   getConversationMemoryScopeId,
   getConversationType,
   provenanceFromTrustContext,
   setConversationOriginChannelIfUnset,
   setConversationOriginInterfaceIfUnset,
 } from "../memory/conversation-crud.js";
+import { updateMetaFile } from "../memory/conversation-disk-view.js";
 import { getOrCreateConversation } from "../memory/conversation-key-store.js";
 import { buildSystemPrompt } from "../prompts/system-prompt.js";
 import { resolveManagedProxyContext } from "../providers/managed-proxy/context.js";
@@ -75,7 +78,7 @@ import {
 } from "./conversation.js";
 import { ConversationEvictor } from "./conversation-evictor.js";
 import { resolveChannelCapabilities } from "./conversation-runtime-assembly.js";
-import { resolveSlash } from "./conversation-slash.js";
+import { resolveSlash, type SlashContext } from "./conversation-slash.js";
 import { undoLastMessage } from "./handlers/conversations.js";
 import { parseIdentityFields } from "./handlers/identity.js";
 import type {
@@ -878,6 +881,7 @@ export class DaemonServer {
       filename: string;
       mimeType: string;
       data: string;
+      filePath?: string;
     }[];
   }> {
     const ingressCheck = checkIngressForSecrets(content);
@@ -960,12 +964,22 @@ export class DaemonServer {
     });
 
     const attachments = attachmentIds
-      ? attachmentsStore.getAttachmentsByIds(attachmentIds).map((a) => ({
-          id: a.id,
-          filename: a.originalFilename,
-          mimeType: a.mimeType,
-          data: a.dataBase64,
-        }))
+      ? (() => {
+          const resolved = attachmentsStore.getAttachmentsByIds(attachmentIds, {
+            hydrateFileData: true,
+          });
+          const sourcePaths =
+            attachmentsStore.getSourcePathsForAttachments(attachmentIds);
+          return resolved.map((a) => ({
+            id: a.id,
+            filename: a.originalFilename,
+            mimeType: a.mimeType,
+            data: a.dataBase64,
+            ...(sourcePaths.has(a.id)
+              ? { filePath: sourcePaths.get(a.id) }
+              : {}),
+          }));
+        })()
       : [];
 
     return { conversation, attachments };
@@ -1057,14 +1071,32 @@ export class DaemonServer {
         sourceInterface,
       );
 
-    const slashResult = await resolveSlash(content);
+    const config = getConfig();
+    const serverInterfaceCtx = conversation.getTurnInterfaceContext();
+    const slashContext: SlashContext = {
+      messageCount: conversation.getMessages().length,
+      inputTokens: conversation.usageStats.inputTokens,
+      outputTokens: conversation.usageStats.outputTokens,
+      maxInputTokens: config.contextWindow.maxInputTokens,
+      model: config.services.inference.model,
+      provider: config.services.inference.provider,
+      estimatedCost: conversation.usageStats.estimatedCost,
+      userMessageInterface: serverInterfaceCtx?.userMessageInterface,
+    };
+    const slashResult = await resolveSlash(content, slashContext);
 
     if (slashResult.kind === "unknown") {
       const serverTurnCtx = conversation.getTurnChannelContext();
-      const serverInterfaceCtx = conversation.getTurnInterfaceContext();
       const serverProvenance = provenanceFromTrustContext(
         conversation.trustContext,
       );
+      const imageSourcePaths: Record<string, string> = {};
+      for (let i = 0; i < attachments.length; i++) {
+        const a = attachments[i];
+        if (a.filePath && a.mimeType.toLowerCase().startsWith("image/")) {
+          imageSourcePaths[`${i}:${a.filename}`] = a.filePath;
+        }
+      }
       const serverChannelMeta = {
         ...serverProvenance,
         ...(serverTurnCtx
@@ -1080,15 +1112,19 @@ export class DaemonServer {
                 serverInterfaceCtx.assistantMessageInterface,
             }
           : {}),
+        ...(Object.keys(imageSourcePaths).length > 0
+          ? { imageSourcePaths }
+          : {}),
       };
-      const userMsg = createUserMessage(content, attachments);
+      const cleanMsg = createUserMessage(content, attachments);
+      const llmMsg = enrichMessageWithSourcePaths(cleanMsg, attachments);
       const persisted = await addMessage(
         conversationId,
         "user",
-        JSON.stringify(userMsg.content),
+        JSON.stringify(cleanMsg.content),
         serverChannelMeta,
       );
-      conversation.getMessages().push(userMsg);
+      conversation.getMessages().push(llmMsg);
 
       if (serverTurnCtx) {
         try {
@@ -1117,6 +1153,21 @@ export class DaemonServer {
         }
       }
 
+      // Rewrite meta.json so the on-disk metadata reflects the origin channel
+      if (serverTurnCtx || serverInterfaceCtx) {
+        try {
+          const convForMeta = getConversation(conversationId);
+          if (convForMeta) {
+            updateMetaFile(convForMeta);
+          }
+        } catch (err) {
+          log.warn(
+            { err, conversationId },
+            "Failed to update disk meta (best-effort)",
+          );
+        }
+      }
+
       const assistantMsg = createAssistantMessage(slashResult.message);
       await addMessage(
         conversationId,
@@ -1198,9 +1249,29 @@ export class DaemonServer {
    * Look up an active conversation that owns a given surfaceId.
    */
   findConversationBySurfaceId(surfaceId: string): Conversation | undefined {
+    // Fast path: exact surfaceId match in surfaceState
     for (const c of this.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 this.conversations.values()) {
+        for (const [, state] of c.surfaceState.entries()) {
+          const data = state.data 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;
   }
 

package/src/daemon/shutdown-handlers.ts

@@ -21,8 +21,8 @@ export interface ShutdownDeps {
   hookManager: HookManager;
   runtimeHttp: RuntimeHttpServer | null;
   scheduler: { stop(): void };
-  memoryWorker: { stop(): void };
-  qdrantManager: QdrantManager;
+  getMemoryWorker: () => { stop(): void } | null;
+  getQdrantManager: () => QdrantManager | null;
   mcpManager: McpServerManager | null;
   telemetryReporter: { stop(): Promise<void> } | null;
   cleanupPidFile: () => void;
@@ -106,7 +106,7 @@ export function installShutdownHandlers(deps: ShutdownDeps): void {
     if (deps.runtimeHttp) await deps.runtimeHttp.stop();
     await browserManager.closeAllPages();
     deps.scheduler.stop();
-    deps.memoryWorker.stop();
+    deps.getMemoryWorker()?.stop();
 
     if (deps.mcpManager) {
       try {
@@ -116,7 +116,7 @@ export function installShutdownHandlers(deps: ShutdownDeps): void {
       }
     }
 
-    await deps.qdrantManager.stop();
+    await deps.getQdrantManager()?.stop();
 
     // Checkpoint WAL and close SQLite so no writes are lost on exit.
     // Checkpoint and close are in separate try blocks so that close()
@@ -143,7 +143,10 @@ export function installShutdownHandlers(deps: ShutdownDeps): void {
   process.on("SIGHUP", shutdown);
 
   process.on("unhandledRejection", (reason) => {
-    log.error({ err: reason }, "Unhandled promise rejection — initiating shutdown");
+    log.error(
+      { err: reason },
+      "Unhandled promise rejection — initiating shutdown",
+    );
     Sentry.captureException(reason);
     exitCode = 1;
     void shutdown();

package/src/daemon/startup-error.ts

@@ -27,6 +27,14 @@ const DAEMON_ERROR_PREFIX = "DAEMON_ERROR:";
  * Inspect an error and return a categorized {@link DaemonStartupError}.
  */
 export function categorizeDaemonError(err: unknown): DaemonStartupError {
+  if (err == null) {
+    return {
+      error: "UNKNOWN",
+      message: String(err),
+      detail: "An unexpected error occurred during startup.",
+    };
+  }
+
   const code = (err as { code?: string }).code ?? "";
   const name = (err as { name?: string }).name ?? "";
   const message =
@@ -96,6 +104,7 @@ export function categorizeDaemonError(err: unknown): DaemonStartupError {
     message.startsWith("Invalid RUNTIME_HTTP_PORT") ||
     message.startsWith("Invalid integer for GATEWAY_PORT") ||
     message.startsWith("Invalid integer for RUNTIME_HTTP_PORT") ||
+    message.startsWith("Invalid integer for QDRANT_HTTP_PORT") ||
     /\benv\b.*\bvalidat/i.test(message) ||
     /\bvalidat.*\benv\b/i.test(message)
   ) {

package/src/daemon/tool-side-effects.ts

@@ -7,11 +7,9 @@
  * registry entry instead of another if/else branch.
  */
 
-import { join } from "node:path";
-
 import { compileApp } from "../bundler/app-compiler.js";
 import { generateAppIcon } from "../media/app-icon-generator.js";
-import { getApp, getAppsDir, isMultifileApp } from "../memory/app-store.js";
+import { getApp, getAppDirPath, isMultifileApp } from "../memory/app-store.js";
 import { deliverVerificationSlack } from "../runtime/verification-outbound-actions.js";
 import { updatePublishedAppDeployment } from "../services/published-app-updater.js";
 import type { ToolExecutionResult } from "../tools/types.js";
@@ -51,7 +49,7 @@ function handleAppChange(
   // Multifile apps need a recompile before refreshing surfaces so the
   // WebView picks up the latest compiled output.
   if (app && isMultifileApp(app)) {
-    const appDir = join(getAppsDir(), appId);
+    const appDir = getAppDirPath(appId);
     void compileApp(appDir)
       .then((result) => {
         if (!result.ok) {
@@ -147,25 +145,25 @@ registerHook(
   },
 );
 
-// Auto-refresh workspace surfaces when a persisted app is updated.
+// Broadcast app_files_changed when an app is deleted so clients remove it
+// from their cached app lists.
 registerHook(
-  "app_update",
-  (_name, input, _result, { ctx, broadcastToAllClients }) => {
+  "app_delete",
+  (_name, input, _result, { broadcastToAllClients }) => {
     const appId = input.app_id as string | undefined;
     if (appId) {
-      handleAppChange(ctx, appId, broadcastToAllClients);
+      broadcastToAllClients?.({ type: "app_files_changed", appId });
     }
   },
 );
 
-// Broadcast app_files_changed when an app is deleted so clients remove it
-// from their cached app lists.
+// Trigger compilation + surface refresh + broadcast when an app is refreshed.
 registerHook(
-  "app_delete",
-  (_name, input, _result, { broadcastToAllClients }) => {
+  "app_refresh",
+  (_name, input, _result, { ctx, broadcastToAllClients }) => {
     const appId = input.app_id as string | undefined;
     if (appId) {
-      broadcastToAllClients?.({ type: "app_files_changed", appId });
+      handleAppChange(ctx, appId, broadcastToAllClients, { fileChange: true });
     }
   },
 );
@@ -179,21 +177,6 @@ registerHook(
   },
 );
 
-// Auto-refresh workspace surfaces when app files are edited.
-registerHook(
-  ["app_file_edit", "app_file_write"],
-  (_name, input, _result, { ctx, broadcastToAllClients }) => {
-    const appId = input.app_id as string | undefined;
-    const status = input.status as string | undefined;
-    if (appId) {
-      handleAppChange(ctx, appId, broadcastToAllClients, {
-        fileChange: true,
-        status,
-      });
-    }
-  },
-);
-
 // Broadcast voice config changes to all connected clients so every window
 // picks up the updated UserDefaults value immediately.
 registerHook(

package/src/events/tool-permission-telemetry-listener.ts

@@ -30,9 +30,7 @@ export function registerToolPermissionTelemetryListener(
           const key = requestId ? `${requestId}:${toolName}` : undefined;
           if (key && promptedToolCalls.has(key)) {
             promptedToolCalls.delete(key);
-            recordLifecycleEvent(
-              `permission_decided:${toolName}:${decision}`,
-            );
+            recordLifecycleEvent(`permission_decided:${toolName}:${decision}`);
           }
           return;
         }

package/src/instrument.ts

@@ -121,7 +121,6 @@ export function setSentryOrganizationId(
 const CONVERSATION_TAG_KEYS = [
   "assistant_id",
   "conversation_id",
-  "session_id",
   "message_count",
   "user_identifier",
 ] as const;
@@ -148,9 +147,6 @@ export function setSentryConversationContext(
 ): void {
   Sentry.setTag("assistant_id", ctx.assistantId);
   Sentry.setTag("conversation_id", ctx.conversationId);
-  // session_id mirrors conversation_id — downstream Sentry dashboards and
-  // alerts may still filter by the legacy tag name.
-  Sentry.setTag("session_id", ctx.conversationId);
   Sentry.setTag("message_count", String(ctx.messageCount));
   if (ctx.userIdentifier) {
     Sentry.setTag("user_identifier", ctx.userIdentifier);

package/src/media/app-icon-generator.ts

@@ -10,7 +10,7 @@ import { existsSync, mkdirSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 
 import { getConfig } from "../config/loader.js";
-import { getAppsDir } from "../memory/app-store.js";
+import { getAppDirPath } from "../memory/app-store.js";
 import {
   buildManagedBaseUrl,
   resolveManagedProxyContext,
@@ -68,7 +68,7 @@ export async function generateAppIcon(
     return;
   }
 
-  const appDir = join(getAppsDir(), appId);
+  const appDir = getAppDirPath(appId);
   const iconPath = join(appDir, "icon.png");
 
   // Don't regenerate if icon already exists

package/src/memory/app-git-service.ts

@@ -3,13 +3,18 @@
  *
  * Initializes a git repository in the apps directory (~/.vellum/apps/) and
  * commits after every app mutation (create, update, delete, file write/edit).
- * Commits are fire-and-forget — they never block the caller.
+ * Commits are fire-and-forget -- they never block the caller.
  *
  * Also exposes query methods (history, diff, file-at-version, restore) for
  * browsing and reverting app version history.
  *
  * Reuses WorkspaceGitService for all git operations (mutex, circuit breaker,
  * lazy init, etc.).
+ *
+ * NOTE: After the 010-app-dir-rename migration, git pathspecs use dirName
+ * (slug) instead of appId (UUID). History queries will only return commits
+ * made after the migration rename. Commits before the migration used UUID-
+ * based paths and are not visible through the current slug-based pathspecs.
  */
 
 import { existsSync, readFileSync, writeFileSync } from "node:fs";
@@ -17,7 +22,7 @@ import { join } from "node:path";
 
 import { getLogger } from "../util/logger.js";
 import { getWorkspaceGitService } from "../workspace/git-service.js";
-import { getAppsDir } from "./app-store.js";
+import { getAppsDir, resolveAppDir } from "./app-store.js";
 
 const log = getLogger("app-git");
 
@@ -38,8 +43,8 @@ export interface AppVersion {
 
 /**
  * Patterns excluded from app version tracking.
- * - *.preview — large base64 preview images
- * - records directories — user data (form submissions), not app code
+ * - *.preview -- large base64 preview images
+ * - records directories -- user data (form submissions), not app code
  */
 const APP_GITIGNORE_RULES = ["*.preview", "*/records/"];
 
@@ -116,7 +121,7 @@ function validateRelativePath(path: string): void {
  * mutation's files get absorbed into WorkspaceGitService's bootstrap
  * commit and the "Create app: ..." commit ends up empty.
  *
- * Safe to call multiple times — ensureInitialized() is idempotent.
+ * Safe to call multiple times -- ensureInitialized() is idempotent.
  * Fire-and-forget: errors are logged but never thrown.
  */
 export async function initAppGit(): Promise<void> {
@@ -189,14 +194,18 @@ export async function commitAppTurnChanges(
 /**
  * Get the commit history for a specific app.
  *
- * Scopes `git log` to files belonging to this app:
- *   {appId}.json, {appId}/index.html, {appId}/pages/*, etc.
+ * Scopes `git log` to files belonging to this app using dirName-based
+ * pathspecs: {dirName}.json, {dirName}/.
+ *
+ * Note: After the 010 migration, only commits made after the rename are
+ * visible. Pre-migration commits used UUID-based paths.
  */
 export async function getAppHistory(
   appId: string,
   limit = 50,
 ): Promise<AppVersion[]> {
   validateAppId(appId);
+  const { dirName } = resolveAppDir(appId);
   const safeLimit = Math.max(1, Math.min(Math.floor(limit) || 50, 500));
   const appsDir = getAppsDir();
   const gitService = getWorkspaceGitService(appsDir);
@@ -207,8 +216,8 @@ export async function getAppHistory(
     `--max-count=${safeLimit}`,
     "--format=%H\t%at\t%s",
     "--",
-    `${appId}.json`,
-    `${appId}/`,
+    `${dirName}.json`,
+    `${dirName}/`,
   ]);
 
   if (!stdout.trim()) return [];
@@ -239,6 +248,7 @@ export async function getAppDiff(
   validateCommitHash(fromCommit);
   if (toCommit) validateCommitHash(toCommit);
 
+  const { dirName } = resolveAppDir(appId);
   const appsDir = getAppsDir();
   const gitService = getWorkspaceGitService(appsDir);
 
@@ -247,8 +257,8 @@ export async function getAppDiff(
     "diff",
     range,
     "--",
-    `${appId}.json`,
-    `${appId}/`,
+    `${dirName}.json`,
+    `${dirName}/`,
   ]);
 
   return stdout;
@@ -266,12 +276,13 @@ export async function getAppFileAtVersion(
   validateRelativePath(path);
   validateCommitHash(commitHash);
 
+  const { dirName } = resolveAppDir(appId);
   const appsDir = getAppsDir();
   const gitService = getWorkspaceGitService(appsDir);
 
   const { stdout } = await gitService.runReadOnlyGit([
     "show",
-    `${commitHash}:${appId}/${path}`,
+    `${commitHash}:${dirName}/${path}`,
   ]);
 
   return stdout;
@@ -294,6 +305,7 @@ export async function restoreAppVersion(
   validateAppId(appId);
   validateCommitHash(commitHash);
 
+  const { dirName } = resolveAppDir(appId);
   const appsDir = getAppsDir();
   const gitService = getWorkspaceGitService(appsDir);
 
@@ -305,14 +317,14 @@ export async function restoreAppVersion(
       commitHash,
       "--no-overlay",
       "--",
-      `${appId}.json`,
-      `${appId}/`,
+      `${dirName}.json`,
+      `${dirName}/`,
     ]);
 
     // Read the app name and refresh updatedAt so the restored app
     // doesn't appear stale in recency ordering.
     let appName = appId;
-    const jsonPath = join(appsDir, `${appId}.json`);
+    const jsonPath = join(appsDir, `${dirName}.json`);
     if (existsSync(jsonPath)) {
       try {
         const raw = readFileSync(jsonPath, "utf-8");
@@ -328,7 +340,7 @@ export async function restoreAppVersion(
     const shortHash = commitHash.substring(0, 7);
 
     // Stage only this app's files and commit atomically within the same mutex lock
-    await exec(["add", "--", `${appId}.json`, `${appId}/`]);
+    await exec(["add", "--", `${dirName}.json`, `${dirName}/`]);
     await exec([
       "commit",
       "-m",