@vellumai/assistant 0.8.4 → 0.8.5

package/src/__tests__/shell-tool-proxy-mode.test.ts

@@ -287,7 +287,7 @@ describe("shell tool proxy mode", () => {
   });
 
   test("schema includes network_mode and credential_ids", () => {
-    const def = shellTool.getDefinition();
+    const def = shellTool;
     const props = (def.input_schema as { properties: Record<string, unknown> })
       .properties;
     expect(props.network_mode).toBeDefined();

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

@@ -130,9 +130,9 @@ describe("isAssistantFeatureFlagEnabled with skillFlagKey", () => {
 // ---------------------------------------------------------------------------
 
 describe("isAssistantFeatureFlagEnabled", () => {
-  test("returns true for unknown flags (open by default)", () => {
+  test("returns false for unknown flags (closed by default)", () => {
     const config = makeConfig();
-    expect(isAssistantFeatureFlagEnabled("unknown", config)).toBe(true);
+    expect(isAssistantFeatureFlagEnabled("unknown", config)).toBe(false);
   });
 
   test("file-based override overrides registry default", () => {

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

@@ -50,7 +50,7 @@ mock.module("../config/assistant-feature-flags.js", () => ({
   isAssistantFeatureFlagEnabled: (key: string, _config: unknown): boolean => {
     const explicit = _mockOverrides[key];
     if (typeof explicit === "boolean") return explicit;
-    return true; // undeclared flags default to enabled
+    return false; // undeclared flags default to disabled
   },
   clearFeatureFlagOverridesCache: () => {
     _mockOverrides = {};
@@ -121,15 +121,12 @@ mock.module("../tools/skills/skill-tool-factory.js", () => ({
       description: entry.description,
       category: entry.category,
       defaultRiskLevel: RiskLevel.Medium,
+      executionTarget: "sandbox" as const,
       origin: "skill" as const,
       ownerSkillId: skillId,
       ownerSkillVersionHash: versionHash,
       ownerSkillBundled: bundled ?? undefined,
-      getDefinition: () => ({
-        name: entry.name,
-        description: entry.description,
-        input_schema: entry.input_schema as object,
-      }),
+      input_schema: entry.input_schema as object,
       execute: async () => ({ content: "", isError: false }),
     }));
   },
@@ -422,7 +419,7 @@ describe("projectSkillTools feature flag enforcement", () => {
     ];
     const prevActive = new Map<string, string>();
 
-    // Declared skill is OFF, plain-skill is undeclared with no persisted override so remains ON.
+    // Declared skill is OFF; plain-skill has no featureFlag so remains ON.
     _setOverridesForTesting({ [DECLARED_FLAG_KEY]: false });
 
     const result = projectSkillTools(history, {

package/src/__tests__/skill-projection.benchmark.test.ts

@@ -23,7 +23,7 @@ mock.module("../util/logger.js", () => ({
 }));
 
 // Mock config loader and feature flags to avoid filesystem reads on CI.
-// getConfig returns a minimal config; all feature flags default to enabled.
+// The benchmark fixture treats every feature flag as enabled.
 mock.module("../config/loader.js", () => ({
   getConfig: () => ({}),
   loadConfig: () => ({}),
@@ -114,11 +114,7 @@ mock.module("../tools/skills/skill-tool-factory.js", () => ({
       ownerSkillId: skillId,
       ownerSkillVersionHash: versionHash,
       ownerSkillBundled: bundled,
-      getDefinition: () => ({
-        name: e.name,
-        description: e.description,
-        input_schema: e.input_schema,
-      }),
+      input_schema: e.input_schema,
       execute: async () => ({ content: "", isError: false }),
     })),
 }));

package/src/__tests__/skill-tool-factory.test.ts

@@ -145,7 +145,7 @@ describe("createSkillTool", () => {
       "v1:test",
     );
 
-    const def = tool.getDefinition();
+    const def = tool;
 
     expect(def.name).toBe("web_scrape");
     expect(def.description).toBe("Scrape a URL");

package/src/__tests__/subagent-notify-parent.test.ts

@@ -146,7 +146,7 @@ function clearCaptured(): void {
 
 describe("notify_parent tool definition", () => {
   test("has correct core tool definition", () => {
-    const def = notifyParentTool.getDefinition();
+    const def = notifyParentTool;
     const schema = def.input_schema as Record<string, unknown>;
     expect(def.name).toBe("notify_parent");
     expect(schema.required).toContain("message");

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

@@ -51,6 +51,7 @@ const mockGetMessages = mock((_conversationId: string) => [
 
 mock.module("../memory/conversation-crud.js", () => ({
   getMessages: mockGetMessages,
+  getConversation: (_id: string) => null,
 }));
 
 const mockGetConfiguredProvider = mock(async () => ({

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

@@ -60,4 +60,63 @@ describe("sync message contract", () => {
       }),
     ).toThrow();
   });
+
+  test("buildSyncChangedMessage includes originClientId when provided", () => {
+    const message = buildSyncChangedMessage(
+      [SYNC_TAGS.assistantAvatar],
+      "client-abc",
+    );
+
+    expect(message).toEqual({
+      type: "sync_changed",
+      tags: [SYNC_TAGS.assistantAvatar],
+      originClientId: "client-abc",
+    });
+  });
+
+  test("buildSyncChangedMessage omits originClientId when undefined", () => {
+    const message = buildSyncChangedMessage([SYNC_TAGS.assistantAvatar]);
+
+    expect(message).toEqual({
+      type: "sync_changed",
+      tags: [SYNC_TAGS.assistantAvatar],
+    });
+    expect("originClientId" in message).toBe(false);
+  });
+
+  test("buildSyncChangedMessage trims and drops blank originClientId", () => {
+    const blank = buildSyncChangedMessage(
+      [SYNC_TAGS.assistantAvatar],
+      "   ",
+    );
+    expect("originClientId" in blank).toBe(false);
+
+    const trimmed = buildSyncChangedMessage(
+      [SYNC_TAGS.assistantAvatar],
+      "  client-xyz  ",
+    );
+    expect(trimmed).toEqual({
+      type: "sync_changed",
+      tags: [SYNC_TAGS.assistantAvatar],
+      originClientId: "client-xyz",
+    });
+  });
+
+  test("schema accepts a string originClientId and rejects non-string types", () => {
+    expect(() =>
+      SyncChangedMessageSchema.parse({
+        type: "sync_changed",
+        tags: [SYNC_TAGS.assistantAvatar],
+        originClientId: "client-abc",
+      }),
+    ).not.toThrow();
+
+    expect(() =>
+      SyncChangedMessageSchema.parse({
+        type: "sync_changed",
+        tags: [SYNC_TAGS.assistantAvatar],
+        originClientId: 42,
+      }),
+    ).toThrow();
+  });
 });

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

@@ -69,51 +69,37 @@ mock.module("../prompts/user-reference.js", () => ({
   resolveUserPronouns: () => null,
 }));
 
+// Stub persona-resolver so tests can dictate the slug `buildSystemPrompt`
+// sees without needing to write contact rows to the test DB. The user
+// and channel persona files themselves now flow through bundled sections
+// (`10-user-persona` / `11-channel-persona`) that read from disk, so
+// persona *content* is exercised by writing the file under TEST_DIR
+// rather than mocking it here. Tests mutate `mockPersona` in place;
+// the default (all-null) matches a fresh workspace with no contacts
+// and no `users/default.md`.
+const mockPersona: {
+  userSlug: string | null;
+  guardianPersona: string | null;
+} = { userSlug: null, guardianPersona: null };
+// eslint-disable-next-line @typescript-eslint/no-require-imports
+const realPersonaResolver = require("../prompts/persona-resolver.js");
+mock.module("../prompts/persona-resolver.js", () => ({
+  ...realPersonaResolver,
+  resolveUserSlug: () => mockPersona.userSlug,
+  resolveGuardianPersona: () => mockPersona.guardianPersona,
+}));
+
 // Import after mock
-const {
-  buildSystemPrompt,
-  ensurePromptFiles,
-  stripCommentLines,
-  SYSTEM_PROMPT_CACHE_BOUNDARY,
-} = await import("../prompts/system-prompt.js");
-
-/**
- * Extract BOOTSTRAP.md content + the user persona from the dynamic block
- * of the system prompt, stripping configuration, skills catalog, and
- * connected services.
- *
- * Neither SOUL.md nor IDENTITY.md flows through this helper — they
- * render as the `09-soul` and `08-identity` workspace-backed sections in
- * the static (cached) prefix.  Tests that assert on their content slice
- * the static block directly.
- */
-function basePrompt(result: string): string {
-  // The workspace files are in the dynamic block after the cache boundary.
-  const boundaryIdx = result.indexOf(SYSTEM_PROMPT_CACHE_BOUNDARY);
-  let s =
-    boundaryIdx >= 0
-      ? result.slice(boundaryIdx + SYSTEM_PROMPT_CACHE_BOUNDARY.length)
-      : result;
-  for (const heading of [
-    "## Configuration",
-    "## Skills Catalog",
-    "## External Communications Identity",
-    "# Connected Services",
-    "## Dynamic Skill Authoring Workflow",
-  ]) {
-    if (s.startsWith(heading)) {
-      s = "";
-      break;
-    }
-    const idx = s.indexOf(`\n\n${heading}`);
-    if (idx !== -1) s = s.slice(0, idx);
-  }
-  return s;
-}
+const { buildSystemPrompt, ensurePromptFiles, stripCommentLines } =
+  await import("../prompts/system-prompt.js");
 
 describe("buildSystemPrompt", () => {
   beforeEach(() => {
     mkdirSync(TEST_DIR, { recursive: true });
+    // Reset persona stub so each test starts from a fresh
+    // no-guardian baseline.
+    mockPersona.userSlug = null;
+    mockPersona.guardianPersona = null;
   });
 
   afterEach(() => {
@@ -123,8 +109,10 @@ describe("buildSystemPrompt", () => {
       "USER.md",
       "BOOTSTRAP.md",
       "UPDATES.md",
+      "VOICE.md",
       "skills",
       "users",
+      "channels",
     ]) {
       const p = join(TEST_DIR, name);
       if (existsSync(p)) rmSync(p, { recursive: true, force: true });
@@ -134,19 +122,11 @@ describe("buildSystemPrompt", () => {
     }
   });
 
-  test("returns empty string when no files exist", () => {
-    const result = buildSystemPrompt();
-    expect(basePrompt(result)).toBe("");
-  });
-
   test("uses SOUL.md when it exists", () => {
     writeFileSync(join(TEST_DIR, "SOUL.md"), "# My Soul\n\nBe awesome.");
     const result = buildSystemPrompt();
-    // SOUL.md renders as the `09-soul` workspace-backed section in the
-    // static (cached) prefix before SYSTEM_PROMPT_CACHE_BOUNDARY.
-    const boundaryIdx = result.indexOf(SYSTEM_PROMPT_CACHE_BOUNDARY);
-    expect(boundaryIdx).toBeGreaterThan(-1);
-    expect(result.slice(0, boundaryIdx)).toContain("# My Soul\n\nBe awesome.");
+    // SOUL.md renders as the `09-soul` workspace-backed section.
+    expect(result).toContain("# My Soul\n\nBe awesome.");
   });
 
   test("uses IDENTITY.md when it exists", () => {
@@ -155,42 +135,40 @@ describe("buildSystemPrompt", () => {
       "# My Identity\n\nI am Vellum.",
     );
     const result = buildSystemPrompt();
-    // IDENTITY.md renders as the `08-identity` workspace-backed section
-    // in the static (cached) prefix before SYSTEM_PROMPT_CACHE_BOUNDARY.
-    const boundaryIdx = result.indexOf(SYSTEM_PROMPT_CACHE_BOUNDARY);
-    expect(boundaryIdx).toBeGreaterThan(-1);
-    expect(result.slice(0, boundaryIdx)).toContain(
-      "# My Identity\n\nI am Vellum.",
-    );
+    // IDENTITY.md renders as the `08-identity` workspace-backed section.
+    expect(result).toContain("# My Identity\n\nI am Vellum.");
   });
 
   test("composes IDENTITY.md + SOUL.md when both exist", () => {
     writeFileSync(join(TEST_DIR, "IDENTITY.md"), "# Identity\n\nI am Vellum.");
     writeFileSync(join(TEST_DIR, "SOUL.md"), "# Soul\n\nBe thoughtful.");
     const result = buildSystemPrompt();
-    // Both render in the static (cached) prefix, IDENTITY before SOUL
-    // (sections `08-identity` and `09-soul`).
-    const boundaryIdx = result.indexOf(SYSTEM_PROMPT_CACHE_BOUNDARY);
-    expect(boundaryIdx).toBeGreaterThan(-1);
-    const staticBlock = result.slice(0, boundaryIdx);
-    expect(staticBlock).toContain("# Identity\n\nI am Vellum.");
-    expect(staticBlock).toContain("# Soul\n\nBe thoughtful.");
-    const identityIdx = staticBlock.indexOf("# Identity\n\nI am Vellum.");
-    const soulIdx = staticBlock.indexOf("# Soul\n\nBe thoughtful.");
+    // IDENTITY renders before SOUL (sections `08-identity` then
+    // `09-soul`).
+    expect(result).toContain("# Identity\n\nI am Vellum.");
+    expect(result).toContain("# Soul\n\nBe thoughtful.");
+    const identityIdx = result.indexOf("# Identity\n\nI am Vellum.");
+    const soulIdx = result.indexOf("# Soul\n\nBe thoughtful.");
     expect(identityIdx).toBeLessThan(soulIdx);
-    expect(basePrompt(result)).toBe("");
   });
 
   test("ignores empty SOUL.md", () => {
     writeFileSync(join(TEST_DIR, "SOUL.md"), "   \n  \n  ");
+    writeFileSync(join(TEST_DIR, "IDENTITY.md"), "# Identity\n\nI am Vellum.");
     const result = buildSystemPrompt();
-    expect(basePrompt(result)).toBe("");
+    // IDENTITY renders but SOUL is gated off by the renderer's
+    // empty-body check; no SOUL content should appear.
+    expect(result).toContain("# Identity\n\nI am Vellum.");
+    expect(result).not.toContain("   \n  \n  ");
   });
 
   test("ignores empty IDENTITY.md", () => {
     writeFileSync(join(TEST_DIR, "IDENTITY.md"), "");
+    writeFileSync(join(TEST_DIR, "SOUL.md"), "# Soul\n\nBe thoughtful.");
     const result = buildSystemPrompt();
-    expect(basePrompt(result)).toBe("");
+    // SOUL renders but IDENTITY's empty file is gated off by the
+    // renderer's empty-body check.
+    expect(result).toContain("# Soul\n\nBe thoughtful.");
   });
 
   test("trims whitespace from file content", () => {
@@ -198,10 +176,8 @@ describe("buildSystemPrompt", () => {
     const result = buildSystemPrompt();
     // SOUL.md renders via the `09-soul` workspace-backed section;
     // stripCommentLines + trim run inside the section renderer.
-    const boundaryIdx = result.indexOf(SYSTEM_PROMPT_CACHE_BOUNDARY);
-    const staticBlock = result.slice(0, boundaryIdx);
-    expect(staticBlock).toContain("Be kind");
-    expect(staticBlock).not.toContain("\n  Be kind  \n");
+    expect(result).toContain("Be kind");
+    expect(result).not.toContain("\n  Be kind  \n");
   });
 
   test("does not include skills catalog in system prompt", () => {
@@ -274,9 +250,6 @@ describe("buildSystemPrompt", () => {
     writeFileSync(join(TEST_DIR, "IDENTITY.md"), "Identity");
     writeFileSync(join(TEST_DIR, "SOUL.md"), "Soul");
     const result = buildSystemPrompt();
-    // Both IDENTITY and SOUL render in the static (cached) prefix; the
-    // dynamic block sliced by basePrompt is empty here.
-    expect(basePrompt(result)).toBe("");
     expect(result).toContain("Identity");
     expect(result).toContain("Soul");
   });
@@ -292,54 +265,117 @@ describe("buildSystemPrompt", () => {
     const result = buildSystemPrompt();
     expect(result).not.toContain("stale user content");
     expect(result).toContain("Identity");
-    expect(basePrompt(result)).toBe("");
   });
 
-  test("uses options.userPersona instead of USER.md", () => {
+  test("includes resolved user persona in the static prefix", () => {
+    // User persona flows through the `10-user-persona` bundled section,
+    // which reads from `users/<userSlug>.md` (or `users/default.md` as
+    // a fallback).  Set the slug + write the file to exercise both.
+    mockPersona.userSlug = "alice";
+    mkdirSync(join(TEST_DIR, "users"), { recursive: true });
+    writeFileSync(
+      join(TEST_DIR, "users", "alice.md"),
+      "# User persona\n\nName: Alice",
+    );
     writeFileSync(join(TEST_DIR, "IDENTITY.md"), "Identity");
     writeFileSync(join(TEST_DIR, "SOUL.md"), "Soul");
-    const result = buildSystemPrompt({
-      userPersona: "# User persona\n\nName: Alice",
-    });
-    // IDENTITY and SOUL both render in the static (cached) prefix; only
-    // the user persona ends up in the dynamic block.
-    expect(basePrompt(result)).toBe("# User persona\n\nName: Alice");
+    const result = buildSystemPrompt();
+    // IDENTITY, SOUL, and the user persona all render as workspace-backed
+    // bundled sections in the assembled prompt.
     expect(result).toContain("Identity");
     expect(result).toContain("Soul");
+    expect(result).toContain("# User persona");
+    expect(result).toContain("Name: Alice");
+  });
+
+  test("user persona falls back to users/default.md when the slug's file is missing", () => {
+    // The `10-user-persona` section's workspacePath is
+    // `["users/{{userSlug}}.md", "users/default.md"]` — when the
+    // primary file doesn't exist the renderer falls through to default.
+    mockPersona.userSlug = "alice";
+    mkdirSync(join(TEST_DIR, "users"), { recursive: true });
+    writeFileSync(
+      join(TEST_DIR, "users", "default.md"),
+      "# Default persona\n\nNo contact bound.",
+    );
+    const result = buildSystemPrompt();
+    expect(result).toContain("# Default persona");
+    expect(result).toContain("No contact bound.");
+  });
+
+  test("includes channel persona from channels/<channelSlug>.md", () => {
+    // Channel persona flows through the `11-channel-persona` section.
+    // Default channel is "vellum" when no channelCapabilities passed.
+    mkdirSync(join(TEST_DIR, "channels"), { recursive: true });
+    writeFileSync(
+      join(TEST_DIR, "channels", "vellum.md"),
+      "# Channel persona\n\nThis is the Vellum channel.",
+    );
+    const result = buildSystemPrompt();
+    expect(result).toContain("# Channel persona");
+    expect(result).toContain("This is the Vellum channel.");
+  });
+
+  test("includes VOICE.md as the 12-voice section with prepended heading", () => {
+    // VOICE.md flows through the `12-voice` bundled section.  The
+    // section transform prepends `# Voice Profile` so the file itself
+    // stays heading-free; the model writes voice markers as plain
+    // bullets / lines.
+    writeFileSync(
+      join(TEST_DIR, "VOICE.md"),
+      "- Prefers lowercase. Replies tightly. Skips greetings.",
+    );
+    const result = buildSystemPrompt();
+    expect(result).toContain("# Voice Profile");
+    expect(result).toContain("Prefers lowercase");
+  });
+
+  test("omits the 12-voice section when VOICE.md is missing", () => {
+    const result = buildSystemPrompt();
+    expect(result).not.toContain("# Voice Profile");
+  });
+
+  test("omits the 12-voice section when VOICE.md is empty / whitespace-only", () => {
+    writeFileSync(join(TEST_DIR, "VOICE.md"), "   \n\n  \n");
+    const result = buildSystemPrompt();
+    expect(result).not.toContain("# Voice Profile");
   });
 
   describe("BOOTSTRAP.md user persona placeholder", () => {
-    test("substitutes {{USER_PERSONA_FILE}} with users/<slug>.md when userSlug is provided", () => {
+    test("substitutes {{userSlug}} with the resolved slug when a guardian slug is resolvable", () => {
+      // Simulate a guardian contact whose userFile resolves to alice.md.
+      mockPersona.userSlug = "alice";
       writeFileSync(
         join(TEST_DIR, "BOOTSTRAP.md"),
-        "# First run\n\nSave facts to users/{{USER_PERSONA_FILE}} immediately.",
+        "# First run\n\nSave facts to users/{{userSlug}}.md immediately.",
       );
-      const result = buildSystemPrompt({ userSlug: "alice" });
+      const result = buildSystemPrompt();
       expect(result).toContain("users/alice.md");
-      expect(result).not.toContain("{{USER_PERSONA_FILE}}");
+      expect(result).not.toContain("{{userSlug}}");
     });
 
-    test("falls back to users/default.md when userSlug is omitted", () => {
+    test("falls back to users/default.md when no slug is resolvable", () => {
       writeFileSync(
         join(TEST_DIR, "BOOTSTRAP.md"),
-        "# First run\n\nSave facts to users/{{USER_PERSONA_FILE}} immediately.",
+        "# First run\n\nSave facts to users/{{userSlug}}.md immediately.",
       );
       const result = buildSystemPrompt();
       expect(result).toContain("users/default.md");
-      expect(result).not.toContain("{{USER_PERSONA_FILE}}");
+      expect(result).not.toContain("{{userSlug}}");
     });
 
     test("substitutes the unmodified bundled BOOTSTRAP.md template", () => {
       // Copy the real bundled BOOTSTRAP.md into the test workspace so we
       // verify substitution against the actual template the daemon ships.
+      mockPersona.userSlug = "alice";
       const bundled = readFileSync(
         join(import.meta.dirname, "..", "prompts", "templates", "BOOTSTRAP.md"),
         "utf-8",
       );
       writeFileSync(join(TEST_DIR, "BOOTSTRAP.md"), bundled);
-      const result = buildSystemPrompt({ userSlug: "alice" });
+      const result = buildSystemPrompt();
       expect(result).toContain("users/alice.md");
-      expect(result).not.toContain("{{USER_PERSONA_FILE}}");
+      expect(result).not.toContain("{{userSlug}}");
     });
   });
 
@@ -513,8 +549,14 @@ describe("buildSystemPrompt", () => {
 
   test("file with only comment lines is treated as empty", () => {
     writeFileSync(join(TEST_DIR, "SOUL.md"), "_ All comments\n_ Nothing else");
+    writeFileSync(join(TEST_DIR, "IDENTITY.md"), "# Identity\n\nI am Vellum.");
     const result = buildSystemPrompt();
-    expect(basePrompt(result)).toBe("");
+    // Comment-only SOUL.md gets stripped down to "" by
+    // `stripCommentLines` and is then gated off by the renderer's
+    // empty-body check; only IDENTITY contributes content here.
+    expect(result).toContain("# Identity\n\nI am Vellum.");
+    expect(result).not.toContain("_ All comments");
+    expect(result).not.toContain("_ Nothing else");
   });
 
   describe("workspace system prompt sections", () => {
@@ -547,11 +589,7 @@ describe("buildSystemPrompt", () => {
       );
       const result = buildSystemPrompt();
       expect(result.startsWith("You are operating in demo mode.")).toBe(true);
-      // Prefix lives in the static (cached) block.
-      const boundaryIdx = result.indexOf(SYSTEM_PROMPT_CACHE_BOUNDARY);
-      expect(boundaryIdx).toBeGreaterThan(-1);
-      const staticBlock = result.slice(0, boundaryIdx);
-      expect(staticBlock).toContain("You are operating in demo mode.");
+      expect(result).toContain("You are operating in demo mode.");
     });
 
     test("workspace file without frontmatter is rendered as-is (always-on)", () => {
@@ -627,13 +665,10 @@ describe("buildSystemPrompt", () => {
       expect(result.startsWith("Custom prefix")).toBe(true);
       // IDENTITY.md renders via 08-identity in the static prefix after
       // the 00-prefix slot.
-      const boundaryIdx = result.indexOf(SYSTEM_PROMPT_CACHE_BOUNDARY);
-      const staticBlock = result.slice(0, boundaryIdx);
-      const prefixIdx = staticBlock.indexOf("Custom prefix");
-      const identityIdx = staticBlock.indexOf("I am Vellum.");
+      const prefixIdx = result.indexOf("Custom prefix");
+      const identityIdx = result.indexOf("I am Vellum.");
       expect(prefixIdx).toBeGreaterThan(-1);
       expect(identityIdx).toBeGreaterThan(prefixIdx);
-      expect(basePrompt(result)).toBe("");
     });
 
     test("parallel tool calls section is sourced from workspace when present", () => {
@@ -809,11 +844,7 @@ describe("buildSystemPrompt", () => {
         expect(result).toContain(
           "Run `assistant --help` to discover commands.",
         );
-        // Section lives in the static (cached) block.
-        const boundaryIdx = result.indexOf(SYSTEM_PROMPT_CACHE_BOUNDARY);
-        expect(boundaryIdx).toBeGreaterThan(-1);
-        const staticBlock = result.slice(0, boundaryIdx);
-        expect(staticBlock).toContain("## Assistant CLI");
+        expect(result).toContain("## Assistant CLI");
       });
 
       test("bundled cli-reference default renders when no workspace override", () => {
@@ -854,11 +885,7 @@ describe("buildSystemPrompt", () => {
         // The no-client body (em-dash separator after sandbox `bash`) must
         // not leak when the with-client variant is active.
         expect(result).not.toContain("install tools yourself; (2) browser");
-        // Section lives in the static (cached) block.
-        const boundaryIdx = result.indexOf(SYSTEM_PROMPT_CACHE_BOUNDARY);
-        expect(boundaryIdx).toBeGreaterThan(-1);
-        const staticBlock = result.slice(0, boundaryIdx);
-        expect(staticBlock).toContain("## External Service Access");
+        expect(result).toContain("## External Service Access");
       });
 
       test("hasNoClient=true renders the two-tier (no host_bash) priority list", () => {
@@ -967,8 +994,7 @@ describe("buildSystemPrompt", () => {
 
       test("paired {{#flag}} + {{^flag}} acts as if/else", () => {
         // Use long unique markers — single letters collide with substrings
-        // in the rest of the system prompt (e.g. "B" lives inside
-        // SYSTEM_PROMPT_CACHE_BOUNDARY, "A" inside "API keys").
+        // in the rest of the system prompt (e.g. "A" inside "API keys").
         mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
         writeFileSync(
           SECTION_FILE,
@@ -1033,11 +1059,7 @@ describe("buildSystemPrompt", () => {
         const result = buildSystemPrompt();
         expect(result).toContain("## Sending Files to the User");
         expect(result).toContain("Use the `<vellum-attachment />` tag.");
-        // Section lives in the static (cached) block.
-        const boundaryIdx = result.indexOf(SYSTEM_PROMPT_CACHE_BOUNDARY);
-        expect(boundaryIdx).toBeGreaterThan(-1);
-        const staticBlock = result.slice(0, boundaryIdx);
-        expect(staticBlock).toContain("## Sending Files to the User");
+        expect(result).toContain("## Sending Files to the User");
       });
 
       test("renders after the cli-reference section to preserve original order", () => {
@@ -1083,11 +1105,7 @@ describe("buildSystemPrompt", () => {
         const result = buildSystemPrompt();
         expect(result).toContain("## Credential Security");
         expect(result).toContain("Workspace override marker BRAVO_TANGO_7.");
-        // Section lives in the static (cached) block.
-        const boundaryIdx = result.indexOf(SYSTEM_PROMPT_CACHE_BOUNDARY);
-        expect(boundaryIdx).toBeGreaterThan(-1);
-        const staticBlock = result.slice(0, boundaryIdx);
-        expect(staticBlock).toContain("## Credential Security");
+        expect(result).toContain("## Credential Security");
       });
 
       test("bundled credential-security default renders when no workspace override", () => {
@@ -1127,11 +1145,7 @@ describe("buildSystemPrompt", () => {
         const result = buildSystemPrompt();
         expect(result).toContain("## External Content");
         expect(result).toContain("Workspace override marker NEBULA_9X.");
-        // Section lives in the static (cached) block.
-        const boundaryIdx = result.indexOf(SYSTEM_PROMPT_CACHE_BOUNDARY);
-        expect(boundaryIdx).toBeGreaterThan(-1);
-        const staticBlock = result.slice(0, boundaryIdx);
-        expect(staticBlock).toContain("## External Content");
+        expect(result).toContain("## External Content");
       });
 
       test("bundled external-content default renders when no workspace override", () => {

package/src/__tests__/terminal-tools.test.ts

@@ -288,7 +288,7 @@ describe("Shell tool input validation", () => {
   });
 
   test("tool definition includes required schema fields", () => {
-    const def = shellTool.getDefinition();
+    const def = shellTool;
     const schema = def.input_schema as {
       required: string[];
       properties: Record<string, unknown>;

package/src/__tests__/tool-approval-handler.test.ts

@@ -26,11 +26,7 @@ const fakeTool = {
   description: "Run a shell command",
   category: "shell",
   defaultRiskLevel: "high",
-  getDefinition: () => ({
-    name: "bash",
-    description: "Run a shell command",
-    input_schema: {},
-  }),
+  input_schema: {},
   execute: async () => ({ content: "ok", isError: false }),
 };
 

package/src/__tests__/tool-execute-pipeline.test.ts

@@ -95,7 +95,7 @@ mock.module("../permissions/checker.js", () => ({
 mock.module("../memory/tool-usage-store.js", () => ({
   recordToolInvocation: () => {},
   getRecentInvocations: () => [],
-  rotateToolInvocations: () => 0,
+  rotateToolInvocations: async () => 0,
 }));
 
 // ── Tool registry: return a stub tool whose execute records the call ─
@@ -113,7 +113,7 @@ mock.module("../tools/registry.js", () => ({
       description: "test tool",
       category: "test",
       defaultRiskLevel: "low",
-      getDefinition: () => ({}),
+      input_schema: {},
       execute: async (input: Record<string, unknown>) => {
         lastToolCall = { name, input };
         return fakeToolResult;