macro-agent 0.1.7 → 0.1.10

package/dist/workspace/topology/yaml-driven.d.ts

@@ -0,0 +1,69 @@
+/**
+ * YamlDrivenTopology — primary TopologyPolicy implementation.
+ *
+ * Compiles `TeamWorkspaceConfig` into per-spawn workspace decisions. Covers
+ * all 6 workflows in `docs/git-cascade-integration-gaps.md` §5 through YAML
+ * alone.
+ *
+ * @module workspace/topology/yaml-driven
+ * @see docs/workspace-redesign-plan.md Phase 3
+ */
+import type { AgentId, StreamId } from '../types-v3.js';
+import type { TeamWorkspaceConfig, RoleWorkspaceConfig } from '../yaml-schema.js';
+import type { TopologyPolicy, TeamStartContext, TeamStartPlan, SpawnContext, WorkspaceDecision, AgentCompleteContext, TeamStopContext } from './types.js';
+/**
+ * Topology policy driven entirely by `macro_agent.workspace` YAML.
+ */
+export declare class YamlDrivenTopology implements TopologyPolicy {
+    private readonly config;
+    readonly name = "yaml-driven";
+    private teamStreamId?;
+    private readonly agentStreams;
+    /** Tracks which role each live agent is, so sync-with-parent can dispatch. */
+    private readonly agentRoles;
+    /** Unsubscribe from the workspace event stream; set on onTeamStart, cleared on onTeamStop. */
+    private eventUnsubscribe?;
+    /** Debounce map: stream id → last-sync timestamp (ms) for coalescing. */
+    private readonly lastSyncAt;
+    /** Minimum interval between auto-syncs per parent stream (ms). */
+    private static readonly SYNC_COALESCE_MS;
+    constructor(config: TeamWorkspaceConfig);
+    /**
+     * Look up per-role config. Returns null for roles not declared in YAML.
+     */
+    getRoleConfig(role: string): RoleWorkspaceConfig | null;
+    onTeamStart(ctx: TeamStartContext): Promise<TeamStartPlan>;
+    onAgentSpawn(ctx: SpawnContext): Promise<WorkspaceDecision>;
+    onAgentComplete(ctx: AgentCompleteContext): Promise<void>;
+    onTeamStop(ctx: TeamStopContext): Promise<void>;
+    /**
+     * Track agent→stream mapping after a successful spawn. Called externally
+     * after the WorkspaceDecision is executed; lets the policy record state.
+     */
+    recordAgentStream(agentId: AgentId, streamId: StreamId, role?: string): void;
+    /**
+     * Get the stream attached to an agent (from our local tracking).
+     */
+    getAgentStream(agentId: AgentId): StreamId | null;
+    /**
+     * A team needs a root stream if any role uses team-root-relative lineage or
+     * attaches to the team root.
+     */
+    private teamNeedsRootStream;
+    private resolveParentStream;
+    private buildStreamName;
+    /**
+     * True if any role declared `on_parent_advanced: sync_with_parent`.
+     * Used to decide whether to subscribe to stream:committed events at all.
+     */
+    private hasAutoSyncRoles;
+    /**
+     * Dispatch syncWithParent for live agents whose role has
+     * `on_parent_advanced: sync_with_parent` and whose active stream's parent
+     * is `parentStreamId`.
+     *
+     * Coalesces: skips if a sync fired for this parent within SYNC_COALESCE_MS.
+     */
+    private dispatchSync;
+}
+//# sourceMappingURL=yaml-driven.d.ts.map

