trellis-herbivore 0.1.0

package/dist/commands/channel/store/paths.js

@@ -0,0 +1,246 @@
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { GLOBAL_PROJECT_KEY, } from "./schema.js";
+/** Top-level Trellis channels directory. */
+export function channelRoot() {
+    const env = process.env.TRELLIS_CHANNEL_ROOT;
+    if (env && env.length > 0)
+        return path.resolve(env);
+    return path.join(os.homedir(), ".trellis", "channels");
+}
+/**
+ * Derive a per-project bucket name from an absolute cwd, mirroring
+ * Claude Code's `~/.claude/projects/<sanitized-cwd>/` convention so
+ * users who already work with that layout get a familiar mental model.
+ *
+ * The transform is irreversible (multiple cwds can collide if they
+ * differ only in `/` vs `_` positions) but the collision risk in
+ * practice is negligible — Claude Code accepts the same trade-off.
+ */
+export function projectKey(cwd) {
+    const abs = path.resolve(cwd);
+    // Match claude's rule: replace `/`, `_`, `\` with `-`. The leading
+    // `-` (from the leading `/` on POSIX paths) is kept so you can spot
+    // project buckets at a glance — they always start with `-`.
+    //
+    // We then sanitise any remaining non-portable bytes (spaces, CJK,
+    // `#`, `:` etc.) to `-` as well so the bucket dir name is portable
+    // and shell-safe. Modern fs APIs handle exotic chars, but anything
+    // that needs quoting in a path is a foot-gun across shells / CI.
+    const slashes = abs.replace(/[\\/_]/g, "-");
+    return slashes.replace(/[^A-Za-z0-9.-]/g, "-");
+}
+/**
+ * Project key for the current CLI invocation. Reads
+ * `TRELLIS_CHANNEL_PROJECT` env first (set by the supervisor spawn so
+ * detached children land in the same bucket as the spawning CLI), then
+ * falls back to deriving from `process.cwd()`.
+ */
+export function currentProjectKey() {
+    const env = process.env.TRELLIS_CHANNEL_PROJECT;
+    if (env && env.length > 0)
+        return env;
+    return projectKey(process.cwd());
+}
+/** Directory holding all channels for a given project. */
+export function projectDir(project = currentProjectKey()) {
+    return path.join(channelRoot(), project);
+}
+/** Marker file that distinguishes a project bucket from a legacy
+ *  flat-layout channel. New project buckets touch this on first use. */
+const BUCKET_MARKER = ".bucket";
+/**
+ * Channel directory inside its project bucket. Defaults to the current
+ * project (cwd-derived); pass an explicit project for cross-project
+ * addressing.
+ */
+export function channelDir(name, project = currentProjectKey()) {
+    return path.join(projectDir(project), name);
+}
+export function eventsPath(name, project = currentProjectKey()) {
+    return path.join(channelDir(name, project), "events.jsonl");
+}
+export function lockPath(name, project = currentProjectKey()) {
+    return path.join(channelDir(name, project), `${name}.lock`);
+}
+export function workerFile(name, worker, suffix, project = currentProjectKey()) {
+    return path.join(channelDir(name, project), `${worker}.${suffix}`);
+}
+export function workerLockPath(name, worker, project = currentProjectKey()) {
+    return path.join(channelDir(name, project), `${worker}.spawnlock`);
+}
+/**
+ * One-shot migration: move legacy flat channels at `<root>/<name>/` into
+ * a `_legacy/` bucket so the new project-scoped layout can use the top
+ * level. Called lazily by `currentProject*` consumers — safe to invoke
+ * multiple times (idempotent).
+ *
+ * A directory at `<root>/X` is treated as a legacy channel if:
+ *   - it doesn't have a `.bucket` marker (so it's not a project bucket)
+ *   - AND it contains an `events.jsonl` directly inside
+ *
+ * Buckets named `_legacy` and `_default` are reserved and never moved.
+ */
+export function migrateLegacyChannels() {
+    const root = channelRoot();
+    if (!fs.existsSync(root))
+        return;
+    const legacy = path.join(root, "_legacy");
+    let moved = 0;
+    let entries;
+    try {
+        entries = fs.readdirSync(root);
+    }
+    catch {
+        return;
+    }
+    for (const entry of entries) {
+        if (entry === "_legacy" || entry === "_default")
+            continue;
+        const dir = path.join(root, entry);
+        let stat;
+        try {
+            stat = fs.statSync(dir);
+        }
+        catch {
+            continue;
+        }
+        if (!stat.isDirectory())
+            continue;
+        // Project bucket marker → skip.
+        if (fs.existsSync(path.join(dir, BUCKET_MARKER)))
+            continue;
+        // Heuristic: a legacy channel has events.jsonl directly.
+        if (!fs.existsSync(path.join(dir, "events.jsonl")))
+            continue;
+        // It's legacy — move it to _legacy/<name>/.
+        fs.mkdirSync(legacy, { recursive: true });
+        const target = path.join(legacy, entry);
+        try {
+            fs.renameSync(dir, target);
+            moved++;
+        }
+        catch (err) {
+            process.stderr.write(`[channel migrate] failed to move ${entry} to _legacy/: ${err instanceof Error ? err.message : err}\n`);
+        }
+    }
+    if (moved > 0) {
+        fs.mkdirSync(legacy, { recursive: true });
+        fs.writeFileSync(path.join(legacy, BUCKET_MARKER), "");
+        process.stderr.write(`[channel migrate] moved ${moved} legacy channel(s) to ${legacy}\n`);
+    }
+}
+/** Mark a directory as a project bucket so the migrator skips it. */
+export function ensureBucketMarker(project) {
+    const dir = projectDir(project);
+    fs.mkdirSync(dir, { recursive: true });
+    const marker = path.join(dir, BUCKET_MARKER);
+    if (!fs.existsSync(marker)) {
+        fs.writeFileSync(marker, "");
+    }
+}
+/** Enumerate all project buckets currently on disk (excluding legacy). */
+export function listProjects() {
+    const root = channelRoot();
+    if (!fs.existsSync(root))
+        return [];
+    const out = [];
+    for (const entry of fs.readdirSync(root)) {
+        const dir = path.join(root, entry);
+        try {
+            if (!fs.statSync(dir).isDirectory())
+                continue;
+        }
+        catch {
+            continue;
+        }
+        // A directory is a project bucket if it has the marker OR is
+        // _legacy / _default / _global (reserved bucket names).
+        if (fs.existsSync(path.join(dir, BUCKET_MARKER)) ||
+            entry === "_legacy" ||
+            entry === "_default" ||
+            entry === GLOBAL_PROJECT_KEY) {
+            out.push(entry);
+        }
+    }
+    return out;
+}
+export function resolveChannelProjectForCreate(name, opts = {}) {
+    const scope = opts.scope ?? "project";
+    const project = scope === "global"
+        ? GLOBAL_PROJECT_KEY
+        : opts.cwd
+            ? projectKey(opts.cwd)
+            : currentProjectKey();
+    return {
+        name,
+        scope,
+        project,
+        dir: channelDir(name, project),
+    };
+}
+export function resolveExistingChannelRef(name, opts = {}) {
+    migrateLegacyChannels();
+    if (opts.scope) {
+        const project = opts.scope === "global"
+            ? GLOBAL_PROJECT_KEY
+            : opts.cwd
+                ? projectKey(opts.cwd)
+                : currentProjectKey();
+        if (!fs.existsSync(eventsPath(name, project))) {
+            throw new Error(`Channel '${name}' not found in ${opts.scope} scope (${project})`);
+        }
+        process.env.TRELLIS_CHANNEL_PROJECT = project;
+        return { name, scope: opts.scope, project, dir: channelDir(name, project) };
+    }
+    const current = currentProjectKey();
+    const projectMatches = listProjects()
+        .filter((project) => project !== GLOBAL_PROJECT_KEY)
+        .filter((project) => fs.existsSync(eventsPath(name, project)));
+    const globalExists = fs.existsSync(eventsPath(name, GLOBAL_PROJECT_KEY));
+    if (globalExists && projectMatches.length > 0) {
+        throw new Error(`Channel '${name}' exists in global and project scopes. Use --scope global or --scope project.`);
+    }
+    if (globalExists) {
+        process.env.TRELLIS_CHANNEL_PROJECT = GLOBAL_PROJECT_KEY;
+        return {
+            name,
+            scope: "global",
+            project: GLOBAL_PROJECT_KEY,
+            dir: channelDir(name, GLOBAL_PROJECT_KEY),
+        };
+    }
+    if (fs.existsSync(eventsPath(name, current))) {
+        process.env.TRELLIS_CHANNEL_PROJECT = current;
+        return {
+            name,
+            scope: "project",
+            project: current,
+            dir: channelDir(name, current),
+        };
+    }
+    if (projectMatches.length === 1) {
+        process.env.TRELLIS_CHANNEL_PROJECT = projectMatches[0];
+        return {
+            name,
+            scope: "project",
+            project: projectMatches[0],
+            dir: channelDir(name, projectMatches[0]),
+        };
+    }
+    if (projectMatches.length > 1) {
+        throw new Error(`Channel '${name}' exists in multiple project buckets: ${projectMatches.join(", ")}. Run from the owning project cwd or use --scope.`);
+    }
+    throw new Error(`Channel '${name}' not found in current project bucket (${current}) or any known scope`);
+}
+/**
+ * Select the project bucket for an existing channel in this CLI process.
+ * Current cwd wins. If it is not there, fall back to a unique match across
+ * all buckets so users can run `channel send <name>` from a different cwd
+ * without silently writing a second event stream.
+ */
+export function selectExistingChannelProject(name) {
+    return resolveExistingChannelRef(name).project;
+}
+//# sourceMappingURL=paths.js.map

