botmux 2.9.0 → 2.9.2

package/dist/services/oncall-store.js

@@ -1,53 +1,94 @@
 /**
- * Oncall bindings — persist chat_id → default workingDir + owners into the
- * bot config JSON file, and keep the in-memory BotConfig in sync so events
- * pick up changes without a daemon restart.
+ * Oncall bindings — persist chat_id → default workingDir into the bot config
+ * JSON file, and keep the in-memory BotConfig in sync so events pick up
+ * changes without a daemon restart.
+ *
+ * Permission model is intentionally simple: anyone in the bot's allowedUsers
+ * can bind/unbind/edit (enforced at the call sites — daemon command handler
+ * + dashboard token gate). No per-chat owner list.
+ *
+ * Multi-process safety: 12 daemon processes + 1 dashboard process all share
+ * a single `bots.json`. Every write path goes through `withFileLock(path)`
+ * so a burst of concurrent auto-binds (each daemon sees a new chat for its
+ * own bot at roughly the same time) doesn't lose updates via read-modify-
+ * write race. The lock is also re-acquired around the read so the modify
+ * step always works against the latest on-disk snapshot.
  */
-import { readFileSync, writeFileSync } from 'node:fs';
+import { promises as fsp } from 'node:fs';
+import { readFileSync } from 'node:fs';
 import { getBot, getLoadedConfigPath } from '../bot-registry.js';
+import { withFileLock } from '../utils/file-lock.js';
 import { logger } from '../utils/logger.js';
