@rallycry/conveyor-agent 7.0.8 → 7.0.10

package/dist/{chunk-PMDVB2EU.js → chunk-BOFWZIL6.js}

@@ -92,8 +92,14 @@ var AgentConnection = class _AgentConnection {
         extraHeaders: { "ngrok-skip-browser-warning": "true" }
       });
       this.socket.on("session:message", (msg) => {
-        if (this.messageCallback) this.messageCallback(msg);
-        else this.earlyMessages.push(msg);
+        const incoming = {
+          content: msg.content,
+          userId: msg.userId,
+          ...msg.source && { source: msg.source },
+          ...msg.files && { files: msg.files }
+        };
+        if (this.messageCallback) this.messageCallback(incoming);
+        else this.earlyMessages.push(incoming);
       });
       this.socket.on("session:stop", () => {
         if (this.stopCallback) this.stopCallback();
@@ -161,7 +167,7 @@ var AgentConnection = class _AgentConnection {
     });
   }
   disconnect() {
-    this.flushEvents();
+    void this.flushEvents();
     if (this.socket) {
       this.socket.io.reconnection(false);
       this.socket.removeAllListeners();
@@ -248,9 +254,9 @@ var AgentConnection = class _AgentConnection {
     this.apiKeyUpdateCallback = callback;
   }
   // ── Convenience methods (thin wrappers around call / emit) ─────────
-  emitStatus(status) {
+  async emitStatus(status) {
     this.lastEmittedStatus = status;
-    this.flushEvents();
+    await this.flushEvents();
     void this.call("reportAgentStatus", {
       sessionId: this.config.sessionId,
       status
@@ -424,10 +430,10 @@ ${q.question}${q.options.length ? "\n" + q.options.map((o) => `- ${o.label}: ${o
     if (!this.socket) return;
     this.eventBuffer.push({ event });
     if (!this.flushTimer) {
-      this.flushTimer = setTimeout(() => this.flushEvents(), EVENT_BATCH_MS);
+      this.flushTimer = setTimeout(() => void this.flushEvents(), EVENT_BATCH_MS);
     }
   }
-  flushEvents() {
+  async flushEvents() {
     if (this.flushTimer) {
       clearTimeout(this.flushTimer);
       this.flushTimer = null;
@@ -435,7 +441,7 @@ ${q.question}${q.options.length ? "\n" + q.options.map((o) => `- ${o.label}: ${o
     if (!this.socket || this.eventBuffer.length === 0) return;
     const events = this.eventBuffer.map((entry) => entry.event);
     this.eventBuffer = [];
-    this.call("emitAgentEvent", { sessionId: this.config.sessionId, events }).catch(() => {
+    await this.call("emitAgentEvent", { sessionId: this.config.sessionId, events }).catch(() => {
     });
   }
 };
@@ -672,6 +678,28 @@ function syncWithBaseBranch(cwd, baseBranch) {
 `);
   return true;
 }
+function ensureOnTaskBranch(cwd, taskBranch) {
+  if (!taskBranch) return true;
+  const current = getCurrentBranch(cwd);
+  if (current === taskBranch) return true;
+  try {
+    execSync(`git fetch origin ${taskBranch}`, { cwd, stdio: "ignore", timeout: 6e4 });
+  } catch {
+    process.stderr.write(`[conveyor-agent] Warning: git fetch origin ${taskBranch} failed
+`);
+    return false;
+  }
+  try {
+    execSync(`git checkout ${taskBranch}`, { cwd, stdio: "ignore", timeout: 3e4 });
+  } catch {
+    process.stderr.write(`[conveyor-agent] Warning: git checkout ${taskBranch} failed
+`);
+    return false;
+  }
+  process.stderr.write(`[conveyor-agent] Checked out task branch ${taskBranch}
+`);
+  return true;
+}
 function hasUncommittedChanges(cwd) {
   const status = execSync("git status --porcelain", {
     cwd,
@@ -879,6 +907,472 @@ var PlanSync = class {
   }
 };
 
+// ../shared/dist/index.js
+import { z } from "zod";
+var MAX_FILE_SIZE_BYTES = 25 * 1024 * 1024;
+var EMBED_THRESHOLD_IMAGES = 5 * 1024 * 1024;
+var EMBED_THRESHOLD_TEXT = 2 * 1024 * 1024;
+var AgentHeartbeatSchema = z.object({
+  sessionId: z.string().optional(),
+  timestamp: z.string(),
+  status: z.enum(["active", "idle", "building"]),
+  currentAction: z.string().optional()
+});
+var CreatePRInputSchema = z.object({
+  title: z.string().min(1),
+  body: z.string(),
+  head: z.string().optional(),
+  base: z.string().optional()
+});
+var PostToChatInputSchema = z.object({
+  message: z.string().min(1),
+  type: z.enum(["message", "question", "update"]).optional().default("message")
+});
+var GetTaskContextRequestSchema = z.object({
+  sessionId: z.string(),
+  includeHistory: z.boolean().optional().default(false)
+});
+var GetChatMessagesRequestSchema = z.object({
+  sessionId: z.string(),
+  limit: z.number().int().positive().optional().default(50),
+  offset: z.number().int().nonnegative().optional().default(0)
+});
+var GetTaskFilesRequestSchema = z.object({
+  sessionId: z.string()
+});
+var GetTaskFileRequestSchema = z.object({
+  sessionId: z.string(),
+  fileId: z.string()
+});
+var GetTaskRequestSchema = z.object({
+  sessionId: z.string(),
+  taskSlugOrId: z.string()
+});
+var GetCliHistoryRequestSchema = z.object({
+  sessionId: z.string(),
+  limit: z.number().int().positive().optional().default(100),
+  source: z.enum(["agent", "application"]).optional()
+});
+var ListSubtasksRequestSchema = z.object({
+  sessionId: z.string()
+});
+var GetDependenciesRequestSchema = z.object({
+  sessionId: z.string()
+});
+var GetSuggestionsRequestSchema = z.object({
+  sessionId: z.string()
+});
+var GetTaskIncidentsRequestSchema = z.object({
+  sessionId: z.string()
+});
+var CreatePullRequestRequestSchema = CreatePRInputSchema.extend({ sessionId: z.string() });
+var UpdateTaskStatusRequestSchema = z.object({
+  sessionId: z.string(),
+  status: z.string(),
+  force: z.boolean().optional().default(false)
+});
+var StoreSessionIdRequestSchema = z.object({
+  sessionId: z.string(),
+  sdkSessionId: z.string()
+});
+var TrackSpendingRequestSchema = z.object({
+  sessionId: z.string(),
+  inputTokens: z.number().int().nonnegative(),
+  outputTokens: z.number().int().nonnegative(),
+  costUsd: z.number().nonnegative(),
+  model: z.string()
+});
+var SessionStartRequestSchema = z.object({
+  sessionId: z.string(),
+  agentVersion: z.string(),
+  capabilities: z.array(z.string())
+});
+var SessionStopRequestSchema = z.object({
+  sessionId: z.string(),
+  reason: z.string().optional()
+});
+var ConnectAgentRequestSchema = z.object({
+  sessionId: z.string()
+});
+var ReportAgentStatusRequestSchema = z.object({
+  sessionId: z.string(),
+  status: z.string()
+});
+var CreateSubtaskRequestSchema = z.object({
+  sessionId: z.string(),
+  title: z.string().min(1),
+  description: z.string().optional(),
+  plan: z.string().optional(),
+  storyPointValue: z.number().int().positive().optional(),
+  ordinal: z.number().int().nonnegative().optional()
+});
+var UpdateSubtaskRequestSchema = z.object({
+  sessionId: z.string(),
+  subtaskId: z.string(),
+  title: z.string().min(1).optional(),
+  description: z.string().optional(),
+  plan: z.string().optional(),
+  status: z.string().optional(),
+  storyPointValue: z.number().int().positive().optional()
+});
+var DeleteSubtaskRequestSchema = z.object({
+  sessionId: z.string(),
+  subtaskId: z.string()
+});
+var SearchIncidentsRequestSchema = z.object({
+  sessionId: z.string(),
+  status: z.string().optional(),
+  source: z.string().optional()
+});
+var QueryGcpLogsRequestSchema = z.object({
+  sessionId: z.string(),
+  filter: z.string().optional(),
+  startTime: z.string().optional(),
+  endTime: z.string().optional(),
+  severity: z.string().optional(),
+  pageSize: z.number().int().positive().optional().default(100)
+});
+var GetTaskPropertiesRequestSchema = z.object({
+  sessionId: z.string()
+});
+var UpdateTaskFieldsRequestSchema = z.object({
+  sessionId: z.string(),
+  plan: z.string().optional(),
+  description: z.string().optional()
+});
+var UpdateTaskPropertiesRequestSchema = z.object({
+  sessionId: z.string(),
+  title: z.string().optional(),
+  storyPointValue: z.number().int().positive().optional(),
+  tagIds: z.array(z.string()).optional()
+});
+var ListIconsRequestSchema = z.object({
+  sessionId: z.string()
+});
+var GenerateTaskIconRequestSchema = z.object({
+  sessionId: z.string(),
+  prompt: z.string().min(1),
+  aspectRatio: z.string().optional()
+});
+var SearchFaIconsRequestSchema = z.object({
+  sessionId: z.string(),
+  query: z.string().min(1),
+  first: z.number().int().positive().optional()
+});
+var PickFaIconRequestSchema = z.object({
+  sessionId: z.string(),
+  fontAwesomeId: z.string().min(1),
+  fontAwesomeStyle: z.string().optional()
+});
+var CreateFollowUpTaskRequestSchema = z.object({
+  sessionId: z.string(),
+  title: z.string().min(1),
+  description: z.string().optional(),
+  plan: z.string().optional(),
+  storyPointValue: z.number().int().positive().optional()
+});
+var AddDependencyRequestSchema = z.object({
+  sessionId: z.string(),
+  dependsOnSlugOrId: z.string()
+});
+var RemoveDependencyRequestSchema = z.object({
+  sessionId: z.string(),
+  dependsOnSlugOrId: z.string()
+});
+var CreateSuggestionRequestSchema = z.object({
+  sessionId: z.string(),
+  title: z.string().min(1),
+  description: z.string().optional(),
+  tagNames: z.array(z.string()).optional()
+});
+var VoteSuggestionRequestSchema = z.object({
+  sessionId: z.string(),
+  suggestionId: z.string(),
+  value: z.union([z.literal(1), z.literal(-1)])
+});
+var ScaleUpResourcesRequestSchema = z.object({
+  sessionId: z.string(),
+  tier: z.string(),
+  reason: z.string().optional()
+});
+var TriggerIdentificationRequestSchema = z.object({
+  sessionId: z.string()
+});
+var SubmitCodeReviewResultRequestSchema = z.object({
+  sessionId: z.string(),
+  approved: z.boolean(),
+  content: z.string()
+});
+var StartChildCloudBuildRequestSchema = z.object({
+  sessionId: z.string(),
+  childTaskId: z.string()
+});
+var StopChildBuildRequestSchema = z.object({
+  sessionId: z.string(),
+  childTaskId: z.string()
+});
+var ApproveAndMergePRRequestSchema = z.object({
+  sessionId: z.string(),
+  childTaskId: z.string()
+});
+var PostChildChatMessageRequestSchema = z.object({
+  sessionId: z.string(),
+  childTaskId: z.string(),
+  message: z.string().min(1)
+});
+var UpdateChildStatusRequestSchema = z.object({
+  sessionId: z.string(),
+  childTaskId: z.string(),
+  status: z.string()
+});
+var RegisterProjectAgentRequestSchema = z.object({
+  projectId: z.string(),
+  capabilities: z.array(z.string())
+});
+var ProjectRunnerHeartbeatRequestSchema = z.object({
+  projectId: z.string()
+});
+var ReportProjectAgentStatusRequestSchema = z.object({
+  projectId: z.string(),
+  status: z.enum(["busy", "idle"]),
+  activeChatId: z.string().nullish(),
+  activeTaskId: z.string().nullish(),
+  activeBranch: z.string().nullish()
+});
+var DisconnectProjectRunnerRequestSchema = z.object({
+  projectId: z.string()
+});
+var GetProjectAgentContextRequestSchema = z.object({
+  projectId: z.string()
+});
+var GetProjectChatHistoryRequestSchema = z.object({
+  projectId: z.string(),
+  limit: z.number().int().positive().optional().default(50),
+  chatId: z.string().optional()
+});
+var PostProjectAgentMessageRequestSchema = z.object({
+  projectId: z.string(),
+  content: z.string().min(1),
+  chatId: z.string().optional()
+});
+var ListProjectTasksRequestSchema = z.object({
+  projectId: z.string(),
+  status: z.string().optional(),
+  assigneeId: z.string().optional(),
+  limit: z.number().int().positive().optional().default(50)
+});
+var GetProjectTaskRequestSchema = z.object({
+  projectId: z.string(),
+  taskId: z.string()
+});
+var SearchProjectTasksRequestSchema = z.object({
+  projectId: z.string(),
+  tagNames: z.array(z.string()).optional(),
+  searchQuery: z.string().optional(),
+  statusFilters: z.array(z.string()).optional(),
+  limit: z.number().int().positive().optional().default(20)
+});
+var ListProjectTagsRequestSchema = z.object({
+  projectId: z.string()
+});
+var GetProjectSummaryRequestSchema = z.object({
+  projectId: z.string()
+});
+var CreateProjectTaskRequestSchema = z.object({
+  projectId: z.string(),
+  title: z.string().min(1),
+  description: z.string().optional(),
+  plan: z.string().optional(),
+  status: z.string().optional(),
+  isBug: z.boolean().optional()
+});
+var UpdateProjectTaskRequestSchema = z.object({
+  projectId: z.string(),
+  taskId: z.string(),
+  title: z.string().optional(),
+  description: z.string().optional(),
+  plan: z.string().optional(),
+  status: z.string().optional(),
+  assignedUserId: z.string().nullish()
+});
+var ReportProjectAgentEventRequestSchema = z.object({
+  projectId: z.string(),
+  event: z.record(z.string(), z.unknown())
+});
+var ReportTagAuditProgressRequestSchema = z.object({
+  projectId: z.string(),
+  requestId: z.string(),
+  activity: z.object({
+    tool: z.string(),
+    input: z.string().optional(),
+    timestamp: z.string()
+  })
+});
+var ReportTagAuditResultRequestSchema = z.object({
+  projectId: z.string(),
+  requestId: z.string(),
+  recommendations: z.array(z.record(z.string(), z.unknown())),
+  summary: z.string(),
+  complete: z.boolean()
+});
+var ReportNewCommitsDetectedRequestSchema = z.object({
+  projectId: z.string(),
+  commits: z.array(
+    z.object({
+      sha: z.string(),
+      message: z.string(),
+      author: z.string()
+    })
+  ),
+  branch: z.string()
+});
+var ReportEnvironmentReadyRequestSchema = z.object({
+  projectId: z.string(),
+  branch: z.string(),
+  setupComplete: z.boolean(),
+  startCommandRunning: z.boolean()
+});
+var ReportEnvSwitchProgressRequestSchema = z.object({
+  projectId: z.string(),
+  step: z.string(),
+  progress: z.number(),
+  message: z.string().optional()
+});
+var ForwardProjectChatMessageRequestSchema = z.object({
+  projectId: z.string(),
+  chatId: z.string(),
+  content: z.string().min(1),
+  targetUserId: z.string().optional()
+});
+var CancelQueuedProjectMessageRequestSchema = z.object({
+  projectId: z.string(),
+  index: z.number().int().nonnegative()
+});
+var GetProjectCliHistoryRequestSchema = z.object({
+  projectId: z.string(),
+  limit: z.number().int().positive().optional().default(50),
+  source: z.string().optional()
+});
+var PostToProjectTaskChatRequestSchema = z.object({
+  projectId: z.string(),
+  taskId: z.string(),
+  content: z.string()
+});
+var GetProjectTaskCliRequestSchema = z.object({
+  projectId: z.string(),
+  taskId: z.string(),
+  limit: z.number().int().positive().optional().default(50),
+  source: z.string().optional()
+});
+var StartProjectBuildRequestSchema = z.object({
+  projectId: z.string(),
+  taskId: z.string()
+});
+var StopProjectBuildRequestSchema = z.object({
+  projectId: z.string(),
+  taskId: z.string()
+});
+var ApproveProjectMergePRRequestSchema = z.object({
+  projectId: z.string(),
+  childTaskId: z.string()
+});
+var GetAgentStatusRequestSchema = z.object({
+  taskId: z.string()
+});
+var GetUiCliHistoryRequestSchema = z.object({
+  taskId: z.string()
+});
+var SendSoftStopRequestSchema = z.object({
+  taskId: z.string().optional(),
+  projectId: z.string().optional()
+});
+var FlushTaskQueueRequestSchema = z.object({
+  taskId: z.string()
+});
+var FlushProjectQueueRequestSchema = z.object({
+  projectId: z.string()
+});
+var CancelTaskQueuedMessageRequestSchema = z.object({
+  taskId: z.string(),
+  messageId: z.string()
+});
+var FlushSingleQueuedMessageRequestSchema = z.object({
+  taskId: z.string(),
+  messageId: z.string()
+});
+var FlushSingleProjectQueuedMessageRequestSchema = z.object({
+  projectId: z.string(),
+  index: z.number().int().nonnegative()
+});
+var AnswerAgentQuestionRequestSchema = z.object({
+  taskId: z.string(),
+  requestId: z.string(),
+  answers: z.record(z.string(), z.string())
+});
+var ClearAgentTodosRequestSchema = z.object({
+  taskId: z.string()
+});
+var AgentQuestionOptionSchema = z.object({
+  label: z.string(),
+  description: z.string(),
+  preview: z.string().optional()
+});
+var AgentQuestionSchema = z.object({
+  question: z.string(),
+  header: z.string(),
+  options: z.array(AgentQuestionOptionSchema),
+  multiSelect: z.boolean().optional()
+});
+var AskUserQuestionRequestSchema = z.object({
+  sessionId: z.string(),
+  question: z.string().min(1),
+  requestId: z.string().min(1),
+  questions: z.array(AgentQuestionSchema).min(1)
+});
+var RefreshGithubTokenRequestSchema = z.object({
+  sessionId: z.string()
+});
+var RefreshGithubTokenResponseSchema = z.object({
+  token: z.string()
+});
+var CreatePRResponseSchema = z.object({
+  prNumber: z.number().int().positive(),
+  prUrl: z.string().url()
+});
+var PostToChatResponseSchema = z.object({
+  messageId: z.string()
+});
+var UpdateTaskStatusResponseSchema = z.object({
+  taskId: z.string(),
+  status: z.string()
+});
+var StoreSessionIdResponseSchema = z.object({
+  success: z.boolean()
+});
+var HeartbeatResponseSchema = z.object({
+  acknowledged: z.boolean()
+});
+var SessionStartResponseSchema = z.object({
+  sessionId: z.string(),
+  startedAt: z.string()
+});
+var SessionStopResponseSchema = z.object({
+  sessionId: z.string(),
+  stoppedAt: z.string()
+});
+var DeleteSubtaskResponseSchema = z.object({
+  deleted: z.boolean()
+});
+var RegisterProjectAgentResponseSchema = z.object({
+  registered: z.boolean(),
+  agentName: z.string(),
+  agentInstructions: z.string(),
+  model: z.string(),
+  agentSettings: z.record(z.string(), z.unknown()).nullable(),
+  branchSwitchCommand: z.string().nullable()
+});
+var CRITICAL_AUTOMATED_SOURCES = /* @__PURE__ */ new Set(["ci_failure"]);
+
 // src/execution/pack-runner-prompt.ts
 function findLastAgentMessageIndex(history) {
   for (let i = history.length - 1; i >= 0; i--) {
@@ -1194,10 +1688,9 @@ function buildPropertyInstructions(context) {
     ``,
     `### Proactive Property Management`,
     `As you plan this task, proactively fill in task properties when you have enough context:`,
-    `- Use update_task_properties to set any combination of: title, story points, tags, and icon`,
+    `- Use update_task_properties to set any combination of: title, story points, and tags`,
     `- You can update all properties at once or just one at a time as needed`,
-    `- For icons: FIRST call list_icons to check for existing matches, then use update_task_properties with iconId.`,
-    `  Only call generate_task_icon if no existing icon is a good fit.`,
+    `- Icons are assigned automatically during identification \u2014 do not set icons manually`,
     ``,
     `Don't wait for the user to ask \u2014 fill these in naturally as the plan takes shape.`,
     `If the user adjusts the plan significantly, update the properties to match.`
@@ -1235,22 +1728,22 @@ function buildDiscoveryPrompt(context) {
     `- If you identify code changes needed, describe them in the plan instead of implementing them`,
     `- You can create and manage subtasks`,
     `- Goal: collaborate with the user to create a clear plan`,
-    `- Proactively fill task properties (SP, tags, icon) as the plan takes shape`,
+    `- Proactively fill task properties (SP, tags) as the plan takes shape`,
     ``,
     `### Planning Checklist (complete ALL before calling ExitPlanMode)`,
     `Your PRIMARY goal is to create a thorough plan. Complete these steps in order:`,
     `1. Read the task description and chat history \u2014 respond to what's been discussed`,
     `2. Explore the codebase to understand relevant files and patterns`,
     `3. Save a detailed plan via \`update_task\``,
-    `4. Set story points, tags, and title via \`update_task_properties\``,
+    `4. Set story points, tags, and title via \`update_task_properties\` (icon is set automatically)`,
     `5. Discuss the plan with the team if they're engaged, incorporate feedback`,
     `6. THEN call ExitPlanMode \u2014 it is the LAST step, not the first`,
     ``,
     `### Self-Identification Tools`,
     `Use these MCP tools to set your own task properties:`,
     `- \`update_task\` \u2014 save your plan and description`,
-    `- \`update_task_properties\` \u2014 set title, story points, tags, and icon (any combination)`,
-    `- \`generate_task_icon\` \u2014 generate a new icon if needed (call \`list_icons\` first)`,
+    `- \`update_task_properties\` \u2014 set title, story points, and tags (any combination)`,
+    `Note: Icons are assigned automatically during identification after planning is complete.`,
     ``,
     `### Tags & Context`,
     `- Early in discovery, identify relevant project tags that match this task's domain`,
@@ -1467,6 +1960,9 @@ function buildCodeReviewPrompt() {
     `- Explain what's wrong and suggest fixes`,
     `- Focus on substantive issues, not style nitpicks (linting handles that)`,
     ``,
+    `## Previous Review Feedback`,
+    `If previous review feedback is present in the chat history, verify those specific issues were addressed before raising new concerns. Focus on whether the requested changes were implemented correctly.`,
+    ``,
     `## Rules`,
     `- You are READ-ONLY. Do NOT modify any files.`,
     `- Do NOT re-review things CI already validates (formatting, lint rules).`,
@@ -2070,7 +2566,7 @@ async function buildInitialPrompt(mode, context, isAuto, agentMode) {
 }
 
 // src/tools/common-tools.ts
-import { z } from "zod";
+import { z as z2 } from "zod";
 
 // src/tools/helpers.ts
 function textResult(text) {
@@ -2104,8 +2600,8 @@ function buildReadTaskChatTool(connection) {
     "read_task_chat",
     "Read recent messages from a task chat. Omit task_id to read the current task's chat, or provide a child task ID to read a child's chat.",
     {
-      limit: z.number().optional().describe("Number of recent messages to fetch (default 20)"),
-      task_id: z.string().optional().describe("Child task ID to read chat from. Omit to read the current task's chat.")
+      limit: z2.number().optional().describe("Number of recent messages to fetch (default 20)"),
+      task_id: z2.string().optional().describe("Child task ID to read chat from. Omit to read the current task's chat.")
     },
     async ({ limit, task_id }) => {
       try {
@@ -2149,7 +2645,7 @@ function buildGetTaskTool(connection) {
     "get_task",
     "Look up a task by slug or ID to get its title, description, plan, and status",
     {
-      slug_or_id: z.string().describe("The task slug (e.g. 'my-task') or CUID")
+      slug_or_id: z2.string().describe("The task slug (e.g. 'my-task') or CUID")
     },
     async ({ slug_or_id }) => {
       try {
@@ -2172,9 +2668,9 @@ function buildGetTaskCliTool(connection) {
     "get_task_cli",
     "Read CLI execution logs from a task. Returns agent reasoning, tool calls, setup output, and other execution events. Use 'source' to filter: 'agent' for agent reasoning/tool calls only, 'application' for setup/dev-server output only.",
     {
-      task_id: z.string().optional().describe("Task ID or slug. Omit to read logs from the current task."),
-      source: z.enum(["agent", "application"]).optional().describe("Filter by log source. Omit for all logs."),
-      limit: z.number().optional().describe("Max number of log entries to return (default 50, max 500).")
+      task_id: z2.string().optional().describe("Task ID or slug. Omit to read logs from the current task."),
+      source: z2.enum(["agent", "application"]).optional().describe("Filter by log source. Omit for all logs."),
+      limit: z2.number().optional().describe("Max number of log entries to return (default 50, max 500).")
     },
     async ({ task_id, source, limit }) => {
       try {
@@ -2234,7 +2730,7 @@ function buildGetTaskFileTool(connection) {
   return defineTool(
     "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") },
+    { fileId: z2.string().describe("The file ID to retrieve") },
     async ({ fileId }) => {
       try {
         const file = await connection.call("getTaskFile", {
@@ -2265,8 +2761,8 @@ function buildSearchIncidentsTool(connection) {
     "search_incidents",
     "Search incidents in the current project. Optionally filter by status (Open, Acknowledged, Investigating, Resolved, Closed) or source.",
     {
-      status: z.string().optional().describe("Filter by incident status"),
-      source: z.string().optional().describe("Filter by source (e.g., 'conveyor', 'agent', 'build')")
+      status: z2.string().optional().describe("Filter by incident status"),
+      source: z2.string().optional().describe("Filter by source (e.g., 'conveyor', 'agent', 'build')")
     },
     async ({ status, source }) => {
       try {
@@ -2290,7 +2786,7 @@ function buildGetTaskIncidentsTool(connection) {
     "get_task_incidents",
     "Get all incidents linked to the current task (or a specified task). Returns full incident details including title, description, severity, status, and source.",
     {
-      task_id: z.string().optional().describe("Task ID (defaults to current task)")
+      task_id: z2.string().optional().describe("Task ID (defaults to current task)")
     },
     async ({ task_id }) => {
       try {
@@ -2313,12 +2809,12 @@ function buildQueryGcpLogsTool(connection) {
     "query_gcp_logs",
     "Query GCP Cloud Logging for the current project. Returns log entries matching the given filters. Use severity to filter by minimum log level. The project's GCP credentials are used automatically.",
     {
-      filter: z.string().optional().describe(
+      filter: z2.string().optional().describe(
         `Cloud Logging filter expression (e.g., 'resource.type="gce_instance"'). Max 1000 chars.`
       ),
-      start_time: z.string().optional().describe("Start time in ISO 8601 format (e.g., '2024-01-01T00:00:00Z')"),
-      end_time: z.string().optional().describe("End time in ISO 8601 format (e.g., '2024-01-02T00:00:00Z')"),
-      severity: z.enum([
+      start_time: z2.string().optional().describe("Start time in ISO 8601 format (e.g., '2024-01-01T00:00:00Z')"),
+      end_time: z2.string().optional().describe("End time in ISO 8601 format (e.g., '2024-01-02T00:00:00Z')"),
+      severity: z2.enum([
         "DEFAULT",
         "DEBUG",
         "INFO",
@@ -2329,7 +2825,7 @@ function buildQueryGcpLogsTool(connection) {
         "ALERT",
         "EMERGENCY"
       ]).optional().describe("Minimum severity level to filter by (default: all levels)"),
-      page_size: z.number().optional().describe("Number of log entries to return (default 100, max 500)")
+      page_size: z2.number().optional().describe("Number of log entries to return (default 100, max 500)")
     },
     async ({ filter, start_time, end_time, severity, page_size }) => {
       try {
@@ -2383,8 +2879,8 @@ function buildGetSuggestionsTool(connection) {
     "get_suggestions",
     "List project suggestions sorted by vote score. Use this to see what the team thinks is important.",
     {
-      status: z.string().optional().describe("Filter by status: Open, Accepted, Rejected, Implemented"),
-      limit: z.number().optional().describe("Max results (default 20)")
+      status: z2.string().optional().describe("Filter by status: Open, Accepted, Rejected, Implemented"),
+      limit: z2.number().optional().describe("Max results (default 20)")
     },
     async ({ status: _status, limit: _limit }) => {
       try {
@@ -2409,8 +2905,8 @@ function buildPostToChatTool(connection) {
     "post_to_chat",
     "Post a message to a task chat. Your normal replies already appear in chat \u2014 only use this for explicit out-of-band updates or posting to a child task's chat.",
     {
-      message: z.string().describe("The message to post to the team"),
-      task_id: z.string().optional().describe("Child task ID to post to. Omit to post to the current task's chat.")
+      message: z2.string().describe("The message to post to the team"),
+      task_id: z2.string().optional().describe("Child task ID to post to. Omit to post to the current task's chat.")
     },
     async ({ message, task_id }) => {
       try {
@@ -2437,8 +2933,8 @@ function buildForceUpdateTaskStatusTool(connection) {
     "force_update_task_status",
     "EMERGENCY ONLY: Force-override a task's Kanban status. Status transitions happen automatically (building sets InProgress, PR creation sets ReviewPR, merge sets ReviewDev). Only use this if an automatic transition failed or a task is stuck in the wrong status. Omit task_id to update the current task, or provide a child task ID.",
     {
-      status: z.enum(["InProgress", "ReviewPR", "ReviewDev", "Complete"]).describe("The new status for the task"),
-      task_id: z.string().optional().describe("Child task ID to update. Omit to update the current task.")
+      status: z2.enum(["InProgress", "ReviewPR", "ReviewDev", "Complete"]).describe("The new status for the task"),
+      task_id: z2.string().optional().describe("Child task ID to update. Omit to update the current task.")
     },
     async ({ status, task_id }) => {
       try {
@@ -2469,15 +2965,15 @@ function buildCreatePullRequestTool(connection, config) {
     "create_pull_request",
     "Create a GitHub pull request for this task. Automatically stages uncommitted changes, commits them, and pushes before creating the PR. Use this instead of gh CLI or git commands to create PRs.",
     {
-      title: z.string().describe("The PR title"),
-      body: z.string().describe("The PR description/body in markdown"),
-      branch: z.string().optional().describe(
+      title: z2.string().describe("The PR title"),
+      body: z2.string().describe("The PR description/body in markdown"),
+      branch: z2.string().optional().describe(
         "The head branch name for the PR. If the task doesn't have a branch set, this will be used. Defaults to the task's existing branch."
       ),
-      baseBranch: z.string().optional().describe(
+      baseBranch: z2.string().optional().describe(
         "The base branch to target for the PR (e.g. 'main', 'develop'). Defaults to the project's configured dev branch."
       ),
-      commitMessage: z.string().optional().describe(
+      commitMessage: z2.string().optional().describe(
         "Commit message for staging uncommitted changes. If not provided, a default message based on the PR title will be used."
       )
     },
@@ -2555,7 +3051,7 @@ function buildAddDependencyTool(connection) {
     "add_dependency",
     "Add a dependency \u2014 this task cannot start until the specified task is merged to dev",
     {
-      depends_on_slug_or_id: z.string().describe("Slug or ID of the task this task depends on")
+      depends_on_slug_or_id: z2.string().describe("Slug or ID of the task this task depends on")
     },
     async ({ depends_on_slug_or_id }) => {
       try {
@@ -2577,7 +3073,7 @@ function buildRemoveDependencyTool(connection) {
     "remove_dependency",
     "Remove a dependency from this task",
     {
-      depends_on_slug_or_id: z.string().describe("Slug or ID of the task to remove as dependency")
+      depends_on_slug_or_id: z2.string().describe("Slug or ID of the task to remove as dependency")
     },
     async ({ depends_on_slug_or_id }) => {
       try {
@@ -2599,10 +3095,10 @@ function buildCreateFollowUpTaskTool(connection) {
     "create_follow_up_task",
     "Create a follow-up task in this project that depends on the current task. Use for out-of-scope work, v1.1 features, or cleanup that should happen after this task merges.",
     {
-      title: z.string().describe("Follow-up task title"),
-      description: z.string().optional().describe("Brief description of the follow-up work"),
-      plan: z.string().optional().describe("Implementation plan if known"),
-      story_point_value: z.number().optional().describe("Story point estimate (1=Common, 2=Magic, 3=Rare, 5=Unique)")
+      title: z2.string().describe("Follow-up task title"),
+      description: z2.string().optional().describe("Brief description of the follow-up work"),
+      plan: z2.string().optional().describe("Implementation plan if known"),
+      story_point_value: z2.number().optional().describe("Story point estimate (1=Common, 2=Magic, 3=Rare, 5=Unique)")
     },
     async ({ title, description, plan, story_point_value }) => {
       try {
@@ -2629,9 +3125,9 @@ function buildCreateSuggestionTool(connection) {
     "create_suggestion",
     "Suggest a feature, improvement, or idea for the project. If you want to recommend something \u2014 a document, a rule, a feature, a task, an optimization \u2014 use this tool. If a similar suggestion already exists, your vote will be added to it instead of creating a duplicate.",
     {
-      title: z.string().describe("Short title for the suggestion"),
-      description: z.string().optional().describe("Details about the suggestion"),
-      tag_names: z.array(z.string()).optional().describe("Tag names to categorize the suggestion")
+      title: z2.string().describe("Short title for the suggestion"),
+      description: z2.string().optional().describe("Details about the suggestion"),
+      tag_names: z2.array(z2.string()).optional().describe("Tag names to categorize the suggestion")
     },
     async ({ title, description, tag_names }) => {
       try {
@@ -2660,8 +3156,8 @@ function buildVoteSuggestionTool(connection) {
     "vote_suggestion",
     "Vote on a project suggestion. Use +1 to upvote or -1 to downvote.",
     {
-      suggestion_id: z.string().describe("The suggestion ID to vote on"),
-      value: z.number().refine((v) => v === 1 || v === -1, { message: "Value must be 1 or -1" }).describe("+1 to upvote, -1 to downvote")
+      suggestion_id: z2.string().describe("The suggestion ID to vote on"),
+      value: z2.number().refine((v) => v === 1 || v === -1, { message: "Value must be 1 or -1" }).describe("+1 to upvote, -1 to downvote")
     },
     async ({ suggestion_id, value }) => {
       try {
@@ -2684,8 +3180,8 @@ function buildScaleUpResourcesTool(connection) {
     "scale_up_resources",
     "Scale up the pod's CPU and memory resources. Use before running dev servers, tests, builds, or other resource-intensive operations. Phases: 'setup' (installs, basic dev servers), 'build' (full dev servers, test suites, typecheck, builds). Actual CPU/memory values are configured per-project. Scaling is one-way (up only).",
     {
-      tier: z.enum(["initial", "setup", "build"]).describe("The resource phase to scale up to"),
-      reason: z.string().optional().describe("Brief reason for scaling (e.g., 'running test suite')")
+      tier: z2.enum(["initial", "setup", "build"]).describe("The resource phase to scale up to"),
+      reason: z2.string().optional().describe("Brief reason for scaling (e.g., 'running test suite')")
     },
     async ({ tier, reason }) => {
       try {
@@ -2738,15 +3234,15 @@ function buildCommonTools(connection, config) {
 }
 
 // src/tools/pm-tools.ts
-import { z as z2 } from "zod";
+import { z as z3 } from "zod";
 var SP_DESCRIPTION = "Story point value (1=Common, 2=Magic, 3=Rare, 5=Unique)";
 function buildUpdateTaskTool(connection) {
   return defineTool(
     "update_task",
     "Save the finalized task plan and/or description",
     {
-      plan: z2.string().optional().describe("The task plan in markdown"),
-      description: z2.string().optional().describe("Updated task description")
+      plan: z3.string().optional().describe("The task plan in markdown"),
+      description: z3.string().optional().describe("Updated task description")
     },
     async ({ plan, description }) => {
       try {
@@ -2767,11 +3263,11 @@ function buildCreateSubtaskTool(connection) {
     "create_subtask",
     "Create a subtask under the current parent task. Use for breaking complex tasks into smaller pieces.",
     {
-      title: z2.string().describe("Subtask title"),
-      description: z2.string().optional().describe("Brief description"),
-      plan: z2.string().optional().describe("Implementation plan in markdown"),
-      ordinal: z2.number().optional().describe("Step/order number (0-based)"),
-      storyPointValue: z2.number().optional().describe(SP_DESCRIPTION)
+      title: z3.string().describe("Subtask title"),
+      description: z3.string().optional().describe("Brief description"),
+      plan: z3.string().optional().describe("Implementation plan in markdown"),
+      ordinal: z3.number().optional().describe("Step/order number (0-based)"),
+      storyPointValue: z3.number().optional().describe(SP_DESCRIPTION)
     },
     async ({ title, description, plan, ordinal, storyPointValue }) => {
       try {
@@ -2797,12 +3293,12 @@ function buildUpdateSubtaskTool(connection) {
     "update_subtask",
     "Update an existing subtask's fields",
     {
-      subtaskId: z2.string().describe("The subtask ID to update"),
-      title: z2.string().optional(),
-      description: z2.string().optional(),
-      plan: z2.string().optional(),
-      ordinal: z2.number().optional(),
-      storyPointValue: z2.number().optional().describe(SP_DESCRIPTION)
+      subtaskId: z3.string().describe("The subtask ID to update"),
+      title: z3.string().optional(),
+      description: z3.string().optional(),
+      plan: z3.string().optional(),
+      ordinal: z3.number().optional(),
+      storyPointValue: z3.number().optional().describe(SP_DESCRIPTION)
     },
     async ({ subtaskId, title, description, plan, storyPointValue }) => {
       try {
@@ -2825,7 +3321,7 @@ function buildDeleteSubtaskTool(connection) {
   return defineTool(
     "delete_subtask",
     "Delete a subtask",
-    { subtaskId: z2.string().describe("The subtask ID to delete") },
+    { subtaskId: z3.string().describe("The subtask ID to delete") },
     async ({ subtaskId }) => {
       try {
         await connection.call("deleteSubtask", {
@@ -2863,7 +3359,7 @@ function buildPackTools(connection) {
       "start_child_cloud_build",
       "Start a cloud build for a child task. The child must be in Open status with story points and an agent assigned.",
       {
-        childTaskId: z2.string().describe("The child task ID to start a cloud build for")
+        childTaskId: z3.string().describe("The child task ID to start a cloud build for")
       },
       async ({ childTaskId }) => {
         try {
@@ -2883,7 +3379,7 @@ function buildPackTools(connection) {
       "stop_child_build",
       "Stop a running cloud build for a child task. Sends a stop signal to the child agent.",
       {
-        childTaskId: z2.string().describe("The child task ID whose build should be stopped")
+        childTaskId: z3.string().describe("The child task ID whose build should be stopped")
       },
       async ({ childTaskId }) => {
         try {
@@ -2903,7 +3399,7 @@ function buildPackTools(connection) {
       "approve_and_merge_pr",
       "Approve and merge a child task's pull request. Only succeeds if all CI/CD checks are passing. Returns an error if checks are pending (retry after waiting) or failed (investigate). The child task must be in ReviewPR status.",
       {
-        childTaskId: z2.string().describe("The child task ID whose PR should be approved and merged")
+        childTaskId: z3.string().describe("The child task ID whose PR should be approved and merged")
       },
       async ({ childTaskId }) => {
         try {
@@ -2941,119 +3437,31 @@ function buildPmTools(connection, options) {
 }
 
 // src/tools/discovery-tools.ts
-import { z as z3 } from "zod";
+import { z as z4 } from "zod";
 var SP_DESCRIPTION2 = "Story point value (1=Common, 2=Magic, 3=Rare, 5=Unique)";
-function buildSearchIconsTool(connection) {
-  return defineTool(
-    "search_icons",
-    "Search for icons by keyword. Searches both the Conveyor database (existing icons) and FontAwesome library (~2200 icons). Returns matching icons with IDs and preview info. Use this to find an icon before generating one.",
-    {
-      query: z3.string().describe("Search query for icon name or keyword (e.g. 'bug', 'gear', 'star')")
-    },
-    async ({ query }) => {
-      try {
-        const [dbIcons, faIcons] = await Promise.all([
-          connection.call("listIcons", { sessionId: connection.sessionId }),
-          connection.call("searchFaIcons", { sessionId: connection.sessionId, query })
-        ]);
-        const q = query.toLowerCase();
-        const matchingDbIcons = dbIcons.filter((icon) => icon.name.toLowerCase().includes(q));
-        const dbFaIds = new Set(matchingDbIcons.map((i) => i.name));
-        const uniqueFaIcons = faIcons.filter((fa) => !dbFaIds.has(fa.fontAwesomeId));
-        const results = {
-          existingIcons: matchingDbIcons.map((i) => ({
-            id: i.id,
-            name: i.name,
-            source: "database"
-          })),
-          fontAwesomeIcons: uniqueFaIcons.map((fa) => ({
-            fontAwesomeId: fa.fontAwesomeId,
-            label: fa.label,
-            styles: fa.styles,
-            source: "fontawesome"
-          }))
-        };
-        return textResult(JSON.stringify(results, null, 2));
-      } catch (error) {
-        const message = error instanceof Error ? error.message : "Unknown error";
-        return textResult(`Failed to search icons: ${message}`);
-      }
-    },
-    { annotations: { readOnlyHint: true } }
-  );
-}
-function buildIconTools(connection) {
-  return [
-    defineTool(
-      "list_icons",
-      "List available icons (default library + user-created). Returns icon IDs, names, and whether they're defaults. Call this FIRST before update_task_properties to check for existing matches.",
-      {},
-      async () => {
-        try {
-          const icons = await connection.call("listIcons", {
-            sessionId: connection.sessionId
-          });
-          return textResult(JSON.stringify(icons, null, 2));
-        } catch (error) {
-          return textResult(
-            `Failed to list icons: ${error instanceof Error ? error.message : "Unknown error"}`
-          );
-        }
-      },
-      { annotations: { readOnlyHint: true } }
-    ),
-    defineTool(
-      "generate_task_icon",
-      "Find a FontAwesome icon matching the description and assign it to this task. Falls back to a placeholder if no match is found. Provide a concise keyword or description.",
-      {
-        prompt: z3.string().describe(
-          "Keyword or description to search FontAwesome icons (e.g. 'bug', 'gear', 'rocket')"
-        ),
-        aspectRatio: z3.enum(["auto", "portrait", "landscape", "square"]).optional().describe("Icon aspect ratio, defaults to square")
-      },
-      async ({ prompt, aspectRatio }) => {
-        try {
-          const result = await connection.call("generateTaskIcon", {
-            sessionId: connection.sessionId,
-            prompt,
-            aspectRatio: aspectRatio ?? "square"
-          });
-          return textResult(`Icon generated and assigned: ${result.iconId}`);
-        } catch (error) {
-          return textResult(
-            `Failed to generate icon: ${error instanceof Error ? error.message : "Unknown error"}`
-          );
-        }
-      }
-    )
-  ];
-}
 function buildDiscoveryTools(connection) {
   return [
     defineTool(
       "update_task_properties",
       "Set one or more task properties in a single call. All fields are optional \u2014 only include the fields you want to update.",
       {
-        title: z3.string().optional().describe("The new task title"),
-        storyPointValue: z3.number().optional().describe(SP_DESCRIPTION2),
-        tagIds: z3.array(z3.string()).optional().describe("Array of tag IDs to assign"),
-        iconId: z3.string().optional().describe("Icon ID to assign (use list_icons first)")
+        title: z4.string().optional().describe("The new task title"),
+        storyPointValue: z4.number().optional().describe(SP_DESCRIPTION2),
+        tagIds: z4.array(z4.string()).optional().describe("Array of tag IDs to assign")
       },
-      async ({ title, storyPointValue, tagIds, iconId }) => {
+      async ({ title, storyPointValue, tagIds }) => {
         try {
           await connection.call("updateTaskProperties", {
             sessionId: connection.sessionId,
             title,
             storyPointValue,
-            tagIds,
-            iconId
+            tagIds
           });
           const updatedFields = [];
           if (title !== void 0) updatedFields.push(`title to "${title}"`);
           if (storyPointValue !== void 0)
             updatedFields.push(`story points to ${storyPointValue}`);
           if (tagIds !== void 0) updatedFields.push(`tags (${tagIds.length} tag(s))`);
-          if (iconId !== void 0) updatedFields.push(`icon`);
           return textResult(`Task properties updated: ${updatedFields.join(", ")}`);
         } catch (error) {
           return textResult(
@@ -3061,21 +3469,19 @@ function buildDiscoveryTools(connection) {
           );
         }
       }
-    ),
-    buildSearchIconsTool(connection),
-    ...buildIconTools(connection)
+    )
   ];
 }
 
 // src/tools/code-review-tools.ts
-import { z as z4 } from "zod";
+import { z as z5 } from "zod";
 function buildCodeReviewTools(connection) {
   return [
     defineTool(
       "approve_code_review",
       "Approve the code review. Use this when the code passes all review criteria and is ready to merge.",
       {
-        summary: z4.string().describe("Brief summary of what was reviewed and why it looks good")
+        summary: z5.string().describe("Brief summary of what was reviewed and why it looks good")
       },
       async ({ summary }) => {
         const content = `**Code Review: Approved** :white_check_mark:
@@ -3098,15 +3504,15 @@ ${summary}`;
       "request_code_changes",
       "Request changes during code review. Use this when substantive issues are found that need to be fixed before merge.",
       {
-        issues: z4.array(
-          z4.object({
-            file: z4.string().describe("File path where the issue was found"),
-            line: z4.number().optional().describe("Line number (if applicable)"),
-            severity: z4.enum(["critical", "major", "minor"]).describe("Issue severity"),
-            description: z4.string().describe("What is wrong and how to fix it")
+        issues: z5.array(
+          z5.object({
+            file: z5.string().describe("File path where the issue was found"),
+            line: z5.number().optional().describe("Line number (if applicable)"),
+            severity: z5.enum(["critical", "major", "minor"]).describe("Issue severity"),
+            description: z5.string().describe("What is wrong and how to fix it")
           })
         ).describe("List of issues found during review"),
-        summary: z4.string().describe("Brief overall summary of the review findings")
+        summary: z5.string().describe("Brief overall summary of the review findings")
       },
       async ({ issues, summary }) => {
         const issueLines = issues.map((issue) => {
@@ -3136,10 +3542,10 @@ ${issueLines}`;
 }
 
 // src/tools/debug-tools.ts
-import { z as z7 } from "zod";
+import { z as z8 } from "zod";
 
 // src/tools/telemetry-tools.ts
-import { z as z5 } from "zod";
+import { z as z6 } from "zod";
 
 // src/debug/telemetry-injector.ts
 var BUFFER_SIZE = 200;
@@ -3534,12 +3940,12 @@ function buildGetTelemetryTool(manager) {
     "debug_get_telemetry",
     "Query structured telemetry events (HTTP requests, database queries, Socket.IO events, errors) captured from the running dev server. Returns filtered, structured data instead of raw logs.",
     {
-      type: z5.enum(["http", "db", "socket", "error"]).optional().describe("Filter by event type"),
-      urlPattern: z5.string().optional().describe("Regex pattern to filter HTTP events by URL"),
-      minDuration: z5.number().optional().describe("Minimum duration in ms \u2014 only return events slower than this"),
-      errorOnly: z5.boolean().optional().describe("Only return error events and HTTP 4xx/5xx responses"),
-      since: z5.number().optional().describe("Only return events after this timestamp (ms since epoch)"),
-      limit: z5.number().optional().describe("Max events to return (default: 20, from most recent)")
+      type: z6.enum(["http", "db", "socket", "error"]).optional().describe("Filter by event type"),
+      urlPattern: z6.string().optional().describe("Regex pattern to filter HTTP events by URL"),
+      minDuration: z6.number().optional().describe("Minimum duration in ms \u2014 only return events slower than this"),
+      errorOnly: z6.boolean().optional().describe("Only return error events and HTTP 4xx/5xx responses"),
+      since: z6.number().optional().describe("Only return events after this timestamp (ms since epoch)"),
+      limit: z6.number().optional().describe("Max events to return (default: 20, from most recent)")
     },
     async ({ type, urlPattern, minDuration, errorOnly, since, limit }) => {
       const clientOrErr = requireDebugClient(manager);
@@ -3609,7 +4015,7 @@ function buildTelemetryTools(manager) {
 }
 
 // src/tools/client-debug-tools.ts
-import { z as z6 } from "zod";
+import { z as z7 } from "zod";
 function requirePlaywrightClient(manager) {
   if (!manager.isClientDebugMode()) {
     return "Client debug mode is not active. Use debug_enter_mode with clientSide: true first.";
@@ -3629,11 +4035,11 @@ function buildClientBreakpointTools(manager) {
       "debug_set_client_breakpoint",
       "Set a breakpoint in client-side code running in the headless Chromium browser. V8 resolves source maps automatically, so original .tsx/.ts file paths work. Use this for React components, client utilities, and browser-side code.",
       {
-        file: z6.string().describe(
+        file: z7.string().describe(
           "Original source file path (e.g., src/components/App.tsx) \u2014 source maps resolve automatically"
         ),
-        line: z6.number().describe("Line number (1-based) in the original source file"),
-        condition: z6.string().optional().describe("JavaScript condition expression \u2014 breakpoint only triggers when truthy")
+        line: z7.number().describe("Line number (1-based) in the original source file"),
+        condition: z7.string().optional().describe("JavaScript condition expression \u2014 breakpoint only triggers when truthy")
       },
       async ({ file, line, condition }) => {
         const clientOrErr = requirePlaywrightClient(manager);
@@ -3655,7 +4061,7 @@ Breakpoint ID: ${breakpointId}${sourceMapNote}`
       "debug_remove_client_breakpoint",
       "Remove a previously set client-side breakpoint by its ID.",
       {
-        breakpointId: z6.string().describe("The breakpoint ID returned by debug_set_client_breakpoint")
+        breakpointId: z7.string().describe("The breakpoint ID returned by debug_set_client_breakpoint")
       },
       async ({ breakpointId }) => {
         const clientOrErr = requirePlaywrightClient(manager);
@@ -3735,8 +4141,8 @@ ${JSON.stringify(queuedHits, null, 2)}`
       "debug_evaluate_client",
       "Evaluate a JavaScript expression in the client-side browser context. When paused at a client breakpoint, evaluates in the paused scope. Can access DOM, window, React internals, etc.",
       {
-        expression: z6.string().describe("JavaScript expression to evaluate in the browser context"),
-        frameIndex: z6.number().optional().describe("Call stack frame index (0 = top frame). Defaults to the top frame.")
+        expression: z7.string().describe("JavaScript expression to evaluate in the browser context"),
+        frameIndex: z7.number().optional().describe("Call stack frame index (0 = top frame). Defaults to the top frame.")
       },
       async ({ expression, frameIndex }) => {
         const clientOrErr = requirePlaywrightClient(manager);
@@ -3809,7 +4215,7 @@ function buildClientInteractionTools(manager) {
       "debug_navigate_client",
       "Navigate the headless browser to a specific URL. Use this to reproduce specific flows or visit different pages.",
       {
-        url: z6.string().describe("URL to navigate to (e.g., http://localhost:3000/dashboard)")
+        url: z7.string().describe("URL to navigate to (e.g., http://localhost:3000/dashboard)")
       },
       async ({ url }) => {
         const clientOrErr = requirePlaywrightClient(manager);
@@ -3826,7 +4232,7 @@ function buildClientInteractionTools(manager) {
       "debug_click_client",
       "Click an element on the page in the headless browser. Use CSS selectors to target elements. Useful for reproducing bugs by interacting with the UI programmatically.",
       {
-        selector: z6.string().describe(
+        selector: z7.string().describe(
           "CSS selector of the element to click (e.g., 'button.submit', '#login-form input[type=submit]')"
         )
       },
@@ -3848,8 +4254,8 @@ function buildClientConsoleTool(manager) {
     "debug_get_client_console",
     "Get console messages captured from the headless browser. Includes console.log, warn, error, etc.",
     {
-      level: z6.string().optional().describe("Filter by console level: log, warn, error, info, debug"),
-      limit: z6.number().optional().describe("Maximum number of recent messages to return (default: all)")
+      level: z7.string().optional().describe("Filter by console level: log, warn, error, info, debug"),
+      limit: z7.number().optional().describe("Maximum number of recent messages to return (default: all)")
     },
     // oxlint-disable-next-line require-await
     async ({ level, limit }) => {
@@ -3876,8 +4282,8 @@ function buildClientNetworkTool(manager) {
     "debug_get_client_network",
     "Get network requests captured from the headless browser. Shows URLs, methods, status codes, and timing.",
     {
-      filter: z6.string().optional().describe("Regex pattern to filter requests by URL"),
-      limit: z6.number().optional().describe("Maximum number of recent requests to return (default: all)")
+      filter: z7.string().optional().describe("Regex pattern to filter requests by URL"),
+      limit: z7.number().optional().describe("Maximum number of recent requests to return (default: all)")
     },
     // oxlint-disable-next-line require-await
     async ({ filter, limit }) => {
@@ -3905,7 +4311,7 @@ function buildClientErrorsTool(manager) {
     "debug_get_client_errors",
     "Get uncaught errors captured from the headless browser. Includes error messages and source-mapped stack traces.",
     {
-      limit: z6.number().optional().describe("Maximum number of recent errors to return (default: all)")
+      limit: z7.number().optional().describe("Maximum number of recent errors to return (default: all)")
     },
     // oxlint-disable-next-line require-await
     async ({ limit }) => {
@@ -3999,12 +4405,12 @@ function buildDebugLifecycleTools(manager) {
       "debug_enter_mode",
       "Activate debug mode: restarts the dev server with Node.js --inspect flag and connects the CDP debugger. Optionally launch a headless Chromium browser for client-side debugging. Use serverSide for backend breakpoints, clientSide for frontend breakpoints, or both for full-stack.",
       {
-        hypothesis: z7.string().optional().describe("Your hypothesis about the bug \u2014 helps track debugging intent"),
-        serverSide: z7.boolean().optional().describe(
+        hypothesis: z8.string().optional().describe("Your hypothesis about the bug \u2014 helps track debugging intent"),
+        serverSide: z8.boolean().optional().describe(
           "Enable server-side Node.js debugging (default: true if clientSide is not set)"
         ),
-        clientSide: z7.boolean().optional().describe("Enable client-side browser debugging via headless Chromium + Playwright"),
-        previewUrl: z7.string().optional().describe(
+        clientSide: z8.boolean().optional().describe("Enable client-side browser debugging via headless Chromium + Playwright"),
+        previewUrl: z8.string().optional().describe(
           "Preview URL for client-side debugging (e.g., http://localhost:3000). Required when clientSide is true."
         )
       },
@@ -4040,9 +4446,9 @@ function buildBreakpointTools(manager) {
       "debug_set_breakpoint",
       "Set a breakpoint at the specified file and line number. Optionally provide a condition expression that must evaluate to true for the breakpoint to pause execution.",
       {
-        file: z7.string().describe("Absolute or relative file path to set the breakpoint in"),
-        line: z7.number().describe("Line number (1-based) to set the breakpoint on"),
-        condition: z7.string().optional().describe("JavaScript condition expression \u2014 breakpoint only triggers when truthy")
+        file: z8.string().describe("Absolute or relative file path to set the breakpoint in"),
+        line: z8.number().describe("Line number (1-based) to set the breakpoint on"),
+        condition: z8.string().optional().describe("JavaScript condition expression \u2014 breakpoint only triggers when truthy")
       },
       async ({ file, line, condition }) => {
         const clientOrErr = requireDebugClient2(manager);
@@ -4064,7 +4470,7 @@ Breakpoint ID: ${breakpointId}`
       "debug_remove_breakpoint",
       "Remove a previously set breakpoint by its ID.",
       {
-        breakpointId: z7.string().describe("The breakpoint ID returned by debug_set_breakpoint")
+        breakpointId: z8.string().describe("The breakpoint ID returned by debug_set_breakpoint")
       },
       async ({ breakpointId }) => {
         const clientOrErr = requireDebugClient2(manager);
@@ -4145,8 +4551,8 @@ ${JSON.stringify(queuedHits, null, 2)}`
       "debug_evaluate",
       "Evaluate a JavaScript expression in the current paused scope (or globally if not paused). When paused, use frameIndex to evaluate in a specific call frame.",
       {
-        expression: z7.string().describe("The JavaScript expression to evaluate"),
-        frameIndex: z7.number().optional().describe("Call stack frame index (0 = top frame). Defaults to the top frame.")
+        expression: z8.string().describe("The JavaScript expression to evaluate"),
+        frameIndex: z8.number().optional().describe("Call stack frame index (0 = top frame). Defaults to the top frame.")
       },
       async ({ expression, frameIndex }) => {
         const clientOrErr = requireDebugClient2(manager);
@@ -4174,12 +4580,12 @@ function buildProbeManagementTools(manager) {
       "debug_add_probe",
       "Add a debug probe at a specific code location. Captures expression values each time the line executes \u2014 without pausing or modifying source files. Like console.log but better: structured, no diff pollution, auto-cleaned on debug exit.",
       {
-        file: z7.string().describe("File path to probe"),
-        line: z7.number().describe("Line number (1-based) to probe"),
-        expressions: z7.array(z7.string()).describe(
+        file: z8.string().describe("File path to probe"),
+        line: z8.number().describe("Line number (1-based) to probe"),
+        expressions: z8.array(z8.string()).describe(
           'JavaScript expressions to capture when the line executes (e.g., ["req.params.id", "user.role"])'
         ),
-        label: z7.string().optional().describe("Optional label for this probe (defaults to file:line)")
+        label: z8.string().optional().describe("Optional label for this probe (defaults to file:line)")
       },
       async ({ file, line, expressions, label }) => {
         const clientOrErr = requireDebugClient2(manager);
@@ -4204,7 +4610,7 @@ Trigger the code path, then use debug_get_probe_results to see captured values.`
       "debug_remove_probe",
       "Remove a previously set debug probe by its ID.",
       {
-        probeId: z7.string().describe("The probe ID returned by debug_add_probe")
+        probeId: z8.string().describe("The probe ID returned by debug_add_probe")
       },
       async ({ probeId }) => {
         const clientOrErr = requireDebugClient2(manager);
@@ -4244,9 +4650,9 @@ function buildProbeResultTools(manager) {
       "debug_get_probe_results",
       "Fetch captured probe hit data. Returns expression values from each time a probed line executed.",
       {
-        probeId: z7.string().optional().describe("Filter results by probe ID (resolves to its label)"),
-        label: z7.string().optional().describe("Filter results by probe label"),
-        limit: z7.number().optional().describe("Maximum number of recent hits to return (default: all)")
+        probeId: z8.string().optional().describe("Filter results by probe ID (resolves to its label)"),
+        label: z8.string().optional().describe("Filter results by probe label"),
+        limit: z8.number().optional().describe("Maximum number of recent hits to return (default: all)")
       },
       async ({ probeId, label, limit }) => {
         const clientOrErr = requireDebugClient2(manager);
@@ -4970,14 +5376,14 @@ async function handleExitPlanMode(host, input) {
     }
     if (host.agentMode === "discovery") {
       host.hasExitedPlanMode = true;
+      void host.connection.triggerIdentification();
       host.connection.postChatMessage(
-        "Plan complete. The task stays in Planning \u2014 identify it or switch to Build mode when ready."
+        "Plan complete. Running identification \u2014 icon and agent assignment will be set automatically."
       );
       host.requestSoftStop();
       return { behavior: "allow", updatedInput: input };
     }
     await host.connection.triggerIdentification();
-    host.connection.updateStatus("InProgress");
     host.hasExitedPlanMode = true;
     const newMode = host.isParentTask ? "review" : "building";
     host.pendingModeRestart = true;
@@ -5385,6 +5791,7 @@ async function emitRetryStatus(host, attempt, delayMs) {
   await host.callbacks.onStatusChange("running");
 }
 function handleRateLimitPause(host, rateLimitResetsAt) {
+  host.wasRateLimited = true;
   host.connection.emitRateLimitPause(rateLimitResetsAt);
   host.connection.postChatMessage(
     `Rate limited. The task will be automatically re-queued and resume after ${new Date(rateLimitResetsAt).toLocaleString()}.`
@@ -5505,6 +5912,7 @@ var QueryBridge = class {
   pendingToolOutputs = [];
   _stopped = false;
   _isParentTask = false;
+  _wasRateLimited = false;
   _abortController = null;
   /** Called by SessionRunner when ExitPlanMode triggers a mode transition. */
   onModeTransition;
@@ -5519,6 +5927,9 @@ var QueryBridge = class {
   set isParentTask(val) {
     this._isParentTask = val;
   }
+  get wasRateLimited() {
+    return this._wasRateLimited;
+  }
   stop() {
     this._stopped = true;
     this._abortController?.abort();
@@ -5533,6 +5944,7 @@ var QueryBridge = class {
    */
   async execute(context, followUpContent) {
     this._stopped = false;
+    this._wasRateLimited = false;
     this._abortController = new AbortController();
     const host = this.buildHost();
     try {
@@ -5582,6 +5994,12 @@ var QueryBridge = class {
       set pendingModeRestart(val) {
         bridge.mode.pendingModeRestart = val;
       },
+      get wasRateLimited() {
+        return bridge._wasRateLimited;
+      },
+      set wasRateLimited(val) {
+        bridge._wasRateLimited = val;
+      },
       get activeQuery() {
         return bridge.activeQuery;
       },
@@ -5720,13 +6138,20 @@ var SessionRunner = class _SessionRunner {
       await this.shutdown("error");
       return;
     }
+    if (this.fullContext?.githubBranch) {
+      ensureOnTaskBranch(this.config.workspaceDir, this.fullContext.githubBranch);
+    }
     if (this.fullContext?.baseBranch) {
       syncWithBaseBranch(this.config.workspaceDir, this.fullContext.baseBranch);
     }
     this.mode.resolveInitialMode(this.taskContext);
     this.queryBridge = this.createQueryBridge();
     this.logInitialization();
+    const staleMessageCount = this.pendingMessages.length;
     await this.executeInitialMode();
+    if (staleMessageCount > 0) {
+      this.pendingMessages.splice(0, staleMessageCount);
+    }
     if (!this.stopped && this._state !== "error") {
       this.hasCompleted = true;
     }
@@ -5750,6 +6175,34 @@ var SessionRunner = class _SessionRunner {
     await this.connect();
     await this.run();
   }
+  // ── Message filtering ──────────────────────────────────────────────
+  /**
+   * Returns true if the message should be skipped (not processed).
+   *
+   * After the agent has completed, we only process:
+   *  1. Critical automated sources (e.g. CI failure) — always process
+   *  2. Messages with source: "user" — real user typed in chat
+   *  3. Messages from flushAllCombined — have a real userId but no source
+   *
+   * Everything else (system messages, stale history replays) is skipped.
+   */
+  shouldSkipMessage(msg) {
+    if (!this.hasCompleted) return false;
+    const isCritical = !!msg.source && CRITICAL_AUTOMATED_SOURCES.has(msg.source);
+    if (isCritical) {
+      this.hasCompleted = false;
+      return false;
+    }
+    if (msg.source === "user") {
+      this.hasCompleted = false;
+      return false;
+    }
+    if (!msg.source && msg.userId !== "system") {
+      this.hasCompleted = false;
+      return false;
+    }
+    return true;
+  }
   // ── Core loop ──────────────────────────────────────────────────────
   async coreLoop() {
     while (!this.stopped) {
@@ -5764,12 +6217,7 @@ var SessionRunner = class _SessionRunner {
           }
           break;
         }
-        if (this.hasCompleted && msg.userId === "system") {
-          continue;
-        }
-        if (msg.userId !== "system") {
-          this.hasCompleted = false;
-        }
+        if (this.shouldSkipMessage(msg)) continue;
         await this.setState("running");
         this.interrupted = false;
         await this.callbacks.onEvent({
@@ -5878,6 +6326,7 @@ var SessionRunner = class _SessionRunner {
   static MAX_PR_NUDGES = 3;
   needsPRNudge() {
     if (!this.config.isAuto || this.stopped) return false;
+    if (this.queryBridge?.wasRateLimited) return false;
     if (this.prNudgeCount > _SessionRunner.MAX_PR_NUDGES) return false;
     if (!this.taskContext) return false;
     return this.taskContext.status === "InProgress" && !this.taskContext.githubPRUrl;
@@ -6035,7 +6484,7 @@ var SessionRunner = class _SessionRunner {
   }
   async setState(status) {
     this._state = status;
-    this.connection.emitStatus(status);
+    await this.connection.emitStatus(status);
     await this.callbacks.onStatusChange(status);
   }
   async shutdown(finalState) {
@@ -6475,7 +6924,7 @@ import * as path from "path";
 import { fileURLToPath } from "url";
 
 // src/tools/project-tools.ts
-import { z as z8 } from "zod";
+import { z as z9 } from "zod";
 function buildTaskListTools(connection) {
   const projectId = connection.projectId;
   return [
@@ -6483,9 +6932,9 @@ function buildTaskListTools(connection) {
       "list_tasks",
       "List tasks in the project. Optionally filter by status or assignee.",
       {
-        status: z8.string().optional().describe("Filter by task status"),
-        assigneeId: z8.string().optional().describe("Filter by assigned user ID"),
-        limit: z8.number().optional().describe("Max number of tasks to return (default 50)")
+        status: z9.string().optional().describe("Filter by task status"),
+        assigneeId: z9.string().optional().describe("Filter by assigned user ID"),
+        limit: z9.number().optional().describe("Max number of tasks to return (default 50)")
       },
       async (params) => {
         try {
@@ -6502,7 +6951,7 @@ function buildTaskListTools(connection) {
     defineTool(
       "get_task",
       "Get detailed information about a task including chat messages, child tasks, and session.",
-      { task_id: z8.string().describe("The task ID to look up") },
+      { task_id: z9.string().describe("The task ID to look up") },
       async ({ task_id }) => {
         try {
           const task = await connection.call("getProjectTask", { projectId, taskId: task_id });
@@ -6519,10 +6968,10 @@ function buildTaskListTools(connection) {
       "search_tasks",
       "Search tasks by tags, text query, or status filters.",
       {
-        tagNames: z8.array(z8.string()).optional().describe("Filter by tag names"),
-        searchQuery: z8.string().optional().describe("Text search in title/description"),
-        statusFilters: z8.array(z8.string()).optional().describe("Filter by statuses"),
-        limit: z8.number().optional().describe("Max results (default 20)")
+        tagNames: z9.array(z9.string()).optional().describe("Filter by tag names"),
+        searchQuery: z9.string().optional().describe("Text search in title/description"),
+        statusFilters: z9.array(z9.string()).optional().describe("Filter by statuses"),
+        limit: z9.number().optional().describe("Max results (default 20)")
       },
       async (params) => {
         try {
@@ -6582,11 +7031,11 @@ function buildMutationTools(connection) {
       "create_task",
       "Create a new task in the project.",
       {
-        title: z8.string().describe("Task title"),
-        description: z8.string().optional().describe("Task description"),
-        plan: z8.string().optional().describe("Implementation plan in markdown"),
-        status: z8.string().optional().describe("Initial status (default: Planning)"),
-        isBug: z8.boolean().optional().describe("Whether this is a bug report")
+        title: z9.string().describe("Task title"),
+        description: z9.string().optional().describe("Task description"),
+        plan: z9.string().optional().describe("Implementation plan in markdown"),
+        status: z9.string().optional().describe("Initial status (default: Planning)"),
+        isBug: z9.boolean().optional().describe("Whether this is a bug report")
       },
       async (params) => {
         try {
@@ -6603,12 +7052,12 @@ function buildMutationTools(connection) {
       "update_task",
       "Update an existing task's title, description, plan, status, or assignee.",
       {
-        task_id: z8.string().describe("The task ID to update"),
-        title: z8.string().optional().describe("New title"),
-        description: z8.string().optional().describe("New description"),
-        plan: z8.string().optional().describe("New plan in markdown"),
-        status: z8.string().optional().describe("New status"),
-        assignedUserId: z8.string().nullable().optional().describe("Assign to user ID, or null to unassign")
+        task_id: z9.string().describe("The task ID to update"),
+        title: z9.string().optional().describe("New title"),
+        description: z9.string().optional().describe("New description"),
+        plan: z9.string().optional().describe("New plan in markdown"),
+        status: z9.string().optional().describe("New status"),
+        assignedUserId: z9.string().nullable().optional().describe("Assign to user ID, or null to unassign")
       },
       async ({ task_id, ...fields }) => {
         try {
@@ -7057,7 +7506,7 @@ var ProjectRunner = class {
   async handleAuditTags(request) {
     this.connection.emitStatus("busy");
     try {
-      const { handleTagAudit } = await import("./tag-audit-handler-4RRGIHVB.js");
+      const { handleTagAudit } = await import("./tag-audit-handler-L7YPDXTA.js");
       await handleTagAudit(request, this.connection, this.projectDir);
     } catch (error) {
       const msg = error instanceof Error ? error.message : String(error);
@@ -7478,4 +7927,4 @@ export {
   loadForwardPorts,
   loadConveyorConfig
 };
-//# sourceMappingURL=chunk-PMDVB2EU.js.map
+//# sourceMappingURL=chunk-BOFWZIL6.js.map