@webappwiz/arbor 0.0.1 → 0.0.2

package/README.md

@@ -246,6 +246,10 @@ export default defineConfig({
 });
 ```
 
+`trunk` is the one key worth leaving out: unset, arbor takes the branch
+`refs/remotes/origin/HEAD` points at, so a repo on `master` needs no config at
+all, and falls back to `main` when there is no such ref to read.
+
 The hooks are named for the git events they sit around: `postCheckout` runs
 once, when `add` checks the worktree out; `postRewrite` runs after every rebase
 `merge` does; `preMerge` runs after that, and is the last thing between the

package/git.d.ts

@@ -25,6 +25,11 @@ export declare class Git {
     run(cwd: string, ...args: string[]): Promise<GitResult>;
     out(cwd: string, ...args: string[]): Promise<string>;
     branchExists(branch: string): Promise<boolean>;
+    /**
+     * The branch `origin/HEAD` points at, or null when the repo has no such ref:
+     * no remote, or a clone that never fetched it.
+     */
+    defaultBranch(): Promise<string | null>;
     currentBranch(cwd: string): Promise<string>;
     head(cwd: string): Promise<string>;
     shortHead(cwd: string): Promise<string>;

package/index.js

@@ -83,9 +83,8 @@ async function add({
   }
   const added = await service.add(task, { base });
   if (added.code !== 0) {
-    fail("usage", `git worktree add failed: ${added.stderr}`, {
-      task
-    });
+    const missingTrunk = base === config.trunk && !await service.git.branchExists(base);
+    fail("usage", missingTrunk ? `trunk '${base}' is not a branch in this repo: set \`trunk\` in arbor.config.ts` : `git worktree add failed: ${added.stderr}`, { task });
   }
   const worktree = await (await service.find(task)).take({ base });
   const info = `${await service.git.commonDir()}/info`;
@@ -698,6 +697,10 @@ class Git {
     const { code } = await this.run(this.root, "rev-parse", "--verify", "--quiet", `refs/heads/${branch}`);
     return code === 0;
   }
+  async defaultBranch() {
+    const { code, stdout } = await this.run(this.root, "symbolic-ref", "--short", "refs/remotes/origin/HEAD");
+    return code === 0 ? stdout.replace(/^origin\//, "") || null : null;
+  }
   currentBranch(cwd) {
     return this.out(cwd, "rev-parse", "--abbrev-ref", "HEAD");
   }
@@ -832,11 +835,13 @@ class Journal {
 import { basename, resolve } from "node:path";
 import { NodeFs as NodeFs5 } from "webappwiz/system";
 async function loadConfig(root, opts = {}) {
-  return { ...defaults(root), ...await file(opts.fs ?? new NodeFs5, root) };
+  const found = await file(opts.fs ?? new NodeFs5, root);
+  const trunk = found.trunk ?? await (opts.git ?? new Git(root)).defaultBranch() ?? "main";
+  return { ...defaults(root, trunk), ...found };
 }
-function defaults(root) {
+function defaults(root, trunk) {
   return {
-    trunk: "main",
+    trunk,
     worktreeRoot: resolve(root, "..", `${basename(root)}-arbor`),
     postCheckout: null,
     postRewrite: null,
@@ -852,7 +857,9 @@ async function file(fs, root) {
   if (!await fs.exists(path2)) {
     return {};
   }
-  const mod = await import(path2);
+  const mod = await import(path2).catch((cause) => {
+    throw new Error(`could not load ${path2}: ${cause}. Its imports may be stale: try \`bun install\` in ${root}.`, { cause });
+  });
   return mod.default ?? {};
 }
 
@@ -1150,8 +1157,8 @@ function repository(at) {
     }
     const gitDir = stdout.trim();
     const arborDir = `${gitDir}/arbor`;
-    const config = await loadConfig(dirname(gitDir), { fs });
     const git = new Git(dirname(gitDir), { ps, fs });
+    const config = await loadConfig(dirname(gitDir), { fs, git });
     const service = new WorktreeService(git, config, arborDir, { fs, ps });
     await service.init();
     await next({

package/load-config.d.ts

@@ -1,7 +1,15 @@
 import { type Fs } from "webappwiz/system";
 import type { Config } from "./config.js";
+import { Git } from "./git.js";
 export interface LoadConfigOptions {
     /** What `arbor.config.ts` is looked for through; the real one by default. */
     fs?: Fs;
+    /** What the trunk is detected through; the repo's own git by default. */
+    git?: Git;
 }
+/**
+ * The settings arbor runs a repo with: what `arbor.config.ts` names, then the
+ * branch `origin/HEAD` points at for the trunk, then arbor's own defaults.
+ * Throws when the config file is there but cannot be imported.
+ */
 export declare function loadConfig(root: string, opts?: LoadConfigOptions): Promise<Config>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webappwiz/arbor",
-	"version": "0.0.1",
+	"version": "0.0.2",
 	"description": "Runs several AI coding agents on one repository at once, each in its own git worktree",
 	"license": "MIT",
 	"author": "Jared Johnson",
@@ -17,7 +17,7 @@
 		"access": "public"
 	},
 	"dependencies": {
-		"webappwiz": "^0.0.1"
+		"webappwiz": "^0.0.2"
 	},
 	"main": "./index.js",
 	"types": "./index.d.ts",