package/dist/workspace/topology/yaml-driven.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"yaml-driven.d.ts","sourceRoot":"","sources":["../../../src/workspace/topology/yaml-driven.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAa,MAAM,gBAAgB,CAAC;AACnE,OAAO,KAAK,EACV,mBAAmB,EACnB,mBAAmB,EAEpB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EACV,cAAc,EACd,gBAAgB,EAChB,aAAa,EACb,YAAY,EACZ,iBAAiB,EACjB,oBAAoB,EACpB,eAAe,EAChB,MAAM,YAAY,CAAC;AAEpB;;GAEG;AACH,qBAAa,kBAAmB,YAAW,cAAc;IAc3C,OAAO,CAAC,QAAQ,CAAC,MAAM;IAbnC,QAAQ,CAAC,IAAI,iBAAiB;IAE9B,OAAO,CAAC,YAAY,CAAC,CAAW;IAChC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAqC;IAClE,8EAA8E;IAC9E,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAmC;IAC9D,8FAA8F;IAC9F,OAAO,CAAC,gBAAgB,CAAC,CAAa;IACtC,yEAAyE;IACzE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAoC;IAC/D,kEAAkE;IAClE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAS;gBAEpB,MAAM,EAAE,mBAAmB;IAExD;;OAEG;IACH,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,mBAAmB,GAAG,IAAI;IAIjD,WAAW,CAAC,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC;IAiC1D,YAAY,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAiE3D,eAAe,CAAC,GAAG,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;IAYzD,UAAU,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IA6BrD;;;OAGG;IACH,iBAAiB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI;IAK5E;;OAEG;IACH,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,QAAQ,GAAG,IAAI;IAMjD;;;OAGG;IACH,OAAO,CAAC,mBAAmB;IAc3B,OAAO,CAAC,mBAAmB;IAoB3B,OAAO,CAAC,eAAe;IAKvB;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IAOxB;;;;;;OAMG;YACW,YAAY;CA4C3B"}

package/dist/workspace/topology/yaml-driven.js

