@inteeka/task-cli 0.2.29 → 0.2.31

package/dist/cli.js

@@ -3,6 +3,17 @@
 // src/cli.ts
 import { Command } from "commander";
 
+// ../../packages/constants/src/tickets.ts
+var TERMINAL_STATUSES = ["done", "duplicate_archive", "not_required_archive"];
+var RESOLVED_TICKET_STATUSES = [
+  "complete",
+  "done",
+  "duplicate_archive",
+  "not_required_archive"
+];
+var RESOLVED_TICKET_STATUSES_FILTER = `(${RESOLVED_TICKET_STATUSES.join(",")})`;
+var TERMINAL_STATUSES_FILTER = `(${TERMINAL_STATUSES.join(",")})`;
+
 // ../../packages/constants/src/plans.ts
 var PLAN_LIMITS = {
   free: {
@@ -949,7 +960,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 +1110,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 +1279,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 {
@@ -1582,11 +1623,74 @@ ${args.repoOverviewBlock}
 ${args.ticketSystemPrompt}${overview}`;
 }
 
+// src/agent/stream-render.ts
+function truncate(value, max) {
+  const oneLine = value.replace(/\s+/g, " ").trim();
+  return oneLine.length > max ? `${oneLine.slice(0, max - 1)}\u2026` : oneLine;
+}
+function formatToolUse(block) {
+  const name = typeof block["name"] === "string" ? block["name"] : "tool";
+  const input = typeof block["input"] === "object" && block["input"] !== null ? block["input"] : {};
+  const filePath = typeof input["file_path"] === "string" ? input["file_path"] : null;
+  const command = typeof input["command"] === "string" ? input["command"] : null;
+  const pattern = typeof input["pattern"] === "string" ? input["pattern"] : null;
+  if (name === "Bash" && command) return `Bash: ${truncate(command, 120)}`;
+  if (filePath && (name === "Edit" || name === "Write" || name === "Read" || name === "MultiEdit")) {
+    return `${name} ${filePath}`;
+  }
+  if (pattern && (name === "Grep" || name === "Glob")) return `${name} ${truncate(pattern, 80)}`;
+  return name;
+}
+function summariseStreamLine(line) {
+  const trimmed = line.trim();
+  if (trimmed.length === 0) return { display: null, resultError: null };
+  let evt;
+  try {
+    evt = JSON.parse(trimmed);
+  } catch {
+    return { display: null, resultError: null };
+  }
+  if (typeof evt !== "object" || evt === null) return { display: null, resultError: null };
+  const e = evt;
+  if (e["type"] === "assistant") {
+    const message = typeof e["message"] === "object" && e["message"] !== null ? e["message"] : {};
+    const content = message["content"];
+    if (!Array.isArray(content)) return { display: null, resultError: null };
+    const parts = [];
+    for (const block of content) {
+      if (typeof block !== "object" || block === null) continue;
+      const b = block;
+      if (b["type"] === "text" && typeof b["text"] === "string") {
+        const text = b["text"].trim();
+        if (text.length > 0) parts.push(text);
+      } else if (b["type"] === "tool_use") {
+        parts.push(c.cyan(`  \u2192 ${formatToolUse(b)}`));
+      }
+    }
+    return { display: parts.length > 0 ? parts.join("\n") : null, resultError: null };
+  }
+  if (e["type"] === "result") {
+    if (e["is_error"] === true) {
+      const detail = typeof e["result"] === "string" && e["result"].trim().length > 0 ? e["result"].trim() : typeof e["subtype"] === "string" ? e["subtype"] : "unknown error";
+      return {
+        display: c.err(`  \u2717 agent run errored: ${truncate(detail, 240)}`),
+        resultError: detail
+      };
+    }
+    return { display: c.dim("  agent run complete"), resultError: null };
+  }
+  return { display: null, resultError: null };
+}
+
 // src/agent/agent-service.ts
 async function runAgent(args) {
   const systemPrompt = buildSystemPrompt(args);
   const claude = args.claudePath ?? "claude";
   const cliArgs = [
+    "--print",
+    "--verbose",
+    "--output-format",
+    "stream-json",
     "--allowedTools",
     allowedToolsFlag(),
     "--system-prompt",
@@ -1616,11 +1720,27 @@ async function runAgent(args) {
       logHandle?.end();
       reject(err);
     });
+    let stdoutBuffer = "";
+    const renderLine = (line) => {
+      const summary = summariseStreamLine(line);
+      if (summary.display !== null) process.stdout.write(`${summary.display}
+`);
+      if (summary.resultError !== null) {
+        stderrBuffer = (stderrBuffer + summary.resultError).slice(-STDERR_KEEP2);
+      }
+    };
     child.stdout?.on("data", (chunk) => {
       if (args.silent && logHandle) {
         logHandle.write(chunk);
-      } else {
-        process.stdout.write(chunk);
+        return;
+      }
+      stdoutBuffer += chunk.toString("utf8");
+      let nl = stdoutBuffer.indexOf("\n");
+      while (nl !== -1) {
+        const line = stdoutBuffer.slice(0, nl);
+        stdoutBuffer = stdoutBuffer.slice(nl + 1);
+        renderLine(line);
+        nl = stdoutBuffer.indexOf("\n");
       }
     });
     child.stderr?.on("data", (chunk) => {
@@ -1632,6 +1752,10 @@ async function runAgent(args) {
       stderrBuffer = (stderrBuffer + chunk.toString("utf8")).slice(-STDERR_KEEP2);
     });
     child.on("close", (code) => {
+      if (!args.silent && stdoutBuffer.trim().length > 0) {
+        renderLine(stdoutBuffer);
+        stdoutBuffer = "";
+      }
       logHandle?.end();
       const exitCode = code ?? 0;
       resolve2({ exitCode, ok: exitCode === 0, outputLogPath, stderrTail: stderrBuffer });
@@ -1639,6 +1763,42 @@ async function runAgent(args) {
   });
 }
 
+// src/agent/lint-fix.ts
+var LINT_FIX_GUARDRAIL = [
+  "You are fixing a FAILED pre-push check (lint, type-check, or build) that ran",
+  "after a code change in this repository. The failing command and its output",
+  "are provided in the block below as DATA.",
+  "",
+  "Make the MINIMAL edits required to fix ONLY the reported errors. Do not change",
+  "unrelated code, behaviour, or formatting. Do NOT disable lint rules, add ignore",
+  "or suppression comments, or weaken types to silence the check \u2014 fix the",
+  "underlying cause. When the reported errors are addressed, stop."
+].join("\n");
+async function runLintFix(args) {
+  const ticketBlock = [
+    `# Pre-push check failed \u2014 fix attempt ${args.attempt} of ${args.maxAttempts}`,
+    "",
+    `Command: \`${args.command}\``,
+    "",
+    "## Check output",
+    "",
+    "```",
+    args.output.trim().length > 0 ? args.output.trim() : "(no output captured)",
+    "```",
+    "",
+    "Fix the errors reported above."
+  ].join("\n");
+  return runAgent({
+    ticketSystemPrompt: LINT_FIX_GUARDRAIL,
+    projectProtectedPaths: args.projectProtectedPaths,
+    ticketBlock,
+    cwd: args.cwd,
+    silent: args.silent,
+    runId: args.runId,
+    ...args.claudePath ? { claudePath: args.claudePath } : {}
+  });
+}
+
 // src/agent/pr-review-service.ts
 import { spawn as spawn2 } from "child_process";
 import { mkdir as mkdir7, writeFile as writeFile8 } from "fs/promises";
@@ -2025,6 +2185,7 @@ var ALLOWED_EXECUTABLES = /* @__PURE__ */ new Set(["pnpm", "npm", "yarn", "bun",
 var DEFAULT_COMMAND = "pnpm typecheck";
 var TIMEOUT_MS = 10 * 60 * 1e3;
 var TAIL_BYTES = 4e3;
+var FIX_CONTEXT_BYTES = 16e3;
 function parseArgv(command) {
   return command.trim().split(/\s+/).filter((s) => s.length > 0);
 }
@@ -2058,25 +2219,31 @@ async function runProjectTest(args) {
     let buf = "";
     const append = (chunk) => {
       buf += chunk.toString("utf8");
-      if (buf.length > TAIL_BYTES * 2) {
-        buf = buf.slice(-TAIL_BYTES);
+      if (buf.length > FIX_CONTEXT_BYTES * 2) {
+        buf = buf.slice(-FIX_CONTEXT_BYTES);
       }
     };
-    child.stdout?.on("data", append);
-    child.stderr?.on("data", append);
+    child.stdout?.on("data", (chunk) => {
+      append(chunk);
+      if (!args.silent) process.stdout.write(chunk);
+    });
+    child.stderr?.on("data", (chunk) => {
+      append(chunk);
+      if (!args.silent) process.stderr.write(chunk);
+    });
     const timeoutHandle = setTimeout(() => {
       child.kill("SIGKILL");
     }, TIMEOUT_MS);
     child.on("close", (code) => {
       clearTimeout(timeoutHandle);
       const durationMs = Date.now() - startedAt;
-      const tail = buf.slice(-TAIL_BYTES);
       resolve2({
         ok: code === 0,
         exitCode: code,
         durationMs,
         command,
-        tail
+        tail: buf.slice(-TAIL_BYTES),
+        fixContext: buf.slice(-FIX_CONTEXT_BYTES)
       });
     });
     child.on("error", () => {
@@ -2086,7 +2253,8 @@ async function runProjectTest(args) {
         exitCode: null,
         durationMs: Date.now() - startedAt,
         command,
-        tail: buf.slice(-TAIL_BYTES)
+        tail: buf.slice(-TAIL_BYTES),
+        fixContext: buf.slice(-FIX_CONTEXT_BYTES)
       });
     });
   });
@@ -2292,11 +2460,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 +2487,12 @@ 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(
+    "--no-fix-lint",
+    "Disable the auto-fix loop for the pre-push check \u2014 fail immediately on lint/type errors (legacy behaviour)."
+  ).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);
   });
