march-cli 0.1.21 → 0.1.23

package/src/config/settings-command.mjs

@@ -1,97 +1,97 @@
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { homedir } from "node:os";
-import { dirname, join } from "node:path";
-import { loadConfig } from "./loader.mjs";
-
-const WRITABLE_KEYS = new Set(["memoryRoot"]);
-const SCOPES = new Set(["global", "project"]);
-
-export function parseSettingsCommand(input) {
-  if (input !== "/settings" && !input.startsWith("/settings ")) return { type: "none" };
-  const arg = input.slice("/settings".length).trim();
-  if (!arg) return { type: "view" };
-
-  const setMatch = arg.match(/^set\s+(global|project)\s+(memoryRoot)\s+(.+)$/);
-  if (setMatch) {
-    return { type: "set", scope: setMatch[1], key: setMatch[2], value: setMatch[3].trim() };
-  }
-
-  const unsetMatch = arg.match(/^unset\s+(global|project)\s+(memoryRoot)$/);
-  if (unsetMatch) {
-    return { type: "unset", scope: unsetMatch[1], key: unsetMatch[2] };
-  }
-
-  return { type: "error", message: "Usage: /settings [set <global|project> memoryRoot <value> | unset <global|project> memoryRoot]" };
-}
-
-export function handleSettingsCommand(command, { cwd = process.cwd(), homeDir = homedir() } = {}) {
-  if (command.type === "view") return formatSettingsView({ cwd, homeDir });
-  if (command.type === "error") return [`Error: ${command.message}`];
-  if (!SCOPES.has(command.scope) || !WRITABLE_KEYS.has(command.key)) {
-    return ["Error: unsupported settings scope or key"];
-  }
-
-  const path = settingsPathForScope(command.scope, { cwd, homeDir });
-  const data = readSettingsFile(path);
-  if (command.type === "set") {
-    data[command.key] = command.value;
-  } else if (command.type === "unset") {
-    delete data[command.key];
-  }
-  writeSettingsFile(path, data);
-  return [
-    `Settings ${command.type === "set" ? "updated" : "unset"}: ${command.scope}.${command.key}`,
-    "Changes apply on next March startup; current session runtime is unchanged.",
-    ...formatSettingsView({ cwd, homeDir }),
-  ];
-}
-
-export function formatSettingsView({ cwd = process.cwd(), homeDir = homedir() } = {}) {
-  const globalPath = settingsPathForScope("global", { cwd, homeDir });
-  const projectPath = settingsPathForScope("project", { cwd, homeDir });
-  const globalSettings = readSettingsFile(globalPath);
-  const projectSettings = readSettingsFile(projectPath);
-  const merged = loadConfig(cwd, { homeDir });
-  return [
-    "Settings:",
-    `  configured.providers: ${Object.keys(merged.providers ?? {}).join(", ") || "(none)"}`,
-    `  global: ${globalPath}`,
-    ...formatScopeLines(globalSettings),
-    `  project: ${projectPath}`,
-    ...formatScopeLines(projectSettings),
-    "Commands:",
-    "  /settings set project memoryRoot <path>",
-    "  /settings unset project memoryRoot",
-  ];
-}
-
-function settingsPathForScope(scope, { cwd, homeDir }) {
-  return scope === "global"
-    ? join(homeDir, ".march", "config")
-    : join(cwd, ".march", "config");
-}
-
-function readSettingsFile(path) {
-  if (!existsSync(path)) return {};
-  try {
-    const parsed = JSON.parse(readFileSync(path, "utf8"));
-    return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : {};
-  } catch {
-    return {};
-  }
-}
-
-function writeSettingsFile(path, data) {
-  mkdirSync(dirname(path), { recursive: true });
-  writeFileSync(path, `${JSON.stringify(data, null, 2)}\n`, "utf8");
-}
-
-function formatScopeLines(settings) {
-  const keys = Object.keys(settings).sort();
-  if (keys.length === 0) return ["    (empty)"];
-  return keys.map((key) => `    ${key}: ${formatSettingValue(settings[key])}`);
-}
-
-function formatSettingValue(value) {
-  return Array.isArray(value) ? value.join(", ") : String(value);
-}
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { dirname, join } from "node:path";
+import { loadConfig } from "./loader.mjs";
+
+const WRITABLE_KEYS = new Set(["memoryRoot"]);
+const SCOPES = new Set(["global", "project"]);
+
+export function parseSettingsCommand(input) {
+  if (input !== "/settings" && !input.startsWith("/settings ")) return { type: "none" };
+  const arg = input.slice("/settings".length).trim();
+  if (!arg) return { type: "view" };
+
+  const setMatch = arg.match(/^set\s+(global|project)\s+(memoryRoot)\s+(.+)$/);
+  if (setMatch) {
+    return { type: "set", scope: setMatch[1], key: setMatch[2], value: setMatch[3].trim() };
+  }
+
+  const unsetMatch = arg.match(/^unset\s+(global|project)\s+(memoryRoot)$/);
+  if (unsetMatch) {
+    return { type: "unset", scope: unsetMatch[1], key: unsetMatch[2] };
+  }
+
+  return { type: "error", message: "Usage: /settings [set <global|project> memoryRoot <value> | unset <global|project> memoryRoot]" };
+}
+
+export function handleSettingsCommand(command, { cwd = process.cwd(), homeDir = homedir() } = {}) {
+  if (command.type === "view") return formatSettingsView({ cwd, homeDir });
+  if (command.type === "error") return [`Error: ${command.message}`];
+  if (!SCOPES.has(command.scope) || !WRITABLE_KEYS.has(command.key)) {
+    return ["Error: unsupported settings scope or key"];
+  }
+
+  const path = settingsPathForScope(command.scope, { cwd, homeDir });
+  const data = readSettingsFile(path);
+  if (command.type === "set") {
+    data[command.key] = command.value;
+  } else if (command.type === "unset") {
+    delete data[command.key];
+  }
+  writeSettingsFile(path, data);
+  return [
+    `Settings ${command.type === "set" ? "updated" : "unset"}: ${command.scope}.${command.key}`,
+    "Changes apply on next March startup; current session runtime is unchanged.",
+    ...formatSettingsView({ cwd, homeDir }),
+  ];
+}
+
+export function formatSettingsView({ cwd = process.cwd(), homeDir = homedir() } = {}) {
+  const globalPath = settingsPathForScope("global", { cwd, homeDir });
+  const projectPath = settingsPathForScope("project", { cwd, homeDir });
+  const globalSettings = readSettingsFile(globalPath);
+  const projectSettings = readSettingsFile(projectPath);
+  const merged = loadConfig(cwd, { homeDir });
+  return [
+    "Settings:",
+    `  configured.providers: ${Object.keys(merged.providers ?? {}).join(", ") || "(none)"}`,
+    `  global: ${globalPath}`,
+    ...formatScopeLines(globalSettings),
+    `  project: ${projectPath}`,
+    ...formatScopeLines(projectSettings),
+    "Commands:",
+    "  /settings set project memoryRoot <path>",
+    "  /settings unset project memoryRoot",
+  ];
+}
+
+function settingsPathForScope(scope, { cwd, homeDir }) {
+  return scope === "global"
+    ? join(homeDir, ".march", "config")
+    : join(cwd, ".march", "config");
+}
+
+function readSettingsFile(path) {
+  if (!existsSync(path)) return {};
+  try {
+    const parsed = JSON.parse(readFileSync(path, "utf8"));
+    return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : {};
+  } catch {
+    return {};
+  }
+}
+
+function writeSettingsFile(path, data) {
+  mkdirSync(dirname(path), { recursive: true });
+  writeFileSync(path, `${JSON.stringify(data, null, 2)}\n`, "utf8");
+}
+
+function formatScopeLines(settings) {
+  const keys = Object.keys(settings).sort();
+  if (keys.length === 0) return ["    (empty)"];
+  return keys.map((key) => `    ${key}: ${formatSettingValue(settings[key])}`);
+}
+
+function formatSettingValue(value) {
+  return Array.isArray(value) ? value.join(", ") : String(value);
+}

