@rallycry/conveyor-agent 2.15.0 → 2.17.0

package/dist/{chunk-JJBVPGTW.js → chunk-MKSZQWR3.js}

@@ -90,6 +90,40 @@ var ConveyorConnection = class _ConveyorConnection {
       );
     });
   }
+  fetchTaskFiles() {
+    const socket = this.socket;
+    if (!socket) throw new Error("Not connected");
+    return new Promise((resolve2, reject) => {
+      socket.emit(
+        "agentRunner:getTaskFiles",
+        { taskId: this.config.taskId },
+        (response) => {
+          if (response.success && response.data) {
+            resolve2(response.data);
+          } else {
+            reject(new Error(response.error ?? "Failed to fetch task files"));
+          }
+        }
+      );
+    });
+  }
+  fetchTaskFile(fileId) {
+    const socket = this.socket;
+    if (!socket) throw new Error("Not connected");
+    return new Promise((resolve2, reject) => {
+      socket.emit(
+        "agentRunner:getTaskFile",
+        { taskId: this.config.taskId, fileId },
+        (response) => {
+          if (response.success && response.data) {
+            resolve2(response.data);
+          } else {
+            reject(new Error(response.error ?? "Failed to fetch task file"));
+          }
+        }
+      );
+    });
+  }
   fetchTaskContext() {
     const socket = this.socket;
     if (!socket) throw new Error("Not connected");
@@ -417,6 +451,7 @@ function removeWorktree(projectDir, taskId) {
 }
 
 // src/runner.ts
+import { randomUUID as randomUUID2 } from "crypto";
 import { execSync as execSync3 } from "child_process";
 import { readdirSync, statSync, readFileSync } from "fs";
 import { homedir } from "os";
@@ -428,6 +463,12 @@ import { query } from "@anthropic-ai/claude-agent-sdk";
 
 // src/prompt-builder.ts
 var ACTIVE_STATUSES = /* @__PURE__ */ new Set(["InProgress", "ReviewPR", "ReviewDev", "ReviewLive"]);
+function formatFileSize(bytes) {
+  if (bytes === void 0) return "";
+  if (bytes < 1024) return `${bytes}B`;
+  if (bytes < 1024 * 1024) return `${Math.round(bytes / 1024)}KB`;
+  return `${(bytes / (1024 * 1024)).toFixed(1)}MB`;
+}
 function findLastAgentMessageIndex(history) {
   for (let i = history.length - 1; i >= 0; i--) {
     if (history[i].role === "assistant") return i;
@@ -543,13 +584,18 @@ ${context.plan}`);
       parts.push(`[${sender}]: ${msg.content}`);
       if (msg.files?.length) {
         for (const file of msg.files) {
+          const sizeStr = file.fileSize ? `, ${formatFileSize(file.fileSize)}` : "";
           if (file.content && file.contentEncoding === "utf-8") {
-            parts.push(`[Attached file: ${file.fileName} (${file.mimeType})]`);
+            parts.push(`[Attached: ${file.fileName} (${file.mimeType}${sizeStr})]`);
             parts.push("```");
             parts.push(file.content);
             parts.push("```");
           } else if (!file.content) {
-            parts.push(`[Attached file: ${file.fileName} (${file.mimeType})]: ${file.downloadUrl}`);
+            parts.push(
+              `[Attached: ${file.fileName} (${file.mimeType}${sizeStr})]: ${file.downloadUrl}`
+            );
+          } else {
+            parts.push(`[Attached: ${file.fileName} (${file.mimeType}${sizeStr})]`);
           }
         }
       }
