cyberlegion 0.0.0 → 0.1.0

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 unional
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { B as loadAgent, C as resolveAgentDef, E as spawn, F as selectSessionAdapter, H as realExec, I as probeMultiplexer, K as resolveSelfId, L as bumpLastSeen, R as detectHarness, S as listAgentDefs, U as register, V as prune, W as resolveAgent, _ as inbox, a as fail, b as send, c as toonObject, d as DispatchWaitingError, f as channel, g as deleteMessage, h as ack, i as emit, j as resolveRoot, l as install, m as awaitReply, n as FileStore, o as nextStep, p as prep, q as touch, r as injectInbox, s as toonList, t as watchMail, u as collect, v as peek, w as realizeLaunch, x as decommission, y as resolveBody, z as listAgents } from "./watch-DA8I44dv.mjs";
+import { A as detectHarness, B as resolveStandingOwner, C as resolveAgentDef, D as selectSessionAdapter, E as spawn, F as register, I as registerStanding, K as resolveRoot, L as resolveAgent, M as loadAgent, N as prune, O as probeMultiplexer, P as realExec, S as listAgentDefs, V as touch, _ as inbox, a as fail, b as send, c as toonObject, d as DispatchWaitingError, f as channel, g as deleteMessage, h as ack, i as emit, j as listAgents, k as bumpLastSeen, l as install, m as awaitReply, n as FileStore, o as nextStep, p as prep, r as injectInbox, s as toonList, t as watchMail, u as collect, v as peek, w as realizeLaunch, x as decommission, y as resolveBody, z as resolveSelfId } from "./watch-BuYsdwhx.mjs";
 import { resolve } from "node:path";
 import { Command, Option } from "commander";
 //#region src/admin.ts
@@ -75,7 +75,7 @@ withGlobals(identity.command("register")).description("register or refresh this
 		toon: toonObject({
 			id: rec.id,
 			handle: rec.handle,
-			harness: rec.harness,
+			harness: rec.harness ?? "-",
 			status: rec.status
 		}),
 		json: rec
@@ -91,7 +91,47 @@ withGlobals(identity.command("whoami")).description("print this session own iden
 		toon: toonObject({
 			id: rec.id,
 			handle: rec.handle,
-			harness: rec.harness,
+			harness: rec.harness ?? "-",
+			status: rec.status
+		}),
+		json: rec
+	});
+});
+withGlobals(identity.command("owner")).description("mint (or refresh) a standing, session-independent owner inbox").option("--handle <name>", "the owner handle to claim").action((opts) => {
+	const ctx = ctxOf(opts);
+	if (!opts.handle) {
+		const standing = listAgents(ctx.store).filter((a) => a.kind === "standing");
+		emit(formatOf(opts), {
+			toon: toonList("agents", standing, [
+				{
+					key: "id",
+					get: (a) => a.id
+				},
+				{
+					key: "handle",
+					get: (a) => a.handle
+				},
+				{
+					key: "harness",
+					get: (a) => a.harness ?? "-"
+				},
+				{
+					key: "status",
+					get: (a) => a.status
+				}
+			], `${standing.length} agents`),
+			json: standing
+		});
+		return;
+	}
+	const liveClaim = listAgents(ctx.store).find((a) => a.handle === opts.handle && a.kind !== "standing" && a.status !== "exited");
+	const rec = registerStanding(ctx, { handle: opts.handle });
+	if (liveClaim) console.error(`a live session already claims handle "${opts.handle}"`);
+	emit(formatOf(opts), {
+		toon: toonObject({
+			id: rec.id,
+			handle: rec.handle,
+			kind: rec.kind,
 			status: rec.status
 		}),
 		json: rec
@@ -113,7 +153,7 @@ function runWho(opts) {
 			},
 			{
 				key: "harness",
-				get: (a) => a.harness
+				get: (a) => a.harness ?? "-"
 			},
 			{
 				key: "status",
@@ -142,11 +182,12 @@ withGlobals(identity.command("prune")).description("mark dead agents exited and
 });
 const session = program.command("session").description("warm peer session lifecycle over a multiplexer");
 function defineSpawn(cmd) {
-	return withGlobals(cmd).description("launch a new peer session in its own git worktree (tmux or herdr)").option("--harness <h>", "claude | cursor | codex (required unless --agent/--agent-file resolves one)").option("--agent <name>", "resolve an agent def (.agents/agents/<name>.md) for harness/model/instructions").option("--agent-file <path>", "read an exact agent def file instead of resolving by name").option("--task <text>", "brief text, or - for stdin").option("--brief-file <path>", "read the brief from a file").option("--handle <name>", "handle for the new peer").option("--branch <name>", "branch for the new worktree (default cyberlegion/unit-<id>)").option("--worktree-path <path>", "where to check out the new worktree").addOption(new Option("--at <placement>", "where to open the new session").choices([
+	return withGlobals(cmd).description("launch a new peer session in its own git worktree (tmux or herdr)").option("--harness <h>", "claude | cursor | codex (required unless --agent/--agent-file resolves one)").option("--agent <name>", "resolve an agent def (.agents/agents/<name>.md) for harness/model/instructions").option("--agent-file <path>", "read an exact agent def file instead of resolving by name").option("--task <text>", "brief text, or - for stdin").option("--brief-file <path>", "read the brief from a file").option("--handle <name>", "handle for the new peer").option("--branch <name>", "branch for the new worktree (default cyberlegion/unit-<id>)").option("--worktree-path <path>", "where to check out the new worktree").option("--cwd <path>", "spawn the session in an existing directory; create no worktree (mutually exclusive with --branch/--worktree-path)").addOption(new Option("--at <placement>", "where to open the new session").choices([
 		"pane:right",
 		"pane:down",
 		"tab",
-		"window"
+		"window",
+		"workspace"
 	]).default("pane:right")).action((opts) => {
 		const ctx = ctxOf(opts);
 		touch(ctx);
@@ -175,6 +216,7 @@ function defineSpawn(cmd) {
 			handle: opts.handle,
 			branch: opts.branch,
 			worktreePath: opts.worktreePath,
+			cwd: opts.cwd,
 			at: opts.at
 		});
 		emit(formatOf(opts), {
@@ -306,7 +348,7 @@ defineSend(mail.command("send"));
 function runInbox(opts) {
 	const ctx = ctxOf(opts);
 	touch(ctx);
-	const meId = requireSelf(ctx);
+	const meId = opts.owner ? resolveStandingOwner(ctx.store, opts.owner) : requireSelf(ctx);
 	const items = inbox({ store: ctx.store }, {
 		meId,
 		unread: opts.unread,
@@ -338,10 +380,10 @@ function runInbox(opts) {
 	const firstUnread = items.find((m) => !m.read);
 	if (firstUnread) nextStep(`cyberlegion mail read ${firstUnread.id}`);
 }
-withGlobals(mail.command("inbox")).description("list your mail").option("--unread", "only un-acked mail").option("--from <id>", "filter by sender").option("--thread <id>", "filter to messages carrying this thread id").action(runInbox);
-withGlobals(mail.command("read")).description("peek at a message without acknowledging it").argument("<msg-id>", "message id").action((msgId, opts) => {
+withGlobals(mail.command("inbox")).description("list your mail").option("--unread", "only un-acked mail").option("--from <id>", "filter by sender").option("--thread <id>", "filter to messages carrying this thread id").option("--owner <handle>", "target a standing owner's mailbox instead of this session's own").action(runInbox);
+withGlobals(mail.command("read")).description("peek at a message without acknowledging it").argument("<msg-id>", "message id").option("--owner <handle>", "peek a standing owner's mailbox instead of this session's own").action((msgId, opts) => {
 	const ctx = ctxOf(opts);
-	const meId = requireSelf(ctx);
+	const meId = opts.owner ? resolveStandingOwner(ctx.store, opts.owner) : requireSelf(ctx);
 	const msg = peek({ store: ctx.store }, meId, msgId);
 	if (!msg) fail(`"${msgId}" is not a message in this inbox`);
 	emit(formatOf(opts), {
@@ -353,11 +395,11 @@ withGlobals(mail.command("read")).description("peek at a message without acknowl
 		}),
 		json: msg
 	});
-	nextStep(`cyberlegion mail ack ${msg.id}`);
+	nextStep(`cyberlegion mail ack ${msg.id}${opts.owner ? ` --owner ${opts.owner}` : ""}`);
 });
-withGlobals(mail.command("ack")).description("acknowledge a message (moves it out of the unread set)").argument("<msg-id>", "message id").action((msgId, opts) => {
+withGlobals(mail.command("ack")).description("acknowledge a message (moves it out of the unread set)").argument("<msg-id>", "message id").option("--owner <handle>", "ack a standing owner's mailbox instead of this session's own").action((msgId, opts) => {
 	const ctx = ctxOf(opts);
-	const meId = requireSelf(ctx);
+	const meId = opts.owner ? resolveStandingOwner(ctx.store, opts.owner) : requireSelf(ctx);
 	const msg = ack({ store: ctx.store }, meId, msgId);
 	emit(formatOf(opts), {
 		toon: toonObject({
@@ -468,7 +510,8 @@ definePrepOptions(dispatch.command("channel")).description("prep + spawn a peer
 	"pane:right",
 	"pane:down",
 	"tab",
-	"window"
+	"window",
+	"workspace"
 ]).default("pane:right")).option("--wait", "block for the mail-thread reply and print the validated result").option("--timeout <ms>", "give up after this many ms with no reply (0 = wait forever)", (v) => Number.parseInt(v, 10), 6e5).option("--max-wait <s>", "self-cap for one internal poll cycle, in seconds (re-arm by re-running with --wait)", (v) => Number.parseInt(v, 10), 240).action(async (opts) => {
 	const ctx = ctxOf(opts);
 	touch(ctx);

package/dist/index.d.mts

@@ -16,7 +16,8 @@ type AgentStatus = 'spawning' | 'active' | 'idle' | 'stale' | 'exited' | 'paused
 interface AgentRecord {
   id: string;
   handle: string;
-  harness: Harness;
+  /** Absent for a standing record (a human/owner principal — no claude/cursor/codex harness). */
+  harness?: Harness;
   cwd: string;
   worktree?: {
     root: string;
@@ -33,6 +34,9 @@ interface AgentRecord {
   lastSeen: string;
   brief?: string;
   spawnedBy?: string;
+  /** Absent ⇒ session (backward compat, no migration). 'standing' = a session-independent,
+   * prune-exempt owner inbox minted by `identity owner`. */
+  kind?: 'session' | 'standing';
 }
 interface InboxSnapshot {
   unread: Message[];
@@ -176,10 +180,47 @@ interface RealizeSubagentOptions {
  * instruction string is correct even when the harness has no such named subagent type. */
 declare function realizeSubagentInstruction(def: AgentDef, opts: RealizeSubagentOptions): string;
 //#endregion
+//#region src/console/worktree.d.ts
+/** Generic multiplexer/worktree seam — no legion-specific concepts. */
+interface WorktreeAddOptions {
+  /** The primary checkout's root — the repo `git worktree add` runs against. */
+  primaryRoot: string;
+  /** Where the new worktree should be checked out. */
+  path: string;
+  /** Branch to create the worktree on. */
+  branch: string;
+}
+interface Worktree {
+  root: string;
+  branch: string;
+}
+interface WorktreeRemoveOptions {
+  primaryRoot: string;
+}
+interface WorktreeAdapter {
+  add(exec: Exec, opts: WorktreeAddOptions): Worktree;
+  remove(exec: Exec, path: string, opts: WorktreeRemoveOptions): void;
+}
+/** The only worktree backend at MVP — plain `git worktree`. */
+declare const gitWorktreeAdapter: WorktreeAdapter;
+/**
+ * Resolve the primary checkout's root regardless of whether the caller's cwd is the primary
+ * checkout or a linked worktree — `--git-common-dir` always points at the main repo's `.git`.
+ */
+declare function resolvePrimaryRoot(exec: Exec): string;
+/**
+ * Refuse the primary checkout: a spawned unit's resolved worktree root must never be the primary
+ * checkout itself. A unit is never run in the primary checkout.
+ */
+declare function assertDistinctFromPrimary(worktreeRoot: string, primaryRoot: string): void;
+//#endregion
 //#region src/console/session.d.ts
 /** Generic multiplexer seam — no legion-specific concepts, so this composes with any host. */
-/** Where a new pane/window/session should be placed relative to the caller's current one. */
-type SessionPlacement = 'pane:right' | 'pane:down' | 'tab' | 'window';
+/** Where a new pane/window/session should be placed relative to the caller's current one.
+ * `'workspace'` opens a genuinely separate workspace/session (herdr: `workspace create`; tmux: a
+ * new detached session) — the caller's current workspace/session is left untouched, unlike every
+ * other placement, which adds a pane/window inside it. */
+type SessionPlacement = 'pane:right' | 'pane:down' | 'tab' | 'window' | 'workspace';
 interface SessionOpenOptions {
   /** Working directory the new pane/window/session should start in. */
   cwd: string;
@@ -196,11 +237,33 @@ interface SessionReadOptions {
   /** How many trailing lines of output to capture; omit for the backend's default. */
   lines?: number;
 }
+interface OpenInNewWorktreeOptions {
+  /** The primary checkout's root — the repo the new worktree branches from. */
+  primaryRoot: string;
+  /** Branch to create the worktree on. */
+  branch: string;
+  /** Where the new worktree should be checked out. */
+  path: string;
+  /** Command line to launch inside the new session once it is open. */
+  launch: string;
+}
 interface SessionAdapter {
   /** Backend name, e.g. "tmux" or "herdr". */
   readonly name: string;
   /** Create a new pane/window running `opts.launch` in `opts.cwd`; returns its target handle. */
   open(exec: Exec, opts: SessionOpenOptions): SessionTarget;
+  /**
+   * Atomically create a new worktree AND open it in a genuinely new workspace/session, when the
+   * backend has a native primitive for that combination (herdr's `worktree create` both creates
+   * the worktree and nests it under its source workspace in one call — a real organizational
+   * improvement over a separate worktree-add followed by a plain `open()`). Backends without such
+   * a primitive (tmux has none) omit this; callers fall back to creating the worktree themselves
+   * and then calling `open()` with `at: 'workspace'`.
+   */
+  openInNewWorktree?(exec: Exec, opts: OpenInNewWorktreeOptions): {
+    target: SessionTarget;
+    worktree: Worktree;
+  };
   /** Type text into the target session (submitted, not queued). */
   send(exec: Exec, target: SessionTarget, text: string): void;
   /** Capture the target session's current output. */
@@ -243,40 +306,6 @@ declare function probeMultiplexer(exec: Exec, env: NodeJS.ProcessEnv, opts?: {
   discover?: boolean;
 }): MuxProbe;
 //#endregion
-//#region src/console/worktree.d.ts
-/** Generic multiplexer/worktree seam — no legion-specific concepts. */
-interface WorktreeAddOptions {
-  /** The primary checkout's root — the repo `git worktree add` runs against. */
-  primaryRoot: string;
-  /** Where the new worktree should be checked out. */
-  path: string;
-  /** Branch to create the worktree on. */
-  branch: string;
-}
-interface Worktree {
-  root: string;
-  branch: string;
-}
-interface WorktreeRemoveOptions {
-  primaryRoot: string;
-}
-interface WorktreeAdapter {
-  add(exec: Exec, opts: WorktreeAddOptions): Worktree;
-  remove(exec: Exec, path: string, opts: WorktreeRemoveOptions): void;
-}
-/** The only worktree backend at MVP — plain `git worktree`. */
-declare const gitWorktreeAdapter: WorktreeAdapter;
-/**
- * Resolve the primary checkout's root regardless of whether the caller's cwd is the primary
- * checkout or a linked worktree — `--git-common-dir` always points at the main repo's `.git`.
- */
-declare function resolvePrimaryRoot(exec: Exec): string;
-/**
- * Refuse the primary checkout: a spawned unit's resolved worktree root must never be the primary
- * checkout itself. A unit is never run in the primary checkout.
- */
-declare function assertDistinctFromPrimary(worktreeRoot: string, primaryRoot: string): void;
-//#endregion
 //#region src/decommission.d.ts
 interface DecommissionInput {
   id: string;
@@ -475,9 +504,10 @@ interface RootOptions {
  */
 declare function resolveRoot(opts?: RootOptions): string;
 /**
- * Resolve the primary checkout's project-local cyberlegion dir — where spawned unit worktrees
- * live (never the global hub), keyed off `git worktree`'s common-dir so it resolves the same from
- * the primary checkout or from any of its linked worktrees.
+ * Resolve the primary checkout's project-local cyberlegion dir — the tracked marker for a
+ * legion-enabled project (never the global hub, and never where spawned unit worktrees themselves
+ * are checked out — see `resolveUnitWorktreePath`), keyed off `git worktree`'s common-dir so it
+ * resolves the same from the primary checkout or from any of its linked worktrees.
  */
 declare function resolveProjectLocalRoot(opts?: RootOptions): string;
 /**
@@ -496,7 +526,6 @@ declare const paths: {
   dataDir: (root: string, id: string) => string;
   briefFile: (root: string, id: string) => string;
   resultFile: (root: string, id: string) => string;
-  worktreeDir: (root: string, id: string) => string;
 };
 //#endregion
 //#region src/session.d.ts
@@ -512,8 +541,13 @@ interface SpawnInput {
   command?: string;
   /** Branch to create the unit's worktree on; defaults to `cyberlegion/unit-<id>`. */
   branch?: string;
-  /** Where to check out the unit's worktree; defaults under `<primary>/.agents/cyberlegion/worktrees/<id>`. */
+  /** Where to check out the unit's worktree; defaults to a sibling of the primary checkout
+   * (`<parent>/<repo>.worktrees/legion-<id6>`, `id6` the same 6-char slice `handle` defaults to)
+   * — never nested inside the primary's own tree. */
   worktreePath?: string;
+  /** Spawn into this existing directory instead — creates no worktree. Mutually exclusive with
+   * `branch`/`worktreePath` (those create a worktree; this reuses one). */
+  cwd?: string;
   /** Placement relative to the caller; defaults to 'pane:right'. */
   at?: SessionPlacement;
 }
@@ -528,9 +562,10 @@ interface SpawnResult {
  * its cwd set to that worktree, pre-register the peer, and drop its brief as a file the peer's own
  * SessionStart hook reads — never typed into its prompt.
  *
- * Spawned unit worktrees live project-local (`<primary>/.agents/cyberlegion/worktrees/<id>`), even
- * though the registry/mailbox itself lives in the global hub — the hub addresses units across
- * project and worktree boundaries, but a unit's checkout is necessarily project-local.
+ * Spawned unit worktrees live sibling to the primary checkout (`<parent>/<repo>.worktrees/legion-<id6>`),
+ * never nested inside it, even though the registry/mailbox itself lives in the global hub — the hub
+ * addresses units across project and worktree boundaries, but a unit's checkout is necessarily
+ * scoped to this one project's git remote.
  */
 declare function spawn(ctx: IdContext, input: SpawnInput): SpawnResult;
 //#endregion

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { A as resolveProjectLocalRoot, B as loadAgent, C as resolveAgentDef, D as ensureMarker, E as spawn, F as selectSessionAdapter, G as resolveRecipient, H as realExec, I as probeMultiplexer, K as resolveSelfId, L as bumpLastSeen, M as assertDistinctFromPrimary, N as gitWorktreeAdapter, O as paths, P as resolvePrimaryRoot, R as detectHarness, S as listAgentDefs, T as realizeSubagentInstruction, U as register, V as prune, W as resolveAgent, _ as inbox, a as fail, b as send, c as toonObject, d as DispatchWaitingError, f as channel, g as deleteMessage, h as ack, i as emit, j as resolveRoot, k as projectRoot, l as install, m as awaitReply, n as FileStore, o as nextStep, p as prep, q as touch, r as injectInbox, s as toonList, t as watchMail, u as collect, v as peek, w as realizeLaunch, x as decommission, y as resolveBody, z as listAgents } from "./watch-DA8I44dv.mjs";
+import { A as detectHarness, C as resolveAgentDef, D as selectSessionAdapter, E as spawn, F as register, G as resolveProjectLocalRoot, H as ensureMarker, J as gitWorktreeAdapter, K as resolveRoot, L as resolveAgent, M as loadAgent, N as prune, O as probeMultiplexer, P as realExec, R as resolveRecipient, S as listAgentDefs, T as realizeSubagentInstruction, U as paths, V as touch, W as projectRoot, Y as resolvePrimaryRoot, _ as inbox, a as fail, b as send, c as toonObject, d as DispatchWaitingError, f as channel, g as deleteMessage, h as ack, i as emit, j as listAgents, k as bumpLastSeen, l as install, m as awaitReply, n as FileStore, o as nextStep, p as prep, q as assertDistinctFromPrimary, r as injectInbox, s as toonList, t as watchMail, u as collect, v as peek, w as realizeLaunch, x as decommission, y as resolveBody, z as resolveSelfId } from "./watch-BuYsdwhx.mjs";
 //#region src/wake/wake-path.ts
 /**
 * Select a wake path from the shipped matrix. Rule order: a `mux.mux === 'none'` caller can never

package/dist/{watch-DA8I44dv.mjs → watch-BuYsdwhx.mjs}

@@ -3,6 +3,156 @@ import { existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, w
 import { execFileSync } from "node:child_process";
 import { randomBytes } from "node:crypto";
 import { homedir } from "node:os";
+//#region src/console/worktree.ts
+/** The only worktree backend at MVP — plain `git worktree`. */
+const gitWorktreeAdapter = {
+	add(exec, opts) {
+		if (exec("git", [
+			"-C",
+			opts.primaryRoot,
+			"worktree",
+			"add",
+			"-b",
+			opts.branch,
+			opts.path
+		]) === null) throw new Error(`git worktree add failed for ${opts.path}`);
+		return {
+			root: resolve(opts.path),
+			branch: opts.branch
+		};
+	},
+	remove(exec, path, opts) {
+		if (exec("git", [
+			"-C",
+			opts.primaryRoot,
+			"worktree",
+			"remove",
+			path,
+			"--force"
+		]) === null) throw new Error(`git worktree remove failed for ${path}`);
+	}
+};
+/**
+* Resolve the primary checkout's root regardless of whether the caller's cwd is the primary
+* checkout or a linked worktree — `--git-common-dir` always points at the main repo's `.git`.
+*/
+function resolvePrimaryRoot(exec) {
+	const commonDir = exec("git", [
+		"rev-parse",
+		"--path-format=absolute",
+		"--git-common-dir"
+	]);
+	if (!commonDir) throw new Error("cannot resolve the primary checkout — not inside a git repository");
+	return dirname(commonDir);
+}
+/**
+* Refuse the primary checkout: a spawned unit's resolved worktree root must never be the primary
+* checkout itself. A unit is never run in the primary checkout.
+*/
+function assertDistinctFromPrimary(worktreeRoot, primaryRoot) {
+	if (resolve(worktreeRoot) === resolve(primaryRoot)) throw new Error("refusing to run a unit in the primary checkout — spawn a worktree distinct from the primary checkout");
+}
+//#endregion
+//#region src/paths.ts
+/** The tracked marker file that makes a hub root initialized (see ensureMarker). */
+const MARKER_FILE = "config.json";
+/** Walk up from `cwd` to the nearest git repo root; fall back to `cwd`. */
+function projectRoot(cwd = process.cwd()) {
+	let dir = resolve(cwd);
+	for (;;) {
+		if (existsSync(join(dir, ".git"))) return dir;
+		const parent = dirname(dir);
+		if (parent === dir) return resolve(cwd);
+		dir = parent;
+	}
+}
+function makeDefaultExec(cwd) {
+	return (cmd, args) => {
+		try {
+			return execFileSync(cmd, args, {
+				encoding: "utf8",
+				stdio: [
+					"ignore",
+					"pipe",
+					"ignore"
+				],
+				cwd
+			}).trim();
+		} catch {
+			return null;
+		}
+	};
+}
+/**
+* Resolve the cyberlegion hub root. Precedence: explicit --root/--space, then `$CYBERLEGION_ROOT`,
+* then the GLOBAL hub `~/.agents/cyberlegion` (addressable across every project and worktree
+* boundary — identity/mail/registry state lives here by default; `--space` isolates it), falling
+* back to a project-local `.agents/cyberlegion` only when no home directory is resolvable.
+*/
+function resolveRoot(opts = {}) {
+	const env = opts.env ?? process.env;
+	const explicit = opts.root ?? opts.space ?? env.CYBERLEGION_ROOT;
+	if (explicit) return resolve(explicit);
+	const home = homedir();
+	if (home) return join(home, ".agents", "cyberlegion");
+	return join(projectRoot(opts.cwd), ".agents", "cyberlegion");
+}
+/**
+* Resolve the primary checkout's project-local cyberlegion dir — the tracked marker for a
+* legion-enabled project (never the global hub, and never where spawned unit worktrees themselves
+* are checked out — see `resolveUnitWorktreePath`), keyed off `git worktree`'s common-dir so it
+* resolves the same from the primary checkout or from any of its linked worktrees.
+*/
+function resolveProjectLocalRoot(opts = {}) {
+	const exec = opts.exec ?? makeDefaultExec(opts.cwd);
+	let primary;
+	try {
+		primary = resolvePrimaryRoot(exec);
+	} catch {
+		primary = void 0;
+	}
+	return join(primary ?? projectRoot(opts.cwd), ".agents", "cyberlegion");
+}
+/**
+* Create the tracked `config.json` marker at `root` (a hub root) if it does not already exist.
+* Callers pass the root under which the marker should be created/ensured; this mkdir's it as
+* needed. Idempotent — never overwrites an existing marker.
+*/
+function ensureMarker(root) {
+	mkdirSync(root, { recursive: true });
+	const marker = join(root, MARKER_FILE);
+	if (!existsSync(marker)) writeFileSync(marker, `${JSON.stringify({ version: 1 }, null, 2)}\n`);
+}
+const paths = {
+	agentsDir: (root) => join(root, "agents"),
+	agentFile: (root, id) => join(root, "agents", `${id}.json`),
+	panesDir: (root) => join(root, "panes"),
+	paneFile: (root, pane) => join(root, "panes", `${sanitizePane(pane)}.id`),
+	inboxDir: (root, id) => join(root, "inbox", id),
+	inboxReadDir: (root, id) => join(root, "inbox", id, "read"),
+	dataDir: (root, id) => join(root, "data", id),
+	briefFile: (root, id) => join(root, "data", id, "brief.md"),
+	resultFile: (root, id) => join(root, "data", id, "result.json")
+};
+/**
+* Where a spawned unit's own git worktree is checked out by default — a sibling of the primary
+* checkout (`<parent>/<repo>.worktrees/legion-<id>`), never nested inside the primary's own working
+* tree. A linked worktree living inside the primary's tree is untracked-but-present: it pollutes
+* `git status` in the primary checkout, confuses tooling that walks the tree recursively (test
+* runners, watchers, `find`/`rm -rf`), and risks a tree-wide op in the primary crossing into the
+* nested worktree's own checkout. `<repo>.worktrees/` matches the sibling convention already in use
+* for other tools' worktrees in this environment (herdr's `worktree-<word>-<word>-<hash>`, cursor's
+* `<proj><count>`); the `legion-` prefix self-identifies this tool's own units the same way, without
+* needing a subfolder.
+*/
+function resolveUnitWorktreePath(primaryRoot, id) {
+	return join(dirname(primaryRoot), `${basename(primaryRoot)}.worktrees`, `legion-${id}`);
+}
+/** tmux pane ids look like "%3"; make them filesystem-safe. */
+function sanitizePane(pane) {
+	return pane.replace(/[^A-Za-z0-9_-]/g, "_");
+}
+//#endregion
 //#region src/identity.ts
 const realExec = (cmd, args) => {
 	try {
@@ -106,6 +256,35 @@ function register(ctx, input) {
 	if (pane) ctx.store.putPaneIndex(pane, id);
 	return rec;
 }
+/** Derive a standing record's stable id from its handle — same slug rule as `sanitizePane`, prefixed
+* so it reads distinct from a random 16-hex session id or a pane pointer. */
+function standingId(handle) {
+	return `standing-${sanitizePane(handle)}`;
+}
+/**
+* Mint (or idempotently refresh) a standing identity: a session-independent, prune-exempt owner
+* inbox keyed by handle, with no pane/tmux/harness. A SIBLING of `register`, not an overload — it
+* skips all pane/tmux machinery and harness auto-detection entirely.
+*/
+function registerStanding(ctx, input) {
+	ctx.store.ensureMarker();
+	const id = standingId(input.handle);
+	const existing = loadAgent(ctx.store, id);
+	const ts = nowIso(ctx);
+	const rec = {
+		id,
+		handle: input.handle,
+		kind: "standing",
+		tmux: null,
+		harness: void 0,
+		cwd: process.cwd(),
+		status: "active",
+		createdAt: existing?.createdAt ?? ts,
+		lastSeen: ts
+	};
+	saveAgent(ctx.store, rec);
+	return rec;
+}
 function gitWorktree(exec) {
 	const root = exec("git", ["rev-parse", "--show-toplevel"]);
 	if (!root) return null;
@@ -118,11 +297,23 @@ function gitWorktree(exec) {
 		]) ?? void 0
 	};
 }
+/** Prefer a standing record over a plain session record when both match a handle — an owner
+* report must land in the durable standing inbox, not a dying session's. */
+function preferStanding(matches) {
+	return matches.find((a) => a.kind === "standing") ?? matches[0];
+}
+/** Resolve a handle to its standing owner record's id — never falls back to a live session agent
+* sharing that handle, so `--owner` can never be pointed at a session's inbox by mistake. */
+function resolveStandingOwner(store, handle) {
+	const match = listAgents(store).find((a) => a.handle === handle && a.kind === "standing");
+	if (!match) throw new Error(`no standing owner "${handle}" — run 'cyberlegion identity owner --handle ${handle}'`);
+	return match.id;
+}
 /** Resolve a recipient argument (id or handle) to an agent id. */
 function resolveRecipient(store, to) {
 	if (loadAgent(store, to)) return to;
-	const match = listAgents(store).find((a) => a.handle === to);
-	if (!match) throw new Error(`no agent addressable as "${to}"`);
+	const match = preferStanding(listAgents(store).filter((a) => a.handle === to));
+	if (!match) throw new Error(`no agent addressable as "${to}" — run 'cyberlegion identity owner --handle ${to}' to create a standing inbox`);
 	return match.id;
 }
 /**
@@ -134,7 +325,7 @@ function resolveAgent(store, ref) {
 	const byId = loadAgent(store, ref);
 	if (byId) return byId;
 	const agents = listAgents(store);
-	const byHandle = agents.find((a) => a.handle === ref);
+	const byHandle = preferStanding(agents.filter((a) => a.handle === ref));
 	if (byHandle) return byHandle;
 	const byBranch = agents.find((a) => a.worktree?.branch === ref);
 	if (byBranch) return byBranch;
@@ -158,6 +349,7 @@ function prune(ctx) {
 	const now = ctx.now?.() ?? Date.now();
 	const changed = [];
 	for (const rec of listAgents(ctx.store)) {
+		if (rec.kind === "standing") continue;
 		if (rec.status === "exited") continue;
 		const paneGone = rec.tmux?.pane ? exec("tmux", [
 			"has-session",
@@ -285,22 +477,36 @@ function discoverByAncestry(exec, env) {
 * rather than its Unix-socket API, so it composes with this codebase's synchronous `Exec`
 * convention exactly like the tmux adapter — no new client/transport needed.
 *
-* herdr is optional/experimental and is not installed in this environment; this follows herdr's
-* documented CLI reference (split/run/read/close/focus) but is unverified against a live binary.
+* The pane lifecycle (split/run/read/close) is verified against a live herdr binary; `pane split`
+* returns a JSON `pane_info` envelope whose id is extracted in `parsePaneId`.
 */
 const herdrSessionAdapter = {
 	name: "herdr",
 	open(exec, opts) {
-		const id = exec("herdr", [
-			"pane",
-			"split",
-			"--current",
-			"--direction",
-			opts.at === "pane:down" ? "down" : "right",
-			"--cwd",
-			opts.cwd
-		]);
-		if (!id) throw new Error("herdr pane split failed");
+		let id;
+		if (opts.at === "workspace") {
+			const out = exec("herdr", [
+				"workspace",
+				"create",
+				"--cwd",
+				opts.cwd,
+				"--no-focus"
+			]);
+			if (!out) throw new Error("herdr workspace create failed");
+			id = parseWorkspaceRootPaneId(out);
+		} else {
+			const out = exec("herdr", [
+				"pane",
+				"split",
+				"--current",
+				"--direction",
+				opts.at === "pane:down" ? "down" : "right",
+				"--cwd",
+				opts.cwd
+			]);
+			if (!out) throw new Error("herdr pane split failed");
+			id = parsePaneId(out);
+		}
 		const target = { id };
 		exec("herdr", [
 			"pane",
@@ -310,6 +516,32 @@ const herdrSessionAdapter = {
 		]);
 		return target;
 	},
+	openInNewWorktree(exec, opts) {
+		const out = exec("herdr", [
+			"worktree",
+			"create",
+			"--cwd",
+			opts.primaryRoot,
+			"--branch",
+			opts.branch,
+			"--path",
+			opts.path,
+			"--no-focus"
+		]);
+		if (!out) throw new Error("herdr worktree create failed");
+		const { paneId, worktree } = parseWorktreeCreate(out);
+		const target = { id: paneId };
+		exec("herdr", [
+			"pane",
+			"run",
+			paneId,
+			opts.launch
+		]);
+		return {
+			target,
+			worktree
+		};
+	},
 	send(exec, target, text) {
 		exec("herdr", [
 			"pane",
@@ -344,13 +576,76 @@ const herdrSessionAdapter = {
 		]);
 	}
 };
+/**
+* `herdr pane split` emits a JSON envelope, not a bare id:
+* `{"id":"cli:pane:split","result":{"pane":{"pane_id":"w3:pB", ...},"type":"pane_info"}}`.
+* The pane id herdr's other `pane` subcommands accept lives at `.result.pane.pane_id`. Extract it —
+* passing the whole blob downstream lands it in a filename and blows the path length limit.
+*/
+function parsePaneId(out) {
+	let paneId;
+	try {
+		paneId = JSON.parse(out)?.result?.pane?.pane_id;
+	} catch {
+		throw new Error(`herdr pane split returned unparseable output: ${out.slice(0, 200)}`);
+	}
+	if (typeof paneId !== "string" || paneId === "") throw new Error(`herdr pane split output had no result.pane.pane_id: ${out.slice(0, 200)}`);
+	return paneId;
+}
+/**
+* `herdr workspace create` emits its new workspace's initial pane at `.result.root_pane.pane_id`
+* (a different path than `pane split`'s `.result.pane.pane_id`).
+*/
+function parseWorkspaceRootPaneId(out) {
+	let paneId;
+	try {
+		paneId = JSON.parse(out)?.result?.root_pane?.pane_id;
+	} catch {
+		throw new Error(`herdr workspace create returned unparseable output: ${out.slice(0, 200)}`);
+	}
+	if (typeof paneId !== "string" || paneId === "") throw new Error(`herdr workspace create output had no result.root_pane.pane_id: ${out.slice(0, 200)}`);
+	return paneId;
+}
+/**
+* `herdr worktree create` emits the same `.result.root_pane.pane_id` shape as `workspace create`,
+* plus the created worktree's own checkout at `.result.worktree.{path,branch}`.
+*/
+function parseWorktreeCreate(out) {
+	let parsed;
+	try {
+		parsed = JSON.parse(out);
+	} catch {
+		throw new Error(`herdr worktree create returned unparseable output: ${out.slice(0, 200)}`);
+	}
+	const result = parsed?.result;
+	const paneId = result?.root_pane?.pane_id;
+	const path = result?.worktree?.path;
+	const branch = result?.worktree?.branch;
+	if (typeof paneId !== "string" || paneId === "") throw new Error(`herdr worktree create output had no result.root_pane.pane_id: ${out.slice(0, 200)}`);
+	if (typeof path !== "string" || path === "" || typeof branch !== "string" || branch === "") throw new Error(`herdr worktree create output had no result.worktree.{path,branch}: ${out.slice(0, 200)}`);
+	return {
+		paneId,
+		worktree: {
+			root: resolve(path),
+			branch
+		}
+	};
+}
 //#endregion
 //#region src/console/session.tmux.ts
 /** tmux backend — detected via `$TMUX`. */
 const tmuxSessionAdapter = {
 	name: "tmux",
 	open(exec, opts) {
-		const pane = exec("tmux", opts.at === "pane:down" ? [
+		const args = opts.at === "workspace" ? [
+			"new-session",
+			"-d",
+			"-c",
+			opts.cwd,
+			"-P",
+			"-F",
+			"#{pane_id}"
+		] : opts.at === "pane:down" ? [
 			"split-window",
 			"-v",
 			"-c",
@@ -373,8 +668,9 @@ const tmuxSessionAdapter = {
 			"-P",
 			"-F",
 			"#{pane_id}"
-		]);
-		if (!pane) throw new Error("tmux split-window failed");
+		];
+		const pane = exec("tmux", args);
+		if (!pane) throw new Error(`tmux ${args[0]} failed`);
 		const target = { id: pane };
 		tmuxSessionAdapter.send(exec, target, opts.launch);
 		return target;
@@ -427,142 +723,6 @@ function selectSessionAdapter(env, exec = realExec) {
 	throw new Error("spawn requires a session backend — run inside tmux ($TMUX) or herdr ($HERDR_ENV=1)");
 }
 //#endregion
-//#region src/console/worktree.ts
-/** The only worktree backend at MVP — plain `git worktree`. */
-const gitWorktreeAdapter = {
-	add(exec, opts) {
-		if (exec("git", [
-			"-C",
-			opts.primaryRoot,
-			"worktree",
-			"add",
-			"-b",
-			opts.branch,
-			opts.path
-		]) === null) throw new Error(`git worktree add failed for ${opts.path}`);
-		return {
-			root: resolve(opts.path),
-			branch: opts.branch
-		};
-	},
-	remove(exec, path, opts) {
-		if (exec("git", [
-			"-C",
-			opts.primaryRoot,
-			"worktree",
-			"remove",
-			path,
-			"--force"
-		]) === null) throw new Error(`git worktree remove failed for ${path}`);
-	}
-};
-/**
-* Resolve the primary checkout's root regardless of whether the caller's cwd is the primary
-* checkout or a linked worktree — `--git-common-dir` always points at the main repo's `.git`.
-*/
-function resolvePrimaryRoot(exec) {
-	const commonDir = exec("git", [
-		"rev-parse",
-		"--path-format=absolute",
-		"--git-common-dir"
-	]);
-	if (!commonDir) throw new Error("cannot resolve the primary checkout — not inside a git repository");
-	return dirname(commonDir);
-}
-/**
-* Refuse the primary checkout: a spawned unit's resolved worktree root must never be the primary
-* checkout itself. A unit is never run in the primary checkout.
-*/
-function assertDistinctFromPrimary(worktreeRoot, primaryRoot) {
-	if (resolve(worktreeRoot) === resolve(primaryRoot)) throw new Error("refusing to run a unit in the primary checkout — spawn a worktree distinct from the primary checkout");
-}
-//#endregion
-//#region src/paths.ts
-/** The tracked marker file that makes a hub root initialized (see ensureMarker). */
-const MARKER_FILE = "config.json";
-/** Walk up from `cwd` to the nearest git repo root; fall back to `cwd`. */
-function projectRoot(cwd = process.cwd()) {
-	let dir = resolve(cwd);
-	for (;;) {
-		if (existsSync(join(dir, ".git"))) return dir;
-		const parent = dirname(dir);
-		if (parent === dir) return resolve(cwd);
-		dir = parent;
-	}
-}
-function makeDefaultExec(cwd) {
-	return (cmd, args) => {
-		try {
-			return execFileSync(cmd, args, {
-				encoding: "utf8",
-				stdio: [
-					"ignore",
-					"pipe",
-					"ignore"
-				],
-				cwd
-			}).trim();
-		} catch {
-			return null;
-		}
-	};
-}
-/**
-* Resolve the cyberlegion hub root. Precedence: explicit --root/--space, then `$CYBERLEGION_ROOT`,
-* then the GLOBAL hub `~/.agents/cyberlegion` (addressable across every project and worktree
-* boundary — identity/mail/registry state lives here by default; `--space` isolates it), falling
-* back to a project-local `.agents/cyberlegion` only when no home directory is resolvable.
-*/
-function resolveRoot(opts = {}) {
-	const env = opts.env ?? process.env;
-	const explicit = opts.root ?? opts.space ?? env.CYBERLEGION_ROOT;
-	if (explicit) return resolve(explicit);
-	const home = homedir();
-	if (home) return join(home, ".agents", "cyberlegion");
-	return join(projectRoot(opts.cwd), ".agents", "cyberlegion");
-}
-/**
-* Resolve the primary checkout's project-local cyberlegion dir — where spawned unit worktrees
-* live (never the global hub), keyed off `git worktree`'s common-dir so it resolves the same from
-* the primary checkout or from any of its linked worktrees.
-*/
-function resolveProjectLocalRoot(opts = {}) {
-	const exec = opts.exec ?? makeDefaultExec(opts.cwd);
-	let primary;
-	try {
-		primary = resolvePrimaryRoot(exec);
-	} catch {
-		primary = void 0;
-	}
-	return join(primary ?? projectRoot(opts.cwd), ".agents", "cyberlegion");
-}
-/**
-* Create the tracked `config.json` marker at `root` (a hub root) if it does not already exist.
-* Callers pass the root under which the marker should be created/ensured; this mkdir's it as
-* needed. Idempotent — never overwrites an existing marker.
-*/
-function ensureMarker(root) {
-	mkdirSync(root, { recursive: true });
-	const marker = join(root, MARKER_FILE);
-	if (!existsSync(marker)) writeFileSync(marker, `${JSON.stringify({ version: 1 }, null, 2)}\n`);
-}
-const paths = {
-	agentsDir: (root) => join(root, "agents"),
-	agentFile: (root, id) => join(root, "agents", `${id}.json`),
-	panesDir: (root) => join(root, "panes"),
-	paneFile: (root, pane) => join(root, "panes", `${sanitizePane(pane)}.id`),
-	inboxDir: (root, id) => join(root, "inbox", id),
-	inboxReadDir: (root, id) => join(root, "inbox", id, "read"),
-	dataDir: (root, id) => join(root, "data", id),
-	briefFile: (root, id) => join(root, "data", id, "brief.md"),
-	resultFile: (root, id) => join(root, "data", id, "result.json"),
-	worktreeDir: (root, id) => join(root, "worktrees", id)
-};
-/** tmux pane ids look like "%3"; make them filesystem-safe. */
-function sanitizePane(pane) {
-	return pane.replace(/[^A-Za-z0-9_-]/g, "_");
-}
-//#endregion
 //#region src/session.ts
 /** How each harness's own CLI is launched in the new pane. */
 const LAUNCH_MAP = {
@@ -576,9 +736,10 @@ const LAUNCH_MAP = {
 * its cwd set to that worktree, pre-register the peer, and drop its brief as a file the peer's own
 * SessionStart hook reads — never typed into its prompt.
 *
-* Spawned unit worktrees live project-local (`<primary>/.agents/cyberlegion/worktrees/<id>`), even
-* though the registry/mailbox itself lives in the global hub — the hub addresses units across
-* project and worktree boundaries, but a unit's checkout is necessarily project-local.
+* Spawned unit worktrees live sibling to the primary checkout (`<parent>/<repo>.worktrees/legion-<id6>`),
+* never nested inside it, even though the registry/mailbox itself lives in the global hub — the hub
+* addresses units across project and worktree boundaries, but a unit's checkout is necessarily
+* scoped to this one project's git remote.
 */
 function spawn(ctx, input) {
 	ctx.store.ensureMarker();
@@ -589,29 +750,62 @@ function spawn(ctx, input) {
 	if (!harness || !(harness in LAUNCH_MAP)) throw new Error(`spawn needs a --harness in the launch map (${Object.keys(LAUNCH_MAP).join(" | ")})`);
 	const brief = resolveBrief(input);
 	if (brief == null) throw new Error("spawn needs a brief — pass --task <text>, --task - (stdin), or --brief-file <path>");
+	if (input.cwd && (input.branch || input.worktreePath)) throw new Error("--cwd cannot combine with the worktree-creating flags --branch/--worktree-path");
 	const id = randomId();
 	const primaryRoot = resolvePrimaryRoot(exec);
-	const branch = input.branch ?? `cyberlegion/unit-${id}`;
-	const worktreePath = input.worktreePath ?? paths.worktreeDir(join(primaryRoot, ".agents", "cyberlegion"), id);
-	const worktree = gitWorktreeAdapter.add(exec, {
-		primaryRoot,
-		path: worktreePath,
-		branch
-	});
-	assertDistinctFromPrimary(worktree.root, primaryRoot);
-	ensureMarker(join(worktree.root, ".agents", "cyberlegion"));
 	const launch = input.command ?? LAUNCH_MAP[harness];
-	const target = sessionAdapter.open(exec, {
-		cwd: worktree.root,
-		launch: `${muxEnvPrefix(sessionAdapter.name)}${launch}`,
-		at: input.at
-	});
+	const fullLaunch = `${muxEnvPrefix(sessionAdapter.name)}${launch}`;
+	let cwd;
+	let worktree;
+	let target;
+	if (input.cwd) {
+		if (!existsSync(input.cwd)) throw new Error(`--cwd directory must already exist: ${input.cwd}`);
+		cwd = resolve(input.cwd);
+		assertDistinctFromPrimary(cwd, primaryRoot);
+		worktree = null;
+		target = sessionAdapter.open(exec, {
+			cwd,
+			launch: fullLaunch,
+			at: input.at
+		});
+	} else {
+		const branch = input.branch ?? `cyberlegion/unit-${id}`;
+		const worktreePath = input.worktreePath ?? resolveUnitWorktreePath(primaryRoot, id.slice(0, 6));
+		if (input.at === "workspace" && sessionAdapter.openInNewWorktree) {
+			const opened = sessionAdapter.openInNewWorktree(exec, {
+				primaryRoot,
+				branch,
+				path: worktreePath,
+				launch: fullLaunch
+			});
+			assertDistinctFromPrimary(opened.worktree.root, primaryRoot);
+			ensureMarker(join(opened.worktree.root, ".agents", "cyberlegion"));
+			cwd = opened.worktree.root;
+			worktree = opened.worktree;
+			target = opened.target;
+		} else {
+			const added = gitWorktreeAdapter.add(exec, {
+				primaryRoot,
+				path: worktreePath,
+				branch
+			});
+			assertDistinctFromPrimary(added.root, primaryRoot);
+			ensureMarker(join(added.root, ".agents", "cyberlegion"));
+			cwd = added.root;
+			worktree = added;
+			target = sessionAdapter.open(exec, {
+				cwd,
+				launch: fullLaunch,
+				at: input.at
+			});
+		}
+	}
 	const ts = new Date(ctx.now?.() ?? Date.now()).toISOString();
 	const rec = {
 		id,
 		handle: input.handle ?? id.slice(0, 6),
 		harness,
-		cwd: worktree.root,
+		cwd,
 		worktree,
 		tmux: sessionAdapter.name === "tmux" ? { pane: target.id } : null,
 		status: "spawning",
@@ -1245,6 +1439,18 @@ function injectInbox(ctx, event) {
 		const lines = unread.map((m) => `- **${m.fromHandle}**${m.subject ? ` — ${m.subject}` : ""}: ${m.body} \`(${m.id})\``);
 		parts.push(`## Unread mail (${unread.length})\n\n${lines.join("\n")}`);
 	}
+	if (rec && !rec.spawnedBy) try {
+		const standing = listAgents(ctx.store).filter((a) => a.kind === "standing");
+		for (const owner of standing) {
+			const ownerUnread = inbox({ store: ctx.store }, {
+				meId: owner.id,
+				unread: true
+			});
+			if (ownerUnread.length === 0) continue;
+			const lines = ownerUnread.map((m) => `- **${m.fromHandle}**${m.subject ? ` — ${m.subject}` : ""}: ${m.body} \`(${m.id})\``);
+			parts.push(`## Owner mail — ${owner.handle} (${ownerUnread.length})\n\n${lines.join("\n")}`);
+		}
+	} catch {}
 	if (parts.length === 0) return null;
 	return { hookSpecificOutput: {
 		hookEventName: event,
@@ -1400,4 +1606,4 @@ async function watchMail(ctx, input, onMessage, opts = {}) {
 	}
 }
 //#endregion
-export { resolveProjectLocalRoot as A, loadAgent as B, resolveAgentDef as C, ensureMarker as D, spawn as E, selectSessionAdapter as F, resolveRecipient as G, realExec as H, probeMultiplexer as I, resolveSelfId as K, bumpLastSeen as L, assertDistinctFromPrimary as M, gitWorktreeAdapter as N, paths as O, resolvePrimaryRoot as P, detectHarness as R, listAgentDefs as S, realizeSubagentInstruction as T, register as U, prune as V, resolveAgent as W, inbox as _, fail as a, send as b, toonObject as c, DispatchWaitingError as d, channel as f, deleteMessage as g, ack as h, emit as i, resolveRoot as j, projectRoot as k, install as l, awaitReply as m, FileStore as n, nextStep as o, prep as p, touch as q, injectInbox as r, toonList as s, watchMail as t, collect as u, peek as v, realizeLaunch as w, decommission as x, resolveBody as y, listAgents as z };
+export { detectHarness as A, resolveStandingOwner as B, resolveAgentDef as C, selectSessionAdapter as D, spawn as E, register as F, resolveProjectLocalRoot as G, ensureMarker as H, registerStanding as I, gitWorktreeAdapter as J, resolveRoot as K, resolveAgent as L, loadAgent as M, prune as N, probeMultiplexer as O, realExec as P, resolveRecipient as R, listAgentDefs as S, realizeSubagentInstruction as T, paths as U, touch as V, projectRoot as W, resolvePrimaryRoot as Y, inbox as _, fail as a, send as b, toonObject as c, DispatchWaitingError as d, channel as f, deleteMessage as g, ack as h, emit as i, listAgents as j, bumpLastSeen as k, install as l, awaitReply as m, FileStore as n, nextStep as o, prep as p, assertDistinctFromPrimary as q, injectInbox as r, toonList as s, watchMail as t, collect as u, peek as v, realizeLaunch as w, decommission as x, resolveBody as y, resolveSelfId as z };

package/package.json

@@ -1,61 +1,60 @@
 {
-	"name": "cyberlegion",
-	"version": "0.0.0",
-	"description": "Harness-agnostic agent session spawning, messaging, and dispatch over the filesystem",
-	"keywords": [
-		"agent",
-		"claude-code",
-		"cursor",
-		"codex",
-		"inter-agent",
-		"dispatch",
-		"tmux"
-	],
-	"repository": {
-		"type": "git",
-		"url": "git+https://github.com/cyberuni/cyberplace.git",
-		"directory": "packages/cyberlegion"
-	},
-	"license": "MIT",
-	"author": "unional <homawong@gmail.com>",
-	"type": "module",
-	"bin": {
-		"cyberlegion": "bin/cyberlegion.mjs"
-	},
-	"exports": {
-		".": {
-			"types": "./dist/index.d.mts",
-			"import": "./dist/index.mjs"
-		},
-		"./package.json": "./package.json"
-	},
-	"files": [
-		"bin",
-		"dist"
-	],
-	"scripts": {
-		"build": "tsdown",
-		"dev": "tsx src/cli.ts",
-		"prepack": "pnpm build",
-		"test": "pnpm build && vitest run src",
-		"test:watch": "vitest",
-		"typecheck": "tsc --noEmit"
-	},
-	"dependencies": {
-		"commander": "^14.0.3"
-	},
-	"devDependencies": {
-		"@types/node": "^24.10.1",
-		"tsdown": "^0.22.0",
-		"tsx": "^4.22.3",
-		"typescript": "^6.0.0",
-		"vitest": "^4.1.7"
-	},
-	"engines": {
-		"node": ">=22"
-	},
-	"publishConfig": {
-		"access": "public",
-		"provenance": true
-	}
-}
+  "name": "cyberlegion",
+  "version": "0.1.0",
+  "description": "Harness-agnostic agent session spawning, messaging, and dispatch over the filesystem",
+  "keywords": [
+    "agent",
+    "claude-code",
+    "cursor",
+    "codex",
+    "inter-agent",
+    "dispatch",
+    "tmux"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/cyberuni/cyberplace.git",
+    "directory": "packages/cyberlegion"
+  },
+  "license": "MIT",
+  "author": "unional <homawong@gmail.com>",
+  "type": "module",
+  "bin": {
+    "cyberlegion": "bin/cyberlegion.mjs"
+  },
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.mts",
+      "import": "./dist/index.mjs"
+    },
+    "./package.json": "./package.json"
+  },
+  "files": [
+    "bin",
+    "dist"
+  ],
+  "dependencies": {
+    "commander": "^14.0.3"
+  },
+  "devDependencies": {
+    "@types/node": "^24.10.1",
+    "tsdown": "^0.22.0",
+    "tsx": "^4.22.3",
+    "typescript": "^6.0.0",
+    "vitest": "^4.1.7"
+  },
+  "engines": {
+    "node": ">=22"
+  },
+  "publishConfig": {
+    "access": "public",
+    "provenance": true
+  },
+  "scripts": {
+    "build": "tsdown",
+    "dev": "tsx src/cli.ts",
+    "test": "pnpm build && vitest run src",
+    "test:watch": "vitest",
+    "typecheck": "tsc --noEmit"
+  }
+}

package/readme.md

@@ -0,0 +1,98 @@
+# cyberlegion
+
+[![npm version](https://img.shields.io/npm/v/cyberlegion.svg)](https://www.npmjs.com/package/cyberlegion)
+[![license: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
+
+Harness-agnostic, MCP-free agent session spawning, messaging, and dispatch over the filesystem (Claude Code, Cursor, Codex).
+
+The CLI is pure mechanism — dumb hands a routing layer composes. It never decides *how* to reach a peer (warm-peer session vs cold subagent vs run-inline); it just spawns, messages, and dispatches. State lives under a shared hub root (`$CYBERLEGION_ROOT`, else the global hub).
+
+## Usage
+
+No install required — run with `npx`:
+
+```sh
+npx cyberlegion <command>
+```
+
+Or pin to an exact version for reproducible hooks:
+
+```sh
+npx cyberlegion@0.1.0 <command>
+```
+
+## Commands
+
+### identity — self-identify and discover peers
+
+```sh
+npx cyberlegion identity register --handle scout   # register/refresh this session
+npx cyberlegion identity whoami                     # print your own identity
+npx cyberlegion identity who                        # list addressable peers
+npx cyberlegion identity prune                      # mark dead agents exited and sweep
+```
+
+### session — warm peer session lifecycle over a multiplexer
+
+```sh
+npx cyberlegion session spawn --agent reviewer      # launch a peer in its own git worktree (tmux/herdr)
+npx cyberlegion session list                         # list live peer sessions
+npx cyberlegion session focus <ref>                  # move input focus to a peer's session
+npx cyberlegion session nudge <ref>                  # ring a peer's session (doorbell)
+npx cyberlegion session read <ref>                   # scrape a peer's session screen
+npx cyberlegion session close <id>                   # tear down worktree + session, reap state
+```
+
+### mail — durable inter-agent messaging
+
+```sh
+npx cyberlegion mail send --to scout --body "ready"  # send a message (by handle or id)
+npx cyberlegion mail inbox                            # list your mail
+npx cyberlegion mail read <msg-id>                   # peek without acknowledging
+npx cyberlegion mail ack <msg-id>                    # acknowledge (move out of unread)
+npx cyberlegion mail delete <msg-id>                 # permanently remove a message
+npx cyberlegion mail await                           # block until a thread reply arrives, print + ack
+npx cyberlegion mail watch                           # stream new matching mail (observer only)
+npx cyberlegion mail hook                            # emit the harness hook injection payload (JSON)
+```
+
+### dispatch — delegate work and await a result
+
+```sh
+npx cyberlegion dispatch prep                        # allocate id + brief + result slot (spawns nothing)
+npx cyberlegion dispatch channel --agent worker --wait  # prep + spawn + await the reply
+npx cyberlegion dispatch collect <id>                # read + validate a subagent's result file
+```
+
+### agent — resolve reusable agent definitions
+
+Reads definitions under `.agents/agents/`.
+
+```sh
+npx cyberlegion agent list                           # list resolvable agent definitions
+npx cyberlegion agent show <name>                    # show a resolved def (model/effort/harness/…)
+npx cyberlegion agent resolve <name>                 # emit the full machine payload for a routing caller
+npx cyberlegion agent path <name>                    # print the resolved def file path
+```
+
+### admin — setup and diagnostics
+
+```sh
+npx cyberlegion admin install                        # wire the mail-surfacing hook into a harness config
+npx cyberlegion admin doctor                         # probe harness, multiplexer, hub root, self-id
+npx cyberlegion admin mode                            # report the detected session-backend mode
+npx cyberlegion admin migrate                        # merge one hub root state into another
+```
+
+Top-level shortcuts are provided for the common verbs: `spawn`, `send`, `inbox`, `who`.
+
+## Global options
+
+| Option              | Description                                                        |
+|---------------------|-------------------------------------------------------------------|
+| `--space <path>`    | Isolate the hub root (overrides the global hub / `$CYBERLEGION_ROOT`) |
+| `--format <format>` | Output format: `toon` (default) or `json`                         |
+
+## License
+
+MIT