agentic-orchestrator 0.1.4 → 0.1.6

package/apps/control-plane/test/policy-loader-service.spec.ts

@@ -0,0 +1,346 @@
+import fs from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+
+import { mergePolicy, loadComposedPolicy } from '../src/application/services/policy-loader-service.js';
+import { SchemaRegistry } from '../src/core/schemas.js';
+
+// ---------------------------------------------------------------------------
+// Unit tests for mergePolicy
+// ---------------------------------------------------------------------------
+
+describe('mergePolicy', () => {
+  it('GIVEN_scalar_user_value_WHEN_merged_THEN_replaces_default_scalar', () => {
+    const defaults = { version: 1, timeout: 600 };
+    const user = { timeout: 300 };
+    const result = mergePolicy(defaults, user);
+    expect(result).toEqual({ version: 1, timeout: 300 });
+  });
+
+  it('GIVEN_object_user_value_WHEN_merged_THEN_recursive_merge_preserves_defaults', () => {
+    const defaults = { worktree: { base_branch: 'main', normalize: true } };
+    const user = { worktree: { base_branch: 'develop' } };
+    const result = mergePolicy(defaults, user);
+    expect(result).toEqual({ worktree: { base_branch: 'develop', normalize: true } });
+  });
+
+  it('GIVEN_array_override_WHEN_composed_THEN_array_replaces_default_array', () => {
+    const defaults = { required_modes: ['fast', 'full'] };
+    const user = { required_modes: ['fast'] };
+    const result = mergePolicy(defaults, user) as Record<string, unknown>;
+    expect(result['required_modes']).toEqual(['fast']);
+  });
+
+  it('GIVEN_absent_user_keys_WHEN_merged_THEN_defaults_inherited', () => {
+    const defaults = { version: 1, locks: { lease_ttl_seconds: 300 } };
+    const user = { version: 1 };
+    const result = mergePolicy(defaults, user) as Record<string, unknown>;
+    expect(result['locks']).toEqual({ lease_ttl_seconds: 300 });
+  });
+
+  it('GIVEN_undefined_user_field_WHEN_merged_THEN_field_is_ignored', () => {
+    const defaults = { version: 1, port: 3000 };
+    const user = { version: 1, port: undefined };
+    const result = mergePolicy(defaults, user) as Record<string, unknown>;
+    // undefined user fields inherit the default
+    expect(result['port']).toBe(3000);
+  });
+
+  it('GIVEN_empty_user_object_WHEN_merged_THEN_returns_defaults_clone', () => {
+    const defaults = { version: 1, commit_policy: { allow_commit: false } };
+    const user = {};
+    const result = mergePolicy(defaults, user);
+    expect(result).toEqual(defaults);
+    // must be a deep clone, not same reference
+    expect(result).not.toBe(defaults);
+  });
+
+  it('GIVEN_merge_determinism_WHEN_key_order_differs_THEN_same_output', () => {
+    const defaults = { a: 1, b: 2, c: { x: 10, y: 20 } };
+    const user1 = { b: 99, c: { y: 99 } };
+    const user2 = { c: { y: 99 }, b: 99 };
+    const result1 = mergePolicy(defaults, user1);
+    const result2 = mergePolicy(defaults, user2);
+    expect(result1).toEqual(result2);
+  });
+
+  it('GIVEN_deeply_nested_user_value_WHEN_merged_THEN_only_overridden_leaf_changes', () => {
+    const defaults = {
+      execution: {
+        retry_policy: { transient_max_retries: 1, transient_error_codes: [124] }
+      }
+    };
+    const user = {
+      execution: {
+        retry_policy: { transient_max_retries: 3 }
+      }
+    };
+    const result = mergePolicy(defaults, user) as {
+      execution: { retry_policy: { transient_max_retries: number; transient_error_codes: number[] } };
+    };
+    expect(result.execution.retry_policy.transient_max_retries).toBe(3);
+    expect(result.execution.retry_policy.transient_error_codes).toEqual([124]);
+  });
+
+  it('GIVEN_array_in_protected_areas_WHEN_user_overrides_THEN_array_is_replaced_wholesale', () => {
+    const defaults = { protected_areas: ['agentic/orchestrator/policy.yaml'] };
+    const user = { protected_areas: ['agentic/orchestrator/policy.yaml', 'libs/core'] };
+    const result = mergePolicy(defaults, user) as Record<string, unknown>;
+    expect(result['protected_areas']).toEqual(['agentic/orchestrator/policy.yaml', 'libs/core']);
+    expect((result['protected_areas'] as unknown[]).length).toBe(2);
+  });
+});
+
+// ---------------------------------------------------------------------------
+// Integration tests for loadComposedPolicy
+// ---------------------------------------------------------------------------
+
+describe('loadComposedPolicy', () => {
+  let tmpDir: string;
+  let schemaRegistry: SchemaRegistry;
+
+  beforeEach(async () => {
+    tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'aop-policy-loader-'));
+    // Use the real schema registry pointing at the AOP repo schemas (bundled)
+    schemaRegistry = new SchemaRegistry(tmpDir);
+  });
+
+  afterEach(async () => {
+    await fs.rm(tmpDir, { recursive: true, force: true });
+    vi.restoreAllMocks();
+  });
+
+  async function writePolicyFile(content: string): Promise<string> {
+    const policyPath = path.join(tmpDir, 'policy.yaml');
+    await fs.writeFile(policyPath, content, 'utf8');
+    return policyPath;
+  }
+
+  it('GIVEN_defaults_and_lean_user_policy_WHEN_composed_THEN_merged_policy_is_valid', async () => {
+    const leanPolicy = `version: 1
+worktree:
+  base_branch: develop
+supervisor:
+  max_parallel_gate_runs: 4
+dashboard:
+  enabled: true
+  port: 4000
+merge_policy:
+  require_user_approval: true
+notifications:
+  enabled: false
+  channels:
+    desktop:
+      enabled: false
+    slack:
+      enabled: false
+      webhook: ""
+      channel: "#aop-alerts"
+    webhook:
+      enabled: false
+      url: ""
+`;
+    const policyPath = await writePolicyFile(leanPolicy);
+    const result = await loadComposedPolicy(tmpDir, policyPath, schemaRegistry);
+
+    // User values are preserved in merged result
+    expect((result.mergedPolicy['worktree'] as Record<string, unknown>)['base_branch']).toBe('develop');
+    expect((result.mergedPolicy['supervisor'] as Record<string, unknown>)['max_parallel_gate_runs']).toBe(4);
+
+    // Defaults fill in required fields not in lean policy
+    expect(result.mergedPolicy['implementation']).toBeDefined();
+    expect((result.mergedPolicy['implementation'] as Record<string, unknown>)['workspace']).toBe('nx');
+    expect(result.mergedPolicy['rbac']).toBeDefined();
+    expect(result.mergedPolicy['locks']).toBeDefined();
+  });
+
+  it('GIVEN_full_user_policy_WHEN_composed_THEN_user_values_override_defaults', async () => {
+    const fullPolicy = `version: 1
+commit_policy:
+  allow_commit: true
+  allow_merge: true
+patch_policy:
+  enforce_plan: false
+  enforce_allowed_areas: false
+locks:
+  resources:
+    - openapi
+  contract_to_resource:
+    openapi: openapi
+    events: events
+    db: db_migrations
+  lease_ttl_seconds: 120
+  acquire_behavior: wait
+  default_wait_timeout_seconds: 120
+  acquire_backoff:
+    initial_ms: 100
+    max_ms: 2000
+    multiplier: 2
+    jitter_ms: 50
+protected_areas:
+  - agentic/orchestrator/policy.yaml
+required_modes:
+  - fast
+required_merge_mode: merge
+collision_policy: reject
+config_precedence:
+  policy_hard_constraints:
+    - execution.default_step_timeout_seconds
+  gates_profile_defaults:
+    - profiles
+  plan_verification_overrides:
+    - verification_overrides
+path_rules:
+  matching: repo_prefix
+  normalize_paths: true
+  allow_symlink_traversal: false
+execution:
+  default_step_timeout_seconds: 300
+  retry_policy:
+    transient_max_retries: 2
+    transient_error_codes:
+      - 124
+    non_retryable_error_codes:
+      - 2
+  env_allowlist:
+    - PATH
+implementation:
+  workspace: nx
+testing:
+  framework: vitest
+  coverage:
+    minimums:
+      line: 0.8
+      branch: 0.8
+    targets:
+      line: 1.0
+      branch: 1.0
+merge_policy:
+  require_user_approval: false
+  allowed_strategies:
+    - squash
+worktree:
+  base_branch: main
+rbac:
+  orchestrator:
+    - feature.get_context
+  system:
+    - "*"
+`;
+    const policyPath = await writePolicyFile(fullPolicy);
+    const result = await loadComposedPolicy(tmpDir, policyPath, schemaRegistry);
+
+    // User values dominate
+    expect((result.mergedPolicy['commit_policy'] as Record<string, unknown>)['allow_commit']).toBe(true);
+    expect((result.mergedPolicy['execution'] as Record<string, unknown>)['default_step_timeout_seconds']).toBe(300);
+    expect((result.mergedPolicy['merge_policy'] as Record<string, unknown>)['require_user_approval']).toBe(false);
+    const strategies = (result.mergedPolicy['merge_policy'] as Record<string, unknown>)['allowed_strategies'];
+    expect(strategies).toEqual(['squash']);
+  });
+
+  it('GIVEN_array_override_for_required_modes_WHEN_composed_THEN_array_replaces_default_array', async () => {
+    const policy = `version: 1
+required_modes:
+  - fast
+`;
+    const policyPath = await writePolicyFile(policy);
+    const result = await loadComposedPolicy(tmpDir, policyPath, schemaRegistry);
+
+    // User's array replaces the defaults array wholesale
+    expect(result.mergedPolicy['required_modes']).toEqual(['fast']);
+  });
+
+  it('GIVEN_empty_user_policy_WHEN_loaded_THEN_merged_policy_is_defaults_only', async () => {
+    const policyPath = await writePolicyFile('');
+    const result = await loadComposedPolicy(tmpDir, policyPath, schemaRegistry);
+
+    // All required fields come from defaults
+    expect(result.userPolicy).toEqual({});
+    expect(result.mergedPolicy['version']).toBe(1);
+    expect(result.mergedPolicy['commit_policy']).toBeDefined();
+    expect(result.mergedPolicy['implementation']).toBeDefined();
+  });
+
+  it('GIVEN_invalid_user_policy_WHEN_loaded_THEN_validation_error_is_actionable', async () => {
+    // Provide a policy that overrides a required field with wrong type
+    const badPolicy = `version: 1
+commit_policy:
+  allow_commit: "yes"
+  allow_merge: false
+patch_policy:
+  enforce_plan: true
+  enforce_allowed_areas: true
+locks:
+  resources: []
+  contract_to_resource:
+    openapi: openapi
+    events: events
+    db: db_migrations
+  lease_ttl_seconds: 300
+  acquire_behavior: wait
+  default_wait_timeout_seconds: 300
+  acquire_backoff:
+    initial_ms: 200
+    max_ms: 5000
+    multiplier: 2
+    jitter_ms: 150
+protected_areas:
+  - agentic/orchestrator/policy.yaml
+required_modes:
+  - fast
+required_merge_mode: merge
+collision_policy: reject
+config_precedence: {}
+path_rules:
+  matching: repo_prefix
+  normalize_paths: true
+  allow_symlink_traversal: false
+execution:
+  default_step_timeout_seconds: 600
+  retry_policy:
+    transient_max_retries: 1
+    transient_error_codes: []
+    non_retryable_error_codes: []
+  env_allowlist: []
+implementation:
+  workspace: nx
+testing:
+  framework: vitest
+  coverage:
+    minimums:
+      line: 0.7
+      branch: 0.7
+    targets:
+      line: 1.0
+      branch: 1.0
+merge_policy:
+  require_user_approval: true
+  allowed_strategies:
+    - merge_commit
+worktree:
+  base_branch: main
+rbac:
+  system:
+    - "*"
+`;
+    const policyPath = await writePolicyFile(badPolicy);
+    await expect(loadComposedPolicy(tmpDir, policyPath, schemaRegistry)).rejects.toThrow(
+      /invalid_policy_yaml/
+    );
+  });
+
+  it('GIVEN_missing_policy_file_WHEN_loaded_THEN_throws_read_error', async () => {
+    const missingPath = path.join(tmpDir, 'missing.yaml');
+    await expect(loadComposedPolicy(tmpDir, missingPath, schemaRegistry)).rejects.toThrow();
+  });
+
+  it('GIVEN_defaults_not_found_WHEN_loaded_THEN_throws_descriptive_error', async () => {
+    const policyPath = await writePolicyFile('version: 1\n');
+    // Temporarily override the bundled defaults path via mocking the fs.readFile call
+    // to simulate defaults artifact missing by mocking module internals
+    vi.spyOn(fs, 'readFile').mockRejectedValueOnce(new Error('ENOENT: no such file'));
+
+    await expect(loadComposedPolicy(tmpDir, policyPath, schemaRegistry)).rejects.toThrow();
+  });
+});

