macro-agent 0.0.10 → 0.0.12

package/dist/workspace/strategies/index.d.ts

@@ -0,0 +1,6 @@
+export type { IntegrationStrategy, IntegrationStrategyFactory, LandRequest, LandResult, LandResultStatus, QueueStrategyConfig, TrunkStrategyConfig, OptimisticStrategyConfig, } from "./types.js";
+export { QueueIntegrationStrategy } from "./queue.js";
+export { TrunkIntegrationStrategy } from "./trunk.js";
+export { OptimisticIntegrationStrategy } from "./optimistic.js";
+export { IntegrationStrategyRegistry, createDefaultStrategyRegistry, defaultStrategyRegistry, } from "./registry.js";
+//# sourceMappingURL=index.d.ts.map

package/dist/workspace/strategies/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/workspace/strategies/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,mBAAmB,EACnB,0BAA0B,EAC1B,WAAW,EACX,UAAU,EACV,gBAAgB,EAChB,mBAAmB,EACnB,mBAAmB,EACnB,wBAAwB,GACzB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AACtD,OAAO,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AACtD,OAAO,EAAE,6BAA6B,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,EACL,2BAA2B,EAC3B,6BAA6B,EAC7B,uBAAuB,GACxB,MAAM,eAAe,CAAC"}

package/dist/workspace/strategies/index.js

@@ -0,0 +1,5 @@
+export { QueueIntegrationStrategy } from "./queue.js";
+export { TrunkIntegrationStrategy } from "./trunk.js";
+export { OptimisticIntegrationStrategy } from "./optimistic.js";
+export { IntegrationStrategyRegistry, createDefaultStrategyRegistry, defaultStrategyRegistry, } from "./registry.js";
+//# sourceMappingURL=index.js.map

package/dist/workspace/strategies/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/workspace/strategies/index.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AACtD,OAAO,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AACtD,OAAO,EAAE,6BAA6B,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,EACL,2BAA2B,EAC3B,6BAA6B,EAC7B,uBAAuB,GACxB,MAAM,eAAe,CAAC"}

package/dist/workspace/strategies/optimistic.d.ts

@@ -0,0 +1,26 @@
+/**
+ * Optimistic Integration Strategy
+ *
+ * Push immediately and emit a validation event. Does NOT run build/test —
+ * validation is the judge agent's responsibility (RD5).
+ *
+ * Uses the same rebase-and-retry logic as trunk for handling push conflicts.
+ *
+ * @module workspace/strategies/optimistic
+ */
+import type { IntegrationStrategy, LandRequest, LandResult } from "./types.js";
+import type { EventStore } from "../../store/event-store.js";
+export declare class OptimisticIntegrationStrategy implements IntegrationStrategy {
+    readonly name = "optimistic";
+    private maxRetries;
+    private eventStore?;
+    constructor(config?: Record<string, unknown>);
+    /**
+     * Set the EventStore for emitting validation events.
+     * Called after construction since EventStore may not be available at strategy creation time.
+     */
+    setEventStore(store: EventStore): void;
+    land(request: LandRequest): Promise<LandResult>;
+    private git;
+}
+//# sourceMappingURL=optimistic.d.ts.map

package/dist/workspace/strategies/optimistic.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"optimistic.d.ts","sourceRoot":"","sources":["../../../src/workspace/strategies/optimistic.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAGH,OAAO,KAAK,EACV,mBAAmB,EACnB,WAAW,EACX,UAAU,EAEX,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAE7D,qBAAa,6BAA8B,YAAW,mBAAmB;IACvE,QAAQ,CAAC,IAAI,gBAAgB;IAC7B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,UAAU,CAAC,CAAa;gBAEpB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAK5C;;;OAGG;IACH,aAAa,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAIhC,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC;IA0FrD,OAAO,CAAC,GAAG;CAOZ"}

package/dist/workspace/strategies/optimistic.js

