v1.12 track A: container guidance + skills

This commit is contained in:
2026-05-21 15:11:04 +00:00
parent ab01e04d77
commit a2e2481ef9
11 changed files with 482 additions and 79 deletions

View File

@@ -73,26 +73,26 @@ function makeMessage(
// ---- tests ------------------------------------------------------------------
describe('buildMessagesPayload', () => {
it('prepends a system prompt containing the project path', () => {
describe('buildMessagesPayload', async () => {
it('prepends a system prompt containing the project path', async () => {
const session = makeSession();
const project = makeProject({ path: '/tmp/my-proj' });
const result = buildMessagesPayload(session, project, []);
const result = await buildMessagesPayload(session, project, []);
expect(result).toHaveLength(1);
expect(result[0]!.role).toBe('system');
expect(result[0]!.content).toContain('/tmp/my-proj');
});
it('appends session.system_prompt to the system message when set', () => {
it('appends session.system_prompt to the system message when set', async () => {
const session = makeSession({ system_prompt: 'Be terse.' });
const project = makeProject();
const result = buildMessagesPayload(session, project, []);
const result = await buildMessagesPayload(session, project, []);
expect(result).toHaveLength(1);
expect(result[0]!.role).toBe('system');
expect(result[0]!.content).toContain('Be terse.');
});
it('returns user/assistant messages in order when no compact marker is present', () => {
it('returns user/assistant messages in order when no compact marker is present', async () => {
const session = makeSession();
const project = makeProject();
const history: Message[] = [
@@ -101,7 +101,7 @@ describe('buildMessagesPayload', () => {
makeMessage('user', 'how are you'),
makeMessage('assistant', 'great'),
];
const result = buildMessagesPayload(session, project, history);
const result = await buildMessagesPayload(session, project, history);
// 1 system + 4 history messages
expect(result).toHaveLength(5);
expect(result[0]!.role).toBe('system');
@@ -111,7 +111,7 @@ describe('buildMessagesPayload', () => {
expect(result[4]).toMatchObject({ role: 'assistant', content: 'great' });
});
it('starts from the latest compact marker, emitting it as a system message', () => {
it('starts from the latest compact marker, emitting it as a system message', async () => {
const session = makeSession();
const project = makeProject();
const history: Message[] = [
@@ -122,7 +122,7 @@ describe('buildMessagesPayload', () => {
makeMessage('user', 'new1'),
makeMessage('assistant', 'newreply1'),
];
const result = buildMessagesPayload(session, project, history);
const result = await buildMessagesPayload(session, project, history);
// Expect: leading base-system prompt, then the compact as system, then
// the user/assistant pair following it.
expect(result).toHaveLength(4);
@@ -135,7 +135,7 @@ describe('buildMessagesPayload', () => {
expect(result[3]).toMatchObject({ role: 'assistant', content: 'newreply1' });
});
it('uses only the most recent compact when multiple are present', () => {
it('uses only the most recent compact when multiple are present', async () => {
const session = makeSession();
const project = makeProject();
const history: Message[] = [
@@ -146,7 +146,7 @@ describe('buildMessagesPayload', () => {
makeMessage('user', 'u3'),
makeMessage('assistant', 'final reply'),
];
const result = buildMessagesPayload(session, project, history);
const result = await buildMessagesPayload(session, project, history);
// Expect: base system + latest compact as system + the two messages
// following it. The earlier compact and pre-compact history are dropped.
expect(result).toHaveLength(4);
@@ -164,7 +164,7 @@ describe('buildMessagesPayload', () => {
expect(concatenated).not.toContain('u2');
});
it('skips streaming and cancelled assistant rows', () => {
it('skips streaming and cancelled assistant rows', async () => {
const session = makeSession();
const project = makeProject();
const history: Message[] = [
@@ -173,14 +173,14 @@ describe('buildMessagesPayload', () => {
makeMessage('assistant', 'cancelled fragment', { status: 'cancelled' }),
makeMessage('assistant', 'final answer'),
];
const result = buildMessagesPayload(session, project, history);
const result = await buildMessagesPayload(session, project, history);
// 1 system + 1 user + 1 assistant (only the complete one)
expect(result).toHaveLength(3);
expect(result[1]).toMatchObject({ role: 'user', content: 'hi' });
expect(result[2]).toMatchObject({ role: 'assistant', content: 'final answer' });
});
it('round-trips an assistant-with-tool_calls followed by its tool result', () => {
it('round-trips an assistant-with-tool_calls followed by its tool result', async () => {
const session = makeSession();
const project = makeProject();
const toolCall: ToolCall = {
@@ -199,7 +199,7 @@ describe('buildMessagesPayload', () => {
makeMessage('tool', '', { tool_results: toolResult }),
makeMessage('assistant', 'here it is'),
];
const result = buildMessagesPayload(session, project, history);
const result = await buildMessagesPayload(session, project, history);
// 1 system + 1 user + 1 assistant(tool_calls) + 1 tool + 1 assistant
expect(result).toHaveLength(5);
expect(result[1]).toMatchObject({ role: 'user', content: 'show me the file' });
@@ -226,7 +226,7 @@ describe('buildMessagesPayload', () => {
expect(result[4]).toMatchObject({ role: 'assistant', content: 'here it is' });
});
it('skips tool rows with no tool_results', () => {
it('skips tool rows with no tool_results', async () => {
const session = makeSession();
const project = makeProject();
const history: Message[] = [
@@ -234,7 +234,7 @@ describe('buildMessagesPayload', () => {
makeMessage('tool', '', { tool_results: null }),
makeMessage('assistant', 'done'),
];
const result = buildMessagesPayload(session, project, history);
const result = await buildMessagesPayload(session, project, history);
// 1 system + 1 user + 1 assistant; the empty tool row is dropped.
expect(result).toHaveLength(3);
expect(result.find((m) => m.role === 'tool')).toBeUndefined();