claude-kanban 0.4.0 → 0.5.0

package/dist/bin/cli.js

@@ -5,7 +5,7 @@ import { Command } from "commander";
 import chalk from "chalk";
 import open from "open";
 import { existsSync as existsSync4 } from "fs";
-import { execSync as execSync2 } from "child_process";
+import { execSync } from "child_process";
 import { createInterface } from "readline";
 import { join as join6 } from "path";
 
@@ -18,9 +18,9 @@ import { fileURLToPath } from "url";
 import { existsSync as existsSync3 } from "fs";
 
 // src/server/services/executor.ts
-import { spawn, execSync } from "child_process";
+import { spawn } from "child_process";
 import { join as join4 } from "path";
-import { writeFileSync as writeFileSync4, unlinkSync, mkdirSync as mkdirSync2, existsSync as existsSync2, appendFileSync as appendFileSync2, readFileSync as readFileSync4, rmSync } from "fs";
+import { writeFileSync as writeFileSync4, unlinkSync, mkdirSync as mkdirSync2, existsSync as existsSync2, appendFileSync as appendFileSync2, readFileSync as readFileSync4 } from "fs";
 import { EventEmitter } from "events";
 
 // src/server/services/project.ts
@@ -458,7 +458,6 @@ function getTaskCounts(projectPath) {
     draft: 0,
     ready: 0,
     in_progress: 0,
-    in_review: 0,
     completed: 0,
     failed: 0
   };
@@ -531,11 +530,9 @@ function getRecentProgress(projectPath, lines = 100) {
 // src/server/services/executor.ts
 var KANBAN_DIR4 = ".claude-kanban";
 var LOGS_DIR = "logs";
-var WORKTREES_DIR = "worktrees";
 var TaskExecutor = class extends EventEmitter {
   projectPath;
-  runningTasks = /* @__PURE__ */ new Map();
-  reviewingTasks = /* @__PURE__ */ new Map();
+  runningTask = null;
   afkMode = false;
   afkIteration = 0;
   afkMaxIterations = 0;
@@ -641,186 +638,47 @@ ${summary}
     }
   }
   /**
-   * Check if project is a git repository
+   * Check if a task is currently running
    */