@@ -0,0 +1,121 @@
+/**
+ * Optimistic Integration Strategy
+ *
+ * Push immediately and emit a validation event. Does NOT run build/test —
+ * validation is the judge agent's responsibility (RD5).
+ *
+ * Uses the same rebase-and-retry logic as trunk for handling push conflicts.
+ *
+ * @module workspace/strategies/optimistic
+ */
+import { execSync } from "child_process";
+export class OptimisticIntegrationStrategy {
+    name = "optimistic";
+    maxRetries;
+    eventStore;
+    constructor(config) {
+        const typedConfig = config;
+        this.maxRetries = typedConfig?.maxRetries ?? 3;
+    }
+    /**
+     * Set the EventStore for emitting validation events.
+     * Called after construction since EventStore may not be available at strategy creation time.
+     */
+    setEventStore(store) {
+        this.eventStore = store;
+    }
+    async land(request) {
+        const { workspacePath, targetBranch } = request;
+        let retryCount = 0;
+        while (retryCount <= this.maxRetries) {
+            try {
+                // Fetch latest
+                this.git(workspacePath, `fetch origin ${targetBranch}`);
+                // Rebase onto latest
+                try {
+                    this.git(workspacePath, `rebase origin/${targetBranch}`);
+                }
+                catch {
+                    try {
+                        this.git(workspacePath, "rebase --abort");
+                    }
+                    catch {
+                        /* already clean */
+                    }
+                    if (retryCount >= this.maxRetries) {
+                        return {
+                            status: "conflict",
+                            retryCount,
+                            error: `Rebase conflict after ${retryCount + 1} attempts`,
+                        };
+                    }
+                    retryCount++;
+                    continue;
+                }
+                // Push optimistically
+                try {
+                    this.git(workspacePath, `push origin HEAD:${targetBranch}`);
+                }
+                catch {
+                    if (retryCount >= this.maxRetries) {
+                        return {
+                            status: "conflict",
+                            retryCount,
+                            error: `Push rejected after ${retryCount + 1} attempts`,
+                        };
+                    }
+                    retryCount++;
+                    continue;
+                }
+                const commitHash = this.git(workspacePath, "rev-parse HEAD").trim();
+                // Emit validation:requested event (RD5 — judge handles validation)
+                if (this.eventStore) {
+                    try {
+                        this.eventStore.emit({
+                            type: "status",
+                            source: { agent_id: request.agentId },
+                            payload: {
+                                status_type: "checkpoint",
+                                summary: `Validation requested for ${commitHash.slice(0, 8)}`,
+                                validation_requested: true,
+                                commitHash,
+                                sourceBranch: request.sourceBranch,
+                                targetBranch,
+                                taskId: request.taskId,
+                                agentId: request.agentId,
+                            },
+                        });
+                    }
+                    catch {
+                        // Never fail land() due to event emission failure
+                    }
+                }
+                return {
+                    status: "landed",
+                    commitHash,
+                    retryCount,
+                };
+            }
+            catch (error) {
+                return {
+                    status: "failed",
+                    retryCount,
+                    error: `Unexpected error: ${error instanceof Error ? error.message : String(error)}`,
+                };
+            }
+        }
+        return {
+            status: "failed",
+            retryCount,
+            error: "Exceeded maximum retries",
+        };
+    }
+    git(cwd, args) {
+        return execSync(`git ${args}`, {
+            cwd,
+            encoding: "utf-8",
+            timeout: 30000,
+        });
+    }
+}
+//# sourceMappingURL=optimistic.js.map

