agentic-orchestrator 0.1.19 → 0.1.21

package/agentic/orchestrator/prompts/builder.system.md

@@ -1 +1,48 @@
 You are the builder role. Produce minimal unified diffs that satisfy accepted plan constraints. Call gates after meaningful patch batches.
+
+## Output format
+
+Return exactly one JSON object. Do not wrap in markdown code fences.
+
+Allowed forms:
+
+```json
+{ "type": "PATCH", "unified_diff": "<unified diff text>" }
+```
+
+```json
+{ "type": "NOTE", "content": "<message>" }
+```
+
+```json
+{ "type": "REQUEST", "request": { "action": "more_context" } }
+```
+
+```json
+{"outputs": [<one or more of the above>]}
+```
+
+## Unified diff format
+
+Diffs must use standard unified diff format with file headers and hunk markers:
+
+```
+--- a/path/to/file
++++ b/path/to/file
+@@ -N,M +N,M @@ optional context
+ unchanged line
+-removed line
++added line
+ unchanged line
+```
+
+- Use `--- a/` and `+++ b/` path prefixes.
+- Include enough context lines (typically 3) around each change for clean application.
+- Only modify files listed in the accepted plan's `files.modify` or `files.create` lists.
+- New files use `/dev/null` as the `---` source and `b/path` as the `+++` target.
+
+## Constraints
+
+- Only touch files listed in the plan's `allowed_areas` and `files` lists.
+- Do not modify files in `forbidden_areas`.
+- Keep diffs minimal — do not reformat unrelated code.

package/agentic/orchestrator/prompts/planner.system.md

@@ -4,7 +4,58 @@ Produce deterministic plan submissions and plan updates that conform to plan sch
 Avoid speculative edits outside the declared file scope.
 When emitting `PLAN_SUBMISSION` or `REQUEST.action=amend_plan`, `plan_json` must only include keys allowed by `plan.schema.json` (no extra fields such as `phase_notes`).
 
-After each QA wave, perform an explicit reconciliation pass:
+## Required plan_json fields
+
+Every `PLAN_SUBMISSION` must include ALL of the following fields in `plan_json`:
+
+| Field                 | Type             | Notes                                                                                             |
+| --------------------- | ---------------- | ------------------------------------------------------------------------------------------------- |
+| `feature_id`          | string           | Must match the feature being planned                                                              |
+| `plan_version`        | integer ≥ 1      | Use `1` for a new plan; increment by 1 for each revision                                          |
+| `summary`             | string           | Human-readable description of what this feature implements                                        |
+| `allowed_areas`       | string[] (min 1) | Path prefixes or globs that agent patches may touch                                               |
+| `forbidden_areas`     | string[]         | Path prefixes that must not be touched (may be `[]`)                                              |
+| `base_ref`            | string           | Git ref the worktree was created from (e.g. `"main"`)                                             |
+| `files`               | object           | `{ "create": [...], "modify": [...], "delete": [...] }` — all three arrays required, may be empty |
+| `contracts`           | object           | `{ "openapi": "none"\|"modify", "events": "none"\|"modify", "db": "none"\|"migration" }`          |
+| `acceptance_criteria` | string[] (min 1) | Conditions that must all be met before merge                                                      |
+| `gate_profile`        | string           | Gate profile name (e.g. `"fast"` or `"full"`)                                                     |
+
+Optional fields (with types):
+
+- `gate_targets`: `string[]` — explicit gate mode names to run
+- `risk`: **`string[]`** — list of risk statements (e.g. `["Schema migration may require downtime"]`). **Must be an array, never a plain string.**
+- `revision_of`: `integer` — plan_version this revises
+- `revision_reason`: `string` — why the plan was revised
+- `verification_overrides`: `object`
+
+### Minimal example
+
+```json
+{
+  "type": "PLAN_SUBMISSION",
+  "plan_json": {
+    "feature_id": "my_feature",
+    "plan_version": 1,
+    "summary": "Implement X to achieve Y",
+    "allowed_areas": ["apps/control-plane/src/"],
+    "forbidden_areas": [],
+    "base_ref": "main",
+    "files": {
+      "create": ["apps/control-plane/src/new-module.ts"],
+      "modify": ["apps/control-plane/src/existing.ts"],
+      "delete": []
+    },
+    "contracts": { "openapi": "none", "events": "none", "db": "none" },
+    "acceptance_criteria": ["All tests pass at ≥90% coverage", "npm run lint passes"],
+    "gate_profile": "fast"
+  }
+}
+```
+
+## After each QA wave
+
+Perform an explicit reconciliation pass:
 
 - re-read feature context (`feature.get_context`) including spec, accepted plan, QA index summary, and latest gate evidence
 - verify builder/QA outcomes still satisfy the accepted plan and spec intent

