botmux 2.68.1 → 2.70.0

package/dist/services/git-worktree.js

@@ -0,0 +1,120 @@
+/**
+ * Git worktree creation for repo selection — "pick a repo, open it as a
+ * fresh worktree". Creates a linked worktree next to the repo, branched off
+ * the remote default branch (origin/master / origin/main), so each session
+ * can get an isolated checkout without touching the main one.
+ *
+ * Async (execFile) on purpose: a `git fetch` can take many seconds and this
+ * runs inside the daemon's event loop.
+ */
+import { execFile } from 'node:child_process';
+import { promisify } from 'node:util';
+import { existsSync } from 'node:fs';
+import { basename, dirname, join, resolve } from 'node:path';
+import { logger } from '../utils/logger.js';
+const execFileP = promisify(execFile);
+async function git(args, cwd, timeoutMs = 10_000) {
+    try {
+        const { stdout } = await execFileP('git', args, { cwd, timeout: timeoutMs, encoding: 'utf-8' });
+        return stdout.trim();
+    }
+    catch (e) {
+        const stderr = typeof e?.stderr === 'string' ? e.stderr.trim() : '';
+        throw new Error(stderr || e?.message || String(e));
+    }
+}
+async function tryGit(args, cwd, timeoutMs = 10_000) {
+    try {
+        return await git(args, cwd, timeoutMs);
+    }
+    catch {
+        return null;
+    }
+}
+async function localBranchExists(repo, branch) {
+    return (await tryGit(['rev-parse', '--verify', '--quiet', `refs/heads/${branch}`], repo)) !== null;
+}
+/** The remote default branch (`origin/master` / `origin/main`), or `HEAD`
+ *  for repos without a usable remote. `origin/HEAD` is only set on clone, so
+ *  fall through to probing the usual names when it's missing. */
+async function resolveBaseRef(repo) {
+    const originHead = await tryGit(['symbolic-ref', '--short', 'refs/remotes/origin/HEAD'], repo);
+    if (originHead)
+        return originHead;
+    for (const cand of ['origin/master', 'origin/main']) {
+        if ((await tryGit(['rev-parse', '--verify', '--quiet', cand], repo)) !== null)
+            return cand;
+    }
+    return 'HEAD';
+}
+/** Branch names may contain `/` etc. — flatten to a filesystem-safe suffix. */
+function dirSuffixForBranch(branch) {
+    return branch.replace(/[^A-Za-z0-9._-]+/g, '-').replace(/^-+|-+$/g, '');
+}
+/** A linked worktree resolves to its repo's MAIN checkout (entry 0 of
+ *  `git worktree list`), so sibling placement and `<repo>-…` naming follow
+ *  the main repo no matter which checkout the caller picked. */
+async function resolveMainWorktree(dir) {
+    const out = await tryGit(['worktree', 'list', '--porcelain'], dir);
+    const first = out?.split('\n').find(l => l.startsWith('worktree '));
+    return first ? first.slice('worktree '.length) : dir;
+}
+/**
+ * Create a linked worktree for `repoPath`, as a sibling of the repo's MAIN
+ * checkout (a linked-worktree input is resolved back to the main one first).
+ *
+ * - No `branch` given → auto-pick `wt/N` (first free N), dir `<repo>-wt-N`.
+ * - `branch` given and exists locally → check it out into the worktree.
+ * - `branch` given and new → create it from the remote default branch.
+ *
+ * The base ref is fetched first so the worktree starts from the remote's
+ * latest state; fetch failure degrades to the local (possibly stale) ref.
+ */
+export async function createRepoWorktree(repoPath, opts = {}) {
+    const startDir = resolve(repoPath);
+    await git(['rev-parse', '--git-dir'], startDir); // not a repo → throw early
+    const repo = await resolveMainWorktree(startDir);
+    const baseRef = await resolveBaseRef(repo);
+    if (baseRef.startsWith('origin/')) {
+        const remoteBranch = baseRef.slice('origin/'.length);
+        try {
+            await git(['fetch', 'origin', remoteBranch], repo, 30_000);
+        }
+        catch (e) {
+            logger.warn(`[git-worktree] fetch origin ${remoteBranch} failed, using local ref: ${e instanceof Error ? e.message : e}`);
+        }
+    }
+    const parent = dirname(repo);
+    const repoBase = basename(repo);
+    let branch = opts.branch?.trim() ?? '';
+    let wtPath;
+    if (branch) {
+        wtPath = join(parent, `${repoBase}-${dirSuffixForBranch(branch)}`);
+        if (existsSync(wtPath))
+            throw new Error(`worktree target already exists: ${wtPath}`);
+    }
+    else {
+        let n = 1;
+        for (;; n++) {
+            if (n > 1000)
+                throw new Error('no free wt/N slot under 1000');
+            const candPath = join(parent, `${repoBase}-wt-${n}`);
+            if (existsSync(candPath) || (await localBranchExists(repo, `wt/${n}`)))
+                continue;
+            branch = `wt/${n}`;
+            wtPath = candPath;
+            break;
+        }
+    }
+    if (await localBranchExists(repo, branch)) {
+        // Existing branch: check it out as-is (git rejects it if the branch is
+        // already checked out in another worktree — surface that error verbatim).
+        await git(['worktree', 'add', wtPath, branch], repo, 60_000);
+        logger.info(`[git-worktree] created ${wtPath} on existing branch ${branch}`);
+        return { path: wtPath, branch, baseRef: branch };
+    }
+    await git(['worktree', 'add', '-b', branch, wtPath, baseRef], repo, 60_000);
+    logger.info(`[git-worktree] created ${wtPath} (branch ${branch} from ${baseRef})`);
+    return { path: wtPath, branch, baseRef };
+}
+//# sourceMappingURL=git-worktree.js.map

