agentic-orchestrator 0.1.28 → 0.2.0

package/dist/apps/control-plane/application/services/collision-queue-service.js

@@ -1,5 +1,6 @@
 import { nowIso, readJson } from '../../core/fs.js';
-import { detectPlanCollisions } from '../../core/collisions.js';
+import { detectPlanCollisions, hasContractCollisions, splitPlanCollisionsByFeature, } from '../../core/collisions.js';
+import { asPlanRecord, recoverStalePlanSubmitConflict } from '../../core/plan-submit-recovery.js';
 import { sortResourcesDeterministically } from '../../core/path-rules.js';
 function asArray(value) {
     return Array.isArray(value) ? value : [];
@@ -12,6 +13,14 @@ function readHeldLocks(frontMatter) {
     const locks = readObjectField(frontMatter, 'locks');
     return asArray(locks.held).filter((item) => typeof item === 'string');
 }
+function queueEntryKey(entry) {
+    return [
+        entry.feature_id,
+        String(entry.plan_version),
+        entry.detected_at,
+        entry.collision_fingerprint,
+    ].join('::');
+}
 /**
  * Manages blocked feature queue and collision re-drive.
  *
@@ -50,9 +59,11 @@ export class CollisionQueueService {
     }
     async collectAcceptedPlans(excludeFeatureId = null) {
         const specs = await this.port.featureDiscoverSpecs();
+        const index = await this.port.readIndex();
+        const merged = new Set(asArray(index.merged));
         const plans = [];
         for (const item of specs.data.specs) {
-            if (item.feature_id === excludeFeatureId) {
+            if (item.feature_id === excludeFeatureId || merged.has(item.feature_id)) {
                 continue;
             }
             const plan = await readJson(this.port.planPath(item.feature_id), null);
@@ -90,8 +101,34 @@ export class CollisionQueueService {
         return {
             hasCollisions: collisionResult.hasCollisions,
             fingerprint: collisionResult.fingerprint,
+            approved: collisionResult.hasCollisions
+                ? await this.hasApprovedOverrides(featureId, collisionResult.collisions)
+                : false,
         };
     }
+    async hasApprovedOverrides(featureId, collisions) {
+        if (hasContractCollisions(collisions)) {
+            return false;
+        }
+        const index = await this.port.readIndex();
+        const overrides = asArray(index.collision_overrides);
+        const pairs = splitPlanCollisionsByFeature(featureId, collisions);
+        return pairs.every((pair) => {
+            const featureIds = [featureId, pair.with_feature_id].sort((left, right) => left.localeCompare(right));
+            return overrides.some((entry) => {
+                const overrideFeatureIds = asArray(entry.feature_ids).filter((item) => typeof item === 'string');
+                const status = typeof entry.status === 'string' ? entry.status : 'unknown';
+                const fingerprint = typeof entry.approved_collision_fingerprint === 'string'
+                    ? entry.approved_collision_fingerprint
+                    : null;
+                return (overrideFeatureIds.length === 2 &&
+                    overrideFeatureIds[0] === featureIds[0] &&
+                    overrideFeatureIds[1] === featureIds[1] &&
+                    (status === 'active' || status === 'applied') &&
+                    fingerprint === pair.fingerprint);
+            });
+        });
+    }
     async processSingleQueueEntry(entry) {
         const persistedPlan = await readJson(this.port.planPath(entry.feature_id), null);
         const snapshotPlan = entry.plan_snapshot && typeof entry.plan_snapshot === 'object' ? entry.plan_snapshot : null;
@@ -108,7 +145,7 @@ export class CollisionQueueService {
             return { retried: false, reason: 'locks_not_held' };
         }
         const collision = await this.checkPlanCollision(entry.feature_id, plan);
-        if (collision.hasCollisions) {
+        if (collision.hasCollisions && !collision.approved) {
             return { retried: false, reason: 'collision_still_present' };
         }
         try {
@@ -116,7 +153,24 @@ export class CollisionQueueService {
             await this.port.planSubmit(entry.feature_id, plan, expectedVersion);
             return { retried: true };
         }
-        catch (_error) {
+        catch (error) {
+            const recovered = await recoverStalePlanSubmitConflict({
+                error,
+                featureId: entry.feature_id,
+                submittedPlan: asPlanRecord(plan),
+                readAcceptedPlan: async (featureId) => (await this.port.planGet(featureId)).data.plan,
+                submitPlanUpdate: async (featureId, expectedPlanVersion, nextPlan) => await this.port.planUpdate(featureId, expectedPlanVersion, nextPlan),
+                buildEquivalentSuccess: (featureId, currentPlanVersion) => ({
+                    data: {
+                        feature_id: featureId,
+                        accepted: true,
+                        plan_version: currentPlanVersion,
+                    },
+                }),
+            });
+            if (recovered) {
+                return { retried: true };
+            }
             return { retried: false, reason: 'plan_submit_failed' };
         }
     }
@@ -142,43 +196,48 @@ export class CollisionQueueService {
                 },
             };
         }
-        return await this.port.withIndexLock(async () => {
+        const queue = await this.port.withIndexLock(async () => {
             const index = await this.port.readIndex();
-            const queue = asArray(index.blocked_queue);
-            if (queue.length === 0) {
-                return {
-                    data: {
-                        processed: 0,
-                        retried: 0,
-                        still_blocked: 0,
-                    },
-                };
+            return asArray(index.blocked_queue);
+        });
+        if (queue.length === 0) {
+            return {
+                data: {
+                    processed: 0,
+                    retried: 0,
+                    still_blocked: 0,
+                },
+            };
+        }
+        const sortedQueue = [...queue].sort((a, b) => a.detected_at.localeCompare(b.detected_at) || a.feature_id.localeCompare(b.feature_id));
+        const stillBlocked = [];
+        let retriedCount = 0;
+        for (const entry of sortedQueue) {
+            const result = await this.processSingleQueueEntry(entry);
+            if (result.retried) {
+                retriedCount += 1;
             }
-            const sortedQueue = [...queue].sort((a, b) => a.detected_at.localeCompare(b.detected_at) || a.feature_id.localeCompare(b.feature_id));
-            const stillBlocked = [];
-            let retriedCount = 0;
-            for (const entry of sortedQueue) {
-                const result = await this.processSingleQueueEntry(entry);
-                if (result.retried) {
-                    retriedCount += 1;
-                }
-                else {
-                    stillBlocked.push(entry);
-                }
+            else {
+                stillBlocked.push(entry);
             }
+        }
+        await this.port.withIndexLock(async () => {
             const currentIndex = await this.port.readIndex();
-            currentIndex.blocked_queue = stillBlocked;
+            const currentQueue = asArray(currentIndex.blocked_queue);
+            const processedKeys = new Set(sortedQueue.map((entry) => queueEntryKey(entry)));
+            const untouchedEntries = currentQueue.filter((entry) => !processedKeys.has(queueEntryKey(entry)));
+            currentIndex.blocked_queue = [...untouchedEntries, ...stillBlocked].sort((a, b) => a.detected_at.localeCompare(b.detected_at) || a.feature_id.localeCompare(b.feature_id));
             currentIndex.version += 1;
             currentIndex.updated_at = nowIso();
             await this.port.writeIndex(currentIndex);
-            return {
-                data: {
-                    processed: sortedQueue.length,
-                    retried: retriedCount,
-                    still_blocked: stillBlocked.length,
-                },
-            };
         });
+        return {
+            data: {
+                processed: sortedQueue.length,
+                retried: retriedCount,
+                still_blocked: stillBlocked.length,
+            },
+        };
     }
     /**
      * Removes entry from blocked queue.

package/dist/apps/control-plane/application/services/collision-queue-service.js.map

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

package/dist/apps/control-plane/application/services/cost-tracking-service.d.ts

@@ -1,3 +1,4 @@
+import type { NormalizedUsageRecord, RoleUsageBreakdown, UsageAvailability } from '../usage-types.js';
 /**
  * @fileoverview Cost tracking and budget enforcement service.
  */
@@ -6,6 +7,8 @@ export interface FeatureCost {
     tokens_used: number;
     estimated_cost_usd: number;
     last_updated: string;
+    by_role?: RoleUsageBreakdown[];
+    aggregate_status?: UsageAvailability;
 }
 export interface BudgetPolicy {
     per_feature_limit_usd?: number;
@@ -89,6 +92,14 @@ export declare class CostTrackingService {
      * ```
      */
     recordCost(featureId: string, tokensDelta: number, costUsdDelta: number): Promise<FeatureCost>;
+    /**
+     * Records per-role usage with availability status.
+     *
+     * Appends to the by_role breakdown and updates the aggregate totals.
+     * Only tokens with reported or estimated status contribute to totals;
+     * unavailable usage is never recorded as zero.
+     */
+    recordRoleUsage(featureId: string, usageRecord: NormalizedUsageRecord): Promise<FeatureCost>;
     /**
      * Checks if feature is within budget limits.
      *

package/dist/apps/control-plane/application/services/cost-tracking-service.js

@@ -1,4 +1,5 @@
 import { atomicWriteJson, nowIso, readJson } from '../../core/fs.js';
+import { aggregateAvailability } from '../usage-types.js';
 /**
  * Manages cost tracking and budget enforcement.
  *
@@ -86,6 +87,80 @@ export class CostTrackingService {
         await atomicWriteJson(this.port.featureCostPath(featureId), updated);
         return updated;
     }
+    /**
+     * Records per-role usage with availability status.
+     *
+     * Appends to the by_role breakdown and updates the aggregate totals.
+     * Only tokens with reported or estimated status contribute to totals;
+     * unavailable usage is never recorded as zero.
+     */
+    async recordRoleUsage(featureId, usageRecord) {
+        const current = await this.getFeatureCost(featureId);
+        const existingByRole = current.by_role ?? [];
+        const existingRoleEntry = existingByRole.find((entry) => entry.role === usageRecord.role &&
+            entry.provider === usageRecord.provider &&
+            entry.model === usageRecord.model);
+        if (existingRoleEntry) {
+            if (usageRecord.status !== 'unavailable') {
+                existingRoleEntry.input_tokens =
+                    (existingRoleEntry.input_tokens ?? 0) + (usageRecord.input_tokens ?? 0);
+                existingRoleEntry.output_tokens =
+                    (existingRoleEntry.output_tokens ?? 0) + (usageRecord.output_tokens ?? 0);
+                existingRoleEntry.total_tokens =
+                    (existingRoleEntry.total_tokens ?? 0) + (usageRecord.total_tokens ?? 0);
+                existingRoleEntry.estimated_cost_usd =
+                    (existingRoleEntry.estimated_cost_usd ?? 0) + (usageRecord.estimated_cost_usd ?? 0);
+            }
+            existingRoleEntry.invocation_count += 1;
+            if (usageRecord.status === 'unavailable' && existingRoleEntry.status === 'reported') {
+                // Degrade to unavailable if any invocation is unavailable
+                existingRoleEntry.status = 'unavailable';
+            }
+        }
+        else {
+            existingByRole.push({
+                role: usageRecord.role,
+                provider: usageRecord.provider,
+                model: usageRecord.model,
+                status: usageRecord.status,
+                input_tokens: usageRecord.input_tokens,
+                output_tokens: usageRecord.output_tokens,
+                total_tokens: usageRecord.total_tokens,
+                estimated_cost_usd: usageRecord.estimated_cost_usd,
+                invocation_count: 1,
+            });
+        }
+        // Recalculate aggregates from by_role
+        let totalTokens = 0;
+        let totalCostUsd = 0;
+        for (const entry of existingByRole) {
+            if (entry.total_tokens !== null) {
+                totalTokens += entry.total_tokens;
+            }
+            if (entry.estimated_cost_usd !== null) {
+                totalCostUsd += entry.estimated_cost_usd;
+            }
+        }
+        const updated = {
+            feature_id: featureId,
+            tokens_used: totalTokens,
+            estimated_cost_usd: totalCostUsd,
+            last_updated: nowIso(),
+            by_role: existingByRole,
+            aggregate_status: aggregateAvailability(existingByRole.map((entry) => ({
+                status: entry.status,
+                input_tokens: entry.input_tokens,
+                output_tokens: entry.output_tokens,
+                total_tokens: entry.total_tokens,
+                provider: entry.provider,
+                model: entry.model,
+                role: entry.role,
+                estimated_cost_usd: entry.estimated_cost_usd,
+            }))),
+        };
+        await atomicWriteJson(this.port.featureCostPath(featureId), updated);
+        return updated;
+    }
     /**
      * Checks if feature is within budget limits.
      *

package/dist/apps/control-plane/application/services/cost-tracking-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"cost-tracking-service.js","sourceRoot":"","sources":["../../../../../apps/control-plane/src/application/services/cost-tracking-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AA+BrE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,MAAM,OAAO,mBAAmB;IACb,IAAI,CAA0B;IAE/C,YAAY,IAA6B;QACvC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED;;;;;;;;;;;OAWG;IACH,KAAK,CAAC,cAAc,CAAC,SAAiB;QACpC,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAc,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,CAAC;QACzF,OAAO,CACL,QAAQ,IAAI;YACV,UAAU,EAAE,SAAS;YACrB,WAAW,EAAE,CAAC;YACd,kBAAkB,EAAE,GAAG;YACvB,YAAY,EAAE,MAAM,EAAE;SACvB,CACF,CAAC;IACJ,CAAC;IAED;;;;;;;;;;;;;;;;OAgBG;IACH,KAAK,CAAC,UAAU,CACd,SAAiB,EACjB,WAAmB,EACnB,YAAoB;QAEpB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QACrD,MAAM,OAAO,GAAgB;YAC3B,UAAU,EAAE,SAAS;YACrB,WAAW,EAAE,OAAO,CAAC,WAAW,GAAG,WAAW;YAC9C,kBAAkB,EAAE,OAAO,CAAC,kBAAkB,GAAG,YAAY;YAC7D,YAAY,EAAE,MAAM,EAAE;SACvB,CAAC;QACF,MAAM,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,CAAC;QACrE,OAAO,OAAO,CAAC;IACjB,CAAC;IAED;;;;;;;;;;;;;OAaG;IACH,KAAK,CAAC,WAAW,CAAC,SAAiB;QACjC,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAC7C,MAAM,YAAY,GAAG,CACnB,MAAM,CAAC,MAAM,IAAI,OAAO,MAAM,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CACxD,CAAC;QAElB,MAAM,QAAQ,GACZ,OAAO,YAAY,CAAC,qBAAqB,KAAK,QAAQ;YACpD,CAAC,CAAC,YAAY,CAAC,qBAAqB;YACpC,CAAC,CAAC,QAAQ,CAAC;QACf,MAAM,cAAc,GAClB,OAAO,YAAY,CAAC,eAAe,KAAK,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC;QAExF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QAClD,MAAM,UAAU,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,kBAAkB,IAAI,QAAQ,CAAC;QACpF,MAAM,qBAAqB,GACzB,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,kBAAkB,IAAI,QAAQ,GAAG,cAAc,CAAC;QAEpF,OAAO;YACL,WAAW,EAAE,UAAU;YACvB,uBAAuB,EAAE,qBAAqB;YAC9C,gBAAgB,EAAE,IAAI,CAAC,kBAAkB;YACzC,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;YACpD,eAAe,EAAE,cAAc;SAChC,CAAC;IACJ,CAAC;CACF"}
+{"version":3,"file":"cost-tracking-service.js","sourceRoot":"","sources":["../../../../../apps/control-plane/src/application/services/cost-tracking-service.ts"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,75 @@
+import type { ExecutionControlSnapshot, ExecutionRequestFeature, ExecutionRequestItem, ExecutionRequestOutcome, ExecutionRequestStatus, PendingExecutionRequestProgress } from '../../core/execution-control.js';
+import type { RuntimeSessionsSnapshot } from '../../core/runtime-sessions.js';
+export interface SubmitExecutionRequestInput {
+    run_id: string;
+    owner_instance_id: string;
+    request_type: 'add_features';
+    features: ExecutionRequestFeature[];
+    operation_id: string;
+    requested_by?: string;
+}
+export interface ExecutionControlServicePort {
+    readonly instanceId: string;
+    executionControlPath(instanceId: string): string;
+    withIndexLock<T>(operation: () => Promise<T>): Promise<T>;
+    readRunLease(): Promise<RuntimeSessionsSnapshot>;
+    normalizeRuntimeSessions(value: unknown, at?: string): RuntimeSessionsSnapshot;
+    isRunLeaseFresh(runtimeSessions: RuntimeSessionsSnapshot): boolean;
+    validateSchema(schemaName: string, value: unknown): Promise<{
+        valid: boolean;
+        errors?: unknown;
+    }>;
+}
+export interface UpdateExecutionRequestProgressInput {
+    detected_at?: string | null;
+    last_evaluated_at?: string | null;
+    queued?: string[];
+    skipped?: Array<{
+        feature_id: string;
+        reason: string;
+    }>;
+    deferred?: Array<{
+        feature_id: string;
+        reason: string;
+    }>;
+}
+export declare class ExecutionControlService {
+    private readonly port;
+    constructor(port: ExecutionControlServicePort);
+    private emptySnapshot;
+    private requestIdFor;
+    private emptyProgress;
+    private executionControlPath;
+    private readSnapshotFromDisk;
+    private assertSnapshotValid;
+    private writeSnapshot;
+    private snapshotForRun;
+    private ensureFreshLease;
+    submitExecutionRequest(input: SubmitExecutionRequestInput): Promise<{
+        data: {
+            run_id: string;
+            request_id: string;
+            request_status: 'pending';
+            requested_features: ExecutionRequestFeature[];
+        };
+    }>;
+    listExecutionRequests(): Promise<{
+        data: ExecutionControlSnapshot;
+    }>;
+    drainPendingExecutionRequests(runId: string, ownerInstanceId: string): Promise<{
+        data: {
+            items: ExecutionRequestItem[];
+        };
+    }>;
+    markExecutionRequestProcessed(runId: string, ownerInstanceId: string, requestId: string, status: Exclude<ExecutionRequestStatus, 'pending'>, outcome: Exclude<ExecutionRequestOutcome, null>): Promise<{
+        data: {
+            updated: boolean;
+        };
+    }>;
+    updateExecutionRequestProgress(runId: string, ownerInstanceId: string, requestId: string, patch: UpdateExecutionRequestProgressInput): Promise<{
+        data: {
+            updated: boolean;
+            progress: PendingExecutionRequestProgress | null;
+        };
+    }>;
+}