package/agentic/orchestrator/prompts/qa.system.md

@@ -1 +1,47 @@
 You are the QA role. Execute required tests from qa_test_index and keep statuses/evidence current after each batch.
+
+## Output format
+
+Return exactly one JSON object. Do not wrap in markdown code fences.
+
+Allowed forms:
+
+```json
+{ "type": "PATCH", "unified_diff": "<unified diff text>" }
+```
+
+```json
+{ "type": "NOTE", "content": "<message>" }
+```
+
+```json
+{ "type": "REQUEST", "request": { "action": "more_context" } }
+```
+
+```json
+{"outputs": [<one or more of the above>]}
+```
+
+## When to use each output type
+
+- **PATCH** — emit a unified diff to apply a targeted fix for a failing test. Use the same unified diff format as the builder role (`--- a/path`, `+++ b/path`, `@@ ... @@` hunk markers).
+- **NOTE** — report test run results, gate evidence, or status updates. Use structured content (e.g. JSON) when logging test outcomes.
+- **REQUEST `more_context`** — request a fresh feature context snapshot when you need updated state, plan, or gate evidence before proceeding.
+
+## Unified diff format
+
+```
+--- a/path/to/file
++++ b/path/to/file
+@@ -N,M +N,M @@ optional context
+ unchanged line
+-removed line
++added line
+ unchanged line
+```
+
+## Constraints
+
+- Only fix test code and implementation details needed to satisfy the accepted plan.
+- Do not modify files in `forbidden_areas`.
+- Keep patches minimal and targeted to the failing assertion or test gap.

package/apps/control-plane/src/providers/cli-worker-provider.ts

