cyrus-edge-worker 0.2.3 → 0.2.5

package/dist/EdgeWorker.js

@@ -7,6 +7,7 @@ import { watch as chokidarWatch } from "chokidar";
 import { AbortError, ClaudeRunner, createCyrusToolsServer, createImageToolsServer, createSoraToolsServer, getAllTools, getCoordinatorTools, getReadOnlyTools, getSafeTools, } from "cyrus-claude-runner";
 import { ConfigUpdater } from "cyrus-config-updater";
 import { DEFAULT_PROXY_URL, isAgentSessionCreatedWebhook, isAgentSessionPromptedWebhook, isIssueAssignedWebhook, isIssueCommentMentionWebhook, isIssueNewCommentWebhook, isIssueUnassignedWebhook, PersistenceManager, resolvePath, } from "cyrus-core";
+import { GeminiRunner } from "cyrus-gemini-runner";
 import { LinearEventTransport, LinearIssueTrackerService, } from "cyrus-linear-event-transport";
 import { fileTypeFromBuffer } from "file-type";
 import { AgentSessionManager } from "./AgentSessionManager.js";
@@ -22,7 +23,7 @@ import { SharedApplicationServer } from "./SharedApplicationServer.js";
 export class EdgeWorker extends EventEmitter {
     config;
     repositories = new Map(); // repository 'id' (internal, stored in config.json) mapped to the full repo config
-    agentSessionManagers = new Map(); // Maps repository ID to AgentSessionManager, which manages ClaudeRunners for a repo
+    agentSessionManagers = new Map(); // Maps repository ID to AgentSessionManager, which manages agent runners for a repo
     issueTrackers = new Map(); // one issue tracker per 'repository'
     linearEventTransport = null; // Single event transport for webhook delivery
     configUpdater = null; // Single config updater for configuration updates
@@ -40,11 +41,13 @@ export class EdgeWorker extends EventEmitter {
         this.config = config;
         this.cyrusHome = config.cyrusHome;
         this.persistenceManager = new PersistenceManager(join(this.cyrusHome, "state"));
-        // Initialize procedure router with haiku model for fast classification
+        // Initialize procedure router with haiku for fast classification
+        // Default to claude runner
         this.procedureRouter = new ProcedureRouter({
             cyrusHome: this.cyrusHome,
             model: "haiku",
-            timeoutMs: 10000,
+            timeoutMs: 100000,
+            runnerType: "claude", // Use Claude by default
         });
         // Initialize repository router with dependencies
         const repositoryRouterDeps = {
@@ -122,47 +125,11 @@ export class EdgeWorker extends EventEmitter {
                     return parentId;
                 }, async (parentSessionId, prompt, childSessionId) => {
                     await this.handleResumeParentSession(parentSessionId, prompt, childSessionId, repo, agentSessionManager);
-                }, async (linearAgentActivitySessionId) => {
-                    console.log(`[Subroutine Transition] Advancing to next subroutine for session ${linearAgentActivitySessionId}`);
-                    // Get the session
-                    const session = agentSessionManager.getSession(linearAgentActivitySessionId);
-                    if (!session) {
-                        console.error(`[Subroutine Transition] Session ${linearAgentActivitySessionId} not found`);
-                        return;
-                    }
-                    // Get next subroutine (advancement already handled by AgentSessionManager)
-                    const nextSubroutine = this.procedureRouter.getCurrentSubroutine(session);
-                    if (!nextSubroutine) {
-                        console.log(`[Subroutine Transition] Procedure complete for session ${linearAgentActivitySessionId}`);
-                        return;
-                    }
-                    console.log(`[Subroutine Transition] Next subroutine: ${nextSubroutine.name}`);
-                    // Load subroutine prompt
-                    let subroutinePrompt;
-                    try {
-                        subroutinePrompt = await this.loadSubroutinePrompt(nextSubroutine, this.config.linearWorkspaceSlug);
-                        if (!subroutinePrompt) {
-                            // Fallback if loadSubroutinePrompt returns null
-                            subroutinePrompt = `Continue with: ${nextSubroutine.description}`;
-                        }
-                    }
-                    catch (error) {
-                        console.error(`[Subroutine Transition] Failed to load subroutine prompt:`, error);
-                        // Fallback to simple prompt
-                        subroutinePrompt = `Continue with: ${nextSubroutine.description}`;
-                    }
-                    // Resume Claude session with subroutine prompt
-                    try {
-                        await this.resumeClaudeSession(session, repo, linearAgentActivitySessionId, agentSessionManager, subroutinePrompt, "", // No attachment manifest
-                        false, // Not a new session
-                        [], // No additional allowed directories
-                        nextSubroutine.maxTurns);
-                        console.log(`[Subroutine Transition] Successfully resumed session for ${nextSubroutine.name} subroutine${nextSubroutine.maxTurns ? ` (maxTurns=${nextSubroutine.maxTurns})` : ""}`);
-                    }
-                    catch (error) {
-                        console.error(`[Subroutine Transition] Failed to resume session for ${nextSubroutine.name} subroutine:`, error);
-                    }
                 }, this.procedureRouter, this.sharedApplicationServer);
+                // Subscribe to subroutine completion events
+                agentSessionManager.on("subroutineComplete", async ({ linearAgentActivitySessionId, session }) => {
+                    await this.handleSubroutineTransition(linearAgentActivitySessionId, session, repo, agentSessionManager);
+                });
                 this.agentSessionManagers.set(repo.id, agentSessionManager);
             }
         }
