cyrus-edge-worker 0.2.2 → 0.2.4

package/dist/EdgeWorker.js

@@ -2,12 +2,13 @@ import { EventEmitter } from "node:events";
 import { mkdir, readdir, readFile, rename, writeFile } from "node:fs/promises";
 import { basename, dirname, extname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
-import { LinearClient, } from "@linear/sdk";
+import { LinearClient } from "@linear/sdk";
 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 { LinearEventTransport } from "cyrus-linear-event-transport";
+import { GeminiRunner } from "cyrus-gemini-runner";
+import { LinearEventTransport, LinearIssueTrackerService, } from "cyrus-linear-event-transport";
 import { fileTypeFromBuffer } from "file-type";
 import { AgentSessionManager } from "./AgentSessionManager.js";
 import { ProcedureRouter, } from "./procedures/index.js";
@@ -22,8 +23,8 @@ 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
-    linearClients = new Map(); // one linear client per 'repository'
+    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
     persistenceManager;
@@ -40,29 +41,27 @@ 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 = {
             fetchIssueLabels: async (issueId, workspaceId) => {
-                // Get Linear client for this workspace
-                const linearClient = this.getLinearClientForWorkspace(workspaceId);
-                if (!linearClient) {
-                    console.warn(`[EdgeWorker] No Linear client found for workspace ${workspaceId}`);
+                // Find repository for this workspace
+                const repo = Array.from(this.repositories.values()).find((r) => r.linearWorkspaceId === workspaceId);
+                if (!repo)
                     return [];
-                }
-                try {
-                    const issue = await linearClient.issue(issueId);
-                    return await this.fetchIssueLabels(issue);
-                }
-                catch (error) {
-                    console.error(`[EdgeWorker] Failed to fetch issue labels for ${issueId}:`, error);
+                // Get issue tracker for this repository
+                const issueTracker = this.issueTrackers.get(repo.id);
+                if (!issueTracker)
                     return [];
-                }
+                // Use platform-agnostic getIssueLabels method
+                return await issueTracker.getIssueLabels(issueId);
             },
             hasActiveSession: (issueId, repositoryId) => {
                 const sessionManager = this.agentSessionManagers.get(repositoryId);
@@ -71,8 +70,8 @@ export class EdgeWorker extends EventEmitter {
                 const activeSessions = sessionManager.getActiveSessionsByIssueId(issueId);
                 return activeSessions.length > 0;
             },
-            getLinearClient: (workspaceId) => {
-                return this.getLinearClientForWorkspace(workspaceId);
+            getIssueTracker: (workspaceId) => {
+                return this.getIssueTrackerForWorkspace(workspaceId);
             },
         };
         this.repositoryRouter = new RepositoryRouter(repositoryRouterDeps);
@@ -103,11 +102,12 @@ export class EdgeWorker extends EventEmitter {
                         : undefined,
                 };
                 this.repositories.set(repo.id, resolvedRepo);
-                // Create Linear client for this repository's workspace
+                // Create issue tracker for this repository's workspace
                 const linearClient = new LinearClient({
                     accessToken: repo.linearToken,
                 });
-                this.linearClients.set(repo.id, linearClient);
+                const issueTracker = new LinearIssueTrackerService(linearClient);
+                this.issueTrackers.set(repo.id, issueTracker);
                 // Create AgentSessionManager for this repository with parent session lookup and resume callback
                 //
                 // Note: This pattern works (despite appearing recursive) because:
@@ -118,54 +118,18 @@ export class EdgeWorker extends EventEmitter {
                 //
                 // This allows the AgentSessionManager to call back into itself to access its own sessions,
                 // enabling child sessions to trigger parent session resumption using the same manager instance.
-                const agentSessionManager = new AgentSessionManager(linearClient, (childSessionId) => {
+                const agentSessionManager = new AgentSessionManager(issueTracker, (childSessionId) => {
                     console.log(`[Parent-Child Lookup] Looking up parent session for child ${childSessionId}`);
                     const parentId = this.childToParentAgentSession.get(childSessionId);
                     console.log(`[Parent-Child Lookup] Child ${childSessionId} -> Parent ${parentId || "not found"}`);
                     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);
             }
         }
@@ -208,10 +172,10 @@ export class EdgeWorker extends EventEmitter {
             secret,
         });
         // Listen for webhook events
-        this.linearEventTransport.on("webhook", (payload) => {
+        this.linearEventTransport.on("event", (event) => {
             // Get all active repositories for webhook handling
             const repos = Array.from(this.repositories.values());
-            this.handleWebhook(payload, repos);
+            this.handleWebhook(event, repos);
         });
         // Listen for errors
         this.linearEventTransport.on("error", (error) => {
@@ -246,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();
@@ -301,12 +265,12 @@ export class EdgeWorker extends EventEmitter {
         }
         await this.postParentResumeAcknowledgment(parentSessionId, repo.id);
         // Post thought to Linear showing child result receipt
-        const linearClient = this.linearClients.get(repo.id);
-        if (linearClient && childSession) {
+        const issueTracker = this.issueTrackers.get(repo.id);
+        if (issueTracker && childSession) {
             const childIssueIdentifier = childSession.issue?.identifier || childSession.issueId;
             const resultThought = `Received result from sub-issue ${childIssueIdentifier}:\n\n---\n\n${prompt}\n\n---`;
             try {
-                const result = await linearClient.createAgentActivity({
+                const result = await issueTracker.createAgentActivity({
                     agentSessionId: parentSessionId,
                     content: {
                         type: "thought",
@@ -338,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
      */
@@ -502,18 +505,22 @@ export class EdgeWorker extends EventEmitter {
                 };
                 // Add to internal map
                 this.repositories.set(repo.id, resolvedRepo);
-                // Create Linear client
+                // Create issue tracker
                 const linearClient = new LinearClient({
                     accessToken: repo.linearToken,
                 });
-                this.linearClients.set(repo.id, linearClient);
+                const issueTracker = new LinearIssueTrackerService(linearClient);
+                this.issueTrackers.set(repo.id, issueTracker);
                 // Create AgentSessionManager with same pattern as constructor
-                const agentSessionManager = new AgentSessionManager(linearClient, (childSessionId) => {
+                const agentSessionManager = new AgentSessionManager(issueTracker, (childSessionId) => {
                     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}`);
             }
@@ -553,13 +560,14 @@ export class EdgeWorker extends EventEmitter {
                 };
                 // Update stored config
                 this.repositories.set(repo.id, resolvedRepo);
-                // If token changed, recreate Linear client
+                // If token changed, recreate issue tracker
                 if (oldRepo.linearToken !== repo.linearToken) {
-                    console.log(`  🔑 Token changed, recreating Linear client`);
+                    console.log(`  🔑 Token changed, recreating issue tracker`);
                     const linearClient = new LinearClient({
                         accessToken: repo.linearToken,
                     });
-                    this.linearClients.set(repo.id, linearClient);
+                    const issueTracker = new LinearIssueTrackerService(linearClient);
+                    this.issueTrackers.set(repo.id, issueTracker);
                 }
                 // If active status changed
                 if (oldRepo.isActive !== repo.isActive) {
@@ -593,17 +601,17 @@ 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}`);
                             }
                             // Post cancellation message to Linear
-                            const linearClient = this.linearClients.get(repo.id);
-                            if (linearClient) {
-                                await linearClient.createAgentActivity({
+                            const issueTracker = this.issueTrackers.get(repo.id);
+                            if (issueTracker) {
+                                await issueTracker.createAgentActivity({
                                     agentSessionId: session.linearAgentActivitySessionId,
                                     content: {
                                         type: "response",
@@ -620,7 +628,7 @@ export class EdgeWorker extends EventEmitter {
                 }
                 // Remove repository from all maps
                 this.repositories.delete(repo.id);
-                this.linearClients.delete(repo.id);
+                this.issueTrackers.delete(repo.id);
                 this.agentSessionManagers.delete(repo.id);
                 console.log(`✅ Repository removed successfully: ${repo.name}`);
             }
@@ -688,6 +696,10 @@ export class EdgeWorker extends EventEmitter {
      * Handle issue unassignment webhook
      */
     async handleIssueUnassignedWebhook(webhook) {
+        if (!webhook.notification.issue) {
+            console.warn("[EdgeWorker] Received issue unassignment webhook without issue");
+            return;
+        }
         const issueId = webhook.notification.issue.id;
         // Get cached repository (unassignment should only happen on issues with active sessions)
         const repository = this.getCachedRepository(issueId);
@@ -703,12 +715,12 @@ export class EdgeWorker extends EventEmitter {
         await this.handleIssueUnassigned(webhook.notification.issue, repository);
     }
     /**
-     * Get Linear client for a workspace by finding first repository with that workspace ID
+     * Get issue tracker for a workspace by finding first repository with that workspace ID
      */
-    getLinearClientForWorkspace(workspaceId) {
+    getIssueTrackerForWorkspace(workspaceId) {
         for (const [repoId, repo] of this.repositories) {
             if (repo.linearWorkspaceId === workspaceId) {
-                return this.linearClients.get(repoId);
+                return this.issueTrackers.get(repoId);
             }
         }
         return undefined;
@@ -751,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);
@@ -811,17 +826,21 @@ export class EdgeWorker extends EventEmitter {
             // Post agent activity showing auto-matched routing
             await this.postRepositorySelectionActivity(webhook.agentSession.id, repository.id, repository.name, routingMethod);
         }
+        if (!webhook.agentSession.issue) {
+            console.warn("[EdgeWorker] Agent session created webhook missing issue");
+            return;
+        }
         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
@@ -829,9 +848,13 @@ 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) {
+            console.warn("[EdgeWorker] Cannot initialize Claude runner without issue");
+            return;
+        }
         // Log guidance if present
         if (guidance && guidance.length > 0) {
             console.log(`[EdgeWorker] Agent guidance received: ${guidance.length} rule(s)`);
@@ -931,7 +954,7 @@ export class EdgeWorker extends EventEmitter {
                 repository,
                 userComment: commentBody || "", // Empty for delegation, present for mentions
                 attachmentManifest: attachmentResult.manifest,
-                guidance,
+                guidance: guidance || undefined,
                 agentSession,
                 labels,
                 isNewSession: true,
@@ -962,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
         }
@@ -1021,13 +1063,13 @@ 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";
+        const issueTitle = issue?.title || "this issue";
         const stopConfirmation = `I've stopped working on ${issueTitle} as requested.\n\n**Stop Signal:** Received from ${webhook.agentSession.creator?.name || "user"}\n**Action Taken:** All ongoing work has been halted`;
         await foundManager.createResponseActivity(agentSessionId, stopConfirmation);
     }
@@ -1043,6 +1085,14 @@ export class EdgeWorker extends EventEmitter {
         const { agentSession, agentActivity, guidance } = webhook;
         const commentBody = agentSession.comment?.body;
         const agentSessionId = agentSession.id;
+        if (!agentActivity) {
+            console.warn("[EdgeWorker] Cannot handle repository selection without agentActivity");
+            return;
+        }
+        if (!agentSession.issue) {
+            console.warn("[EdgeWorker] Cannot handle repository selection without issue");
+            return;
+        }
         const userMessage = agentActivity.content.body;
         console.log(`[EdgeWorker] Processing repository selection response: "${userMessage}"`);
         // Get the selected repository (or fallback)
@@ -1056,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)
@@ -1068,6 +1118,14 @@ export class EdgeWorker extends EventEmitter {
         const { agentSession } = webhook;
         const linearAgentActivitySessionId = agentSession.id;
         const { issue } = agentSession;
+        if (!issue) {
+            console.warn("[EdgeWorker] Cannot handle prompted activity without issue");
+            return;
+        }
+        if (!webhook.agentActivity) {
+            console.warn("[EdgeWorker] Cannot handle prompted activity without agentActivity");
+            return;
+        }
         const commentId = webhook.agentActivity.sourceCommentId;
         // Initialize the agent session in AgentSessionManager
         const agentSessionManager = this.agentSessionManagers.get(repository.id);
@@ -1097,14 +1155,14 @@ 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 linearClient = this.linearClients.get(repository.id);
-            if (linearClient) {
+            const issueTracker = this.issueTrackers.get(repository.id);
+            if (issueTracker) {
                 try {
-                    fullIssue = await linearClient.issue(issue.id);
+                    fullIssue = await issueTracker.fetchIssue(issue.id);
                 }
                 catch (error) {
                     console.warn(`[EdgeWorker] Failed to fetch full issue for routing: ${issue.id}`, error);
@@ -1120,10 +1178,10 @@ export class EdgeWorker extends EventEmitter {
         }
         // Acknowledgment already posted above for both new and existing sessions
         // (before any async routing work to ensure instant user feedback)
-        // Get Linear client for this repository
-        const linearClient = this.linearClients.get(repository.id);
-        if (!linearClient) {
-            console.error("Unexpected: There was no LinearClient for the repository with id", repository.id);
+        // Get issue tracker for this repository
+        const issueTracker = this.issueTrackers.get(repository.id);
+        if (!issueTracker) {
+            console.error("Unexpected: There was no IssueTrackerService for the repository with id", repository.id);
             return;
         }
         // Always set up attachments directory, even if no attachments in current comment
@@ -1134,37 +1192,34 @@ export class EdgeWorker extends EventEmitter {
         let attachmentManifest = "";
         let commentAuthor;
         let commentTimestamp;
+        if (!commentId) {
+            console.warn("[EdgeWorker] No comment ID provided for attachment handling");
+        }
         try {
-            const result = await linearClient.client.rawRequest(`
-          query GetComment($id: String!) {
-            comment(id: $id) {
-              id
-              body
-              createdAt
-              updatedAt
-              user {
-                name
-                displayName
-                email
-                id
-              }
-            }
-          }
-        `, { id: commentId });
-            // Extract comment data
-            const comment = result.data.comment;
+            const comment = commentId
+                ? await issueTracker.fetchComment(commentId)
+                : null;
             // Extract comment metadata for multi-player context
             if (comment) {
-                const user = comment.user;
+                const user = await comment.user;
                 commentAuthor =
                     user?.displayName || user?.name || user?.email || "Unknown";
-                commentTimestamp = comment.createdAt || new Date().toISOString();
+                commentTimestamp = comment.createdAt
+                    ? comment.createdAt.toISOString()
+                    : new Date().toISOString();
             }
             // Count existing attachments
             const existingFiles = await readdir(attachmentsDir).catch(() => []);
             const existingAttachmentCount = existingFiles.filter((file) => file.startsWith("attachment_") || file.startsWith("image_")).length;
             // Download new attachments from the comment
-            const downloadResult = await this.downloadCommentAttachments(comment.body, attachmentsDir, repository.linearToken, existingAttachmentCount);
+            const downloadResult = comment
+                ? await this.downloadCommentAttachments(comment.body, attachmentsDir, repository.linearToken, existingAttachmentCount)
+                : {
+                    totalNewAttachments: 0,
+                    newAttachmentMap: {},
+                    newImageMap: {},
+                    failedCount: 0,
+                };
             if (downloadResult.totalNewAttachments > 0) {
                 attachmentManifest = this.generateNewAttachmentManifest(downloadResult);
             }
@@ -1196,7 +1251,7 @@ export class EdgeWorker extends EventEmitter {
         // Branch 1: Handle stop signal (checked FIRST, before any routing work)
         // Per CLAUDE.md: "an agentSession MUST already exist" for stop signals
         // IMPORTANT: Stop signals do NOT require repository lookup
-        if (webhook.agentActivity.signal === "stop") {
+        if (webhook.agentActivity?.signal === "stop") {
             await this.handleStopSignal(webhook);
             return;
         }
@@ -1235,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
@@ -1284,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
      */
@@ -1373,10 +1508,10 @@ export class EdgeWorker extends EventEmitter {
                 console.warn(`[EdgeWorker] Failed to fetch assignee details:`, error);
             }
             // Get LinearClient for this repository
-            const linearClient = this.linearClients.get(repository.id);
-            if (!linearClient) {
-                console.error(`No LinearClient found for repository ${repository.id}`);
-                throw new Error(`No LinearClient found for repository ${repository.id}`);
+            const issueTracker = this.issueTrackers.get(repository.id);
+            if (!issueTracker) {
+                console.error(`No IssueTrackerService found for repository ${repository.id}`);
+                throw new Error(`No IssueTrackerService found for repository ${repository.id}`);
             }
             // Fetch workspace teams and labels
             let workspaceTeams = "";
@@ -1384,7 +1519,7 @@ export class EdgeWorker extends EventEmitter {
             try {
                 console.log(`[EdgeWorker] Fetching workspace teams and labels for repository ${repository.id}`);
                 // Fetch teams
-                const teamsConnection = await linearClient.teams();
+                const teamsConnection = await issueTracker.fetchTeams();
                 const teamsArray = [];
                 for (const team of teamsConnection.nodes) {
                     teamsArray.push({
@@ -1399,7 +1534,7 @@ export class EdgeWorker extends EventEmitter {
                     .map((team) => `- ${team.name} (${team.key}): ${team.id}${team.description ? ` - ${team.description}` : ""}`)
                     .join("\n");
                 // Fetch labels
-                const labelsConnection = await linearClient.issueLabels();
+                const labelsConnection = await issueTracker.fetchLabels();
                 const labelsArray = [];
                 for (const label of labelsConnection.nodes) {
                     labelsArray.push({
@@ -1721,14 +1856,12 @@ ${reply.body}
             // Determine the base branch considering parent issues
             const baseBranch = await this.determineBaseBranch(issue, repository);
             // Get formatted comment threads
-            const linearClient = this.linearClients.get(repository.id);
+            const issueTracker = this.issueTrackers.get(repository.id);
             let commentThreads = "No comments yet.";
-            if (linearClient && issue.id) {
+            if (issueTracker && issue.id) {
                 try {
                     console.log(`[EdgeWorker] Fetching comments for issue ${issue.identifier}`);
-                    const comments = await linearClient.comments({
-                        filter: { issue: { id: { eq: issue.id } } },
-                    });
+                    const comments = await issueTracker.fetchComments(issue.id);
                     const commentNodes = comments.nodes;
                     if (commentNodes.length > 0) {
                         commentThreads = await this.formatCommentThreads(commentNodes);
@@ -1771,11 +1904,9 @@ IMPORTANT: Focus specifically on addressing the new comment above. This is a new
                 // Now replace the new comment variables
                 // We'll need to fetch the comment author
                 let authorName = "Unknown";
-                if (linearClient) {
+                if (issueTracker) {
                     try {
-                        const fullComment = await linearClient.comment({
-                            id: newComment.id,
-                        });
+                        const fullComment = await issueTracker.fetchComment(newComment.id);
                         const user = await fullComment.user;
                         authorName =
                             user?.displayName || user?.name || user?.email || "Unknown";
@@ -1876,13 +2007,13 @@ ${newComment ? `New comment to address:\n${newComment.body}\n\n` : ""}Please ana
     /**
      * Move issue to started state when assigned
      * @param issue Full Linear issue object from Linear SDK
-     * @param repositoryId Repository ID for Linear client lookup
+     * @param repositoryId Repository ID for issue tracker lookup
      */
     async moveIssueToStartedState(issue, repositoryId) {
         try {
-            const linearClient = this.linearClients.get(repositoryId);
-            if (!linearClient) {
-                console.warn(`No Linear client found for repository ${repositoryId}, skipping state update`);
+            const issueTracker = this.issueTrackers.get(repositoryId);
+            if (!issueTracker) {
+                console.warn(`No issue tracker found for repository ${repositoryId}, skipping state update`);
                 return;
             }
             // Check if issue is already in a started state
@@ -1898,9 +2029,7 @@ ${newComment ? `New comment to address:\n${newComment.body}\n\n` : ""}Please ana
                 return;
             }
             // Get available workflow states for the issue's team
-            const teamStates = await linearClient.workflowStates({
-                filter: { team: { id: { eq: team.id } } },
-            });
+            const teamStates = await issueTracker.fetchWorkflowStates(team.id);
             const states = teamStates;
             // Find all states with type "started" and pick the one with lowest position
             // This ensures we pick "In Progress" over "In Review" when both have type "started"
@@ -1916,7 +2045,7 @@ ${newComment ? `New comment to address:\n${newComment.body}\n\n` : ""}Please ana
                 console.warn(`Issue ${issue.identifier} has no ID, skipping state update`);
                 return;
             }
-            await linearClient.updateIssue(issue.id, {
+            await issueTracker.updateIssue(issue.id, {
                 stateId: startedState.id,
             });
             console.log(`✅ Successfully moved issue ${issue.identifier} to ${startedState.name} state`);
@@ -1931,35 +2060,33 @@ ${newComment ? `New comment to address:\n${newComment.body}\n\n` : ""}Please ana
      */
     // private async postInitialComment(issueId: string, repositoryId: string): Promise<void> {
     //   const body = "I'm getting started right away."
-    //   // Get the Linear client for this repository
-    //   const linearClient = this.linearClients.get(repositoryId)
-    //   if (!linearClient) {
-    //     throw new Error(`No Linear client found for repository ${repositoryId}`)
+    //   // Get the issue tracker for this repository
+    //   const issueTracker = this.issueTrackers.get(repositoryId)
+    //   if (!issueTracker) {
+    //     throw new Error(`No issue tracker found for repository ${repositoryId}`)
     //   }
     //   const commentData = {
-    //     issueId,
     //     body
     //   }
-    //   await linearClient.createComment(commentData)
+    //   await issueTracker.createComment(commentData)
     // }
     /**
      * Post a comment to Linear
      */
     async postComment(issueId, body, repositoryId, parentId) {
-        // Get the Linear client for this repository
-        const linearClient = this.linearClients.get(repositoryId);
-        if (!linearClient) {
-            throw new Error(`No Linear client found for repository ${repositoryId}`);
+        // Get the issue tracker for this repository
+        const issueTracker = this.issueTrackers.get(repositoryId);
+        if (!issueTracker) {
+            throw new Error(`No issue tracker found for repository ${repositoryId}`);
         }
-        const commentData = {
-            issueId,
+        const commentInput = {
             body,
         };
         // Add parent ID if provided (for reply)
         if (parentId) {
-            commentData.parentId = parentId;
+            commentInput.parentId = parentId;
         }
-        await linearClient.createComment(commentData);
+        await issueTracker.createComment(issueId, commentInput);
     }
     /**
      * Format todos as Linear checklist markdown
@@ -2008,10 +2135,10 @@ ${newComment ? `New comment to address:\n${newComment.body}\n\n` : ""}Please ana
             const descriptionUrls = this.extractAttachmentUrls(issue.description || "");
             // Extract URLs from comments if available
             const commentUrls = [];
-            const linearClient = this.linearClients.get(repository.id);
+            const issueTracker = this.issueTrackers.get(repository.id);
             // Fetch native Linear attachments (e.g., Sentry links)
             const nativeAttachments = [];
-            if (linearClient && issue.id) {
+            if (issueTracker && issue.id) {
                 try {
                     // Fetch native attachments using Linear SDK
                     console.log(`[EdgeWorker] Fetching native attachments for issue ${issue.identifier}`);
@@ -2030,9 +2157,7 @@ ${newComment ? `New comment to address:\n${newComment.body}\n\n` : ""}Please ana
                     console.error("Failed to fetch native attachments:", error);
                 }
                 try {
-                    const comments = await linearClient.comments({
-                        filter: { issue: { id: { eq: issue.id } } },
-                    });
+                    const comments = await issueTracker.fetchComments(issue.id);
                     const commentNodes = comments.nodes;
                     for (const comment of commentNodes) {
                         const urls = this.extractAttachmentUrls(comment.body);
@@ -2364,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;
@@ -2395,13 +2520,13 @@ ${newComment ? `New comment to address:\n${newComment.body}\n\n` : ""}Please ana
                         }
                     }
                     // Post thought to Linear showing feedback receipt
-                    const linearClient = this.linearClients.get(childRepo.id);
-                    if (linearClient) {
+                    const issueTracker = this.issueTrackers.get(childRepo.id);
+                    if (issueTracker) {
                         const feedbackThought = parentIssueId
                             ? `Received feedback from orchestrator (${parentIssueId}):\n\n---\n\n${message}\n\n---`
                             : `Received feedback from orchestrator:\n\n---\n\n${message}\n\n---`;
                         try {
-                            const result = await linearClient.createAgentActivity({
+                            const result = await issueTracker.createAgentActivity({
                                 agentSessionId: childSessionId,
                                 content: {
                                     type: "thought",
@@ -2748,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: [
@@ -2769,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,
@@ -2812,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,
@@ -2825,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
@@ -3024,9 +3146,9 @@ ${input.userComment}
      */
     async postInstantAcknowledgment(linearAgentActivitySessionId, repositoryId) {
         try {
-            const linearClient = this.linearClients.get(repositoryId);
-            if (!linearClient) {
-                console.warn(`[EdgeWorker] No Linear client found for repository ${repositoryId}`);
+            const issueTracker = this.issueTrackers.get(repositoryId);
+            if (!issueTracker) {
+                console.warn(`[EdgeWorker] No issue tracker found for repository ${repositoryId}`);
                 return;
             }
             const activityInput = {
@@ -3036,7 +3158,7 @@ ${input.userComment}
                     body: "I've received your request and I'm starting to work on it. Let me analyze the issue and prepare my approach.",
                 },
             };
-            const result = await linearClient.createAgentActivity(activityInput);
+            const result = await issueTracker.createAgentActivity(activityInput);
             if (result.success) {
                 console.log(`[EdgeWorker] Posted instant acknowledgment thought for session ${linearAgentActivitySessionId}`);
             }
@@ -3053,9 +3175,9 @@ ${input.userComment}
      */
     async postParentResumeAcknowledgment(linearAgentActivitySessionId, repositoryId) {
         try {
-            const linearClient = this.linearClients.get(repositoryId);
-            if (!linearClient) {
-                console.warn(`[EdgeWorker] No Linear client found for repository ${repositoryId}`);
+            const issueTracker = this.issueTrackers.get(repositoryId);
+            if (!issueTracker) {
+                console.warn(`[EdgeWorker] No issue tracker found for repository ${repositoryId}`);
                 return;
             }
             const activityInput = {
@@ -3065,7 +3187,7 @@ ${input.userComment}
                     body: "Resuming from child session",
                 },
             };
-            const result = await linearClient.createAgentActivity(activityInput);
+            const result = await issueTracker.createAgentActivity(activityInput);
             if (result.success) {
                 console.log(`[EdgeWorker] Posted parent resumption acknowledgment thought for session ${linearAgentActivitySessionId}`);
             }
@@ -3083,9 +3205,9 @@ ${input.userComment}
      */
     async postRepositorySelectionActivity(linearAgentActivitySessionId, repositoryId, repositoryName, selectionMethod) {
         try {
-            const linearClient = this.linearClients.get(repositoryId);
-            if (!linearClient) {
-                console.warn(`[EdgeWorker] No Linear client found for repository ${repositoryId}`);
+            const issueTracker = this.issueTrackers.get(repositoryId);
+            if (!issueTracker) {
+                console.warn(`[EdgeWorker] No issue tracker found for repository ${repositoryId}`);
                 return;
             }
             let methodDisplay;
@@ -3117,7 +3239,7 @@ ${input.userComment}
                     body: `Repository "${repositoryName}" has been ${methodDisplay}.`,
                 },
             };
-            const result = await linearClient.createAgentActivity(activityInput);
+            const result = await issueTracker.createAgentActivity(activityInput);
             if (result.success) {
                 console.log(`[EdgeWorker] Posted repository selection activity for session ${linearAgentActivitySessionId} (${selectionMethod})`);
             }
@@ -3141,11 +3263,11 @@ ${input.userComment}
         // Post ephemeral "Routing..." thought
         await agentSessionManager.postRoutingThought(linearAgentActivitySessionId);
         // Fetch full issue and labels to check for Orchestrator label override
-        const linearClient = this.linearClients.get(repository.id);
+        const issueTracker = this.issueTrackers.get(repository.id);
         let hasOrchestratorLabel = false;
-        if (linearClient) {
+        if (issueTracker) {
             try {
-                const fullIssue = await linearClient.issue(session.issueId);
+                const fullIssue = await issueTracker.fetchIssue(session.issueId);
                 const labels = await this.fetchIssueLabels(fullIssue);
                 // Check for Orchestrator label (same logic as initial routing)
                 const orchestratorConfig = repository.labelPrompts?.orchestrator;
@@ -3208,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;
@@ -3232,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
     }
@@ -3241,9 +3365,9 @@ ${input.userComment}
      */
     async postSystemPromptSelectionThought(linearAgentActivitySessionId, labels, repositoryId) {
         try {
-            const linearClient = this.linearClients.get(repositoryId);
-            if (!linearClient) {
-                console.warn(`[EdgeWorker] No Linear client found for repository ${repositoryId}`);
+            const issueTracker = this.issueTrackers.get(repositoryId);
+            if (!issueTracker) {
+                console.warn(`[EdgeWorker] No issue tracker found for repository ${repositoryId}`);
                 return;
             }
             // Determine which prompt type was selected and which label triggered it
@@ -3309,7 +3433,7 @@ ${input.userComment}
                     body: `Entering '${selectedPromptType}' mode because of the '${triggerLabel}' label. I'll follow the ${selectedPromptType} process...`,
                 },
             };
-            const result = await linearClient.createAgentActivity(activityInput);
+            const result = await issueTracker.createAgentActivity(activityInput);
             if (result.success) {
                 console.log(`[EdgeWorker] Posted system prompt selection thought for session ${linearAgentActivitySessionId} (${selectedPromptType} mode)`);
             }
@@ -3322,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
@@ -3332,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}`;
@@ -3344,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;
@@ -3372,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;
         }
     }
@@ -3401,9 +3546,9 @@ ${input.userComment}
      */
     async postInstantPromptedAcknowledgment(linearAgentActivitySessionId, repositoryId, isStreaming) {
         try {
-            const linearClient = this.linearClients.get(repositoryId);
-            if (!linearClient) {
-                console.warn(`[EdgeWorker] No Linear client found for repository ${repositoryId}`);
+            const issueTracker = this.issueTrackers.get(repositoryId);
+            if (!issueTracker) {
+                console.warn(`[EdgeWorker] No issue tracker found for repository ${repositoryId}`);
                 return;
             }
             const message = isStreaming
@@ -3416,7 +3561,7 @@ ${input.userComment}
                     body: message,
                 },
             };
-            const result = await linearClient.createAgentActivity(activityInput);
+            const result = await issueTracker.createAgentActivity(activityInput);
             if (result.success) {
                 console.log(`[EdgeWorker] Posted instant prompted acknowledgment thought for session ${linearAgentActivitySessionId} (streaming: ${isStreaming})`);
             }
@@ -3432,14 +3577,14 @@ ${input.userComment}
      * Fetch complete issue details from Linear API
      */
     async fetchFullIssueDetails(issueId, repositoryId) {
-        const linearClient = this.linearClients.get(repositoryId);
-        if (!linearClient) {
-            console.warn(`[EdgeWorker] No Linear client found for repository ${repositoryId}`);
+        const issueTracker = this.issueTrackers.get(repositoryId);
+        if (!issueTracker) {
+            console.warn(`[EdgeWorker] No issue tracker found for repository ${repositoryId}`);
             return null;
         }
         try {
             console.log(`[EdgeWorker] Fetching full issue details for ${issueId}`);
-            const fullIssue = await linearClient.issue(issueId);
+            const fullIssue = await issueTracker.fetchIssue(issueId);
             console.log(`[EdgeWorker] Successfully fetched issue details for ${issueId}`);
             // Check if issue has a parent
             try {