@@ -0,0 +1,273 @@
+/**
+ * YamlDrivenTopology — primary TopologyPolicy implementation.
+ *
+ * Compiles `TeamWorkspaceConfig` into per-spawn workspace decisions. Covers
+ * all 6 workflows in `docs/git-cascade-integration-gaps.md` §5 through YAML
+ * alone.
+ *
+ * @module workspace/topology/yaml-driven
+ * @see docs/workspace-redesign-plan.md Phase 3
+ */
+/**
+ * Topology policy driven entirely by `macro_agent.workspace` YAML.
+ */
+export class YamlDrivenTopology {
+    config;
+    name = 'yaml-driven';
+    teamStreamId;
+    agentStreams = new Map();
+    /** Tracks which role each live agent is, so sync-with-parent can dispatch. */
+    agentRoles = new Map();
+    /** Unsubscribe from the workspace event stream; set on onTeamStart, cleared on onTeamStop. */
+    eventUnsubscribe;
+    /** Debounce map: stream id → last-sync timestamp (ms) for coalescing. */
+    lastSyncAt = new Map();
+    /** Minimum interval between auto-syncs per parent stream (ms). */
+    static SYNC_COALESCE_MS = 2_000;
+    constructor(config) {
+        this.config = config;
+    }
+    /**
+     * Look up per-role config. Returns null for roles not declared in YAML.
+     */
+    getRoleConfig(role) {
+        return this.config.roles[role] ?? null;
+    }
+    async onTeamStart(ctx) {
+        const needsTeamRoot = this.teamNeedsRootStream();
+        if (needsTeamRoot) {
+            const forkFrom = this.config.default_stream?.fork_from ?? 'main';
+            const nameTemplate = this.config.default_stream?.name_template ?? '{team}';
+            const streamName = nameTemplate.replace('{team}', ctx.teamName);
+            this.teamStreamId = ctx.workspaceManager.createStreamV3({
+                name: streamName,
+                ownerId: `team:${ctx.teamName}`,
+                forkFrom,
+                metadata: { kind: 'team_root', teamInstanceId: ctx.teamInstanceId },
+            });
+        }
+        // Wire auto-sync if any role declared on_parent_advanced: sync_with_parent.
+        if (this.hasAutoSyncRoles()) {
+            this.eventUnsubscribe = ctx.workspaceManager.onEvent((event) => {
+                if (event.type !== 'stream:committed')
+                    return;
+                const streamId = event.data.streamId;
+                if (!streamId)
+                    return;
+                // Fire-and-forget: schedule sync for affected agents on children of
+                // this stream, coalesced.
+                void this.dispatchSync(ctx, streamId);
+            });
+        }
+        return this.teamStreamId
+            ? { teamStreamId: this.teamStreamId }
+            : {};
+    }
+    async onAgentSpawn(ctx) {
+        const roleConfig = this.getRoleConfig(ctx.role);
+        if (!roleConfig) {
+            // Role not declared in macro_agent.workspace → conservative default:
+            // inherit parent's cwd (no isolation, no stream).
+            return { kind: 'share-parent-cwd' };
+        }
+        switch (roleConfig.workspace) {
+            case 'none':
+                return { kind: 'none' };
+            case 'share_parent_cwd':
+                return { kind: 'share-parent-cwd' };
+            case 'share_with_agent': {
+                if (!roleConfig.share_with) {
+                    // Schema guarantees this, but double-check
+                    return { kind: 'share-parent-cwd' };
+                }
+                const partnerId = ctx.getAgentByRole?.(roleConfig.share_with);
+                if (!partnerId) {
+                    // Partner role not yet spawned; fall back to share-parent-cwd.
+                    return { kind: 'share-parent-cwd' };
+                }
+                return { kind: 'share-with-agent', agentId: partnerId };
+            }
+            case 'attach_to_team_root': {
+                if (!this.teamStreamId) {
+                    // Should have been created in onTeamStart; defensive fallback
+                    return { kind: 'share-parent-cwd' };
+                }
+                return {
+                    kind: 'attach-to-stream',
+                    streamId: this.teamStreamId,
+                    allocateWorktree: roleConfig.allocation !== 'inherit_parent_cwd',
+                };
+            }
+            case 'new_stream': {
+                const parent = this.resolveParentStream(roleConfig, ctx);
+                const forkFrom = roleConfig.stream_lineage === 'independent'
+                    ? this.config.default_stream?.fork_from ?? 'main'
+                    : undefined;
+                const streamName = this.buildStreamName(ctx.role, ctx.agentId);
+                const spec = {
+                    name: streamName,
+                    ownerId: ctx.agentId,
+                    parent,
+                    forkFrom,
+                    metadata: { role: ctx.role },
+                };
+                return {
+                    kind: 'new-stream',
+                    streamSpec: spec,
+                    allocateWorktree: roleConfig.allocation !== 'inherit_parent_cwd',
+                };
+            }
+        }
+    }
+    async onAgentComplete(ctx) {
+        // Deallocate the agent's worktree (if any). Landing was already handled
+        // by the LandingStrategy invoked from done(); this is pure cleanup.
+        try {
+            ctx.workspaceManager.deallocateWorkspace(ctx.agentId);
+        }
+        catch {
+            // Non-fatal — agent may not have had a worktree
+        }
+        this.agentStreams.delete(ctx.agentId);
+        this.agentRoles.delete(ctx.agentId);
+    }
+    async onTeamStop(ctx) {
+        // Stop auto-sync event subscription
+        if (this.eventUnsubscribe) {
+            this.eventUnsubscribe();
+            this.eventUnsubscribe = undefined;
+        }
+        if (!this.teamStreamId)
+            return;
+        const action = this.config.on_team_complete;
+        switch (action) {
+            case 'abandon':
+                ctx.workspaceManager.abandonStream(this.teamStreamId, {
+                    cascade: true,
+                    reason: 'team stopped',
+                });
+                break;
+            case 'merge_to_main':
+                // Requires a landing strategy configured for the team stream.
+                // Deferred to Phase 5 (LandingStrategy integration); log a warning.
+                // Leaving stream active for now.
+                break;
+            case 'keep':
+            default:
+                // Leave the stream active for human review / PR.
+                break;
+        }
+    }
+    /**
+     * Track agent→stream mapping after a successful spawn. Called externally
+     * after the WorkspaceDecision is executed; lets the policy record state.
+     */
+    recordAgentStream(agentId, streamId, role) {
+        this.agentStreams.set(agentId, streamId);
+        if (role)
+            this.agentRoles.set(agentId, role);
+    }
+    /**
+     * Get the stream attached to an agent (from our local tracking).
+     */
+    getAgentStream(agentId) {
+        return this.agentStreams.get(agentId) ?? null;
+    }
+    // ── Helpers ─────────────────────────────────────────────────────────────
+    /**
+     * A team needs a root stream if any role uses team-root-relative lineage or
+     * attaches to the team root.
+     */
+    teamNeedsRootStream() {
+        for (const roleConfig of Object.values(this.config.roles)) {
+            if (roleConfig.workspace === 'attach_to_team_root')
+                return true;
+            if (roleConfig.workspace === 'new_stream' &&
+                (roleConfig.stream_lineage === 'from_team_root' ||
+                    roleConfig.stream_lineage === 'fork_from_team_root')) {
+                return true;
+            }
+        }
+        return false;
+    }
+    resolveParentStream(roleConfig, ctx) {
+        const lineage = roleConfig.stream_lineage;
+        switch (lineage) {
+            case 'fork_from_team_root':
+            case 'from_team_root':
+                return this.teamStreamId;
+            case 'fork_from_parent':
+                return ctx.parentStreamId ?? this.teamStreamId;
+            case 'independent':
+                return undefined;
+            case 'track_existing_branch':
+                return undefined; // Caller uses track_branch directly
+            default:
+                return undefined;
+        }
+    }
+    buildStreamName(role, agentId) {
+        const shortId = agentId.slice(-8);
+        return `${role}-${shortId}`;
+    }
+    /**
+     * True if any role declared `on_parent_advanced: sync_with_parent`.
+     * Used to decide whether to subscribe to stream:committed events at all.
+     */
+    hasAutoSyncRoles() {
+        for (const roleConfig of Object.values(this.config.roles)) {
+            if (roleConfig.on_parent_advanced === 'sync_with_parent')
+                return true;
+        }
+        return false;
+    }
+    /**
+     * Dispatch syncWithParent for live agents whose role has
+     * `on_parent_advanced: sync_with_parent` and whose active stream's parent
+     * is `parentStreamId`.
+     *
+     * Coalesces: skips if a sync fired for this parent within SYNC_COALESCE_MS.
+     */
+    async dispatchSync(ctx, parentStreamId) {
+        const now = Date.now();
+        const last = this.lastSyncAt.get(parentStreamId) ?? 0;
+        if (now - last < YamlDrivenTopology.SYNC_COALESCE_MS) {
+            return;
+        }
+        this.lastSyncAt.set(parentStreamId, now);
+        // Find live agents whose stream's parent matches and whose role has
+        // on_parent_advanced: sync_with_parent.
+        for (const [agentId, streamId] of this.agentStreams) {
+            const role = this.agentRoles.get(agentId);
+            if (!role)
+                continue;
+            const roleConfig = this.getRoleConfig(role);
+            if (roleConfig?.on_parent_advanced !== 'sync_with_parent')
+                continue;
+            const stream = ctx.workspaceManager.getStream(streamId);
+            if (stream?.parentStream !== parentStreamId)
+                continue;
+            // Find agent's worktree
+            const worktree = ctx.workspaceManager.getWorktreeForAgent(agentId);
+            if (!worktree)
+                continue; // no worktree → can't sync; skip silently
+            // Map YAML's on_conflict → git-cascade ConflictStrategy. 'defer' has
+            // no git-native equivalent; we use 'manual' (git-cascade records the
+            // conflict and leaves the worktree in a conflict state).
+            const yamlStrategy = roleConfig.on_conflict ?? 'defer';
+            const onConflict = yamlStrategy === 'defer' ? 'manual' : yamlStrategy;
+            try {
+                ctx.workspaceManager.syncWithParent({
+                    streamId,
+                    agentId,
+                    worktree: worktree.path,
+                    onConflict,
+                });
+            }
+            catch {
+                // Best-effort — don't throw out of an event handler
+            }
+        }
+    }
+}
+//# sourceMappingURL=yaml-driven.js.map

