techunter 0.1.5 → 0.1.7

package/README.md

@@ -4,7 +4,7 @@
 
 ```
     ╔═══════════════╗
-◆═══╬   TECHUNTER   ╬═══▶   Techunter v0.1.4
+◆═══╬   TECHUNTER   ╬═══▶   Techunter v0.1.6
     ╚═══════════════╝        GLM-5 · z-ai  ·  owner/repo
 ```
 

package/dist/index.js

@@ -18,7 +18,9 @@ __export(github_exports, {
   createPR: () => createPR,
   createTask: () => createTask,
   editTask: () => editTask,
+  embedBaseCommit: () => embedBaseCommit,
   ensureLabels: () => ensureLabels,
+  extractBaseCommit: () => extractBaseCommit,
   formatGuideAsMarkdown: () => formatGuideAsMarkdown,
   getAuthenticatedUser: () => getAuthenticatedUser,
   getDefaultBranch: () => getDefaultBranch,
@@ -29,6 +31,7 @@ __export(github_exports, {
   listTasks: () => listTasks,
   listTasksForReview: () => listTasksForReview,
   markInReview: () => markInReview,
+  mergeWorkerIntoBase: () => mergeWorkerIntoBase,
   postComment: () => postComment,
   postGuideComment: () => postGuideComment,
   rejectTask: () => rejectTask
@@ -77,19 +80,41 @@ async function getTask(config, number) {
   const { data } = await octokit.issues.get({ owner, repo, issue_number: number });
   return parseIssue(data);
 }
-async function createTask(config, title, body) {
+function embedBaseCommit(body, sha) {
+  return `${body}
+
+${BASE_COMMIT_MARKER}${sha} -->`;
+}
+function extractBaseCommit(body) {
+  if (!body) return null;
+  const match = body.match(/<!-- techunter-base:([a-f0-9]{7,40}) -->/);
+  return match?.[1] ?? null;
+}
+async function createTask(config, title, body, baseCommit) {
   const octokit = createOctokit(config.githubToken);
   const { owner, repo } = config.github;
   await ensureLabels(config);
+  const finalBody = baseCommit ? embedBaseCommit(body ?? "", baseCommit) : body;
   const { data } = await octokit.issues.create({
     owner,
     repo,
     title,
-    body,
+    body: finalBody,
     labels: [LABEL_AVAILABLE]
   });
   return parseIssue(data);
 }
+async function mergeWorkerIntoBase(config, workerBranch, baseBranch) {
+  const octokit = createOctokit(config.githubToken);
+  const { owner, repo } = config.github;
+  await octokit.repos.merge({
+    owner,
+    repo,
+    base: baseBranch,
+    head: workerBranch,
+    commit_message: `chore: merge ${workerBranch} into ${baseBranch}`
+  });
+}
 async function claimTask(config, number, username) {
   const octokit = createOctokit(config.githubToken);
   const { owner, repo } = config.github;
@@ -308,12 +333,12 @@ async function getDefaultBranch(config) {
   const { data } = await octokit.repos.get({ owner, repo });
   return data.default_branch;
 }
-async function acceptTask(config, issueNumber) {
+async function acceptTask(config, issueNumber, headBranch) {
   const octokit = createOctokit(config.githubToken);
   const { owner, repo } = config.github;
   const { data: prs } = await octokit.pulls.list({ owner, repo, state: "open", per_page: 100 });
-  const pr = prs.find((p) => p.head.ref.startsWith(`task-${issueNumber}-`));
-  if (!pr) throw new Error(`No open PR found for task #${issueNumber} (expected branch starting with task-${issueNumber}-)`);
+  const pr = headBranch ? prs.find((p) => p.head.ref === headBranch) : prs.find((p) => p.head.ref.startsWith(`task-${issueNumber}-`) || p.head.ref.startsWith("worker-"));
+  if (!pr) throw new Error(`No open PR found for task #${issueNumber}`);
   const { data: merge } = await octokit.pulls.merge({
     owner,
     repo,
@@ -323,7 +348,7 @@ async function acceptTask(config, issueNumber) {
   await closeTask(config, issueNumber);
   return { prNumber: pr.number, prUrl: pr.html_url, sha: merge.sha ?? "" };
 }
-var LABEL_AVAILABLE, LABEL_CLAIMED, LABEL_IN_REVIEW, LABEL_CHANGES_NEEDED, LABELS, TECHUNTER_LABELS;
+var LABEL_AVAILABLE, LABEL_CLAIMED, LABEL_IN_REVIEW, LABEL_CHANGES_NEEDED, LABELS, TECHUNTER_LABELS, BASE_COMMIT_MARKER;
 var init_github = __esm({
   "src/lib/github.ts"() {
     "use strict";
@@ -338,6 +363,7 @@ var init_github = __esm({
       { name: LABEL_CHANGES_NEEDED, color: "e11d48", description: "Task needs changes" }
     ];
     TECHUNTER_LABELS = /* @__PURE__ */ new Set([LABEL_AVAILABLE, LABEL_CLAIMED, LABEL_IN_REVIEW, LABEL_CHANGES_NEEDED]);
+    BASE_COMMIT_MARKER = "<!-- techunter-base:";
   }
 });
 
@@ -362,6 +388,7 @@ var configSchema = z.object({
   aiModel: z.string().optional(),
   githubToken: z.string().min(1),
   githubClientId: z.string().optional(),
+  baseBranch: z.string().optional(),
   github: z.object({
     owner: z.string().min(1),
     repo: z.string().min(1)
@@ -406,6 +433,9 @@ function setConfig(partial) {
   if (partial.githubClientId !== void 0) {
     current["githubClientId"] = partial.githubClientId;
   }
+  if (partial.baseBranch !== void 0) {
+    current["baseBranch"] = partial.baseBranch;
+  }
   if (partial.taskState !== void 0) {
     current["taskState"] = {
       ...current["taskState"] ?? {},
@@ -568,6 +598,28 @@ async function stageAllAndCommit(message) {
   const branch = (await git.branch()).current;
   await git.push("origin", branch, ["--set-upstream"]);
 }
+async function syncWithBase(baseBranch) {
+  await git.fetch("origin", baseBranch);
+  try {
+    await git.merge([`origin/${baseBranch}`, "--ff-only"]);
+  } catch {
+    await git.merge([`origin/${baseBranch}`, "-m", `chore: sync with ${baseBranch}`]);
+  }
+}
+async function getRemoteHeadSha(baseBranch) {
+  await git.fetch("origin", baseBranch);
+  return (await git.revparse([`origin/${baseBranch}`])).trim();
+}
+async function resetOrCreateBranch(branchName, sha) {
+  const branches = await git.branch();
+  const localExists = Object.keys(branches.branches).some((b) => b === branchName);
+  if (localExists) {
+    await git.checkout(branchName);
+    await git.reset(["--hard", sha]);
+  } else {
+    await git.checkoutBranch(branchName, sha);
+  }
+}
 
 // src/lib/client.ts
 import OpenAI from "openai";
@@ -736,10 +788,12 @@ async function configCommand() {
 `));
   const currentBaseUrl = config.aiBaseUrl ?? DEFAULT_BASE_URL;
   const currentModel = config.aiModel ?? DEFAULT_MODEL;
+  const currentBaseBranch = config.baseBranch ?? "main";
   const field = await select2({
     message: "Which setting to change?",
     choices: [
       { name: `GitHub repo          ${chalk3.dim(`${config.github.owner}/${config.github.repo}`)}`, value: "repo" },
+      { name: `Base branch          ${chalk3.dim(currentBaseBranch)}`, value: "baseBranch" },
       { name: `AI base URL          ${chalk3.dim(currentBaseUrl)}`, value: "aiBaseUrl" },
       { name: `AI model             ${chalk3.dim(currentModel)}`, value: "aiModel" },
       { name: `AI API Key           ${chalk3.dim("(hidden)")}`, value: "aiApiKey" },
@@ -748,7 +802,15 @@ async function configCommand() {
     ]
   });
   if (field === "cancel") return;
-  if (field === "repo") {
+  if (field === "baseBranch") {
+    const val = await input2({ message: "Base branch name:", default: currentBaseBranch });
+    if (val.trim()) {
+      setConfig({ baseBranch: val.trim() });
+      console.log(chalk3.green(`
+Base branch set to: ${val.trim()}
+`));
+    }
+  } else if (field === "repo") {
     const owner = await input2({ message: "GitHub repo owner:", default: config.github.owner });
     const repo = await input2({ message: "GitHub repo name:", default: config.github.repo });
     setConfig({ github: { ...config.github, owner: owner.trim(), repo: repo.trim() } });
@@ -805,6 +867,7 @@ init_github();
 import chalk8 from "chalk";
 import ora4 from "ora";
 import { select as select5 } from "@inquirer/prompts";
+init_github();
 
 // src/lib/markdown.ts
 import { marked } from "marked";
@@ -944,7 +1007,8 @@ async function launchClaudeCode(issue, branch) {
   const prompt = buildClaudePrompt(issue, branch);
   console.log(chalk5.dim("\n  Launching Claude Code\u2026\n"));
   await new Promise((resolve) => {
-    const child = spawn("claude", [prompt], { stdio: "inherit", shell: true });
+    const safePrompt = prompt.replace(/\r?\n/g, " ").replace(/"/g, "'");
+    const child = spawn(`claude "${safePrompt}"`, [], { stdio: "inherit", shell: true });
     child.on("close", () => resolve());
     child.on("error", () => {
       console.log(
@@ -1142,8 +1206,16 @@ async function run(_input, config) {
     return `Commit failed: ${err.message}`;
   }
   if (isSelfSubmit) {
+    spinner = ora2("Closing issue\u2026").start();
+    try {
+      await closeTask(config, issueNumber);
+      spinner.stop();
+    } catch (err) {
+      spinner.stop();
+      console.error(chalk7.yellow(`Warning: failed to close issue: ${err.message}`));
+    }
     setConfig({ taskState: { activeIssueNumber: void 0, baseCommit: void 0 } });
-    return `Task #${issueNumber} committed.
+    return `Task #${issueNumber} committed and closed.
 Commit: "${commitMessage.trim()}"`;
   }
   spinner = ora2("Creating pull request\u2026").start();
@@ -1204,8 +1276,12 @@ async function execute(input3, config) {
     return `Commit failed: ${err.message}`;
   }
   if (isSelfSubmit) {
+    try {
+      await closeTask(config, issueNumber);
+    } catch {
+    }
     setConfig({ taskState: { activeIssueNumber: void 0, baseCommit: void 0 } });
-    return `Task #${issueNumber} committed.
+    return `Task #${issueNumber} committed and closed.
 Commit: "${commitMessage}"`;
   }
   let prUrl;
@@ -1413,41 +1489,29 @@ Finish or submit it before claiming a new one.`;
       await claimTask(config, issue.number, me);
       spinner.stop();
       const workerBranch = makeWorkerBranchName(me);
-      spinner = ora4(`Switching to ${workerBranch}\u2026`).start();
+      const taskBase = extractBaseCommit(issue.body);
+      spinner = ora4(`Switching to ${workerBranch}${taskBase ? ` from ${taskBase.slice(0, 7)}` : ""}\u2026`).start();
       try {
-        const isNewWorker = await switchToBranchOrCreate(workerBranch);
-        spinner.stop();
-        if (isNewWorker) {
-          spinner = ora4("Pushing worker branch\u2026").start();
-          try {
-            await pushBranch(workerBranch);
-            spinner.stop();
-          } catch {
-            spinner.warn("Could not push worker branch");
-          }
+        if (taskBase) {
+          await resetOrCreateBranch(workerBranch, taskBase);
+        } else {
+          await switchToBranchOrCreate(workerBranch);
         }
-      } catch {
-        spinner.warn(`Could not switch to ${workerBranch}`);
-      }
-      const branch = makeBranchName(issue.number, me);
-      spinner = ora4(`Creating task branch ${branch}\u2026`).start();
-      try {
-        await switchToBranchOrCreate(branch);
         spinner.stop();
-        spinner = ora4("Pushing task branch\u2026").start();
+        spinner = ora4("Pushing worker branch\u2026").start();
         try {
-          await pushBranch(branch);
+          await pushBranch(workerBranch);
           spinner.stop();
         } catch {
-          spinner.warn("Could not push task branch");
+          spinner.warn("Could not push worker branch");
         }
       } catch {
-        spinner.warn(`Could not create branch ${branch}`);
+        spinner.warn(`Could not switch to ${workerBranch}`);
       }
       const baseCommit = await getCurrentCommit();
       setConfig({ taskState: { activeIssueNumber: issue.number, baseCommit } });
       console.log(chalk8.green(`
-  Claimed! Branch: ${branch}  (base: ${baseCommit.slice(0, 7)})
+  Claimed! Branch: ${workerBranch}  (base: ${baseCommit.slice(0, 7)})
 `));
       let openClaude;
       try {
@@ -1461,8 +1525,8 @@ Finish or submit it before claiming a new one.`;
       } catch {
         openClaude = false;
       }
-      if (openClaude) await launchClaudeCode(issue, branch);
-      return `Task #${issue.number} claimed. Branch: ${branch}`;
+      if (openClaude) await launchClaudeCode(issue, workerBranch);
+      return `Task #${issue.number} claimed. Branch: ${workerBranch}`;
     } catch (err) {
       return `Error claiming task: ${err.message}`;
     }
@@ -1501,28 +1565,22 @@ async function execute3(input3, config) {
       return `Error claiming task: ${err.message}`;
     }
     const workerBranch = makeWorkerBranchName(me);
+    const taskBase = extractBaseCommit(issue.body);
     try {
-      const isNewWorker = await switchToBranchOrCreate(workerBranch);
-      if (isNewWorker) {
-        try {
-          await pushBranch(workerBranch);
-        } catch {
-        }
+      if (taskBase) {
+        await resetOrCreateBranch(workerBranch, taskBase);
+      } else {
+        await switchToBranchOrCreate(workerBranch);
       }
     } catch {
     }
-    const branch = makeBranchName(issueNumber, me);
     try {
-      await switchToBranchOrCreate(branch);
-    } catch {
-    }
-    try {
-      await pushBranch(branch);
+      await pushBranch(workerBranch);
     } catch {
     }
     const baseCommit = await getCurrentCommit();
     setConfig({ taskState: { activeIssueNumber: issueNumber, baseCommit } });
-    return `Task #${issueNumber} claimed. Branch: ${branch} (base commit: ${baseCommit.slice(0, 7)})`;
+    return `Task #${issueNumber} claimed. Branch: ${workerBranch} (base commit: ${baseCommit.slice(0, 7)})`;
   }
   return `Unknown action: ${action}`;
 }
@@ -1692,12 +1750,26 @@ async function run4(input3, config) {
       console.log(chalk9.yellow(`  Revision error: ${err.message}`));
     }
   }
+  const baseBranch = config.baseBranch ?? "main";
+  let baseCommit;
+  const syncSpinner = ora5(`Syncing with ${baseBranch}\u2026`).start();
+  try {
+    await syncWithBase(baseBranch);
+    baseCommit = await getCurrentCommit();
+    syncSpinner.succeed(`Synced with ${baseBranch} (base: ${baseCommit.slice(0, 7)})`);
+  } catch {
+    syncSpinner.warn(`Could not sync with ${baseBranch} \u2014 recording remote HEAD as base`);
+    try {
+      baseCommit = await getRemoteHeadSha(baseBranch);
+    } catch {
+    }
+  }
   const createSpinner = ora5(`Creating "${title}"\u2026`).start();
   let htmlUrl;
   let issueNumber;
   let issueTitle;
   try {
-    const issue = await createTask(config, title, guide);
+    const issue = await createTask(config, title, guide, baseCommit);
     createSpinner.stop();
     htmlUrl = issue.htmlUrl;
     issueNumber = issue.number;
@@ -1734,8 +1806,19 @@ async function execute4(input3, config) {
   if (feedback) {
     guide = await generateGuide(config, title, { feedback, previousGuide: guide });
   }
+  const baseBranch = config.baseBranch ?? "main";
+  let baseCommit;
+  try {
+    await syncWithBase(baseBranch);
+    baseCommit = await getCurrentCommit();
+  } catch {
+    try {
+      baseCommit = await getRemoteHeadSha(baseBranch);
+    } catch {
+    }
+  }
   try {
-    const issue = await createTask(config, title, guide);
+    const issue = await createTask(config, title, guide, baseCommit);
     return `Created #${issue.number} "${issue.title}" \u2014 ${issue.htmlUrl}
 
 Guide:
@@ -2136,16 +2219,40 @@ async function run10(input3, config) {
   }
   if (!confirmed) return "Cancelled.";
   const spinner = ora9(`Merging PR for #${issueNumber}\u2026`).start();
+  let result;
   try {
-    const result = await acceptTask(config, issueNumber);
+    const assigneeWorkerBranch = issue.assignee ? makeWorkerBranchName(issue.assignee) : void 0;
+    result = await acceptTask(config, issueNumber, assigneeWorkerBranch);
     spinner.succeed(`PR #${result.prNumber} merged into ${targetBranch}`);
-    return `Task #${issueNumber} accepted.
-PR #${result.prNumber} merged \u2192 ${targetBranch}
-Issue closed.`;
   } catch (err) {
     spinner.fail("Failed");
     return `Error: ${err.message}`;
   }
+  const baseBranch = config.baseBranch ?? "main";
+  let pushToMain;
+  try {
+    pushToMain = await select8({
+      message: `Push ${chalk11.cyan(targetBranch)} \u2192 ${chalk11.cyan(baseBranch)}?`,
+      choices: [
+        { name: `Yes, push to ${baseBranch}`, value: true },
+        { name: "No, keep in worker branch", value: false }
+      ]
+    });
+  } catch {
+    pushToMain = false;
+  }
+  if (pushToMain) {
+    const mergeSpinner = ora9(`Merging ${targetBranch} \u2192 ${baseBranch}\u2026`).start();
+    try {
+      await mergeWorkerIntoBase(config, targetBranch, baseBranch);
+      mergeSpinner.succeed(`Merged ${targetBranch} \u2192 ${baseBranch}`);
+    } catch (err) {
+      mergeSpinner.fail(`Could not merge to ${baseBranch}: ${err.message}`);
+    }
+  }
+  return `Task #${issueNumber} accepted.
+PR #${result.prNumber} merged \u2192 ${targetBranch}${pushToMain ? ` \u2192 ${baseBranch}` : ""}
+Issue closed.`;
 }
 async function execute10(input3, config) {
   const issueNumber = input3["issue_number"];
@@ -2159,7 +2266,8 @@ async function execute10(input3, config) {
   const targetBranch = makeWorkerBranchName(me);
   const spinner = ora9(`Merging PR for #${issueNumber}\u2026`).start();
   try {
-    const result = await acceptTask(config, issueNumber);
+    const assigneeWorkerBranch = issue.assignee ? makeWorkerBranchName(issue.assignee) : void 0;
+    const result = await acceptTask(config, issueNumber, assigneeWorkerBranch);
     spinner.stop();
     return `Task #${issueNumber} accepted.
 PR #${result.prNumber} merged \u2192 ${targetBranch}
@@ -2921,6 +3029,8 @@ function completer(line) {
 var _rl = null;
 function promptUser() {
   return new Promise((resolve) => {
+    if (process.stdin.isPaused()) process.stdin.resume();
+    _rl.resume();
     _rl.question(chalk14.cyan("You") + chalk14.dim(" \u203A "), resolve);
   });
 }

package/dist/mcp.js

@@ -18,7 +18,9 @@ __export(github_exports, {
   createPR: () => createPR,
   createTask: () => createTask,
   editTask: () => editTask,
+  embedBaseCommit: () => embedBaseCommit,
   ensureLabels: () => ensureLabels,
+  extractBaseCommit: () => extractBaseCommit,
   formatGuideAsMarkdown: () => formatGuideAsMarkdown,
   getAuthenticatedUser: () => getAuthenticatedUser,
   getDefaultBranch: () => getDefaultBranch,
@@ -29,6 +31,7 @@ __export(github_exports, {
   listTasks: () => listTasks,
   listTasksForReview: () => listTasksForReview,
   markInReview: () => markInReview,
+  mergeWorkerIntoBase: () => mergeWorkerIntoBase,
   postComment: () => postComment,
   postGuideComment: () => postGuideComment,
   rejectTask: () => rejectTask
@@ -77,19 +80,41 @@ async function getTask(config, number) {
   const { data } = await octokit.issues.get({ owner, repo, issue_number: number });
   return parseIssue(data);
 }
-async function createTask(config, title, body) {
+function embedBaseCommit(body, sha) {
+  return `${body}
+
+${BASE_COMMIT_MARKER}${sha} -->`;
+}
+function extractBaseCommit(body) {
+  if (!body) return null;
+  const match = body.match(/<!-- techunter-base:([a-f0-9]{7,40}) -->/);
+  return match?.[1] ?? null;
+}
+async function createTask(config, title, body, baseCommit) {
   const octokit = createOctokit(config.githubToken);
   const { owner, repo } = config.github;
   await ensureLabels(config);
+  const finalBody = baseCommit ? embedBaseCommit(body ?? "", baseCommit) : body;
   const { data } = await octokit.issues.create({
     owner,
     repo,
     title,
-    body,
+    body: finalBody,
     labels: [LABEL_AVAILABLE]
   });
   return parseIssue(data);
 }
+async function mergeWorkerIntoBase(config, workerBranch, baseBranch) {
+  const octokit = createOctokit(config.githubToken);
+  const { owner, repo } = config.github;
+  await octokit.repos.merge({
+    owner,
+    repo,
+    base: baseBranch,
+    head: workerBranch,
+    commit_message: `chore: merge ${workerBranch} into ${baseBranch}`
+  });
+}
 async function claimTask(config, number, username) {
   const octokit = createOctokit(config.githubToken);
   const { owner, repo } = config.github;
@@ -308,12 +333,12 @@ async function getDefaultBranch(config) {
   const { data } = await octokit.repos.get({ owner, repo });
   return data.default_branch;
 }
-async function acceptTask(config, issueNumber) {
+async function acceptTask(config, issueNumber, headBranch) {
   const octokit = createOctokit(config.githubToken);
   const { owner, repo } = config.github;
   const { data: prs } = await octokit.pulls.list({ owner, repo, state: "open", per_page: 100 });
-  const pr = prs.find((p) => p.head.ref.startsWith(`task-${issueNumber}-`));
-  if (!pr) throw new Error(`No open PR found for task #${issueNumber} (expected branch starting with task-${issueNumber}-)`);
+  const pr = headBranch ? prs.find((p) => p.head.ref === headBranch) : prs.find((p) => p.head.ref.startsWith(`task-${issueNumber}-`) || p.head.ref.startsWith("worker-"));
+  if (!pr) throw new Error(`No open PR found for task #${issueNumber}`);
   const { data: merge } = await octokit.pulls.merge({
     owner,
     repo,
@@ -323,7 +348,7 @@ async function acceptTask(config, issueNumber) {
   await closeTask(config, issueNumber);
   return { prNumber: pr.number, prUrl: pr.html_url, sha: merge.sha ?? "" };
 }
-var LABEL_AVAILABLE, LABEL_CLAIMED, LABEL_IN_REVIEW, LABEL_CHANGES_NEEDED, LABELS, TECHUNTER_LABELS;
+var LABEL_AVAILABLE, LABEL_CLAIMED, LABEL_IN_REVIEW, LABEL_CHANGES_NEEDED, LABELS, TECHUNTER_LABELS, BASE_COMMIT_MARKER;
 var init_github = __esm({
   "src/lib/github.ts"() {
     "use strict";
@@ -338,6 +363,7 @@ var init_github = __esm({
       { name: LABEL_CHANGES_NEEDED, color: "e11d48", description: "Task needs changes" }
     ];
     TECHUNTER_LABELS = /* @__PURE__ */ new Set([LABEL_AVAILABLE, LABEL_CLAIMED, LABEL_IN_REVIEW, LABEL_CHANGES_NEEDED]);
+    BASE_COMMIT_MARKER = "<!-- techunter-base:";
   }
 });
 
@@ -370,10 +396,6 @@ async function getCurrentBranch() {
 async function pushBranch(name) {
   await git.push("origin", name, ["--set-upstream"]);
 }
-function makeBranchName(issueNumber, username) {
-  const slug = username.toLowerCase().replace(/[^a-z0-9-]/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "") || "user";
-  return `task-${issueNumber}-${slug}`;
-}
 function makeWorkerBranchName(username) {
   const slug = username.toLowerCase().replace(/[^a-z0-9-]/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "") || "user";
   return `worker-${slug}`;
@@ -486,6 +508,31 @@ async function stageAllAndCommit(message) {
   const branch = (await git.branch()).current;
   await git.push("origin", branch, ["--set-upstream"]);
 }
+async function syncWithBase(baseBranch) {
+  await git.fetch("origin", baseBranch);
+  try {
+    await git.merge([`origin/${baseBranch}`, "--ff-only"]);
+  } catch {
+    await git.merge([`origin/${baseBranch}`, "-m", `chore: sync with ${baseBranch}`]);
+  }
+}
+async function getRemoteHeadSha(baseBranch) {
+  await git.fetch("origin", baseBranch);
+  return (await git.revparse([`origin/${baseBranch}`])).trim();
+}
+async function resetOrCreateBranch(branchName, sha) {
+  const branches = await git.branch();
+  const localExists = Object.keys(branches.branches).some((b) => b === branchName);
+  if (localExists) {
+    await git.checkout(branchName);
+    await git.reset(["--hard", sha]);
+  } else {
+    await git.checkoutBranch(branchName, sha);
+  }
+}
+
+// src/tools/pick/index.ts
+init_github();
 
 // src/lib/config.ts
 import Conf from "conf";
@@ -496,6 +543,7 @@ var configSchema = z.object({
   aiModel: z.string().optional(),
   githubToken: z.string().min(1),
   githubClientId: z.string().optional(),
+  baseBranch: z.string().optional(),
   github: z.object({
     owner: z.string().min(1),
     repo: z.string().min(1)
@@ -540,6 +588,9 @@ function setConfig(partial) {
   if (partial.githubClientId !== void 0) {
     current["githubClientId"] = partial.githubClientId;
   }
+  if (partial.baseBranch !== void 0) {
+    current["baseBranch"] = partial.baseBranch;
+  }
   if (partial.taskState !== void 0) {
     current["taskState"] = {
       ...current["taskState"] ?? {},
@@ -646,7 +697,8 @@ async function launchClaudeCode(issue, branch) {
   const prompt = buildClaudePrompt(issue, branch);
   console.log(chalk3.dim("\n  Launching Claude Code\u2026\n"));
   await new Promise((resolve) => {
-    const child = spawn("claude", [prompt], { stdio: "inherit", shell: true });
+    const safePrompt = prompt.replace(/\r?\n/g, " ").replace(/"/g, "'");
+    const child = spawn(`claude "${safePrompt}"`, [], { stdio: "inherit", shell: true });
     child.on("close", () => resolve());
     child.on("error", () => {
       console.log(
@@ -858,8 +910,16 @@ async function run(_input, config) {
     return `Commit failed: ${err.message}`;
   }
   if (isSelfSubmit) {
+    spinner = ora("Closing issue\u2026").start();
+    try {
+      await closeTask(config, issueNumber);
+      spinner.stop();
+    } catch (err) {
+      spinner.stop();
+      console.error(chalk5.yellow(`Warning: failed to close issue: ${err.message}`));
+    }
     setConfig({ taskState: { activeIssueNumber: void 0, baseCommit: void 0 } });
-    return `Task #${issueNumber} committed.
+    return `Task #${issueNumber} committed and closed.
 Commit: "${commitMessage.trim()}"`;
   }
   spinner = ora("Creating pull request\u2026").start();
@@ -920,8 +980,12 @@ async function execute(input, config) {
     return `Commit failed: ${err.message}`;
   }
   if (isSelfSubmit) {
+    try {
+      await closeTask(config, issueNumber);
+    } catch {
+    }
     setConfig({ taskState: { activeIssueNumber: void 0, baseCommit: void 0 } });
-    return `Task #${issueNumber} committed.
+    return `Task #${issueNumber} committed and closed.
 Commit: "${commitMessage}"`;
   }
   let prUrl;
@@ -1129,41 +1193,29 @@ Finish or submit it before claiming a new one.`;
       await claimTask(config, issue.number, me);
       spinner.stop();
       const workerBranch = makeWorkerBranchName(me);
-      spinner = ora3(`Switching to ${workerBranch}\u2026`).start();
+      const taskBase = extractBaseCommit(issue.body);
+      spinner = ora3(`Switching to ${workerBranch}${taskBase ? ` from ${taskBase.slice(0, 7)}` : ""}\u2026`).start();
       try {
-        const isNewWorker = await switchToBranchOrCreate(workerBranch);
-        spinner.stop();
-        if (isNewWorker) {
-          spinner = ora3("Pushing worker branch\u2026").start();
-          try {
-            await pushBranch(workerBranch);
-            spinner.stop();
-          } catch {
-            spinner.warn("Could not push worker branch");
-          }
+        if (taskBase) {
+          await resetOrCreateBranch(workerBranch, taskBase);
+        } else {
+          await switchToBranchOrCreate(workerBranch);
         }
-      } catch {
-        spinner.warn(`Could not switch to ${workerBranch}`);
-      }
-      const branch = makeBranchName(issue.number, me);
-      spinner = ora3(`Creating task branch ${branch}\u2026`).start();
-      try {
-        await switchToBranchOrCreate(branch);
         spinner.stop();
-        spinner = ora3("Pushing task branch\u2026").start();
+        spinner = ora3("Pushing worker branch\u2026").start();
         try {
-          await pushBranch(branch);
+          await pushBranch(workerBranch);
           spinner.stop();
         } catch {
-          spinner.warn("Could not push task branch");
+          spinner.warn("Could not push worker branch");
         }
       } catch {
-        spinner.warn(`Could not create branch ${branch}`);
+        spinner.warn(`Could not switch to ${workerBranch}`);
       }
       const baseCommit = await getCurrentCommit();
       setConfig({ taskState: { activeIssueNumber: issue.number, baseCommit } });
       console.log(chalk6.green(`
-  Claimed! Branch: ${branch}  (base: ${baseCommit.slice(0, 7)})
+  Claimed! Branch: ${workerBranch}  (base: ${baseCommit.slice(0, 7)})
 `));
       let openClaude;
       try {
@@ -1177,8 +1229,8 @@ Finish or submit it before claiming a new one.`;
       } catch {
         openClaude = false;
       }
-      if (openClaude) await launchClaudeCode(issue, branch);
-      return `Task #${issue.number} claimed. Branch: ${branch}`;
+      if (openClaude) await launchClaudeCode(issue, workerBranch);
+      return `Task #${issue.number} claimed. Branch: ${workerBranch}`;
     } catch (err) {
       return `Error claiming task: ${err.message}`;
     }
@@ -1217,28 +1269,22 @@ async function execute3(input, config) {
       return `Error claiming task: ${err.message}`;
     }
     const workerBranch = makeWorkerBranchName(me);
+    const taskBase = extractBaseCommit(issue.body);
     try {
-      const isNewWorker = await switchToBranchOrCreate(workerBranch);
-      if (isNewWorker) {
-        try {
-          await pushBranch(workerBranch);
-        } catch {
-        }
+      if (taskBase) {
+        await resetOrCreateBranch(workerBranch, taskBase);
+      } else {
+        await switchToBranchOrCreate(workerBranch);
       }
     } catch {
     }
-    const branch = makeBranchName(issueNumber, me);
-    try {
-      await switchToBranchOrCreate(branch);
-    } catch {
-    }
     try {
-      await pushBranch(branch);
+      await pushBranch(workerBranch);
     } catch {
     }
     const baseCommit = await getCurrentCommit();
     setConfig({ taskState: { activeIssueNumber: issueNumber, baseCommit } });
-    return `Task #${issueNumber} claimed. Branch: ${branch} (base commit: ${baseCommit.slice(0, 7)})`;
+    return `Task #${issueNumber} claimed. Branch: ${workerBranch} (base commit: ${baseCommit.slice(0, 7)})`;
   }
   return `Unknown action: ${action}`;
 }
@@ -1408,12 +1454,26 @@ async function run4(input, config) {
       console.log(chalk7.yellow(`  Revision error: ${err.message}`));
     }
   }
+  const baseBranch = config.baseBranch ?? "main";
+  let baseCommit;
+  const syncSpinner = ora4(`Syncing with ${baseBranch}\u2026`).start();
+  try {
+    await syncWithBase(baseBranch);
+    baseCommit = await getCurrentCommit();
+    syncSpinner.succeed(`Synced with ${baseBranch} (base: ${baseCommit.slice(0, 7)})`);
+  } catch {
+    syncSpinner.warn(`Could not sync with ${baseBranch} \u2014 recording remote HEAD as base`);
+    try {
+      baseCommit = await getRemoteHeadSha(baseBranch);
+    } catch {
+    }
+  }
   const createSpinner = ora4(`Creating "${title}"\u2026`).start();
   let htmlUrl;
   let issueNumber;
   let issueTitle;
   try {
-    const issue = await createTask(config, title, guide);
+    const issue = await createTask(config, title, guide, baseCommit);
     createSpinner.stop();
     htmlUrl = issue.htmlUrl;
     issueNumber = issue.number;
@@ -1450,8 +1510,19 @@ async function execute4(input, config) {
   if (feedback) {
     guide = await generateGuide(config, title, { feedback, previousGuide: guide });
   }
+  const baseBranch = config.baseBranch ?? "main";
+  let baseCommit;
+  try {
+    await syncWithBase(baseBranch);
+    baseCommit = await getCurrentCommit();
+  } catch {
+    try {
+      baseCommit = await getRemoteHeadSha(baseBranch);
+    } catch {
+    }
+  }
   try {
-    const issue = await createTask(config, title, guide);
+    const issue = await createTask(config, title, guide, baseCommit);
     return `Created #${issue.number} "${issue.title}" \u2014 ${issue.htmlUrl}
 
 Guide:
@@ -1852,16 +1923,40 @@ async function run10(input, config) {
   }
   if (!confirmed) return "Cancelled.";
   const spinner = ora8(`Merging PR for #${issueNumber}\u2026`).start();
+  let result;
   try {
-    const result = await acceptTask(config, issueNumber);
+    const assigneeWorkerBranch = issue.assignee ? makeWorkerBranchName(issue.assignee) : void 0;
+    result = await acceptTask(config, issueNumber, assigneeWorkerBranch);
     spinner.succeed(`PR #${result.prNumber} merged into ${targetBranch}`);
-    return `Task #${issueNumber} accepted.
-PR #${result.prNumber} merged \u2192 ${targetBranch}
-Issue closed.`;
   } catch (err) {
     spinner.fail("Failed");
     return `Error: ${err.message}`;
   }
+  const baseBranch = config.baseBranch ?? "main";
+  let pushToMain;
+  try {
+    pushToMain = await select6({
+      message: `Push ${chalk9.cyan(targetBranch)} \u2192 ${chalk9.cyan(baseBranch)}?`,
+      choices: [
+        { name: `Yes, push to ${baseBranch}`, value: true },
+        { name: "No, keep in worker branch", value: false }
+      ]
+    });
+  } catch {
+    pushToMain = false;
+  }
+  if (pushToMain) {
+    const mergeSpinner = ora8(`Merging ${targetBranch} \u2192 ${baseBranch}\u2026`).start();
+    try {
+      await mergeWorkerIntoBase(config, targetBranch, baseBranch);
+      mergeSpinner.succeed(`Merged ${targetBranch} \u2192 ${baseBranch}`);
+    } catch (err) {
+      mergeSpinner.fail(`Could not merge to ${baseBranch}: ${err.message}`);
+    }
+  }
+  return `Task #${issueNumber} accepted.
+PR #${result.prNumber} merged \u2192 ${targetBranch}${pushToMain ? ` \u2192 ${baseBranch}` : ""}
+Issue closed.`;
 }
 async function execute10(input, config) {
   const issueNumber = input["issue_number"];
@@ -1875,7 +1970,8 @@ async function execute10(input, config) {
   const targetBranch = makeWorkerBranchName(me);
   const spinner = ora8(`Merging PR for #${issueNumber}\u2026`).start();
   try {
-    const result = await acceptTask(config, issueNumber);
+    const assigneeWorkerBranch = issue.assignee ? makeWorkerBranchName(issue.assignee) : void 0;
+    const result = await acceptTask(config, issueNumber, assigneeWorkerBranch);
     spinner.stop();
     return `Task #${issueNumber} accepted.
 PR #${result.prNumber} merged \u2192 ${targetBranch}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "techunter",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "AI-powered task distribution CLI for development teams",
   "author": "Techunter Contributors",
   "license": "MIT",