8c323666be
- Converted systemPrompt APIs and state types to ordered `string[]` across agent, AI, and coding-agent surfaces. - Added `normalizeSystemPrompts` and applied it to context normalization before building provider request payloads. - Updated AI providers to emit separate normalized prompt blocks/messages instead of a single merged system prompt. - Removed dedicated `projectPrompt` state and remapped that context into system-context buckets in session, dump, and token accounting. - Aligned tests and changelogs to pass and assert `systemPrompt` as arrays with ordered prompt semantics.
134 lines
4.8 KiB
TypeScript
134 lines
4.8 KiB
TypeScript
import { afterEach, beforeEach, describe, expect, it } from "bun:test";
|
|
import * as fs from "node:fs";
|
|
import * as os from "node:os";
|
|
import * as path from "node:path";
|
|
import { Settings } from "@oh-my-pi/pi-coding-agent/config/settings";
|
|
import { createAgentSession } from "@oh-my-pi/pi-coding-agent/sdk";
|
|
import { SessionManager } from "@oh-my-pi/pi-coding-agent/session/session-manager";
|
|
import {
|
|
buildSystemPrompt,
|
|
loadProjectContextFiles,
|
|
loadSystemPromptFiles,
|
|
} from "@oh-my-pi/pi-coding-agent/system-prompt";
|
|
import { cleanupTempHome } from "./helpers/temp-home-cleanup";
|
|
|
|
function escapeRegExp(text: string): string {
|
|
return text.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
|
|
}
|
|
|
|
describe("SYSTEM.md prompt assembly", () => {
|
|
let tempDir = "";
|
|
let tempHomeDir = "";
|
|
let originalHome: string | undefined;
|
|
|
|
beforeEach(() => {
|
|
tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "pi-system-prompt-"));
|
|
tempHomeDir = fs.mkdtempSync(path.join(os.tmpdir(), "pi-system-home-"));
|
|
originalHome = process.env.HOME;
|
|
process.env.HOME = tempHomeDir;
|
|
});
|
|
|
|
afterEach(cleanupTempHome(() => ({ tempDir, tempHomeDir, originalHome })));
|
|
|
|
it("renders SYSTEM.md exactly once when it is used as the custom base prompt", async () => {
|
|
const projectDir = path.join(tempDir, "project");
|
|
const systemDir = path.join(projectDir, ".omp");
|
|
const systemPrompt = "You are the project SYSTEM prompt.";
|
|
fs.mkdirSync(systemDir, { recursive: true });
|
|
fs.writeFileSync(path.join(systemDir, "SYSTEM.md"), systemPrompt);
|
|
|
|
const { session } = await createAgentSession({
|
|
cwd: projectDir,
|
|
agentDir: projectDir,
|
|
sessionManager: SessionManager.inMemory(),
|
|
settings: Settings.isolated(),
|
|
systemPrompt: [systemPrompt],
|
|
disableExtensionDiscovery: true,
|
|
skills: [],
|
|
contextFiles: [],
|
|
promptTemplates: [],
|
|
slashCommands: [],
|
|
enableMCP: false,
|
|
enableLsp: false,
|
|
});
|
|
|
|
try {
|
|
const formatted = session.formatSessionAsText();
|
|
const matches = formatted.match(new RegExp(escapeRegExp(systemPrompt), "g")) ?? [];
|
|
expect(matches).toHaveLength(1);
|
|
} finally {
|
|
await session.dispose();
|
|
}
|
|
});
|
|
|
|
it("prefers project SYSTEM.md over user SYSTEM.md", async () => {
|
|
const projectDir = path.join(tempDir, "project");
|
|
fs.mkdirSync(path.join(projectDir, ".omp"), { recursive: true });
|
|
fs.mkdirSync(path.join(tempHomeDir, ".omp", "agent"), { recursive: true });
|
|
fs.writeFileSync(path.join(tempHomeDir, ".omp", "agent", "SYSTEM.md"), "User SYSTEM prompt");
|
|
fs.writeFileSync(path.join(projectDir, ".omp", "SYSTEM.md"), "Project SYSTEM prompt");
|
|
|
|
await expect(loadSystemPromptFiles({ cwd: projectDir })).resolves.toBe("Project SYSTEM prompt");
|
|
});
|
|
it("drops identical explicit context entries even when file names differ", async () => {
|
|
const farPath = path.join(tempDir, "far", "AGENTS.md");
|
|
const nearPath = path.join(tempDir, "near", "CLAUDE.md");
|
|
const sharedContent = "Shared context instructions";
|
|
|
|
const { systemPrompt } = await buildSystemPrompt({
|
|
cwd: tempDir,
|
|
customPrompt: "Base prompt",
|
|
contextFiles: [
|
|
{ path: farPath, content: sharedContent, depth: 2 },
|
|
{ path: nearPath, content: sharedContent, depth: 0 },
|
|
],
|
|
skills: [],
|
|
rules: [],
|
|
toolNames: [],
|
|
});
|
|
|
|
const promptText = systemPrompt.join("\n\n");
|
|
const matches = promptText.match(new RegExp(escapeRegExp(sharedContent), "g")) ?? [];
|
|
expect(matches).toHaveLength(1);
|
|
expect(promptText).not.toContain(`<file path="${farPath}">`);
|
|
expect(promptText).toContain(`<file path="${nearPath}">`);
|
|
});
|
|
|
|
it("drops identical discovered context entries and keeps the closest copy", async () => {
|
|
const projectDir = path.join(tempDir, "project");
|
|
const appDir = path.join(projectDir, "packages", "app");
|
|
const sharedContent = "Shared context instructions";
|
|
|
|
fs.mkdirSync(appDir, { recursive: true });
|
|
fs.writeFileSync(path.join(projectDir, "AGENTS.md"), sharedContent);
|
|
fs.writeFileSync(path.join(appDir, "AGENTS.md"), sharedContent);
|
|
|
|
const contextFiles = await loadProjectContextFiles({ cwd: appDir });
|
|
const discoveredFiles = contextFiles.filter(file => file.path.startsWith(projectDir));
|
|
|
|
expect(discoveredFiles).toHaveLength(1);
|
|
expect(discoveredFiles[0]?.path).toBe(path.join(appDir, "AGENTS.md"));
|
|
});
|
|
|
|
it("keeps distinct context entries when their contents differ", async () => {
|
|
const farPath = path.join(tempDir, "far", "AGENTS.md");
|
|
const nearPath = path.join(tempDir, "near", "CLAUDE.md");
|
|
|
|
const { systemPrompt } = await buildSystemPrompt({
|
|
cwd: tempDir,
|
|
customPrompt: "Base prompt",
|
|
contextFiles: [
|
|
{ path: farPath, content: "Root context instructions", depth: 2 },
|
|
{ path: nearPath, content: "Near context instructions", depth: 0 },
|
|
],
|
|
skills: [],
|
|
rules: [],
|
|
toolNames: [],
|
|
});
|
|
const promptText = systemPrompt.join("\n\n");
|
|
|
|
expect(promptText).toContain("Root context instructions");
|
|
expect(promptText).toContain("Near context instructions");
|
|
});
|
|
});
|