macro-agent 0.1.7 → 0.1.10

package/dist/workspace/types.d.ts

@@ -24,7 +24,7 @@ export type TaskId = string;
 /**
  * Agent role types that require workspaces
  */
-export type WorkspaceRole = 'worker' | 'integrator' | 'coordinator';
+export type WorkspaceRole = 'worker' | 'integrator' | 'coordinator' | 'v3';
 /**
  * Workspace represents an isolated git worktree assigned to an agent.
  *
@@ -129,7 +129,7 @@ export interface CleanupStatus {
 /**
  * WorkspaceManager interface for managing agent workspaces.
  *
- * Bridges macro-agent roles to dataplane streams and worktrees.
+ * Bridges macro-agent roles to git-cascade streams and worktrees.
  *
  * @see [[s-7ktd]] WorkspaceManager API section
  */
@@ -137,6 +137,10 @@ export interface WorkspaceManager {
     /**
      * Create an integration stream for a coordinator.
      *
+     * Role-shaped convenience method. For stream-first semantics (fork from
+     * another stream, pseudo-principal ownership, richer metadata), prefer
+     * `createStreamV3({ name, ownerId, forkFrom, parent?, metadata? })`.
+     *
      * @param coordinatorId - ID of the coordinator agent
      * @param config - Stream configuration
      * @returns Stream ID
@@ -152,26 +156,22 @@ export interface WorkspaceManager {
     /**
      * Create a workspace for a worker agent.
      *
-     * @param workerId - ID of the worker agent
-     * @param taskId - ID of the task to work on
-     * @param streamId - ID of the integration stream
-     * @returns Worker workspace
+     * Role-shaped convenience. For role-neutral allocation, prefer
+     * `allocateWorktree({ agentId, streamId })`.
      */
     createWorkerWorkspace(workerId: AgentId, taskId: TaskId, streamId: StreamId): WorkerWorkspace;
     /**
      * Create a workspace for an integrator agent.
      *
-     * @param integratorId - ID of the integrator agent
-     * @param streamId - ID of the integration stream
-     * @returns Integrator workspace
+     * Role-shaped convenience. For role-neutral allocation, prefer
+     * `allocateWorktree({ agentId, streamId })`.
      */
     createIntegratorWorkspace(integratorId: AgentId, streamId: StreamId): IntegratorWorkspace;
     /**
      * Create a workspace for a coordinator agent.
      *
-     * @param coordinatorId - ID of the coordinator agent
-     * @param streamId - ID of the integration stream
-     * @returns Coordinator workspace
+     * Role-shaped convenience. For role-neutral allocation, prefer
+     * `allocateWorktree({ agentId, streamId })`.
      */
     createCoordinatorWorkspace(coordinatorId: AgentId, streamId: StreamId): CoordinatorWorkspace;
     /**
@@ -183,6 +183,9 @@ export interface WorkspaceManager {
     /**
      * Create a task under a stream.
      *
+     * @deprecated V3 does not use git-cascade's `workerTasks` layer for
+     *   task tracking; use opentasks via `TasksAdapter` instead. This method
+     *   exists only for the legacy capability-based dispatch path.
      * @param streamId - ID of the integration stream
      * @param options - Task creation options
      * @returns Task ID
@@ -191,6 +194,10 @@ export interface WorkspaceManager {
     /**
      * Claim a task for a worker.
      *
+     * @deprecated See `createTask` — V3 uses opentasks. This method cuts the
+     *   git-cascade worker branch via `startTask`; V3 equivalent is
+     *   `allocateWorktree({ agentId, streamId })` + `commitChanges` on the
+     *   stream branch directly.
      * @param taskId - ID of the task to claim
      * @param workerId - ID of the worker agent
      * @param worktree - Path to the worker's worktree
@@ -200,6 +207,8 @@ export interface WorkspaceManager {
     /**
      * Get the next available task for a stream.
      *
+     * @deprecated Use opentasks for task queueing; git-cascade's worker task
+     *   layer is redundant in V3.
      * @param streamId - ID of the integration stream
      * @returns Next task or null if none available
      */
@@ -229,21 +238,140 @@ export interface WorkspaceManager {
     /**
      * Get the merge queue for coordinating worker merges.
      *
-     * The merge queue is shared across all streams and uses the same
-     * database as the dataplane adapter.
+     * @deprecated Use git-cascade's built-in queue via the V3 surface —
+     *   `workspaceManager.addToMergeQueue` (when exposed) or the
+     *   `queue-to-branch` `LandingStrategy`. This method returns the legacy
+     *   macro-agent MergeQueue that duplicates git-cascade's schema; kept for
+     *   legacy callers until teams migrate to `macro_agent.workspace` YAML.
      *
-     * @returns MergeQueue instance
+     * @returns Legacy MergeQueue instance (duplicate of git-cascade's queue)
      */
     getMergeQueue(): MergeQueueInterface;
+    /**
+     * Create a new stream. Stream-first equivalent of `createIntegrationStream`;
+     * does not require a coordinator owner — any `Principal` (including pseudo
+     * principals like `team:<name>`) can own.
+     *
+     * @see docs/workspace-interfaces.md §5
+     */
+    createStreamV3(spec: import('./types-v3.js').StreamSpec): StreamId;
+    /**
+     * Fork a child stream from a parent. Enables stacking workflows (solo stack,
+     * long-lived feature + subtasks).
+     */
+    forkStream(opts: {
+        parentStreamId: StreamId;
+        name: string;
+        ownerId: import('./types-v3.js').Principal;
+        metadata?: Record<string, unknown>;
+    }): StreamId;
+    /**
+     * Merge a source stream into a target stream.
+     */
+    mergeStream(opts: {
+        sourceStreamId: StreamId;
+        targetStreamId: StreamId;
+        agentId: import('./types-v3.js').Principal;
+        worktree: string;
+    }): import('./types-v3.js').MergeResult;
+    /**
+     * Rebase a stream onto its parent.
+     */
+    syncWithParent(opts: {
+        streamId: StreamId;
+        agentId: import('./types-v3.js').Principal;
+        worktree: string;
+        onConflict?: import('./types-v3.js').ConflictStrategy;
+    }): import('./types-v3.js').RebaseResult;
+    /**
+     * Lifecycle transitions for streams.
+     */
+    abandonStream(streamId: StreamId, opts?: {
+        cascade?: boolean;
+        reason?: string;
+    }): void;
+    pauseStream(streamId: StreamId, reason?: string): void;
+    resumeStream(streamId: StreamId): void;
+    /**
+     * Stream queries.
+     */
+    listStreams(filter?: {
+        ownerId?: import('./types-v3.js').Principal;
+        status?: import('./types-v3.js').Stream['status'];
+    }): import('./types-v3.js').Stream[];
+    /**
+     * Commit with Change-Id tracking. Use this instead of raw `git commit` when
+     * committing on behalf of a streamed agent.
+     */
+    commitChanges(opts: {
+        agentId: import('./types-v3.js').Principal;
+        streamId: StreamId;
+        worktree: string;
+        message: string;
+    }): {
+        commit: string;
+        changeId: import('./types-v3.js').ChangeId;
+    };
+    /**
+     * Mark a set of changes as merged (e.g., after a landing strategy completes).
+     */
+    markChangesMerged(changeIds: import('./types-v3.js').ChangeId[]): void;
+    getChange(changeId: import('./types-v3.js').ChangeId): import('./types-v3.js').Change | null;
+    getChangeByCommit(commit: string): import('./types-v3.js').Change | null;
+    /**
+     * Allocate a worktree for an agent, optionally attached to a stream.
+     * Stream-first equivalent of `createWorker/Integrator/CoordinatorWorkspace`.
+     */
+    allocateWorktree(opts: import('./types-v3.js').AllocateWorktreeOpts): import('./types-v3.js').Worktree;
+    /**
+     * Get the worktree owned by a principal (if any).
+     */
+    getWorktreeForAgent(agentId: import('./types-v3.js').Principal): import('./types-v3.js').Worktree | null;
+    /**
+     * Register a landing strategy. Registered strategies can be referenced by
+     * name from role YAML (see Phase 5 — `LandingStrategy` integration).
+     */
+    registerLandingStrategy(strategy: import('./types-v3.js').LandingStrategy): void;
+    /**
+     * Run macro-level reconciliation:
+     * - Delegates to git-cascade's `reconcile()` for stream↔git sync.
+     * - Cleans up orphan worktrees and stale pool entries.
+     * Intended to be called once on boot.
+     */
+    reconcileV3(): import('./types-v3.js').MacroReconcileResult;
+    /**
+     * Resolve a conflict record (typically called by a resolver agent via the
+     * `resolve_conflict` MCP tool after it fixes conflict markers and commits).
+     * Emits `conflict:resolved` event.
+     */
+    resolveConflict(opts: {
+        conflictId: string;
+        resolvedBy: import('./types-v3.js').Principal;
+        resolutionCommit?: string;
+        /** How the conflict was resolved. Default 'agent'. */
+        method?: 'ours' | 'theirs' | 'manual' | 'agent' | 'auto-resolve' | 'spawn-resolver' | 'abandoned';
+        /** Human-readable resolution summary. */
+        summary?: string;
+    }): void;
+    /**
+     * Subscribe to workspace events. Returns an unsubscribe function.
+     */
+    onEvent(callback: WorkspaceEventCallback): () => void;
     /**
      * Close the workspace manager and release resources.
      */
     close(): void;
 }
 /**
- * Events emitted by WorkspaceManager
+ * Events emitted by WorkspaceManager.
+ *
+ * Legacy events (`workspace:*`, `child:*`, `branches:*`, `branch:*`) drive the
+ * existing role-shaped lifecycle. V3 events (`stream:*`, `worktree:*`,
+ * `change:*`, `conflict:*`, `landing:*`, `cascade:*`, `mergeQueue:*`) drive the
+ * stream-first redesign and are re-emitted from the underlying git-cascade
+ * adapter. Consumers narrow on the type string.
  */
-export type WorkspaceEventType = 'workspace:created' | 'workspace:deallocated' | 'child:registered' | 'branches:cleaned' | 'branch:deleted';
+export type WorkspaceEventType = 'workspace:created' | 'workspace:deallocated' | 'child:registered' | 'branches:cleaned' | 'branch:deleted' | 'stream:created' | 'stream:forked' | 'stream:committed' | 'stream:merged' | 'stream:conflicted' | 'stream:abandoned' | 'stream:paused' | 'stream:resumed' | 'worktree:allocated' | 'worktree:shared' | 'worktree:released' | 'change:merged' | 'change:dropped' | 'conflict:created' | 'conflict:resolved' | 'landing:started' | 'landing:completed' | 'cascade:completed' | 'mergeQueue:added' | 'mergeQueue:ready' | 'mergeQueue:cancelled' | 'mergeQueue:removed';
 /**
  * Event payload for workspace events
  */

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

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

package/dist/workspace/workspace-manager.d.ts

@@ -1,15 +1,15 @@
 /**
  * WorkspaceManager Implementation
  *
- * Bridges macro-agent roles to dataplane streams and worktrees.
+ * Bridges macro-agent roles to git-cascade streams and worktrees.
  * Provides a higher-level API for workspace management.
  *
  * @module workspace/workspace-manager
  * @implements [[s-7ktd]] WorkspaceManager API section
  */
 import type { Stream, WorkerTask, StartTaskResult, CleanupWorkerBranchesOptions, CleanupResult } from 'git-cascade';
-import { DataplaneAdapter } from './dataplane-adapter.js';
-import type { DataplaneConfig, WorktreePoolConfig } from './config.js';
+import { GitCascadeAdapter } from './git-cascade-adapter.js';
+import type { GitCascadeConfig, WorktreePoolConfig } from './config.js';
 import { WorktreePool } from './pool/worktree-pool.js';
 import type { AllocationStrategy, AcquireOptions } from './pool/types.js';
 import type { AgentId, StreamId, TaskId, Workspace, WorkerWorkspace, IntegratorWorkspace, CoordinatorWorkspace, WorkspaceManager, StreamConfig, CreateTaskOptions, WorkspaceEventCallback } from './types.js';
@@ -17,7 +17,7 @@ import type { MergeQueueInterface } from './merge-queue/types.js';
 /**
  * Configuration options for DefaultWorkspaceManager.
  */
-export interface WorkspaceManagerConfig extends DataplaneConfig {
+export interface WorkspaceManagerConfig extends GitCascadeConfig {
     /**
      * Base directory for worktrees.
      * Defaults to `<repoPath>/.worktrees`.
@@ -33,7 +33,7 @@ export interface WorkspaceManagerConfig extends DataplaneConfig {
  * DefaultWorkspaceManager implements the WorkspaceManager interface.
  *
  * Responsibilities:
- * - Wraps DataplaneAdapter for stream/worktree operations
+ * - Wraps GitCascadeAdapter for stream/worktree operations
  * - Maintains agentId → workspace mappings
  * - Emits events on workspace lifecycle changes
  *
@@ -51,10 +51,20 @@ export declare class DefaultWorkspaceManager implements WorkspaceManager {
     /**
      * Create a new DefaultWorkspaceManager.
      *
-     * @param adapter - DataplaneAdapter instance
+     * @param adapter - GitCascadeAdapter instance
      * @param config - Configuration options
      */
-    constructor(adapter: DataplaneAdapter, config?: Partial<WorkspaceManagerConfig>);
+    constructor(adapter: GitCascadeAdapter, config?: Partial<WorkspaceManagerConfig>);
+    /**
+     * Access the underlying GitCascadeAdapter. Exposed for bridges that
+     * subscribe to the cascade event stream (e.g., the MAP cascade-bridge
+     * that forwards events to an OpenHive hub).
+     *
+     * Most callers should use the WorkspaceManager API surface. Use this only
+     * when direct access to the adapter's event stream or primitives is
+     * required.
+     */
+    getGitCascadeAdapter(): GitCascadeAdapter;
     /**
      * Subscribe to workspace events.
      *
@@ -172,16 +182,16 @@ export declare class DefaultWorkspaceManager implements WorkspaceManager {
      */
     registerChildWorkspace(coordinatorId: AgentId, childId: AgentId, childPath: string): void;
     /**
-     * Get the underlying DataplaneAdapter.
+     * Get the underlying GitCascadeAdapter.
      *
      * Use with caution - prefer manager methods for operations.
      */
-    get rawAdapter(): DataplaneAdapter;
+    get rawAdapter(): GitCascadeAdapter;
     /**
      * Get the merge queue for coordinating worker merges.
      *
      * The merge queue is lazily initialized on first access and uses
-     * the same database as the dataplane adapter.
+     * the same database as the git-cascade adapter.
      *
      * @returns MergeQueue instance
      */
@@ -293,6 +303,75 @@ export declare class DefaultWorkspaceManager implements WorkspaceManager {
      * @returns true if deleted, false if branch didn't exist
      */
     deleteWorkerBranch(branchName: string): boolean;
+    private readonly landingStrategies;
+    /**
+     * Ref-counted sharing state keyed by worktree path.
+     *
+     * - `ownerId`: the principal that originally allocated the worktree (the
+     *   id that git-cascade's tracker associates with the worktree).
+     * - `sharers`: other agents that allocated via `sharedWithAgent`.
+     * - `ownerDeparted`: set when the owner deallocates but sharers remain —
+     *   the actual git-cascade teardown is deferred until `sharers` is empty.
+     */
+    private readonly sharedWorktreeRefs;
+    createStreamV3(spec: import('./types-v3.js').StreamSpec): StreamId;
+    forkStream(opts: {
+        parentStreamId: StreamId;
+        name: string;
+        ownerId: import('./types-v3.js').Principal;
+        metadata?: Record<string, unknown>;
+    }): StreamId;
+    mergeStream(opts: {
+        sourceStreamId: StreamId;
+        targetStreamId: StreamId;
+        agentId: import('./types-v3.js').Principal;
+        worktree: string;
+    }): import('./types-v3.js').MergeResult;
+    syncWithParent(opts: {
+        streamId: StreamId;
+        agentId: import('./types-v3.js').Principal;
+        worktree: string;
+        onConflict?: import('./types-v3.js').ConflictStrategy;
+    }): import('./types-v3.js').RebaseResult;
+    abandonStream(streamId: StreamId, opts?: {
+        cascade?: boolean;
+        reason?: string;
+    }): void;
+    pauseStream(streamId: StreamId, reason?: string): void;
+    resumeStream(streamId: StreamId): void;
+    listStreams(filter?: {
+        ownerId?: import('./types-v3.js').Principal;
+        status?: import('./types-v3.js').Stream['status'];
+    }): import('./types-v3.js').Stream[];
+    commitChanges(opts: {
+        agentId: import('./types-v3.js').Principal;
+        streamId: StreamId;
+        worktree: string;
+        message: string;
+    }): {
+        commit: string;
+        changeId: import('./types-v3.js').ChangeId;
+    };
+    markChangesMerged(changeIds: import('./types-v3.js').ChangeId[]): void;
+    getChange(changeId: import('./types-v3.js').ChangeId): import('./types-v3.js').Change | null;
+    getChangeByCommit(commit: string): import('./types-v3.js').Change | null;
+    allocateWorktree(opts: import('./types-v3.js').AllocateWorktreeOpts): import('./types-v3.js').Worktree;
+    getWorktreeForAgent(agentId: import('./types-v3.js').Principal): import('./types-v3.js').Worktree | null;
+    registerLandingStrategy(strategy: import('./types-v3.js').LandingStrategy): void;
+    reconcileV3(): import('./types-v3.js').MacroReconcileResult;
+    resolveConflict(opts: {
+        conflictId: string;
+        resolvedBy: import('./types-v3.js').Principal;
+        resolutionCommit?: string;
+        /**
+         * How the conflict was resolved. Defaults to 'agent' for the legacy
+         * call shape; recovery strategies should pass an explicit method so
+         * the OpenHive hub records the right resolution.
+         */
+        method?: import('git-cascade').ConflictResolution['method'] | 'auto-resolve' | 'spawn-resolver' | 'abandoned';
+        /** Human-readable resolution summary (e.g., 'merged with -X ours'). */
+        summary?: string;
+    }): void;
     /**
      * Close the workspace manager and release resources.
      */
@@ -321,11 +400,11 @@ export declare class DefaultWorkspaceManager implements WorkspaceManager {
  */
 export declare function createWorkspaceManager(config: WorkspaceManagerConfig): DefaultWorkspaceManager;
 /**
- * Create a WorkspaceManager with an existing DataplaneAdapter.
+ * Create a WorkspaceManager with an existing GitCascadeAdapter.
  *
- * @param adapter - DataplaneAdapter instance
+ * @param adapter - GitCascadeAdapter instance
  * @param config - Configuration options
  * @returns WorkspaceManager instance
  */
-export declare function createWorkspaceManagerWithAdapter(adapter: DataplaneAdapter, config?: Partial<WorkspaceManagerConfig>): DefaultWorkspaceManager;
+export declare function createWorkspaceManagerWithAdapter(adapter: GitCascadeAdapter, config?: Partial<WorkspaceManagerConfig>): DefaultWorkspaceManager;
 //# sourceMappingURL=workspace-manager.d.ts.map

package/dist/workspace/workspace-manager.d.ts.map

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