oh-my-opencode 4.16.2 → 4.16.3

package/packages/omo-codex/plugin/components/rules/test/hephaestus-model-variant.test.ts

@@ -0,0 +1,106 @@
+import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { afterEach, describe, expect, it } from "vitest";
+
+import { type CodexSessionStartInput, runSessionStartHook } from "../src/codex-hook.js";
+import { findPluginBundledCandidates } from "@oh-my-opencode/rules-engine/engine";
+
+const GPT_55_VARIANT_PATH = "bundled-rules/hephaestus/gpt-5.5.md";
+const GPT_56_VARIANT_PATH = "bundled-rules/hephaestus/gpt-5.6.md";
+const BUNDLED_ONLY_ENV = {
+	CODEX_RULES_ENABLED_SOURCES: "plugin-bundled",
+};
+const tempDirectories: string[] = [];
+let originalPluginRoot: string | undefined;
+
+afterEach(() => {
+	restoreEnv("PLUGIN_ROOT", originalPluginRoot);
+	for (const directory of tempDirectories.splice(0)) {
+		rmSync(directory, { recursive: true, force: true });
+	}
+});
+
+function makeProject(): { readonly root: string; readonly pluginData: string } {
+	originalPluginRoot = process.env["PLUGIN_ROOT"];
+	process.env["PLUGIN_ROOT"] = process.cwd();
+	const root = mkdtempSync(join(tmpdir(), "codex-rules-hephaestus-variant-project-"));
+	const pluginData = mkdtempSync(join(tmpdir(), "codex-rules-hephaestus-variant-data-"));
+	tempDirectories.push(root, pluginData);
+	writeFileSync(join(root, "package.json"), JSON.stringify({ name: "fixture" }));
+	return { root, pluginData };
+}
+
+function sessionStartInput(root: string, model: string): CodexSessionStartInput {
+	return {
+		session_id: "session-1",
+		transcript_path: null,
+		cwd: root,
+		hook_event_name: "SessionStart",
+		model,
+		permission_mode: "default",
+		source: "startup",
+	};
+}
+
+function restoreEnv(name: string, value: string | undefined): void {
+	if (value === undefined) {
+		delete process.env[name];
+		return;
+	}
+	process.env[name] = value;
+}
+
+describe("Hephaestus bundled rule model variants", () => {
+	it("#given packaged bundled rules #when discovering with a gpt-5.5 model #then only the gpt-5.5 variant is included", () => {
+		const candidates = findPluginBundledCandidates({ pluginRoot: process.cwd(), model: "gpt-5.5" });
+		const paths = candidates.map((candidate) => candidate.relativePath);
+
+		expect(paths).toContain(GPT_55_VARIANT_PATH);
+		expect(paths).not.toContain(GPT_56_VARIANT_PATH);
+	});
+
+	it("#given packaged bundled rules #when discovering with a gpt-5.6 family model #then only the gpt-5.6 variant is included", () => {
+		const candidates = findPluginBundledCandidates({ pluginRoot: process.cwd(), model: "gpt-5.6-codex" });
+		const paths = candidates.map((candidate) => candidate.relativePath);
+
+		expect(paths).toContain(GPT_56_VARIANT_PATH);
+		expect(paths).not.toContain(GPT_55_VARIANT_PATH);
+	});
+
+	it("#given packaged bundled rules #when discovering without a model #then the gpt-5.5 variant is the fallback", () => {
+		const candidates = findPluginBundledCandidates({ pluginRoot: process.cwd() });
+		const paths = candidates.map((candidate) => candidate.relativePath);
+
+		expect(paths).toContain(GPT_55_VARIANT_PATH);
+		expect(paths).not.toContain(GPT_56_VARIANT_PATH);
+	});
+
+	it("#given a gpt-5.5 session #when SessionStart runs #then the gpt-5.5 identity is injected in full", async () => {
+		const { root, pluginData } = makeProject();
+
+		const output = await runSessionStartHook(sessionStartInput(root, "gpt-5.5"), {
+			pluginDataRoot: pluginData,
+			env: BUNDLED_ONLY_ENV,
+		});
+
+		expect(output).toContain(`Instructions from: ${join(process.cwd(), GPT_55_VARIANT_PATH)}`);
+		expect(output).toContain("based on GPT-5.5");
+		expect(output).not.toContain("based on GPT-5.6");
+		expect(output).not.toContain("[Truncated. Full:");
+	});
+
+	it("#given a gpt-5.6 session #when SessionStart runs #then the gpt-5.6 identity is injected in full", async () => {
+		const { root, pluginData } = makeProject();
+
+		const output = await runSessionStartHook(sessionStartInput(root, "gpt-5.6-codex"), {
+			pluginDataRoot: pluginData,
+			env: BUNDLED_ONLY_ENV,
+		});
+
+		expect(output).toContain(`Instructions from: ${join(process.cwd(), GPT_56_VARIANT_PATH)}`);
+		expect(output).toContain("based on GPT-5.6");
+		expect(output).not.toContain("based on GPT-5.5");
+		expect(output).not.toContain("[Truncated. Full:");
+	});
+});