package/dist/commands/channel/store/paths.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"paths.js","sourceRoot":"","sources":["../../../../src/commands/channel/store/paths.ts"],"names":[],"mappings":"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"}

package/dist/commands/channel/store/schema.d.ts

@@ -0,0 +1,27 @@
+/**
+ * Channel schema re-exports.
+ *
+ * Canonical source: `trellis-herbivore-core/channel`. This module is
+ * kept as a thin pass-through during the supervisor/wait migration so
+ * CLI runtime code (supervisor, spawn, kill, wait) can continue to
+ * import from a stable local path while command files migrate to the
+ * core public API directly.
+ */
+export { GLOBAL_PROJECT_KEY, CHANNEL_TYPES, THREAD_ACTIONS, parseChannelScope, parseChannelType, parseThreadAction, normalizeThreadKey, asStringArray, asContextEntries, buildContextEntries, } from "trellis-herbivore-core/channel";
+export type { ChannelScope, ChannelType, ChannelRef, ChannelMetadata, ContextEntry, FileContextEntry, RawContextEntry, ThreadAction, EventOrigin, } from "trellis-herbivore-core/channel";
+import type { ContextEntry } from "trellis-herbivore-core/channel";
+/**
+ * CSV parser kept colocated with the schema for CLI command files that
+ * trim comma-separated label / target lists. Pure helper — does not
+ * touch the channel store.
+ */
+export declare function parseCsv(value: string | undefined): string[] | undefined;
+/**
+ * Legacy alias accepted by CLI flag parsers — old code calls this when
+ * processing `--linked-context-file` / `--linked-context-raw`. New code
+ * uses {@link buildContextEntries} directly.
+ *
+ * @deprecated Use buildContextEntries.
+ */
+export declare function parseLinkedContext(files: string[] | undefined, raw: string[] | undefined): ContextEntry[] | undefined;
+//# sourceMappingURL=schema.d.ts.map