package/dist/workspace/strategies/optimistic.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"optimistic.js","sourceRoot":"","sources":["../../../src/workspace/strategies/optimistic.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AASzC,MAAM,OAAO,6BAA6B;IAC/B,IAAI,GAAG,YAAY,CAAC;IACrB,UAAU,CAAS;IACnB,UAAU,CAAc;IAEhC,YAAY,MAAgC;QAC1C,MAAM,WAAW,GAAG,MAA8C,CAAC;QACnE,IAAI,CAAC,UAAU,GAAG,WAAW,EAAE,UAAU,IAAI,CAAC,CAAC;IACjD,CAAC;IAED;;;OAGG;IACH,aAAa,CAAC,KAAiB;QAC7B,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAAoB;QAC7B,MAAM,EAAE,aAAa,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;QAChD,IAAI,UAAU,GAAG,CAAC,CAAC;QAEnB,OAAO,UAAU,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACrC,IAAI,CAAC;gBACH,eAAe;gBACf,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,gBAAgB,YAAY,EAAE,CAAC,CAAC;gBAExD,qBAAqB;gBACrB,IAAI,CAAC;oBACH,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,iBAAiB,YAAY,EAAE,CAAC,CAAC;gBAC3D,CAAC;gBAAC,MAAM,CAAC;oBACP,IAAI,CAAC;wBACH,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAC;oBAC5C,CAAC;oBAAC,MAAM,CAAC;wBACP,mBAAmB;oBACrB,CAAC;oBAED,IAAI,UAAU,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;wBAClC,OAAO;4BACL,MAAM,EAAE,UAAU;4BAClB,UAAU;4BACV,KAAK,EAAE,yBAAyB,UAAU,GAAG,CAAC,WAAW;yBAC1D,CAAC;oBACJ,CAAC;oBACD,UAAU,EAAE,CAAC;oBACb,SAAS;gBACX,CAAC;gBAED,sBAAsB;gBACtB,IAAI,CAAC;oBACH,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,oBAAoB,YAAY,EAAE,CAAC,CAAC;gBAC9D,CAAC;gBAAC,MAAM,CAAC;oBACP,IAAI,UAAU,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;wBAClC,OAAO;4BACL,MAAM,EAAE,UAAU;4BAClB,UAAU;4BACV,KAAK,EAAE,uBAAuB,UAAU,GAAG,CAAC,WAAW;yBACxD,CAAC;oBACJ,CAAC;oBACD,UAAU,EAAE,CAAC;oBACb,SAAS;gBACX,CAAC;gBAED,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAC,IAAI,EAAE,CAAC;gBAEpE,mEAAmE;gBACnE,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;oBACpB,IAAI,CAAC;wBACH,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;4BACnB,IAAI,EAAE,QAAQ;4BACd,MAAM,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,OAAO,EAAE;4BACrC,OAAO,EAAE;gCACP,WAAW,EAAE,YAAY;gCACzB,OAAO,EAAE,4BAA4B,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE;gCAC7D,oBAAoB,EAAE,IAAI;gCAC1B,UAAU;gCACV,YAAY,EAAE,OAAO,CAAC,YAAY;gCAClC,YAAY;gCACZ,MAAM,EAAE,OAAO,CAAC,MAAM;gCACtB,OAAO,EAAE,OAAO,CAAC,OAAO;6BACzB;yBACF,CAAC,CAAC;oBACL,CAAC;oBAAC,MAAM,CAAC;wBACP,kDAAkD;oBACpD,CAAC;gBACH,CAAC;gBAED,OAAO;oBACL,MAAM,EAAE,QAAQ;oBAChB,UAAU;oBACV,UAAU;iBACX,CAAC;YACJ,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO;oBACL,MAAM,EAAE,QAAQ;oBAChB,UAAU;oBACV,KAAK,EAAE,qBAAqB,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;iBACrF,CAAC;YACJ,CAAC;QACH,CAAC;QAED,OAAO;YACL,MAAM,EAAE,QAAQ;YAChB,UAAU;YACV,KAAK,EAAE,0BAA0B;SAClC,CAAC;IACJ,CAAC;IAEO,GAAG,CAAC,GAAW,EAAE,IAAY;QACnC,OAAO,QAAQ,CAAC,OAAO,IAAI,EAAE,EAAE;YAC7B,GAAG;YACH,QAAQ,EAAE,OAAO;YACjB,OAAO,EAAE,KAAK;SACf,CAAC,CAAC;IACL,CAAC;CACF"}

package/dist/workspace/strategies/queue.d.ts

@@ -0,0 +1,26 @@
+/**
+ * Queue Integration Strategy
+ *
+ * Wraps the existing MergeQueueInterface — submits merge requests to
+ * the queue for sequential processing by an integrator agent.
+ *
+ * This produces identical behavior to the current worker done() handler's
+ * merge queue path.
+ *
+ * @module workspace/strategies/queue
+ */
+import type { IntegrationStrategy, LandRequest, LandResult } from "./types.js";
+import type { MergeQueueInterface } from "../merge-queue/types.js";
+export declare class QueueIntegrationStrategy implements IntegrationStrategy {
+    readonly name = "queue";
+    private mergeQueue?;
+    private defaultPriority;
+    constructor(config?: Record<string, unknown>);
+    /**
+     * Set the merge queue instance.
+     * Called after construction since merge queue may not be available at strategy creation time.
+     */
+    setMergeQueue(queue: MergeQueueInterface): void;
+    land(request: LandRequest): Promise<LandResult>;
+}
+//# sourceMappingURL=queue.d.ts.map

