macro-agent 0.2.0 → 0.2.1

package/dist/workspace/dataplane-adapter.js

@@ -0,0 +1,416 @@
+/**
+ * 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 { MultiAgentRepoTracker, workerTasks, diffStacks, } from 'git-cascade';
+import { DEFAULT_DATAPLANE_CONFIG } from './config.js';
+/**
+ * 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 class DataplaneAdapter {
+    tracker;
+    config;
+    eventListeners = new Set();
+    ownsDb;
+    /**
+     * Create a new DataplaneAdapter.
+     *
+     * @param config - Dataplane configuration
+     */
+    constructor(config) {
+        const mergedConfig = {
+            ...DEFAULT_DATAPLANE_CONFIG,
+            ...config,
+            repoPath: config.repoPath ?? process.cwd(),
+        };
+        this.config = {
+            enabled: mergedConfig.enabled ?? true,
+            repoPath: mergedConfig.repoPath,
+            tablePrefix: mergedConfig.tablePrefix ?? 'dataplane_',
+            verbose: mergedConfig.verbose ?? false,
+            skipRecovery: mergedConfig.skipRecovery ?? false,
+        };
+        // Determine if we own the database connection
+        this.ownsDb = !config.db;
+        const trackerOptions = {
+            repoPath: this.config.repoPath,
+            tablePrefix: this.config.tablePrefix,
+            verbose: this.config.verbose,
+            skipRecovery: this.config.skipRecovery,
+        };
+        if (config.db) {
+            trackerOptions.db = config.db;
+        }
+        else if (config.dbPath) {
+            trackerOptions.dbPath = config.dbPath;
+        }
+        // If neither db nor dbPath provided, tracker uses default path
+        this.tracker = new MultiAgentRepoTracker(trackerOptions);
+    }
+    /**
+     * Get whether dataplane is enabled.
+     */
+    get enabled() {
+        return this.config.enabled;
+    }
+    /**
+     * Get the repository path.
+     */
+    get repoPath() {
+        return this.config.repoPath;
+    }
+    /**
+     * Get the underlying database connection.
+     * Use with caution - prefer adapter methods for operations.
+     */
+    get db() {
+        return this.tracker.db;
+    }
+    /**
+     * Get the underlying tracker.
+     * Use with caution - prefer adapter methods for operations.
+     */
+    get rawTracker() {
+        return this.tracker;
+    }
+    // ─────────────────────────────────────────────────────────────────────────────
+    // Event System
+    // ─────────────────────────────────────────────────────────────────────────────
+    /**
+     * Subscribe to dataplane events.
+     *
+     * @param callback - Function called when events occur
+     * @returns Unsubscribe function
+     */
+    onEvent(callback) {
+        this.eventListeners.add(callback);
+        return () => this.eventListeners.delete(callback);
+    }
+    /**
+     * Emit an event to all listeners.
+     */
+    emit(type, data) {
+        const event = {
+            type,
+            timestamp: Date.now(),
+            data,
+        };
+        for (const listener of this.eventListeners) {
+            try {
+                listener(event);
+            }
+            catch (error) {
+                console.error('[DataplaneAdapter] Event listener error:', error);
+            }
+        }
+    }
+    // ─────────────────────────────────────────────────────────────────────────────
+    // Stream Operations
+    // ─────────────────────────────────────────────────────────────────────────────
+    /**
+     * Create a new stream (integration branch).
+     *
+     * @param options - Stream creation options
+     * @returns Stream ID
+     */
+    createStream(options) {
+        const streamId = this.tracker.createStream(options);
+        this.emit('stream:created', { streamId, ...options });
+        return streamId;
+    }
+    /**
+     * Get a stream by ID.
+     */
+    getStream(streamId) {
+        return this.tracker.getStream(streamId);
+    }
+    /**
+     * List streams with optional filters.
+     */
+    listStreams(options) {
+        return this.tracker.listStreams(options);
+    }
+    /**
+     * Update a stream.
+     */
+    updateStream(streamId, updates) {
+        this.tracker.updateStream(streamId, updates);
+        this.emit('stream:updated', { streamId, updates });
+    }
+    /**
+     * Abandon a stream.
+     */
+    abandonStream(streamId, options) {
+        this.tracker.abandonStream(streamId, options);
+        this.emit('stream:abandoned', { streamId, ...options });
+    }
+    /**
+     * Get the git branch name for a stream.
+     */
+    getStreamBranchName(streamId) {
+        return this.tracker.getStreamBranchName(streamId);
+    }
+    /**
+     * Get the HEAD commit of a stream.
+     */
+    getStreamHead(streamId) {
+        return this.tracker.getStreamHead(streamId);
+    }
+    // ─────────────────────────────────────────────────────────────────────────────
+    // Worktree Operations
+    // ─────────────────────────────────────────────────────────────────────────────
+    /**
+     * Create a worktree for an agent.
+     *
+     * @param options - Worktree creation options
+     * @returns Created worktree info
+     */
+    createWorktree(options) {
+        const worktree = this.tracker.createWorktree(options);
+        this.emit('worktree:created', { ...worktree });
+        return worktree;
+    }
+    /**
+     * Get a worktree by agent ID.
+     */
+    getWorktree(agentId) {
+        return this.tracker.getWorktree(agentId);
+    }
+    /**
+     * List all worktrees.
+     */
+    listWorktrees() {
+        return this.tracker.listWorktrees();
+    }
+    /**
+     * Update the stream associated with a worktree.
+     */
+    updateWorktreeStream(agentId, streamId) {
+        this.tracker.updateWorktreeStream(agentId, streamId);
+    }
+    /**
+     * Deallocate a worktree.
+     */
+    deallocateWorktree(agentId) {
+        this.tracker.deallocateWorktree(agentId);
+        this.emit('worktree:deallocated', { agentId });
+    }
+    // ─────────────────────────────────────────────────────────────────────────────
+    // Worker Task Operations
+    // ─────────────────────────────────────────────────────────────────────────────
+    /**
+     * Create a worker task under a stream.
+     *
+     * @param options - Task creation options
+     * @returns Task ID
+     */
+    createTask(options) {
+        const taskId = this.tracker.createTask(options);
+        this.emit('task:created', { taskId, ...options });
+        return taskId;
+    }
+    /**
+     * Get a task by ID.
+     */
+    getTask(taskId) {
+        return this.tracker.getTask(taskId);
+    }
+    /**
+     * List tasks for a stream.
+     */
+    listTasks(streamId, options) {
+        return this.tracker.listTasks(streamId, options);
+    }
+    /**
+     * Start a task - assigns agent and creates worker branch.
+     *
+     * @param options - Start task options
+     * @returns Branch name and start commit
+     */
+    startTask(options) {
+        const result = this.tracker.startTask(options);
+        this.emit('task:started', {
+            taskId: options.taskId,
+            agentId: options.agentId,
+            branchName: result.branchName,
+            startCommit: result.startCommit,
+        });
+        return result;
+    }
+    /**
+     * Complete a task - merges worker branch to stream.
+     *
+     * @param options - Complete task options
+     * @returns Merge result
+     */
+    completeTask(options) {
+        const result = this.tracker.completeTask(options);
+        this.emit('task:completed', { taskId: options.taskId, ...result });
+        return result;
+    }
+    /**
+     * Abandon a task.
+     *
+     * @param taskId - Task ID
+     * @param options - Options
+     */
+    abandonTask(taskId, options) {
+        this.tracker.abandonTask(taskId, options);
+        this.emit('task:abandoned', { taskId, ...options });
+    }
+    /**
+     * Release a task back to 'open' status.
+     */
+    releaseTask(taskId) {
+        this.tracker.releaseTask(taskId);
+    }
+    /**
+     * 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, worktree) {
+        return workerTasks.detectTaskConflicts(this.tracker.db, this.config.repoPath, taskId, worktree);
+    }
+    /**
+     * 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 = 60 * 60 * 1000) {
+        return workerTasks.recoverStaleTasks(this.tracker.db, thresholdMs);
+    }
+    // ─────────────────────────────────────────────────────────────────────────────
+    // Checkpoint Operations
+    // ─────────────────────────────────────────────────────────────────────────────
+    /**
+     * 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, agentId) {
+        const task = this.getTask(taskId);
+        if (!task) {
+            console.warn(`[DataplaneAdapter] Task not found: ${taskId}`);
+            return [];
+        }
+        if (!task.streamId) {
+            console.warn(`[DataplaneAdapter] Task ${taskId} has no streamId`);
+            return [];
+        }
+        if (!task.startCommit) {
+            console.warn(`[DataplaneAdapter] Task ${taskId} has no startCommit`);
+            return [];
+        }
+        try {
+            // Create checkpoints from task's startCommit to stream's current HEAD
+            const checkpoints = diffStacks.createCheckpointsFromStream(this.tracker.db, this.config.repoPath, task.streamId, {
+                from: task.startCommit,
+                createdBy: agentId,
+            });
+            return checkpoints;
+        }
+        catch (error) {
+            console.error(`[DataplaneAdapter] Failed to create checkpoints for task ${taskId}:`, error);
+            return [];
+        }
+    }
+    // ─────────────────────────────────────────────────────────────────────────────
+    // Commit Operations
+    // ─────────────────────────────────────────────────────────────────────────────
+    /**
+     * Commit changes in a worktree with Change tracking.
+     *
+     * @param options - Commit options
+     * @returns Commit hash and change ID
+     */
+    commitChanges(options) {
+        return this.tracker.commitChanges(options);
+    }
+    // ─────────────────────────────────────────────────────────────────────────────
+    // Maintenance Operations
+    // ─────────────────────────────────────────────────────────────────────────────
+    /**
+     * 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) {
+        return workerTasks.cleanupWorkerBranches(this.tracker.db, this.config.repoPath, options);
+    }
+    /**
+     * Delete a specific worker branch.
+     *
+     * @param branchName - Branch name to delete
+     * @returns true if deleted, false if branch didn't exist
+     */
+    deleteWorkerBranch(branchName) {
+        try {
+            const { execSync } = require('child_process');
+            execSync(`git branch -D "${branchName}"`, {
+                cwd: this.config.repoPath,
+                stdio: 'pipe',
+            });
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }
+    // ─────────────────────────────────────────────────────────────────────────────
+    // Health & Recovery
+    // ─────────────────────────────────────────────────────────────────────────────
+    /**
+     * Check system health.
+     */
+    healthCheck() {
+        return this.tracker.healthCheck();
+    }
+    // ─────────────────────────────────────────────────────────────────────────────
+    // Lifecycle
+    // ─────────────────────────────────────────────────────────────────────────────
+    /**
+     * Close the adapter and release resources.
+     *
+     * Only closes the database if we created it (not if using shared DB).
+     */
+    close() {
+        this.eventListeners.clear();
+        this.tracker.close();
+    }
+}
+/**
+ * Create a DataplaneAdapter instance.
+ *
+ * @param config - Configuration options
+ * @returns DataplaneAdapter instance
+ */
+export function createDataplaneAdapter(config) {
+    return new DataplaneAdapter(config);
+}
+//# sourceMappingURL=dataplane-adapter.js.map

