@intent-systems/nexus 2026.1.5-3 → 2026.1.5-5

package/dist/cli/upstream-sync-cli.js

@@ -21,7 +21,7 @@
  *   bundle-dispatch-oldest - Dispatch oldest pending bundles
  */
 import { execSync, spawn } from "node:child_process";
-import { existsSync, readFileSync, writeFileSync, mkdirSync, openSync, closeSync, statSync, } from "node:fs";
+import { closeSync, existsSync, mkdirSync, openSync, readFileSync, statSync, writeFileSync, } from "node:fs";
 import { dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 const __dirname = dirname(fileURLToPath(import.meta.url));
@@ -29,6 +29,14 @@ const PROJECT_ROOT = resolve(__dirname, "../..");
 const STATE_FILE = join(PROJECT_ROOT, ".upstream-sync/state.json");
 const TMUX_SOCKET = "/tmp/upstream-sync.sock";
 const RUNS_DIR = join(PROJECT_ROOT, ".upstream-sync/runs");
+const DEFAULT_MAX_CONCURRENT = 6;
+function getMaxConcurrent() {
+    const raw = process.env.NEXUS_UPSTREAM_SYNC_MAX_CONCURRENT;
+    const parsed = raw ? Number.parseInt(raw, 10) : Number.NaN;
+    if (Number.isFinite(parsed) && parsed > 0)
+        return parsed;
+    return DEFAULT_MAX_CONCURRENT;
+}
 // ============================================================================
 // State Management
 // ============================================================================
@@ -120,7 +128,11 @@ function getTypePriority(type, breaking) {
 function bundleDirectCommits(state) {
     const directCommits = Object.entries(state.merges)
         .filter(([_, e]) => e.isDirectCommit && e.status === "new" && !e.bundleId)
-        .map(([sha, e]) => ({ sha, entry: e, parsed: parseConventionalCommit(e.title) }));
+        .map(([sha, e]) => ({
+        sha,
+        entry: e,
+        parsed: parseConventionalCommit(e.title),
+    }));
     if (directCommits.length === 0)
         return [];
     // Group by: date (day) + scope + type
@@ -135,7 +147,7 @@ function bundleDirectCommits(state) {
         if (!groups.has(key)) {
             groups.set(key, []);
         }
-        groups.get(key).push(commit);
+        groups.get(key)?.push(commit);
     }
     // Convert groups to bundles
     const bundles = [];
@@ -177,8 +189,17 @@ function bundleDirectCommits(state) {
     return bundles.sort((a, b) => b.priority - a.priority);
 }
 // Types that should ALWAYS be consolidated into daily bundles (low priority, safe to batch)
-const LOW_PRIORITY_TYPES = new Set(["fix", "docs", "test", "chore", "style", "ci", "build"]);
-const BUNDLE_STRATEGY = (process.env.NEXUS_UPSTREAM_SYNC_BUNDLE_STRATEGY ?? "aggressive");
+const LOW_PRIORITY_TYPES = new Set([
+    "fix",
+    "docs",
+    "test",
+    "chore",
+    "style",
+    "ci",
+    "build",
+]);
+const BUNDLE_STRATEGY = (process.env.NEXUS_UPSTREAM_SYNC_BUNDLE_STRATEGY ??
+    "aggressive");
 const MIN_BUNDLE_LINES = (() => {
     const raw = process.env.NEXUS_UPSTREAM_SYNC_BUNDLE_MIN_LINES ?? "1000";
     const parsed = Number.parseInt(raw, 10);
@@ -314,7 +335,7 @@ function consolidateBundles(state, bundles) {
             if (!scopeBundles.has(key)) {
                 scopeBundles.set(key, []);
             }
-            scopeBundles.get(key).push(bundle);
+            scopeBundles.get(key)?.push(bundle);
             continue;
         }
         if (bundle.type && LOW_PRIORITY_TYPES.has(bundle.type)) {
@@ -351,7 +372,7 @@ function consolidateBundles(state, bundles) {
             if (!byDate.has(date)) {
                 byDate.set(date, []);
             }
-            byDate.get(date).push(bundle);
+            byDate.get(date)?.push(bundle);
         }
         for (const [date, group] of byDate) {
             if (group.length === 1) {
@@ -384,7 +405,7 @@ function consolidateBundles(state, bundles) {
         if (!byDateType.has(key)) {
             byDateType.set(key, []);
         }
-        byDateType.get(key).push(bundle);
+        byDateType.get(key)?.push(bundle);
     }
     for (const [key, group] of byDateType) {
         if (group.length === 1) {
@@ -418,7 +439,7 @@ function printBundles(bundles) {
         console.log("No bundles to display.");
         return;
     }
-    console.log("\n" + "═".repeat(60));
+    console.log(`\n${"═".repeat(60)}`);
     console.log("  DIRECT COMMIT BUNDLES");
     console.log("═".repeat(60));
     // Group by priority tier
@@ -442,13 +463,15 @@ function printBundles(bundles) {
     printTier("FIXES", "🐛", fixes);
     printTier("REFACTORS", "♻️", refactors);
     printTier("OTHER", "📦", other);
-    console.log("\n" + "═".repeat(60));
+    console.log(`\n${"═".repeat(60)}`);
     console.log(`  Total: ${bundles.length} bundles, ${bundles.reduce((sum, b) => sum + b.commits.length, 0)} commits`);
-    console.log("═".repeat(60) + "\n");
+    console.log(`${"═".repeat(60)}\n`);
 }
 function categorizeSplitBucket(title, type) {
     const lower = title.toLowerCase();
-    if (lower.includes("appcast") || lower.includes("release") || lower.includes("changelog")) {
+    if (lower.includes("appcast") ||
+        lower.includes("release") ||
+        lower.includes("changelog")) {
         return "release";
     }
     if (type === "docs" ||
@@ -483,7 +506,9 @@ function categorizeSplitBucket(title, type) {
     if (lower.includes("cron") || lower.includes("gateway")) {
         return "gateway";
     }
-    if (lower.includes("voice") || lower.includes("plugin") || lower.includes("apply_patch")) {
+    if (lower.includes("voice") ||
+        lower.includes("plugin") ||
+        lower.includes("apply_patch")) {
         return "voice";
     }
     if (type && type !== "other")
@@ -495,7 +520,11 @@ function categorizeSplitBucket(title, type) {
 // ============================================================================
 function exec(cmd, cwd) {
     try {
-        return execSync(cmd, { cwd, encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] }).trim();
+        return execSync(cmd, {
+            cwd,
+            encoding: "utf-8",
+            stdio: ["pipe", "pipe", "pipe"],
+        }).trim();
     }
     catch (e) {
         const error = e;
@@ -503,7 +532,8 @@ function exec(cmd, cwd) {
     }
 }
 function isDispatchDisabled(state) {
-    return process.env.NEXUS_UPSTREAM_SYNC_DISABLE_DISPATCH === "1" || Boolean(state?.dispatchDisabled);
+    return (process.env.NEXUS_UPSTREAM_SYNC_DISABLE_DISPATCH === "1" ||
+        Boolean(state?.dispatchDisabled));
 }
 function assertDispatchEnabled(state) {
     if (isDispatchDisabled(state)) {
@@ -524,7 +554,10 @@ function branchExists(branchName) {
 }
 function isGitAncestor(ancestor, target, cwd) {
     try {
-        execSync(`git merge-base --is-ancestor ${ancestor} ${target}`, { cwd, stdio: "ignore" });
+        execSync(`git merge-base --is-ancestor ${ancestor} ${target}`, {
+            cwd,
+            stdio: "ignore",
+        });
         return true;
     }
     catch {
@@ -539,7 +572,8 @@ function assertBranchBasedOnMain(branchName, worktreePath) {
         }
         return mainCommit;
     }
-    if (branchExists(branchName) && !isGitAncestor(mainCommit, branchName, PROJECT_ROOT)) {
+    if (branchExists(branchName) &&
+        !isGitAncestor(mainCommit, branchName, PROJECT_ROOT)) {
         throw new Error(`Branch ${branchName} is not based on current main (${mainCommit}). Delete/recreate before dispatch.`);
     }
     return mainCommit;
@@ -559,7 +593,7 @@ function getRunPaths(runId) {
 }
 function bashSingleQuote(s) {
     // 'foo'"'"'bar' pattern
-    return `'${s.replace(/'/g, `'\"'\"'`)}'`;
+    return `'${s.replace(/'/g, `'"'"'`)}'`;
 }
 function isPidRunning(pid) {
     try {
@@ -580,6 +614,19 @@ function readLastLines(filePath, maxLines) {
         return "";
     }
 }
+function hasWorktreeCommitBeyondMain(worktreePath) {
+    try {
+        const log = execSync(`git log --oneline main..HEAD`, {
+            cwd: worktreePath,
+            encoding: "utf-8",
+            stdio: ["pipe", "pipe", "ignore"],
+        }).trim();
+        return Boolean(log);
+    }
+    catch {
+        return false;
+    }
+}
 function isRunStalled(runLog, runStartedAt) {
     if (!runLog || !runStartedAt)
         return false;
@@ -605,13 +652,19 @@ function startDetachedAgentRun(opts) {
     const promptArg = bashSingleQuote(opts.prompt);
     const commitMsgArg = bashSingleQuote(opts.commitMessage);
     const exitPathArg = bashSingleQuote(exitPath);
+    const nodeMajor = Number((process.versions.node ?? "").split(".")[0] ?? 0);
+    const skipInstall = process.env.NEXUS_UPSTREAM_SYNC_SKIP_INSTALL === "1" ||
+        (nodeMajor > 0 && nodeMajor < 20);
+    const installCmd = skipInstall
+        ? `echo "SKIP_NPM_INSTALL"; `
+        : `npm install || echo "WARN: npm install failed; continuing"; `;
     const cmd = `rc=0; ` +
         `echo "== upstream-sync run ${opts.runId} =="; ` +
         `echo "startedAt=${startedAt}"; ` +
         `echo "cwd=${opts.cwd}"; ` +
         `echo ""; ` +
-        `npm install || rc=$?; ` +
-        `if [ $rc -eq 0 ]; then codex exec --dangerously-bypass-approvals-and-sandbox ${promptArg} || rc=$?; fi; ` +
+        installCmd +
+        `codex exec --dangerously-bypass-approvals-and-sandbox ${promptArg} || rc=$?; ` +
         `if [ $rc -eq 0 ]; then ` +
         `  git add -A || rc=$?; ` +
         `  git reset PORT_TASK.md package-lock.json 2>/dev/null || true; ` +
@@ -631,14 +684,25 @@ function startDetachedAgentRun(opts) {
         env: process.env,
     });
     try {
-        writeFileSync(metaPath, JSON.stringify({ runId: opts.runId, pid: child.pid, startedAt, cwd: opts.cwd, logPath, exitPath }, null, 2) + "\n");
+        writeFileSync(metaPath, `${JSON.stringify({
+            runId: opts.runId,
+            pid: child.pid,
+            startedAt,
+            cwd: opts.cwd,
+            logPath,
+            exitPath,
+        }, null, 2)}\n`);
     }
     catch {
         // ignore
     }
     child.unref();
     closeSync(fd);
-    return { pid: child.pid, logPath, exitPath, metaPath, startedAt };
+    const pid = child.pid;
+    if (!pid) {
+        throw new Error("Expected child process pid");
+    }
+    return { pid, logPath, exitPath, metaPath, startedAt };
 }
 function getUpstreamPath(state) {
     return resolve(PROJECT_ROOT, state.upstream.path);
@@ -682,7 +746,14 @@ function findNewCommits(state) {
             const prMatch = subject.match(/Merge pull request #(\d+) from (.+)/);
             const prNumber = prMatch ? parseInt(prMatch[1], 10) : undefined;
             const title = prMatch ? prMatch[2] : subject;
-            commits.push({ sha, prNumber, title, date, isDirectCommit: false, author });
+            commits.push({
+                sha,
+                prNumber,
+                title,
+                date,
+                isDirectCommit: false,
+                author,
+            });
         }
         else {
             // Check if this references a PR anywhere in the subject:
@@ -698,18 +769,31 @@ function findNewCommits(state) {
                     .replace(/\s*\(#\d+\)\s*/g, " ")
                     .replace(/\s+/g, " ")
                     .trim();
-                commits.push({ sha, prNumber, title, date, isDirectCommit: false, author });
+                commits.push({
+                    sha,
+                    prNumber,
+                    title,
+                    date,
+                    isDirectCommit: false,
+                    author,
+                });
             }
             else {
                 // True direct commit - no PR number reference
-                commits.push({ sha, title: subject, date, isDirectCommit: true, author });
+                commits.push({
+                    sha,
+                    title: subject,
+                    date,
+                    isDirectCommit: true,
+                    author,
+                });
             }
         }
     }
     return commits;
 }
 // Legacy alias for compatibility
-function findNewMerges(state) {
+function _findNewMerges(state) {
     return findNewCommits(state);
 }
 // ============================================================================
@@ -720,7 +804,9 @@ function generatePortTask(state, sha, entry) {
     const baseCommit = entry.baseCommit || exec("git rev-parse main", PROJECT_ROOT);
     // Get the diff for this commit
     const diff = exec(`git show ${sha} --stat`, upstreamPath);
-    const commitType = entry.isDirectCommit ? "Direct Commit" : `PR #${entry.prNumber || "unknown"}`;
+    const commitType = entry.isDirectCommit
+        ? "Direct Commit"
+        : `PR #${entry.prNumber || "unknown"}`;
     const commitLabel = entry.isDirectCommit
         ? `⭐ DIRECT COMMIT (HIGH PRIORITY)`
         : `PR #${entry.prNumber}`;
@@ -792,7 +878,7 @@ function dispatchAgent(state, sha) {
                 exec(`git worktree add ${worktreePath} ${branchName}`, PROJECT_ROOT);
             }
             catch {
-                throw new Error(`Failed to create worktree: ${e}`);
+                throw new Error(`Failed to create worktree: ${String(e)}`);
             }
         }
     }
@@ -804,7 +890,12 @@ function dispatchAgent(state, sha) {
     const runId = `pr-${identifier}-${Date.now()}`;
     const prompt = "Read PORT_TASK.md and complete the porting task. Commit your changes when done (a supervisor will also attempt to commit).";
     const commitMessage = "feat: port upstream changes";
-    const run = startDetachedAgentRun({ runId, cwd: worktreePath, prompt, commitMessage });
+    const run = startDetachedAgentRun({
+        runId,
+        cwd: worktreePath,
+        prompt,
+        commitMessage,
+    });
     console.log(`   Started detached runner pid=${run.pid}`);
     // Update state
     entry.status = "porting";
@@ -851,7 +942,8 @@ function checkAgentStatus(state, sha) {
             return "idle";
         // If log indicates codex finished and is waiting on commit, treat as idle.
         const tail = entry.runLog ? readLastLines(entry.runLog, 30) : "";
-        if (tail.includes("Your task is complete") || tail.includes("Run these commands NOW"))
+        if (tail.includes("Your task is complete") ||
+            tail.includes("Run these commands NOW"))
             return "idle";
         return "working";
     }
@@ -884,7 +976,8 @@ function checkAgentStatus(state, sha) {
     try {
         const output = exec(`tmux -S "${TMUX_SOCKET}" capture-pane -p -t ${sessionName} -S -10`);
         // Check if codex is waiting for commit instructions
-        if (output.includes("Your task is complete") || output.includes("Run these commands NOW")) {
+        if (output.includes("Your task is complete") ||
+            output.includes("Run these commands NOW")) {
             if (entry.portBranch) {
                 try {
                     const commits = exec(`git log main..${entry.portBranch} --oneline`, PROJECT_ROOT);
@@ -958,7 +1051,10 @@ function nudgeIdleAgent(worktreePath, sessionName) {
             }
             let hasChanges = false;
             try {
-                execSync("git diff --cached --quiet", { cwd: worktreePath, stdio: "ignore" });
+                execSync("git diff --cached --quiet", {
+                    cwd: worktreePath,
+                    stdio: "ignore",
+                });
             }
             catch {
                 hasChanges = true;
@@ -1014,7 +1110,9 @@ function updateAllStatuses(state) {
         if (entry.bundleId)
             continue;
         if (entry.status === "porting") {
-            const label = entry.prNumber ? `PR #${entry.prNumber}` : `Commit ${sha.slice(0, 8)}`;
+            const label = entry.prNumber
+                ? `PR #${entry.prNumber}`
+                : `Commit ${sha.slice(0, 8)}`;
             const status = checkAgentStatus(state, sha);
             if (status === "done") {
                 // Agent finished and committed - close session and mark complete
@@ -1098,7 +1196,7 @@ function checkBundleAgentStatus(bundleId) {
                     encoding: "utf-8",
                     stdio: ["pipe", "pipe", "ignore"],
                 }).trim();
-                if (subject) {
+                if (subject && hasWorktreeCommitBeyondMain(worktreePath)) {
                     const files = execSync(`git show --name-only --pretty=format: -1`, {
                         cwd: worktreePath,
                         encoding: "utf-8",
@@ -1123,7 +1221,8 @@ function checkBundleAgentStatus(bundleId) {
             if (isRunStalled(bundle.runLog, bundle.runStartedAt))
                 return "idle";
             const tail = bundle.runLog ? readLastLines(bundle.runLog, 40) : "";
-            if (tail.includes("Your task is complete") || tail.includes("Run these commands NOW"))
+            if (tail.includes("Your task is complete") ||
+                tail.includes("Run these commands NOW"))
                 return "idle";
             return "working";
         }
@@ -1138,10 +1237,11 @@ function checkBundleAgentStatus(bundleId) {
             encoding: "utf-8",
             stdio: ["pipe", "pipe", "ignore"],
         }).trim();
-        if (log.includes("port") ||
+        if ((log.includes("port") ||
             log.includes("feat:") ||
             log.includes("fix:") ||
-            log.includes("refactor")) {
+            log.includes("refactor")) &&
+            hasWorktreeCommitBeyondMain(worktreePath)) {
             // Ensure the commit includes actual changes beyond PORT_TASK/package-lock
             try {
                 const files = execSync(`git show --name-only --pretty=format: -1`, {
@@ -1169,7 +1269,8 @@ function checkBundleAgentStatus(bundleId) {
                 const pane = execSync(`tmux -S ${TMUX_SOCKET} capture-pane -t "${sessionName}" -p 2>/dev/null`, {
                     encoding: "utf-8",
                 });
-                if (pane.includes("Your task is complete") || pane.includes("Run these commands NOW")) {
+                if (pane.includes("Your task is complete") ||
+                    pane.includes("Run these commands NOW")) {
                     return "idle"; // Done but hasn't exited
                 }
                 return "working";
@@ -1246,7 +1347,14 @@ function formatDuration(seconds) {
     return `${mins}m`;
 }
 function printStatus(state) {
-    const counts = { new: 0, porting: 0, pending_review: 0, shelved: 0, merged: 0, ignored: 0 };
+    const counts = {
+        new: 0,
+        porting: 0,
+        pending_review: 0,
+        shelved: 0,
+        merged: 0,
+        ignored: 0,
+    };
     const byStatus = {
         pending_review: [],
         shelved: [],
@@ -1261,7 +1369,7 @@ function printStatus(state) {
         counts[statusKey]++;
         byStatus[statusKey].push({ sha, entry });
     }
-    console.log("\n" + "═".repeat(60));
+    console.log(`\n${"═".repeat(60)}`);
     console.log("  UPSTREAM SYNC STATUS");
     console.log("═".repeat(60));
     console.log(`  Last fetched: ${state.lastFetched}`);
@@ -1302,7 +1410,9 @@ function printStatus(state) {
             const sessionName = getBundleSessionName(bundle.id);
             const agentStatus = checkBundleAgentStatus(bundle.id);
             const session = tmuxSessions.get(sessionName);
-            const runtimeSec = session ? Math.floor(Date.now() / 1000) - session.created : 0;
+            const runtimeSec = session
+                ? Math.floor(Date.now() / 1000) - session.created
+                : 0;
             const runtime = formatDuration(runtimeSec);
             const statusLabel = agentStatus === "idle"
                 ? "stuck (idle)"
@@ -1359,7 +1469,9 @@ function printStatus(state) {
     if (byStatus.porting.length > 0) {
         console.log("  ⚙️  IN PROGRESS:");
         for (const { entry } of byStatus.porting) {
-            const status = entry.tmuxSession ? `tmux: ${entry.tmuxSession}` : "unknown";
+            const status = entry.tmuxSession
+                ? `tmux: ${entry.tmuxSession}`
+                : "unknown";
             console.log(`     PR #${entry.prNumber}: ${entry.title} [${status}]`);
         }
         console.log("");
@@ -1371,7 +1483,7 @@ function printStatus(state) {
                 return -1;
             if (!a.entry.isDirectCommit && b.entry.isDirectCommit)
                 return 1;
-            return new Date(b.entry.date).getTime() - new Date(a.entry.date).getTime();
+            return (new Date(b.entry.date).getTime() - new Date(a.entry.date).getTime());
         });
         const directCount = sortedNew.filter((x) => x.entry.isDirectCommit).length;
         console.log(`  🆕 NEW (will dispatch agents): ${directCount} direct commits, ${byStatus.new.length - directCount} PRs`);
@@ -1380,7 +1492,9 @@ function printStatus(state) {
             console.log(`     ⭐ DIRECT: ${entry.title} (${entry.author || "unknown"})`);
         }
         // Then PRs
-        for (const { entry } of sortedNew.filter((x) => !x.entry.isDirectCommit).slice(0, 10)) {
+        for (const { entry } of sortedNew
+            .filter((x) => !x.entry.isDirectCommit)
+            .slice(0, 10)) {
             console.log(`     PR #${entry.prNumber}: ${entry.title}`);
         }
         const remainingPRs = sortedNew.filter((x) => !x.entry.isDirectCommit).length - 10;
@@ -1410,7 +1524,7 @@ function printStatus(state) {
     console.log("    bundle-dispatch-oldest  - Dispatch oldest pending bundles");
     console.log("    bundle-ignore <id>      - Ignore a bundle");
     console.log("    bundle-auto             - Auto-dispatch high-priority bundles");
-    console.log("═".repeat(60) + "\n");
+    console.log(`${"═".repeat(60)}\n`);
 }
 // ============================================================================
 // Commands
@@ -1418,7 +1532,7 @@ function printStatus(state) {
 function findMergeBySha(state, prNumOrSha) {
     // Try PR number first
     const prNum = parseInt(prNumOrSha, 10);
-    if (!isNaN(prNum)) {
+    if (!Number.isNaN(prNum)) {
         for (const [sha, entry] of Object.entries(state.merges)) {
             if (entry.prNumber === prNum) {
                 return { sha, entry };
@@ -1437,13 +1551,13 @@ function findMergeBySha(state, prNumOrSha) {
     }
     return null;
 }
-function cmdMerge(state, prNumOrSha) {
+function _cmdMerge(state, prNumOrSha) {
     const found = findMergeBySha(state, prNumOrSha);
     if (!found) {
         console.error(`❌ PR not found: ${prNumOrSha}`);
         return;
     }
-    const { sha, entry } = found;
+    const { entry } = found;
     if (entry.status !== "pending_review") {
         console.error(`❌ PR #${entry.prNumber} is not ready for review (status: ${entry.status})`);
         return;
@@ -1466,7 +1580,7 @@ function cmdMerge(state, prNumOrSha) {
         }
     }
     catch (e) {
-        console.error(`❌ Merge failed: ${e}`);
+        console.error(`❌ Merge failed: ${String(e)}`);
     }
 }
 function cmdIgnore(state, prNumOrSha, reason) {
@@ -1526,7 +1640,7 @@ function cmdShow(state, prNumOrSha) {
         console.log(diff);
     }
     catch (e) {
-        console.error(`   Could not get diff: ${e}`);
+        console.error(`   Could not get diff: ${String(e)}`);
     }
 }
 function cmdShelve(state, prNumOrSha) {
@@ -1571,7 +1685,7 @@ function cmdUnshelve(state, prNumOrSha) {
     saveState(state);
     console.log(`👀 PR #${entry.prNumber} moved back to pending review`);
 }
-function generatePrDescription(state, sha, entry) {
+function generatePrDescription(state, sha, _entry) {
     const upstreamPath = getUpstreamPath(state);
     try {
         // Get commit message body for description
@@ -1593,7 +1707,7 @@ function cmdTimeline(state) {
     const entries = Object.entries(state.merges);
     // Group by date
     const byDate = new Map();
-    for (const [sha, entry] of entries) {
+    for (const [_sha, entry] of entries) {
         const date = entry.date.split("T")[0];
         if (!byDate.has(date)) {
             byDate.set(date, {
@@ -1607,6 +1721,8 @@ function cmdTimeline(state) {
             });
         }
         const day = byDate.get(date);
+        if (!day)
+            continue;
         if (entry.status === "merged")
             day.merged++;
         else if (entry.status === "porting")
@@ -1625,7 +1741,15 @@ function cmdTimeline(state) {
     // Sort dates
     const dates = [...byDate.keys()].sort();
     // Calculate totals
-    const totals = { merged: 0, porting: 0, pending: 0, new: 0, ignored: 0, prs: 0, direct: 0 };
+    const totals = {
+        merged: 0,
+        porting: 0,
+        pending: 0,
+        new: 0,
+        ignored: 0,
+        prs: 0,
+        direct: 0,
+    };
     for (const day of byDate.values()) {
         totals.merged += day.merged;
         totals.porting += day.porting;
@@ -1635,11 +1759,15 @@ function cmdTimeline(state) {
         totals.prs += day.prs;
         totals.direct += day.direct;
     }
-    const totalCommits = totals.merged + totals.porting + totals.pending + totals.new + totals.ignored;
+    const totalCommits = totals.merged +
+        totals.porting +
+        totals.pending +
+        totals.new +
+        totals.ignored;
     const ported = totals.merged + totals.porting + totals.pending;
     const portedPct = Math.round((ported / totalCommits) * 100);
     // Header
-    console.log("\n" + "═".repeat(80));
+    console.log(`\n${"═".repeat(80)}`);
     console.log("  📊 NEXUS ← UPSTREAM SYNC TIMELINE");
     console.log("═".repeat(80));
     console.log(`  Tracking since: ${state.trackingStartDate}`);
@@ -1665,11 +1793,13 @@ function cmdTimeline(state) {
     console.log("");
     // Daily timeline
     console.log("  DAILY TIMELINE:");
-    console.log("  " + "─".repeat(76));
+    console.log(`  ${"─".repeat(76)}`);
     console.log("  Date       │ Total │ Merged │ Porting │ Pending │ New   │ Progress");
-    console.log("  " + "─".repeat(76));
+    console.log(`  ${"─".repeat(76)}`);
     for (const date of dates) {
         const day = byDate.get(date);
+        if (!day)
+            continue;
         const dayTotal = day.merged + day.porting + day.pending + day.new + day.ignored;
         const dayPorted = day.merged + day.porting + day.pending;
         const dayPct = dayTotal > 0 ? Math.round((dayPorted / dayTotal) * 100) : 0;
@@ -1685,7 +1815,7 @@ function cmdTimeline(state) {
             "·".repeat(Math.max(0, miniNew));
         console.log(`  ${date} │ ${String(dayTotal).padStart(5)} │ ${String(day.merged).padStart(6)} │ ${String(day.porting).padStart(7)} │ ${String(day.pending).padStart(7)} │ ${String(day.new).padStart(5)} │ ${miniBar} ${dayPct}%`);
     }
-    console.log("  " + "─".repeat(76));
+    console.log(`  ${"─".repeat(76)}`);
     console.log(`  TOTAL      │ ${String(totalCommits).padStart(5)} │ ${String(totals.merged).padStart(6)} │ ${String(totals.porting).padStart(7)} │ ${String(totals.pending).padStart(7)} │ ${String(totals.new).padStart(5)} │`);
     console.log("");
     // Bundle summary
@@ -1704,7 +1834,7 @@ function cmdTimeline(state) {
     const portingEntries = entries.filter(([_, e]) => e.status === "porting");
     if (portingEntries.length > 0) {
         console.log("  🔧 CURRENTLY PORTING:");
-        for (const [sha, entry] of portingEntries.slice(0, 8)) {
+        for (const [_sha, entry] of portingEntries.slice(0, 8)) {
             const type = entry.isDirectCommit ? "DIRECT" : `PR #${entry.prNumber}`;
             const session = entry.tmuxSession ? ` [${entry.tmuxSession}]` : "";
             console.log(`     ${type}: ${entry.title.slice(0, 50)}...${session}`);
@@ -1728,7 +1858,7 @@ function cmdTimeline(state) {
     console.log(`     But Peter pushes ${totals.direct} commits directly to main (no PRs).`);
     console.log(`     We just discovered these today - that's why there's so much "new" work.`);
     console.log("");
-    console.log("═".repeat(80) + "\n");
+    console.log(`${"═".repeat(80)}\n`);
 }
 function cmdReview(state) {
     const reviewable = Object.entries(state.merges)
@@ -1853,7 +1983,7 @@ function cmdRebundle(state) {
     }
     // 1. Clear bundleIds from all "new" direct commits (not porting ones)
     let clearedCommits = 0;
-    for (const [sha, entry] of Object.entries(state.merges)) {
+    for (const [_sha, entry] of Object.entries(state.merges)) {
         if (entry.isDirectCommit && entry.bundleId && entry.status === "new") {
             delete entry.bundleId;
             clearedCommits++;
@@ -1997,7 +2127,7 @@ function dispatchBundleAgent(state, bundleId) {
                 exec(`git worktree add ${worktreePath} ${branchName}`, PROJECT_ROOT);
             }
             catch {
-                throw new Error(`Failed to create worktree: ${e}`);
+                throw new Error(`Failed to create worktree: ${String(e)}`);
             }
         }
     }
@@ -2009,7 +2139,12 @@ function dispatchBundleAgent(state, bundleId) {
     const runId = `bundle-${shortId}-${Date.now()}`;
     const prompt = "Read PORT_TASK.md and complete the porting task. This is a BUNDLED port - apply all changes as one cohesive update. Commit your changes when done (a supervisor will also attempt to commit).";
     const commitMessage = `feat: port ${bundle.name}`;
-    const run = startDetachedAgentRun({ runId, cwd: worktreePath, prompt, commitMessage });
+    const run = startDetachedAgentRun({
+        runId,
+        cwd: worktreePath,
+        prompt,
+        commitMessage,
+    });
     console.log(`   Started detached runner pid=${run.pid}`);
     // Update bundle status
     bundle.status = "porting";
@@ -2054,7 +2189,7 @@ function cmdBundleDispatch(state, bundleId) {
         dispatchBundleAgent(state, found);
     }
     catch (e) {
-        console.error(`❌ Failed to dispatch: ${e}`);
+        console.error(`❌ Failed to dispatch: ${String(e)}`);
     }
 }
 function cmdBundleIgnore(state, bundleId, reason) {
@@ -2143,7 +2278,9 @@ function cmdBundleSplit(state, bundleId) {
         const types = new Set(sorted.map((c) => c.parsed.type));
         const scopes = new Set(sorted.map((c) => c.parsed.scope).filter(Boolean));
         const authors = new Set(sorted.map((c) => c.entry.author).filter(Boolean));
-        const author = authors.size === 1 ? Array.from(authors)[0] : bundle.author || "multiple";
+        const author = authors.size === 1
+            ? Array.from(authors)[0]
+            : bundle.author || "multiple";
         const dateLabel = firstEntry?.date?.split("T")[0] ?? "unknown";
         const name = sorted.length === 1
             ? sorted[0]?.entry.title
@@ -2233,7 +2370,8 @@ function cmdBundleAuto(state, minPriority = 70) {
         console.log("🔍 Analyzing direct commits first...\n");
         cmdBundles(state);
     }
-    const pending = Object.values(state.bundles)
+    const bundles = state.bundles ?? {};
+    const pending = Object.values(bundles)
         .filter((b) => b.status === "pending" && b.priority >= minPriority)
         .sort((a, b) => b.priority - a.priority);
     if (pending.length === 0) {
@@ -2241,8 +2379,8 @@ function cmdBundleAuto(state, minPriority = 70) {
         return;
     }
     // Check how many agents are already running
-    const currentlyRunning = Object.values(state.bundles).filter((b) => b.status === "porting").length;
-    const maxConcurrent = 6;
+    const currentlyRunning = Object.values(bundles).filter((b) => b.status === "porting").length;
+    const maxConcurrent = getMaxConcurrent();
     const canDispatch = Math.max(0, maxConcurrent - currentlyRunning);
     if (canDispatch === 0) {
         console.log(`⏳ Max agents (${maxConcurrent}) already running. Wait for some to complete.`);
@@ -2251,13 +2389,17 @@ function cmdBundleAuto(state, minPriority = 70) {
     const toDispatch = pending.slice(0, canDispatch);
     console.log(`🚀 Auto-dispatching ${toDispatch.length} high-priority bundle(s)...\n`);
     for (const bundle of toDispatch) {
-        const priorityLabel = bundle.priority >= 100 ? "🔥 BREAKING" : bundle.priority >= 70 ? "✨ FEATURE" : "🐛 FIX";
+        const priorityLabel = bundle.priority >= 100
+            ? "🔥 BREAKING"
+            : bundle.priority >= 70
+                ? "✨ FEATURE"
+                : "🐛 FIX";
         console.log(`\n${priorityLabel} ${bundle.name}`);
         try {
             dispatchBundleAgent(state, bundle.id);
         }
         catch (e) {
-            console.error(`   ❌ Failed: ${e}`);
+            console.error(`   ❌ Failed: ${String(e)}`);
         }
     }
     console.log(`\n✅ Dispatched ${toDispatch.length} bundle(s).`);
@@ -2279,13 +2421,14 @@ function cmdBundleDispatchOldest(state, requested) {
         : 0;
     const portingIndividual = Object.values(state.merges).filter((e) => e.status === "porting" && !e.bundleId).length;
     const currentlyPorting = portingBundles + portingIndividual;
-    const maxConcurrent = 6;
+    const maxConcurrent = getMaxConcurrent();
     const available = Math.max(0, maxConcurrent - currentlyPorting);
     if (available === 0) {
         console.log(`⏳ All ${maxConcurrent} slots occupied. Wait for current bundles to finish.`);
         return;
     }
-    const pending = Object.values(state.bundles)
+    const bundles = state.bundles ?? {};
+    const pending = Object.values(bundles)
         .filter((b) => b.status === "pending")
         .sort((a, b) => {
         const dateDiff = a.dateRange.start.localeCompare(b.dateRange.start);
@@ -2308,7 +2451,7 @@ function cmdBundleDispatchOldest(state, requested) {
             console.log(`   ✓ ${bundle.name} (${bundle.commits.length} commits)`);
         }
         catch (e) {
-            console.error(`   ✗ ${bundle.id}: ${e}`);
+            console.error(`   ✗ ${bundle.id}: ${String(e)}`);
         }
     }
 }
@@ -2326,7 +2469,7 @@ function checkMergeConflicts(state, prNums) {
                 exec(`git merge --no-commit --no-ff ${found.entry.portBranch}`, PROJECT_ROOT);
                 exec(`git reset --hard HEAD`, PROJECT_ROOT);
             }
-            catch (e) {
+            catch {
                 // Get conflicting files
                 try {
                     const conflictFiles = exec(`git diff --name-only --diff-filter=U`, PROJECT_ROOT);
@@ -2355,7 +2498,9 @@ function checkMergeConflicts(state, prNums) {
     return { canMerge: conflicts.length === 0, conflicts };
 }
 function cmdMergeMultiple(state, prNums) {
-    const nums = prNums.map((p) => parseInt(p, 10)).filter((n) => !isNaN(n));
+    const nums = prNums
+        .map((p) => parseInt(p, 10))
+        .filter((n) => !Number.isNaN(n));
     if (nums.length === 0) {
         console.error("Usage: upstream-sync merge <pr#> [pr#] [pr#]...");
         return;
@@ -2368,7 +2513,8 @@ function cmdMergeMultiple(state, prNums) {
             console.error(`❌ PR #${prNum} not found`);
             return;
         }
-        if (found.entry.status !== "pending_review" && found.entry.status !== "shelved") {
+        if (found.entry.status !== "pending_review" &&
+            found.entry.status !== "shelved") {
             console.error(`❌ PR #${prNum} is not ready for merge (status: ${found.entry.status})`);
             return;
         }
@@ -2415,7 +2561,7 @@ function cmdMergeMultiple(state, prNums) {
             }
         }
         catch (e) {
-            console.error(`   ❌ Merge failed: ${e}`);
+            console.error(`   ❌ Merge failed: ${String(e)}`);
             console.log(`   Stopping merge sequence. Please resolve manually.`);
             return;
         }
@@ -2433,7 +2579,7 @@ async function runDaemon(state, intervalMinutes = 2) {
     console.log(`   Interval: ${intervalMinutes} minute(s)`);
     console.log(`   Max concurrent agents: 6`);
     console.log(`   Press Ctrl+C to stop\n`);
-    console.log("═".repeat(60) + "\n");
+    console.log(`${"═".repeat(60)}\n`);
     let iteration = 0;
     while (true) {
         iteration++;
@@ -2445,7 +2591,7 @@ async function runDaemon(state, intervalMinutes = 2) {
             state = loadState();
         }
         catch (e) {
-            console.error(`   ❌ Failed to load state: ${e}`);
+            console.error(`   ❌ Failed to load state: ${String(e)}`);
             await sleep(intervalMinutes * 60 * 1000);
             continue;
         }
@@ -2454,7 +2600,7 @@ async function runDaemon(state, intervalMinutes = 2) {
             fetchUpstream(state);
         }
         catch (e) {
-            console.error(`   ⚠️ Fetch failed: ${e}`);
+            console.error(`   ⚠️ Fetch failed: ${String(e)}`);
         }
         // 2. Find new commits (both merges and direct commits)
         const newCommits = findNewCommits(state);
@@ -2498,7 +2644,13 @@ async function runDaemon(state, intervalMinutes = 2) {
         for (const entry of Object.values(state.merges)) {
             mergeCounts[entry.status]++;
         }
-        const bundleCounts = { pending: 0, porting: 0, pending_review: 0, merged: 0, ignored: 0 };
+        const bundleCounts = {
+            pending: 0,
+            porting: 0,
+            pending_review: 0,
+            merged: 0,
+            ignored: 0,
+        };
         if (state.bundles) {
             for (const bundle of Object.values(state.bundles)) {
                 if (bundle.status in bundleCounts) {
@@ -2514,22 +2666,23 @@ async function runDaemon(state, intervalMinutes = 2) {
         console.log(`   📊 Status: ${totalPorting} porting | ${totalReady} ready | ${totalQueued} queued (${bundleCounts.pending} bundles + ${totalQueued - bundleCounts.pending} PRs)`);
         // 5. Check if we're done
         if (totalQueued === 0 && totalPorting === 0) {
-            console.log("\n" + "═".repeat(60));
+            console.log(`\n${"═".repeat(60)}`);
             console.log("🎉 ALL DONE! No more work to process.");
             console.log(`   ✅ Merged: ${mergeCounts.merged}`);
             console.log(`   👀 Ready for review: ${totalReady}`);
             console.log(`   📦 Shelved: ${mergeCounts.shelved}`);
             console.log(`   ⏭️  Ignored: ${mergeCounts.ignored}`);
-            console.log("═".repeat(60) + "\n");
+            console.log(`${"═".repeat(60)}\n`);
             console.log("Daemon exiting. Run 'upstream-sync review' to see pending PRs.");
             break;
         }
         // 6. Dispatch agents for new work (up to max concurrent)
         // Handle both bundles (for direct commits) and individual PRs
-        const maxConcurrent = 6;
+        const maxConcurrent = getMaxConcurrent();
         // Count currently porting (both bundle and individual)
         const portingBundles = state.bundles
-            ? Object.values(state.bundles).filter((b) => b.status === "porting").length
+            ? Object.values(state.bundles).filter((b) => b.status === "porting")
+                .length
             : 0;
         const portingIndividual = Object.values(state.merges).filter((e) => e.status === "porting" && !e.bundleId).length;
         const currentlyPorting = portingBundles + portingIndividual;
@@ -2545,7 +2698,8 @@ async function runDaemon(state, intervalMinutes = 2) {
                     .filter(([_, b]) => b.status === "pending")
                     .sort((a, b) => {
                     // Oldest first, then higher priority
-                    const dateDiff = new Date(a[1].dateRange.start).getTime() - new Date(b[1].dateRange.start).getTime();
+                    const dateDiff = new Date(a[1].dateRange.start).getTime() -
+                        new Date(b[1].dateRange.start).getTime();
                     if (dateDiff !== 0)
                         return dateDiff;
                     return b[1].priority - a[1].priority;
@@ -2571,7 +2725,7 @@ async function runDaemon(state, intervalMinutes = 2) {
                         dispatched++;
                     }
                     catch (e) {
-                        console.error(`      ✗ Bundle ${bundleId}: ${e}`);
+                        console.error(`      ✗ Bundle ${bundleId}: ${String(e)}`);
                     }
                 }
             }
@@ -2581,7 +2735,7 @@ async function runDaemon(state, intervalMinutes = 2) {
                     .filter(([_, e]) => e.status === "new" && !e.isDirectCommit && !e.bundleId)
                     .sort((a, b) => {
                     // Oldest first
-                    return new Date(a[1].date).getTime() - new Date(b[1].date).getTime();
+                    return (new Date(a[1].date).getTime() - new Date(b[1].date).getTime());
                 });
                 for (const [sha, entry] of newPRs) {
                     if (dispatched >= canDispatch)
@@ -2592,7 +2746,7 @@ async function runDaemon(state, intervalMinutes = 2) {
                         dispatched++;
                     }
                     catch (e) {
-                        console.error(`      ✗ PR #${entry.prNumber}: ${e}`);
+                        console.error(`      ✗ PR #${entry.prNumber}: ${String(e)}`);
                     }
                 }
             }
@@ -2625,7 +2779,7 @@ async function main() {
         state = loadState();
     }
     catch (e) {
-        console.error(`❌ ${e}`);
+        console.error(`❌ ${String(e)}`);
         process.exit(1);
     }
     switch (command) {
@@ -2726,11 +2880,12 @@ async function main() {
             cmdBundleDispatchOldest(state, Number.isFinite(rawCount) ? rawCount : undefined);
             break;
         }
-        case "bundle-auto":
+        case "bundle-auto": {
             // Optional: specify minimum priority (default 70 = features+)
             const minPriority = args[1] ? parseInt(args[1], 10) : 70;
             cmdBundleAuto(state, minPriority);
             break;
+        }
         case "pause":
             state.dispatchDisabled = true;
             saveState(state);
@@ -2741,8 +2896,7 @@ async function main() {
             saveState(state);
             console.log("✅ Dispatch resumed. New agents can be started.");
             break;
-        case "sync":
-        default:
+        default: {
             // Full sync flow
             console.log("🔄 UPSTREAM SYNC\n");
             // 1. Fetch
@@ -2793,7 +2947,7 @@ async function main() {
             updateAllStatuses(state);
             // 4. Dispatch agents - PRIORITIZE direct commits
             const currentlyPorting = Object.values(state.merges).filter((e) => e.status === "porting").length;
-            const maxConcurrentSync = 6;
+            const maxConcurrentSync = getMaxConcurrent();
             const canDispatchSync = Math.max(0, maxConcurrentSync - currentlyPorting);
             // Sort: direct commits first, then by date
             const newEntries = Object.entries(state.merges)
@@ -2811,11 +2965,13 @@ async function main() {
                 for (const [sha, entry] of toDispatchSync) {
                     try {
                         dispatchAgent(state, sha);
-                        const label = entry.isDirectCommit ? "⭐ DIRECT" : `PR #${entry.prNumber}`;
+                        const label = entry.isDirectCommit
+                            ? "⭐ DIRECT"
+                            : `PR #${entry.prNumber}`;
                         console.log(`   ✓ ${label}: ${entry.title}`);
                     }
                     catch (e) {
-                        console.error(`   Failed to dispatch: ${e}`);
+                        console.error(`   Failed to dispatch: ${String(e)}`);
                     }
                 }
             }
@@ -2825,6 +2981,7 @@ async function main() {
             // 5. Show status
             printStatus(state);
             break;
+        }
     }
 }
 main().catch((e) => {