@webappwiz/arbor 0.0.31 → 0.0.32

package/merge.d.ts

@@ -3,7 +3,7 @@ import type { Fs, Lock } from "webappwiz/system";
 import type { Config } from "./config.js";
 import type { Git } from "./git.js";
 import type { Shell } from "./shell.js";
-import { type Todos } from "./todo.js";
+import type { Todos } from "./todos.js";
 import type { WorktreeService } from "./worktree-service.js";
 /**
  * Lands the current worktree's branch on its base branch, trunk unless the

package/package.json

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

package/remove.d.ts

@@ -1,5 +1,5 @@
 import { type Logger } from "webappwiz/log";
-import type { Todos } from "./todo.js";
+import type { Todos } from "./todos.js";
 import type { WorktreeService } from "./worktree-service.js";
 export interface RemoveOptions {
     /** Discard the tree even when another agent holds its lease. */

package/repository.d.ts

@@ -4,7 +4,7 @@ import type { Config } from "./config.js";
 import { Git } from "./git.js";
 import { Journal } from "./journal.js";
 import { Shell } from "./shell.js";
-import { Todos } from "./todo.js";
+import { Todos } from "./todos.js";
 import { WorktreeService } from "./worktree-service.js";
 /** What a command gets to work with, once there is a repository to work in. */
 export interface Repository {

package/snapshot.d.ts

@@ -1,6 +1,7 @@
 import type { Fs } from "webappwiz/system";
 import { type Details } from "./show.js";
-import type { TodoState, Todos } from "./todo.js";
+import type { TodoState } from "./todo.js";
+import type { Todos } from "./todos.js";
 import type { WorktreeService } from "./worktree-service.js";
 /**
  * Everything one page shows: `todo list`, and `list` and `show` for each

package/todo.d.ts

@@ -1,7 +1,7 @@
-import { type IdProvider } from "webappwiz/id";
 import { type Logger } from "webappwiz/log";
-import { type Fs, type Lock, type Ps } from "webappwiz/system";
-import { type Attachment, Attachments } from "./attachments.js";
+import type { Fs, Ps } from "webappwiz/system";
+import { type Attachment, type Attachments } from "./attachments.js";
+import type { Todos } from "./todos.js";
 /** What a todo is on disk: one file apiece, so two agents never rewrite one. */
 export interface TodoState {
     id: number;
@@ -21,37 +21,6 @@ export interface TodoState {
     /** What it belongs to, sorted: the areas or goals it adds up to with others. */
     tags: string[];
 }
-/** A tag in use, with how many todos have it. */
-export interface TagState {
-    tag: string;
-    todos: number;
-}
-/** `tags` deduped and sorted, refusing any not written the one way. */
-export declare function tagList(tags: string[]): string[];
-/** A todo's words, place or files changed: new ones added, some of the old kept. */
-export interface TodoChange {
-    /** A new line; the old one stays when this is absent. */
-    subject?: string;
-    /** New detail, empty for none; the old stays when this is absent. */
-    text?: string;
-    /** Where to move it in the list; it stays put when this is absent. */
-    position?: number;
-    /** Files to add. */
-    files?: Attachment[];
-    /** The paths of the files it has now to keep; absent keeps them all. */
-    keep?: string[];
-    /** Its tags from now on; the old stay when this is absent. */
-    tags?: string[];
-}
-/** What a new todo has besides its subject, all of it optional. */
-export interface TodoNew {
-    /** Whatever more there is to say about it. */
-    text?: string;
-    files?: Attachment[];
-    /** Where it goes in the list, pushing those from there down; the bottom by default. */
-    position?: number;
-    tags?: string[];
-}
 /**
  * Work deferred for later: what an agent notes when something outside its
  * task comes up, so it can move on instead of growing the task. Kept under the
@@ -85,77 +54,46 @@ export declare class Todo {
     update({ subject, text, position, files, keep, tags, }: TodoChange): Promise<Todo>;
     remove(): Promise<void>;
 }
-/** What `Todos` is stored through; the real filesystem by default. */
-export interface TodosOptions {
-    fs?: Fs;
-    /** Names stored files apart; a test counts. */
-    ids?: IdProvider;
+/** A tag in use, with how many todos have it. */
+export interface TagState {
+    tag: string;
+    todos: number;
 }
-/** Every todo in the repo, one JSON file each under `.git/arbor/todos`. */
-export declare class Todos {
-    readonly dir: string;
-    /**
-     * Held while numbering a new todo, so two agents never share an id, and
-     * while writing one, so a move renumbering the rest never loses to a
-     * write of a position it just changed.
-     */
-    private readonly lock;
-    private readonly fs;
-    private readonly ids;
-    constructor(dir: string, 
-    /**
-     * Held while numbering a new todo, so two agents never share an id, and
-     * while writing one, so a move renumbering the rest never loses to a
-     * write of a position it just changed.
-     */
-    lock: Lock, opts?: TodosOptions);
-    /** Where a todo's files live, beside its record. */
-    attachments(id: number): Attachments;
-    /** Whether `path` is a file some todo holds, and not a way out of here. */
-    owns(path: string): boolean;
-    add(subject: string, from: string | null, { text, files, position, tags }?: TodoNew): Promise<Todo>;
-    /**
-     * Top of the list first. A file that will not parse is skipped rather than
-     * fatal, and positions are counted again from 1 as they are read, so a
-     * gap or a tie left by a crash, or a todo saved before they had any (it
-     * goes below those that do, oldest first), never shows.
-     */
-    all(): Promise<Todo[]>;
-    find(id: number): Promise<Todo>;
-    /** Every tag a todo on the list has, by name, with how many have it. */
-    tags(): Promise<TagState[]>;
-    /** The todos `task` has taken; what a merge or remove settles. */
-    takenBy(task: string): Promise<Todo[]>;
-    /**
-     * Puts a todo at `position`, 1 at the top, past the bottom meaning the
-     * bottom, and numbers the rest around it.
-     */
-    move(id: number, position: number): Promise<Todo>;
-    /**
-     * @internal Rewrites one todo as it stands on disk now, under the lock, so
-     * a change to its words or who has it never undoes a move made meanwhile.
-     */
-    revise(id: number, change: (state: TodoState) => TodoState): Promise<Todo>;
-    /** @internal Writes one todo. Rename makes the swap atomic for readers. */
-    save(state: TodoState): Promise<Todo>;
-    /** @internal Removes one, moving those below it up to close the gap. */
-    delete(id: number): Promise<void>;
-    private locked;
-    /** One todo as it stands on disk; call it under the lock. */
-    private state;
-    /**
-     * Slots `state` in at `position` among the rest and saves whichever moved.
-     * Call it under the lock.
-     */
-    private place;
-    /** Every todo in list order, with the positions it has on disk. */
-    private stored;
-    /** Saves each todo in `order` whose position on disk is not its place there. */
-    private renumber;
-    private path;
-    private lastId;
-    private read;
+/** `tags` deduped and sorted, refusing any not written the one way. */
+export declare function tagList(tags: string[]): string[];
+/** A todo's words, place or files changed: new ones added, some of the old kept. */
+export interface TodoChange {
+    /** A new line; the old one stays when this is absent. */
+    subject?: string;
+    /** New detail, empty for none; the old stays when this is absent. */
+    text?: string;
+    /** Where to move it in the list; it stays put when this is absent. */
+    position?: number;
+    /** Files to add. */
+    files?: Attachment[];
+    /** The paths of the files it has now to keep; absent keeps them all. */
+    keep?: string[];
+    /** Its tags from now on; the old stay when this is absent. */
+    tags?: string[];
 }
+/** What a new todo has besides its subject, all of it optional. */
+export interface TodoNew {
+    /** Whatever more there is to say about it. */
+    text?: string;
+    files?: Attachment[];
+    /** Where it goes in the list, pushing those from there down; the bottom by default. */
+    position?: number;
+    tags?: string[];
+}
+/**
+ * A subject and its detail, trimmed. A subject running past one line keeps
+ * only the first, the rest leading the detail, so the list stays one line a
+ * todo however it was written.
+ */
+export declare function wording(subject: string, text: string): {
+    subject: string;
+    text: string;
+};
 /** What a finished task should be followed by, and what should just go. */
 export interface Recommendation {
     /** The todo to pick up next, or null when there is nothing fresh left. */
@@ -178,8 +116,8 @@ export interface TodoListOptions {
     json?: boolean;
     /** Only those no task has taken: the ones free to pick up. */
     open?: boolean;
-    /** Only those with this tag. */
-    tag?: string;
+    /** Only those with any of these tags; every todo when empty. */
+    tags?: string[];
 }
 export interface TodoFileOptions {
     /** Files to attach, relative to the current directory or absolute. */
@@ -201,7 +139,7 @@ export declare function todoAdd(deps: {
 export declare function todoList({ todos, log }: {
     todos: Todos;
     log: Logger;
-}, { json, open, tag }?: TodoListOptions): Promise<void>;
+}, { json, open, tags }?: TodoListOptions): Promise<void>;
 export interface TodoShowOptions {
     /** Print the todo as JSON instead of prose. */
     json?: boolean;

package/todos.d.ts

@@ -0,0 +1,75 @@
+import { type IdProvider } from "webappwiz/id";
+import { type Fs, type Lock } from "webappwiz/system";
+import { Attachments } from "./attachments.js";
+import { type TagState, Todo, type TodoNew, type TodoState } from "./todo.js";
+/** Every todo in the repo, one JSON file each under `.git/arbor/todos`. */
+export declare class Todos {
+    readonly dir: string;
+    /**
+     * Held while numbering a new todo, so two agents never share an id, and
+     * while writing one, so a move renumbering the rest never loses to a
+     * write of a position it just changed.
+     */
+    private readonly lock;
+    private readonly fs;
+    private readonly ids;
+    constructor(dir: string, 
+    /**
+     * Held while numbering a new todo, so two agents never share an id, and
+     * while writing one, so a move renumbering the rest never loses to a
+     * write of a position it just changed.
+     */
+    lock: Lock, opts?: TodosOptions);
+    /** Where a todo's files live, beside its record. */
+    attachments(id: number): Attachments;
+    /** Whether `path` is a file some todo holds, and not a way out of here. */
+    owns(path: string): boolean;
+    add(subject: string, from: string | null, { text, files, position, tags }?: TodoNew): Promise<Todo>;
+    /**
+     * Top of the list first. A file that will not parse is skipped rather than
+     * fatal, and positions are counted again from 1 as they are read, so a
+     * gap or a tie left by a crash, or a todo saved before they had any (it
+     * goes below those that do, oldest first), never shows.
+     */
+    all(): Promise<Todo[]>;
+    find(id: number): Promise<Todo>;
+    /** Every tag a todo on the list has, by name, with how many have it. */
+    tags(): Promise<TagState[]>;
+    /** The todos `task` has taken; what a merge or remove settles. */
+    takenBy(task: string): Promise<Todo[]>;
+    /**
+     * Puts a todo at `position`, 1 at the top, past the bottom meaning the
+     * bottom, and numbers the rest around it.
+     */
+    move(id: number, position: number): Promise<Todo>;
+    /**
+     * @internal Rewrites one todo as it stands on disk now, under the lock, so
+     * a change to its words or who has it never undoes a move made meanwhile.
+     */
+    revise(id: number, change: (state: TodoState) => TodoState): Promise<Todo>;
+    /** @internal Writes one todo. Rename makes the swap atomic for readers. */
+    save(state: TodoState): Promise<Todo>;
+    /** @internal Removes one, moving those below it up to close the gap. */
+    delete(id: number): Promise<void>;
+    private locked;
+    /** One todo as it stands on disk; call it under the lock. */
+    private state;
+    /**
+     * Slots `state` in at `position` among the rest and saves whichever moved.
+     * Call it under the lock.
+     */
+    private place;
+    /** Every todo in list order, with the positions it has on disk. */
+    private stored;
+    /** Saves each todo in `order` whose position on disk is not its place there. */
+    private renumber;
+    private path;
+    private lastId;
+    private read;
+}
+/** What `Todos` is stored through; the real filesystem by default. */
+export interface TodosOptions {
+    fs?: Fs;
+    /** Names stored files apart; a test counts. */
+    ids?: IdProvider;
+}

package/worktree-service.d.ts

@@ -29,7 +29,7 @@ export declare class WorktreeService {
     /** Where a task's worktree lives: a sibling of the repo, never inside it. */
     pathFor(task: string): string;
     branchFor(task: string): string;
-    taskFor(branch: string): string | null;
+    taskFor(branch: string | null): string | null;
     recordPath(task: string): string;
     /** Always answers; the returned worktree's status says what was found. */
     find(task: string): Promise<Worktree>;

package/worktree.d.ts

@@ -1,51 +1,5 @@
 import type { GitResult } from "./git.js";
 import type { WorktreeService } from "./worktree-service.js";
-/** The status a task's own record carries. */
-export type RecordStatus = "working" | "merging" | "escalated";
-/** What a task's record stores about who is driving it. */
-export interface LeaseState {
-    pid: number;
-    hostname: string;
-    heartbeatAt: string;
-}
-export interface Escalation {
-    reason: string;
-    at: string;
-    /**
-     * For a task handed over to be approved rather than to answer questions,
-     * the question in its plan that asks for the approval, `4`.
-     */
-    review?: string;
-}
-export interface TaskState {
-    task: string;
-    branch: string;
-    worktree: string;
-    /** The branch this task lands on. Absent in old records: trunk. */
-    base?: string;
-    status: RecordStatus;
-    lease: LeaseState | null;
-    mergeAttempts: number;
-    createdAt: string;
-    updatedAt: string;
-    escalations?: Escalation[];
-}
-/**
- * Everything a name can turn out to be. The record's own status when the
- * task is intact, and otherwise the way in which it is not.
- */
-export type WorktreeStatus = RecordStatus | "absent" | "removed" | "orphaned" | "stray" | "unrecorded" | "unknown";
-/** What the service found on disk. */
-export interface WorktreeSnapshot {
-    task: string;
-    branch: string;
-    path: string;
-    state: TaskState | null;
-    exists: boolean;
-    hasBranch: boolean;
-    removedAt: string | null;
-    corrupt: boolean;
-}
 /**
  * One task, whether or not it is still there. Commands ask the service for
  * one of these and read its status rather than assembling the same handful of
@@ -93,3 +47,49 @@ export declare class Worktree {
     uncommitted(): Promise<string[]>;
     interruptedOps(): Promise<string[]>;
 }
+/** The status a task's own record carries. */
+export type RecordStatus = "working" | "merging" | "escalated";
+/** What a task's record stores about who is driving it. */
+export interface LeaseState {
+    pid: number;
+    hostname: string;
+    heartbeatAt: string;
+}
+export interface Escalation {
+    reason: string;
+    at: string;
+    /**
+     * For a task handed over to be approved rather than to answer questions,
+     * the question in its plan that asks for the approval, `4`.
+     */
+    review?: string;
+}
+export interface TaskState {
+    task: string;
+    branch: string;
+    worktree: string;
+    /** The branch this task lands on. Absent in old records: trunk. */
+    base?: string;
+    status: RecordStatus;
+    lease: LeaseState | null;
+    mergeAttempts: number;
+    createdAt: string;
+    updatedAt: string;
+    escalations?: Escalation[];
+}
+/**
+ * Everything a name can turn out to be. The record's own status when the
+ * task is intact, and otherwise the way in which it is not.
+ */
+export type WorktreeStatus = RecordStatus | "absent" | "removed" | "orphaned" | "stray" | "unrecorded" | "unknown";
+/** What the service found on disk. */
+export interface WorktreeSnapshot {
+    task: string;
+    branch: string;
+    path: string;
+    state: TaskState | null;
+    exists: boolean;
+    hasBranch: boolean;
+    removedAt: string | null;
+    corrupt: boolean;
+}