package/dist/commands/channel/store/schema.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../src/commands/channel/store/schema.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EACL,kBAAkB,EAClB,aAAa,EACb,cAAc,EACd,iBAAiB,EACjB,gBAAgB,EAChB,iBAAiB,EACjB,kBAAkB,EAClB,aAAa,EACb,gBAAgB,EAChB,mBAAmB,GACpB,MAAM,gCAAgC,CAAC;AAExC,YAAY,EACV,YAAY,EACZ,WAAW,EACX,UAAU,EACV,eAAe,EACf,YAAY,EACZ,gBAAgB,EAChB,eAAe,EACf,YAAY,EACZ,WAAW,GACZ,MAAM,gCAAgC,CAAC;AAGxC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAEnE;;;;GAIG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,EAAE,GAAG,SAAS,CAMxE;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,MAAM,EAAE,GAAG,SAAS,EAC3B,GAAG,EAAE,MAAM,EAAE,GAAG,SAAS,GACxB,YAAY,EAAE,GAAG,SAAS,CAE5B"}

package/dist/commands/channel/store/schema.js

@@ -0,0 +1,34 @@
+/**
+ * Channel schema re-exports.
+ *
+ * Canonical source: `trellis-herbivore-core/channel`. This module is
+ * kept as a thin pass-through during the supervisor/wait migration so
+ * CLI runtime code (supervisor, spawn, kill, wait) can continue to
+ * import from a stable local path while command files migrate to the
+ * core public API directly.
+ */
+export { GLOBAL_PROJECT_KEY, CHANNEL_TYPES, THREAD_ACTIONS, parseChannelScope, parseChannelType, parseThreadAction, normalizeThreadKey, asStringArray, asContextEntries, buildContextEntries, } from "trellis-herbivore-core/channel";
+import { buildContextEntries } from "trellis-herbivore-core/channel";
+/**
+ * CSV parser kept colocated with the schema for CLI command files that
+ * trim comma-separated label / target lists. Pure helper — does not
+ * touch the channel store.
+ */
+export function parseCsv(value) {
+    const out = value
+        ?.split(",")
+        .map((s) => s.trim())
+        .filter(Boolean);
+    return out && out.length > 0 ? out : undefined;
+}
+/**
+ * Legacy alias accepted by CLI flag parsers — old code calls this when
+ * processing `--linked-context-file` / `--linked-context-raw`. New code
+ * uses {@link buildContextEntries} directly.
+ *
+ * @deprecated Use buildContextEntries.
+ */
+export function parseLinkedContext(files, raw) {
+    return buildContextEntries(files, raw);
+}
+//# sourceMappingURL=schema.js.map

