agentic-orchestrator 0.1.6 → 0.1.8

package/apps/control-plane/test/merge-service.spec.ts

@@ -4,12 +4,12 @@ const rmMock = vi.hoisted(() => vi.fn(async () => undefined));
 
 vi.mock('node:fs/promises', () => ({
   default: {
-    rm: rmMock
-  }
+    rm: rmMock,
+  },
 }));
 
 vi.mock('../src/core/git.js', () => ({
-  runGit: vi.fn()
+  runGit: vi.fn(),
 }));
 
 import { MergeService } from '../src/application/services/merge-service.js';
@@ -26,7 +26,7 @@ function commandResult(overrides: Partial<Awaited<ReturnType<typeof runGit>>> =
     stdout: '',
     stderr: '',
     timeout: false,
-    ...overrides
+    ...overrides,
   };
 }
 
@@ -34,10 +34,12 @@ function clone<T>(value: T): T {
   return JSON.parse(JSON.stringify(value)) as T;
 }
 
-function makeHarness(options: {
-  stateOverrides?: AnyRecord;
-  policyOverrides?: AnyRecord;
-} = {}) {
+function makeHarness(
+  options: {
+    stateOverrides?: AnyRecord;
+    policyOverrides?: AnyRecord;
+  } = {},
+) {
   const state = {
     frontMatter: {
       feature_id: 'feature_merge',
@@ -45,28 +47,28 @@ function makeHarness(options: {
       status: STATUS.READY_TO_MERGE,
       gates: {
         fast: GATE_RESULT.PASS,
-        full: GATE_RESULT.PASS
+        full: GATE_RESULT.PASS,
       },
       locks: {
-        held: ['openapi', 'db_migrations']
+        held: ['openapi', 'db_migrations'],
       },
       evidence: {},
-      ...(options.stateOverrides ?? {})
+      ...(options.stateOverrides ?? {}),
     },
-    body: '# State\n'
+    body: '# State\n',
   };
 
   const policy = {
     merge_policy: {
       allowed_strategies: ['merge_commit', 'squash', 'rebase'],
-      require_user_approval: false
+      require_user_approval: false,
     },
     required_modes: ['fast'],
     required_merge_mode: 'full',
     worktree: {
-      base_branch: 'main'
+      base_branch: 'main',
     },
-    ...(options.policyOverrides ?? {})
+    ...(options.policyOverrides ?? {}),
   };
 
   let index: AnyRecord = {
@@ -80,15 +82,15 @@ function makeHarness(options: {
         feature_merge: {
           planner_session_id: 'planner-a',
           builder_session_id: 'builder-a',
-          qa_session_id: 'qa-a'
+          qa_session_id: 'qa-a',
         },
         other: {
           planner_session_id: 'planner-b',
           builder_session_id: 'builder-b',
-          qa_session_id: 'qa-b'
-        }
-      }
-    }
+          qa_session_id: 'qa-b',
+        },
+      },
+    },
   };
 
   const locksRelease = vi.fn(async () => ({ data: { released: true } }));
@@ -107,7 +109,7 @@ function makeHarness(options: {
       state.frontMatter = {
         ...state.frontMatter,
         ...(next.frontMatter ?? {}),
-        version: state.frontMatter.version + 1
+        version: state.frontMatter.version + 1,
       };
       state.body = next.body ?? state.body;
       return clone(state.frontMatter);
@@ -117,14 +119,14 @@ function makeHarness(options: {
     readIndex: async () => clone(index),
     writeIndex: async (nextIndex: AnyRecord) => {
       index = clone(nextIndex);
-    }
+    },
   });
 
   return {
     service,
     state,
     locksRelease,
-    getIndex: () => clone(index)
+    getIndex: () => clone(index),
   };
 }
 
@@ -139,19 +141,19 @@ describe('MergeService', () => {
       policyOverrides: {
         merge_policy: {
           allowed_strategies: ['merge_commit'],
-          require_user_approval: false
-        }
-      }
+          require_user_approval: false,
+        },
+      },
     });
 
     await expect(
-      harness.service.featureReadyToMerge('feature_merge', 'merge', 'squash', null)
+      harness.service.featureReadyToMerge('feature_merge', 'merge', 'squash', null),
     ).rejects.toMatchObject({
       normalizedResponse: {
         error: {
-          code: ERROR_CODES.MERGE_DISABLED
-        }
-      }
+          code: ERROR_CODES.MERGE_DISABLED,
+        },
+      },
     });
     expect(runGit).not.toHaveBeenCalled();
   });
