@webappwiz/arbor 0.0.15 → 0.0.16

package/arbor.d.ts

@@ -1,13 +1,10 @@
 import { type Deps } from "webappwiz/cmd";
-import type { HttpServer } from "webappwiz/http";
 import type { Fs } from "webappwiz/system";
 import type { Assets } from "./dev/assets.js";
 import { type Repository } from "./repository.js";
 /** Everything `arbor` is run with, before the repository middleware adds to it. */
 export interface ArborDeps extends Deps {
     fs: Fs;
-    /** HTTP server `dev` listens on to serve its preview. */
-    http: HttpServer;
     /** The built page `dev` serves as its preview. */
     assets: Assets;
 }

package/dev.d.ts

@@ -1,5 +1,4 @@
 import { type AsyncResource } from "webappwiz/disposable";
-import type { HttpServer } from "webappwiz/http";
 import type { Logger } from "webappwiz/log";
 import { type Fs, type PortProvider } from "webappwiz/system";
 import type { Assets } from "./dev/assets.js";
@@ -23,12 +22,11 @@ export interface DevServer extends AsyncResource {
  * repo changes. Read-only on purpose: driving arbor is what the CLI is for, and
  * a button that took a lease would fight the agent holding it.
  */
-export declare function dev({ service, fs, journal, log, http, assets, }: {
+export declare function dev({ service, fs, journal, log, assets, }: {
     service: WorktreeService;
     fs: Fs;
     journal: Journal;
     log: Logger;
-    http: HttpServer;
     assets: Assets;
 }, { ports }?: DevOptions): Promise<DevServer>;
 /**

package/index.js

@@ -2,13 +2,12 @@
 // @bun
 
 // index.ts
-import { BunHttpServer } from "webappwiz/http/bun";
 import { NodeFs as NodeFs7 } from "webappwiz/system";
 
 // arbor.ts
 import { cli } from "webappwiz/cmd";
-import { t } from "webappwiz/t";
-import { Duration as Duration3 } from "webappwiz/time";
+import { Duration as Duration2 } from "webappwiz/time";
+import { z } from "zod";
 
 // add.ts
 import { color } from "webappwiz/log";
@@ -167,7 +166,6 @@ import {
   MAX_PORT,
   OpenPortProvider
 } from "webappwiz/system";
-import { Duration } from "webappwiz/time";
 
 // snapshot.ts
 import { NodeFs as NodeFs2 } from "webappwiz/system";
@@ -382,7 +380,6 @@ async function dev({
   fs,
   journal,
   log: log2,
-  http,
   assets
 }, { ports = devPorts(DEFAULT_PORT) } = {}) {
   const open = new Set;
@@ -425,34 +422,27 @@ async function dev({
       }
     });
   };
-  const listening = await http.serve(async (request) => {
-    switch (new URL(request.url).pathname) {
-      case "/":
-        return new Response(assets.shell, {
-          headers: { "content-type": "text/html; charset=utf-8" }
-        });
-      case "/main.js":
-        return new Response(assets.script, {
-          headers: { "content-type": "text/javascript; charset=utf-8" }
-        });
-      case "/styles.css":
-        return new Response(assets.styles, {
-          headers: { "content-type": "text/css; charset=utf-8" }
-        });
-      case "/api/snapshot":
-        return Response.json(await snapshot(service, journal, { fs }));
-      case "/events":
-        return events();
-      default:
-        return new Response("not found", { status: 404 });
-    }
-  }, { port: await ports.get(), idleTimeout: Duration.zero() });
-  log2.info(`arbor dev on http://localhost:${listening.port}`);
+  const asset = (body, type) => new Response(body, { headers: { "content-type": type } });
+  const requested = await ports.get();
+  const server = Bun.serve({
+    port: requested,
+    idleTimeout: 0,
+    routes: {
+      "/": asset(assets.shell, "text/html; charset=utf-8"),
+      "/main.js": asset(assets.script, "text/javascript; charset=utf-8"),
+      "/styles.css": asset(assets.styles, "text/css; charset=utf-8"),
+      "/api/snapshot": async () => Response.json(await snapshot(service, journal, { fs })),
+      "/events": events
+    },
+    fetch: () => new Response("not found", { status: 404 })
+  });
+  const port = server.port ?? requested;
+  log2.info(`arbor dev on http://localhost:${port}`);
   const disposer = new AsyncDisposer;
-  disposer.defer(() => listening.stop());
+  disposer.defer(() => server.stop(true));
   disposer.defer(async () => clearInterval(poll));
   return {
-    port: listening.port,
+    port,
     disposeAsync: disposer.disposeAsync
   };
 }
@@ -1306,9 +1296,9 @@ async function retry({
 
 // wait.ts
 import { color as color11 } from "webappwiz/log";
-import { Duration as Duration2, sleep } from "webappwiz/time";
-var DEFAULT_TIMEOUT = Duration2.mins(5);
-var POLL = Duration2.secs(2);
+import { Duration, sleep } from "webappwiz/time";
+var DEFAULT_TIMEOUT = Duration.mins(5);
+var POLL = Duration.secs(2);
 var RUNNING = ["working", "merging"];
 async function wait({ service, log: log2 }, task, { timeout = DEFAULT_TIMEOUT, poll = POLL } = {}) {
   const deadline = Date.now() + timeout.ms;
@@ -1325,7 +1315,7 @@ async function wait({ service, log: log2 }, task, { timeout = DEFAULT_TIMEOUT, p
     if (left <= 0) {
       fail("timeout", `'${task}' is still ${worktree.status} after ${timeout.secs}s: wait again, work alongside it and accept the rebase, or ask the human`, { task, status: worktree.status });
     }
-    await sleep(Duration2.min(poll, Duration2.ms(left)));
+    await sleep(Duration.min(poll, Duration.ms(left)));
   }
 }
 function report2(worktree) {
@@ -1343,43 +1333,43 @@ function report2(worktree) {
 
 // arbor.ts
 var arbor = cli("arbor").use(exits()).use(repository());
-arbor.command("add").description("start a new task: create branch task/<task>, a worktree at ../<repo>-arbor/<task> and a state record").arg("task", t.string(), { description: "task name (lowercase-with-dashes)" }).option("base", t.string(), {
+arbor.command("add").description("start a new task: create branch task/<task>, a worktree at ../<repo>-arbor/<task> and a state record").arg("task", z.string(), { description: "task name (lowercase-with-dashes)" }).option("base", z.string(), {
   default: "",
   description: "branch this task starts from and merges onto (default: trunk); `task/<other>` stacks this task on that one and lands the work in its worktree"
 }).action((opts, ctx) => ctx.journal.record("add", opts.task, () => add(ctx, opts.task, { base: opts.base || undefined })));
-arbor.command("claim").description("resume an existing task: take ownership of its worktree and print its path, status and any half-finished rebase; refuses while another agent holds the lease, but takes a stale one silently, so `arbor show` first if the tree may not be abandoned").arg("task", t.string(), { description: "task name" }).action((opts, ctx) => ctx.journal.record("claim", opts.task, () => claim(ctx, opts.task)));
+arbor.command("claim").description("resume an existing task: take ownership of its worktree and print its path, status and any half-finished rebase; refuses while another agent holds the lease, but takes a stale one silently, so `arbor show` first if the tree may not be abandoned").arg("task", z.string(), { description: "task name" }).action((opts, ctx) => ctx.journal.record("claim", opts.task, () => claim(ctx, opts.task)));
 arbor.command("merge").description("land this worktree's branch on its base (trunk unless created with --base): rebase onto it, run tests on the rebased code, fast-forward it in whichever worktree has it checked out, then discard the worktree, branch and record (linear history, never a merge commit, no flag to skip tests); requires committed work, refusing a dirty worktree").action(async (_opts, ctx) => ctx.journal.record("merge", await here(ctx), () => merge(ctx, ctx.ps.cwd())));
-arbor.command("remove").description("discard a task: worktree, branch and state file; cheap and encouraged, since redoing a task against current trunk often beats a hard rebase").arg("task", t.string(), { description: "task name" }).option("force", t.boolean(), {
+arbor.command("remove").description("discard a task: worktree, branch and state file; cheap and encouraged, since redoing a task against current trunk often beats a hard rebase").arg("task", z.string(), { description: "task name" }).option("force", z.string().transform((raw) => raw !== "false"), {
   default: false,
   description: "discard even when another agent holds the lease"
 }).action((opts, ctx) => ctx.journal.record("remove", opts.task, () => remove(ctx, opts.task, { force: opts.force })));
-arbor.command("list").description("list every task: name, status, lease (held: an agent is on it now; stale: gone quiet, normal for a task mid-edit; none), commits ahead of trunk, age").option("json", t.boolean(), { default: false, description: "emit JSON" }).action((opts, ctx) => list(ctx, { json: opts.json }));
-arbor.command("show").description("read one task without touching it: everything `list` shows for it, plus the ARBOR.md its agent left at the worktree root; takes no lease, so it cannot knock that agent off its own tree").arg("task", t.string(), { description: "task name" }).option("json", t.boolean(), { default: false, description: "emit JSON" }).action((opts, ctx) => show(ctx, opts.task, { json: opts.json }));
-arbor.command("wait").description("block until a task stops moving: escalated, or gone (merged or removed), or broken; takes no lease, and gives up with `timeout` rather than waiting forever").arg("task", t.string(), { description: "task name" }).option("timeout-secs", t.number(), {
+arbor.command("list").description("list every task: name, status, lease (held: an agent is on it now; stale: gone quiet, normal for a task mid-edit; none), commits ahead of trunk, age").option("json", z.string().transform((raw) => raw !== "false"), { default: false, description: "emit JSON" }).action((opts, ctx) => list(ctx, { json: opts.json }));
+arbor.command("show").description("read one task without touching it: everything `list` shows for it, plus the ARBOR.md its agent left at the worktree root; takes no lease, so it cannot knock that agent off its own tree").arg("task", z.string(), { description: "task name" }).option("json", z.string().transform((raw) => raw !== "false"), { default: false, description: "emit JSON" }).action((opts, ctx) => show(ctx, opts.task, { json: opts.json }));
+arbor.command("wait").description("block until a task stops moving: escalated, or gone (merged or removed), or broken; takes no lease, and gives up with `timeout` rather than waiting forever").arg("task", z.string(), { description: "task name" }).option("timeout-secs", z.coerce.number(), {
   default: DEFAULT_TIMEOUT.secs,
   description: "how long to wait before giving up"
 }).action((opts, ctx) => wait(ctx, opts.task, {
-  timeout: Duration3.secs(opts["timeout-secs"])
+  timeout: Duration2.secs(opts["timeout-secs"])
 }));
-arbor.command("log").description("show what has been done here recently: one line per add, claim, merge, remove, escalate and retry, with how it ended; outlives the tasks themselves").option("count", t.number(), {
+arbor.command("log").description("show what has been done here recently: one line per add, claim, merge, remove, escalate and retry, with how it ended; outlives the tasks themselves").option("count", z.coerce.number(), {
   default: DEFAULT_COUNT,
   description: "how many entries to show"
-}).option("json", t.boolean(), { default: false, description: "emit JSON" }).action((opts, ctx) => log(ctx, { count: opts.count, json: opts.json }));
-arbor.command("dev").description("serve `list`, `show` and `log` as a web page; read-only").option("port", t.number(), {
+}).option("json", z.string().transform((raw) => raw !== "false"), { default: false, description: "emit JSON" }).action((opts, ctx) => log(ctx, { count: opts.count, json: opts.json }));
+arbor.command("dev").description("serve `list`, `show` and `log` as a web page; read-only").option("port", z.coerce.number(), {
   default: DEFAULT_PORT,
   description: "port to listen on, or the next open one above it"
 }).action((opts, ctx) => dev(ctx, { ports: devPorts(opts.port) }));
-arbor.command("path").description("print a task's worktree path, or the main tree with no task; names another agent's tree without taking its lease").arg("task", t.string(), {
+arbor.command("path").description("print a task's worktree path, or the main tree with no task; names another agent's tree without taking its lease").arg("task", z.string(), {
   default: "",
   description: "task name; omit for the main tree"
 }).action((opts, ctx) => path(ctx, opts.task || undefined));
-arbor.command("escalate").description("hand this task to a human and stop: records the reason, drops the lease and leaves the worktree exactly as it is; use instead of resolving a genuine conflict badly just to finish").arg("reason", t.string(), { description: "why this needs a human" }).option("task", t.string(), {
+arbor.command("escalate").description("hand this task to a human and stop: records the reason, drops the lease and leaves the worktree exactly as it is; use instead of resolving a genuine conflict badly just to finish").arg("reason", z.string(), { description: "why this needs a human" }).option("task", z.string(), {
   default: "",
   description: "task name, when run outside its worktree"
 }).action(async (opts, ctx) => ctx.journal.record("escalate", opts.task || await here(ctx), () => escalate(ctx, opts.reason, ctx.ps.cwd(), {
   task: opts.task || undefined
 })));
-arbor.command("retry").description("give an escalated task another mergeRetryCount merge attempts and put it back to working; the way out of `budget_exhausted` that is not remove and redo, and only from escalated, so a human has seen the tree first").arg("task", t.string(), { description: "task name" }).action((opts, ctx) => ctx.journal.record("retry", opts.task, () => retry(ctx, opts.task)));
+arbor.command("retry").description("give an escalated task another mergeRetryCount merge attempts and put it back to working; the way out of `budget_exhausted` that is not remove and redo, and only from escalated, so a human has seen the tree first").arg("task", z.string(), { description: "task name" }).action((opts, ctx) => ctx.journal.record("retry", opts.task, () => retry(ctx, opts.task)));
 async function here({
   service,
   git,
@@ -20033,6 +20023,5 @@ var assets = { shell: shell_default, script: main_default, styles: styles_defaul
 // index.ts
 await arbor.run({
   fs: new NodeFs7,
-  http: new BunHttpServer,
   assets
 });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webappwiz/arbor",
-	"version": "0.0.15",
+	"version": "0.0.16",
 	"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,8 @@
 		"access": "public"
 	},
 	"dependencies": {
-		"webappwiz": "^0.0.15"
+		"webappwiz": "^0.0.16",
+		"zod": "^4.4.3"
 	},
 	"main": "./index.js",
 	"types": "./index.d.ts",