diff --git a/src/orchestrator/orchestrator.ts b/src/orchestrator/orchestrator.ts index 8b0073d..169741d 100644 --- a/src/orchestrator/orchestrator.ts +++ b/src/orchestrator/orchestrator.ts @@ -64,6 +64,7 @@ import { TaskQueue } from '../task/queue.js' import { createTask } from '../task/task.js' import { Scheduler } from './scheduler.js' import { TokenBudgetExceededError } from '../errors.js' +import { extractKeywords, keywordScore } from '../utils/keywords.js' // --------------------------------------------------------------------------- // Internal constants @@ -73,6 +74,119 @@ const ZERO_USAGE: TokenUsage = { input_tokens: 0, output_tokens: 0 } const DEFAULT_MAX_CONCURRENCY = 5 const DEFAULT_MODEL = 'claude-opus-4-6' +// --------------------------------------------------------------------------- +// Short-circuit helpers (exported for testability) +// --------------------------------------------------------------------------- + +/** + * Regex patterns that indicate a goal requires multi-agent coordination. + * + * Each pattern targets a distinct complexity signal: + * - Sequencing: "first … then", "step 1 / step 2", numbered lists + * - Coordination: "collaborate", "coordinate", "review each other" + * - Parallel work: "in parallel", "at the same time", "concurrently" + * - Multi-phase: "phase", "stage", multiple distinct action verbs joined by connectives + */ +const COMPLEXITY_PATTERNS: RegExp[] = [ + // Explicit sequencing + /\bfirst\b.{3,60}\bthen\b/i, + /\bstep\s*\d/i, + /\bphase\s*\d/i, + /\bstage\s*\d/i, + /^\s*\d+[\.\)]/m, // numbered list items ("1. …", "2) …") + + // Coordination language — must be an imperative directive aimed at the agents + // ("collaborate with X", "coordinate the team", "agents should coordinate"), + // not a descriptive use ("how does X coordinate with Y" / "what does collaboration mean"). + // Match either an explicit preposition or a noun-phrase that names a group. + /\bcollaborat(?:e|ing)\b\s+(?:with|on|to)\b/i, + /\bcoordinat(?:e|ing)\b\s+(?:with|on|across|between|the\s+(?:team|agents?|workers?|effort|work))\b/i, + /\breview\s+each\s+other/i, + /\bwork\s+together\b/i, + + // Parallel execution + /\bin\s+parallel\b/i, + /\bconcurrently\b/i, + /\bat\s+the\s+same\s+time\b/i, + + // Multiple deliverables joined by connectives + // Matches patterns like "build X, then deploy Y and test Z" + /\b(?:build|create|implement|design|write|develop)\b.{5,80}\b(?:and|then)\b.{5,80}\b(?:build|create|implement|design|write|develop|test|review|deploy)\b/i, +] + + +/** + * Maximum goal length (in characters) below which a goal *may* be simple. + * + * Goals longer than this threshold almost always contain enough detail to + * warrant multi-agent decomposition. The value is generous — short-circuit + * is meant for genuinely simple, single-action goals. + */ +const SIMPLE_GOAL_MAX_LENGTH = 200 + +/** + * Determine whether a goal is simple enough to skip coordinator decomposition. + * + * A goal is considered "simple" when ALL of the following hold: + * 1. Its length is ≤ {@link SIMPLE_GOAL_MAX_LENGTH}. + * 2. It does not match any {@link COMPLEXITY_PATTERNS}. + * + * The complexity patterns are deliberately conservative — they only fire on + * imperative coordination directives (e.g. "collaborate with the team", + * "coordinate the workers"), so descriptive uses ("how do pods coordinate + * state", "explain microservice collaboration") remain classified as simple. + * + * Exported for unit testing. + */ +export function isSimpleGoal(goal: string): boolean { + if (goal.length > SIMPLE_GOAL_MAX_LENGTH) return false + return !COMPLEXITY_PATTERNS.some((re) => re.test(goal)) +} + +/** + * Select the best-matching agent for a goal using keyword affinity scoring. + * + * The scoring logic mirrors {@link Scheduler}'s `capability-match` strategy + * exactly, including its asymmetric use of the agent's `model` field: + * + * - `agentKeywords` is computed from `name + systemPrompt + model` so that + * a goal which mentions a model name (e.g. "haiku") can boost an agent + * bound to that model. + * - `agentText` (used for the reverse direction) is computed from + * `name + systemPrompt` only — model names should not bias the + * text-vs-goal-keywords match. + * + * The two-direction sum (`scoreA + scoreB`) ensures both "agent describes + * goal" and "goal mentions agent capability" contribute to the final score. + * + * Exported for unit testing. + */ +export function selectBestAgent(goal: string, agents: AgentConfig[]): AgentConfig { + if (agents.length <= 1) return agents[0]! + + const goalKeywords = extractKeywords(goal) + + let bestAgent = agents[0]! + let bestScore = -1 + + for (const agent of agents) { + const agentText = `${agent.name} ${agent.systemPrompt ?? ''}` + // Mirror Scheduler.capability-match: include `model` here only. + const agentKeywords = extractKeywords(`${agent.name} ${agent.systemPrompt ?? ''} ${agent.model}`) + + const scoreA = keywordScore(agentText, goalKeywords) + const scoreB = keywordScore(goal, agentKeywords) + const score = scoreA + scoreB + + if (score > bestScore) { + bestScore = score + bestAgent = agent + } + } + + return bestAgent +} + // --------------------------------------------------------------------------- // Internal helpers // --------------------------------------------------------------------------- @@ -624,7 +738,11 @@ export class OpenMultiAgent { * @param config - Agent configuration. * @param prompt - The user prompt to send. */ - async runAgent(config: AgentConfig, prompt: string): Promise { + async runAgent( + config: AgentConfig, + prompt: string, + options?: { abortSignal?: AbortSignal }, + ): Promise { const effectiveBudget = resolveTokenBudget(config.maxTokenBudget, this.config.maxTokenBudget) const effective: AgentConfig = { ...config, @@ -640,11 +758,22 @@ export class OpenMultiAgent { data: { prompt }, }) - const traceOptions: Partial | undefined = this.config.onTrace - ? { onTrace: this.config.onTrace, runId: generateRunId(), traceAgent: config.name } - : undefined + // Build run-time options: trace + optional abort signal. RunOptions has + // readonly fields, so we assemble the literal in one shot. + const traceFields = this.config.onTrace + ? { + onTrace: this.config.onTrace, + runId: generateRunId(), + traceAgent: config.name, + } + : null + const abortFields = options?.abortSignal ? { abortSignal: options.abortSignal } : null + const runOptions: Partial | undefined = + traceFields || abortFields + ? { ...(traceFields ?? {}), ...(abortFields ?? {}) } + : undefined - const result = await agent.run(prompt, traceOptions) + const result = await agent.run(prompt, runOptions) if (result.budgetExceeded) { this.config.onProgress?.({ @@ -699,6 +828,44 @@ export class OpenMultiAgent { async runTeam(team: Team, goal: string, options?: { abortSignal?: AbortSignal }): Promise { const agentConfigs = team.getAgents() + // ------------------------------------------------------------------ + // Short-circuit: skip coordinator for simple, single-action goals. + // + // When the goal is short and contains no multi-step / coordination + // signals, dispatching it to a single agent is faster and cheaper + // than spinning up a coordinator for decomposition + synthesis. + // + // The best-matching agent is selected via keyword affinity scoring + // (same algorithm as the `capability-match` scheduler strategy). + // ------------------------------------------------------------------ + if (agentConfigs.length > 0 && isSimpleGoal(goal)) { + const bestAgent = selectBestAgent(goal, agentConfigs) + + this.config.onProgress?.({ + type: 'agent_start', + agent: bestAgent.name, + data: { phase: 'short-circuit', goal }, + }) + + // Forward the caller's abort signal so short-circuit honours the same + // cancellation contract as the full coordinator path. + const result = await this.runAgent( + bestAgent, + goal, + options?.abortSignal ? { abortSignal: options.abortSignal } : undefined, + ) + const agentResults = new Map() + agentResults.set(bestAgent.name, result) + + this.config.onProgress?.({ + type: 'agent_complete', + agent: bestAgent.name, + data: { phase: 'short-circuit', result }, + }) + + return this.buildTeamRunResult(agentResults) + } + // ------------------------------------------------------------------ // Step 1: Coordinator decomposes goal into tasks // ------------------------------------------------------------------ diff --git a/src/orchestrator/scheduler.ts b/src/orchestrator/scheduler.ts index 93d64ac..c3805c8 100644 --- a/src/orchestrator/scheduler.ts +++ b/src/orchestrator/scheduler.ts @@ -15,6 +15,7 @@ import type { AgentConfig, Task } from '../types.js' import type { TaskQueue } from '../task/queue.js' +import { extractKeywords, keywordScore } from '../utils/keywords.js' // --------------------------------------------------------------------------- // Public types @@ -74,38 +75,6 @@ function countBlockedDependents(taskId: string, allTasks: Task[]): number { return visited.size } -/** - * Compute a simple keyword-overlap score between `text` and `keywords`. - * - * Both the text and keywords are normalised to lower-case before comparison. - * Each keyword that appears in the text contributes +1 to the score. - */ -function keywordScore(text: string, keywords: string[]): number { - const lower = text.toLowerCase() - return keywords.reduce((acc, kw) => acc + (lower.includes(kw.toLowerCase()) ? 1 : 0), 0) -} - -/** - * Extract a list of meaningful keywords from a string for capability matching. - * - * Strips common stop-words so that incidental matches (e.g. "the", "and") do - * not inflate scores. Returns unique words longer than three characters. - */ -function extractKeywords(text: string): string[] { - const STOP_WORDS = new Set([ - 'the', 'and', 'for', 'that', 'this', 'with', 'are', 'from', 'have', - 'will', 'your', 'you', 'can', 'all', 'each', 'when', 'then', 'they', - 'them', 'their', 'about', 'into', 'more', 'also', 'should', 'must', - ]) - - return [...new Set( - text - .toLowerCase() - .split(/\W+/) - .filter((w) => w.length > 3 && !STOP_WORDS.has(w)), - )] -} - // --------------------------------------------------------------------------- // Scheduler // --------------------------------------------------------------------------- diff --git a/src/utils/keywords.ts b/src/utils/keywords.ts new file mode 100644 index 0000000..247a6c4 --- /dev/null +++ b/src/utils/keywords.ts @@ -0,0 +1,39 @@ +/** + * Shared keyword-affinity helpers used by capability-match scheduling + * and short-circuit agent selection. Kept in one place so behaviour + * can't drift between Scheduler and Orchestrator. + */ + +export const STOP_WORDS: ReadonlySet = new Set([ + 'the', 'and', 'for', 'that', 'this', 'with', 'are', 'from', 'have', + 'will', 'your', 'you', 'can', 'all', 'each', 'when', 'then', 'they', + 'them', 'their', 'about', 'into', 'more', 'also', 'should', 'must', +]) + +/** + * Tokenise `text` into a deduplicated set of lower-cased keywords. + * Words shorter than 4 characters and entries in {@link STOP_WORDS} + * are filtered out. + */ +export function extractKeywords(text: string): string[] { + return [ + ...new Set( + text + .toLowerCase() + .split(/\W+/) + .filter((w) => w.length > 3 && !STOP_WORDS.has(w)), + ), + ] +} + +/** + * Count how many `keywords` appear (case-insensitively) in `text`. + * Each keyword contributes at most 1 to the score. + */ +export function keywordScore(text: string, keywords: readonly string[]): number { + const lower = text.toLowerCase() + return keywords.reduce( + (acc, kw) => acc + (lower.includes(kw.toLowerCase()) ? 1 : 0), + 0, + ) +} diff --git a/tests/keywords.test.ts b/tests/keywords.test.ts new file mode 100644 index 0000000..599f4fa --- /dev/null +++ b/tests/keywords.test.ts @@ -0,0 +1,75 @@ +import { describe, it, expect } from 'vitest' +import { STOP_WORDS, extractKeywords, keywordScore } from '../src/utils/keywords.js' + +// Regression coverage for the shared keyword helpers extracted from +// orchestrator.ts and scheduler.ts (PR #70 review point 1). +// +// These tests pin behaviour so future drift between Scheduler and the +// short-circuit selector is impossible — any edit must update the shared +// module and these tests at once. + +describe('utils/keywords', () => { + describe('STOP_WORDS', () => { + it('contains all 26 stop words', () => { + // Sanity-check the canonical list — if anyone adds/removes a stop word + // they should also update this assertion. + expect(STOP_WORDS.size).toBe(26) + }) + + it('includes "then" and "and" so they cannot dominate scoring', () => { + expect(STOP_WORDS.has('then')).toBe(true) + expect(STOP_WORDS.has('and')).toBe(true) + }) + }) + + describe('extractKeywords', () => { + it('lowercases and dedupes', () => { + const out = extractKeywords('TypeScript typescript TYPESCRIPT') + expect(out).toEqual(['typescript']) + }) + + it('drops words shorter than 4 characters', () => { + const out = extractKeywords('a bb ccc dddd eeeee') + expect(out).toEqual(['dddd', 'eeeee']) + }) + + it('drops stop words', () => { + const out = extractKeywords('the cat and the dog have meals') + // 'cat', 'dog', 'have' filtered: 'cat'/'dog' too short, 'have' is a stop word + expect(out).toEqual(['meals']) + }) + + it('splits on non-word characters', () => { + const out = extractKeywords('hello,world!writer-mode') + expect(out.sort()).toEqual(['hello', 'mode', 'world', 'writer']) + }) + + it('returns empty array for empty input', () => { + expect(extractKeywords('')).toEqual([]) + }) + }) + + describe('keywordScore', () => { + it('counts each keyword at most once', () => { + // 'code' appears twice in the text but contributes 1 + expect(keywordScore('code review code style', ['code'])).toBe(1) + }) + + it('is case-insensitive', () => { + expect(keywordScore('TYPESCRIPT', ['typescript'])).toBe(1) + expect(keywordScore('typescript', ['TYPESCRIPT'])).toBe(1) + }) + + it('returns 0 when no keywords match', () => { + expect(keywordScore('hello world', ['rust', 'go'])).toBe(0) + }) + + it('sums distinct keyword hits', () => { + expect(keywordScore('write typescript code for the api', ['typescript', 'code', 'rust'])).toBe(2) + }) + + it('returns 0 for empty keywords array', () => { + expect(keywordScore('any text', [])).toBe(0) + }) + }) +}) diff --git a/tests/orchestrator.test.ts b/tests/orchestrator.test.ts index 41d8da3..b80f119 100644 --- a/tests/orchestrator.test.ts +++ b/tests/orchestrator.test.ts @@ -215,7 +215,7 @@ describe('OpenMultiAgent', () => { }) const team = oma.createTeam('t', teamCfg()) - const result = await oma.runTeam(team, 'Research AI safety') + const result = await oma.runTeam(team, 'First research AI safety best practices, then write a comprehensive implementation guide') expect(result.success).toBe(true) // Should have coordinator result @@ -233,7 +233,7 @@ describe('OpenMultiAgent', () => { const oma = new OpenMultiAgent({ defaultModel: 'mock-model' }) const team = oma.createTeam('t', teamCfg()) - const result = await oma.runTeam(team, 'Do something') + const result = await oma.runTeam(team, 'First design the database schema, then implement the REST API endpoints') expect(result.success).toBe(true) }) diff --git a/tests/short-circuit.test.ts b/tests/short-circuit.test.ts new file mode 100644 index 0000000..b1f13e2 --- /dev/null +++ b/tests/short-circuit.test.ts @@ -0,0 +1,432 @@ +import { describe, it, expect, vi, beforeEach } from 'vitest' +import { isSimpleGoal, selectBestAgent } from '../src/orchestrator/orchestrator.js' +import { OpenMultiAgent } from '../src/orchestrator/orchestrator.js' +import type { + AgentConfig, + LLMChatOptions, + LLMMessage, + LLMResponse, + OrchestratorEvent, + TeamConfig, +} from '../src/types.js' + +// --------------------------------------------------------------------------- +// isSimpleGoal — pure function tests +// --------------------------------------------------------------------------- + +describe('isSimpleGoal', () => { + describe('returns true for simple goals', () => { + const simpleGoals = [ + 'Say hello', + 'What is 2 + 2?', + 'Explain monads in one paragraph', + 'Translate this to French: Good morning', + 'List 3 blockchain security vulnerabilities', + 'Write a haiku about TypeScript', + 'Summarize this article', + '你好，回一个字：哈', + 'Fix the typo in the README', + ] + + for (const goal of simpleGoals) { + it(`"${goal}"`, () => { + expect(isSimpleGoal(goal)).toBe(true) + }) + } + }) + + describe('returns false for complex goals', () => { + it('goal with explicit sequencing (first…then)', () => { + expect(isSimpleGoal('First design the API schema, then implement the endpoints')).toBe(false) + }) + + it('goal with numbered steps', () => { + expect(isSimpleGoal('1. Design the schema\n2. Implement the API\n3. Write tests')).toBe(false) + }) + + it('goal with step N pattern', () => { + expect(isSimpleGoal('Step 1: set up the project. Step 2: write the code.')).toBe(false) + }) + + it('goal with collaboration language', () => { + expect(isSimpleGoal('Collaborate on building a REST API with tests')).toBe(false) + }) + + it('goal with coordination language', () => { + expect(isSimpleGoal('Coordinate the team to build and deploy the service')).toBe(false) + }) + + it('goal with parallel execution', () => { + expect(isSimpleGoal('Run the linter and tests in parallel')).toBe(false) + }) + + it('goal with multiple deliverables (build…and…test)', () => { + expect(isSimpleGoal('Build the REST API endpoints and then write comprehensive integration tests for each one')).toBe(false) + }) + + it('goal exceeding max length', () => { + const longGoal = 'Explain the concept of ' + 'a'.repeat(200) + expect(isSimpleGoal(longGoal)).toBe(false) + }) + + it('goal with phase markers', () => { + expect(isSimpleGoal('Phase 1 is planning, phase 2 is execution')).toBe(false) + }) + + it('goal with "work together"', () => { + expect(isSimpleGoal('Work together to build the frontend and backend')).toBe(false) + }) + + it('goal with "review each other"', () => { + expect(isSimpleGoal('Write code and review each other\'s pull requests')).toBe(false) + }) + }) + + describe('edge cases', () => { + it('empty string is simple', () => { + expect(isSimpleGoal('')).toBe(true) + }) + + it('"and" alone does not trigger complexity', () => { + // Unlike the original turbo implementation, common words like "and" + // should NOT flag a goal as complex. + expect(isSimpleGoal('Pros and cons of TypeScript')).toBe(true) + }) + + it('"then" alone does not trigger complexity', () => { + expect(isSimpleGoal('What happened then?')).toBe(true) + }) + + it('"summarize" alone does not trigger complexity', () => { + expect(isSimpleGoal('Summarize the article about AI safety')).toBe(true) + }) + + it('"analyze" alone does not trigger complexity', () => { + expect(isSimpleGoal('Analyze this error log')).toBe(true) + }) + + it('goal exactly at length boundary (200) is simple if no patterns', () => { + const goal = 'x'.repeat(200) + expect(isSimpleGoal(goal)).toBe(true) + }) + + it('goal at 201 chars is complex', () => { + const goal = 'x'.repeat(201) + expect(isSimpleGoal(goal)).toBe(false) + }) + }) + + // ------------------------------------------------------------------------- + // Regression: tightened coordinate/collaborate regex (PR #70 review point 5) + // + // Descriptive uses of "coordinate" / "collaborate" / "collaboration" must + // NOT be flagged as complex — only imperative directives aimed at agents. + // ------------------------------------------------------------------------- + + describe('tightened coordinate/collaborate patterns', () => { + it('descriptive "how X coordinates" is simple', () => { + expect(isSimpleGoal('Explain how Kubernetes pods coordinate state')).toBe(true) + }) + + it('descriptive "collaboration" noun is simple', () => { + expect(isSimpleGoal('What is microservice collaboration?')).toBe(true) + }) + + it('descriptive "team that coordinates" is simple', () => { + expect(isSimpleGoal('Describe a team that coordinates releases')).toBe(true) + }) + + it('descriptive "without collaborating" is simple', () => { + expect(isSimpleGoal('Show how to deploy without collaborating')).toBe(true) + }) + + it('imperative "collaborate with X" is complex', () => { + expect(isSimpleGoal('Collaborate with the writer to draft a post')).toBe(false) + }) + + it('imperative "coordinate the team" is complex', () => { + expect(isSimpleGoal('Coordinate the team for release')).toBe(false) + }) + + it('imperative "coordinate across services" is complex', () => { + expect(isSimpleGoal('Coordinate across services to roll out the change')).toBe(false) + }) + }) +}) + +// --------------------------------------------------------------------------- +// selectBestAgent — keyword affinity scoring +// --------------------------------------------------------------------------- + +describe('selectBestAgent', () => { + it('selects agent whose systemPrompt best matches the goal', () => { + const agents: AgentConfig[] = [ + { name: 'researcher', model: 'test', systemPrompt: 'You are a research expert who analyzes data and writes reports' }, + { name: 'coder', model: 'test', systemPrompt: 'You are a software engineer who writes TypeScript code' }, + ] + + expect(selectBestAgent('Write TypeScript code for the API', agents)).toBe(agents[1]) + expect(selectBestAgent('Research the latest AI papers', agents)).toBe(agents[0]) + }) + + it('falls back to first agent when no keywords match', () => { + const agents: AgentConfig[] = [ + { name: 'alpha', model: 'test' }, + { name: 'beta', model: 'test' }, + ] + + expect(selectBestAgent('xyzzy', agents)).toBe(agents[0]) + }) + + it('returns the only agent when team has one member', () => { + const agents: AgentConfig[] = [ + { name: 'solo', model: 'test', systemPrompt: 'General purpose agent' }, + ] + + expect(selectBestAgent('anything', agents)).toBe(agents[0]) + }) + + it('considers agent name in scoring', () => { + const agents: AgentConfig[] = [ + { name: 'writer', model: 'test', systemPrompt: 'You help with tasks' }, + { name: 'reviewer', model: 'test', systemPrompt: 'You help with tasks' }, + ] + + // "review" should match "reviewer" agent name + expect(selectBestAgent('Review this pull request', agents)).toBe(agents[1]) + }) + + // ------------------------------------------------------------------------- + // Regression: model field asymmetry (PR #70 review point 2) + // + // selectBestAgent must mirror Scheduler.capability-match exactly: + // - agentKeywords includes `model` + // - agentText excludes `model` + // This means a goal that mentions a model name should boost the agent + // bound to that model (via scoreB), even if neither name nor system prompt + // contains the keyword. + // ------------------------------------------------------------------------- + it('matches scheduler asymmetry: model name in goal boosts the bound agent', () => { + const agents: AgentConfig[] = [ + // Distinct, non-overlapping prompts so neither one wins on scoreA + { name: 'a1', model: 'haiku-fast-model', systemPrompt: 'You handle quick lookups' }, + { name: 'a2', model: 'opus-deep-model', systemPrompt: 'You handle deep analysis' }, + ] + + // Mention "haiku" — this is only present in a1.model, so the bound + // agent should win because agentKeywords (which includes model) matches. + expect(selectBestAgent('Use the haiku model please', agents)).toBe(agents[0]) + }) +}) + +// --------------------------------------------------------------------------- +// runTeam short-circuit integration test +// --------------------------------------------------------------------------- + +let mockAdapterResponses: string[] = [] + +vi.mock('../src/llm/adapter.js', () => ({ + createAdapter: async () => { + let callIndex = 0 + return { + name: 'mock', + async chat(_msgs: LLMMessage[], options: LLMChatOptions): Promise { + const text = mockAdapterResponses[callIndex] ?? 'default mock response' + callIndex++ + return { + id: `resp-${callIndex}`, + content: [{ type: 'text', text }], + model: options.model ?? 'mock-model', + stop_reason: 'end_turn', + usage: { input_tokens: 10, output_tokens: 20 }, + } + }, + async *stream() { + yield { type: 'done' as const, data: {} } + }, + } + }, +})) + +function agentConfig(name: string, systemPrompt?: string): AgentConfig { + return { + name, + model: 'mock-model', + provider: 'openai', + systemPrompt: systemPrompt ?? `You are ${name}.`, + } +} + +function teamCfg(agents?: AgentConfig[]): TeamConfig { + return { + name: 'test-team', + agents: agents ?? [ + agentConfig('researcher', 'You research topics and analyze data'), + agentConfig('coder', 'You write TypeScript code'), + ], + sharedMemory: true, + } +} + +describe('runTeam short-circuit', () => { + beforeEach(() => { + mockAdapterResponses = [] + }) + + it('short-circuits simple goals to a single agent (no coordinator)', async () => { + // Only ONE response needed — no coordinator decomposition or synthesis + mockAdapterResponses = ['Direct answer without coordination'] + + const events: OrchestratorEvent[] = [] + const oma = new OpenMultiAgent({ + defaultModel: 'mock-model', + onProgress: (e) => events.push(e), + }) + const team = oma.createTeam('t', teamCfg()) + + const result = await oma.runTeam(team, 'Say hello') + + expect(result.success).toBe(true) + expect(result.agentResults.size).toBe(1) + // Should NOT have coordinator results — short-circuit bypasses it + expect(result.agentResults.has('coordinator')).toBe(false) + }) + + it('emits progress events for short-circuit path', async () => { + mockAdapterResponses = ['done'] + + const events: OrchestratorEvent[] = [] + const oma = new OpenMultiAgent({ + defaultModel: 'mock-model', + onProgress: (e) => events.push(e), + }) + const team = oma.createTeam('t', teamCfg()) + + await oma.runTeam(team, 'Say hello') + + const types = events.map(e => e.type) + expect(types).toContain('agent_start') + expect(types).toContain('agent_complete') + }) + + it('uses coordinator for complex goals', async () => { + // Complex goal — needs coordinator decomposition + execution + synthesis + mockAdapterResponses = [ + '```json\n[{"title": "Research", "description": "Research the topic", "assignee": "researcher"}]\n```', + 'Research results', + 'Final synthesis', + ] + + const oma = new OpenMultiAgent({ defaultModel: 'mock-model' }) + const team = oma.createTeam('t', teamCfg()) + + const result = await oma.runTeam( + team, + 'First research AI safety best practices, then write a comprehensive guide with code examples', + ) + + expect(result.success).toBe(true) + // Complex goal should go through coordinator + expect(result.agentResults.has('coordinator')).toBe(true) + }) + + it('selects best-matching agent for simple goals', async () => { + mockAdapterResponses = ['code result'] + + const events: OrchestratorEvent[] = [] + const oma = new OpenMultiAgent({ + defaultModel: 'mock-model', + onProgress: (e) => events.push(e), + }) + const team = oma.createTeam('t', teamCfg()) + + await oma.runTeam(team, 'Write TypeScript code') + + // Should pick 'coder' agent based on keyword match + const startEvent = events.find(e => e.type === 'agent_start') + expect(startEvent?.agent).toBe('coder') + }) + + // ------------------------------------------------------------------------- + // Regression: abortSignal forwarding (PR #70 review point 4) + // + // The short-circuit path must forward `options.abortSignal` from runTeam + // through to runAgent, otherwise simple-goal cancellations are silently + // ignored — a regression vs the full coordinator path which already + // honours the signal via PR #69. + // ------------------------------------------------------------------------- + it('forwards abortSignal from runTeam to runAgent in short-circuit path', async () => { + mockAdapterResponses = ['done'] + + const oma = new OpenMultiAgent({ defaultModel: 'mock-model' }) + const team = oma.createTeam('t', teamCfg()) + + // Spy on runAgent to capture the options argument + const runAgentSpy = vi.spyOn(oma, 'runAgent') + + const controller = new AbortController() + await oma.runTeam(team, 'Say hello', { abortSignal: controller.signal }) + + expect(runAgentSpy).toHaveBeenCalledTimes(1) + const callArgs = runAgentSpy.mock.calls[0]! + // Third positional arg must contain the same signal we passed in + expect(callArgs[2]).toBeDefined() + expect(callArgs[2]?.abortSignal).toBe(controller.signal) + }) + + it('runAgent invoked without abortSignal when caller omits it', async () => { + mockAdapterResponses = ['done'] + + const oma = new OpenMultiAgent({ defaultModel: 'mock-model' }) + const team = oma.createTeam('t', teamCfg()) + + const runAgentSpy = vi.spyOn(oma, 'runAgent') + + await oma.runTeam(team, 'Say hello') + + expect(runAgentSpy).toHaveBeenCalledTimes(1) + const callArgs = runAgentSpy.mock.calls[0]! + // Third positional arg should be undefined when caller doesn't pass one + expect(callArgs[2]).toBeUndefined() + }) + + it('aborted signal causes the underlying agent loop to skip the LLM call', async () => { + // Pre-aborted controller — runner should break before any chat() call + const controller = new AbortController() + controller.abort() + + mockAdapterResponses = ['should never be returned'] + + const oma = new OpenMultiAgent({ defaultModel: 'mock-model' }) + const team = oma.createTeam('t', teamCfg()) + + const result = await oma.runTeam(team, 'Say hello', { abortSignal: controller.signal }) + + // Short-circuit ran one agent, but its loop bailed before any LLM call, + // so the agent's output is the empty string and token usage is zero. + const agentResult = result.agentResults.values().next().value + expect(agentResult?.output).toBe('') + expect(agentResult?.tokenUsage.input_tokens).toBe(0) + expect(agentResult?.tokenUsage.output_tokens).toBe(0) + }) +}) + +// --------------------------------------------------------------------------- +// Public API surface — internal helpers must stay out of the barrel export +// (PR #70 review point 3) +// --------------------------------------------------------------------------- + +describe('public API barrel', () => { + it('does not re-export isSimpleGoal or selectBestAgent', async () => { + const indexExports = await import('../src/index.js') + expect((indexExports as Record).isSimpleGoal).toBeUndefined() + expect((indexExports as Record).selectBestAgent).toBeUndefined() + }) + + it('still re-exports the documented public symbols', async () => { + const indexExports = await import('../src/index.js') + expect(indexExports.OpenMultiAgent).toBeDefined() + expect(indexExports.executeWithRetry).toBeDefined() + expect(indexExports.computeRetryDelay).toBeDefined() + }) +}) diff --git a/tests/token-budget.test.ts b/tests/token-budget.test.ts index 72cde15..c2b64a9 100644 --- a/tests/token-budget.test.ts +++ b/tests/token-budget.test.ts @@ -238,7 +238,10 @@ describe('token budget enforcement', () => { sharedMemory: false, }) - const result = await oma.runTeam(team, 'Do work') + // Use a goal that explicitly mentions sequencing so the short-circuit + // path is skipped and the coordinator decomposition + execution flow + // (which this test is exercising) actually runs. + const result = await oma.runTeam(team, 'First plan the work, then execute it') expect(result.totalTokenUsage.input_tokens + result.totalTokenUsage.output_tokens).toBe(70) expect(events.some(e => e.type === 'budget_exceeded')).toBe(true) })