@@ -161,19 +163,19 @@ describe('MergeService', () => {
       policyOverrides: {
         merge_policy: {
           allowed_strategies: ['merge_commit', 'squash', 'rebase'],
-          require_user_approval: true
-        }
-      }
+          require_user_approval: true,
+        },
+      },
     });
 
     await expect(
-      harness.service.featureReadyToMerge('feature_merge', 'merge', 'merge_commit', null)
+      harness.service.featureReadyToMerge('feature_merge', 'merge', 'merge_commit', null),
     ).rejects.toMatchObject({
       normalizedResponse: {
         error: {
-          code: ERROR_CODES.USER_APPROVAL_REQUIRED
-        }
-      }
+          code: ERROR_CODES.USER_APPROVAL_REQUIRED,
+        },
+      },
     });
     expect(runGit).not.toHaveBeenCalled();
   });
@@ -181,38 +183,43 @@ describe('MergeService', () => {
   it('GIVEN_feature_not_ready_or_required_gates_missing_WHEN_feature_ready_to_merge_THEN_returns_precondition_errors', async () => {
     const invalidStatus = makeHarness({
       stateOverrides: {
-        status: STATUS.BUILDING
-      }
+        status: STATUS.BUILDING,
+      },
     });
     await expect(
-      invalidStatus.service.featureReadyToMerge('feature_merge', 'merge', 'merge_commit', 'approved')
+      invalidStatus.service.featureReadyToMerge(
+        'feature_merge',
+        'merge',
+        'merge_commit',
+        'approved',
+      ),
     ).rejects.toMatchObject({
       normalizedResponse: {
         error: {
-          code: ERROR_CODES.INVALID_STATUS_TRANSITION
-        }
-      }
+          code: ERROR_CODES.INVALID_STATUS_TRANSITION,
+        },
+      },
     });
 
     const missingGate = makeHarness({
       stateOverrides: {
         gates: {
           fast: GATE_RESULT.PASS,
-          full: GATE_RESULT.FAIL
-        }
-      }
+          full: GATE_RESULT.FAIL,
+        },
+      },
     });
     await expect(
-      missingGate.service.featureReadyToMerge('feature_merge', 'merge', 'merge_commit', 'approved')
+      missingGate.service.featureReadyToMerge('feature_merge', 'merge', 'merge_commit', 'approved'),
     ).rejects.toMatchObject({
       normalizedResponse: {
         error: {
           code: ERROR_CODES.MERGE_DISABLED,
           details: {
-            mode: 'full'
-          }
-        }
-      }
+            mode: 'full',
+          },
+        },
+      },
     });
   });
 
@@ -221,13 +228,13 @@ describe('MergeService', () => {
     vi.mocked(runGit).mockResolvedValueOnce(commandResult({ code: 1, stderr: 'add failed' }));
 
     await expect(
-      addFailure.service.featureReadyToMerge('feature_merge', 'merge', 'merge_commit', 'approved')
+      addFailure.service.featureReadyToMerge('feature_merge', 'merge', 'merge_commit', 'approved'),
     ).rejects.toMatchObject({
       normalizedResponse: {
         error: {
-          code: ERROR_CODES.GIT_FAILURE
-        }
-      }
+          code: ERROR_CODES.GIT_FAILURE,
+        },
+      },
     });
 
     const commitFailure = makeHarness();
@@ -236,13 +243,18 @@ describe('MergeService', () => {
       .mockResolvedValueOnce(commandResult({ code: 1, stderr: 'commit failed' }));
 
     await expect(
-      commitFailure.service.featureReadyToMerge('feature_merge', 'merge', 'merge_commit', 'approved')
+      commitFailure.service.featureReadyToMerge(
+        'feature_merge',
+        'merge',
+        'merge_commit',
+        'approved',
+      ),
     ).rejects.toMatchObject({
       normalizedResponse: {
         error: {
-          code: ERROR_CODES.GIT_FAILURE
-        }
-      }
+          code: ERROR_CODES.GIT_FAILURE,
+        },
+      },
     });
   });
 
