@renseiai/agentfactory 0.8.3 → 0.8.4

package/dist/src/orchestrator/orchestrator.js

@@ -8,7 +8,7 @@ import { execSync } from 'child_process';
 import { existsSync, lstatSync, mkdirSync, readFileSync, readdirSync, rmSync, statSync, symlinkSync, unlinkSync, writeFileSync } from 'fs';
 import { resolve, dirname } from 'path';
 import { parse as parseDotenv } from 'dotenv';
-import { createProvider, resolveProviderName, } from '../providers/index.js';
+import { createProvider, resolveProviderName, resolveProviderWithSource, } from '../providers/index.js';
 import { initializeAgentDir, writeState, updateState, writeTodos, createInitialState, checkRecovery, buildRecoveryPrompt, getHeartbeatTimeoutFromEnv, getMaxRecoveryAttemptsFromEnv, } from './state-recovery.js';
 import { createHeartbeatWriter, getHeartbeatIntervalFromEnv } from './heartbeat-writer.js';
 import { createProgressLogger } from './progress-logger.js';
@@ -20,7 +20,7 @@ import { createActivityEmitter } from './activity-emitter.js';
 import { createApiActivityEmitter } from './api-activity-emitter.js';
 import { createLogger } from '../logger.js';
 import { TemplateRegistry, createToolPermissionAdapter } from '../templates/index.js';
-import { loadRepositoryConfig, getProjectConfig } from '../config/index.js';
+import { loadRepositoryConfig, getProjectConfig, getProvidersConfig } from '../config/index.js';
 import { ToolRegistry, linearPlugin } from '../tools/index.js';
 // Default inactivity timeout: 5 minutes
 const DEFAULT_INACTIVITY_TIMEOUT_MS = 300000;
@@ -670,6 +670,30 @@ export function getWorktreeIdentifier(issueIdentifier, workType) {
     const suffix = WORK_TYPE_SUFFIX[workType];
     return `${issueIdentifier}-${suffix}`;
 }
+/**
+ * Detect the appropriate work type for an issue based on its status,
+ * upgrading to coordination variants for parent issues with sub-issues.
+ *
+ * This prevents parent issues returning to Backlog after refinement from
+ * being dispatched as 'development' (which uses the wrong template and
+ * produces no sub-agent orchestration).
+ */
+export function detectWorkType(statusName, isParent) {
+    let workType = STATUS_WORK_TYPE_MAP[statusName] ?? 'development';
+    console.log(`Auto-detected work type: ${workType} (from status: ${statusName})`);
+    if (isParent) {
+        if (workType === 'development')
+            workType = 'coordination';
+        else if (workType === 'qa')
+            workType = 'qa-coordination';
+        else if (workType === 'acceptance')
+            workType = 'acceptance-coordination';
+        else if (workType === 'refinement')
+            workType = 'refinement-coordination';
+        console.log(`Upgraded to coordination work type: ${workType} (parent issue)`);
+    }
+    return workType;
+}
 export class AgentOrchestrator {
     config;
     client;
@@ -677,6 +701,8 @@ export class AgentOrchestrator {
     activeAgents = new Map();
     agentHandles = new Map();
     provider;
+    providerCache = new Map();
+    configProviders;
     agentSessions = new Map();
     activityEmitters = new Map();
     // Track session ID to issue ID mapping for stop signal handling
@@ -743,9 +769,10 @@ export class AgentOrchestrator {
         }
         this.client = createLinearAgentClient({ apiKey });
         this.events = events;
-        // Initialize agent provider — defaults to Claude, configurable via env
+        // Initialize default agent provider — per-spawn resolution may override
         const providerName = resolveProviderName({ project: config.project });
         this.provider = config.provider ?? createProvider(providerName);
+        this.providerCache.set(this.provider.name, this.provider);
         // Initialize template registry for configurable workflow prompts
         try {
             const templateDirs = [];
@@ -810,6 +837,8 @@ export class AgentOrchestrator {
                     if (repoConfig.validateCommand) {
                         this.validateCommand = repoConfig.validateCommand;
                     }
+                    // Store providers config for per-spawn resolution
+                    this.configProviders = getProvidersConfig(repoConfig);
                 }
             }
         }
@@ -852,6 +881,18 @@ export class AgentOrchestrator {
         }
         return baseConfig;
     }
