macro-agent 0.1.10 → 0.1.11

package/src/workspace/types.ts

@@ -353,12 +353,17 @@ export interface WorkspaceManager {
 
   /**
    * Merge a source stream into a target stream.
+   *
+   * `metadata` is forwarded into the `x-cascade/stream.merged` emit so
+   * consumers (e.g., the OpenHive hub) can bind the merge to a task ref.
+   * Landing strategies pass `{ task_ref: ctx.taskRef }` through here.
    */
   mergeStream(opts: {
     sourceStreamId: StreamId;
     targetStreamId: StreamId;
     agentId: import('./types-v3.js').Principal;
     worktree: string;
+    metadata?: import('git-cascade/events').EventMetadata;
   }): import('./types-v3.js').MergeResult;
 
   /**
@@ -422,6 +427,21 @@ export interface WorkspaceManager {
    */
   registerLandingStrategy(strategy: import('./types-v3.js').LandingStrategy): void;
 
+  /**
+   * Dispatch a landing. Resolves the strategy by `ctx.strategyName`
+   * (defaulting to `merge-to-parent`), accepts both internal and YAML-style
+   * names, and invokes the strategy's `land(ctx)`. Strategies call back
+   * into this manager via `ctx.workspaceManager`, which is filled in here.
+   *
+   * Returns the strategy's `MergeResult`. Conflicts are reflected in the
+   * result (`success: false` + `conflicts: [...]`); thrown errors indicate
+   * unrecoverable failures (unknown strategy, strategy rejected context,
+   * transport-level issues).
+   */
+  land(
+    ctx: import('./types-v3.js').LandingContext,
+  ): Promise<import('./types-v3.js').MergeResult>;
+
   /**
    * Run macro-level reconciliation:
    * - Delegates to git-cascade's `reconcile()` for stream↔git sync.

package/src/workspace/workspace-manager.ts

@@ -1107,9 +1107,18 @@ export class DefaultWorkspaceManager implements WorkspaceManager {
     targetStreamId: StreamId;
     agentId: import('./types-v3.js').Principal;
     worktree: string;
+    /**
+     * Free-form metadata forwarded into the `x-cascade/stream.merged` emit.
+     * The canonical binding is `{ task_ref: { resource_id, node_id } }` —
+     * landing strategies thread `LandingContext.taskRef` through here so the
+     * hub's cascade_merges projection records which task drove the merge.
+     */
+    metadata?: import('git-cascade/events').EventMetadata;
   }): import('./types-v3.js').MergeResult {
-    // git-cascade's MergeStreamOptions uses `sourceStream`/`targetStream`.
-    // We adapt to v3's `sourceStreamId`/`targetStreamId` at the boundary.
+    // git-cascade's MergeStreamOptions uses `sourceStream`/`targetStream` and
+    // doesn't accept an opts.metadata field — the tagging is our concern, not
+    // the tracker's. Carry `opts.metadata` through on the emitted event
+    // instead, which is what the hub's cascade_merges projection reads.
     const result = this.adapter.mergeStream({
       sourceStream: opts.sourceStreamId,
       targetStream: opts.targetStreamId,
@@ -1121,6 +1130,7 @@ export class DefaultWorkspaceManager implements WorkspaceManager {
         sourceStreamId: opts.sourceStreamId,
         targetStreamId: opts.targetStreamId,
         mergeCommit: result.newHead,
+        ...(opts.metadata ? { metadata: opts.metadata } : {}),
       });
     } else {
       this.emit('stream:conflicted', {
@@ -1295,6 +1305,31 @@ export class DefaultWorkspaceManager implements WorkspaceManager {
     this.landingStrategies.set(strategy.name, strategy);
   }
 
+  async land(
+    ctx: import('./types-v3.js').LandingContext,
+  ): Promise<import('./types-v3.js').MergeResult> {
+    const internalName = resolveLandingStrategyName(ctx.strategyName);
+    if (internalName === 'none') {
+      return { success: true, alreadyMerged: true } as import('./types-v3.js').MergeResult;
+    }
+    const strategy = this.landingStrategies.get(internalName);
+    if (!strategy) {
+      throw new Error(
+        `No landing strategy registered for "${internalName}" (from ctx.strategyName="${ctx.strategyName ?? 'merge-to-parent'}"). Registered: ${Array.from(this.landingStrategies.keys()).join(', ') || '<none>'}.`,
+      );
+    }
+    const resolved: import('./types-v3.js').LandingContext = {
+      ...ctx,
+      workspaceManager: this,
+    };
+    if (strategy.canLand && !strategy.canLand(resolved)) {
+      throw new Error(
+        `Landing strategy "${internalName}" rejected context for agent ${ctx.agentId}, stream ${ctx.streamId}`,
+      );
+    }
+    return strategy.land(resolved);
+  }
+
   reconcileV3(): import('./types-v3.js').MacroReconcileResult {
     const result: import('./types-v3.js').MacroReconcileResult = {
       streamsChecked: 0,
@@ -1516,3 +1551,27 @@ export function createWorkspaceManagerWithAdapter(
 ): DefaultWorkspaceManager {
   return new DefaultWorkspaceManager(adapter, config);
 }
+
+// ═════════════════════════════════════════════════════════════════════════════
+// Landing strategy name resolution
+// ═════════════════════════════════════════════════════════════════════════════
+//
+// YAML uses snake_case (`merge_to_parent_stream`, `queue_to_branch`, …) to
+// match the team-config naming convention. Strategy classes expose
+// kebab-case internal names (`merge-to-parent`, …). `WorkspaceManager.land()`
+// accepts either and normalizes before dispatch so AgentManagerV2 can pass
+// `roleConfig.landing` directly without another translation layer.
+
+const YAML_TO_INTERNAL_LANDING: Record<string, string> = {
+  merge_to_parent_stream: 'merge-to-parent',
+  queue_to_branch: 'queue-to-branch',
+  direct_push: 'direct-push',
+  optimistic_push: 'optimistic-push',
+  cherry_pick_stack: 'cherry-pick-stack',
+  none: 'none',
+};
+
+export function resolveLandingStrategyName(input?: string): string {
+  if (!input) return 'merge-to-parent';
+  return YAML_TO_INTERNAL_LANDING[input] ?? input;
+}

package/dist/workspace/dataplane-adapter.d.ts

@@ -1,260 +0,0 @@
-/**
- * Dataplane Adapter
- *
- * Wraps MultiAgentRepoTracker to integrate with macro-agent's event system
- * and provide a simplified interface for workspace management.
- *
- * @module workspace/dataplane-adapter
- * @implements [[s-7ktd]] Dataplane Integration section
- */
-import Database from 'better-sqlite3';
-import { MultiAgentRepoTracker, type Stream, type StreamStatus, type CreateStreamOptions, type AgentWorktree, type CreateWorktreeOptions, type WorkerTask, type CreateTaskOptions, type StartTaskOptions, type CompleteTaskOptions, type StartTaskResult, type CompleteTaskResult, type ListTasksOptions, type CleanupWorkerBranchesOptions, type CleanupResult, type Checkpoint } from 'git-cascade';
-import type { DataplaneConfig } from './config.js';
-/**
- * Event types emitted by DataplaneAdapter
- */
-export type DataplaneEventType = 'stream:created' | 'stream:updated' | 'stream:abandoned' | 'worktree:created' | 'worktree:deallocated' | 'task:created' | 'task:started' | 'task:completed' | 'task:abandoned';
-/**
- * Event payload for dataplane events
- */
-export interface DataplaneEvent {
-    type: DataplaneEventType;
-    timestamp: number;
-    data: Record<string, unknown>;
-}
-/**
- * Callback for dataplane events
- */
-export type DataplaneEventCallback = (event: DataplaneEvent) => void;
-/**
- * DataplaneAdapter wraps MultiAgentRepoTracker for macro-agent integration.
- *
- * Key responsibilities:
- * - Initialize dataplane with shared or dedicated database
- * - Emit events on dataplane operations
- * - Provide simplified API for workspace management
- */
-export declare class DataplaneAdapter {
-    private readonly tracker;
-    private readonly config;
-    private readonly eventListeners;
-    private readonly ownsDb;
-    /**
-     * Create a new DataplaneAdapter.
-     *
-     * @param config - Dataplane configuration
-     */
-    constructor(config: DataplaneConfig);
-    /**
-     * Get whether dataplane is enabled.
-     */
-    get enabled(): boolean;
-    /**
-     * Get the repository path.
-     */
-    get repoPath(): string;
-    /**
-     * Get the underlying database connection.
-     * Use with caution - prefer adapter methods for operations.
-     */
-    get db(): Database.Database;
-    /**
-     * Get the underlying tracker.
-     * Use with caution - prefer adapter methods for operations.
-     */
-    get rawTracker(): MultiAgentRepoTracker;
-    /**
-     * Subscribe to dataplane events.
-     *
-     * @param callback - Function called when events occur
-     * @returns Unsubscribe function
-     */
-    onEvent(callback: DataplaneEventCallback): () => void;
-    /**
-     * Emit an event to all listeners.
-     */
-    private emit;
-    /**
-     * Create a new stream (integration branch).
-     *
-     * @param options - Stream creation options
-     * @returns Stream ID
-     */
-    createStream(options: CreateStreamOptions): string;
-    /**
-     * Get a stream by ID.
-     */
-    getStream(streamId: string): Stream | null;
-    /**
-     * List streams with optional filters.
-     */
-    listStreams(options?: {
-        agentId?: string;
-        status?: StreamStatus;
-    }): Stream[];
-    /**
-     * Update a stream.
-     */
-    updateStream(streamId: string, updates: Partial<Pick<Stream, 'name' | 'status' | 'metadata'>>): void;
-    /**
-     * Abandon a stream.
-     */
-    abandonStream(streamId: string, options?: {
-        reason?: string;
-        cascade?: boolean;
-    }): void;
-    /**
-     * Get the git branch name for a stream.
-     */
-    getStreamBranchName(streamId: string): string;
-    /**
-     * Get the HEAD commit of a stream.
-     */
-    getStreamHead(streamId: string): string;
-    /**
-     * Create a worktree for an agent.
-     *
-     * @param options - Worktree creation options
-     * @returns Created worktree info
-     */
-    createWorktree(options: CreateWorktreeOptions): AgentWorktree;
-    /**
-     * Get a worktree by agent ID.
-     */
-    getWorktree(agentId: string): AgentWorktree | null;
-    /**
-     * List all worktrees.
-     */
-    listWorktrees(): AgentWorktree[];
-    /**
-     * Update the stream associated with a worktree.
-     */
-    updateWorktreeStream(agentId: string, streamId: string | null): void;
-    /**
-     * Deallocate a worktree.
-     */
-    deallocateWorktree(agentId: string): void;
-    /**
-     * Create a worker task under a stream.
-     *
-     * @param options - Task creation options
-     * @returns Task ID
-     */
-    createTask(options: CreateTaskOptions): string;
-    /**
-     * Get a task by ID.
-     */
-    getTask(taskId: string): WorkerTask | null;
-    /**
-     * List tasks for a stream.
-     */
-    listTasks(streamId: string, options?: ListTasksOptions): WorkerTask[];
-    /**
-     * Start a task - assigns agent and creates worker branch.
-     *
-     * @param options - Start task options
-     * @returns Branch name and start commit
-     */
-    startTask(options: StartTaskOptions): StartTaskResult;
-    /**
-     * Complete a task - merges worker branch to stream.
-     *
-     * @param options - Complete task options
-     * @returns Merge result
-     */
-    completeTask(options: CompleteTaskOptions): CompleteTaskResult;
-    /**
-     * Abandon a task.
-     *
-     * @param taskId - Task ID
-     * @param options - Options
-     */
-    abandonTask(taskId: string, options?: {
-        deleteBranch?: boolean;
-    }): void;
-    /**
-     * Release a task back to 'open' status.
-     */
-    releaseTask(taskId: string): void;
-    /**
-     * Detect conflicts for a task before completing.
-     *
-     * @param taskId - Task ID
-     * @param worktree - Worktree path
-     * @returns Array of conflicting file paths, empty if no conflicts
-     */
-    detectTaskConflicts(taskId: string, worktree: string): string[];
-    /**
-     * Recover stale tasks that have been in_progress too long.
-     *
-     * @param thresholdMs - Tasks older than this are considered stale
-     * @returns Result with released task IDs
-     */
-    recoverStaleTasks(thresholdMs?: number): {
-        released: string[];
-    };
-    /**
-     * Create checkpoints for commits made during a task.
-     *
-     * Creates a checkpoint for each commit between the task's startCommit and
-     * the current HEAD of the task's stream. This captures the work done during
-     * the task for future review and merge workflows.
-     *
-     * @param taskId - Task ID to create checkpoints for
-     * @param agentId - Agent ID (used as createdBy)
-     * @returns Array of created checkpoints
-     */
-    createCheckpointsForTask(taskId: string, agentId: string): Checkpoint[];
-    /**
-     * Commit changes in a worktree with Change tracking.
-     *
-     * @param options - Commit options
-     * @returns Commit hash and change ID
-     */
-    commitChanges(options: {
-        streamId: string;
-        agentId: string;
-        worktree: string;
-        message: string;
-    }): {
-        commit: string;
-        changeId: string;
-    };
-    /**
-     * Clean up old worker branches.
-     *
-     * Deletes branches for:
-     * - Completed tasks older than threshold (default 24h)
-     * - Abandoned tasks
-     * - Orphaned branches (no task record)
-     *
-     * @param options - Cleanup options
-     * @returns Deleted branches and any errors
-     */
-    cleanupWorkerBranches(options?: CleanupWorkerBranchesOptions): CleanupResult;
-    /**
-     * Delete a specific worker branch.
-     *
-     * @param branchName - Branch name to delete
-     * @returns true if deleted, false if branch didn't exist
-     */
-    deleteWorkerBranch(branchName: string): boolean;
-    /**
-     * Check system health.
-     */
-    healthCheck(): ReturnType<MultiAgentRepoTracker['healthCheck']>;
-    /**
-     * Close the adapter and release resources.
-     *
-     * Only closes the database if we created it (not if using shared DB).
-     */
-    close(): void;
-}
-/**
- * Create a DataplaneAdapter instance.
- *
- * @param config - Configuration options
- * @returns DataplaneAdapter instance
- */
-export declare function createDataplaneAdapter(config: DataplaneConfig): DataplaneAdapter;
-//# sourceMappingURL=dataplane-adapter.d.ts.map

package/dist/workspace/dataplane-adapter.d.ts.map

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