macro-agent 0.1.1 → 0.1.2

package/src/teams/types.ts

@@ -1,9 +1,8 @@
 /**
  * Team Template Types
  *
- * TypeScript types for the team manifest schema. Generic multi-agent fields
- * (name, roles, topology, communication) are separated from macro-agent
- * specific extensions under the `macro_agent` namespace for interoperability.
+ * Imports generic multi-agent schema types from openteams and extends them
+ * with macro-agent specific runtime types (extensions, resolved roles, errors).
  *
  * @module teams/types
  */
@@ -11,171 +10,108 @@
 import type { RoleDefinition, Capability } from "../roles/types.js";
 
 // =============================================================================
-// Core Manifest
+// Imports from openteams (canonical schema types)
 // =============================================================================
 
-/**
- * Fully resolved team manifest.
- *
- * Returned by TeamLoader.load() with all inheritance resolved,
- * capabilities computed, and prompts loaded.
- */
-export interface TeamManifest {
-  /** Team name (directory name) */
-  name: string;
-
-  /** Human-readable description */
-  description: string;
-
-  /** Schema version */
-  version: number;
-
-  /** Role names used by this team */
-  roles: string[];
-
-  /** Agent spawn topology */
-  topology: TeamTopology;
-
-  /** Communication topology */
-  communication: TeamCommunication;
-
-  /** macro-agent specific extensions */
-  macro_agent: MacroAgentExtensions;
-
-  // ─────────────────────────────────────────────────────────────
-  // Resolved state (populated by TeamLoader, not in YAML)
-  // ─────────────────────────────────────────────────────────────
-
-  /** Resolved role definitions keyed by role name */
-  _resolvedRoles: Map<string, ResolvedTeamRole>;
-
-  /** Loaded prompt contents keyed by file path */
-  _loadedPrompts: Map<string, string>;
-
-  /** Loaded MCP server configs keyed by role name */
-  _mcpServers: Map<string, McpServerEntry[]>;
-}
+import type {
+  TeamManifest as OpenTeamsManifest,
+  TopologyConfig,
+  TopologyNode,
+  TopologyNodeConfig,
+  CommunicationConfig,
+  ChannelDefinition,
+  SubscriptionEntry,
+  RoutingConfig,
+  PeerRoute,
+  RoleDefinition as OpenTeamsRoleDefinition,
+  CapabilityComposition,
+  McpServerEntry,
+  ResolvedTemplate,
+  ResolvedRole,
+  ResolvedPrompts,
+  PromptSection,
+} from "openteams";
 
 // =============================================================================
-// Topology
+// Re-exports from openteams
 // =============================================================================
 
-/**
- * Defines the agent spawn graph for the team.
- */
-export interface TeamTopology {
-  /** The initial agent spawned when the team starts */
-  root: TopologyNode;
-
-  /** Agents spawned alongside root (peers, not children) */
-  companions?: TopologyNode[];
-
-  /**
-   * Which roles can spawn which other roles.
-   * Translated into capability additions by TeamLoader (RD3).
-   */
-  spawn_rules?: Record<string, string[]>;
-}
-
-/**
- * A node in the team's spawn topology.
- */
-export interface TopologyNode {
-  /** Role name (must be in manifest.roles) */
-  role: string;
-
-  /** Path to prompt file relative to team directory */
-  prompt?: string;
-
-  /** Agent configuration */
-  config?: TopologyNodeConfig;
-}
-
-export interface TopologyNodeConfig {
-  /** Model to use (e.g., "sonnet", "haiku", "opus") */
-  model?: string;
-
-  /** Additional key-value config passed to agent */
-  [key: string]: unknown;
-}
+export type {
+  OpenTeamsManifest,
+  TopologyConfig,
+  TopologyNode,
+  TopologyNodeConfig,
+  CommunicationConfig,
+  ChannelDefinition,
+  SubscriptionEntry,
+  RoutingConfig,
+  PeerRoute,
+  OpenTeamsRoleDefinition,
+  CapabilityComposition,
+  McpServerEntry,
+  ResolvedTemplate,
+  ResolvedRole,
+  ResolvedPrompts,
+  PromptSection,
+};
 
 // =============================================================================
-// Communication
+// Backward-Compatible Aliases
 // =============================================================================
 
-/**
- * Communication topology for the team.
- *
- * Declares channels (signal groups), per-role subscriptions,
- * emission restrictions, and routing rules.
- */
-export interface TeamCommunication {
-  /** Named signal channels */
-  channels?: Record<string, ChannelDefinition>;
+/** @deprecated Use TopologyConfig from openteams */
+export type TeamTopology = TopologyConfig;
 
-  /** Per-role subscription declarations */
-  subscriptions?: Record<string, ChannelSubscription[]>;
+/** @deprecated Use CommunicationConfig from openteams */
+export type TeamCommunication = CommunicationConfig;
 
-  /** Per-role emission declarations (which signals a role can emit) */
-  emissions?: Record<string, string[]>;
+/** @deprecated Use SubscriptionEntry from openteams */
+export type ChannelSubscription = SubscriptionEntry;
 
-  /** Routing configuration */
-  routing?: CommunicationRouting;
+/** @deprecated Use RoutingConfig from openteams (now includes "none" status) */
+export type CommunicationRouting = RoutingConfig;
 
-  /** Enforcement level for communication rules */
-  enforcement?: CommunicationEnforcement;
-}
+/** @deprecated Use PeerRoute from openteams */
+export type PeerConnection = PeerRoute;
 