package/dist/workspace/dataplane-adapter.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "macro-agent",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Interact with multiple agents as if they were a single agent.",
   "type": "module",
   "main": "dist/index.js",
@@ -53,6 +53,7 @@
     "@multi-agent-protocol/sdk": "^0.1.12",
     "acp-factory": "^0.1.14",
     "agent-inbox": "^0.2.2",
+    "agent-workspace": "^0.1.5",
     "better-sqlite3": "^12.5.0",
     "chalk": "^5.6.2",
     "commander": "^14.0.2",

package/src/acp/macro-agent.ts

@@ -205,18 +205,22 @@ export function createMacroAgent(
     method: string,
     params: Record<string, unknown>,
   ): Promise<Record<string, unknown>> {
+    const normalizedMethod = method.startsWith("macro/")
+      ? `_${method}`
+      : method;
+
     // Check if it's a stubbed peer method
     if (
-      (STUBBED_PEER_EXTENSIONS as readonly string[]).includes(method)
+      (STUBBED_PEER_EXTENSIONS as readonly string[]).includes(normalizedMethod)
     ) {
       throw new ACPError(
-        `Peer manager not available: ${method}`,
+        `Peer manager not available: ${normalizedMethod}`,
         "NO_PEER_MANAGER",
-        { method },
+        { method: normalizedMethod },
       );
     }
 
-    switch (method as SupportedExtension) {
+    switch (normalizedMethod as SupportedExtension) {
       case "_macro/spawnAgent": {
         const task = params.task as string;
         if (!task) throw RequestError.invalidParams(params, "task is required");
@@ -226,6 +230,7 @@ export function createMacroAgent(
           cwd: (params.cwd as string) ?? defaultCwd,
           role: params.role as string | undefined,
           permissionMode: params.permissionMode as "auto-approve" | undefined,
+          askForAllTools: params.askForAllTools as boolean | undefined,
         });
         return {
           agentId: spawned.id,
@@ -837,45 +842,18 @@ export function createMacroAgent(
           }
 
           // Handle permission requests from the underlying agent.
-          // When the agent is in interactive mode, it yields
-          // PermissionRequestUpdate objects instead of auto-approving.
-          // We forward these to the client via AgentSideConnection's
-          // requestPermission() method (JSON-RPC agent→client request).
+          // When the agent is in interactive mode, acp-factory yields
+          // PermissionRequestUpdate objects. Forward them as session updates
+          // instead of AgentSideConnection.requestPermission(): MAP-routed
+          // browser clients already consume session/update, and replies come
+          // back through _macro/respondToPermission or _macro/cancelPermission.
           if (isPermissionRequestUpdate(update)) {
-            try {
-              const permResponse = await connection.requestPermission({
-                sessionId: params.sessionId,
-                toolCall: {
-                  toolCallId: update.toolCall.toolCallId,
-                  title: update.toolCall.title,
-                  status: update.toolCall.status as any,
-                  rawInput: update.toolCall.rawInput,
-                },
-                options: update.options,
-              });
-              // Relay the permission response back to the agent.
-              // ACP response: { outcome: { outcome: "selected", optionId } | { outcome: "cancelled" } }
-              const outcome = permResponse?.outcome;
-              if (outcome) {
-                if (outcome.outcome === "selected" && "optionId" in outcome) {
-                  agentManager.respondToPermission(
-                    agentId,
-                    update.requestId,
-                    outcome.optionId,
-                  );
-                } else if (outcome.outcome === "cancelled") {
-                  agentManager.cancelPermission(agentId, update.requestId);
-                }
-              }
-            } catch {
-              // If the permission request fails (e.g., client disconnected),
-              // cancel it so the agent doesn't hang.
-              try {
-                agentManager.cancelPermission(agentId, update.requestId);
-              } catch {
-                // Best effort
-              }
-            }
+            const forwardedUpdate = { ...update, _agentId: agentId };
+            appendSessionUpdate(params.sessionId, forwardedUpdate as any);
+            await connection.sessionUpdate({
+              sessionId: params.sessionId,
+              update: forwardedUpdate as any,
+            });
             continue;
           }
 

package/src/agent/agent-manager-v2.ts

@@ -577,6 +577,7 @@ export function createAgentManagerV2(
       parent,
       cwd = defaultCwd,
       permissionMode = defaultPermissionMode,
+      askForAllTools = false,
       subscribeParent = true,
       topics = [],
       config: agentConfig,

package/src/boot-v2.ts

@@ -592,6 +592,8 @@ export async function bootV2(
       agentManager,
       agentStore,
       getSidecar: () => (systemRef as any).mapSidecar ?? null,
+      getRepoManager: () => (systemRef as any).mapSidecar?.getWorkspaceManager?.() ?? null,
+      getRepoTransport: () => (systemRef as any).mapSidecar?.getRepoTransport?.() ?? null,
       log: (msg) => console.log(msg),
     });