+    /**
+     * Detect the appropriate work type for an issue, upgrading to coordination
+     * variants for parent issues that have sub-issues.
+     *
+     * This prevents parent issues returning to Backlog after refinement from
+     * being dispatched as 'development' (which uses the wrong template and
+     * produces no sub-agent orchestration).
+     */
+    async detectWorkType(issueId, statusName) {
+        const isParent = await this.client.isParentIssue(issueId);
+        return detectWorkType(statusName, isParent);
+    }
     /**
      * Get backlog issues for the configured project
      */
@@ -1591,11 +1632,33 @@ ORCHESTRATOR_INSTALL=1 exec pnpm add "$@"
     preInstallDependencies(worktreePath, identifier) {
         this.linkDependencies(worktreePath, identifier);
     }
+    /**
+     * Resolve the provider for a specific spawn, using the full priority cascade.
+     * Returns a cached provider instance (creating one if needed) and the resolved name.
+     */
+    resolveProviderForSpawn(context) {
+        const { name, source } = resolveProviderWithSource({
+            project: context.projectName,
+            workType: context.workType,
+            labels: context.labels,
+            mentionContext: context.mentionContext,
+            configProviders: this.configProviders,
+        });
+        // Return cached instance or create a new one
+        let provider = this.providerCache.get(name);
+        if (!provider) {
+            provider = createProvider(name);
+            this.providerCache.set(name, provider);
+        }
+        return { provider, providerName: name, source };
+    }
     /**
      * Spawn a Claude agent for a specific issue using the Agent SDK
      */
     spawnAgent(options) {
-        const { issueId, identifier, worktreeIdentifier, sessionId, worktreePath, streamActivities, workType = 'development', prompt: customPrompt, teamName, projectName, } = options;
+        const { issueId, identifier, worktreeIdentifier, sessionId, worktreePath, streamActivities, workType = 'development', prompt: customPrompt, teamName, projectName, labels, mentionContext, } = options;
+        // Resolve provider for this specific spawn (may differ from default)
+        const { provider: spawnProvider, providerName: spawnProviderName, source: providerSource } = this.resolveProviderForSpawn({ workType, projectName, labels, mentionContext });
         // Generate prompt based on work type, or use custom prompt if provided
         // Try template registry first, fall back to hardcoded prompts
         let prompt;
@@ -1612,7 +1675,7 @@ ORCHESTRATOR_INSTALL=1 exec pnpm add "$@"
                 repository: this.config.repository,
                 projectPath: perProject?.path ?? this.projectPaths?.[projectName ?? ''],
                 sharedPaths: this.sharedPaths,
-                useToolPlugins: this.provider.name === 'claude',
+                useToolPlugins: spawnProviderName === 'claude',
                 linearCli: this.linearCli ?? 'pnpm af-linear',
                 packageManager: perProject?.packageManager ?? this.packageManager ?? 'pnpm',
                 buildCommand: perProject?.buildCommand ?? this.buildCommand,
@@ -1640,6 +1703,7 @@ ORCHESTRATOR_INSTALL=1 exec pnpm add "$@"
             startedAt: now,
             lastActivityAt: now, // Initialize for inactivity tracking
             workType,
+            providerName: spawnProviderName,
         };
         this.activeAgents.set(issueId, agent);
         // Track session to issue mapping for stop signal handling
@@ -1794,9 +1858,9 @@ ORCHESTRATOR_INSTALL=1 exec pnpm add "$@"
         if (teamName) {
             env.LINEAR_TEAM_NAME = teamName;
         }
-        log.info('Starting agent via provider', { provider: this.provider.name, cwd: worktreePath ?? 'repo-root', workType, promptPreview: prompt.substring(0, 50) });
+        log.info('Starting agent via provider', { provider: spawnProviderName, source: providerSource, cwd: worktreePath ?? 'repo-root', workType, promptPreview: prompt.substring(0, 50) });
         // Create in-process tool servers from registered plugins