package/dist/workspace/strategies/queue.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../../../src/workspace/strategies/queue.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EACV,mBAAmB,EACnB,WAAW,EACX,UAAU,EAEX,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAEnE,qBAAa,wBAAyB,YAAW,mBAAmB;IAClE,QAAQ,CAAC,IAAI,WAAW;IACxB,OAAO,CAAC,UAAU,CAAC,CAAsB;IACzC,OAAO,CAAC,eAAe,CAAS;gBAEpB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAK5C;;;OAGG;IACH,aAAa,CAAC,KAAK,EAAE,mBAAmB,GAAG,IAAI;IAIzC,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC;CA0CtD"}

package/dist/workspace/strategies/queue.js

@@ -0,0 +1,67 @@
+/**
+ * Queue Integration Strategy
+ *
+ * Wraps the existing MergeQueueInterface — submits merge requests to
+ * the queue for sequential processing by an integrator agent.
+ *
+ * This produces identical behavior to the current worker done() handler's
+ * merge queue path.
+ *
+ * @module workspace/strategies/queue
+ */
+export class QueueIntegrationStrategy {
+    name = "queue";
+    mergeQueue;
+    defaultPriority;
+    constructor(config) {
+        const typedConfig = config;
+        this.defaultPriority = typedConfig?.defaultPriority ?? 100;
+    }
+    /**
+     * Set the merge queue instance.
+     * Called after construction since merge queue may not be available at strategy creation time.
+     */
+    setMergeQueue(queue) {
+        this.mergeQueue = queue;
+    }
+    async land(request) {
+        if (!this.mergeQueue) {
+            return {
+                status: "failed",
+                error: "Merge queue not configured",
+            };
+        }
+        if (!request.streamId) {
+            return {
+                status: "failed",
+                error: "streamId required for queue strategy",
+            };
+        }
+        if (!request.taskId) {
+            return {
+                status: "failed",
+                error: "taskId required for queue strategy",
+            };
+        }
+        try {
+            const mrId = this.mergeQueue.submit({
+                streamId: request.streamId,
+                taskId: request.taskId,
+                workerBranch: request.sourceBranch,
+                workerAgentId: request.agentId,
+                priority: this.defaultPriority,
+            });
+            return {
+                status: "landed",
+                mergeRequestId: mrId,
+            };
+        }
+        catch (error) {
+            return {
+                status: "failed",
+                error: `Failed to submit to merge queue: ${error instanceof Error ? error.message : String(error)}`,
+            };
+        }
+    }
+}
+//# sourceMappingURL=queue.js.map

package/dist/workspace/strategies/queue.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"queue.js","sourceRoot":"","sources":["../../../src/workspace/strategies/queue.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAUH,MAAM,OAAO,wBAAwB;IAC1B,IAAI,GAAG,OAAO,CAAC;IAChB,UAAU,CAAuB;IACjC,eAAe,CAAS;IAEhC,YAAY,MAAgC;QAC1C,MAAM,WAAW,GAAG,MAAyC,CAAC;QAC9D,IAAI,CAAC,eAAe,GAAG,WAAW,EAAE,eAAe,IAAI,GAAG,CAAC;IAC7D,CAAC;IAED;;;OAGG;IACH,aAAa,CAAC,KAA0B;QACtC,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAAoB;QAC7B,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACrB,OAAO;gBACL,MAAM,EAAE,QAAQ;gBAChB,KAAK,EAAE,4BAA4B;aACpC,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;YACtB,OAAO;gBACL,MAAM,EAAE,QAAQ;gBAChB,KAAK,EAAE,sCAAsC;aAC9C,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YACpB,OAAO;gBACL,MAAM,EAAE,QAAQ;gBAChB,KAAK,EAAE,oCAAoC;aAC5C,CAAC;QACJ,CAAC;QAED,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;gBAClC,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,YAAY,EAAE,OAAO,CAAC,YAAY;gBAClC,aAAa,EAAE,OAAO,CAAC,OAAO;gBAC9B,QAAQ,EAAE,IAAI,CAAC,eAAe;aAC/B,CAAC,CAAC;YAEH,OAAO;gBACL,MAAM,EAAE,QAAQ;gBAChB,cAAc,EAAE,IAAI;aACrB,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO;gBACL,MAAM,EAAE,QAAQ;gBAChB,KAAK,EAAE,oCAAoC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;aACpG,CAAC;QACJ,CAAC;IACH,CAAC;CACF"}