-function loadRawConfig() {
-    const path = getLoadedConfigPath();
-    if (!path)
-        throw new Error('Bot config path unknown — cannot persist oncall bindings');
-    const raw = JSON.parse(readFileSync(path, 'utf-8'));
+async function readRawConfig(path) {
+    const raw = JSON.parse(await fsp.readFile(path, 'utf-8'));
     if (!Array.isArray(raw))
         throw new Error(`Config file is not a JSON array: ${path}`);
-    return { path, raw };
+    return raw;
 }
-function writeRawConfig(path, raw) {
-    writeFileSync(path, JSON.stringify(raw, null, 2) + '\n', 'utf-8');
+async function writeRawConfigAtomic(path, raw) {
+    const tmp = path + '.tmp.' + process.pid;
+    await fsp.writeFile(tmp, JSON.stringify(raw, null, 2) + '\n', 'utf-8');
+    await fsp.rename(tmp, path);
 }
 function findEntryIndex(raw, larkAppId) {
     return raw.findIndex((e) => e?.larkAppId === larkAppId);
 }
+function requireConfigPath() {
+    const p = getLoadedConfigPath();
+    if (!p)
+        throw new Error('Bot config path unknown — cannot persist oncall bindings');
+    return p;
+}
+/**
+ * Run a read-modify-write critical section against the bot config file under
+ * a cross-process lock. `mutate` runs against the freshest on-disk snapshot
+ * and decides what to write back; returning `undefined` means "no write".
+ */
+async function rmwBotEntry(larkAppId, mutate) {
+    const path = requireConfigPath();
+    return withFileLock(path, async () => {
+        const raw = await readRawConfig(path);
+        const idx = findEntryIndex(raw, larkAppId);
+        if (idx < 0)
+            return { ok: false, reason: 'bot_not_in_config' };
+        const entry = raw[idx];
+        const out = mutate(entry, raw);
+        if (out && typeof out === 'object' && 'write' in out) {
+            const wrap = out;
+            if (wrap.write)
+                await writeRawConfigAtomic(path, raw);
+            return { ok: true, result: wrap.result };
+        }
+        await writeRawConfigAtomic(path, raw);
+        return { ok: true, result: out };
+    });
+}
+// ─── Manual binding ───────────────────────────────────────────────────────
 /**
- * Upsert an oncall binding. If the chat is already bound, only existing owners
- * can update the workingDir (ownerOpenId must be in owners). First-time bind
- * puts the caller into owners automatically.
+ * Upsert an oncall binding. Returns whether it was newly created.
  */
-export function bindOncall(larkAppId, chatId, workingDir, ownerOpenId) {
-    const bot = getBot(larkAppId);
-    const existingList = bot.config.oncallChats ?? [];
-    const existing = existingList.find(c => c.chatId === chatId);
-    if (existing && !existing.owners.includes(ownerOpenId)) {
-        return { ok: false, reason: 'not_owner' };
+export async function bindOncall(larkAppId, chatId, workingDir) {
+    let bot;
+    try {
+        bot = getBot(larkAppId);
     }
-    const next = existing
-        ? { ...existing, workingDir }
-        : { chatId, workingDir, owners: [ownerOpenId] };
-    const { path, raw } = loadRawConfig();
-    const idx = findEntryIndex(raw, larkAppId);
-    if (idx < 0)
-        return { ok: false, reason: 'bot_not_in_config' };
-    const cur = Array.isArray(raw[idx].oncallChats) ? raw[idx].oncallChats : [];
-    const curIdx = cur.findIndex((c) => c.chatId === chatId);
-    if (curIdx >= 0)
-        cur[curIdx] = next;
-    else
-        cur.push(next);
-    raw[idx].oncallChats = cur;
-    writeRawConfig(path, raw);
+    catch {
+        return { ok: false, reason: 'bot_not_registered' };
+    }
+    const next = { chatId, workingDir };
+    const r = await rmwBotEntry(larkAppId, (entry) => {
+        const cur = Array.isArray(entry.oncallChats) ? entry.oncallChats : [];
+        const curIdx = cur.findIndex((c) => c?.chatId === chatId);
+        const created = curIdx < 0;
+        if (created)
+            cur.push(next);
+        else
+            cur[curIdx] = next; // wholesale replace strips legacy keys
+        entry.oncallChats = cur;
+        return { write: true, result: { created } };
+    });
+    if (!r.ok)
+        return { ok: false, reason: r.reason };
     // Keep in-memory config in sync
     const inMem = (bot.config.oncallChats ??= []);
     const memIdx = inMem.findIndex(c => c.chatId === chatId);
@@ -55,30 +96,199 @@ export function bindOncall(larkAppId, chatId, workingDir, ownerOpenId) {
         inMem[memIdx] = next;
     else
         inMem.push(next);
-    logger.info(`[oncall:${larkAppId}] bind chat=${chatId} dir=${workingDir} owner=${ownerOpenId}`);
-    return { ok: true, entry: next, created: !existing };
+    logger.info(`[oncall:${larkAppId}] bind chat=${chatId} dir=${workingDir}`);
+    return { ok: true, entry: next, created: r.result.created };
 }
-export function unbindOncall(larkAppId, chatId, ownerOpenId) {
-    const bot = getBot(larkAppId);
-    const existing = bot.config.oncallChats?.find(c => c.chatId === chatId);
-    if (!existing)
-        return { ok: false, reason: 'not_bound' };
-    if (!existing.owners.includes(ownerOpenId))
-        return { ok: false, reason: 'not_owner' };
-    const { path, raw } = loadRawConfig();
-    const idx = findEntryIndex(raw, larkAppId);
-    if (idx < 0)
-        return { ok: false, reason: 'bot_not_in_config' };
-    const cur = Array.isArray(raw[idx].oncallChats) ? raw[idx].oncallChats : [];
-    raw[idx].oncallChats = cur.filter((c) => c.chatId !== chatId);
-    writeRawConfig(path, raw);
+/**
+ * Unbind oncall for `chatId` and ALWAYS write a tombstone into
+ * `defaultOncallAutoboundChats`. The tombstone protects against the case
+ * where a user manually fiddled with a chat (bound then unbound, or just
+ * unbound) and we then mis-classify it as "new" on the next observation
+ * and re-auto-bind. Treating unbind as "default's one shot is spent" is
+ * symmetric with auto-bind already adding to the same list.
+ *
+ * Idempotent: never errors on "not bound". `wasBound` reports whether an
+ * existing binding was actually removed so callers can phrase UI text
+ * accordingly (the Lark `/oncall unbind` command still wants to say "未绑定"
+ * vs "已解绑").
+ */
+export async function unbindOncall(larkAppId, chatId) {
+    let bot;
+    try {
+        bot = getBot(larkAppId);
+    }
+    catch {
+        return { ok: false, reason: 'bot_not_registered' };
+    }
+    const r = await rmwBotEntry(larkAppId, (entry) => {
+        const cur = Array.isArray(entry.oncallChats) ? entry.oncallChats : [];
+        const wasBound = cur.some(c => c?.chatId === chatId);
+        entry.oncallChats = cur.filter((c) => c?.chatId !== chatId);
+        const tomb = Array.isArray(entry.defaultOncallAutoboundChats)
+            ? entry.defaultOncallAutoboundChats : [];
+        if (!tomb.includes(chatId))
+            tomb.push(chatId);
+        entry.defaultOncallAutoboundChats = tomb;
+        return { write: true, result: { wasBound } };
+    });
+    if (!r.ok)
+        return { ok: false, reason: r.reason };
     if (bot.config.oncallChats) {
         bot.config.oncallChats = bot.config.oncallChats.filter(c => c.chatId !== chatId);
     }
-    logger.info(`[oncall:${larkAppId}] unbind chat=${chatId} by=${ownerOpenId}`);
-    return { ok: true };
+    const inMemTomb = (bot.config.defaultOncallAutoboundChats ??= []);
+    if (!inMemTomb.includes(chatId))
+        inMemTomb.push(chatId);
+    logger.info(`[oncall:${larkAppId}] unbind chat=${chatId} wasBound=${r.result.wasBound} (tombstoned)`);
+    return { ok: true, wasBound: r.result.wasBound };
 }
 export function getOncallStatus(larkAppId, chatId) {
-    return getBot(larkAppId).config.oncallChats?.find(c => c.chatId === chatId);
+    // Defensive: dashboard callers may probe with an app id whose bot isn't
+    // registered yet (boot races, or tests exercising the IPC layer without
+    // a full registry). Treat "no such bot" as "no oncall binding" — this
+    // is best-effort enrichment, not a critical path.
+    let bot;
+    try {
+        bot = getBot(larkAppId);
+    }
+    catch {
+        return undefined;
+    }
+    return bot.config.oncallChats?.find(c => c.chatId === chatId);
+}
+// ─── Per-bot defaultOncall ───────────────────────────────────────────────
+/** Read the current defaultOncall config + autobound list for a bot. Used by
+ *  the dashboard GET route and by the daemon's auto-bind judge. Sync because
+ *  it only reads the in-memory snapshot — file-level consistency comes from
+ *  the daemon never racing with itself on reads. */
+export function getBotDefaultOncall(larkAppId) {
+    let bot;
+    try {
+        bot = getBot(larkAppId);
+    }
+    catch {
+        return { defaultOncall: undefined, autoboundChats: [] };
+    }
+    return {
+        defaultOncall: bot.config.defaultOncall,
+        autoboundChats: [...(bot.config.defaultOncallAutoboundChats ?? [])],
+    };
+}
+/**
+ * Persist a defaultOncall change for the given bot. The dashboard PUT route
+ * is the only authorized caller — `since` is server-side authoritative so the
+ * frontend can't backdate the cut-off and accidentally include existing chats.
+ *
+ * `since` is stamped on every enabled save, not just the first transition.
+ * This matches the dashboard copy/requirement and prevents a later workingDir
+ * edit from reaching chats that were first observed before that edit.
+ *
+ * When disabled with an empty `workingDir`, the prior workingDir is preserved
+ * so the UI can round-trip (toggle off → toggle back on) without forcing the
+ * user to retype the path. Disable with a non-empty workingDir overwrites.
+ */
+export async function updateBotDefaultOncall(larkAppId, patch) {
+    let bot;
+    try {
+        bot = getBot(larkAppId);
+    }
+    catch {
+        return { ok: false, reason: 'bot_not_registered' };
+    }
+    let next = null;
+    const r = await rmwBotEntry(larkAppId, (entry) => {
+        const prior = entry.defaultOncall;
+        // Cut-off line: every enabled save re-stamps so a workingDir edit while
+        // enabled doesn't reach back to chats observed under the old setting.
+        const nextSince = patch.enabled ? Date.now() : (prior?.since ?? 0);
+        const trimmed = (patch.workingDir ?? '').trim();
+        const resolvedWorkingDir = patch.enabled
+            ? trimmed
+            // Disabled + empty input → keep the prior path so the toggle is round-
+            // trippable. Disabled + explicit non-empty → user is replacing it.
+            : (trimmed || prior?.workingDir || '');
+        next = {
+            enabled: !!patch.enabled,
+            workingDir: resolvedWorkingDir,
+            since: nextSince,
+        };
+        entry.defaultOncall = next;
+        return { write: true, result: next };
+    });
+    if (!r.ok)
+        return { ok: false, reason: r.reason };
+    bot.config.defaultOncall = next;
+    logger.info(`[oncall:${larkAppId}] defaultOncall ${next.enabled ? 'enabled' : 'disabled'} ` +
+        `(workingDir=${next.workingDir || '∅'}, since=${next.since})`);
+    return { ok: true, defaultOncall: next };
+}
+/**
+ * Auto-bind a chat as part of the defaultOncall flow. Atomically:
+ *   1. RE-CHECK tombstone + existing binding against the freshest on-disk
+ *      snapshot. The daemon's fast-path tombstone check is informational —
+ *      if a concurrent `unbindOncall` wrote a tombstone between then and
+ *      now, the lock-internal view sees it and we skip.
+ *   2. Upsert the oncallChats entry (same shape as manual bindOncall).
+ *   3. Append chatId to defaultOncallAutoboundChats (idempotent).
+ *
+ * Returns `skipped: 'tombstoned'` when the lock-internal tombstone check
+ * trips, `skipped: 'already_bound'` when another writer (manual bind by
+ * the user, or a sibling daemon) bound the chat between the fast-path read
+ * and the lock acquisition. Neither is an error.
+ */
+export async function autoBindOncallFromDefault(larkAppId, chatId, workingDir) {
+    let bot;
+    try {
+        bot = getBot(larkAppId);
+    }
+    catch {
+        return { ok: false, reason: 'bot_not_registered' };
+    }
+    const next = { chatId, workingDir };
+    const r = await rmwBotEntry(larkAppId, (entry) => {
+        // Authoritative re-check #1: tombstone wins. If a concurrent unbind or
+        // earlier autoBind wrote one, the user has effectively opted out — never
+        // overwrite that decision from the auto-bind path.
+        const tomb = Array.isArray(entry.defaultOncallAutoboundChats)
+            ? entry.defaultOncallAutoboundChats : [];
+        if (tomb.includes(chatId)) {
+            return { write: false, result: { kind: 'skipped', reason: 'tombstoned' } };
+        }
+        // Authoritative re-check #2: existing binding wins. Could be from
+        // a sibling daemon, a manual /oncall bind, or a dashboard PUT racing
+        // with us. We never overwrite an existing binding with the default —
+        // the user's explicit choice (or a sibling's earlier auto-bind to its
+        // own default) is authoritative.
+        const cur = Array.isArray(entry.oncallChats) ? entry.oncallChats : [];
+        if (cur.some(c => c?.chatId === chatId)) {
+            return { write: false, result: { kind: 'skipped', reason: 'already_bound' } };
+        }
+        cur.push(next);
+        entry.oncallChats = cur;
+        tomb.push(chatId);
+        entry.defaultOncallAutoboundChats = tomb;
+        return { write: true, result: { kind: 'bound', created: true } };
+    });
+    if (!r.ok)
+        return { ok: false, reason: r.reason };
+    if (r.result.kind === 'skipped') {
+        return { ok: true, skipped: r.result.reason };
+    }
+    // Sync in-memory
+    const inMem = (bot.config.oncallChats ??= []);
+    const memIdx = inMem.findIndex(c => c.chatId === chatId);
+    if (memIdx >= 0)
+        inMem[memIdx] = next;
+    else
+        inMem.push(next);
+    const inMemAutobound = (bot.config.defaultOncallAutoboundChats ??= []);
+    if (!inMemAutobound.includes(chatId))
+        inMemAutobound.push(chatId);
+    logger.info(`[oncall:${larkAppId}] auto-bind (default) chat=${chatId} dir=${workingDir}`);
+    return { ok: true, entry: next, created: r.result.created };
+}
+// Test helper — read raw bots.json synchronously. Not for production use.
+export function _readRawConfigSyncForTesting(path) {
+    return JSON.parse(readFileSync(path, 'utf-8'));
 }
 //# sourceMappingURL=oncall-store.js.map

package/dist/services/oncall-store.js.map

@@ -1 +1 @@
-{"version":3,"file":"oncall-store.js","sourceRoot":"","sources":["../../src/services/oncall-store.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"oncall-store.js","sourceRoot":"","sources":["../../src/services/oncall-store.ts"],"names":[],"mappings":"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"}

package/dist/services/project-scanner.d.ts

@@ -6,11 +6,10 @@ export interface ProjectInfo {
 }
 /**
  * Scan a directory for git repositories and their worktrees.
- * Returns a flat list of all projects found.
  */
 export declare function scanProjects(baseDir: string, maxDepth?: number): ProjectInfo[];
 /**
- * Scan multiple directories for git repositories, merge and deduplicate results.
+ * Scan multiple directories and deduplicate by path.
  */
 export declare function scanMultipleProjects(baseDirs: string[], maxDepth?: number): ProjectInfo[];
 //# sourceMappingURL=project-scanner.d.ts.map

package/dist/services/project-scanner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"project-scanner.d.ts","sourceRoot":"","sources":["../../src/services/project-scanner.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,GAAG,UAAU,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;CAChB;AA2CD;;;GAGG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAU,GAAG,WAAW,EAAE,CA6DjF;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,QAAQ,GAAE,MAAU,GAAG,WAAW,EAAE,CAoB5F"}
+{"version":3,"file":"project-scanner.d.ts","sourceRoot":"","sources":["../../src/services/project-scanner.ts"],"names":[],"mappings":"AA2BA,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,GAAG,UAAU,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;CAChB;AAmFD;;GAEG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAU,GAAG,WAAW,EAAE,CA+CjF;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,QAAQ,GAAE,MAAU,GAAG,WAAW,EAAE,CAe5F"}

package/dist/services/project-scanner.js

@@ -1,55 +1,124 @@
 import { execSync } from 'node:child_process';
-import { readdirSync, statSync } from 'node:fs';
-import { join, basename } from 'node:path';
+import { readdirSync, statSync, existsSync } from 'node:fs';
+import { join, basename, resolve } from 'node:path';
 import { logger } from '../utils/logger.js';
-function getGitBranch(dir) {
+/** A `.git` entry that's a regular file (worktree gitlink) or a directory
+ *  containing `HEAD`. An empty `.git/` is rejected so the scanner keeps
+ *  recursing past stray markers like `/root/.git`. */
+function isValidGitMarker(parentDir) {
+    const gitPath = join(parentDir, '.git');
+    let st;
     try {
-        return execSync('git rev-parse --abbrev-ref HEAD', { cwd: dir, timeout: 5000, encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
+        st = statSync(gitPath);
     }
     catch {
-        return 'unknown';
+        return false;
     }
+    if (st.isFile())
+        return true;
+    if (st.isDirectory())
+        return existsSync(join(gitPath, 'HEAD'));
+    return false;
 }
-function getWorktrees(repoPath) {
+function runGit(args, cwd) {
     try {
-        const output = execSync('git worktree list --porcelain', { cwd: repoPath, timeout: 5000, encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] });
-        const worktrees = [];
-        let currentPath = '';
-        let currentBranch = '';
-        for (const line of output.split('\n')) {
-            if (line.startsWith('worktree ')) {
-                currentPath = line.slice('worktree '.length);
-            }
-            else if (line.startsWith('branch ')) {
-                currentBranch = line.slice('branch '.length).replace('refs/heads/', '');
-            }
-            else if (line === '') {
-                // End of a worktree entry — skip the main worktree (same as repoPath)
-                if (currentPath && currentPath !== repoPath) {
-                    worktrees.push({
-                        name: `${basename(repoPath)}/${basename(currentPath)}`,
-                        path: currentPath,
-                        type: 'worktree',
-                        branch: currentBranch || 'unknown',
-                    });
-                }
-                currentPath = '';
-                currentBranch = '';
-            }
-        }
-        return worktrees;
+        return execSync(`git ${args}`, {
+            cwd, timeout: 5000, encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'],
+        }).trim();
     }
     catch {
-        return [];
+        return null;
+    }
+}
+/** `rev-parse --abbrev-ref HEAD` returns the literal string `HEAD` when
+ *  detached — that's the signal to fall through to tag/SHA. */
+function getGitRef(dir) {
+    const branch = runGit('rev-parse --abbrev-ref HEAD', dir);
+    if (branch && branch !== 'HEAD')
+        return branch;
+    const tag = runGit('describe --tags --exact-match HEAD', dir);
+    if (tag)
+        return tag;
+    const sha = runGit('rev-parse --short HEAD', dir);
+    return sha || 'unknown';
+}
+function describeDetachedHead(worktreePath, headSha) {
+    const tag = runGit('describe --tags --exact-match HEAD', worktreePath);
+    if (tag)
+        return tag;
+    return headSha ? headSha.slice(0, 7) : 'unknown';
+}
+/** Sibling worktrees of one repo share a common-dir — used as the dedup
+ *  key so the scanner doesn't double-register when main + linked sit
+ *  side-by-side in the scan root. */
+function getGitCommonDir(dir) {
+    const out = runGit('rev-parse --git-common-dir', dir);
+    return out ? resolve(dir, out) : dir;
+}
+/** Index 0 of `git worktree list --porcelain` is always the main worktree.
+ *  All entries share its basename as `name`, so display stays stable
+ *  regardless of which sibling readdir hits first. */
+function scanRepoFromAnyWorktree(anyWorktreePath) {
+    const fallback = [{
+            name: basename(anyWorktreePath),
+            path: anyWorktreePath,
+            type: 'repo',
+            branch: getGitRef(anyWorktreePath),
+        }];
+    const output = runGit('worktree list --porcelain', anyWorktreePath);
+    if (output === null)
+        return fallback;
+    const entries = [];
+    let currentPath = '';
+    let currentHead = '';
+    let currentBranch = '';
+    // runGit trims the trailing newline; append a sentinel so the final
+    // entry hits the empty-line flush branch below.
+    const lines = output.split('\n');
+    lines.push('');
+    for (const line of lines) {
+        if (line.startsWith('worktree ')) {
+            currentPath = line.slice('worktree '.length);
+        }
+        else if (line.startsWith('HEAD ')) {
+            currentHead = line.slice('HEAD '.length);
+        }
+        else if (line.startsWith('branch ')) {
+            currentBranch = line.slice('branch '.length).replace('refs/heads/', '');
+        }
+        else if (line === '') {
+            if (currentPath) {
+                const ref = currentBranch
+                    || (currentHead ? describeDetachedHead(currentPath, currentHead) : 'unknown');
+                entries.push({ path: currentPath, branch: ref });
+            }
+            currentPath = '';
+            currentHead = '';
+            currentBranch = '';
+        }
     }
+    if (entries.length === 0)
+        return fallback;
+    const repoName = basename(entries[0].path);
+    return entries.map((wt, i) => ({
+        name: repoName,
+        path: wt.path,
+        type: i === 0 ? 'repo' : 'worktree',
+        branch: wt.branch,
+    }));
+}
+function compareProjects(a, b) {
+    if (a.type !== b.type)
+        return a.type === 'repo' ? -1 : 1;
+    return a.name.localeCompare(b.name) || a.branch.localeCompare(b.branch);
 }
 /**
  * Scan a directory for git repositories and their worktrees.
- * Returns a flat list of all projects found.
  */
 export function scanProjects(baseDir, maxDepth = 3) {
     const projects = [];
-    const seen = new Set();
+    const seenRepos = new Set(); // by git-common-dir
+    const seenPaths = new Set(); // by absolute path
     function walk(dir, depth) {
         if (depth > maxDepth)
             return;
@@ -60,28 +129,19 @@ export function scanProjects(baseDir, maxDepth = 3) {
         catch {
             return;
         }
-        // Check if this directory is a git repo
-        if (entries.includes('.git')) {
-            const realPath = dir;
-            if (!seen.has(realPath)) {
-                seen.add(realPath);
-                projects.push({
-                    name: basename(realPath),
-                    path: realPath,
-                    type: 'repo',
-                    branch: getGitBranch(realPath),
-                });
-                // Also scan for worktrees
-                for (const wt of getWorktrees(realPath)) {
-                    if (!seen.has(wt.path)) {
-                        seen.add(wt.path);
-                        projects.push(wt);
-                    }
+        if (entries.includes('.git') && isValidGitMarker(dir)) {
+            const commonDir = getGitCommonDir(dir);
+            if (seenRepos.has(commonDir))
+                return;
+            seenRepos.add(commonDir);
+            for (const p of scanRepoFromAnyWorktree(dir)) {
+                if (!seenPaths.has(p.path)) {
+                    seenPaths.add(p.path);
+                    projects.push(p);
                 }
             }
-            return; // Don't recurse into git repos
+            return;
         }
-        // Recurse into subdirectories
         for (const entry of entries) {
             if (entry.startsWith('.') || entry === 'node_modules' || entry === 'vendor' || entry === 'dist')
                 continue;
@@ -92,22 +152,17 @@ export function scanProjects(baseDir, maxDepth = 3) {
                 }
             }
             catch {
-                // Permission denied or broken symlink
+                // permission denied or broken symlink
             }
         }
     }
     walk(baseDir, 0);
-    // Sort: repos first, then worktrees, alphabetically within each group
-    projects.sort((a, b) => {
-        if (a.type !== b.type)
-            return a.type === 'repo' ? -1 : 1;
-        return a.name.localeCompare(b.name);
-    });
+    projects.sort(compareProjects);
     logger.info(`Scanned ${baseDir}: found ${projects.length} project(s)`);
     return projects;
 }
 /**
- * Scan multiple directories for git repositories, merge and deduplicate results.
+ * Scan multiple directories and deduplicate by path.
  */
 export function scanMultipleProjects(baseDirs, maxDepth = 3) {
     const seen = new Set();
@@ -120,12 +175,7 @@ export function scanMultipleProjects(baseDirs, maxDepth = 3) {
             }
         }
     }
-    // Sort: repos first, then worktrees, alphabetically within each group
-    merged.sort((a, b) => {
-        if (a.type !== b.type)
-            return a.type === 'repo' ? -1 : 1;
-        return a.name.localeCompare(b.name);
-    });
+    merged.sort(compareProjects);
     return merged;
 }
 //# sourceMappingURL=project-scanner.js.map