macro-agent 0.2.0 → 0.2.1

package/src/map/sidecar.ts

@@ -23,6 +23,13 @@ import type {
   TaskBridge,
 } from "./types.js";
 import type { AgentLifecycleCallback } from "../agent/types.js";
+import {
+  REPO_PROTOCOL_VERSION,
+  RepoClient,
+  RepoManager,
+  type RepoClientTransport,
+  type WorkspaceCapability,
+} from "./repo-workspace.js";
 
 /**
  * Create a MAP sidecar that connects macro-agent to an OpenHive MAP hub.
@@ -55,8 +62,25 @@ export function createMAPSidecar(
   let dispatchSpawnHandlerCleanup: (() => void) | null = null;
   let dispatchMessageHandlerCleanup: (() => void) | null = null;
   let dispatchPermissionsHandlerCleanup: (() => void) | null = null;
+  let workspaceManager: RepoManager | null = null;
+  let workspaceTransport: RepoClientTransport | null = null;
   let reconnectTimer: ReturnType<typeof setTimeout> | null = null;
 
+  // Resolve the workspace capability from env vars. Setting OPENHIVE_WORKSPACE_DECLARE=off
+  // disables both explicit declare AND trajectory-handler bootstrap on the hub side.
+  const workspaceCapability: WorkspaceCapability = {
+    protocolVersion: REPO_PROTOCOL_VERSION,
+    declare: {
+      enabled: process.env.OPENHIVE_WORKSPACE_DECLARE !== "off",
+      defaultVisibility:
+        (process.env.OPENHIVE_WORKSPACE_VISIBILITY as
+          | "private"
+          | "hub_local"
+          | "federated") ?? "hub_local",
+    },
+    list: { enabled: true },
+  };
+
   /**
    * Build the MAP connection URL with auth token.
    */
@@ -121,6 +145,8 @@ export function createMAPSidecar(
     }
     lifecycleCallback = null;
     taskBridge = null;
+    workspaceManager = null;
+    workspaceTransport = null;
   }
 
   /**
@@ -147,6 +173,7 @@ export function createMAPSidecar(
             canUpdate: true,
             canList: true,
           },
+          workspace: workspaceCapability,
         },
         metadata: {
           systemId: config.systemId ?? "macro-agent",
@@ -624,6 +651,56 @@ export function createMAPSidecar(
         actionCleanup();
       };
     }
+
+    // 6. Workspace (kinds/repo) — declare attached repos to the hub.
+    //    Discovers repos from WORKSPACE_* env vars (set by openhive's swarm-spawn
+    //    flow when spawning with a `repo_id`) plus OPENHIVE_WORKSPACE_REPOS for
+    //    multi-repo declarations. Skipped entirely when capability.declare is off.
+    if (workspaceCapability.declare.enabled) {
+      try {
+        // OpenHive's MAP server registers x-workspace/repo.* as request handlers
+        // (additionalHandlers), not notification handlers — so route notify
+        // through callExtension and ignore the (void) response.
+        const repoTransport: RepoClientTransport = {
+          notify: async (method: string, params: unknown) => {
+            await connection.callExtension(method, params);
+          },
+          request: (method: string, params: unknown) =>
+            connection.callExtension(method, params),
+        };
+        const manager = new RepoManager();
+        const single =
+          process.env.WORKSPACE_REPO_URL && process.env.WORKSPACE_LOCAL_PATH
+            ? [{
+                remoteUrl: process.env.WORKSPACE_REPO_URL,
+                localPath: process.env.WORKSPACE_LOCAL_PATH,
+              }]
+            : [];
+        const multi = process.env.OPENHIVE_WORKSPACE_REPOS
+          ? (JSON.parse(process.env.OPENHIVE_WORKSPACE_REPOS) as Array<{
+              remoteUrl: string;
+              localPath: string;
+            }>)
+          : [];
+        for (const cfg of [...single, ...multi]) {
+          await manager.attach(cfg);
+        }
+        if (manager.list().length > 0) {
+          const client = new RepoClient(repoTransport);
+          await client.declare(RepoClient.snapshot(manager));
+          workspaceManager = manager;
+          workspaceTransport = repoTransport;
+          console.log(
+            `[map-sidecar] Declared ${manager.list().length} workspace(s) to hub`,
+          );
+        }
+      } catch (err) {
+        // Non-fatal — sidecar continues without workspace declarations
+        console.warn(
+          `[map-sidecar] Workspace declare failed: ${(err as Error).message}`,
+        );
+      }
+    }
   }
 
   return {
@@ -708,5 +785,13 @@ export function createMAPSidecar(
         );
       }
     },
+
+    getWorkspaceManager() {
+      return workspaceManager;
+    },
+
+    getRepoTransport() {
+      return workspaceTransport;
+    },
   };
 }

package/src/map/types.ts

@@ -127,6 +127,19 @@ export interface MAPSidecar {
     participantId: string,
     content: string,
   ): Promise<void>;
+
+  /**
+   * Access the sidecar's workspace RepoManager (if workspace declarations
+   * are enabled and the sidecar is connected). Used by mail-inbound-consumer
+   * for pre-spawn repo mount.
+   */
+  getWorkspaceManager?(): unknown;
+
+  /**
+   * Access the sidecar's repo client transport for declaring newly-attached
+   * repos to the hub. Used by mail-inbound-consumer after pre-spawn clone.
+   */
+  getRepoTransport?(): { notify(method: string, params: unknown): Promise<void>; request(method: string, params: unknown): Promise<unknown> } | null;
 }
 
 // =============================================================================