@@ -254,16 +266,21 @@ describe('MergeService', () => {
       .mockResolvedValueOnce(commandResult({ code: 1, stderr: 'checkout failed' }));
 
     await expect(
-      checkoutFailure.service.featureReadyToMerge('feature_merge', 'merge', 'merge_commit', 'approved')
+      checkoutFailure.service.featureReadyToMerge(
+        'feature_merge',
+        'merge',
+        'merge_commit',
+        'approved',
+      ),
     ).rejects.toMatchObject({
       normalizedResponse: {
         error: {
           code: ERROR_CODES.GIT_FAILURE,
           details: {
-            requires_human: true
-          }
-        }
-      }
+            requires_human: true,
+          },
+        },
+      },
     });
 
     const rebaseFailure = makeHarness();
@@ -274,16 +291,16 @@ describe('MergeService', () => {
       .mockResolvedValueOnce(commandResult({ code: 1, stderr: 'rebase failed' }));
 
     await expect(
-      rebaseFailure.service.featureReadyToMerge('feature_merge', 'merge', 'rebase', 'approved')
+      rebaseFailure.service.featureReadyToMerge('feature_merge', 'merge', 'rebase', 'approved'),
     ).rejects.toMatchObject({
       normalizedResponse: {
         error: {
           code: ERROR_CODES.GIT_FAILURE,
           details: {
-            requires_human: true
-          }
-        }
-      }
+            requires_human: true,
+          },
+        },
+      },
     });
   });
 
@@ -297,16 +314,16 @@ describe('MergeService', () => {
       .mockResolvedValueOnce(commandResult({ code: 1, stderr: 'squash commit failed' }));
 
     await expect(
-      harness.service.featureReadyToMerge('feature_merge', 'merge', 'squash', 'approved')
+      harness.service.featureReadyToMerge('feature_merge', 'merge', 'squash', 'approved'),
     ).rejects.toMatchObject({
       normalizedResponse: {
         error: {
           code: ERROR_CODES.GIT_FAILURE,
           details: {
-            requires_human: true
-          }
-        }
-      }
+            requires_human: true,
+          },
+        },
+      },
     });
   });
 
@@ -314,9 +331,9 @@ describe('MergeService', () => {
     const harness = makeHarness({
       stateOverrides: {
         locks: {
-          held: ['openapi', 42]
-        }
-      }
+          held: ['openapi', 42],
+        },
+      },
     });
 
     vi.mocked(runGit)