package/packages/omo-codex/plugin/components/start-work-continuation/hooks/hooks.json

@@ -7,7 +7,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/components/start-work-continuation/dist/cli.js\" hook stop",
 						"timeout": 10,
-						"statusMessage": "(OmO 4.16.2) Checking Start-Work Continuation"
+						"statusMessage": "(OmO 4.16.3) Checking Start-Work Continuation"
 					}
 				]
 			}
@@ -19,7 +19,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/components/start-work-continuation/dist/cli.js\" hook subagent-stop",
 						"timeout": 10,
-						"statusMessage": "(OmO 4.16.2) Checking Start-Work Continuation"
+						"statusMessage": "(OmO 4.16.3) Checking Start-Work Continuation"
 					}
 				]
 			}

package/packages/omo-codex/plugin/components/start-work-continuation/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@code-yeongyu/codex-start-work-continuation",
-	"version": "4.16.2",
+	"version": "4.16.3",
 	"description": "Codex Stop hook continuation injector for omo-codex start-work plans.",
 	"type": "module",
 	"packageManager": "npm@11.12.1",

package/packages/omo-codex/plugin/components/teammode/AGENTS.md

@@ -7,18 +7,19 @@
 Codex team-mode component. Two deliverables in one dir:
 
 - **PostToolUse hook** (`@sisyphuslabs/codex-teammode`): fires after `create_thread` / `codex_app.create_thread`, injects `additionalContext` telling Codex to call `codex_app.set_thread_title` NOW with the real task/role. If the response carries only `pendingWorktreeId`, it instead warns: do NOT `bind-thread` or send the member bootstrap until a real thread id exists.
-- **`teammode` skill**: script-driven orchestration of a named team of Codex threads. Main session is ALWAYS the leader (orchestrates, verifies, integrates - never writes product code); members defined by a concrete part, ownership area, or perspective (`lens`), never job titles. Durable state under `.omo/teams/{session_id}/`: `team.json` + auto-generated `guide.md` member field manual + `artifacts/` exchange dir.
+- **`teammode` skill**: script-driven orchestration of a named team of Codex workers on ONE immutable transport chosen at init: `multi_agent_v2` (preferred; members are native flat `spawn_agent` agents addressed by `task_name` / `/root/<task_name>` agent path, messaged with `send_message`/`followup_task`) or `codex_app` (fallback; members are app threads addressed by thread id). The leader inspects the active tool list and announces the selected transport to the user BEFORE `init`. Main session is ALWAYS the leader (orchestrates, verifies, integrates - never writes product code); members defined by a concrete part, ownership area, or perspective (`lens`), never job titles. Durable state under `.omo/teams/{session_id}/`: `team.json` + auto-generated `guide.md` member field manual + `artifacts/` exchange dir.
 
 ## KEY FILES
 
 - `src/codex-hook.ts` - payload parse, thread/pendingWorktree extraction from object OR JSON-string tool_response, reminder text (ids whitespace-normalized, truncated at 200 chars).
 - `src/cli.ts` - argv dispatch; only `hook post-tool-use`.
 - `hooks/hooks.json` - matcher `^(create_thread|codex_app\.create_thread)$`, runs `node ${PLUGIN_ROOT}/dist/cli.js hook post-tool-use`, timeout 10.
