cyrus-edge-worker 0.0.27 → 0.0.29

package/dist/EdgeWorker.js

@@ -1,11 +1,11 @@
 import { EventEmitter } from "node:events";
 import { mkdir, readdir, readFile, rename, writeFile } from "node:fs/promises";
-import { homedir } from "node:os";
 import { basename, dirname, extname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { LinearClient, } from "@linear/sdk";
-import { ClaudeRunner, getAllTools, getReadOnlyTools, getSafeTools, } from "cyrus-claude-runner";
+import { ClaudeRunner, createCyrusToolsServer, getAllTools, getCoordinatorTools, getReadOnlyTools, getSafeTools, } from "cyrus-claude-runner";
 import { isAgentSessionCreatedWebhook, isAgentSessionPromptedWebhook, isIssueAssignedWebhook, isIssueCommentMentionWebhook, isIssueNewCommentWebhook, isIssueUnassignedWebhook, PersistenceManager, } from "cyrus-core";
+import { LinearWebhookClient } from "cyrus-linear-webhook-client";
 import { NdjsonClient } from "cyrus-ndjson-client";
 import { fileTypeFromBuffer } from "file-type";
 import { AgentSessionManager } from "./AgentSessionManager.js";
@@ -25,10 +25,15 @@ export class EdgeWorker extends EventEmitter {
     ndjsonClients = new Map(); // listeners for webhook events, one per linear token
     persistenceManager;
     sharedApplicationServer;
+    cyrusHome;
+    childToParentAgentSession = new Map(); // Maps child agentSessionId to parent agentSessionId
     constructor(config) {
         super();
         this.config = config;
-        this.persistenceManager = new PersistenceManager();
+        this.cyrusHome = config.cyrusHome;
+        this.persistenceManager = new PersistenceManager(join(this.cyrusHome, "state"));
+        console.log(`[EdgeWorker Constructor] Initializing parent-child session mapping system`);
+        console.log(`[EdgeWorker Constructor] Parent-child mapping initialized with 0 entries`);
         // Initialize shared application server
         const serverPort = config.serverPort || config.webhookPort || 3456;
         const serverHost = config.serverHost || "localhost";
@@ -46,8 +51,57 @@ export class EdgeWorker extends EventEmitter {
                     accessToken: repo.linearToken,
                 });
                 this.linearClients.set(repo.id, linearClient);
-                // Create AgentSessionManager for this repository
-                this.agentSessionManagers.set(repo.id, new AgentSessionManager(linearClient));
+                // Create AgentSessionManager for this repository with parent session lookup and resume callback
+                //
+                // Note: This pattern works (despite appearing recursive) because:
+                // 1. The agentSessionManager variable is captured by the closure after it's assigned
+                // 2. JavaScript's variable hoisting means 'agentSessionManager' exists (but is undefined) when the arrow function is created
+                // 3. By the time the callback is actually invoked (when a child session completes), agentSessionManager is fully initialized
+                // 4. The callback only executes asynchronously, well after the constructor has completed and agentSessionManager is assigned
+                //
+                // 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) => {
+                    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) => {
+                    console.log(`[Parent Session Resume] Child session completed, resuming parent session ${parentSessionId}`);
+                    // Get the parent session and repository
+                    // This works because by the time this callback runs, agentSessionManager is fully initialized
+                    console.log(`[Parent Session Resume] Retrieving parent session ${parentSessionId} from agent session manager`);
+                    const parentSession = agentSessionManager.getSession(parentSessionId);
+                    if (!parentSession) {
+                        console.error(`[Parent Session Resume] Parent session ${parentSessionId} not found in agent session manager`);
+                        return;
+                    }
+                    console.log(`[Parent Session Resume] Found parent session - Issue: ${parentSession.issueId}, Workspace: ${parentSession.workspace.path}`);
+                    // Get the child session to access its workspace path
+                    const childSession = agentSessionManager.getSession(childSessionId);
+                    const childWorkspaceDirs = [];
+                    if (childSession) {
+                        childWorkspaceDirs.push(childSession.workspace.path);
+                        console.log(`[Parent Session Resume] Adding child workspace to parent allowed directories: ${childSession.workspace.path}`);
+                    }
+                    else {
+                        console.warn(`[Parent Session Resume] Could not find child session ${childSessionId} to add workspace to parent allowed directories`);
+                    }
+                    await this.postParentResumeAcknowledgment(parentSessionId, repo.id);
+                    // Resume the parent session with the child's result
+                    console.log(`[Parent Session Resume] Resuming parent Claude session with child results`);
+                    try {
+                        await this.resumeClaudeSession(parentSession, repo, parentSessionId, agentSessionManager, prompt, "", // No attachment manifest for child results
+                        false, // Not a new session
+                        childWorkspaceDirs);
+                        console.log(`[Parent Session Resume] Successfully resumed parent session ${parentSessionId} with child results`);
+                    }
+                    catch (error) {
+                        console.error(`[Parent Session Resume] Failed to resume parent session ${parentSessionId}:`, error);
+                        console.error(`[Parent Session Resume] Error context - Parent issue: ${parentSession.issueId}, Repository: ${repo.name}`);
+                    }
+                });
+                this.agentSessionManagers.set(repo.id, agentSessionManager);
             }
         }
         // Group repositories by token to minimize NDJSON connections