package/dist/workspace/strategies/registry.d.ts

@@ -0,0 +1,37 @@
+/**
+ * Integration Strategy Registry
+ *
+ * Factory registry for creating named integration strategies.
+ * Supports registration of custom strategies alongside built-in ones.
+ *
+ * @module workspace/strategies/registry
+ */
+import type { IntegrationStrategy, IntegrationStrategyFactory } from "./types.js";
+export declare class IntegrationStrategyRegistry {
+    private factories;
+    /**
+     * Register a strategy factory under a name.
+     */
+    register(name: string, factory: IntegrationStrategyFactory): void;
+    /**
+     * Create a strategy instance by name.
+     *
+     * @throws Error if the strategy name is not registered
+     */
+    get(name: string, config?: Record<string, unknown>): IntegrationStrategy;
+    /**
+     * Check if a strategy is registered.
+     */
+    has(name: string): boolean;
+    /**
+     * List registered strategy names.
+     */
+    list(): string[];
+}
+/**
+ * Create a registry with all built-in strategies registered.
+ */
+export declare function createDefaultStrategyRegistry(): IntegrationStrategyRegistry;
+/** Singleton default registry */
+export declare const defaultStrategyRegistry: IntegrationStrategyRegistry;
+//# sourceMappingURL=registry.d.ts.map

package/dist/workspace/strategies/registry.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../../src/workspace/strategies/registry.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EACV,mBAAmB,EACnB,0BAA0B,EAC3B,MAAM,YAAY,CAAC;AASpB,qBAAa,2BAA2B;IACtC,OAAO,CAAC,SAAS,CAAiD;IAElE;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,0BAA0B,GAAG,IAAI;IAIjE;;;;OAIG;IACH,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,mBAAmB;IAUxE;;OAEG;IACH,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAI1B;;OAEG;IACH,IAAI,IAAI,MAAM,EAAE;CAGjB;AAMD;;GAEG;AACH,wBAAgB,6BAA6B,IAAI,2BAA2B,CAiB3E;AAED,iCAAiC;AACjC,eAAO,MAAM,uBAAuB,6BAAkC,CAAC"}

package/dist/workspace/strategies/registry.js

@@ -0,0 +1,63 @@
+/**
+ * Integration Strategy Registry
+ *
+ * Factory registry for creating named integration strategies.
+ * Supports registration of custom strategies alongside built-in ones.
+ *
+ * @module workspace/strategies/registry
+ */
+import { QueueIntegrationStrategy } from "./queue.js";
+import { TrunkIntegrationStrategy } from "./trunk.js";
+import { OptimisticIntegrationStrategy } from "./optimistic.js";
+// =============================================================================
+// Registry
+// =============================================================================
+export class IntegrationStrategyRegistry {
+    factories = new Map();
+    /**
+     * Register a strategy factory under a name.
+     */
+    register(name, factory) {
+        this.factories.set(name, factory);
+    }
+    /**
+     * Create a strategy instance by name.
+     *
+     * @throws Error if the strategy name is not registered
+     */
+    get(name, config) {
+        const factory = this.factories.get(name);
+        if (!factory) {
+            throw new Error(`Unknown integration strategy: '${name}'. Available: ${this.list().join(", ")}`);
+        }
+        return factory(config);
+    }
+    /**
+     * Check if a strategy is registered.
+     */
+    has(name) {
+        return this.factories.has(name);
+    }
+    /**
+     * List registered strategy names.
+     */
+    list() {
+        return Array.from(this.factories.keys());
+    }
+}
+// =============================================================================
+// Default Registry
+// =============================================================================
+/**
+ * Create a registry with all built-in strategies registered.
+ */
+export function createDefaultStrategyRegistry() {
+    const registry = new IntegrationStrategyRegistry();
+    registry.register("queue", (config) => new QueueIntegrationStrategy(config));
+    registry.register("trunk", (config) => new TrunkIntegrationStrategy(config));
+    registry.register("optimistic", (config) => new OptimisticIntegrationStrategy(config));
+    return registry;
+}
+/** Singleton default registry */
+export const defaultStrategyRegistry = createDefaultStrategyRegistry();
+//# sourceMappingURL=registry.js.map

