@inteeka/task-cli 0.2.28 → 0.2.30

package/dist/cli.js

@@ -949,7 +949,7 @@ function registerLink(program2) {
         project_slug: chosen.slug,
         project_name: chosen.name,
         cli_protected_paths: chosen.cli_protected_paths,
-        cli_base_branch: chosen.cli_base_branch ?? "development",
+        ...chosen.cli_base_branch ? { cli_base_branch: chosen.cli_base_branch } : {},
         cli_test_command: chosen.cli_test_command ?? null
       },
       repoRoot
@@ -1099,10 +1099,14 @@ function currentBranch(cwd) {
 }
 
 // src/git/branch.ts
-var VALID_BRANCH = /^[A-Za-z0-9._/-]{1,200}$/;
+var BRANCH_NAME_REGEX = /^[A-Za-z0-9._/-]{1,200}$/;
+var VALID_BRANCH = BRANCH_NAME_REGEX;
 var TICKET_BRANCH = /^task\/[a-z0-9-]{1,80}$/;
+function isValidBranchName(branch) {
+  return BRANCH_NAME_REGEX.test(branch) && !branch.includes("..") && !branch.startsWith("/") && !branch.endsWith("/");
+}
 function assertValidBranchName(branch) {
-  if (!VALID_BRANCH.test(branch) || branch.includes("..") || branch.startsWith("/") || branch.endsWith("/")) {
+  if (!isValidBranchName(branch)) {
     throw new CliError(
       CLI_EXIT_CODES.MISCONFIGURATION,
       `Invalid branch name: ${branch}`,
@@ -1264,6 +1268,32 @@ function remoteBranchExists(cwd, branchName, opts = {}) {
   }
   return stdout.trim().length > 0;
 }
+function detectDefaultBranch(cwd) {
+  try {
+    const ref = execFileSync2("git", ["symbolic-ref", "refs/remotes/origin/HEAD"], {
+      cwd,
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "pipe"]
+    }).trim();
+    const prefix = "refs/remotes/origin/";
+    if (ref.startsWith(prefix)) {
+      const name = ref.slice(prefix.length);
+      if (isValidBranchName(name)) return name;
+    }
+  } catch {
+  }
+  for (const candidate of ["main", "development", "master"]) {
+    try {
+      execFileSync2("git", ["rev-parse", "--verify", `origin/${candidate}`], {
+        cwd,
+        stdio: ["ignore", "ignore", "ignore"]
+      });
+      return candidate;
+    } catch {
+    }
+  }
+  return null;
+}
 function listLocalTicketBranches(cwd) {
   let stdout;
   try {
@@ -2292,11 +2322,20 @@ async function buildWorkContext(opts) {
     );
   }
   const localCfg = await readLocalConfig();
+  const cwd = findRepoRoot();
+  if (opts.baseBranch !== void 0 && !isValidBranchName(opts.baseBranch)) {
+    throw new CliError(
+      CLI_EXIT_CODES.MISCONFIGURATION,
+      `Invalid --base-branch value: ${opts.baseBranch}`,
+      'Branch names must contain only [A-Za-z0-9._/-], no "..", and no leading/trailing slash.'
+    );
+  }
+  const baseBranch = opts.baseBranch ?? project.cli_base_branch ?? detectDefaultBranch(cwd) ?? "main";
   return {
     project,
     localCfg,
-    cwd: findRepoRoot(),
-    baseBranch: project.cli_base_branch ?? "development",
+    cwd,
+    baseBranch,
     silent: !!opts.silent || localCfg.silent
   };
 }
@@ -2310,6 +2349,9 @@ function registerWork(program2) {
   ).option(
     "--no-auto-review",
     "Skip the post-PR /qa + /security auto-review. The PR is left open for a human to review and merge."
+  ).option(
+    "--base-branch <name>",
+    "Override the base branch for this run. Wins over the project's configured cli_base_branch and the git auto-detect fallback. Typically supplied by the dashboard listener on each spawn."
   ).option("--schedule-id <id>", "Internal: schedule id when invoked from a scheduled task").action(async (ticketId, opts) => {
     await runWork(ticketId, opts);
   });
@@ -3159,12 +3201,19 @@ function registerMultiWork(program2) {
   ).option(
     "--reset",
     "DESTRUCTIVE: discard local working-tree changes before the first ticket. Requires --confirm in non-TTY contexts."
-  ).option("--confirm", "Confirm --reset in non-TTY (silent / scheduled-task) contexts.").option("--schedule-id <id>", "Internal: schedule id when invoked from a scheduled task").action(async (opts) => {
+  ).option("--confirm", "Confirm --reset in non-TTY (silent / scheduled-task) contexts.").option(
+    "--base-branch <name>",
+    "Override the base branch for the whole batch. Wins over the project's configured cli_base_branch and the git auto-detect fallback."
+  ).option("--schedule-id <id>", "Internal: schedule id when invoked from a scheduled task").action(async (opts) => {
     await runMultiWork(opts);
   });
 }
 async function runMultiWork(opts) {
-  const ctx = await buildWorkContext({ max: opts.max, silent: opts.silent });
+  const ctx = await buildWorkContext({
+    max: opts.max,
+    silent: opts.silent,
+    ...opts.baseBranch ? { baseBranch: opts.baseBranch } : {}
+  });
   const max = Math.max(1, parseInt(opts.max, 10) || 10);
   let firstIteration = true;
   const innerOpts = {
@@ -3175,7 +3224,8 @@ async function runMultiWork(opts) {
     silent: opts.silent,
     scheduleId: opts.scheduleId,
     reset: opts.reset,
-    confirm: opts.confirm
+    confirm: opts.confirm,
+    ...opts.baseBranch ? { baseBranch: opts.baseBranch } : {}
   };
   const results = [];
   let processed = 0;
@@ -3314,7 +3364,7 @@ async function runResume(ticketRef, opts) {
       "Run 'task link' first."
     );
   }
-  const baseBranch = project.cli_base_branch ?? "development";
+  const baseBranch = project.cli_base_branch ?? detectDefaultBranch(cwd) ?? "main";
   const silent = !!opts.silent;
   assertBaseBranch(cwd, baseBranch);
   const access2 = await apiCallOrThrow("GET", "/api/v1/cli/access");
@@ -4676,6 +4726,9 @@ function registerFastTrack(program2) {
   ).option("--confirm", "Confirm --reset in non-TTY (silent / scheduled-task) contexts").option(
     "--no-auto-review",
     "Skip the post-PR /qa + /security auto-review. Each PR is left open for a human to review and merge."
+  ).option(
+    "--base-branch <name>",
+    "Override the base branch for this run. Wins over the project's configured cli_base_branch and the git auto-detect fallback."
   ).option("--schedule-id <id>", "Internal: schedule id when invoked from a scheduled task").action(async (opts) => {
     await runFastTrack(opts);
   });
@@ -4702,7 +4755,11 @@ async function runFastTrack(opts) {
   const apiUrl = (opts.apiUrl ?? process.env["TASK_API_URL"] ?? creds.api_url ?? localCfg.api_url ?? linkedProject.api_url ?? "http://localhost:3400").replace(/\/$/, "");
   const max = Math.max(1, parseInt(opts.max, 10) || 1);
   const silent = !!opts.silent || localCfg.silent;
-  const ctx = await buildWorkContext({ max: "1", silent: opts.silent });
+  const ctx = await buildWorkContext({
+    max: "1",
+    silent: opts.silent,
+    ...opts.baseBranch ? { baseBranch: opts.baseBranch } : {}
+  });
   const api = new AutopilotApi({ apiUrl, creds });
   const claudePath = localCfg.claude_path ?? void 0;
   let firstIteration = true;
@@ -4721,7 +4778,8 @@ async function runFastTrack(opts) {
       // Commander sets opts.autoReview to `false` only when --no-auto-review
       // is passed; otherwise it's `undefined` and processOneTicketImpl
       // treats `undefined` as "auto-review enabled" (opts.autoReview !== false).
-      ...opts.autoReview === false ? { autoReview: false } : {}
+      ...opts.autoReview === false ? { autoReview: false } : {},
+      ...opts.baseBranch ? { baseBranch: opts.baseBranch } : {}
     };
     const outcome = await fastTrackOneTicket({
       api,
@@ -4939,7 +4997,7 @@ async function runPrTest(opts) {
       "Run 'task link' first."
     );
   }
-  const baseBranch = project.cli_base_branch ?? "development";
+  const baseBranch = project.cli_base_branch ?? detectDefaultBranch(cwd) ?? "main";
   const silent = !!opts.silent;
   if (!silent) process.stdout.write(`${c.dim(`Step 1/6: assertBaseBranch (${baseBranch})\u2026`)}
 `);
@@ -6101,7 +6159,15 @@ function registerDoctor(program2) {
       });
     }
     if (project) {
-      const baseBranch = project.cli_base_branch ?? "development";
+      const explicitlyConfigured = typeof project.cli_base_branch === "string";
+      checks.push({
+        group: "setup",
+        name: "cli base branch configured",
+        ok: explicitlyConfigured,
+        detail: explicitlyConfigured ? `set to "${project.cli_base_branch}"` : "no value set on the project \u2014 using auto-detect fallback",
+        remediation: explicitlyConfigured ? void 0 : `Open the dashboard \u2192 Project settings \u2192 Agentic CLI and set the base branch (typically "main" or "development"), then re-run \`task link\`.`
+      });
+      const baseBranch = project.cli_base_branch ?? detectDefaultBranch(root) ?? "main";
       try {
         const exists = remoteBranchExists(root, baseBranch);
         checks.push({
@@ -6109,7 +6175,7 @@ function registerDoctor(program2) {
           name: "base branch on origin",
           ok: exists,
           detail: exists ? `origin/${baseBranch} reachable` : `origin has no branch "${baseBranch}"`,
-          remediation: exists ? void 0 : `push it (\`git push origin ${baseBranch}\`) or update the project's cli_base_branch via PATCH /api/v1/projects/${project.project_id}`
+          remediation: exists ? void 0 : `push it (\`git push origin ${baseBranch}\`) or set the project's base branch in the dashboard (Project settings \u2192 Agentic CLI), or pass --base-branch <name> on the next \`task work\``
         });
       } catch (err) {
         checks.push({
@@ -6337,7 +6403,7 @@ function checkBinary(name, command) {
 }
 
 // src/commands/version.ts
-var CLI_VERSION = true ? "0.2.28" : "0.0.0-dev";
+var CLI_VERSION = true ? "0.2.30" : "0.0.0-dev";
 function registerVersion(program2) {
   program2.command("version").description("Print the CLI version").action(() => {
     process.stdout.write(CLI_VERSION + "\n");