@@ -562,7 +608,14 @@ function buildInstructions(mode, context, scenario) {
 ## Instructions`];
   const isPm = mode === "pm";
   if (scenario === "fresh") {
-    if (isPm) {
+    if (isPm && context.isParentTask) {
+      parts.push(
+        `You are the project manager for this task and its subtasks.`,
+        `Use list_subtasks to review the current state of child tasks.`,
+        `The task details are provided above. Wait for the team to provide instructions before taking action.`,
+        `When you finish planning, save the plan with update_task, post a summary to chat, and end your turn.`
+      );
+    } else if (isPm) {
       parts.push(
         `You are the project manager for this task.`,
         `The task details are provided above. Wait for the team to ask questions or provide additional requirements before starting to plan.`,
@@ -644,7 +697,7 @@ function buildInitialPrompt(mode, context) {
 }
 function buildSystemPrompt(mode, context, config, setupLog) {
   const isPm = mode === "pm";
-  const parts = isPm ? [
+  const pmParts = [
     `You are an AI project manager helping to plan tasks for the "${context.title}" project.`,
     `You are running locally with full access to the repository.`,
     `You can read files, search code, and run shell commands (e.g. git log, git diff) to understand the codebase. You cannot write or edit files.`,
@@ -659,7 +712,34 @@ Workflow:`,
     `- You can also use update_task directly to save the plan to the task.`,
     `- After saving the plan, post a summary to chat and end your turn. Do NOT attempt to execute the plan yourself.`,
     `- A separate task agent will handle execution after the team reviews and approves your plan.`
-  ] : [
+  ];
+  if (isPm && context.isParentTask) {
+    pmParts.push(
+      `
+You are the Project Manager for this set of tasks.`,
+      `This task has child tasks (subtasks) that are tracked on the board.`,
+      `Your role is to coordinate, plan, and manage the subtasks \u2014 not to write code directly.`,
+      `Use the subtask tools (create_subtask, update_subtask, list_subtasks) to manage work breakdown.`
+    );
+  }
+  if (isPm && context.storyPoints && context.storyPoints.length > 0) {
+    pmParts.push(`
+Story Point Tiers:`);
+    for (const sp of context.storyPoints) {
+      const desc = sp.description ? ` \u2014 ${sp.description}` : "";
+      pmParts.push(`- Value ${sp.value}: "${sp.name}"${desc}`);
+    }
+  }
+  if (isPm && context.projectAgents && context.projectAgents.length > 0) {
+    pmParts.push(`
+Project Agents:`);
+    for (const pa of context.projectAgents) {
+      const role = pa.role ? `role: ${pa.role}` : "role: unassigned";
+      const sp = pa.storyPoints != null ? `, story points: ${pa.storyPoints}` : "";
+      pmParts.push(`- ${pa.agent.name} (${role}${sp})`);
+    }
+  }
+  const parts = isPm ? pmParts : [
     `You are an AI agent working on a task for the "${context.title}" project.`,
     `You are running inside a GitHub Codespace with full access to the repository.`,
     `
@@ -776,10 +856,48 @@ function buildCommonTools(connection, config) {
         }
       },
       { annotations: { readOnlyHint: true } }
+    ),
+    tool(
+      "list_task_files",
+      "List all files attached to this task with metadata (name, type, size) and download URLs",
+      {},
+      async () => {
+        try {
+          const files = await connection.fetchTaskFiles();
+          return textResult(JSON.stringify(files, null, 2));
+        } catch {
+          return textResult("Failed to list task files.");
+        }
+      },
+      { annotations: { readOnlyHint: true } }
+    ),
+    tool(
+      "get_task_file",
+      "Get a specific task file's content and download URL by file ID",
+      { fileId: z.string().describe("The file ID to retrieve") },
+      async ({ fileId }) => {
+        try {
+          const file = await connection.fetchTaskFile(fileId);
+          return textResult(JSON.stringify(file, null, 2));
+        } catch (error) {
+          return textResult(
+            `Failed to get task file: ${error instanceof Error ? error.message : "Unknown error"}`
+          );
+        }
+      },
+      { annotations: { readOnlyHint: true } }
     )
   ];
 }
-function buildPmTools(connection) {
+function buildStoryPointDescription(storyPoints) {
+  if (storyPoints && storyPoints.length > 0) {
+    const tiers = storyPoints.map((sp) => `${sp.value}=${sp.name}`).join(", ");
+    return `Story point value (${tiers})`;
+  }
+  return "Story point value (1=Common, 2=Magic, 3=Rare, 5=Unique)";
+}
+function buildPmTools(connection, storyPoints) {
+  const spDescription = buildStoryPointDescription(storyPoints);
   return [
     tool(
       "update_task",
@@ -805,7 +923,7 @@ function buildPmTools(connection) {
         description: z.string().optional().describe("Brief description"),
         plan: z.string().optional().describe("Implementation plan in markdown"),
         ordinal: z.number().optional().describe("Step/order number (0-based)"),
-        storyPointValue: z.number().optional().describe("Story point value (1=Common, 2=Magic, 3=Rare, 5=Unique)")
+        storyPointValue: z.number().optional().describe(spDescription)
       },
       async (params) => {
         try {
@@ -827,7 +945,7 @@ function buildPmTools(connection) {
         description: z.string().optional(),
         plan: z.string().optional(),
         ordinal: z.number().optional(),
-        storyPointValue: z.number().optional()
+        storyPointValue: z.number().optional().describe(spDescription)
       },
       async ({ subtaskId, ...fields }) => {
         try {
@@ -896,9 +1014,9 @@ function buildTaskTools(connection) {
 function textResult(text) {
   return { content: [{ type: "text", text }] };
 }
-function createConveyorMcpServer(connection, config) {
+function createConveyorMcpServer(connection, config, context) {
   const commonTools = buildCommonTools(connection, config);
-  const modeTools = config.mode === "pm" ? buildPmTools(connection) : buildTaskTools(connection);
+  const modeTools = config.mode === "pm" ? buildPmTools(connection, context?.storyPoints) : buildTaskTools(connection);
   return createSdkMcpServer({
     name: "conveyor",
     tools: [...commonTools, ...modeTools]
@@ -946,7 +1064,6 @@ async function processAssistantEvent(event, host, turnToolCalls) {
 function handleResultEvent(event, host, context, startTime) {
   const resultEvent = event;
   let totalCostUsd = 0;
-  let deltaCost = 0;
   let retriable = false;
   if (resultEvent.subtype === "success") {
     totalCostUsd = "total_cost_usd" in resultEvent ? resultEvent.total_cost_usd : 0;
@@ -955,18 +1072,12 @@ function handleResultEvent(event, host, context, startTime) {
     if (API_ERROR_PATTERN.test(summary) && durationMs < 3e4) {
       retriable = true;
     }
-    const lastCost = context._lastReportedCostUsd ?? 0;
-    deltaCost = totalCostUsd - lastCost;
-    context._lastReportedCostUsd = totalCostUsd;
-    host.connection.sendEvent({ type: "completed", summary, costUsd: deltaCost, durationMs });
-    if (deltaCost > 0 && context.agentId) {
-      const estimatedDeltaTokens = Math.round(deltaCost * 1e5);
+    host.connection.sendEvent({ type: "completed", summary, costUsd: totalCostUsd, durationMs });
+    if (totalCostUsd > 0 && context.agentId && context._runnerSessionId) {
       host.connection.trackSpending({
         agentId: context.agentId,
-        inputTokens: Math.round(estimatedDeltaTokens * 0.7),
-        outputTokens: Math.round(estimatedDeltaTokens * 0.3),
-        totalTokens: estimatedDeltaTokens,
-        totalCostUsd: deltaCost,
+        sessionId: context._runnerSessionId,
+        totalCostUsd,
         onSubscription: host.config.mode === "pm" || !!process.env.CLAUDE_CODE_OAUTH_TOKEN
       });
     }
@@ -978,33 +1089,24 @@ function handleResultEvent(event, host, context, startTime) {
     }
     host.connection.sendEvent({ type: "error", message: errorMsg });
   }
-  return { totalCostUsd, deltaCost, retriable };
+  return { totalCostUsd, retriable };
 }
 async function emitResultEvent(event, host, context, startTime) {
   const result = handleResultEvent(event, host, context, startTime);
   const durationMs = Date.now() - startTime;
-  if (result.deltaCost > 0 && context.agentId) {
+  const resultEvent = event;
+  if (resultEvent.subtype === "success") {
+    const summary = "result" in resultEvent ? String(resultEvent.result) : "Task completed.";
     await host.callbacks.onEvent({
       type: "completed",
-      summary: "Task completed.",
-      costUsd: result.deltaCost,
+      summary,
+      costUsd: result.totalCostUsd,
       durationMs
     });
   } else {
-    const resultEvent = event;
-    if (resultEvent.subtype === "success") {
-      const summary = "result" in resultEvent ? String(resultEvent.result) : "Task completed.";
-      await host.callbacks.onEvent({
-        type: "completed",
-        summary,
-        costUsd: 0,
-        durationMs
-      });
-    } else {
-      const errors = "errors" in resultEvent ? resultEvent.errors : [];
-      const errorMsg = errors.length > 0 ? errors.join(", ") : `Agent stopped: ${resultEvent.subtype}`;
-      await host.callbacks.onEvent({ type: "error", message: errorMsg });
-    }
+    const errors = "errors" in resultEvent ? resultEvent.errors : [];
+    const errorMsg = errors.length > 0 ? errors.join(", ") : `Agent stopped: ${resultEvent.subtype}`;
+    await host.callbacks.onEvent({ type: "error", message: errorMsg });
   }
   return result.retriable;
 }
@@ -1023,9 +1125,6 @@ async function processEvents(events, context, host) {
           if (sessionId && !sessionIdStored) {
             sessionIdStored = true;
             host.connection.storeSessionId(sessionId);
-            if (sessionId !== context.claudeSessionId) {
-              context._lastReportedCostUsd = 0;
-            }
           }
           await host.callbacks.onEvent({
             type: "thinking",
@@ -1099,7 +1198,7 @@ function buildCanUseTool(host) {
 function buildQueryOptions(host, context) {
   const settings = context.agentSettings ?? host.config.agentSettings ?? {};
   const systemPromptText = buildSystemPrompt(host.config.mode, context, host.config, host.setupLog);
-  const conveyorMcp = createConveyorMcpServer(host.connection, host.config);
+  const conveyorMcp = createConveyorMcpServer(host.connection, host.config, context);
   const isPm = host.config.mode === "pm";
   const pmDisallowedTools = isPm ? ["TodoWrite", "TodoRead", "NotebookEdit"] : [];
   const disallowedTools = [...settings.disallowedTools ?? [], ...pmDisallowedTools];
@@ -1211,7 +1310,6 @@ async function runWithRetry(initialQuery, context, host, options) {
   for (let attempt = 0; attempt <= RETRY_DELAYS_MS.length; attempt++) {
     if (host.isStopped()) return;
     const agentQuery = attempt === 0 ? initialQuery : (() => {
-      context._lastReportedCostUsd = 0;
       const retryPrompt = buildMultimodalPrompt(
         buildInitialPrompt(host.config.mode, context),
         context
@@ -1228,7 +1326,6 @@ async function runWithRetry(initialQuery, context, host, options) {
       const isStaleSession = error instanceof Error && error.message.includes("No conversation found with session ID");
       if (isStaleSession && context.claudeSessionId) {
         context.claudeSessionId = null;
-        context._lastReportedCostUsd = 0;
         host.connection.storeSessionId("");
         const freshPrompt = buildMultimodalPrompt(
           buildInitialPrompt(host.config.mode, context),
@@ -1362,9 +1459,7 @@ var AgentRunner = class _AgentRunner {
       this.connection.disconnect();
       return;
     }
-    if (this.taskContext.claudeSessionId && this.taskContext._existingSpendingTotal !== null) {
-      this.taskContext._lastReportedCostUsd = this.taskContext._existingSpendingTotal;
-    }
+    this.taskContext._runnerSessionId = randomUUID2();
     if (process.env.CODESPACES === "true" && this.taskContext.baseBranch) {
       const result = cleanDevcontainerFromGit(
         this.config.workspaceDir,
@@ -1691,6 +1786,8 @@ var ProjectConnection = class {
   taskAssignmentCallback = null;
   stopTaskCallback = null;
   shutdownCallback = null;
+  chatMessageCallback = null;
+  earlyChatMessages = [];
   constructor(config) {
     this.config = config;
   }
@@ -1726,6 +1823,13 @@ var ProjectConnection = class {
           this.shutdownCallback();
         }
       });
+      this.socket.on("projectRunner:incomingChatMessage", (msg) => {
+        if (this.chatMessageCallback) {
+          this.chatMessageCallback(msg);
+        } else {
+          this.earlyChatMessages.push(msg);
+        }
+      });
       this.socket.on("connect", () => {
         if (!settled) {
           settled = true;
@@ -1750,6 +1854,13 @@ var ProjectConnection = class {
   onShutdown(callback) {
     this.shutdownCallback = callback;
   }
+  onChatMessage(callback) {
+    this.chatMessageCallback = callback;
+    for (const msg of this.earlyChatMessages) {
+      callback(msg);
+    }
+    this.earlyChatMessages = [];
+  }
   sendHeartbeat() {
     if (!this.socket) return;
     this.socket.emit("projectRunner:heartbeat", {});
@@ -1762,6 +1873,55 @@ var ProjectConnection = class {
     if (!this.socket) return;
     this.socket.emit("projectRunner:taskStopped", { taskId, reason });
   }
+  emitEvent(event) {
+    if (!this.socket) return;
+    this.socket.emit("conveyor:projectAgentEvent", event);
+  }
+  emitChatMessage(content) {
+    const socket = this.socket;
+    if (!socket) return Promise.reject(new Error("Not connected"));
+    return new Promise((resolve2, reject) => {
+      socket.emit(
+        "conveyor:projectAgentChatMessage",
+        { content },
+        (response) => {
+          if (response.success) resolve2();
+          else reject(new Error(response.error ?? "Failed to send chat message"));
+        }
+      );
+    });
+  }
+  emitAgentStatus(status) {
+    if (!this.socket) return;
+    this.socket.emit("conveyor:projectAgentStatus", { status });
+  }
+  fetchAgentContext() {
+    const socket = this.socket;
+    if (!socket) return Promise.reject(new Error("Not connected"));
+    return new Promise((resolve2, reject) => {
+      socket.emit(
+        "projectRunner:getAgentContext",
+        (response) => {
+          if (response.success) resolve2(response.data ?? null);
+          else reject(new Error(response.error ?? "Failed to fetch agent context"));
+        }
+      );
+    });
+  }
+  fetchChatHistory(limit) {
+    const socket = this.socket;
+    if (!socket) return Promise.reject(new Error("Not connected"));
+    return new Promise((resolve2, reject) => {
+      socket.emit(
+        "projectRunner:getChatHistory",
+        { limit },
+        (response) => {
+          if (response.success && response.data) resolve2(response.data);
+          else reject(new Error(response.error ?? "Failed to fetch chat history"));
+        }
+      );
+    });
+  }
   disconnect() {
     this.socket?.disconnect();
     this.socket = null;
@@ -1773,6 +1933,151 @@ import { fork } from "child_process";
 import { execSync as execSync4 } from "child_process";
 import * as path from "path";
 import { fileURLToPath } from "url";
+
+// src/project-chat-handler.ts
+import { query as query2 } from "@anthropic-ai/claude-agent-sdk";
+var FALLBACK_MODEL = "claude-sonnet-4-20250514";
+function buildSystemPrompt2(projectDir, agentCtx) {
+  const parts = [];
+  if (agentCtx?.agentInstructions) {
+    parts.push(agentCtx.agentInstructions);
+  }
+  const projectName = agentCtx?.projectName ?? "this project";
+  parts.push(`
+You are the project management assistant for ${projectName}.`);
+  if (agentCtx?.projectDescription) {
+    parts.push(`Project description: ${agentCtx.projectDescription}`);
+  }
+  parts.push(
+    `You are running locally on the developer's machine with full access to the codebase at: ${projectDir}`,
+    ``,
+    `Your role is to help team members:`,
+    `- Discuss project direction and priorities`,
+    `- Answer questions about the codebase, architecture, and implementation`,
+    `- Help plan new work and break it into tasks`,
+    `- Review code and suggest improvements`,
+    ``,
+    `You have access to the local filesystem through your tools. Use them to read code,`,
+    `understand the project structure, and provide informed answers.`,
+    ``,
+    `Keep responses concise and helpful. When referencing code, cite specific files and line numbers.`
+  );
+  return parts.join("\n");
+}
+function buildPrompt(message, chatHistory) {
+  const parts = [];
+  if (chatHistory.length > 0) {
+    parts.push("Recent conversation history:");
+    for (const msg of chatHistory.slice(-20)) {
+      const prefix = msg.role === "assistant" ? "Agent" : msg.userName ?? "User";
+      parts.push(`[${prefix}]: ${msg.content}`);
+    }
+    parts.push("");
+  }
+  parts.push(`Latest message from the user:
+${message.content}`);
+  return parts.join("\n");
+}
+async function handleProjectChatMessage(message, connection, projectDir) {
+  connection.emitAgentStatus("busy");
+  try {
+    let agentCtx = null;
+    try {
+      agentCtx = await connection.fetchAgentContext();
+    } catch {
+      console.log("[project-chat] Could not fetch agent context, using defaults");
+    }
+    let chatHistory = [];
+    try {
+      chatHistory = await connection.fetchChatHistory(30);
+    } catch {
+      console.log("[project-chat] Could not fetch chat history, proceeding without it");
+    }
+    const model = agentCtx?.model || FALLBACK_MODEL;
+    const settings = agentCtx?.agentSettings ?? {};
+    const systemPrompt = buildSystemPrompt2(projectDir, agentCtx);
+    const prompt = buildPrompt(message, chatHistory);
+    const events = query2({
+      prompt,
+      options: {
+        model,
+        systemPrompt: {
+          type: "preset",
+          preset: "claude_code",
+          append: systemPrompt
+        },
+        cwd: projectDir,
+        permissionMode: "bypassPermissions",
+        allowDangerouslySkipPermissions: true,
+        tools: { type: "preset", preset: "claude_code" },
+        maxTurns: settings.maxTurns ?? 15,
+        maxBudgetUsd: settings.maxBudgetUsd ?? 5,
+        effort: settings.effort,
+        thinking: settings.thinking
+      }
+    });
+    const responseParts = [];
+    const turnToolCalls = [];
+    let isTyping = false;
+    for await (const event of events) {
+      const eventType = event.type;
+      if (eventType === "assistant") {
+        if (!isTyping) {
+          setTimeout(() => connection.emitEvent({ type: "agent_typing_start" }), 200);
+          isTyping = true;
+        }
+        const msg = event.message;
+        const content = msg.content;
+        for (const block of content) {
+          if (block.type === "text") {
+            responseParts.push(block.text);
+          } else if (block.type === "tool_use") {
+            const name = block.name;
+            const inputStr = typeof block.input === "string" ? block.input : JSON.stringify(block.input);
+            turnToolCalls.push({
+              tool: name,
+              input: inputStr.slice(0, 1e4),
+              timestamp: (/* @__PURE__ */ new Date()).toISOString()
+            });
+            console.log(`[project-chat] [tool_use] ${name}`);
+          }
+        }
+        if (turnToolCalls.length > 0) {
+          connection.emitEvent({ type: "activity_block", events: [...turnToolCalls] });
+          turnToolCalls.length = 0;
+        }
+      } else if (eventType === "result") {
+        if (isTyping) {
+          connection.emitEvent({ type: "agent_typing_stop" });
+          isTyping = false;
+        }
+        break;
+      }
+    }
+    if (isTyping) {
+      connection.emitEvent({ type: "agent_typing_stop" });
+    }
+    const responseText = responseParts.join("\n\n").trim();
+    if (responseText) {
+      await connection.emitChatMessage(responseText);
+    }
+  } catch (error) {
+    console.error(
+      "[project-chat] Failed to handle message:",
+      error instanceof Error ? error.message : error
+    );
+    try {
+      await connection.emitChatMessage(
+        "I encountered an error processing your message. Please try again."
+      );
+    } catch {
+    }
+  } finally {
+    connection.emitAgentStatus("idle");
+  }
+}
+
+// src/project-runner.ts
 var __filename = fileURLToPath(import.meta.url);
 var __dirname = path.dirname(__filename);
 var HEARTBEAT_INTERVAL_MS2 = 3e4;
@@ -1805,6 +2110,10 @@ var ProjectRunner = class {
       console.log("[project-runner] Received shutdown signal from server");
       void this.stop();
     });
+    this.connection.onChatMessage((msg) => {
+      console.log("[project-runner] Received project chat message");
+      void handleProjectChatMessage(msg, this.connection, this.projectDir);
+    });
     this.heartbeatTimer = setInterval(() => {
       this.connection.sendHeartbeat();
     }, HEARTBEAT_INTERVAL_MS2);
@@ -1966,4 +2275,4 @@ export {
   ProjectConnection,
   ProjectRunner
 };
-//# sourceMappingURL=chunk-JJBVPGTW.js.map
+//# sourceMappingURL=chunk-MKSZQWR3.js.map