@@ -65,7 +119,9 @@ export class EdgeWorker extends EventEmitter {
             if (!firstRepo)
                 continue;
             const primaryRepoId = firstRepo.id;
-            const ndjsonClient = new NdjsonClient({
+            // Determine which client to use based on environment variable
+            const useLinearDirectWebhooks = process.env.LINEAR_DIRECT_WEBHOOKS === "true";
+            const clientConfig = {
                 proxyUrl: config.proxyUrl,
                 token: token,
                 name: repos.map((r) => r.name).join(", "), // Pass repository names
@@ -83,11 +139,20 @@ export class EdgeWorker extends EventEmitter {
                 onConnect: () => this.handleConnect(primaryRepoId, repos),
                 onDisconnect: (reason) => this.handleDisconnect(primaryRepoId, repos, reason),
                 onError: (error) => this.handleError(error),
-            });
-            // Set up webhook handler - data should be the native webhook payload
-            ndjsonClient.on("webhook", (data) => this.handleWebhook(data, repos));
-            // Optional heartbeat logging
-            if (process.env.DEBUG_EDGE === "true") {
+            };
+            // Create the appropriate client based on configuration
+            const ndjsonClient = useLinearDirectWebhooks
+                ? new LinearWebhookClient({
+                    ...clientConfig,
+                    onWebhook: (payload) => this.handleWebhook(payload, repos),
+                })
+                : new NdjsonClient(clientConfig);
+            // Set up webhook handler for NdjsonClient (LinearWebhookClient uses onWebhook in constructor)
+            if (!useLinearDirectWebhooks) {
+                ndjsonClient.on("webhook", (data) => this.handleWebhook(data, repos));
+            }
+            // Optional heartbeat logging (only for NdjsonClient)
+            if (process.env.DEBUG_EDGE === "true" && !useLinearDirectWebhooks) {
                 ndjsonClient.on("heartbeat", () => {
                     console.log(`❤️ Heartbeat received for token ending in ...${token.slice(-4)}`);
                 });
@@ -212,17 +277,16 @@ export class EdgeWorker extends EventEmitter {
      * Handle webhook events from proxy - now accepts native webhook payloads
      */
     async handleWebhook(webhook, repos) {
-        console.log(`[EdgeWorker] Processing webhook: ${webhook.type}`);
         // Log verbose webhook info if enabled
         if (process.env.CYRUS_WEBHOOK_DEBUG === "true") {
-            console.log(`[EdgeWorker] Webhook payload:`, JSON.stringify(webhook, null, 2));
+            console.log(`[handleWebhook] Full webhook payload:`, JSON.stringify(webhook, null, 2));
         }
         // Find the appropriate repository for this webhook
         const repository = await this.findRepositoryForWebhook(webhook, repos);
         if (!repository) {
-            console.log("No repository configured for webhook from workspace", webhook.organizationId);
             if (process.env.CYRUS_WEBHOOK_DEBUG === "true") {
-                console.log("Available repositories:", repos.map((r) => ({
+                console.log(`[handleWebhook] No repository configured for webhook from workspace ${webhook.organizationId}`);
+                console.log(`[handleWebhook] Available repositories:`, repos.map((r) => ({
                     name: r.name,
                     workspaceId: r.linearWorkspaceId,
                     teamKeys: r.teamKeys,
@@ -231,20 +295,16 @@ export class EdgeWorker extends EventEmitter {
             }
             return;
         }
-        console.log(`[EdgeWorker] Webhook matched to repository: ${repository.name}`);
         try {
             // Handle specific webhook types with proper typing
             // NOTE: Traditional webhooks (assigned, comment) are disabled in favor of agent session events
             if (isIssueAssignedWebhook(webhook)) {
-                console.log(`[EdgeWorker] Ignoring traditional issue assigned webhook - using agent session events instead`);
                 return;
             }
             else if (isIssueCommentMentionWebhook(webhook)) {
-                console.log(`[EdgeWorker] Ignoring traditional comment mention webhook - using agent session events instead`);
                 return;
             }
             else if (isIssueNewCommentWebhook(webhook)) {
-                console.log(`[EdgeWorker] Ignoring traditional new comment webhook - using agent session events instead`);
                 return;
             }
             else if (isIssueUnassignedWebhook(webhook)) {
@@ -258,11 +318,13 @@ export class EdgeWorker extends EventEmitter {
                 await this.handleUserPostedAgentActivity(webhook, repository);
             }
             else {
-                console.log(`Unhandled webhook type: ${webhook.action}`);
+                if (process.env.CYRUS_WEBHOOK_DEBUG === "true") {
+                    console.log(`[handleWebhook] Unhandled webhook type: ${webhook.action} for repository ${repository.name}`);
+                }
             }
         }
         catch (error) {
-            console.error(`[EdgeWorker] Failed to process webhook: ${webhook.action}`, error);
+            console.error(`[handleWebhook] Failed to process webhook: ${webhook.action} for repository ${repository.name}`, error);
             // Don't re-throw webhook processing errors to prevent application crashes
             // The error has been logged and individual webhook failures shouldn't crash the entire system
         }
@@ -437,13 +499,14 @@ export class EdgeWorker extends EventEmitter {
         const attachmentResult = await this.downloadIssueAttachments(fullIssue, repository, workspace.path);
         // Pre-create attachments directory even if no attachments exist yet
         const workspaceFolderName = basename(workspace.path);
-        const attachmentsDir = join(homedir(), ".cyrus", workspaceFolderName, "attachments");
+        const attachmentsDir = join(this.cyrusHome, workspaceFolderName, "attachments");
         await mkdir(attachmentsDir, { recursive: true });
         // Build allowed directories list - always include attachments directory
         const allowedDirectories = [attachmentsDir];
         console.log(`[EdgeWorker] Configured allowed directories for ${fullIssue.identifier}:`, allowedDirectories);
         // Build allowed tools list with Linear MCP tools
         const allowedTools = this.buildAllowedTools(repository);
+        const disallowedTools = this.buildDisallowedTools(repository);
         return {
             session,
             fullIssue,
@@ -452,6 +515,7 @@ export class EdgeWorker extends EventEmitter {
             attachmentsDir,
             allowedDirectories,
             allowedTools,
+            disallowedTools,
         };
     }
     /**
@@ -469,6 +533,8 @@ export class EdgeWorker extends EventEmitter {
         // HACK: This is required since the comment body is always populated, thus there is no other way to differentiate between the two trigger events
         const AGENT_SESSION_MARKER = "This thread is for an agent session";
         const isMentionTriggered = commentBody && !commentBody.includes(AGENT_SESSION_MARKER);
+        // Check if the comment contains the /label-based-prompt command
+        const isLabelBasedPromptRequested = commentBody?.includes("/label-based-prompt");
         // Initialize the agent session in AgentSessionManager
         const agentSessionManager = this.agentSessionManagers.get(repository.id);
         if (!agentSessionManager) {
@@ -481,13 +547,14 @@ export class EdgeWorker extends EventEmitter {
         const sessionData = await this.createLinearAgentSession(linearAgentActivitySessionId, issue, repository, agentSessionManager);
         // Destructure the session data (excluding allowedTools which we'll build with promptType)
         const { session, fullIssue, workspace: _workspace, attachmentResult, attachmentsDir: _attachmentsDir, allowedDirectories, } = sessionData;
-        // Only fetch labels and determine system prompt for delegation (not mentions)
+        // Fetch labels (needed for both model selection and system prompt determination)
+        const labels = await this.fetchIssueLabels(fullIssue);
+        // Only determine system prompt for delegation (not mentions) or when /label-based-prompt is requested
         let systemPrompt;
         let systemPromptVersion;
         let promptType;
-        if (!isMentionTriggered) {
-            // Fetch issue labels and determine system prompt (delegation case)
-            const labels = await this.fetchIssueLabels(fullIssue);
+        if (!isMentionTriggered || isLabelBasedPromptRequested) {
+            // Determine system prompt based on labels (delegation case or /label-based-prompt command)
             const systemPromptResult = await this.determineSystemPromptFromLabels(labels, repository);
             systemPrompt = systemPromptResult?.prompt;
             systemPromptVersion = systemPromptResult?.version;
@@ -502,9 +569,14 @@ export class EdgeWorker extends EventEmitter {
         }
         // Build allowed tools list with Linear MCP tools (now with prompt type context)
         const allowedTools = this.buildAllowedTools(repository, promptType);
+        const disallowedTools = this.buildDisallowedTools(repository, promptType);
         console.log(`[EdgeWorker] Configured allowed tools for ${fullIssue.identifier}:`, allowedTools);
+        if (disallowedTools.length > 0) {
+            console.log(`[EdgeWorker] Configured disallowed tools for ${fullIssue.identifier}:`, disallowedTools);
+        }
         // Create Claude runner with attachment directory access and optional system prompt
-        const runnerConfig = this.buildClaudeRunnerConfig(session, repository, linearAgentActivitySessionId, systemPrompt, allowedTools, allowedDirectories);
+        const runnerConfig = this.buildClaudeRunnerConfig(session, repository, linearAgentActivitySessionId, systemPrompt, allowedTools, allowedDirectories, disallowedTools, undefined, // resumeSessionId
+        labels);
         const runner = new ClaudeRunner(runnerConfig);
         // Store runner by comment ID
         agentSessionManager.addClaudeRunner(linearAgentActivitySessionId, runner);
@@ -517,11 +589,13 @@ export class EdgeWorker extends EventEmitter {
         console.log(`[EdgeWorker] Building initial prompt for issue ${fullIssue.identifier}`);
         try {
             // Choose the appropriate prompt builder based on trigger type and system prompt
-            const promptResult = isMentionTriggered
-                ? await this.buildMentionPrompt(fullIssue, agentSession, attachmentResult.manifest)
-                : systemPrompt
-                    ? await this.buildLabelBasedPrompt(fullIssue, repository, attachmentResult.manifest)
-                    : await this.buildPromptV2(fullIssue, repository, undefined, attachmentResult.manifest);
+            const promptResult = isMentionTriggered && isLabelBasedPromptRequested
+                ? await this.buildLabelBasedPrompt(fullIssue, repository, attachmentResult.manifest)
+                : isMentionTriggered
+                    ? await this.buildMentionPrompt(fullIssue, agentSession, attachmentResult.manifest)
+                    : systemPrompt
+                        ? await this.buildLabelBasedPrompt(fullIssue, repository, attachmentResult.manifest)
+                        : await this.buildPromptV2(fullIssue, repository, undefined, attachmentResult.manifest);
             const { prompt, version: userPromptVersion } = promptResult;
             // Update runner with version information
             if (userPromptVersion || systemPromptVersion) {
@@ -530,11 +604,13 @@ export class EdgeWorker extends EventEmitter {
                     systemPromptVersion,
                 });
             }
-            const promptType = isMentionTriggered
-                ? "mention"
-                : systemPrompt
-                    ? "label-based"
-                    : "fallback";
+            const promptType = isMentionTriggered && isLabelBasedPromptRequested
+                ? "label-based-prompt-command"
+                : isMentionTriggered
+                    ? "mention"
+                    : systemPrompt
+                        ? "label-based"
+                        : "fallback";
             console.log(`[EdgeWorker] Initial prompt built successfully using ${promptType} workflow, length: ${prompt.length} characters`);
             console.log(`[EdgeWorker] Starting Claude streaming session`);
             const sessionInfo = await runner.startStreaming(prompt);
@@ -600,7 +676,7 @@ export class EdgeWorker extends EventEmitter {
         }
         // Always set up attachments directory, even if no attachments in current comment
         const workspaceFolderName = basename(session.workspace.path);
-        const attachmentsDir = join(homedir(), ".cyrus", workspaceFolderName, "attachments");
+        const attachmentsDir = join(this.cyrusHome, workspaceFolderName, "attachments");
         // Ensure directory exists
         await mkdir(attachmentsDir, { recursive: true });
         let attachmentManifest = "";
@@ -659,44 +735,9 @@ export class EdgeWorker extends EventEmitter {
             existingRunner.addStreamMessage(fullPrompt);
             return; // Exit early - comment has been added to stream
         }
-        // Stop existing runner if it's not streaming or stream addition failed
-        if (existingRunner) {
-            existingRunner.stop();
-        }
-        // For newly created sessions or sessions without claudeSessionId, create a fresh Claude session
-        const needsNewClaudeSession = isNewSession || !session.claudeSessionId;
+        // Use the new resumeClaudeSession function
         try {
-            // Fetch full issue details to get labels (needed for both new and existing sessions)
-            const fullIssue = await this.fetchFullIssueDetails(issue.id, repository.id);
-            if (!fullIssue) {
-                throw new Error(`Failed to fetch full issue details for ${issue.id}`);
-            }
-            // Fetch issue labels and determine system prompt (same as in handleAgentSessionCreatedWebhook)
-            const labels = await this.fetchIssueLabels(fullIssue);
-            const systemPromptResult = await this.determineSystemPromptFromLabels(labels, repository);
-            const systemPrompt = systemPromptResult?.prompt;
-            const promptType = systemPromptResult?.type;
-            // Build allowed tools list with Linear MCP tools (now with prompt type context)
-            const allowedTools = this.buildAllowedTools(repository, promptType);
-            console.log(`[EdgeWorker] Configured allowed tools for ${issue.identifier} (continued session):`, allowedTools);
-            const allowedDirectories = [attachmentsDir];
-            // Create runner - resume existing session or start new one
-            const runnerConfig = this.buildClaudeRunnerConfig(session, repository, linearAgentActivitySessionId, systemPrompt, allowedTools, allowedDirectories, needsNewClaudeSession ? undefined : session.claudeSessionId);
-            const runner = new ClaudeRunner(runnerConfig);
-            // Store new runner by comment thread root
-            // Store runner by comment ID
-            agentSessionManager.addClaudeRunner(linearAgentActivitySessionId, runner);
-            // Save state after mapping changes
-            await this.savePersistedState();
-            // Prepare the prompt - different logic for new vs existing sessions
-            const fullPrompt = await this.buildSessionPrompt(isNewSession, fullIssue, repository, promptBody, attachmentManifest);
-            if (isNewSession) {
-                console.log(`[EdgeWorker] Building initial prompt for new session for issue ${fullIssue.identifier}`);
-            }
-            // Start streaming session
-            const sessionType = needsNewClaudeSession ? "new" : "resumed";
-            console.log(`[EdgeWorker] Starting ${sessionType} streaming session for issue ${issue.identifier}`);
-            await runner.startStreaming(fullPrompt);
+            await this.resumeClaudeSession(session, repository, linearAgentActivitySessionId, agentSessionManager, promptBody, attachmentManifest, isNewSession, []);
         }
         catch (error) {
             console.error("Failed to continue conversation:", error);
@@ -776,7 +817,12 @@ export class EdgeWorker extends EventEmitter {
             return undefined;
         }
         // Check each prompt type for matching labels
-        const promptTypes = ["debugger", "builder", "scoper"];
+        const promptTypes = [
+            "debugger",
+            "builder",
+            "scoper",
+            "orchestrator",
+        ];
         for (const promptType of promptTypes) {
             const promptConfig = repository.labelPrompts[promptType];
             // Handle both old array format and new object format for backward compatibility
@@ -833,6 +879,67 @@ export class EdgeWorker extends EventEmitter {
             }
             // Determine the base branch considering parent issues
             const baseBranch = await this.determineBaseBranch(issue, repository);
+            // Fetch assignee information
+            let assigneeId = "";
+            let assigneeName = "";
+            try {
+                if (issue.assigneeId) {
+                    assigneeId = issue.assigneeId;
+                    // Fetch the full assignee object to get the name
+                    const assignee = await issue.assignee;
+                    if (assignee) {
+                        assigneeName = assignee.displayName || assignee.name || "";
+                    }
+                }
+            }
+            catch (error) {
+                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}`);
+            }
+            // Fetch workspace teams and labels
+            let workspaceTeams = "";
+            let workspaceLabels = "";
+            try {
+                console.log(`[EdgeWorker] Fetching workspace teams and labels for repository ${repository.id}`);
+                // Fetch teams
+                const teamsConnection = await linearClient.teams();
+                const teamsArray = [];
+                for (const team of teamsConnection.nodes) {
+                    teamsArray.push({
+                        id: team.id,
+                        name: team.name,
+                        key: team.key,
+                        description: team.description || "",
+                        color: team.color,
+                    });
+                }
+                workspaceTeams = teamsArray
+                    .map((team) => `- ${team.name} (${team.key}): ${team.id}${team.description ? ` - ${team.description}` : ""}`)
+                    .join("\n");
+                // Fetch labels
+                const labelsConnection = await linearClient.issueLabels();
+                const labelsArray = [];
+                for (const label of labelsConnection.nodes) {
+                    labelsArray.push({
+                        id: label.id,
+                        name: label.name,
+                        description: label.description || "",
+                        color: label.color,
+                    });
+                }
+                workspaceLabels = labelsArray
+                    .map((label) => `- ${label.name}: ${label.id}${label.description ? ` - ${label.description}` : ""}`)
+                    .join("\n");
+                console.log(`[EdgeWorker] Fetched ${teamsArray.length} teams and ${labelsArray.length} labels`);
+            }
+            catch (error) {
+                console.warn(`[EdgeWorker] Failed to fetch workspace teams and labels:`, error);
+            }
             // Build the simplified prompt with only essential variables
             let prompt = template
                 .replace(/{{repository_name}}/g, repository.name)
@@ -841,7 +948,11 @@ export class EdgeWorker extends EventEmitter {
                 .replace(/{{issue_identifier}}/g, issue.identifier || "")
                 .replace(/{{issue_title}}/g, issue.title || "")
                 .replace(/{{issue_description}}/g, issue.description || "No description provided")
-                .replace(/{{issue_url}}/g, issue.url || "");
+                .replace(/{{issue_url}}/g, issue.url || "")
+                .replace(/{{assignee_id}}/g, assigneeId)
+                .replace(/{{assignee_name}}/g, assigneeName)
+                .replace(/{{workspace_teams}}/g, workspaceTeams)
+                .replace(/{{workspace_labels}}/g, workspaceLabels);
             if (attachmentManifest) {
                 console.log(`[EdgeWorker] Adding attachment manifest to label-based prompt, length: ${attachmentManifest.length} characters`);
                 prompt = `${prompt}\n\n${attachmentManifest}`;
@@ -1355,7 +1466,8 @@ ${newComment ? `New comment to address:\n${newComment.body}\n\n` : ""}Please ana
         if (!text)
             return [];
         // Match URLs that start with https://uploads.linear.app
-        const regex = /https:\/\/uploads\.linear\.app\/[^\s<>"')]+/gi;
+        // Exclude brackets and parentheses to avoid capturing malformed markdown link syntax
+        const regex = /https:\/\/uploads\.linear\.app\/[a-zA-Z0-9/_.-]+/gi;
         const matches = text.match(regex) || [];
         // Remove duplicates
         return [...new Set(matches)];
@@ -1369,7 +1481,7 @@ ${newComment ? `New comment to address:\n${newComment.body}\n\n` : ""}Please ana
     async downloadIssueAttachments(issue, repository, workspacePath) {
         // Create attachments directory in home directory
         const workspaceFolderName = basename(workspacePath);
-        const attachmentsDir = join(homedir(), ".cyrus", workspaceFolderName, "attachments");
+        const attachmentsDir = join(this.cyrusHome, workspaceFolderName, "attachments");
         try {
             const attachmentMap = {};
             const imageMap = {};
@@ -1377,7 +1489,7 @@ ${newComment ? `New comment to address:\n${newComment.body}\n\n` : ""}Please ana
             let imageCount = 0;
             let skippedCount = 0;
             let failedCount = 0;
-            const maxAttachments = 10;
+            const maxAttachments = 20;
             // Ensure directory exists
             await mkdir(attachmentsDir, { recursive: true });
             // Extract URLs from issue description
@@ -1542,7 +1654,7 @@ ${newComment ? `New comment to address:\n${newComment.body}\n\n` : ""}Please ana
         let newAttachmentCount = 0;
         let newImageCount = 0;
         let failedCount = 0;
-        const maxAttachments = 10;
+        const maxAttachments = 20;
         // Extract URLs from the comment
         const urls = this.extractAttachmentUrls(commentBody);
         if (urls.length === 0) {
@@ -1710,10 +1822,10 @@ ${newComment ? `New comment to address:\n${newComment.body}\n\n` : ""}Please ana
         return manifest;
     }
     /**
-     * Build MCP configuration with automatic Linear server injection
+     * Build MCP configuration with automatic Linear server injection and inline cyrus tools
      */
-    buildMcpConfig(repository) {
-        // Always inject the Linear MCP server with the repository's token
+    buildMcpConfig(repository, parentSessionId) {
+        // Always inject the Linear MCP servers with the repository's token
         const mcpConfig = {
             linear: {
                 type: "stdio",
@@ -1723,6 +1835,58 @@ ${newComment ? `New comment to address:\n${newComment.body}\n\n` : ""}Please ana
                     LINEAR_API_TOKEN: repository.linearToken,
                 },
             },
+            "cyrus-tools": createCyrusToolsServer(repository.linearToken, {
+                parentSessionId,
+                onSessionCreated: (childSessionId, parentId) => {
+                    console.log(`[EdgeWorker] Agent session created: ${childSessionId}, mapping to parent ${parentId}`);
+                    // Map child to parent session
+                    this.childToParentAgentSession.set(childSessionId, parentId);
+                    console.log(`[EdgeWorker] Parent-child mapping updated: ${this.childToParentAgentSession.size} mappings`);
+                },
+                onFeedbackDelivery: async (childSessionId, message) => {
+                    console.log(`[EdgeWorker] Processing feedback delivery to child session ${childSessionId}`);
+                    // Find the repository containing the child session
+                    // We need to search all repositories for this child session
+                    let childRepo;
+                    let childAgentSessionManager;
+                    for (const [repoId, manager] of this.agentSessionManagers) {
+                        if (manager.hasClaudeRunner(childSessionId)) {
+                            childRepo = this.repositories.get(repoId);
+                            childAgentSessionManager = manager;
+                            break;
+                        }
+                    }
+                    if (!childRepo || !childAgentSessionManager) {
+                        console.error(`[EdgeWorker] Child session ${childSessionId} not found in any repository`);
+                        return false;
+                    }
+                    // Get the child session
+                    const childSession = childAgentSessionManager.getSession(childSessionId);
+                    if (!childSession) {
+                        console.error(`[EdgeWorker] Child session ${childSessionId} not found`);
+                        return false;
+                    }
+                    console.log(`[EdgeWorker] Found child session - Issue: ${childSession.issueId}`);
+                    // Format the feedback as a prompt for the child session with enhanced markdown formatting
+                    const feedbackPrompt = `## Received feedback from orchestrator\n\n---\n\n${message}\n\n---`;
+                    // Resume the CHILD session with the feedback from the parent
+                    // Important: We don't await the full session completion to avoid timeouts.
+                    // The feedback is delivered immediately when the session starts, so we can
+                    // return success right away while the session continues in the background.
+                    this.resumeClaudeSession(childSession, childRepo, childSessionId, childAgentSessionManager, feedbackPrompt, "", // No attachment manifest for feedback
+                    false, // Not a new session
+                    [])
+                        .then(() => {
+                        console.log(`[EdgeWorker] Child session ${childSessionId} completed processing feedback`);
+                    })
+                        .catch((error) => {
+                        console.error(`[EdgeWorker] Failed to complete child session with feedback:`, error);
+                    });
+                    // Return success immediately after initiating the session
+                    console.log(`[EdgeWorker] Feedback delivered successfully to child session ${childSessionId}`);
+                    return true;
+                },
+            }),
         };
         return mcpConfig;
     }
@@ -1740,6 +1904,8 @@ ${newComment ? `New comment to address:\n${newComment.body}\n\n` : ""}Please ana
                 return getSafeTools();
             case "all":
                 return getAllTools();
+            case "coordinator":
+                return getCoordinatorTools();
             default:
                 // If it's a string but not a preset, treat it as a single tool
                 return [preset];
@@ -1766,18 +1932,73 @@ ${newComment ? `New comment to address:\n${newComment.body}\n\n` : ""}Please ana
     /**
      * Build Claude runner configuration with common settings
      */
-    buildClaudeRunnerConfig(session, repository, linearAgentActivitySessionId, systemPrompt, allowedTools, allowedDirectories, resumeSessionId) {
+    buildClaudeRunnerConfig(session, repository, linearAgentActivitySessionId, systemPrompt, allowedTools, allowedDirectories, disallowedTools, resumeSessionId, labels) {
+        // Configure PostToolUse hook for playwright screenshots
+        const hooks = {
+            PostToolUse: [
+                {
+                    matcher: "playwright_screenshot",
+                    hooks: [
+                        async (input, _toolUseID, { signal: _signal }) => {
+                            const postToolUseInput = input;
+                            console.log(`Tool ${postToolUseInput.tool_name} completed with response:`, postToolUseInput.tool_response);
+                            return {
+                                continue: true,
+                                additionalContext: "Screenshot taken successfully. You should use the Read tool to view the screenshot file to analyze the visual content.",
+                            };
+                        },
+                    ],
+                },
+            ],
+        };
+        // 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
+                }
+            }
+        }
         const config = {
             workingDirectory: session.workspace.path,
             allowedTools,
+            disallowedTools,
             allowedDirectories,
             workspaceName: session.issue?.identifier || session.issueId,
+            cyrusHome: this.cyrusHome,
             mcpConfigPath: repository.mcpConfigPath,
-            mcpConfig: this.buildMcpConfig(repository),
+            mcpConfig: this.buildMcpConfig(repository, linearAgentActivitySessionId),
             appendSystemPrompt: (systemPrompt || "") + LAST_MESSAGE_MARKER,
-            // Use repository-specific model or fall back to global default
-            model: repository.model || this.config.defaultModel,
-            fallbackModel: repository.fallbackModel || this.config.defaultFallbackModel,
+            // Priority order: label override > repository config > global default
+            model: modelOverride || repository.model || this.config.defaultModel,
+            fallbackModel: fallbackModelOverride ||
+                repository.fallbackModel ||
+                this.config.defaultFallbackModel,
+            hooks,
             onMessage: (message) => {
                 this.handleClaudeMessage(linearAgentActivitySessionId, message, repository.id);
             },
@@ -1788,6 +2009,44 @@ ${newComment ? `New comment to address:\n${newComment.body}\n\n` : ""}Please ana
         }
         return config;
     }
+    /**
+     * Build disallowed tools list following the same hierarchy as allowed tools
+     */
+    buildDisallowedTools(repository, promptType) {
+        let disallowedTools = [];
+        let toolSource = "";
+        // Priority order (same as allowedTools):
+        // 1. Repository-specific prompt type configuration
+        if (promptType && repository.labelPrompts?.[promptType]?.disallowedTools) {
+            disallowedTools = repository.labelPrompts[promptType].disallowedTools;
+            toolSource = `repository label prompt (${promptType})`;
+        }
+        // 2. Global prompt type defaults
+        else if (promptType &&
+            this.config.promptDefaults?.[promptType]?.disallowedTools) {
+            disallowedTools = this.config.promptDefaults[promptType].disallowedTools;
+            toolSource = `global prompt defaults (${promptType})`;
+        }
+        // 3. Repository-level disallowed tools
+        else if (repository.disallowedTools) {
+            disallowedTools = repository.disallowedTools;
+            toolSource = "repository configuration";
+        }
+        // 4. Global default disallowed tools
+        else if (this.config.defaultDisallowedTools) {
+            disallowedTools = this.config.defaultDisallowedTools;
+            toolSource = "global defaults";
+        }
+        // 5. No defaults for disallowedTools (as per requirements)
+        else {
+            disallowedTools = [];
+            toolSource = "none (no defaults)";
+        }
+        if (disallowedTools.length > 0) {
+            console.log(`[EdgeWorker] Disallowed tools for ${repository.name}: ${disallowedTools.length} tools from ${toolSource}`);
+        }
+        return disallowedTools;
+    }
     /**
      * Build allowed tools list with Linear MCP tools automatically included
      */
@@ -1823,7 +2082,7 @@ ${newComment ? `New comment to address:\n${newComment.body}\n\n` : ""}Please ana
         }
         // Linear MCP tools that should always be available
         // See: https://docs.anthropic.com/en/docs/claude-code/iam#tool-specific-permission-rules
-        const linearMcpTools = ["mcp__linear"];
+        const linearMcpTools = ["mcp__linear", "mcp__cyrus-tools"];
         // Combine and deduplicate
         const allTools = [...new Set([...baseTools, ...linearMcpTools])];
         console.log(`[EdgeWorker] Tool selection for ${repository.name}: ${allTools.length} tools from ${toolSource}`);
@@ -1879,9 +2138,12 @@ ${newComment ? `New comment to address:\n${newComment.body}\n\n` : ""}Please ana
             agentSessions[repositoryId] = serializedState.sessions;
             agentSessionEntries[repositoryId] = serializedState.entries;
         }
+        // Serialize child to parent agent session mapping
+        const childToParentAgentSession = Object.fromEntries(this.childToParentAgentSession.entries());
         return {
             agentSessions,
             agentSessionEntries,
+            childToParentAgentSession,
         };
     }
     /**
@@ -1900,6 +2162,11 @@ ${newComment ? `New comment to address:\n${newComment.body}\n\n` : ""}Please ana
                 }
             }
         }
+        // Restore child to parent agent session mapping
+        if (state.childToParentAgentSession) {
+            this.childToParentAgentSession = new Map(Object.entries(state.childToParentAgentSession));
+            console.log(`[EdgeWorker] Restored ${this.childToParentAgentSession.size} child-to-parent agent session mappings`);
+        }
     }
     /**
      * Post instant acknowledgment thought when agent session is created
@@ -1930,6 +2197,35 @@ ${newComment ? `New comment to address:\n${newComment.body}\n\n` : ""}Please ana
             console.error(`[EdgeWorker] Error posting instant acknowledgment:`, error);
         }
     }
+    /**
+     * Post parent resume acknowledgment thought when parent session is resumed from child
+     */
+    async postParentResumeAcknowledgment(linearAgentActivitySessionId, repositoryId) {
+        try {
+            const linearClient = this.linearClients.get(repositoryId);
+            if (!linearClient) {
+                console.warn(`[EdgeWorker] No Linear client found for repository ${repositoryId}`);
+                return;
+            }
+            const activityInput = {
+                agentSessionId: linearAgentActivitySessionId,
+                content: {
+                    type: "thought",
+                    body: "Resuming from child session",
+                },
+            };
+            const result = await linearClient.createAgentActivity(activityInput);
+            if (result.success) {
+                console.log(`[EdgeWorker] Posted parent resumption acknowledgment thought for session ${linearAgentActivitySessionId}`);
+            }
+            else {
+                console.error(`[EdgeWorker] Failed to post parent resumption acknowledgment:`, result);
+            }
+        }
+        catch (error) {
+            console.error(`[EdgeWorker] Error posting parent resumption acknowledgment:`, error);
+        }
+    }
     /**
      * Post thought about system prompt selection based on labels
      */
@@ -1977,6 +2273,18 @@ ${newComment ? `New comment to address:\n${newComment.body}\n\n` : ""}Please ana
                             selectedPromptType = "scoper";
                             triggerLabel = scoperLabel;
                         }
+                        else {
+                            // Check orchestrator labels
+                            const orchestratorConfig = repository.labelPrompts.orchestrator;
+                            const orchestratorLabels = Array.isArray(orchestratorConfig)
+                                ? orchestratorConfig
+                                : orchestratorConfig?.labels;
+                            const orchestratorLabel = orchestratorLabels?.find((label) => labels.includes(label));
+                            if (orchestratorLabel) {
+                                selectedPromptType = "orchestrator";
+                                triggerLabel = orchestratorLabel;
+                            }
+                        }
                     }
                 }
             }
@@ -2003,6 +2311,76 @@ ${newComment ? `New comment to address:\n${newComment.body}\n\n` : ""}Please ana
             console.error(`[EdgeWorker] Error posting system prompt selection thought:`, error);
         }
     }
+    /**
+     * Resume or create a Claude 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
+     * @param linearAgentActivitySessionId The Linear agent session ID
+     * @param agentSessionManager The agent session manager
+     * @param promptBody The prompt text to send
+     * @param attachmentManifest Optional attachment manifest
+     * @param isNewSession Whether this is a new session
+     */
+    async resumeClaudeSession(session, repository, linearAgentActivitySessionId, agentSessionManager, promptBody, attachmentManifest = "", isNewSession = false, additionalAllowedDirectories = []) {
+        // Check for existing runner
+        const existingRunner = session.claudeRunner;
+        // If there's an existing streaming runner, add to it
+        if (existingRunner?.isStreaming()) {
+            let fullPrompt = promptBody;
+            if (attachmentManifest) {
+                fullPrompt = `${promptBody}\n\n${attachmentManifest}`;
+            }
+            fullPrompt = `${fullPrompt}${LAST_MESSAGE_MARKER}`;
+            existingRunner.addStreamMessage(fullPrompt);
+            return;
+        }
+        // Stop existing runner if it's not streaming
+        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}`);
+            throw new Error(`Failed to fetch full issue details for ${session.issueId}`);
+        }
+        // Fetch issue labels and determine system prompt
+        const labels = await this.fetchIssueLabels(fullIssue);
+        const systemPromptResult = await this.determineSystemPromptFromLabels(labels, repository);
+        const systemPrompt = systemPromptResult?.prompt;
+        const promptType = systemPromptResult?.type;
+        // Build allowed tools list
+        const allowedTools = this.buildAllowedTools(repository, promptType);
+        const disallowedTools = this.buildDisallowedTools(repository, promptType);
+        // Set up attachments directory
+        const workspaceFolderName = basename(session.workspace.path);
+        const attachmentsDir = join(this.cyrusHome, workspaceFolderName, "attachments");
+        await mkdir(attachmentsDir, { recursive: true });
+        const allowedDirectories = [
+            attachmentsDir,
+            ...additionalAllowedDirectories,
+        ];
+        // Create runner configuration
+        const runnerConfig = this.buildClaudeRunnerConfig(session, repository, linearAgentActivitySessionId, systemPrompt, allowedTools, allowedDirectories, disallowedTools, needsNewClaudeSession ? undefined : session.claudeSessionId, labels);
+        const runner = new ClaudeRunner(runnerConfig);
+        // Store runner
+        agentSessionManager.addClaudeRunner(linearAgentActivitySessionId, runner);
+        // Save state
+        await this.savePersistedState();
+        // Prepare the full prompt
+        const fullPrompt = await this.buildSessionPrompt(isNewSession, fullIssue, repository, promptBody, attachmentManifest);
+        // Start streaming session
+        try {
+            await runner.startStreaming(fullPrompt);
+        }
+        catch (error) {
+            console.error(`[resumeClaudeSession] Failed to start streaming session for ${linearAgentActivitySessionId}:`, error);
+            throw error;
+        }
+    }
     /**
      * Post instant acknowledgment thought when receiving prompted webhook
      */