-- `skills/teammode/SKILL.md` - leader protocol: team-vs-subagent decision matrix, ulw-plan parallel-wave mapping, "Let members work - do not rush them" (4-reason message gate; quiet between heartbeats = working, not stalled), archive/delete/stop rules.
-- `skills/teammode/scripts/team.mjs` - controller CLI: init / add-member / bind-thread / member-prompt / set-status / worktree-add / worktree-remove / integrate / archive / delete / status / guide. Zero npm deps, node builtins only, runs under node or bun on all 3 OSes.
-- `skills/teammode/scripts/team-state.mjs` - state model + persistence: per-team `.team.lock` dir lock (`owner.json`; `OMO_TEAMMODE_LOCK_TIMEOUT_MS` / `OMO_TEAMMODE_LOCK_RETRY_MS`), atomic tmp+rename writes, symlink- and escape-guarded team dirs, schemaVersion 2, `MIN_MEMBERS = 2`, unique focus/name/threadTitle invariants.
+- `skills/teammode/SKILL.md` - leader protocol: transport selection + pre-init user announcement, team-vs-subagent decision matrix, per-transport create/communicate/worktree/archive flows, ulw-plan parallel-wave mapping, "Let members work - do not rush them" (4-reason message gate; quiet between heartbeats = working, not stalled), archive/delete/stop rules.
+- `skills/teammode/scripts/team.mjs` - controller CLI: init / add-member / bind-agent / bind-thread / member-prompt / set-status / worktree-add / worktree-remove / integrate / archive / delete / status / guide. Zero npm deps, node builtins only, runs under node or bun on all 3 OSes.
+- `skills/teammode/scripts/team-transport.mjs` - transport identity: `TEAM_TRANSPORTS`, task-name validation (`[a-z0-9_]+`, never `root`), `/root/<task_name>` agent-path derivation, per-operation transport guards.
+- `skills/teammode/scripts/team-state.mjs` - state model + persistence: per-team `.team.lock` dir lock (`owner.json`; `OMO_TEAMMODE_LOCK_TIMEOUT_MS` / `OMO_TEAMMODE_LOCK_RETRY_MS`), atomic tmp+rename writes, symlink- and escape-guarded team dirs, schemaVersion 3 (legacy 2 migrates in memory to `codex_app` and persists on the next mutation), `MIN_MEMBERS = 2`, unique focus/name invariants plus per-transport identity invariants (taskName/agentPath on V2, threadTitle on codex_app).
 - `skills/teammode/scripts/team-worktree.mjs` - git worktree provisioning + `merge --no-ff --no-edit` integration; conflict leaves the tree mid-merge for the leader to resolve and re-run.
-- `skills/teammode/scripts/team-guide.mjs` - pure string builders for `guide.md` + the short member bootstrap trigger (`codex://threads/<id>` deep links, `WORKING:` / `BLOCKED:` heartbeat rules, English-only member traffic).
+- `skills/teammode/scripts/team-guide.mjs` - pure string builders for `guide.md` + the short member bootstrap trigger, branched by transport (V2: `/root` leader target + `members[].agentPath` peers + `send_message`/`followup_task`; codex_app: `codex_app.send_message_to_thread` + `codex://threads/<id>` deep links), `WORKING:` / `BLOCKED:` heartbeat rules, English-only member traffic.
 - `test/thread-title-hook.test.ts` - hook unit tests (vitest-style imports, run via `bun test`).
 
 ## WHERE TO LOOK
@@ -26,8 +27,9 @@ Codex team-mode component. Two deliverables in one dir:
 | Task | Location |
 |------|----------|
 | Hook reminder text | `src/codex-hook.ts` `threadTitleReminder` + `test/thread-title-hook.test.ts`; `plugin/test/teammode-thread-title.test.mjs` pins the exact strings |
-| Skill protocol text | `skills/teammode/SKILL.md`; contract tests `plugin/test/teammode-{communication,worktree,safety,archive-ambiguity,thread-links}.test.mjs` pin phrases |
-| team.json shape | `team-state.mjs` (single source of the shape; `validateTeam` rejects schemaVersion != 2) |
+| Skill protocol text | `skills/teammode/SKILL.md`; contract tests `plugin/test/teammode-{transport,communication,worktree,safety,archive-ambiguity,thread-links}.test.mjs` pin phrases |
+| team.json shape | `team-state.mjs` (single source of the shape; `validateTeam` migrates schemaVersion 2 to 3 and rejects anything else) |
+| Transport rules | `team-transport.mjs` (`parseTeamTransport`, `parseTaskName`, `assertTransport`) + `plugin/test/teammode-transport.test.mjs` |
 | Branch naming, worktree paths, merge | `team-worktree.mjs` (`team/<sessionId>/<memberId>` branches, worktrees confined to `<team dir>/worktrees/<memberId>`) |
 | Hook wiring | `hooks/hooks.json` (component) + `plugin/hooks/post-tool-use-checking-thread-title-hygiene.json` (aggregate; adds `commandWindows` powershell node-dispatch) |
 
@@ -40,7 +42,8 @@ Codex team-mode component. Two deliverables in one dir:
 - All mutating subcommands serialize through `withTeamLock` and re-read committed state before writing. "team state is locked by ..." means the mutation did NOT happen; retry, or inspect `.team.lock/owner.json` after a crash.
 - Archive ambiguity: "Ambiguous Codex thread id" from `codex_app.set_thread_archived` is an app-thread archival blocker, not a team-state blocker. Record it via `archive --note`, never claim the thread was archived, never delete team state before evidence is copied or the user accepts the loss.
 - `integrate` lands member branches with merge commits only (`--no-ff`); never squash or rebase.
