macro-agent 0.0.11 → 0.0.12

package/src/workspace/strategies/registry.ts

@@ -0,0 +1,89 @@
+/**
+ * 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";
+import { QueueIntegrationStrategy } from "./queue.js";
+import { TrunkIntegrationStrategy } from "./trunk.js";
+import { OptimisticIntegrationStrategy } from "./optimistic.js";
+
+// =============================================================================
+// Registry
+// =============================================================================
+
+export class IntegrationStrategyRegistry {
+  private factories = new Map<string, IntegrationStrategyFactory>();
+
+  /**
+   * Register a strategy factory under a name.
+   */
+  register(name: string, factory: IntegrationStrategyFactory): void {
+    this.factories.set(name, factory);
+  }
+
+  /**
+   * Create a strategy instance by name.
+   *
+   * @throws Error if the strategy name is not registered
+   */
+  get(name: string, config?: Record<string, unknown>): IntegrationStrategy {
+    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: string): boolean {
+    return this.factories.has(name);
+  }
+
+  /**
+   * List registered strategy names.
+   */
+  list(): string[] {
+    return Array.from(this.factories.keys());
+  }
+}
+
+// =============================================================================
+// Default Registry
+// =============================================================================
+
+/**
+ * Create a registry with all built-in strategies registered.
+ */
+export function createDefaultStrategyRegistry(): IntegrationStrategyRegistry {
+  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();

package/src/workspace/strategies/trunk.ts

@@ -0,0 +1,123 @@
+/**
+ * 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";
+import type {
+  IntegrationStrategy,
+  LandRequest,
+  LandResult,
+  TrunkStrategyConfig,
+} from "./types.js";
+
+export class TrunkIntegrationStrategy implements IntegrationStrategy {
+  readonly name = "trunk";
+  private maxRetries: number;
+  private conflictAction: "abandon" | "queued_for_resolution";
+
+  constructor(config?: Record<string, unknown>) {
+    const typedConfig = config as TrunkStrategyConfig | undefined;
+    this.maxRetries = typedConfig?.maxRetries ?? 3;
+    this.conflictAction = typedConfig?.conflictAction ?? "abandon";
+  }
+
+  async land(request: LandRequest): Promise<LandResult> {
+    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",
+    };
+  }
+
+  private git(cwd: string, args: string): string {
+    return execSync(`git ${args}`, {
+      cwd,
+      encoding: "utf-8",
+      timeout: 30000,
+    });
+  }
+
+  private getConflictFiles(cwd: string): string[] {
+    try {
+      const output = this.git(cwd, "diff --name-only --diff-filter=U");
+      return output.split("\n").filter(Boolean);
+    } catch {
+      return [];
+    }
+  }
+}

package/src/workspace/strategies/types.ts

@@ -0,0 +1,145 @@
+/**
+ * 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
+ */
+
+// =============================================================================
+// Land Request / Result
+// =============================================================================
+
+/**
+ * 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;
+}
+
+// =============================================================================
+// Strategy Interface
+// =============================================================================
+
+/**
+ * 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>;
+}
+
+// =============================================================================
+// Strategy Configuration Types
+// =============================================================================
+
+/**
+ * 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
+// =============================================================================
+
+/**
+ * Factory function signature for creating strategies
+ */
+export type IntegrationStrategyFactory = (
+  config?: Record<string, unknown>
+) => IntegrationStrategy;

package/src/workspace/types.ts

@@ -8,7 +8,7 @@
  * @implements [[s-7ktd]] Workspace types section
  */
 
-import type { Stream, WorkerTask, StartTaskResult } from 'dataplane';
+import type { Stream, WorkerTask, StartTaskResult } from 'git-cascade';
 import type { MergeQueueInterface } from './merge-queue/types.js';
 
 /**

package/src/workspace/workspace-manager.ts

@@ -8,7 +8,7 @@
  * @implements [[s-7ktd]] WorkspaceManager API section
  */
 
-import type { Stream, WorkerTask, StartTaskResult, AgentWorktree, CleanupWorkerBranchesOptions, CleanupResult } from 'dataplane';
+import type { Stream, WorkerTask, StartTaskResult, AgentWorktree, CleanupWorkerBranchesOptions, CleanupResult } from 'git-cascade';
 import { DataplaneAdapter } from './dataplane-adapter.js';
 import type { DataplaneConfig, WorktreePoolConfig } from './config.js';
 import { DEFAULT_POOL_CONFIG } from './config.js';

package/.claude/settings.local.json

@@ -1,59 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "mcp__plugin_sudocode_sudocode__show_spec",
-      "mcp__plugin_sudocode_sudocode__list_specs",
-      "mcp__plugin_sudocode_sudocode__upsert_issue",
-      "mcp__plugin_sudocode_sudocode__link",
-      "Bash(npm test:*)",
-      "Bash(npx vitest:*)",
-      "Bash(npm run test:run:*)",
-      "Bash(npm install:*)",
-      "mcp__plugin_sudocode_sudocode__add_feedback",
-      "mcp__plugin_sudocode_sudocode__show_issue",
-      "mcp__plugin_sudocode_sudocode__ready",
-      "mcp__plugin_sudocode_sudocode__list_issues",
-      "Bash(wc:*)",
-      "Bash(npm run build:*)",
-      "Skill(sudocode:sudocode)",
-      "Bash(find:*)",
-      "Bash(jq:*)",
-      "Bash(for spec in s-60tc s-7ktd s-32xs s-bcqm s-8472 s-9rld)",
-      "Bash(do)",
-      "Bash(echo:*)",
-      "Bash(done)",
-      "Bash(grep:*)",
-      "mcp__plugin_sudocode_sudocode__upsert_spec",
-      "mcp__macro-agent__check_messages",
-      "mcp__macro-agent__get_hierarchy",
-      "Bash(git branch:*)",
-      "Bash(git worktree:*)",
-      "Bash(npm run test:e2e:*)",
-      "Bash(node --experimental-strip-types:*)",
-      "Bash(npx tsx:*)",
-      "Bash(for:*)",
-      "Bash(do echo \"Testing: $f\" npx vitest run --config vitest.e2e.config.ts \"$f\")",
-      "Bash(__NEW_LINE_6544485f4eb6ac41__ echo \"Testing full copy...\")",
-      "Bash(ls:*)",
-      "Bash(git status:*)",
-      "Bash(RUN_E2E_TESTS=true npx vitest:*)",
-      "Bash(RUN_E2E_TESTS=true npm run test:e2e:*)",
-      "Bash(npx tsc:*)",
-      "Bash(npm run test:*)",
-      "Bash(node:*)",
-      "Bash(RUN_FULL_AGENT_TESTS=true npx vitest:*)",
-      "Bash(RUN_FULL_AGENT_TESTS=true npm run test:e2e:*)",
-      "Bash(MACRO_AGENT_ID=test_agent MACRO_INSTANCE_ID=test_instance MACRO_BASE_DIR=/tmp/test-mcp timeout 3 node:*)",
-      "Bash(MACRO_AGENT_ID=test_agent MACRO_INSTANCE_ID=test_instance timeout 5 npx multiagent-mcp:*)",
-      "Bash(npm view:*)",
-      "Bash(npm ls:*)",
-      "Bash(npx @sudocode-ai/claude-code-acp@latest --version)",
-      "WebSearch",
-      "Bash(npm link:*)",
-      "Bash(npm unlink:*)",
-      "mcp__macro-agent__spawn_agent",
-      "Bash(git stash:*)",
-      "Bash(do echo \"Testing $f\")"
-    ]
-  }
-}