@@ -327,14 +344,19 @@ describe('MergeService', () => {
       .mockResolvedValueOnce(commandResult())
       .mockResolvedValueOnce(commandResult({ stdout: 'abc123\n' }));
 
-    const result = await harness.service.featureReadyToMerge('feature_merge', 'merge', 'rebase', 'approved');
+    const result = await harness.service.featureReadyToMerge(
+      'feature_merge',
+      'merge',
+      'rebase',
+      'approved',
+    );
 
     expect(result.data).toMatchObject({
       feature_id: 'feature_merge',
       merge_sha: 'abc123',
       merge_strategy: 'rebase',
       status: STATUS.MERGED,
-      retained_for_cleanup: true
+      retained_for_cleanup: true,
     });
     expect(harness.state.frontMatter.status).toBe(STATUS.MERGED);
     expect((harness.state.frontMatter.evidence as AnyRecord).merge_strategy).toBe('rebase');
@@ -348,7 +370,7 @@ describe('MergeService', () => {
     expect(index.blocked_queue).toEqual([{ feature_id: 'other' }]);
     expect(index.runtime_sessions.feature_sessions).not.toHaveProperty('feature_merge');
     expect(index.runtime_sessions.feature_sessions.other).toMatchObject({
-      planner_session_id: 'planner-b'
+      planner_session_id: 'planner-b',
     });
     expect(rmMock).not.toHaveBeenCalled();
   });
@@ -358,9 +380,9 @@ describe('MergeService', () => {
       policyOverrides: {
         cleanup: {
           auto_after_merge: true,
-          grace_period_seconds: 0
-        }
-      }
+          grace_period_seconds: 0,
+        },
+      },
     });
 
     vi.mocked(runGit).mockImplementation(async (_repoRoot, args) => {
@@ -370,15 +392,28 @@ describe('MergeService', () => {
       return commandResult();
     });
 
-    const result = await harness.service.featureReadyToMerge('feature_merge', 'merge', 'merge_commit', 'approved');
+    const result = await harness.service.featureReadyToMerge(
+      'feature_merge',
+      'merge',
+      'merge_commit',
+      'approved',
+    );
 
     expect(result.data).toMatchObject({
       retained_for_cleanup: false,
-      cleanup_grace_period_seconds: 0
+      cleanup_grace_period_seconds: 0,
     });
-    expect(runGit).toHaveBeenCalledWith('/repo', ['worktree', 'remove', '--force', '/repo/.worktrees/feature_merge']);
+    expect(runGit).toHaveBeenCalledWith('/repo', [
+      'worktree',
+      'remove',
+      '--force',
+      '/repo/.worktrees/feature_merge',
+    ]);
     expect(runGit).toHaveBeenCalledWith('/repo', ['branch', '-D', 'feature_merge']);
-    expect(rmMock).toHaveBeenCalledWith('/repo/.aop/features/feature_merge', { recursive: true, force: true });
+    expect(rmMock).toHaveBeenCalledWith('/repo/.aop/features/feature_merge', {
+      recursive: true,
+      force: true,
+    });
   });
 
   it('GIVEN_auto_cleanup_enabled_with_grace_WHEN_merge_succeeds_THEN_schedules_cleanup_after_delay', async () => {
@@ -388,9 +423,9 @@ describe('MergeService', () => {
         policyOverrides: {
           cleanup: {
             auto_after_merge: true,
-            grace_period_seconds: 1
-          }
-        }
+            grace_period_seconds: 1,
+          },
+        },
       });
 
       vi.mocked(runGit).mockImplementation(async (_repoRoot, args) => {
@@ -400,19 +435,32 @@ describe('MergeService', () => {
         return commandResult();
       });
 
-      const result = await harness.service.featureReadyToMerge('feature_merge', 'merge', 'merge_commit', 'approved');
+      const result = await harness.service.featureReadyToMerge(
+        'feature_merge',
+        'merge',
+        'merge_commit',
+        'approved',
+      );
 
       expect(result.data).toMatchObject({
         retained_for_cleanup: true,
-        cleanup_grace_period_seconds: 1
+        cleanup_grace_period_seconds: 1,
       });
       expect(rmMock).not.toHaveBeenCalled();
 
       await vi.advanceTimersByTimeAsync(1000);
 
-      expect(runGit).toHaveBeenCalledWith('/repo', ['worktree', 'remove', '--force', '/repo/.worktrees/feature_merge']);
+      expect(runGit).toHaveBeenCalledWith('/repo', [
+        'worktree',
+        'remove',
+        '--force',
+        '/repo/.worktrees/feature_merge',
+      ]);
       expect(runGit).toHaveBeenCalledWith('/repo', ['branch', '-D', 'feature_merge']);
-      expect(rmMock).toHaveBeenCalledWith('/repo/.aop/features/feature_merge', { recursive: true, force: true });
+      expect(rmMock).toHaveBeenCalledWith('/repo/.aop/features/feature_merge', {
+        recursive: true,
+        force: true,
+      });
     } finally {
       vi.useRealTimers();
     }

package/apps/control-plane/test/multi-project.spec.ts

@@ -12,8 +12,8 @@ const kernelCtorMock = vi.hoisted(() => vi.fn());
 const toolCallMock = vi.hoisted(() =>
   vi.fn(async () => ({
     ok: true,
-    data: { features: [{ feature_id: 'feat-a', status: 'planning' }] }
-  }))
+    data: { features: [{ feature_id: 'feat-a', status: 'planning' }] },
+  })),
 );
 
 vi.mock('../src/core/kernel.js', () => {
@@ -51,23 +51,29 @@ vi.mock('../src/core/kernel.js', () => {
 
 vi.mock('../src/mcp/runtime-factory.js', () => ({
   createToolingRuntime: createToolingRuntimeMock,
-  resolveToolClient: resolveToolClientMock
+  resolveToolClient: resolveToolClientMock,
 }));
 
 // ── helpers ───────────────────────────────────────────────────────────────────
 
 async function writeMultiProjectYaml(dir: string, content: string): Promise<void> {
-  const configDir = path.join(dir, 'agentic', 'orchestrator');
+  const configDir = path.join(dir, 'config', 'agentic', 'orchestrator');
   await fs.mkdir(configDir, { recursive: true });
   await fs.writeFile(path.join(configDir, 'multi-project.yaml'), content, 'utf8');
 }
 
 async function writeSchemaFile(dir: string): Promise<void> {
-  const schemasDir = path.join(dir, 'agentic', 'orchestrator', 'schemas');
+  const schemasDir = path.join(dir, 'config', 'agentic', 'orchestrator', 'schemas');
   await fs.mkdir(schemasDir, { recursive: true });
   // Resolve repo root: test/ -> control-plane/ -> apps/ -> repo root
   const repoRoot = path.resolve(import.meta.dirname, '../../../');
-  const srcSchema = path.join(repoRoot, 'agentic', 'orchestrator', 'schemas', 'multi-project.schema.json');
+  const srcSchema = path.join(
+    repoRoot,
+    'agentic',
+    'orchestrator',
+    'schemas',
+    'multi-project.schema.json',
+  );
   const destSchema = path.join(schemasDir, 'multi-project.schema.json');
   await fs.copyFile(srcSchema, destSchema);
 }
@@ -111,7 +117,7 @@ projects:
   - name: beta
     path: ~/projects/beta
     repo: https://github.com/org/beta
-`
+`,
     );
 
     const { MultiProjectLoader } = await import('../src/application/multi-project-loader.js');
@@ -141,7 +147,7 @@ projects:
       `
 version: "1.0"
 projects: []
-`
+`,
     );
 
     const { MultiProjectLoader } = await import('../src/application/multi-project-loader.js');
@@ -159,7 +165,7 @@ projects:
     path: /tmp/alpha
   - name: beta
     path: /tmp/beta
-`
+`,
     );
     const { MultiProjectLoader } = await import('../src/application/multi-project-loader.js');
     const loader = new MultiProjectLoader();
@@ -204,20 +210,20 @@ version: "1.0"
 projects:
   - name: alpha
     path: /tmp/alpha
-`
+`,
     );
 
     const { runCli } = await import('../src/interfaces/cli/bootstrap.js');
     const code = await runCli(['status', '--project', 'nonexistent'], {
       cwd: tmpDir,
-      env: process.env
+      env: process.env,
     });
 
     const writes = asJsonWrites(stdoutSpy);
     expect(code).toBe(1);
     expect(writes[0]).toMatchObject({
       ok: false,
-      error: expect.objectContaining({ message: expect.stringContaining('nonexistent') })
+      error: expect.objectContaining({ message: expect.stringContaining('nonexistent') }),
     });
   });
 
@@ -233,7 +239,7 @@ version: "1.0"
 projects:
   - name: alpha
     path: ${projectPath}
-`
+`,
     );
 
     const capturedRoots: string[] = [];
@@ -265,7 +271,7 @@ projects:
     path: ${projectAlpha}
   - name: beta
     path: ${projectBeta}
-`
+`,
     );
 
     const capturedRoots: string[] = [];
@@ -300,7 +306,7 @@ projects:
     path: ${projectAlpha}
   - name: beta
     path: ${projectBeta}
-`
+`,
     );
 
     const capturedRoots: string[] = [];
@@ -337,27 +343,27 @@ projects:
       `
 version: "1.0"
 defaults:
-  policy: agentic/orchestrator/policy.yaml
-  gates: agentic/orchestrator/gates.yaml
+  policy: config/agentic/orchestrator/policy.yaml
+  gates: config/agentic/orchestrator/gates.yaml
 projects:
   - name: alpha
     path: ${projectAlpha}
-`
+`,
     );
 
     const { runCli } = await import('../src/interfaces/cli/bootstrap.js');
     const code = await runCli(['status', '--project', 'alpha'], {
       cwd: tmpDir,
-      env: process.env
+      env: process.env,
     });
 
     expect(code).toBe(0);
     expect(kernelCtorMock).toHaveBeenCalledWith(
       projectAlpha,
       expect.objectContaining({
-        policyPath: path.join(projectAlpha, 'agentic', 'orchestrator', 'policy.yaml'),
-        gatesPath: path.join(projectAlpha, 'agentic', 'orchestrator', 'gates.yaml')
-      })
+        policyPath: path.join(projectAlpha, 'config', 'agentic', 'orchestrator', 'policy.yaml'),
+        gatesPath: path.join(projectAlpha, 'config', 'agentic', 'orchestrator', 'gates.yaml'),
+      }),
     );
   });
 });