-- `bind-thread` refuses while the team has fewer than 2 members; a single-member team is a subagent, not a team. Member focus, name, and threadTitle must each be unique (case/whitespace-insensitive).
-- Every member is a real `codex_app.create_thread` thread bound via `bind-thread`; a spawned in-process subagent (`multi_agent_v1.spawn_agent` or flat `spawn_agent`) is never a substitute.
+- `bind-agent`/`bind-thread` refuse while the team has fewer than 2 members; a single-member team is a subagent, not a team. Member focus and name must be unique (case/whitespace-insensitive); V2 adds unique taskName/agentPath, codex_app adds unique threadTitle.
+- Binding is transport-strict and mutation-safe: `bind-thread` on a V2 team and `bind-agent` on a codex_app team fail before persisting, leaving `team.json` byte-identical; `bind-agent` also rejects any path other than the member's precomputed `/root/<task_name>`.
+- On `multi_agent_v2` teams a member IS a durable flat `spawn_agent` agent (spawned with `fork_turns: "none"`, re-tasked via `followup_task`, no title/deep-link/archive primitive - `interrupt_agent` + durable team state is the archive story). On `codex_app` teams every member is a real `codex_app.create_thread` thread bound via `bind-thread`, and a spawned in-process subagent is never a substitute there. V2 has no spawn-time cwd: create worktrees BEFORE spawn so the bootstrap carries the path.
 - The hook must stay silent (empty stdout) on unrelated tools and malformed payloads; it never blocks a Codex turn.
 - `init` with an explicit `--session <leader thread id>` makes `leader.sessionId` messageable; without it members cannot report and the leader is stuck polling. Re-running `init` is a safe no-op.

package/packages/omo-codex/plugin/components/teammode/hooks/hooks.json

@@ -8,7 +8,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/dist/cli.js\" hook post-tool-use",
 						"timeout": 10,
-						"statusMessage": "(OmO 4.16.2) Checking Thread Title Hygiene"
+						"statusMessage": "(OmO 4.16.3) Checking Thread Title Hygiene"
 					}
 				]
 			}

package/packages/omo-codex/plugin/components/teammode/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sisyphuslabs/codex-teammode",
-	"version": "4.16.2",
+	"version": "4.16.3",
 	"description": "Codex team-mode hook component that keeps background thread titles descriptive after create_thread.",
 	"type": "module",
 	"private": true,

package/packages/omo-codex/plugin/components/teammode/skills/teammode/SKILL.md

@@ -1,15 +1,15 @@
 ---
 name: teammode
-description: "Codex-only team orchestration: run a named team of cooperating Codex threads with durable, script-managed state. MUST USE when the user asks Codex to create, run, coordinate, inspect, archive, or delete a team of threads/sessions, or to work on something as a team in parallel. The main session is always the leader; members are defined by a concrete part, ownership area, or perspective - never a vague job role; a bundled cross-platform script writes the .omo/teams state plus an auto-generated member field manual. Use a team when the work is not perfectly isolated but parallelizing helps, or when a task still needs exploration under a clear goal; use plain subagents when scope is perfectly isolated or the goal is ambiguous. Triggers: team mode, teammode, make a team, run as a team, team of agents, coordinate threads, parallel Codex threads, archive the team, delete the team."
+description: "Codex-only team orchestration: run a named team of cooperating Codex workers with durable, script-managed state. MUST USE when the user asks Codex to create, run, coordinate, inspect, archive, or delete a team of agents/threads/sessions, or to work on something as a team in parallel. FIRST inspects the active tool surface and tells the user which transport it selected: native MultiAgentV2 agents (flat spawn_agent with task_name) when available, Codex App threads as the fallback. The main session is always the leader; members are defined by a concrete part, ownership area, or perspective - never a vague job role; a bundled cross-platform script writes the .omo/teams state plus an auto-generated member field manual. Use a team when the work is not perfectly isolated but parallelizing helps; use plain subagents when scope is perfectly isolated or the goal is ambiguous. Triggers: team mode, teammode, make a team, run as a team, team of agents, coordinate threads, parallel Codex threads, archive the team."
 ---
 
 # Teammode
 
-Run a named team of cooperating Codex threads under one leader, with durable state on disk.
-This is a Codex-only workflow. It is inspired by the lifecycle concerns in the
-Yeachan-Heo/oh-my-codex team skill, but it does not copy that runtime model and never depends
-on an external terminal runner - it coordinates through Codex's own thread tools plus a bundled
-state script.
+Run a named team of cooperating Codex workers under one leader, with durable state on disk.
+This is a Codex-only workflow. It never depends on an external terminal runner - it
+coordinates through Codex's own collaboration tools plus a bundled state script, on ONE of
+two transports chosen up front: native MultiAgentV2 agents, or Codex App threads as the
+fallback.
 
 ## When to use a team (and when to use plain subagents instead)
 
@@ -19,17 +19,43 @@ Use a TEAM when EITHER holds:
 - one task still needs exploration, yet its GOAL is already clear - parallel investigation under
   a fixed objective.
 