@@ -243,13 +210,13 @@ export class EdgeWorker extends EventEmitter {
         catch (error) {
             console.error("❌ Failed to save EdgeWorker state during shutdown:", error);
         }
-        // get all claudeRunners
-        const claudeRunners = [];
+        // get all agent runners
+        const agentRunners = [];
         for (const agentSessionManager of this.agentSessionManagers.values()) {
-            claudeRunners.push(...agentSessionManager.getAllClaudeRunners());
+            agentRunners.push(...agentSessionManager.getAllAgentRunners());
         }
-        // Kill all Claude processes with null checking
-        for (const runner of claudeRunners) {
+        // Kill all agent processes with null checking
+        for (const runner of agentRunners) {
             if (runner) {
                 try {
                     runner.stop();
@@ -335,6 +302,45 @@ export class EdgeWorker extends EventEmitter {
             console.error(`[Parent Session Resume] Error context - Parent issue: ${parentSession.issueId}, Repository: ${repo.name}`);
         }
     }
+    /**
+     * Handle subroutine transition when a subroutine completes
+     * This is triggered by the AgentSessionManager's 'subroutineComplete' event
+     */
+    async handleSubroutineTransition(linearAgentActivitySessionId, session, repo, agentSessionManager) {
+        console.log(`[Subroutine Transition] Handling subroutine completion for session ${linearAgentActivitySessionId}`);
+        // Get next subroutine (advancement already handled by AgentSessionManager)
+        const nextSubroutine = this.procedureRouter.getCurrentSubroutine(session);
+        if (!nextSubroutine) {
+            console.log(`[Subroutine Transition] Procedure complete for session ${linearAgentActivitySessionId}`);
+            return;
+        }
+        console.log(`[Subroutine Transition] Next subroutine: ${nextSubroutine.name}`);
+        // Load subroutine prompt
+        let subroutinePrompt;
+        try {
+            subroutinePrompt = await this.loadSubroutinePrompt(nextSubroutine, this.config.linearWorkspaceSlug);
+            if (!subroutinePrompt) {
+                // Fallback if loadSubroutinePrompt returns null
+                subroutinePrompt = `Continue with: ${nextSubroutine.description}`;
+            }
+        }
+        catch (error) {
+            console.error(`[Subroutine Transition] Failed to load subroutine prompt:`, error);
+            // Fallback to simple prompt
+            subroutinePrompt = `Continue with: ${nextSubroutine.description}`;
+        }
+        // Resume Claude session with subroutine prompt
+        try {
+            await this.resumeAgentSession(session, repo, linearAgentActivitySessionId, agentSessionManager, subroutinePrompt, "", // No attachment manifest
+            false, // Not a new session
+            [], // No additional allowed directories
+            nextSubroutine?.singleTurn ? 1 : undefined);
+            console.log(`[Subroutine Transition] Successfully resumed session for ${nextSubroutine.name} subroutine${nextSubroutine.singleTurn ? " (singleTurn)" : ""}`);
+        }
+        catch (error) {
+            console.error(`[Subroutine Transition] Failed to resume session for ${nextSubroutine.name} subroutine:`, error);
+        }
+    }
     /**
      * Start watching config file for changes
      */
@@ -510,8 +516,11 @@ export class EdgeWorker extends EventEmitter {
                     return this.childToParentAgentSession.get(childSessionId);
                 }, async (parentSessionId, prompt, childSessionId) => {
                     await this.handleResumeParentSession(parentSessionId, prompt, childSessionId, repo, agentSessionManager);
-                }, undefined, // No resumeNextSubroutine callback for dynamically added repos
-                this.procedureRouter, this.sharedApplicationServer);
+                }, this.procedureRouter, this.sharedApplicationServer);
+                // Subscribe to subroutine completion events
+                agentSessionManager.on("subroutineComplete", async ({ linearAgentActivitySessionId, session }) => {
+                    await this.handleSubroutineTransition(linearAgentActivitySessionId, session, repo, agentSessionManager);
+                });
                 this.agentSessionManagers.set(repo.id, agentSessionManager);
                 console.log(`✅ Repository added successfully: ${repo.name}`);
             }