package/dist/workspace/strategies/registry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../src/workspace/strategies/registry.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAMH,OAAO,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AACtD,OAAO,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AACtD,OAAO,EAAE,6BAA6B,EAAE,MAAM,iBAAiB,CAAC;AAEhE,gFAAgF;AAChF,WAAW;AACX,gFAAgF;AAEhF,MAAM,OAAO,2BAA2B;IAC9B,SAAS,GAAG,IAAI,GAAG,EAAsC,CAAC;IAElE;;OAEG;IACH,QAAQ,CAAC,IAAY,EAAE,OAAmC;QACxD,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACpC,CAAC;IAED;;;;OAIG;IACH,GAAG,CAAC,IAAY,EAAE,MAAgC;QAChD,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CACb,kCAAkC,IAAI,iBAAiB,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAChF,CAAC;QACJ,CAAC;QACD,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC;IACzB,CAAC;IAED;;OAEG;IACH,GAAG,CAAC,IAAY;QACd,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAED;;OAEG;IACH,IAAI;QACF,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;IAC3C,CAAC;CACF;AAED,gFAAgF;AAChF,mBAAmB;AACnB,gFAAgF;AAEhF;;GAEG;AACH,MAAM,UAAU,6BAA6B;IAC3C,MAAM,QAAQ,GAAG,IAAI,2BAA2B,EAAE,CAAC;IAEnD,QAAQ,CAAC,QAAQ,CACf,OAAO,EACP,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,wBAAwB,CAAC,MAAM,CAAC,CACjD,CAAC;IACF,QAAQ,CAAC,QAAQ,CACf,OAAO,EACP,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,wBAAwB,CAAC,MAAM,CAAC,CACjD,CAAC;IACF,QAAQ,CAAC,QAAQ,CACf,YAAY,EACZ,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,6BAA6B,CAAC,MAAM,CAAC,CACtD,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,iCAAiC;AACjC,MAAM,CAAC,MAAM,uBAAuB,GAAG,6BAA6B,EAAE,CAAC"}

package/dist/workspace/strategies/trunk.d.ts

@@ -0,0 +1,20 @@
+/**
+ * Trunk Integration Strategy
+ *
+ * Direct push to integration branch with rebase-and-retry on conflict.
+ * Suited for trunk-based development workflows where changes are
+ * integrated immediately.
+ *
+ * @module workspace/strategies/trunk
+ */
+import type { IntegrationStrategy, LandRequest, LandResult } from "./types.js";
+export declare class TrunkIntegrationStrategy implements IntegrationStrategy {
+    readonly name = "trunk";
+    private maxRetries;
+    private conflictAction;
+    constructor(config?: Record<string, unknown>);
+    land(request: LandRequest): Promise<LandResult>;
+    private git;
+    private getConflictFiles;
+}
+//# sourceMappingURL=trunk.d.ts.map

package/dist/workspace/strategies/trunk.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"trunk.d.ts","sourceRoot":"","sources":["../../../src/workspace/strategies/trunk.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,KAAK,EACV,mBAAmB,EACnB,WAAW,EACX,UAAU,EAEX,MAAM,YAAY,CAAC;AAEpB,qBAAa,wBAAyB,YAAW,mBAAmB;IAClE,QAAQ,CAAC,IAAI,WAAW;IACxB,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,cAAc,CAAsC;gBAEhD,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAMtC,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC;IA6ErD,OAAO,CAAC,GAAG;IAQX,OAAO,CAAC,gBAAgB;CAQzB"}

package/dist/workspace/strategies/trunk.js