-Use plain subagents (`$ulw` / `multi_agent_v1.spawn_agent` / flat `spawn_agent` on `multi_agent_v2`) - NOT a team - when EITHER holds:
+Use plain fire-and-forget subagents (`$ulw` / one-off `spawn_agent` workers) - NOT a team - when
+EITHER holds:
 - the work IS perfectly isolated, so there is no coordination cost worth paying; or
 - the GOAL is still ambiguous, where one mind should resolve direction before any fan-out.
 
 A team buys cross-member coordination at a real overhead cost; only spend it when coordination
 is the thing you actually need.
 
+## Pick the transport FIRST - then tell the user
+
+Before creating any team state, decide which transport this session can run.
+Inspect your active tool list and select:
+
+1. **MultiAgentV2 (preferred)** - select when the flat V2 collaboration tools are ALL active:
+   flat `spawn_agent` whose schema requires `task_name`, plus `send_message`, `followup_task`,
+   `wait_agent`, `list_agents`, and `interrupt_agent`. Members are durable native agents
+   addressed by task name / agent path (`/root/<task_name>`). The namespaced
+   `multi_agent_v1.*` surface never qualifies as a team transport.
+2. **Codex App threads (fallback)** - select when flat V2 is not available but the
+   `codex_app.*` thread tools are (`create_thread`, `read_thread`, `send_message_to_thread`,
+   `set_thread_title`, `set_thread_archived`).
+3. **Neither complete set available** - STOP before `init`. Tell the user which tools are
+   missing; do not fake a team with partial tooling.
+
+Then, BEFORE running `init`, tell the user in one line which transport you selected and why,
+e.g. `Teammode transport: MultiAgentV2 (flat spawn_agent with task_name).` or
+`Teammode transport: Codex App threads (flat V2 tools not present in this session).`
+
+Pass that choice to `init` as `--transport multi_agent_v2` or `--transport codex_app`. The
+transport is recorded in `team.json` and is IMMUTABLE for the team's lifetime: a V2 spawn
+failure is a V2 blocker to report, never permission to mix Codex App threads into the same
+team. Never probe by trial-calling tools; read your tool list.
+
 ## You are the leader - orchestrate, do not implement
 
 The main session is ALWAYS the team leader; you orchestrate directly and never spin up a separate
-leader thread. Your job is orchestration, NOT writing product code: split the work and assign each
+leader worker. Your job is orchestration, NOT writing product code: split the work and assign each
 slice, hold live situational awareness of every member, verify and QA what they deliver, relay
 findings between members, instruct and unblock, and synthesize the result. DELEGATE every code edit
 to a member - if you catch yourself editing product files while the team runs, that work was a
@@ -39,7 +65,7 @@ merge), not the keystrokes.
 ## Compose by part, ownership, or perspective - not by job title
 
 A team is ALWAYS two or more members - never a single-member team. One worker on an isolated
-job is a spawned subagent, not a team; if you end up with a single member,
+job is a plain subagent, not a team; if you end up with a single member,
 either split off a second distinct slice or drop the team and use a subagent.
 
 Compose the team from what you actually KNOW about the work. Ground the split in real knowledge
@@ -50,8 +76,10 @@ perspective/lens. Assigning a vague role ("backend dev", "release analyst", "the
 anti-pattern - it gives the member no real boundary and invites overlap. Each member's `focus`
 names what they own concretely; the `lens` is one of `area`, `ownership`, or `perspective`.
 Give each member a short, distinct `--name` too - its role or what it watches (e.g.
-`app-server-lifecycle`, `mailbox-delivery`) - because that name titles its thread; never reuse
-one name for two members.
+`app-server-lifecycle`, `mailbox-delivery`) - it labels the member everywhere; never reuse
+one name for two members. On MultiAgentV2 teams also give each member a unique
+`--task-name` in `lowercase_digits_underscores` form - it becomes the member's permanent
+agent path `/root/<task_name>`.
 
 ## Run the script - never hand-write team state
 