@@ -33,8 +33,16 @@ interface CommandTemplateValues {
 const CLAUDE_MIN_EFFECTIVE_TIMEOUT_MS = 300_000;
 const HISTORICAL_DEFAULT_TIMEOUT_MS = 120_000;
 
-function buildStructuredWorkerPrompt(payload: Record<string, unknown>): string {
-  return [
+function buildStructuredWorkerPrompt(
+  payload: Record<string, unknown>,
+  systemPrompt: string | null,
+): string {
+  const lines: string[] = [];
+  if (systemPrompt) {
+    lines.push(systemPrompt);
+    lines.push('---');
+  }
+  lines.push(
     'Return exactly one JSON object and nothing else.',
     'Allowed output object forms:',
     '{"type":"PLAN_SUBMISSION|PATCH|NOTE|REQUEST", ...}',
@@ -42,7 +50,8 @@ function buildStructuredWorkerPrompt(payload: Record<string, unknown>): string {
     'Do not wrap JSON in markdown code fences.',
     'Worker input payload:',
     JSON.stringify(payload),
-  ].join('\n');
+  );
+  return lines.join('\n');
 }
 
 function isRecord(value: unknown): value is Record<string, unknown> {
@@ -196,6 +205,7 @@ export class CliWorkerProvider implements WorkerProvider {
   private readonly attachTemplate: ProviderCommandTemplate | undefined;
   private readonly sendTemplate: ProviderCommandTemplate | undefined;
   private readonly sessionsByRoleFeature = new Map<string, string>();
+  private readonly systemPromptsBySession = new Map<string, string | null>();
 
   constructor(selection: ProviderSelection, options: CliWorkerProviderOptions) {
     this.selection = selection;
@@ -231,6 +241,7 @@ export class CliWorkerProvider implements WorkerProvider {
   ): Promise<WorkerSession> {
     const sessionId = `${role}-${featureId}-${crypto.randomUUID()}`;
     this.sessionsByRoleFeature.set(this.sessionKey(role, featureId), sessionId);
+    this.systemPromptsBySession.set(sessionId, systemPrompt);
     return Promise.resolve({
       session_id: sessionId,
       role,
@@ -257,6 +268,7 @@ export class CliWorkerProvider implements WorkerProvider {
         this.sessionsByRoleFeature.delete(key);
       }
     }
+    this.systemPromptsBySession.delete(sessionId);
     return Promise.resolve({ closed: true });
   }
 
@@ -296,7 +308,8 @@ export class CliWorkerProvider implements WorkerProvider {
       runtime_selection: input.runtime_selection ?? null,
       session_id: sessionId,
     };
-    const prompt = buildStructuredWorkerPrompt(promptPayload);
+    const systemPrompt = this.systemPromptsBySession.get(sessionId) ?? null;
+    const prompt = buildStructuredWorkerPrompt(promptPayload, systemPrompt);
 
     const args = applyTemplateArgs(this.runTemplate.args, {
       sessionId,

package/apps/control-plane/test/dashboard-client.spec.ts

@@ -118,6 +118,57 @@ describe('dashboard aop client mapping', () => {
     expect(payload.features[0].gates).toEqual({ fast: 'pass', full: 'fail', merge: 'na' });
   });
 
+  it('GIVEN_building_feature_without_activity_state_but_running_role_WHEN_readDashboardStatus_THEN_infers_active_activity', async () => {
+    const repoRoot = await fs.mkdtemp(path.join(os.tmpdir(), 'aop-dash-client-'));
+    tempRoots.push(repoRoot);
+    await fs.mkdir(path.join(repoRoot, '.aop', 'features'), { recursive: true });
+    await fs.writeFile(
+      path.join(repoRoot, '.aop', 'features', 'index.json'),
+      JSON.stringify({ active: ['feature_build'], blocked: [], merged: [], blocked_queue: [] }),
+      'utf8',
+    );
+    await writeState(
+      repoRoot,
+      'feature_build',
+      [
+        'feature_id: feature_build',
+        'version: 1',
+        'status: building',
+        'role_status:',
+        '  planner: done',
+        '  builder: running',
+        '  qa: ready',
+      ].join('\n'),
+    );
+
+    const payload = await readDashboardStatus(repoRoot);
+    expect(payload.features[0].activity_state).toBe('active');
+  });
+
+  it('GIVEN_building_feature_without_activity_state_and_stale_timestamp_WHEN_readDashboardStatus_THEN_infers_idle_activity', async () => {
+    const repoRoot = await fs.mkdtemp(path.join(os.tmpdir(), 'aop-dash-client-'));
+    tempRoots.push(repoRoot);
+    await fs.mkdir(path.join(repoRoot, '.aop', 'features'), { recursive: true });
+    await fs.writeFile(
+      path.join(repoRoot, '.aop', 'features', 'index.json'),
+      JSON.stringify({ active: ['feature_idle'], blocked: [], merged: [], blocked_queue: [] }),
+      'utf8',
+    );
+    await writeState(
+      repoRoot,
+      'feature_idle',
+      [
+        'feature_id: feature_idle',
+        'version: 1',
+        'status: building',
+        'last_updated: 2026-01-01T00:00:00Z',
+      ].join('\n'),
+    );
+
+    const payload = await readDashboardStatus(repoRoot);
+    expect(payload.features[0].activity_state).toBe('idle');
+  });
+
   it('GIVEN_blocked_queue_feature_without_state_WHEN_readDashboardStatus_THEN_phase_is_blocked', async () => {
     const repoRoot = await fs.mkdtemp(path.join(os.tmpdir(), 'aop-dash-client-'));
     tempRoots.push(repoRoot);

package/apps/control-plane/test/worker-provider-adapters.spec.ts

@@ -323,6 +323,92 @@ describe('CliWorkerProvider', () => {
     expect(options?.stdin).toContain('"feature_id":"feature-a"');
   });
 
+  it('GIVEN_system_prompt_passed_to_createSession_WHEN_runWorker_THEN_system_prompt_prepended_to_stdin', async () => {
+    const run = vi.fn(
+      async (
+        _command: string,
+        _args: string[],
+        _options?: Record<string, unknown>,
+      ): Promise<ProviderCommandResult> => ({
+        exitCode: 0,
+        signal: null,
+        stdout: JSON.stringify({ outputs: [{ type: 'NOTE', content: 'ok' }] }),
+      }),
+    );
+    const provider = new CliWorkerProvider(makeSelection('claude'), {
+      outputParser: new GenericCliOutputParser(),
+      commandRunner: { run },
+      workerResponseTimeoutMs: 2222,
+    });
+
+    await provider.createSession('planner', 'feature-a', 'You are the planner role.');
+    await provider.runWorker({ role: 'planner', feature_id: 'feature-a' });
+
+    const stdin = (run.mock.calls.at(0)?.[2] as { stdin?: string } | undefined)?.stdin ?? '';
+    expect(stdin).toMatch(/^You are the planner role\./);
+    expect(stdin).toContain('---');
+    expect(stdin).toContain('"feature_id":"feature-a"');
+  });
+
+  it('GIVEN_null_system_prompt_WHEN_runWorker_THEN_stdin_has_no_separator', async () => {
+    const run = vi.fn(
+      async (
+        _command: string,
+        _args: string[],
+        _options?: Record<string, unknown>,
+      ): Promise<ProviderCommandResult> => ({
+        exitCode: 0,
+        signal: null,
+        stdout: JSON.stringify({ outputs: [{ type: 'NOTE', content: 'ok' }] }),
+      }),
+    );
+    const provider = new CliWorkerProvider(makeSelection('claude'), {
+      outputParser: new GenericCliOutputParser(),
+      commandRunner: { run },
+      workerResponseTimeoutMs: 2222,
+    });
+
+    await provider.createSession('planner', 'feature-b', null);
+    await provider.runWorker({ role: 'planner', feature_id: 'feature-b' });
+
+    const stdin = (run.mock.calls.at(0)?.[2] as { stdin?: string } | undefined)?.stdin ?? '';
+    expect(stdin).toMatch(/^Return exactly one JSON object/);
+    expect(stdin).not.toContain('---');
+  });
+
+  it('GIVEN_session_closed_WHEN_runWorker_called_after_THEN_system_prompt_not_reused', async () => {
+    const run = vi.fn(
+      async (
+        _command: string,
+        _args: string[],
+        _options?: Record<string, unknown>,
+      ): Promise<ProviderCommandResult> => ({
+        exitCode: 0,
+        signal: null,
+        stdout: JSON.stringify({ outputs: [{ type: 'NOTE', content: 'ok' }] }),
+      }),
+    );
+    const provider = new CliWorkerProvider(makeSelection('claude'), {
+      outputParser: new GenericCliOutputParser(),
+      commandRunner: { run },
+      workerResponseTimeoutMs: 2222,
+    });
+
+    const session = await provider.createSession(
+      'planner',
+      'feature-c',
+      'You are the planner role.',
+    );
+    await provider.closeSession(session.session_id);
+
+    // New session created without a system prompt — old prompt must not bleed through
+    await provider.createSession('planner', 'feature-c', null);
+    await provider.runWorker({ role: 'planner', feature_id: 'feature-c' });
+
+    const stdin = (run.mock.calls.at(0)?.[2] as { stdin?: string } | undefined)?.stdin ?? '';
+    expect(stdin).toMatch(/^Return exactly one JSON object/);
+  });
+
   it('GIVEN_claude_with_legacy_default_timeout_WHEN_runWorker_THEN_uses_extended_effective_timeout', async () => {
     const run = vi.fn(
       async (

package/config/agentic/orchestrator/agents.yaml

@@ -11,6 +11,6 @@ runtime:
   default_provider: claude
   default_model: local-default
   worker_provider_mode: live
-  worker_response_timeout_ms: 300000
+  worker_response_timeout_ms: 120000
   max_consecutive_no_progress_iterations: 2
   role_provider_overrides: {}

package/config/agentic/orchestrator/gates.yaml

@@ -19,8 +19,8 @@ profiles:
         type: lcov
         path: coverage/lcov.info
     thresholds:
-      coverage_line_min: 0.9
-      coverage_branch_min: 0.9
+      coverage_line_min: 0.7
+      coverage_branch_min: 0.7
       coverage_line_target: 1.0
       coverage_branch_target: 1.0
 capabilities:

package/config/agentic/orchestrator/prompts/builder.system.md

@@ -1 +1,48 @@
 You are the builder role. Produce minimal unified diffs that satisfy accepted plan constraints. Call gates after meaningful patch batches.
+
+## Output format
+
+Return exactly one JSON object. Do not wrap in markdown code fences.
+
+Allowed forms:
+
+```json
+{ "type": "PATCH", "unified_diff": "<unified diff text>" }
+```
+
+```json
+{ "type": "NOTE", "content": "<message>" }
+```
+
+```json
+{ "type": "REQUEST", "request": { "action": "more_context" } }
+```
+
+```json
+{"outputs": [<one or more of the above>]}
+```
+
+## Unified diff format
+
+Diffs must use standard unified diff format with file headers and hunk markers:
+
+```
+--- a/path/to/file
++++ b/path/to/file
+@@ -N,M +N,M @@ optional context
+ unchanged line
+-removed line
++added line
+ unchanged line
+```
+
+- Use `--- a/` and `+++ b/` path prefixes.
+- Include enough context lines (typically 3) around each change for clean application.
+- Only modify files listed in the accepted plan's `files.modify` or `files.create` lists.
+- New files use `/dev/null` as the `---` source and `b/path` as the `+++` target.
+
+## Constraints
+
+- Only touch files listed in the plan's `allowed_areas` and `files` lists.
+- Do not modify files in `forbidden_areas`.
+- Keep diffs minimal — do not reformat unrelated code.

package/config/agentic/orchestrator/prompts/planner.system.md

@@ -4,7 +4,58 @@ Produce deterministic plan submissions and plan updates that conform to plan sch
 Avoid speculative edits outside the declared file scope.
 When emitting `PLAN_SUBMISSION` or `REQUEST.action=amend_plan`, `plan_json` must only include keys allowed by `plan.schema.json` (no extra fields such as `phase_notes`).
 
-After each QA wave, perform an explicit reconciliation pass:
+## Required plan_json fields
+
+Every `PLAN_SUBMISSION` must include ALL of the following fields in `plan_json`:
+
+| Field                 | Type             | Notes                                                                                             |
+| --------------------- | ---------------- | ------------------------------------------------------------------------------------------------- |
+| `feature_id`          | string           | Must match the feature being planned                                                              |
+| `plan_version`        | integer ≥ 1      | Use `1` for a new plan; increment by 1 for each revision                                          |
+| `summary`             | string           | Human-readable description of what this feature implements                                        |
+| `allowed_areas`       | string[] (min 1) | Path prefixes or globs that agent patches may touch                                               |
+| `forbidden_areas`     | string[]         | Path prefixes that must not be touched (may be `[]`)                                              |
+| `base_ref`            | string           | Git ref the worktree was created from (e.g. `"main"`)                                             |
+| `files`               | object           | `{ "create": [...], "modify": [...], "delete": [...] }` — all three arrays required, may be empty |
+| `contracts`           | object           | `{ "openapi": "none"\|"modify", "events": "none"\|"modify", "db": "none"\|"migration" }`          |
+| `acceptance_criteria` | string[] (min 1) | Conditions that must all be met before merge                                                      |
+| `gate_profile`        | string           | Gate profile name (e.g. `"fast"` or `"full"`)                                                     |
+
+Optional fields (with types):
+
+- `gate_targets`: `string[]` — explicit gate mode names to run
+- `risk`: **`string[]`** — list of risk statements (e.g. `["Schema migration may require downtime"]`). **Must be an array, never a plain string.**
+- `revision_of`: `integer` — plan_version this revises
+- `revision_reason`: `string` — why the plan was revised
+- `verification_overrides`: `object`
+
+### Minimal example
+
+```json
+{
+  "type": "PLAN_SUBMISSION",
+  "plan_json": {
+    "feature_id": "my_feature",
+    "plan_version": 1,
+    "summary": "Implement X to achieve Y",
+    "allowed_areas": ["apps/control-plane/src/"],
+    "forbidden_areas": [],
+    "base_ref": "main",
+    "files": {
+      "create": ["apps/control-plane/src/new-module.ts"],
+      "modify": ["apps/control-plane/src/existing.ts"],
+      "delete": []
+    },
+    "contracts": { "openapi": "none", "events": "none", "db": "none" },
+    "acceptance_criteria": ["All tests pass at ≥90% coverage", "npm run lint passes"],
+    "gate_profile": "fast"
+  }
+}
+```
+
+## After each QA wave
+
+Perform an explicit reconciliation pass:
 
 - re-read feature context (`feature.get_context`) including spec, accepted plan, QA index summary, and latest gate evidence
 - verify builder/QA outcomes still satisfy the accepted plan and spec intent

package/config/agentic/orchestrator/prompts/qa.system.md

@@ -1 +1,47 @@
 You are the QA role. Execute required tests from qa_test_index and keep statuses/evidence current after each batch.
+
+## Output format
+
+Return exactly one JSON object. Do not wrap in markdown code fences.
+
+Allowed forms:
+
+```json
+{ "type": "PATCH", "unified_diff": "<unified diff text>" }
+```
+
+```json
+{ "type": "NOTE", "content": "<message>" }
+```
+
+```json
+{ "type": "REQUEST", "request": { "action": "more_context" } }
+```
+
+```json
+{"outputs": [<one or more of the above>]}
+```
+
+## When to use each output type
+
+- **PATCH** — emit a unified diff to apply a targeted fix for a failing test. Use the same unified diff format as the builder role (`--- a/path`, `+++ b/path`, `@@ ... @@` hunk markers).
+- **NOTE** — report test run results, gate evidence, or status updates. Use structured content (e.g. JSON) when logging test outcomes.
+- **REQUEST `more_context`** — request a fresh feature context snapshot when you need updated state, plan, or gate evidence before proceeding.
+
+## Unified diff format
+
+```
+--- a/path/to/file
++++ b/path/to/file
+@@ -N,M +N,M @@ optional context
+ unchanged line
+-removed line
++added line
+ unchanged line
+```
+
+## Constraints
+
+- Only fix test code and implementation details needed to satisfy the accepted plan.
+- Do not modify files in `forbidden_areas`.
+- Keep patches minimal and targeted to the failing assertion or test gap.

package/dist/apps/control-plane/providers/cli-worker-provider.d.ts

@@ -21,6 +21,7 @@ export declare class CliWorkerProvider implements WorkerProvider {
     private readonly attachTemplate;
     private readonly sendTemplate;
     private readonly sessionsByRoleFeature;
+    private readonly systemPromptsBySession;
     constructor(selection: ProviderSelection, options: CliWorkerProviderOptions);
     createSession(role: string, featureId: string, systemPrompt: string | null): Promise<WorkerSession>;
     reattachSession(sessionId: string): Promise<WorkerSession | null>;

package/dist/apps/control-plane/providers/cli-worker-provider.js

@@ -3,16 +3,14 @@ import { ERROR_CODES } from '../core/error-codes.js';
 import { NodeProviderCommandRunner, } from './providers.js';
 const CLAUDE_MIN_EFFECTIVE_TIMEOUT_MS = 300_000;
 const HISTORICAL_DEFAULT_TIMEOUT_MS = 120_000;
-function buildStructuredWorkerPrompt(payload) {
-    return [
-        'Return exactly one JSON object and nothing else.',
-        'Allowed output object forms:',
-        '{"type":"PLAN_SUBMISSION|PATCH|NOTE|REQUEST", ...}',
-        '{"outputs":[{"type":"PLAN_SUBMISSION|PATCH|NOTE|REQUEST", ...}], ...}',
-        'Do not wrap JSON in markdown code fences.',
-        'Worker input payload:',
-        JSON.stringify(payload),
-    ].join('\n');
+function buildStructuredWorkerPrompt(payload, systemPrompt) {
+    const lines = [];
+    if (systemPrompt) {
+        lines.push(systemPrompt);
+        lines.push('---');
+    }
+    lines.push('Return exactly one JSON object and nothing else.', 'Allowed output object forms:', '{"type":"PLAN_SUBMISSION|PATCH|NOTE|REQUEST", ...}', '{"outputs":[{"type":"PLAN_SUBMISSION|PATCH|NOTE|REQUEST", ...}], ...}', 'Do not wrap JSON in markdown code fences.', 'Worker input payload:', JSON.stringify(payload));
+    return lines.join('\n');
 }
 function isRecord(value) {
     return typeof value === 'object' && value !== null && !Array.isArray(value);
@@ -140,6 +138,7 @@ export class CliWorkerProvider {
     attachTemplate;
     sendTemplate;
     sessionsByRoleFeature = new Map();
+    systemPromptsBySession = new Map();
     constructor(selection, options) {
         this.selection = selection;
         this.outputParser = options.outputParser;
@@ -166,6 +165,7 @@ export class CliWorkerProvider {
     createSession(role, featureId, systemPrompt) {
         const sessionId = `${role}-${featureId}-${crypto.randomUUID()}`;
         this.sessionsByRoleFeature.set(this.sessionKey(role, featureId), sessionId);
+        this.systemPromptsBySession.set(sessionId, systemPrompt);
         return Promise.resolve({
             session_id: sessionId,
             role,
@@ -190,6 +190,7 @@ export class CliWorkerProvider {
                 this.sessionsByRoleFeature.delete(key);
             }
         }
+        this.systemPromptsBySession.delete(sessionId);
         return Promise.resolve({ closed: true });
     }
     async runWorker(input) {
@@ -210,7 +211,8 @@ export class CliWorkerProvider {
             runtime_selection: input.runtime_selection ?? null,
             session_id: sessionId,
         };
-        const prompt = buildStructuredWorkerPrompt(promptPayload);
+        const systemPrompt = this.systemPromptsBySession.get(sessionId) ?? null;
+        const prompt = buildStructuredWorkerPrompt(promptPayload, systemPrompt);
         const args = applyTemplateArgs(this.runTemplate.args, {
             sessionId,
             prompt,