package/dist/services/git-worktree.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"git-worktree.js","sourceRoot":"","sources":["../../src/services/git-worktree.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,MAAM,SAAS,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;AAYtC,KAAK,UAAU,GAAG,CAAC,IAAc,EAAE,GAAW,EAAE,SAAS,GAAG,MAAM;IAChE,IAAI,CAAC;QACH,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;QAChG,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;IACvB,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QAChB,MAAM,MAAM,GAAG,OAAO,CAAC,EAAE,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACpE,MAAM,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,EAAE,OAAO,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IACrD,CAAC;AACH,CAAC;AAED,KAAK,UAAU,MAAM,CAAC,IAAc,EAAE,GAAW,EAAE,SAAS,GAAG,MAAM;IACnE,IAAI,CAAC;QACH,OAAO,MAAM,GAAG,CAAC,IAAI,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC;IACzC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,KAAK,UAAU,iBAAiB,CAAC,IAAY,EAAE,MAAc;IAC3D,OAAO,CAAC,MAAM,MAAM,CAAC,CAAC,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,cAAc,MAAM,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,KAAK,IAAI,CAAC;AACrG,CAAC;AAED;;iEAEiE;AACjE,KAAK,UAAU,cAAc,CAAC,IAAY;IACxC,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,CAAC,cAAc,EAAE,SAAS,EAAE,0BAA0B,CAAC,EAAE,IAAI,CAAC,CAAC;IAC/F,IAAI,UAAU;QAAE,OAAO,UAAU,CAAC;IAClC,KAAK,MAAM,IAAI,IAAI,CAAC,eAAe,EAAE,aAAa,CAAC,EAAE,CAAC;QACpD,IAAI,CAAC,MAAM,MAAM,CAAC,CAAC,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC;IAC7F,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,+EAA+E;AAC/E,SAAS,kBAAkB,CAAC,MAAc;IACxC,OAAO,MAAM,CAAC,OAAO,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;AAC1E,CAAC;AAED;;gEAEgE;AAChE,KAAK,UAAU,mBAAmB,CAAC,GAAW;IAC5C,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,GAAG,CAAC,CAAC;IACnE,MAAM,KAAK,GAAG,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC;IACpE,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;AACvD,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,QAAgB,EAChB,OAA4B,EAAE;IAE9B,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IACnC,MAAM,GAAG,CAAC,CAAC,WAAW,EAAE,WAAW,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,2BAA2B;IAC5E,MAAM,IAAI,GAAG,MAAM,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IAEjD,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,CAAC;IAC3C,IAAI,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QAClC,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACrD,IAAI,CAAC;YACH,MAAM,GAAG,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,YAAY,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QAC7D,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,CAAC,IAAI,CAAC,+BAA+B,YAAY,6BAA6B,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC5H,CAAC;IACH,CAAC;IAED,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAEhC,IAAI,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACvC,IAAI,MAAc,CAAC;IACnB,IAAI,MAAM,EAAE,CAAC;QACX,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,QAAQ,IAAI,kBAAkB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACnE,IAAI,UAAU,CAAC,MAAM,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,mCAAmC,MAAM,EAAE,CAAC,CAAC;IACvF,CAAC;SAAM,CAAC;QACN,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,QAAQ,CAAC,EAAE,EAAE,CAAC;YACZ,IAAI,CAAC,GAAG,IAAI;gBAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;YAC9D,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,QAAQ,OAAO,CAAC,EAAE,CAAC,CAAC;YACrD,IAAI,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,iBAAiB,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;gBAAE,SAAS;YACjF,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;YACnB,MAAM,GAAG,QAAQ,CAAC;YAClB,MAAM;QACR,CAAC;IACH,CAAC;IAED,IAAI,MAAM,iBAAiB,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC;QAC1C,uEAAuE;QACvE,0EAA0E;QAC1E,MAAM,GAAG,CAAC,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QAC7D,MAAM,CAAC,IAAI,CAAC,0BAA0B,MAAM,uBAAuB,MAAM,EAAE,CAAC,CAAC;QAC7E,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;IACnD,CAAC;IAED,MAAM,GAAG,CAAC,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IAC5E,MAAM,CAAC,IAAI,CAAC,0BAA0B,MAAM,YAAY,MAAM,SAAS,OAAO,GAAG,CAAC,CAAC;IACnF,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;AAC3C,CAAC"}

package/dist/worker.js

@@ -3686,6 +3686,7 @@ function spawnCli(cfg) {
                     cliBin: cliAdapter.resolvedBin,
                     cliArgs: args,
                     hidePaths: cfg.sandboxHidePaths ?? [],
+                    authPaths: cliAdapter.authPaths,
                 });
                 if (sbx) {
                     spawnBin = sbx.bin;