@@ -60,9 +88,10 @@ the member manual by hand. Run it with `node` (or `bun`); it works on macOS, Lin
 Replace `<skill-root>` with this skill's own directory.
 
 ```
-node "<skill-root>/scripts/team.mjs" init        --name "<team>" --session-name "<session>" [--session <leader_session_id>] [--worktree] [--base-branch dev]
-node "<skill-root>/scripts/team.mjs" add-member  --team <session_id> --id A --name "<short role>" --focus "<part/ownership/perspective>" --lens area|ownership|perspective --deliverable "<...>" [--branch <branch>]
-node "<skill-root>/scripts/team.mjs" bind-thread  --team <session_id> --id A --thread <thread_id> [--cwd <path>]
+node "<skill-root>/scripts/team.mjs" init        --name "<team>" --session-name "<session>" --transport multi_agent_v2|codex_app [--session <leader_thread_id>] [--worktree] [--base-branch dev]
+node "<skill-root>/scripts/team.mjs" add-member  --team <session_id> --id A --name "<short role>" [--task-name <v2_task_name>] --focus "<part/ownership/perspective>" --lens area|ownership|perspective --deliverable "<...>" [--branch <branch>]
+node "<skill-root>/scripts/team.mjs" bind-agent   --team <session_id> --id A --agent-path /root/<task_name> [--cwd <path>]   # multi_agent_v2 teams
+node "<skill-root>/scripts/team.mjs" bind-thread  --team <session_id> --id A --thread <thread_id> [--cwd <path>]             # codex_app teams
 node "<skill-root>/scripts/team.mjs" member-prompt --team <session_id> --id A
 node "<skill-root>/scripts/team.mjs" set-status   --team <session_id> --id A --status reported|blocked|active|archived [--note "<...>"]
 node "<skill-root>/scripts/team.mjs" worktree-add    --team <session_id> --id A [--base-branch <branch>]
@@ -74,70 +103,93 @@ node "<skill-root>/scripts/team.mjs" status       --team <session_id>
 ```
 
 `init` creates `.omo/teams/{session_id}/` containing `team.json` (the single durable state file:
-team id, the main-session leader, the member roster, status, worktree config, and a lifecycle
-log), `guide.md` (the auto-generated member field manual), and `artifacts/` (a shared exchange
-space). `{session_id}` is the leader's Codex session id when you can pass it via `--session`;
-otherwise the script generates a stable handle. Re-running `init` is a safe no-op. Every mutating
-subcommand rewrites `guide.md`, so the manual always matches the current team.
+team id, transport, the main-session leader, the member roster, status, worktree config, and a
+lifecycle log), `guide.md` (the auto-generated member field manual), and `artifacts/` (a shared
+exchange space). On codex_app teams `{session_id}` is the leader's Codex session id when you can
+pass it via `--session`; otherwise the script generates a stable handle. Re-running `init` is a
+safe no-op. Every mutating subcommand rewrites `guide.md`, so the manual always matches the
+current team.
 
 Mutating subcommands take a per-team state lock before reading and rewriting `team.json`. It is