@@ -592,10 +601,10 @@ export class EdgeWorker extends EventEmitter {
                     for (const session of activeSessions) {
                         try {
                             console.log(`  🛑 Stopping session for issue ${session.issueId}`);
-                            // Get the Claude runner for this session
-                            const runner = manager?.getClaudeRunner(session.linearAgentActivitySessionId);
+                            // Get the agent runner for this session
+                            const runner = manager?.getAgentRunner(session.linearAgentActivitySessionId);
                             if (runner) {
-                                // Stop the Claude process
+                                // Stop the agent process
                                 runner.stop();
                                 console.log(`  ✅ Stopped Claude runner for session ${session.linearAgentActivitySessionId}`);
                             }
@@ -754,7 +763,10 @@ export class EdgeWorker extends EventEmitter {
         const attachmentsDir = join(this.cyrusHome, workspaceFolderName, "attachments");
         await mkdir(attachmentsDir, { recursive: true });
         // Build allowed directories list - always include attachments directory
-        const allowedDirectories = [attachmentsDir];
+        const allowedDirectories = [
+            attachmentsDir,
+            repository.repositoryPath,
+        ];
         console.log(`[EdgeWorker] Configured allowed directories for ${fullIssue.identifier}:`, allowedDirectories);
         // Build allowed tools list with Linear MCP tools
         const allowedTools = this.buildAllowedTools(repository);
@@ -821,14 +833,14 @@ export class EdgeWorker extends EventEmitter {
         console.log(`[EdgeWorker] Handling agent session created: ${webhook.agentSession.issue.identifier}`);
         const { agentSession, guidance } = webhook;
         const commentBody = agentSession.comment?.body;
-        // Initialize Claude runner using shared logic
-        await this.initializeClaudeRunner(agentSession, repository, guidance, commentBody);
+        // Initialize agent runner using shared logic
+        await this.initializeAgentRunner(agentSession, repository, guidance, commentBody);
     }
     /**
 
     /**
-     * Initialize and start Claude runner for an agent session
-     * This method contains the shared logic for creating a Claude runner that both
+     * Initialize and start agent runner for an agent session
+     * This method contains the shared logic for creating an agent runner that both
      * handleAgentSessionCreatedWebhook and handleUserPromptedAgentActivity use.
      *
      * @param agentSession The Linear agent session
@@ -836,7 +848,7 @@ export class EdgeWorker extends EventEmitter {
      * @param guidance Optional guidance rules from Linear
      * @param commentBody Optional comment body (for mentions)
      */
-    async initializeClaudeRunner(agentSession, repository, guidance, commentBody) {
+    async initializeAgentRunner(agentSession, repository, guidance, commentBody) {
         const linearAgentActivitySessionId = agentSession.id;
         const { issue } = agentSession;
         if (!issue) {
@@ -973,28 +985,47 @@ export class EdgeWorker extends EventEmitter {
             if (disallowedTools.length > 0) {
                 console.log(`[EdgeWorker] Configured disallowed tools for ${fullIssue.identifier}:`, disallowedTools);
             }
-            // Create Claude runner with system prompt from assembly
-            const runnerConfig = this.buildClaudeRunnerConfig(session, repository, linearAgentActivitySessionId, assembly.systemPrompt, allowedTools, allowedDirectories, disallowedTools, undefined, // resumeSessionId
-            labels);
-            const runner = new ClaudeRunner(runnerConfig);
+            // Get current subroutine to check for singleTurn mode
+            const currentSubroutine = this.procedureRouter.getCurrentSubroutine(session);
+            // Create agent runner with system prompt from assembly
+            // buildAgentRunnerConfig now determines runner type from labels internally
+            const { config: runnerConfig, runnerType } = this.buildAgentRunnerConfig(session, repository, linearAgentActivitySessionId, assembly.systemPrompt, allowedTools, allowedDirectories, disallowedTools, undefined, // resumeSessionId
+            labels, // Pass labels for runner selection and model override
+            undefined, // maxTurns
+            currentSubroutine?.singleTurn);
+            console.log(`[EdgeWorker] Label-based runner selection for new session: ${runnerType} (session ${linearAgentActivitySessionId})`);
+            const runner = runnerType === "claude"
+                ? new ClaudeRunner(runnerConfig)
+                : new GeminiRunner(runnerConfig);
             // Store runner by comment ID
-            agentSessionManager.addClaudeRunner(linearAgentActivitySessionId, runner);
+            agentSessionManager.addAgentRunner(linearAgentActivitySessionId, runner);
             // Save state after mapping changes
             await this.savePersistedState();
             // Emit events using full Linear issue
             this.emit("session:started", fullIssue.id, fullIssue, repository.id);
             this.config.handlers?.onSessionStart?.(fullIssue.id, fullIssue, repository.id);
             // Update runner with version information (if available)
-            if (systemPromptVersion) {
+            // Note: updatePromptVersions is specific to ClaudeRunner
+            if (systemPromptVersion &&
+                "updatePromptVersions" in runner &&
+                typeof runner.updatePromptVersions === "function") {
                 runner.updatePromptVersions({
                     systemPromptVersion,
                 });
             }
             // Log metadata for debugging
             console.log(`[EdgeWorker] Initial prompt built successfully - components: ${assembly.metadata.components.join(", ")}, type: ${assembly.metadata.promptType}, length: ${assembly.userPrompt.length} characters`);
-            console.log(`[EdgeWorker] Starting Claude streaming session`);
-            const sessionInfo = await runner.startStreaming(assembly.userPrompt);
-            console.log(`[EdgeWorker] Claude streaming session started: ${sessionInfo.sessionId}`);
+            // Start session - use streaming mode if supported for ability to add messages later
+            if (runner.supportsStreamingInput && runner.startStreaming) {
+                console.log(`[EdgeWorker] Starting streaming session`);
+                const sessionInfo = await runner.startStreaming(assembly.userPrompt);
+                console.log(`[EdgeWorker] Streaming session started: ${sessionInfo.sessionId}`);
+            }
+            else {
+                console.log(`[EdgeWorker] Starting non-streaming session`);
+                const sessionInfo = await runner.start(assembly.userPrompt);
+                console.log(`[EdgeWorker] Non-streaming session started: ${sessionInfo.sessionId}`);
+            }
             // Note: AgentSessionManager will be initialized automatically when the first system message
             // is received via handleClaudeMessage() callback
         }
@@ -1032,10 +1063,10 @@ export class EdgeWorker extends EventEmitter {
             return;
         }
         // Stop the existing runner if it's active
-        const existingRunner = foundSession.claudeRunner;
+        const existingRunner = foundSession.agentRunner;
         if (existingRunner) {
             existingRunner.stop();
-            console.log(`[EdgeWorker] Stopped Claude session for agent activity session ${agentSessionId}`);
+            console.log(`[EdgeWorker] Stopped agent session for agent activity session ${agentSessionId}`);
         }
         // Post confirmation
         const issueTitle = issue?.title || "this issue";
@@ -1075,9 +1106,9 @@ export class EdgeWorker extends EventEmitter {
         this.repositoryRouter.getIssueRepositoryCache().set(issueId, repository.id);
         // Post agent activity showing user-selected repository
         await this.postRepositorySelectionActivity(agentSessionId, repository.id, repository.name, "user-selected");
-        console.log(`[EdgeWorker] Initializing Claude runner after repository selection: ${agentSession.issue.identifier} -> ${repository.name}`);
-        // Initialize Claude runner with the selected repository
-        await this.initializeClaudeRunner(agentSession, repository, guidance, commentBody);
+        console.log(`[EdgeWorker] Initializing agent runner after repository selection: ${agentSession.issue.identifier} -> ${repository.name}`);
+        // Initialize agent runner with the selected repository
+        await this.initializeAgentRunner(agentSession, repository, guidance, commentBody);
     }
     /**
      * Handle normal prompted activity (existing session continuation)
@@ -1124,8 +1155,8 @@ export class EdgeWorker extends EventEmitter {
         else {
             console.log(`[EdgeWorker] Found existing session ${linearAgentActivitySessionId} for new user prompt`);
             // Post instant acknowledgment for existing session BEFORE any async work
-            // Check streaming status first to determine the message
-            const isCurrentlyStreaming = session?.claudeRunner?.isStreaming() || false;
+            // Check if runner is currently running (streaming is Claude-specific, use isRunning for both)
+            const isCurrentlyStreaming = session?.agentRunner?.isRunning() || false;
             await this.postInstantPromptedAcknowledgment(linearAgentActivitySessionId, repository.id, isCurrentlyStreaming);
             // Need to fetch full issue for routing context
             const issueTracker = this.issueTrackers.get(repository.id);
@@ -1259,12 +1290,12 @@ export class EdgeWorker extends EventEmitter {
             console.log("No agentSessionManager for unassigned issue, so no sessions to stop");
             return;
         }
-        // Get all Claude runners for this specific issue
-        const claudeRunners = agentSessionManager.getClaudeRunnersForIssue(issue.id);
-        // Stop all Claude runners for this issue
-        const activeThreadCount = claudeRunners.length;
-        for (const runner of claudeRunners) {
-            console.log(`[EdgeWorker] Stopping Claude runner for issue ${issue.identifier}`);
+        // Get all agent runners for this specific issue
+        const agentRunners = agentSessionManager.getAgentRunnersForIssue(issue.id);
+        // Stop all agent runners for this issue
+        const activeThreadCount = agentRunners.length;
+        for (const runner of agentRunners) {
+            console.log(`[EdgeWorker] Stopping agent runner for issue ${issue.identifier}`);
             runner.stop();
         }
         // Post ONE farewell comment on the issue (not in any thread) if there were active sessions
@@ -1308,6 +1339,86 @@ export class EdgeWorker extends EventEmitter {
             return [];
         }
     }
+    /**
+     * Determine runner type and model from issue labels.
+     * Returns the runner type ("claude" or "gemini"), optional model override, and fallback model.
+     *
+     * Label priority (case-insensitive):
+     * - Gemini labels: gemini, gemini-2.5-pro, gemini-2.5-flash, gemini-2.5-flash-lite, gemini-3-pro, gemini-3-pro-preview
+     * - Claude labels: claude, sonnet, opus
+     *
+     * If no runner label is found, defaults to claude.
+     */
+    determineRunnerFromLabels(labels) {
+        if (!labels || labels.length === 0) {
+            return {
+                runnerType: "claude",
+                modelOverride: "sonnet",
+                fallbackModelOverride: "haiku",
+            };
+        }
+        const lowercaseLabels = labels.map((label) => label.toLowerCase());
+        // Check for Gemini labels first
+        if (lowercaseLabels.includes("gemini-2.5-pro") ||
+            lowercaseLabels.includes("gemini-2.5")) {
+            return {
+                runnerType: "gemini",
+                modelOverride: "gemini-2.5-pro",
+                fallbackModelOverride: "gemini-2.5-flash",
+            };
+        }
+        if (lowercaseLabels.includes("gemini-2.5-flash")) {
+            return {
+                runnerType: "gemini",
+                modelOverride: "gemini-2.5-flash",
+                fallbackModelOverride: "gemini-2.5-flash-lite",
+            };
+        }
+        if (lowercaseLabels.includes("gemini-2.5-flash-lite")) {
+            return {
+                runnerType: "gemini",
+                modelOverride: "gemini-2.5-flash-lite",
+                fallbackModelOverride: "gemini-2.5-flash-lite",
+            };
+        }
+        if (lowercaseLabels.includes("gemini-3") ||
+            lowercaseLabels.includes("gemini-3-pro") ||
+            lowercaseLabels.includes("gemini-3-pro-preview")) {
+            return {
+                runnerType: "gemini",
+                modelOverride: "gemini-3-pro-preview",
+                fallbackModelOverride: "gemini-2.5-pro",
+            };
+        }
+        if (lowercaseLabels.includes("gemini")) {
+            return {
+                runnerType: "gemini",
+                modelOverride: "gemini-2.5-pro",
+                fallbackModelOverride: "gemini-2.5-flash",
+            };
+        }
+        // Check for Claude labels
+        if (lowercaseLabels.includes("opus")) {
+            return {
+                runnerType: "claude",
+                modelOverride: "opus",
+                fallbackModelOverride: "sonnet",
+            };
+        }
+        if (lowercaseLabels.includes("sonnet")) {
+            return {
+                runnerType: "claude",
+                modelOverride: "sonnet",
+                fallbackModelOverride: "haiku",
+            };
+        }
+        // Default to claude if no runner labels found
+        return {
+            runnerType: "claude",
+            modelOverride: "sonnet",
+            fallbackModelOverride: "haiku",
+        };
+    }
     /**
      * Determine system prompt based on issue labels and repository configuration
      */
@@ -2378,7 +2489,7 @@ ${newComment ? `New comment to address:\n${newComment.body}\n\n` : ""}Please ana
                     let childRepo;
                     let childAgentSessionManager;
                     for (const [repoId, manager] of this.agentSessionManagers) {
-                        if (manager.hasClaudeRunner(childSessionId)) {
+                        if (manager.hasAgentRunner(childSessionId)) {
                             childRepo = this.repositories.get(repoId);
                             childAgentSessionManager = manager;
                             break;
@@ -2762,9 +2873,11 @@ ${input.userComment}
         attachmentManifest, guidance);
     }
     /**
-     * Build Claude runner configuration with common settings
+     * Build agent runner configuration with common settings.
+     * Also determines which runner type to use based on labels.
+     * @returns Object containing the runner config and runner type to use
      */
-    buildClaudeRunnerConfig(session, repository, linearAgentActivitySessionId, systemPrompt, allowedTools, allowedDirectories, disallowedTools, resumeSessionId, labels, maxTurns) {
+    buildAgentRunnerConfig(session, repository, linearAgentActivitySessionId, systemPrompt, allowedTools, allowedDirectories, disallowedTools, resumeSessionId, labels, maxTurns, singleTurn) {
         // Configure PostToolUse hook for playwright screenshots
         const hooks = {
             PostToolUse: [
@@ -2783,38 +2896,30 @@ ${input.userComment}
                 },
             ],
         };
-        // Check for model override labels (case-insensitive)
-        let modelOverride;
-        let fallbackModelOverride;
-        if (labels && labels.length > 0) {
-            const lowercaseLabels = labels.map((label) => label.toLowerCase());
-            // Check for model override labels: opus, sonnet, haiku
-            if (lowercaseLabels.includes("opus")) {
-                modelOverride = "opus";
-                console.log(`[EdgeWorker] Model override via label: opus (for session ${linearAgentActivitySessionId})`);
-            }
-            else if (lowercaseLabels.includes("sonnet")) {
-                modelOverride = "sonnet";
-                console.log(`[EdgeWorker] Model override via label: sonnet (for session ${linearAgentActivitySessionId})`);
-            }
-            else if (lowercaseLabels.includes("haiku")) {
-                modelOverride = "haiku";
-                console.log(`[EdgeWorker] Model override via label: haiku (for session ${linearAgentActivitySessionId})`);
-            }
-            // If a model override is found, also set a reasonable fallback
-            if (modelOverride) {
-                // Set fallback to the next lower tier: opus->sonnet, sonnet->haiku, haiku->sonnet
-                if (modelOverride === "opus") {
-                    fallbackModelOverride = "sonnet";
-                }
-                else if (modelOverride === "sonnet") {
-                    fallbackModelOverride = "haiku";
-                }
-                else {
-                    fallbackModelOverride = "sonnet"; // haiku falls back to sonnet since same model retry doesn't help
-                }
-            }
-        }
+        // Determine runner type and model override from labels
+        const runnerSelection = this.determineRunnerFromLabels(labels || []);
+        let runnerType = runnerSelection.runnerType;
+        let modelOverride = runnerSelection.modelOverride;
+        let fallbackModelOverride = runnerSelection.fallbackModelOverride;
+        // If the labels have changed, and we are resuming a session. Use the existing runner for the session.
+        if (session.claudeSessionId && runnerType !== "claude") {
+            runnerType = "claude";
+            modelOverride = "sonnet";
+            fallbackModelOverride = "haiku";
+        }
+        else if (session.geminiSessionId && runnerType !== "gemini") {
+            runnerType = "gemini";
+            modelOverride = "gemini-2.5-pro";
+            fallbackModelOverride = "gemini-2.5-flash";
+        }
+        // Log model override if found
+        if (modelOverride) {
+            console.log(`[EdgeWorker] Model override via label: ${modelOverride} (for session ${linearAgentActivitySessionId})`);
+        }
+        // Convert singleTurn flag to effective maxTurns value
+        const effectiveMaxTurns = singleTurn ? 1 : maxTurns;
+        // Determine final model name with singleTurn suffix for Gemini
+        const finalModel = modelOverride || repository.model || this.config.defaultModel;
         const config = {
             workingDirectory: session.workspace.path,
             allowedTools,
@@ -2826,7 +2931,7 @@ ${input.userComment}
             mcpConfig: this.buildMcpConfig(repository, linearAgentActivitySessionId),
             appendSystemPrompt: systemPrompt || "",
             // Priority order: label override > repository config > global default
-            model: modelOverride || repository.model || this.config.defaultModel,
+            model: finalModel,
             fallbackModel: fallbackModelOverride ||
                 repository.fallbackModel ||
                 this.config.defaultFallbackModel,
@@ -2839,10 +2944,13 @@ ${input.userComment}
         if (resumeSessionId) {
             config.resumeSessionId = resumeSessionId;
         }
-        if (maxTurns !== undefined) {
-            config.maxTurns = maxTurns;
+        if (effectiveMaxTurns !== undefined) {
+            config.maxTurns = effectiveMaxTurns;
+            if (singleTurn) {
+                console.log(`[EdgeWorker] Applied singleTurn maxTurns=1 (for session ${linearAgentActivitySessionId})`);
+            }
         }
-        return config;
+        return { config, runnerType };
     }
     /**
      * Build disallowed tools list following the same hierarchy as allowed tools
@@ -3222,19 +3330,21 @@ ${input.userComment}
      * @returns true if message was added to stream, false if session was resumed
      */
     async handlePromptWithStreamingCheck(session, repository, linearAgentActivitySessionId, agentSessionManager, promptBody, attachmentManifest, isNewSession, additionalAllowedDirs, logContext, commentAuthor, commentTimestamp) {
-        // Check if runner is actively streaming before routing
-        const existingRunner = session.claudeRunner;
-        const isStreaming = existingRunner?.isStreaming() || false;
-        // Always route procedure for new input, UNLESS actively streaming
-        if (!isStreaming) {
+        // Check if runner is actively running before routing
+        const existingRunner = session.agentRunner;
+        const isRunning = existingRunner?.isRunning() || false;
+        // Always route procedure for new input, UNLESS actively running
+        if (!isRunning) {
             await this.rerouteProcedureForSession(session, linearAgentActivitySessionId, agentSessionManager, promptBody, repository);
             console.log(`[EdgeWorker] Routed procedure for ${logContext}`);
         }
         else {
-            console.log(`[EdgeWorker] Skipping routing for ${linearAgentActivitySessionId} (${logContext}) - runner is actively streaming`);
+            console.log(`[EdgeWorker] Skipping routing for ${linearAgentActivitySessionId} (${logContext}) - runner is actively running`);
         }
-        // Handle streaming case - add message to existing stream
-        if (existingRunner?.isStreaming()) {
+        // Handle running case - add message to existing stream (if supported)
+        if (existingRunner?.isRunning() &&
+            existingRunner.supportsStreamingInput &&
+            existingRunner.addStreamMessage) {
             console.log(`[EdgeWorker] Adding prompt to existing stream for ${linearAgentActivitySessionId} (${logContext})`);
             // Append attachment manifest to the prompt if we have one
             let fullPrompt = promptBody;
@@ -3246,7 +3356,7 @@ ${input.userComment}
         }
         // Not streaming - resume/start session
         console.log(`[EdgeWorker] Resuming Claude session for ${linearAgentActivitySessionId} (${logContext})`);
-        await this.resumeClaudeSession(session, repository, linearAgentActivitySessionId, agentSessionManager, promptBody, attachmentManifest, isNewSession, additionalAllowedDirs, undefined, // maxTurns
+        await this.resumeAgentSession(session, repository, linearAgentActivitySessionId, agentSessionManager, promptBody, attachmentManifest, isNewSession, additionalAllowedDirs, undefined, // maxTurns
         commentAuthor, commentTimestamp);
         return false; // Session was resumed
     }
@@ -3336,7 +3446,7 @@ ${input.userComment}
         }
     }
     /**
-     * Resume or create a Claude session with the given prompt
+     * Resume or create an Agent session with the given prompt
      * This is the core logic for handling prompted agent activities
      * @param session The Cyrus agent session
      * @param repository The repository configuration
@@ -3346,11 +3456,13 @@ ${input.userComment}
      * @param attachmentManifest Optional attachment manifest
      * @param isNewSession Whether this is a new session
      */
-    async resumeClaudeSession(session, repository, linearAgentActivitySessionId, agentSessionManager, promptBody, attachmentManifest = "", isNewSession = false, additionalAllowedDirectories = [], maxTurns, commentAuthor, commentTimestamp) {
+    async resumeAgentSession(session, repository, linearAgentActivitySessionId, agentSessionManager, promptBody, attachmentManifest = "", isNewSession = false, additionalAllowedDirectories = [], maxTurns, commentAuthor, commentTimestamp) {
         // Check for existing runner
-        const existingRunner = session.claudeRunner;
-        // If there's an existing streaming runner, add to it
-        if (existingRunner?.isStreaming()) {
+        const existingRunner = session.agentRunner;
+        // If there's an existing running runner that supports streaming, add to it
+        if (existingRunner?.isRunning() &&
+            existingRunner.supportsStreamingInput &&
+            existingRunner.addStreamMessage) {
             let fullPrompt = promptBody;
             if (attachmentManifest) {
                 fullPrompt = `${promptBody}\n\n${attachmentManifest}`;
@@ -3358,20 +3470,23 @@ ${input.userComment}
             existingRunner.addStreamMessage(fullPrompt);
             return;
         }
-        // Stop existing runner if it's not streaming
+        // Stop existing runner if it's not running
         if (existingRunner) {
             existingRunner.stop();
         }
-        // Determine if we need a new Claude session
-        const needsNewClaudeSession = isNewSession || !session.claudeSessionId;
         // Fetch full issue details
         const fullIssue = await this.fetchFullIssueDetails(session.issueId, repository.id);
         if (!fullIssue) {
-            console.error(`[resumeClaudeSession] Failed to fetch full issue details for ${session.issueId}`);
+            console.error(`[resumeAgentSession] Failed to fetch full issue details for ${session.issueId}`);
             throw new Error(`Failed to fetch full issue details for ${session.issueId}`);
         }
-        // Fetch issue labels and determine system prompt
+        // Fetch issue labels early to determine runner type
         const labels = await this.fetchIssueLabels(fullIssue);
+        // Determine which runner to use based on existing session IDs
+        const hasClaudeSession = !isNewSession && Boolean(session.claudeSessionId);
+        const hasGeminiSession = !isNewSession && Boolean(session.geminiSessionId);
+        const needsNewSession = isNewSession || (!hasClaudeSession && !hasGeminiSession);
+        // Fetch system prompt based on labels
         const systemPromptResult = await this.determineSystemPromptFromLabels(labels, repository);
         const systemPrompt = systemPromptResult?.prompt;
         const promptType = systemPromptResult?.type;
@@ -3386,27 +3501,43 @@ ${input.userComment}
         await mkdir(attachmentsDir, { recursive: true });
         const allowedDirectories = [
             attachmentsDir,
+            repository.repositoryPath,
             ...additionalAllowedDirectories,
         ];
-        // Create runner configuration
-        const resumeSessionId = needsNewClaudeSession
+        // Get current subroutine to check for singleTurn mode
+        const currentSubroutine = this.procedureRouter.getCurrentSubroutine(session);
+        const resumeSessionId = needsNewSession
             ? undefined
-            : session.claudeSessionId;
-        const runnerConfig = this.buildClaudeRunnerConfig(session, repository, linearAgentActivitySessionId, systemPrompt, allowedTools, allowedDirectories, disallowedTools, resumeSessionId, labels, // Pass labels for model override
-        maxTurns);
-        const runner = new ClaudeRunner(runnerConfig);
+            : session.claudeSessionId
+                ? session.claudeSessionId
+                : session.geminiSessionId;
+        // Create runner configuration
+        // buildAgentRunnerConfig determines runner type from labels for new sessions
+        // For existing sessions, we still need labels for model override but ignore runner type
+        const { config: runnerConfig, runnerType } = this.buildAgentRunnerConfig(session, repository, linearAgentActivitySessionId, systemPrompt, allowedTools, allowedDirectories, disallowedTools, resumeSessionId, labels, // Always pass labels to preserve model override
+        maxTurns, // Pass maxTurns if specified
+        currentSubroutine?.singleTurn);
+        // Create the appropriate runner based on session state
+        const runner = runnerType === "claude"
+            ? new ClaudeRunner(runnerConfig)
+            : new GeminiRunner(runnerConfig);
         // Store runner
-        agentSessionManager.addClaudeRunner(linearAgentActivitySessionId, runner);
+        agentSessionManager.addAgentRunner(linearAgentActivitySessionId, runner);
         // Save state
         await this.savePersistedState();
         // Prepare the full prompt
         const fullPrompt = await this.buildSessionPrompt(isNewSession, session, fullIssue, repository, promptBody, attachmentManifest, commentAuthor, commentTimestamp);
-        // Start streaming session
+        // Start session - use streaming mode if supported for ability to add messages later
         try {
-            await runner.startStreaming(fullPrompt);
+            if (runner.supportsStreamingInput && runner.startStreaming) {
+                await runner.startStreaming(fullPrompt);
+            }
+            else {
+                await runner.start(fullPrompt);
+            }
         }
         catch (error) {
-            console.error(`[resumeClaudeSession] Failed to start streaming session for ${linearAgentActivitySessionId}:`, error);
+            console.error(`[resumeAgentSession] Failed to start streaming session for ${linearAgentActivitySessionId}:`, error);
             throw error;
         }
     }