techunter 0.1.2 → 0.1.3

package/README.md

@@ -3,9 +3,9 @@
 > An AI-powered task distribution CLI for development teams. Manage GitHub Issues through a conversational terminal interface.
 
 ```
-   ▗▄▄▄▄▖     Techunter v0.1.1
-◆──▐████▌══▶  GLM-5 · zai-org
-   ▝▀▀▀▀▘     owner/repo
+    ╔═══════════════╗
+◆═══╬   TECHUNTER   ╬═══▶   Techunter v0.1.3
+    ╚═══════════════╝        GLM-5 · z-ai  ·  owner/repo
 ```
 
 ---
@@ -29,10 +29,11 @@
 ## Features
 
 - **Conversational REPL** — Describe what you need in plain English; the Agent calls the right tools automatically
-- **GitHub Issues integration** — Create, claim, submit, and close tasks; labels and assignees stay in sync
+- **GitHub Issues integration** — Create, claim, submit, review, and close tasks; labels and assignees stay in sync
 - **Automatic branch management** — Claiming a task creates and pushes the corresponding Git branch
 - **Smart task guides** — Before you start, the Agent scans your codebase and posts a detailed implementation guide as an Issue comment
-- **One-command delivery** — `/submit` lets the Agent review your changes against acceptance criteria, then commits and pushes; `/deliver` opens a PR and marks it as in-review
+- **One-command delivery** — `/submit` lets the Agent review your changes against acceptance criteria, then commits and pushes
+- **Review & accept flow** — `/review` lists in-review PRs; `/accept` merges and closes
 - **Slash commands** — Common actions don't need a description: just `/pick`, `/new`, `/submit`
 - **Persistent conversation history** — Full context is retained across turns in the same REPL session
 
@@ -43,7 +44,7 @@
 - Node.js ≥ 18
 - A GitHub repository with Issues enabled
 - GitHub Personal Access Token or OAuth Device Flow authorization