@@ -0,0 +1,108 @@
+/**
+ * Trunk Integration Strategy
+ *
+ * Direct push to integration branch with rebase-and-retry on conflict.
+ * Suited for trunk-based development workflows where changes are
+ * integrated immediately.
+ *
+ * @module workspace/strategies/trunk
+ */
+import { execSync } from "child_process";
+export class TrunkIntegrationStrategy {
+    name = "trunk";
+    maxRetries;
+    conflictAction;
+    constructor(config) {
+        const typedConfig = config;
+        this.maxRetries = typedConfig?.maxRetries ?? 3;
+        this.conflictAction = typedConfig?.conflictAction ?? "abandon";
+    }
+    async land(request) {
+        const { workspacePath, targetBranch } = request;
+        let retryCount = 0;
+        while (retryCount <= this.maxRetries) {
+            try {
+                // Fetch latest target branch
+                this.git(workspacePath, `fetch origin ${targetBranch}`);
+                // Rebase our changes onto latest target
+                try {
+                    this.git(workspacePath, `rebase origin/${targetBranch}`);
+                }
+                catch {
+                    // Rebase conflict — abort and retry or give up
+                    try {
+                        this.git(workspacePath, "rebase --abort");
+                    }
+                    catch {
+                        /* already clean */
+                    }
+                    if (retryCount >= this.maxRetries) {
+                        const conflictFiles = this.getConflictFiles(workspacePath);
+                        return {
+                            status: "conflict",
+                            conflictFiles,
+                            action: this.conflictAction === "abandon" ? "abandoned" : this.conflictAction,
+                            retryCount,
+                            error: `Rebase conflict after ${retryCount + 1} attempts`,
+                        };
+                    }
+                    retryCount++;
+                    continue;
+                }
+                // Push to target branch
+                try {
+                    this.git(workspacePath, `push origin HEAD:${targetBranch}`);
+                }
+                catch {
+                    // Push rejected (concurrent update) — retry
+                    if (retryCount >= this.maxRetries) {
+                        return {
+                            status: "conflict",
+                            action: this.conflictAction === "abandon" ? "abandoned" : this.conflictAction,
+                            retryCount,
+                            error: `Push rejected after ${retryCount + 1} attempts`,
+                        };
+                    }
+                    retryCount++;
+                    continue;
+                }
+                // Get the HEAD commit hash
+                const commitHash = this.git(workspacePath, "rev-parse HEAD").trim();
+                return {
+                    status: "landed",
+                    commitHash,
+                    retryCount,
+                };
+            }
+            catch (error) {
+                return {
+                    status: "failed",
+                    retryCount,
+                    error: `Unexpected error: ${error instanceof Error ? error.message : String(error)}`,
+                };
+            }
+        }
+        return {
+            status: "failed",
+            retryCount,
+            error: "Exceeded maximum retries",
+        };
+    }
+    git(cwd, args) {
+        return execSync(`git ${args}`, {
+            cwd,
+            encoding: "utf-8",
+            timeout: 30000,
+        });
+    }
+    getConflictFiles(cwd) {
+        try {
+            const output = this.git(cwd, "diff --name-only --diff-filter=U");
+            return output.split("\n").filter(Boolean);
+        }
+        catch {
+            return [];
+        }
+    }
+}
+//# sourceMappingURL=trunk.js.map

package/dist/workspace/strategies/trunk.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"trunk.js","sourceRoot":"","sources":["../../../src/workspace/strategies/trunk.ts"],"names":[],"mappings":"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"}

package/dist/workspace/strategies/types.d.ts