+/** Communication enforcement level */
 export type CommunicationEnforcement = "strict" | "permissive" | "audit";
 
-/**
- * A named channel grouping related signals.
- */
-export interface ChannelDefinition {
-  /** Human-readable description */
-  description?: string;
+/** @deprecated Use OpenTeamsRoleDefinition from openteams */
+export type TeamRoleDefinition = OpenTeamsRoleDefinition;
 
-  /** Signals in this channel */
-  signals: string[];
-}
+// =============================================================================
+// Core Manifest (macro-agent extension of openteams)
+// =============================================================================
 
 /**
- * A role's subscription to a channel.
+ * Fully resolved team manifest for macro-agent.
+ *
+ * Extends the openteams manifest with typed macro_agent extensions
+ * and resolved state fields populated by TeamLoader.
  */
-export interface ChannelSubscription {
-  /** Channel name (must exist in communication.channels) */
-  channel: string;
-
-  /** Specific signals to receive. If omitted, receives all signals in the channel */
-  signals?: string[];
-}
+export interface TeamManifest extends OpenTeamsManifest {
+  /** Human-readable description */
+  description: string;
 
-/**
- * Communication routing configuration.
- */
-export interface CommunicationRouting {
-  /** Status flow direction */
-  status?: "upstream";
+  /** Communication topology (required in macro-agent) */
+  communication: CommunicationConfig;
 
-  /** Explicit peer connections (non-hierarchical) */
-  peers?: PeerConnection[];
-}
+  /** macro-agent specific extensions */
+  macro_agent: MacroAgentExtensions;
 
-/**
- * A peer-to-peer connection between two roles.
- */
-export interface PeerConnection {
-  /** Source role name */
-  from: string;
+  // ─────────────────────────────────────────────────────────────
+  // Resolved state (populated by TeamLoader, not in YAML)
+  // ─────────────────────────────────────────────────────────────
 
-  /** Target role name */
-  to: string;
+  /** Resolved role definitions keyed by role name */
+  _resolvedRoles: Map<string, ResolvedTeamRole>;
 
-  /** Routing mechanism */
-  via: "direct" | "topic" | "scope";
+  /** Loaded prompt contents keyed by file path */
+  _loadedPrompts: Map<string, string>;
 
-  /** Signals allowed on this connection */
-  signals?: string[];
+  /** Loaded MCP server configs keyed by role name */
+  _mcpServers: Map<string, McpServerEntry[]>;
 }
 
 // =============================================================================
@@ -199,6 +135,9 @@ export interface MacroAgentExtensions {
 
   /** Observability configuration */
   observability?: ObservabilityConfig;
+
+  /** Allow extension fields for interop with openteams Record<string, unknown> */
+  [key: string]: unknown;
 }
 
 export interface TaskAssignmentConfig {
@@ -249,52 +188,9 @@ export interface ObservabilityConfig {
 }
 
 // =============================================================================
-// Team Role Definition
+// Team Role macro-agent Config
 // =============================================================================
 
-/**
- * Role definition as declared in a team template's roles/*.yaml file.
- *
- * Supports both full replacement and additive/subtractive capability composition.
- */
-export interface TeamRoleDefinition {
-  /** Role name */
-  name: string;
-
-  /** Built-in role to extend */
-  extends?: string;
-
-  /** Display name for UI/logs */
-  display_name?: string;
-
-  /** Human-readable description */
-  description?: string;
-
-  /**
-   * Full replacement capability list.
-   * Mutually exclusive with add/remove.
-   */
-  capabilities?: string[];
-
-  /**
-   * Capabilities to add to the parent role's set.
-   * Only valid when `extends` is set.
-   */
-  capabilities_add?: string[];
-
-  /**
-   * Capabilities to remove from the parent role's set.
-   * Only valid when `extends` is set.
-   */
-  capabilities_remove?: string[];
-
-  /** Path to prompt file relative to team directory */
-  prompt?: string;
-
-  /** macro-agent specific role configuration */
-  macro_agent?: TeamRoleMacroAgent;
-}
-
 export interface TeamRoleMacroAgent {
   /** Workspace configuration */
   workspace?: {
@@ -318,6 +214,24 @@ export interface TeamRoleMacroAgent {
 // Resolved Types
 // =============================================================================
 
+/**
+ * macro-agent's enriched team resolution result.
+ *
+ * Wraps openteams' ResolvedTemplate with enforcement-enriched roles
+ * and typed macro-agent extensions. Produced by loadTeam(), consumed
+ * by TeamRuntime.
+ */
+export interface MacroResolvedTemplate {
+  /** openteams resolved template (manifest + generic roles + prompts + mcpServers) */
+  template: ResolvedTemplate;
+
+  /** Enforcement-enriched roles mapped to macro-agent's RoleDefinition */
+  resolvedRoles: Map<string, ResolvedTeamRole>;
+
+  /** Parsed macro-agent extensions (typed from manifest.macro_agent) */
+  macroAgent: MacroAgentExtensions;
+}
+
 /**
  * A team role with inheritance resolved and capabilities computed.
  */
@@ -338,21 +252,6 @@ export interface ResolvedTeamRole {
   roleDefinition: RoleDefinition;
 }
 
-// =============================================================================
-// MCP Server Config
-// =============================================================================
-
-/**
- * MCP server entry from tools/mcp-servers.json.
- * Follows Claude Code's native format.
- */
-export interface McpServerEntry {
-  name: string;
-  command: string;
-  args?: string[];
-  env?: Record<string, string>;
-}
-
 // =============================================================================
 // Team Loading Errors
 // =============================================================================