@webappwiz/arbor 0.0.1 → 0.0.3

package/README.md

@@ -216,7 +216,7 @@ The agent's control flow runs on these.
 | 6    | `lease_held`        | Another agent is driving this tree.                                |
 | 7    | `dirty`             | Uncommitted changes. Commit before merging.                       |
 | 8    | `not_found`         | No such task, or not run from a task worktree.                     |
-| 9    | `hook_failed`       | `postCheckout` failed. The worktree still exists; fix and re-run the hook. |
+| 9    | `hook_failed`       | `postCheckout` failed (worktree still exists; fix and re-run the hook), or `postMerge` failed (the branch already landed; nothing rolled back). |
 | 10   | `exists`            | Task already exists. `arbor claim` it, or `arbor rm` first.    |
 | 11   | `orphaned`          | Record with no worktree. `arbor rm` it.                         |
 | 12   | `merge_failed`      | Trunk could not be fast-forwarded (usually a dirty main worktree). |
@@ -239,6 +239,7 @@ export default defineConfig({
 	postCheckout: "bun install && cp ../../myrepo/.env .env",
 	postRewrite: "bun install",     // after each rebase, before preMerge
 	preMerge: "bun test",           // the last gate before the branch lands
+	postMerge: "bun install",       // in the main tree, after the branch lands
 	leaseStalenessMs: 90_000,
 	mergeRetryCount: 2,
 	removedCapacity: 50,            // removed names kept, so rm can say "already removed"
@@ -246,11 +247,19 @@ 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
 branch and the base. They all run through `sh -c` in the worktree with
-`ARBOR_TASK` and `ARBOR_WORKTREE` in the environment.
+`ARBOR_TASK` and `ARBOR_WORKTREE` in the environment. `postMerge` is the
+exception: it runs in the main tree after the branch lands and the worktree is
+gone (so only `ARBOR_TASK` is set), for keeping the main tree current the way
+`postRewrite` keeps the worktree current. It reports failure but rolls nothing
+back; the landing already happened.
 
 Every hook is unset by default: arbor has no opinion about what a repo runs, or
 whether it has tests at all. Configure `preMerge` and a nonzero exit rolls the

package/config.d.ts

@@ -22,6 +22,12 @@ export interface Config {
      * rebase alone.
      */
     preMerge: string | null;
+    /**
+     * Command run by `merge` in the main tree after the base fast-forwards, via
+     * `sh -c`. The branch has already landed and the worktree is gone: a nonzero
+     * exit reports the failure but rolls nothing back.
+     */
+    postMerge: string | null;
     /** How long since its last heartbeat before a task's lease is up for grabs. */
     leaseStalenessMs: number;
     /** Failed `merge` attempts a task gets before it must escalate or be removed. */

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`;
@@ -628,6 +627,21 @@ ${gated.stderr}`)
     fail("usage", `landed '${task}' on ${base} (${head}) but could not discard its worktree: ${discarded.stderr || discarded.stdout}
 Run \`arbor rm ${task}\` to clean up.`, { task });
   }
+  if (config.postMerge) {
+    const ran = await shell.run(config.postMerge, {
+      cwd: git.root,
+      env: { ARBOR_TASK: task }
+    });
+    if (ran.exitCode !== 0) {
+      fail("hook_failed", [
+        `landed '${task}' on ${base} (${head}) but the postMerge hook failed (exit ${ran.exitCode}).`,
+        "",
+        tail(`${ran.stdout}
+${ran.stderr}`)
+      ].join(`
+`), { task, exitCode: ran.exitCode });
+    }
+  }
   log2.info(`${color8.green("merged")} ${task} onto ${base} (${head})
   worktree removed, cd ${git.root}`);
 }
@@ -698,6 +712,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,15 +850,18 @@ 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,
     preMerge: null,
+    postMerge: null,
     leaseStalenessMs: 90000,
     mergeRetryCount: 2,
     removedCapacity: 50,
@@ -852,7 +873,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 +1173,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({
@@ -19026,14 +19049,21 @@ function App() {
   }, [feed]);
   const { snapshot, offline } = useReactive(feed, (feed2) => ({ snapshot: feed2.snapshot, offline: feed2.offline }), ["changed"]);
   const [tab, setTab] = import_react6.useState("tasks");
+  const emoji = offline ? "⚠️" : "\\uD83C\\uDF32";
+  import_react6.useEffect(() => {
+    document.querySelector("link[rel=icon]")?.setAttribute("href", \`data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32'><text y='26' font-size='28'>\${emoji}</text></svg>\`);
+  }, [emoji]);
   return /* @__PURE__ */ jsx_dev_runtime2.jsxDEV("div", {
     className: "mx-auto max-w-6xl px-4 py-8 font-mono text-[13px]",
     children: [
       /* @__PURE__ */ jsx_dev_runtime2.jsxDEV("h1", {
         className: "mb-4 text-base",
         children: /* @__PURE__ */ jsx_dev_runtime2.jsxDEV("b", {
-          children: "\\uD83C\\uDF32 arbor"
-        }, undefined, false, undefined, this)
+          children: [
+            emoji,
+            " arbor"
+          ]
+        }, undefined, true, undefined, this)
       }, undefined, false, undefined, this),
       /* @__PURE__ */ jsx_dev_runtime2.jsxDEV("nav", {
         className: "mb-4 flex gap-6 text-xs uppercase tracking-widest",
@@ -19362,7 +19392,7 @@ var shell_default = `<!doctype html>
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<title>arbor</title>
 		<!-- The emoji drawn as SVG inline, so there is no file for the server to
-		     serve and nothing to keep in step with the heading on the page. -->
+		     serve. The page rewrites it to a warning when the server goes away. -->
 		<link
 			rel="icon"
 			href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32'><text y='26' font-size='28'>🌲</text></svg>"

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.3",
 	"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.3"
 	},
 	"main": "./index.js",
 	"types": "./index.d.ts",