@@ -0,0 +1,104 @@
+/**
+ * Integration Strategy Types
+ *
+ * Defines the pluggable strategy interface for integrating worker changes
+ * into the integration branch. Strategies determine how completed work
+ * is landed (merge queue, direct push, optimistic push).
+ *
+ * @module workspace/strategies/types
+ */
+/**
+ * Result status from a land operation
+ */
+export type LandResultStatus = "landed" | "conflict" | "failed";
+/**
+ * Request to land changes from a worker branch
+ */
+export interface LandRequest {
+    /** Worker's branch with completed changes */
+    sourceBranch: string;
+    /** Target integration branch */
+    targetBranch: string;
+    /** Workspace path where git operations run */
+    workspacePath: string;
+    /** Agent ID of the worker */
+    agentId: string;
+    /** Task ID associated with the changes */
+    taskId?: string;
+    /** Stream ID for the integration stream */
+    streamId?: string;
+    /** Commit message for the merge/rebase */
+    commitMessage?: string;
+}
+/**
+ * Result of a land operation
+ */
+export interface LandResult {
+    /** Whether the landing was successful */
+    status: LandResultStatus;
+    /** Merge/rebase commit hash if landed */
+    commitHash?: string;
+    /** Merge request ID if submitted to a queue */
+    mergeRequestId?: string;
+    /** Files with conflicts if status is "conflict" */
+    conflictFiles?: string[];
+    /** Action taken on conflict exhaustion */
+    action?: "abandoned" | "queued_for_resolution";
+    /** Error message if status is "failed" */
+    error?: string;
+    /** Number of retry attempts made */
+    retryCount?: number;
+}
+/**
+ * Integration strategy interface.
+ *
+ * Strategies determine how completed worker changes are integrated
+ * into the target branch. Different strategies suit different workflows:
+ * - queue: Sequential merge via integrator (default, existing behavior)
+ * - trunk: Direct push with rebase-and-retry
+ * - optimistic: Push immediately, validate later (judge validates)
+ */
+export interface IntegrationStrategy {
+    /** Strategy name */
+    readonly name: string;
+    /**
+     * Land changes from source branch to target branch.
+     */
+    land(request: LandRequest): Promise<LandResult>;
+    /**
+     * Optional initialization hook (called on TeamRuntime.initialize()).
+     */
+    initialize?(): Promise<void>;
+    /**
+     * Optional cleanup hook (called on TeamRuntime.teardown()).
+     */
+    close?(): Promise<void>;
+}
+/**
+ * Configuration for the queue strategy
+ */
+export interface QueueStrategyConfig {
+    /** Priority for submitted merge requests (default: 100) */
+    defaultPriority?: number;
+}
+/**
+ * Configuration for the trunk strategy
+ */
+export interface TrunkStrategyConfig {
+    /** Maximum rebase-and-retry attempts on conflict (default: 3) */
+    maxRetries?: number;
+    /** Action on conflict exhaustion (default: "abandon") */
+    conflictAction?: "abandon" | "queued_for_resolution";
+}
+/**
+ * Configuration for the optimistic strategy
+ */
+export interface OptimisticStrategyConfig {
+    /** Maximum rebase-and-retry attempts on conflict (default: 3) */
+    maxRetries?: number;
+}
+/**
+ * Factory function signature for creating strategies
+ */
+export type IntegrationStrategyFactory = (config?: Record<string, unknown>) => IntegrationStrategy;
+//# sourceMappingURL=types.d.ts.map

package/dist/workspace/strategies/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/workspace/strategies/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAMH;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG,QAAQ,GAAG,UAAU,GAAG,QAAQ,CAAC;AAEhE;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,6CAA6C;IAC7C,YAAY,EAAE,MAAM,CAAC;IAErB,gCAAgC;IAChC,YAAY,EAAE,MAAM,CAAC;IAErB,8CAA8C;IAC9C,aAAa,EAAE,MAAM,CAAC;IAEtB,6BAA6B;IAC7B,OAAO,EAAE,MAAM,CAAC;IAEhB,0CAA0C;IAC1C,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,2CAA2C;IAC3C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,0CAA0C;IAC1C,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,yCAAyC;IACzC,MAAM,EAAE,gBAAgB,CAAC;IAEzB,yCAAyC;IACzC,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,+CAA+C;IAC/C,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB,mDAAmD;IACnD,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IAEzB,0CAA0C;IAC1C,MAAM,CAAC,EAAE,WAAW,GAAG,uBAAuB,CAAC;IAE/C,0CAA0C;IAC1C,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,oCAAoC;IACpC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAMD;;;;;;;;GAQG;AACH,MAAM,WAAW,mBAAmB;IAClC,oBAAoB;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IAEhD;;OAEG;IACH,UAAU,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7B;;OAEG;IACH,KAAK,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACzB;AAMD;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,2DAA2D;IAC3D,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,iEAAiE;IACjE,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,yDAAyD;IACzD,cAAc,CAAC,EAAE,SAAS,GAAG,uBAAuB,CAAC;CACtD;AAED;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC,iEAAiE;IACjE,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAMD;;GAEG;AACH,MAAM,MAAM,0BAA0B,GAAG,CACvC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAC7B,mBAAmB,CAAC"}

package/dist/workspace/strategies/types.js

@@ -0,0 +1,11 @@
+/**
+ * Integration Strategy Types
+ *
+ * Defines the pluggable strategy interface for integrating worker changes
+ * into the integration branch. Strategies determine how completed work
+ * is landed (merge queue, direct push, optimistic push).
+ *
+ * @module workspace/strategies/types
+ */
+export {};
+//# sourceMappingURL=types.js.map