-  isGitRepo() {
-    try {
-      execSync("git rev-parse --is-inside-work-tree", {
-        cwd: this.projectPath,
-        stdio: "pipe"
-      });
-      return true;
-    } catch {
-      return false;
-    }
-  }
-  /**
-   * Get worktrees directory path
-   */
-  getWorktreesDir() {
-    return join4(this.projectPath, KANBAN_DIR4, WORKTREES_DIR);
-  }
-  /**
-   * Get worktree path for a task
-   */
-  getWorktreePath(taskId) {
-    return join4(this.getWorktreesDir(), taskId);
+  isRunning() {
+    return this.runningTask !== null;
   }
   /**
-   * Get branch name for a task
+   * Get the currently running task ID
    */
-  getBranchName(taskId) {
-    return `task/${taskId}`;
-  }
-  /**
-   * Create a git worktree for isolated task execution
-   */
-  createWorktree(taskId) {
-    if (!this.isGitRepo()) {
-      console.log("[executor] Not a git repo, skipping worktree creation");
-      return null;
-    }
-    const worktreePath = this.getWorktreePath(taskId);
-    const branchName = this.getBranchName(taskId);
-    try {
-      const worktreesDir = this.getWorktreesDir();
-      if (!existsSync2(worktreesDir)) {
-        mkdirSync2(worktreesDir, { recursive: true });
-      }
-      if (existsSync2(worktreePath)) {
-        this.removeWorktree(taskId);
-      }
-      try {
-        execSync(`git rev-parse --verify ${branchName}`, {
-          cwd: this.projectPath,
-          stdio: "pipe"
-        });
-        execSync(`git branch -D ${branchName}`, {
-          cwd: this.projectPath,
-          stdio: "pipe"
-        });
-      } catch {
-      }
-      execSync(`git worktree add -b ${branchName} "${worktreePath}"`, {
-        cwd: this.projectPath,
-        stdio: "pipe"
-      });
-      console.log(`[executor] Created worktree at ${worktreePath} on branch ${branchName}`);
-      return { worktreePath, branchName };
-    } catch (error) {
-      console.error("[executor] Failed to create worktree:", error);
-      return null;
-    }
-  }
-  /**
-   * Remove a git worktree
-   */
-  removeWorktree(taskId) {
-    const worktreePath = this.getWorktreePath(taskId);
-    const branchName = this.getBranchName(taskId);
-    try {
-      if (existsSync2(worktreePath)) {
-        execSync(`git worktree remove "${worktreePath}" --force`, {
-          cwd: this.projectPath,
-          stdio: "pipe"
-        });
-        console.log(`[executor] Removed worktree at ${worktreePath}`);
-      }
-    } catch (error) {
-      console.error("[executor] Failed to remove worktree via git:", error);
-      try {
-        if (existsSync2(worktreePath)) {
-          rmSync(worktreePath, { recursive: true, force: true });
-          execSync("git worktree prune", {
-            cwd: this.projectPath,
-            stdio: "pipe"
-          });
-        }
-      } catch {
-        console.error("[executor] Failed to force remove worktree directory");
-      }
-    }
-    try {
-      execSync(`git branch -D ${branchName}`, {
-        cwd: this.projectPath,
-        stdio: "pipe"
-      });
-      console.log(`[executor] Deleted branch ${branchName}`);
-    } catch {
-    }
-  }
-  /**
-   * Merge worktree branch back to main branch
-   */
-  mergeWorktreeBranch(taskId) {
-    const branchName = this.getBranchName(taskId);
-    try {
-      const currentBranch = execSync("git rev-parse --abbrev-ref HEAD", {
-        cwd: this.projectPath,
-        encoding: "utf-8"
-      }).trim();
-      execSync(`git merge ${branchName} --no-edit`, {
-        cwd: this.projectPath,
-        stdio: "pipe"
-      });
-      console.log(`[executor] Merged ${branchName} into ${currentBranch}`);
-      return true;
-    } catch (error) {
-      console.error("[executor] Failed to merge branch:", error);
-      return false;
-    }
-  }
-  /**
-   * Get number of currently running tasks
-   */
-  getRunningCount() {
-    return this.runningTasks.size;
-  }
-  /**
-   * Check if a task is running
-   */
-  isTaskRunning(taskId) {
-    return this.runningTasks.has(taskId);
-  }
-  /**
-   * Get all running task IDs
-   */
-  getRunningTaskIds() {
-    return Array.from(this.runningTasks.keys());
+  getRunningTaskId() {
+    return this.runningTask?.taskId || null;
   }
   /**
    * Get running task output
    */
   getTaskOutput(taskId) {
-    return this.runningTasks.get(taskId)?.output;
+    if (this.runningTask?.taskId === taskId) {
+      return this.runningTask.output;
+    }
+    return void 0;
   }
   /**
-   * Build the prompt for a specific task
+   * Build the prompt for a task - simplified Ralph-style
    */
-  buildTaskPrompt(task, config, worktreeInfo) {
+  buildTaskPrompt(task, config) {
     const kanbanDir = join4(this.projectPath, KANBAN_DIR4);
     const prdPath = join4(kanbanDir, "prd.json");
     const progressPath = join4(kanbanDir, "progress.txt");
     const stepsText = task.steps.length > 0 ? `
 Verification steps:
 ${task.steps.map((s, i) => `${i + 1}. ${s}`).join("\n")}` : "";
-    const verifySteps = [];
+    const verifyCommands = [];
     if (config.project.typecheckCommand) {
-      verifySteps.push(`Run typecheck: ${config.project.typecheckCommand}`);
+      verifyCommands.push(config.project.typecheckCommand);
     }
     if (config.project.testCommand) {
-      verifySteps.push(`Run tests: ${config.project.testCommand}`);
+      verifyCommands.push(config.project.testCommand);
     }
-    const verifySection = verifySteps.length > 0 ? `3. Verify your work:
-${verifySteps.map((s) => `   - ${s}`).join("\n")}
+    const verifySection = verifyCommands.length > 0 ? `3. Run quality checks:
+${verifyCommands.map((cmd) => `   - ${cmd}`).join("\n")}
 
-` : "";
-    const worktreeSection = worktreeInfo ? `## ENVIRONMENT
-You are running in an isolated git worktree on branch "${worktreeInfo.branchName}".
-This is a fresh checkout - dependencies (node_modules, vendor, etc.) are NOT installed.
-Before running any build/test commands, install dependencies first (e.g., npm install, composer install, pip install).
-
-` : "";
+4.` : "3.";
     return `You are an AI coding agent. Complete the following task:
 
 ## TASK
@@ -831,48 +689,41 @@ Priority: ${task.priority}
 ${task.description}
 ${stepsText}
 
-${worktreeSection}## INSTRUCTIONS
-1. If dependencies are not installed, install them first.
+## INSTRUCTIONS
+
+1. Implement this task as described above.
 
-2. Implement this task as described above.
+2. Make sure your changes work correctly.
 
-${verifySection}${verifySteps.length > 0 ? "4" : "3"}. When complete, update the task in ${prdPath}:
+${verifySection} When complete, update the PRD file at ${prdPath}:
    - Find the task with id "${task.id}"
    - Set "passes": true
-   (Note: Do NOT change the status - the system will move it to review)
+   - Set "status": "completed"
 
-${verifySteps.length > 0 ? "5" : "4"}. Document your work in ${progressPath}:
-   - What you implemented and files changed
-   - Key decisions made and why
-   - Gotchas, edge cases, or tricky parts discovered
-   - Useful patterns or approaches that worked well
-   - Anything a future agent should know about this area of the codebase
+${verifyCommands.length > 0 ? "5" : "4"}. Document your work in ${progressPath}:
+   - What you implemented
+   - Key decisions made
+   - Any gotchas or important notes for future work
 
-${verifySteps.length > 0 ? "6" : "5"}. Make a git commit with a descriptive message.
+${verifyCommands.length > 0 ? "6" : "5"}. Commit your changes with a descriptive message.
 
-Focus only on this task. When successfully complete, output: <promise>COMPLETE</promise>`;
+Focus only on this task. When done, output: <promise>COMPLETE</promise>`;
   }
   /**
-   * Run a specific task
+   * Run a task
    */
   async runTask(taskId) {
+    if (this.isRunning()) {
+      throw new Error("A task is already running. Wait for it to complete or cancel it first.");
+    }
     const config = getConfig(this.projectPath);
     const task = getTaskById(this.projectPath, taskId);
     if (!task) {
       throw new Error(`Task not found: ${taskId}`);
     }
-    if (this.isTaskRunning(taskId)) {
-      throw new Error(`Task already running: ${taskId}`);
-    }
-    const maxConcurrent = config.execution.maxConcurrent || 3;
-    if (this.getRunningCount() >= maxConcurrent) {
-      throw new Error(`Maximum concurrent tasks (${maxConcurrent}) reached`);
-    }
     updateTask(this.projectPath, taskId, { status: "in_progress" });
     const startedAt = /* @__PURE__ */ new Date();
-    const worktreeInfo = this.createWorktree(taskId);
-    const executionPath = worktreeInfo?.worktreePath || this.projectPath;
-    const prompt = this.buildTaskPrompt(task, config, worktreeInfo);
+    const prompt = this.buildTaskPrompt(task, config);
     const kanbanDir = join4(this.projectPath, KANBAN_DIR4);
     const promptFile = join4(kanbanDir, `prompt-${taskId}.txt`);
     writeFileSync4(promptFile, prompt);
@@ -888,48 +739,32 @@ Focus only on this task. When successfully complete, output: <promise>COMPLETE</
     const commandDisplay = `${config.agent.command} ${args.join(" ")}`;
     const fullCommand = `${config.agent.command} ${args.join(" ")}`;
     console.log("[executor] Command:", fullCommand);
-    console.log("[executor] CWD:", executionPath);
-    if (worktreeInfo) {
-      console.log("[executor] Using worktree:", worktreeInfo.worktreePath);
-      console.log("[executor] Branch:", worktreeInfo.branchName);
-    }
+    console.log("[executor] CWD:", this.projectPath);
     const childProcess = spawn("bash", ["-c", fullCommand], {
-      cwd: executionPath,
+      cwd: this.projectPath,
       env: {
         ...process.env,
         TERM: "xterm-256color",
         FORCE_COLOR: "0",
-        // Disable colors to avoid escape codes
         NO_COLOR: "1"
-        // Standard way to disable colors
       },
       stdio: ["ignore", "pipe", "pipe"]
-      // Close stdin since we don't need interactive input
     });
-    const runningTask = {
+    this.runningTask = {
       taskId,
       process: childProcess,
       startedAt,
-      output: [],
-      worktreePath: worktreeInfo?.worktreePath,
-      branchName: worktreeInfo?.branchName
+      output: []
     };
-    this.runningTasks.set(taskId, runningTask);
     this.initLogFile(taskId);
     const logOutput = (line) => {
       this.appendToLog(taskId, line);
-      runningTask.output.push(line);
+      this.runningTask?.output.push(line);
       this.emit("task:output", { taskId, line, lineType: "stdout" });
     };
     this.emit("task:started", { taskId, timestamp: startedAt.toISOString() });
     logOutput(`[claude-kanban] Starting task: ${task.title}
 `);
-    if (worktreeInfo) {
-      logOutput(`[claude-kanban] Worktree: ${worktreeInfo.worktreePath}
-`);
-      logOutput(`[claude-kanban] Branch: ${worktreeInfo.branchName}
-`);
-    }
     logOutput(`[claude-kanban] Command: ${commandDisplay}
 `);
     logOutput(`[claude-kanban] Process spawned (PID: ${childProcess.pid})
@@ -974,9 +809,6 @@ Focus only on this task. When successfully complete, output: <promise>COMPLETE</
       const text = data.toString();
       logOutput(`[stderr] ${text}`);
     });
-    childProcess.on("spawn", () => {
-      console.log("[executor] Process spawned successfully");
-    });
     childProcess.on("error", (error) => {
       console.log("[executor] Spawn error:", error.message);
       this.emit("task:output", { taskId, line: `[claude-kanban] Error: ${error.message}
@@ -985,9 +817,6 @@ Focus only on this task. When successfully complete, output: <promise>COMPLETE</
         unlinkSync(promptFile);
       } catch {
       }
-      if (worktreeInfo) {
-        this.removeWorktree(taskId);
-      }
       updateTask(this.projectPath, taskId, { status: "failed", passes: false });
       const endedAt = /* @__PURE__ */ new Date();
       addExecutionEntry(this.projectPath, taskId, {
@@ -998,7 +827,7 @@ Focus only on this task. When successfully complete, output: <promise>COMPLETE</
         error: error.message
       });
       this.emit("task:failed", { taskId, error: error.message });
-      this.runningTasks.delete(taskId);
+      this.runningTask = null;
     });
     childProcess.on("close", (code, signal) => {
       console.log("[executor] Process closed with code:", code, "signal:", signal);
@@ -1012,48 +841,41 @@ Focus only on this task. When successfully complete, output: <promise>COMPLETE</
     });
     const timeoutMs = (config.execution.timeout || 30) * 60 * 1e3;
     setTimeout(() => {
-      if (this.isTaskRunning(taskId)) {
-        this.cancelTask(taskId, "Timeout exceeded");
+      if (this.runningTask?.taskId === taskId) {
+        this.cancelTask("Timeout exceeded");
       }
     }, timeoutMs);
   }
   /**
-   * Handle task completion - moves to in_review, keeps worktree alive
+   * Handle task completion
    */
   handleTaskComplete(taskId, exitCode, startedAt) {
-    const runningTask = this.runningTasks.get(taskId);
-    if (!runningTask) return;
+    if (!this.runningTask || this.runningTask.taskId !== taskId) return;
     const endedAt = /* @__PURE__ */ new Date();
     const duration = endedAt.getTime() - startedAt.getTime();
-    const output = runningTask.output.join("");
+    const output = this.runningTask.output.join("");
     const isComplete = output.includes("<promise>COMPLETE</promise>");
     const task = getTaskById(this.projectPath, taskId);
     if (isComplete || exitCode === 0) {
-      if (runningTask.worktreePath && runningTask.branchName) {
-        this.reviewingTasks.set(taskId, {
-          worktreePath: runningTask.worktreePath,
-          branchName: runningTask.branchName,
-          startedAt,
-          endedAt
-        });
-        console.log(`[executor] Task ${taskId} ready for review at ${runningTask.worktreePath}`);
-      }
       updateTask(this.projectPath, taskId, {
-        status: "in_review",
+        status: "completed",
         passes: true
       });
+      addExecutionEntry(this.projectPath, taskId, {
+        startedAt: startedAt.toISOString(),
+        endedAt: endedAt.toISOString(),
+        status: "completed",
+        duration
+      });
       logTaskExecution(this.projectPath, {
         taskId,
         taskTitle: task?.title || "Unknown",
-        status: "in_review",
+        status: "completed",
         duration
       });
-      this.emit("task:completed", { taskId, duration, status: "in_review" });
+      this.emit("task:completed", { taskId, duration });
       this.afkTasksCompleted++;
     } else {
-      if (runningTask.worktreePath) {
-        this.removeWorktree(taskId);
-      }
       updateTask(this.projectPath, taskId, {
         status: "failed",
         passes: false
@@ -1075,184 +897,33 @@ Focus only on this task. When successfully complete, output: <promise>COMPLETE</
       });
       this.emit("task:failed", { taskId, error });
     }
-    this.runningTasks.delete(taskId);
+    this.runningTask = null;
     if (this.afkMode) {
       this.continueAFKMode();
     }
   }
   /**
-   * Get info about a task in review
-   */
-  getReviewingTask(taskId) {
-    return this.reviewingTasks.get(taskId);
-  }
-  /**
-   * Merge a reviewed task into the base branch
-   */
-  mergeTask(taskId) {
-    const reviewInfo = this.reviewingTasks.get(taskId);
-    if (!reviewInfo) {
-      return { success: false, error: "Task not in review or no worktree found" };
-    }
-    const merged = this.mergeWorktreeBranch(taskId);
-    if (!merged) {
-      return { success: false, error: "Merge failed - may have conflicts" };
-    }
-    this.removeWorktree(taskId);
-    this.reviewingTasks.delete(taskId);
-    updateTask(this.projectPath, taskId, {
-      status: "completed"
-    });
-    addExecutionEntry(this.projectPath, taskId, {
-      startedAt: reviewInfo.startedAt.toISOString(),
-      endedAt: (/* @__PURE__ */ new Date()).toISOString(),
-      status: "completed",
-      duration: (/* @__PURE__ */ new Date()).getTime() - reviewInfo.startedAt.getTime()
-    });
-    console.log(`[executor] Task ${taskId} merged successfully`);
-    return { success: true };
-  }
-  /**
-   * Create a PR for a reviewed task
-   */
-  createPR(taskId) {
-    const reviewInfo = this.reviewingTasks.get(taskId);
-    const task = getTaskById(this.projectPath, taskId);
-    if (!reviewInfo) {
-      return { success: false, error: "Task not in review or no worktree found" };
-    }
-    try {
-      execSync(`git push -u origin ${reviewInfo.branchName}`, {
-        cwd: this.projectPath,
-        stdio: "pipe"
-      });
-      const prTitle = task?.title || `Task ${taskId}`;
-      const prBody = task?.description || "";
-      const result = execSync(
-        `gh pr create --title "${prTitle.replace(/"/g, '\\"')}" --body "${prBody.replace(/"/g, '\\"')}" --head ${reviewInfo.branchName}`,
-        {
-          cwd: this.projectPath,
-          encoding: "utf-8"
-        }
-      );
-      const prUrl = result.trim();
-      try {
-        execSync(`git worktree remove "${reviewInfo.worktreePath}" --force`, {
-          cwd: this.projectPath,
-          stdio: "pipe"
-        });
-      } catch {
-      }
-      this.reviewingTasks.delete(taskId);
-      updateTask(this.projectPath, taskId, {
-        status: "completed"
-      });
-      addExecutionEntry(this.projectPath, taskId, {
-        startedAt: reviewInfo.startedAt.toISOString(),
-        endedAt: (/* @__PURE__ */ new Date()).toISOString(),
-        status: "completed",
-        duration: (/* @__PURE__ */ new Date()).getTime() - reviewInfo.startedAt.getTime()
-      });
-      console.log(`[executor] PR created for task ${taskId}: ${prUrl}`);
-      return { success: true, prUrl };
-    } catch (error) {
-      const errorMsg = error instanceof Error ? error.message : String(error);
-      console.error(`[executor] Failed to create PR:`, errorMsg);
-      return { success: false, error: errorMsg };
-    }
-  }
-  /**
-   * Discard a reviewed task - delete worktree and return to ready
+   * Cancel the running task
    */
-  discardTask(taskId) {
-    const reviewInfo = this.reviewingTasks.get(taskId);
-    if (!reviewInfo) {
-      return { success: false, error: "Task not in review or no worktree found" };
-    }
-    this.removeWorktree(taskId);
-    this.reviewingTasks.delete(taskId);
-    updateTask(this.projectPath, taskId, {
-      status: "ready",
-      passes: false
-    });
-    addExecutionEntry(this.projectPath, taskId, {
-      startedAt: reviewInfo.startedAt.toISOString(),
-      endedAt: (/* @__PURE__ */ new Date()).toISOString(),
-      status: "discarded",
-      duration: (/* @__PURE__ */ new Date()).getTime() - reviewInfo.startedAt.getTime()
-    });
-    console.log(`[executor] Task ${taskId} discarded, returned to ready`);
-    return { success: true };
-  }
-  /**
-   * Get diff for a task in review
-   */
-  getTaskDiff(taskId) {
-    const reviewInfo = this.reviewingTasks.get(taskId);
-    if (!reviewInfo) {
-      return { success: false, error: "Task not in review or no worktree found" };
-    }
-    try {
-      const diff = execSync(`git diff main...${reviewInfo.branchName}`, {
-        cwd: this.projectPath,
-        encoding: "utf-8",
-        maxBuffer: 10 * 1024 * 1024
-        // 10MB buffer for large diffs
-      });
-      return { success: true, diff };
-    } catch (error) {
-      const errorMsg = error instanceof Error ? error.message : String(error);
-      return { success: false, error: errorMsg };
-    }
-  }
-  /**
-   * Get list of changed files for a task in review
-   */
-  getTaskChangedFiles(taskId) {
-    const reviewInfo = this.reviewingTasks.get(taskId);
-    if (!reviewInfo) {
-      return { success: false, error: "Task not in review or no worktree found" };
-    }
-    try {
-      const result = execSync(`git diff --name-only main...${reviewInfo.branchName}`, {
-        cwd: this.projectPath,
-        encoding: "utf-8"
-      });
-      const files = result.trim().split("\n").filter((f) => f);
-      return { success: true, files };
-    } catch (error) {
-      const errorMsg = error instanceof Error ? error.message : String(error);
-      return { success: false, error: errorMsg };
-    }
-  }
-  /**
-   * Cancel a running task
-   */
-  cancelTask(taskId, reason = "Cancelled by user") {
-    const runningTask = this.runningTasks.get(taskId);
-    if (!runningTask) return false;
-    const startedAt = runningTask.startedAt;
+  cancelTask(reason = "Cancelled by user") {
+    if (!this.runningTask) return false;
+    const { taskId, process: childProcess, startedAt } = this.runningTask;
     const endedAt = /* @__PURE__ */ new Date();
     const duration = endedAt.getTime() - startedAt.getTime();
     const task = getTaskById(this.projectPath, taskId);
     try {
-      runningTask.process.kill("SIGTERM");
+      childProcess.kill("SIGTERM");
       setTimeout(() => {
         try {
-          if (!runningTask.process.killed) {
-            runningTask.process.kill("SIGKILL");
+          if (!childProcess.killed) {
+            childProcess.kill("SIGKILL");
           }
         } catch {
         }
       }, 2e3);
     } catch {
     }
-    if (runningTask.worktreePath) {
-      this.removeWorktree(taskId);
-    }
-    updateTask(this.projectPath, taskId, {
-      status: "ready"
-    });
+    updateTask(this.projectPath, taskId, { status: "ready" });
     addExecutionEntry(this.projectPath, taskId, {
       startedAt: startedAt.toISOString(),
       endedAt: endedAt.toISOString(),
@@ -1268,48 +939,46 @@ Focus only on this task. When successfully complete, output: <promise>COMPLETE</
       error: reason
     });
     this.emit("task:cancelled", { taskId });
-    this.runningTasks.delete(taskId);
+    this.runningTask = null;
     return true;
   }
   /**
-   * Start AFK mode
+   * Start AFK mode - run tasks sequentially until done
    */
-  startAFKMode(maxIterations, concurrent) {
+  startAFKMode(maxIterations) {
     if (this.afkMode) {
       throw new Error("AFK mode already running");
     }
+    if (this.isRunning()) {
+      throw new Error("Cannot start AFK mode while a task is running");
+    }
     this.afkMode = true;
     this.afkIteration = 0;
     this.afkMaxIterations = maxIterations;
     this.afkTasksCompleted = 0;
     this.emitAFKStatus();
-    this.continueAFKMode(concurrent);
+    this.continueAFKMode();
   }
   /**
-   * Continue AFK mode - pick up next tasks
+   * Continue AFK mode - pick next task
    */
-  continueAFKMode(concurrent = 1) {
+  continueAFKMode() {
     if (!this.afkMode) return;
     if (this.afkIteration >= this.afkMaxIterations) {
       this.stopAFKMode();
       return;
     }
-    const config = getConfig(this.projectPath);
-    const maxConcurrent = Math.min(concurrent, config.execution.maxConcurrent || 3);
-    while (this.getRunningCount() < maxConcurrent) {
-      const nextTask = getNextReadyTask(this.projectPath);
-      if (!nextTask) {
-        if (this.getRunningCount() === 0) {
-          this.stopAFKMode();
-        }
-        break;
-      }
-      this.afkIteration++;
-      this.runTask(nextTask.id).catch((error) => {
-        console.error("AFK task error:", error);
-      });
-      this.emitAFKStatus();
+    if (this.isRunning()) return;
+    const nextTask = getNextReadyTask(this.projectPath);
+    if (!nextTask) {
+      this.stopAFKMode();
+      return;
     }
+    this.afkIteration++;
+    this.runTask(nextTask.id).catch((error) => {
+      console.error("AFK task error:", error);
+    });
+    this.emitAFKStatus();
   }
   /**
    * Stop AFK mode
@@ -1341,18 +1010,15 @@ Focus only on this task. When successfully complete, output: <promise>COMPLETE</
     };
   }
   /**
-   * Cancel all running tasks
+   * Cancel running task and stop AFK mode
    */
   cancelAll() {
-    for (const [taskId, runningTask] of this.runningTasks.entries()) {
+    if (this.runningTask) {
       try {
-        runningTask.process.kill("SIGKILL");
+        this.runningTask.process.kill("SIGKILL");
       } catch {
       }
-      if (runningTask.worktreePath) {
-        this.removeWorktree(taskId);
-      }
-      this.runningTasks.delete(taskId);
+      this.runningTask = null;
     }
     this.stopAFKMode();
   }
@@ -1862,7 +1528,12 @@ async function createServer(projectPath, port) {
   });
   app.post("/api/tasks/:id/cancel", (req, res) => {
     try {
-      const cancelled = executor.cancelTask(req.params.id);
+      const runningId = executor.getRunningTaskId();
+      if (runningId !== req.params.id) {
+        res.status(404).json({ error: "Task not running" });
+        return;
+      }
+      const cancelled = executor.cancelTask();
       if (!cancelled) {
         res.status(404).json({ error: "Task not running" });
         return;
@@ -1891,90 +1562,6 @@ async function createServer(projectPath, port) {
       res.status(500).json({ error: String(error) });
     }
   });
-  app.post("/api/tasks/:id/merge", (req, res) => {
-    try {
-      const result = executor.mergeTask(req.params.id);
-      if (!result.success) {
-        res.status(400).json({ error: result.error });
-        return;
-      }
-      const task = getTaskById(projectPath, req.params.id);
-      if (task) {
-        io.emit("task:updated", task);
-      }
-      res.json({ success: true });
-    } catch (error) {
-      res.status(500).json({ error: String(error) });
-    }
-  });
-  app.post("/api/tasks/:id/create-pr", (req, res) => {
-    try {
-      const result = executor.createPR(req.params.id);
-      if (!result.success) {
-        res.status(400).json({ error: result.error });
-        return;
-      }
-      const task = getTaskById(projectPath, req.params.id);
-      if (task) {
-        io.emit("task:updated", task);
-      }
-      res.json({ success: true, prUrl: result.prUrl });
-    } catch (error) {
-      res.status(500).json({ error: String(error) });
-    }
-  });
-  app.post("/api/tasks/:id/discard", (req, res) => {
-    try {
-      const result = executor.discardTask(req.params.id);
-      if (!result.success) {
-        res.status(400).json({ error: result.error });
-        return;
-      }
-      const task = getTaskById(projectPath, req.params.id);
-      if (task) {
-        io.emit("task:updated", task);
-      }
-      res.json({ success: true });
-    } catch (error) {
-      res.status(500).json({ error: String(error) });
-    }
-  });
-  app.get("/api/tasks/:id/diff", (req, res) => {
-    try {
-      const result = executor.getTaskDiff(req.params.id);
-      if (!result.success) {
-        res.status(400).json({ error: result.error });
-        return;
-      }
-      res.json({ diff: result.diff });
-    } catch (error) {
-      res.status(500).json({ error: String(error) });
-    }
-  });
-  app.get("/api/tasks/:id/changed-files", (req, res) => {
-    try {
-      const result = executor.getTaskChangedFiles(req.params.id);
-      if (!result.success) {
-        res.status(400).json({ error: result.error });
-        return;
-      }
-      res.json({ files: result.files });
-    } catch (error) {
-      res.status(500).json({ error: String(error) });
-    }
-  });
-  app.get("/api/tasks/:id/review-info", (req, res) => {
-    try {
-      const info = executor.getReviewingTask(req.params.id);
-      if (!info) {
-        res.status(404).json({ error: "Task not in review" });
-        return;
-      }
-      res.json(info);
-    } catch (error) {
-      res.status(500).json({ error: String(error) });
-    }
-  });
   app.get("/api/tasks/:id/logs", (req, res) => {
     try {
       const logs = executor.getTaskLog(req.params.id);
@@ -2048,8 +1635,8 @@ async function createServer(projectPath, port) {
   });
   app.post("/api/afk/start", (req, res) => {
     try {
-      const { maxIterations, concurrent } = req.body;
-      executor.startAFKMode(maxIterations || 10, concurrent || 1);
+      const { maxIterations } = req.body;
+      executor.startAFKMode(maxIterations || 10);
       res.json({ success: true, status: executor.getAFKStatus() });
     } catch (error) {
       res.status(400).json({ error: String(error) });
@@ -2073,8 +1660,8 @@ async function createServer(projectPath, port) {
   });
   app.get("/api/running", (_req, res) => {
     try {
-      const taskIds = executor.getRunningTaskIds();
-      res.json({ running: taskIds, count: taskIds.length });
+      const taskId = executor.getRunningTaskId();
+      res.json({ running: taskId ? [taskId] : [], count: taskId ? 1 : 0 });
     } catch (error) {
       res.status(500).json({ error: String(error) });
     }
@@ -2082,7 +1669,7 @@ async function createServer(projectPath, port) {
   app.get("/api/stats", (_req, res) => {
     try {
       const counts = getTaskCounts(projectPath);
-      const running = executor.getRunningCount();
+      const running = executor.isRunning() ? 1 : 0;
       const afk = executor.getAFKStatus();
       res.json({ counts, running, afk });
     } catch (error) {
@@ -2098,12 +1685,13 @@ async function createServer(projectPath, port) {
   });
   io.on("connection", (socket) => {
     console.log("Client connected");
-    const runningIds = executor.getRunningTaskIds();
+    const runningId = executor.getRunningTaskId();
+    const runningIds = runningId ? [runningId] : [];
     const taskLogs = {};
-    for (const taskId of runningIds) {
-      const logs = executor.getTaskLog(taskId);
+    if (runningId) {
+      const logs = executor.getTaskLog(runningId);
       if (logs) {
-        taskLogs[taskId] = logs;
+        taskLogs[runningId] = logs;
       }
     }
     socket.emit("init", {
@@ -2111,7 +1699,7 @@ async function createServer(projectPath, port) {
       running: runningIds,
       afk: executor.getAFKStatus(),
       taskLogs
-      // Include logs for running tasks
+      // Include logs for running task
     });
     socket.on("get-logs", (taskId) => {
       const logs = executor.getTaskLog(taskId);
@@ -2284,7 +1872,6 @@ function getClientHTML() {
     .status-dot-draft { background: #a3a3a3; }
     .status-dot-ready { background: #3b82f6; }
     .status-dot-in_progress { background: #f97316; }
-    .status-dot-in_review { background: #8b5cf6; }
     .status-dot-completed { background: #22c55e; }
     .status-dot-failed { background: #ef4444; }
 
@@ -2494,7 +2081,6 @@ function getClientHTML() {
     .status-badge-draft { background: #f5f5f5; color: #737373; }
     .status-badge-ready { background: #eff6ff; color: #3b82f6; }
     .status-badge-in_progress { background: #fff7ed; color: #f97316; }
-    .status-badge-in_review { background: #f5f3ff; color: #8b5cf6; }
     .status-badge-completed { background: #f0fdf4; color: #22c55e; }
     .status-badge-failed { background: #fef2f2; color: #ef4444; }
 
@@ -2820,16 +2406,14 @@ socket.on('task:output', ({ taskId, line }) => {
   }
 });
 
-socket.on('task:completed', ({ taskId, status }) => {
+socket.on('task:completed', ({ taskId }) => {
   state.running = state.running.filter(id => id !== taskId);
   const task = state.tasks.find(t => t.id === taskId);
   if (task) {
-    // Use status from server (could be 'in_review' or 'completed')
-    task.status = status || 'in_review';
+    task.status = 'completed';
     task.passes = true;
   }
-  const statusMsg = (status === 'in_review') ? 'ready for review' : 'completed';
-  showToast('Task ' + statusMsg + ': ' + (task?.title || taskId), 'success');
+  showToast('Task completed: ' + (task?.title || taskId), 'success');
   render();
 });
 
@@ -2903,53 +2487,6 @@ async function retryTask(id) {
   });
 }
 
-async function mergeTask(id) {
-  const res = await fetch('/api/tasks/' + id + '/merge', { method: 'POST' });
-  const data = await res.json();
-  if (!res.ok) {
-    throw new Error(data.error || 'Merge failed');
-  }
-  return data;
-}
-
-async function createPR(id) {
-  const res = await fetch('/api/tasks/' + id + '/create-pr', { method: 'POST' });
-  const data = await res.json();
-  if (!res.ok) {
-    throw new Error(data.error || 'PR creation failed');
-  }
-  return data;
-}
-
-async function discardTask(id) {
-  const res = await fetch('/api/tasks/' + id + '/discard', { method: 'POST' });
-  const data = await res.json();
-  if (!res.ok) {
-    throw new Error(data.error || 'Discard failed');
-  }
-  return data;
-}
-
-async function getReviewInfo(id) {
-  const res = await fetch('/api/tasks/' + id + '/review-info');
-  const data = await res.json();
-  if (!res.ok) {
-    throw new Error(data.error || 'Failed to get review info');
-  }
-  return data;
-}
-
-async function openInVSCode(id) {
-  try {
-    const info = await getReviewInfo(id);
-    // Open VS Code at the worktree path
-    window.open('vscode://file/' + encodeURIComponent(info.worktreePath), '_blank');
-    showToast('Opening in VS Code...', 'info');
-  } catch (e) {
-    showToast('Failed to open in VS Code: ' + e.message, 'error');
-  }
-}
-
 async function generateTask(prompt) {
   state.aiGenerating = true;
   render();
@@ -2968,11 +2505,11 @@ async function generateTask(prompt) {
   }
 }
 
-async function startAFK(maxIterations, concurrent) {
+async function startAFK(maxIterations) {
   await fetch('/api/afk/start', {
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify({ maxIterations, concurrent })
+    body: JSON.stringify({ maxIterations })
   });
 }
 
@@ -3153,7 +2690,6 @@ function renderColumn(status, title, tasks) {
     draft: 'To Do',
     ready: 'Ready',
     in_progress: 'In Progress',
-    in_review: 'In Review',
     completed: 'Done',
     failed: 'Failed'
   };
@@ -3406,21 +2942,13 @@ function renderModal() {
             <button onclick="state.showModal = null; render();" class="btn btn-ghost p-1.5 text-canvas-500 hover:text-canvas-700">\u2715</button>
           </div>
           <div class="p-6">
-            <p class="text-sm text-canvas-600 mb-5">Run the agent in a loop, automatically picking up tasks from the "Ready" column until complete.</p>
+            <p class="text-sm text-canvas-600 mb-5">Run the agent in a loop, automatically picking up tasks from the "Ready" column one at a time until complete.</p>
             <div class="space-y-4">
               <div>
                 <label class="block text-sm font-medium text-canvas-700 mb-2">Maximum Iterations</label>
                 <input type="number" id="afk-iterations" value="10" min="1" max="100"
                        class="input w-full">
               </div>
-              <div>
-                <label class="block text-sm font-medium text-canvas-700 mb-2">Concurrent Tasks</label>
-                <select id="afk-concurrent" class="input w-full">
-                  <option value="1">1 (Sequential)</option>
-                  <option value="2">2</option>
-                  <option value="3">3 (Max)</option>
-                </select>
-              </div>
               <div class="bg-status-running/10 border border-status-running/20 rounded-lg p-3">
                 <p class="text-xs text-status-running">\u26A0\uFE0F You can close this tab - the agent will continue running. Check back later or watch the terminal output.</p>
               </div>
@@ -3535,20 +3063,6 @@ function renderSidePanel() {
             \u23F9 Stop Attempt
           </button>
         \` : ''}
-        \${task.status === 'in_review' ? \`
-          <button onclick="handleMerge('\${task.id}')" class="btn btn-primary px-4 py-2 text-sm">
-            \u2713 Merge
-          </button>
-          <button onclick="handleCreatePR('\${task.id}')" class="btn btn-ghost px-4 py-2 text-sm">
-            \u21E1 Create PR
-          </button>
-          <button onclick="openInVSCode('\${task.id}')" class="btn btn-ghost px-4 py-2 text-sm">
-            \u{1F4C2} Open in VS Code
-          </button>
-          <button onclick="handleDiscard('\${task.id}')" class="btn btn-danger px-4 py-2 text-sm">
-            \u2715 Discard
-          </button>
-        \` : ''}
         \${task.status === 'failed' ? \`
           <button onclick="retryTask('\${task.id}')" class="btn btn-primary px-4 py-2 text-sm">
             \u21BB Retry
@@ -3743,47 +3257,11 @@ function applyTemplate(templateId) {
 
 function handleStartAFK() {
   const iterations = parseInt(document.getElementById('afk-iterations').value) || 10;
-  const concurrent = parseInt(document.getElementById('afk-concurrent').value) || 1;
-  startAFK(iterations, concurrent);
+  startAFK(iterations);
   state.showModal = null;
   render();
 }
 
-async function handleMerge(taskId) {
-  if (!confirm('Merge this task into the main branch?')) return;
-  try {
-    await mergeTask(taskId);
-    showToast('Task merged successfully!', 'success');
-    closeSidePanel();
-  } catch (e) {
-    showToast('Merge failed: ' + e.message, 'error');
-  }
-}
-
-async function handleCreatePR(taskId) {
-  try {
-    const result = await createPR(taskId);
-    showToast('PR created successfully!', 'success');
-    if (result.prUrl) {
-      window.open(result.prUrl, '_blank');
-    }
-    closeSidePanel();
-  } catch (e) {
-    showToast('PR creation failed: ' + e.message, 'error');
-  }
-}
-
-async function handleDiscard(taskId) {
-  if (!confirm('Discard this work? The task will return to Ready status.')) return;
-  try {
-    await discardTask(taskId);
-    showToast('Task discarded, returned to Ready', 'warning');
-    closeSidePanel();
-  } catch (e) {
-    showToast('Discard failed: ' + e.message, 'error');
-  }
-}
-
 // Filter tasks based on search query
 function filterTasks(tasks) {
   if (!state.searchQuery) return tasks;
@@ -3845,7 +3323,6 @@ function render() {
             \${renderColumn('draft', 'To Do', filterTasks(state.tasks))}
             \${renderColumn('ready', 'Ready', filterTasks(state.tasks))}
             \${renderColumn('in_progress', 'In Progress', filterTasks(state.tasks))}
-            \${renderColumn('in_review', 'In Review', filterTasks(state.tasks))}
             \${renderColumn('completed', 'Done', filterTasks(state.tasks))}
             \${renderColumn('failed', 'Failed', filterTasks(state.tasks))}
           </div>
@@ -3910,14 +3387,6 @@ window.closeSidePanel = closeSidePanel;
 window.showTaskMenu = showTaskMenu;
 window.filterTasks = filterTasks;
 window.scrollSidePanelLog = scrollSidePanelLog;
-window.mergeTask = mergeTask;
-window.createPR = createPR;
-window.discardTask = discardTask;
-window.handleMerge = handleMerge;
-window.handleCreatePR = handleCreatePR;
-window.handleDiscard = handleDiscard;
-window.openInVSCode = openInVSCode;
-window.getReviewInfo = getReviewInfo;
 
 // Keyboard shortcuts
 document.addEventListener('keydown', (e) => {
@@ -3997,7 +3466,7 @@ function isGitRepo(dir) {
 }
 function hasGitRemote(dir) {
   try {
-    const result = execSync2("git remote -v", { cwd: dir, stdio: "pipe" }).toString();
+    const result = execSync("git remote -v", { cwd: dir, stdio: "pipe" }).toString();
     return result.trim().length > 0;
   } catch {
     return false;
@@ -4005,7 +3474,7 @@ function hasGitRemote(dir) {
 }
 function detectRemoteType(dir) {
   try {
-    const result = execSync2("git remote get-url origin", { cwd: dir, stdio: "pipe" }).toString().toLowerCase();
+    const result = execSync("git remote get-url origin", { cwd: dir, stdio: "pipe" }).toString().toLowerCase();
     if (result.includes("github.com")) return "github";
     if (result.includes("gitlab.com") || result.includes("gitlab")) return "gitlab";
     if (result.includes("bitbucket.org") || result.includes("bitbucket")) return "bitbucket";
@@ -4016,10 +3485,10 @@ function detectRemoteType(dir) {
   }
 }
 function initializeGit(dir) {
-  execSync2("git init", { cwd: dir, stdio: "pipe" });
+  execSync("git init", { cwd: dir, stdio: "pipe" });
   try {
-    execSync2("git add -A", { cwd: dir, stdio: "pipe" });
-    execSync2('git commit -m "Initial commit"', { cwd: dir, stdio: "pipe" });
+    execSync("git add -A", { cwd: dir, stdio: "pipe" });
+    execSync('git commit -m "Initial commit"', { cwd: dir, stdio: "pipe" });
   } catch {
   }
 }