package/dist/commands/channel/store/schema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../src/commands/channel/store/schema.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EACL,kBAAkB,EAClB,aAAa,EACb,cAAc,EACd,iBAAiB,EACjB,gBAAgB,EAChB,iBAAiB,EACjB,kBAAkB,EAClB,aAAa,EACb,gBAAgB,EAChB,mBAAmB,GACpB,MAAM,gCAAgC,CAAC;AAcxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAGrE;;;;GAIG;AACH,MAAM,UAAU,QAAQ,CAAC,KAAyB;IAChD,MAAM,GAAG,GAAG,KAAK;QACf,EAAE,KAAK,CAAC,GAAG,CAAC;SACX,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;SACpB,MAAM,CAAC,OAAO,CAAC,CAAC;IACnB,OAAO,GAAG,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC;AACjD,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,kBAAkB,CAChC,KAA2B,EAC3B,GAAyB;IAEzB,OAAO,mBAAmB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AACzC,CAAC"}

package/dist/commands/channel/store/thread-state.d.ts

@@ -0,0 +1,5 @@
+export { reduceThreads, buildThreadAliasResolver, collectThreadTimeline, } from "trellis-herbivore-core/channel";
+export type { ThreadState, ThreadAliasResolver, } from "trellis-herbivore-core/channel";
+import type { ThreadState } from "trellis-herbivore-core/channel";
+export declare function formatThreadBoard(states: ThreadState[]): string[];
+//# sourceMappingURL=thread-state.d.ts.map

package/dist/commands/channel/store/thread-state.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"thread-state.d.ts","sourceRoot":"","sources":["../../../../src/commands/channel/store/thread-state.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,wBAAwB,EACxB,qBAAqB,GACtB,MAAM,gCAAgC,CAAC;AAExC,YAAY,EACV,WAAW,EACX,mBAAmB,GACpB,MAAM,gCAAgC,CAAC;AAExC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAElE,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,EAAE,CAcjE"}

package/dist/commands/channel/store/thread-state.js

@@ -0,0 +1,16 @@
+export { reduceThreads, buildThreadAliasResolver, collectThreadTimeline, } from "trellis-herbivore-core/channel";
+export function formatThreadBoard(states) {
+    if (states.length === 0)
+        return ["(no threads)"];
+    return [
+        "THREAD  STATUS  TITLE",
+        ...states.map((state) => {
+            const labels = state.labels.length > 0 ? ` labels=${state.labels.join(",")}` : "";
+            const assignees = state.assignees.length > 0
+                ? ` assignees=${state.assignees.join(",")}`
+                : "";
+            return `${state.thread} [${state.status}] ${state.title ?? ""}${labels}${assignees}`;
+        }),
+    ];
+}
+//# sourceMappingURL=thread-state.js.map