-- [ppio.com](https://ppio.com) API Key (uses the GLM-5 model)
+- An OpenAI-compatible API key (OpenRouter by default, or any custom provider)
 
 ---
 
@@ -75,9 +76,10 @@ tch init
 
 The wizard will ask for:
 
-1. **GitHub authentication** — A Personal Access Token is recommended
-   - Create one at https://github.com/settings/tokens/new with `repo` and `read:user` scopes
-2. **PPIO API Key** — Get yours from the [ppio.com](https://ppio.com) console → API Keys
+1. **GitHub authentication** — Browser OAuth (recommended) or a Personal Access Token
+   - PAT: create one at https://github.com/settings/tokens/new with `repo` and `read:user` scopes
+2. **AI provider** — OpenRouter (default) or a custom OpenAI-compatible endpoint
+   - OpenRouter key: https://openrouter.ai/settings/keys
 3. **GitHub repository** — Auto-detected from your git remote, or enter manually
 
 Config is stored at `~/.config/techunter/`.
@@ -99,10 +101,14 @@ Starts the conversational REPL. Type natural language or slash commands:
 | `/pick` | `/p` | Browse and act on tasks interactively |
 | `/new` | `/n` | Create a new task |
 | `/close` | `/d` | Close (delete) a task |
-| `/submit` | `/s` | Review changes for a task and commit + push |
-| `/review` | `/rv` | Review team submissions — approve or request changes |
+| `/edit` | `/e` | Edit the title or description of a task |
+| `/submit` | `/s` | Review changes, commit, and push |
+| `/review` | `/rv` | List tasks waiting for your approval |
+| `/accept` | `/ac` | Accept a reviewed task: merge PR and close issue |
 | `/status` | `/me` | Show tasks assigned to you |
 | `/code` | `/c` | Launch Claude Code for the current task branch |
+| `/config` | `/cfg` | Change settings (repo, API keys, etc.) |
+| `/init` | | Re-run the setup wizard for this repo |
 
 Any other input is sent to the AI Agent, for example:
 
@@ -141,6 +147,12 @@ task-{issue_number}-{your-github-username}
 
 Example: Issue #7 claimed by `johndoe` → `task-7-johndoe`
 
+Worker branches (for persistent personal workspaces) follow:
+
+```
+worker-{your-github-username}
+```
+
 ---
 
 ## AI Agent Tools

package/dist/index.js

@@ -21,7 +21,6 @@ __export(github_exports, {
   ensureLabels: () => ensureLabels,
   formatGuideAsMarkdown: () => formatGuideAsMarkdown,
   getAuthenticatedUser: () => getAuthenticatedUser,
-  getBaseBranch: () => getBaseBranch,
   getDefaultBranch: () => getDefaultBranch,
   getTask: () => getTask,
   isCollaborator: () => isCollaborator,
@@ -309,10 +308,6 @@ async function getDefaultBranch(config) {
   const { data } = await octokit.repos.get({ owner, repo });
   return data.default_branch;
 }
-function getBaseBranch(config) {
-  if (config.github.baseBranch) return Promise.resolve(config.github.baseBranch);
-  return getDefaultBranch(config);
-}
 async function acceptTask(config, issueNumber) {
   const octokit = createOctokit(config.githubToken);
   const { owner, repo } = config.github;
@@ -350,7 +345,6 @@ var init_github = __esm({
 import chalk14 from "chalk";
 import readline from "readline";
 import { createRequire } from "module";
-import { input as input3 } from "@inquirer/prompts";
 
 // src/commands/init.ts
 import { input, password, select } from "@inquirer/prompts";
@@ -370,8 +364,7 @@ var configSchema = z.object({
   githubClientId: z.string().optional(),
   github: z.object({
     owner: z.string().min(1),
-    repo: z.string().min(1),
-    baseBranch: z.string().optional()
+    repo: z.string().min(1)
   }),
   taskState: z.object({
     activeIssueNumber: z.number().optional(),
@@ -702,11 +695,6 @@ async function initCommand() {
       required: true
     });
   }
-  const detectedDefault = "main";
-  const baseBranch = await input({
-    message: "Main branch to merge PRs into:",
-    default: detectedDefault
-  });
   const config = {
     githubToken,
     githubClientId,
@@ -715,8 +703,7 @@ async function initCommand() {
     ...aiModel ? { aiModel } : {},
     github: {
       owner: owner.trim(),
-      repo: repo.trim(),
-      baseBranch: baseBranch.trim() || detectedDefault
+      repo: repo.trim()
     }
   };
   setConfig(config);
@@ -752,7 +739,6 @@ async function configCommand() {
   const field = await select2({
     message: "Which setting to change?",
     choices: [
-      { name: `Base branch          ${chalk3.dim(config.github.baseBranch ?? "(not set, uses repo default)")}`, value: "baseBranch" },
       { name: `GitHub repo          ${chalk3.dim(`${config.github.owner}/${config.github.repo}`)}`, value: "repo" },
       { name: `AI base URL          ${chalk3.dim(currentBaseUrl)}`, value: "aiBaseUrl" },
       { name: `AI model             ${chalk3.dim(currentModel)}`, value: "aiModel" },
@@ -762,16 +748,7 @@ async function configCommand() {
     ]
   });
   if (field === "cancel") return;
-  if (field === "baseBranch") {
-    const val = await input2({
-      message: "Main branch to merge PRs into:",
-      default: config.github.baseBranch ?? "main"
-    });
-    setConfig({ github: { ...config.github, baseBranch: val.trim() || "main" } });
-    console.log(chalk3.green(`
-Base branch set to: ${val.trim() || "main"}
-`));
-  } else if (field === "repo") {
+  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() } });
@@ -995,8 +972,8 @@ import { select as select3, input as promptInput } from "@inquirer/prompts";
 
 // src/lib/agent-ui.ts
 import chalk6 from "chalk";
-function formatInput(input4) {
-  return Object.entries(input4).map(([k, v]) => {
+function formatInput(input3) {
+  return Object.entries(input3).map(([k, v]) => {
     if (typeof v === "number") return `${k}=${v}`;
     if (typeof v === "string") {
       if (k === "body" || v.length > 50) return `${k}=[${v.length} chars]`;
@@ -1009,8 +986,8 @@ function summarize(result) {
   const first = result.split("\n").find((l) => l.trim()) ?? result;
   return first.length > 100 ? first.slice(0, 97) + "..." : first;
 }
-function printToolCall(name, input4) {
-  const params = formatInput(input4);
+function printToolCall(name, input3) {
+  const params = formatInput(input3);
   console.log(`  ${chalk6.cyan("\u2192")} ${chalk6.bold(name)}${params ? "  " + chalk6.dim(params) : ""}`);
 }
 function printToolResult(result) {
@@ -1046,15 +1023,15 @@ async function runSubAgentLoop(config, systemPrompt, userMessage, toolNames) {
     }
     if (choice.finish_reason === "tool_calls") {
       for (const tc of choice.message.tool_calls ?? []) {
-        let input4;
+        let input3;
         try {
-          input4 = JSON.parse(tc.function.arguments);
+          input3 = JSON.parse(tc.function.arguments);
         } catch {
-          input4 = {};
+          input3 = {};
         }
-        printToolCall(tc.function.name, input4);
+        printToolCall(tc.function.name, input3);
         const mod = selected.find((m) => m.definition.function.name === tc.function.name);
-        const result = mod ? await mod.execute(input4, config) : `Unknown tool: ${tc.function.name}`;
+        const result = mod ? await mod.execute(input3, config) : `Unknown tool: ${tc.function.name}`;
         printToolResult(result);
         messages.push({ role: "tool", tool_call_id: tc.id, content: result });
       }
@@ -1103,14 +1080,14 @@ async function run(_input, config) {
     return "No active task found. Claim a task first with /pick.";
   }
   let spinner = ora2("Loading task and diff\u2026").start();
-  const diffPromise = taskState?.baseCommit ? getDiffFromCommit(taskState.baseCommit) : getDiff(config.github.baseBranch);
-  const [issue, defaultBranch, diff, me] = await Promise.all([
+  const diffPromise = taskState?.baseCommit ? getDiffFromCommit(taskState.baseCommit) : getDiff();
+  const [issue, diff, me] = await Promise.all([
     getTask(config, issueNumber),
-    getBaseBranch(config),
     diffPromise,
     getAuthenticatedUser(config)
   ]);
   spinner.stop();
+  const workerBranch = makeWorkerBranchName(issue.author ?? me);
   const branch = await getCurrentBranch();
   const isSelfSubmit = issue.author !== null && issue.author === me;
   let review = "";
@@ -1175,7 +1152,7 @@ ${issue.body}` : "",
 ## AI Review
 ${review}` : ""
     ].join("\n").trim();
-    prUrl = await createPR(config, issue.title, prBody, branch, defaultBranch);
+    prUrl = await createPR(config, issue.title, prBody, branch, workerBranch);
     spinner.stop();
   } catch (err) {
     spinner.stop();
@@ -1194,18 +1171,18 @@ ${review}` : ""
 Commit: "${commitMessage.trim()}"
 PR: ${prUrl}`;
 }
-async function execute(input4, config) {
+async function execute(input3, config) {
   const taskState = getConfig().taskState;
   const issueNumber = taskState?.activeIssueNumber;
   if (!issueNumber) return "No active task found. Claim a task first.";
-  const diffPromise = taskState?.baseCommit ? getDiffFromCommit(taskState.baseCommit) : getDiff(config.github.baseBranch);
-  const [issue, defaultBranch, diff, branch, me] = await Promise.all([
+  const diffPromise = taskState?.baseCommit ? getDiffFromCommit(taskState.baseCommit) : getDiff();
+  const [issue, diff, branch, me] = await Promise.all([
     getTask(config, issueNumber),
-    getBaseBranch(config),
     diffPromise,
     getCurrentBranch(),
     getAuthenticatedUser(config)
   ]);
+  const workerBranch = makeWorkerBranchName(issue.author ?? me);
   const isSelfSubmit = issue.author !== null && issue.author === me;
   let review = "";
   if (!isSelfSubmit) {
@@ -1215,7 +1192,7 @@ async function execute(input4, config) {
       review = `(Review failed: ${err.message})`;
     }
   }
-  const commitMessage = input4["commit_message"]?.trim() || `complete: ${issue.title}`;
+  const commitMessage = input3["commit_message"]?.trim() || `complete: ${issue.title}`;
   try {
     await stageAllAndCommit(commitMessage);
   } catch (err) {
@@ -1231,7 +1208,7 @@ ${issue.body}` : "",
 ## AI Review
 ${review}` : ""
     ].join("\n").trim();
-    prUrl = await createPR(config, issue.title, prBody, branch, defaultBranch);
+    prUrl = await createPR(config, issue.title, prBody, branch, workerBranch);
   } catch (err) {
     return `Committed but PR creation failed: ${err.message}`;
   }
@@ -1272,8 +1249,8 @@ var definition2 = {
     }
   }
 };
-async function run2(input4, config) {
-  let issueNumber = input4["issue_number"];
+async function run2(input3, config) {
+  let issueNumber = input3["issue_number"];
   if (!issueNumber) {
     let tasks;
     try {
@@ -1314,8 +1291,8 @@ async function run2(input4, config) {
     return `Error: ${err.message}`;
   }
 }
-async function execute2(input4, config) {
-  const issueNumber = input4["issue_number"];
+async function execute2(input3, config) {
+  const issueNumber = input3["issue_number"];
   const spinner = ora3(`Closing #${issueNumber}\u2026`).start();
   try {
     await closeTask(config, issueNumber);
@@ -1348,8 +1325,8 @@ var definition3 = {
     }
   }
 };
-async function run3(input4, config) {
-  const preselected = input4["issue_number"];
+async function run3(input3, config) {
+  const preselected = input3["issue_number"];
   let chosenNumber;
   if (preselected !== void 0) {
     chosenNumber = preselected;
@@ -1425,23 +1402,37 @@ Finish or submit it before claiming a new one.`;
       let spinner = ora4(`Claiming #${issue.number}\u2026`).start();
       await claimTask(config, issue.number, me);
       spinner.stop();
-      const branch = makeWorkerBranchName(me);
-      spinner = ora4(`Switching to branch ${branch}\u2026`).start();
-      let isNew = false;
+      const workerBranch = makeWorkerBranchName(me);
+      spinner = ora4(`Switching to ${workerBranch}\u2026`).start();
       try {
-        isNew = await switchToBranchOrCreate(branch);
+        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");
+          }
+        }
       } catch {
-        spinner.warn(`Could not switch to branch ${branch}`);
+        spinner.warn(`Could not switch to ${workerBranch}`);
       }
-      if (isNew) {
-        spinner = ora4("Pushing branch\u2026").start();
+      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();
         try {
           await pushBranch(branch);
           spinner.stop();
         } catch {
-          spinner.warn("Could not push branch");
+          spinner.warn("Could not push task branch");
         }
+      } catch {
+        spinner.warn(`Could not create branch ${branch}`);
       }
       const baseCommit = await getCurrentCommit();
       setConfig({ taskState: { activeIssueNumber: issue.number, baseCommit } });
@@ -1470,9 +1461,9 @@ Finish or submit it before claiming a new one.`;
   if (action === "close") return run2({ issue_number: issue.number }, config);
   return "Cancelled.";
 }
-async function execute3(input4, config) {
-  const issueNumber = input4["issue_number"];
-  const action = input4["action"];
+async function execute3(input3, config) {
+  const issueNumber = input3["issue_number"];
+  const action = input3["action"];
   let issue;
   try {
     issue = await getTask(config, issueNumber);
@@ -1499,17 +1490,25 @@ async function execute3(input4, config) {
     } catch (err) {
       return `Error claiming task: ${err.message}`;
     }
-    const branch = makeWorkerBranchName(me);
-    let isNew = false;
+    const workerBranch = makeWorkerBranchName(me);
     try {
-      isNew = await switchToBranchOrCreate(branch);
+      const isNewWorker = await switchToBranchOrCreate(workerBranch);
+      if (isNewWorker) {
+        try {
+          await pushBranch(workerBranch);
+        } catch {
+        }
+      }
     } catch {
     }
-    if (isNew) {
-      try {
-        await pushBranch(branch);
-      } catch {
-      }
+    const branch = makeBranchName(issueNumber, me);
+    try {
+      await switchToBranchOrCreate(branch);
+    } catch {
+    }
+    try {
+      await pushBranch(branch);
+    } catch {
     }
     const baseCommit = await getCurrentCommit();
     setConfig({ taskState: { activeIssueNumber: issueNumber, baseCommit } });
@@ -1603,7 +1602,7 @@ var definition4 = {
     }
   }
 };
-async function run4(input4, config) {
+async function run4(input3, config) {
   const authSpinner = ora5("Checking permissions\u2026").start();
   let me;
   let allowed;
@@ -1618,7 +1617,7 @@ async function run4(input4, config) {
   if (!allowed) {
     return `Permission denied: only repository collaborators can create tasks.`;
   }
-  let title = input4["title"]?.trim();
+  let title = input3["title"]?.trim();
   if (!title) {
     try {
       title = (await promptInput2({ message: "Task title:" })).trim();
@@ -1714,13 +1713,13 @@ async function run4(input4, config) {
   }
   return `Created #${issueNumber} "${issueTitle}" \u2014 ${htmlUrl}`;
 }
-async function execute4(input4, config) {
+async function execute4(input3, config) {
   const me = await getAuthenticatedUser(config);
   if (!await isCollaborator(config, me)) {
     return `Permission denied: only repository collaborators can create tasks.`;
   }
-  const title = input4["title"].trim();
-  const feedback = input4["feedback"];
+  const title = input3["title"].trim();
+  const feedback = input3["feedback"];
   let guide = await generateGuide(config, title);
   if (feedback) {
     guide = await generateGuide(config, title, { feedback, previousGuide: guide });
@@ -1935,8 +1934,8 @@ var definition9 = {
     }
   }
 };
-async function run9(input4, config) {
-  const issueNumber = input4["issue_number"];
+async function run9(input3, config) {
+  const issueNumber = input3["issue_number"];
   const [me, issue] = await Promise.all([
     getAuthenticatedUser(config),
     getTask(config, issueNumber)
@@ -2010,9 +2009,9 @@ async function run9(input4, config) {
     return `Task #${issueNumber} rejected. Label changed to changes-needed.`;
   }
 }
-async function execute9(input4, config) {
-  const issueNumber = input4["issue_number"];
-  const feedback = input4["feedback"];
+async function execute9(input3, config) {
+  const issueNumber = input3["issue_number"];
+  const feedback = input3["feedback"];
   const [me, issue] = await Promise.all([
     getAuthenticatedUser(config),
     getTask(config, issueNumber)
@@ -2059,7 +2058,7 @@ var definition10 = {
   type: "function",
   function: {
     name: "accept",
-    description: "Accept an in-review task: merges the PR into the configured base branch and closes the issue.",
+    description: "Accept an in-review task: merges the PR into your worker branch and closes the issue.",
     parameters: {
       type: "object",
       properties: {
@@ -2069,8 +2068,8 @@ var definition10 = {
     }
   }
 };
-async function run10(input4, config) {
-  let issueNumber = input4["issue_number"];
+async function run10(input3, config) {
+  let issueNumber = input3["issue_number"];
   if (!issueNumber) {
     const spinner3 = ora9("Loading tasks for review\u2026").start();
     let tasks;
@@ -2112,11 +2111,11 @@ async function run10(input4, config) {
   if (issue.author && issue.author !== me2) {
     return `Permission denied: only the task author (@${issue.author}) can accept task #${issueNumber}.`;
   }
-  const baseBranch = config.github.baseBranch ?? "main";
+  const targetBranch = makeWorkerBranchName(me2);
   let confirmed;
   try {
     confirmed = await select8({
-      message: `Merge PR for #${issueNumber} into ${chalk11.cyan(baseBranch)} and close issue?`,
+      message: `Merge PR for #${issueNumber} into ${chalk11.cyan(targetBranch)} and close issue?`,
       choices: [
         { name: "Yes, accept", value: true },
         { name: "Cancel", value: false }
@@ -2129,17 +2128,17 @@ async function run10(input4, config) {
   const spinner = ora9(`Merging PR for #${issueNumber}\u2026`).start();
   try {
     const result = await acceptTask(config, issueNumber);
-    spinner.succeed(`PR #${result.prNumber} merged into ${baseBranch}`);
+    spinner.succeed(`PR #${result.prNumber} merged into ${targetBranch}`);
     return `Task #${issueNumber} accepted.
-PR #${result.prNumber} merged \u2192 ${baseBranch}
+PR #${result.prNumber} merged \u2192 ${targetBranch}
 Issue closed.`;
   } catch (err) {
     spinner.fail("Failed");
     return `Error: ${err.message}`;
   }
 }
-async function execute10(input4, config) {
-  const issueNumber = input4["issue_number"];
+async function execute10(input3, config) {
+  const issueNumber = input3["issue_number"];
   const [me, issue] = await Promise.all([
     getAuthenticatedUser(config),
     getTask(config, issueNumber)
@@ -2147,13 +2146,13 @@ async function execute10(input4, config) {
   if (issue.author && issue.author !== me) {
     return `Permission denied: only the task author (@${issue.author}) can accept task #${issueNumber}.`;
   }
+  const targetBranch = makeWorkerBranchName(me);
   const spinner = ora9(`Merging PR for #${issueNumber}\u2026`).start();
   try {
     const result = await acceptTask(config, issueNumber);
     spinner.stop();
-    const baseBranch = config.github.baseBranch ?? "main";
     return `Task #${issueNumber} accepted.
-PR #${result.prNumber} merged \u2192 ${baseBranch}
+PR #${result.prNumber} merged \u2192 ${targetBranch}
 Issue closed.`;
   } catch (err) {
     spinner.stop();
@@ -2189,8 +2188,8 @@ var definition11 = {
     }
   }
 };
-async function run11(input4, config) {
-  let issueNumber = input4["issue_number"];
+async function run11(input3, config) {
+  let issueNumber = input3["issue_number"];
   if (!issueNumber) {
     let tasks;
     try {
@@ -2241,10 +2240,10 @@ async function run11(input4, config) {
     return `Error: ${err.message}`;
   }
 }
-async function execute11(input4, config) {
-  const issueNumber = input4["issue_number"];
-  const title = input4["title"];
-  const body = input4["body"];
+async function execute11(input3, config) {
+  const issueNumber = input3["issue_number"];
+  const title = input3["title"];
+  const body = input3["body"];
   const spinner = ora10(`Updating #${issueNumber}\u2026`).start();
   try {
     await editTask(config, issueNumber, title, body);
@@ -2307,8 +2306,8 @@ var definition13 = {
     }
   }
 };
-async function execute13(input4, config) {
-  const issue = await getTask(config, input4["issue_number"]);
+async function execute13(input3, config) {
+  const issue = await getTask(config, input3["issue_number"]);
   const status = issue.labels.find((l) => l.startsWith("techunter:"))?.replace("techunter:", "") ?? "unknown";
   const assignee = issue.assignee ? `@${issue.assignee}` : "\u2014";
   const lines = [
@@ -2344,9 +2343,9 @@ var definition14 = {
     }
   }
 };
-async function execute14(input4, config) {
-  const issueNumber = input4["issue_number"];
-  const limit = input4["limit"] ?? 5;
+async function execute14(input3, config) {
+  const issueNumber = input3["issue_number"];
+  const limit = input3["limit"] ?? 5;
   const spinner = ora11(`Loading comments for #${issueNumber}...`).start();
   try {
     const comments = await listComments(config, issueNumber, limit);
@@ -2381,7 +2380,7 @@ var definition15 = {
 async function execute15(_input, _config) {
   const spinner = ora12("Reading git diff...").start();
   try {
-    const diff = await getDiff(_config.github.baseBranch);
+    const diff = await getDiff();
     spinner.stop();
     return diff;
   } catch (err) {
@@ -2414,8 +2413,8 @@ var definition16 = {
     }
   }
 };
-async function execute16(input4, _config) {
-  const command = input4["command"];
+async function execute16(input3, _config) {
+  const command = input3["command"];
   const cwd = process.cwd();
   const spinner = ora13(`$ ${command}`).start();
   try {
@@ -2607,8 +2606,8 @@ var definition17 = {
     }
   }
 };
-async function execute17(input4, _config) {
-  const focus = input4["focus"] ?? "";
+async function execute17(input3, _config) {
+  const focus = input3["focus"] ?? "";
   const spinner = ora14("Scanning project...").start();
   try {
     const cwd = process.cwd();
@@ -2657,8 +2656,8 @@ var definition18 = {
     }
   }
 };
-async function execute18(input4, _config) {
-  const filePath = input4["path"];
+async function execute18(input3, _config) {
+  const filePath = input3["path"];
   try {
     const fullPath = path3.join(process.cwd(), filePath);
     const content = await readFile3(fullPath, "utf-8");
@@ -2695,9 +2694,9 @@ var definition19 = {
     }
   }
 };
-async function execute19(input4, _config) {
-  const question = input4["question"];
-  const options = input4["options"];
+async function execute19(input3, _config) {
+  const question = input3["question"];
+  const options = input3["options"];
   const OTHER = "__other__";
   console.log("");
   console.log(chalk12.dim("  \u250C\u2500 Agent question " + "\u2500".repeat(51)));
@@ -2750,12 +2749,12 @@ var toolModules = [
 
 // src/lib/agent.ts
 var tools = toolModules.map((m) => m.definition);
-async function executeTool(name, input4, config) {
+async function executeTool(name, input3, config) {
   const mod = toolModules.find((m) => m.definition.function.name === name);
   if (!mod) return `Unknown tool: ${name}`;
   try {
     const fn = mod.run ?? mod.execute;
-    return await fn(input4, config);
+    return await fn(input3, config);
   } catch (err) {
     return `Error: ${err.message}`;
   }
@@ -2959,13 +2958,9 @@ async function initNewRepo(config, owner, repo) {
   console.log("");
   console.log(chalk14.bold.cyan(`  New repo detected: ${owner}/${repo}`));
   console.log(chalk14.dim("  Setting up Techunter for this repository...\n"));
-  const baseBranch = await input3({
-    message: "Main branch to merge PRs into:",
-    default: "main"
-  });
   const newConfig = {
     ...config,
-    github: { owner, repo, baseBranch: baseBranch.trim() || "main" }
+    github: { owner, repo }
   };
   setConfig({ github: newConfig.github });
   const ora16 = (await import("ora")).default;

package/dist/mcp.js

@@ -21,7 +21,6 @@ __export(github_exports, {
   ensureLabels: () => ensureLabels,
   formatGuideAsMarkdown: () => formatGuideAsMarkdown,
   getAuthenticatedUser: () => getAuthenticatedUser,
-  getBaseBranch: () => getBaseBranch,
   getDefaultBranch: () => getDefaultBranch,
   getTask: () => getTask,
   isCollaborator: () => isCollaborator,
@@ -309,10 +308,6 @@ async function getDefaultBranch(config) {
   const { data } = await octokit.repos.get({ owner, repo });
   return data.default_branch;
 }
-function getBaseBranch(config) {
-  if (config.github.baseBranch) return Promise.resolve(config.github.baseBranch);
-  return getDefaultBranch(config);
-}
 async function acceptTask(config, issueNumber) {
   const octokit = createOctokit(config.githubToken);
   const { owner, repo } = config.github;
@@ -375,6 +370,10 @@ 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}`;
@@ -499,8 +498,7 @@ var configSchema = z.object({
   githubClientId: z.string().optional(),
   github: z.object({
     owner: z.string().min(1),
-    repo: z.string().min(1),
-    baseBranch: z.string().optional()
+    repo: z.string().min(1)
   }),
   taskState: z.object({
     activeIssueNumber: z.number().optional(),
@@ -798,14 +796,14 @@ async function run(_input, config) {
     return "No active task found. Claim a task first with /pick.";
   }
   let spinner = ora("Loading task and diff\u2026").start();
-  const diffPromise = taskState?.baseCommit ? getDiffFromCommit(taskState.baseCommit) : getDiff(config.github.baseBranch);
-  const [issue, defaultBranch, diff, me] = await Promise.all([
+  const diffPromise = taskState?.baseCommit ? getDiffFromCommit(taskState.baseCommit) : getDiff();
+  const [issue, diff, me] = await Promise.all([
     getTask(config, issueNumber),
-    getBaseBranch(config),
     diffPromise,
     getAuthenticatedUser(config)
   ]);
   spinner.stop();
+  const workerBranch = makeWorkerBranchName(issue.author ?? me);
   const branch = await getCurrentBranch();
   const isSelfSubmit = issue.author !== null && issue.author === me;
   let review = "";
@@ -870,7 +868,7 @@ ${issue.body}` : "",
 ## AI Review
 ${review}` : ""
     ].join("\n").trim();
-    prUrl = await createPR(config, issue.title, prBody, branch, defaultBranch);
+    prUrl = await createPR(config, issue.title, prBody, branch, workerBranch);
     spinner.stop();
   } catch (err) {
     spinner.stop();
@@ -893,14 +891,14 @@ async function execute(input, config) {
   const taskState = getConfig().taskState;
   const issueNumber = taskState?.activeIssueNumber;
   if (!issueNumber) return "No active task found. Claim a task first.";
-  const diffPromise = taskState?.baseCommit ? getDiffFromCommit(taskState.baseCommit) : getDiff(config.github.baseBranch);
-  const [issue, defaultBranch, diff, branch, me] = await Promise.all([
+  const diffPromise = taskState?.baseCommit ? getDiffFromCommit(taskState.baseCommit) : getDiff();
+  const [issue, diff, branch, me] = await Promise.all([
     getTask(config, issueNumber),
-    getBaseBranch(config),
     diffPromise,
     getCurrentBranch(),
     getAuthenticatedUser(config)
   ]);
+  const workerBranch = makeWorkerBranchName(issue.author ?? me);
   const isSelfSubmit = issue.author !== null && issue.author === me;
   let review = "";
   if (!isSelfSubmit) {
@@ -926,7 +924,7 @@ ${issue.body}` : "",
 ## AI Review
 ${review}` : ""
     ].join("\n").trim();
-    prUrl = await createPR(config, issue.title, prBody, branch, defaultBranch);
+    prUrl = await createPR(config, issue.title, prBody, branch, workerBranch);
   } catch (err) {
     return `Committed but PR creation failed: ${err.message}`;
   }
@@ -1120,23 +1118,37 @@ Finish or submit it before claiming a new one.`;
       let spinner = ora3(`Claiming #${issue.number}\u2026`).start();
       await claimTask(config, issue.number, me);
       spinner.stop();
-      const branch = makeWorkerBranchName(me);
-      spinner = ora3(`Switching to branch ${branch}\u2026`).start();
-      let isNew = false;
+      const workerBranch = makeWorkerBranchName(me);
+      spinner = ora3(`Switching to ${workerBranch}\u2026`).start();
       try {
-        isNew = await switchToBranchOrCreate(branch);
+        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");
+          }
+        }
       } catch {
-        spinner.warn(`Could not switch to branch ${branch}`);
+        spinner.warn(`Could not switch to ${workerBranch}`);
       }
-      if (isNew) {
-        spinner = ora3("Pushing branch\u2026").start();
+      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();
         try {
           await pushBranch(branch);
           spinner.stop();
         } catch {
-          spinner.warn("Could not push branch");
+          spinner.warn("Could not push task branch");
         }
+      } catch {
+        spinner.warn(`Could not create branch ${branch}`);
       }
       const baseCommit = await getCurrentCommit();
       setConfig({ taskState: { activeIssueNumber: issue.number, baseCommit } });
@@ -1194,17 +1206,25 @@ async function execute3(input, config) {
     } catch (err) {
       return `Error claiming task: ${err.message}`;
     }
-    const branch = makeWorkerBranchName(me);
-    let isNew = false;
+    const workerBranch = makeWorkerBranchName(me);
     try {
-      isNew = await switchToBranchOrCreate(branch);
+      const isNewWorker = await switchToBranchOrCreate(workerBranch);
+      if (isNewWorker) {
+        try {
+          await pushBranch(workerBranch);
+        } catch {
+        }
+      }
     } catch {
     }
-    if (isNew) {
-      try {
-        await pushBranch(branch);
-      } catch {
-      }
+    const branch = makeBranchName(issueNumber, me);
+    try {
+      await switchToBranchOrCreate(branch);
+    } catch {
+    }
+    try {
+      await pushBranch(branch);
+    } catch {
     }
     const baseCommit = await getCurrentCommit();
     setConfig({ taskState: { activeIssueNumber: issueNumber, baseCommit } });
@@ -1754,7 +1774,7 @@ var definition10 = {
   type: "function",
   function: {
     name: "accept",
-    description: "Accept an in-review task: merges the PR into the configured base branch and closes the issue.",
+    description: "Accept an in-review task: merges the PR into your worker branch and closes the issue.",
     parameters: {
       type: "object",
       properties: {
@@ -1807,11 +1827,11 @@ async function run10(input, config) {
   if (issue.author && issue.author !== me2) {
     return `Permission denied: only the task author (@${issue.author}) can accept task #${issueNumber}.`;
   }
-  const baseBranch = config.github.baseBranch ?? "main";
+  const targetBranch = makeWorkerBranchName(me2);
   let confirmed;
   try {
     confirmed = await select6({
-      message: `Merge PR for #${issueNumber} into ${chalk9.cyan(baseBranch)} and close issue?`,
+      message: `Merge PR for #${issueNumber} into ${chalk9.cyan(targetBranch)} and close issue?`,
       choices: [
         { name: "Yes, accept", value: true },
         { name: "Cancel", value: false }
@@ -1824,9 +1844,9 @@ async function run10(input, config) {
   const spinner = ora8(`Merging PR for #${issueNumber}\u2026`).start();
   try {
     const result = await acceptTask(config, issueNumber);
-    spinner.succeed(`PR #${result.prNumber} merged into ${baseBranch}`);
+    spinner.succeed(`PR #${result.prNumber} merged into ${targetBranch}`);
     return `Task #${issueNumber} accepted.
-PR #${result.prNumber} merged \u2192 ${baseBranch}
+PR #${result.prNumber} merged \u2192 ${targetBranch}
 Issue closed.`;
   } catch (err) {
     spinner.fail("Failed");
@@ -1842,13 +1862,13 @@ async function execute10(input, config) {
   if (issue.author && issue.author !== me) {
     return `Permission denied: only the task author (@${issue.author}) can accept task #${issueNumber}.`;
   }
+  const targetBranch = makeWorkerBranchName(me);
   const spinner = ora8(`Merging PR for #${issueNumber}\u2026`).start();
   try {
     const result = await acceptTask(config, issueNumber);
     spinner.stop();
-    const baseBranch = config.github.baseBranch ?? "main";
     return `Task #${issueNumber} accepted.
-PR #${result.prNumber} merged \u2192 ${baseBranch}
+PR #${result.prNumber} merged \u2192 ${targetBranch}
 Issue closed.`;
   } catch (err) {
     spinner.stop();
@@ -2076,7 +2096,7 @@ var definition15 = {
 async function execute15(_input, _config) {
   const spinner = ora11("Reading git diff...").start();
   try {
-    const diff = await getDiff(_config.github.baseBranch);
+    const diff = await getDiff();
     spinner.stop();
     return diff;
   } catch (err) {

package/package.json

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