package/dist/workspace/topology/yaml-driven.js.map

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

package/dist/workspace/types-v3.d.ts

@@ -0,0 +1,110 @@
+/**
+ * Workspace V3 Types — stream-first primitives.
+ *
+ * These types supplement the legacy role-shaped `types.ts` for the redesigned
+ * workspace layer (see `docs/workspace-interfaces.md`). Once the migration is
+ * complete (Phase 9), these merge back into `types.ts` and the V3 prefix is
+ * dropped.
+ *
+ * @module workspace/types-v3
+ */
+import type { Stream as GCStream, AgentWorktree, MergeResult as GCMergeResult, RebaseResult as GCRebaseResult, Change as GCChange, ChangeStatus, ConflictStrategy as GCConflictStrategy, ConflictRecord as GCConflictRecord } from 'git-cascade';
+export type AgentId = string;
+export type StreamId = string;
+export type ChangeId = string;
+export type QueueEntryId = string;
+/**
+ * Pseudo-principals own resources that aren't bound to a live agent. Team-root
+ * streams use `team:<name>`; system-created streams use `system:<subsystem>`.
+ * Tagged via prefix; never terminates.
+ */
+export type PseudoAgentId = `team:${string}` | `system:${string}`;
+export type Principal = AgentId | PseudoAgentId;
+export declare const isPseudoAgentId: (p: Principal) => p is PseudoAgentId;
+/**
+ * Specification for creating a new stream. If `parent` is set, the stream
+ * forks from that parent stream. Otherwise, `forkFrom` names the branch to
+ * fork from (defaults to 'main').
+ */
+export interface StreamSpec {
+    name: string;
+    ownerId: Principal;
+    parent?: StreamId;
+    forkFrom?: string;
+    metadata?: Record<string, unknown>;
+}
+export type Stream = GCStream;
+export type MergeResult = GCMergeResult;
+export type RebaseResult = GCRebaseResult;
+export type Change = GCChange;
+export type ConflictStrategy = GCConflictStrategy;
+export type ConflictRecord = GCConflictRecord;
+export type { ChangeStatus };
+export interface AllocateWorktreeOpts {
+    agentId: Principal;
+    streamId?: StreamId;
+    baseDir?: string;
+    pooled?: boolean;
+    /**
+     * If set, co-locate this agent on the referenced agent's worktree
+     * (ref-counted; last-out wins on deallocation).
+     */
+    sharedWithAgent?: AgentId;
+    /** Optional branch override; defaults to the stream's branch. */
+    branch?: string;
+}
+export type Worktree = AgentWorktree;
+export type CascadeStrategy = 'stop_on_conflict' | 'skip_conflicting' | 'defer_conflicts';
+export interface CascadeResult {
+    rootStreamId: StreamId;
+    succeeded: StreamId[];
+    failed: Array<{
+        streamId: StreamId;
+        conflictId?: string;
+        error?: string;
+    }>;
+}
+/**
+ * Result of macro-agent's reconcile wrapper — handles both git-cascade's
+ * stream↔git sync and macro-level worktree/pool state.
+ */
+export interface MacroReconcileResult {
+    streamsChecked: number;
+    streamsFixed: number;
+    worktreesOrphaned: number;
+    worktreesCleaned: number;
+    poolEntriesPurged: number;
+    errors: Array<{
+        context: string;
+        message: string;
+    }>;
+}
+export interface LandingContext {
+    agentId: AgentId;
+    streamId: StreamId;
+    sourceWorktree: string;
+    targetStreamId?: StreamId;
+    strategyConfig?: Record<string, unknown>;
+    /** Reference to the manager; strategies call back for merge/cascade. */
+    workspaceManager: unknown;
+    /**
+     * Optional task reference inherited from the spawning agent. Strategies
+     * that produce commits/merges should thread this into their adapter
+     * calls' metadata as `{ task_ref }` so the resulting cascade events carry
+     * the binding.
+     */
+    taskRef?: import('git-cascade/events').TaskRef;
+}
+export interface LandingStrategy {
+    readonly name: string;
+    canLand?(ctx: LandingContext): boolean;
+    land(ctx: LandingContext): Promise<MergeResult>;
+    initialize?(): Promise<void>;
+    close?(): Promise<void>;
+}
+/**
+ * Opaque branded marker — use for inferring that something is a v3 concept.
+ * Only used in documentation / type exports; no runtime effect.
+ */
+export declare const V3_MARKER: unique symbol;
+//# sourceMappingURL=types-v3.d.ts.map

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

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

