@vellumai/assistant 0.8.6 → 0.8.7

package/src/__tests__/skill-feature-flags-integration.test.ts

@@ -26,13 +26,13 @@ import { parseFrontmatterFields } from "../skills/frontmatter.js";
 // Fixtures
 // ---------------------------------------------------------------------------
 
-/** A SKILL.md with `feature-flag: email-channel` declared in its vellum metadata. */
+/** A SKILL.md with `feature-flag: a2a-channel` declared in its vellum metadata. */
 const SKILL_MD_WITH_FLAG = `---
 name: "Email Setup"
 description: "Set up email integration"
 metadata:
   vellum:
-    feature-flag: email-channel
+    feature-flag: a2a-channel
 ---
 
 Instructions for the email setup skill.
@@ -126,16 +126,16 @@ describe("frontmatter feature-flag integration", () => {
     expect(metadataObj).toBeTruthy();
 
     const vellum = metadataObj.vellum as Record<string, unknown>;
-    expect(vellum["feature-flag"]).toBe("email-channel");
+    expect(vellum["feature-flag"]).toBe("a2a-channel");
   });
 
   test("skillFlagKey returns correct key for parsed skill", () => {
     const skill = buildSkillSummary("email-setup", SKILL_MD_WITH_FLAG);
     expect(skill).not.toBeNull();
-    expect(skill!.featureFlag).toBe("email-channel");
+    expect(skill!.featureFlag).toBe("a2a-channel");
 
     const key = skillFlagKey(skill!);
-    expect(key).toBe("email-channel");
+    expect(key).toBe("a2a-channel");
   });
 
   test("skillFlagKey returns undefined for skill without feature-flag", () => {
@@ -149,7 +149,7 @@ describe("frontmatter feature-flag integration", () => {
 
   test("resolveSkillStates includes skill with featureFlag when flag is ON", () => {
     setOverridesForTesting({
-      "email-channel": true,
+      "a2a-channel": true,
     });
     const skill = buildSkillSummary("email-setup", SKILL_MD_WITH_FLAG)!;
     const config = makeConfig();
@@ -161,7 +161,7 @@ describe("frontmatter feature-flag integration", () => {
 
   test("resolveSkillStates excludes skill with featureFlag when flag defaults to OFF", () => {
     const skill = buildSkillSummary("email-setup", SKILL_MD_WITH_FLAG)!;
-    // "email-channel" is in the registry with defaultEnabled: false
+    // "a2a-channel" is in the registry with defaultEnabled: false
     const config = makeConfig();
 
     const resolved = resolveSkillStates([skill], config);
@@ -189,17 +189,17 @@ describe("frontmatter feature-flag integration", () => {
     const metadataObj = parsed!.fields.metadata as Record<string, unknown>;
     const vellum = metadataObj.vellum as Record<string, unknown>;
     const flagId = vellum["feature-flag"];
-    expect(flagId).toBe("email-channel");
+    expect(flagId).toBe("a2a-channel");
 
     // Step 2: Build SkillSummary (as the catalog loader would)
     const skill = buildSkillSummary("email-setup", SKILL_MD_WITH_FLAG)!;
-    expect(skill.featureFlag).toBe("email-channel");
+    expect(skill.featureFlag).toBe("a2a-channel");
 
     // Step 3: Derive the flag key
     const key = skillFlagKey(skill);
-    expect(key).toBe("email-channel");
+    expect(key).toBe("a2a-channel");
 
-    // Step 4: Check flag state — "email-channel" has defaultEnabled: false in registry
+    // Step 4: Check flag state — "a2a-channel" has defaultEnabled: false in registry
     const configDefault = makeConfig();
     expect(isAssistantFeatureFlagEnabled(key!, configDefault)).toBe(false);
 

package/src/__tests__/skill-feature-flags.test.ts

@@ -14,9 +14,9 @@ afterEach(() => {
   setOverridesForTesting({});
 });
 
-const DECLARED_FLAG_ID = "email-channel";
+const DECLARED_FLAG_ID = "a2a-channel";
 const DECLARED_FLAG_KEY = DECLARED_FLAG_ID;
-const DECLARED_SKILL_ID = "email-channel";
+const DECLARED_SKILL_ID = "a2a-channel";
 const ENABLED_UNDECLARED_FLAG_KEY = "enabled-undeclared-flag";
 const ENABLED_UNDECLARED_SKILL_ID = "enabled-undeclared-skill";
 // ---------------------------------------------------------------------------
@@ -143,7 +143,7 @@ describe("isAssistantFeatureFlagEnabled", () => {
 
   test("falls back to registry default when no override", () => {
     const config = makeConfig();
-    // email-channel defaults to false in the registry
+    // a2a-channel defaults to false in the registry
     expect(isAssistantFeatureFlagEnabled(DECLARED_FLAG_KEY, config)).toBe(
       false,
     );
@@ -212,7 +212,7 @@ describe("resolveSkillStates with feature flags", () => {
     const config = makeConfig();
 
     const resolved = resolveSkillStates(catalog, config);
-    // email-channel registry default is false, so it is filtered out
+    // a2a-channel registry default is false, so it is filtered out
     expect(resolved.length).toBe(0);
   });
 
@@ -273,7 +273,7 @@ describe("resolveSkillStates with feature flags", () => {
     const resolved = resolveSkillStates(catalog, config);
     const ids = resolved.map((r) => r.summary.id);
 
-    // email-channel and deploy explicitly false; one unrelated skill explicitly true
+    // a2a-channel and deploy explicitly false; one unrelated skill explicitly true
     expect(ids).toEqual([ENABLED_UNDECLARED_SKILL_ID]);
   });
 });
@@ -284,7 +284,7 @@ describe("resolveSkillStates with feature flags", () => {
 
 describe("resolveSkillStates with frontmatter featureFlag", () => {
   test("skill with featureFlag (defaultEnabled: false) is excluded when no config override", () => {
-    // email-channel has defaultEnabled: false in the registry
+    // a2a-channel has defaultEnabled: false in the registry
     const catalog = [makeSkill(DECLARED_SKILL_ID, "bundled", DECLARED_FLAG_ID)];
     const config = makeConfig();
 

package/src/__tests__/skill-load-feature-flag.test.ts

@@ -12,8 +12,8 @@ const TEST_DIR = process.env.VELLUM_WORKSPACE_DIR!;
 
 let currentConfig: Record<string, unknown> = {};
 
-const DECLARED_SKILL_ID = "email-channel";
-const DECLARED_FLAG_KEY = "email-channel";
+const DECLARED_SKILL_ID = "a2a-channel";
+const DECLARED_FLAG_KEY = "a2a-channel";
 
 const noopLogger = new Proxy({} as Record<string, unknown>, {
   get: (_target, prop) => (prop === "child" ? () => noopLogger : () => {}),
@@ -99,8 +99,8 @@ describe("skill_load feature flag enforcement", () => {
   test("returns deterministic error for flag OFF skill", async () => {
     writeSkill(
       DECLARED_SKILL_ID,
-      "Email Channel",
-      "Toggle email channel behavior",
+      "A2A Channel",
+      "Toggle A2A channel behavior",
       "Use the feature.",
     );
 
@@ -116,8 +116,8 @@ describe("skill_load feature flag enforcement", () => {
   test("loads skill normally when flag is ON", async () => {
     writeSkill(
       DECLARED_SKILL_ID,
-      "Email Channel",
-      "Toggle email channel behavior",
+      "A2A Channel",
+      "Toggle A2A channel behavior",
       "Use the feature.",
     );
 
@@ -126,14 +126,14 @@ describe("skill_load feature flag enforcement", () => {
     const result = await executeSkillLoad({ skill: DECLARED_SKILL_ID });
 
     expect(result.isError).toBe(false);
-    expect(result.content).toContain("Skill: Email Channel");
+    expect(result.content).toContain("Skill: A2A Channel");
   });
 
   test("returns error when flag key is absent (registry defaults to disabled)", async () => {
     writeSkill(
       DECLARED_SKILL_ID,
-      "Email Channel",
-      "Toggle email channel behavior",
+      "A2A Channel",
+      "Toggle A2A channel behavior",
       "Use the feature.",
     );
 
@@ -141,7 +141,7 @@ describe("skill_load feature flag enforcement", () => {
 
     const result = await executeSkillLoad({ skill: DECLARED_SKILL_ID });
 
-    // email-channel is declared in the registry with defaultEnabled: false
+    // a2a-channel is declared in the registry with defaultEnabled: false
     expect(result.isError).toBe(true);
     expect(result.content).toContain("disabled by feature flag");
   });

package/src/__tests__/skills-files-catalog-fallback.test.ts

@@ -306,6 +306,7 @@ describe("getSkillFiles — provider chain fallback", () => {
         kind: "catalog",
         origin: "vellum",
         status: "available",
+        category: "knowledge",
       }),
     };
 
@@ -322,6 +323,7 @@ describe("getSkillFiles — provider chain fallback", () => {
       kind: "catalog",
       origin: "vellum",
       status: "available",
+      category: "knowledge",
     });
     expect(result.files).toHaveLength(2);
     for (const entry of result.files) {
@@ -455,6 +457,7 @@ describe("getSkillFiles — provider chain fallback", () => {
         kind: "catalog",
         origin: "vellum",
         status: "available",
+        category: "knowledge",
       }),
     };
 
@@ -479,6 +482,7 @@ describe("getSkillFiles — provider chain fallback", () => {
         kind: "catalog",
         origin: "vellum",
         status: "available",
+        category: "knowledge",
       }),
     };
 
@@ -504,6 +508,7 @@ describe("getSkillFiles — provider chain fallback", () => {
         kind: "catalog",
         origin: "vellum",
         status: "available",
+        category: "knowledge",
       }),
     };
 
@@ -544,6 +549,7 @@ describe("getSkillFiles — provider chain fallback", () => {
         kind: "catalog",
         origin: "skillssh",
         status: "available",
+        category: "knowledge",
         slug: id,
         sourceRepo: "owner/repo",
         installs: 0,
@@ -603,6 +609,7 @@ describe("getSkillFiles — provider chain fallback", () => {
         kind: "catalog",
         origin: "clawhub",
         status: "available",
+        category: "knowledge",
         slug: "cool-tool",
         author: "someone",
         stars: 5,
@@ -662,6 +669,7 @@ describe("getSkillFiles — provider chain fallback", () => {
         kind: "catalog",
         origin: "vellum",
         status: "available",
+        category: "knowledge",
       }),
     };
     mockSkillsshProvider = {
@@ -678,6 +686,7 @@ describe("getSkillFiles — provider chain fallback", () => {
         kind: "catalog",
         origin: "skillssh",
         status: "available",
+        category: "knowledge",
         slug: "contested-skill",
         sourceRepo: "",
         installs: 0,
@@ -697,6 +706,7 @@ describe("getSkillFiles — provider chain fallback", () => {
         kind: "catalog",
         origin: "clawhub",
         status: "available",
+        category: "knowledge",
         slug: "contested-skill",
         author: "",
         stars: 0,

package/src/__tests__/skillssh-files.test.ts

@@ -384,6 +384,7 @@ describe("toSlimSkill", () => {
     expect(slim!.kind).toBe("catalog");
     expect(slim!.status).toBe("available");
     expect(slim!.origin).toBe("skillssh");
+    expect(slim!.category).toBe("knowledge");
     expect((slim as any).slug).toBe("owner/repo/my-skill");
     expect((slim as any).sourceRepo).toBe("owner/repo");
     expect((slim as any).installs).toBe(0);

package/src/__tests__/starter-task-flow.test.ts

@@ -54,8 +54,8 @@ describe("starter task surface actions", () => {
   test("forwards prompt payload as normal message content", () => {
     const forwarded: string[] = [];
     const ctx = makeContext();
-    ctx.processMessage = async (content) => {
-      forwarded.push(content);
+    ctx.processMessage = async (options) => {
+      forwarded.push(options.content);
       return "ok";
     };
     ctx.pendingSurfaceActions.set("surf-1", { surfaceType: "dynamic_page" });
@@ -74,8 +74,8 @@ describe("starter task surface actions", () => {
   test("falls back to human-readable summary with action data when prompt is absent", () => {
     const forwarded: string[] = [];
     const ctx = makeContext();
-    ctx.processMessage = async (content) => {
-      forwarded.push(content);
+    ctx.processMessage = async (options) => {
+      forwarded.push(options.content);
       return "ok";
     };
     ctx.pendingSurfaceActions.set("surf-2", { surfaceType: "dynamic_page" });
@@ -94,8 +94,8 @@ describe("starter task surface actions", () => {
   test("does not treat prompt-like fields as relay content for non-relay actions", () => {
     const forwarded: string[] = [];
     const ctx = makeContext();
-    ctx.processMessage = async (content) => {
-      forwarded.push(content);
+    ctx.processMessage = async (options) => {
+      forwarded.push(options.content);
       return "ok";
     };
     ctx.pendingSurfaceActions.set("surf-3", { surfaceType: "dynamic_page" });

package/src/__tests__/strip-memory-injections.test.ts

@@ -1,6 +1,9 @@
 import { describe, expect, test } from "bun:test";
 
-import { stripExistingMemoryInjections } from "../memory/graph/conversation-graph-memory.js";
+import {
+  stripAllMemoryInjections,
+  stripExistingMemoryInjections,
+} from "../memory/graph/conversation-graph-memory.js";
 import type { ContentBlock, Message } from "../providers/types.js";
 
 // ---------------------------------------------------------------------------
@@ -79,7 +82,13 @@ describe("stripExistingMemoryInjections", () => {
 
   test("strips 3-block memory image (marker + image + close)", () => {
     const messages = [
-      userMsg(memoryTextBlock, memoryImageMarker, memoryImage, memoryImageClose, textBlock("hi")),
+      userMsg(
+        memoryTextBlock,
+        memoryImageMarker,
+        memoryImage,
+        memoryImageClose,
+        textBlock("hi"),
+      ),
     ];
     const result = stripExistingMemoryInjections(messages);
     expect(result[0].content).toEqual([textBlock("hi")]);
@@ -104,7 +113,12 @@ describe("stripExistingMemoryInjections", () => {
 
   test("strips legacy 2-block memory image (no closing tag)", () => {
     const messages = [
-      userMsg(memoryTextBlock, legacyMemoryImageMarker, memoryImage, textBlock("hi")),
+      userMsg(
+        memoryTextBlock,
+        legacyMemoryImageMarker,
+        memoryImage,
+        textBlock("hi"),
+      ),
     ];
     const result = stripExistingMemoryInjections(messages);
     expect(result[0].content).toEqual([textBlock("hi")]);
@@ -119,10 +133,7 @@ describe("stripExistingMemoryInjections", () => {
   test("preserves user-attached image with text", () => {
     const messages = [userMsg(imageBlock, textBlock("what is this?"))];
     const result = stripExistingMemoryInjections(messages);
-    expect(result[0].content).toEqual([
-      imageBlock,
-      textBlock("what is this?"),
-    ]);
+    expect(result[0].content).toEqual([imageBlock, textBlock("what is this?")]);
   });
 
   test("preserves user image after stripping 3-block memory blocks", () => {
@@ -137,10 +148,7 @@ describe("stripExistingMemoryInjections", () => {
       ),
     ];
     const result = stripExistingMemoryInjections(messages);
-    expect(result[0].content).toEqual([
-      imageBlock,
-      textBlock("look at this"),
-    ]);
+    expect(result[0].content).toEqual([imageBlock, textBlock("look at this")]);
   });
 
   test("preserves user image-only message after stripping memory blocks", () => {
@@ -151,7 +159,11 @@ describe("stripExistingMemoryInjections", () => {
 
   test("does not modify earlier messages", () => {
     const earlier = userMsg(textBlock("first"));
-    const messages = [earlier, assistantMsg("ok"), userMsg(memoryTextBlock, textBlock("second"))];
+    const messages = [
+      earlier,
+      assistantMsg("ok"),
+      userMsg(memoryTextBlock, textBlock("second")),
+    ];
     const result = stripExistingMemoryInjections(messages);
     expect(result[0]).toBe(earlier);
     expect(result[2].content).toEqual([textBlock("second")]);
@@ -165,10 +177,17 @@ describe("stripExistingMemoryInjections", () => {
 
   test("does not strip </memory_image> after memory text block (no image context)", () => {
     const messages = [
-      userMsg(memoryTextBlock, textBlock("</memory_image>"), textBlock("hello")),
+      userMsg(
+        memoryTextBlock,
+        textBlock("</memory_image>"),
+        textBlock("hello"),
+      ),
     ];
     const result = stripExistingMemoryInjections(messages);
-    expect(result[0].content).toEqual([textBlock("</memory_image>"), textBlock("hello")]);
+    expect(result[0].content).toEqual([
+      textBlock("</memory_image>"),
+      textBlock("hello"),
+    ]);
   });
 
   test("strips images-first then text (actual injectMemoryBlock order)", () => {
@@ -184,4 +203,73 @@ describe("stripExistingMemoryInjections", () => {
     const result = stripExistingMemoryInjections(messages);
     expect(result[0].content).toEqual([textBlock("hello")]);
   });
+
+  // Regression guard: the v2 helper must remain last-message-only even after
+  // the shared per-message strip is extracted for stripAllMemoryInjections.
+  test("strips ONLY the last user message, leaving earlier ones injected", () => {
+    const messages = [
+      userMsg(memoryTextBlock, textBlock("first")),
+      assistantMsg("ok"),
+      userMsg(memoryTextBlock, textBlock("second")),
+    ];
+    const result = stripExistingMemoryInjections(messages);
+    // Earlier user message keeps its injected memory block.
+    expect(result[0].content).toEqual([memoryTextBlock, textBlock("first")]);
+    // Last user message is stripped.
+    expect(result[2].content).toEqual([textBlock("second")]);
+  });
+});
+
+// ---------------------------------------------------------------------------
+// stripAllMemoryInjections — removes memory-injected blocks from EVERY user
+// message (memory-v3 live mode). Reuses the same per-message strip logic.
+// ---------------------------------------------------------------------------
+
+describe("stripAllMemoryInjections", () => {
+  test("strips memory blocks from multiple historical user messages", () => {
+    const messages = [
+      userMsg(memoryTextBlock, textBlock("first")),
+      assistantMsg("ok"),
+      userMsg(
+        memoryImageMarker,
+        memoryImage,
+        memoryImageClose,
+        memoryTextBlock,
+        textBlock("second"),
+      ),
+      assistantMsg("sure"),
+      userMsg(memoryTextBlock, textBlock("third")),
+    ];
+    const result = stripAllMemoryInjections(messages);
+    expect(result[0].content).toEqual([textBlock("first")]);
+    expect(result[1]).toBe(messages[1]); // assistant message untouched
+    expect(result[2].content).toEqual([textBlock("second")]);
+    expect(result[3]).toBe(messages[3]);
+    expect(result[4].content).toEqual([textBlock("third")]);
+  });
+
+  test("preserves non-memory content and user-attached images", () => {
+    const messages = [
+      userMsg(memoryTextBlock, imageBlock, textBlock("what is this?")),
+      userMsg(textBlock("plain message")),
+    ];
+    const result = stripAllMemoryInjections(messages);
+    expect(result[0].content).toEqual([imageBlock, textBlock("what is this?")]);
+    expect(result[1].content).toEqual([textBlock("plain message")]);
+  });
+
+  test("no-op (same reference) when no user message carries a memory block", () => {
+    const messages = [
+      userMsg(textBlock("hello")),
+      assistantMsg("hi"),
+      userMsg(imageBlock),
+    ];
+    const result = stripAllMemoryInjections(messages);
+    expect(result).toBe(messages);
+  });
+
+  test("no-op for empty messages array", () => {
+    const result = stripAllMemoryInjections([]);
+    expect(result).toEqual([]);
+  });
 });

package/src/__tests__/subagent-call-site-routing.test.ts

@@ -384,7 +384,7 @@ describe("CallSiteRoutingProvider — selectProvider behavior", () => {
       },
     );
 
-    await wrapper.sendMessage([], undefined, undefined, {
+    await wrapper.sendMessage([], {
       config: { callSite: "subagentSpawn" },
     });
 
@@ -420,7 +420,7 @@ describe("CallSiteRoutingProvider — selectProvider behavior", () => {
       async () => null,
     );
 
-    await wrapper.sendMessage([], undefined, undefined, {
+    await wrapper.sendMessage([], {
       config: {},
     });
 

package/src/__tests__/suggestion-routes.test.ts

@@ -442,7 +442,7 @@ describe("GET /v1/suggestion", () => {
       role: string;
       content: Array<{ type: string; text: string }>;
     }>;
-    const options = callArgs[3] as {
+    const options = callArgs[1] as {
       config?: {
         stop_sequences?: string[];
         max_tokens?: number;
@@ -557,7 +557,7 @@ describe("GET /v1/suggestion", () => {
 
     expect(provider.sendMessage).toHaveBeenCalledTimes(1);
     const callArgs = provider.sendMessage.mock.calls[0] as unknown[];
-    const options = callArgs[3] as
+    const options = callArgs[1] as
       | { config?: { callSite?: string } }
       | undefined;
     expect(options?.config?.callSite).toBe("replySuggestion");
@@ -595,7 +595,7 @@ describe("GET /v1/suggestion", () => {
 
     expect(provider.sendMessage).toHaveBeenCalledTimes(1);
     const callArgs = provider.sendMessage.mock.calls[0] as unknown[];
-    const options = callArgs[3] as
+    const options = callArgs[1] as
       | {
           config?: {
             temperature?: number;

package/src/__tests__/sync-message-contract.test.ts

@@ -5,7 +5,7 @@ import {
   conversationMessagesSyncTag,
   type ServerMessage,
   SYNC_TAGS,
-  SyncChangedMessageSchema,
+  SyncChangedEventSchema,
 } from "../daemon/message-protocol.js";
 
 describe("sync message contract", () => {
@@ -39,26 +39,32 @@ describe("sync message contract", () => {
 
   test("schema rejects malformed sync_changed payloads", () => {
     expect(() =>
-      SyncChangedMessageSchema.parse({
+      SyncChangedEventSchema.parse({
         type: "sync_changed",
         tags: [],
       }),
     ).toThrow();
 
     expect(() =>
-      SyncChangedMessageSchema.parse({
+      SyncChangedEventSchema.parse({
         type: "sync_changed",
         tags: [""],
       }),
     ).toThrow();
+  });
 
-    expect(() =>
-      SyncChangedMessageSchema.parse({
-        type: "sync_changed",
-        tags: [SYNC_TAGS.assistantAvatar],
-        cursor: 1,
-      }),
-    ).toThrow();
+  test("schema strips unknown server-stamped fields", () => {
+    const parsed = SyncChangedEventSchema.parse({
+      type: "sync_changed",
+      tags: [SYNC_TAGS.assistantAvatar],
+      cursor: 1,
+    });
+
+    expect(parsed).toEqual({
+      type: "sync_changed",
+      tags: [SYNC_TAGS.assistantAvatar],
+    });
+    expect("cursor" in parsed).toBe(false);
   });
 
   test("buildSyncChangedMessage includes originClientId when provided", () => {
@@ -85,10 +91,7 @@ describe("sync message contract", () => {
   });
 
   test("buildSyncChangedMessage trims and drops blank originClientId", () => {
-    const blank = buildSyncChangedMessage(
-      [SYNC_TAGS.assistantAvatar],
-      "   ",
-    );
+    const blank = buildSyncChangedMessage([SYNC_TAGS.assistantAvatar], "   ");
     expect("originClientId" in blank).toBe(false);
 
     const trimmed = buildSyncChangedMessage(
@@ -104,7 +107,7 @@ describe("sync message contract", () => {
 
   test("schema accepts a string originClientId and rejects non-string types", () => {
     expect(() =>
-      SyncChangedMessageSchema.parse({
+      SyncChangedEventSchema.parse({
         type: "sync_changed",
         tags: [SYNC_TAGS.assistantAvatar],
         originClientId: "client-abc",
@@ -112,7 +115,7 @@ describe("sync message contract", () => {
     ).not.toThrow();
 
     expect(() =>
-      SyncChangedMessageSchema.parse({
+      SyncChangedEventSchema.parse({
         type: "sync_changed",
         tags: [SYNC_TAGS.assistantAvatar],
         originClientId: 42,

package/src/__tests__/system-prompt.test.ts

@@ -89,6 +89,24 @@ mock.module("../prompts/persona-resolver.js", () => ({
   resolveGuardianPersona: () => mockPersona.guardianPersona,
 }));
 
+const mockOauthConnections: Array<{
+  provider: string;
+  status: string;
+  accountInfo?: string | null;
+}> = [];
+const mockManagedConnections: Array<{
+  provider: string;
+  accountInfo?: string | null;
+}> = [];
+
+mock.module("../oauth/oauth-store.js", () => ({
+  listConnections: () => mockOauthConnections,
+}));
+
+mock.module("../credential-execution/managed-catalog.js", () => ({
+  getCachedManagedConnections: () => mockManagedConnections,
+}));
+
 // Import after mock
 const { buildSystemPrompt, ensurePromptFiles, stripCommentLines } =
   await import("../prompts/system-prompt.js");
@@ -100,6 +118,8 @@ describe("buildSystemPrompt", () => {
     // no-guardian baseline.
     mockPersona.userSlug = null;
     mockPersona.guardianPersona = null;
+    mockOauthConnections.length = 0;
+    mockManagedConnections.length = 0;
   });
 
   afterEach(() => {
@@ -152,6 +172,40 @@ describe("buildSystemPrompt", () => {
     expect(identityIdx).toBeLessThan(soulIdx);
   });
 
+  test("renders runtime-computed dynamic sections after workspace-only static sections", () => {
+    const systemPromptsDir = join(TEST_DIR, "prompts", "system");
+    mkdirSync(systemPromptsDir, { recursive: true });
+    writeFileSync(
+      join(systemPromptsDir, "99-org-policy.md"),
+      "# Org policy\n\nMostly static workspace policy.\n",
+    );
+    mockManagedConnections.push({
+      provider: "google",
+      accountInfo: "user@example.com",
+    });
+
+    const result = buildSystemPrompt();
+
+    const staticIdx = result.indexOf("Mostly static workspace policy.");
+    const dynamicIdx = result.indexOf("# Connected Services");
+    expect(staticIdx).toBeGreaterThan(-1);
+    expect(dynamicIdx).toBeGreaterThan(-1);
+    expect(dynamicIdx).toBeGreaterThan(staticIdx);
+  });
+
+  test("side-chain prompt options still include IDENTITY.md and SOUL.md", () => {
+    writeFileSync(join(TEST_DIR, "IDENTITY.md"), "# Identity\n\nI am Vellum.");
+    writeFileSync(join(TEST_DIR, "SOUL.md"), "# Soul\n\nBe thoughtful.");
+
+    const result = buildSystemPrompt({
+      excludeBootstrap: true,
+      excludeCustomPrefix: true,
+    });
+
+    expect(result).toContain("# Identity\n\nI am Vellum.");
+    expect(result).toContain("# Soul\n\nBe thoughtful.");
+  });
+
   test("ignores empty SOUL.md", () => {
     writeFileSync(join(TEST_DIR, "SOUL.md"), "   \n  \n  ");
     writeFileSync(join(TEST_DIR, "IDENTITY.md"), "# Identity\n\nI am Vellum.");