@@ -2683,10 +2866,77 @@ ${installResult.tail}`.slice(
       )
     );
   }
+  const MAX_FIX_ATTEMPTS = 2;
+  const fixEnabled = opts.fixLint !== false;
   if (!silent)
-    process.stdout.write(c.dim(`  running pre-push test: ${testCommand ?? "pnpm typecheck"}
+    process.stdout.write(c.dim(`  running pre-push check: ${testCommand ?? "pnpm typecheck"}
 `));
-  const testResult = await runProjectTest({ cwd, command: testCommand });
+  let testResult = await runProjectTest({ cwd, command: testCommand, silent });
+  let fixAttempts = 0;
+  while (!testResult.ok && fixEnabled && fixAttempts < MAX_FIX_ATTEMPTS) {
+    fixAttempts += 1;
+    if (!silent)
+      process.stdout.write(
+        c.warn(
+          `  \u2717 pre-push check failed (exit ${testResult.exitCode}) \u2014 attempting fix ${fixAttempts}/${MAX_FIX_ATTEMPTS}
+`
+        )
+      );
+    const fixResult = await runLintFix({
+      command: testResult.command,
+      output: testResult.fixContext,
+      attempt: fixAttempts,
+      maxAttempts: MAX_FIX_ATTEMPTS,
+      projectProtectedPaths: detail.project_protected_paths,
+      cwd,
+      silent,
+      runId,
+      ...ctx.localCfg.claude_path ? { claudePath: ctx.localCfg.claude_path } : {}
+    }).catch((err) => {
+      if (!silent) process.stdout.write(c.dim(`  lint-fix agent could not run: ${err.message}
+`));
+      return null;
+    });
+    if (!fixResult || !fixResult.ok) break;
+    const fixGuardrail = checkDiff({
+      cwd,
+      projectProtectedPaths: detail.project_protected_paths
+    });
+    if (fixGuardrail.violation) {
+      discardWorkingTreeChanges(cwd);
+      try {
+        checkoutBranch(cwd, baseBranch);
+      } catch {
+      }
+      deleteLocalBranch(cwd, branchName);
+      if (!silent) {
+        process.stdout.write(
+          `${c.err("\u2717 Guardrail blocked")} \u2014 lint-fix agent attempted to modify protected files:
+`
+        );
+        for (const p of fixGuardrail.offendingPaths) {
+          process.stdout.write(`    - ${p}
+`);
+        }
+        process.stdout.write(c.dim("  Working tree restored. Branch deleted.\n"));
+      }
+      await apiCall("POST", "/api/v1/cli/me/runs", {
+        body: {
+          ticket_id: detail.id,
+          schedule_id: opts.scheduleId,
+          event: "guardrail_blocked",
+          claude_session_id: runId,
+          offending_paths: fixGuardrail.offendingPaths
+        }
+      });
+      throw new CliError(
+        CLI_EXIT_CODES.GUARDRAIL_BLOCKED,
+        `Lint-fix agent attempted to modify ${fixGuardrail.offendingPaths.length} protected file(s)`
+      );
+    }
+    if (!silent) process.stdout.write(c.dim("  re-running pre-push check\u2026\n"));
+    testResult = await runProjectTest({ cwd, command: testCommand, silent });
+  }
   if (!testResult.ok) {
     discardWorkingTreeChanges(cwd);
     try {
@@ -2706,16 +2956,21 @@ ${installResult.tail}`.slice(
     });
     if (!silent) {
       process.stdout.write(
-        `${c.err("\u2717 Pre-push test failed")} (exit ${testResult.exitCode}) \u2014 branch deleted, no push.
+        `${c.err("\u2717 Pre-push check failed")} (exit ${testResult.exitCode})` + (fixAttempts > 0 ? ` after ${fixAttempts} fix attempt${fixAttempts === 1 ? "" : "s"}` : "") + ` \u2014 branch deleted, no push.
 `
       );
-      if (testResult.tail.trim().length > 0) {
-        process.stdout.write(c.dim(testResult.tail.slice(-1e3) + "\n"));
-      }
     }
     throw new CliError(
       CLI_EXIT_CODES.GENERIC_ERROR,
-      `Pre-push test failed: ${testResult.command} (exit ${testResult.exitCode})`
+      `Pre-push check failed: ${testResult.command} (exit ${testResult.exitCode})`
+    );
+  }
+  if (fixAttempts > 0 && !silent) {
+    process.stdout.write(
+      c.dim(
+        `  pre-push check passed after ${fixAttempts} fix attempt${fixAttempts === 1 ? "" : "s"}
+`
+      )
     );
   }
   await apiCall("POST", "/api/v1/cli/me/runs", {
@@ -3159,12 +3414,22 @@ 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(
+    "--no-fix-lint",
+    "Disable the pre-push check auto-fix loop \u2014 fail immediately on lint/type errors (legacy behaviour)."
+  ).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 +3440,9 @@ async function runMultiWork(opts) {
     silent: opts.silent,
     scheduleId: opts.scheduleId,
     reset: opts.reset,
-    confirm: opts.confirm
+    confirm: opts.confirm,
+    fixLint: opts.fixLint,
+    ...opts.baseBranch ? { baseBranch: opts.baseBranch } : {}
   };
   const results = [];
   let processed = 0;
@@ -3314,7 +3581,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 +4943,12 @@ 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(
+    "--no-fix-lint",
+    "Disable the pre-push check auto-fix loop \u2014 fail immediately on lint/type errors (legacy behaviour)."
+  ).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 +4975,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 +4998,9 @@ 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.fixLint === false ? { fixLint: false } : {},
+      ...opts.baseBranch ? { baseBranch: opts.baseBranch } : {}
     };
     const outcome = await fastTrackOneTicket({
       api,
@@ -4939,7 +5218,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`)}
 `);
@@ -6037,15 +6316,21 @@ function registerConfig(program2) {
 
 // src/commands/doctor.ts
 import { execFileSync as execFileSync12 } from "child_process";
+import { existsSync } from "fs";
 import { readFile as readFile8, writeFile as writeFile13 } from "fs/promises";
-import { join as join15 } from "path";
+import { isAbsolute, join as join15 } from "path";
 import { request as request6 } from "undici";
 var ALLOWED_TEST_EXECUTABLES = /* @__PURE__ */ new Set(["pnpm", "npm", "yarn", "bun", "node", "npx"]);
+var PACKAGE_MANAGERS = /* @__PURE__ */ new Set(["pnpm", "npm", "yarn", "bun"]);
 var DEFAULT_TEST_COMMAND = "pnpm typecheck";
+var INSTALL_TIMEOUT_MS2 = 10 * 60 * 1e3;
 function registerDoctor(program2) {
   program2.command("doctor").description(
     "Diagnose your CLI setup \u2014 Identity (who you are signed in as) first, then Setup checks"
-  ).option("--fix", "attempt to auto-remediate fixable problems (e.g. add a typecheck script)").action(async (opts) => {
+  ).option(
+    "--fix",
+    "attempt to auto-remediate fixable problems (install missing dependencies, add a typecheck script)"
+  ).action(async (opts) => {
     const checks = [];
     const creds = await readCredentials();
     let accessLite = null;
@@ -6101,7 +6386,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 +6402,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({
@@ -6244,15 +6537,47 @@ async function checkPrePushTest(root, configuredCommand, fix) {
       remediation: "update projects.cli_test_command via the dashboard"
     };
   }
-  const scriptName = resolveScriptName(argv);
+  const { scriptName, subdir } = resolveTestTarget(argv);
+  const targetDir = subdir ? join15(root, subdir) : root;
+  const where = subdir ? `${subdir}/` : "repo root";
+  const inSubdir = subdir ? ` in ${subdir}/` : "";
+  if (PACKAGE_MANAGERS.has(exe)) {
+    const nodeModules = join15(targetDir, "node_modules");
+    if (!existsSync(nodeModules)) {
+      if (fix) {
+        try {
+          execFileSync12(exe, ["install"], {
+            cwd: targetDir,
+            stdio: "inherit",
+            timeout: INSTALL_TIMEOUT_MS2
+          });
+        } catch (err) {
+          return {
+            name: "pre-push test",
+            ok: false,
+            detail: `dependencies missing (${where}) \u2014 \`${exe} install\` failed: ${err.message}`,
+            remediation: `run \`${exe} install\`${inSubdir} manually, then re-run \`task doctor\``
+          };
+        }
+      }
+      if (!existsSync(nodeModules)) {
+        return {
+          name: "pre-push test",
+          ok: false,
+          detail: `dependencies not installed \u2014 ${where} has no node_modules, so "${command}" will fail`,
+          remediation: `run \`${exe} install\`${inSubdir}, or re-run \`task doctor --fix\` to install automatically`
+        };
+      }
+    }
+  }
   if (!scriptName) {
     return {
       name: "pre-push test",
       ok: true,
-      detail: `${command} (non-script executable, not statically verifiable)`
+      detail: PACKAGE_MANAGERS.has(exe) ? `${command} (dependencies present; script not statically verifiable)` : `${command} (non-script executable, not statically verifiable)`
     };
   }
-  const pkgPath = join15(root, "package.json");
+  const pkgPath = join15(targetDir, "package.json");
   let pkgRaw;
   try {
     pkgRaw = await readFile8(pkgPath, "utf8");
@@ -6260,7 +6585,7 @@ async function checkPrePushTest(root, configuredCommand, fix) {
     return {
       name: "pre-push test",
       ok: false,
-      detail: `no package.json at repo root for "${command}"`,
+      detail: `no package.json in ${where} for "${command}"`,
       remediation: `add a package.json with a "${scriptName}" script, or set projects.cli_test_command in the dashboard`
     };
   }
@@ -6271,7 +6596,7 @@ async function checkPrePushTest(root, configuredCommand, fix) {
     return {
       name: "pre-push test",
       ok: false,
-      detail: `package.json is invalid JSON: ${err.message}`
+      detail: `package.json in ${where} is invalid JSON: ${err.message}`
     };
   }
   const scripts = pkg.scripts ?? {};
@@ -6295,29 +6620,57 @@ async function checkPrePushTest(root, configuredCommand, fix) {
       detail: `added "typecheck": "tsc --noEmit" to ${pkgPath}`
     };
   }
-  const remediation = isDefaultTypecheck ? hasTypeScript ? 're-run with --fix to add "typecheck": "tsc --noEmit" to package.json' : 'add a "typecheck" script to package.json, or set a different cli_test_command in the dashboard' : `add a "${scriptName}" script to package.json, or update cli_test_command in the dashboard`;
+  const remediation = isDefaultTypecheck ? hasTypeScript ? 're-run with --fix to add "typecheck": "tsc --noEmit" to package.json' : 'add a "typecheck" script to package.json, or set a different cli_test_command in the dashboard' : `add a "${scriptName}" script to ${where} package.json, or update cli_test_command in the dashboard`;
   return {
     name: "pre-push test",
     ok: false,
-    detail: `"${scriptName}" script missing \u2014 "${command}" will exit 254 (ERR_PNPM_RECURSIVE_EXEC_FIRST_FAIL)`,
+    detail: `"${scriptName}" script missing from ${where} package.json \u2014 "${command}" will fail`,
     remediation
   };
 }
-function resolveScriptName(argv) {
+function resolveTestTarget(argv) {
   const [exe, ...rest] = argv;
-  if (!exe || rest.length === 0) return null;
-  const hasAnyFlag = rest.some((tok) => tok.startsWith("-"));
-  if (hasAnyFlag) return null;
-  if (exe === "pnpm" || exe === "yarn" || exe === "bun") {
-    const next = rest[0];
-    if (!next) return null;
-    if (next === "run") return rest[1] ?? null;
-    return next;
+  let subdir = null;
+  const positional = [];
+  let opaque = false;
+  for (let i = 0; i < rest.length; i++) {
+    const tok = rest[i];
+    if (tok === "--prefix" || tok === "-C" || tok === "--dir") {
+      const val = rest[i + 1];
+      if (val !== void 0) {
+        subdir = val;
+        i++;
+      }
+      continue;
+    }
+    const eq = tok.match(/^(?:--prefix|--dir)=(.+)$/);
+    if (eq) {
+      subdir = eq[1];
+      continue;
+    }
+    if (tok.startsWith("-")) {
+      opaque = true;
+      continue;
+    }
+    positional.push(tok);
   }
+  if (subdir !== null && (isAbsolute(subdir) || subdir.split(/[\\/]/).includes(".."))) {
+    subdir = null;
+    opaque = true;
+  }
+  const scriptName = opaque ? null : resolveScriptName(exe, positional);
+  return { scriptName, subdir, opaque };
+}
+function resolveScriptName(exe, positional) {
+  if (!exe || positional.length === 0) return null;
   if (exe === "npm") {
-    if (rest[0] === "run" || rest[0] === "run-script") return rest[1] ?? null;
+    if (positional[0] === "run" || positional[0] === "run-script") return positional[1] ?? null;
     return null;
   }
+  if (exe === "pnpm" || exe === "yarn" || exe === "bun") {
+    if (positional[0] === "run") return positional[1] ?? null;
+    return positional[0] ?? null;
+  }
   return null;
 }
 function detectIndent(raw) {
@@ -6337,7 +6690,7 @@ function checkBinary(name, command) {
 }
 
 // src/commands/version.ts
-var CLI_VERSION = true ? "0.2.29" : "0.0.0-dev";
+var CLI_VERSION = true ? "0.2.31" : "0.0.0-dev";
 function registerVersion(program2) {
   program2.command("version").description("Print the CLI version").action(() => {
     process.stdout.write(CLI_VERSION + "\n");