@vellumai/assistant 0.8.1 → 0.8.3

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

@@ -32,7 +32,7 @@ mock.module("../util/logger.js", () => ({
 }));
 
 // Mutable config used by the mocked loader so individual tests can override
-// specific fields (e.g. systemPromptPrefix) without touching other sections.
+// specific fields without touching other sections.
 const mockLoadedConfig: Record<string, unknown> = {};
 
 mock.module("../config/loader.js", () => ({
@@ -78,12 +78,13 @@ const {
 } = await import("../prompts/system-prompt.js");
 
 /**
- * Extract just the workspace-file content (IDENTITY.md, SOUL.md,
- * BOOTSTRAP.md) from the full system prompt, stripping all static
- * instruction sections, configuration, and skills catalog.
+ * Extract IDENTITY.md / BOOTSTRAP.md content + the user persona from the
+ * dynamic block of the system prompt, stripping configuration, skills
+ * catalog, and connected services.
  *
- * After the cache-boundary refactor, workspace content lives in the
- * dynamic block (after SYSTEM_PROMPT_CACHE_BOUNDARY).
+ * SOUL.md no longer flows through this helper — it renders as the
+ * `09-soul` workspace-backed section in the static (cached) prefix.
+ * Tests that assert on SOUL.md content slice the static block directly.
  */
 function basePrompt(result: string): string {
   // The workspace files are in the dynamic block after the cache boundary.
@@ -127,7 +128,9 @@ describe("buildSystemPrompt", () => {
       const p = join(TEST_DIR, name);
       if (existsSync(p)) rmSync(p, { recursive: true, force: true });
     }
-    delete mockLoadedConfig.systemPromptPrefix;
+    for (const key of Object.keys(mockLoadedConfig)) {
+      delete mockLoadedConfig[key];
+    }
   });
 
   test("returns empty string when no files exist", () => {
@@ -138,7 +141,11 @@ describe("buildSystemPrompt", () => {
   test("uses SOUL.md when it exists", () => {
     writeFileSync(join(TEST_DIR, "SOUL.md"), "# My Soul\n\nBe awesome.");
     const result = buildSystemPrompt();
-    expect(basePrompt(result)).toBe("# My Soul\n\nBe awesome.");
+    // 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.");
   });
 
   test("uses IDENTITY.md when it exists", () => {
@@ -154,9 +161,11 @@ describe("buildSystemPrompt", () => {
     writeFileSync(join(TEST_DIR, "IDENTITY.md"), "# Identity\n\nI am Vellum.");
     writeFileSync(join(TEST_DIR, "SOUL.md"), "# Soul\n\nBe thoughtful.");
     const result = buildSystemPrompt();
-    expect(basePrompt(result)).toBe(
-      "# Identity\n\nI am Vellum.\n\n# Soul\n\nBe thoughtful.",
-    );
+    // SOUL renders as the workspace-backed section in the static prefix;
+    // IDENTITY renders in the dynamic suffix.
+    const boundaryIdx = result.indexOf(SYSTEM_PROMPT_CACHE_BOUNDARY);
+    expect(result.slice(0, boundaryIdx)).toContain("# Soul\n\nBe thoughtful.");
+    expect(basePrompt(result)).toBe("# Identity\n\nI am Vellum.");
   });
 
   test("ignores empty SOUL.md", () => {
@@ -174,7 +183,12 @@ describe("buildSystemPrompt", () => {
   test("trims whitespace from file content", () => {
     writeFileSync(join(TEST_DIR, "SOUL.md"), "\n  Be kind  \n\n");
     const result = buildSystemPrompt();
-    expect(basePrompt(result)).toBe("Be kind");
+    // 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");
   });
 
   test("does not include skills catalog in system prompt", () => {
@@ -184,7 +198,6 @@ describe("buildSystemPrompt", () => {
       join(skillsDir, "release-checklist", "SKILL.md"),
       '---\nname: "Release Checklist"\ndescription: "Deployment checks."\n---\n\nRun checks.\n',
     );
-    writeFileSync(join(skillsDir, "SKILLS.md"), "- release-checklist\n");
 
     writeFileSync(join(TEST_DIR, "IDENTITY.md"), "Custom identity");
     const result = buildSystemPrompt();
@@ -200,29 +213,19 @@ describe("buildSystemPrompt", () => {
       join(skillsDir, "incident-response", "SKILL.md"),
       '---\nname: "Incident Response"\ndescription: "Triage and mitigation."\n---\n\nFollow runbook.\n',
     );
-    writeFileSync(join(skillsDir, "SKILLS.md"), "- incident-response\n");
     writeFileSync(join(TEST_DIR, "IDENTITY.md"), "Identity content");
     writeFileSync(join(TEST_DIR, "SOUL.md"), "Soul content");
 
     const result = buildSystemPrompt();
-    expect(result).toContain("Identity content\n\nSoul content");
+    // After SOUL.md became the `09-soul` workspace-backed section, it
+    // renders in the static prefix while IDENTITY stays in the dynamic
+    // suffix — the two are no longer adjacent.  Verify both are present
+    // and the skills catalog is still suppressed.
+    expect(result).toContain("Identity content");
+    expect(result).toContain("Soul content");
     expect(result).not.toContain("## Available Skills");
   });
 
-  test("includes external service access section", () => {
-    const result = buildSystemPrompt();
-    expect(result).toContain("## External Service Access");
-    expect(result).toContain("browser automation as last resort");
-  });
-
-  test("includes inline media attachment guidance", () => {
-    const result = buildSystemPrompt();
-    expect(result).toContain(
-      "Image and video attachments can render inline in chat.",
-    );
-    expect(result).toContain("attach it instead of only printing its path");
-  });
-
   test("does not include removed sections", () => {
     const result = buildSystemPrompt();
     expect(result).not.toContain("## External Communications Identity");
@@ -259,7 +262,12 @@ describe("buildSystemPrompt", () => {
     writeFileSync(join(TEST_DIR, "IDENTITY.md"), "Identity");
     writeFileSync(join(TEST_DIR, "SOUL.md"), "Soul");
     const result = buildSystemPrompt();
-    expect(basePrompt(result)).toBe("Identity\n\nSoul");
+    // SOUL.md now renders in the static (cached) prefix via the 09-soul
+    // section, so it doesn't flow through basePrompt.  Assert that
+    // IDENTITY is the only dynamic content and that SOUL is still in the
+    // full prompt.
+    expect(basePrompt(result)).toBe("Identity");
+    expect(result).toContain("Soul");
   });
 
   test("does not read USER.md content from disk even when the file is present", () => {
@@ -281,9 +289,12 @@ describe("buildSystemPrompt", () => {
     const result = buildSystemPrompt({
       userPersona: "# User persona\n\nName: Alice",
     });
+    // SOUL.md renders in the static (cached) prefix via the 09-soul section
+    // and is no longer part of the dynamic block sliced by basePrompt.
     expect(basePrompt(result)).toBe(
-      "Identity\n\nSoul\n\n# User persona\n\nName: Alice",
+      "Identity\n\n# User persona\n\nName: Alice",
     );
+    expect(result).toContain("Soul");
   });
 
   describe("BOOTSTRAP.md user persona placeholder", () => {
@@ -478,7 +489,11 @@ describe("buildSystemPrompt", () => {
       "First paragraph\n\n_ Comment between paragraphs\n\nSecond paragraph",
     );
     const result = buildSystemPrompt();
-    expect(basePrompt(result)).toBe("First paragraph\n\nSecond paragraph");
+    // SOUL.md renders in the static prefix via the 09-soul section, so we
+    // assert against the full prompt rather than basePrompt.  Comment lines
+    // are stripped and surrounding whitespace collapsed by renderSection.
+    expect(result).toContain("First paragraph\n\nSecond paragraph");
+    expect(result).not.toContain("Comment between paragraphs");
   });
 
   test("file with only comment lines is treated as empty", () => {
@@ -487,55 +502,100 @@ describe("buildSystemPrompt", () => {
     expect(basePrompt(result)).toBe("");
   });
 
-  describe("custom systemPromptPrefix", () => {
-    test("omits prefix when config value is unset", () => {
-      const result = buildSystemPrompt();
-      // With no prefix, the prompt should start with the parallel tool calls
-      // section (the first static section when no prefix is injected).
-      expect(result.startsWith("<use_parallel_tool_calls>")).toBe(true);
+  describe("workspace system prompt sections", () => {
+    const SYSTEM_PROMPTS_DIR = join(TEST_DIR, "prompts", "system");
+    const PREFIX_FILE = join(SYSTEM_PROMPTS_DIR, "00-prefix.md");
+    const PARALLEL_FILE = join(SYSTEM_PROMPTS_DIR, "01-parallel-tool-calls.md");
+    const PREFIX_FRONTMATTER = '---\nenabled: "!excludeCustomPrefix"\n---\n';
+
+    afterEach(() => {
+      if (existsSync(SYSTEM_PROMPTS_DIR))
+        rmSync(SYSTEM_PROMPTS_DIR, { recursive: true, force: true });
     });
 
-    test("omits prefix when config value is null", () => {
-      mockLoadedConfig.systemPromptPrefix = null;
+    test("no workspace section files → bundled defaults render directly", () => {
+      // Bundled `templates/system/` files are the source of default truth.
+      // With no workspace overrides in place, the renderer falls through to
+      // the bundled body so `01-parallel-tool-calls.md` ships its default
+      // guidance even though `ensurePromptFiles()` no longer seeds section
+      // files into the workspace.
       const result = buildSystemPrompt();
-      expect(result.startsWith("<use_parallel_tool_calls>")).toBe(true);
+      expect(result).toContain("<use_parallel_tool_calls>");
+      expect(result).toContain("Batch independent tool calls");
     });
 
-    test("omits prefix when config value is an empty string", () => {
-      mockLoadedConfig.systemPromptPrefix = "";
+    test("workspace prefix with frontmatter renders body at the very top", () => {
+      mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+      writeFileSync(
+        PREFIX_FILE,
+        PREFIX_FRONTMATTER + "You are operating in demo mode.\n",
+      );
       const result = buildSystemPrompt();
-      expect(result.startsWith("<use_parallel_tool_calls>")).toBe(true);
+      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.");
     });
 
-    test("omits prefix when config value is whitespace-only", () => {
-      mockLoadedConfig.systemPromptPrefix = "   \n\n  ";
+    test("workspace file without frontmatter is rendered as-is (always-on)", () => {
+      mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+      writeFileSync(PREFIX_FILE, "Plain prefix, no frontmatter.\n");
       const result = buildSystemPrompt();
-      expect(result.startsWith("<use_parallel_tool_calls>")).toBe(true);
+      expect(result.startsWith("Plain prefix, no frontmatter.")).toBe(true);
     });
 
-    test("injects prefix at the very start of the prompt when set", () => {
-      mockLoadedConfig.systemPromptPrefix = "You are operating in demo mode.";
+    test("renders nothing when workspace prefix body is empty after stripping", () => {
+      mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+      writeFileSync(PREFIX_FILE, PREFIX_FRONTMATTER);
       const result = buildSystemPrompt();
-      expect(result.startsWith("You are operating in demo mode.")).toBe(true);
-      // The standard static sections should still follow the prefix.
+      // Frontmatter-only override → workspace wins (existsSync(workspace) is
+      // true) but body strips to empty → prefix renders nothing.  No leaked
+      // frontmatter at top, but the bundled `01-parallel-tool-calls.md`
+      // default still renders because that slot has no workspace override.
+      expect(result.startsWith("---")).toBe(false);
       expect(result).toContain("<use_parallel_tool_calls>");
-      // Prefix lives in the static (cached) block, not the dynamic 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.");
     });
 
-    test("trims leading/trailing whitespace from the prefix", () => {
-      mockLoadedConfig.systemPromptPrefix =
-        "\n\n  Pretend you are a pirate.  \n\n";
+    test("comment-only workspace prefix body strips to nothing — no comment text leaks", () => {
+      // Bundled `00-prefix.md` ships frontmatter-only (empty body), so
+      // either way the prefix slot contributes nothing — workspace
+      // override stripped to empty by `_` comment lines, or bundled
+      // fallback already empty.  This test asserts only that the
+      // `_`-prefixed comment text does not bleed into the output.
+      // Bundled sections at higher slots still render (covered by
+      // other tests).
+      mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+      writeFileSync(
+        PREFIX_FILE,
+        PREFIX_FRONTMATTER +
+          "_ UNIQUE_COMMENT_MARKER_PURPLE_OCTOPUS\n_ UNIQUE_COMMENT_MARKER_GREEN_HELICOPTER\n",
+      );
+      const result = buildSystemPrompt();
+      expect(result).not.toContain("UNIQUE_COMMENT_MARKER_PURPLE_OCTOPUS");
+      expect(result).not.toContain("UNIQUE_COMMENT_MARKER_GREEN_HELICOPTER");
+    });
+
+    test("strips comment lines and trims whitespace from rendered body", () => {
+      mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+      writeFileSync(
+        PREFIX_FILE,
+        PREFIX_FRONTMATTER +
+          "_ inline note\n\n  Pretend you are a pirate.  \n\n",
+      );
       const result = buildSystemPrompt();
       expect(result.startsWith("Pretend you are a pirate.")).toBe(true);
+      expect(result).not.toContain("inline note");
     });
 
-    test("multi-line prefixes are preserved verbatim after trimming", () => {
-      mockLoadedConfig.systemPromptPrefix =
-        "# Org Guardrails\n\n- Never discuss pricing.\n- Escalate refunds.";
+    test("multi-line bodies are preserved verbatim after stripping", () => {
+      mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+      writeFileSync(
+        PREFIX_FILE,
+        PREFIX_FRONTMATTER +
+          "# Org Guardrails\n\n- Never discuss pricing.\n- Escalate refunds.\n",
+      );
       const result = buildSystemPrompt();
       expect(
         result.startsWith(
@@ -545,12 +605,546 @@ describe("buildSystemPrompt", () => {
     });
 
     test("workspace file content still appears after prefix", () => {
-      mockLoadedConfig.systemPromptPrefix = "Custom prefix";
+      mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+      writeFileSync(PREFIX_FILE, PREFIX_FRONTMATTER + "Custom prefix\n");
       writeFileSync(join(TEST_DIR, "IDENTITY.md"), "I am Vellum.");
       const result = buildSystemPrompt();
       expect(result.startsWith("Custom prefix")).toBe(true);
       expect(basePrompt(result)).toBe("I am Vellum.");
     });
+
+    test("parallel tool calls section is sourced from workspace when present", () => {
+      mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+      writeFileSync(
+        PARALLEL_FILE,
+        "<use_parallel_tool_calls>\nCustomized parallel guidance.\n</use_parallel_tool_calls>\n",
+      );
+      const result = buildSystemPrompt();
+      expect(result).toContain("Customized parallel guidance.");
+      // Body of the bundled file must not leak in.
+      expect(result).not.toContain("Batch independent tool calls");
+    });
+
+    test("comment-only parallel file suppresses the section entirely", () => {
+      mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+      writeFileSync(PARALLEL_FILE, "_ silenced\n");
+      const result = buildSystemPrompt();
+      expect(result).not.toContain("<use_parallel_tool_calls>");
+    });
+
+    test("frontmatter `enabled: !excludeCustomPrefix` suppresses prefix when flag is true", () => {
+      mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+      writeFileSync(
+        PREFIX_FILE,
+        PREFIX_FRONTMATTER + "Should be excluded by sidechain.\n",
+      );
+      const result = buildSystemPrompt({ excludeCustomPrefix: true });
+      expect(result).not.toContain("Should be excluded by sidechain.");
+    });
+
+    test("frontmatter `enabled: !excludeCustomPrefix` renders prefix when flag is false", () => {
+      mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+      writeFileSync(PREFIX_FILE, PREFIX_FRONTMATTER + "Default-on prefix.\n");
+      const result = buildSystemPrompt({ excludeCustomPrefix: false });
+      expect(result.startsWith("Default-on prefix.")).toBe(true);
+    });
+
+    test("frontmatter `enabled: <unknown-key>` treats key as falsy → suppresses", () => {
+      mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+      writeFileSync(
+        PREFIX_FILE,
+        "---\nenabled: someUnknownFlag\n---\nShould not render.\n",
+      );
+      const result = buildSystemPrompt();
+      expect(result).not.toContain("Should not render.");
+    });
+
+    test("frontmatter `enabled: false` (literal boolean) suppresses the section", () => {
+      mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+      writeFileSync(
+        PREFIX_FILE,
+        "---\nenabled: false\n---\nShould not render.\n",
+      );
+      const result = buildSystemPrompt();
+      expect(result).not.toContain("Should not render.");
+    });
+
+    test("workspace `enabled: false` on a slot WITH a bundled file suppresses the bundled default", () => {
+      // Override wins regardless of body — the workspace file's `enabled: false`
+      // frontmatter wins over the bundled `01-parallel-tool-calls.md` default,
+      // so the bundled body must not leak into the rendered output.  This is
+      // the explicit "user silenced this section" path.
+      mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+      writeFileSync(PARALLEL_FILE, "---\nenabled: false\n---\nIgnored body.\n");
+      const result = buildSystemPrompt();
+      expect(result).not.toContain("<use_parallel_tool_calls>");
+      expect(result).not.toContain("Batch independent tool calls");
+      expect(result).not.toContain("Ignored body.");
+    });
+
+    test("workspace-only sections (no bundled counterpart) render — discovery union covers both dirs", () => {
+      // The renderer collects section ids as the union of bundled and
+      // workspace filenames, so any numbered `.md` a user drops into
+      // `<workspace>/prompts/system/` joins the render order automatically
+      // even when no bundled file shares its id.
+      mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+      writeFileSync(
+        join(SYSTEM_PROMPTS_DIR, "99-org-policy.md"),
+        "# Org policy\n\nUnique workspace-only marker A1B2C3.\n",
+      );
+      const result = buildSystemPrompt();
+      expect(result).toContain("Unique workspace-only marker A1B2C3.");
+      // Sort order is filename-driven; the new section sorts after `01-`,
+      // so it must appear after the parallel-tool-calls block when both
+      // are present.
+      mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+      writeFileSync(
+        PARALLEL_FILE,
+        "<use_parallel_tool_calls>\nbatched.\n</use_parallel_tool_calls>\n",
+      );
+      const ordered = buildSystemPrompt();
+      const parallelIdx = ordered.indexOf("batched.");
+      const orgIdx = ordered.indexOf("Unique workspace-only marker A1B2C3.");
+      expect(parallelIdx).toBeGreaterThan(-1);
+      expect(orgIdx).toBeGreaterThan(parallelIdx);
+    });
+
+    describe("containerized section (slot 02)", () => {
+      const CONTAINERIZED_FILE = join(
+        SYSTEM_PROMPTS_DIR,
+        "02-containerized.md",
+      );
+
+      // The runtime gate is `isContainerized` on the render context, sourced
+      // from `getIsContainerized()` which reads `process.env.IS_CONTAINERIZED`.
+      // Tests toggle the env var directly and restore it in `finally`.
+      let priorIsContainerized: string | undefined;
+
+      beforeEach(() => {
+        priorIsContainerized = process.env.IS_CONTAINERIZED;
+      });
+
+      afterEach(() => {
+        if (priorIsContainerized === undefined)
+          delete process.env.IS_CONTAINERIZED;
+        else process.env.IS_CONTAINERIZED = priorIsContainerized;
+      });
+
+      test("renders the section when IS_CONTAINERIZED=true with {{workspaceDir}} interpolated", () => {
+        mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+        writeFileSync(
+          CONTAINERIZED_FILE,
+          "---\nenabled: isContainerized\n---\n" +
+            "Container mounted at `{{workspaceDir}}`. Persist accordingly.\n",
+        );
+        process.env.IS_CONTAINERIZED = "true";
+        const result = buildSystemPrompt();
+        expect(result).toContain(
+          `Container mounted at \`${TEST_DIR}\`. Persist accordingly.`,
+        );
+        // The literal `{{workspaceDir}}` must be substituted, not leaked.
+        expect(result).not.toContain("{{workspaceDir}}");
+      });
+
+      test("omits the section when IS_CONTAINERIZED is unset", () => {
+        mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+        writeFileSync(
+          CONTAINERIZED_FILE,
+          "---\nenabled: isContainerized\n---\nContainer guidance body.\n",
+        );
+        delete process.env.IS_CONTAINERIZED;
+        const result = buildSystemPrompt();
+        expect(result).not.toContain("Container guidance body.");
+      });
+
+      test("omits the section when IS_CONTAINERIZED=false (string)", () => {
+        mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+        writeFileSync(
+          CONTAINERIZED_FILE,
+          "---\nenabled: isContainerized\n---\nContainer guidance body.\n",
+        );
+        process.env.IS_CONTAINERIZED = "false";
+        const result = buildSystemPrompt();
+        expect(result).not.toContain("Container guidance body.");
+      });
+    });
+
+    describe("cli-reference section (slot 03)", () => {
+      const CLI_REFERENCE_FILE = join(
+        SYSTEM_PROMPTS_DIR,
+        "03-cli-reference.md",
+      );
+
+      test("workspace cli-reference file is rendered into the static block", () => {
+        mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+        writeFileSync(
+          CLI_REFERENCE_FILE,
+          "## Assistant CLI\n\nRun `assistant --help` to discover commands.\n",
+        );
+        const result = buildSystemPrompt();
+        expect(result).toContain("## Assistant CLI");
+        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");
+      });
+
+      test("bundled cli-reference default renders when no workspace override", () => {
+        // Bundled `03-cli-reference.md` is the source of default truth.  No
+        // workspace override → renderer falls through to bundled body, so
+        // `## Assistant CLI` lands in the static block automatically.
+        mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+        const result = buildSystemPrompt();
+        expect(result).toContain("## Assistant CLI");
+        expect(result).toContain("`assistant` CLI is available");
+      });
+    });
+
+    describe("access-preference section (slot 05)", () => {
+      const ACCESS_FILE = join(SYSTEM_PROMPTS_DIR, "05-access-preference.md");
+      // Mirrors the bundled `templates/system/05-access-preference.md` — both
+      // variants live in the markdown body and the renderer picks one via
+      // mustache-style `{{#hasNoClient}}` / `{{^hasNoClient}}` conditionals.
+      const TEMPLATE_BODY = [
+        "## External Service Access",
+        "",
+        "{{#hasNoClient}}",
+        "Priority: (1) sandbox `bash` — install tools yourself; (2) browser automation as last resort (no API, visual interaction, or OAuth consent).",
+        "{{/hasNoClient}}",
+        "{{^hasNoClient}}",
+        "Priority: (1) sandbox `bash` - install tools yourself, only fall back to host when you need local files/auth; (2) `host_bash` with CLIs (gh, aws, etc.) using --json flags; (3) browser automation as last resort (no API, visual interaction, or OAuth consent).",
+        "{{/hasNoClient}}",
+        "",
+      ].join("\n");
+
+      test("with-client (default) renders the three-tier priority list", () => {
+        mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+        writeFileSync(ACCESS_FILE, TEMPLATE_BODY);
+        const result = buildSystemPrompt();
+        expect(result).toContain("## External Service Access");
+        expect(result).toContain("`host_bash` with CLIs");
+        expect(result).toContain("browser automation as last resort");
+        // 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");
+      });
+
+      test("hasNoClient=true renders the two-tier (no host_bash) priority list", () => {
+        mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+        writeFileSync(ACCESS_FILE, TEMPLATE_BODY);
+        const result = buildSystemPrompt({ hasNoClient: true });
+        expect(result).toContain("## External Service Access");
+        expect(result).toContain("browser automation as last resort");
+        // The host_bash tier must be absent in the no-client variant.
+        expect(result).not.toContain("`host_bash` with CLIs");
+        // The no-client body uses an em-dash + semicolon separator after
+        // sandbox `bash`; the with-client body uses a comma — guard against
+        // the wrong variant leaking through.
+        expect(result).toContain("install tools yourself; (2) browser");
+        expect(result).not.toContain(
+          "only fall back to host when you need local files/auth",
+        );
+      });
+
+      test("standalone tag lines do not bleed extra blank lines into output", () => {
+        mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+        writeFileSync(ACCESS_FILE, TEMPLATE_BODY);
+        const result = buildSystemPrompt();
+        // The heading and the active variant body should sit on adjacent
+        // lines separated by exactly one blank line — no triple-newline
+        // artifacts from the section markers.
+        expect(result).toMatch(
+          /## External Service Access\n\nPriority: \(1\) sandbox `bash` -/,
+        );
+      });
+
+      test("bundled access-preference default renders when no workspace override", () => {
+        // Bundled `05-access-preference.md` carries both with-client and
+        // no-client variants inline behind mustache section conditionals,
+        // so the default body renders without any workspace file present.
+        mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+        const result = buildSystemPrompt();
+        expect(result).toContain("## External Service Access");
+        expect(result).toContain("`host_bash` with CLIs");
+      });
+
+      test("renders after the attachment section to preserve original order", () => {
+        mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+        writeFileSync(
+          join(SYSTEM_PROMPTS_DIR, "04-attachment.md"),
+          "## Sending Files to the User\n\nbody.\n",
+        );
+        writeFileSync(ACCESS_FILE, TEMPLATE_BODY);
+        const result = buildSystemPrompt();
+        const attachmentIdx = result.indexOf("## Sending Files to the User");
+        const accessIdx = result.indexOf("## External Service Access");
+        expect(attachmentIdx).toBeGreaterThan(-1);
+        expect(accessIdx).toBeGreaterThan(-1);
+        expect(attachmentIdx).toBeLessThan(accessIdx);
+      });
+    });
+
+    describe("mustache section interpolation", () => {
+      // Reuse slot 00 (prefix) — its default-on `enabled` predicate is
+      // already covered by other tests; here we only care about body
+      // interpolation shape.
+      const SECTION_FILE = join(SYSTEM_PROMPTS_DIR, "00-prefix.md");
+      const FRONTMATTER = '---\nenabled: "!excludeCustomPrefix"\n---\n';
+
+      test("{{#flag}}body{{/flag}} renders body when ctx[flag] is truthy", () => {
+        mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+        writeFileSync(
+          SECTION_FILE,
+          FRONTMATTER + "before {{#hasNoClient}}YES{{/hasNoClient}} after\n",
+        );
+        const result = buildSystemPrompt({ hasNoClient: true });
+        expect(result).toContain("before YES after");
+      });
+
+      test("{{#flag}}body{{/flag}} omits body when ctx[flag] is falsy", () => {
+        mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+        writeFileSync(
+          SECTION_FILE,
+          FRONTMATTER + "before {{#hasNoClient}}YES{{/hasNoClient}} after\n",
+        );
+        const result = buildSystemPrompt({ hasNoClient: false });
+        expect(result).toContain("before  after");
+        expect(result).not.toContain("YES");
+      });
+
+      test("{{^flag}}body{{/flag}} renders body when ctx[flag] is falsy", () => {
+        mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+        writeFileSync(
+          SECTION_FILE,
+          FRONTMATTER + "before {{^hasNoClient}}NO{{/hasNoClient}} after\n",
+        );
+        const result = buildSystemPrompt({ hasNoClient: false });
+        expect(result).toContain("before NO after");
+      });
+
+      test("{{^flag}}body{{/flag}} omits body when ctx[flag] is truthy", () => {
+        mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+        writeFileSync(
+          SECTION_FILE,
+          FRONTMATTER + "before {{^hasNoClient}}NO{{/hasNoClient}} after\n",
+        );
+        const result = buildSystemPrompt({ hasNoClient: true });
+        expect(result).toContain("before  after");
+        expect(result).not.toContain("NO");
+      });
+
+      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").
+        mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+        writeFileSync(
+          SECTION_FILE,
+          FRONTMATTER +
+            "{{#hasNoClient}}NO_CLIENT_BRANCH_MARKER{{/hasNoClient}}{{^hasNoClient}}WITH_CLIENT_BRANCH_MARKER{{/hasNoClient}}\n",
+        );
+        const onTrue = buildSystemPrompt({ hasNoClient: true });
+        expect(onTrue).toContain("NO_CLIENT_BRANCH_MARKER");
+        expect(onTrue).not.toContain("WITH_CLIENT_BRANCH_MARKER");
+        const onFalse = buildSystemPrompt({ hasNoClient: false });
+        expect(onFalse).toContain("WITH_CLIENT_BRANCH_MARKER");
+        expect(onFalse).not.toContain("NO_CLIENT_BRANCH_MARKER");
+      });
+
+      test("section body may contain a {{variable}} substitution", () => {
+        // Gate on `hasNoClient` (passed explicitly, so we don't depend on
+        // ambient test-env state for `isContainerized`).  The section body
+        // includes a `{{workspaceDir}}` interpolation that should resolve
+        // to the test workspace path.
+        mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+        writeFileSync(
+          SECTION_FILE,
+          FRONTMATTER +
+            "{{#hasNoClient}}cwd={{workspaceDir}}{{/hasNoClient}}\n",
+        );
+        const result = buildSystemPrompt({ hasNoClient: true });
+        expect(result).toMatch(/cwd=\S+/);
+        expect(result).not.toContain("{{workspaceDir}}");
+      });
+
+      test("section keys missing from ctx gate the body off (treated as falsy)", () => {
+        mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+        writeFileSync(
+          SECTION_FILE,
+          FRONTMATTER + "{{#noSuchFlag}}hidden{{/noSuchFlag}}\n",
+        );
+        const result = buildSystemPrompt();
+        expect(result).not.toContain("{{#noSuchFlag}}");
+        expect(result).not.toContain("hidden");
+      });
+
+      test("inverted section keys missing from ctx render the body (undefined is falsy)", () => {
+        mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+        writeFileSync(
+          SECTION_FILE,
+          FRONTMATTER + "{{^noSuchFlag}}shown{{/noSuchFlag}}\n",
+        );
+        const result = buildSystemPrompt();
+        expect(result).toContain("shown");
+      });
+    });
+
+    describe("attachment section (slot 04)", () => {
+      const ATTACHMENT_FILE = join(SYSTEM_PROMPTS_DIR, "04-attachment.md");
+
+      test("workspace attachment file is rendered into the static block", () => {
+        mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+        writeFileSync(
+          ATTACHMENT_FILE,
+          "## Sending Files to the User\n\nUse the `<vellum-attachment />` tag.\n",
+        );
+        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");
+      });
+
+      test("renders after the cli-reference section to preserve original order", () => {
+        mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+        writeFileSync(
+          join(SYSTEM_PROMPTS_DIR, "03-cli-reference.md"),
+          "## Assistant CLI\n\nUse `assistant --help`.\n",
+        );
+        writeFileSync(
+          ATTACHMENT_FILE,
+          "## Sending Files to the User\n\nbody.\n",
+        );
+        const result = buildSystemPrompt();
+        const cliIdx = result.indexOf("## Assistant CLI");
+        const attachmentIdx = result.indexOf("## Sending Files to the User");
+        expect(cliIdx).toBeGreaterThan(-1);
+        expect(attachmentIdx).toBeGreaterThan(-1);
+        expect(cliIdx).toBeLessThan(attachmentIdx);
+      });
+
+      test("bundled attachment default renders when no workspace override", () => {
+        // Bundled `04-attachment.md` is the source of default truth; no
+        // workspace override → renderer falls through to bundled body.
+        mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+        const result = buildSystemPrompt();
+        expect(result).toContain("## Sending Files to the User");
+        expect(result).toContain("<vellum-attachment");
+      });
+    });
+
+    describe("credential-security section (slot 06)", () => {
+      const CREDENTIAL_FILE = join(
+        SYSTEM_PROMPTS_DIR,
+        "06-credential-security.md",
+      );
+
+      test("workspace credential-security file is rendered into the static block", () => {
+        mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+        writeFileSync(
+          CREDENTIAL_FILE,
+          "## Credential Security\n\nWorkspace override marker BRAVO_TANGO_7.\n",
+        );
+        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");
+      });
+
+      test("bundled credential-security default renders when no workspace override", () => {
+        // Bundled `06-credential-security` registry entry is the source of
+        // default truth; no workspace override → renderer falls through to
+        // bundled body.
+        mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+        const result = buildSystemPrompt();
+        expect(result).toContain("## Credential Security");
+        expect(result).toContain("Never ask users to share secrets");
+        expect(result).toContain("`credential_store` tool");
+      });
+
+      test("renders after the access-preference section to preserve original order", () => {
+        // Static-block order from the pre-registry inline build was
+        // access-preference → credential-security.  The numeric prefix on
+        // the registry id (`06-` > `05-`) preserves that order.
+        mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+        const result = buildSystemPrompt();
+        const accessIdx = result.indexOf("## External Service Access");
+        const credentialIdx = result.indexOf("## Credential Security");
+        expect(accessIdx).toBeGreaterThan(-1);
+        expect(credentialIdx).toBeGreaterThan(-1);
+        expect(accessIdx).toBeLessThan(credentialIdx);
+      });
+    });
+
+    describe("external-content section (slot 07)", () => {
+      const EXTERNAL_FILE = join(SYSTEM_PROMPTS_DIR, "07-external-content.md");
+
+      test("workspace external-content file is rendered into the static block", () => {
+        mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+        writeFileSync(
+          EXTERNAL_FILE,
+          "## External Content\n\nWorkspace override marker NEBULA_9X.\n",
+        );
+        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");
+      });
+
+      test("bundled external-content default renders when no workspace override", () => {
+        // Bundled `07-external-content` registry entry is the source of
+        // default truth; no workspace override → renderer falls through to
+        // bundled body.
+        mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+        const result = buildSystemPrompt();
+        expect(result).toContain("## External Content");
+        expect(result).toContain("third-party data");
+        expect(result).toContain("`<external_content>`");
+      });
+
+      test("renders after the credential-security section to preserve original order", () => {
+        // Static-block order from the pre-registry inline build was
+        // credential-security → external-content.  The numeric prefix on
+        // the registry id (`07-` > `06-`) preserves that order.
+        mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+        const result = buildSystemPrompt();
+        const credentialIdx = result.indexOf("## Credential Security");
+        const externalIdx = result.indexOf("## External Content");
+        expect(credentialIdx).toBeGreaterThan(-1);
+        expect(externalIdx).toBeGreaterThan(-1);
+        expect(credentialIdx).toBeLessThan(externalIdx);
+      });
+    });
+
+    test("unresolved {{variable}} is left as a literal in the body", () => {
+      mkdirSync(SYSTEM_PROMPTS_DIR, { recursive: true });
+      writeFileSync(
+        PREFIX_FILE,
+        PREFIX_FRONTMATTER + "Has {{somethingMissing}} in body.\n",
+      );
+      const result = buildSystemPrompt();
+      expect(result).toContain("Has {{somethingMissing}} in body.");
+    });
   });
 });
 
@@ -748,6 +1342,19 @@ describe("ensurePromptFiles", () => {
     expect(content.length).toBeGreaterThan(0);
   });
 
+  test("does not seed bundled system prompt sections into the workspace", () => {
+    // Bundled `templates/system/*.md` files are the source of default truth.
+    // The renderer reads them directly; the workspace dir is an optional
+    // override layer.  On first run we must not pre-populate the workspace
+    // with bundled section copies — leaving the workspace empty keeps the
+    // override layer purely opt-in and lets bundled defaults flow through
+    // automatically as the daemon ships updates.
+    ensurePromptFiles();
+
+    const sectionsDir = join(TEST_DIR, "prompts", "system");
+    expect(existsSync(sectionsDir)).toBe(false);
+  });
+
   test("does not recreate BOOTSTRAP.md when other prompt files already exist", () => {
     // Simulate a workspace where onboarding completed: core files exist,
     // BOOTSTRAP.md was deleted by the user.