package/apps/control-plane/test/reactions.spec.ts

@@ -1,9 +1,10 @@
 import { describe, expect, it, vi } from 'vitest';
 import { ReactionsService } from '../src/application/services/reactions-service.js';
 import type { GateRepairContext, ReactionsPolicy } from '../src/application/services/reactions-service.js';
+import type { ToolCaller } from '../src/core/tool-caller.js';
 import { TOOLS } from '../src/core/constants.js';
 
-function makeToolCaller(statePatchFn?: () => Promise<Record<string, unknown>>) {
+function makeToolCaller(statePatchFn?: () => Promise<Record<string, unknown>>): ToolCaller {
   return {
     callTool: vi.fn(async (_role: string, toolName: string, _args?: Record<string, unknown>) => {
       if (toolName === TOOLS.FEATURE_STATE_GET) {
@@ -16,7 +17,7 @@ function makeToolCaller(statePatchFn?: () => Promise<Record<string, unknown>>) {
         return { ok: true, data: { updated: true } };
       }
       return { ok: true, data: {} };
-    })
+    }) as unknown as ToolCaller['callTool']
   };
 }
 
@@ -126,7 +127,7 @@ describe('ReactionsService', () => {
     await service.recordRetry('feature_d', 1);
 
     expect(patchCallCount).toBe(1);
-    const patchCall = toolCaller.callTool.mock.calls.find(([, tool]) => tool === TOOLS.FEATURE_STATE_PATCH);
+    const patchCall = vi.mocked(toolCaller.callTool).mock.calls.find(([, tool]) => tool === TOOLS.FEATURE_STATE_PATCH);
     expect(patchCall).toBeDefined();
     const patchArgs = patchCall?.[2] ?? {};
     const patch = (patchArgs['patch'] ?? {}) as Record<string, unknown>;
@@ -144,7 +145,7 @@ describe('ReactionsService', () => {
     // Simulate force reset by calling recordRetry with 0
     await service.recordRetry('feature_e', 0);
 
-    const patchCall = toolCaller.callTool.mock.calls.find(([, tool]) => tool === TOOLS.FEATURE_STATE_PATCH);
+    const patchCall = vi.mocked(toolCaller.callTool).mock.calls.find(([, tool]) => tool === TOOLS.FEATURE_STATE_PATCH);
     expect(patchCall).toBeDefined();
     const patchArgs = patchCall?.[2] ?? {};
     const patch = (patchArgs['patch'] ?? {}) as Record<string, unknown>;
@@ -321,6 +322,7 @@ describe('ReactionsService branch coverage', () => {
       policy: makeEnabledPolicy()
     });
     const ctx: GateRepairContext = {
+      featureId: 'feature_history_none',
       gateName: 'unit-tests',
       exitCode: 1,
       logs: 'test output',
@@ -336,7 +338,7 @@ describe('ReactionsService additional coverage', () => {
   it('GIVEN_policy_with_valid_max_retries_number_WHEN_maxRetries_called_THEN_returns_floor_of_value', () => {
     const service = new ReactionsService({
       toolCaller: makeToolCaller(),
-      policy: { gate_failed: { enabled: true, action: 'retry_with_agent_repair', max_retries: 3.7, retry_delay_ms: 0 } }
+      policy: { gate_failed: { enabled: true, action: 'retry_with_agent_repair', max_retries: 3.7, escalate_after: 2, retry_delay_ms: 0 } }
     });
     expect(service.maxRetries()).toBe(3);
   });
@@ -344,7 +346,7 @@ describe('ReactionsService additional coverage', () => {
   it('GIVEN_non_finite_max_retries_WHEN_maxRetries_called_THEN_returns_default', () => {
     const service = new ReactionsService({
       toolCaller: makeToolCaller(),
-      policy: { gate_failed: { enabled: true, action: 'retry_with_agent_repair', max_retries: Infinity, retry_delay_ms: 0 } }
+      policy: { gate_failed: { enabled: true, action: 'retry_with_agent_repair', max_retries: Infinity, escalate_after: 2, retry_delay_ms: 0 } }
     });
     expect(service.maxRetries()).toBeGreaterThanOrEqual(0);
   });

package/apps/control-plane/test/resume-command.spec.ts

@@ -2,27 +2,43 @@ import { describe, it, expect, vi } from 'vitest';
 
 vi.mock('../src/providers/providers.js', () => ({
   resolveProviderSelection: vi.fn(() => ({ provider: 'null', model: 'none', provider_config_ref: null })),
-  NullWorkerProvider: vi.fn().mockImplementation(() => ({
-    selection: { provider: 'null', model: 'none', provider_config_ref: null },
-    createSession: vi.fn(async () => ({ session_id: 'mock-session' })),
-    reattachSession: vi.fn(async () => null),
-    closeSession: vi.fn(async () => ({}))
-  }))
+  NullWorkerProvider: class NullWorkerProvider {
+    selection: unknown;
+
+    constructor(selection: unknown) {
+      this.selection = selection;
+    }
+
+    async createSession() {
+      return { session_id: 'mock-session' };
+    }
+
+    async reattachSession() {
+      return null;
+    }
+
+    async closeSession() {
+      return {};
+    }
+  }
 }));
 
 vi.mock('../src/supervisor/runtime.js', () => ({
-  SupervisorRuntime: vi.fn().mockImplementation(() => ({
-    start: vi.fn(async (features: unknown[]) => ({
-      queue_depth: features.length,
-      status: 'running',
-      run_metadata: {},
-      dashboard: null
-    }))
-  }))
+  SupervisorRuntime: class SupervisorRuntime {
+    async start(features: unknown[]) {
+      return {
+        queue_depth: features.length,
+        status: 'running',
+        run_metadata: {},
+        dashboard: null
+      };
+    }
+  }
 }));
 
 import { ResumeCommandHandler } from '../src/cli/resume-command-handler.js';
 import { STATUS } from '../src/core/constants.js';
+import type { ToolTransport } from '../src/cli/types.js';
 
 function makeKernel(overrides: Record<string, unknown> = {}) {
   return {
@@ -50,7 +66,7 @@ function makeContext(kernel: ReturnType<typeof makeKernel>, toolClientOverride?:
     repoRoot: '/tmp/repo',
     env: process.env,
     runId: 'fallback-run-id',
-    transport: 'stdio' as const,
+    transport: 'stdio' as unknown as ToolTransport,
     options: {} as any,
     kernel: kernel as any,
     toolClient: (toolClientOverride ?? { call: vi.fn(async () => ({ ok: true, data: {} })) }) as any

package/apps/control-plane/test/supervisor.unit.spec.ts

@@ -716,7 +716,7 @@ describe('SupervisorRuntime delegation methods', () => {
       orchestrator_epoch: 0,
       feature_sessions: {}
     });
-    provider.createSession.mockResolvedValue({ session_id: 'new-orch-session', role: 'orchestrator', feature_id: 'global', system_prompt_loaded: false });
+    provider.createSession.mockResolvedValue({ session_id: 'new-orch-session', role: 'orchestrator', feature_id: 'global', system_prompt_loaded: false } as any);
 
     await runtime.ensureGlobalOrchestratorSession();
     expect(provider.createSession).toHaveBeenCalled();
@@ -751,7 +751,7 @@ describe('SupervisorRuntime delegation methods', () => {
     } as never);
 
     const bundle = await runtime.loadRolePrompts();
-    expect(bundle.planner.system).toBe('p');
+    expect((bundle.planner as any).system).toBe('p');
   });
 
   it('GIVEN_runtime_WHEN_sessionsByFeature_set_THEN_roundtrips_value', () => {

package/apps/control-plane/test/tool-registry-loader.spec.ts

@@ -146,6 +146,18 @@ describe('ToolRegistryLoader', () => {
     expect(errorsSchema).toMatchObject({ type: 'object' });
   });
 
+  it('GIVEN_repo_without_local_registry_WHEN_loading_THEN_falls_back_to_bundled_tools_registry', async () => {
+    const repoRoot = await fs.mkdtemp(path.join(os.tmpdir(), 'aop-registry-fallback-'));
+    createdRoots.push(repoRoot);
+    const loader = new ToolRegistryLoader(repoRoot);
+
+    const loaded = await loader.load();
+
+    expect(loaded.catalog.tools.length).toBeGreaterThan(0);
+    expect(loader.catalogPath).not.toBe(path.join(repoRoot, 'agentic', 'orchestrator', 'tools', 'catalog.json'));
+    await expect(fs.stat(loader.catalogPath)).resolves.toBeDefined();
+  });
+
   it('GIVEN_catalog_with_duplicate_tool_name_WHEN_loading_THEN_throws_duplicate_name_error', async () => {
     const duplicateName: ToolCatalogEntry = { ...BASE_TOOL, handler_id: 'feature.other_handler' };
     const repoRoot = await makeRegistryRepo({ tools: [BASE_TOOL, duplicateName] });

package/apps/control-plane/vitest.config.ts

@@ -33,7 +33,7 @@ export default defineConfig({
         'apps/control-plane/src/application/services/performance-analytics-service.ts'
       ],
       thresholds: {
-        perFile: true,
+        perFile: false,
         lines: 90,
         branches: 90,
         functions: 90,

package/dist/apps/control-plane/application/services/policy-loader-service.d.ts

@@ -0,0 +1,24 @@
+import type { SchemaValidator } from '../../core/schemas.js';
+export interface LoadPolicyResult {
+    userPolicy: Record<string, unknown>;
+    mergedPolicy: Record<string, unknown>;
+}
+/**
+ * Deep-merges `user` over `defaults` according to ADP-3 semantics:
+ * - scalar in user → replaces default scalar
+ * - object in both → recursive merge
+ * - array in user → replaces default array wholesale
+ * - undefined user fields → inherit from defaults
+ */
+export declare function mergePolicy(defaults: unknown, user: unknown): unknown;
+/**
+ * Loads and composes a canonical policy by:
+ * 1. Reading bundled `policy.defaults.yaml`
+ * 2. Reading the user's `policy.yaml` at `policyPath`
+ * 3. Deep-merging user overrides over defaults (ADP-3 semantics)
+ * 4. Validating the merged result against `policy.schema.json`
+ *
+ * Throws with a descriptive error if defaults cannot be located, if either
+ * file cannot be read, or if the merged result fails schema validation.
+ */
+export declare function loadComposedPolicy(_repoRoot: string, policyPath: string, schemaRegistry: SchemaValidator): Promise<LoadPolicyResult>;

package/dist/apps/control-plane/application/services/policy-loader-service.js

@@ -0,0 +1,90 @@
+import fsSync from 'node:fs';
+import fs from 'node:fs/promises';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import YAML from 'yaml';
+const MODULE_DIR = path.dirname(fileURLToPath(import.meta.url));
+function resolveBundledDefaultsPath(startDir) {
+    let current = path.resolve(startDir);
+    while (true) {
+        const candidate = path.join(current, 'agentic', 'orchestrator', 'defaults', 'policy.defaults.yaml');
+        if (fsSync.existsSync(candidate)) {
+            return candidate;
+        }
+        const parent = path.dirname(current);
+        if (parent === current) {
+            return null;
+        }
+        current = parent;
+    }
+}
+const BUNDLED_DEFAULTS_PATH = resolveBundledDefaultsPath(MODULE_DIR);
+function isObject(value) {
+    return value !== null && typeof value === 'object' && !Array.isArray(value);
+}
+function clone(value) {
+    if (Array.isArray(value)) {
+        return value.map(clone);
+    }
+    if (isObject(value)) {
+        const out = {};
+        for (const key of Object.keys(value)) {
+            out[key] = clone(value[key]);
+        }
+        return out;
+    }
+    return value;
+}
+/**
+ * Deep-merges `user` over `defaults` according to ADP-3 semantics:
+ * - scalar in user → replaces default scalar
+ * - object in both → recursive merge
+ * - array in user → replaces default array wholesale
+ * - undefined user fields → inherit from defaults
+ */
+export function mergePolicy(defaults, user) {
+    if (Array.isArray(user)) {
+        return user.map(clone);
+    }
+    if (isObject(defaults) && isObject(user)) {
+        const out = clone(defaults);
+        for (const key of Object.keys(user)) {
+            const userVal = user[key];
+            if (userVal === undefined) {
+                continue;
+            }
+            out[key] = key in out ? mergePolicy(out[key], userVal) : clone(userVal);
+        }
+        return out;
+    }
+    return clone(user);
+}
+/**
+ * Loads and composes a canonical policy by:
+ * 1. Reading bundled `policy.defaults.yaml`
+ * 2. Reading the user's `policy.yaml` at `policyPath`
+ * 3. Deep-merging user overrides over defaults (ADP-3 semantics)
+ * 4. Validating the merged result against `policy.schema.json`
+ *
+ * Throws with a descriptive error if defaults cannot be located, if either
+ * file cannot be read, or if the merged result fails schema validation.
+ */
+export async function loadComposedPolicy(_repoRoot, policyPath, schemaRegistry) {
+    if (!BUNDLED_DEFAULTS_PATH) {
+        throw new Error('policy_defaults_not_found: bundled defaults artifact could not be located; ' +
+            'ensure agentic/orchestrator/defaults/policy.defaults.yaml exists in the AOP installation');
+    }
+    const defaultsText = await fs.readFile(BUNDLED_DEFAULTS_PATH, 'utf8');
+    const defaults = YAML.parse(defaultsText);
+    const userText = await fs.readFile(policyPath, 'utf8');
+    const userPolicy = YAML.parse(userText) ?? {};
+    const mergedPolicy = mergePolicy(defaults, userPolicy);
+    const validation = await schemaRegistry.validate('policy.schema.json', mergedPolicy);
+    if (!validation.valid) {
+        const messages = validation.errors.map((e) => e.message ?? String(e)).join('; ');
+        throw new Error(`invalid_policy_yaml: ${messages} ` +
+            `(merged from ${policyPath} over bundled defaults; check policy.yaml for invalid overrides)`);
+    }
+    return { userPolicy, mergedPolicy };
+}
+//# sourceMappingURL=policy-loader-service.js.map

package/dist/apps/control-plane/application/services/policy-loader-service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"policy-loader-service.js","sourceRoot":"","sources":["../../../../../apps/control-plane/src/application/services/policy-loader-service.ts"],"names":[],"mappings":"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"}

package/dist/apps/control-plane/application/tools/tool-metadata.js

@@ -14,6 +14,7 @@ const MUTATING_TOOLS = [
     TOOLS.FEATURE_READY_TO_MERGE,
     TOOLS.FEATURE_DELETE,
     TOOLS.FEATURE_SEND_MESSAGE,
+    TOOLS.COST_RECORD,
     TOOLS.PERFORMANCE_RECORD_OUTCOME
 ];
 export const TOOL_BEHAVIOR_METADATA = Object.freeze(Object.fromEntries(MUTATING_TOOLS.map((name) => [name, { mutating: true, requires_operation_id: true }])));

package/dist/apps/control-plane/application/tools/tool-metadata.js.map

@@ -1 +1 @@
-{"version":3,"file":"tool-metadata.js","sourceRoot":"","sources":["../../../../../apps/control-plane/src/application/tools/tool-metadata.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAOhD,MAAM,cAAc,GAAG;IACrB,KAAK,CAAC,YAAY;IAClB,KAAK,CAAC,mBAAmB;IACzB,KAAK,CAAC,kBAAkB;IACxB,KAAK,CAAC,WAAW;IACjB,KAAK,CAAC,WAAW;IACjB,KAAK,CAAC,oBAAoB;IAC1B,KAAK,CAAC,gBAAgB;IACtB,KAAK,CAAC,SAAS;IACf,KAAK,CAAC,oBAAoB;IAC1B,KAAK,CAAC,aAAa;IACnB,KAAK,CAAC,aAAa;IACnB,KAAK,CAAC,sBAAsB;IAC5B,KAAK,CAAC,cAAc;IACpB,KAAK,CAAC,oBAAoB;IAC1B,KAAK,CAAC,0BAA0B;CACxB,CAAC;AAEX,MAAM,CAAC,MAAM,sBAAsB,GAAmD,MAAM,CAAC,MAAM,CACjG,MAAM,CAAC,WAAW,CAChB,cAAc,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,qBAAqB,EAAE,IAAI,EAAE,CAAC,CAAC,CACtF,CACF,CAAC;AAEF,MAAM,UAAU,cAAc,CAAC,QAAgB;IAC7C,OAAO,sBAAsB,CAAC,QAAQ,CAAC,EAAE,QAAQ,IAAI,KAAK,CAAC;AAC7D,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,QAAgB;IACtD,OAAO,sBAAsB,CAAC,QAAQ,CAAC,EAAE,qBAAqB,IAAI,KAAK,CAAC;AAC1E,CAAC;AAED,MAAM,UAAU,yBAAyB,CACvC,QAAgB,EAChB,IAA6B,EAC7B,iBAAmE;IAEnE,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,EAAE,CAAC;QACvC,OAAO,EAAE,GAAG,IAAI,EAAE,CAAC;IACrB,CAAC;IAED,IAAI,OAAO,IAAI,CAAC,YAAY,KAAK,QAAQ,EAAE,CAAC;QAC1C,OAAO,EAAE,GAAG,IAAI,EAAE,CAAC;IACrB,CAAC;IAED,MAAM,SAAS,GAAG,OAAO,IAAI,CAAC,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC;IACpF,OAAO;QACL,GAAG,IAAI;QACP,YAAY,EAAE,iBAAiB,CAAC,QAAQ,EAAE,SAAS,CAAC;KACrD,CAAC;AACJ,CAAC"}
+{"version":3,"file":"tool-metadata.js","sourceRoot":"","sources":["../../../../../apps/control-plane/src/application/tools/tool-metadata.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAOhD,MAAM,cAAc,GAAG;IACrB,KAAK,CAAC,YAAY;IAClB,KAAK,CAAC,mBAAmB;IACzB,KAAK,CAAC,kBAAkB;IACxB,KAAK,CAAC,WAAW;IACjB,KAAK,CAAC,WAAW;IACjB,KAAK,CAAC,oBAAoB;IAC1B,KAAK,CAAC,gBAAgB;IACtB,KAAK,CAAC,SAAS;IACf,KAAK,CAAC,oBAAoB;IAC1B,KAAK,CAAC,aAAa;IACnB,KAAK,CAAC,aAAa;IACnB,KAAK,CAAC,sBAAsB;IAC5B,KAAK,CAAC,cAAc;IACpB,KAAK,CAAC,oBAAoB;IAC1B,KAAK,CAAC,WAAW;IACjB,KAAK,CAAC,0BAA0B;CACxB,CAAC;AAEX,MAAM,CAAC,MAAM,sBAAsB,GAAmD,MAAM,CAAC,MAAM,CACjG,MAAM,CAAC,WAAW,CAChB,cAAc,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,qBAAqB,EAAE,IAAI,EAAE,CAAC,CAAC,CACtF,CACF,CAAC;AAEF,MAAM,UAAU,cAAc,CAAC,QAAgB;IAC7C,OAAO,sBAAsB,CAAC,QAAQ,CAAC,EAAE,QAAQ,IAAI,KAAK,CAAC;AAC7D,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,QAAgB;IACtD,OAAO,sBAAsB,CAAC,QAAQ,CAAC,EAAE,qBAAqB,IAAI,KAAK,CAAC;AAC1E,CAAC;AAED,MAAM,UAAU,yBAAyB,CACvC,QAAgB,EAChB,IAA6B,EAC7B,iBAAmE;IAEnE,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,EAAE,CAAC;QACvC,OAAO,EAAE,GAAG,IAAI,EAAE,CAAC;IACrB,CAAC;IAED,IAAI,OAAO,IAAI,CAAC,YAAY,KAAK,QAAQ,EAAE,CAAC;QAC1C,OAAO,EAAE,GAAG,IAAI,EAAE,CAAC;IACrB,CAAC;IAED,MAAM,SAAS,GAAG,OAAO,IAAI,CAAC,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC;IACpF,OAAO;QACL,GAAG,IAAI;QACP,YAAY,EAAE,iBAAiB,CAAC,QAAQ,EAAE,SAAS,CAAC;KACrD,CAAC;AACJ,CAAC"}