package/dist/commands/channel/store/thread-state.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"thread-state.js","sourceRoot":"","sources":["../../../../src/commands/channel/store/thread-state.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,wBAAwB,EACxB,qBAAqB,GACtB,MAAM,gCAAgC,CAAC;AASxC,MAAM,UAAU,iBAAiB,CAAC,MAAqB;IACrD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,CAAC,cAAc,CAAC,CAAC;IACjD,OAAO;QACL,uBAAuB;QACvB,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACtB,MAAM,MAAM,GACV,KAAK,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACrE,MAAM,SAAS,GACb,KAAK,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC;gBACxB,CAAC,CAAC,cAAc,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;gBAC3C,CAAC,CAAC,EAAE,CAAC;YACT,OAAO,GAAG,KAAK,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,KAAK,KAAK,CAAC,KAAK,IAAI,EAAE,GAAG,MAAM,GAAG,SAAS,EAAE,CAAC;QACvF,CAAC,CAAC;KACH,CAAC;AACJ,CAAC"}

package/dist/commands/channel/store/watch.d.ts

@@ -0,0 +1,19 @@
+import type { ChannelEvent } from "./events.js";
+import { type ChannelEventFilter } from "./filter.js";
+export type WatchFilter = ChannelEventFilter;
+/**
+ * Watch the channel events.jsonl for events matching the filter.
+ *
+ * Yields each matching event as it arrives. Caller may break to stop;
+ * the function cleans up on iterator return.
+ *
+ * Implementation: fs.watch with a 200ms safety poll for platforms where
+ * fs.watch is lossy (Windows, NFS, etc.).
+ */
+export declare function watchEvents(channelName: string, filter: WatchFilter, opts?: {
+    signal?: AbortSignal;
+    fromStart?: boolean;
+    sinceSeq?: number;
+    project?: string;
+}): AsyncGenerator<ChannelEvent, void, unknown>;
+//# sourceMappingURL=watch.d.ts.map

package/dist/commands/channel/store/watch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../../../src/commands/channel/store/watch.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAsB,KAAK,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAE1E,MAAM,MAAM,WAAW,GAAG,kBAAkB,CAAC;AAqD7C;;;;;;;;GAQG;AACH,wBAAuB,WAAW,CAChC,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,WAAW,EACnB,IAAI,GAAE;IACJ,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;CACb,GACL,cAAc,CAAC,YAAY,EAAE,IAAI,EAAE,OAAO,CAAC,CAyE7C"}

package/dist/commands/channel/store/watch.js

@@ -0,0 +1,130 @@
+import fs from "node:fs";
+import { eventsPath, channelDir } from "./paths.js";
+import { matchesEventFilter } from "./filter.js";
+async function readNewEvents(filePath, state) {
+    if (!fs.existsSync(filePath)) {
+        // File was deleted (e.g. `--force` recreate) — reset offset so when
+        // the file reappears we'll re-scan it from byte 0.
+        state.byteOffset = 0;
+        state.carry = "";
+        return [];
+    }
+    const stat = await fs.promises.stat(filePath);
+    if (stat.size < state.byteOffset) {
+        // File was truncated / rotated / replaced — re-scan from start so
+        // post-truncate events aren't lost forever.
+        state.byteOffset = 0;
+        state.carry = "";
+    }
+    if (stat.size <= state.byteOffset)
+        return [];
+    const fh = await fs.promises.open(filePath, "r");
+    try {
+        const length = stat.size - state.byteOffset;
+        const buf = Buffer.alloc(length);
+        await fh.read(buf, 0, length, state.byteOffset);
+        state.byteOffset = stat.size;
+        const text = state.carry + buf.toString("utf-8");
+        const lines = text.split("\n");
+        state.carry = lines.pop() ?? "";
+        const events = [];
+        for (const line of lines) {
+            const t = line.trim();
+            if (!t)
+                continue;
+            try {
+                events.push(JSON.parse(t));
+            }
+            catch {
+                // corrupted line — skip
+                continue;
+            }
+        }
+        return events;
+    }
+    finally {
+        await fh.close();
+    }
+}
+/**
+ * Watch the channel events.jsonl for events matching the filter.
+ *
+ * Yields each matching event as it arrives. Caller may break to stop;
+ * the function cleans up on iterator return.
+ *
+ * Implementation: fs.watch with a 200ms safety poll for platforms where
+ * fs.watch is lossy (Windows, NFS, etc.).
+ */
+export async function* watchEvents(channelName, filter, opts = {}) {
+    const file = eventsPath(channelName, opts.project);
+    // Ensure channel dir exists so fs.watch on its parent works
+    if (!fs.existsSync(channelDir(channelName, opts.project))) {
+        await fs.promises.mkdir(channelDir(channelName, opts.project), {
+            recursive: true,
+        });
+    }
+    // Three modes:
+    //   default (from-now): start at EOF. Used by `wait` so a previous
+    //     turn's `done` doesn't unblock a fresh wait immediately.
+    //   fromStart=true: start at offset 0 and yield existing events
+    //     before tailing. Used by first-time supervisor inbox catch-up.
+    //   sinceSeq=N: like fromStart=true but skip events with seq <= N.
+    //     Used by supervisor inbox watcher after the first run so a
+    //     respawn doesn't replay already-processed messages.
+    let initialOffset = 0;
+    if (!opts.fromStart && opts.sinceSeq === undefined) {
+        try {
+            if (fs.existsSync(file)) {
+                initialOffset = (await fs.promises.stat(file)).size;
+            }
+        }
+        catch {
+            initialOffset = 0;
+        }
+    }
+    const state = { byteOffset: initialOffset, carry: "" };
+    const sinceSeq = opts.sinceSeq;
+    let resolveNext = null;
+    const wake = () => {
+        if (resolveNext) {
+            const r = resolveNext;
+            resolveNext = null;
+            r();
+        }
+    };
+    let watcher = null;
+    try {
+        watcher = fs.watch(channelDir(channelName, opts.project), () => wake());
+    }
+    catch {
+        // ignore — fall back to polling
+    }
+    // 200ms safety polling (Windows / NFS / macOS fs.watch quirks)
+    const poll = setInterval(wake, 200);
+    const abortHandler = () => wake();
+    opts.signal?.addEventListener("abort", abortHandler);
+    try {
+        while (true) {
+            if (opts.signal?.aborted)
+                return;
+            const fresh = await readNewEvents(file, state);
+            for (const ev of fresh) {
+                if (sinceSeq !== undefined && ev.seq <= sinceSeq)
+                    continue;
+                if (matchesEventFilter(ev, filter))
+                    yield ev;
+                if (opts.signal?.aborted)
+                    return;
+            }
+            await new Promise((resolve) => {
+                resolveNext = resolve;
+            });
+        }
+    }
+    finally {
+        clearInterval(poll);
+        watcher?.close();
+        opts.signal?.removeEventListener("abort", abortHandler);
+    }
+}
+//# sourceMappingURL=watch.js.map

package/dist/commands/channel/store/watch.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"watch.js","sourceRoot":"","sources":["../../../../src/commands/channel/store/watch.ts"],"names":[],"mappings":"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"}

package/dist/commands/channel/supervisor/inbox.d.ts

@@ -0,0 +1,25 @@
+/**
+ * Inbox watcher: tails events.jsonl for `kind:message` events addressed
+ * to this worker and forwards them into the worker's stdin via the
+ * adapter's `encodeUserMessage`. A persisted cursor file keeps respawns
+ * from replaying messages the previous supervisor already delivered.
+ *
+ * Step 3 of the supervisor refactor: pulled out of supervisor.ts so the
+ * orchestrator only needs to call `runInboxWatcher(...)`. Cursor
+ * read/write helpers stay private to this module.
+ */
+import type { ChildProcessByStdio } from "node:child_process";
+import type { Readable, Writable } from "node:stream";
+import type { WorkerAdapter } from "../adapters/index.js";
+type Child = ChildProcessByStdio<Writable, Readable, Readable>;
+export interface InboxWatcherArgs {
+    channelName: string;
+    workerName: string;
+    adapter: WorkerAdapter;
+    ctx: unknown;
+    child: Child;
+    signal: AbortSignal;
+}
+export declare function runInboxWatcher(args: InboxWatcherArgs): Promise<void>;
+export {};
+//# sourceMappingURL=inbox.d.ts.map

package/dist/commands/channel/supervisor/inbox.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"inbox.d.ts","sourceRoot":"","sources":["../../../../src/commands/channel/supervisor/inbox.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE9D,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEtD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAI1D,KAAK,KAAK,GAAG,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;AAE/D,MAAM,WAAW,gBAAgB;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,aAAa,CAAC;IACvB,GAAG,EAAE,OAAO,CAAC;IACb,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,EAAE,WAAW,CAAC;CACrB;AAED,wBAAsB,eAAe,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CA4D3E"}

package/dist/commands/channel/supervisor/inbox.js

@@ -0,0 +1,99 @@
+/**
+ * Inbox watcher: tails events.jsonl for `kind:message` events addressed
+ * to this worker and forwards them into the worker's stdin via the
+ * adapter's `encodeUserMessage`. A persisted cursor file keeps respawns
+ * from replaying messages the previous supervisor already delivered.
+ *
+ * Step 3 of the supervisor refactor: pulled out of supervisor.ts so the
+ * orchestrator only needs to call `runInboxWatcher(...)`. Cursor
+ * read/write helpers stay private to this module.
+ */
+import fs from "node:fs";
+import { workerFile } from "../store/paths.js";
+import { watchEvents } from "../store/watch.js";
+export async function runInboxWatcher(args) {
+    const { channelName, workerName, adapter, ctx, child, signal } = args;
+    // Resume from persisted cursor: first-time spawn → 0 (read full backlog);
+    // respawn after kill → last forwarded seq (no replay).
+    let cursor = readInboxCursor(channelName, workerName);
+    for await (const ev of watchEvents(channelName, {
+        self: workerName, // ignore our own events
+        to: workerName, // workers ONLY consume explicit `to`
+        kind: "message",
+    }, 
+    // First run with cursor=0 reads backlog from start; subsequent runs
+    // use sinceSeq to skip already-processed events. Both cases tail
+    // future events normally.
+    { signal, sinceSeq: cursor, fromStart: cursor === 0 ? true : undefined })) {
+        if (signal.aborted)
+            return;
+        // Workers must NOT consume each other's broadcast `message` events.
+        // Only ingest messages explicitly addressed to this worker via `to`.
+        const evTo = ev.to;
+        if (!evTo)
+            continue;
+        const toList = Array.isArray(evTo) ? evTo : [evTo];
+        if (!toList.includes(workerName))
+            continue;
+        const text = (ev.text ?? "").trim();
+        if (!text)
+            continue;
+        const tag = ev.tag;
+        // Block until the adapter says it can accept input (e.g. codex
+        // thread/start has produced a threadId). Drop the message if we
+        // never get ready before being aborted.
+        if (!adapter.isReady(ctx)) {
+            const deadline = Date.now() + 60_000;
+            while (!adapter.isReady(ctx) &&
+                Date.now() < deadline &&
+                !signal.aborted) {
+                await sleep(25);
+            }
+            if (!adapter.isReady(ctx)) {
+                // never became ready; advance the cursor anyway so we don't
+                // re-attempt this exact event on next start.
+                cursor = ev.seq;
+                writeInboxCursor(channelName, workerName, cursor);
+                continue;
+            }
+        }
+        try {
+            child.stdin.write(adapter.encodeUserMessage(text, tag, ctx));
+            cursor = ev.seq;
+            writeInboxCursor(channelName, workerName, cursor);
+        }
+        catch {
+            // stdin closed, worker exiting — bail out
+            return;
+        }
+    }
+}
+/**
+ * Per-worker inbox consumption cursor. Persisted to
+ * `<worker>.inbox-cursor` so a respawn (same worker name) doesn't replay
+ * messages that the previous supervisor already forwarded into the worker
+ * process. The cursor is the highest seq we've already turned into a
+ * worker stdin write.
+ */
+function readInboxCursor(channelName, workerName) {
+    try {
+        const raw = fs.readFileSync(workerFile(channelName, workerName, "inbox-cursor"), "utf-8");
+        const n = Number(raw.trim());
+        return Number.isFinite(n) && n > 0 ? n : 0;
+    }
+    catch {
+        return 0;
+    }
+}
+function writeInboxCursor(channelName, workerName, seq) {
+    try {
+        fs.writeFileSync(workerFile(channelName, workerName, "inbox-cursor"), String(seq), "utf-8");
+    }
+    catch {
+        // ignore — cursor is best-effort; worst case we replay a message
+    }
+}
+function sleep(ms) {
+    return new Promise((r) => setTimeout(r, ms));
+}
+//# sourceMappingURL=inbox.js.map