cyrus-edge-worker 0.2.1 → 0.2.3

package/dist/EdgeWorker.js

@@ -2,12 +2,12 @@ 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 { LinearEventTransport, LinearIssueTrackerService, } from "cyrus-linear-event-transport";
 import { fileTypeFromBuffer } from "file-type";
 import { AgentSessionManager } from "./AgentSessionManager.js";
 import { ProcedureRouter, } from "./procedures/index.js";
@@ -23,7 +23,7 @@ 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'
+    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;
@@ -49,20 +49,16 @@ export class EdgeWorker extends EventEmitter {
         // 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 +67,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 +99,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,7 +115,7 @@ 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"}`);
@@ -208,10 +205,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) => {
@@ -301,12 +298,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",
@@ -502,13 +499,14 @@ 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);
@@ -553,13 +551,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) {
@@ -601,9 +600,9 @@ export class EdgeWorker extends EventEmitter {
                                 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 +619,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 +687,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 +706,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;
@@ -811,6 +814,10 @@ 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;
@@ -832,6 +839,10 @@ export class EdgeWorker extends EventEmitter {
     async initializeClaudeRunner(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 +942,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,
@@ -1027,7 +1038,7 @@ export class EdgeWorker extends EventEmitter {
             console.log(`[EdgeWorker] Stopped Claude 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 +1054,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)
@@ -1068,6 +1087,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);
@@ -1101,10 +1128,10 @@ export class EdgeWorker extends EventEmitter {
             const isCurrentlyStreaming = session?.claudeRunner?.isStreaming() || 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 +1147,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 +1161,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 +1220,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;
         }
@@ -1373,10 +1397,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 +1408,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 +1423,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 +1745,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 +1793,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 +1896,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 +1918,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 +1934,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 +1949,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 +2024,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 +2046,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);
@@ -2395,13 +2409,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",
@@ -3024,9 +3038,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 +3050,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 +3067,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 +3079,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 +3097,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 +3131,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 +3155,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;
@@ -3241,9 +3255,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 +3323,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)`);
             }
@@ -3401,9 +3415,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 +3430,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 +3446,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 {