-        const mcpServers = this.provider.name === 'claude'
+        const mcpServers = spawnProviderName === 'claude'
             ? this.toolRegistry.createServers({ env, cwd: worktreePath ?? process.cwd() })
             : undefined;
         // Coordinators need significantly more turns than standard agents
@@ -1819,7 +1883,7 @@ ORCHESTRATOR_INSTALL=1 exec pnpm add "$@"
                 log.info('Agent process spawned', { pid });
             },
         };
-        const handle = this.provider.spawn(spawnConfig);
+        const handle = spawnProvider.spawn(spawnConfig);
         this.agentHandles.set(issueId, handle);
         agent.status = 'running';
         // Process the event stream in the background
@@ -2521,8 +2585,8 @@ ORCHESTRATOR_INSTALL=1 exec pnpm add "$@"
             this.events.onIssueSelected?.(issue);
             console.log(`Processing: ${issue.identifier} - ${issue.title}`);
             try {
-                // Backlog issues are always development work
-                const workType = 'development';
+                // Detect work type — parent issues with sub-issues use coordination variants
+                const workType = await this.detectWorkType(issue.id, 'Backlog');
                 // Create worktree with work type suffix
                 const { worktreePath, worktreeIdentifier } = this.createWorktree(issue.identifier, workType);
                 // Link dependencies from main repo into worktree
@@ -2543,6 +2607,7 @@ ORCHESTRATOR_INSTALL=1 exec pnpm add "$@"
                     workType,
                     teamName: issue.teamName,
                     projectName: issue.projectName,
+                    labels: issue.labels,
                 });
                 result.agents.push(agent);
             }
@@ -2575,6 +2640,9 @@ ORCHESTRATOR_INSTALL=1 exec pnpm add "$@"
         const issueId = issue.id; // Use the actual UUID
         const team = await issue.team;
         const teamName = team?.key;
+        // Fetch labels for provider resolution
+        const issueLabels = await issue.labels();
+        const labelNames = issueLabels.nodes.map((l) => l.name);
         // Resolve project name for path scoping in monorepos
         let projectName;
         if (this.projectPaths) {
@@ -2599,21 +2667,7 @@ ORCHESTRATOR_INSTALL=1 exec pnpm add "$@"
         if (!effectiveWorkType) {
             const state = await issue.state;
             const statusName = state?.name ?? 'Backlog';
-            effectiveWorkType = STATUS_WORK_TYPE_MAP[statusName] ?? 'development';
-            console.log(`Auto-detected work type: ${effectiveWorkType} (from status: ${statusName})`);
-            // Parent issues use coordination variants
-            const isParent = await this.client.isParentIssue(issueId);
-            if (isParent) {
-                if (effectiveWorkType === 'development')
-                    effectiveWorkType = 'coordination';
-                else if (effectiveWorkType === 'qa')
-                    effectiveWorkType = 'qa-coordination';
-                else if (effectiveWorkType === 'acceptance')
-                    effectiveWorkType = 'acceptance-coordination';
-                else if (effectiveWorkType === 'refinement')
-                    effectiveWorkType = 'refinement-coordination';
-                console.log(`Upgraded to coordination work type: ${effectiveWorkType} (parent issue)`);
-            }
+            effectiveWorkType = await this.detectWorkType(issueId, statusName);
         }
         // Create isolated worktree for the agent
         let worktreePath;
@@ -2667,6 +2721,7 @@ ORCHESTRATOR_INSTALL=1 exec pnpm add "$@"
                     workType: recoveryWorkType,
                     teamName,
                     projectName,
+                    labels: labelNames,
                 });
             }
         }
@@ -2691,6 +2746,7 @@ ORCHESTRATOR_INSTALL=1 exec pnpm add "$@"
             prompt,
             teamName,
             projectName,
