@locusai/sdk 0.10.6 → 0.11.0

package/dist/agent/worker.js

@@ -574,9 +574,6 @@ var init_config = __esm(() => {
     "# Locus AI - Plans (generated per task)",
     ".locus/plans/",
     "",
-    "# Locus AI - Agent worktrees (parallel execution)",
-    ".locus-worktrees/",
-    "",
     "# Locus AI - Settings (contains API key, telegram config, etc.)",
     ".locus/settings.json",
     "",
@@ -1753,583 +1750,247 @@ var init_knowledge_base = __esm(() => {
   import_node_path5 = require("node:path");
 });
 
-// src/git/pr-service.ts
-class PrService {
-  projectPath;
+// src/agent/git-workflow.ts
+class GitWorkflow {
+  config;
   log;
-  constructor(projectPath, log) {
-    this.projectPath = projectPath;
+  projectPath;
+  branchName = null;
+  baseBranch = null;
+  ghUsername;
+  constructor(config, log) {
+    this.config = config;
     this.log = log;
-  }
-  createPr(options) {
-    const {
-      task,
-      branch,
-      baseBranch: requestedBaseBranch,
-      agentId,
-      summary
-    } = options;
-    const provider = detectRemoteProvider(this.projectPath);
-    if (provider !== "github") {
-      throw new Error(`PR creation is only supported for GitHub repositories (detected: ${provider})`);
-    }
-    if (!isGhAvailable(this.projectPath)) {
-      throw new Error("GitHub CLI (gh) is not installed or not authenticated. Install from https://cli.github.com/");
-    }
-    const title = `[Locus] ${task.title}`;
-    const body = this.buildPrBody(task, agentId, summary);
-    const baseBranch = requestedBaseBranch ?? getDefaultBranch(this.projectPath);
-    this.validateCreatePrInputs(baseBranch, branch);
-    this.log(`Creating PR: ${title} (${branch} → ${baseBranch})`, "info");
-    const output = import_node_child_process4.execFileSync("gh", [
-      "pr",
-      "create",
-      "--title",
-      title,
-      "--body",
-      body,
-      "--base",
-      baseBranch,
-      "--head",
-      branch
-    ], {
-      cwd: this.projectPath,
-      encoding: "utf-8",
-      stdio: ["pipe", "pipe", "pipe"]
-    }).trim();
-    const url = output;
-    const prNumber = this.extractPrNumber(url);
-    this.log(`PR created: ${url}`, "success");
-    return { url, number: prNumber };
-  }
-  validateCreatePrInputs(baseBranch, headBranch) {
-    if (!this.hasRemoteBranch(baseBranch)) {
-      throw new Error(`Base branch "${baseBranch}" does not exist on origin. Push/fetch refs and retry.`);
-    }
-    if (!this.hasRemoteBranch(headBranch)) {
-      throw new Error(`Head branch "${headBranch}" is not available on origin. Ensure it is pushed before PR creation.`);
-    }
-    const baseRef = this.resolveBranchRef(baseBranch);
-    const headRef = this.resolveBranchRef(headBranch);
-    if (!baseRef) {
-      throw new Error(`Could not resolve base branch "${baseBranch}" locally.`);
-    }
-    if (!headRef) {
-      throw new Error(`Could not resolve head branch "${headBranch}" locally.`);
-    }
-    const commitsAhead = this.countCommitsAhead(baseRef, headRef);
-    if (commitsAhead <= 0) {
-      throw new Error(`No commits between "${baseBranch}" and "${headBranch}". Skipping PR creation.`);
+    this.projectPath = config.projectPath || process.cwd();
+    this.ghUsername = getGhUsername();
+    if (this.ghUsername) {
+      this.log(`GitHub user: ${this.ghUsername}`, "info");
     }
   }
-  countCommitsAhead(baseRef, headRef) {
-    const output = import_node_child_process4.execFileSync("git", ["rev-list", "--count", `${baseRef}..${headRef}`], {
-      cwd: this.projectPath,
-      encoding: "utf-8",
-      stdio: ["pipe", "pipe", "pipe"]
-    }).trim();
-    const value = Number.parseInt(output || "0", 10);
-    return Number.isNaN(value) ? 0 : value;
-  }
-  resolveBranchRef(branch) {
-    if (this.hasLocalBranch(branch)) {
-      return branch;
-    }
-    if (this.hasRemoteTrackingBranch(branch)) {
-      return `origin/${branch}`;
-    }
-    return null;
-  }
-  hasLocalBranch(branch) {
+  createBranch(sprintId) {
+    const defaultBranch = getDefaultBranch(this.projectPath);
+    this.baseBranch = defaultBranch;
     try {
-      import_node_child_process4.execFileSync("git", ["show-ref", "--verify", "--quiet", `refs/heads/${branch}`], {
-        cwd: this.projectPath,
-        stdio: ["pipe", "pipe", "pipe"]
-      });
-      return true;
+      this.gitExec(["checkout", defaultBranch]);
+      this.gitExec(["pull", "origin", defaultBranch]);
     } catch {
-      return false;
+      this.log(`Could not pull latest from ${defaultBranch}, continuing with current state`, "warn");
     }
-  }
-  hasRemoteTrackingBranch(branch) {
+    const suffix = sprintId ? sprintId.slice(0, 8) : Date.now().toString(36);
+    this.branchName = `locus/${suffix}`;
     try {
-      import_node_child_process4.execFileSync("git", ["show-ref", "--verify", "--quiet", `refs/remotes/origin/${branch}`], {
-        cwd: this.projectPath,
-        stdio: ["pipe", "pipe", "pipe"]
-      });
-      return true;
-    } catch {
-      return false;
-    }
-  }
-  hasRemoteBranch(branch) {
-    try {
-      import_node_child_process4.execFileSync("git", ["ls-remote", "--exit-code", "--heads", "origin", branch], {
-        cwd: this.projectPath,
-        stdio: ["pipe", "pipe", "pipe"]
-      });
-      return true;
-    } catch {
-      return false;
-    }
-  }
-  getPrDiff(branch) {
-    return import_node_child_process4.execFileSync("gh", ["pr", "diff", branch], {
-      cwd: this.projectPath,
-      encoding: "utf-8",
-      stdio: ["pipe", "pipe", "pipe"],
-      maxBuffer: 10 * 1024 * 1024
-    });
-  }
-  submitReview(prIdentifier, body, event) {
-    try {
-      import_node_child_process4.execFileSync("gh", [
-        "pr",
-        "review",
-        prIdentifier,
-        "--body",
-        body,
-        `--${event.toLowerCase().replace("_", "-")}`
-      ], {
-        cwd: this.projectPath,
-        encoding: "utf-8",
-        stdio: ["pipe", "pipe", "pipe"]
-      });
-    } catch (err) {
-      const msg = err instanceof Error ? err.message : String(err);
-      if (event === "REQUEST_CHANGES" && msg.includes("own pull request")) {
-        import_node_child_process4.execFileSync("gh", ["pr", "review", prIdentifier, "--body", body, "--comment"], {
-          cwd: this.projectPath,
-          encoding: "utf-8",
-          stdio: ["pipe", "pipe", "pipe"]
-        });
-        return;
-      }
-      throw err;
-    }
+      this.gitExec(["branch", "-D", this.branchName]);
+    } catch {}
+    this.gitExec(["checkout", "-b", this.branchName]);
+    this.log(`Created branch: ${this.branchName} (from ${defaultBranch})`, "success");
+    return this.branchName;
   }
-  listLocusPrs() {
-    try {
-      const output = import_node_child_process4.execFileSync("gh", [
-        "pr",
-        "list",
-        "--search",
-        "[Locus] in:title",
-        "--state",
-        "open",
-        "--json",
-        "number,title,url,headRefName"
-      ], {
-        cwd: this.projectPath,
-        encoding: "utf-8",
-        stdio: ["pipe", "pipe", "pipe"]
-      }).trim();
-      const prs = JSON.parse(output || "[]");
-      return prs.map((pr) => ({
-        number: pr.number,
-        title: pr.title,
-        url: pr.url,
-        branch: pr.headRefName
-      }));
-    } catch {
-      this.log("Failed to list Locus PRs", "warn");
-      return [];
+  commitAndPush(task) {
+    if (!this.branchName) {
+      this.log("No branch created yet, skipping commit", "warn");
+      return { branch: null, pushed: false, pushFailed: false };
     }
-  }
-  hasLocusReview(prNumber) {
     try {
-      const output = import_node_child_process4.execFileSync("gh", ["pr", "view", prNumber, "--json", "reviews"], {
-        cwd: this.projectPath,
-        encoding: "utf-8",
-        stdio: ["pipe", "pipe", "pipe"]
-      }).trim();
-      const data = JSON.parse(output || "{}");
-      return data.reviews?.some((r) => r.body?.includes("## Locus Agent Review")) ?? false;
-    } catch {
-      return false;
-    }
-  }
-  listUnreviewedLocusPrs() {
-    const allPrs = this.listLocusPrs();
-    return allPrs.filter((pr) => !this.hasLocusReview(String(pr.number)));
-  }
-  buildPrBody(task, agentId, summary) {
-    const sections = [];
-    sections.push(`## Task: ${task.title}`);
-    sections.push("");
-    if (task.description) {
-      sections.push(task.description);
-      sections.push("");
-    }
-    if (task.acceptanceChecklist?.length > 0) {
-      sections.push("## Acceptance Criteria");
-      for (const item of task.acceptanceChecklist) {
-        sections.push(`- [ ] ${item.text}`);
-      }
-      sections.push("");
-    }
-    if (summary) {
-      sections.push("## Agent Summary");
-      sections.push(summary);
-      sections.push("");
-    }
-    sections.push("---");
-    sections.push(`*Created by Locus Agent \`${agentId.slice(-8)}\`* | Task ID: \`${task.id}\``);
-    return sections.join(`
-`);
-  }
-  extractPrNumber(url) {
-    const match = url.match(/\/pull\/(\d+)/);
-    return match ? Number.parseInt(match[1], 10) : 0;
-  }
-}
-var import_node_child_process4;
-var init_pr_service = __esm(() => {
-  init_git_utils();
-  import_node_child_process4 = require("node:child_process");
-});
-
-// src/worktree/worktree-config.ts
-var WORKTREE_ROOT_DIR = ".locus-worktrees", WORKTREE_BRANCH_PREFIX = "agent", DEFAULT_WORKTREE_CONFIG;
-var init_worktree_config = __esm(() => {
-  DEFAULT_WORKTREE_CONFIG = {
-    rootDir: WORKTREE_ROOT_DIR,
-    branchPrefix: WORKTREE_BRANCH_PREFIX,
-    cleanupPolicy: "retain-on-failure"
-  };
-});
-
-// src/worktree/worktree-manager.ts
-class WorktreeManager {
-  config;
-  projectPath;
-  log;
-  constructor(projectPath, config, log) {
-    this.projectPath = import_node_path6.resolve(projectPath);
-    this.config = { ...DEFAULT_WORKTREE_CONFIG, ...config };
-    this.log = log ?? ((_msg) => {
-      return;
-    });
-  }
-  get rootPath() {
-    return import_node_path6.join(this.projectPath, this.config.rootDir);
-  }
-  buildBranchName(taskId, taskSlug) {
-    const sanitized = taskSlug.toLowerCase().replace(/[^a-z0-9-]/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "").slice(0, 50);
-    return `${this.config.branchPrefix}/${taskId}-${sanitized}`;
-  }
-  create(options) {
-    const branch = this.buildBranchName(options.taskId, options.taskSlug);
-    const worktreeDir = `${options.agentId}-${options.taskId}`;
-    const worktreePath = import_node_path6.join(this.rootPath, worktreeDir);
-    this.ensureDirectory(this.rootPath, "Worktree root");
-    const baseBranch = options.baseBranch ?? this.config.baseBranch ?? this.getCurrentBranch();
-    if (!this.branchExists(baseBranch)) {
-      this.log(`Base branch "${baseBranch}" not found locally, fetching from origin`, "info");
-      try {
-        this.gitExec(["fetch", "origin", baseBranch], this.projectPath);
-        this.gitExec(["branch", baseBranch, `origin/${baseBranch}`], this.projectPath);
-      } catch {
-        this.log(`Could not fetch/create local branch for "${baseBranch}", falling back to current branch`, "warn");
-      }
-    }
-    this.log(`Creating worktree: ${worktreeDir} (branch: ${branch}, base: ${baseBranch})`, "info");
-    if (import_node_fs4.existsSync(worktreePath)) {
-      this.log(`Removing stale worktree directory: ${worktreePath}`, "warn");
-      try {
-        this.git(`worktree remove "${worktreePath}" --force`, this.projectPath);
-      } catch {
-        import_node_fs4.rmSync(worktreePath, { recursive: true, force: true });
-        this.git("worktree prune", this.projectPath);
-      }
-    }
-    if (this.branchExists(branch)) {
-      this.log(`Deleting existing branch: ${branch}`, "warn");
-      const branchWorktrees = this.list().filter((wt) => wt.branch === branch);
-      for (const wt of branchWorktrees) {
-        const worktreePath2 = import_node_path6.resolve(wt.path);
-        if (wt.isMain || !this.isManagedWorktreePath(worktreePath2)) {
-          throw new Error(`Branch "${branch}" is checked out at "${worktreePath2}". Remove or detach that worktree before retrying.`);
+      const status = this.gitExec(["status", "--porcelain"]).trim();
+      if (!status) {
+        const baseBranchCommit = this.getBaseCommit();
+        const headCommit = this.gitExec(["rev-parse", "HEAD"]).trim();
+        if (baseBranchCommit && headCommit !== baseBranchCommit) {
+          return this.pushBranch();
         }
-        this.log(`Removing existing worktree for branch: ${branch} (${worktreePath2})`, "warn");
-        this.remove(worktreePath2, false);
+        this.log("No changes to commit for this task", "info");
+        return {
+          branch: this.branchName,
+          pushed: false,
+          pushFailed: false,
+          noChanges: true,
+          skipReason: "No changes were made for this task."
+        };
       }
-      try {
-        this.git(`branch -D "${branch}"`, this.projectPath);
-      } catch {
-        this.git("worktree prune", this.projectPath);
-        this.git(`branch -D "${branch}"`, this.projectPath);
+      this.gitExec(["add", "-A"]);
+      const staged = this.gitExec(["diff", "--cached", "--name-only"]).trim();
+      if (!staged) {
+        this.log("All changes were ignored by .gitignore — nothing to commit", "warn");
+        return {
+          branch: this.branchName,
+          pushed: false,
+          pushFailed: false,
+          noChanges: true,
+          skipReason: "All changes were ignored by .gitignore."
+        };
       }
-    }
-    const addWorktree = () => this.git(`worktree add "${worktreePath}" -b "${branch}" "${baseBranch}"`, this.projectPath);
-    try {
-      addWorktree();
-    } catch (error) {
-      if (!this.isMissingDirectoryError(error)) {
-        throw error;
+      this.log(`Staging ${staged.split(`
+`).length} file(s) for commit`, "info");
+      const trailers = [
+        `Task-ID: ${task.id}`,
+        `Agent: ${this.config.agentId}`,
+        "Co-authored-by: LocusAI <agent@locusai.team>"
+      ];
+      if (this.ghUsername) {
+        trailers.push(`Co-authored-by: ${this.ghUsername} <${this.ghUsername}@users.noreply.github.com>`);
       }
-      this.log(`Worktree creation failed due to missing directories. Retrying after cleanup: ${worktreePath}`, "warn");
-      this.cleanupFailedWorktree(worktreePath, branch);
-      this.ensureDirectory(this.rootPath, "Worktree root");
-      addWorktree();
-    }
-    const baseCommitHash = this.git("rev-parse HEAD", worktreePath).trim();
-    this.log(`Worktree created at ${worktreePath} (base: ${baseCommitHash.slice(0, 8)})`, "success");
-    return { worktreePath, branch, baseBranch, baseCommitHash };
-  }
-  list() {
-    const output = this.git("worktree list --porcelain", this.projectPath);
-    const worktrees = [];
-    const blocks = output.trim().split(`
+      const commitMessage = `feat(agent): ${task.title}
 
-`);
-    for (const block of blocks) {
-      if (!block.trim())
-        continue;
-      const lines = block.trim().split(`
-`);
-      let path = "";
-      let head = "";
-      let branch = "";
-      let isMain = false;
-      let isPrunable = false;
-      for (const line of lines) {
-        if (line.startsWith("worktree ")) {
-          path = line.slice("worktree ".length);
-        } else if (line.startsWith("HEAD ")) {
-          head = line.slice("HEAD ".length);
-        } else if (line.startsWith("branch ")) {
-          branch = line.slice("branch ".length).replace("refs/heads/", "");
-        } else if (line === "bare" || path === this.projectPath) {
-          isMain = true;
-        } else if (line === "prunable") {
-          isPrunable = true;
-        } else if (line === "detached") {
-          branch = "(detached)";
-        }
-      }
-      if (import_node_path6.resolve(path) === this.projectPath) {
-        isMain = true;
-      }
-      if (path) {
-        worktrees.push({ path, branch, head, isMain, isPrunable });
-      }
+${trailers.join(`
+`)}`;
+      this.gitExec(["commit", "-m", commitMessage]);
+      const hash = this.gitExec(["rev-parse", "HEAD"]).trim();
+      this.log(`Committed: ${hash.slice(0, 8)}`, "success");
+      return this.pushBranch();
+    } catch (err) {
+      const errorMessage = err instanceof Error ? err.message : String(err);
+      this.log(`Git commit failed: ${errorMessage}`, "error");
+      return {
+        branch: this.branchName,
+        pushed: false,
+        pushFailed: true,
+        pushError: `Git commit/push failed: ${errorMessage}`
+      };
     }
-    return worktrees;
-  }
-  listAgentWorktrees() {
-    return this.list().filter((wt) => !wt.isMain);
   }
-  remove(worktreePath, deleteBranch = true) {
-    const absolutePath = import_node_path6.resolve(worktreePath);
-    const worktrees = this.list();
-    const worktree = worktrees.find((wt) => import_node_path6.resolve(wt.path) === absolutePath);
-    const branchToDelete = worktree?.branch;
-    this.log(`Removing worktree: ${absolutePath}`, "info");
-    try {
-      this.git(`worktree remove "${absolutePath}" --force`, this.projectPath);
-    } catch {
-      if (import_node_fs4.existsSync(absolutePath)) {
-        import_node_fs4.rmSync(absolutePath, { recursive: true, force: true });
-      }
-      this.git("worktree prune", this.projectPath);
+  pushBranch() {
+    if (!this.branchName) {
+      return { branch: null, pushed: false, pushFailed: false };
     }
-    if (deleteBranch && branchToDelete && !branchToDelete.startsWith("(")) {
-      try {
-        this.git(`branch -D "${branchToDelete}"`, this.projectPath);
-        this.log(`Deleted branch: ${branchToDelete}`, "success");
-      } catch {
-        this.log(`Could not delete branch: ${branchToDelete} (may already be deleted)`, "warn");
+    try {
+      this.gitExec(["push", "-u", "origin", this.branchName]);
+      this.log(`Pushed ${this.branchName} to origin`, "success");
+      return { branch: this.branchName, pushed: true, pushFailed: false };
+    } catch (error) {
+      const msg = error instanceof Error ? error.message : String(error);
+      if (msg.includes("non-fast-forward") || msg.includes("[rejected]") || msg.includes("fetch first")) {
+        this.log(`Push rejected (non-fast-forward). Retrying with --force-with-lease.`, "warn");
+        try {
+          this.gitExec([
+            "push",
+            "--force-with-lease",
+            "-u",
+            "origin",
+            this.branchName
+          ]);
+          this.log(`Pushed ${this.branchName} to origin with --force-with-lease`, "success");
+          return { branch: this.branchName, pushed: true, pushFailed: false };
+        } catch (retryErr) {
+          const retryMsg = retryErr instanceof Error ? retryErr.message : String(retryErr);
+          this.log(`Git push retry failed: ${retryMsg}`, "error");
+          return {
+            branch: this.branchName,
+            pushed: false,
+            pushFailed: true,
+            pushError: retryMsg
+          };
+        }
       }
+      this.log(`Git push failed: ${msg}`, "error");
+      return {
+        branch: this.branchName,
+        pushed: false,
+        pushFailed: true,
+        pushError: msg
+      };
     }
-    this.log("Worktree removed", "success");
   }
-  prune() {
-    const before = this.listAgentWorktrees().filter((wt) => wt.isPrunable).length;
-    this.git("worktree prune", this.projectPath);
-    const after = this.listAgentWorktrees().filter((wt) => wt.isPrunable).length;
-    const pruned = before - after;
-    if (pruned > 0) {
-      this.log(`Pruned ${pruned} stale worktree(s)`, "success");
+  createPullRequest(completedTasks, summaries) {
+    if (!this.branchName || !this.baseBranch) {
+      return { url: null, error: "No branch or base branch available." };
     }
-    return pruned;
-  }
-  removeAll() {
-    const agentWorktrees = this.listAgentWorktrees();
-    let removed = 0;
-    for (const wt of agentWorktrees) {
-      try {
-        this.remove(wt.path, true);
-        removed++;
-      } catch {
-        this.log(`Failed to remove worktree: ${wt.path}`, "warn");
-      }
+    const provider = detectRemoteProvider(this.projectPath);
+    if (provider !== "github") {
+      return {
+        url: null,
+        error: `PR creation is only supported for GitHub repositories (detected: ${provider})`
+      };
     }
-    if (import_node_fs4.existsSync(this.rootPath)) {
-      try {
-        import_node_fs4.rmSync(this.rootPath, { recursive: true, force: true });
-      } catch {}
+    if (!isGhAvailable(this.projectPath)) {
+      return {
+        url: null,
+        error: "GitHub CLI (gh) is not installed or not authenticated. Install from https://cli.github.com/"
+      };
     }
-    return removed;
-  }
-  hasChanges(worktreePath) {
-    const status = this.git("status --porcelain", worktreePath).trim();
-    return status.length > 0;
-  }
-  hasCommitsAhead(worktreePath, baseBranch) {
+    const title = `[Locus] Sprint tasks (${completedTasks.length} task${completedTasks.length !== 1 ? "s" : ""})`;
+    const body = this.buildPrBody(completedTasks, summaries);
+    this.log(`Creating PR: ${title} (${this.branchName} → ${this.baseBranch})`, "info");
     try {
-      const count = this.git(`rev-list --count "${baseBranch}..HEAD"`, worktreePath).trim();
-      return Number.parseInt(count, 10) > 0;
+      const output = import_node_child_process4.execFileSync("gh", [
+        "pr",
+        "create",
+        "--title",
+        title,
+        "--body",
+        body,
+        "--base",
+        this.baseBranch,
+        "--head",
+        this.branchName
+      ], {
+        cwd: this.projectPath,
+        encoding: "utf-8",
+        stdio: ["pipe", "pipe", "pipe"]
+      }).trim();
+      this.log(`PR created: ${output}`, "success");
+      return { url: output };
     } catch (err) {
-      this.log(`Could not compare HEAD against base branch "${baseBranch}": ${err instanceof Error ? err.message : String(err)}`, "warn");
-      return false;
+      const errorMessage = err instanceof Error ? err.message : String(err);
+      this.log(`PR creation failed: ${errorMessage}`, "error");
+      return { url: null, error: errorMessage };
     }
   }
-  hasCommitsAheadOfHash(worktreePath, baseHash) {
-    try {
-      const headHash = this.git("rev-parse HEAD", worktreePath).trim();
-      return headHash !== baseHash;
-    } catch {
-      return false;
-    }
-  }
-  commitChanges(worktreePath, message, baseBranch, baseCommitHash) {
-    const hasUncommittedChanges = this.hasChanges(worktreePath);
-    if (hasUncommittedChanges) {
-      const statusOutput = this.git("status --porcelain", worktreePath).trim();
-      this.log(`Detected uncommitted changes:
-${statusOutput.split(`
-`).slice(0, 10).join(`
-`)}${statusOutput.split(`
-`).length > 10 ? `
-... and ${statusOutput.split(`
-`).length - 10} more` : ""}`, "info");
-    }
-    if (!hasUncommittedChanges) {
-      if (baseBranch && this.hasCommitsAhead(worktreePath, baseBranch)) {
-        const hash2 = this.git("rev-parse HEAD", worktreePath).trim();
-        this.log(`Agent already committed changes (${hash2.slice(0, 8)}); skipping additional commit`, "info");
-        return hash2;
-      }
-      if (baseCommitHash && this.hasCommitsAheadOfHash(worktreePath, baseCommitHash)) {
-        const hash2 = this.git("rev-parse HEAD", worktreePath).trim();
-        this.log(`Agent already committed changes (${hash2.slice(0, 8)}, detected via base commit hash); skipping additional commit`, "info");
-        return hash2;
-      }
-      const branch = this.getBranch(worktreePath);
-      this.log(`No changes detected in worktree (branch: ${branch}, baseBranch: ${baseBranch ?? "none"}, baseCommitHash: ${baseCommitHash?.slice(0, 8) ?? "none"})`, "warn");
-      return null;
-    }
-    this.git("add -A", worktreePath);
-    const staged = this.git("diff --cached --name-only", worktreePath).trim();
-    if (!staged) {
-      this.log("All changes were ignored by .gitignore — nothing to commit", "warn");
-      return null;
-    }
-    this.log(`Staging ${staged.split(`
-`).length} file(s) for commit`, "info");
-    this.gitExec(["commit", "-m", message], worktreePath);
-    const hash = this.git("rev-parse HEAD", worktreePath).trim();
-    this.log(`Committed: ${hash.slice(0, 8)}`, "success");
-    return hash;
-  }
-  pushBranch(worktreePath, remote = "origin") {
-    const branch = this.getBranch(worktreePath);
-    this.log(`Pushing branch ${branch} to ${remote}`, "info");
+  checkoutBaseBranch() {
+    if (!this.baseBranch)
+      return;
     try {
-      this.gitExec(["push", "-u", remote, branch], worktreePath);
-      this.log(`Pushed ${branch} to ${remote}`, "success");
-      return branch;
-    } catch (error) {
-      if (!this.isNonFastForwardPushError(error)) {
-        throw error;
-      }
-      this.log(`Push rejected for ${branch} (non-fast-forward). Retrying with --force-with-lease.`, "warn");
-      try {
-        this.gitExec(["fetch", remote, branch], worktreePath);
-      } catch {}
-      this.gitExec(["push", "--force-with-lease", "-u", remote, branch], worktreePath);
-      this.log(`Pushed ${branch} to ${remote} with --force-with-lease`, "success");
-      return branch;
+      this.gitExec(["checkout", this.baseBranch]);
+      this.log(`Checked out base branch: ${this.baseBranch}`, "info");
+    } catch (err) {
+      this.log(`Could not checkout base branch: ${err instanceof Error ? err.message : String(err)}`, "warn");
     }
   }
-  getBranch(worktreePath) {
-    return this.git("rev-parse --abbrev-ref HEAD", worktreePath).trim();
+  getBranchName() {
+    return this.branchName;
   }
-  hasWorktreeForTask(taskId) {
-    return this.listAgentWorktrees().some((wt) => wt.branch.includes(taskId) || wt.path.includes(taskId));
+  getBaseBranch() {
+    return this.baseBranch;
   }
-  branchExists(branchName) {
+  getBaseCommit() {
+    if (!this.baseBranch)
+      return null;
     try {
-      this.git(`rev-parse --verify "refs/heads/${branchName}"`, this.projectPath);
-      return true;
+      return this.gitExec(["rev-parse", this.baseBranch]).trim();
     } catch {
-      return false;
+      return null;
     }
   }
-  getCurrentBranch() {
-    return this.git("rev-parse --abbrev-ref HEAD", this.projectPath).trim();
-  }
-  isManagedWorktreePath(worktreePath) {
-    const rootPath = import_node_path6.resolve(this.rootPath);
-    const candidate = import_node_path6.resolve(worktreePath);
-    const rootWithSep = rootPath.endsWith(import_node_path6.sep) ? rootPath : `${rootPath}${import_node_path6.sep}`;
-    return candidate.startsWith(rootWithSep);
-  }
-  ensureDirectory(dirPath, label) {
-    if (import_node_fs4.existsSync(dirPath)) {
-      if (!import_node_fs4.statSync(dirPath).isDirectory()) {
-        throw new Error(`${label} exists but is not a directory: ${dirPath}`);
+  buildPrBody(completedTasks, summaries) {
+    const sections = [];
+    sections.push("## Completed Tasks");
+    sections.push("");
+    for (let i = 0;i < completedTasks.length; i++) {
+      const task = completedTasks[i];
+      sections.push(`### ${i + 1}. ${task.title}`);
+      sections.push(`Task ID: \`${task.id}\``);
+      if (summaries[i]) {
+        sections.push("");
+        sections.push(summaries[i]);
       }
-      return;
-    }
-    import_node_fs4.mkdirSync(dirPath, { recursive: true });
-  }
-  isMissingDirectoryError(error) {
-    const message = error instanceof Error ? error.message : String(error);
-    return message.includes("cannot create directory") || message.includes("No such file or directory");
-  }
-  cleanupFailedWorktree(worktreePath, branch) {
-    try {
-      this.git(`worktree remove "${worktreePath}" --force`, this.projectPath);
-    } catch {}
-    if (import_node_fs4.existsSync(worktreePath)) {
-      import_node_fs4.rmSync(worktreePath, { recursive: true, force: true });
-    }
-    try {
-      this.git("worktree prune", this.projectPath);
-    } catch {}
-    if (this.branchExists(branch)) {
-      try {
-        this.git(`branch -D "${branch}"`, this.projectPath);
-      } catch {}
+      sections.push("");
     }
+    sections.push("---");
+    sections.push(`*Created by Locus Agent \`${this.config.agentId.slice(-8)}\`*`);
+    return sections.join(`
+`);
   }
-  isNonFastForwardPushError(error) {
-    const message = error instanceof Error ? error.message : String(error);
-    return message.includes("non-fast-forward") || message.includes("[rejected]") || message.includes("fetch first");
-  }
-  git(args, cwd) {
-    return import_node_child_process5.execSync(`git ${args}`, {
-      cwd,
-      encoding: "utf-8",
-      stdio: ["pipe", "pipe", "pipe"]
-    });
-  }
-  gitExec(args, cwd) {
-    return import_node_child_process5.execFileSync("git", args, {
-      cwd,
+  gitExec(args) {
+    return import_node_child_process4.execFileSync("git", args, {
+      cwd: this.projectPath,
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"]
     });
   }
 }
-var import_node_child_process5, import_node_fs4, import_node_path6;
-var init_worktree_manager = __esm(() => {
-  init_worktree_config();
-  import_node_child_process5 = require("node:child_process");
-  import_node_fs4 = require("node:fs");
-  import_node_path6 = require("node:path");
+var import_node_child_process4;
+var init_git_workflow = __esm(() => {
+  init_git_utils();
+  import_node_child_process4 = require("node:child_process");
 });
 
 // src/core/prompt-builder.ts
@@ -2373,9 +2034,9 @@ ${task.description || "No description provided."}
     }
     const contextPath = getLocusPath(this.projectPath, "contextFile");
     let hasLocalContext = false;
-    if (import_node_fs5.existsSync(contextPath)) {
+    if (import_node_fs4.existsSync(contextPath)) {
       try {
-        const context = import_node_fs5.readFileSync(contextPath, "utf-8");
+        const context = import_node_fs4.readFileSync(contextPath, "utf-8");
         if (context.trim().length > 20) {
           prompt += `## Project Context (Local)
 ${context}
@@ -2429,7 +2090,7 @@ ${serverContext.context}
 
 `;
     const indexPath = getLocusPath(this.projectPath, "indexFile");
-    if (import_node_fs5.existsSync(indexPath)) {
+    if (import_node_fs4.existsSync(indexPath)) {
       prompt += `## Codebase Overview
 There is an index file in the .locus/codebase-index.json and if you need you can check it.
 
@@ -2506,9 +2167,9 @@ ${query}
     }
     const contextPath = getLocusPath(this.projectPath, "contextFile");
     let hasLocalContext = false;
-    if (import_node_fs5.existsSync(contextPath)) {
+    if (import_node_fs4.existsSync(contextPath)) {
       try {
-        const context = import_node_fs5.readFileSync(contextPath, "utf-8");
+        const context = import_node_fs4.readFileSync(contextPath, "utf-8");
         if (context.trim().length > 20) {
           prompt += `## Project Context (Local)
 ${context}
@@ -2542,7 +2203,7 @@ ${fallback}
 
 `;
     const indexPath = getLocusPath(this.projectPath, "indexFile");
-    if (import_node_fs5.existsSync(indexPath)) {
+    if (import_node_fs4.existsSync(indexPath)) {
       prompt += `## Codebase Overview
 There is an index file in the .locus/codebase-index.json and if you need you can check it.
 
@@ -2557,9 +2218,9 @@ There is an index file in the .locus/codebase-index.json and if you need you can
   }
   getProjectConfig() {
     const configPath = getLocusPath(this.projectPath, "configFile");
-    if (import_node_fs5.existsSync(configPath)) {
+    if (import_node_fs4.existsSync(configPath)) {
       try {
-        return JSON.parse(import_node_fs5.readFileSync(configPath, "utf-8"));
+        return JSON.parse(import_node_fs4.readFileSync(configPath, "utf-8"));
       } catch {
         return null;
       }
@@ -2567,10 +2228,10 @@ There is an index file in the .locus/codebase-index.json and if you need you can
     return null;
   }
   getFallbackContext() {
-    const readmePath = import_node_path7.join(this.projectPath, "README.md");
-    if (import_node_fs5.existsSync(readmePath)) {
+    const readmePath = import_node_path6.join(this.projectPath, "README.md");
+    if (import_node_fs4.existsSync(readmePath)) {
       try {
-        const content = import_node_fs5.readFileSync(readmePath, "utf-8");
+        const content = import_node_fs4.readFileSync(readmePath, "utf-8");
         const limit = 1000;
         return content.slice(0, limit) + (content.length > limit ? `
 ...(truncated)...` : "");
@@ -2582,12 +2243,12 @@ There is an index file in the .locus/codebase-index.json and if you need you can
   }
   getProjectStructure() {
     try {
-      const entries = import_node_fs5.readdirSync(this.projectPath);
+      const entries = import_node_fs4.readdirSync(this.projectPath);
       const folders = entries.filter((e) => {
         if (e.startsWith(".") || e === "node_modules")
           return false;
         try {
-          return import_node_fs5.statSync(import_node_path7.join(this.projectPath, e)).isDirectory();
+          return import_node_fs4.statSync(import_node_path6.join(this.projectPath, e)).isDirectory();
         } catch {
           return false;
         }
@@ -2628,11 +2289,11 @@ There is an index file in the .locus/codebase-index.json and if you need you can
     }
   }
 }
-var import_node_fs5, import_node_path7, import_shared2;
+var import_node_fs4, import_node_path6, import_shared2;
 var init_prompt_builder = __esm(() => {
   init_config();
-  import_node_fs5 = require("node:fs");
-  import_node_path7 = require("node:path");
+  import_node_fs4 = require("node:fs");
+  import_node_path6 = require("node:path");
   import_shared2 = require("@locusai/shared");
 });
 
@@ -2675,162 +2336,6 @@ var init_task_executor = __esm(() => {
   init_prompt_builder();
 });
 
-// src/agent/git-workflow.ts
-class GitWorkflow {
-  config;
-  log;
-  ghUsername;
-  worktreeManager;
-  prService;
-  constructor(config, log, ghUsername) {
-    this.config = config;
-    this.log = log;
-    this.ghUsername = ghUsername;
-    const projectPath = config.projectPath || process.cwd();
-    this.worktreeManager = config.useWorktrees ? new WorktreeManager(projectPath, { cleanupPolicy: "auto" }, log) : null;
-    this.prService = config.autoPush ? new PrService(projectPath, log) : null;
-  }
-  createTaskWorktree(task, defaultExecutor) {
-    if (!this.worktreeManager) {
-      return {
-        worktreePath: null,
-        baseBranch: null,
-        baseCommitHash: null,
-        executor: defaultExecutor
-      };
-    }
-    const slug = task.title.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "").slice(0, 40);
-    const result = this.worktreeManager.create({
-      taskId: task.id,
-      taskSlug: slug,
-      agentId: this.config.agentId,
-      baseBranch: this.config.baseBranch
-    });
-    this.log(`Worktree created: ${result.worktreePath} (${result.branch})`, "info");
-    const provider = this.config.provider ?? PROVIDER.CLAUDE;
-    const taskAiRunner = createAiRunner(provider, {
-      projectPath: result.worktreePath,
-      model: this.config.model,
-      log: this.log
-    });
-    const taskExecutor = new TaskExecutor({
-      aiRunner: taskAiRunner,
-      projectPath: result.worktreePath,
-      log: this.log
-    });
-    return {
-      worktreePath: result.worktreePath,
-      baseBranch: result.baseBranch,
-      baseCommitHash: result.baseCommitHash,
-      executor: taskExecutor
-    };
-  }
-  commitAndPush(worktreePath, task, baseBranch, baseCommitHash) {
-    if (!this.worktreeManager) {
-      return { branch: null, pushed: false, pushFailed: false };
-    }
-    try {
-      const trailers = [
-        `Task-ID: ${task.id}`,
-        `Agent: ${this.config.agentId}`,
-        "Co-authored-by: LocusAI <agent@locusai.team>"
-      ];
-      if (this.ghUsername) {
-        trailers.push(`Co-authored-by: ${this.ghUsername} <${this.ghUsername}@users.noreply.github.com>`);
-      }
-      const commitMessage = `feat(agent): ${task.title}
-
-${trailers.join(`
-`)}`;
-      const hash = this.worktreeManager.commitChanges(worktreePath, commitMessage, baseBranch, baseCommitHash);
-      if (!hash) {
-        this.log("No changes to commit for this task", "info");
-        return {
-          branch: null,
-          pushed: false,
-          pushFailed: false,
-          noChanges: true,
-          skipReason: "No changes were committed, so no branch was pushed."
-        };
-      }
-      const localBranch = this.worktreeManager.getBranch(worktreePath);
-      if (this.config.autoPush) {
-        try {
-          return {
-            branch: this.worktreeManager.pushBranch(worktreePath),
-            pushed: true,
-            pushFailed: false
-          };
-        } catch (err) {
-          const errorMessage = err instanceof Error ? err.message : String(err);
-          this.log(`Git push failed: ${errorMessage}`, "error");
-          return {
-            branch: localBranch,
-            pushed: false,
-            pushFailed: true,
-            pushError: errorMessage
-          };
-        }
-      }
-      this.log("Auto-push disabled; skipping branch push", "info");
-      return {
-        branch: localBranch,
-        pushed: false,
-        pushFailed: false,
-        skipReason: "Auto-push is disabled, so PR creation was skipped."
-      };
-    } catch (err) {
-      const errorMessage = err instanceof Error ? err.message : String(err);
-      this.log(`Git commit failed: ${errorMessage}`, "error");
-      return {
-        branch: null,
-        pushed: false,
-        pushFailed: true,
-        pushError: `Git commit/push failed: ${errorMessage}`
-      };
-    }
-  }
-  createPullRequest(task, branch, summary, baseBranch) {
-    if (!this.prService) {
-      const errorMessage = "PR service is not initialized. Enable auto-push to allow PR creation.";
-      this.log(`PR creation skipped: ${errorMessage}`, "warn");
-      return { url: null, error: errorMessage };
-    }
-    this.log(`Attempting PR creation from branch: ${branch}`, "info");
-    try {
-      const result = this.prService.createPr({
-        task,
-        branch,
-        baseBranch,
-        agentId: this.config.agentId,
-        summary
-      });
-      return { url: result.url };
-    } catch (err) {
-      const errorMessage = err instanceof Error ? err.message : String(err);
-      this.log(`PR creation failed: ${errorMessage}`, "error");
-      return { url: null, error: errorMessage };
-    }
-  }
-  cleanupWorktree(worktreePath, keepBranch) {
-    if (!this.worktreeManager || !worktreePath)
-      return;
-    try {
-      this.worktreeManager.remove(worktreePath, !keepBranch);
-      this.log(keepBranch ? "Worktree cleaned up (branch preserved)" : "Worktree cleaned up", "info");
-    } catch {
-      this.log(`Could not clean up worktree: ${worktreePath}`, "warn");
-    }
-  }
-}
-var init_git_workflow = __esm(() => {
-  init_factory();
-  init_config();
-  init_pr_service();
-  init_worktree_manager();
-  init_task_executor();
-});
-
 // src/agent/worker-cli.ts
 var exports_worker_cli = {};
 __export(exports_worker_cli, {
@@ -2863,16 +2368,8 @@ function parseWorkerArgs(argv) {
       config.apiKey = args[++i];
     else if (arg === "--project-path")
       config.projectPath = args[++i];
-    else if (arg === "--main-project-path")
-      config.mainProjectPath = args[++i];
     else if (arg === "--model")
       config.model = args[++i];
-    else if (arg === "--use-worktrees")
-      config.useWorktrees = true;
-    else if (arg === "--auto-push")
-      config.autoPush = true;
-    else if (arg === "--base-branch")
-      config.baseBranch = args[++i];
     else if (arg === "--provider") {
       const value = args[i + 1];
       if (value && !value.startsWith("--"))
@@ -2920,8 +2417,8 @@ class AgentWorker {
   tasksCompleted = 0;
   heartbeatInterval = null;
   currentTaskId = null;
-  currentWorktreePath = null;
-  postCleanupDelayMs = 5000;
+  completedTaskList = [];
+  taskSummaries = [];
   constructor(config) {
     this.config = config;
     const projectPath = config.projectPath || process.cwd();
@@ -2936,17 +2433,12 @@ class AgentWorker {
       }
     });
     const log = this.log.bind(this);
-    if (config.useWorktrees && !isGitAvailable()) {
-      this.log("git is not installed — worktree isolation will not work", "error");
-      config.useWorktrees = false;
+    if (!isGitAvailable()) {
+      this.log("git is not installed — branch management will not work", "error");
     }
-    if (config.autoPush && !isGhAvailable(projectPath)) {
+    if (!isGhAvailable(projectPath)) {
       this.log("GitHub CLI (gh) not available or not authenticated. Branch push can continue, but automatic PR creation may fail until gh is configured. Install from https://cli.github.com/", "warn");
     }
-    const ghUsername = config.autoPush ? getGhUsername() : null;
-    if (ghUsername) {
-      this.log(`GitHub user: ${ghUsername}`, "info");
-    }
     const provider = config.provider ?? PROVIDER.CLAUDE;
     this.aiRunner = createAiRunner(provider, {
       projectPath,
@@ -2959,18 +2451,9 @@ class AgentWorker {
       log
     });
     this.knowledgeBase = new KnowledgeBase(projectPath);
-    this.gitWorkflow = new GitWorkflow(config, log, ghUsername);
+    this.gitWorkflow = new GitWorkflow(config, log);
     const providerLabel = provider === "codex" ? "Codex" : "Claude";
     this.log(`Using ${providerLabel} CLI for all phases`, "info");
-    if (config.useWorktrees) {
-      this.log("Per-task worktree isolation enabled", "info");
-      if (config.baseBranch) {
-        this.log(`Base branch for worktrees: ${config.baseBranch}`, "info");
-      }
-      if (config.autoPush) {
-        this.log("Auto-push enabled: branches will be pushed to remote", "info");
-      }
-    }
   }
   log(message, level = "info") {
     const timestamp = new Date().toISOString().split("T")[1]?.slice(0, 8) ?? "";
@@ -3019,56 +2502,26 @@ class AgentWorker {
   }
   async executeTask(task) {
     const fullTask = await this.client.tasks.getById(task.id, this.config.workspaceId);
-    const { worktreePath, baseBranch, baseCommitHash, executor } = this.gitWorkflow.createTaskWorktree(fullTask, this.taskExecutor);
-    this.currentWorktreePath = worktreePath;
-    let branchPushed = false;
-    let keepBranch = false;
-    let preserveWorktree = false;
     try {
-      const result = await executor.execute(fullTask);
-      let taskBranch = null;
-      let prUrl = null;
-      let prError = null;
+      const result = await this.taskExecutor.execute(fullTask);
       let noChanges = false;
-      if (result.success && worktreePath) {
-        const commitResult = this.gitWorkflow.commitAndPush(worktreePath, fullTask, baseBranch ?? undefined, baseCommitHash ?? undefined);
+      let taskBranch = null;
+      if (result.success) {
+        const commitResult = this.gitWorkflow.commitAndPush(fullTask);
         taskBranch = commitResult.branch;
-        branchPushed = commitResult.pushed;
-        keepBranch = taskBranch !== null;
         noChanges = Boolean(commitResult.noChanges);
-        if (commitResult.pushFailed) {
-          preserveWorktree = true;
-          prError = commitResult.pushError ?? "Git push failed before PR creation. Please retry manually.";
-          this.log(`Preserving worktree after push failure: ${worktreePath}`, "warn");
-        }
-        if (branchPushed && taskBranch) {
-          const prResult = this.gitWorkflow.createPullRequest(fullTask, taskBranch, result.summary, baseBranch ?? undefined);
-          prUrl = prResult.url;
-          prError = prResult.error ?? null;
-          if (!prUrl) {
-            preserveWorktree = true;
-            this.log(`Preserving worktree for manual follow-up: ${worktreePath}`, "warn");
-          }
-        } else if (commitResult.skipReason) {
-          this.log(`Skipping PR creation: ${commitResult.skipReason}`, "info");
-        }
-      } else if (result.success && !worktreePath) {
-        this.log("Skipping commit/push/PR flow because no task worktree is active.", "warn");
       }
       return {
         ...result,
         branch: taskBranch ?? undefined,
-        prUrl: prUrl ?? undefined,
-        prError: prError ?? undefined,
         noChanges: noChanges || undefined
       };
-    } finally {
-      if (preserveWorktree || keepBranch) {
-        this.currentWorktreePath = null;
-      } else {
-        this.gitWorkflow.cleanupWorktree(worktreePath, keepBranch);
-        this.currentWorktreePath = null;
-      }
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      return {
+        success: false,
+        summary: `Execution error: ${msg}`
+      };
     }
   }
   updateProgress(task, summary) {
@@ -3101,19 +2554,13 @@ class AgentWorker {
       this.log(`Heartbeat failed: ${err instanceof Error ? err.message : String(err)}`, "warn");
     });
   }
-  async delayAfterCleanup() {
-    if (!this.config.useWorktrees || this.postCleanupDelayMs <= 0)
-      return;
-    this.log(`Waiting ${Math.floor(this.postCleanupDelayMs / 1000)}s after worktree cleanup before next dispatch`, "info");
-    await new Promise((resolve3) => setTimeout(resolve3, this.postCleanupDelayMs));
-  }
   async run() {
     this.log(`Agent started in ${this.config.projectPath || process.cwd()}`, "success");
     const handleShutdown = () => {
       this.log("Received shutdown signal. Aborting...", "warn");
       this.aiRunner.abort();
       this.stopHeartbeat();
-      this.gitWorkflow.cleanupWorktree(this.currentWorktreePath, false);
+      this.gitWorkflow.checkoutBaseBranch();
       process.exit(1);
     };
     process.on("SIGTERM", handleShutdown);
@@ -3125,10 +2572,12 @@ class AgentWorker {
     } else {
       this.log("No active sprint found.", "warn");
     }
+    const branchName = this.gitWorkflow.createBranch(this.config.sprintId);
+    this.log(`Working on branch: ${branchName}`, "info");
     while (this.tasksCompleted < this.maxTasks) {
       const task = await this.getNextTask();
       if (!task) {
-        this.log("No more tasks to process. Exiting.", "info");
+        this.log("No more tasks to process.", "info");
         break;
       }
       this.log(`Claimed: ${task.title}`, "success");
@@ -3144,7 +2593,7 @@ class AgentWorker {
           });
           await this.client.tasks.addComment(task.id, this.config.workspaceId, {
             author: this.config.agentId,
-            text: `⚠️ Agent execution finished with no file changes, so no commit/branch/PR was created.
+            text: `⚠️ Agent execution finished with no file changes, so no commit was created.
 
 ${result.summary}`
           });
@@ -3153,22 +2602,17 @@ ${result.summary}`
           const updatePayload = {
             status: import_shared3.TaskStatus.IN_REVIEW
           };
-          if (result.prUrl) {
-            updatePayload.prUrl = result.prUrl;
-          }
           await this.client.tasks.update(task.id, this.config.workspaceId, updatePayload);
           const branchInfo = result.branch ? `
 
 Branch: \`${result.branch}\`` : "";
-          const prInfo = result.prUrl ? `
-PR: ${result.prUrl}` : "";
-          const prErrorInfo = result.prError ? `
-PR automation error: ${result.prError}` : "";
           await this.client.tasks.addComment(task.id, this.config.workspaceId, {
             author: this.config.agentId,
-            text: `✅ ${result.summary}${branchInfo}${prInfo}${prErrorInfo}`
+            text: `✅ ${result.summary}${branchInfo}`
           });
           this.tasksCompleted++;
+          this.completedTaskList.push({ title: task.title, id: task.id });
+          this.taskSummaries.push(result.summary);
           this.updateProgress(task, result.summary);
         }
       } else {
@@ -3184,8 +2628,24 @@ PR automation error: ${result.prError}` : "";
       }
       this.currentTaskId = null;
       this.sendHeartbeat();
-      await this.delayAfterCleanup();
     }
+    if (this.completedTaskList.length > 0) {
+      this.log("All tasks done. Creating pull request...", "info");
+      const prResult = this.gitWorkflow.createPullRequest(this.completedTaskList, this.taskSummaries);
+      if (prResult.url) {
+        this.log(`PR created: ${prResult.url}`, "success");
+        for (const task of this.completedTaskList) {
+          try {
+            await this.client.tasks.update(task.id, this.config.workspaceId, {
+              prUrl: prResult.url
+            });
+          } catch {}
+        }
+      } else if (prResult.error) {
+        this.log(`PR creation failed: ${prResult.error}`, "error");
+      }
+    }
+    this.gitWorkflow.checkoutBaseBranch();
     this.currentTaskId = null;
     this.stopHeartbeat();
     this.client.workspaces.heartbeat(this.config.workspaceId, this.config.agentId, null, "COMPLETED").catch(() => {});