package/dist/map/utils/address-translation.d.ts

@@ -1,99 +0,0 @@
-/**
- * Address Translation Utilities
- *
- * Provides bidirectional translation between MAP addresses and
- * legacy MessageRouter channel format. Used during migration to
- * support both addressing schemes.
- *
- * @see specs/s-5qir_map_integration_for_macro_agent.md
- */
-import type { Address } from "../types.js";
-import type { ChannelType } from "../../router/types.js";
-import type { AgentId } from "../../store/types/index.js";
-/**
- * Legacy channel format from MessageRouter.
- * Used for translation during migration.
- */
-export interface LegacyChannel {
-    type: ChannelType;
-    /** Target ID (agent_id, task_id, or topic name) */
-    target: string;
-    /** Role name for role channels */
-    role?: string;
-    /** Coordinator ID for scoped role channels */
-    coordinatorId?: AgentId;
-    /** Broadcast scope */
-    scope?: string;
-}
-/**
- * Translate a MAP Address to legacy MessageRouter channel format.
- *
- * Used during migration to route messages through the existing
- * MessageRouter while accepting MAP-style addresses.
- *
- * @param address - MAP address to translate
- * @returns Legacy channel format
- * @throws Error if address type is not supported in legacy format
- */
-export declare function addressToChannel(address: Address): LegacyChannel;
-/**
- * Translate a legacy MessageRouter channel to MAP address format.
- *
- * Used to migrate existing code to the new addressing scheme.
- *
- * @param channel - Legacy channel to translate
- * @returns MAP address
- * @throws Error if channel type is unknown
- */
-export declare function channelToAddress(channel: LegacyChannel): Address;
-/**
- * Check if a MAP address can be translated to legacy channel format.
- *
- * Returns false for address types that were added in MAP and have
- * no equivalent in the legacy MessageRouter.
- *
- * @param address - Address to check
- * @returns true if address can be translated to legacy format
- */
-export declare function isLegacyCompatible(address: Address): boolean;
-/**
- * Get a list of address features that are not legacy compatible.
- *
- * @param address - Address to check
- * @returns Array of incompatible feature names, empty if fully compatible
- */
-export declare function getLegacyIncompatibilities(address: Address): string[];
-/**
- * Error thrown when a MAP address cannot be translated to legacy format.
- */
-export declare class AddressTranslationError extends Error {
-    readonly address: Address;
-    constructor(message: string, address: Address);
-}
-/**
- * Error thrown when a legacy channel cannot be translated to MAP format.
- */
-export declare class ChannelTranslationError extends Error {
-    readonly channel: LegacyChannel;
-    constructor(message: string, channel: LegacyChannel);
-}
-/**
- * Attempt to translate an address, returning undefined if not compatible.
- *
- * @param address - Address to translate
- * @returns Legacy channel or undefined if not compatible
- */
-export declare function tryAddressToChannel(address: Address): LegacyChannel | undefined;
-/**
- * Create a mapping table entry for documentation/debugging.
- */
-export interface AddressMapping {
-    mapAddress: string;
-    legacyChannel: string;
-    notes?: string;
-}
-/**
- * Get the address mapping table for documentation.
- */
-export declare function getAddressMappingTable(): AddressMapping[];
-//# sourceMappingURL=address-translation.d.ts.map

package/dist/map/utils/address-translation.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"address-translation.d.ts","sourceRoot":"","sources":["../../../src/map/utils/address-translation.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EACV,OAAO,EASR,MAAM,aAAa,CAAC;AAcrB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,OAAO,EAAU,MAAM,4BAA4B,CAAC;AAMlE;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,WAAW,CAAC;IAClB,mDAAmD;IACnD,MAAM,EAAE,MAAM,CAAC;IACf,kCAAkC;IAClC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,8CAA8C;IAC9C,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,sBAAsB;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAMD;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,aAAa,CA0FhE;AAMD;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAsChE;AAMD;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAW5D;AAED;;;;;GAKG;AACH,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,EAAE,CAiBrE;AAMD;;GAEG;AACH,qBAAa,uBAAwB,SAAQ,KAAK;IAChD,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;gBAEd,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO;CAK9C;AAED;;GAEG;AACH,qBAAa,uBAAwB,SAAQ,KAAK;IAChD,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC;gBAEpB,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa;CAKpD;AAMD;;;;;GAKG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,OAAO,GACf,aAAa,GAAG,SAAS,CAU3B;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,wBAAgB,sBAAsB,IAAI,cAAc,EAAE,CAuDzD"}