+            labels: labelNames,
         });
     }
     /**
@@ -2862,19 +2918,7 @@ ORCHESTRATOR_INSTALL=1 exec pnpm add "$@"
                 // incorrect status transitions (e.g., Delivered → Started for acceptance work)
                 if (!workType) {
                     const statusName = currentStatus ?? 'Backlog';
-                    workType = STATUS_WORK_TYPE_MAP[statusName] ?? 'development';
-                    // Parent issues use coordination variants
-                    const isParent = await this.client.isParentIssue(issue.id);
-                    if (isParent) {
-                        if (workType === 'development')
-                            workType = 'coordination';
-                        else if (workType === 'qa')
-                            workType = 'qa-coordination';
-                        else if (workType === 'acceptance')
-                            workType = 'acceptance-coordination';
-                        else if (workType === 'refinement')
-                            workType = 'refinement-coordination';
-                    }
+                    workType = await this.detectWorkType(issue.id, statusName);
                 }
                 // Create isolated worktree for the agent
                 if (WORK_TYPES_REQUIRING_WORKTREE.has(workType)) {
@@ -2925,6 +2969,7 @@ ORCHESTRATOR_INSTALL=1 exec pnpm add "$@"
                 providerSessionId,
                 workType,
                 teamName,
+                mentionContext: prompt,
             });
             return {
                 forwarded: true,
@@ -3002,7 +3047,9 @@ ORCHESTRATOR_INSTALL=1 exec pnpm add "$@"
      * If autoTransition is enabled, also transitions the issue status to the appropriate working state
      */
     async spawnAgentWithResume(options) {
-        const { issueId, identifier, worktreeIdentifier, sessionId, worktreePath, prompt, providerSessionId, workType, teamName } = options;
+        const { issueId, identifier, worktreeIdentifier, sessionId, worktreePath, prompt, providerSessionId, workType, teamName, labels, mentionContext } = options;
+        // Resolve provider for this specific spawn (may differ from default)
+        const { provider: spawnProvider, providerName: spawnProviderName, source: providerSource } = this.resolveProviderForSpawn({ workType, projectName: options.projectName, labels, mentionContext });
         // Create logger for this agent
         const log = createLogger({ issueIdentifier: identifier });
         this.agentLoggers.set(issueId, log);
@@ -3035,6 +3082,7 @@ ORCHESTRATOR_INSTALL=1 exec pnpm add "$@"
             startedAt: now,
             lastActivityAt: now, // Initialize for inactivity tracking
             workType,
+            providerName: spawnProviderName,
         };
         this.activeAgents.set(issueId, agent);
         // Track session to issue mapping for stop signal handling
@@ -3172,13 +3220,14 @@ ORCHESTRATOR_INSTALL=1 exec pnpm add "$@"
             ...(teamName && { LINEAR_TEAM_NAME: teamName }),
         };
         log.info('Starting agent via provider', {
-            provider: this.provider.name,
+            provider: spawnProviderName,
+            source: providerSource,
             cwd: worktreePath ?? 'repo-root',
             resuming: !!providerSessionId,
             workType: workType ?? 'development',
         });
         // Create in-process tool servers from registered plugins
-        const mcpServers = this.provider.name === 'claude'
+        const mcpServers = spawnProviderName === 'claude'
             ? this.toolRegistry.createServers({ env, cwd: worktreePath ?? process.cwd() })
             : undefined;
         // Coordinators need significantly more turns than standard agents
@@ -3201,8 +3250,8 @@ ORCHESTRATOR_INSTALL=1 exec pnpm add "$@"
             },
         };
         const handle = providerSessionId
-            ? this.provider.resume(providerSessionId, spawnConfig)
-            : this.provider.spawn(spawnConfig);
+            ? spawnProvider.resume(providerSessionId, spawnConfig)
+            : spawnProvider.spawn(spawnConfig);
         this.agentHandles.set(issueId, handle);
         agent.status = 'running';
         // Process the event stream in the background

package/dist/src/orchestrator/state-recovery.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=state-recovery.test.d.ts.map

package/dist/src/orchestrator/state-recovery.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"state-recovery.test.d.ts","sourceRoot":"","sources":["../../../src/orchestrator/state-recovery.test.ts"],"names":[],"mappings":""}