@vellumai/assistant 0.8.6 → 0.8.7

package/src/runtime/routes/conversation-routes.ts

@@ -18,6 +18,7 @@ import {
   parseInterfaceId,
   supportsHostProxy,
 } from "../../channels/types.js";
+import { isAssistantFeatureFlagEnabled } from "../../config/assistant-feature-flags.js";
 import { isHttpAuthDisabled } from "../../config/env.js";
 import { getConfig } from "../../config/loader.js";
 import {
@@ -41,6 +42,7 @@ import { getOrCreateConversation as getOrCreateConversationInstance } from "../.
 import { canonicalizeTimeZone } from "../../daemon/date-context.js";
 import {
   buildScanFirstMessage,
+  buildSelfIntroMessage,
   getCannedFirstGreeting,
   isWakeUpGreeting,
 } from "../../daemon/first-greeting.js";
@@ -107,6 +109,7 @@ import { getWorkspacePromptPath } from "../../util/platform.js";
 import { silentlyWithLog } from "../../util/silently.js";
 import { assistantEventHub, broadcastMessage } from "../assistant-event-hub.js";
 import { DAEMON_INTERNAL_ASSISTANT_ID } from "../assistant-scope.js";
+import { ACTOR_PRINCIPALS } from "../auth/route-policy.js";
 import { routeGuardianReply } from "../guardian-reply-router.js";
 import { healGuardianBindingDrift } from "../guardian-vellum-migration.js";
 import type {
@@ -140,6 +143,9 @@ const log = getLogger("conversation-routes");
 const NO_RESPONSE_INLINE_RE = /<no_response\s*\/?>/g;
 const ATTACHMENT_ENTRY_RE = /^attachment:(\d+)$/;
 
+/** Feature flag gating the self-intro first message (see first-greeting.ts). */
+const SELF_INTRO_GREETING_FLAG = "self-intro-greeting" as const;
+
 const SUGGESTION_CACHE_MAX = 100;
 const VALID_RISK_THRESHOLDS = ["none", "low", "medium", "high"] as const;
 type RiskThreshold = (typeof VALID_RISK_THRESHOLDS)[number];
@@ -409,7 +415,7 @@ async function tryConsumeCanonicalGuardianReply(params: {
       conversationId,
       "user",
       JSON.stringify(cleanUserMessage.content),
-      channelMeta,
+      { metadata: channelMeta },
     );
     messageId = persistedUser.id;
 
@@ -423,7 +429,7 @@ async function tryConsumeCanonicalGuardianReply(params: {
       conversationId,
       "assistant",
       JSON.stringify(assistantMessage.content),
-      channelMeta,
+      { metadata: channelMeta },
     );
 
     // Avoid mutating in-memory history / emitting stream deltas while a run is active.
@@ -700,6 +706,7 @@ export function handleListMessages({
   });
 
   const messages: RuntimeMessagePayload[] = parsed.map((m) => {
+    const mergedMessageIds = m.id ? (mergedIdMap.get(m.id) ?? []) : [];
     let msgAttachments: RuntimeAttachmentMetadata[] = [];
     if (m.id) {
       // Use metadata-only query first to avoid loading large base64
@@ -833,8 +840,8 @@ export function handleListMessages({
     const displayTimestamp = m.sentAt ?? m.timestamp;
     return {
       id: m.id ?? "",
+      ...(mergedMessageIds.length > 0 ? { mergedMessageIds } : {}),
       role: m.role,
-      content: m.text,
       timestamp: new Date(displayTimestamp).toISOString(),
       attachments: msgAttachments,
       ...(m.toolCalls.length > 0 ? { toolCalls: m.toolCalls } : {}),
@@ -1330,10 +1337,20 @@ export async function handleSendMessage(
   }
 
   const isInteractive = isInteractiveInterface(sourceInterface);
+  // Use the JWT-verified requester principal — not guardianPrincipalId,
+  // which is the workspace owner and would let a trusted contact's web
+  // turn match against the guardian's macOS client.
+  const sourceActorPrincipalId = actorPrincipalId ?? undefined;
   // Bash/File/Transfer singletons are globally available via isAvailable() —
   // no per-conversation gating needed. CU is per-conversation (owns step
   // count, AX tree history, loop detection).
-  if (shouldAttachHostProxyForCapability("host_cu", sourceInterface)) {
+  if (
+    shouldAttachHostProxyForCapability(
+      "host_cu",
+      sourceInterface,
+      sourceActorPrincipalId,
+    )
+  ) {
     if (!conversation.isProcessing() || !conversation.hostCuProxy) {
       conversation.setHostCuProxy(new HostCuProxy());
     }
@@ -1346,7 +1363,13 @@ export async function handleSendMessage(
   // lives in the skill-projection layer (which reads the `feature-flag:
   // app-control` declaration in SKILL.md frontmatter), so an attached proxy
   // is harmless when the flag resolves to off.
-  if (shouldAttachHostProxyForCapability("host_app_control", sourceInterface)) {
+  if (
+    shouldAttachHostProxyForCapability(
+      "host_app_control",
+      sourceInterface,
+      sourceActorPrincipalId,
+    )
+  ) {
     if (!conversation.isProcessing() || !conversation.hostAppControlProxy) {
       conversation.setHostAppControlProxy(
         new HostAppControlProxy(mapping.conversationId),
@@ -1359,7 +1382,11 @@ export async function handleSendMessage(
   // this message will be queued and preactivation is deferred to dequeue
   // time in drainQueueImpl to avoid mutating in-flight turn state.
   if (!conversation.isProcessing()) {
-    preactivateHostProxySkills(conversation, sourceInterface);
+    preactivateHostProxySkills(
+      conversation,
+      sourceInterface,
+      sourceActorPrincipalId,
+    );
   }
   // Wire sendToClient to the SSE hub so all subsystems can reach the HTTP client.
   // hasNoClient must remain `!isInteractive` so downstream tool gating
@@ -1392,6 +1419,16 @@ export async function handleSendMessage(
     conversation.getMessages().length,
   );
   const isScanPath = !!scanUrl && isWakeUp;
+  // Self-intro path: when we know a name, send a natural introduction on the
+  // user's behalf instead of the canned greeting, so the assistant generates a
+  // real first response. Gated behind the `self-intro-greeting` flag (default
+  // off); `undefined` (flag off or no names) falls back to the canned path.
+  const selfIntroGreetingEnabled =
+    isWakeUp &&
+    isAssistantFeatureFlagEnabled(SELF_INTRO_GREETING_FLAG, getConfig());
+  const selfIntro = selfIntroGreetingEnabled
+    ? buildSelfIntroMessage(body.onboarding ?? undefined)
+    : undefined;
 
   let effectiveContent: string | undefined;
   if (isScanPath) {
@@ -1400,8 +1437,12 @@ export async function handleSendMessage(
       : ("content-source" as const);
     effectiveContent = buildScanFirstMessage(scanUrl, scanVariant);
     // Fall through to normal inference path below
-  } else if (isWakeUp && body.onboarding?.initialMessage) {
+  } else if (selfIntroGreetingEnabled && body.onboarding?.initialMessage) {
     effectiveContent = body.onboarding.initialMessage;
+  } else if (isWakeUp && selfIntro) {
+    // Rewrite to the self-introduction and fall through to real inference
+    // (mirrors the scan path above).
+    effectiveContent = selfIntro;
   } else if (isWakeUp) {
     const cannedGreeting = getCannedFirstGreeting(body.onboarding ?? undefined);
 
@@ -1435,7 +1476,7 @@ export async function handleSendMessage(
         mapping.conversationId,
         "assistant",
         JSON.stringify(assistantMsg.content),
-        channelMeta,
+        { metadata: channelMeta },
       );
       conversation.getMessages().push(assistantMsg);
 
@@ -1744,7 +1785,7 @@ export async function handleSendMessage(
         mapping.conversationId,
         "assistant",
         JSON.stringify(assistantMsg.content),
-        channelMeta,
+        { metadata: channelMeta },
       );
       conversation.getMessages().push(assistantMsg);
 
@@ -1862,11 +1903,7 @@ export async function handleSendMessage(
           clientMessageId,
         });
         publishConversationMessagesChanged(conversationId, originClientId);
-        conversation.emitActivityState(
-          "thinking",
-          "context_compacting",
-          "assistant_turn",
-        );
+        conversation.emitActivityState("thinking", "context_compacting");
         const result = await conversation.forceCompact({
           targetInputTokensOverride: slashResult.targetInputTokensOverride,
         });
@@ -1877,7 +1914,7 @@ export async function handleSendMessage(
           conversationId,
           "assistant",
           JSON.stringify(assistantMsg.content),
-          channelMeta,
+          { metadata: channelMeta },
         );
         assistantMessagePersisted = true;
         conversation.getMessages().push(assistantMsg);
@@ -1972,7 +2009,7 @@ export async function handleSendMessage(
           conversationId,
           "assistant",
           JSON.stringify(assistantMsg.content),
-          channelMeta,
+          { metadata: channelMeta },
         );
         assistantMessagePersisted = true;
         conversation.getMessages().push(assistantMsg);
@@ -2046,7 +2083,8 @@ export async function handleSendMessage(
 
   // Fire-and-forget the agent loop; events flow to the hub via broadcastMessage.
   conversation
-    .runAgentLoop(resolvedContent, messageId, broadcastMessage, {
+    .runAgentLoop(resolvedContent, messageId, {
+      onEvent: broadcastMessage,
       isInteractive,
       isUserMessage: true,
     })
@@ -2124,9 +2162,10 @@ async function generateLlmSuggestion(
   // tokens here would be wasteful.
   const response = await provider.sendMessage(
     [{ role: "user", content: [{ type: "text", text: userPrompt }] }],
-    [], // no tools
-    systemPrompt,
     {
+      tools: [],
+      // no tools
+      systemPrompt,
       config: {
         callSite: "replySuggestion",
         max_tokens: 60,
@@ -2418,6 +2457,10 @@ export const ROUTES: RouteDefinition[] = [
     operationId: "messages_get",
     endpoint: "messages",
     method: "GET",
+    policy: {
+      requiredScopes: ["chat.read"],
+      allowedPrincipalTypes: ACTOR_PRINCIPALS,
+    },
     summary: "List messages",
     description:
       "Return messages for a conversation, including attachments and interface file metadata.",
@@ -2447,6 +2490,10 @@ export const ROUTES: RouteDefinition[] = [
     operationId: "messages_post",
     endpoint: "messages",
     method: "POST",
+    policy: {
+      requiredScopes: ["chat.write"],
+      allowedPrincipalTypes: ACTOR_PRINCIPALS,
+    },
     summary: "Send a message",
     description:
       "Send a user message to a conversation and trigger the assistant response.",
@@ -2479,6 +2526,10 @@ export const ROUTES: RouteDefinition[] = [
     operationId: "search_get",
     endpoint: "search",
     method: "GET",
+    policy: {
+      requiredScopes: ["chat.read"],
+      allowedPrincipalTypes: ACTOR_PRINCIPALS,
+    },
     summary: "Search conversations",
     description: "Full-text search across all conversations.",
     tags: ["conversations"],
@@ -2492,6 +2543,10 @@ export const ROUTES: RouteDefinition[] = [
     operationId: "suggestion_get",
     endpoint: "suggestion",
     method: "GET",
+    policy: {
+      requiredScopes: ["chat.read"],
+      allowedPrincipalTypes: ACTOR_PRINCIPALS,
+    },
     summary: "Get reply suggestion",
     description:
       "Return an LLM-generated follow-up suggestion for the most recent assistant message.",

package/src/runtime/routes/conversation-starter-routes.ts

@@ -21,11 +21,9 @@ import {
   isValidConversationStarterText,
 } from "../../memory/conversation-starter-validation.js";
 import { getDb } from "../../memory/db-connection.js";
-import {
-  enqueueMemoryJob,
-  isMemoryEnabled,
-} from "../../memory/jobs-store.js";
+import { enqueueMemoryJob, isMemoryEnabled } from "../../memory/jobs-store.js";
 import { conversationStarters, memoryJobs } from "../../memory/schema.js";
+import { ACTOR_PRINCIPALS } from "../auth/route-policy.js";
 import { NotFoundError } from "./errors.js";
 import type { RouteDefinition, RouteHandlerArgs } from "./types.js";
 
@@ -34,13 +32,15 @@ import type { RouteDefinition, RouteHandlerArgs } from "./types.js";
 // chips form a coherent, non-repetitive row.
 // ---------------------------------------------------------------------------
 
-interface StarterItem {
-  id: string;
-  label: string;
-  prompt: string;
-  category: string | null;
-  batch: number;
-}
+const starterItemSchema = z.object({
+  id: z.string(),
+  label: z.string(),
+  prompt: z.string(),
+  category: z.string().nullable(),
+  batch: z.number().int(),
+});
+
+type StarterItem = z.infer<typeof starterItemSchema>;
 
 export const CONVERSATION_STARTERS_STALE_TTL_MS = 24 * 60 * 60 * 1000;
 
@@ -276,6 +276,10 @@ export const ROUTES: RouteDefinition[] = [
     operationId: "conversation_starters_list",
     endpoint: "conversation-starters",
     method: "GET",
+    policy: {
+      requiredScopes: ["chat.read"],
+      allowedPrincipalTypes: ACTOR_PRINCIPALS,
+    },
     handler: handleListConversationStarters,
     summary: "List conversation starters",
     description:
@@ -298,7 +302,9 @@ export const ROUTES: RouteDefinition[] = [
       },
     ],
     responseBody: z.object({
-      starters: z.array(z.unknown()).describe("Ordered list of starter chips"),
+      starters: z
+        .array(starterItemSchema)
+        .describe("Ordered list of starter chips"),
       total: z.number().int().describe("Total number of available starters"),
       status: z
         .enum(["ready", "refreshing", "empty", "generating"])
@@ -309,7 +315,10 @@ export const ROUTES: RouteDefinition[] = [
     operationId: "conversation_starters_delete",
     endpoint: "conversation-starters/:id",
     method: "DELETE",
-    policyKey: "conversation-starters",
+    policy: {
+      requiredScopes: ["chat.write"],
+      allowedPrincipalTypes: ACTOR_PRINCIPALS,
+    },
     handler: handleDeleteConversationStarter,
     summary: "Delete conversation starter",
     description:

package/src/runtime/routes/conversations-import-routes.ts

@@ -18,6 +18,7 @@ import {
   messages as messagesTable,
 } from "../../memory/schema.js";
 import { getLogger } from "../../util/logger.js";
+import { ACTOR_PRINCIPALS } from "../auth/route-policy.js";
 import { BadRequestError } from "./errors.js";
 import type { RouteDefinition, RouteHandlerArgs } from "./types.js";
 
@@ -108,7 +109,7 @@ async function handleConversationsImport({ body }: RouteHandlerArgs) {
           typeof msg.content === "string"
             ? msg.content
             : JSON.stringify(msg.content);
-        await addMessage(conversation.id, msg.role, contentStr, undefined, {
+        await addMessage(conversation.id, msg.role, contentStr, {
           skipIndexing: true,
         });
       }
@@ -201,6 +202,10 @@ export const ROUTES: RouteDefinition[] = [
     operationId: "conversations_import",
     endpoint: "conversations/import",
     method: "POST",
+    policy: {
+      requiredScopes: ["chat.write"],
+      allowedPrincipalTypes: ACTOR_PRINCIPALS,
+    },
     handler: handleConversationsImport,
     summary: "Import conversations",
     description: "Import conversations from a standard JSON payload.",

package/src/runtime/routes/credential-prompt-routes.ts

@@ -16,6 +16,7 @@ import {
   assertMetadataWritable,
   upsertCredentialMetadata,
 } from "../../tools/credentials/metadata-store.js";
+import { LOCAL_PRINCIPALS } from "../auth/route-policy.js";
 import type { RouteDefinition, RouteHandlerArgs } from "./types.js";
 
 // ---------------------------------------------------------------------------
@@ -108,6 +109,10 @@ export const ROUTES: RouteDefinition[] = [
     operationId: "credentials_prompt",
     endpoint: "credentials/prompt",
     method: "POST",
+    policy: {
+      requiredScopes: ["settings.write"],
+      allowedPrincipalTypes: LOCAL_PRINCIPALS,
+    },
     handler: handleCredentialPrompt,
     summary: "Prompt user for a credential",
     description:

package/src/runtime/routes/credential-routes.ts

@@ -45,6 +45,7 @@ import {
   listCredentialMetadata,
   upsertCredentialMetadata,
 } from "../../tools/credentials/metadata-store.js";
+import { ACTOR_PRINCIPALS } from "../auth/route-policy.js";
 import { BadRequestError, InternalError } from "./errors.js";
 import type { RouteDefinition, RouteHandlerArgs } from "./types.js";
 
@@ -424,7 +425,10 @@ export const ROUTES: RouteDefinition[] = [
     operationId: "credentials_list",
     endpoint: "credentials/list",
     method: "POST",
-    policyKey: "secrets",
+    policy: {
+      requiredScopes: ["settings.write"],
+      allowedPrincipalTypes: ACTOR_PRINCIPALS,
+    },
     summary: "List all credentials with metadata",
     description:
       "Return all stored credentials with metadata, OAuth connection info, and platform-managed credentials.",
@@ -442,7 +446,10 @@ export const ROUTES: RouteDefinition[] = [
     operationId: "credentials_inspect",
     endpoint: "credentials/inspect",
     method: "POST",
-    policyKey: "secrets",
+    policy: {
+      requiredScopes: ["settings.write"],
+      allowedPrincipalTypes: ACTOR_PRINCIPALS,
+    },
     summary: "Inspect a credential",
     description:
       "Return metadata and a masked preview of a stored credential. Does not reveal the plaintext value.",
@@ -465,7 +472,10 @@ export const ROUTES: RouteDefinition[] = [
     operationId: "credentials_reveal",
     endpoint: "credentials/reveal",
     method: "POST",
-    policyKey: "secrets",
+    policy: {
+      requiredScopes: ["settings.write"],
+      allowedPrincipalTypes: ACTOR_PRINCIPALS,
+    },
     summary: "Reveal a credential's plaintext value",
     description:
       "Return the raw plaintext value of a stored credential. Blocked in untrusted shell mode.",
@@ -484,7 +494,10 @@ export const ROUTES: RouteDefinition[] = [
     operationId: "credentials_set",
     endpoint: "credentials/set",
     method: "POST",
-    policyKey: "secrets",
+    policy: {
+      requiredScopes: ["settings.write"],
+      allowedPrincipalTypes: ACTOR_PRINCIPALS,
+    },
     summary: "Store a credential with metadata",
     description:
       "Store a secret value and create or update its metadata (label, description, allowed tools).",
@@ -508,7 +521,10 @@ export const ROUTES: RouteDefinition[] = [
     operationId: "credentials_delete",
     endpoint: "credentials/delete",
     method: "POST",
-    policyKey: "secrets",
+    policy: {
+      requiredScopes: ["settings.write"],
+      allowedPrincipalTypes: ACTOR_PRINCIPALS,
+    },
     summary: "Delete a credential",
     description:
       "Remove a secret, its metadata, and any associated OAuth connection from the vault.",
@@ -527,7 +543,10 @@ export const ROUTES: RouteDefinition[] = [
     operationId: "credentials_status",
     endpoint: "credentials/status",
     method: "GET",
-    policyKey: "secrets",
+    policy: {
+      requiredScopes: ["settings.read"],
+      allowedPrincipalTypes: ACTOR_PRINCIPALS,
+    },
     summary: "Credential backend status",
     description:
       "Return the active credential storage backend and its configuration details.",

package/src/runtime/routes/debug-bash-routes.ts

@@ -17,6 +17,7 @@ import { z } from "zod";
 import { getIsContainerized } from "../../config/env-registry.js";
 import { buildSanitizedEnv } from "../../tools/terminal/safe-env.js";
 import { getWorkspaceDir } from "../../util/platform.js";
+import { ACTOR_PRINCIPALS } from "../auth/route-policy.js";
 import type { RouteDefinition, RouteHandlerArgs } from "./types.js";
 
 const DEFAULT_TIMEOUT_MS = 30_000;
@@ -141,6 +142,10 @@ export const ROUTES: RouteDefinition[] = [
     operationId: "debug_bash",
     endpoint: "debug/bash",
     method: "POST",
+    policy: {
+      requiredScopes: ["settings.write"],
+      allowedPrincipalTypes: ACTOR_PRINCIPALS,
+    },
     requireGuardian: false,
     summary: "Execute a shell command in the assistant process",
     description:

package/src/runtime/routes/debug-routes.ts

@@ -17,6 +17,7 @@ import {
 } from "../../providers/registry.js";
 import { countSchedules } from "../../schedule/schedule-store.js";
 import { getDbPath } from "../../util/platform.js";
+import { ACTOR_PRINCIPALS } from "../auth/route-policy.js";
 import type { RouteDefinition } from "./types.js";
 
 /** Process start time — used to calculate uptime. */
@@ -45,7 +46,10 @@ function getDebugInfo() {
   const now = Date.now();
   const uptimeSeconds = Math.floor((now - startedAt) / 1000);
 
-  const conversationCount = countConversations();
+  // Debug view counts every standard conversation, archived or not, so the
+  // diagnostics report doesn't undercount after the route-level default
+  // moved to "active".
+  const conversationCount = countConversations("standard", "all");
   const memoryItemCount = getMemoryItemCount();
   const dbSizeBytes = getDatabaseSizeBytes();
 
@@ -66,7 +70,8 @@ function getDebugInfo() {
       startedAt: new Date(startedAt).toISOString(),
     },
     provider: {
-      configuredProvider: resolveCallSiteConfig("mainAgent", config.llm).provider,
+      configuredProvider: resolveCallSiteConfig("mainAgent", config.llm)
+        .provider,
       registeredProviders,
       routingSources,
     },
@@ -91,6 +96,10 @@ export const ROUTES: RouteDefinition[] = [
     operationId: "debug",
     endpoint: "debug",
     method: "GET",
+    policy: {
+      requiredScopes: ["settings.read"],
+      allowedPrincipalTypes: ACTOR_PRINCIPALS,
+    },
     handler: getDebugInfo,
     summary: "Debug introspection",
     description:

package/src/runtime/routes/defer-routes.ts

@@ -14,6 +14,7 @@ import {
   getSchedule,
   listSchedules,
 } from "../../schedule/schedule-store.js";
+import { LOCAL_PRINCIPALS } from "../auth/route-policy.js";
 import { BadRequestError, NotFoundError } from "./errors.js";
 import type { RouteDefinition, RouteHandlerArgs } from "./types.js";
 
@@ -185,6 +186,10 @@ export const ROUTES: RouteDefinition[] = [
     operationId: "defer_create",
     endpoint: "defer/create",
     method: "POST",
+    policy: {
+      requiredScopes: ["settings.write"],
+      allowedPrincipalTypes: LOCAL_PRINCIPALS,
+    },
     handler: handleDeferCreate,
     summary: "Create a deferred wake",
     description:
@@ -202,6 +207,10 @@ export const ROUTES: RouteDefinition[] = [
     operationId: "defer_list",
     endpoint: "defer/list",
     method: "POST",
+    policy: {
+      requiredScopes: ["settings.read"],
+      allowedPrincipalTypes: LOCAL_PRINCIPALS,
+    },
     handler: handleDeferList,
     summary: "List active deferred wakes",
     description:
@@ -216,6 +225,10 @@ export const ROUTES: RouteDefinition[] = [
     operationId: "defer_cancel",
     endpoint: "defer/cancel",
     method: "POST",
+    policy: {
+      requiredScopes: ["settings.write"],
+      allowedPrincipalTypes: LOCAL_PRINCIPALS,
+    },
     handler: handleDeferCancel,
     summary: "Cancel deferred wakes",
     description: