@mindfoldhq/trellis 0.6.0-beta.17 → 0.6.0-beta.18

package/dist/commands/channel/guard.js

@@ -0,0 +1,474 @@
+/**
+ * Channel worker OOM guard policy.
+ *
+ * Resolves idle-cleanup TTL and live-worker budget from CLI flag /
+ * environment / project config / built-in defaults (in that precedence
+ * order), then scans the live worker registry inside a project bucket
+ * to enforce both constraints at spawn time.
+ *
+ * Boundary: this module lives in the CLI runtime layer. Core owns
+ * worker activity / `idleSince` projection; the supervisor owns process
+ * launch + signals. The guard only consumes that durable state and
+ * sends OS signals through pid files.
+ */
+import { execFileSync } from "node:child_process";
+import fs from "node:fs";
+import path from "node:path";
+import { isTerminalLifecycle, reduceWorkerRegistry, } from "@mindfoldhq/trellis-core/channel";
+import { DIR_NAMES } from "../../constants/paths.js";
+import { channelRoot, currentProjectKey, projectDir, workerFile, } from "./store/paths.js";
+import { parseDuration } from "./wait.js";
+/** Built-in default idle-cleanup TTL for spawned workers (5 minutes). */
+export const DEFAULT_IDLE_TTL_MS = 5 * 60 * 1000;
+/** Built-in default live-worker budget per project/scope. */
+export const DEFAULT_MAX_LIVE_WORKERS = 6;
+/** Env var override for the idle-cleanup TTL. */
+export const ENV_IDLE_TIMEOUT = "TRELLIS_CHANNEL_WORKER_IDLE_TIMEOUT";
+/** Env var override for the live-worker budget. */
+export const ENV_MAX_LIVE_WORKERS = "TRELLIS_CHANNEL_MAX_LIVE_WORKERS";
+/**
+ * Resolve the effective guard policy. Precedence:
+ *   1. CLI flag (`flag*Ms` / `flagMaxLiveWorkers`)
+ *   2. environment variable
+ *   3. `.trellis/config.yaml` `channel.worker_guard`
+ *   4. built-in default constant
+ */
+export function resolveWorkerGuardConfig(opts = {}) {
+    const cwd = opts.cwd ?? process.cwd();
+    const env = opts.env ?? process.env;
+    const fromConfig = loadWorkerGuardConfig(cwd);
+    const idleTimeoutMs = pickNonNegativeMs(opts.flagIdleTimeoutMs, parseEnvDuration(env[ENV_IDLE_TIMEOUT], ENV_IDLE_TIMEOUT), fromConfig?.idleTimeoutMs, DEFAULT_IDLE_TTL_MS);
+    const maxLiveWorkers = pickNonNegativeInt(opts.flagMaxLiveWorkers, parseEnvInt(env[ENV_MAX_LIVE_WORKERS], ENV_MAX_LIVE_WORKERS), fromConfig?.maxLiveWorkers, DEFAULT_MAX_LIVE_WORKERS);
+    return { idleTimeoutMs, maxLiveWorkers };
+}
+function pickNonNegativeMs(...candidates) {
+    for (const c of candidates) {
+        if (c === undefined)
+            continue;
+        if (!Number.isFinite(c) || c < 0) {
+            throw new Error(`Idle timeout must be a non-negative duration (got ${c})`);
+        }
+        return c;
+    }
+    return DEFAULT_IDLE_TTL_MS;
+}
+function pickNonNegativeInt(...candidates) {
+    for (const c of candidates) {
+        if (c === undefined)
+            continue;
+        if (!Number.isInteger(c) || c < 0) {
+            throw new Error(`Max live workers must be a non-negative integer (got ${c})`);
+        }
+        return c;
+    }
+    return DEFAULT_MAX_LIVE_WORKERS;
+}
+function parseEnvDuration(raw, envName) {
+    if (raw === undefined || raw === "")
+        return undefined;
+    try {
+        return parseDuration(raw);
+    }
+    catch (err) {
+        throw new Error(`${envName}: ${err instanceof Error ? err.message : String(err)}`);
+    }
+}
+function parseEnvInt(raw, envName) {
+    if (raw === undefined || raw === "")
+        return undefined;
+    const n = Number(raw);
+    if (!Number.isInteger(n) || n < 0) {
+        throw new Error(`${envName} must be a non-negative integer (got '${raw}')`);
+    }
+    return n;
+}
+/**
+ * Parse the `channel.worker_guard` section out of `.trellis/config.yaml`.
+ * Mirrors the lightweight line-scanner used elsewhere in update.ts so we
+ * don't pull in a YAML dependency just for this two-field section.
+ */
+export function loadWorkerGuardConfig(cwd) {
+    const configPath = path.join(cwd, DIR_NAMES.WORKFLOW, "config.yaml");
+    if (!fs.existsSync(configPath))
+        return undefined;
+    let content;
+    try {
+        content = fs.readFileSync(configPath, "utf-8");
+    }
+    catch {
+        return undefined;
+    }
+    return parseWorkerGuardSection(content);
+}
+/** Exposed for unit tests. */
+export function parseWorkerGuardSection(content) {
+    const lines = content.split("\n");
+    let inChannel = false;
+    let inGuard = false;
+    const found = {};
+    let any = false;
+    for (const raw of lines) {
+        const line = raw.replace(/\r$/, "");
+        const trimmed = line.trimEnd();
+        if (trimmed === "" || trimmed.trimStart().startsWith("#"))
+            continue;
+        if (/^channel:\s*$/.test(trimmed)) {
+            inChannel = true;
+            inGuard = false;
+            continue;
+        }
+        if (inChannel && /^ {2}worker_guard:\s*$/.test(trimmed)) {
+            inGuard = true;
+            continue;
+        }
+        if (inGuard) {
+            const idle = trimmed.match(/^ {4}idle_timeout:\s*(.+)$/);
+            if (idle) {
+                const val = stripValue(idle[1]);
+                found.idleTimeoutMs = parseGuardDuration(val, "idle_timeout");
+                any = true;
+                continue;
+            }
+            const max = trimmed.match(/^ {4}max_live_workers:\s*(.+)$/);
+            if (max) {
+                const val = stripValue(max[1]);
+                const n = Number(val);
+                if (!Number.isInteger(n) || n < 0) {
+                    throw new Error(`channel.worker_guard.max_live_workers must be a non-negative integer (got '${val}')`);
+                }
+                found.maxLiveWorkers = n;
+                any = true;
+                continue;
+            }
+            // Anything else at the same indent (or shallower) ends the section.
+            if (!/^ {4}\S/.test(line)) {
+                inGuard = false;
+            }
+        }
+        if (inChannel && !/^ {2}\S/.test(line) && /^\S/.test(line)) {
+            inChannel = false;
+            inGuard = false;
+        }
+    }
+    return any ? found : undefined;
+}
+function stripValue(s) {
+    return s
+        .trim()
+        .replace(/\s*#.*$/, "")
+        .trim()
+        .replace(/^['"]|['"]$/g, "");
+}
+function parseGuardDuration(raw, key) {
+    // Allow bare integer = milliseconds (so `0` disables cleanly).
+    const asInt = Number(raw);
+    if (Number.isFinite(asInt) && /^\d+$/.test(raw)) {
+        if (asInt < 0) {
+            throw new Error(`channel.worker_guard.${key} must be non-negative (got '${raw}')`);
+        }
+        // Bare integer 0 = disabled; >0 with no unit = milliseconds.
+        return asInt;
+    }
+    try {
+        return parseDuration(raw) ?? 0;
+    }
+    catch (err) {
+        throw new Error(`channel.worker_guard.${key}: ${err instanceof Error ? err.message : String(err)}`);
+    }
+}
+/**
+ * Enumerate live (non-terminal + supervisor-pid alive) workers across
+ * every channel in the given project bucket.
+ */
+export function scanLiveWorkers(opts = {}) {
+    const project = opts.projectKey ?? currentProjectKey();
+    const bucket = opts.root
+        ? path.join(opts.root, project)
+        : projectDir(project);
+    if (!fs.existsSync(bucket))
+        return [];
+    let entries;
+    try {
+        entries = fs.readdirSync(bucket);
+    }
+    catch {
+        return [];
+    }
+    const out = [];
+    for (const entry of entries) {
+        if (entry.startsWith("."))
+            continue;
+        const dir = path.join(bucket, entry);
+        try {
+            if (!fs.statSync(dir).isDirectory())
+                continue;
+        }
+        catch {
+            continue;
+        }
+        const events = path.join(dir, "events.jsonl");
+        if (!fs.existsSync(events))
+            continue;
+        let workers;
+        try {
+            const all = readFileEventsSync(events);
+            workers = reduceWorkerRegistry(all).workers;
+        }
+        catch {
+            continue;
+        }
+        for (const state of workers) {
+            if (state.terminal || isTerminalLifecycle(state.lifecycle))
+                continue;
+            const supervisorPid = readPid(workerFile(entry, state.workerId, "pid", project));
+            if (supervisorPid === undefined || !pidAlive(supervisorPid)) {
+                // Supervisor pid file missing or dead → not a live OS process,
+                // even if durable state still shows running. Reconciler / future
+                // CLI cleanup will catch up; the guard ignores it.
+                continue;
+            }
+            const supervisorVerified = opts.isSupervisorProcess
+                ? opts.isSupervisorProcess(supervisorPid, entry, state.workerId)
+                : isSupervisorProcess(supervisorPid, entry, state.workerId);
+            const workerPid = readPid(workerFile(entry, state.workerId, "worker-pid", project));
+            out.push({
+                channel: entry,
+                workerId: state.workerId,
+                state,
+                supervisorPid,
+                supervisorVerified,
+                ...(workerPid !== undefined ? { workerPid } : {}),
+            });
+        }
+        for (const state of readReservationWorkers(entry, project)) {
+            if (out.some((w) => w.channel === entry && w.workerId === state.workerId)) {
+                continue;
+            }
+            const supervisorPid = readPid(workerFile(entry, state.workerId, "pid", project));
+            if (supervisorPid === undefined || !pidAlive(supervisorPid))
+                continue;
+            const supervisorVerified = opts.isSupervisorProcess
+                ? opts.isSupervisorProcess(supervisorPid, entry, state.workerId)
+                : isSupervisorProcess(supervisorPid, entry, state.workerId);
+            out.push({
+                channel: entry,
+                workerId: state.workerId,
+                state,
+                supervisorPid,
+                supervisorVerified,
+            });
+        }
+    }
+    return out;
+}
+function readReservationWorkers(channel, project) {
+    const dir = path.join(projectDir(project), channel);
+    let files;
+    try {
+        files = fs.readdirSync(dir);
+    }
+    catch {
+        return [];
+    }
+    const workers = [];
+    for (const file of files) {
+        if (!file.endsWith(".reservation"))
+            continue;
+        const worker = file.slice(0, -".reservation".length);
+        workers.push({
+            workerId: worker,
+            lifecycle: "starting",
+            terminal: false,
+            activity: "idle",
+            pendingMessageCount: 0,
+            inboxPolicy: "explicitOnly",
+            updatedAt: new Date(0).toISOString(),
+            lastSeq: 0,
+        });
+    }
+    return workers;
+}
+function readFileEventsSync(file) {
+    const text = fs.readFileSync(file, "utf-8");
+    const events = [];
+    for (const line of text.split("\n")) {
+        if (!line.trim())
+            continue;
+        try {
+            events.push(JSON.parse(line));
+        }
+        catch {
+            continue;
+        }
+    }
+    return events;
+}
+function readPid(p) {
+    try {
+        const n = Number(fs.readFileSync(p, "utf-8").trim());
+        return Number.isFinite(n) && n > 0 ? n : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+function pidAlive(pid) {
+    try {
+        process.kill(pid, 0);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+export function isSupervisorProcess(pid, channel, worker) {
+    if (process.platform === "win32")
+        return false;
+    try {
+        const command = execFileSync("ps", ["-p", String(pid), "-o", "command="], {
+            encoding: "utf-8",
+            timeout: 1000,
+            stdio: ["ignore", "pipe", "ignore"],
+        }).trim();
+        const pattern = new RegExp([
+            "(?:^|\\s)channel\\s+__supervisor\\s+",
+            escapeRegExp(channel),
+            "\\s+",
+            escapeRegExp(worker),
+            "(?:\\s|$)",
+        ].join(""));
+        return pattern.test(command);
+    }
+    catch {
+        return false;
+    }
+}
+function escapeRegExp(s) {
+    return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+/**
+ * Pure predicate: is this live worker eligible for idle-cleanup right
+ * now? Mid-turn workers and workers without `idleSince` (e.g. they
+ * never spawned cleanly) are never killed by the guard.
+ */
+export function isIdleCleanupEligible(live, idleTimeoutMs, now) {
+    if (idleTimeoutMs <= 0)
+        return false;
+    const { state } = live;
+    if (state.activity !== "idle")
+        return false;
+    if (!state.idleSince)
+        return false;
+    if (state.terminal)
+        return false;
+    const idleSinceMs = Date.parse(state.idleSince);
+    if (!Number.isFinite(idleSinceMs))
+        return false;
+    return now - idleSinceMs >= idleTimeoutMs;
+}
+/**
+ * Kill workers whose idle TTL has expired. Writes a one-shot shutdown
+ * reason sidecar before signalling the supervisor so the supervisor's
+ * existing shutdown funnel emits the single terminal `killed` event.
+ *
+ * Returns the workers that were signalled. Failures are collected — a
+ * dead pid or read race is not fatal; the next scan re-evaluates.
+ */
+export async function cleanupExpiredIdleWorkers(candidates, idleTimeoutMs, opts = {}) {
+    const result = { killed: [], failed: [] };
+    if (idleTimeoutMs <= 0)
+        return result;
+    const now = opts.now ?? Date.now();
+    for (const live of candidates) {
+        if (!isIdleCleanupEligible(live, idleTimeoutMs, now))
+            continue;
+        try {
+            const project = opts.project ?? currentProjectKey();
+            if (live.supervisorPid === undefined ||
+                live.supervisorVerified !== true ||
+                !pidAlive(live.supervisorPid)) {
+                continue;
+            }
+            const reasonFile = workerFile(live.channel, live.workerId, "shutdown-reason", project);
+            fs.writeFileSync(reasonFile, "idle-timeout\n", "utf-8");
+            try {
+                process.kill(live.supervisorPid, "SIGTERM");
+            }
+            catch (err) {
+                try {
+                    fs.unlinkSync(reasonFile);
+                }
+                catch {
+                    // already gone
+                }
+                throw err;
+            }
+            result.killed.push(live);
+        }
+        catch (err) {
+            result.failed.push({
+                worker: live,
+                error: err instanceof Error ? err.message : String(err),
+            });
+        }
+    }
+    return result;
+}
+/**
+ * Run the spawn-time guard for a project bucket. Cleans expired idle
+ * workers, re-scans, then decides whether the live worker budget has
+ * room for one more spawn.
+ */
+export async function enforceSpawnBudget(input) {
+    const project = input.projectKey ?? currentProjectKey();
+    const scanOpts = {
+        projectKey: project,
+        ...(input.root !== undefined ? { root: input.root } : {}),
+        ...(input.isSupervisorProcess !== undefined
+            ? { isSupervisorProcess: input.isSupervisorProcess }
+            : {}),
+    };
+    const initial = scanLiveWorkers(scanOpts);
+    const cleanup = await cleanupExpiredIdleWorkers(initial, input.policy.idleTimeoutMs, { project, ...(input.now !== undefined ? { now: input.now } : {}) });
+    // Re-probe after cleanup so we don't double-count workers that have
+    // been signalled but haven't actually torn down their pid files yet.
+    // Wait briefly for the SIGTERM to translate into pid-file removal; if
+    // a worker is taking its grace period, just exclude killed workers
+    // from the count.
+    const killedIds = new Set(cleanup.killed.map((w) => `${w.channel}::${w.workerId}`));
+    const remaining = scanLiveWorkers(scanOpts).filter((w) => !killedIds.has(`${w.channel}::${w.workerId}`));
+    const allowed = input.policy.maxLiveWorkers <= 0 ||
+        remaining.length < input.policy.maxLiveWorkers;
+    return { cleaned: cleanup.killed, remaining, allowed };
+}
+/** Build a multi-line, actionable overflow error string. */
+export function formatBudgetOverflowError(args) {
+    const { projectKey, live, limit } = args;
+    const header = `Live worker budget exhausted for project '${projectKey}': ${live.length}/${limit} live worker(s).`;
+    const rows = live
+        .map((w) => {
+        const provider = w.state.provider ?? "?";
+        const lifecycle = w.state.lifecycle;
+        const activity = w.state.activity;
+        const pid = w.supervisorPid ?? "?";
+        const verified = w.supervisorVerified === false ? " supervisor=unverified" : "";
+        return `  • channel='${w.channel}' worker='${w.workerId}' provider=${provider} lifecycle=${lifecycle} activity=${activity} pid=${pid}${verified}`;
+    })
+        .join("\n");
+    const hint = [
+        "Free a slot before spawning, e.g.:",
+        `  trellis channel kill <channel> --as <worker>`,
+        "Or override per spawn:",
+        `  trellis channel spawn ... --max-live-workers ${live.length + 1}`,
+        "Or raise the default in .trellis/config.yaml under channel.worker_guard.max_live_workers.",
+    ].join("\n");
+    return [header, rows, hint].join("\n");
+}
+/**
+ * Convenience helper: ensure `channelRoot()` is initialised before scan
+ * (otherwise the project dir may not yet exist on first spawn).
+ */
+export function ensureRootExists() {
+    fs.mkdirSync(channelRoot(), { recursive: true });
+}
+//# sourceMappingURL=guard.js.map

package/dist/commands/channel/guard.js.map

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

package/dist/commands/channel/index.d.ts

@@ -1,3 +1,3 @@
-import type { Command } from "commander";
+import { type Command } from "commander";
 export declare function registerChannelCommand(program: Command): void;
 //# sourceMappingURL=index.d.ts.map

package/dist/commands/channel/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/channel/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA6BzC,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CA01B7D"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/channel/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAwB,KAAK,OAAO,EAAE,MAAM,WAAW,CAAC;AAuC/D,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAo4B7D"}

package/dist/commands/channel/index.js

@@ -1,9 +1,11 @@
 import chalk from "chalk";
+import { InvalidArgumentError } from "commander";
 import { isProvider, listProviders } from "./adapters/index.js";
 import { channelContextAdd, channelContextDelete, channelContextList, } from "./context.js";
 import { createChannel } from "./create.js";
 import { parseTrace } from "./dev-parse-trace.js";
 import { channelKill } from "./kill.js";
+import { channelInterrupt } from "./interrupt.js";
 import { channelList } from "./list.js";
 import { channelMessages } from "./messages.js";
 import { channelPrune, channelRm } from "./rm.js";
@@ -16,6 +18,12 @@ import { runSupervisor } from "./supervisor.js";
 import { channelWait, parseDuration } from "./wait.js";
 import { parseCsv } from "./store/schema.js";
 import { parseInboxPolicy } from "@mindfoldhq/trellis-core/channel";
+function parseNonNegativeInteger(value) {
+    if (!/^\d+$/.test(value)) {
+        throw new InvalidArgumentError(`expected a non-negative integer, got '${value}'`);
+    }
+    return Number(value);
+}
 export function registerChannelCommand(program) {
     const channel = program
         .command("channel")
@@ -51,8 +59,6 @@ export function registerChannelCommand(program) {
         .description("Send a message into the channel")
         .requiredOption("--as <agent>", "agent name sending")
         .option("--scope <scope>", "channel scope: project | global")
-        .option("--tag <tag>", "tag (e.g. interrupt / phase_done / question)")
-        .option("--kind <tag>", "legacy alias for --tag")
         .option("--to <agents>", "comma-separated target agents (default: broadcast)")
         .option("--stdin", "read message body from stdin")
         .option("--text-file <path>", "read message body from file")
@@ -67,8 +73,6 @@ export function registerChannelCommand(program) {
                 stdin: opts.stdin,
                 textFile: opts.textFile,
                 scope: opts.scope,
-                tag: opts.tag,
-                kind: opts.kind,
                 to: opts.to,
                 deliveryMode: opts.deliveryMode,
             });
@@ -86,7 +90,6 @@ export function registerChannelCommand(program) {
         .option("--timeout <duration>", "max wait (e.g. 30s, 2m, 1h)")
         .option("--from <agents>", "only wake on events from these agents (CSV)")
         .option("--kind <kind[,kind...]>", "only wake on these event kinds (CSV, OR semantics)")
-        .option("--tag <tag>", "only wake on this user tag")
         .option("--thread <key>", "only wake on this thread key")
         .option("--action <action>", "only wake on this thread action")
         .option("--to <target>", "only wake on events targeted to this name (default: own agent)")
@@ -100,7 +103,6 @@ export function registerChannelCommand(program) {
                 timeoutMs: parseDuration(opts.timeout),
                 from: opts.from,
                 kind: opts.kind,
-                tag: opts.tag,
                 scope: opts.scope,
                 thread: opts.thread,
                 action: opts.action,
@@ -114,6 +116,32 @@ export function registerChannelCommand(program) {
             process.exit(1);
         }
     });
+    channel
+        .command("interrupt <name>")
+        .description("Interrupt a worker turn and send a replacement instruction")
+        .requiredOption("--as <agent>", "agent name requesting the interrupt")
+        .requiredOption("--to <agent>", "target worker name")
+        .option("--scope <scope>", "channel scope: project | global")
+        .option("--stdin", "read interrupt message body from stdin")
+        .option("--text-file <path>", "read interrupt message body from file")
+        .argument("[text]", "inline interrupt message (otherwise use --stdin / --text-file)")
+        .action(async (name, text, raw) => {
+        const opts = raw;
+        try {
+            await channelInterrupt(name, {
+                as: opts.as,
+                to: opts.to,
+                text,
+                stdin: opts.stdin,
+                textFile: opts.textFile,
+                scope: opts.scope,
+            });
+        }
+        catch (err) {
+            console.error(chalk.red("Error:"), err instanceof Error ? err.message : err);
+            process.exit(1);
+        }
+    });
     channel
         .command("spawn <name>")
         .description("Register a worker (claude/codex) into the channel — the worker stays idle until the first `channel send --to <worker>` arrives")
@@ -130,6 +158,8 @@ export function registerChannelCommand(program) {
         .option("--jsonl <path>", "parse a Trellis jsonl manifest ({file, reason} per line) and include each referenced file (repeatable)", (val, prev) => [...(prev ?? []), val], [])
         .option("--by <agent>", "identity recorded as the spawn author (defaults to TRELLIS_CHANNEL_AS env or 'main')")
         .option("--inbox-policy <policy>", "worker inbox delivery policy: explicitOnly | broadcastAndExplicit (default explicitOnly)")
+        .option("--idle-timeout <duration>", "OOM-guard idle-cleanup TTL for this worker (default 5m; 0 disables)")
+        .option("--max-live-workers <n>", "spawn-time live-worker budget for this project/scope (default 6; 0 disables)", parseNonNegativeInteger)
         .action(async (name, raw) => {
         const opts = raw;
         if (opts.provider !== undefined && !isProvider(opts.provider)) {
@@ -151,6 +181,8 @@ export function registerChannelCommand(program) {
                 by: opts.by,
                 scope: opts.scope,
                 inboxPolicy: parseInboxPolicy(opts.inboxPolicy),
+                idleTimeoutMs: parseDuration(opts.idleTimeout),
+                maxLiveWorkers: opts.maxLiveWorkers,
             });
         }
         catch (err) {
@@ -171,7 +203,6 @@ export function registerChannelCommand(program) {
         .option("--message <text>", "inline prompt text")
         .option("--message-file <path>", "read prompt body from file")
         .option("--stdin", "read prompt body from stdin")
-        .option("--tag <tag>", "user tag (e.g. interrupt / phase_done / question)")
         .option("--timeout <duration>", "max time to wait for done (e.g. 30s, 5m, 1h; default 5m)")
         .action(async (name, raw) => {
         const opts = raw;
@@ -192,7 +223,6 @@ export function registerChannelCommand(program) {
                 message: opts.message,
                 textFile: opts.messageFile,
                 stdin: opts.stdin,
-                tag: opts.tag,
                 timeoutMs: parseDuration(opts.timeout),
             });
         }
@@ -273,7 +303,6 @@ export function registerChannelCommand(program) {
         .option("--kind <kind>", "filter by event kind (e.g. message, done, killed)")
         .option("--from <agents>", "filter by author (CSV)")
         .option("--to <target>", "filter by routing target")
-        .option("--tag <tag>", "filter by user tag (e.g. interrupt, final_answer)")
         .option("--thread <key>", "filter by thread key")
         .option("--action <action>", "filter by thread action")
         .option("--no-progress", "hide progress events (tool calls, deltas)")
@@ -288,7 +317,6 @@ export function registerChannelCommand(program) {
                 kind: opts.kind,
                 from: opts.from,
                 to: opts.to,
-                tag: opts.tag,
                 scope: opts.scope,
                 thread: opts.thread,
                 action: opts.action,