package/dist/workspace/types-v3.js

@@ -0,0 +1,20 @@
+/**
+ * Workspace V3 Types — stream-first primitives.
+ *
+ * These types supplement the legacy role-shaped `types.ts` for the redesigned
+ * workspace layer (see `docs/workspace-interfaces.md`). Once the migration is
+ * complete (Phase 9), these merge back into `types.ts` and the V3 prefix is
+ * dropped.
+ *
+ * @module workspace/types-v3
+ */
+export const isPseudoAgentId = (p) => p.startsWith('team:') || p.startsWith('system:');
+// ─────────────────────────────────────────────────────────────────────────────
+// Helpers
+// ─────────────────────────────────────────────────────────────────────────────
+/**
+ * Opaque branded marker — use for inferring that something is a v3 concept.
+ * Only used in documentation / type exports; no runtime effect.
+ */
+export const V3_MARKER = Symbol('workspace.v3');
+//# sourceMappingURL=types-v3.js.map

package/dist/workspace/types-v3.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types-v3.js","sourceRoot":"","sources":["../../src/workspace/types-v3.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AA+BH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,CAAY,EAAsB,EAAE,CAClE,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;AAyGnD,gFAAgF;AAChF,UAAU;AACV,gFAAgF;AAEhF;;;GAGG;AACH,MAAM,CAAC,MAAM,SAAS,GAAkB,MAAM,CAAC,cAAc,CAAC,CAAC"}