feat(agy): add configurable prompt ordering

GSL-R · GSL-R · commit 93ca9d141a10 · 2026-06-27T19:01:50.000+09:00
diff --git a/src/agent/agy-prompt.ts b/src/agent/agy-prompt.ts
@@ -0,0 +1,25 @@
+export type AgyPromptOrder = 'task-first' | 'context-first';
+
+export function resolveAgyPromptOrder(value: unknown): AgyPromptOrder {
+    return value === 'context-first' ? 'context-first' : 'task-first';
+}
+
+export function composeAgyPrompt(
+    taskPrompt: string,
+    systemPrompt: string,
+    order: AgyPromptOrder = 'task-first',
+): string {
+    if (!systemPrompt) return taskPrompt;
+
+    const operationalContext = [
+        '[Operational Context — cli-jaw Integration]',
+        'The following operational guidelines apply to this session. Follow these task rules and use the tools/commands described:',
+        '',
+        systemPrompt,
+    ].join('\n');
+    const currentTask = `[Current cli-jaw task]\n${taskPrompt}`;
+
+    return order === 'context-first'
+        ? `${operationalContext}\n\n---\n\n${currentTask}`
+        : `${currentTask}\n\n---\n\n${operationalContext}`;
+}
diff --git a/src/agent/spawn.ts b/src/agent/spawn.ts
@@ -68,6 +68,7 @@ import {
     stripAgyResumeReplayPrefixes,
 } from './agy-runtime.js';
 import { startAgyTranscriptWatcher, type AgyTranscriptWatcherHandle } from './agy-transcript-watcher.js';
+import { composeAgyPrompt, resolveAgyPromptOrder } from './agy-prompt.js';
 import { appendAssistantTextSegment, normalizeAssistantDisplayText, pushTrace } from './events/helpers.js';
 import { listKiroConversationIdsForCwd } from './kiro-auth.js';
 import {
@@ -1219,7 +1220,11 @@ export function spawnAgent(prompt: string, opts: SpawnOpts = {}): SpawnResult {
         ? withHistoryPrompt(prompt, historyBlock)
         : prompt;
     if (cli === 'agy' && sysPrompt) {
-        promptForArgs = `[Current cli-jaw task]\n${promptForArgs}\n\n---\n\n[Operational Context — cli-jaw Integration]\nThe following operational guidelines apply to this session. Follow these task rules and use the tools/commands described:\n\n${sysPrompt}`;
+        promptForArgs = composeAgyPrompt(
+            promptForArgs,
+            sysPrompt,
+            resolveAgyPromptOrder(cfg.promptOrder),
+        );
     } else if ((cli === 'kiro-code' || (cli === 'ai-e' && effectiveProvider === 'kiro')) && sysPrompt) {
         promptForArgs = `[Operational Context — cli-jaw Integration]\nThe following operational guidelines apply to this session. Follow these task rules and use the tools/commands described:\n\n${sysPrompt}\n\n---\n\n${promptForArgs}`;
     }
diff --git a/tests/unit/agy-prompt.test.ts b/tests/unit/agy-prompt.test.ts
@@ -0,0 +1,28 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import { composeAgyPrompt, resolveAgyPromptOrder } from '../../src/agent/agy-prompt.js';
+
+
+test('AGY-PROMPT-001: task-first remains the compatibility default', () => {
+    const prompt = composeAgyPrompt('CURRENT', 'SYSTEM');
+    assert.ok(prompt.startsWith('[Current cli-jaw task]\nCURRENT'));
+    assert.ok(prompt.endsWith('SYSTEM'));
+});
+
+test('AGY-PROMPT-002: context-first keeps stable instructions first and current task last', () => {
+    const prompt = composeAgyPrompt('HISTORY\nCURRENT', 'SYSTEM', 'context-first');
+    assert.ok(prompt.startsWith('[Operational Context — cli-jaw Integration]'));
+    assert.ok(prompt.indexOf('SYSTEM') < prompt.indexOf('HISTORY'));
+    assert.ok(prompt.endsWith('[Current cli-jaw task]\nHISTORY\nCURRENT'));
+});
+
+test('AGY-PROMPT-003: unknown settings fail closed to task-first', () => {
+    assert.equal(resolveAgyPromptOrder('context-first'), 'context-first');
+    assert.equal(resolveAgyPromptOrder('task-first'), 'task-first');
+    assert.equal(resolveAgyPromptOrder('unknown'), 'task-first');
+    assert.equal(resolveAgyPromptOrder(undefined), 'task-first');
+});
+
+test('AGY-PROMPT-004: no system prompt leaves the task untouched', () => {
+    assert.equal(composeAgyPrompt('CURRENT', '', 'context-first'), 'CURRENT');
+});
diff --git a/tests/unit/steer-flow.test.ts b/tests/unit/steer-flow.test.ts
@@ -133,20 +133,16 @@ test('SF-004b: resume argv CLIs keep enriched promptForArgs for agy and compact
     );
 });
 
-test('SF-004c: agy front-loads current task before operational context', () => {
+test('SF-004c: agy delegates configurable prompt ordering to the bounded composer', () => {
     const src = fs.readFileSync(join(__dirname, '../../src/agent/spawn.ts'), 'utf8');
     const agyBranchIdx = src.indexOf("if (cli === 'agy' && sysPrompt)");
     const kiroBranchIdx = src.indexOf("else if ((cli === 'kiro-code'");
     assert.ok(agyBranchIdx > 0, 'agy should have a dedicated prompt ordering branch');
     assert.ok(kiroBranchIdx > agyBranchIdx, 'kiro branch should remain separate from agy');
 
     const agyBranch = src.slice(agyBranchIdx, kiroBranchIdx);
-    assert.ok(agyBranch.includes('[Current cli-jaw task]'), 'agy prompt should put task context first');
-    assert.ok(agyBranch.includes('${promptForArgs}\\n\\n---\\n\\n[Operational Context'), 'agy should append operational context after task prompt');
-    assert.ok(
-        agyBranch.indexOf('[Current cli-jaw task]') < agyBranch.indexOf('[Operational Context'),
-        'agy must not put the long operational context before the current user task',
-    );
+    assert.ok(agyBranch.includes('composeAgyPrompt('), 'agy should use the dedicated prompt composer');
+    assert.ok(agyBranch.includes('resolveAgyPromptOrder(cfg.promptOrder)'), 'agy should resolve the per-cli prompt order');
 });
 
 // ─── SF-EDGE: processQueue is called after mainManaged exit ───
