techunter 0.1.11 → 1.0.0

package/dist/index.js

@@ -39,12 +39,20 @@ __export(github_exports, {
   createTask: () => createTask,
   editTask: () => editTask,
   embedBaseCommit: () => embedBaseCommit,
+  embedTargetBranch: () => embedTargetBranch,
   ensureLabels: () => ensureLabels,
+  ensureRemoteBranch: () => ensureRemoteBranch,
   extractBaseCommit: () => extractBaseCommit,
+  extractTargetBranch: () => extractTargetBranch,
   formatGuideAsMarkdown: () => formatGuideAsMarkdown,
   getAuthenticatedUser: () => getAuthenticatedUser,
   getDefaultBranch: () => getDefaultBranch,
+  getIssueNumberFromBranch: () => getIssueNumberFromBranch,
+  getOpenSubtasks: () => getOpenSubtasks,
+  getRepoFile: () => getRepoFile,
   getTask: () => getTask,
+  getTaskPR: () => getTaskPR,
+  getTaskPRDiff: () => getTaskPRDiff,
   isCollaborator: () => isCollaborator,
   listComments: () => listComments,
   listMyTasks: () => listMyTasks,
@@ -54,7 +62,8 @@ __export(github_exports, {
   mergeWorkerIntoBase: () => mergeWorkerIntoBase,
   postComment: () => postComment,
   postGuideComment: () => postGuideComment,
-  rejectTask: () => rejectTask
+  rejectTask: () => rejectTask,
+  upsertRepoFile: () => upsertRepoFile
 });
 import { Octokit } from "@octokit/rest";
 import { fetch as undiciFetch } from "undici";
@@ -117,11 +126,22 @@ function extractBaseCommit(body) {
   const match = body.match(/<!-- techunter-base:([a-f0-9]{7,40}) -->/);
   return match?.[1] ?? null;
 }
-async function createTask(config, title, body, baseCommit) {
+function embedTargetBranch(body, branch) {
+  return `${body}
+${TARGET_BRANCH_MARKER}${branch} -->`;
+}
+function extractTargetBranch(body) {
+  if (!body) return null;
+  const match = body.match(/<!-- techunter-target:([^\s>]+) -->/);
+  return match?.[1] ?? null;
+}
+async function createTask(config, title, body, baseCommit, targetBranch) {
   const octokit = createOctokit(config.githubToken);
   const { owner, repo } = config.github;
   await ensureLabels(config);
-  const finalBody = baseCommit ? embedBaseCommit(body ?? "", baseCommit) : body;
+  let finalBody = body ?? "";
+  if (baseCommit) finalBody = embedBaseCommit(finalBody, baseCommit);
+  if (targetBranch) finalBody = embedTargetBranch(finalBody, targetBranch);
   const { data } = await octokit.issues.create({
     owner,
     repo,
@@ -134,13 +154,22 @@ async function createTask(config, title, body, baseCommit) {
 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}`
-  });
+  try {
+    await octokit.repos.merge({
+      owner,
+      repo,
+      base: baseBranch,
+      head: workerBranch,
+      commit_message: `chore: merge ${workerBranch} into ${baseBranch}`
+    });
+  } catch (err) {
+    if (err.status === 409) {
+      throw new Error(
+        `Merge conflict: ${workerBranch} cannot be merged into ${baseBranch} cleanly. Resolve conflicts manually.`
+      );
+    }
+    throw err;
+  }
 }
 async function claimTask(config, number, username) {
   const octokit = createOctokit(config.githubToken);
@@ -216,6 +245,23 @@ async function postGuideComment(config, number, guide) {
     body
   });
 }
+async function ensureRemoteBranch(config, branchName, fallbackBase) {
+  const octokit = createOctokit(config.githubToken);
+  const { owner, repo } = config.github;
+  try {
+    await octokit.repos.getBranch({ owner, repo, branch: branchName });
+    return;
+  } catch (err) {
+    if (err.status !== 404) throw err;
+  }
+  const { data: baseRef } = await octokit.repos.getBranch({ owner, repo, branch: fallbackBase });
+  await octokit.git.createRef({
+    owner,
+    repo,
+    ref: `refs/heads/${branchName}`,
+    sha: baseRef.commit.sha
+  });
+}
 async function createPR(config, title, body, branch, base) {
   const octokit = createOctokit(config.githubToken);
   const { owner, repo } = config.github;
@@ -232,14 +278,11 @@ async function createPR(config, title, body, branch, base) {
 async function markInReview(config, number) {
   const octokit = createOctokit(config.githubToken);
   const { owner, repo } = config.github;
-  try {
-    await octokit.issues.removeLabel({
-      owner,
-      repo,
-      issue_number: number,
-      name: LABEL_CLAIMED
-    });
-  } catch {
+  for (const label of [LABEL_CLAIMED, LABEL_CHANGES_NEEDED]) {
+    try {
+      await octokit.issues.removeLabel({ owner, repo, issue_number: number, name: label });
+    } catch {
+    }
   }
   await octokit.issues.addLabels({
     owner,
@@ -354,28 +397,115 @@ async function editTask(config, number, title, body) {
   const { owner, repo } = config.github;
   await octokit.issues.update({ owner, repo, issue_number: number, title, body });
 }
+async function upsertRepoFile(config, filePath, content, message) {
+  const octokit = createOctokit(config.githubToken);
+  const { owner, repo } = config.github;
+  let sha;
+  try {
+    const { data: data2 } = await octokit.repos.getContent({ owner, repo, path: filePath });
+    if (!Array.isArray(data2) && data2.type === "file") {
+      sha = data2.sha;
+    }
+  } catch {
+  }
+  const { data } = await octokit.repos.createOrUpdateFileContents({
+    owner,
+    repo,
+    path: filePath,
+    message,
+    content: Buffer.from(content, "utf-8").toString("base64"),
+    ...sha ? { sha } : {}
+  });
+  return data.content?.html_url ?? `https://github.com/${owner}/${repo}/blob/main/${filePath}`;
+}
+async function getRepoFile(config, filePath) {
+  const octokit = createOctokit(config.githubToken);
+  const { owner, repo } = config.github;
+  try {
+    const { data } = await octokit.repos.getContent({ owner, repo, path: filePath });
+    if (!Array.isArray(data) && data.type === "file" && "content" in data) {
+      return Buffer.from(data.content, "base64").toString("utf-8");
+    }
+    return null;
+  } catch {
+    return null;
+  }
+}
 async function getDefaultBranch(config) {
   const octokit = createOctokit(config.githubToken);
   const { owner, repo } = config.github;
   const { data } = await octokit.repos.get({ owner, repo });
   return data.default_branch;
 }
-async function acceptTask(config, issueNumber, headBranch) {
+async function getTaskPR(config, issueNumber) {
   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 = 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({
+  const pr = prs.find(
+    (p) => new RegExp(`Closes #${issueNumber}\\b`, "i").test(p.body ?? "")
+  );
+  if (!pr) return null;
+  return { number: pr.number, url: pr.html_url, body: pr.body ?? "", baseBranch: pr.base.ref };
+}
+async function getOpenSubtasks(config, targetBranch) {
+  const octokit = createOctokit(config.githubToken);
+  const { owner, repo } = config.github;
+  const { data } = await octokit.issues.listForRepo({
+    owner,
+    repo,
+    state: "open",
+    per_page: 100
+  });
+  return data.filter((issue) => !issue.pull_request).filter((issue) => extractTargetBranch(issue.body ?? null) === targetBranch).map((issue) => issue.number);
+}
+async function getIssueNumberFromBranch(config, branch) {
+  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 === branch);
+  if (!pr) return null;
+  const match = (pr.body ?? "").match(/Closes #(\d+)/i);
+  if (!match) return null;
+  return { issueNumber: parseInt(match[1], 10), prUrl: pr.html_url };
+}
+async function getTaskPRDiff(config, prNumber) {
+  const octokit = createOctokit(config.githubToken);
+  const { owner, repo } = config.github;
+  const response = await octokit.pulls.get({
     owner,
     repo,
-    pull_number: pr.number,
-    merge_method: "merge"
+    pull_number: prNumber,
+    mediaType: { format: "diff" }
   });
-  await closeTask(config, issueNumber);
-  return { prNumber: pr.number, prUrl: pr.html_url, sha: merge.sha ?? "" };
+  return response.data;
+}
+async function acceptTask(config, issueNumber) {
+  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) => new RegExp(`Closes #${issueNumber}\\b`, "i").test(p.body ?? "")
+  );
+  if (!pr) throw new Error(`No open PR found for task #${issueNumber}`);
+  try {
+    const { data: merge } = await octokit.pulls.merge({
+      owner,
+      repo,
+      pull_number: pr.number,
+      merge_method: "merge"
+    });
+    await closeTask(config, issueNumber);
+    return { prNumber: pr.number, prUrl: pr.html_url, sha: merge.sha ?? "", baseBranch: pr.base.ref };
+  } catch (err) {
+    if (err.status === 405) {
+      throw new Error(
+        `PR #${pr.number} cannot be merged \u2014 may have conflicts or is not in a mergeable state.`
+      );
+    }
+    throw err;
+  }
 }
-var LABEL_AVAILABLE, LABEL_CLAIMED, LABEL_IN_REVIEW, LABEL_CHANGES_NEEDED, LABELS, TECHUNTER_LABELS, BASE_COMMIT_MARKER;
+var LABEL_AVAILABLE, LABEL_CLAIMED, LABEL_IN_REVIEW, LABEL_CHANGES_NEEDED, LABELS, TECHUNTER_LABELS, BASE_COMMIT_MARKER, TARGET_BRANCH_MARKER;
 var init_github = __esm({
   "src/lib/github.ts"() {
     "use strict";
@@ -392,19 +522,20 @@ var init_github = __esm({
     ];
     TECHUNTER_LABELS = /* @__PURE__ */ new Set([LABEL_AVAILABLE, LABEL_CLAIMED, LABEL_IN_REVIEW, LABEL_CHANGES_NEEDED]);
     BASE_COMMIT_MARKER = "<!-- techunter-base:";
+    TARGET_BRANCH_MARKER = "<!-- techunter-target:";
   }
 });
 
 // src/index.ts
-import chalk14 from "chalk";
+import chalk17 from "chalk";
 import readline from "readline";
 import { createRequire } from "module";
 
 // src/commands/init.ts
-import { input, password, select } from "@inquirer/prompts";
-import chalk2 from "chalk";
-import ora from "ora";
-import open from "open";
+import { input, password, select as select11 } from "@inquirer/prompts";
+import chalk13 from "chalk";
+import ora14 from "ora";
+import open2 from "open";
 import { createOAuthDeviceAuth } from "@octokit/auth-oauth-device";
 
 // src/lib/config.ts
@@ -423,7 +554,8 @@ var configSchema = z.object({
   }),
   taskState: z.object({
     activeIssueNumber: z.number().optional(),
-    baseCommit: z.string().optional()
+    baseCommit: z.string().optional(),
+    activeBranch: z.string().optional()
   }).optional()
 });
 var store = new Conf({
@@ -510,14 +642,21 @@ function parseOwnerRepo(remoteUrl) {
   }
   return null;
 }
-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}`;
 }
+function makeTaskBranchName(issueNumber, username) {
+  const slug = username.toLowerCase().replace(/[^a-z0-9-]/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "") || "user";
+  return `task-${issueNumber}-${slug}`;
+}
+function isTaskBranch(branch) {
+  return /^task-\d+-/.test(branch);
+}
+function parseIssueNumberFromBranch(branch) {
+  const match = branch.match(/^task-(\d+)-/);
+  return match ? parseInt(match[1], 10) : null;
+}
 async function getCurrentCommit() {
   return (await git.revparse(["HEAD"])).trim();
 }
@@ -638,16 +777,27 @@ 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) {
+async function checkoutFromCommit(branchName, sha) {
+  const branches = await git.branch(["-a"]);
+  const exists = Object.keys(branches.branches).some(
+    (b) => b === branchName || b === `remotes/origin/${branchName}`
+  );
+  if (exists) {
     await git.checkout(branchName);
-    await git.reset(["--hard", sha]);
   } else {
     await git.checkoutBranch(branchName, sha);
   }
 }
+async function hasUncommittedChanges() {
+  const status = await git.status();
+  return !status.isClean();
+}
+async function stash(message) {
+  await git.stash(["push", "-u", "-m", message]);
+}
+async function stashPop() {
+  await git.stash(["pop"]);
+}
 
 // src/lib/client.ts
 init_proxy();
@@ -665,349 +815,165 @@ function getModel(config) {
   return config.aiModel ?? DEFAULT_MODEL;
 }
 
-// src/commands/init.ts
-async function getGitHubTokenViaPAT() {
-  console.log(chalk2.dim("\n  Create a token at: https://github.com/settings/tokens/new"));
-  console.log(chalk2.dim("  Required scopes: repo, read:user\n"));
-  const token = await password({
-    message: "GitHub Personal Access Token:",
-    mask: "*"
-  });
-  return { token: token.trim() };
+// src/tools/pick/index.ts
+var pick_exports = {};
+__export(pick_exports, {
+  definition: () => definition3,
+  execute: () => execute3,
+  run: () => run3,
+  terminal: () => terminal3
+});
+init_github();
+import chalk5 from "chalk";
+import ora3 from "ora";
+import { select as select3 } from "@inquirer/prompts";
+init_github();
+
+// src/lib/markdown.ts
+import { marked } from "marked";
+import { markedTerminal } from "marked-terminal";
+marked.use(markedTerminal({ showSectionPrefix: false }));
+function renderMarkdown(text) {
+  return marked(text);
 }
-var OAUTH_CLIENT_ID = "Ov23liW4zJ4r2RdZOsCJ";
-async function getGitHubTokenViaDeviceFlow() {
-  let verificationUri = "";
-  let userCode = "";
-  const auth = createOAuthDeviceAuth({
-    clientType: "oauth-app",
-    clientId: OAUTH_CLIENT_ID,
-    scopes: ["repo"],
-    onVerification(verification) {
-      verificationUri = verification.verification_uri;
-      userCode = verification.user_code;
-      console.log("");
-      console.log(chalk2.bold("  1. Open this URL in your browser:"));
-      console.log("     " + chalk2.cyan(verificationUri));
-      console.log("");
-      console.log(chalk2.bold("  2. Enter this code:"));
-      console.log("     " + chalk2.yellow.bold(userCode));
-      console.log("");
-      open(verificationUri).catch(() => {
-      });
-    }
-  });
-  const spinner = ora("Waiting for authorization in browser...").start();
-  let token;
+
+// src/lib/display.ts
+init_github();
+import chalk2 from "chalk";
+var LABEL_AVAILABLE2 = "techunter:available";
+var LABEL_CLAIMED2 = "techunter:claimed";
+var LABEL_IN_REVIEW2 = "techunter:in-review";
+var LABEL_CHANGES_NEEDED2 = "techunter:changes-needed";
+function getStatus(issue) {
+  if (issue.labels.includes(LABEL_CHANGES_NEEDED2)) return "changes-needed";
+  if (issue.labels.includes(LABEL_IN_REVIEW2)) return "in-review";
+  if (issue.labels.includes(LABEL_CLAIMED2)) return "claimed";
+  if (issue.labels.includes(LABEL_AVAILABLE2)) return "available";
+  return "unknown";
+}
+function colorStatus(status) {
+  const padded = status.padEnd(14);
+  switch (status) {
+    case "available":
+      return chalk2.green(padded);
+    case "claimed":
+      return chalk2.yellow(padded);
+    case "in-review":
+      return chalk2.blue(padded);
+    case "changes-needed":
+      return chalk2.red(padded);
+    default:
+      return padded;
+  }
+}
+function parentIssueFromBranch(branch) {
+  if (!isTaskBranch(branch)) return null;
+  const match = branch.match(/^task-(\d+)-/);
+  return match ? parseInt(match[1], 10) : null;
+}
+function getParentIssueNumber(issue) {
+  const target = extractTargetBranch(issue.body);
+  if (!target) return null;
+  return parentIssueFromBranch(target);
+}
+function printTaskDetail(issue) {
+  const divider = chalk2.dim("\u2500".repeat(70));
+  const parentNum = getParentIssueNumber(issue);
+  console.log("\n" + divider);
+  console.log(
+    chalk2.bold(` #${issue.number}`) + "  " + colorStatus(getStatus(issue)) + "  " + chalk2.dim(issue.assignee ? `@${issue.assignee}` : "\u2014") + (parentNum ? chalk2.dim(`  sub-task of #${parentNum}`) : "")
+  );
+  console.log(chalk2.bold("\n " + issue.title));
+  if (issue.body) {
+    console.log("");
+    console.log(renderMarkdown(issue.body));
+  }
+  console.log("\n " + chalk2.dim(issue.htmlUrl));
+  console.log(divider + "\n");
+}
+async function printTaskList(config) {
   try {
-    const result = await auth({ type: "oauth" });
-    token = result.token;
-    spinner.succeed("Authorized!");
+    const tasks = await listTasks(config);
+    const divider = chalk2.dim("\u2500".repeat(70));
+    console.log("");
+    console.log(chalk2.dim(" " + "#".padEnd(5) + "Status".padEnd(14) + "Assignee".padEnd(16) + "Title"));
+    console.log(divider);
+    if (tasks.length === 0) {
+      console.log(chalk2.dim("  (no tasks)"));
+    } else {
+      let printTask2 = function(t, indent, connector, isLast) {
+        const num = `#${t.number}`.padEnd(5);
+        const status = colorStatus(getStatus(t));
+        const assignee = (t.assignee ? `@${t.assignee}` : "\u2014").padEnd(16);
+        const fullPrefix = indent + connector;
+        const maxTitle = 36 - fullPrefix.length;
+        const title = t.title.length > maxTitle ? t.title.slice(0, maxTitle - 3) + "..." : t.title;
+        console.log(` ${num}${status}${assignee}${chalk2.dim(fullPrefix)}${title}`);
+        const children = childrenOf.get(t.number) ?? [];
+        const childIndent = indent + (isLast ? "   " : "\u2502  ");
+        for (let i = 0; i < children.length; i++) {
+          const childIsLast = i === children.length - 1;
+          printTask2(children[i], childIndent, childIsLast ? "\u2514\u2500 " : "\u251C\u2500 ", childIsLast);
+        }
+      };
+      var printTask = printTask2;
+      const taskMap = new Map(tasks.map((t) => [t.number, t]));
+      const childrenOf = /* @__PURE__ */ new Map();
+      for (const t of tasks) {
+        const parentNum = getParentIssueNumber(t);
+        const key = parentNum !== null && taskMap.has(parentNum) ? parentNum : null;
+        if (!childrenOf.has(key)) childrenOf.set(key, []);
+        childrenOf.get(key).push(t);
+      }
+      const roots = childrenOf.get(null) ?? [];
+      for (let i = 0; i < roots.length; i++) {
+        const isLast = i === roots.length - 1;
+        printTask2(roots[i], "", isLast ? "\u2514\u2500 " : "\u251C\u2500 ", isLast);
+      }
+    }
+    console.log(divider);
+    return tasks;
   } catch (err) {
-    spinner.fail("Authorization failed");
-    throw err;
+    console.log(chalk2.yellow(`(Could not load tasks: ${err.message})`));
+    return [];
   }
-  return { token, clientId: OAUTH_CLIENT_ID };
 }
-async function initCommand() {
-  console.log(chalk2.bold.cyan("\nTechunter \u2014 Initial Setup\n"));
-  let detectedOwner = "";
-  let detectedRepo = "";
-  const remoteUrl = await getRemoteUrl();
-  if (remoteUrl) {
-    const parsed = parseOwnerRepo(remoteUrl);
-    if (parsed) {
-      detectedOwner = parsed.owner;
-      detectedRepo = parsed.repo;
-      console.log(chalk2.dim(`Detected GitHub repo: ${detectedOwner}/${detectedRepo}
-`));
+async function printMyTasks(config) {
+  try {
+    const me = await getAuthenticatedUser(config);
+    const tasks = await listMyTasks(config, me);
+    if (tasks.length === 0) return;
+    const divider = chalk2.dim("\u2500".repeat(70));
+    console.log("");
+    console.log(chalk2.dim(" " + "#".padEnd(5) + "Status".padEnd(14) + `My Tasks  @${me}`));
+    console.log(divider);
+    for (const t of tasks) {
+      const num = `#${t.number}`.padEnd(5);
+      const status = colorStatus(getStatus(t));
+      const parentNum = getParentIssueNumber(t);
+      const parentTag = parentNum ? chalk2.dim(` (sub of #${parentNum})`) : "";
+      const maxTitle = parentNum ? 34 : 46;
+      const title = t.title.length > maxTitle ? t.title.slice(0, maxTitle - 3) + "..." : t.title;
+      console.log(` ${num}${status}${title}${parentTag}`);
     }
-  }
-  const authMethod = await select({
-    message: "How would you like to authenticate with GitHub?",
-    choices: [
-      {
-        name: "Browser login (OAuth) \u2014 open a URL and click Authorize",
-        value: "device"
-      },
-      {
-        name: "Personal Access Token (PAT) \u2014 paste a token from github.com/settings/tokens",
-        value: "pat"
-      }
-    ]
-  });
-  let githubToken;
-  let githubClientId;
-  if (authMethod === "device") {
-    const result = await getGitHubTokenViaDeviceFlow();
-    githubToken = result.token;
-    githubClientId = result.clientId;
-  } else {
-    const result = await getGitHubTokenViaPAT();
-    githubToken = result.token;
-  }
-  const providerChoice = await select({
-    message: "AI provider:",
-    choices: [
-      { name: `OpenRouter (recommended)  ${chalk2.dim(`${DEFAULT_BASE_URL}  \xB7  ${DEFAULT_MODEL}`)}`, value: "openrouter" },
-      { name: "Custom (specify base URL and model)", value: "custom" }
-    ]
-  });
-  let aiBaseUrl;
-  let aiModel;
-  if (providerChoice === "custom") {
-    aiBaseUrl = (await input({ message: "API base URL:", default: DEFAULT_BASE_URL })).trim();
-    aiModel = (await input({ message: "Model name:", default: DEFAULT_MODEL })).trim();
-  }
-  const apiKeyHint = providerChoice === "openrouter" ? chalk2.dim("  Get a key at: https://openrouter.ai/settings/keys\n") : chalk2.dim("  API key for your provider\n");
-  console.log(apiKeyHint);
-  const aiApiKey = await password({
-    message: "API Key:",
-    mask: "*"
-  });
-  let owner = detectedOwner;
-  let repo = detectedRepo;
-  if (!owner || !repo) {
-    owner = await input({
-      message: "GitHub repo owner (user or org):",
-      required: true
-    });
-    repo = await input({
-      message: "GitHub repo name:",
-      required: true
-    });
-  }
-  const config = {
-    githubToken,
-    githubClientId,
-    aiApiKey: aiApiKey.trim(),
-    ...aiBaseUrl ? { aiBaseUrl } : {},
-    ...aiModel ? { aiModel } : {},
-    github: {
-      owner: owner.trim(),
-      repo: repo.trim()
-    }
-  };
-  setConfig(config);
-  const spinner = ora("Setting up GitHub labels...").start();
-  try {
-    await ensureLabels(config);
-    spinner.succeed("GitHub labels created");
-  } catch (err) {
-    spinner.fail("Failed to create labels (check token permissions)");
-    console.error(chalk2.red(String(err)));
-  }
-  console.log(chalk2.green("\nSetup complete!"));
-  console.log(chalk2.dim(`Config saved to: ${getConfigPath()}
-`));
-}
-
-// src/commands/config.ts
-import { input as input2, password as password2, select as select2 } from "@inquirer/prompts";
-import chalk3 from "chalk";
-async function configCommand() {
-  let config;
-  try {
-    config = getConfig();
-  } catch {
-    console.error(chalk3.red("No config found. Run `tch init` first."));
-    process.exit(1);
-  }
-  console.log(chalk3.bold.cyan("\nTechunter \u2014 Settings\n"));
-  console.log(chalk3.dim(`Config file: ${getConfigPath()}
-`));
-  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" },
-      { name: `GitHub Token         ${chalk3.dim("(hidden)")}`, value: "githubToken" },
-      { name: "Cancel", value: "cancel" }
-    ]
-  });
-  if (field === "cancel") return;
-  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() } });
-    console.log(chalk3.green(`
-Repo set to: ${owner.trim()}/${repo.trim()}
-`));
-  } else if (field === "aiBaseUrl") {
-    const val = await input2({ message: "AI base URL:", default: currentBaseUrl });
-    if (val.trim()) {
-      setConfig({ aiBaseUrl: val.trim() });
-      console.log(chalk3.green(`
-AI base URL set to: ${val.trim()}
-`));
-    }
-  } else if (field === "aiModel") {
-    const val = await input2({ message: "AI model name:", default: currentModel });
-    if (val.trim()) {
-      setConfig({ aiModel: val.trim() });
-      console.log(chalk3.green(`
-AI model set to: ${val.trim()}
-`));
-    }
-  } else if (field === "aiApiKey") {
-    const val = await password2({ message: "New AI API Key:", mask: "*" });
-    if (val.trim()) {
-      setConfig({ aiApiKey: val.trim() });
-      console.log(chalk3.green("\nAI API Key updated.\n"));
-    }
-  } else if (field === "githubToken") {
-    const val = await password2({ message: "New GitHub Token:", mask: "*" });
-    if (val.trim()) {
-      setConfig({ githubToken: val.trim() });
-      console.log(chalk3.green("\nGitHub Token updated.\n"));
-    }
-  }
-}
-
-// src/index.ts
-init_github();
-
-// src/lib/agent.ts
-import ora14 from "ora";
-import chalk13 from "chalk";
-
-// src/tools/pick/index.ts
-var pick_exports = {};
-__export(pick_exports, {
-  definition: () => definition3,
-  execute: () => execute3,
-  run: () => run3,
-  terminal: () => terminal3
-});
-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";
-import { markedTerminal } from "marked-terminal";
-marked.use(markedTerminal({ showSectionPrefix: false }));
-function renderMarkdown(text) {
-  return marked(text);
-}
-
-// src/lib/display.ts
-init_github();
-import chalk4 from "chalk";
-var LABEL_AVAILABLE2 = "techunter:available";
-var LABEL_CLAIMED2 = "techunter:claimed";
-var LABEL_IN_REVIEW2 = "techunter:in-review";
-var LABEL_CHANGES_NEEDED2 = "techunter:changes-needed";
-function getStatus(issue) {
-  if (issue.labels.includes(LABEL_CHANGES_NEEDED2)) return "changes-needed";
-  if (issue.labels.includes(LABEL_IN_REVIEW2)) return "in-review";
-  if (issue.labels.includes(LABEL_CLAIMED2)) return "claimed";
-  if (issue.labels.includes(LABEL_AVAILABLE2)) return "available";
-  return "unknown";
-}
-function colorStatus(status) {
-  const padded = status.padEnd(14);
-  switch (status) {
-    case "available":
-      return chalk4.green(padded);
-    case "claimed":
-      return chalk4.yellow(padded);
-    case "in-review":
-      return chalk4.blue(padded);
-    case "changes-needed":
-      return chalk4.red(padded);
-    default:
-      return padded;
-  }
-}
-function printTaskDetail(issue) {
-  const divider = chalk4.dim("\u2500".repeat(70));
-  console.log("\n" + divider);
-  console.log(
-    chalk4.bold(` #${issue.number}`) + "  " + colorStatus(getStatus(issue)) + "  " + chalk4.dim(issue.assignee ? `@${issue.assignee}` : "\u2014")
-  );
-  console.log(chalk4.bold("\n " + issue.title));
-  if (issue.body) {
-    console.log("");
-    console.log(renderMarkdown(issue.body));
-  }
-  console.log("\n " + chalk4.dim(issue.htmlUrl));
-  console.log(divider + "\n");
-}
-async function printTaskList(config) {
-  try {
-    const tasks = await listTasks(config);
-    const divider = chalk4.dim("\u2500".repeat(70));
-    console.log("");
-    console.log(chalk4.dim(" " + "#".padEnd(5) + "Status".padEnd(14) + "Assignee".padEnd(16) + "Title"));
-    console.log(divider);
-    if (tasks.length === 0) {
-      console.log(chalk4.dim("  (no tasks)"));
-    } else {
-      for (const t of tasks) {
-        const num = `#${t.number}`.padEnd(5);
-        const status = colorStatus(getStatus(t));
-        const assignee = (t.assignee ? `@${t.assignee}` : "\u2014").padEnd(16);
-        const title = t.title.length > 36 ? t.title.slice(0, 33) + "..." : t.title;
-        console.log(` ${num}${status}${assignee}${title}`);
-      }
-    }
-    console.log(divider);
-    return tasks;
-  } catch (err) {
-    console.log(chalk4.yellow(`(Could not load tasks: ${err.message})`));
-    return [];
-  }
-}
-async function printMyTasks(config) {
-  try {
-    const me = await getAuthenticatedUser(config);
-    const tasks = await listMyTasks(config, me);
-    if (tasks.length === 0) return;
-    const divider = chalk4.dim("\u2500".repeat(70));
-    console.log("");
-    console.log(chalk4.dim(" " + "#".padEnd(5) + "Status".padEnd(14) + `My Tasks  @${me}`));
-    console.log(divider);
-    for (const t of tasks) {
-      const num = `#${t.number}`.padEnd(5);
-      const status = colorStatus(getStatus(t));
-      const title = t.title.length > 46 ? t.title.slice(0, 43) + "..." : t.title;
-      console.log(` ${num}${status}${title}`);
-    }
-    console.log(divider);
-    const rejectedTasks = tasks.filter((t) => t.labels.includes(LABEL_CHANGES_NEEDED2));
-    if (rejectedTasks.length > 0) {
-      let currentBranch = "";
-      try {
-        currentBranch = await getCurrentBranch();
-      } catch {
+    console.log(divider);
+    const rejectedTasks = tasks.filter((t) => t.labels.includes(LABEL_CHANGES_NEEDED2));
+    if (rejectedTasks.length > 0) {
+      let currentBranch = "";
+      try {
+        currentBranch = await getCurrentBranch();
+      } catch {
       }
       console.log("");
       for (const t of rejectedTasks) {
-        const expectedBranch = makeBranchName(t.number, t.title);
-        const onCorrectBranch = currentBranch === expectedBranch;
+        const taskBranch = t.assignee ? makeTaskBranchName(t.number, t.assignee) : `task-${t.number}`;
+        const onCorrectBranch = currentBranch === taskBranch;
         console.log(
-          chalk4.red.bold("  \u26A0 Changes requested") + chalk4.red(` on #${t.number} "${t.title}"`)
+          chalk2.red.bold("  \u26A0 Changes requested") + chalk2.red(` on #${t.number} "${t.title}"`)
         );
         if (!onCorrectBranch) {
           console.log(
-            chalk4.dim("    Switch branch: ") + chalk4.cyan(`git checkout ${expectedBranch}`)
+            chalk2.dim("    Switch branch: ") + chalk2.cyan(`git checkout ${taskBranch}`)
           );
         }
       }
@@ -1019,7 +985,7 @@ async function printMyTasks(config) {
 
 // src/lib/launch.ts
 import { spawn } from "child_process";
-import chalk5 from "chalk";
+import chalk3 from "chalk";
 function buildClaudePrompt(issue, branch) {
   const lines = [
     `You are working on task #${issue.number}: ${issue.title}`,
@@ -1035,14 +1001,14 @@ function buildClaudePrompt(issue, branch) {
 }
 async function launchClaudeCode(issue, branch) {
   const prompt = buildClaudePrompt(issue, branch);
-  console.log(chalk5.dim("\n  Launching Claude Code\u2026\n"));
+  console.log(chalk3.dim("\n  Launching Claude Code\u2026\n"));
   await new Promise((resolve) => {
     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(
-        chalk5.yellow(
+        chalk3.yellow(
           "  Could not launch claude. Make sure Claude Code is installed:\n  npm install -g @anthropic-ai/claude-code"
         )
       );
@@ -1060,78 +1026,9 @@ __export(submit_exports, {
   terminal: () => terminal
 });
 init_github();
-import chalk7 from "chalk";
-import ora2 from "ora";
-import { select as select3, input as promptInput } from "@inquirer/prompts";
-
-// src/lib/agent-ui.ts
-import chalk6 from "chalk";
-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]`;
-      return `${k}="${v}"`;
-    }
-    return `${k}=${JSON.stringify(v)}`;
-  }).join("  ");
-}
-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, input3) {
-  const params = formatInput(input3);
-  console.log(`  ${chalk6.cyan("\u2192")} ${chalk6.bold(name)}${params ? "  " + chalk6.dim(params) : ""}`);
-}
-function printToolResult(result) {
-  const ok = !result.startsWith("Error:");
-  const icon = ok ? chalk6.green("\u2713") : chalk6.red("\u2717");
-  console.log(`  ${icon} ${chalk6.dim(summarize(result))}`);
-}
-
-// src/lib/sub-agent.ts
-async function runSubAgentLoop(config, systemPrompt, userMessage, toolNames) {
-  const client = createClient(config);
-  const selected = toolModules.filter((m) => toolNames.includes(m.definition.function.name));
-  const tools2 = selected.map((m) => m.definition);
-  const messages = [
-    { role: "system", content: systemPrompt },
-    { role: "user", content: userMessage }
-  ];
-  const MAX_ITERATIONS = 100;
-  let iterations = 0;
-  for (; ; ) {
-    if (++iterations > MAX_ITERATIONS) {
-      throw new Error(`Sub-agent exceeded ${MAX_ITERATIONS} iterations without finishing.`);
-    }
-    const res = await client.chat.completions.create({ model: getModel(config), tools: tools2, messages });
-    const choice = res.choices[0];
-    messages.push({
-      role: "assistant",
-      content: choice.message.content ?? null,
-      ...choice.message.tool_calls ? { tool_calls: choice.message.tool_calls } : {}
-    });
-    if (choice.finish_reason === "stop") {
-      return choice.message.content ?? "";
-    }
-    if (choice.finish_reason === "tool_calls") {
-      for (const tc of choice.message.tool_calls ?? []) {
-        let input3;
-        try {
-          input3 = JSON.parse(tc.function.arguments);
-        } catch {
-          input3 = {};
-        }
-        printToolCall(tc.function.name, input3);
-        const mod = selected.find((m) => m.definition.function.name === 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 });
-      }
-    }
-  }
-}
+import chalk4 from "chalk";
+import ora from "ora";
+import { select, input as promptInput } from "@inquirer/prompts";
 
 // src/tools/submit/prompts.ts
 var REVIEWER_SYSTEM_PROMPT = "You are a concise code reviewer. The diff provided shows all changes on this worker branch since the task was claimed. The branch is shared across tasks, so the diff may contain changes unrelated to this specific task \u2014 use the task title and acceptance criteria to identify which changes are relevant, and ignore the rest. Use run_command to run tests/lint if needed, and read_file to inspect specific files. Then output your review: for each acceptance criterion mark \u2705 met or \u274C not met with a one-line reason. End with an overall verdict line: Ready to submit / Not ready. Reply in the same language as the task.";
@@ -1169,11 +1066,21 @@ var definition = {
 };
 async function run(_input, config) {
   const taskState = getConfig().taskState;
-  const issueNumber = taskState?.activeIssueNumber;
+  const currentBranch = await getCurrentBranch();
+  let issueNumber = taskState?.activeIssueNumber && taskState?.activeBranch && currentBranch === taskState.activeBranch ? taskState.activeIssueNumber : void 0;
   if (!issueNumber) {
-    return "No active task found. Claim a task first with /pick.";
+    const fromBranch = parseIssueNumberFromBranch(currentBranch);
+    if (fromBranch) {
+      issueNumber = fromBranch;
+    } else {
+      const found = await getIssueNumberFromBranch(config, currentBranch);
+      if (!found) {
+        return "No active task found. Claim a task first with /pick.";
+      }
+      issueNumber = found.issueNumber;
+    }
   }
-  let spinner = ora2("Loading task and diff\u2026").start();
+  let spinner = ora("Loading task and diff\u2026").start();
   const diffPromise = taskState?.baseCommit ? getDiffFromCommit(taskState.baseCommit) : getDiff();
   const [issue, diff, me] = await Promise.all([
     getTask(config, issueNumber),
@@ -1181,12 +1088,19 @@ async function run(_input, config) {
     getAuthenticatedUser(config)
   ]);
   spinner.stop();
-  const workerBranch = makeWorkerBranchName(issue.author ?? me);
+  const targetBranch = extractTargetBranch(issue.body) ?? makeWorkerBranchName(issue.author ?? me);
   const branch = await getCurrentBranch();
   const isSelfSubmit = issue.author !== null && issue.author === me;
+  spinner = ora("Checking for open sub-tasks\u2026").start();
+  const openSubtaskNumbers = await getOpenSubtasks(config, branch);
+  spinner.stop();
+  if (openSubtaskNumbers.length > 0) {
+    return `Cannot submit: ${openSubtaskNumbers.length} sub-task(s) still open:
+` + openSubtaskNumbers.map((n) => `  - #${n}`).join("\n") + "\nComplete all sub-tasks before submitting.";
+  }
   let review = "";
   if (!isSelfSubmit) {
-    const reviewSpinner = ora2("Reviewing changes\u2026").start();
+    const reviewSpinner = ora("Reviewing changes\u2026").start();
     try {
       review = await reviewChanges(config, issueNumber, issue, diff);
     } catch (err) {
@@ -1194,19 +1108,19 @@ async function run(_input, config) {
     }
     reviewSpinner.stop();
   }
-  const divider = chalk7.dim("\u2500".repeat(70));
+  const divider = chalk4.dim("\u2500".repeat(70));
   console.log("\n" + divider);
   if (isSelfSubmit) {
-    console.log(chalk7.yellow(`  Self-submit detected \u2014 AI review skipped.`));
+    console.log(chalk4.yellow(`  Self-submit detected \u2014 AI review skipped.`));
   } else {
-    console.log(chalk7.bold(`  Review \u2014 task #${issueNumber} "${issue.title}"`));
+    console.log(chalk4.bold(`  Review \u2014 task #${issueNumber} "${issue.title}"`));
     console.log(divider);
     console.log(renderMarkdown(review));
   }
   console.log(divider + "\n");
   let shouldProceed;
   try {
-    shouldProceed = await select3({
+    shouldProceed = await select({
       message: `Submit task #${issueNumber}?`,
       choices: [
         { name: "Yes, submit", value: true },
@@ -1227,7 +1141,7 @@ async function run(_input, config) {
     return "Submit cancelled.";
   }
   if (!commitMessage.trim()) return "Submit cancelled.";
-  spinner = ora2("Committing and pushing\u2026").start();
+  spinner = ora("Committing and pushing\u2026").start();
   try {
     await stageAllAndCommit(commitMessage.trim());
     spinner.stop();
@@ -1236,52 +1150,71 @@ async function run(_input, config) {
     return `Commit failed: ${err.message}`;
   }
   if (isSelfSubmit) {
-    spinner = ora2("Closing issue\u2026").start();
+    spinner = ora("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}`));
+      console.error(chalk4.yellow(`Warning: failed to close issue: ${err.message}`));
     }
-    setConfig({ taskState: { activeIssueNumber: void 0, baseCommit: void 0 } });
+    setConfig({ taskState: { activeIssueNumber: void 0, baseCommit: void 0, activeBranch: void 0 } });
     return `Task #${issueNumber} committed and closed.
 Commit: "${commitMessage.trim()}"`;
   }
-  spinner = ora2("Creating pull request\u2026").start();
+  spinner = ora("Checking for existing PR\u2026").start();
+  const existingPR = await getTaskPR(config, issueNumber);
+  spinner.stop();
   let prUrl;
-  try {
-    const prBody = [
-      `Closes #${issueNumber}`,
-      issue.body ? `
+  if (existingPR) {
+    prUrl = existingPR.url;
+    console.log(chalk4.dim(`  Existing PR found: ${prUrl} \u2014 updating.`));
+  } else {
+    spinner = ora("Creating pull request\u2026").start();
+    try {
+      await ensureRemoteBranch(config, targetBranch, config.baseBranch ?? "main");
+      const prBody = [
+        `Closes #${issueNumber}`,
+        issue.body ? `
 ${issue.body}` : "",
-      review ? `
+        review ? `
 ## AI Review
 ${review}` : ""
-    ].join("\n").trim();
-    prUrl = await createPR(config, issue.title, prBody, branch, workerBranch);
-    spinner.stop();
-  } catch (err) {
-    spinner.stop();
-    return `Committed but PR creation failed: ${err.message}`;
+      ].join("\n").trim();
+      prUrl = await createPR(config, issue.title, prBody, branch, targetBranch);
+      spinner.stop();
+    } catch (err) {
+      spinner.stop();
+      return `Committed but PR creation failed: ${err.message}`;
+    }
   }
-  spinner = ora2("Marking as in-review\u2026").start();
+  spinner = ora("Marking as in-review\u2026").start();
   try {
     await markInReview(config, issueNumber);
     spinner.stop();
   } catch (err) {
     spinner.stop();
-    return `PR created (${prUrl}) but failed to update label: ${err.message}`;
+    return `PR ${existingPR ? "updated" : "created"} (${prUrl}) but failed to update label: ${err.message}`;
   }
-  setConfig({ taskState: { activeIssueNumber: void 0, baseCommit: void 0 } });
-  return `Task #${issueNumber} submitted.
+  setConfig({ taskState: { activeIssueNumber: void 0, baseCommit: void 0, activeBranch: void 0 } });
+  return `Task #${issueNumber} ${existingPR ? "re-submitted" : "submitted"}.
 Commit: "${commitMessage.trim()}"
 PR: ${prUrl}`;
 }
 async function execute(input3, config) {
   const taskState = getConfig().taskState;
-  const issueNumber = taskState?.activeIssueNumber;
-  if (!issueNumber) return "No active task found. Claim a task first.";
+  let issueNumber = taskState?.activeIssueNumber;
+  if (!issueNumber) {
+    const currentBranch = await getCurrentBranch();
+    const fromBranch = parseIssueNumberFromBranch(currentBranch);
+    if (fromBranch) {
+      issueNumber = fromBranch;
+    } else {
+      const found = await getIssueNumberFromBranch(config, currentBranch);
+      if (!found) return "No active task found. Claim a task first.";
+      issueNumber = found.issueNumber;
+    }
+  }
   const diffPromise = taskState?.baseCommit ? getDiffFromCommit(taskState.baseCommit) : getDiff();
   const [issue, diff, branch, me] = await Promise.all([
     getTask(config, issueNumber),
@@ -1289,7 +1222,11 @@ async function execute(input3, config) {
     getCurrentBranch(),
     getAuthenticatedUser(config)
   ]);
-  const workerBranch = makeWorkerBranchName(issue.author ?? me);
+  const targetBranch = extractTargetBranch(issue.body) ?? makeWorkerBranchName(issue.author ?? me);
+  const openSubtaskNumbers = await getOpenSubtasks(config, branch);
+  if (openSubtaskNumbers.length > 0) {
+    return `Cannot submit: ${openSubtaskNumbers.length} sub-task(s) still open: ` + openSubtaskNumbers.map((n) => `#${n}`).join(", ");
+  }
   const isSelfSubmit = issue.author !== null && issue.author === me;
   let review = "";
   if (!isSelfSubmit) {
@@ -1310,29 +1247,36 @@ async function execute(input3, config) {
       await closeTask(config, issueNumber);
     } catch {
     }
-    setConfig({ taskState: { activeIssueNumber: void 0, baseCommit: void 0 } });
+    setConfig({ taskState: { activeIssueNumber: void 0, baseCommit: void 0, activeBranch: void 0 } });
     return `Task #${issueNumber} committed and closed.
 Commit: "${commitMessage}"`;
   }
+  const existingPR = await getTaskPR(config, issueNumber);
   let prUrl;
-  try {
-    const prBody = [
-      `Closes #${issueNumber}`,
-      issue.body ? `
+  if (existingPR) {
+    prUrl = existingPR.url;
+  } else {
+    try {
+      await ensureRemoteBranch(config, targetBranch, config.baseBranch ?? "main");
+      const prBody = [
+        `Closes #${issueNumber}`,
+        issue.body ? `
 ${issue.body}` : "",
-      review ? `
+        review ? `
 ## AI Review
 ${review}` : ""
-    ].join("\n").trim();
-    prUrl = await createPR(config, issue.title, prBody, branch, workerBranch);
-  } catch (err) {
-    return `Committed but PR creation failed: ${err.message}`;
+      ].join("\n").trim();
+      prUrl = await createPR(config, issue.title, prBody, branch, targetBranch);
+    } catch (err) {
+      return `Committed but PR creation failed: ${err.message}`;
+    }
   }
   try {
     await markInReview(config, issueNumber);
   } catch {
   }
-  return `Task #${issueNumber} submitted.
+  setConfig({ taskState: { activeIssueNumber: void 0, baseCommit: void 0, activeBranch: void 0 } });
+  return `Task #${issueNumber} ${existingPR ? "re-submitted" : "submitted"}.
 Review:
 ${review}
 Commit: "${commitMessage}"
@@ -1349,8 +1293,8 @@ __export(close_exports, {
   terminal: () => terminal2
 });
 init_github();
-import { select as select4 } from "@inquirer/prompts";
-import ora3 from "ora";
+import { select as select2 } from "@inquirer/prompts";
+import ora2 from "ora";
 var definition2 = {
   type: "function",
   function: {
@@ -1376,7 +1320,7 @@ async function run2(input3, config) {
     }
     if (tasks.length === 0) return "No tasks found.";
     try {
-      issueNumber = await select4({
+      issueNumber = await select2({
         message: "Select task to close:",
         choices: tasks.map((t) => ({ name: `#${t.number}  [${getStatus(t)}]  ${t.title}`, value: t.number }))
       });
@@ -1386,7 +1330,7 @@ async function run2(input3, config) {
   }
   let confirmed;
   try {
-    confirmed = await select4({
+    confirmed = await select2({
       message: `Close task #${issueNumber}?`,
       choices: [
         { name: "Yes, close it", value: true },
@@ -1397,7 +1341,7 @@ async function run2(input3, config) {
     return "Cancelled.";
   }
   if (!confirmed) return "Cancelled.";
-  const spinner = ora3(`Closing #${issueNumber}\u2026`).start();
+  const spinner = ora2(`Closing #${issueNumber}\u2026`).start();
   try {
     await closeTask(config, issueNumber);
     spinner.stop();
@@ -1409,7 +1353,7 @@ async function run2(input3, config) {
 }
 async function execute2(input3, config) {
   const issueNumber = input3["issue_number"];
-  const spinner = ora3(`Closing #${issueNumber}\u2026`).start();
+  const spinner = ora2(`Closing #${issueNumber}\u2026`).start();
   try {
     await closeTask(config, issueNumber);
     spinner.stop();
@@ -1455,7 +1399,7 @@ async function run3(input3, config) {
     }
     if (tasks.length === 0) return "No tasks found.";
     try {
-      chosenNumber = await select5({
+      chosenNumber = await select3({
         message: "Select a task:",
         choices: tasks.map((t) => ({
           name: `#${String(t.number).padEnd(4)} ${colorStatus(getStatus(t))} ${t.title}`,
@@ -1479,9 +1423,9 @@ async function run3(input3, config) {
       const comments = await listComments(config, issue.number, 1);
       if (comments.length > 0) {
         const c = comments[0];
-        const divider = chalk8.dim("\u2500".repeat(70));
+        const divider = chalk5.dim("\u2500".repeat(70));
         console.log(
-          chalk8.red.bold("  Latest rejection feedback") + chalk8.dim(` \u2014 @${c.author} \xB7 ${c.createdAt.slice(0, 10)}`)
+          chalk5.red.bold("  Latest rejection feedback") + chalk5.dim(` \u2014 @${c.author} \xB7 ${c.createdAt.slice(0, 10)}`)
         );
         console.log(divider);
         console.log(renderMarkdown(c.body));
@@ -1491,22 +1435,36 @@ async function run3(input3, config) {
     }
   }
   const actions = [];
-  if (status === "available") actions.push({ name: "Claim this task", value: "claim" });
-  if (status === "claimed" || status === "changes-needed") actions.push({ name: "Submit this task", value: "submit" });
+  if (status === "available") {
+    actions.push({ name: "Claim this task", value: "claim" });
+  }
+  if (status === "claimed") {
+    actions.push({ name: "Submit this task", value: "submit" });
+  }
+  if (status === "changes-needed") {
+    const { getAuthenticatedUser: getAuthenticatedUser2 } = await Promise.resolve().then(() => (init_github(), github_exports));
+    const me = await getAuthenticatedUser2(config);
+    const taskBranch = issue.assignee ? makeTaskBranchName(issue.number, issue.assignee) : makeTaskBranchName(issue.number, me);
+    const currentBranch = await getCurrentBranch();
+    if (currentBranch === taskBranch) {
+      actions.push({ name: "Submit this task (fixes done)", value: "submit" });
+    } else {
+      actions.push({ name: `Switch to ${taskBranch} to fix`, value: "switch-fix" });
+    }
+  }
   actions.push({ name: "Close this task", value: "close" });
   actions.push({ name: "Nothing, just viewing", value: "none" });
   let action;
   try {
-    action = await select5({ message: "Action:", choices: actions });
+    action = await select3({ message: "Action:", choices: actions });
   } catch {
     return "Cancelled.";
   }
   if (action === "none") return `Viewed task #${issue.number}.`;
   if (action === "claim") {
     try {
-      const { getAuthenticatedUser: getAuthenticatedUser2, listMyTasks: listMyTasks2 } = await Promise.resolve().then(() => (init_github(), github_exports));
-      const me = await getAuthenticatedUser2(config);
-      const myTasks = await listMyTasks2(config, me);
+      const me = await getAuthenticatedUser(config);
+      const myTasks = await listMyTasks(config, me);
       const activeTask = myTasks.find((t) => {
         const labels = t.labels;
         return labels.includes("techunter:claimed") || labels.includes("techunter:changes-needed");
@@ -1515,37 +1473,65 @@ async function run3(input3, config) {
         return `You already have an active task: #${activeTask.number} "${activeTask.title}"
 Finish or submit it before claiming a new one.`;
       }
-      let spinner = ora4(`Claiming #${issue.number}\u2026`).start();
+      let stashed = false;
+      if (await hasUncommittedChanges()) {
+        let choice;
+        try {
+          choice = await select3({
+            message: "You have uncommitted changes. What would you like to do?",
+            choices: [
+              { name: "Stash changes and switch branch (restore with: git stash pop)", value: "stash" },
+              { name: "Cancel", value: "cancel" }
+            ]
+          });
+        } catch {
+          choice = "cancel";
+        }
+        if (choice === "cancel") return "Cancelled.";
+        await stash(`tch: before claiming #${issue.number}`);
+        stashed = true;
+        console.log(chalk5.dim("  Changes stashed. Run `git stash pop` after you finish this task to restore them."));
+      }
+      let spinner = ora3(`Claiming #${issue.number}\u2026`).start();
       await claimTask(config, issue.number, me);
       spinner.stop();
-      const workerBranch = makeWorkerBranchName(me);
+      const taskBranch = makeTaskBranchName(issue.number, me);
       const taskBase = extractBaseCommit(issue.body);
-      spinner = ora4(`Switching to ${workerBranch}${taskBase ? ` from ${taskBase.slice(0, 7)}` : ""}\u2026`).start();
+      spinner = ora3(`Creating branch ${taskBranch}${taskBase ? ` from ${taskBase.slice(0, 7)}` : ""}\u2026`).start();
       try {
         if (taskBase) {
-          await resetOrCreateBranch(workerBranch, taskBase);
+          await checkoutFromCommit(taskBranch, taskBase);
         } else {
-          await switchToBranchOrCreate(workerBranch);
+          await switchToBranchOrCreate(taskBranch);
         }
         spinner.stop();
-        spinner = ora4("Pushing worker branch\u2026").start();
+        spinner = ora3("Pushing task branch\u2026").start();
         try {
-          await pushBranch(workerBranch);
+          await pushBranch(taskBranch);
           spinner.stop();
         } catch {
-          spinner.warn("Could not push worker branch");
+          spinner.warn("Could not push task branch \u2014 will push on submit");
         }
-      } catch {
-        spinner.warn(`Could not switch to ${workerBranch}`);
+      } catch (err) {
+        spinner.warn(`Could not switch to ${taskBranch}`);
+        if (stashed) {
+          try {
+            await stashPop();
+            console.log(chalk5.dim("  Restored stashed changes."));
+          } catch {
+            console.log(chalk5.yellow("  Warning: could not restore stash automatically. Run `git stash pop` manually."));
+          }
+        }
+        throw err;
       }
       const baseCommit = await getCurrentCommit();
-      setConfig({ taskState: { activeIssueNumber: issue.number, baseCommit } });
-      console.log(chalk8.green(`
-  Claimed! Branch: ${workerBranch}  (base: ${baseCommit.slice(0, 7)})
+      setConfig({ taskState: { activeIssueNumber: issue.number, baseCommit, activeBranch: taskBranch } });
+      console.log(chalk5.green(`
+  Claimed! Branch: ${taskBranch}  (base: ${baseCommit.slice(0, 7)})
 `));
       let openClaude;
       try {
-        openClaude = await select5({
+        openClaude = await select3({
           message: "Open Claude Code for this task?",
           choices: [
             { name: "Yes, start coding now", value: true },
@@ -1555,12 +1541,58 @@ Finish or submit it before claiming a new one.`;
       } catch {
         openClaude = false;
       }
-      if (openClaude) await launchClaudeCode(issue, workerBranch);
-      return `Task #${issue.number} claimed. Branch: ${workerBranch}`;
+      if (openClaude) await launchClaudeCode(issue, taskBranch);
+      return `Task #${issue.number} claimed. Branch: ${taskBranch}`;
     } catch (err) {
       return `Error claiming task: ${err.message}`;
     }
   }
+  if (action === "switch-fix") {
+    const { getAuthenticatedUser: getAuthenticatedUser2 } = await Promise.resolve().then(() => (init_github(), github_exports));
+    const me = await getAuthenticatedUser2(config);
+    const taskBranch = issue.assignee ? makeTaskBranchName(issue.number, issue.assignee) : makeTaskBranchName(issue.number, me);
+    let stashed = false;
+    if (await hasUncommittedChanges()) {
+      let choice;
+      try {
+        choice = await select3({
+          message: "You have uncommitted changes. What would you like to do?",
+          choices: [
+            { name: "Stash changes and switch branch (restore with: git stash pop)", value: "stash" },
+            { name: "Cancel", value: "cancel" }
+          ]
+        });
+      } catch {
+        choice = "cancel";
+      }
+      if (choice === "cancel") return "Cancelled.";
+      await stash(`tch: before switching to ${taskBranch}`);
+      stashed = true;
+      console.log(chalk5.dim("  Changes stashed. Run `git stash pop` to restore them later."));
+    }
+    const spinner = ora3(`Switching to ${taskBranch}\u2026`).start();
+    try {
+      await switchToBranchOrCreate(taskBranch);
+      spinner.stop();
+    } catch (err) {
+      spinner.warn(`Could not switch to ${taskBranch}: ${err.message}`);
+      if (stashed) {
+        try {
+          await stashPop();
+          console.log(chalk5.dim("  Restored stashed changes."));
+        } catch {
+          console.log(chalk5.yellow("  Run `git stash pop` manually to restore your changes."));
+        }
+      }
+      return `Error: ${err.message}`;
+    }
+    const baseCommit = extractBaseCommit(issue.body) ?? await getCurrentCommit();
+    setConfig({ taskState: { activeIssueNumber: issue.number, baseCommit, activeBranch: taskBranch } });
+    console.log(chalk5.green(`
+  Switched to ${taskBranch}. Fix the issues then run /submit.
+`));
+    return `Switched to ${taskBranch} for task #${issue.number}.`;
+  }
   if (action === "submit") return run({}, config);
   if (action === "close") return run2({ issue_number: issue.number }, config);
   return "Cancelled.";
@@ -1589,28 +1621,31 @@ async function execute3(input3, config) {
     if (activeTask) {
       return `You already have an active task: #${activeTask.number} "${activeTask.title}". Finish it before claiming a new one.`;
     }
+    if (await hasUncommittedChanges()) {
+      return "Cannot claim: you have uncommitted changes. Commit or stash them first (git stash).";
+    }
     try {
       await claimTask(config, issueNumber, me);
     } catch (err) {
       return `Error claiming task: ${err.message}`;
     }
-    const workerBranch = makeWorkerBranchName(me);
+    const taskBranch = makeTaskBranchName(issue.number, me);
     const taskBase = extractBaseCommit(issue.body);
     try {
       if (taskBase) {
-        await resetOrCreateBranch(workerBranch, taskBase);
+        await checkoutFromCommit(taskBranch, taskBase);
       } else {
-        await switchToBranchOrCreate(workerBranch);
+        await switchToBranchOrCreate(taskBranch);
       }
     } catch {
     }
     try {
-      await pushBranch(workerBranch);
+      await pushBranch(taskBranch);
     } catch {
     }
     const baseCommit = await getCurrentCommit();
-    setConfig({ taskState: { activeIssueNumber: issueNumber, baseCommit } });
-    return `Task #${issueNumber} claimed. Branch: ${workerBranch} (base commit: ${baseCommit.slice(0, 7)})`;
+    setConfig({ taskState: { activeIssueNumber: issueNumber, baseCommit, activeBranch: taskBranch } });
+    return `Task #${issueNumber} claimed. Branch: ${taskBranch} (base commit: ${baseCommit.slice(0, 7)})`;
   }
   return `Unknown action: ${action}`;
 }
@@ -1625,14 +1660,14 @@ __export(new_task_exports, {
   terminal: () => terminal4
 });
 init_github();
-import { select as select6, input as promptInput2 } from "@inquirer/prompts";
+import { select as select4, input as promptInput2 } from "@inquirer/prompts";
 import { writeFile, readFile, mkdtemp, rm } from "fs/promises";
 import { spawn as spawn2 } from "child_process";
 import { tmpdir } from "os";
 import path from "path";
-import ora5 from "ora";
-import chalk9 from "chalk";
-import open2 from "open";
+import ora4 from "ora";
+import chalk6 from "chalk";
+import open from "open";
 
 // src/tools/new-task/prompts.ts
 var GUIDE_FORMAT = `
@@ -1685,6 +1720,77 @@ async function openInEditor(content) {
     await rm(dir, { recursive: true, force: true });
   }
 }
+async function resolveBaseAndTarget(config, me, interactive) {
+  const currentBranch = await getCurrentBranch();
+  if (isTaskBranch(currentBranch)) {
+    if (await hasUncommittedChanges()) {
+      if (!interactive) {
+        throw new Error("Cannot create sub-task: you have uncommitted changes. Commit them first so the executor starts from the correct base.");
+      }
+      const { select: inquirerSelect } = await import("@inquirer/prompts");
+      let choice;
+      try {
+        choice = await inquirerSelect({
+          message: "You have uncommitted changes. The sub-task executor will start from the last commit \u2014 they won't see your current unsaved work.",
+          choices: [
+            { name: "Commit first (cancel and commit manually)", value: "cancel" },
+            { name: "Continue anyway (executor starts without my unsaved changes)", value: "continue" }
+          ]
+        });
+      } catch {
+        choice = "cancel";
+      }
+      if (choice === "cancel") throw new Error("Cancelled. Commit your changes first, then create the sub-task.");
+    }
+    const baseCommit2 = await getCurrentCommit();
+    return { baseCommit: baseCommit2, targetBranch: currentBranch, isSubtask: true };
+  }
+  let stashedForSync = false;
+  if (await hasUncommittedChanges()) {
+    if (!interactive) {
+      throw new Error("Cannot create task: you have uncommitted changes. Commit or stash them first (git stash).");
+    }
+    const { select: inquirerSelect } = await import("@inquirer/prompts");
+    let choice;
+    try {
+      choice = await inquirerSelect({
+        message: "You have uncommitted changes. Syncing with main requires a clean working tree.",
+        choices: [
+          { name: "Stash changes and continue (restore with: git stash pop)", value: "stash" },
+          { name: "Cancel", value: "cancel" }
+        ]
+      });
+    } catch {
+      choice = "cancel";
+    }
+    if (choice === "cancel") throw new Error("Cancelled.");
+    await stash("tch: before creating new task");
+    stashedForSync = true;
+    console.log(chalk6.dim("  Changes stashed. Run `git stash pop` after creating the task."));
+  }
+  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 {
+    }
+    if (stashedForSync) {
+      try {
+        await stashPop();
+      } catch {
+      }
+      throw new Error(`Could not sync with ${baseBranch}. Your changes have been restored from stash.`);
+    }
+  }
+  return { baseCommit, targetBranch: makeWorkerBranchName(me), isSubtask: false };
+}
 var definition4 = {
   type: "function",
   function: {
@@ -1701,7 +1807,7 @@ var definition4 = {
   }
 };
 async function run4(input3, config) {
-  const authSpinner = ora5("Checking permissions\u2026").start();
+  const authSpinner = ora4("Checking permissions\u2026").start();
   let me;
   let allowed;
   try {
@@ -1724,7 +1830,7 @@ async function run4(input3, config) {
     }
     if (!title) return "Cancelled.";
   }
-  const spinner = ora5("Scanning project and generating guide\u2026").start();
+  const spinner = ora4("Scanning project and generating guide\u2026").start();
   let guide;
   try {
     guide = await generateGuide(config, title);
@@ -1733,16 +1839,16 @@ async function run4(input3, config) {
     spinner.stop();
     return `Error generating guide: ${err.message}`;
   }
-  const divider = chalk9.dim("\u2500".repeat(70));
+  const divider = chalk6.dim("\u2500".repeat(70));
   for (; ; ) {
     console.log("\n" + divider);
-    console.log(chalk9.bold("  Generated guide preview"));
+    console.log(chalk6.bold("  Generated guide preview"));
     console.log(divider);
     console.log(renderMarkdown(guide));
     console.log(divider + "\n");
     let action;
     try {
-      action = await select6({
+      action = await select4({
         message: "Create this task?",
         choices: [
           { name: "Yes, create task", value: "create" },
@@ -1760,7 +1866,7 @@ async function run4(input3, config) {
       try {
         guide = await openInEditor(guide);
       } catch (err) {
-        console.log(chalk9.yellow(`  Editor error: ${err.message}`));
+        console.log(chalk6.yellow(`  Editor error: ${err.message}`));
       }
       continue;
     }
@@ -1771,35 +1877,32 @@ async function run4(input3, config) {
       return "Cancelled.";
     }
     if (!feedback) continue;
-    const reviseSpinner = ora5("Revising guide\u2026").start();
+    const reviseSpinner = ora4("Revising guide\u2026").start();
     try {
       guide = await generateGuide(config, title, { feedback, previousGuide: guide });
       reviseSpinner.stop();
     } catch (err) {
       reviseSpinner.stop();
-      console.log(chalk9.yellow(`  Revision error: ${err.message}`));
+      console.log(chalk6.yellow(`  Revision error: ${err.message}`));
     }
   }
-  const baseBranch = config.baseBranch ?? "main";
   let baseCommit;
-  const syncSpinner = ora5(`Syncing with ${baseBranch}\u2026`).start();
+  let targetBranch;
+  let isSubtask;
   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 {
-    }
+    ({ baseCommit, targetBranch, isSubtask } = await resolveBaseAndTarget(config, me, true));
+  } catch (err) {
+    return err.message;
   }
-  const createSpinner = ora5(`Creating "${title}"\u2026`).start();
+  if (isSubtask) {
+    console.log(chalk6.dim(`  Sub-task: will target branch ${chalk6.cyan(targetBranch)} (base: ${baseCommit?.slice(0, 7) ?? "HEAD"})`));
+  }
+  const createSpinner = ora4(`Creating "${title}"\u2026`).start();
   let htmlUrl;
   let issueNumber;
   let issueTitle;
   try {
-    const issue = await createTask(config, title, guide, baseCommit);
+    const issue = await createTask(config, title, guide, baseCommit, targetBranch);
     createSpinner.stop();
     htmlUrl = issue.htmlUrl;
     issueNumber = issue.number;
@@ -1808,19 +1911,19 @@ async function run4(input3, config) {
     createSpinner.stop();
     return `Error: ${err.message}`;
   }
-  console.log(chalk9.green(`
+  console.log(chalk6.green(`
   Created #${issueNumber} "${issueTitle}"
-  ${chalk9.dim(htmlUrl)}
+  ${chalk6.dim(htmlUrl)}
 `));
   try {
-    const openBrowser = await select6({
+    const openBrowser = await select4({
       message: "Open issue in browser?",
       choices: [
         { name: "Yes", value: true },
         { name: "No", value: false }
       ]
     });
-    if (openBrowser) await open2(htmlUrl);
+    if (openBrowser) await open(htmlUrl);
   } catch {
   }
   return `Created #${issueNumber} "${issueTitle}" \u2014 ${htmlUrl}`;
@@ -1836,19 +1939,9 @@ 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 {
-    }
-  }
+  const { baseCommit, targetBranch } = await resolveBaseAndTarget(config, me, false);
   try {
-    const issue = await createTask(config, title, guide, baseCommit);
+    const issue = await createTask(config, title, guide, baseCommit, targetBranch);
     return `Created #${issue.number} "${issue.title}" \u2014 ${issue.htmlUrl}
 
 Guide:
@@ -1868,7 +1961,7 @@ __export(my_status_exports, {
   terminal: () => terminal5
 });
 init_github();
-import ora6 from "ora";
+import ora5 from "ora";
 var definition5 = {
   type: "function",
   function: {
@@ -1878,7 +1971,7 @@ var definition5 = {
   }
 };
 async function run5(_input, config) {
-  const spinner = ora6("Fetching your tasks\u2026").start();
+  const spinner = ora5("Fetching your tasks\u2026").start();
   try {
     const me = await getAuthenticatedUser(config);
     const tasks = await listMyTasks(config, me);
@@ -1898,120 +1991,193 @@ var terminal5 = true;
 // src/tools/review/index.ts
 var review_exports = {};
 __export(review_exports, {
+  definition: () => definition8,
+  execute: () => execute8,
+  run: () => run8,
+  terminal: () => terminal8
+});
+init_github();
+import chalk9 from "chalk";
+import ora8 from "ora";
+import { select as select7 } from "@inquirer/prompts";
+
+// src/tools/accept/index.ts
+var accept_exports = {};
+__export(accept_exports, {
   definition: () => definition6,
   execute: () => execute6,
   run: () => run6,
   terminal: () => terminal6
 });
 init_github();
-import ora7 from "ora";
+import chalk7 from "chalk";
+import { select as select5 } from "@inquirer/prompts";
+import ora6 from "ora";
 var definition6 = {
   type: "function",
   function: {
-    name: "review",
-    description: "List tasks waiting for your review (submitted by others, created by you). Equivalent to /review.",
-    parameters: { type: "object", properties: {}, required: [] }
+    name: "accept",
+    description: "Accept an in-review task: merges the PR into the target branch and closes the issue.",
+    parameters: {
+      type: "object",
+      properties: {
+        issue_number: { type: "number", description: "GitHub issue number to accept" }
+      },
+      required: ["issue_number"]
+    }
   }
 };
-async function run6(_input, config) {
-  const spinner = ora7("Loading tasks for review\u2026").start();
+async function run6(input3, config) {
+  let issueNumber = input3["issue_number"];
+  if (!issueNumber) {
+    const spinner3 = ora6("Loading tasks for review\u2026").start();
+    let tasks;
+    let me;
+    try {
+      me = await getAuthenticatedUser(config);
+      tasks = await listTasksForReview(config, me);
+      spinner3.stop();
+    } catch (err) {
+      spinner3.stop();
+      return `Error: ${err.message}`;
+    }
+    if (tasks.length === 0) return "No tasks pending review.";
+    try {
+      issueNumber = await select5({
+        message: "Which task to accept?",
+        choices: tasks.map((t) => ({
+          name: `#${t.number}  @${t.assignee ?? "\u2014"}  ${t.title}`,
+          value: t.number
+        }))
+      });
+    } catch {
+      return "Cancelled.";
+    }
+  }
+  const spinner2 = ora6("Verifying permissions\u2026").start();
+  let me2;
+  let issue;
   try {
-    const me = await getAuthenticatedUser(config);
-    const tasks = await listTasksForReview(config, me);
-    spinner.stop();
-    if (tasks.length === 0) return `No tasks pending review for @${me}.`;
-    const lines = tasks.map((t) => `  #${t.number}  [in-review]  @${t.assignee ?? "\u2014"}  ${t.title}`);
-    return `Tasks pending review (created by @${me}):
-${lines.join("\n")}`;
+    [me2, issue] = await Promise.all([
+      getAuthenticatedUser(config),
+      getTask(config, issueNumber)
+    ]);
+    spinner2.stop();
   } catch (err) {
-    spinner.stop();
+    spinner2.stop();
     return `Error: ${err.message}`;
   }
-}
-var execute6 = run6;
-var terminal6 = true;
-
-// src/tools/refresh/index.ts
-var refresh_exports = {};
-__export(refresh_exports, {
-  definition: () => definition7,
-  execute: () => execute7,
-  run: () => run7,
-  terminal: () => terminal7
-});
-var definition7 = {
-  type: "function",
-  function: {
-    name: "refresh",
-    description: "Reload and display the full task list. Equivalent to /refresh.",
-    parameters: { type: "object", properties: {}, required: [] }
+  if (issue.author && issue.author !== me2) {
+    return `Permission denied: only the task author (@${issue.author}) can accept task #${issueNumber}.`;
   }
-};
-async function run7(_input, config) {
-  const tasks = await printTaskList(config);
-  if (tasks.length === 0) return "No tasks found.";
-  const lines = tasks.map((t) => {
-    const status = getStatus(t);
-    const assignee = t.assignee ? `@${t.assignee}` : "\u2014";
-    return `#${t.number}  [${status}]  ${assignee}  ${t.title}`;
-  });
-  return `Tasks (${tasks.length}):
-${lines.join("\n")}`;
-}
-var execute7 = run7;
-var terminal7 = true;
-
-// src/tools/open-code/index.ts
-var open_code_exports = {};
-__export(open_code_exports, {
-  definition: () => definition8,
-  execute: () => execute8,
-  run: () => run8,
-  terminal: () => terminal8
-});
-init_github();
-var definition8 = {
-  type: "function",
-  function: {
-    name: "open_code",
-    description: "Launch Claude Code for the current task branch. Equivalent to /code.",
-    parameters: { type: "object", properties: {}, required: [] }
+  let confirmed;
+  try {
+    confirmed = await select5({
+      message: `Merge PR for #${issueNumber} and close issue?`,
+      choices: [
+        { name: "Yes, accept", value: true },
+        { name: "Cancel", value: false }
+      ]
+    });
+  } catch {
+    return "Cancelled.";
   }
-};
-async function run8(_input, config) {
-  let branch;
+  if (!confirmed) return "Cancelled.";
+  const spinner = ora6(`Merging PR for #${issueNumber}\u2026`).start();
+  let result;
   try {
-    branch = await getCurrentBranch();
+    result = await acceptTask(config, issueNumber);
+    spinner.succeed(`PR #${result.prNumber} merged \u2192 ${chalk7.cyan(result.baseBranch)}`);
   } catch (err) {
+    spinner.fail("Failed");
     return `Error: ${err.message}`;
   }
-  const match = branch.match(/^task-(\d+)-/);
-  if (!match) return `Not on a task branch (current: ${branch}).`;
-  const issueNum = parseInt(match[1], 10);
-  let issue;
+  const mergedIntoTaskBranch = isTaskBranch(result.baseBranch);
+  if (!mergedIntoTaskBranch) {
+    const baseBranch = config.baseBranch ?? "main";
+    let pushToMain;
+    try {
+      pushToMain = await select5({
+        message: `Push ${chalk7.cyan(result.baseBranch)} \u2192 ${chalk7.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 = ora6(`Merging ${result.baseBranch} \u2192 ${baseBranch}\u2026`).start();
+      try {
+        await mergeWorkerIntoBase(config, result.baseBranch, baseBranch);
+        mergeSpinner.succeed(`Merged ${result.baseBranch} \u2192 ${baseBranch}`);
+      } catch (err) {
+        mergeSpinner.fail(`Could not merge to ${baseBranch}: ${err.message}`);
+      }
+    }
+  }
+  let updateWiki = false;
   try {
-    issue = await getTask(config, issueNum);
+    updateWiki = await select5({
+      message: "Update TECHUNTER.md project overview?",
+      choices: [
+        { name: "Yes, regenerate", value: true },
+        { name: "No, skip", value: false }
+      ]
+    });
+  } catch {
+  }
+  if (updateWiki) {
+    const wikiSpinner = ora6("Regenerating TECHUNTER.md\u2026").start();
+    try {
+      const content = await generateWiki(config);
+      await upsertRepoFile(config, "TECHUNTER.md", content, "docs: update TECHUNTER.md project overview");
+      wikiSpinner.succeed("TECHUNTER.md updated");
+    } catch (err) {
+      wikiSpinner.fail(`Wiki update failed: ${err.message}`);
+    }
+  }
+  const mergeTarget = mergedIntoTaskBranch ? `${result.baseBranch} (sub-task merged, no push to main)` : result.baseBranch;
+  return `Task #${issueNumber} accepted.
+PR #${result.prNumber} merged \u2192 ${mergeTarget}
+Issue closed.`;
+}
+async function execute6(input3, config) {
+  const issueNumber = input3["issue_number"];
+  const [me, issue] = await Promise.all([
+    getAuthenticatedUser(config),
+    getTask(config, issueNumber)
+  ]);
+  if (issue.author && issue.author !== me) {
+    return `Permission denied: only the task author (@${issue.author}) can accept task #${issueNumber}.`;
+  }
+  const spinner = ora6(`Merging PR for #${issueNumber}\u2026`).start();
+  try {
+    const result = await acceptTask(config, issueNumber);
+    spinner.stop();
+    return `Task #${issueNumber} accepted.
+PR #${result.prNumber} merged \u2192 ${result.baseBranch}
+Issue closed.`;
   } catch (err) {
+    spinner.stop();
     return `Error: ${err.message}`;
   }
-  await launchClaudeCode(issue, branch);
-  return "Claude Code session ended.";
 }
-var execute8 = run8;
-var terminal8 = true;
+var terminal6 = true;
 
 // src/tools/reject/index.ts
 var reject_exports = {};
 __export(reject_exports, {
-  definition: () => definition9,
-  execute: () => execute9,
-  run: () => run9,
-  terminal: () => terminal9
+  definition: () => definition7,
+  execute: () => execute7,
+  run: () => run7,
+  terminal: () => terminal7
 });
 init_github();
-import chalk10 from "chalk";
-import { select as select7, input as promptInput3 } from "@inquirer/prompts";
-import ora8 from "ora";
+import chalk8 from "chalk";
+import { select as select6, input as promptInput3 } from "@inquirer/prompts";
+import ora7 from "ora";
 
 // src/tools/reject/prompts.ts
 var REJECTION_FORMAT = `
@@ -2042,7 +2208,7 @@ Reviewer feedback: ${userFeedback}`,
 }
 
 // src/tools/reject/index.ts
-var definition9 = {
+var definition7 = {
   type: "function",
   function: {
     name: "reject",
@@ -2057,7 +2223,7 @@ var definition9 = {
     }
   }
 };
-async function run9(input3, config) {
+async function run7(input3, config) {
   const issueNumber = input3["issue_number"];
   const [me, issue] = await Promise.all([
     getAuthenticatedUser(config),
@@ -2075,9 +2241,9 @@ async function run9(input3, config) {
     return "Cancelled.";
   }
   if (!feedback.trim()) return "Cancelled.";
-  const divider = chalk10.dim("\u2500".repeat(70));
+  const divider = chalk8.dim("\u2500".repeat(70));
   for (; ; ) {
-    const spinner = ora8("Generating rejection comment\u2026").start();
+    const spinner = ora7("Generating rejection comment\u2026").start();
     let comment;
     try {
       comment = await generateRejectionComment(config, issueNumber, feedback);
@@ -2087,13 +2253,13 @@ async function run9(input3, config) {
       return `Error generating comment: ${err.message}`;
     }
     console.log("\n" + divider);
-    console.log(chalk10.bold(`  Rejection preview \u2014 issue #${issueNumber}`));
+    console.log(chalk8.bold(`  Rejection preview \u2014 issue #${issueNumber}`));
     console.log(divider);
     console.log(renderMarkdown(comment));
     console.log(divider + "\n");
     let decision;
     try {
-      decision = await select7({
+      decision = await select6({
         message: `Post rejection and mark #${issueNumber} as changes-needed?`,
         choices: [
           { name: "Post & Reject", value: "yes" },
@@ -2113,7 +2279,7 @@ async function run9(input3, config) {
       }
       continue;
     }
-    let spinner2 = ora8(`Posting rejection comment on #${issueNumber}\u2026`).start();
+    let spinner2 = ora7(`Posting rejection comment on #${issueNumber}\u2026`).start();
     try {
       await postComment(config, issueNumber, comment);
       spinner2.stop();
@@ -2121,7 +2287,7 @@ async function run9(input3, config) {
       spinner2.stop();
       return `Error posting comment: ${err.message}`;
     }
-    spinner2 = ora8(`Marking #${issueNumber} as changes-needed\u2026`).start();
+    spinner2 = ora7(`Marking #${issueNumber} as changes-needed\u2026`).start();
     try {
       await rejectTask(config, issueNumber);
       spinner2.stop();
@@ -2132,7 +2298,7 @@ async function run9(input3, config) {
     return `Task #${issueNumber} rejected. Label changed to changes-needed.`;
   }
 }
-async function execute9(input3, config) {
+async function execute7(input3, config) {
   const issueNumber = input3["issue_number"];
   const feedback = input3["feedback"];
   const [me, issue] = await Promise.all([
@@ -2149,164 +2315,195 @@ async function execute9(input3, config) {
     return `Error generating comment: ${err.message}`;
   }
   try {
-    await postComment(config, issueNumber, comment);
-  } catch (err) {
-    return `Error posting comment: ${err.message}`;
+    await postComment(config, issueNumber, comment);
+  } catch (err) {
+    return `Error posting comment: ${err.message}`;
+  }
+  try {
+    await rejectTask(config, issueNumber);
+  } catch (err) {
+    return `Comment posted but failed to update label: ${err.message}`;
+  }
+  return `Task #${issueNumber} rejected.
+
+Comment posted:
+${comment}`;
+}
+var terminal7 = true;
+
+// src/tools/review/index.ts
+var definition8 = {
+  type: "function",
+  function: {
+    name: "review",
+    description: "List tasks waiting for your review (submitted by others, created by you), then let you accept or reject one. Equivalent to /review.",
+    parameters: { type: "object", properties: {}, required: [] }
+  }
+};
+async function run8(_input, config) {
+  const spinner = ora8("Loading tasks for review\u2026").start();
+  let me;
+  let tasks;
+  try {
+    me = await getAuthenticatedUser(config);
+    tasks = await listTasksForReview(config, me);
+    spinner.stop();
+  } catch (err) {
+    spinner.stop();
+    return `Error: ${err.message}`;
+  }
+  if (tasks.length === 0) return `No tasks pending review for @${me}.`;
+  let issueNumber;
+  try {
+    issueNumber = await select7({
+      message: "Select a task to review:",
+      choices: tasks.map((t) => ({
+        name: `#${String(t.number).padEnd(4)} @${t.assignee ?? "\u2014"}  ${t.title}`,
+        value: t.number
+      }))
+    });
+  } catch {
+    return "Cancelled.";
   }
+  const spinner2 = ora8(`Loading #${issueNumber}\u2026`).start();
+  let pr;
   try {
-    await rejectTask(config, issueNumber);
+    pr = await getTaskPR(config, issueNumber);
+    spinner2.stop();
   } catch (err) {
-    return `Comment posted but failed to update label: ${err.message}`;
+    spinner2.stop();
+    return `Error loading PR: ${err.message}`;
   }
-  return `Task #${issueNumber} rejected.
+  const divider = chalk9.dim("\u2500".repeat(70));
+  console.log("\n" + divider);
+  if (pr) {
+    console.log(chalk9.bold(`  PR #${pr.number}`) + "  " + chalk9.dim(pr.url));
+    console.log(divider);
+    console.log(renderMarkdown(pr.body));
+  } else {
+    console.log(chalk9.yellow(`  No open PR found for task #${issueNumber}`));
+  }
+  console.log(divider + "\n");
+  for (; ; ) {
+    let action;
+    try {
+      action = await select7({
+        message: "Review action:",
+        choices: [
+          ...pr ? [{ name: "View diff", value: "diff" }] : [],
+          { name: chalk9.green("Accept") + " \u2014 merge PR and close issue", value: "accept" },
+          { name: chalk9.red("Reject") + " \u2014 request changes", value: "reject" },
+          { name: "Nothing, just viewing", value: "none" }
+        ]
+      });
+    } catch {
+      return "Cancelled.";
+    }
+    if (action === "none") return `Viewed task #${issueNumber}.`;
+    if (action === "accept") return run6({ issue_number: issueNumber }, config);
+    if (action === "reject") return run7({ issue_number: issueNumber }, config);
+    if (action === "diff") {
+      const diffSpinner = ora8("Fetching diff\u2026").start();
+      let diff;
+      try {
+        diff = await getTaskPRDiff(config, pr.number);
+        diffSpinner.stop();
+      } catch (err) {
+        diffSpinner.stop();
+        console.log(chalk9.red(`Error fetching diff: ${err.message}`));
+        continue;
+      }
+      console.log("\n" + divider);
+      for (const line of diff.split("\n")) {
+        if (line.startsWith("+") && !line.startsWith("+++")) {
+          process.stdout.write(chalk9.green(line) + "\n");
+        } else if (line.startsWith("-") && !line.startsWith("---")) {
+          process.stdout.write(chalk9.red(line) + "\n");
+        } else if (line.startsWith("@@")) {
+          process.stdout.write(chalk9.cyan(line) + "\n");
+        } else if (line.startsWith("diff ") || line.startsWith("index ") || line.startsWith("+++") || line.startsWith("---")) {
+          process.stdout.write(chalk9.bold(line) + "\n");
+        } else {
+          process.stdout.write(line + "\n");
+        }
+      }
+      console.log(divider + "\n");
+    }
+  }
+}
+var execute8 = run8;
+var terminal8 = true;
 
-Comment posted:
-${comment}`;
+// src/tools/refresh/index.ts
+var refresh_exports = {};
+__export(refresh_exports, {
+  definition: () => definition9,
+  execute: () => execute9,
+  run: () => run9,
+  terminal: () => terminal9
+});
+var definition9 = {
+  type: "function",
+  function: {
+    name: "refresh",
+    description: "Reload and display the full task list. Equivalent to /refresh.",
+    parameters: { type: "object", properties: {}, required: [] }
+  }
+};
+async function run9(_input, config) {
+  const tasks = await printTaskList(config);
+  if (tasks.length === 0) return "No tasks found.";
+  const lines = tasks.map((t) => {
+    const status = getStatus(t);
+    const assignee = t.assignee ? `@${t.assignee}` : "\u2014";
+    return `#${t.number}  [${status}]  ${assignee}  ${t.title}`;
+  });
+  return `Tasks (${tasks.length}):
+${lines.join("\n")}`;
 }
+var execute9 = run9;
 var terminal9 = true;
 
-// src/tools/accept/index.ts
-var accept_exports = {};
-__export(accept_exports, {
+// src/tools/open-code/index.ts
+var open_code_exports = {};
+__export(open_code_exports, {
   definition: () => definition10,
   execute: () => execute10,
   run: () => run10,
   terminal: () => terminal10
 });
 init_github();
-import chalk11 from "chalk";
-import { select as select8 } from "@inquirer/prompts";
-import ora9 from "ora";
 var definition10 = {
   type: "function",
   function: {
-    name: "accept",
-    description: "Accept an in-review task: merges the PR into your worker branch and closes the issue.",
-    parameters: {
-      type: "object",
-      properties: {
-        issue_number: { type: "number", description: "GitHub issue number to accept" }
-      },
-      required: ["issue_number"]
-    }
+    name: "open_code",
+    description: "Launch Claude Code for the current task branch. Equivalent to /code.",
+    parameters: { type: "object", properties: {}, required: [] }
   }
 };
-async function run10(input3, config) {
-  let issueNumber = input3["issue_number"];
-  if (!issueNumber) {
-    const spinner3 = ora9("Loading tasks for review\u2026").start();
-    let tasks;
-    let me;
-    try {
-      me = await getAuthenticatedUser(config);
-      tasks = await listTasksForReview(config, me);
-      spinner3.stop();
-    } catch (err) {
-      spinner3.stop();
-      return `Error: ${err.message}`;
-    }
-    if (tasks.length === 0) return "No tasks pending review.";
-    try {
-      issueNumber = await select8({
-        message: "Which task to accept?",
-        choices: tasks.map((t) => ({
-          name: `#${t.number}  @${t.assignee ?? "\u2014"}  ${t.title}`,
-          value: t.number
-        }))
-      });
-    } catch {
-      return "Cancelled.";
-    }
-  }
-  const spinner2 = ora9("Verifying permissions\u2026").start();
-  let me2;
-  let issue;
-  try {
-    [me2, issue] = await Promise.all([
-      getAuthenticatedUser(config),
-      getTask(config, issueNumber)
-    ]);
-    spinner2.stop();
-  } catch (err) {
-    spinner2.stop();
-    return `Error: ${err.message}`;
-  }
-  if (issue.author && issue.author !== me2) {
-    return `Permission denied: only the task author (@${issue.author}) can accept task #${issueNumber}.`;
-  }
-  const targetBranch = makeWorkerBranchName(me2);
-  let confirmed;
-  try {
-    confirmed = await select8({
-      message: `Merge PR for #${issueNumber} into ${chalk11.cyan(targetBranch)} and close issue?`,
-      choices: [
-        { name: "Yes, accept", value: true },
-        { name: "Cancel", value: false }
-      ]
-    });
-  } catch {
-    return "Cancelled.";
-  }
-  if (!confirmed) return "Cancelled.";
-  const spinner = ora9(`Merging PR for #${issueNumber}\u2026`).start();
-  let result;
+async function run10(_input, config) {
+  let branch;
   try {
-    const assigneeWorkerBranch = issue.assignee ? makeWorkerBranchName(issue.assignee) : void 0;
-    result = await acceptTask(config, issueNumber, assigneeWorkerBranch);
-    spinner.succeed(`PR #${result.prNumber} merged into ${targetBranch}`);
+    branch = await getCurrentBranch();
   } 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"];
-  const [me, issue] = await Promise.all([
-    getAuthenticatedUser(config),
-    getTask(config, issueNumber)
-  ]);
-  if (issue.author && issue.author !== me) {
-    return `Permission denied: only the task author (@${issue.author}) can accept task #${issueNumber}.`;
+  let issueNum = getConfig().taskState?.activeIssueNumber;
+  if (!issueNum) {
+    const found = await getIssueNumberFromBranch(config, branch);
+    if (!found) return `No active task found (current branch: ${branch}).`;
+    issueNum = found.issueNumber;
   }
-  const targetBranch = makeWorkerBranchName(me);
-  const spinner = ora9(`Merging PR for #${issueNumber}\u2026`).start();
+  let issue;
   try {
-    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}
-Issue closed.`;
+    issue = await getTask(config, issueNum);
   } catch (err) {
-    spinner.stop();
     return `Error: ${err.message}`;
   }
+  await launchClaudeCode(issue, branch);
+  return "Claude Code session ended.";
 }
+var execute10 = run10;
 var terminal10 = true;
 
 // src/tools/edit-task/index.ts
@@ -2318,8 +2515,8 @@ __export(edit_task_exports, {
   terminal: () => terminal11
 });
 init_github();
-import { select as select9, input as promptInput4 } from "@inquirer/prompts";
-import ora10 from "ora";
+import { select as select8, input as promptInput4 } from "@inquirer/prompts";
+import ora9 from "ora";
 var definition11 = {
   type: "function",
   function: {
@@ -2347,7 +2544,7 @@ async function run11(input3, config) {
     }
     if (tasks.length === 0) return "No tasks found.";
     try {
-      issueNumber = await select9({
+      issueNumber = await select8({
         message: "Select task to edit:",
         choices: tasks.map((t) => ({ name: `#${t.number}  [${getStatus(t)}]  ${t.title}`, value: t.number }))
       });
@@ -2375,43 +2572,169 @@ async function run11(input3, config) {
   } catch {
     return "Cancelled.";
   }
-  if (title.trim() === issue.title && body.trim() === (issue.body ?? "")) {
-    return "No changes made.";
-  }
-  const spinner = ora10(`Updating #${issueNumber}\u2026`).start();
+  if (title.trim() === issue.title && body.trim() === (issue.body ?? "")) {
+    return "No changes made.";
+  }
+  const spinner = ora9(`Updating #${issueNumber}\u2026`).start();
+  try {
+    await editTask(config, issueNumber, title.trim() || issue.title, body.trim());
+    spinner.stop();
+    return `Task #${issueNumber} updated.`;
+  } catch (err) {
+    spinner.stop();
+    return `Error: ${err.message}`;
+  }
+}
+async function execute11(input3, config) {
+  const issueNumber = input3["issue_number"];
+  const title = input3["title"];
+  const body = input3["body"];
+  const spinner = ora9(`Updating #${issueNumber}\u2026`).start();
+  try {
+    await editTask(config, issueNumber, title, body);
+    spinner.stop();
+    return `Task #${issueNumber} updated.`;
+  } catch (err) {
+    spinner.stop();
+    return `Error: ${err.message}`;
+  }
+}
+var terminal11 = true;
+
+// src/tools/wiki/index.ts
+var wiki_exports = {};
+__export(wiki_exports, {
+  definition: () => definition12,
+  execute: () => execute12,
+  run: () => run12,
+  terminal: () => terminal12
+});
+import ora10 from "ora";
+import chalk10 from "chalk";
+import { readFile as readFile2 } from "fs/promises";
+import { select as select9 } from "@inquirer/prompts";
+init_github();
+var WIKI_PATH = "TECHUNTER.md";
+var definition12 = {
+  type: "function",
+  function: {
+    name: "update_wiki",
+    description: "Generate or refresh the project overview document (TECHUNTER.md) by scanning the codebase. The document helps new team members understand what the project does, how it is architected, and how to start contributing. Equivalent to /wiki.",
+    parameters: {
+      type: "object",
+      properties: {},
+      required: []
+    }
+  }
+};
+async function readWikiContent(config) {
+  try {
+    return await readFile2(WIKI_PATH, "utf-8");
+  } catch {
+  }
+  return getRepoFile(config, WIKI_PATH);
+}
+function printWiki(content) {
+  const divider = chalk10.dim("\u2500".repeat(70));
+  console.log("\n" + divider);
+  console.log(chalk10.bold("  TECHUNTER.md"));
+  console.log(divider);
+  console.log(renderMarkdown(content));
+  console.log(divider + "\n");
+}
+async function run12(_input, config) {
+  const fetchSpinner = ora10("Checking for existing wiki\u2026").start();
+  const existing = await readWikiContent(config).catch(() => null);
+  fetchSpinner.stop();
+  let action;
+  try {
+    action = await select9({
+      message: "TECHUNTER.md \u2014 what would you like to do?",
+      choices: [
+        ...existing ? [{ name: "View current wiki", value: "view" }] : [],
+        { name: existing ? "Regenerate & commit to repo" : "Generate & commit to repo", value: "generate" },
+        { name: "Cancel", value: "cancel" }
+      ]
+    });
+  } catch {
+    return "Cancelled.";
+  }
+  if (action === "cancel") return "Cancelled.";
+  if (action === "view") {
+    printWiki(existing);
+    return "Displayed TECHUNTER.md.";
+  }
+  const authSpinner = ora10("Checking permissions\u2026").start();
+  let me;
+  let allowed;
+  try {
+    me = await getAuthenticatedUser(config);
+    allowed = await isCollaborator(config, me);
+    authSpinner.stop();
+  } catch (err) {
+    authSpinner.stop();
+    return `Error checking permissions: ${err.message}`;
+  }
+  if (!allowed) {
+    return `Permission denied: only repository collaborators can update the project wiki.`;
+  }
+  const genSpinner = ora10("Analyzing project and generating overview\u2026").start();
+  let content;
+  try {
+    content = await generateWiki(config);
+    genSpinner.stop();
+  } catch (err) {
+    genSpinner.stop();
+    return `Error generating wiki: ${err.message}`;
+  }
+  printWiki(content);
+  let confirm;
+  try {
+    confirm = await select9({
+      message: `Publish to repository as ${WIKI_PATH}?`,
+      choices: [
+        { name: "Yes, commit to repo", value: "publish" },
+        { name: "Cancel", value: "cancel" }
+      ]
+    });
+  } catch {
+    return "Cancelled.";
+  }
+  if (confirm === "cancel") return "Cancelled.";
+  const writeSpinner = ora10(`Writing ${WIKI_PATH}\u2026`).start();
   try {
-    await editTask(config, issueNumber, title.trim() || issue.title, body.trim());
-    spinner.stop();
-    return `Task #${issueNumber} updated.`;
+    const url = await upsertRepoFile(config, WIKI_PATH, content, "docs: update TECHUNTER.md project overview");
+    writeSpinner.succeed(`Written: ${url}`);
+    console.log("");
+    return `TECHUNTER.md updated \u2014 ${url}`;
   } catch (err) {
-    spinner.stop();
+    writeSpinner.fail(`Failed: ${err.message}`);
     return `Error: ${err.message}`;
   }
 }
-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();
+async function execute12(_input, config) {
+  const me = await getAuthenticatedUser(config);
+  if (!await isCollaborator(config, me)) {
+    return `Permission denied: only repository collaborators can update the project wiki.`;
+  }
+  const content = await generateWiki(config);
   try {
-    await editTask(config, issueNumber, title, body);
-    spinner.stop();
-    return `Task #${issueNumber} updated.`;
+    const url = await upsertRepoFile(config, WIKI_PATH, content, "docs: update TECHUNTER.md project overview");
+    return `TECHUNTER.md updated \u2014 ${url}`;
   } catch (err) {
-    spinner.stop();
     return `Error: ${err.message}`;
   }
 }
-var terminal11 = true;
+var terminal12 = true;
 
 // src/tools/list-tasks/index.ts
 var list_tasks_exports = {};
 __export(list_tasks_exports, {
-  definition: () => definition12,
-  execute: () => execute12
+  definition: () => definition13,
+  execute: () => execute13
 });
 init_github();
-var definition12 = {
+var definition13 = {
   type: "function",
   function: {
     name: "list_tasks",
@@ -2423,7 +2746,7 @@ var definition12 = {
     }
   }
 };
-async function execute12(_input, config) {
+async function execute13(_input, config) {
   const tasks = await listTasks(config);
   if (tasks.length === 0) return "No open tasks.";
   return tasks.map((t) => {
@@ -2436,11 +2759,11 @@ async function execute12(_input, config) {
 // src/tools/get-task/index.ts
 var get_task_exports = {};
 __export(get_task_exports, {
-  definition: () => definition13,
-  execute: () => execute13
+  definition: () => definition14,
+  execute: () => execute14
 });
 init_github();
-var definition13 = {
+var definition14 = {
   type: "function",
   function: {
     name: "get_task",
@@ -2454,7 +2777,7 @@ var definition13 = {
     }
   }
 };
-async function execute13(input3, config) {
+async function execute14(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";
@@ -2471,12 +2794,12 @@ ${issue.body}`);
 // src/tools/get-comments/index.ts
 var get_comments_exports = {};
 __export(get_comments_exports, {
-  definition: () => definition14,
-  execute: () => execute14
+  definition: () => definition15,
+  execute: () => execute15
 });
 init_github();
 import ora11 from "ora";
-var definition14 = {
+var definition15 = {
   type: "function",
   function: {
     name: "get_comments",
@@ -2491,7 +2814,7 @@ var definition14 = {
     }
   }
 };
-async function execute14(input3, config) {
+async function execute15(input3, config) {
   const issueNumber = input3["issue_number"];
   const limit = input3["limit"] ?? 5;
   const spinner = ora11(`Loading comments for #${issueNumber}...`).start();
@@ -2513,11 +2836,11 @@ ${lines.join("\n\n")}`;
 // src/tools/get-diff/index.ts
 var get_diff_exports = {};
 __export(get_diff_exports, {
-  definition: () => definition15,
-  execute: () => execute15
+  definition: () => definition16,
+  execute: () => execute16
 });
 import ora12 from "ora";
-var definition15 = {
+var definition16 = {
   type: "function",
   function: {
     name: "get_diff",
@@ -2525,7 +2848,7 @@ var definition15 = {
     parameters: { type: "object", properties: {}, required: [] }
   }
 };
-async function execute15(_input, _config) {
+async function execute16(_input, _config) {
   const spinner = ora12("Reading git diff...").start();
   try {
     const diff = await getDiff();
@@ -2540,14 +2863,14 @@ async function execute15(_input, _config) {
 // src/tools/run-command/index.ts
 var run_command_exports = {};
 __export(run_command_exports, {
-  definition: () => definition16,
-  execute: () => execute16
+  definition: () => definition17,
+  execute: () => execute17
 });
 import { exec } from "child_process";
 import { promisify } from "util";
 import ora13 from "ora";
 var execAsync = promisify(exec);
-var definition16 = {
+var definition17 = {
   type: "function",
   function: {
     name: "run_command",
@@ -2561,7 +2884,7 @@ var definition16 = {
     }
   }
 };
-async function execute16(input3, _config) {
+async function execute17(input3, _config) {
   const command = input3["command"];
   const cwd = process.cwd();
   const spinner = ora13(`$ ${command}`).start();
@@ -2583,15 +2906,15 @@ ${out || e.message}`;
 // src/tools/list-files/index.ts
 var list_files_exports = {};
 __export(list_files_exports, {
-  definition: () => definition17,
-  execute: () => execute17
+  definition: () => definition18,
+  execute: () => execute18
 });
-import { readFile as readFile2 } from "fs/promises";
+import { readFile as readFile3 } from "fs/promises";
 import { existsSync } from "fs";
 import path2 from "path";
 import { globby } from "globby";
 import ignore from "ignore";
-var definition17 = {
+var definition18 = {
   type: "function",
   function: {
     name: "list_files",
@@ -2631,13 +2954,13 @@ var BINARY_EXTENSIONS = /* @__PURE__ */ new Set([
   ".sqlite",
   ".lock"
 ]);
-async function execute17(input3, _config) {
+async function execute18(input3, _config) {
   const glob = input3["glob"] ?? "**/*";
   const cwd = process.cwd();
   const ig = ignore();
   const gitignorePath = path2.join(cwd, ".gitignore");
   if (existsSync(gitignorePath)) {
-    ig.add(await readFile2(gitignorePath, "utf-8"));
+    ig.add(await readFile3(gitignorePath, "utf-8"));
   }
   ig.add(["node_modules", "dist", ".git", ".next", "__pycache__", "build", "coverage"]);
   const files = await globby(glob, { cwd, dot: false, onlyFiles: true, gitignore: false });
@@ -2650,15 +2973,15 @@ ${filtered.join("\n")}`;
 // src/tools/grep-code/index.ts
 var grep_code_exports = {};
 __export(grep_code_exports, {
-  definition: () => definition18,
-  execute: () => execute18
+  definition: () => definition19,
+  execute: () => execute19
 });
-import { readFile as readFile3 } from "fs/promises";
+import { readFile as readFile4 } from "fs/promises";
 import { existsSync as existsSync2 } from "fs";
 import path3 from "path";
 import { globby as globby2 } from "globby";
 import ignore2 from "ignore";
-var definition18 = {
+var definition19 = {
   type: "function",
   function: {
     name: "grep_code",
@@ -2699,7 +3022,7 @@ async function buildIgnore(cwd) {
   const ig = ignore2();
   const gitignorePath = path3.join(cwd, ".gitignore");
   if (existsSync2(gitignorePath)) {
-    ig.add(await readFile3(gitignorePath, "utf-8"));
+    ig.add(await readFile4(gitignorePath, "utf-8"));
   }
   ig.add(["node_modules", "dist", ".git", ".next", "__pycache__", "build", "coverage"]);
   return ig;
@@ -2731,7 +3054,7 @@ function isText(f) {
   return !BINARY_EXTENSIONS2.has(path3.extname(f).toLowerCase());
 }
 var MAX_RANGE_LINES = 300;
-async function execute18(input3, _config) {
+async function execute19(input3, _config) {
   const pattern = input3["pattern"] ?? "";
   const fileGlob = input3["file_glob"] ?? "**/*";
   const contextLines = Math.min(input3["context_lines"] ?? 2, 5);
@@ -2743,7 +3066,7 @@ async function execute18(input3, _config) {
     const files = await globby2(fileGlob, { cwd, dot: false, onlyFiles: true, gitignore: false });
     if (files.length === 0) return `No file matched: ${fileGlob}`;
     if (files.length > 1) return `file_glob matched ${files.length} files \u2014 narrow it to a single file for read-range mode.`;
-    const raw = await readFile3(path3.join(cwd, files[0]), "utf-8");
+    const raw = await readFile4(path3.join(cwd, files[0]), "utf-8");
     const lines = raw.split("\n");
     const total = lines.length;
     const from = Math.max(1, startLine);
@@ -2772,7 +3095,7 @@ ${numbered}
     if (totalMatches >= maxResults) break;
     let content;
     try {
-      content = await readFile3(path3.join(cwd, file), "utf-8");
+      content = await readFile4(path3.join(cwd, file), "utf-8");
     } catch {
       continue;
     }
@@ -2810,92 +3133,457 @@ ${snippets.join("\n---\n")}
 \`\`\``);
     }
   }
-  if (matches.length === 0) return `No matches found for: ${pattern}`;
-  const header = `Found matches in ${matches.length} file(s) (${totalMatches} match${totalMatches === 1 ? "" : "es"})${totalMatches >= maxResults ? " \u2014 limit reached" : ""}:`;
-  return [header, ...matches].join("\n\n");
+  if (matches.length === 0) return `No matches found for: ${pattern}`;
+  const header = `Found matches in ${matches.length} file(s) (${totalMatches} match${totalMatches === 1 ? "" : "es"})${totalMatches >= maxResults ? " \u2014 limit reached" : ""}:`;
+  return [header, ...matches].join("\n\n");
+}
+
+// src/tools/ask-user/index.ts
+var ask_user_exports = {};
+__export(ask_user_exports, {
+  definition: () => definition20,
+  execute: () => execute20
+});
+import chalk11 from "chalk";
+import { select as select10, input as promptInput5 } from "@inquirer/prompts";
+var definition20 = {
+  type: "function",
+  function: {
+    name: "ask_user",
+    description: "Ask the user to clarify something ambiguous \u2014 scope, expected behaviour, edge cases, or business decisions. Do NOT ask about technical implementation choices. Use at most 3 times per task.",
+    parameters: {
+      type: "object",
+      properties: {
+        question: { type: "string", description: "The question to ask the user" },
+        options: {
+          type: "array",
+          items: { type: "string" },
+          description: "2\u20134 concrete answer choices"
+        }
+      },
+      required: ["question", "options"]
+    }
+  }
+};
+async function execute20(input3, _config) {
+  const question = input3["question"];
+  const options = input3["options"];
+  const OTHER = "__other__";
+  console.log("");
+  console.log(chalk11.dim("  \u250C\u2500 Agent question " + "\u2500".repeat(51)));
+  console.log(chalk11.dim("  \u2502"));
+  for (const line of question.split("\n")) {
+    console.log(chalk11.dim("  \u2502 ") + line);
+  }
+  console.log(chalk11.dim("  \u2514" + "\u2500".repeat(67)));
+  let answer;
+  try {
+    const chosen = await select10({
+      message: " ",
+      choices: [
+        ...options.map((o) => ({ name: o, value: o })),
+        { name: chalk11.dim("Other (describe below)"), value: OTHER }
+      ]
+    });
+    answer = chosen === OTHER ? await promptInput5({ message: "Your answer:" }) : chosen;
+  } catch {
+    answer = "User skipped this question \u2014 use your best judgement.";
+  }
+  console.log("");
+  return answer;
+}
+
+// src/tools/registry.ts
+var toolModules = [
+  // Command tools
+  pick_exports,
+  new_task_exports,
+  close_exports,
+  submit_exports,
+  my_status_exports,
+  review_exports,
+  refresh_exports,
+  open_code_exports,
+  reject_exports,
+  accept_exports,
+  edit_task_exports,
+  wiki_exports,
+  // Low-level tools
+  list_tasks_exports,
+  get_task_exports,
+  get_comments_exports,
+  get_diff_exports,
+  run_command_exports,
+  list_files_exports,
+  grep_code_exports,
+  ask_user_exports
+];
+
+// src/lib/agent-ui.ts
+import chalk12 from "chalk";
+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]`;
+      return `${k}="${v}"`;
+    }
+    return `${k}=${JSON.stringify(v)}`;
+  }).join("  ");
+}
+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, input3) {
+  const params = formatInput(input3);
+  console.log(`  ${chalk12.cyan("\u2192")} ${chalk12.bold(name)}${params ? "  " + chalk12.dim(params) : ""}`);
+}
+function printToolResult(result) {
+  const ok = !result.startsWith("Error:");
+  const icon = ok ? chalk12.green("\u2713") : chalk12.red("\u2717");
+  console.log(`  ${icon} ${chalk12.dim(summarize(result))}`);
+}
+
+// src/lib/sub-agent.ts
+async function runSubAgentLoop(config, systemPrompt, userMessage, toolNames) {
+  const client = createClient(config);
+  const selected = toolModules.filter((m) => toolNames.includes(m.definition.function.name));
+  const tools2 = selected.map((m) => m.definition);
+  const messages = [
+    { role: "system", content: systemPrompt },
+    { role: "user", content: userMessage }
+  ];
+  const MAX_ITERATIONS = 100;
+  let iterations = 0;
+  for (; ; ) {
+    if (++iterations > MAX_ITERATIONS) {
+      throw new Error(`Sub-agent exceeded ${MAX_ITERATIONS} iterations without finishing.`);
+    }
+    const res = await client.chat.completions.create({ model: getModel(config), tools: tools2, messages });
+    const choice = res.choices[0];
+    messages.push({
+      role: "assistant",
+      content: choice.message.content ?? null,
+      ...choice.message.tool_calls ? { tool_calls: choice.message.tool_calls } : {}
+    });
+    if (choice.finish_reason === "stop") {
+      return choice.message.content ?? "";
+    }
+    if (choice.finish_reason === "tool_calls") {
+      for (const tc of choice.message.tool_calls ?? []) {
+        let input3;
+        try {
+          input3 = JSON.parse(tc.function.arguments);
+        } catch {
+          input3 = {};
+        }
+        printToolCall(tc.function.name, input3);
+        const mod = selected.find((m) => m.definition.function.name === 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 });
+      }
+    }
+  }
+}
+
+// src/tools/wiki/prompts.ts
+var WIKI_FORMAT = `
+The document you produce must be valid Markdown with these exact sections:
+
+# [Project Name]
+
+> One-sentence description of what this project does.
+
+## What Is This?
+
+2-4 paragraphs covering:
+- The problem this project solves
+- Who uses it and in what context
+- Core capabilities / key features
+
+## Quick Start
+
+Numbered steps for a brand-new developer to install, configure, and run the project for the first time.
+
+## Architecture
+
+High-level explanation of how the system is structured:
+- Key components / layers and their responsibilities
+- Request or data flow (prose or ASCII diagram)
+- Noteworthy design decisions
+
+## Key Files
+
+| File / Directory | Purpose |
+|---|---|
+| ... | ... |
+
+(List the 8-15 most important files.)
+
+## Development Workflow
+
+Common day-to-day tasks a contributor will need:
+- How to build / run locally
+- How to add a new feature (brief steps)
+- Any testing or linting commands
+
+---
+*Maintained by Techunter \u2014 run \`tch wiki\` to regenerate*
+`;
+
+// src/tools/wiki/wiki-generator.ts
+async function generateWiki(config) {
+  return runSubAgentLoop(
+    config,
+    "You are a senior engineer writing a project overview document for new team members. Use list_files to understand the project structure, then grep_code and run_command to read key files (e.g. package.json, README, entry points, config files). Be concrete and specific \u2014 reference real file names, commands, and concepts from this codebase. Avoid vague filler. When you have enough context, write the document.\n\n" + WIKI_FORMAT,
+    "Analyze this project thoroughly and produce a comprehensive TECHUNTER.md overview document for new team members.",
+    ["list_files", "grep_code", "run_command"]
+  );
+}
+
+// src/commands/init.ts
+async function getGitHubTokenViaPAT() {
+  console.log(chalk13.dim("\n  Create a token at: https://github.com/settings/tokens/new"));
+  console.log(chalk13.dim("  Required scopes: repo, read:user\n"));
+  const token = await password({
+    message: "GitHub Personal Access Token:",
+    mask: "*"
+  });
+  return { token: token.trim() };
+}
+var OAUTH_CLIENT_ID = "Ov23liW4zJ4r2RdZOsCJ";
+async function getGitHubTokenViaDeviceFlow() {
+  let verificationUri = "";
+  let userCode = "";
+  const auth = createOAuthDeviceAuth({
+    clientType: "oauth-app",
+    clientId: OAUTH_CLIENT_ID,
+    scopes: ["repo"],
+    onVerification(verification) {
+      verificationUri = verification.verification_uri;
+      userCode = verification.user_code;
+      console.log("");
+      console.log(chalk13.bold("  1. Open this URL in your browser:"));
+      console.log("     " + chalk13.cyan(verificationUri));
+      console.log("");
+      console.log(chalk13.bold("  2. Enter this code:"));
+      console.log("     " + chalk13.yellow.bold(userCode));
+      console.log("");
+      open2(verificationUri).catch(() => {
+      });
+    }
+  });
+  const spinner = ora14("Waiting for authorization in browser...").start();
+  let token;
+  try {
+    const result = await auth({ type: "oauth" });
+    token = result.token;
+    spinner.succeed("Authorized!");
+  } catch (err) {
+    spinner.fail("Authorization failed");
+    throw err;
+  }
+  return { token, clientId: OAUTH_CLIENT_ID };
 }
-
-// src/tools/ask-user/index.ts
-var ask_user_exports = {};
-__export(ask_user_exports, {
-  definition: () => definition19,
-  execute: () => execute19
-});
-import chalk12 from "chalk";
-import { select as select10, input as promptInput5 } from "@inquirer/prompts";
-var definition19 = {
-  type: "function",
-  function: {
-    name: "ask_user",
-    description: "Ask the user to clarify something ambiguous \u2014 scope, expected behaviour, edge cases, or business decisions. Do NOT ask about technical implementation choices. Use at most 3 times per task.",
-    parameters: {
-      type: "object",
-      properties: {
-        question: { type: "string", description: "The question to ask the user" },
-        options: {
-          type: "array",
-          items: { type: "string" },
-          description: "2\u20134 concrete answer choices"
-        }
-      },
-      required: ["question", "options"]
+async function initCommand() {
+  console.log(chalk13.bold.cyan("\nTechunter \u2014 Initial Setup\n"));
+  let detectedOwner = "";
+  let detectedRepo = "";
+  const remoteUrl = await getRemoteUrl();
+  if (remoteUrl) {
+    const parsed = parseOwnerRepo(remoteUrl);
+    if (parsed) {
+      detectedOwner = parsed.owner;
+      detectedRepo = parsed.repo;
+      console.log(chalk13.dim(`Detected GitHub repo: ${detectedOwner}/${detectedRepo}
+`));
     }
   }
-};
-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)));
-  console.log(chalk12.dim("  \u2502"));
-  for (const line of question.split("\n")) {
-    console.log(chalk12.dim("  \u2502 ") + line);
+  const authMethod = await select11({
+    message: "How would you like to authenticate with GitHub?",
+    choices: [
+      {
+        name: "Browser login (OAuth) \u2014 open a URL and click Authorize",
+        value: "device"
+      },
+      {
+        name: "Personal Access Token (PAT) \u2014 paste a token from github.com/settings/tokens",
+        value: "pat"
+      }
+    ]
+  });
+  let githubToken;
+  let githubClientId;
+  if (authMethod === "device") {
+    const result = await getGitHubTokenViaDeviceFlow();
+    githubToken = result.token;
+    githubClientId = result.clientId;
+  } else {
+    const result = await getGitHubTokenViaPAT();
+    githubToken = result.token;
   }
-  console.log(chalk12.dim("  \u2514" + "\u2500".repeat(67)));
-  let answer;
+  const providerChoice = await select11({
+    message: "AI provider:",
+    choices: [
+      { name: `OpenRouter (recommended)  ${chalk13.dim(`${DEFAULT_BASE_URL}  \xB7  ${DEFAULT_MODEL}`)}`, value: "openrouter" },
+      { name: "Custom (specify base URL and model)", value: "custom" }
+    ]
+  });
+  let aiBaseUrl;
+  let aiModel;
+  if (providerChoice === "custom") {
+    aiBaseUrl = (await input({ message: "API base URL:", default: DEFAULT_BASE_URL })).trim();
+    aiModel = (await input({ message: "Model name:", default: DEFAULT_MODEL })).trim();
+  }
+  const apiKeyHint = providerChoice === "openrouter" ? chalk13.dim("  Get a key at: https://openrouter.ai/settings/keys\n") : chalk13.dim("  API key for your provider\n");
+  console.log(apiKeyHint);
+  const aiApiKey = await password({
+    message: "API Key:",
+    mask: "*"
+  });
+  let owner = detectedOwner;
+  let repo = detectedRepo;
+  if (!owner || !repo) {
+    owner = await input({
+      message: "GitHub repo owner (user or org):",
+      required: true
+    });
+    repo = await input({
+      message: "GitHub repo name:",
+      required: true
+    });
+  }
+  const config = {
+    githubToken,
+    githubClientId,
+    aiApiKey: aiApiKey.trim(),
+    ...aiBaseUrl ? { aiBaseUrl } : {},
+    ...aiModel ? { aiModel } : {},
+    github: {
+      owner: owner.trim(),
+      repo: repo.trim()
+    }
+  };
+  setConfig(config);
+  const spinner = ora14("Setting up GitHub labels...").start();
   try {
-    const chosen = await select10({
-      message: " ",
+    await ensureLabels(config);
+    spinner.succeed("GitHub labels created");
+  } catch (err) {
+    spinner.fail("Failed to create labels (check token permissions)");
+    console.error(chalk13.red(String(err)));
+  }
+  console.log(chalk13.green("\nSetup complete!"));
+  console.log(chalk13.dim(`Config saved to: ${getConfigPath()}
+`));
+  let genWiki = false;
+  try {
+    genWiki = await select11({
+      message: "Generate TECHUNTER.md project overview for new team members?",
       choices: [
-        ...options.map((o) => ({ name: o, value: o })),
-        { name: chalk12.dim("Other (describe below)"), value: OTHER }
+        { name: "Yes, generate now", value: true },
+        { name: "No, skip (run /wiki later)", value: false }
       ]
     });
-    answer = chosen === OTHER ? await promptInput5({ message: "Your answer:" }) : chosen;
   } catch {
-    answer = "User skipped this question \u2014 use your best judgement.";
   }
-  console.log("");
-  return answer;
+  if (genWiki) {
+    const wikiSpinner = ora14("Analyzing project and generating TECHUNTER.md\u2026").start();
+    try {
+      const content = await generateWiki(config);
+      await upsertRepoFile(config, "TECHUNTER.md", content, "docs: add TECHUNTER.md project overview");
+      wikiSpinner.succeed("TECHUNTER.md created");
+    } catch (err) {
+      wikiSpinner.fail(`Could not generate wiki: ${err.message}`);
+    }
+    console.log("");
+  }
 }
 
-// src/tools/registry.ts
-var toolModules = [
-  // Command tools
-  pick_exports,
-  new_task_exports,
-  close_exports,
-  submit_exports,
-  my_status_exports,
-  review_exports,
-  refresh_exports,
-  open_code_exports,
-  reject_exports,
-  accept_exports,
-  edit_task_exports,
-  // Low-level tools
-  list_tasks_exports,
-  get_task_exports,
-  get_comments_exports,
-  get_diff_exports,
-  run_command_exports,
-  list_files_exports,
-  grep_code_exports,
-  ask_user_exports
-];
+// src/commands/config.ts
+import { input as input2, password as password2, select as select12 } from "@inquirer/prompts";
+import chalk14 from "chalk";
+async function configCommand() {
+  let config;
+  try {
+    config = getConfig();
+  } catch {
+    console.error(chalk14.red("No config found. Run `tch init` first."));
+    process.exit(1);
+  }
+  console.log(chalk14.bold.cyan("\nTechunter \u2014 Settings\n"));
+  console.log(chalk14.dim(`Config file: ${getConfigPath()}
+`));
+  const currentBaseUrl = config.aiBaseUrl ?? DEFAULT_BASE_URL;
+  const currentModel = config.aiModel ?? DEFAULT_MODEL;
+  const currentBaseBranch = config.baseBranch ?? "main";
+  const field = await select12({
+    message: "Which setting to change?",
+    choices: [
+      { name: `GitHub repo          ${chalk14.dim(`${config.github.owner}/${config.github.repo}`)}`, value: "repo" },
+      { name: `Base branch          ${chalk14.dim(currentBaseBranch)}`, value: "baseBranch" },
+      { name: `AI base URL          ${chalk14.dim(currentBaseUrl)}`, value: "aiBaseUrl" },
+      { name: `AI model             ${chalk14.dim(currentModel)}`, value: "aiModel" },
+      { name: `AI API Key           ${chalk14.dim("(hidden)")}`, value: "aiApiKey" },
+      { name: `GitHub Token         ${chalk14.dim("(hidden)")}`, value: "githubToken" },
+      { name: "Cancel", value: "cancel" }
+    ]
+  });
+  if (field === "cancel") return;
+  if (field === "baseBranch") {
+    const val = await input2({ message: "Base branch name:", default: currentBaseBranch });
+    if (val.trim()) {
+      setConfig({ baseBranch: val.trim() });
+      console.log(chalk14.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() } });
+    console.log(chalk14.green(`
+Repo set to: ${owner.trim()}/${repo.trim()}
+`));
+  } else if (field === "aiBaseUrl") {
+    const val = await input2({ message: "AI base URL:", default: currentBaseUrl });
+    if (val.trim()) {
+      setConfig({ aiBaseUrl: val.trim() });
+      console.log(chalk14.green(`
+AI base URL set to: ${val.trim()}
+`));
+    }
+  } else if (field === "aiModel") {
+    const val = await input2({ message: "AI model name:", default: currentModel });
+    if (val.trim()) {
+      setConfig({ aiModel: val.trim() });
+      console.log(chalk14.green(`
+AI model set to: ${val.trim()}
+`));
+    }
+  } else if (field === "aiApiKey") {
+    const val = await password2({ message: "New AI API Key:", mask: "*" });
+    if (val.trim()) {
+      setConfig({ aiApiKey: val.trim() });
+      console.log(chalk14.green("\nAI API Key updated.\n"));
+    }
+  } else if (field === "githubToken") {
+    const val = await password2({ message: "New GitHub Token:", mask: "*" });
+    if (val.trim()) {
+      setConfig({ githubToken: val.trim() });
+      console.log(chalk14.green("\nGitHub Token updated.\n"));
+    }
+  }
+}
+
+// src/index.ts
+init_github();
 
 // src/lib/agent.ts
+import ora15 from "ora";
+import chalk15 from "chalk";
 var tools = toolModules.map((m) => m.definition);
 var HISTORY_KEEP_TURNS = 8;
 function trimHistory(messages) {
@@ -2981,7 +3669,7 @@ async function runAgentLoop(config, messages) {
       throw new Error(`Agent exceeded ${MAX_ITERATIONS} iterations without finishing.`);
     }
     trimHistory(messages);
-    const spinner = ora14({ text: chalk13.dim("Thinking\u2026"), color: "cyan" }).start();
+    const spinner = ora15({ text: chalk15.dim("Thinking\u2026"), color: "cyan" }).start();
     let response;
     try {
       response = await client.chat.completions.create({
@@ -3026,7 +3714,7 @@ async function runAgentLoop(config, messages) {
           return executeTool(tc.function.name, parsed, config);
         })
       );
-      let terminal12 = false;
+      let terminal13 = false;
       for (let i = 0; i < toolCalls.length; i++) {
         printToolResult(results[i]);
         messages.push({
@@ -3035,16 +3723,93 @@ async function runAgentLoop(config, messages) {
           content: results[i]
         });
         if (toolModules.find((m) => m.definition.function.name === toolCalls[i].function.name)?.terminal) {
-          terminal12 = true;
+          terminal13 = true;
         }
       }
-      if (terminal12) return results[results.length - 1];
+      if (terminal13) return results[results.length - 1];
     } else {
       return choice.message.content ?? "";
     }
   }
 }
 
+// src/lib/update-check.ts
+import Conf2 from "conf";
+import chalk16 from "chalk";
+import { execFile } from "child_process";
+var PACKAGE_NAME = "techunter";
+var CHECK_INTERVAL_MS = 24 * 60 * 60 * 1e3;
+var cache = new Conf2({
+  projectName: "techunter-update-cache",
+  defaults: { lastChecked: 0, latestVersion: "" }
+});
+async function fetchLatestVersion() {
+  try {
+    const { fetch } = await import("undici");
+    const res = await fetch(`https://registry.npmjs.org/${PACKAGE_NAME}/latest`, {
+      signal: AbortSignal.timeout(5e3)
+    });
+    if (!res.ok) return null;
+    const data = await res.json();
+    return data.version ?? null;
+  } catch {
+    return null;
+  }
+}
+function isNewer(latest, current) {
+  const parse = (v) => v.split(".").map(Number);
+  const [la, lb, lc] = parse(latest);
+  const [ca, cb, cc] = parse(current);
+  if (la !== ca) return la > ca;
+  if (lb !== cb) return lb > cb;
+  return lc > cc;
+}
+async function getAvailableUpdate(currentVersion) {
+  const now = Date.now();
+  const lastChecked = cache.get("lastChecked");
+  let latest = cache.get("latestVersion");
+  if (!latest || now - lastChecked > CHECK_INTERVAL_MS) {
+    const fetched = await fetchLatestVersion();
+    if (fetched) {
+      latest = fetched;
+      cache.set("latestVersion", fetched);
+      cache.set("lastChecked", now);
+    }
+  }
+  return latest && isNewer(latest, currentVersion) ? latest : null;
+}
+function installUpdate() {
+  return new Promise((resolve, reject) => {
+    execFile("npm", ["install", "-g", PACKAGE_NAME], { shell: true }, (err, _stdout, stderr) => {
+      if (err) {
+        reject(new Error(stderr.trim() || err.message));
+      } else {
+        resolve(cache.get("latestVersion"));
+      }
+    });
+  });
+}
+async function startAutoUpdate(currentVersion) {
+  const latest = await Promise.race([
+    getAvailableUpdate(currentVersion),
+    new Promise((resolve) => setTimeout(() => resolve(null), 2e3))
+  ]);
+  if (!latest) return;
+  console.log(
+    chalk16.cyan("\n  \u2191 Auto-updating to v" + latest + "\u2026") + chalk16.dim(" (running in background)\n")
+  );
+  installUpdate().then((installedVersion) => {
+    console.log(
+      "\n" + chalk16.green("  \u2714 Updated to v" + (installedVersion || latest)) + chalk16.dim("  \u2014  restart tch to use the new version\n") + chalk16.cyan("  You \u203A ")
+      // redraw the prompt hint
+    );
+  }).catch((err) => {
+    console.log(
+      "\n" + chalk16.red("  \u2718 Auto-update failed: ") + chalk16.dim(err.message) + "\n" + chalk16.dim("  Run manually: npm install -g techunter\n") + chalk16.cyan("  You \u203A ")
+    );
+  });
+}
+
 // src/index.ts
 var _require = createRequire(import.meta.url);
 var { version } = _require("../package.json");
@@ -3071,6 +3836,8 @@ var SLASH_NAMES = [
   "/me",
   "/code",
   "/c",
+  "/wiki",
+  "/w",
   "/config",
   "/cfg",
   "/init"
@@ -3087,7 +3854,7 @@ function promptUser() {
   return new Promise((resolve) => {
     if (process.stdin.isPaused()) process.stdin.resume();
     _rl.resume();
-    _rl.question(chalk14.cyan("You") + chalk14.dim(" \u203A "), resolve);
+    _rl.question(chalk17.cyan("You") + chalk17.dim(" \u203A "), resolve);
   });
 }
 var COMMANDS = [
@@ -3103,44 +3870,45 @@ var COMMANDS = [
   { cmd: "/config", alias: "/cfg", desc: "Change settings (branch, repo, API keys)" },
   { cmd: "/init", desc: "Re-run setup wizard for this repo" },
   { cmd: "/status", alias: "/me", desc: "Show tasks assigned to you" },
-  { cmd: "/code", alias: "/c", desc: "Open Claude Code for the current task branch" }
+  { cmd: "/code", alias: "/c", desc: "Open Claude Code for the current task branch" },
+  { cmd: "/wiki", alias: "/w", desc: "Generate or refresh TECHUNTER.md project overview" }
 ];
 function cmdHelp() {
   console.log("");
-  console.log(chalk14.bold("  Commands"));
-  console.log(chalk14.dim("  \u2500".repeat(35)));
+  console.log(chalk17.bold("  Commands"));
+  console.log(chalk17.dim("  \u2500".repeat(35)));
   for (const { cmd, alias, desc } of COMMANDS) {
-    const left = (cmd + (alias ? `  ${chalk14.dim(alias)}` : "")).padEnd(22);
-    console.log(`  ${chalk14.cyan(cmd)}${alias ? "  " + chalk14.dim(alias) : ""}`.padEnd(30) + chalk14.dim(desc));
+    const left = (cmd + (alias ? `  ${chalk17.dim(alias)}` : "")).padEnd(22);
+    console.log(`  ${chalk17.cyan(cmd)}${alias ? "  " + chalk17.dim(alias) : ""}`.padEnd(30) + chalk17.dim(desc));
   }
-  console.log(chalk14.dim("\n  Anything else is sent to the AI agent.\n"));
+  console.log(chalk17.dim("\n  Anything else is sent to the AI agent.\n"));
 }
 function printBanner(config) {
   const { owner, repo } = config.github;
-  const g = chalk14.cyan;
-  const b = chalk14.bold.white;
-  const p = chalk14.yellow.bold;
+  const g = chalk17.cyan;
+  const b = chalk17.bold.white;
+  const p = chalk17.yellow.bold;
   console.log("");
   console.log("    " + g("\u2554\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2557"));
   console.log(p("\u25C6") + b("\u2550\u2550\u2550") + g("\u256C") + b("   TECHUNTER   ") + g("\u256C") + b("\u2550\u2550\u2550\u25B6"));
   console.log("    " + g("\u255A\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u255D"));
   console.log("");
   console.log(
-    "    " + chalk14.bold("Techunter") + chalk14.dim(` v${version}`) + chalk14.dim("  \xB7  ") + chalk14.cyan(getModel(config)) + chalk14.dim("  \xB7  ") + chalk14.dim(`${owner}/${repo}`)
+    "    " + chalk17.bold("Techunter") + chalk17.dim(` v${version}`) + chalk17.dim("  \xB7  ") + chalk17.cyan(getModel(config)) + chalk17.dim("  \xB7  ") + chalk17.dim(`${owner}/${repo}`)
   );
   console.log("");
 }
 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"));
+  console.log(chalk17.bold.cyan(`  New repo detected: ${owner}/${repo}`));
+  console.log(chalk17.dim("  Setting up Techunter for this repository...\n"));
   const newConfig = {
     ...config,
     github: { owner, repo }
   };
   setConfig({ github: newConfig.github });
-  const ora15 = (await import("ora")).default;
-  const spinner = ora15("Creating Techunter labels...").start();
+  const ora16 = (await import("ora")).default;
+  const spinner = ora16("Creating Techunter labels...").start();
   try {
     await ensureLabels(newConfig);
     spinner.succeed("Labels ready");
@@ -3156,7 +3924,7 @@ async function main() {
     try {
       await configCommand();
     } catch (err) {
-      console.error(chalk14.red(`
+      console.error(chalk17.red(`
 Error: ${err.message}`));
       process.exit(1);
     }
@@ -3170,7 +3938,7 @@ Error: ${err.message}`));
       await initCommand();
       config = getConfig();
     } catch (err) {
-      console.error(chalk14.red(`
+      console.error(chalk17.red(`
 Setup failed: ${err.message}`));
       process.exit(1);
       return;
@@ -3188,11 +3956,13 @@ Setup failed: ${err.message}`));
       }
     }
   } else if (!config.github.owner) {
-    console.error(chalk14.red("\nNo git remote found and no repo configured. Run tch init."));
+    console.error(chalk17.red("\nNo git remote found and no repo configured. Run tch init."));
     process.exit(1);
   }
   printBanner(config);
-  console.log(chalk14.dim("  Type /help for commands, or describe what you want.\n"));
+  console.log(chalk17.dim("  Type /help for commands, or describe what you want.\n"));
+  startAutoUpdate(version).catch(() => {
+  });
   await printTaskList(config);
   await printMyTasks(config);
   _rl = readline.createInterface({
@@ -3202,11 +3972,11 @@ Setup failed: ${err.message}`));
     terminal: true
   });
   _rl.on("close", () => {
-    console.log(chalk14.gray("\nGoodbye!"));
+    console.log(chalk17.gray("\nGoodbye!"));
     process.exit(0);
   });
   _rl.on("SIGINT", () => {
-    console.log(chalk14.gray("\nGoodbye!"));
+    console.log(chalk17.gray("\nGoodbye!"));
     process.exit(0);
   });
   const messages = [];
@@ -3223,7 +3993,7 @@ Setup failed: ${err.message}`));
           break;
         case "/refresh":
         case "/r":
-          await run7({}, config);
+          await run9({}, config);
           break;
         case "/pick":
         case "/p": {
@@ -3231,7 +4001,7 @@ Setup failed: ${err.message}`));
           const preselected = arg ? parseInt(arg, 10) : void 0;
           const result = await run3({ issue_number: Number.isNaN(preselected) ? void 0 : preselected }, config);
           if (result && result !== "Cancelled.") {
-            console.log(chalk14.green(`
+            console.log(chalk17.green(`
   ${result}
 `));
           }
@@ -3241,7 +4011,7 @@ Setup failed: ${err.message}`));
         case "/new":
         case "/n": {
           const result = await run4({}, config);
-          console.log(chalk14.green(`
+          console.log(chalk17.green(`
   ${result}
 `));
           await printTaskList(config);
@@ -3259,7 +4029,7 @@ Setup failed: ${err.message}`));
           const arg = userInput.slice(cmd.length).trim().replace(/^#/, "");
           const preselected = arg ? parseInt(arg, 10) : void 0;
           const result = await run11({ issue_number: Number.isNaN(preselected) ? void 0 : preselected }, config);
-          console.log(chalk14.green(`
+          console.log(chalk17.green(`
   ${result}
 `));
           await printTaskList(config);
@@ -3268,7 +4038,7 @@ Setup failed: ${err.message}`));
         case "/close":
         case "/d": {
           const result = await run2({}, config);
-          console.log(chalk14.green(`
+          console.log(chalk17.green(`
   ${result}
 `));
           await printTaskList(config);
@@ -3276,7 +4046,7 @@ Setup failed: ${err.message}`));
         }
         case "/review":
         case "/rv": {
-          const result = await run6({}, config);
+          const result = await run8({}, config);
           console.log("\n" + renderMarkdown(result));
           break;
         }
@@ -3290,8 +4060,8 @@ Setup failed: ${err.message}`));
         case "/ac": {
           const arg = userInput.slice(cmd.length).trim().replace(/^#/, "");
           const preselected = arg ? parseInt(arg, 10) : void 0;
-          const result = await run10({ issue_number: Number.isNaN(preselected) ? void 0 : preselected }, config);
-          console.log(chalk14.green(`
+          const result = await run6({ issue_number: Number.isNaN(preselected) ? void 0 : preselected }, config);
+          console.log(chalk17.green(`
   ${result}
 `));
           await printTaskList(config);
@@ -3307,17 +4077,25 @@ Setup failed: ${err.message}`));
             config = getConfig();
             await printTaskList(config);
           } catch (err) {
-            console.error(chalk14.red(`
+            console.error(chalk17.red(`
 Init failed: ${err.message}
 `));
           }
           break;
         case "/code":
         case "/c":
-          await run8({}, config);
+          await run10({}, config);
           break;
+        case "/wiki":
+        case "/w": {
+          const result = await run12({}, config);
+          console.log(chalk17.green(`
+  ${result}
+`));
+          break;
+        }
         default:
-          console.log(chalk14.yellow(`  Unknown command: ${cmd}  (try /help)`));
+          console.log(chalk17.yellow(`  Unknown command: ${cmd}  (try /help)`));
       }
       continue;
     }
@@ -3325,10 +4103,10 @@ Init failed: ${err.message}
     messages.push({ role: "user", content: userInput });
     try {
       const response = await runAgentLoop(config, messages);
-      console.log("\n" + chalk14.green("Techunter:") + "\n" + renderMarkdown(response));
+      console.log("\n" + chalk17.green("Techunter:") + "\n" + renderMarkdown(response));
     } catch (err) {
       messages.splice(prevLength);
-      console.error(chalk14.red(`
+      console.error(chalk17.red(`
 Error: ${err.message}
 `));
     }
@@ -3336,6 +4114,6 @@ Error: ${err.message}
   }
 }
 main().catch((err) => {
-  console.error(chalk14.red(`Fatal: ${err.message}`));
+  console.error(chalk17.red(`Fatal: ${err.message}`));
   process.exit(1);
 });