-safe to run independent `add-member`, `bind-thread`, `set-status`, `archive`, `delete`, `guide`,
-and worktree mutation commands concurrently against the same team: they serialize and each command
-reads the latest committed state before writing. If a command reports that team state is locked,
-do not treat the intended mutation as complete; retry after the named command finishes, or inspect
-`.omo/teams/{session_id}/.team.lock/owner.json` if the previous command crashed.
-
-## Create the team and its threads
-
-1. `init` the team, then `add-member` once per member.
-2. Create a durable thread per member with `codex_app.create_thread` - ALWAYS this tool for every
-   member, never a spawned agent - titled `[team name] <member name>`, using THAT member's own
-   name (its role / what it watches), so no two threads share a title. `add-member` prints the
-   exact title to use. If `codex_app.create_thread` accepts a working directory / cwd argument,
-   set it to that member's worktree; otherwise the member's manual tells it to `cd` there first.
-   Use `codex_app.set_thread_title` if the title did not land at creation.
-   If Codex returns only `pendingWorktreeId`, the worktree-backed thread is not ready yet: do not
-   `bind-thread` and do not send the member bootstrap. Wait until Codex surfaces a real `threadId`
-   or the thread appears in the thread list, then set the title, bind that real id with the cwd,
-   and only then send the bootstrap.
-3. `bind-thread` to record each thread id (and `--cwd`), then send that member's bootstrap
-   trigger (printed by `add-member` / `member-prompt`) as the thread's first message. The trigger
-   is short on purpose: it tells the new thread to READ its `guide.md` and `team.json` rather than
-   carrying the whole protocol inline.
-4. Whenever you report, audit, reopen, or hand off a member thread, include the app deep link
-   `codex://threads/<thread_id>` next to the raw id. For example:
-   `codex://threads/019ef350-ee78-72a3-bd5e-e40cebc3d814`. Worktree-backed threads are easy to
-   lose in the sidebar without this link.
-
-Every team member is a real Codex thread created with `codex_app.create_thread` - this is strict,
-not a preference. NEVER substitute a spawned in-process subagent (`multi_agent_v1.spawn_agent` or flat `spawn_agent`)
-for a team member: a spawned agent is an ephemeral helper that does not show up as a team thread,
-cannot carry the `[team name] <member name>` title, and cannot be inspected, titled, archived, or
-re-opened with the `codex_app.*` thread tools - which defeats the entire point of a durable team.
-A member only counts once you have `bind-thread`-ed it to a real `codex_app.create_thread` thread
-id. If the thread-creation tool is unavailable, STOP and say so (see Stop rules); do not quietly
-fall back to a spawned agent.
+safe to run independent `add-member`, `bind-agent`, `bind-thread`, `set-status`, `archive`,
+`delete`, `guide`, and worktree mutation commands concurrently against the same team: they
+serialize and each command reads the latest committed state before writing. If a command reports
+that team state is locked, do not treat the intended mutation as complete; retry after the named
+command finishes, or inspect `.omo/teams/{session_id}/.team.lock/owner.json` if the previous
+command crashed. `bind-agent` refuses codex_app teams and `bind-thread` refuses multi_agent_v2
+teams, and a refused command never changes `team.json`.
+
+## Create the team and its members
+
+`init` the team, then `add-member` once per member. What happens next depends on the transport.
+
+**MultiAgentV2 teams:**
+1. If a member needs an isolated worktree, run `worktree-add` BEFORE spawning it - flat
+   `spawn_agent` has no cwd argument, so the path must ride in the bootstrap message.
+2. Spawn each member with flat `spawn_agent`: `task_name` is that member's `--task-name`,
+   `message` is the bootstrap printed by `add-member` / `member-prompt`, and
+   `fork_turns: "none"` (members read `guide.md` for context; full parent history is not
+   their context model). Do not set `agent_type`, `model`, or `reasoning_effort`.
+3. `bind-agent --agent-path` with the canonical task name the spawn returned (normally
+   `/root/<task_name>`); binding confirms the runtime identity matches the roster and records
+   the member's cwd. Members are durable: they persist as subagent threads, survive idling,
+   and are re-tasked with `followup_task` - never respawned under a second name.
+4. Members appear in `list_agents` with their task paths; inspect status there instead of
+   deep links (V2 exposes no thread title or `codex://` link surface to you).
+
+**Codex App teams:**
+1. Create a durable thread per member with `codex_app.create_thread` - ALWAYS this tool for
+   every member - titled `[team name] <member name>`, using THAT member's own name, so no two
+   threads share a title. `add-member` prints the exact title to use. If the tool accepts a
+   working directory / cwd argument, set it to that member's worktree; otherwise the member's
+   manual tells it to `cd` there first. Use `codex_app.set_thread_title` if the title did not
+   land at creation. If Codex returns only `pendingWorktreeId`, the worktree-backed thread is
+   not ready yet: do not `bind-thread` and do not send the member bootstrap. Wait until Codex
+   surfaces a real `threadId`, then set the title, bind that real id with the cwd, and only
+   then send the bootstrap.
+2. `bind-thread` to record each thread id (and `--cwd`), then send that member's bootstrap
+   trigger as the thread's first message. The trigger is short on purpose: it tells the new
+   thread to READ its `guide.md` and `team.json` rather than carrying the whole protocol inline.
+3. Whenever you report, audit, reopen, or hand off a member thread, include the app deep link
+   `codex://threads/<thread_id>` next to the raw id - worktree-backed threads are easy to lose
+   in the sidebar without it. On a codex_app team, a spawned in-process agent is never a
+   member substitute: it cannot carry the team title or be inspected, titled, archived, or
+   re-opened with the `codex_app.*` tools this team runs on.
+
+On either transport, a member only counts once it is bound (`bind-agent` / `bind-thread`). If
+the selected transport's tools stop working mid-run, STOP and say so (see Stop rules); do not
+quietly switch transports.
 
 ## Communication
 
-Members push to you and to one another with `codex_app.send_message_to_thread`; you inspect their
-state with `codex_app.read_thread`. So members can actually reach you, run `init` with
-`--session <your own thread id>` - that makes `leader.sessionId` in team.json a real, messageable
-thread; without it members cannot report to you and you are stuck polling. The generated manual binds
-members to the hard rules, so you mainly keep the channel open: expect frequent small inbound updates
-from each member - findings, `WORKING:`/`BLOCKED:` markers, peer digests - rather than one final
-dump, and act on them as they arrive. All member-to-member and member-to-leader traffic is in English;
-when the END user addresses a member, that member replies in the user's own language. Members hand off
-files and memos through the team `artifacts/` directory and reference them by path.
+Members push to you and to one another; you never poll them as a routine. The address book is
+`team.json`, and the generated manual binds members to the hard rules, so you mainly keep the
+channel open: expect frequent small inbound updates from each member - findings,
+`WORKING:`/`BLOCKED:` markers, peer digests - rather than one final dump, and act on them as
+they arrive.
+
+- **MultiAgentV2:** members reach you with `send_message` to `/root` and reach peers by their
+  `members[].agentPath`. You reach members the same way; use `followup_task` when you hand an
+  idle member NEW work (it wakes the member), `send_message` for context that should not
+  interrupt, and `wait_agent` only when you are genuinely blocked on their next update - a
+  `wait_agent` timeout only means no new mailbox update arrived, never that a member failed.
+  Your own session IS `/root` - members can always reach you; leave `--session` unset.
+- **Codex App:** members push with `codex_app.send_message_to_thread`; you inspect state with
+  `codex_app.read_thread`. So members can actually reach you, run `init` with
+  `--session <your own thread id>` - that makes `leader.sessionId` in team.json a real,
+  messageable thread; without it members cannot report to you and you are stuck polling.
+
+All member-to-member and member-to-leader traffic is in English; when the END user addresses a
+member, that member replies in the user's own language. Members hand off files and memos
+through the team `artifacts/` directory and reference them by path.
 
 ## Let members work - do not rush them
 
 Members heartbeat every few tool calls and message you on every finding, blocker, and finished
 slice (their manual binds them to this). So a member that is quiet between heartbeats is **working,
 not stalled** - a stretch of silence is the normal sound of focused work, not a problem to chase.