package/src/context/engine.mjs

@@ -1,198 +1,198 @@
-import { resolve } from "node:path";
-import { buildSessionIdentity } from "./session-status.mjs";
-import { buildSystemCore, resolveSystemCorePromptKey } from "./system-core.mjs";
-import { buildInjectionsLayer } from "./injections.mjs";
-import { buildProjectContext } from "./project-context.mjs";
-import { buildProfileLayers } from "./profiles.mjs";
-import { formatRecallHints } from "../memory/markdown-store.mjs";
-
-export class ContextEngine {
-  constructor({ cwd, modelId, provider = "deepseek", thinkingLevel = "medium", namespace = "", memoryRoot = null, profilePaths = null, shellRuntime = null, lspService = null, injections = [], maxTurns, trimBatch }) {
-    this.cwd = cwd;
-    this.memoryRoot = memoryRoot;
-    this.profilePaths = profilePaths;
-    this.modelId = modelId;
-    this.provider = provider;
-    this.thinkingLevel = thinkingLevel;
-    this.turns = [];
-    this.pendingAssistantRecallHints = [];
-    this.pendingAssistantRecallHintsRendered = false;
-    this.sessionName = "";
-    this.toolDefs = [];
-    this.namespace = namespace;
-    this.shellRuntime = shellRuntime;
-    this.lspService = lspService;
-    this.injections = [...injections];
-    this.maxTurns = maxTurns ?? 15;
-    this.trimBatch = trimBatch ?? 5;
-    this.systemCorePromptKey = resolveSystemCorePromptKey({ modelId });
-    this.systemCore = buildSystemCore({ modelId });
-  }
-
-  // ── Public API ──────────────────────────────────────────────────────
-
-  buildContext(userMessage = "") {
-    return this.buildContextLayers(userMessage).map((layer) => layer.text).join("\n\n");
-  }
-
-  buildProviderContext(userMessage = "") {
-    const layers = this.buildContextLayers(userMessage);
-    const systemLayer = layers.find((layer) => layer.name === "system_core");
-    return {
-      system: systemLayer?.text ?? this.systemCore,
-      userMessages: layers
-        .filter((layer) => layer.name !== "system_core")
-        .map((layer) => ({
-          name: layer.name,
-          content: layer.name === "recent_chat" ? appendCurrentUser(layer.text, userMessage) : layer.text,
-        })),
-    };
-  }
-
-  buildContextLayers(_userMessage = "") {
-    const layers = [
-      { name: "system_core", text: this.systemCore },
-    ];
-
-    const injectionsLayer = buildInjectionsLayer(this.injections);
-    if (injectionsLayer) layers.push({ name: "injections", text: injectionsLayer });
-
-    layers.push({ name: "session_identity", text: this.#buildSessionIdentity() });
-
-    const projectCtx = buildProjectContext(this.cwd);
-    if (projectCtx) layers.push({ name: "project_context", text: projectCtx });
-
-    layers.push(...buildProfileLayers(this.profilePaths));
-
-    layers.push({ name: "recent_chat", text: this.#buildRecentChat() });
-
-    return layers;
-  }
-
-  recordTurn({ userMessage, assistantMessage, assistantContext = "", userRecallHints = [], assistantRecallHints = [] }) {
-    this.turns.push({
-      index: this.turns.length + 1,
-      userMessage,
-      assistantMessage: assistantMessage ?? "",
-      assistantContext: assistantContext ?? "",
-      userRecallHints,
-      assistantRecallHints,
-    });
-    if (this.turns.length > this.maxTurns) {
-      const keep = Math.max(1, this.maxTurns - this.trimBatch);
-      this.turns = this.turns.slice(-keep);
-    }
-  }
-
-  getRecentRecallMemoryIds() {
-    const ids = new Set();
-    for (const turn of this.turns) {
-      for (const hint of turn.userRecallHints ?? []) if (hint?.id) ids.add(hint.id);
-      for (const hint of turn.assistantRecallHints ?? []) if (hint?.id) ids.add(hint.id);
-    }
-    return ids;
-  }
-
-  setPendingAssistantRecallHints(hints = []) {
-    this.pendingAssistantRecallHints = uniqueHints(hints);
-    this.pendingAssistantRecallHintsRendered = false;
-  }
-
-  peekPendingAssistantRecallHints() {
-    return this.pendingAssistantRecallHints;
-  }
-
-  hasRenderedPendingAssistantRecallHints() {
-    return this.pendingAssistantRecallHintsRendered;
-  }
-
-  markPendingAssistantRecallHintsRendered() {
-    if (this.pendingAssistantRecallHints.length > 0) this.pendingAssistantRecallHintsRendered = true;
-  }
-
-  takePendingAssistantRecallHints() {
-    const hints = this.pendingAssistantRecallHints;
-    this.pendingAssistantRecallHints = [];
-    this.pendingAssistantRecallHintsRendered = false;
-    return hints;
-  }
-
-  resolvePath(raw) {
-    return resolve(this.cwd, raw);
-  }
-
-  setInjections(injections = []) { this.injections = [...injections]; }
-  setToolDefs(defs) { this.toolDefs = defs; }
-  setRuntimeState({ modelId, provider, thinkingLevel } = {}) {
-    if (modelId) this.modelId = modelId;
-    if (provider) this.provider = provider;
-    if (thinkingLevel) this.thinkingLevel = thinkingLevel;
-    const nextPromptKey = resolveSystemCorePromptKey({ modelId: this.modelId });
-    if (nextPromptKey !== this.systemCorePromptKey) {
-      this.systemCorePromptKey = nextPromptKey;
-      this.systemCore = buildSystemCore({ modelId: this.modelId });
-    }
-  }
-  setSessionName(name) { this.sessionName = String(name || "").trim(); }
-
-  restoreSession(data, _pool, { replace = false } = {}) {
-    if (replace) {
-      this.turns = [];
-      this.pendingAssistantRecallHints = [];
-      this.pendingAssistantRecallHintsRendered = false;
-      this.sessionName = "";
-    }
-    if (data.turns) this.turns = data.turns;
-    if (Array.isArray(data.pendingAssistantRecallHints)) {
-      this.pendingAssistantRecallHints = uniqueHints(data.pendingAssistantRecallHints);
-      this.pendingAssistantRecallHintsRendered = false;
-    }
-    if (typeof data.sessionName === "string") this.sessionName = data.sessionName;
-    this.setRuntimeState(data);
-  }
-
-  // ── Private layers ──────────────────────────────────────────────────
-
-  #buildSessionIdentity() {
-    return buildSessionIdentity({ cwd: this.cwd, workspaceRoot: this.cwd, memoryRoot: this.memoryRoot });
-  }
-
-  #buildRecentChat() {
-    if (this.turns.length === 0) {
-      return `[recent_chat]\n(no prior turns)`;
-    }
-    const entries = [];
-    for (const turn of this.turns) {
-      let block = `## Turn ${turn.index}\n` +
-        `[user]\n${String(turn.userMessage ?? "")}\n`;
-      const userRecall = formatRecallHints("user", turn.userRecallHints ?? []);
-      if (userRecall) block += `\n${userRecall}\n`;
-      block += `\n[assistant]\n`;
-      const assistantText = turn.assistantContext || turn.assistantMessage;
-      if (assistantText) {
-        block += `\n${String(assistantText ?? "")}\n`;
-      }
-      const assistantRecall = formatRecallHints("assistant", turn.assistantRecallHints ?? []);
-      if (assistantRecall) block += `\n${assistantRecall}\n`;
-      entries.push(block);
-    }
-    return `[recent_chat]\n${entries.join("\n\n")}`;
-  }
-
-}
-
-function appendCurrentUser(recentChat, userMessage) {
-  const currentUser = String(userMessage ?? "").trimEnd();
-  return `${recentChat}\n\n[current_user]\n${currentUser}`;
-}
-
-function uniqueHints(hints = []) {
-  const seen = new Set();
-  const unique = [];
-  for (const hint of hints) {
-    if (!hint?.id || seen.has(hint.id)) continue;
-    seen.add(hint.id);
-    unique.push(hint);
-  }
-  return unique;
-}
+import { resolve } from "node:path";
+import { buildSessionIdentity } from "./session-status.mjs";
+import { buildSystemCore, resolveSystemCorePromptKey } from "./system-core.mjs";
+import { buildInjectionsLayer } from "./injections.mjs";
+import { buildProjectContext } from "./project-context.mjs";
+import { buildProfileLayers } from "./profiles.mjs";
+import { formatRecallHints } from "../memory/markdown-store.mjs";
+
+export class ContextEngine {
+  constructor({ cwd, modelId, provider = "deepseek", thinkingLevel = "medium", namespace = "", memoryRoot = null, profilePaths = null, shellRuntime = null, lspService = null, injections = [], maxTurns, trimBatch }) {
+    this.cwd = cwd;
+    this.memoryRoot = memoryRoot;
+    this.profilePaths = profilePaths;
+    this.modelId = modelId;
+    this.provider = provider;
+    this.thinkingLevel = thinkingLevel;
+    this.turns = [];
+    this.pendingAssistantRecallHints = [];
+    this.pendingAssistantRecallHintsRendered = false;
+    this.sessionName = "";
+    this.toolDefs = [];
+    this.namespace = namespace;
+    this.shellRuntime = shellRuntime;
+    this.lspService = lspService;
+    this.injections = [...injections];
+    this.maxTurns = maxTurns ?? 15;
+    this.trimBatch = trimBatch ?? 5;
+    this.systemCorePromptKey = resolveSystemCorePromptKey({ modelId });
+    this.systemCore = buildSystemCore({ modelId });
+  }
+
+  // ── Public API ──────────────────────────────────────────────────────
+
+  buildContext(userMessage = "") {
+    return this.buildContextLayers(userMessage).map((layer) => layer.text).join("\n\n");
+  }
+
+  buildProviderContext(userMessage = "") {
+    const layers = this.buildContextLayers(userMessage);
+    const systemLayer = layers.find((layer) => layer.name === "system_core");
+    return {
+      system: systemLayer?.text ?? this.systemCore,
+      userMessages: layers
+        .filter((layer) => layer.name !== "system_core")
+        .map((layer) => ({
+          name: layer.name,
+          content: layer.name === "recent_chat" ? appendCurrentUser(layer.text, userMessage) : layer.text,
+        })),
+    };
+  }
+
+  buildContextLayers(_userMessage = "") {
+    const layers = [
+      { name: "system_core", text: this.systemCore },
+    ];
+
+    const injectionsLayer = buildInjectionsLayer(this.injections);
+    if (injectionsLayer) layers.push({ name: "injections", text: injectionsLayer });
+
+    layers.push({ name: "session_identity", text: this.#buildSessionIdentity() });
+
+    const projectCtx = buildProjectContext(this.cwd);
+    if (projectCtx) layers.push({ name: "project_context", text: projectCtx });
+
+    layers.push(...buildProfileLayers(this.profilePaths));
+
+    layers.push({ name: "recent_chat", text: this.#buildRecentChat() });
+
+    return layers;
+  }
+
+  recordTurn({ userMessage, assistantMessage, assistantContext = "", userRecallHints = [], assistantRecallHints = [] }) {
+    this.turns.push({
+      index: this.turns.length + 1,
+      userMessage,
+      assistantMessage: assistantMessage ?? "",
+      assistantContext: assistantContext ?? "",
+      userRecallHints,
+      assistantRecallHints,
+    });
+    if (this.turns.length > this.maxTurns) {
+      const keep = Math.max(1, this.maxTurns - this.trimBatch);
+      this.turns = this.turns.slice(-keep);
+    }
+  }
+
+  getRecentRecallMemoryIds() {
+    const ids = new Set();
+    for (const turn of this.turns) {
+      for (const hint of turn.userRecallHints ?? []) if (hint?.id) ids.add(hint.id);
+      for (const hint of turn.assistantRecallHints ?? []) if (hint?.id) ids.add(hint.id);
+    }
+    return ids;
+  }
+
+  setPendingAssistantRecallHints(hints = []) {
+    this.pendingAssistantRecallHints = uniqueHints(hints);
+    this.pendingAssistantRecallHintsRendered = false;
+  }
+
+  peekPendingAssistantRecallHints() {
+    return this.pendingAssistantRecallHints;
+  }
+
+  hasRenderedPendingAssistantRecallHints() {
+    return this.pendingAssistantRecallHintsRendered;
+  }
+
+  markPendingAssistantRecallHintsRendered() {
+    if (this.pendingAssistantRecallHints.length > 0) this.pendingAssistantRecallHintsRendered = true;
+  }
+
+  takePendingAssistantRecallHints() {
+    const hints = this.pendingAssistantRecallHints;
+    this.pendingAssistantRecallHints = [];
+    this.pendingAssistantRecallHintsRendered = false;
+    return hints;
+  }
+
+  resolvePath(raw) {
+    return resolve(this.cwd, raw);
+  }
+
+  setInjections(injections = []) { this.injections = [...injections]; }
+  setToolDefs(defs) { this.toolDefs = defs; }
+  setRuntimeState({ modelId, provider, thinkingLevel } = {}) {
+    if (modelId) this.modelId = modelId;
+    if (provider) this.provider = provider;
+    if (thinkingLevel) this.thinkingLevel = thinkingLevel;
+    const nextPromptKey = resolveSystemCorePromptKey({ modelId: this.modelId });
+    if (nextPromptKey !== this.systemCorePromptKey) {
+      this.systemCorePromptKey = nextPromptKey;
+      this.systemCore = buildSystemCore({ modelId: this.modelId });
+    }
+  }
+  setSessionName(name) { this.sessionName = String(name || "").trim(); }
+
+  restoreSession(data, _pool, { replace = false } = {}) {
+    if (replace) {
+      this.turns = [];
+      this.pendingAssistantRecallHints = [];
+      this.pendingAssistantRecallHintsRendered = false;
+      this.sessionName = "";
+    }
+    if (data.turns) this.turns = data.turns;
+    if (Array.isArray(data.pendingAssistantRecallHints)) {
+      this.pendingAssistantRecallHints = uniqueHints(data.pendingAssistantRecallHints);
+      this.pendingAssistantRecallHintsRendered = false;
+    }
+    if (typeof data.sessionName === "string") this.sessionName = data.sessionName;
+    this.setRuntimeState(data);
+  }
+
+  // ── Private layers ──────────────────────────────────────────────────
+
+  #buildSessionIdentity() {
+    return buildSessionIdentity({ cwd: this.cwd, workspaceRoot: this.cwd, memoryRoot: this.memoryRoot });
+  }
+
+  #buildRecentChat() {
+    if (this.turns.length === 0) {
+      return `[recent_chat]\n(no prior turns)`;
+    }
+    const entries = [];
+    for (const turn of this.turns) {
+      let block = `## Turn ${turn.index}\n` +
+        `[user]\n${String(turn.userMessage ?? "")}\n`;
+      const userRecall = formatRecallHints("user", turn.userRecallHints ?? []);
+      if (userRecall) block += `\n${userRecall}\n`;
+      block += `\n[assistant]\n`;
+      const assistantText = turn.assistantContext || turn.assistantMessage;
+      if (assistantText) {
+        block += `\n${String(assistantText ?? "")}\n`;
+      }
+      const assistantRecall = formatRecallHints("assistant", turn.assistantRecallHints ?? []);
+      if (assistantRecall) block += `\n${assistantRecall}\n`;
+      entries.push(block);
+    }
+    return `[recent_chat]\n${entries.join("\n\n")}`;
+  }
+
+}
+
+function appendCurrentUser(recentChat, userMessage) {
+  const currentUser = String(userMessage ?? "").trimEnd();
+  return `${recentChat}\n\n[current_user]\n${currentUser}`;
+}
+
+function uniqueHints(hints = []) {
+  const seen = new Set();
+  const unique = [];
+  for (const hint of hints) {
+    if (!hint?.id || seen.has(hint.id)) continue;
+    seen.add(hint.id);
+    unique.push(hint);
+  }
+  return unique;
+}

package/src/context/injections.mjs

@@ -1,26 +1,26 @@
-export function buildInjectionsLayer(injections = []) {
-  const blocks = injections
-    .map(normalizeInjection)
-    .filter(Boolean)
-    .map(({ type, source, content }) => `## ${formatInjectionTitle(type, source)}\n${content}`);
-
-  if (blocks.length === 0) return "";
-  return `[injections]\n${blocks.join("\n\n")}`;
-}
-
-function normalizeInjection(injection) {
-  if (!injection || typeof injection.content !== "string") return null;
-  const content = injection.content.trim();
-  if (!content) return null;
-  return {
-    type: String(injection.type || "external"),
-    source: String(injection.source || "unknown"),
-    content,
-  };
-}
-
-function formatInjectionTitle(type, source) {
-  if (type === "mcp_server") return `MCP server: ${source}`;
-  if (type === "extension") return `Extension: ${source}`;
-  return `${type}: ${source}`;
-}
+export function buildInjectionsLayer(injections = []) {
+  const blocks = injections
+    .map(normalizeInjection)
+    .filter(Boolean)
+    .map(({ type, source, content }) => `## ${formatInjectionTitle(type, source)}\n${content}`);
+
+  if (blocks.length === 0) return "";
+  return `[injections]\n${blocks.join("\n\n")}`;
+}
+
+function normalizeInjection(injection) {
+  if (!injection || typeof injection.content !== "string") return null;
+  const content = injection.content.trim();
+  if (!content) return null;
+  return {
+    type: String(injection.type || "external"),
+    source: String(injection.source || "unknown"),
+    content,
+  };
+}
+
+function formatInjectionTitle(type, source) {
+  if (type === "mcp_server") return `MCP server: ${source}`;
+  if (type === "extension") return `Extension: ${source}`;
+  return `${type}: ${source}`;
+}