macro-agent 0.1.11 → 0.2.0

package/src/teams/seed-defaults.ts

@@ -13,9 +13,13 @@ import * as path from "path";
 import { fileURLToPath } from "url";
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
-// Package root: up from src/teams/ → src/ → package root
+// Package root: up from src/teams/ → src/ → package root.
+// Bundled templates live under `templates/teams/` so they're clearly shipped
+// assets (not confused with user runtime config, which lives at
+// `<project>/.multiagent/teams/` — a gitignored directory that this module
+// seeds INTO on first use).
 const PACKAGE_ROOT = path.resolve(__dirname, "..", "..");
-const BUNDLED_TEAMS_DIR = path.join(PACKAGE_ROOT, ".multiagent", "teams");
+const BUNDLED_TEAMS_DIR = path.join(PACKAGE_ROOT, "templates", "teams");
 const TEAMS_DIR = ".multiagent/teams";
 
 /**

package/src/teams/team-loader.ts

@@ -7,7 +7,9 @@
  * @module teams/team-loader
  */
 
+import * as fs from "fs";
 import * as path from "path";
+import { fileURLToPath } from "url";
 import { TemplateLoader } from "openteams";
 import type {
   ResolvedRole,
@@ -29,6 +31,15 @@ import {
 
 const TEAMS_DIR = ".multiagent/teams";
 
+// Bundled team templates shipped with the macro-agent package. Used as a
+// fallback when a team name isn't present in the user's `.multiagent/teams/`
+// — so a fresh project can `startTeam('self-driving', cwd)` without first
+// running the seed step. User-local copies always win when present.
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const PACKAGE_ROOT = path.resolve(__dirname, "..", "..");
+const BUNDLED_TEAMS_DIR = path.join(PACKAGE_ROOT, "templates", "teams");
+
 // =============================================================================
 // TeamLoader
 // =============================================================================
@@ -51,7 +62,13 @@ export async function loadTeam(
   basePath?: string
 ): Promise<TeamManifest> {
   const root = basePath ?? process.cwd();
-  const teamDir = path.join(root, TEAMS_DIR, teamName);
+  const userTeamDir = path.join(root, TEAMS_DIR, teamName);
+  // Prefer a user-customised template; fall back to the bundled default
+  // shipped under `<package>/templates/teams/<name>/`. This lets fresh
+  // projects use built-in teams without an explicit seed step, while
+  // still honouring per-project overrides.
+  const bundledTeamDir = path.join(BUNDLED_TEAMS_DIR, teamName);
+  const teamDir = fs.existsSync(userTeamDir) ? userTeamDir : bundledTeamDir;
 
   // 1. Load via openteams TemplateLoader with hooks
   let template;
@@ -67,7 +84,9 @@ export async function loadTeam(
 
   const manifest = template.manifest;
   const communication = (manifest.communication ?? {}) as CommunicationConfig;
-  const macroAgent = parseMacroAgentExtensions(manifest.macro_agent);
+  const macroAgent = parseMacroAgentExtensions(
+    manifest.macro_agent as Record<string, unknown> | undefined,
+  );
 
   // 2. Build enforcement-enriched roles
   const resolvedRoles = new Map<string, ResolvedTeamRole>();

package/src/teams/team-runtime-v2.ts

@@ -63,6 +63,8 @@ function manifestToResolved(manifest: TeamManifest): MacroResolvedTemplate {
       roles: new Map(),
       prompts: new Map(),
       mcpServers: manifest._mcpServers,
+      mcpProviders: new Map(),
+      loadouts: new Map(),
       sourcePath: "",
     },
     resolvedRoles: manifest._resolvedRoles,

package/src/workspace/__tests__/self-driving-yaml.test.ts

@@ -19,9 +19,17 @@ import type { WorkspaceManager } from '../types.js';
 import { vi } from 'vitest';
 
 describe('self-driving team YAML (V3 migration)', () => {
+  // Resolve relative to this test file so the path is cwd-independent and
+  // points at the shipped package asset (not a user-runtime copy under
+  // <project>/.multiagent/ — that only exists after `seed-defaults` runs).
+  // `src/workspace/__tests__/` → `../../../` → package root.
+  const PACKAGE_ROOT = path.resolve(
+    path.dirname(new URL(import.meta.url).pathname),
+    '..', '..', '..'
+  );
   const yamlPath = path.join(
-    process.cwd(),
-    '.multiagent/teams/self-driving/team.yaml'
+    PACKAGE_ROOT,
+    'templates/teams/self-driving/team.yaml'
   );
 
   it('exists on disk', () => {

package/templates/teams/self-driving/team.yaml

@@ -0,0 +1,142 @@
+name: self-driving
+description: "Cursor-style autonomous codebase development: planners explore and create tasks, grinders claim and execute in their own streams, judges evaluate quality."
+version: 1
+
+# ─────────────────────────────────────────────────────────────
+# Roles
+# ─────────────────────────────────────────────────────────────
+roles:
+  - planner
+  - grinder
+  - judge
+
+# ─────────────────────────────────────────────────────────────
+# Topology
+# ─────────────────────────────────────────────────────────────
+topology:
+  root:
+    role: planner
+    prompt: prompts/planner.md
+    config:
+      model: sonnet
+  companions:
+    - role: judge
+      prompt: prompts/judge.md
+      config:
+        model: haiku
+  spawn_rules:
+    planner: [grinder, planner]
+    judge: []
+    grinder: []
+
+# ─────────────────────────────────────────────────────────────
+# Communication
+# ─────────────────────────────────────────────────────────────
+communication:
+  enforcement: permissive
+
+  channels:
+    task_updates:
+      description: "Task lifecycle events"
+      signals: [TASK_CREATED, TASK_COMPLETED, TASK_FAILED]
+    work_coordination:
+      description: "Work assignment and completion"
+      signals: [WORK_ASSIGNED, WORKER_DONE, MERGE_REQUEST]
+    health:
+      description: "System health monitoring"
+      signals: [HEALTH_CHECK, METRIC_SNAPSHOT, GREEN_SNAPSHOT, FIXUP_CREATED]
+
+  subscriptions:
+    planner:
+      - channel: task_updates
+      - channel: work_coordination
+        signals: [WORKER_DONE]
+      - channel: health
+        signals: [METRIC_SNAPSHOT, GREEN_SNAPSHOT, FIXUP_CREATED]
+    judge:
+      - channel: task_updates
+        signals: [TASK_FAILED]
+      - channel: work_coordination
+        signals: [WORKER_DONE]
+      - channel: health
+    grinder:
+      - channel: work_coordination
+        signals: [WORK_ASSIGNED]
+
+  emissions:
+    planner: [TASK_CREATED, WORK_ASSIGNED, PLANNING_COMPLETE]
+    judge: [HEALTH_CHECK, GREEN_SNAPSHOT, FIXUP_CREATED]
+    grinder: [WORKER_DONE]
+
+  routing:
+    peers:
+      - from: judge
+        to: planner
+        via: direct
+        signals: [FIXUP_CREATED, GREEN_SNAPSHOT]
+      - from: planner
+        to: judge
+        via: direct
+        signals: [CONVERGENCE_CHECK]
+
+# ─────────────────────────────────────────────────────────────
+# macro-agent specific extensions
+# ─────────────────────────────────────────────────────────────
+macro_agent:
+  # V3 stream-first workspace topology.
+  # Compiled by YamlDrivenTopology into per-spawn WorkspaceDecision values.
+  workspace:
+    default_stream:
+      fork_from: main
+      name_template: "{team}"
+      change_id_tracking: true
+
+    on_team_complete: keep
+
+    roles:
+      # Planner shares the team root stream — continuous exploration lives on the
+      # same branch as the team's accumulated work; no per-planner fork.
+      planner:
+        workspace: attach_to_team_root
+        capabilities:
+          - workspace.read
+          - agent.spawn
+
+      # Grinders fork their own stream off the team root, land via direct-push
+      # (trunk integration). A conflict during landing aborts and leaves the
+      # stream for human / judge review.
+      grinder:
+        workspace: new_stream
+        stream_lineage: fork_from_team_root
+        landing: direct_push
+        on_conflict: defer
+        capabilities:
+          - workspace.commit
+          - workspace.land
+
+      # Judge is read-only — it observes repo state but doesn't need a
+      # workspace of its own.
+      judge:
+        workspace: none
+        capabilities:
+          - workspace.read
+
+  # Declarative shorthand read by TeamRuntimeV2.getStrategyName(). `trunk`
+  # pairs with the grinder's direct_push landing above: every task lands
+  # straight onto the team-root stream rather than going through a merge
+  # queue. Kept here as a top-level scalar so runtimes that don't parse the
+  # full V3 workspace block (env-var consumers, logs, metrics labels) still
+  # see the integration strategy.
+  integration:
+    strategy: trunk
+
+  task_assignment:
+    mode: pull
+    pull:
+      idle_timeout_s: 300
+      claim_retry_delay_ms: 2000
+      max_concurrent_per_agent: 1
+
+  observability:
+    metrics_window_s: 3600
+    snapshot_interval_s: 300

package/tsconfig.json

@@ -13,7 +13,8 @@
     "declaration": true,
     "declarationMap": true,
     "sourceMap": true,
-    "resolveJsonModule": true
+    "resolveJsonModule": true,
+    "types": ["node", "better-sqlite3", "express", "js-yaml", "supertest", "ws"]
   },
   "include": ["src/**/*"],
   "exclude": ["node_modules", "dist", "**/*.test.ts"]