-Re-reading `codex_app.read_thread` to check on a calm member, or sending "any update?" / "are you
-done?" / "hurry up" pings, interrupts that member and slows the whole team. Trust the heartbeat and
-let them cook.
+Re-reading a calm member's state, or sending "any update?" / "are you done?" / "hurry up" pings,
+interrupts that member and slows the whole team. Trust the heartbeat and let them cook.
 
 Message a member only when one of these is true:
 - you have new information, context, or a correction it needs to do its slice right;
@@ -147,7 +199,9 @@ Message a member only when one of these is true:
   then send one specific question, not a barrage.
 
 Otherwise stay calm and keep the channel open: read inbound updates as they arrive and act on them.
-A long-running member is alive; a heartbeat you have not received yet is not a failure. Wait for
+A long-running member is alive; a heartbeat you have not received yet is not a failure. Fallback only when
+a member is completed without its deliverable, explicitly `BLOCKED:`, or no longer running - then
+unblock, reassign, or re-task that slice instead of waiting on it. Wait for
 every required member's final report before you declare the team done - rushing toward "done" while
 members are still mid-slice just produces half-built work you will have to redo.
 
@@ -162,10 +216,12 @@ its own worktree. To land the work, `integrate --team <id>` merges every member
 current branch with a merge commit (never a squash or rebase); resolve any conflict it reports, then
 `worktree-remove` each worktree at cleanup.
 
-After `worktree-add`, immediately send the member a follow-up that includes both its assigned
-worktree path and its `codex://threads/<thread_id>` link. Use `bind-thread --cwd <worktree>` or
-`--worktree-path <worktree>` after the thread exists so `team.json`, `guide.md`, `status`, and
-`member-prompt` all point at the same worktree-backed thread.
+Delivering the path differs by transport: on MultiAgentV2, create the worktree BEFORE spawning
+so the bootstrap carries it, or send it to an already-running member as a `followup_task`; on
+Codex App, send a follow-up message that includes both the worktree path and the member's
+`codex://threads/<thread_id>` link. Either way, run `bind-agent`/`bind-thread` with
+`--cwd <worktree>` (or `--worktree-path`) so `team.json`, `guide.md`, `status`, and
+`member-prompt` all point at the same worktree-backed member.
 
 When the member starts inside a worktree, it must verify the assigned cwd exists and contains the
 repository checkout before editing. If the directory is missing, empty, or does not look like a git
@@ -194,8 +250,11 @@ then delete the team state only after archival evidence is clean or preserved. A
 is never disbanded is a leak.
 
 - `archive` closes the team: notify each active member, copy anything useful into `artifacts/`,
-  then try to archive each member thread with `codex_app.set_thread_archived`. Treat Codex App
-  failures such as "Ambiguous Codex thread id" or a thread id that is ambiguous across hosts as an
+  then close each member on its transport. On MultiAgentV2, `interrupt_agent` any member still
+  mid-turn and record in the note that V2 exposes no runtime archive operation - the durable
+  `team.json` state IS the archive; never claim a V2 agent itself was archived. On Codex App,
+  try `codex_app.set_thread_archived` per member thread; treat failures such as
+  "Ambiguous Codex thread id" or an id that is ambiguous across hosts as an
   app-thread archival blocker, not as a team-state blocker: record the failure in the team log,
   tell the user which member thread was not proven archived, and continue the team-state archive
   with `archive --note "<blocker>"`. Never pretend a member thread was archived. Do not delete the
@@ -212,5 +271,6 @@ is never disbanded is a leak.
 - Stop and ask before deleting an unarchived team while any member is still active.
 - Member communication stays English unless the user explicitly requests otherwise; user-facing
   replies follow the user's language.
-- Stop if the requested operation needs Codex thread tools (create/read/send/title/archive) and
-  they are unavailable; say so instead of faking it.
+- Stop if the selected transport's tools (V2 spawn/message/wait/list/interrupt, or Codex App
+  create/read/send/title/archive) are unavailable or stop working; say so instead of faking it
+  or silently switching transports.