fix(subagent): remove the workspace-wide coordination lock

The v3 transaction lock and per-writer boot leases already own coordination.
Remove the lifetime process lock and its read-only fallback so one stale
session cannot keep later sessions read-only. Retry failed store admission
on later delegated writes, preserving image validation and lease ownership.

Pin an admitted Windows workspace directory without delete sharing. Keep
ordinary directory handles unchanged for plugin staging. The pin protects
the workspace and its ancestors, not children under .codewhale; that residual
boundary remains explicit in the review and release acceptance.

Integrated from 9a1e8e3b9f993a6adad30ad26d17a6d16e90737c; preserve the
original candidate and historical evidence. Updated lifecycle/architecture
docs, conformance fixtures, call sites and mirrored release notes together.

Validation on the integrated source: formatting, preflight and diff checks
passed (121 dead-code suppressions, 665 blocking sites, 244 runtime routes).
Independent source review approved. Focused Linux tests are running; exact
Windows convergence PASS and app-server compilation on all three platforms
remain required before landing. Earlier test counts are historical and are
not claimed for this integrated candidate.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
Co-Authored-By: Claude Sonnet 5.5 <[email protected]>

CHANGELOG.md

@@ -7,12 +7,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+- **Plugin index hooks:** hooks with the same name and event now have distinct row IDs, so clients can keep every configured hook visible.
+
 - **Renaming sessions with Chinese titles:** the session picker no longer rejects a Chinese, Japanese, Korean or emoji title of more than about 33 characters as "Title must be 1–100 characters". It now counts characters, as the message says and as `/rename` and the Runtime API already did, so any title up to 100 characters is accepted. Thanks [@luochen211](https://github.com/luochen211) (PR 7322).
 - **Non-ASCII file names:** `/diff`, the `@git` and `@diff` mentions and the Runtime API workspace diff now show paths with Chinese, emoji and other non-ASCII characters as written instead of as quoted octal escapes, and the turn context no longer lists the workspace root as an empty "Active paths" entry. Thanks [@luochen211](https://github.com/luochen211) (PR 7317).
 - **Session names after a crash, and keep-forever snapshot retention:** a session name saved right after a crash that cut off the previous session-index line is no longer lost, because the new entry now starts on its own line; and a very large `[snapshots] max_age_days` (such as `9223372036854775807` for "keep forever") no longer wraps around and deletes every undo snapshot at session start. Thanks [@luochen211](https://github.com/luochen211) (PR 7316).
 - **Blank environment variables:** exporting a variable empty (for example `CODEWHALE_MODEL=` from a compose `${VAR:-}` template) no longer hides its legacy alias. `DEEPSEEK_MODEL`, `DEEPSEEK_BASE_URL`, `KIMI_BASE_URL`, `DEEPSEEK_FORCE_HTTP1`, `DEEPSEEK_STREAM_OPEN_TIMEOUT_SECS` and the other provider alias variables now apply as they do when the primary is unset. Thanks [@luochen211](https://github.com/luochen211) (PR 7315).
 - **MCP and language servers that send requests mid-call:** a tool call no longer fails with "neither a result nor an error" when an MCP server sends a `ping` or other request that reuses the call's id while the call is running, and a language server's `workspace/configuration` or similar request no longer ends a pending LSP request. Codewhale now answers `ping`, answers other server requests with "Method not found" (it never advertised them), keeps waiting for the real reply, and a refused answer over Streamable HTTP no longer drops the connection to legacy SSE. Thanks [@luochen211](https://github.com/luochen211) (PR 7319).
 - **Qwen Code as an external agent:** Codewhale now finds an installed Qwen Code CLI (`qwen`, 0.6.1 or newer) and can run it as a session over ACP with `qwen --acp`. `GET /v1/agents/external` lists it, an older install is reported as needing `npm i -g @qwen-code/qwen-code@latest`, and sign-in stays inside Qwen Code (`/auth`). Thanks [@MannXo](https://github.com/MannXo) (#7293).
+- **Qwen Code as an external agent:** Codewhale now finds an installed Qwen Code CLI (`qwen`, 0.6.1 or newer) and can run it as a session over ACP with `qwen --acp`. `GET /v1/agents/external` lists it, an older install is reported as needing `npm i -g @qwen-code/qwen-code@latest`, and sign-in stays inside Qwen Code (`/auth`). Thanks [@MannXo](https://github.com/MannXo) (PR 7293).
+- **Telemetry setting default:** the settings schema API reports telemetry's default as on, matching what Codewhale does when you have not chosen.
+- **Auto routing abstention:** when the decision model marks a tier, effort or shadow answer `abstained: true`, Auto no longer acts on it, even with `min_confidence = 0`: an abstained tier takes the local fallback, an abstained effort keeps the tier and drops only the effort, and the routing receipt lists the abstained questions.
+- **Plugin index (Runtime API):** a new `GET /v1/apps/plugin-index` route lists plugins, skills, connectors, hooks and hand-written commands with kind, source and state, and `/v1/commands` rows say which plugin (`plugin_id`) added a command and whether a command came from the project (`workspace_sourced`) (CW-8092).
+- **Model commands and routing:** `codewhale model list` now lists every custom endpoint you have configured, under its own name. `codewhale model resolve` no longer refuses a model on a custom endpoint, router or local server whose model list has not been fetched yet; once a list is fetched, a model missing from it is still refused. Automatic routing marks a context window as verified only when the route itself supplies it, and no longer reports a guessed output limit.
+- **ACP:** when a plugin tool asks the core to run a tool that needs approval, the editor now gets a `session/request_permission` on the plugin tool's call that names the nested tool and its input; before, the prompt ended with an internal error (CW-8050).
 - **README and contributor credit:** the repository front page now opens the way the website does: the line "The model can be anyone's. The agent should be yours.", one sentence on what Codewhale is, the install command and one picture, with reference detail moved into the linked guides; the 18 translated READMEs follow the same structure and say they are machine-drafted. The contributor wall and the website now count the same 433 people (407 GitHub accounts and the commit authors whose email is not linked to an account), where the website had counted accounts only. `DEPENDENCY_SECURITY.md` moved into `docs/dependency-maintenance.md`, and `.github/SUPPORT.md` says where to ask for help.
 - **Website Plugins page:** The website's Plugins page now describes what the released version does, and a labelled section says what 0.10.3 adds: one Plugins place, Standard and Creator mode, and the Permissions control.
 - **First-time guide on the website:** a new docs page, "Use Codewhale for the first time" (`/docs/first-time`, English and Simplified Chinese), walks someone who has never used a terminal through opening one, installing, choosing the folder Codewhale works in and when that choice matters, opening a terminal in a folder from Finder or File Explorer, connecting a model, a first task, and stopping, undoing and quitting. The install page gains a short "New to the terminal?" block for macOS and Windows that links to it, and `llms.txt` carries the same steps.
@@ -676,7 +684,7 @@ work is declared complete here. Items moved to 0.10.4 by name are marked below.
 - **Windows uninstall removes the receipt and update leftovers.** The installer's uninstaller also deletes `.codewhale-install.sha256` and `codewhale.old-*`/`codew.old-*` left by a self-update, so `bin` can be removed. Refs #7091.
 - **Windows `/undo` matches recorded file paths regardless of case.** A write recorded under a different drive-letter or directory case, or a `\\?\` prefix, is no longer dropped from the restore plan. Refs #6970.
 - **Windows: Fleet and metrics read live files again.** Replaying a Fleet ledger and reading audit or receipt records no longer fail with a sharing violation while their writer is still open; the same regular-file, link and identity checks apply. Plugin enablement now says which snapshot check refused (stage root, content identity or final check) instead of one generic message. Generated protocol and SDK exports keep LF line endings in Windows checkouts.
-- **A held coordination lock no longer makes a new session read-only.** When another session owns the delegated-agent store, the new session starts on private state and says so, instead of refusing every sub-agent with “Failed to clean up sub-agents”.
+- **Sessions in one folder no longer leave each other's sub-agents read-only or private:** a second session works beside another one, stale or suspended included, the older sub-agent store upgrades right away, and a store that cannot be opened is retried on the next sub-agent change instead of needing a restart. While another Codewhale session, a suspended one included, is open in a folder the desktop app or `serve` was asked to work in (other than the folder it started in), that Runtime still refuses sub-agents that would edit the folder directly; isolated worktrees are unaffected. A sub-agent store that cannot be opened shows its refusal once instead of repeating cleanup warnings on every sidebar refresh. Restart any session started with Codewhale 0.10.2 or older: once the folder upgrades it can no longer save sub-agent state (Refs #7232).
 - **A dev server can outlive the turn in an interactive session.** `persist:true` now works in the TUI and desktop when the thread has Full Access; restricted postures and Fleet/sub-agents still refuse it.
 - **`codewhale exec --add-dir <path>`** (repeatable) and `addDirs` on `POST /v1/threads` let the file tools read and write a sibling directory, a second checkout or a shared scratch root without turning on Full Access.
 - **Unsettled usage is persisted in production, not only in tests.** The interactive sink now records a legacy usage receipt when a provider response has no settlement, so children and turns stop reporting settlement failure.
@@ -713,12 +721,6 @@ work is declared complete here. Items moved to 0.10.4 by name are marked below.
   composer. Real Pinyin input on macOS and Windows is not yet confirmed.
   Thanks [@cmdcorp6534](https://github.com/cmdcorp6534) for the report
   (Refs #2323).
-- **Sub-agents beside an older session:** while a Codewhale 0.10.2 session
-  still uses a folder's older delegated-agent store, a 0.10.3 session in the
-  same folder keeps working sub-agents with private state that is not saved,
-  instead of refusing every sub-agent action. The older session's files are
-  left untouched, and the store upgrades when a session starts after the older
-  one exits (Refs #7232).
 - **Fleet members:** a replayed member start now matches only within its own
   session, so two sessions that reuse an operation key no longer receive each
   other's agent.
@@ -747,12 +749,6 @@ work is declared complete here. Items moved to 0.10.4 by name are marked below.
   bare self-package exports resolve inside the selected package directory.
   Invalid or incompatible ranges and paths outside the reviewed package still
   refuse. Real published-plugin activation remains unqualified.
-- **Coordination lock diagnostics (#7232):** stale lock-file contents no longer
-  identify an owner PID. A refused legacy admission keeps its reason in Work
-  and shows one notice per cause instead of repeating cleanup warnings on
-  every sidebar refresh. Legacy migration still requires the actual holder to
-  exit and the refused owning Runtime to restart; locks and retained state
-  remain protected.
 - **A local proxy that stops mid-session no longer strands the session (#7231):** the model, catalog, search, vision, finance, MCP-registry, profile and remote-control clients watch a loopback proxy port and go direct while it refuses connections, then resume proxying when it returns. Only a definite refusal from every resolved address changes the route; remote proxies, `NO_PROXY` matches, credentials and the existing precedence are unchanged. Set `CODEWHALE_LOCAL_PROXY_FALLBACK=0` to keep the old build-time snapshot.
 - **Proxy diagnostic privacy ([#7233](https://github.com/codewhale-hq/codewhale/issues/7233)):** malformed MCP proxy warnings omit configured values; local-proxy log labels mask userinfo and omit URL paths, queries and fragments. Routing is unchanged. All 23 existing proxy tests passed on macOS; runtime log capture and other platforms remain unqualified. Thanks [@SparkofSpike](https://github.com/SparkofSpike) for the report.
 - **Fork, undo and retry work after a workspace drift notice (#7234):** the history-boundary walks now treat a whole `<context_update>` envelope as engine-owned, so a session that received one can be cut at every saved turn. A person quoting a notice or a truncated envelope still counts as their own prompt.

crates/app-server/src/acp_server/runtime.rs

@@ -47,6 +47,18 @@ impl Drop for TurnClaim {
         }
     }
 }
+fn admitted_call<'a>(
+    calls: &'a HashMap<String, PendingToolCall>,
+    execution: &str,
+) -> Option<(&'a str, &'a PendingToolCall)> {
+    let mut id = execution;
+    loop {
+        if let Some((key, call)) = calls.get_key_value(id) {
+            return Some((key.as_str(), call));
+        }
+        id = id.rsplit_once('.')?.0;
+    }
+}
 fn update(session: &str, update: acp::SessionUpdate) -> Outgoing {
     Outgoing::Update(acp::SessionNotification::new(session.to_string(), update))
 }
@@ -419,27 +431,50 @@ impl PromptRun {
                         && pending.turn_id == turn
                         && pending.tool_call_id.as_deref() == Some(execution)
                 }) {
-                    let call = calls
-                        .get(execution)
+                    let (shown, call) = admitted_call(calls, execution)
                         .ok_or_else(|| anyhow!("Approval projection lacks admitted tool start"))?;
                     let id = uuid::Uuid::new_v4().to_string();
-                    let title = tool_call_title(call);
-                    let text = p
+                    let nested = shown != execution;
+                    let nested_call;
+                    let shown_call = if nested {
+                        nested_call = PendingToolCall {
+                            execution_id: execution.to_string(),
+                            name: p
+                                .get("tool_name")
+                                .and_then(Value::as_str)
+                                .unwrap_or(&call.name)
+                                .to_string(),
+                            input: p.get("input").cloned().unwrap_or(Value::Null),
+                        };
+                        &nested_call
+                    } else {
+                        call
+                    };
+                    let title = tool_call_title(shown_call);
+                    let description = p
                         .get("description")
                         .and_then(Value::as_str)
-                        .filter(|text| !text.trim().is_empty())
-                        .map_or_else(|| title.clone(), str::to_string);
+                        .filter(|text| !text.trim().is_empty());
+                    let summary = p
+                        .get("summary")
+                        .and_then(Value::as_str)
+                        .filter(|text| nested && !text.trim().is_empty());
+                    let text = match (summary, description) {
+                        (Some(summary), Some(description)) => format!("{summary}\n{description}"),
+                        (Some(text), None) | (None, Some(text)) => text.to_string(),
+                        (None, None) => title.clone(),
+                    };
+                    let mut fields = acp::ToolCallUpdateFields::new()
+                        .title(title)
+                        .kind(tool_call_kind(shown_call))
+                        .raw_input((!shown_call.input.is_null()).then(|| shown_call.input.clone()))
+                        .content(vec![acp::ToolCallContent::from(text)]);
+                    if !nested {
+                        fields = fields.status(acp::ToolCallStatus::Pending);
+                    }
                     let request = acp::RequestPermissionRequest::new(
                         session.to_string(),
-                        acp::ToolCallUpdate::new(
-                            execution.to_string(),
-                            acp::ToolCallUpdateFields::new()
-                                .title(title)
-                                .kind(tool_call_kind(call))
-                                .status(acp::ToolCallStatus::Pending)
-                                .raw_input((!call.input.is_null()).then(|| call.input.clone()))
-                                .content(vec![acp::ToolCallContent::from(text)]),
-                        ),
+                        acp::ToolCallUpdate::new(shown.to_string(), fields),
                         vec![
                             acp::PermissionOption::new(
                                 "allow-once",

crates/app-server/src/runtime_api.rs

@@ -129,6 +129,7 @@ mod members;
 mod memory_lens;
 mod mobile;
 mod plans;
+mod plugin_index;
 mod plugins;
 pub(crate) mod review;
 mod secrets;
@@ -386,7 +387,7 @@ impl RuntimeWorkspaceScopes {
         let owner = self.clone();
         codewhale_runtime::runtime_control::owner_work(move || {
             let (canonical, directory) =
-                codewhale_util::workspace_dir::open_workspace_directory(&lexical)?;
+                codewhale_util::workspace_dir::open_pinned_workspace_directory(&lexical)?;
             let directory = Arc::new(directory);
             let mut scopes = owner.scopes.lock();
             if let Some(scope) = scopes.get(&lexical) {
@@ -3372,6 +3373,7 @@ pub fn build_router(state: RuntimeApiState) -> Router {
         .route("/v1/skills/{name}/audit", get(audit_skill_api))
         .route("/v1/apps/mcp/tools", get(list_mcp_tools))
         .route("/v1/apps/plugins", get(plugins::list_plugins))
+        .route("/v1/apps/plugin-index", get(plugin_index::get_plugin_index))
         .route("/v1/apps/avatars", get(avatars::list_avatars))
         .route(
             "/v1/apps/avatars/{handle}/atlases/{page}",
@@ -5875,6 +5877,10 @@ struct CommandCatalogEntry {
     #[serde(skip_serializing_if = "Option::is_none")]
     origin: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
+    plugin_id: Option<String>,
+    #[serde(skip_serializing_if = "std::ops::Not::not")]
+    workspace_sourced: bool,
+    #[serde(skip_serializing_if = "Option::is_none")]
     registration_id: Option<String>,
 }
 
@@ -5933,6 +5939,8 @@ fn command_catalog(
             shadowed_by,
             shadowed_aliases,
             origin: None,
+            plugin_id: None,
+            workspace_sourced: false,
             registration_id: None,
         });
     }
@@ -5956,6 +5964,8 @@ fn command_catalog(
             shadowed_by: None,
             shadowed_aliases: Vec::new(),
             origin: None,
+            plugin_id: command.plugin_id.clone(),
+            workspace_sourced: command.workspace_sourced,
             registration_id: None,
         });
     }
@@ -6038,6 +6048,8 @@ async fn list_commands(
                 shadowed_by: None,
                 shadowed_aliases: Vec::new(),
                 origin: Some(reference.origin.clone()),
+                plugin_id: Some(reference.plugin_id.clone()),
+                workspace_sourced: false,
                 registration_id: query
                     .thread_id
                     .as_deref()

crates/app-server/src/runtime_api/plugin_index.rs

@@ -0,0 +1,489 @@
+use std::collections::{BTreeSet, HashMap};
+use std::path::{Path as FsPath, PathBuf};
+
+use axum::Json;
+use axum::extract::{Query, State};
+use serde::Serialize;
+use serde_json::Value;
+
+use super::plugins::{self, PluginSummaryEntry};
+use super::{ApiError, CommandsQuery, HooksQuery, RuntimeApiState};
+
+const MAX_ADDED_NAMES: usize = 512;
+
+#[derive(Debug, Serialize)]
+pub(super) struct PluginIndexResponse {
+    workspace: String,
+    items: Vec<IndexItem>,
+    unavailable: Vec<IndexNote>,
+    problems: Vec<IndexNote>,
+}
+
+#[derive(Debug, Serialize)]
+struct IndexNote {
+    kind: &'static str,
+    message: String,
+}
+
+#[derive(Debug, Serialize)]
+struct IndexItem {
+    id: String,
+    kind: &'static str,
+    name: String,
+    description: Option<String>,
+    source: &'static str,
+    state: &'static str,
+    labels: Vec<&'static str>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    plugin: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    adds: Option<PluginAdds>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    tier: Option<&'static str>,
+    owner: &'static str,
+    row: Value,
+}
+
+#[derive(Debug, Default, Serialize)]
+struct PluginAdds {
+    skills: Vec<String>,
+    connectors: Vec<String>,
+    hooks: Vec<String>,
+    commands: Vec<String>,
+    profiles: Vec<String>,
+}
+
+impl PluginAdds {
+    fn labels(&self, entry: &PluginSummaryEntry) -> Vec<&'static str> {
+        [
+            ("skill", !self.skills.is_empty()),
+            ("connector", !self.connectors.is_empty()),
+            ("hook", !self.hooks.is_empty()),
+            ("command", !self.commands.is_empty()),
+            (
+                "tool",
+                entry.inventory.native > 0 || entry.inventory.lsp > 0,
+            ),
+            ("profile", !self.profiles.is_empty()),
+        ]
+        .into_iter()
+        .filter_map(|(label, present)| present.then_some(label))
+        .collect()
+    }
+}
+
+fn row_value<T: Serialize>(row: &T) -> Value {
+    serde_json::to_value(row).unwrap_or(Value::Null)
+}
+
+fn note_failure(unavailable: &mut Vec<IndexNote>, kind: &'static str, error: &ApiError) {
+    unavailable.push(IndexNote {
+        kind,
+        message: error.message.clone(),
+    });
+}
+
+fn plugin_source(origin: &str) -> &'static str {
+    match origin {
+        "codewhale-builtin" => "built_in",
+        "workspace-codewhale" => "project",
+        _ => "user",
+    }
+}
+
+fn plugin_state(entry: &PluginSummaryEntry) -> &'static str {
+    if matches!(
+        entry.trust_status,
+        "content-changed" | "capabilities-changed"
+    ) || entry.state == "enabled-untrusted"
+    {
+        return "needs_review";
+    }
+    match entry.state {
+        "active" => "enabled",
+        "disabled" => "disabled",
+        _ => "unavailable",
+    }
+}
+
+fn add_stem(names: &mut BTreeSet<String>, path: &FsPath, extension: Option<&str>, lowercase: bool) {
+    if let Some(wanted) = extension
+        && path.extension().and_then(|value| value.to_str()) != Some(wanted)
+    {
+        return;
+    }
+    if let Some(stem) = path.file_stem().and_then(|value| value.to_str()) {
+        names.insert(if lowercase {
+            stem.to_lowercase()
+        } else {
+            stem.to_string()
+        });
+    }
+}
+
+async fn component_names(
+    paths: &[PathBuf],
+    extension: Option<&str>,
+    lowercase: bool,
+    omitted: &mut bool,
+) -> Vec<String> {
+    let mut names = BTreeSet::new();
+    for path in paths {
+        let Ok(meta) = tokio::fs::symlink_metadata(path).await else {
+            continue;
+        };
+        if meta.is_file() {
+            add_stem(&mut names, path, extension, lowercase);
+        } else if meta.is_dir()
+            && let Ok(mut entries) = tokio::fs::read_dir(path).await
+        {
+            let mut seen = 0;
+            while let Ok(Some(entry)) = entries.next_entry().await {
+                seen += 1;
+                if seen > MAX_ADDED_NAMES {
+                    *omitted = true;
+                    break;
+                }
+                if entry.file_type().await.is_ok_and(|kind| kind.is_file()) {
+                    add_stem(&mut names, &entry.path(), extension, lowercase);
+                }
+            }
+        }
+        if names.len() >= MAX_ADDED_NAMES {
+            *omitted = true;
+            break;
+        }
+    }
+    if names.iter().any(|name| name.chars().any(char::is_control)) {
+        *omitted = true;
+        names.retain(|name| !name.chars().any(char::is_control));
+    }
+    names.into_iter().take(MAX_ADDED_NAMES).collect()
+}
+
+async fn plugin_adds(
+    plugin: &codewhale_plugins::types::LoadedPlugin,
+    omitted: &mut bool,
+) -> PluginAdds {
+    let mut skills: Vec<String> = plugin
+        .skill_snapshots
+        .iter()
+        .map(|skill| skill.name.clone())
+        .collect();
+    skills.sort();
+    let mut connectors: Vec<String> = plugin
+        .manifest
+        .mcp_servers
+        .as_ref()
+        .map(|servers| servers.keys().cloned().collect())
+        .unwrap_or_default();
+    connectors.sort();
+    PluginAdds {
+        skills,
+        connectors,
+        hooks: component_names(&plugin.components.hooks, None, false, omitted).await,
+        commands: component_names(&plugin.components.commands, Some("md"), true, omitted).await,
+        profiles: component_names(&plugin.components.agents, Some("toml"), false, omitted).await,
+    }
+}
+
+async fn plugin_adds_by_id(
+    state: &RuntimeApiState,
+    omitted: &mut BTreeSet<String>,
+) -> HashMap<String, PluginAdds> {
+    let registry = state
+        .plugin_discovery
+        .registry_for_workspace(&state.workspace);
+    let mut adds = HashMap::new();
+    for plugin in registry.list() {
+        let mut cut = false;
+        adds.insert(
+            plugin.id.as_str().to_string(),
+            plugin_adds(plugin, &mut cut).await,
+        );
+        if cut {
+            omitted.insert(plugin.name().to_string());
+        }
+    }
+    adds
+}
+
+fn skill_source(
+    path: Option<&PathBuf>,
+    is_bundled: bool,
+    skills_dir: &FsPath,
+    workspace: &FsPath,
+) -> &'static str {
+    if is_bundled {
+        return "built_in";
+    }
+    match path {
+        Some(path) if path.starts_with(skills_dir) => "user",
+        Some(path) if path.starts_with(workspace) => "project",
+        Some(_) => "other_app",
+        None => "plugin",
+    }
+}
+
+pub(super) async fn get_plugin_index(
+    State(state): State<RuntimeApiState>,
+) -> Result<Json<PluginIndexResponse>, ApiError> {
+    let mut items = Vec::new();
+    let mut unavailable = Vec::new();
+    let mut problems = Vec::new();
+
+    let commands = super::list_commands(
+        State(state.clone()),
+        Query(CommandsQuery { thread_id: None }),
+    )
+    .await;
+    let mut plugin_commands: HashMap<String, BTreeSet<String>> = HashMap::new();
+    if let Ok(Json(response)) = &commands {
+        for command in &response.commands {
+            if let (Some(plugin_id), "user") = (command.plugin_id.as_ref(), command.kind) {
+                plugin_commands
+                    .entry(plugin_id.clone())
+                    .or_default()
+                    .insert(command.name.clone());
+            }
+        }
+    }
+
+    match plugins::list_plugins(State(state.clone())).await {
+        Ok(Json(response)) => {
+            let mut omitted = BTreeSet::new();
+            let mut adds_by_id = plugin_adds_by_id(&state, &mut omitted).await;
+            for name in &omitted {
+                problems.push(IndexNote {
+                    kind: "plugin",
+                    message: format!(
+                        "plugin '{name}' adds more files than are listed, or a file name with control characters; some names are left out of `adds`"
+                    ),
+                });
+            }
+            for diagnostic in &response.registry_diagnostics {
+                problems.push(IndexNote {
+                    kind: "plugin",
+                    message: diagnostic.message.clone(),
+                });
+            }
+            for entry in &response.plugins {
+                let mut adds = adds_by_id.remove(&entry.id);
+                if entry.state == "active"
+                    && commands.is_ok()
+                    && let Some(adds) = adds.as_mut()
+                {
+                    adds.commands = plugin_commands
+                        .remove(&entry.id)
+                        .map(|names| names.into_iter().collect())
+                        .unwrap_or_default();
+                }
+                items.push(IndexItem {
+                    id: format!("plugin:{}", entry.id),
+                    kind: "plugin",
+                    name: entry
+                        .display_name
+                        .clone()
+                        .unwrap_or_else(|| entry.name.clone()),
+                    description: entry.description.clone(),
+                    source: plugin_source(entry.origin),
+                    state: plugin_state(entry),
+                    labels: adds
+                        .as_ref()
+                        .map(|adds| adds.labels(entry))
+                        .unwrap_or_default(),
+                    plugin: None,
+                    adds,
+                    tier: None,
+                    owner: "/v1/apps/plugins",
+                    row: row_value(entry),
+                });
+            }
+        }
+        Err(error) => note_failure(&mut unavailable, "plugin", &error),
+    }
+
+    match plugins::list_plugin_catalog(State(state.clone())).await {
+        Ok(Json(catalog)) => {
+            for (tier, rows) in [
+                ("builtin", &catalog.builtin),
+                ("experimental", &catalog.experimental),
+                ("more", &catalog.more),
+            ] {
+                for row in rows {
+                    items.push(IndexItem {
+                        id: format!("plugin:catalog:{}", row.id),
+                        kind: "plugin",
+                        name: row.title.clone(),
+                        description: row.description.clone(),
+                        source: "built_in",
+                        state: if !row.available {
+                            "unavailable"
+                        } else if row.enabled {
+                            "enabled"
+                        } else {
+                            "disabled"
+                        },
+                        labels: Vec::new(),
+                        plugin: None,
+                        adds: None,
+                        tier: Some(tier),
+                        owner: "/v1/apps/plugins/catalog",
+                        row: row_value(row),
+                    });
+                }
+            }
+        }
+        Err(error) => note_failure(&mut unavailable, "plugin", &error),
+    }
+
+    match super::list_skills(State(state.clone())).await {
+        Ok(Json(response)) => {
+            for warning in &response.warnings {
+                problems.push(IndexNote {
+                    kind: "skill",
+                    message: warning.clone(),
+                });
+            }
+            for skill in &response.skills {
+                if skill.plugin_id.is_some() {
+                    continue;
+                }
+                items.push(IndexItem {
+                    id: format!("skill:{}", skill.name),
+                    kind: "skill",
+                    name: skill.name.clone(),
+                    description: Some(skill.description.clone()),
+                    source: skill_source(
+                        skill.path.as_ref(),
+                        skill.is_bundled,
+                        &response.directory,
+                        &state.workspace,
+                    ),
+                    state: if skill.enabled { "enabled" } else { "disabled" },
+                    labels: vec!["skill"],
+                    plugin: None,
+                    adds: None,
+                    tier: None,
+                    owner: "/v1/skills",
+                    row: row_value(skill),
+                });
+            }
+        }
+        Err(error) => note_failure(&mut unavailable, "skill", &error),
+    }
+
+    match super::list_mcp_servers(State(state.clone())).await {
+        Ok(Json(response)) => {
+            for server in &response.servers {
+                let source = match server.origin {
+                    "plugin" => continue,
+                    "project" => "project",
+                    "runtime" => "runtime",
+                    _ => "user",
+                };
+                items.push(IndexItem {
+                    id: format!("connector:{}", server.name),
+                    kind: "connector",
+                    name: server.name.clone(),
+                    description: None,
+                    source,
+                    state: if !server.enabled {
+                        "disabled"
+                    } else if server.auth_required {
+                        "needs_sign_in"
+                    } else {
+                        "enabled"
+                    },
+                    labels: vec!["connector"],
+                    plugin: None,
+                    adds: None,
+                    tier: None,
+                    owner: "/v1/apps/mcp/servers",
+                    row: row_value(server),
+                });
+            }
+        }
+        Err(error) => note_failure(&mut unavailable, "connector", &error),
+    }
+
+    match super::list_hooks(State(state.clone()), Query(HooksQuery { thread_id: None })).await {
+        Ok(Json(response)) => {
+            for problem in &response.problems {
+                problems.push(IndexNote {
+                    kind: "hook",
+                    message: problem.clone(),
+                });
+            }
+            let mut ordinals: HashMap<&'static str, usize> = HashMap::new();
+            for hook in &response.hooks {
+                let ordinal = ordinals.entry(hook.event).or_default();
+                *ordinal += 1;
+                let source = match hook.source {
+                    "plugin" => continue,
+                    "project" => "project",
+                    _ => "user",
+                };
+                let name = hook
+                    .name
+                    .clone()
+                    .unwrap_or_else(|| format!("{} {}", hook.event, ordinal));
+                items.push(IndexItem {
+                    id: format!("hook:{source}:{}:{ordinal}", hook.event),
+                    kind: "hook",
+                    name,
+                    description: None,
+                    source,
+                    state: if response.enabled {
+                        "enabled"
+                    } else {
+                        "disabled"
+                    },
+                    labels: vec!["hook"],
+                    plugin: None,
+                    adds: None,
+                    tier: None,
+                    owner: "/v1/hooks",
+                    row: row_value(hook),
+                });
+            }
+        }
+        Err(error) => note_failure(&mut unavailable, "hook", &error),
+    }
+
+    match commands {
+        Ok(Json(response)) => {
+            for command in &response.commands {
+                let (source, plugin) = match (command.kind, command.plugin_id.as_ref()) {
+                    ("builtin", _) => continue,
+                    ("user", Some(_)) => continue,
+                    ("extension", plugin_id) => ("plugin", plugin_id.cloned()),
+                    _ if command.workspace_sourced => ("project", None),
+                    _ => ("user", None),
+                };
+                items.push(IndexItem {
+                    id: format!("command:{}", command.name),
+                    kind: "command",
+                    name: command.name.clone(),
+                    description: command.summary.clone(),
+                    source,
+                    state: "enabled",
+                    labels: vec!["command"],
+                    plugin,
+                    adds: None,
+                    tier: None,
+                    owner: "/v1/commands",
+                    row: row_value(command),
+                });
+            }
+        }
+        Err(error) => note_failure(&mut unavailable, "command", &error),
+    }
+
+    Ok(Json(PluginIndexResponse {
+        workspace: state.workspace.display().to_string(),
+        items,
+        unavailable,
+        problems,
+    }))
+}

crates/app-server/src/runtime_api/tests.rs

@@ -15,6 +15,7 @@ use tokio::sync::{Mutex, mpsc, oneshot};
 use tokio::time::sleep;
 use uuid::Uuid;
 
+mod catalog_parity;
 mod command_catalog;
 #[cfg(unix)]
 mod control_socket_selection;
@@ -28,6 +29,7 @@ mod headless_catalog;
 mod member_operations;
 #[cfg(unix)]
 mod owner_bootstrap;
+mod plugin_index;
 mod plugin_ui;
 mod profile_constitution;
 #[cfg(any(unix, windows))]

crates/app-server/src/runtime_api/tests/catalog_parity.rs

@@ -0,0 +1,600 @@
+use super::*;
+use codewhale_config::catalog::{
+    CatalogOffering, CatalogSource, CatalogStatus, ProviderCatalogDelta, base_url_fingerprint,
+    now_unix,
+};
+use codewhale_engine::cost_status::EffectiveRouteEnvelope;
+use codewhale_engine::model_inventory::ModelInventory;
+use codewhale_runtime::config::ProviderIdentity;
+use sha2::{Digest, Sha256};
+use std::collections::BTreeMap;
+
+const SINGULAR: &str = "model list / model resolve";
+const PLURAL: &str = "models";
+const RUNTIME: &str = "runtime api";
+const ROUTING: &str = "routing inventory";
+const COST: &str = "cost";
+const UNKNOWN: &str = "unknown";
+
+const ROSTER: &[&str] = &["claude-opus-5", "claude-haiku-4-5", "claude-parity-probe-1"];
+
+type Readings = BTreeMap<(String, String, &'static str), BTreeMap<&'static str, String>>;
+
+struct Route {
+    label: &'static str,
+    api_path: &'static str,
+    identity: ProviderIdentity,
+    base_url: String,
+    models: &'static [&'static str],
+}
+
+fn cold_process() {
+    codewhale_engine::provider_catalog_live::reset_cache_for_test();
+    codewhale_engine::provider_lake::clear_live_snapshot();
+}
+
+fn known<T: ToString>(value: Option<T>) -> String {
+    value.map_or_else(|| UNKNOWN.to_string(), |value| value.to_string())
+}
+
+fn rate(value: &Value) -> String {
+    let number = match value {
+        Value::Number(number) => number.as_f64(),
+        Value::String(text) => text.parse::<f64>().ok(),
+        _ => None,
+    };
+    known(number)
+}
+
+fn roster(mut models: Vec<String>) -> String {
+    models.sort();
+    models.dedup();
+    models.join(",")
+}
+
+fn read(
+    readings: &mut Readings,
+    route: &Route,
+    model: &str,
+    field: &'static str,
+    surface: &'static str,
+    value: String,
+) {
+    readings
+        .entry((route.label.to_string(), model.to_string(), field))
+        .or_default()
+        .insert(surface, value);
+}
+
+fn persist_id_only_roster(identity: &ProviderIdentity, base_url: &str) {
+    let fingerprint = base_url_fingerprint(base_url);
+    let fetched_at = now_unix();
+    let ticket = codewhale_engine::provider_catalog_live::begin_refresh_for_identity(
+        identity.provider,
+        identity.key.as_str(),
+        base_url,
+    );
+    assert_eq!(
+        codewhale_engine::provider_catalog_live::record_success_if_current(
+            &ticket,
+            ProviderCatalogDelta {
+                provider: identity.key.to_string(),
+                base_url_fingerprint: fingerprint.clone(),
+                fetched_at,
+                offerings: ROSTER
+                    .iter()
+                    .map(|id| CatalogOffering {
+                        provider: identity.key.to_string(),
+                        wire_model_id: (*id).to_string(),
+                        endpoint_key: "chat".into(),
+                        source: CatalogSource::Live {
+                            base_url_fingerprint: fingerprint.clone(),
+                            fetched_at,
+                        },
+                        ..Default::default()
+                    })
+                    .collect(),
+            },
+        ),
+        Some(CatalogStatus::Fresh)
+    );
+}
+
+fn read_singular(readings: &mut Readings, config_path: &Path, route: &Route) -> Result<()> {
+    cold_process();
+    let store = codewhale_config::ConfigStore::load(Some(config_path.to_path_buf()))?;
+    let listed =
+        codewhale_engine::route_preferences::list_models(&store, Some(route.identity.provider))?
+            .into_iter()
+            .find(|(listed, _)| listed == route.identity.key.as_str())
+            .map(|(_, models)| roster(models));
+    read(
+        readings,
+        route,
+        "*",
+        "roster",
+        SINGULAR,
+        listed.unwrap_or_else(|| "route not listed".into()),
+    );
+    for model in route.models {
+        let limits = codewhale_engine::route_preferences::resolve_model(
+            config_path,
+            route.identity.key.as_str(),
+            &route.base_url,
+            Some(model),
+        )
+        .map(|candidate| candidate.limits());
+        let (context, output) = match limits {
+            Ok(limits) => (known(limits.context_tokens), known(limits.output_tokens)),
+            Err(error) => (format!("refused: {error}"), format!("refused: {error}")),
+        };
+        read(readings, route, model, "limit.context", SINGULAR, context);
+        read(readings, route, model, "limit.output", SINGULAR, output);
+    }
+    Ok(())
+}
+
+fn read_plural(readings: &mut Readings, config: &Config, route: &Route) -> Result<()> {
+    cold_process();
+    codewhale_engine::models_dev_live::maybe_load_persisted_cache();
+    let mut route_config = config.clone();
+    route_config
+        .scope_to_provider_identity(&route.identity)
+        .map_err(anyhow::Error::msg)?;
+    read(
+        readings,
+        route,
+        "*",
+        "roster",
+        PLURAL,
+        roster(codewhale_engine::provider_lake::listed_models_for_route(
+            &route_config,
+            &route.identity,
+        )),
+    );
+    Ok(())
+}
+
+async fn read_runtime(
+    readings: &mut Readings,
+    client: &reqwest::Client,
+    addr: &SocketAddr,
+    route: &Route,
+) -> Result<()> {
+    let body: Value = client
+        .get(format!("http://{addr}/v1/providers/{}", route.api_path))
+        .send()
+        .await?
+        .error_for_status()?
+        .json()
+        .await?;
+    let models = body["models"].as_array().context("models array")?;
+    read(
+        readings,
+        route,
+        "*",
+        "roster",
+        RUNTIME,
+        roster(
+            models
+                .iter()
+                .filter_map(|model| model["id"].as_str().map(str::to_string))
+                .collect(),
+        ),
+    );
+    for model in route.models {
+        let facts = models
+            .iter()
+            .find(|entry| entry["id"] == *model)
+            .map_or(&Value::Null, |entry| &entry["facts"]);
+        read(
+            readings,
+            route,
+            model,
+            "limit.context",
+            RUNTIME,
+            known(facts["effective_limits"]["context_tokens"].as_u64()),
+        );
+        read(
+            readings,
+            route,
+            model,
+            "limit.output",
+            RUNTIME,
+            known(facts["effective_limits"]["output_tokens"].as_u64()),
+        );
+        read(
+            readings,
+            route,
+            model,
+            "window",
+            RUNTIME,
+            known(facts["effective_context"]["tokens"].as_u64()),
+        );
+        read(
+            readings,
+            route,
+            model,
+            "window.source",
+            RUNTIME,
+            known(facts["effective_context"]["source"].as_str()),
+        );
+        read(
+            readings,
+            route,
+            model,
+            "price.input",
+            RUNTIME,
+            rate(&facts["pricing"]["input_per_million"]),
+        );
+        read(
+            readings,
+            route,
+            model,
+            "price.output",
+            RUNTIME,
+            rate(&facts["pricing"]["output_per_million"]),
+        );
+        read(
+            readings,
+            route,
+            model,
+            "price.basis",
+            RUNTIME,
+            format!(
+                "provenance={} status={} source={}",
+                facts["pricing"]["provenance"], facts["pricing_status"], facts["source"]
+            ),
+        );
+    }
+    Ok(())
+}
+
+fn read_routing(readings: &mut Readings, config: &Config, route: &Route) -> Result<()> {
+    let inventory = ModelInventory::from_config(config).map_err(anyhow::Error::msg)?;
+    let candidates: Vec<_> = inventory
+        .candidates
+        .iter()
+        .filter(|candidate| candidate.identity == route.identity)
+        .collect();
+    read(
+        readings,
+        route,
+        "*",
+        "roster",
+        ROUTING,
+        roster(
+            candidates
+                .iter()
+                .map(|candidate| candidate.model.clone())
+                .collect(),
+        ),
+    );
+    for model in route.models {
+        let candidate = candidates
+            .iter()
+            .find(|candidate| candidate.model == *model);
+        read(
+            readings,
+            route,
+            model,
+            "window",
+            ROUTING,
+            known(candidate.map(|candidate| candidate.context_window)),
+        );
+        read(
+            readings,
+            route,
+            model,
+            "window.source",
+            ROUTING,
+            known(candidate.map(|candidate| {
+                if candidate.context_window_unverified {
+                    "unverified"
+                } else {
+                    "verified"
+                }
+            })),
+        );
+        read(
+            readings,
+            route,
+            model,
+            "limit.output",
+            ROUTING,
+            known(candidate.and_then(|candidate| candidate.max_output)),
+        );
+    }
+    Ok(())
+}
+
+fn read_cost(readings: &mut Readings, config: &Config, route: &Route) {
+    let usage = Usage {
+        input_tokens: 100_000,
+        output_tokens: 10_000,
+        ..Default::default()
+    };
+    for model in route.models {
+        let envelope = EffectiveRouteEnvelope::from_admitted(
+            Some(config),
+            &route.identity,
+            *model,
+            Some(&route.base_url),
+            chrono::Utc::now(),
+        );
+        let quote = envelope.provider_live_pricing.as_ref();
+        let audit = envelope.audit(&usage);
+        read(
+            readings,
+            route,
+            model,
+            "price.input",
+            COST,
+            quote
+                .and_then(|quote| quote.input_per_million.as_deref())
+                .map_or_else(|| UNKNOWN.to_string(), |text| rate(&json!(text))),
+        );
+        read(
+            readings,
+            route,
+            model,
+            "price.output",
+            COST,
+            quote
+                .and_then(|quote| quote.output_per_million.as_deref())
+                .map_or_else(|| UNKNOWN.to_string(), |text| rate(&json!(text))),
+        );
+        read(
+            readings,
+            route,
+            model,
+            "price.basis",
+            COST,
+            format!(
+                "provenance={:?} billing={:?} charge_usd={} unpriced={:?}",
+                quote.map(|quote| quote.provenance.clone()),
+                envelope.billing_mode,
+                known(audit.exact_usd.as_deref()),
+                audit.unpriced_reason,
+            ),
+        );
+    }
+}
+
+#[tokio::test]
+async fn one_captured_catalog_reads_the_same_on_every_model_surface() -> Result<()> {
+    let _env = lock_test_env();
+    let _live = codewhale_engine::provider_lake::lock_live_snapshot();
+    let root = tempfile::tempdir()?;
+    let captured = codewhale_config::catalog::BUNDLED_MODELS_DEV_JSON;
+    let catalog_path = root.path().join("captured-models-dev.json");
+    fs::write(&catalog_path, captured)?;
+    let _catalog = EnvVarGuard::set("CODEWHALE_MODELS_DEV_PATH", &catalog_path);
+    let _home = EnvVarGuard::set("CODEWHALE_HOME", root.path());
+    let _config_path = EnvVarGuard::remove("CODEWHALE_CONFIG_PATH");
+    let _legacy_config_path = EnvVarGuard::remove("DEEPSEEK_CONFIG_PATH");
+    let _cli = EnvVarGuard::remove(codewhale_config::CLI_API_KEY_ENV);
+    cold_process();
+
+    let config_path = root.path().join("config.toml");
+    fs::write(
+        &config_path,
+        r#"provider = "anthropic"
+
+[providers.anthropic]
+api_key = "parity-fixture-key"
+model = "claude-opus-5"
+
+[providers.zai]
+api_key = "parity-fixture-key"
+model = "GLM-5.3"
+
+[providers.lab]
+kind = "openai-compatible"
+base_url = "http://127.0.0.1:9/v1"
+api_key = "parity-fixture-key"
+model = "claude-haiku-4-5"
+"#,
+    )?;
+    let config = Config::load(Some(config_path.clone()), None)?;
+    let route = |label: &'static str,
+                 api_path: &'static str,
+                 key: &str,
+                 models: &'static [&'static str]|
+     -> Result<Route> {
+        let identity = config
+            .resolve_provider_pin_identity(key)
+            .map_err(anyhow::Error::msg)?;
+        Ok(Route {
+            label,
+            api_path,
+            base_url: config.base_url_for_route(&identity),
+            identity,
+            models,
+        })
+    };
+    let routes = [
+        route(
+            "anthropic (official, id-only roster)",
+            "anthropic/models",
+            "anthropic",
+            ROSTER,
+        )?,
+        route(
+            "lab (custom endpoint, same spelling)",
+            "custom/models?model_provider_id=lab",
+            "lab",
+            &["claude-haiku-4-5"],
+        )?,
+        route(
+            "zai (plan endpoint)",
+            "zai/models",
+            "zai",
+            &["GLM-5.3", "GLM-5.2"],
+        )?,
+    ];
+
+    assert!(
+        codewhale_engine::models_dev_live::refresh(false)
+            .await
+            .map_err(|error| anyhow::anyhow!("{error}"))?
+            > 0
+    );
+    persist_id_only_roster(&routes[0].identity, &routes[0].base_url);
+
+    let mut readings = Readings::new();
+    for route in &routes {
+        read_singular(&mut readings, &config_path, route)?;
+        read_plural(&mut readings, &config, route)?;
+    }
+    cold_process();
+    let (addr, _, handle) = spawn_test_server_with_config_path(config_path.clone())
+        .await?
+        .expect("loopback server required");
+    let client = codewhale_release::tls::reqwest_client();
+    for route in &routes {
+        read_runtime(&mut readings, &client, &addr, route).await?;
+        read_routing(&mut readings, &config, route)?;
+        read_cost(&mut readings, &config, route);
+    }
+    handle.abort();
+    cold_process();
+
+    println!(
+        "PARITY captured_catalog sha256={} bytes={}",
+        Sha256::digest(captured.as_bytes())
+            .iter()
+            .map(|byte| format!("{byte:02x}"))
+            .collect::<String>(),
+        captured.len()
+    );
+    let mut differing = Vec::new();
+    let mut known_differences: Vec<String> = Vec::new();
+    for ((route, model, field), surfaces) in &readings {
+        let mut values: Vec<String> = surfaces
+            .values()
+            .map(|value| {
+                if *field == "roster" {
+                    roster(
+                        value
+                            .to_ascii_lowercase()
+                            .split(',')
+                            .map(str::to_string)
+                            .collect(),
+                    )
+                } else {
+                    value.clone()
+                }
+            })
+            .collect();
+        values.sort();
+        values.dedup();
+        let compared = !matches!(*field, "price.basis" | "window.source");
+        let borrowed_window = *field == "window"
+            && surfaces.get(RUNTIME).map(String::as_str) == Some(UNKNOWN)
+            && readings
+                .get(&(route.clone(), model.clone(), "window.source"))
+                .and_then(|sources| sources.get(ROUTING))
+                .map(String::as_str)
+                == Some("unverified");
+        let verdict = if !compared {
+            "info"
+        } else if borrowed_window {
+            known_differences.push(format!("{route} | {model} | {surfaces:?}"));
+            "KNOWN-DIFFERENCE"
+        } else if values.len() == 1 {
+            "agree"
+        } else {
+            differing.push(format!("{route} | {model} | {field} | {surfaces:?}"));
+            "DIFFER"
+        };
+        println!("PARITY {verdict} | {route} | {model} | {field} | {surfaces:?}");
+    }
+    let value = |route: &Route, model: &str, field: &'static str, surface: &'static str| {
+        readings
+            .get(&(route.label.to_string(), model.to_string(), field))
+            .and_then(|surfaces| surfaces.get(surface))
+            .cloned()
+            .unwrap_or_default()
+    };
+    assert_eq!(
+        value(&routes[0], "*", "roster", SINGULAR),
+        "claude-haiku-4-5,claude-opus-5,claude-parity-probe-1",
+        "the singular command lists the route's own roster, not every bundled row"
+    );
+    assert_eq!(
+        value(&routes[0], "claude-opus-5", "limit.context", RUNTIME),
+        "1000000"
+    );
+    assert_eq!(
+        value(&routes[0], "claude-haiku-4-5", "limit.context", RUNTIME),
+        "200000"
+    );
+    assert_eq!(value(&routes[0], "claude-opus-5", "price.input", COST), "5");
+    assert_eq!(
+        value(&routes[0], "claude-haiku-4-5", "price.output", COST),
+        "5"
+    );
+    for field in ["limit.context", "limit.output", "price.input"] {
+        assert_eq!(
+            value(&routes[1], "claude-haiku-4-5", field, RUNTIME),
+            UNKNOWN,
+            "a custom endpoint borrows no fact from a same-named model: {field}"
+        );
+    }
+    assert_eq!(
+        value(&routes[1], "claude-haiku-4-5", "window.source", ROUTING),
+        "unverified",
+        "routing never presents a same-named model's window as this endpoint's"
+    );
+    assert_eq!(
+        value(&routes[1], "claude-haiku-4-5", "limit.output", ROUTING),
+        UNKNOWN
+    );
+    for model in ["GLM-5.3", "GLM-5.2"] {
+        let basis = value(&routes[2], model, "price.basis", COST);
+        assert!(
+            basis.contains("NotMoneyMetered") && basis.contains("charge_usd=unknown"),
+            "a plan route is never billed per token: {model}: {basis}"
+        );
+    }
+    for (model, rate) in [("GLM-5.3", UNKNOWN), ("GLM-5.2", "1.4")] {
+        for surface in [COST, RUNTIME] {
+            assert_eq!(
+                value(&routes[2], model, "price.input", surface),
+                rate,
+                "the list rate is shown the same everywhere and never turned into a charge: {model} {surface}"
+            );
+        }
+    }
+    let basis = value(&routes[1], "claude-haiku-4-5", "price.basis", COST);
+    assert!(
+        basis.contains("UnknownBillingBasis") && basis.contains("charge_usd=unknown"),
+        "a custom endpoint is never given a charge: {basis}"
+    );
+    for surface in [COST, RUNTIME] {
+        assert_eq!(
+            value(&routes[0], "claude-parity-probe-1", "price.input", surface),
+            UNKNOWN,
+            "a metered first-party model with no price row reads unknown: {surface}"
+        );
+    }
+    let basis = value(&routes[0], "claude-parity-probe-1", "price.basis", COST);
+    assert!(
+        basis.contains("charge_usd=unknown") && !basis.contains("unpriced=None"),
+        "an unpriced model produces no charge and says why: {basis}"
+    );
+    assert_eq!(
+        known_differences,
+        vec![
+            "lab (custom endpoint, same spelling) | claude-haiku-4-5 | {\"routing inventory\": \"200000\", \"runtime api\": \"unknown\"}"
+        ],
+        "the only named difference is the custom endpoint's borrowed routing window"
+    );
+    assert!(
+        differing.is_empty(),
+        "surfaces disagree on the same captured catalog:\n{}",
+        differing.join("\n")
+    );
+    Ok(())
+}

crates/app-server/src/runtime_api/tests/command_catalog.rs

@@ -28,6 +28,8 @@ fn user(name: &str) -> UserCommand {
         takes_arguments: false,
         hidden: false,
         extension: false,
+        plugin_id: None,
+        workspace_sourced: false,
         builtin_bindings: vec![name.to_string()],
     }
 }

crates/app-server/src/runtime_api/tests/plugin_index.rs

@@ -0,0 +1,219 @@
+use super::*;
+use codewhale_engine::command_catalog::{BuiltinCommand, CommandCatalog, UserCommand};
+
+struct Catalog(Arc<std::sync::Mutex<Option<String>>>);
+
+impl CommandCatalog for Catalog {
+    fn answers_to(&self, _name: &str) -> bool {
+        false
+    }
+    fn builtins(&self) -> Vec<BuiltinCommand> {
+        Vec::new()
+    }
+    fn user_commands(&self, _workspace: &Path) -> Vec<UserCommand> {
+        let plugin_id = self.0.lock().expect("plugin id").clone();
+        let command = |name: &str, plugin: Option<String>| UserCommand {
+            name: name.to_string(),
+            aliases: Vec::new(),
+            description: Some("A command.".to_string()),
+            usage: None,
+            takes_arguments: false,
+            hidden: false,
+            extension: false,
+            plugin_id: plugin,
+            workspace_sourced: false,
+            builtin_bindings: Vec::new(),
+        };
+        vec![command("mine", None), command("ship", plugin_id)]
+    }
+}
+
+#[tokio::test]
+async fn the_index_lists_every_kind_once_and_a_plugin_carries_what_it_adds() -> Result<()> {
+    let _env = lock_test_env();
+    let temp = tempfile::tempdir()?;
+    let root = temp.path().join("index-route");
+    let workspace = root.join("workspace");
+    fs::create_dir_all(&workspace)?;
+    let plugin_id = Arc::new(std::sync::Mutex::new(None));
+    let _catalog = codewhale_engine::command_catalog::CatalogGuard::install(Arc::new(Catalog(
+        plugin_id.clone(),
+    )));
+    let sources = root.join("sources");
+    fs::create_dir_all(&sources)?;
+    let bundle = write_plugin_source_bundle(&sources, "indexed")?;
+    fs::create_dir_all(bundle.join("commands"))?;
+    fs::write(bundle.join("commands/ship.md"), "Ship it.\n")?;
+    fs::create_dir_all(bundle.join("agents"))?;
+    fs::write(bundle.join("agents/reviewer.toml"), "name = \"reviewer\"\n")?;
+    fs::write(
+        bundle.join("plugin.toml"),
+        "schema_version = 1\n[plugin]\nname = \"indexed\"\nversion = \"1.0.0\"\n\
+         description = \"test bundle\"\n\n[skills]\npath = \"skills\"\n\
+         [commands]\npath = \"commands\"\n[agents]\npath = \"agents\"\n",
+    )?;
+
+    let Some((addr, handle)) = spawn_plugin_api_server(root, workspace).await? else {
+        return Ok(());
+    };
+    let client = codewhale_release::tls::reqwest_client();
+    plugin_ui::install_active(
+        &client,
+        &format!("http://{addr}/v1/apps/plugins"),
+        bundle.display().to_string(),
+    )
+    .await?;
+
+    let listed: Value = client
+        .get(format!("http://{addr}/v1/apps/plugins"))
+        .send()
+        .await?
+        .error_for_status()?
+        .json()
+        .await?;
+    let id = listed["plugins"]
+        .as_array()
+        .and_then(|plugins| plugins.iter().find(|plugin| plugin["name"] == "indexed"))
+        .and_then(|plugin| plugin["id"].as_str())
+        .expect("installed plugin id")
+        .to_string();
+    *plugin_id.lock().expect("plugin id") = Some(id.clone());
+
+    let commands: Value = client
+        .get(format!("http://{addr}/v1/commands"))
+        .send()
+        .await?
+        .error_for_status()?
+        .json()
+        .await?;
+    let ship = commands["commands"]
+        .as_array()
+        .and_then(|rows| rows.iter().find(|row| row["name"] == "ship"))
+        .expect("ship row");
+    assert_eq!(ship["plugin_id"], id.as_str());
+
+    let index: Value = client
+        .get(format!("http://{addr}/v1/apps/plugin-index"))
+        .send()
+        .await?
+        .error_for_status()?
+        .json()
+        .await?;
+    let items = index["items"].as_array().expect("items");
+    let find = |id: &str| items.iter().find(|item| item["id"] == id);
+
+    let plugin = items
+        .iter()
+        .find(|item| item["kind"] == "plugin" && item["row"]["name"] == "indexed")
+        .unwrap_or_else(|| panic!("plugin row in {index}"));
+    assert_eq!(plugin["kind"], "plugin");
+    assert_eq!(plugin["state"], "enabled");
+    assert_eq!(plugin["adds"]["skills"], serde_json::json!(["greet"]));
+    assert_eq!(plugin["adds"]["commands"], serde_json::json!(["ship"]));
+    assert_eq!(plugin["adds"]["profiles"], serde_json::json!(["reviewer"]));
+    assert_eq!(
+        plugin["labels"],
+        serde_json::json!(["skill", "command", "profile"])
+    );
+    assert_eq!(plugin["row"]["name"], "indexed");
+
+    assert!(find("skill:greet").is_none());
+    assert!(find("command:ship").is_none());
+    let mine = find("command:mine").expect("a hand-written command is a row");
+    assert_eq!(mine["source"], "user");
+    assert_eq!(mine["labels"], serde_json::json!(["command"]));
+    assert!(
+        items
+            .iter()
+            .any(|item| item["kind"] == "plugin" && item["tier"] == "builtin"),
+        "built-in switches are rows"
+    );
+    assert_eq!(
+        index["unavailable"].as_array().map(Vec::len),
+        Some(0),
+        "{index}"
+    );
+
+    handle.abort();
+    Ok(())
+}
+
+#[tokio::test]
+async fn the_index_keeps_same_name_hooks_distinct() -> Result<()> {
+    let _env = lock_test_env();
+    let temp = tempfile::tempdir()?;
+    let root = temp.path().join("hook-index-route");
+    let workspace = root.join("workspace");
+    let mut config = Config::default();
+    config.hooks = Some(codewhale_config::hooks::HooksConfig {
+        hooks: vec![
+            codewhale_config::hooks::Hook::new(
+                codewhale_config::hooks::HookEvent::SessionStart,
+                "echo first",
+            )
+            .with_name("gate"),
+            codewhale_config::hooks::Hook::new(
+                codewhale_config::hooks::HookEvent::SessionStart,
+                "echo second",
+            )
+            .with_name("gate"),
+            codewhale_config::hooks::Hook::new(
+                codewhale_config::hooks::HookEvent::SessionStart,
+                "echo third",
+            ),
+            codewhale_config::hooks::Hook::new(
+                codewhale_config::hooks::HookEvent::SessionStart,
+                "echo fourth",
+            )
+            .with_name("session_start 3"),
+        ],
+        enabled: true,
+        ..Default::default()
+    });
+    let (addr, _runtime_threads, handle) =
+        spawn_test_server_with_root_token_mobile_workspace_and_overrides(
+            root.clone(),
+            root.join("sessions"),
+            None,
+            false,
+            workspace.clone(),
+            TestServerOverrides {
+                config: Some(config),
+                plugin_discovery: Some(isolated_plugin_discovery(&root, &workspace)),
+                ..TestServerOverrides::default()
+            },
+        )
+        .await?
+        .expect("hook index test server");
+    let client = codewhale_release::tls::reqwest_client();
+    let index: Value = client
+        .get(format!("http://{addr}/v1/apps/plugin-index"))
+        .send()
+        .await?
+        .error_for_status()?
+        .json()
+        .await?;
+    let hooks: Vec<_> = index["items"]
+        .as_array()
+        .expect("items")
+        .iter()
+        .filter(|item| item["kind"] == "hook")
+        .collect();
+    assert_eq!(hooks.len(), 4, "{index}");
+    for (ordinal, hook) in hooks.iter().enumerate() {
+        assert_eq!(
+            hook["id"],
+            format!("hook:user:session_start:{}", ordinal + 1)
+        );
+        assert_eq!(hook["state"], "enabled");
+    }
+    assert_eq!(hooks[0]["name"], "gate");
+    assert_eq!(hooks[1]["name"], "gate");
+    assert_eq!(hooks[2]["name"], "session_start 3");
+    assert_eq!(hooks[3]["name"], "session_start 3");
+    assert_eq!(hooks[3]["row"]["command"], "echo fourth");
+    assert_eq!(hooks[0]["row"]["command"], "echo first");
+    assert_eq!(hooks[1]["row"]["command"], "echo second");
+    handle.abort();
+    Ok(())
+}

crates/app-server/src/runtime_api/tests/plugin_ui.rs

@@ -79,7 +79,7 @@ fn write_native_ui_bundle(dir: &Path, name: &str) -> Result<PathBuf> {
     Ok(bundle)
 }
 
-async fn install_active(
+pub(super) async fn install_active(
     client: &reqwest::Client,
     base: &str,
     source: String,

crates/app-server/src/runtime_api/tests/runtime_store_convergence.rs

@@ -1202,15 +1202,15 @@ async fn real_owner_two_workspace_services_share_scope_caches_and_settle_global_
     {
         let error = fs::rename(&selected_workspace, &retired_workspace)
             .expect_err("a live Runtime owner must prevent workspace replacement");
-        assert_eq!(error.raw_os_error(), Some(5), "{error}");
+        assert_eq!(error.raw_os_error(), Some(32), "{error}");
         assert!(!retired_workspace.exists());
     }
     manager.shutdown_and_wait().await?;
     #[cfg(windows)]
     {
         let error = fs::rename(&selected_workspace, &retired_workspace)
-            .expect_err("Engine shutdown must retain the Runtime owner's workspace lock");
-        assert_eq!(error.raw_os_error(), Some(5), "{error}");
+            .expect_err("Engine shutdown must retain the Runtime owner's pinned workspace");
+        assert_eq!(error.raw_os_error(), Some(32), "{error}");
         assert!(!retired_workspace.exists());
         assert!(Arc::ptr_eq(
             &scopes.admit(selected_workspace.clone()).await?,

crates/app-server/tests/acp_journey.rs

@@ -3,13 +3,13 @@ mod acp_support;
 use acp_support::{Client, fixture_config, text_of, updates};
 use anyhow::{Result, anyhow};
 use codewhale_app_server::acp_server::capture_frontend;
-use codewhale_engine::llm_client::mock::{MockLlmClient, canned};
+use codewhale_engine::llm_client::mock::{CannedTurn, MockLlmClient, canned};
 use codewhale_engine::runtime_threads::RuntimeTurnStatus;
 use codewhale_engine::runtime_threads::manager::{
     RuntimeThreadManager, RuntimeThreadManagerConfig,
 };
 use serde_json::{Value, json};
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 use std::sync::Arc;
 use std::time::Duration;
 use tokio::io::{AsyncWriteExt, BufReader};
@@ -497,3 +497,346 @@ async fn extension_journey() -> Result<()> {
     host.shutdown().await;
     Ok(())
 }
+
+const GATES_MCP_FIXTURE: &str = r#"import readline from 'node:readline';
+readline.createInterface({input:process.stdin}).on('line', line => {
+  const r = JSON.parse(line); if (r.id === undefined) return;
+  let result = {};
+  if (r.method === 'initialize') result = {protocolVersion:'2024-11-05',capabilities:{tools:{}},serverInfo:{name:'fixture',version:'1'}};
+  if (r.method === 'tools/list') result = {tools:['echo','hidden'].map(name => ({name,description:'Echo text',inputSchema:{type:'object',properties:{text:{type:'string'}},required:['text']}}))};
+  if (r.method === 'tools/call') result = {content:[{type:'text',text:'mcp-ran:' + r.params.name + ':' + r.params.arguments.text}]};
+  process.stdout.write(JSON.stringify({jsonrpc:'2.0',id:r.id,result}) + '\n');
+});
+"#;
+
+struct Outcome {
+    response: Value,
+    frames: Vec<Value>,
+    asked: Vec<Value>,
+}
+
+impl Outcome {
+    fn rendered(&self) -> String {
+        serde_json::to_string(&self.frames).unwrap_or_default()
+    }
+    fn completed(&self) -> usize {
+        updates(&self.frames, "tool_call_update")
+            .iter()
+            .filter(|frame| frame.pointer("/params/update/status") == Some(&json!("completed")))
+            .count()
+    }
+    fn titles(&self) -> Vec<String> {
+        self.asked
+            .iter()
+            .map(|frame| {
+                frame["params"]["toolCall"]["title"]
+                    .as_str()
+                    .unwrap_or_default()
+                    .to_string()
+            })
+            .collect()
+    }
+    fn announced_ids(&self) -> Vec<String> {
+        updates(&self.frames, "tool_call")
+            .iter()
+            .filter_map(|frame| frame.pointer("/params/update/toolCallId")?.as_str())
+            .map(str::to_string)
+            .collect()
+    }
+}
+
+async fn run_prompt(
+    client: &mut Client,
+    session: &str,
+    allow: &dyn Fn(usize) -> bool,
+) -> Result<Outcome> {
+    client.next_id += 1;
+    let prompt_id = client.next_id;
+    client
+        .send(
+            json!({"jsonrpc":"2.0","id":prompt_id,"method":"session/prompt","params":{
+            "sessionId":session,"prompt":[{"type":"text","text":"go"}]}}),
+        )
+        .await?;
+    let mut frames = Vec::new();
+    let mut asked = Vec::new();
+    let response = loop {
+        let frame = client.recv().await?;
+        if frame["method"] == "session/request_permission" {
+            let option = if allow(asked.len()) {
+                "allow-once"
+            } else {
+                "reject-once"
+            };
+            client
+                .send(json!({"jsonrpc":"2.0","id":frame["id"],
+                    "result":{"outcome":{"outcome":"selected","optionId":option}}}))
+                .await?;
+            asked.push(frame);
+        } else if frame["id"] == json!(prompt_id) && frame.get("method").is_none() {
+            break frame;
+        } else {
+            frames.push(frame);
+        }
+    };
+    Ok(Outcome {
+        response,
+        frames,
+        asked,
+    })
+}
+
+async fn new_session(
+    client: &mut Client,
+    manager: &RuntimeThreadManager,
+    workspace: &Path,
+    turns: Vec<CannedTurn>,
+    plan: bool,
+) -> Result<String> {
+    manager.set_test_model_client(Arc::new(MockLlmClient::new(turns)));
+    let (created, _) = client
+        .request("session/new", json!({"cwd":workspace}))
+        .await?;
+    let session = created["result"]["sessionId"]
+        .as_str()
+        .ok_or_else(|| anyhow!("session/new returned no sessionId: {created}"))?
+        .to_string();
+    if plan {
+        let (set, _) = client
+            .request(
+                "session/set_mode",
+                json!({"sessionId":session,"modeId":"plan"}),
+            )
+            .await?;
+        assert!(set.get("error").is_none(), "{set}");
+    }
+    Ok(session)
+}
+
+#[test]
+fn extension_tools_keep_the_permission_boundary_in_an_acp_session() -> Result<()> {
+    std::thread::Builder::new()
+        .stack_size(64 << 20)
+        .spawn(|| {
+            tokio::runtime::Builder::new_current_thread()
+                .enable_all()
+                .build()?
+                .block_on(async {
+                    tokio::time::timeout(Duration::from_secs(180), gates())
+                        .await
+                        .map_err(|_| anyhow!("extension gates exceeded 180s"))?
+                })
+        })?
+        .join()
+        .map_err(|_| anyhow!("extension gates thread panicked"))?
+}
+
+async fn gates() -> Result<()> {
+    use codewhale_engine::extension_host::test_support::{FixturePlugins, node_for_tests};
+    let Some(node) = node_for_tests("extension_tools_keep_the_permission_boundary") else {
+        return Ok(());
+    };
+    let _policy = codewhale_plugins::activation::TestPolicyGuard::extension_host(true);
+    let fixture = FixturePlugins::new(&["plugin-context", "core-call"]).await;
+    let host = fixture.manager(node.clone());
+    let _host = codewhale_engine::extension_host::TestManagerGuard::install(Arc::clone(&host));
+    let dir = tempfile::tempdir()?;
+    let _home = codewhale_engine::test_support::SealedHome::at(dir.path());
+    let workspace = fixture.workspace().to_path_buf();
+    std::fs::write(workspace.join("seed.txt"), "seed-content-xyz")?;
+    let server = dir.path().join("fixture-mcp.mjs");
+    std::fs::write(&server, GATES_MCP_FIXTURE)?;
+    let mcp_config = dir.path().join("mcp.json");
+    std::fs::write(
+        &mcp_config,
+        serde_json::to_vec(&json!({"servers":{
+            "fixture":{"command":node,"args":[server],"disabled_tools":["hidden"]},
+            "off":{"command":node,"args":[server],"disabled":true}
+        }}))?,
+    )?;
+    let runtime_dir = dir.path().join("runtime");
+    let mut config = fixture_config();
+    config.set_feature("mcp", true).unwrap();
+    config.set_feature("extension_host", true).unwrap();
+    config.mcp_config_path = Some(mcp_config.to_string_lossy().into_owned());
+    let manager = Arc::new(RuntimeThreadManager::open_host(
+        config.clone(),
+        workspace.clone(),
+        RuntimeThreadManagerConfig {
+            mcp_auth_context: Default::default(),
+            data_dir: runtime_dir.clone(),
+            task_data_dir: runtime_dir,
+            sessions_dir: None,
+            max_active_threads: 16,
+        },
+        fixture.registry(),
+        codewhale_engine::core::engine::EngineHostProfile::Acp,
+        None,
+        None,
+    )?);
+    let frontend = capture_frontend(
+        config,
+        "fixture-model".into(),
+        workspace.clone(),
+        Arc::clone(&manager),
+        codewhale_engine::session_manager::default_sessions_dir()?,
+        None,
+        None,
+    )?;
+    let (mut client, agent_read, agent_write) = Client::connect(false);
+    let connection = frontend.serve(Box::new(BufReader::new(agent_read)), Box::new(agent_write));
+    let manager_for_script = Arc::clone(&manager);
+    let script =
+        async {
+            let manager = manager_for_script;
+            let result = async {
+            client
+                .request(
+                    "initialize",
+                    json!({"protocolVersion":1,"clientCapabilities":{}}),
+                )
+                .await?;
+
+            let session = new_session(
+                &mut client,
+                &manager,
+                &workspace,
+                vec![
+                    canned::tool_call_turn(
+                        "n1",
+                        "cc_call",
+                        r#"{"name":"write","input":{"path":"nested.txt","content":"via-plugin"}}"#,
+                    ),
+                    canned::simple_text_turn("nested allowed"),
+                ],
+                false,
+            )
+            .await?;
+            let allowed = run_prompt(&mut client, &session, &|_| true).await?;
+            assert!(allowed.response.get("error").is_none(), "{}", allowed.response);
+            assert_eq!(allowed.response["result"]["stopReason"], "end_turn");
+            assert_eq!(allowed.asked.len(), 2, "{:?}", allowed.titles());
+            assert!(allowed.titles()[0].starts_with("cc_call"));
+            let announced = allowed.announced_ids();
+            for request in &allowed.asked {
+                let id = request["params"]["toolCall"]["toolCallId"]
+                    .as_str()
+                    .unwrap_or_default();
+                assert!(
+                    announced.iter().any(|known| known == id),
+                    "a nested approval is shown on a tool call the editor knows: {id} {announced:?}"
+                );
+            }
+            let nested = &allowed.asked[1]["params"]["toolCall"];
+            assert_eq!(nested["title"], "write: nested.txt", "{nested}");
+            assert_eq!(nested["kind"], "edit", "{nested}");
+            assert_eq!(nested["rawInput"]["path"], "nested.txt", "{nested}");
+            assert!(nested.get("status").is_none(), "{nested}");
+            assert_eq!(
+                std::fs::read_to_string(workspace.join("nested.txt"))?,
+                "via-plugin"
+            );
+
+            std::fs::remove_file(workspace.join("nested.txt"))?;
+            let session = new_session(
+                &mut client,
+                &manager,
+                &workspace,
+                vec![
+                    canned::tool_call_turn(
+                        "n2",
+                        "cc_call",
+                        r#"{"name":"write","input":{"path":"nested.txt","content":"via-plugin"}}"#,
+                    ),
+                    canned::simple_text_turn("nested denied"),
+                ],
+                false,
+            )
+            .await?;
+            let denied = run_prompt(&mut client, &session, &|index| index == 0).await?;
+            assert!(denied.response.get("error").is_none(), "{}", denied.response);
+            assert_eq!(denied.response["result"]["stopReason"], "end_turn");
+            assert_eq!(denied.asked.len(), 2, "{:?}", denied.titles());
+            assert!(
+                !workspace.join("nested.txt").exists(),
+                "a rejected nested write must not run"
+            );
+
+            let session = new_session(
+                &mut client,
+                &manager,
+                &workspace,
+                vec![
+                    canned::tool_call_turn("r1", "ctx_probe", "{}"),
+                    canned::tool_call_turn("r2", "mcp_fixture_echo", r#"{"text":"control"}"#),
+                    canned::tool_call_turn("r3", "ctx_note", r#"{"text":"must-not-be-written"}"#),
+                    canned::tool_call_turn("r4", "mcp_fixture_echo", r#"{"text":"rejected"}"#),
+                    canned::simple_text_turn("rejections done"),
+                ],
+                false,
+            )
+            .await?;
+            let rejected = run_prompt(&mut client, &session, &|index| index < 2).await?;
+            assert_eq!(rejected.asked.len(), 4, "{:?}", rejected.titles());
+            let rendered = rejected.rendered();
+            assert!(rendered.contains("mcp-ran:echo:control"), "{rendered}");
+            assert!(!rendered.contains("mcp-ran:echo:rejected"), "{rendered}");
+            assert!(!rendered.contains("note.txt"), "{rendered}");
+
+            let session = new_session(
+                &mut client,
+                &manager,
+                &workspace,
+                vec![
+                    canned::tool_call_turn("p1", "ctx_probe", "{}"),
+                    canned::tool_call_turn("p2", "mcp_fixture_echo", r#"{"text":"plan"}"#),
+                    canned::simple_text_turn("plan done"),
+                ],
+                true,
+            )
+            .await?;
+            let plan = run_prompt(&mut client, &session, &|_| true).await?;
+            assert!(plan.asked.is_empty(), "{:?}", plan.titles());
+            assert_eq!(plan.completed(), 0, "{}", plan.rendered());
+            assert!(!plan.rendered().contains("mcp-ran:"));
+
+            let session = new_session(
+                &mut client,
+                &manager,
+                &workspace,
+                vec![
+                    canned::tool_call_turn("f1", "mcp_fixture_hidden", r#"{"text":"hid"}"#),
+                    canned::tool_call_turn("f2", "mcp_off_echo", r#"{"text":"off"}"#),
+                    canned::tool_call_turn("f3", "mcp_evil_echo", r#"{"text":"evil"}"#),
+                    canned::tool_call_turn(
+                        "f4",
+                        "start_mcp_server",
+                        r#"{"name":"evil","command":"node","args":["-e","0"]}"#,
+                    ),
+                    canned::tool_call_turn("f5", "agent", r#"{"action":"start","prompt":"p"}"#),
+                    canned::simple_text_turn("fabricated done"),
+                ],
+                false,
+            )
+            .await?;
+            let fabricated = run_prompt(&mut client, &session, &|_| true).await?;
+            assert!(fabricated.asked.is_empty(), "{:?}", fabricated.titles());
+            assert_eq!(fabricated.completed(), 0, "{}", fabricated.rendered());
+            assert!(!fabricated.rendered().contains("mcp-ran:"));
+
+            client.request("shutdown", json!({})).await?;
+            Ok::<_, anyhow::Error>(())
+        }
+        .await;
+            if result.is_err() {
+                let _ = client.write.shutdown().await;
+            }
+            result
+        };
+    let (served, scripted) = tokio::join!(connection, script);
+    served?;
+    scripted?;
+    manager.shutdown_and_wait().await?;
+    host.shutdown().await;
+    Ok(())
+}

crates/config/src/settings_schema.rs

@@ -1313,7 +1313,7 @@ pub const SETTINGS_SCHEMA: &[SettingDef] = &[
     def(
         "telemetry",
         SettingKind::Bool(TELEMETRY),
-        "false",
+        "true",
         ui(
             TAB_TRUST,
             "network",

crates/engine/src/client/system_one.rs

@@ -138,6 +138,16 @@ pub struct SystemOneResponse {
     pub answers_validated: Option<bool>,
 }
 
+impl SystemOneResponse {
+    pub fn abstained_questions(&self, names: &[&str]) -> Vec<String> {
+        names
+            .iter()
+            .filter(|name| self.answers.get(**name).is_some_and(|a| a.abstained))
+            .map(|name| (*name).to_string())
+            .collect()
+    }
+}
+
 impl<'de> Deserialize<'de> for SystemOneResponse {
     fn deserialize<D: serde::Deserializer<'de>>(
         deserializer: D,
@@ -201,6 +211,8 @@ pub struct SystemOneAnswer {
     pub probabilities: BTreeMap<String, Option<f64>>,
     #[serde(default)]
     pub confidence: Option<f64>,
+    #[serde(default)]
+    pub abstained: bool,
 }
 
 /// Provider usage. OpenRouter adds `cost`; the token-count casing differs

crates/engine/src/command_catalog.rs

@@ -29,6 +29,8 @@ pub struct UserCommand {
     pub takes_arguments: bool,
     pub hidden: bool,
     pub extension: bool,
+    pub plugin_id: Option<String>,
+    pub workspace_sourced: bool,
     pub builtin_bindings: Vec<String>,
 }
 

crates/engine/src/core/engine.rs

@@ -314,8 +314,8 @@ pub struct EngineConfig {
     pub session_id: Option<String>,
     /// Optional host-owned root for delegated-agent runtime state.
     ///
-    /// When unset, the worker ledger, complete transcript artifacts and
-    /// coordination lock retain their historical location under
+    /// When unset, the worker ledger and complete transcript artifacts
+    /// retain their historical location under
     /// `workspace/.codewhale/state`. Embedders may set a session-scoped root
     /// to separate that control-plane state from the execution workspace.
     /// Child cwd and file authority still derive from `workspace`; hosts using

crates/engine/src/core/engine/tests/rlm_host.rs

@@ -456,7 +456,7 @@ async fn captured_identity_cancel_and_task_bounds_refuse_before_any_provider() {
 
 #[tokio::test]
 async fn dropping_an_actual_dispatched_core_call_keeps_unknown_usage_without_retaining_authority() {
-    struct Pending;
+    struct Pending(Arc<tokio::sync::Notify>);
     impl Replies for Pending {
         fn effective_route_envelope(
             &self,
@@ -478,24 +478,42 @@ async fn dropping_an_actual_dispatched_core_call_keeps_unknown_usage_without_ret
             &self,
             _: MessageRequest,
         ) -> Pin<Box<dyn Future<Output = anyhow::Result<MessageResponse>> + Send + '_>> {
+            self.0.notify_one();
             Box::pin(std::future::pending())
         }
     }
-    let caller = Arc::new(caller_for(Arc::new(Pending), "captured-model"));
+    let entered = Arc::new(tokio::sync::Notify::new());
+    let caller = Arc::new(caller_for(
+        Arc::new(Pending(entered.clone())),
+        "captured-model",
+    ));
     let weak_caller = Arc::downgrade(&caller);
     let usage = RlmUsageAccumulator::new();
-    let result = caller
-        .dispatch(RlmInvocation {
-            prompt: "pending".into(),
-            mode: RlmMode::Completion,
-            max_tokens: None,
-            task_instructions: None,
-            deadline: Some(tokio::time::Instant::now() + Duration::from_millis(100)),
-            gate: None,
-            events: None,
-            usage: usage.clone(),
-        })
-        .await;
+    let mut dispatch = caller.dispatch(RlmInvocation {
+        prompt: "pending".into(),
+        mode: RlmMode::Completion,
+        max_tokens: None,
+        task_instructions: None,
+        deadline: Some(tokio::time::Instant::now() + Duration::from_secs(600)),
+        gate: None,
+        events: None,
+        usage: usage.clone(),
+    });
+    tokio::time::timeout(Duration::from_secs(10), async {
+        tokio::select! {
+            biased;
+            () = entered.notified() => {}
+            result = &mut dispatch => panic!(
+                "dropped dispatch never reached the client: {:?}",
+                result.error
+            ),
+        }
+    })
+    .await
+    .expect("the dispatched call must reach the client");
+    tokio::time::pause();
+    tokio::time::advance(Duration::from_secs(601)).await;
+    let result = dispatch.await;
     assert!(
         result
             .error

crates/engine/src/cost_status.rs

@@ -2643,6 +2643,7 @@ pub fn decision_receipt_fixture(source_id: &str) -> RuntimeDecisionReceipt {
             probabilities_bp: Default::default(),
             confidence_bp: 0,
             min_confidence_bp: 5_000,
+            abstained_questions: Vec::new(),
             cost_saving_kept_fast: false,
             thinking: None,
             provider_reported_cost_usd: Some("0.000012054".to_string()),

crates/engine/src/model_inventory.rs

@@ -282,31 +282,20 @@ impl ModelInventory {
                 // vendor-family heuristic) carries the number *and* the fact
                 // that nobody verified it — the auto-router must not read a
                 // guessed window as a route capability.
-                let mut context_window_unverified =
-                    codewhale_config::catalog::reviewed::intrinsic_model(&model)
-                        .and_then(|row| row.context_window)
-                        .is_none();
+                let mut context_window_unverified = true;
                 if let Ok(route) = crate::route_runtime::resolve_runtime_route_for_identity(
                     config,
                     &identity,
                     Some(&model),
                 ) {
-                    if let Some(context_window) = route.candidate.limits().context_tokens {
-                        capability.context_window = context_window.min(u64::from(u32::MAX)) as u32;
-                        context_window_unverified = !route.context_window.source.is_verified();
-                    }
-                    // A concrete offering maximum is a stronger fact than the
-                    // static compatibility matrix — and is the only way a
-                    // membership route (no static cap) gets a known ceiling.
-                    if let Some(max_output) = route
+                    capability.context_window = route.context_window.tokens;
+                    context_window_unverified = !route.context_window.source.is_verified();
+                    capability.max_output = route
                         .candidate
                         .limits()
                         .output_tokens
                         .and_then(|tokens| u32::try_from(tokens).ok())
-                        .filter(|tokens| *tokens > 0)
-                    {
-                        capability.max_output = Some(max_output);
-                    }
+                        .filter(|tokens| *tokens > 0);
                     user_declared = route
                         .candidate
                         .applied_limit_overrides()
@@ -316,13 +305,6 @@ impl ModelInventory {
                                 == codewhale_config::route::OverrideSource::UserModelMetadata
                         });
                     if user_declared {
-                        context_window_unverified = !route.context_window.source.is_verified();
-                        capability.context_window = route.context_window.tokens;
-                        capability.max_output = route
-                            .candidate
-                            .limits()
-                            .output_tokens
-                            .and_then(|value| u32::try_from(value).ok());
                         capability.thinking_supported = route.candidate.capabilities().reasoning
                             == codewhale_config::route::CapabilityState::Supported;
                     }

crates/engine/src/model_routing.rs

@@ -1852,6 +1852,7 @@ pub struct ValidChoice {
     pub choice: String,
     pub probabilities_bp: BTreeMap<String, u16>,
     pub confidence_bp: u16,
+    pub abstained: bool,
 }
 
 /// Validate one `choice` answer against the offered options. Any violation
@@ -1894,6 +1895,7 @@ pub fn validated_choice(answer: Option<&SystemOneAnswer>, options: &[&str]) -> O
         choice: choice.to_string(),
         probabilities_bp,
         confidence_bp: probability_bp(confidence),
+        abstained: answer.abstained,
     })
 }
 
@@ -1982,6 +1984,7 @@ fn decision_attempt_from_response(
         probabilities_bp: Default::default(),
         confidence_bp: 0,
         min_confidence_bp: inventory.router_min_confidence_bp,
+        abstained_questions: response.abstained_questions(&["tier", "thinking"]),
         cost_saving_kept_fast: false,
         thinking: None,
         provider_reported_cost_usd: response
@@ -2005,17 +2008,18 @@ fn decision_attempt_from_response(
     let min_confidence_bp = inventory.router_min_confidence_bp;
     // An invalid or unsure `thinking` answer drops only the effort.
     let thinking = validated_choice(response.answers.get("thinking"), &DECISION_THINKING_OPTIONS)
-        .filter(|thinking| thinking.confidence_bp >= min_confidence_bp)
+        .filter(|thinking| !thinking.abstained && thinking.confidence_bp >= min_confidence_bp)
         .map(|thinking| thinking.choice);
     let strong_bp = tier.probabilities_bp.get("strong").copied().unwrap_or(0);
     let cost_saving_kept_fast =
         cost_saving && tier.choice == "strong" && strong_bp < COST_SAVING_STRONG_MIN_BP;
-    let acted = tier.confidence_bp >= min_confidence_bp;
+    let acted = !tier.abstained && tier.confidence_bp >= min_confidence_bp;
     attempt.decision = Some(AutoRouteDecisionEvidence {
         choice: tier.choice.clone(),
         probabilities_bp: tier.probabilities_bp,
         confidence_bp: tier.confidence_bp,
         min_confidence_bp,
+        abstained_questions: response.abstained_questions(&["tier", "thinking"]),
         cost_saving_kept_fast: acted && cost_saving_kept_fast,
         thinking: thinking.clone().filter(|_| acted),
         provider_reported_cost_usd: response
@@ -4187,6 +4191,60 @@ mod decision_router_tests {
         );
     }
 
+    #[test]
+    fn explicit_abstention_survives_decode_and_never_authorizes_auto_at_floor_zero() {
+        let _env = hermetic_env();
+        let mut config = decision_config("https://openrouter.invalid/api/v1", false, 2);
+        config
+            .auto
+            .as_mut()
+            .unwrap()
+            .router
+            .as_mut()
+            .unwrap()
+            .min_confidence = Some(0.0);
+        let inventory = ModelInventory::from_config(&config).unwrap();
+        let attempt = |body: serde_json::Value| {
+            decision_attempt_from_response(false, &inventory, &pair(), None, &parsed(body), 120)
+        };
+        let mut body = answer_body(0.1, 0.9);
+        body["answers"]["thinking"]["abstained"] = true.into();
+        let effort_abstained = attempt(body.clone());
+        let recommendation = effort_abstained
+            .recommendation
+            .expect("valid tier survives effort abstention");
+        assert_eq!(recommendation.model, "deepseek-v4-flash");
+        assert_eq!(recommendation.reasoning_effort, None);
+        assert_eq!(
+            effort_abstained.decision.unwrap().abstained_questions,
+            vec!["thinking"]
+        );
+        body["answers"]["tier"]["abstained"] = true.into();
+        let tier_abstained = attempt(body);
+        assert!(tier_abstained.recommendation.is_none());
+        assert_eq!(
+            tier_abstained.fallback_reason,
+            Some(AutoRouteHeuristicReason::LowConfidence)
+        );
+        assert_eq!(tier_abstained.failure, None);
+        let decision = tier_abstained.decision.unwrap();
+        assert_eq!(decision.abstained_questions, vec!["tier", "thinking"]);
+        assert_eq!(decision.choice, "fast");
+        assert_eq!(
+            decision.provider_reported_cost_usd.as_deref(),
+            Some("0.000019992")
+        );
+    }
+
+    #[test]
+    fn non_boolean_abstention_is_refused_not_ignored() {
+        let mut body = answer_body(0.1, 0.9);
+        body["answers"]["tier"]["abstained"] = "yes".into();
+        let attempt = policy(false, &parsed(body));
+        assert!(attempt.recommendation.is_none());
+        assert_eq!(attempt.failure, Some(AutoRouterFailure::InvalidAnswer));
+    }
+
     #[test]
     fn invalid_answers_are_rejected_not_repaired() {
         let mut outside = answer_body(0.8, 0.6);

crates/engine/src/provider_lake.rs

@@ -1455,6 +1455,24 @@ pub fn configured_catalog_models_for_route(
     ids
 }
 
+pub fn listed_models_for_route(route_config: &Config, identity: &ProviderIdentity) -> Vec<String> {
+    let mut models = configured_catalog_models_for_route(
+        route_config,
+        identity.provider,
+        identity.key.as_str(),
+        &route_config.active_route_base_url(),
+    );
+    if identity.provider != ProviderKind::OpenaiCodex {
+        let default_model = route_config.default_model();
+        if !default_model.is_empty() && !default_model.eq_ignore_ascii_case("auto") {
+            push_unique_model(&mut models, &default_model);
+        }
+        models.sort();
+        models.dedup();
+    }
+    models
+}
+
 /// Look up the **bundled-snapshot** offering for `(provider, wire_model_id)`,
 /// ignoring any live rows merged over it.
 ///
@@ -2219,23 +2237,8 @@ pub async fn run_models(
     route_config
         .scope_to_provider_identity(identity)
         .map_err(anyhow::Error::msg)?;
-    let mut models = configured_catalog_models_for_route(
-        &route_config,
-        identity.provider,
-        identity.key.as_str(),
-        &route_config.active_route_base_url(),
-    );
+    let models = listed_models_for_route(&route_config, identity);
     let default_model = route_config.default_model();
-    if identity.provider != ProviderKind::OpenaiCodex
-        && !default_model.is_empty()
-        && !default_model.eq_ignore_ascii_case("auto")
-    {
-        push_unique_model(&mut models, &default_model);
-    }
-    if identity.provider != ProviderKind::OpenaiCodex {
-        models.sort();
-        models.dedup();
-    }
     if json {
         // Preserve the existing array + AvailableModel field shape.
         let chatgpt_roster = (identity.provider == ProviderKind::OpenaiCodex)

crates/engine/src/route_preferences.rs

@@ -325,7 +325,7 @@ pub fn selected_route(path: &Path) -> Result<(String, String, codewhale_config::
 pub fn list_models(
     store: &codewhale_config::ConfigStore,
     filter: Option<ProviderKind>,
-) -> Result<Vec<(ProviderKind, Vec<String>)>> {
+) -> Result<Vec<(String, Vec<String>)>> {
     crate::models_dev_live::maybe_load_persisted_cache();
     let mut config = saved_config(store)?;
     config.base_url_env_receipt = config
@@ -333,42 +333,33 @@ pub fn list_models(
         .map_or(BaseUrlEnvReceipt::NoOwner, |identity| {
             BaseUrlEnvReceipt::Route(identity.provider, identity.key.to_string())
         });
+    let mut custom_routes: Vec<String> = config
+        .providers
+        .as_ref()
+        .map(|providers| providers.custom.keys().cloned().collect())
+        .unwrap_or_default();
+    custom_routes.sort();
     let providers = filter
         .as_ref()
         .map_or(ProviderKind::all(), std::slice::from_ref);
     let mut catalogs = Vec::with_capacity(providers.len());
     for provider in providers {
-        if *provider == ProviderKind::Custom
-            && config
-                .providers
-                .as_ref()
-                .and_then(|providers| providers.custom_provider_config(provider.as_str()))
-                .is_none()
-        {
-            continue;
+        let routes = if *provider == ProviderKind::Custom {
+            custom_routes.clone()
+        } else {
+            vec![provider.as_str().to_string()]
+        };
+        for route in routes {
+            let identity = config
+                .legacy_selection_identity(&route)
+                .map_err(anyhow::Error::msg)?;
+            let mut route_config = config.clone();
+            route_config
+                .scope_to_provider_identity(&identity)
+                .map_err(anyhow::Error::msg)?;
+            let models = crate::provider_lake::listed_models_for_route(&route_config, &identity);
+            catalogs.push((route, models));
         }
-        let identity = config
-            .legacy_selection_identity(provider.as_str())
-            .map_err(anyhow::Error::msg)?;
-        let mut route_config = config.clone();
-        route_config
-            .scope_to_provider_identity(&identity)
-            .map_err(anyhow::Error::msg)?;
-        let mut models = crate::provider_lake::configured_catalog_models_for_route(
-            &route_config,
-            identity.provider,
-            identity.key.as_str(),
-            &route_config.active_route_base_url(),
-        );
-        if identity.provider != ProviderKind::OpenaiCodex {
-            let default_model = route_config.default_model();
-            if !default_model.is_empty() && !default_model.eq_ignore_ascii_case("auto") {
-                models.push(default_model);
-            }
-            models.sort();
-            models.dedup();
-        }
-        catalogs.push((*provider, models));
     }
     Ok(catalogs)
 }
@@ -418,10 +409,12 @@ pub fn resolve_model(
                 .into(),
             );
         }
-        codewhale_agent::ModelRegistry::default().resolve(
-            model.filter(|model| *model != "auto"),
-            Some(identity.provider),
-        )?;
+        if !crate::provider_catalog_live::provider_owns_live_catalog(identity.provider, base_url) {
+            codewhale_agent::ModelRegistry::default().resolve(
+                model.filter(|model| *model != "auto"),
+                Some(identity.provider),
+            )?;
+        }
     }
     Ok(route?.candidate)
 }

crates/engine/src/runtime_threads/tests.rs

@@ -11615,10 +11615,9 @@ async fn compact_thread_receipt_keeps_exact_named_custom_identity() -> Result<()
 
 #[tokio::test]
 async fn compact_thread_with_real_engine_reaches_terminal_status() -> Result<()> {
-    // A real engine takes the workspace coordination lock exclusively, and
     // nextest runs tests in parallel processes with this crate as their working
     // directory. A `"."` workspace would therefore be the crate directory
-    // itself, and two exclusive holders of it cannot both start.
+    // itself, shared by every test process.
     let workspace = tempfile::tempdir()?;
     let manager = RuntimeThreadManager::open(
         {

crates/engine/src/superfast.rs

@@ -451,6 +451,11 @@ async fn evaluate(
                             .map_or_else(Default::default, |v| v.probabilities_bp.clone()),
                         confidence_bp: intent.as_ref().map_or(0, |v| v.confidence_bp),
                         min_confidence_bp: 5_000,
+                        abstained_questions: response.abstained_questions(&[
+                            "intent",
+                            "needs_tool",
+                            "answerable_from_context",
+                        ]),
                         cost_saving_kept_fast: false,
                         thinking: None,
                         provider_reported_cost_usd: response
@@ -521,7 +526,7 @@ fn unit_interval(value: Option<f64>) -> Option<f64> {
 /// fast route.
 fn read_noul(response: &SystemOneResponse, key: &str) -> Option<f64> {
     let answer = response.answers.get(key)?;
-    (answer.kind == "noul")
+    (answer.kind == "noul" && !answer.abstained)
         .then_some(answer.noul)
         .and_then(unit_interval)
 }
@@ -548,7 +553,9 @@ fn derive_route(response: &SystemOneResponse) -> Route {
         response.answers.get("intent"),
         &["code_change", "code_question", "command", "chat", "other"],
     )
-    .is_some_and(|intent| intent.choice == "chat" && intent.confidence_bp >= 5_000);
+    .is_some_and(|intent| {
+        !intent.abstained && intent.choice == "chat" && intent.confidence_bp >= 5_000
+    });
     if intent_is_calibrated_chat && needs_tool.is_some_and(|nt| nt <= 0.2) {
         return Route::PlainChat;
     }
@@ -564,6 +571,23 @@ mod tests {
 
     const TYPESAFE_TEST_KEY: &str = "sf-typesafe-test-key-0123456789";
 
+    #[test]
+    fn explicit_abstention_never_authorizes_a_shadow_route() {
+        let mut value = json!({"answers":{
+            "intent":{"type":"choice","choice":"chat","confidence":0.9,
+                "probabilities":{"chat":0.9,"code_change":0.1,"code_question":0.0,"command":0.0,"other":0.0}},
+            "needs_tool":{"type":"noul","noul":0.1},
+            "answerable_from_context":{"type":"noul","noul":0.1}}});
+        let decoded =
+            |value: Value| serde_json::from_value::<SystemOneResponse>(value).expect("response");
+        assert_eq!(derive_route(&decoded(value.clone())), Route::PlainChat);
+        value["answers"]["intent"]["abstained"] = true.into();
+        assert_eq!(derive_route(&decoded(value.clone())), Route::Unknown);
+        value["answers"]["needs_tool"]["noul"] = 0.95.into();
+        value["answers"]["needs_tool"]["abstained"] = true.into();
+        assert_eq!(derive_route(&decoded(value)), Route::Unknown);
+    }
+
     /// Fields drop in declaration order: restore the environment before the
     /// lock is released, or another test observes our overrides.
     struct Env {

crates/engine/src/tools/subagent/coord.rs

@@ -1721,7 +1721,7 @@ mod tests {
             .expect_err("mutation must fail when its receipt cannot persist")
             .to_string();
         assert!(
-            error.contains("Runtime coordination was opened without its writer lock"),
+            error.contains("delegated durable store admission failed"),
             "{error}"
         );
         assert!(

crates/engine/src/tools/subagent/coord/ledger.rs

@@ -321,9 +321,10 @@ pub struct CoordinationDetailProjection {
     pub metrics: CoordinationDetailMetrics,
     pub bounded: bool,
     pub limit: usize,
-    /// Whether this process currently holds the workspace coordination flock.
-    /// When false, durable ledger writes are skipped and the UI must say so —
-    /// a counter must never tick on a turn the engine has already settled.
+    /// Whether this manager's durable store is admitted. When false, durable
+    /// ledger writes are refused until admission is retried and the UI must
+    /// say so — a counter must never tick on a turn the engine has already
+    /// settled.
     #[serde(default = "default_process_lock_held")]
     pub process_lock_held: bool,
     /// Human-readable reason when [`Self::process_lock_held`] is false.

crates/engine/src/tools/subagent/mod.rs

@@ -499,7 +499,6 @@ const SUBAGENT_TRANSCRIPT_ARTIFACT_DIR: &str = "subagent-transcripts";
 const SUBAGENT_STATE_SCHEMA_VERSION: u32 = 1;
 const SUBAGENT_STATE_FILE: &str = "subagents.v3.json";
 const LEGACY_SUBAGENT_STATE_FILE: &str = "subagents.v1.json";
-const SUBAGENT_STATE_LOCK_FILE: &str = "subagents.v1.lock";
 const SUBAGENT_RESTART_REASON: &str = "Interrupted by process restart";
 const SUBAGENT_SESSION_CLOSED_REASON: &str = "Interrupted: parent session closed";
 #[cfg(test)]
@@ -3933,12 +3932,6 @@ impl SubAgent {
     }
 }
 
-/// Manager for active sub-agents.
-struct CoordinationProcessLock {
-    release: Option<std::sync::mpsc::SyncSender<()>>,
-    thread: Option<std::thread::JoinHandle<()>>,
-}
-
 /// Marker prefix retained for presentation compatibility with same-process
 /// handover notes from earlier hosts. It does not control lock acquisition
 /// or retry.
@@ -3954,123 +3947,6 @@ pub const COORDINATION_LOCK_TIMEOUT_MARKER: &str =
 
 pub const SESSION_PRIVATE_COORDINATION: &str = "another Codewhale session still uses this folder's older delegated-agent store, so its upgrade waits; sub-agents in this session keep private state that other sessions do not see and that is not saved, and the store upgrades when a session starts after the other one exits";
 
-#[derive(Debug)]
-struct SubAgentCutoverBlocked(anyhow::Error);
-
-impl std::fmt::Display for SubAgentCutoverBlocked {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-impl std::error::Error for SubAgentCutoverBlocked {}
-
-impl CoordinationProcessLock {
-    fn acquire(state_root: &Path, exclusive: bool) -> Result<Self> {
-        let requested_root = normalize_subagent_workspace(state_root);
-        // Root and path for the lock. A non-home workspace keeps itself as the
-        // root, so a repository-supplied `.codewhale` link is walked and
-        // refused before `create_dir_all` could follow it into the target. A
-        // home workspace resolves its own junction once and still walks
-        // everything below it.
-        let (walk_root, lock_path) = codewhale_util::files::workspace_state_path(
-            &requested_root,
-            &Path::new("state").join(SUBAGENT_STATE_LOCK_FILE),
-        );
-        let lock_dir = lock_path
-            .parent()
-            .map_or_else(|| walk_root.clone(), Path::to_path_buf);
-        // Refuse a linked `.codewhale` or `state` before creating anything:
-        // `create_dir_all` follows links and would populate the target.
-        reject_root_relative_symlinks(&walk_root, &lock_path)?;
-        fs::create_dir_all(&lock_dir)?;
-        let ignore = lock_dir.join(".gitignore");
-        let ignored = reject_root_relative_symlinks(&walk_root, &ignore).and_then(|()| {
-            match fs::OpenOptions::new()
-                .write(true)
-                .create_new(true)
-                .open(&ignore)
-            {
-                Ok(mut file) => file.write_all(b"*\n").map_err(Into::into),
-                Err(error) if error.kind() == std::io::ErrorKind::AlreadyExists => Ok(()),
-                Err(error) => Err(error.into()),
-            }
-        });
-        if let Err(error) = ignored {
-            tracing::warn!(target: "subagent", %error, "could not write {}", ignore.display());
-        }
-        // Creating a missing root can change its canonical spelling on
-        // Windows (for example by adding a `\\?\` prefix). Re-resolve both
-        // sides before checking containment.
-        let state_root = normalize_subagent_workspace(state_root);
-        let (walk_root, lock_path) = codewhale_util::files::workspace_state_path(
-            &state_root,
-            &Path::new("state").join(SUBAGENT_STATE_LOCK_FILE),
-        );
-        reject_root_relative_symlinks(&walk_root, &lock_path)?;
-        let lock_file = std::fs::OpenOptions::new()
-            .create(true)
-            .truncate(false)
-            .read(true)
-            .write(true)
-            .open(&lock_path)?;
-        let (ready_tx, ready_rx) = std::sync::mpsc::sync_channel(1);
-        let (release_tx, release_rx) = std::sync::mpsc::sync_channel(0);
-        let thread = std::thread::spawn(move || {
-            let mut lock = fd_lock::RwLock::new(lock_file);
-            let acquired = if exclusive {
-                lock.try_write().map(|guard| {
-                    let _ = ready_tx.send(Ok::<(), String>(()));
-                    let _guard = guard;
-                    let _ = release_rx.recv();
-                })
-            } else {
-                lock.try_read().map(|guard| {
-                    let _ = ready_tx.send(Ok::<(), String>(()));
-                    let _guard = guard;
-                    let _ = release_rx.recv();
-                })
-            };
-            match acquired {
-                Ok(()) => {}
-                Err(error) => {
-                    let _ = ready_tx.send(Err(error.to_string()));
-                }
-            }
-        });
-        match ready_rx.recv_timeout(Duration::from_secs(5)) {
-            Ok(Ok(())) => Ok(Self {
-                release: Some(release_tx),
-                thread: Some(thread),
-            }),
-            Ok(Err(error)) => {
-                let _ = thread.join();
-                Err(anyhow!(
-                    "delegated coordination lock is unavailable for {}: {error}; close any other running or suspended Codewhale session using this workspace, then restart this Runtime if admission was refused",
-                    state_root.display()
-                ))
-            }
-            Err(error) => {
-                drop(release_tx);
-                let _ = thread.join();
-                Err(anyhow!(
-                    "{COORDINATION_LOCK_TIMEOUT_MARKER} for {}: {error}",
-                    state_root.display()
-                ))
-            }
-        }
-    }
-}
-
-impl Drop for CoordinationProcessLock {
-    fn drop(&mut self) {
-        self.release.take();
-        if let Some(thread) = self.thread.take() {
-            let _ = thread.join();
-        }
-    }
-}
-
 /// Only the captured Runtime owner admits roots. Held handles are not serialized;
 /// a restored attributed claim must be re-admitted before it can authorize work.
 struct AdmittedCoordinationRoot {
@@ -4106,19 +3982,12 @@ pub struct SubAgentManager {
     worker_origins: HashMap<String, WorkerOrigin>,
     worker_origin_schema: u32,
     workspace: PathBuf,
-    /// Root that owns the delegated-agent ledger, complete transcript
-    /// artifacts and coordination lock. Defaults to `workspace`; embedders may
+    /// Root that owns the delegated-agent ledger and complete transcript
+    /// artifacts. Defaults to `workspace`; embedders may
     /// isolate it without changing child execution cwd or file authority.
     state_root: PathBuf,
     state_path: Option<PathBuf>,
     state_unreachable_warned: bool,
-    coordination_process_lock: std::sync::Mutex<Option<Arc<CoordinationProcessLock>>>,
-    coordination_process_lock_required: bool,
-    coordination_exclusive: bool,
-    coordination_snapshot_read_only: bool,
-    store_cutover_blocked: bool,
-    session_private: bool,
-    workspace_writer_locks: HashMap<PathBuf, Arc<CoordinationProcessLock>>,
     /// Configured default per-child model-turn budget (`[subagents]
     /// default_max_steps`, #5324). `None` keeps the unbounded Fleet default;
     /// an explicit spawn `max_steps` still wins. Zero means unbounded.
@@ -4759,13 +4628,6 @@ impl SubAgentManager {
             state_root,
             state_path: None,
             state_unreachable_warned: false,
-            coordination_process_lock: std::sync::Mutex::new(None),
-            coordination_process_lock_required: false,
-            coordination_exclusive: false,
-            coordination_snapshot_read_only: false,
-            store_cutover_blocked: false,
-            session_private: false,
-            workspace_writer_locks: HashMap::new(),
             max_steps: None,
             wall_time: None,
             max_agents,
@@ -4831,22 +4693,6 @@ impl SubAgentManager {
         return Err("coordination workspace identity is unsupported on this platform".into());
         #[cfg(any(unix, windows))]
         {
-            if self.coordination_exclusive
-                && !self.coordination_snapshot_read_only
-                && normalize_subagent_workspace(&lexical)
-                    != normalize_subagent_workspace(&self.state_root)
-                && !self.workspace_writer_locks.contains_key(&canonical_root)
-            {
-                match CoordinationProcessLock::acquire(&lexical, true) {
-                    Ok(lock) => {
-                        self.workspace_writer_locks
-                            .insert(canonical_root.clone(), Arc::new(lock));
-                    }
-                    Err(error) => {
-                        tracing::warn!(target: "subagent", %error, "admitted coordination workspace without its writer lock; shared-workspace writers there stay refused until it is free");
-                    }
-                }
-            }
             let receipt = CoordinationClaimScope {
                 canonical_root,
                 platform: platform.into(),
@@ -4866,44 +4712,61 @@ impl SubAgentManager {
         }
     }
 
-    fn ensure_origin_writer_lock(&mut self, origin: &WorkerOrigin) -> Result<(), String> {
-        let (Some(selected), Some(scope)) = (&origin.selected_workspace, &origin.scope) else {
+    fn refuse_live_selected_store_writers(&self, origin: &WorkerOrigin) -> Result<(), String> {
+        let (Some(selected), Some(_)) = (&origin.selected_workspace, &origin.scope) else {
             return Ok(());
         };
-        if !self.coordination_exclusive
-            || normalize_subagent_workspace(selected)
-                == normalize_subagent_workspace(&self.state_root)
-            || self
-                .workspace_writer_locks
-                .contains_key(&scope.canonical_root)
+        if normalize_subagent_workspace(selected) == normalize_subagent_workspace(&self.state_root)
         {
             return Ok(());
         }
-        let lock =
-            CoordinationProcessLock::acquire(selected, true).map_err(|error| error.to_string())?;
-        self.workspace_writer_locks
-            .insert(scope.canonical_root.clone(), Arc::new(lock));
+        let path = default_state_path(selected).map_err(|error| error.to_string())?;
+        let unreadable = |error: std::io::Error| {
+            format!(
+                "cannot check {} for another open Codewhale session ({error}); shared-workspace writers there stay refused, or launch the builder in an isolated worktree",
+                selected.display()
+            )
+        };
+        let directory = path
+            .parent()
+            .ok_or_else(|| "delegated store has no parent".to_string())?;
+        let entries = match fs::read_dir(directory) {
+            Ok(entries) => entries,
+            Err(error) if error.kind() == std::io::ErrorKind::NotFound => return Ok(()),
+            Err(error) => return Err(unreadable(error)),
+        };
+        for entry in entries {
+            let name = entry.map_err(unreadable)?.file_name();
+            let Some(writer) = name
+                .to_str()
+                .and_then(|name| name.strip_prefix("subagents.v3.writer."))
+                .and_then(|name| name.strip_suffix(".lock"))
+            else {
+                continue;
+            };
+            if valid_store_writer(writer) && store_writer_is_live(&path, writer) {
+                return Err(format!(
+                    "another Codewhale session ({writer}) has {} open; shared-workspace writers there stay refused until it exits, or launch the builder in an isolated worktree",
+                    selected.display()
+                ));
+            }
+        }
         Ok(())
     }
 
-    fn ensure_worker_coordination_locks(
-        &mut self,
+    fn admit_worker_shared_writes(
+        &self,
         spec: &AgentWorkerSpec,
         origin: &WorkerOrigin,
     ) -> Result<(), String> {
-        let claim = worker_coordination_claim(spec)?;
-        if claim.as_ref().is_some_and(|(_, isolated)| *isolated) {
-            return Ok(());
+        match worker_coordination_claim(spec)? {
+            Some((_, false)) => self.refuse_live_selected_store_writers(origin),
+            _ => Ok(()),
         }
-        self.ensure_coordination_process_lock()?;
-        if claim.is_some() {
-            self.ensure_origin_writer_lock(origin)?;
-        }
-        Ok(())
     }
 
     pub fn ensure_registered_worker_coordination_locks(
-        &mut self,
+        &self,
         worker_id: &str,
     ) -> Result<(), String> {
         let spec = self
@@ -4918,7 +4781,7 @@ impl SubAgentManager {
             .cloned()
             .ok_or_else(|| "worker origin is missing from the owner journal".to_string())?;
         self.validate_worker_origin(&origin)?;
-        self.ensure_worker_coordination_locks(&spec, &origin)
+        self.admit_worker_shared_writes(&spec, &origin)
     }
 
     fn admitted_coordination_root(&self, workspace: &Path) -> Option<&AdmittedCoordinationRoot> {
@@ -5316,7 +5179,6 @@ impl SubAgentManager {
                 .map_err(|error| error.to_string());
         }
 
-        self.ensure_coordination_process_lock()?;
         if let Some(root) = self.admitted_coordination_root(workspace) {
             root.validate()?;
         }
@@ -5395,7 +5257,6 @@ impl SubAgentManager {
                 .map_err(|error| error.to_string());
         }
 
-        self.ensure_coordination_process_lock()?;
         self.coordination
             .update_decision_status(decision_id, status, owner, expected_version)
     }
@@ -5442,7 +5303,6 @@ impl SubAgentManager {
                 .map_err(|error| error.to_string());
         }
 
-        self.ensure_coordination_process_lock()?;
         let expected_owner = self.nearest_common_fan_in_owner(&input_decisions)?;
         if owner != expected_owner {
             return Err(format!(
@@ -5714,19 +5574,13 @@ impl SubAgentManager {
             },
             bounded: true,
             limit,
-            process_lock_held: !self.session_private && {
-                // Retry acquire on each projection so a session that lost the
-                // flock at construction recovers once the previous owner exits.
-                let _ = self.coordination_process_lock_status();
-                self.holds_coordination_process_lock()
-            },
-            process_lock_note: if self.session_private {
-                Some(SESSION_PRIVATE_COORDINATION.to_string())
-            } else if self.holds_coordination_process_lock() {
-                None
-            } else {
-                self.coordination_process_lock_status().err()
-            },
+            process_lock_held: self.state_path.is_none() || self.store_authority.is_some(),
+            process_lock_note: (self.state_path.is_some() && self.store_authority.is_none()).then(
+                || {
+                    "delegated store admission failed; it is retried on the next delegated write"
+                        .to_string()
+                },
+            ),
         }
     }
 
@@ -5861,7 +5715,6 @@ impl SubAgentManager {
                 .and_then(|outcome| outcome);
         }
 
-        self.ensure_coordination_process_lock()?;
         let Some(existing) = self
             .coordination
             .write_claims
@@ -5948,7 +5801,6 @@ impl SubAgentManager {
                 .map_err(|error| error.to_string());
         }
 
-        self.ensure_coordination_process_lock()?;
         let active = self.active_coordination_owners();
         let released = self
             .coordination
@@ -6073,109 +5925,12 @@ impl SubAgentManager {
         match SubAgentStoreAuthority::open(&self.state_root, &path, &self.current_session_boot_id) {
             Ok(authority) => self.store_authority = Some(authority),
             Err(error) => {
-                self.coordination_snapshot_read_only = true;
-                self.store_cutover_blocked = error
-                    .chain()
-                    .any(|cause| cause.is::<SubAgentCutoverBlocked>());
-                tracing::warn!(target: "subagent", %error, "delegated store admission failed; writable state remains refused");
+                tracing::warn!(target: "subagent", %error, "delegated store admission failed; it is retried on the next delegated write");
             }
         }
         self
     }
 
-    fn into_session_private(mut self) -> Self {
-        self.state_path = None;
-        self.store_authority = None;
-        self.coordination_snapshot_read_only = false;
-        self.coordination_process_lock_required = false;
-        self.session_private = true;
-        tracing::warn!(target: "subagent", "{SESSION_PRIVATE_COORDINATION}");
-        self
-    }
-
-    fn require_coordination_process_lock(mut self) -> Self {
-        self.coordination_process_lock_required = true;
-        if self.store_authority.is_none()
-            && let Some(path) = self.state_path.as_ref()
-        {
-            match SubAgentStoreAuthority::open(
-                &self.state_root,
-                path,
-                &self.current_session_boot_id,
-            ) {
-                Ok(authority) => self.store_authority = Some(authority),
-                Err(error) => {
-                    self.coordination_snapshot_read_only = true;
-                    tracing::warn!(target: "subagent", %error, "delegated store migration or admission failed; no durable writes are admitted");
-                    return self;
-                }
-            }
-        }
-        let acquired =
-            CoordinationProcessLock::acquire(&self.state_root, self.coordination_exclusive)
-                .ok()
-                .map(Arc::new);
-        if acquired.is_none() {
-            return self.into_session_private();
-        }
-        *self
-            .coordination_process_lock
-            .get_mut()
-            .expect("coordination lock slot poisoned") = acquired;
-        self
-    }
-
-    /// Terminal sessions retry failed acquisition when the previous owner
-    /// exits. A Runtime loaded without its writer lock must restart rather
-    /// than publish its stale snapshot. The flock is held on an open fd —
-    /// deleting the lock file does not release it (#5036).
-    fn ensure_coordination_process_lock(&self) -> Result<(), String> {
-        if self.coordination_snapshot_read_only {
-            return Err(
-                "Runtime coordination was opened without its writer lock; stop and restart this Runtime process after the other session exits"
-                    .into(),
-            );
-        }
-        if !self.coordination_process_lock_required {
-            return Ok(());
-        }
-        let mut slot = self
-            .coordination_process_lock
-            .lock()
-            .expect("coordination lock slot poisoned");
-        if slot.is_some() {
-            return Ok(());
-        }
-        match CoordinationProcessLock::acquire(&self.state_root, self.coordination_exclusive) {
-            Ok(lock) => {
-                *slot = Some(Arc::new(lock));
-                Ok(())
-            }
-            Err(error) => Err(error.to_string()),
-        }
-    }
-
-    /// Whether this process currently owns the workspace coordination flock.
-    /// Read-only inspection of the in-process slot — does not attempt acquire.
-    #[must_use]
-    pub fn holds_coordination_process_lock(&self) -> bool {
-        if !self.coordination_process_lock_required {
-            // Tests and non-durable managers do not require the flock.
-            return true;
-        }
-        self.coordination_process_lock
-            .lock()
-            .expect("coordination lock slot poisoned")
-            .is_some()
-    }
-
-    /// Probe lock ownership for UI/inspect surfaces. Retries acquire when the
-    /// slot is empty so a terminal session can recover after the previous
-    /// owner exits (#2.6 / #5036); read-only Runtime snapshots require restart.
-    pub fn coordination_process_lock_status(&self) -> Result<(), String> {
-        self.ensure_coordination_process_lock()
-    }
-
     #[must_use]
     pub fn with_running_heartbeat_timeout(mut self, timeout: Duration) -> Self {
         self.running_heartbeat_timeout = if timeout.is_zero() {
@@ -6223,18 +5978,31 @@ impl SubAgentManager {
                 .is_some_and(|authority| authority.owned.lock().contains(id))
     }
 
+    fn admitted_store_authority(&mut self) -> Result<Option<Arc<SubAgentStoreAuthority>>> {
+        let Some(path) = self.state_path.as_ref() else {
+            return Ok(None);
+        };
+        if let Some(authority) = self.store_authority.as_ref() {
+            return Ok(Some(authority.clone()));
+        }
+        let authority =
+            SubAgentStoreAuthority::open(&self.state_root, path, &self.current_session_boot_id)
+                .map_err(|error| {
+                    anyhow!(
+                        "delegated durable store admission failed ({error:#}); it is retried on the next delegated write"
+                    )
+                })?;
+        self.store_authority = Some(authority.clone());
+        Ok(Some(authority))
+    }
+
     pub(crate) fn with_store_transaction<T>(
         &mut self,
         operation: impl FnOnce(&mut Self) -> Result<T>,
     ) -> Result<T> {
-        if self.state_path.is_none() {
+        let Some(authority) = self.admitted_store_authority()? else {
             return operation(self);
-        }
-        self.ensure_coordination_process_lock()
-            .map_err(anyhow::Error::msg)?;
-        let authority = self.store_authority.clone().ok_or_else(|| {
-            anyhow!("delegated durable store admission failed; inspect before retrying")
-        })?;
+        };
         if authority.is_current_transaction() {
             return operation(self);
         }
@@ -6435,8 +6203,6 @@ impl SubAgentManager {
         worker_id: &str,
         payload: PersistedSubAgentState,
     ) -> Result<Option<AgentWorkerRecord>> {
-        self.ensure_coordination_process_lock()
-            .map_err(anyhow::Error::msg)?;
         if self.state_path.is_none() {
             return Ok(None);
         }
@@ -6534,8 +6300,6 @@ impl SubAgentManager {
     /// completes.  Callers may `.join()` for synchronous semantics or drop it
     /// for fire-and-forget.
     fn persist_state(&self) -> Result<std::thread::JoinHandle<()>> {
-        self.ensure_coordination_process_lock()
-            .map_err(anyhow::Error::msg)?;
         let Some((_, payload)) = self.build_persist_payload()? else {
             return Ok(std::thread::spawn(|| {}));
         };
@@ -6543,16 +6307,7 @@ impl SubAgentManager {
             .store_authority
             .clone()
             .ok_or_else(|| anyhow!("delegated store authority is unavailable"))?;
-        let writer_locks = self
-            .coordination_process_lock
-            .lock()
-            .expect("coordination lock slot poisoned")
-            .iter()
-            .cloned()
-            .chain(self.workspace_writer_locks.values().cloned())
-            .collect::<Vec<_>>();
         Ok(std::thread::spawn(move || {
-            let _writer_locks = writer_locks;
             if let Err(error) = authority.publish(&payload, None, None) {
                 tracing::warn!(target: "subagent", %error, "failed to persist sub-agent checkpoint");
             }
@@ -6560,8 +6315,6 @@ impl SubAgentManager {
     }
 
     fn persist_state_synchronously(&self) -> Result<()> {
-        self.ensure_coordination_process_lock()
-            .map_err(anyhow::Error::msg)?;
         let Some((_, payload)) = self.build_persist_payload()? else {
             return Ok(());
         };
@@ -6624,8 +6377,6 @@ impl SubAgentManager {
     /// Unlike `persist_state`, this performs disk I/O **synchronously** to
     /// guarantee data is flushed before the process exits.
     pub fn flush_pending_persist(&mut self) -> Result<()> {
-        self.ensure_coordination_process_lock()
-            .map_err(anyhow::Error::msg)?;
         if self.persist_pending {
             self.persist_state_synchronously()?;
             self.last_persist_at = Some(Instant::now());
@@ -6848,8 +6599,7 @@ impl SubAgentManager {
     }
 
     pub fn finalize_session_close_for_session(&mut self, active_session_id: &str) -> Result<usize> {
-        if !self.coordination_snapshot_read_only
-            && (self.state_path.is_none() || self.store_authority.is_some())
+        if (self.state_path.is_none() || self.store_authority.is_some())
             && !self.agents.values().any(|agent| {
                 self.owns_store_record(&agent.id)
                     && self.agent_is_owned_by_session(agent, active_session_id)
@@ -7108,10 +6858,9 @@ impl SubAgentManager {
         let Some((claim, isolated_worktree)) = worker_coordination_claim(spec)? else {
             return Ok(());
         };
-        // Isolated-worktree builders mutate their own checkout, not the
-        // shared workspace, so they must not contend for the per-workspace
-        // coordination process lock (#5036).
-        self.ensure_worker_coordination_locks(spec, origin)?;
+        if !isolated_worktree {
+            self.refuse_live_selected_store_writers(origin)?;
+        }
         let claim = self.namespace_write_claim(&origin_workspace, isolated_worktree, claim)?;
         let scope = if isolated_worktree {
             None
@@ -7191,11 +6940,7 @@ impl SubAgentManager {
         let previous_origins = self.worker_origins.clone();
         let previous_schema = self.worker_origin_schema;
         let claim = worker_coordination_claim(&spec)?;
-        // Same isolation rule as `preflight_worker_coordination` (#5036).
-        let isolated_worktree = claim
-            .as_ref()
-            .is_some_and(|(_, isolated_worktree)| *isolated_worktree);
-        self.ensure_worker_coordination_locks(&spec, &origin)?;
+        self.admit_worker_shared_writes(&spec, &origin)?;
         let previous_worker_records = self.worker_records.clone();
         let previous_coordination = self.coordination.clone();
         let persisted_claim = claim
@@ -7247,18 +6992,6 @@ impl SubAgentManager {
         let worker_id_for_log = spec.worker_id.clone();
         self.register_worker_for_session(spec, &origin.owner_session_id, None);
         self.install_worker_origin(&worker_id_for_log, origin);
-        if isolated_worktree && self.ensure_coordination_process_lock().is_err() {
-            // This process does not own the durable coordination state and an
-            // isolated-worktree builder must not be blocked on it: register
-            // in memory only and leave the durable ledger to the lock owner.
-            // The persist-layer lock check stays intact (#5036).
-            tracing::warn!(
-                target: "subagent",
-                worker = %worker_id_for_log,
-                "registered isolated-worktree worker in memory only; delegated coordination lock is owned elsewhere"
-            );
-            return Ok(());
-        }
         if let Err(error) = self.persist_state_synchronously() {
             self.worker_records = previous_worker_records;
             self.coordination = previous_coordination;
@@ -7684,7 +7417,6 @@ impl SubAgentManager {
                 .map_err(|error| error.to_string());
         }
 
-        self.ensure_coordination_process_lock()?;
         let worker_id = spec.worker_id.clone();
         let previous = self
             .worker_records
@@ -10327,20 +10059,9 @@ impl SubAgentManager {
                 ));
             }
         }
-        if write_capable {
-            // Isolated-worktree children mutate their own checkout, so they
-            // do not contend for the shared-workspace process lock (#5036).
-            if !options.isolated_worktree {
-                self.ensure_coordination_process_lock()
-                    .map_err(anyhow::Error::msg)?;
-                self.ensure_origin_writer_lock(&origin)
-                    .map_err(anyhow::Error::msg)?;
-            }
-            if self.coordination_process_lock_required && self.state_path.is_none() {
-                return Err(anyhow!(
-                    "write-capable sub-agent launch requires a durable coordination state path"
-                ));
-            }
+        if write_capable && !options.isolated_worktree {
+            self.refuse_live_selected_store_writers(&origin)
+                .map_err(anyhow::Error::msg)?;
         }
         let runtime_origin_turn_id = if runtime.context.runtime.active_thread_id.as_deref()
             == Some(runtime.context.state_namespace.as_str())
@@ -10574,7 +10295,9 @@ impl SubAgentManager {
                 self.resume_targets.insert(source.clone(), agent_id.clone());
             }
             self.agents.insert(agent_id.clone(), agent);
-            let persist_result = self.persist_state_synchronously();
+            let persist_result = self
+                .admitted_store_authority()
+                .and_then(|_| self.persist_state_synchronously());
             agent = self
                 .agents
                 .remove(&agent_id)
@@ -10887,8 +10610,6 @@ impl SubAgentManager {
         identity: &ChildActivationIdentity,
     ) -> Result<impl FnOnce() -> Result<()> + Send + 'static + use<>> {
         self.exact_activation(identity)?;
-        self.ensure_coordination_process_lock()
-            .map_err(anyhow::Error::msg)?;
         let (path, payload) = self
             .build_persist_payload()?
             .ok_or_else(|| anyhow!("child activation has no durable worker store"))?;
@@ -10913,16 +10634,7 @@ impl SubAgentManager {
             .clone()
             .ok_or_else(|| anyhow!("child activation has no store authority"))?;
         let identity = identity.clone();
-        let writer_locks = self
-            .coordination_process_lock
-            .lock()
-            .expect("coordination lock slot poisoned")
-            .iter()
-            .cloned()
-            .chain(self.workspace_writer_locks.values().cloned())
-            .collect::<Vec<_>>();
         Ok(move || {
-            let _writer_locks = writer_locks;
             store_authority.publish(&payload, None, None)?;
             let persisted = read_durable_subagent_store(&state_root, &path)?.state;
             let worker = persisted
@@ -11509,13 +11221,10 @@ impl SubAgentManager {
             }
         }
         // Deliberately NOT here: a pass that terminalized every Running agent
-        // without a live task handle whenever this process lacked the
-        // coordination flock (#2.6). Two Codewhale sessions in one workspace is
-        // ordinary usage, and failure to append to a shared bookkeeping ledger
-        // is not evidence that live work has stopped. Liveness is decided by
-        // the heartbeat above — which is actual evidence — never by who owns
-        // the flock (owner report, 2026-08-04). See `docs/architecture/
-        // delegated-coordination.md` for what lock loss legitimately costs.
+        // without a live task handle because another session shares the
+        // workspace (#2.6). Two Codewhale sessions in one workspace is ordinary
+        // usage, and liveness is decided by the heartbeat above — which is
+        // actual evidence (owner report, 2026-08-04).
 
         // The retained lineage owns continuation lookup and descendant
         // control. Keep the agents projection while live work references it.
@@ -11645,11 +11354,12 @@ impl SubAgentManager {
     }
 
     /// #3803: whether the next sidebar refresh should attempt cleanup.
-    /// Read-only managers without a process lock only render their refusal.
-    /// Other managers use the last attempt's interval to bound cleanup locking.
+    /// A manager whose durable store is not admitted only renders its refusal;
+    /// admission is retried on the next delegated write. Other managers use the
+    /// last attempt's interval to bound cleanup locking.
     #[must_use]
     pub fn cleanup_due(&self, min_interval: Duration) -> bool {
-        (!self.coordination_snapshot_read_only || self.holds_coordination_process_lock())
+        (self.state_path.is_none() || self.store_authority.is_some())
             && self
                 .last_cleanup_at
                 .is_none_or(|last| last.elapsed() >= min_interval)
@@ -13790,22 +13500,6 @@ fn ensure_subagent_store_cutover(root: &Path, path: &Path) -> Result<()> {
         let _ = codewhale_config::private_directory::PrivateDirectory::inspect(&legacy)?;
         return Ok(());
     }
-    let _migration = if legacy.is_dir() {
-        None
-    } else {
-        Some(
-            CoordinationProcessLock::acquire(root, true)
-                .map_err(|error| anyhow::Error::new(SubAgentCutoverBlocked(error)))?,
-        )
-    };
-    if path.exists() {
-        read_durable_subagent_store(root, path)?;
-        anyhow::ensure!(
-            legacy.is_dir(),
-            "delegated migration did not retain its legacy-write tombstone"
-        );
-        return Ok(());
-    }
     let staging = parent.join("subagents.v1.cutover");
     let backup_name = "legacy.json";
     let original_name = "original.json";
@@ -13882,6 +13576,20 @@ fn ensure_subagent_store_cutover(root: &Path, path: &Path) -> Result<()> {
     write_json_atomic(root, path, &DurableSubAgentStore::from_legacy(state))
 }
 
+fn write_state_gitignore(root: &Path, path: &Path) -> Result<()> {
+    let ignore = checked_subagent_state_path(root, &path.with_file_name(".gitignore"))?;
+    match fs::OpenOptions::new()
+        .write(true)
+        .create_new(true)
+        .open(&ignore)
+    {
+        Ok(mut file) => file.write_all(b"*\n")?,
+        Err(error) if error.kind() == std::io::ErrorKind::AlreadyExists => {}
+        Err(error) => return Err(error.into()),
+    }
+    Ok(())
+}
+
 fn store_writer_is_live(path: &Path, writer: &str) -> bool {
     if !valid_store_writer(writer) {
         return true;
@@ -13954,6 +13662,9 @@ impl SubAgentStoreAuthority {
         let _opening = acquire_store_transaction(root, path)?;
         ensure_subagent_store_cutover(root, path)?;
         let image = read_durable_subagent_store(root, path)?;
+        if let Err(error) = write_state_gitignore(root, path) {
+            tracing::warn!(target: "subagent", %error, "could not ignore the delegated state directory");
+        }
         sync_subagent_store_directory(
             path.parent()
                 .ok_or_else(|| anyhow!("delegated store has no parent"))?,
@@ -14494,24 +14205,16 @@ pub fn new_shared_subagent_manager_with_timeout(
     )
 }
 
-pub fn new_shared_runtime_subagent_manager(
-    workspace: PathBuf,
-    workers: usize,
-) -> Result<SharedSubAgentManager> {
-    new_runtime_subagent_manager(workspace, workers, false)
-}
-
 pub fn new_exclusive_runtime_subagent_manager(
     workspace: PathBuf,
     workers: usize,
 ) -> Result<SharedSubAgentManager> {
-    new_runtime_subagent_manager(workspace, workers, true)
+    new_shared_runtime_subagent_manager(workspace, workers)
 }
 
-fn new_runtime_subagent_manager(
+pub fn new_shared_runtime_subagent_manager(
     workspace: PathBuf,
     workers: usize,
-    exclusive: bool,
 ) -> Result<SharedSubAgentManager> {
     type RuntimeManagerRegistry =
         parking_lot::Mutex<HashMap<PathBuf, (usize, std::sync::Weak<RwLock<SubAgentManager>>)>>;
@@ -14536,12 +14239,6 @@ fn new_runtime_subagent_manager(
         .with_admission_limit(workers)
         .with_launch_concurrency(workers)
         .with_state_path(state_path);
-    manager.coordination_exclusive = exclusive;
-    manager = manager.require_coordination_process_lock();
-    if let Err(error) = manager.ensure_coordination_process_lock() {
-        manager.coordination_snapshot_read_only = true;
-        tracing::warn!(target: "subagent", %error, "Runtime coordination is read-only; stop and restart this Runtime process after the other session exits to load current state and regain delegated writes");
-    }
     manager.load_state()?;
     let manager = Arc::new(RwLock::new(manager));
     managers.insert(key, (workers, Arc::downgrade(&manager)));
@@ -14551,7 +14248,7 @@ fn new_runtime_subagent_manager(
 /// Create a shared sub-agent manager with an explicit control-plane state root.
 ///
 /// `workspace` remains the child execution and file-authority root. The worker
-/// ledger, complete transcript artifacts and coordination lock live under
+/// ledger and complete transcript artifacts live under
 /// `state_root/.codewhale/state`. Distinct state roots intentionally do not
 /// share write claims; an embedding host that runs them against the same
 /// workspace must provide any required cross-session write coordination.
@@ -14594,25 +14291,8 @@ pub fn new_shared_subagent_manager_with_state_root_and_timeout(
     if let Some(state_path) = state_path {
         manager = manager.with_state_path(state_path);
     }
-    manager = if manager.store_cutover_blocked {
-        manager.into_session_private()
-    } else {
-        manager.require_coordination_process_lock()
-    };
-    if let Err(error) = manager.ensure_coordination_process_lock() {
-        tracing::warn!(target: "subagent", %error, "this session cannot append to the shared coordination ledger");
-    }
-    // Loading is a read. It was previously gated behind the *write* flock,
-    // which left a second session in the same workspace blind to every
-    // decision and write claim already recorded — and holding a default,
-    // empty ledger that would be written straight over the real one the
-    // moment the first session exited and the flock became acquirable
-    // (owner report, 2026-08-04). Read unconditionally; the write gate on
-    // `persist_state`/`persist_state_synchronously` still checks this
-    // manager's coordinator admission before publishing.
     if let Err(err) = manager.load_state() {
-        manager.coordination_snapshot_read_only = true;
-        tracing::warn!(target: "subagent", ?err, "failed to load sub-agent state; durable writes remain refused");
+        tracing::warn!(target: "subagent", ?err, "failed to load sub-agent state");
     }
     Arc::new(RwLock::new(manager))
 }
@@ -23153,10 +22833,29 @@ mod owner_scoped_coordination_tests {
         let mut manager = authority.try_write().unwrap();
         admit(&mut manager, &original);
         admit(&mut manager, &selected);
-        let independent =
-            SubAgentManager::new(selected.clone(), 2).require_coordination_process_lock();
-        assert!(independent.session_private);
-        assert!(independent.ensure_coordination_process_lock().is_ok());
+        let independent = SubAgentManager::new(selected.clone(), 2)
+            .with_state_path(default_state_path(&selected).unwrap());
+        assert!(independent.store_authority.is_some());
+        #[cfg(unix)]
+        {
+            use std::os::unix::fs::PermissionsExt;
+            let state_directory = default_state_path(&selected)
+                .unwrap()
+                .parent()
+                .unwrap()
+                .to_path_buf();
+            let mode = fs::metadata(&state_directory).unwrap().permissions().mode();
+            fs::set_permissions(&state_directory, fs::Permissions::from_mode(0o000)).unwrap();
+            let unreadable =
+                manager.preflight_worker_coordination(&writer("selected", &selected, "src"));
+            fs::set_permissions(&state_directory, fs::Permissions::from_mode(mode)).unwrap();
+            assert!(unreadable.is_err(), "an unlistable store must fail closed");
+        }
+        let refused = manager
+            .preflight_worker_coordination(&writer("selected", &selected, "src"))
+            .unwrap_err();
+        assert!(refused.contains("another Codewhale session"), "{refused}");
+        drop(independent);
         manager
             .preflight_worker_coordination(&writer("original", &original, "src"))
             .unwrap();

crates/engine/src/tools/subagent/tests.rs

@@ -1223,21 +1223,18 @@ fn coordination_hot_paths_count_only_active_authoritative_owners() {
 }
 
 #[test]
-fn runtime_mount_coordination_lock_is_shared_with_parallel_sessions() {
+fn runtime_mount_and_parallel_sessions_both_append_durably() {
     let tmp = tempdir().expect("tempdir");
     let runtime_authority = new_shared_runtime_subagent_manager(tmp.path().to_path_buf(), 8)
         .expect("admit TUI runtime writer");
-    let session =
-        SubAgentManager::new(tmp.path().to_path_buf(), 8).require_coordination_process_lock();
-    session
-        .ensure_coordination_process_lock()
-        .expect("a second session appends beside the runtime");
-    assert!(!session.coordination_snapshot_read_only);
+    let session = SubAgentManager::new(tmp.path().to_path_buf(), 8)
+        .with_state_path(default_state_path(tmp.path()).expect("state path"));
+    assert!(session.store_authority.is_some());
     session
         .persist_state_synchronously()
         .expect("session append");
     let runtime = runtime_authority.try_write().expect("runtime lock");
-    assert!(!runtime.coordination_snapshot_read_only);
+    assert!(runtime.store_authority.is_some());
     runtime
         .persist_state_synchronously()
         .expect("runtime append");
@@ -1363,10 +1360,9 @@ fn headless_worker_registration_enforces_live_claims_and_projects_context() {
             .iter()
             .any(|record| record.owner_session_id == "owner-worker-c")
     );
-    let independent =
-        SubAgentManager::new(tmp.path().to_path_buf(), 8).require_coordination_process_lock();
-    assert!(independent.session_private);
-    assert!(independent.ensure_coordination_process_lock().is_ok());
+    let independent = SubAgentManager::new(tmp.path().to_path_buf(), 8)
+        .with_state_path(default_state_path(tmp.path()).expect("state path"));
+    assert!(independent.store_authority.is_some());
     drop(independent);
     drop(authority_a);
     drop(authority_b);
@@ -1575,25 +1571,21 @@ fn prior_session_owners_never_count_as_active_coordination_owners() {
 }
 
 #[test]
-fn isolated_worktree_workers_skip_the_coordination_process_lock() {
+fn parallel_sessions_admit_shared_and_isolated_writers_durably() {
     let tmp = tempdir().expect("tempdir");
     let workspace = tmp.path().canonicalize().expect("canonical workspace");
+    let state_path = default_state_path(&workspace).expect("state path");
 
-    let holder = SubAgentManager::new(workspace.clone(), 4).require_coordination_process_lock();
-    holder
-        .ensure_coordination_process_lock()
-        .expect("holder owns the lock");
+    let holder = SubAgentManager::new(workspace.clone(), 4).with_state_path(state_path.clone());
+    assert!(holder.store_authority.is_some());
 
-    let mut contender =
-        SubAgentManager::new(workspace.clone(), 4).require_coordination_process_lock();
-    contender
-        .ensure_coordination_process_lock()
-        .expect("second manager now also owns shared lock (coexistence)");
+    let mut contender = SubAgentManager::new(workspace.clone(), 4).with_state_path(state_path);
+    assert!(contender.store_authority.is_some());
 
     let shared = make_write_worker_spec("shared-writer", workspace.clone(), "src/shared");
     contender
         .preflight_worker_coordination(&shared)
-        .expect("shared-workspace writer proceeds with shared lock");
+        .expect("shared-workspace writer proceeds beside another session");
 
     let mut isolated = make_write_worker_spec("isolated-writer", workspace.clone(), "src/iso");
     isolated
@@ -1603,69 +1595,64 @@ fn isolated_worktree_workers_skip_the_coordination_process_lock() {
         .worktree = true;
     contender
         .preflight_worker_coordination(&isolated)
-        .expect("isolated-worktree writer preflights without the lock");
+        .expect("isolated-worktree writer preflights beside another session");
     contender
         .register_worker_with_coordination(isolated)
-        .expect("isolated-worktree writer registers without the lock");
-
-    // Once the previous owner exits, a manager that failed earlier must
-    // acquire the lock on retry instead of replaying a memoized failure.
+        .expect("isolated-worktree writer registers durably");
     drop(holder);
-    contender
-        .ensure_coordination_process_lock()
-        .expect("lock acquisition retries after the holder exits");
     contender
         .preflight_worker_coordination(&shared)
-        .expect("shared-workspace writer proceeds once the lock is held");
+        .expect("shared-workspace writer proceeds after the other session exits");
 }
 
 #[test]
-fn coordination_detail_projection_reports_process_lock_ownership() {
+fn coordination_detail_projection_reports_store_admission_and_its_retry() {
     let tmp = tempdir().expect("tempdir");
     let workspace = tmp.path().canonicalize().expect("canonical workspace");
+    let state_path = default_state_path(&workspace).expect("state path");
 
-    let holder = SubAgentManager::new(workspace.clone(), 4).require_coordination_process_lock();
-    holder
-        .ensure_coordination_process_lock()
-        .expect("holder owns the lock");
+    let holder = SubAgentManager::new(workspace.clone(), 4).with_state_path(state_path.clone());
     let held = holder.coordination_detail_projection(None, 8);
-    assert!(
-        held.process_lock_held,
-        "holder projection must report lock held"
-    );
+    assert!(held.process_lock_held);
     assert!(held.process_lock_note.is_none());
 
-    let contender = SubAgentManager::new(workspace, 4).require_coordination_process_lock();
+    let contender = SubAgentManager::new(workspace.clone(), 4).with_state_path(state_path.clone());
     let shared = contender.coordination_detail_projection(None, 8);
-    // With shared locks both holders coexist — contender reports held and no note.
+    assert!(shared.process_lock_held);
+    assert!(shared.process_lock_note.is_none());
+
+    let committed = std::fs::read(&state_path).expect("committed store");
+    std::fs::write(&state_path, b"{").expect("corrupt store");
+    let mut refused = SubAgentManager::new(workspace, 4).with_state_path(state_path.clone());
+    let projection = refused.coordination_detail_projection(None, 8);
+    assert!(!projection.process_lock_held);
+    assert!(projection.process_lock_note.is_some());
+    assert!(!refused.cleanup_due(Duration::ZERO));
+    assert!(refused.release_stale_write_claims(None).is_err());
+    assert!(!refused.cleanup_due(Duration::ZERO));
+
+    std::fs::write(&state_path, committed).expect("restore store");
+    refused
+        .release_stale_write_claims(None)
+        .expect("admission is retried once the store is readable");
     assert!(
-        shared.process_lock_held,
-        "contender projection must report lock held with shared locks"
-    );
-    assert!(
-        shared.process_lock_note.is_none(),
-        "shared projection carries no note"
+        refused
+            .coordination_detail_projection(None, 8)
+            .process_lock_held
     );
+    assert!(refused.cleanup_due(Duration::ZERO));
 }
 
-/// A second Codewhale session in the same workspace is ordinary usage. Losing
-/// the coordination flock means "I cannot append to the shared ledger" — it
-/// must never mean "my agents are dead". Bookkeeping failure and liveness are
-/// separate concerns (owner report, 2026-08-04).
+/// A second Codewhale session in the same workspace is ordinary usage and
+/// must never mean "my agents are dead". Bookkeeping and liveness are separate
+/// concerns (owner report, 2026-08-04).
 #[test]
-fn a_second_session_without_the_lock_keeps_its_running_agents_live() {
+fn a_second_session_keeps_its_running_agents_live() {
     let tmp = tempdir().expect("tempdir");
     let workspace = tmp.path().canonicalize().expect("canonical workspace");
 
-    let holder = SubAgentManager::new(workspace.clone(), 4).require_coordination_process_lock();
-    holder
-        .ensure_coordination_process_lock()
-        .expect("holder owns the lock");
-
-    let mut contender = SubAgentManager::new(workspace, 4).require_coordination_process_lock();
-    contender
-        .ensure_coordination_process_lock()
-        .expect("contender now also owns shared lock");
+    let _first = SubAgentManager::new(workspace.clone(), 4);
+    let mut contender = SubAgentManager::new(workspace, 4);
 
     let (input_tx, _input_rx) = mpsc::unbounded_channel();
     let mut agent = SubAgent::new(
@@ -1680,9 +1667,6 @@ fn a_second_session_without_the_lock_keeps_its_running_agents_live() {
         PathBuf::from("."),
         contender.session_boot_id().to_string(),
     );
-    // Fresh, well inside the heartbeat window: nothing about this agent is
-    // stale. The only thing "wrong" with it is that this process cannot write
-    // the shared ledger.
     agent.last_activity_at = Instant::now();
     let agent_id = agent.id.clone();
     contender.agents.insert(agent_id.clone(), agent);
@@ -1692,7 +1676,7 @@ fn a_second_session_without_the_lock_keeps_its_running_agents_live() {
         .expect("durable worker operation");
     assert_eq!(
         cancelled, 0,
-        "lock loss alone must not terminalize anything"
+        "another session alone must not terminalize anything"
     );
     let snap = contender
         .get_result(&agent_id)
@@ -1700,26 +1684,21 @@ fn a_second_session_without_the_lock_keeps_its_running_agents_live() {
     assert_eq!(
         snap.status,
         SubAgentStatus::Running,
-        "a live agent stays Running when this session cannot write the ledger: {:?}",
+        "a live agent stays Running beside another session: {:?}",
         snap.status
     );
 }
 
-/// A second session shares the workspace coordination read-lock and must load
-/// the existing ledger before it persists any of its own state. That preserves
-/// prior decisions instead of replacing them with an empty ledger.
+/// A second session must load the existing ledger before it persists any of
+/// its own state. That preserves prior decisions instead of replacing them
+/// with an empty ledger.
 #[test]
-fn a_second_session_with_the_shared_lock_loads_the_workspace_ledger() {
+fn a_second_session_loads_the_workspace_ledger() {
     let tmp = tempdir().expect("tempdir");
     let workspace = tmp.path().canonicalize().expect("canonical workspace");
     let state_path = default_state_path(&workspace).expect("state path");
 
-    let mut first = SubAgentManager::new(workspace.clone(), 4)
-        .with_state_path(state_path.clone())
-        .require_coordination_process_lock();
-    first
-        .ensure_coordination_process_lock()
-        .expect("first session owns the lock");
+    let mut first = SubAgentManager::new(workspace.clone(), 4).with_state_path(state_path.clone());
     first
         .record_coordination_decision(DecisionRecord {
             decision_id: "shared-decision".to_string(),
@@ -1737,20 +1716,15 @@ fn a_second_session_with_the_shared_lock_loads_the_workspace_ledger() {
         .persist_state_synchronously()
         .expect("first session persists the ledger");
 
-    // Second session in the same workspace while the first still holds the
-    // shared flock. It coexists and must see the workspace ledger.
     let second = new_shared_subagent_manager(workspace.clone(), 4);
     {
         let guard = second.blocking_read();
-        assert!(
-            guard.holds_coordination_process_lock(),
-            "test premise: the second session joins the shared flock"
-        );
+        assert!(guard.store_authority.is_some());
         let ledger = guard.coordination_snapshot();
         assert_eq!(
             ledger.decisions.len(),
             1,
-            "second session must load the workspace ledger it cannot write"
+            "second session must load the workspace ledger"
         );
         assert_eq!(ledger.decisions[0].decision_id, "shared-decision");
     }
@@ -1759,12 +1733,9 @@ fn a_second_session_with_the_shared_lock_loads_the_workspace_ledger() {
     drop(first);
     {
         let guard = second.blocking_write();
-        guard
-            .ensure_coordination_process_lock()
-            .expect("shared lock remains available after the first session exits");
         guard
             .persist_state_synchronously()
-            .expect("second session persists once it owns the lock");
+            .expect("second session persists after the first exits");
     }
     let mut replayed = SubAgentManager::new(workspace, 4).with_state_path(state_path);
     replayed.load_state().expect("reload the workspace ledger");
@@ -1776,23 +1747,15 @@ fn a_second_session_with_the_shared_lock_loads_the_workspace_ledger() {
 }
 
 /// The complement of the test above: an orphan still terminalizes, but only on
-/// heartbeat evidence. Lock ownership is not part of the decision either way.
+/// heartbeat evidence. Another session is not part of the decision either way.
 #[test]
-fn cleanup_terminalizes_orphans_on_heartbeat_evidence_not_on_lock_ownership() {
+fn cleanup_terminalizes_orphans_on_heartbeat_evidence_not_on_other_sessions() {
     let tmp = tempdir().expect("tempdir");
     let workspace = tmp.path().canonicalize().expect("canonical workspace");
 
-    let holder = SubAgentManager::new(workspace.clone(), 4).require_coordination_process_lock();
-    holder
-        .ensure_coordination_process_lock()
-        .expect("holder owns the lock");
-
-    let mut contender = SubAgentManager::new(workspace, 4)
-        .with_running_heartbeat_timeout(Duration::from_secs(30))
-        .require_coordination_process_lock();
-    contender
-        .ensure_coordination_process_lock()
-        .expect("contender now also owns shared lock");
+    let _first = SubAgentManager::new(workspace.clone(), 4);
+    let mut contender =
+        SubAgentManager::new(workspace, 4).with_running_heartbeat_timeout(Duration::from_secs(30));
 
     let insert_orphan = |manager: &mut SubAgentManager, name: &str, idle: Duration| {
         let (input_tx, _input_rx) = mpsc::unbounded_channel();
@@ -1832,7 +1795,7 @@ fn cleanup_terminalizes_orphans_on_heartbeat_evidence_not_on_lock_ownership() {
             .expect("fresh orphan still listed")
             .status,
         SubAgentStatus::Running,
-        "a fresh orphan is not terminalized just because the flock is elsewhere"
+        "a fresh orphan is not terminalized just because another session is open"
     );
     assert!(
         matches!(
@@ -11351,7 +11314,7 @@ async fn write_capable_agent_does_not_launch_when_durable_registration_fails() {
         .expect_err("writer must fail before spawn when its durable claim cannot commit")
         .to_string();
     assert!(
-        error.contains("durably register") || error.contains("writer lock"),
+        error.contains("durably register") || error.contains("store admission failed"),
         "{error}"
     );
 
@@ -12230,7 +12193,10 @@ fn persist_state_rejects_state_path_outside_state_root() {
         .persist_state()
         .expect_err("outside state path should fail");
 
-    assert!(format!("{err:#}").contains("without its writer lock"));
+    assert!(
+        format!("{err:#}").contains("must stay within state root"),
+        "{err:#}"
+    );
 }
 
 /// A user who keeps application state on another volume makes the workspace's
@@ -12405,9 +12371,7 @@ fn explicit_state_roots_isolate_managers_for_the_same_execution_workspace() {
         let mut manager = manager.try_write().expect("manager write lock");
         assert_eq!(manager.workspace.as_path(), workspace.as_path());
         assert_eq!(manager.state_root.as_path(), expected_root.as_path());
-        manager
-            .ensure_coordination_process_lock()
-            .expect("independent state-root coordination lock");
+        assert!(manager.store_authority.is_some());
         manager.register_worker(make_worker_spec(worker_id, workspace.clone()));
         manager
             .persist_state_synchronously()
@@ -12462,31 +12426,21 @@ fn persist_state_rejects_symlinked_state_directory() {
     );
 }
 
-/// A linked `.codewhale` must be refused before anything is created: the
-/// coordination lock used to `create_dir_all` through the link first.
 #[cfg(unix)]
 #[test]
-fn coordination_lock_refuses_linked_codewhale_without_writing_through_it() {
+fn a_linked_codewhale_admission_writes_no_gitignore_through_it() {
     let tmp = tempdir().expect("tempdir");
-    let workspace = tmp.path().join("workspace");
-    let outside = tmp.path().join("outside");
+    let root = tmp.path().canonicalize().expect("canonical root");
+    let workspace = root.join("workspace");
+    let outside = root.join("outside");
     std::fs::create_dir_all(&workspace).expect("mkdir workspace");
     std::fs::create_dir_all(&outside).expect("mkdir outside");
     std::os::unix::fs::symlink(&outside, workspace.join(".codewhale")).expect("link .codewhale");
-
-    let Err(err) = CoordinationProcessLock::acquire(&workspace, false) else {
-        panic!("a linked .codewhale must be refused");
-    };
-    let message = format!("{err:#}");
+    let manager = new_shared_subagent_manager(workspace, 4);
+    assert!(manager.blocking_read().store_authority.is_none());
     assert!(
-        message.contains("must not traverse symlinks")
-            || message.contains("must stay within state root"),
-        "{message}"
-    );
-    assert_eq!(
-        std::fs::read_dir(&outside).expect("read outside").count(),
-        0,
-        "nothing may be created through the link"
+        !outside.join("state").join(".gitignore").exists(),
+        "a refused admission writes no .gitignore through the link"
     );
 }
 
@@ -20874,24 +20828,66 @@ fn write_json_atomic_survives_concurrent_writers() {
     assert!(leftover.is_empty(), "temp files leaked: {leftover:?}");
 }
 
+fn two_process_decision(id: &str) -> DecisionRecord {
+    DecisionRecord {
+        decision_id: id.to_string(),
+        subject: id.to_string(),
+        status: DecisionStatus::Accepted,
+        owner: "root".to_string(),
+        scope: vec!["src".to_string()],
+        constraints: Vec::new(),
+        evidence_handles: Vec::new(),
+        version: 1,
+        sequence: 0,
+    }
+}
+
+fn wait_for_two_process_file(path: &Path, child: &mut std::process::Child, what: &str) {
+    let deadline = Instant::now() + Duration::from_secs(30);
+    while !path.exists() && Instant::now() < deadline {
+        std::thread::sleep(Duration::from_millis(10));
+    }
+    if !path.exists() {
+        let _ = child.kill();
+        panic!("{what} never became ready");
+    }
+}
+
 #[test]
-fn coordination_process_lock_rejects_second_process() {
-    const ROLE_ENV: &str = "CODEWHALE_TEST_COORDINATION_LOCK_ROLE";
-    const WORKSPACE_ENV: &str = "CODEWHALE_TEST_COORDINATION_LOCK_WORKSPACE";
+fn a_stale_session_never_makes_a_new_session_read_only() {
+    const ROLE_ENV: &str = "CODEWHALE_TEST_COORDINATION_ROLE";
+    const WORKSPACE_ENV: &str = "CODEWHALE_TEST_COORDINATION_WORKSPACE";
     const TEST_NAME: &str =
-        "tools::subagent::tests::coordination_process_lock_rejects_second_process";
+        "tools::subagent::tests::a_stale_session_never_makes_a_new_session_read_only";
 
     if let Some(role) = std::env::var_os(ROLE_ENV) {
         let workspace = PathBuf::from(std::env::var_os(WORKSPACE_ENV).expect("workspace env"));
-        if role == "legacy-holder" {
-            let _legacy_session = CoordinationProcessLock::acquire(&workspace, false)
-                .expect("an older session holds the shared lock");
-            std::fs::write(workspace.join("holder.ready"), b"ready").unwrap();
-            let deadline = Instant::now() + Duration::from_secs(10);
+        let wait_for_release = || {
+            let deadline = Instant::now() + Duration::from_secs(60);
             while !workspace.join("holder.release").exists() && Instant::now() < deadline {
                 std::thread::sleep(Duration::from_millis(10));
             }
             assert!(workspace.join("holder.release").exists(), "release timeout");
+        };
+        if role == "legacy-holder" {
+            let lock_file = std::fs::OpenOptions::new()
+                .create(true)
+                .truncate(false)
+                .read(true)
+                .write(true)
+                .open(
+                    workspace
+                        .join(".codewhale")
+                        .join("state")
+                        .join("subagents.v1.lock"),
+                )
+                .expect("open legacy lock");
+            let legacy = fd_lock::RwLock::new(lock_file);
+            let _guard = legacy
+                .try_read()
+                .expect("an older session holds the legacy lock");
+            std::fs::write(workspace.join("holder.ready"), b"ready").unwrap();
+            wait_for_release();
             return;
         }
         let manager = new_shared_subagent_manager_with_timeout(
@@ -20901,78 +20897,82 @@ fn coordination_process_lock_rejects_second_process() {
             Duration::from_secs(30),
             4,
         );
+        let mut guard = manager.try_write().unwrap();
+        assert!(guard.store_authority.is_some(), "{role:?} store admitted");
+        assert!(
+            guard
+                .coordination_detail_projection(None, 8)
+                .process_lock_held
+        );
+        let name = role.to_string_lossy().into_owned();
+        guard
+            .record_coordination_decision(two_process_decision(&format!("{name}-decision")))
+            .expect("record a decision beside the other session");
+        guard.register_worker(make_worker_spec(
+            &format!("{name}-worker"),
+            workspace.clone(),
+        ));
+        guard
+            .persist_state_synchronously()
+            .expect("publish beside the other session");
         if role == "holder" {
-            manager
-                .try_read()
-                .unwrap()
-                .ensure_coordination_process_lock()
-                .expect("holder owns lock");
             std::fs::write(workspace.join("holder.ready"), b"ready").unwrap();
-            let deadline = Instant::now() + Duration::from_secs(10);
-            while !workspace.join("holder.release").exists() && Instant::now() < deadline {
-                std::thread::sleep(Duration::from_millis(10));
-            }
-            assert!(workspace.join("holder.release").exists(), "release timeout");
+            wait_for_release();
         } else {
-            manager
-                .try_read()
-                .unwrap()
-                .ensure_coordination_process_lock()
-                .expect("second process now also succeeds with shared lock");
+            assert!(
+                guard
+                    .coordination_snapshot()
+                    .decisions
+                    .iter()
+                    .any(|decision| decision.decision_id == "holder-decision"),
+                "the new session merges the open session's ledger"
+            );
         }
         return;
     }
 
-    let dir = tempdir().expect("tempdir");
-    let workspace = dir.path().canonicalize().expect("canonical workspace");
     let test_binary = std::env::current_exe().expect("test binary");
-    let mut holder = std::process::Command::new(&test_binary)
-        .arg("--exact")
-        .arg(TEST_NAME)
-        .arg("--nocapture")
-        .env(ROLE_ENV, "holder")
-        .env(WORKSPACE_ENV, &workspace)
-        .stdout(std::process::Stdio::piped())
-        .stderr(std::process::Stdio::piped())
-        .spawn()
-        .expect("spawn lock holder");
-    let deadline = Instant::now() + Duration::from_secs(5);
-    while !workspace.join("holder.ready").exists() && Instant::now() < deadline {
-        std::thread::sleep(Duration::from_millis(10));
-    }
-    if !workspace.join("holder.ready").exists() {
-        let _ = holder.kill();
-        let output = holder.wait_with_output().expect("holder output");
-        panic!(
-            "holder never acquired lock:\nstdout:\n{}\nstderr:\n{}",
+    let spawn = |role: &str, workspace: &Path| {
+        std::process::Command::new(&test_binary)
+            .arg("--exact")
+            .arg(TEST_NAME)
+            .arg("--nocapture")
+            .env(ROLE_ENV, role)
+            .env(WORKSPACE_ENV, workspace)
+            .stdout(std::process::Stdio::piped())
+            .stderr(std::process::Stdio::piped())
+            .spawn()
+            .expect("spawn session process")
+    };
+    let finish = |child: std::process::Child, what: &str| {
+        let output = child.wait_with_output().expect("session output");
+        assert!(
+            output.status.success(),
+            "{what} failed:\nstdout:\n{}\nstderr:\n{}",
             String::from_utf8_lossy(&output.stdout),
             String::from_utf8_lossy(&output.stderr)
         );
-    }
-
-    let contender = std::process::Command::new(&test_binary)
-        .arg("--exact")
-        .arg(TEST_NAME)
-        .arg("--nocapture")
-        .env(ROLE_ENV, "contender")
-        .env(WORKSPACE_ENV, &workspace)
-        .output()
-        .expect("spawn lock contender");
-    assert!(
-        contender.status.success(),
-        "contender failed:\nstdout:\n{}\nstderr:\n{}",
-        String::from_utf8_lossy(&contender.stdout),
-        String::from_utf8_lossy(&contender.stderr)
-    );
+    };
 
+    let dir = tempdir().expect("tempdir");
+    let workspace = dir.path().canonicalize().expect("canonical workspace");
+    let mut holder = spawn("holder", &workspace);
+    wait_for_two_process_file(&workspace.join("holder.ready"), &mut holder, "open session");
+    finish(spawn("contender", &workspace), "new session");
     std::fs::write(workspace.join("holder.release"), b"release").unwrap();
-    let output = holder.wait_with_output().expect("holder output");
-    assert!(
-        output.status.success(),
-        "holder failed:\nstdout:\n{}\nstderr:\n{}",
-        String::from_utf8_lossy(&output.stdout),
-        String::from_utf8_lossy(&output.stderr)
-    );
+    finish(holder, "open session");
+    let workers = load_persisted_agent_worker_records_with_state_root(&workspace, &workspace)
+        .expect("read merged store");
+    for id in ["holder-worker", "contender-worker"] {
+        assert!(
+            workers.iter().any(|record| record.spec.worker_id == id),
+            "{id} survives the other session's publication"
+        );
+    }
+    let mut replayed = SubAgentManager::new(workspace.clone(), 4)
+        .with_state_path(default_state_path(&workspace).unwrap());
+    replayed.load_state().expect("reload merged ledger");
+    assert_eq!(replayed.coordination.decisions.len(), 2);
 
     let legacy_dir = tempdir().expect("tempdir");
     let legacy_workspace = legacy_dir
@@ -20988,75 +20988,42 @@ fn coordination_process_lock_rejects_second_process() {
     )
     .unwrap();
     let legacy_bytes = std::fs::read(&legacy_file).unwrap();
-    let mut legacy_holder = std::process::Command::new(&test_binary)
-        .arg("--exact")
-        .arg(TEST_NAME)
-        .arg("--nocapture")
-        .env(ROLE_ENV, "legacy-holder")
-        .env(WORKSPACE_ENV, &legacy_workspace)
-        .stdout(std::process::Stdio::piped())
-        .stderr(std::process::Stdio::piped())
-        .spawn()
-        .expect("spawn legacy lock holder");
-    let deadline = Instant::now() + Duration::from_secs(5);
-    while !legacy_workspace.join("holder.ready").exists() && Instant::now() < deadline {
-        std::thread::sleep(Duration::from_millis(10));
-    }
-    if !legacy_workspace.join("holder.ready").exists() {
-        let _ = legacy_holder.kill();
-        let output = legacy_holder
-            .wait_with_output()
-            .expect("legacy holder output");
-        panic!(
-            "legacy holder never acquired lock:\nstdout:\n{}\nstderr:\n{}",
-            String::from_utf8_lossy(&output.stdout),
-            String::from_utf8_lossy(&output.stderr)
-        );
-    }
-    let private = new_shared_subagent_manager(legacy_workspace.clone(), 4);
+    let mut legacy_holder = spawn("legacy-holder", &legacy_workspace);
+    wait_for_two_process_file(
+        &legacy_workspace.join("holder.ready"),
+        &mut legacy_holder,
+        "older session",
+    );
+    let upgraded = new_shared_subagent_manager(legacy_workspace.clone(), 4);
     {
-        let guard = private.blocking_read();
+        let mut guard = upgraded.blocking_write();
         assert!(
-            guard.ensure_coordination_process_lock().is_ok(),
-            "a session beside an older one keeps working sub-agents"
+            guard.store_authority.is_some(),
+            "a stale older session must not leave the new one read-only"
         );
         let projection = guard.coordination_detail_projection(None, 8);
-        assert!(!projection.process_lock_held);
         assert!(
-            projection
-                .process_lock_note
-                .as_deref()
-                .is_some_and(|note| note.starts_with(SESSION_PRIVATE_COORDINATION)),
+            projection.process_lock_held,
             "{:?}",
             projection.process_lock_note
         );
+        assert!(projection.process_lock_note.is_none());
+        guard
+            .record_coordination_decision(two_process_decision("upgraded-decision"))
+            .expect("the new session writes while the older one is still open");
+        assert!(guard.cleanup_due(Duration::from_secs(3600)));
     }
-    assert_eq!(
-        std::fs::read(&legacy_file).unwrap(),
-        legacy_bytes,
-        "the older session's store stays untouched"
-    );
-    assert!(
-        !state_dir.join(SUBAGENT_STATE_FILE).exists(),
-        "no forced cutover while the older session runs"
-    );
-    std::fs::write(legacy_workspace.join("holder.release"), b"release").unwrap();
-    let output = legacy_holder
-        .wait_with_output()
-        .expect("legacy holder output");
-    assert!(
-        output.status.success(),
-        "legacy holder failed:\nstdout:\n{}\nstderr:\n{}",
-        String::from_utf8_lossy(&output.stdout),
-        String::from_utf8_lossy(&output.stderr)
-    );
-    let upgraded = new_shared_subagent_manager(legacy_workspace, 4);
     assert!(
         state_dir.join(SUBAGENT_STATE_FILE).exists() && legacy_file.is_dir(),
-        "the next session upgrades the store once the older one exits"
+        "the store upgrades without waiting for the older session to exit"
     );
-    assert!(upgraded.blocking_read().holds_coordination_process_lock());
-    drop(private);
+    assert_eq!(
+        std::fs::read(legacy_file.join("legacy.json")).unwrap(),
+        legacy_bytes,
+        "the older store is retained byte for byte"
+    );
+    std::fs::write(legacy_workspace.join("holder.release"), b"release").unwrap();
+    finish(legacy_holder, "older session");
 }
 
 // === agent(action="wait") + peek throttling (#4097) ===
@@ -24171,35 +24138,32 @@ fn validate_resume_from_source(
 }
 
 /// Owner report 2026-08-04: a model/provider switch spawns the new engine's
-/// manager while the old engine still holds the workspace coordination flock
-/// in this same process. That losing acquisition must classify itself as a
-/// same-process handover (not "another Codewhale process"), and must
-/// self-heal via the projection retry once the previous owner drops.
+/// manager while the old engine's manager is still open in this same process.
+/// Both stay admitted, and the new one keeps writing after the old one drops.
 #[test]
-fn coordination_lock_loss_to_own_process_reads_as_handover_and_self_heals() {
+fn a_same_process_engine_handover_keeps_both_managers_admitted() {
     let tmp = tempdir().expect("tempdir");
+    let state_path = default_state_path(tmp.path()).expect("state path");
     let first =
-        SubAgentManager::new(tmp.path().to_path_buf(), 1).require_coordination_process_lock();
+        SubAgentManager::new(tmp.path().to_path_buf(), 1).with_state_path(state_path.clone());
+    let second = SubAgentManager::new(tmp.path().to_path_buf(), 1).with_state_path(state_path);
     assert!(
-        first.holds_coordination_process_lock(),
-        "first manager must own the flock"
+        first
+            .coordination_detail_projection(None, 8)
+            .process_lock_held
     );
-
-    let second =
-        SubAgentManager::new(tmp.path().to_path_buf(), 1).require_coordination_process_lock();
     assert!(
-        second.holds_coordination_process_lock(),
-        "second manager now also holds shared flock (coexistence)"
+        second
+            .coordination_detail_projection(None, 8)
+            .process_lock_held
     );
-    let note = second.coordination_process_lock_status();
-    assert!(note.is_ok(), "shared lock should not error: {note:?}");
-
+    first
+        .persist_state_synchronously()
+        .expect("old engine publishes");
     drop(first);
-    assert!(
-        second.coordination_process_lock_status().is_ok(),
-        "retry must acquire once the previous engine dropped the flock"
-    );
-    assert!(second.holds_coordination_process_lock());
+    second
+        .persist_state_synchronously()
+        .expect("new engine publishes after the old one drops");
 }
 
 // -- resume-from-checkpoint tests (checkpoint-based continuation) --

crates/models/src/auto_route_evidence.rs

@@ -11,6 +11,8 @@ pub struct AutoRouteDecisionEvidence {
     pub probabilities_bp: BTreeMap<String, u16>,
     pub confidence_bp: u16,
     pub min_confidence_bp: u16,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub abstained_questions: Vec<String>,
     /// `[auto] cost_saving` kept the fast tier because the strong tier's
     /// probability was below the cost-saving floor.
     #[serde(default, skip_serializing_if = "std::ops::Not::not")]

crates/tui/CHANGELOG.md

@@ -7,12 +7,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+- **Plugin index hooks:** hooks with the same name and event now have distinct row IDs, so clients can keep every configured hook visible.
+
 - **Renaming sessions with Chinese titles:** the session picker no longer rejects a Chinese, Japanese, Korean or emoji title of more than about 33 characters as "Title must be 1–100 characters". It now counts characters, as the message says and as `/rename` and the Runtime API already did, so any title up to 100 characters is accepted. Thanks [@luochen211](https://github.com/luochen211) (PR 7322).
 - **Non-ASCII file names:** `/diff`, the `@git` and `@diff` mentions and the Runtime API workspace diff now show paths with Chinese, emoji and other non-ASCII characters as written instead of as quoted octal escapes, and the turn context no longer lists the workspace root as an empty "Active paths" entry. Thanks [@luochen211](https://github.com/luochen211) (PR 7317).
 - **Session names after a crash, and keep-forever snapshot retention:** a session name saved right after a crash that cut off the previous session-index line is no longer lost, because the new entry now starts on its own line; and a very large `[snapshots] max_age_days` (such as `9223372036854775807` for "keep forever") no longer wraps around and deletes every undo snapshot at session start. Thanks [@luochen211](https://github.com/luochen211) (PR 7316).
 - **Blank environment variables:** exporting a variable empty (for example `CODEWHALE_MODEL=` from a compose `${VAR:-}` template) no longer hides its legacy alias. `DEEPSEEK_MODEL`, `DEEPSEEK_BASE_URL`, `KIMI_BASE_URL`, `DEEPSEEK_FORCE_HTTP1`, `DEEPSEEK_STREAM_OPEN_TIMEOUT_SECS` and the other provider alias variables now apply as they do when the primary is unset. Thanks [@luochen211](https://github.com/luochen211) (PR 7315).
 - **MCP and language servers that send requests mid-call:** a tool call no longer fails with "neither a result nor an error" when an MCP server sends a `ping` or other request that reuses the call's id while the call is running, and a language server's `workspace/configuration` or similar request no longer ends a pending LSP request. Codewhale now answers `ping`, answers other server requests with "Method not found" (it never advertised them), keeps waiting for the real reply, and a refused answer over Streamable HTTP no longer drops the connection to legacy SSE. Thanks [@luochen211](https://github.com/luochen211) (PR 7319).
 - **Qwen Code as an external agent:** Codewhale now finds an installed Qwen Code CLI (`qwen`, 0.6.1 or newer) and can run it as a session over ACP with `qwen --acp`. `GET /v1/agents/external` lists it, an older install is reported as needing `npm i -g @qwen-code/qwen-code@latest`, and sign-in stays inside Qwen Code (`/auth`). Thanks [@MannXo](https://github.com/MannXo) (#7293).
+- **Qwen Code as an external agent:** Codewhale now finds an installed Qwen Code CLI (`qwen`, 0.6.1 or newer) and can run it as a session over ACP with `qwen --acp`. `GET /v1/agents/external` lists it, an older install is reported as needing `npm i -g @qwen-code/qwen-code@latest`, and sign-in stays inside Qwen Code (`/auth`). Thanks [@MannXo](https://github.com/MannXo) (PR 7293).
+- **Telemetry setting default:** the settings schema API reports telemetry's default as on, matching what Codewhale does when you have not chosen.
+- **Auto routing abstention:** when the decision model marks a tier, effort or shadow answer `abstained: true`, Auto no longer acts on it, even with `min_confidence = 0`: an abstained tier takes the local fallback, an abstained effort keeps the tier and drops only the effort, and the routing receipt lists the abstained questions.
+- **Plugin index (Runtime API):** a new `GET /v1/apps/plugin-index` route lists plugins, skills, connectors, hooks and hand-written commands with kind, source and state, and `/v1/commands` rows say which plugin (`plugin_id`) added a command and whether a command came from the project (`workspace_sourced`) (CW-8092).
+- **Model commands and routing:** `codewhale model list` now lists every custom endpoint you have configured, under its own name. `codewhale model resolve` no longer refuses a model on a custom endpoint, router or local server whose model list has not been fetched yet; once a list is fetched, a model missing from it is still refused. Automatic routing marks a context window as verified only when the route itself supplies it, and no longer reports a guessed output limit.
+- **ACP:** when a plugin tool asks the core to run a tool that needs approval, the editor now gets a `session/request_permission` on the plugin tool's call that names the nested tool and its input; before, the prompt ended with an internal error (CW-8050).
 - **README and contributor credit:** the repository front page now opens the way the website does: the line "The model can be anyone's. The agent should be yours.", one sentence on what Codewhale is, the install command and one picture, with reference detail moved into the linked guides; the 18 translated READMEs follow the same structure and say they are machine-drafted. The contributor wall and the website now count the same 433 people (407 GitHub accounts and the commit authors whose email is not linked to an account), where the website had counted accounts only. `DEPENDENCY_SECURITY.md` moved into `docs/dependency-maintenance.md`, and `.github/SUPPORT.md` says where to ask for help.
 - **Website Plugins page:** The website's Plugins page now describes what the released version does, and a labelled section says what 0.10.3 adds: one Plugins place, Standard and Creator mode, and the Permissions control.
 - **First-time guide on the website:** a new docs page, "Use Codewhale for the first time" (`/docs/first-time`, English and Simplified Chinese), walks someone who has never used a terminal through opening one, installing, choosing the folder Codewhale works in and when that choice matters, opening a terminal in a folder from Finder or File Explorer, connecting a model, a first task, and stopping, undoing and quitting. The install page gains a short "New to the terminal?" block for macOS and Windows that links to it, and `llms.txt` carries the same steps.
@@ -676,7 +684,7 @@ work is declared complete here. Items moved to 0.10.4 by name are marked below.
 - **Windows uninstall removes the receipt and update leftovers.** The installer's uninstaller also deletes `.codewhale-install.sha256` and `codewhale.old-*`/`codew.old-*` left by a self-update, so `bin` can be removed. Refs #7091.
 - **Windows `/undo` matches recorded file paths regardless of case.** A write recorded under a different drive-letter or directory case, or a `\\?\` prefix, is no longer dropped from the restore plan. Refs #6970.
 - **Windows: Fleet and metrics read live files again.** Replaying a Fleet ledger and reading audit or receipt records no longer fail with a sharing violation while their writer is still open; the same regular-file, link and identity checks apply. Plugin enablement now says which snapshot check refused (stage root, content identity or final check) instead of one generic message. Generated protocol and SDK exports keep LF line endings in Windows checkouts.
-- **A held coordination lock no longer makes a new session read-only.** When another session owns the delegated-agent store, the new session starts on private state and says so, instead of refusing every sub-agent with “Failed to clean up sub-agents”.
+- **Sessions in one folder no longer leave each other's sub-agents read-only or private:** a second session works beside another one, stale or suspended included, the older sub-agent store upgrades right away, and a store that cannot be opened is retried on the next sub-agent change instead of needing a restart. While another Codewhale session, a suspended one included, is open in a folder the desktop app or `serve` was asked to work in (other than the folder it started in), that Runtime still refuses sub-agents that would edit the folder directly; isolated worktrees are unaffected. A sub-agent store that cannot be opened shows its refusal once instead of repeating cleanup warnings on every sidebar refresh. Restart any session started with Codewhale 0.10.2 or older: once the folder upgrades it can no longer save sub-agent state (Refs #7232).
 - **A dev server can outlive the turn in an interactive session.** `persist:true` now works in the TUI and desktop when the thread has Full Access; restricted postures and Fleet/sub-agents still refuse it.
 - **`codewhale exec --add-dir <path>`** (repeatable) and `addDirs` on `POST /v1/threads` let the file tools read and write a sibling directory, a second checkout or a shared scratch root without turning on Full Access.
 - **Unsettled usage is persisted in production, not only in tests.** The interactive sink now records a legacy usage receipt when a provider response has no settlement, so children and turns stop reporting settlement failure.
@@ -713,12 +721,6 @@ work is declared complete here. Items moved to 0.10.4 by name are marked below.
   composer. Real Pinyin input on macOS and Windows is not yet confirmed.
   Thanks [@cmdcorp6534](https://github.com/cmdcorp6534) for the report
   (Refs #2323).
-- **Sub-agents beside an older session:** while a Codewhale 0.10.2 session
-  still uses a folder's older delegated-agent store, a 0.10.3 session in the
-  same folder keeps working sub-agents with private state that is not saved,
-  instead of refusing every sub-agent action. The older session's files are
-  left untouched, and the store upgrades when a session starts after the older
-  one exits (Refs #7232).
 - **Fleet members:** a replayed member start now matches only within its own
   session, so two sessions that reuse an operation key no longer receive each
   other's agent.
@@ -747,12 +749,6 @@ work is declared complete here. Items moved to 0.10.4 by name are marked below.
   bare self-package exports resolve inside the selected package directory.
   Invalid or incompatible ranges and paths outside the reviewed package still
   refuse. Real published-plugin activation remains unqualified.
-- **Coordination lock diagnostics (#7232):** stale lock-file contents no longer
-  identify an owner PID. A refused legacy admission keeps its reason in Work
-  and shows one notice per cause instead of repeating cleanup warnings on
-  every sidebar refresh. Legacy migration still requires the actual holder to
-  exit and the refused owning Runtime to restart; locks and retained state
-  remain protected.
 - **A local proxy that stops mid-session no longer strands the session (#7231):** the model, catalog, search, vision, finance, MCP-registry, profile and remote-control clients watch a loopback proxy port and go direct while it refuses connections, then resume proxying when it returns. Only a definite refusal from every resolved address changes the route; remote proxies, `NO_PROXY` matches, credentials and the existing precedence are unchanged. Set `CODEWHALE_LOCAL_PROXY_FALLBACK=0` to keep the old build-time snapshot.
 - **Proxy diagnostic privacy ([#7233](https://github.com/codewhale-hq/codewhale/issues/7233)):** malformed MCP proxy warnings omit configured values; local-proxy log labels mask userinfo and omit URL paths, queries and fragments. Routing is unchanged. All 23 existing proxy tests passed on macOS; runtime log capture and other platforms remain unqualified. Thanks [@SparkofSpike](https://github.com/SparkofSpike) for the report.
 - **Fork, undo and retry work after a workspace drift notice (#7234):** the history-boundary walks now treat a whole `<context_update>` envelope as engine-owned, so a session that received one can be cut at every saved turn. A person quoting a notice or a truncated envelope still counts as their own prompt.

crates/tui/src/commands/discovery.rs

@@ -85,6 +85,7 @@ mod tests {
             aliases: aliases.iter().map(|s| s.to_string()).collect(),
             hidden,
             plugin_authority: None,
+            workspace_sourced: false,
             extension: None,
         }
     }

crates/tui/src/commands/mod.rs

@@ -296,6 +296,11 @@ impl codewhale_engine::command_catalog::CommandCatalog for CommandTable {
                     takes_arguments: metadata.takes_arguments(),
                     hidden: metadata.hidden,
                     extension: metadata.extension.is_some(),
+                    plugin_id: metadata
+                        .plugin_authority
+                        .as_ref()
+                        .map(|authority| authority.plugin_id.as_str().to_string()),
+                    workspace_sourced: metadata.workspace_sourced,
                     builtin_bindings: bindings.remove(&metadata.name).unwrap_or_default(),
                 })
                 .collect()

crates/tui/src/commands/user_registry.rs

@@ -80,6 +80,7 @@ pub struct UserCommandMetadata {
     pub aliases: Vec<String>,
     pub hidden: bool,
     pub plugin_authority: Option<codewhale_config::PluginAuthority>,
+    pub workspace_sourced: bool,
     /// Set for a command contributed by an extension-host plugin: it runs in
     /// the host (`command/run`) instead of expanding `body`.
     pub extension: Option<codewhale_engine::extension_host::command::ExtensionCommandRef>,
@@ -246,6 +247,7 @@ impl UserCommandRegistry {
                 let (mut metadata, errors) =
                     parse_metadata(entry.name, &entry.content, &entry.path);
                 metadata.plugin_authority = entry.plugin_authority;
+                metadata.workspace_sourced = entry.workspace_sourced;
                 (metadata, errors, entry.path, entry.workspace_sourced)
             })
             .collect::<Vec<_>>();
@@ -395,6 +397,7 @@ impl UserCommandRegistry {
                     aliases: Vec::new(),
                     hidden: false,
                     plugin_authority: Some(entry.authority),
+                    workspace_sourced: false,
                     extension: Some(reference),
                 },
             );
@@ -482,6 +485,7 @@ fn parse_metadata(
         aliases: Vec::new(),
         hidden: false,
         plugin_authority: None,
+        workspace_sourced: false,
         extension: None,
     };
     let mut configured_name = None;

crates/tui/src/tui/ui/activity_detail.rs

@@ -1771,6 +1771,7 @@ mod tests {
                 .collect(),
             confidence_bp: 6400,
             min_confidence_bp: 5000,
+            abstained_questions: Vec::new(),
             cost_saving_kept_fast: false,
             thinking: Some("max".to_string()),
             provider_reported_cost_usd: Some("0.000019992".to_string()),

crates/tui/tests/fixtures/conformance/events/approval_denied.golden.jsonl

@@ -24,4 +24,4 @@
 {"engine_session_id":"conformance-session","event":"session_updated","instruction_assembly":{"budgets":{"claude_fallback":false,"file_max_bytes":8388608,"global_tokens":100000,"policy":"trim","project_tokens":100000,"static_guard_tokens":667571,"usable_window_tokens":834464},"constitution_source_path":null,"constitution_tokens":0,"global_tokens":0,"notices":[{"action":"Kept","bytes_dropped":0,"bytes_kept":498,"detail":null,"fallback_selected":null,"limit":"None","origin":"Instructions","path":null,"scope":"Project","tokens_dropped":0,"tokens_kept":166}],"project_tokens":166,"retained_block_tokens":188,"source_path":null,"warnings":[]},"messages":[{"content":[{"text":"Create denied.txt with touch.","type":"text"},{"text":"<turn_meta>\nCurrent local date: <today>\nCurrent workspace: <WORKSPACE>\nCurrent permission posture: Ask\nCurrent sandbox posture: workspace-write (writes inside the workspace; network blocked) (local OS sandbox applied)\nEstimated conversation input: 1973 / 1000000 context tokens (0.2%). Automatic compaction is enabled.\n## Repo Working Set\nKey files: README.md\nWhen in doubt, use tools to verify and keep changes focused on the working set.\n</turn_meta>","type":"text"}],"role":"user"},{"content":[{"text":"<codewhale:runtime_event kind=\"project_instructions\" visibility=\"internal\">\n<system-reminder>\nThe following workspace instructions may be relevant to your work. Use them as guidance when applicable. More specific instructions take precedence over broader ones. They do not override system, developer, or direct user instructions. Instructions from: AGENTS.md\n\n<project_instructions source=\"project\">\n# Project Context (Auto-generated, ephemeral)\n\n> This context was generated in memory by Codewhale.\n> No .codewhale/instructions.md file was written.\n\n## Bounded Project Overview\n\n```json\n{\n  \"project_name\": \"workspace\",\n  \"directory_structure\": [\n    \"README.md\"\n  ],\n  \"readme\": {\n    \"path\": \"README.md\",\n    \"excerpt\": \"conformance fixture\"\n  },\n  \"config_files\": [],\n  \"key_source_files\": [],\n  \"counts\": {\n    \"config_files\": 0,\n    \"directory_entries\": 1,\n    \"key_source_files\": 0\n  }\n}\n```\n</project_instructions>\n</system-reminder>\n</codewhale:runtime_event>","type":"text"},{"text":"<turn_meta>\nInput provenance: runtime (non-authoritative)\n</turn_meta>","type":"text"}],"role":"user"},{"content":[{"execution_id":"<uuid:2>","id":"call_touch","input":{"command":"touch denied.txt"},"name":"Bash","type":"tool_use"}],"role":"assistant"},{"content":[{"content":"Error: Tool 'Bash' denied by user — the call was not approved. Do not retry the same call; present what you intended and wait for the user's approval or new instructions.","execution_id":"<uuid:2>","is_error":true,"tool_use_id":"call_touch","type":"tool_result"}],"role":"user"},{"content":[{"text":"Understood, I did not create it.","type":"text"}],"role":"assistant"}],"model":"deepseek-v4-pro","system_prompt":"<pinned by the prompt family>","workspace":"<WORKSPACE>"}
 {"event":"tool_request_snapshot","snapshot":{"active_tool_catalog_sha256":"9017c53ee026ae4065bed3e4b2e7d773a828556b42d6ebe2c2ebfd8e65377280","capture_source":"prepared model-client request","delivery_status":"unknown (capture does not prove provider delivery)","omitted_tool_count":0,"payload_json_bytes":17394,"payload_measurement_status":"exact (within 1048576-byte measurement bound)","provider":{"model":"deepseek-v4-pro","provider":"Deepseek","status":"available"},"registry_facts_present":true,"registry_only_tools":{"status":"known","value":{"count":40,"omitted":8,"rendered":[{"truncated":false,"value":"Git"},{"truncated":false,"value":"Run"},{"truncated":false,"value":"Web"},{"truncated":false,"value":"apply_patch"},{"truncated":false,"value":"automation"},{"truncated":false,"value":"context_archive_get"},{"truncated":false,"value":"context_archive_search"},{"truncated":false,"value":"diagnostics"},{"truncated":false,"value":"finance"},{"truncated":false,"value":"github"},{"truncated":false,"value":"handle_read"},{"truncated":false,"value":"harness"},{"truncated":false,"value":"image_ocr"},{"truncated":false,"value":"list_dir"},{"truncated":false,"value":"lsp"},{"truncated":false,"value":"note"},{"truncated":false,"value":"notify"},{"truncated":false,"value":"pandoc_convert"},{"truncated":false,"value":"project_map"},{"truncated":false,"value":"registry_sync"},{"truncated":false,"value":"request_plugin_install"},{"truncated":false,"value":"request_user_input"},{"truncated":false,"value":"retrieve_tool_result"},{"truncated":false,"value":"revert_turn"},{"truncated":false,"value":"review"},{"truncated":false,"value":"send_later"},{"truncated":false,"value":"session_get"},{"truncated":false,"value":"session_search"},{"truncated":false,"value":"start_mcp_server"},{"truncated":false,"value":"start_registry_mcp_server"},{"truncated":false,"value":"tasks"},{"truncated":false,"value":"terminal/cancel"}]}},"registry_tool_count":{"status":"known","value":65},"rendered_tool_count":15,"schema_version":1,"step":1,"terminal":{"automatic_compaction_attempts":0,"effective_max_steps":null,"emergency_compaction_attempts":0,"empty_stop_retries":0,"final_report_requested":false,"last_prepared_output_limit_tokens":65536,"last_provider_finish_reason":{"truncated":false,"value":"end_turn"},"last_reported_input_tokens":200,"last_response_tool_calls":0,"last_response_tool_calls_suppressed":0,"model_requests_started":2,"model_step_index":1,"permission_denial_rounds_without_progress":0,"permission_strategy_switches":0,"reason":"provider_no_tool_call","reasoning_only_reprompts":0,"route_context_window_tokens":1000000,"status":"completed","step_budget_source":"max_steps","stream_resumes":0,"transparent_stream_retries":0,"transport_retries":0},"tool_count":15,"tools":[{"allowed_callers":{"status":"known","value":{"count":1,"omitted":0,"rendered":[{"truncated":false,"value":"direct"}]}},"approval":{"status":"known","value":{"truncated":false,"value":"Required"}},"cache_control_type":{"reason":"request field absent","status":"unknown"},"capabilities":{"status":"known","value":{"count":3,"omitted":0,"rendered":[{"truncated":false,"value":"ExecutesCode"},{"truncated":false,"value":"Sandboxable"},{"truncated":false,"value":"RequiresApproval"}]}},"defer_loading":{"status":"known","value":false},"description":{"truncated":true,"value":"Execute a shell command in the workspace and return stdout and stderr (last 2000 lines or 50KB). Optional timeout is foreground seconds (default 30 seconds); a command still running then moves to the background by itself — never killed for time — returning output so far, last-output age, build phase, and a task_id. Call task_shell_wait with that task_id to read more or wait; do not sleep-poll with bash. Before a final answer, collect every still-relevant background task (wait only when genuinely blocked) an"},"input_examples":{"reason":"request field absent","status":"unknown"},"input_schema_json":{"truncated":false,"value":"{\"additionalProperties\":false,\"properties\":{\"command\":{\"description\":\"The command to execute. Actual execution shell: `/bin/bash`. Use Bash syntax: pipelines, redirections, $(command), and && / || are supported. Quote paths and variable expansions, such as \\\"$path\\\"; use single quotes for literal text. For literal multiline input, use a quoted heredoc delimiter (<<'EOF') with its closing delimiter on a separate line. Use only installed programs; do not assume GNU-specific flags on macOS/BSD. Example: printf '%s\\\\n' 'sample'.\",\"type\":\"string\"},\"description\":{\"description\":\"Optional few-word summary shown to the user beside the command.\",\"type\":\"string\"},\"justification\":{\"description\":\"Required with sandbox_permissions: one sentence explaining why this exact command needs wider access.\",\"type\":\"string\"},\"read_only\":{\"description\":\"Set true to run analysis code (including Python/SQLite) or a network fetch (curl) with mandatory native filesysteLine truncated
 {"event":"turn_complete","parent_route_usage":{"input_tokens":350,"output_tokens":21},"routed_usage_dropped_records":0,"status":"completed","tool_catalog":"<pinned by the prompt family>","turn_id":"<uuid:1>","usage":{"input_tokens":350,"output_tokens":21}}
-{"harness_summary":{"model_requests":2,"non_streaming_requests":0,"workspace_after":{".codewhale/state/.gitignore":"cdbcae15105d6b78",".codewhale/state/subagents.v1.json/legacy.json":"9064f16acf90984c",".codewhale/state/subagents.v1.lock":"e3b0c44298fc1c14",".codewhale/state/subagents.v3.json":"e874da2951e53d2b",".codewhale/state/subagents.v3.transaction.lock":"e3b0c44298fc1c14","README.md":"41f49bffb38de5ba"}}}
+{"harness_summary":{"model_requests":2,"non_streaming_requests":0,"workspace_after":{".codewhale/state/.gitignore":"cdbcae15105d6b78",".codewhale/state/subagents.v1.json/legacy.json":"9064f16acf90984c",".codewhale/state/subagents.v3.json":"e874da2951e53d2b",".codewhale/state/subagents.v3.transaction.lock":"e3b0c44298fc1c14","README.md":"41f49bffb38de5ba"}}}

crates/tui/tests/fixtures/conformance/events/cancel_midstream.golden.jsonl

@@ -15,4 +15,4 @@
 {"event":"tool_request_snapshot","snapshot":{"active_tool_catalog_sha256":"9017c53ee026ae4065bed3e4b2e7d773a828556b42d6ebe2c2ebfd8e65377280","capture_source":"prepared model-client request","delivery_status":"unknown (capture does not prove provider delivery)","omitted_tool_count":0,"payload_json_bytes":17394,"payload_measurement_status":"exact (within 1048576-byte measurement bound)","provider":{"model":"deepseek-v4-pro","provider":"Deepseek","status":"available"},"registry_facts_present":true,"registry_only_tools":{"status":"known","value":{"count":40,"omitted":8,"rendered":[{"truncated":false,"value":"Git"},{"truncated":false,"value":"Run"},{"truncated":false,"value":"Web"},{"truncated":false,"value":"apply_patch"},{"truncated":false,"value":"automation"},{"truncated":false,"value":"context_archive_get"},{"truncated":false,"value":"context_archive_search"},{"truncated":false,"value":"diagnostics"},{"truncated":false,"value":"finance"},{"truncated":false,"value":"github"},{"truncated":false,"value":"handle_read"},{"truncated":false,"value":"harness"},{"truncated":false,"value":"image_ocr"},{"truncated":false,"value":"list_dir"},{"truncated":false,"value":"lsp"},{"truncated":false,"value":"note"},{"truncated":false,"value":"notify"},{"truncated":false,"value":"pandoc_convert"},{"truncated":false,"value":"project_map"},{"truncated":false,"value":"registry_sync"},{"truncated":false,"value":"request_plugin_install"},{"truncated":false,"value":"request_user_input"},{"truncated":false,"value":"retrieve_tool_result"},{"truncated":false,"value":"revert_turn"},{"truncated":false,"value":"review"},{"truncated":false,"value":"send_later"},{"truncated":false,"value":"session_get"},{"truncated":false,"value":"session_search"},{"truncated":false,"value":"start_mcp_server"},{"truncated":false,"value":"start_registry_mcp_server"},{"truncated":false,"value":"tasks"},{"truncated":false,"value":"terminal/cancel"}]}},"registry_tool_count":{"status":"known","value":65},"rendered_tool_count":15,"schema_version":1,"step":0,"terminal":{"automatic_compaction_attempts":0,"effective_max_steps":null,"emergency_compaction_attempts":0,"empty_stop_retries":0,"final_report_requested":false,"last_prepared_output_limit_tokens":65536,"last_provider_finish_reason":null,"last_reported_input_tokens":120,"last_response_tool_calls":0,"last_response_tool_calls_suppressed":null,"model_requests_started":1,"model_step_index":0,"permission_denial_rounds_without_progress":0,"permission_strategy_switches":0,"reason":"interrupted","reasoning_only_reprompts":0,"route_context_window_tokens":1000000,"status":"interrupted","step_budget_source":"max_steps","stream_resumes":0,"transparent_stream_retries":0,"transport_retries":0},"tool_count":15,"tools":[{"allowed_callers":{"status":"known","value":{"count":1,"omitted":0,"rendered":[{"truncated":false,"value":"direct"}]}},"approval":{"status":"known","value":{"truncated":false,"value":"Required"}},"cache_control_type":{"reason":"request field absent","status":"unknown"},"capabilities":{"status":"known","value":{"count":3,"omitted":0,"rendered":[{"truncated":false,"value":"ExecutesCode"},{"truncated":false,"value":"Sandboxable"},{"truncated":false,"value":"RequiresApproval"}]}},"defer_loading":{"status":"known","value":false},"description":{"truncated":true,"value":"Execute a shell command in the workspace and return stdout and stderr (last 2000 lines or 50KB). Optional timeout is foreground seconds (default 30 seconds); a command still running then moves to the background by itself — never killed for time — returning output so far, last-output age, build phase, and a task_id. Call task_shell_wait with that task_id to read more or wait; do not sleep-poll with bash. Before a final answer, collect every still-relevant background task (wait only when genuinely blocked) an"},"input_examples":{"reason":"request field absent","status":"unknown"},"input_schema_json":{"truncated":false,"value":"{\"additionalProperties\":false,\"properties\":{\"command\":{\"description\":\"The command to execute. Actual execution shell: `/bin/bash`. Use Bash syntax: pipelines, redirections, $(command), and && / || are supported. Quote paths and variable expansions, such as \\\"$path\\\"; use single quotes for literal text. For literal multiline input, use a quoted heredoc delimiter (<<'EOF') with its closing delimiter on a separate line. Use only installed programs; do not assume GNU-specific flags on macOS/BSD. Example: printf '%s\\\\n' 'sample'.\",\"type\":\"string\"},\"description\":{\"description\":\"Optional few-word summary shown to the user beside the command.\",\"type\":\"string\"},\"justification\":{\"description\":\"Required with sandbox_permissions: one sentence explaining why this exact command needs wider access.\",\"type\":\"string\"},\"read_only\":{\"description\":\"Set true to run analysis code (including Python/SQLite) or a network fetch (curl) with mandatory native filesystem read-only isolation. Outbound networkLine truncated
 {"event":"turn_complete","parent_route_usage":{"input_tokens":120,"output_tokens":0},"routed_usage_dropped_records":0,"status":"interrupted","tool_catalog":"<pinned by the prompt family>","turn_id":"<uuid:1>","usage":{"input_tokens":120,"output_tokens":0}}
 {"event":"status","message":"Turn interrupted."}
-{"harness_summary":{"model_requests":1,"non_streaming_requests":0,"workspace_after":{".codewhale/state/.gitignore":"cdbcae15105d6b78",".codewhale/state/subagents.v1.json/legacy.json":"9064f16acf90984c",".codewhale/state/subagents.v1.lock":"e3b0c44298fc1c14",".codewhale/state/subagents.v3.json":"e874da2951e53d2b",".codewhale/state/subagents.v3.transaction.lock":"e3b0c44298fc1c14","NOTES.md":"f957b19529906961","README.md":"41f49bffb38de5ba"}}}
+{"harness_summary":{"model_requests":1,"non_streaming_requests":0,"workspace_after":{".codewhale/state/.gitignore":"cdbcae15105d6b78",".codewhale/state/subagents.v1.json/legacy.json":"9064f16acf90984c",".codewhale/state/subagents.v3.json":"e874da2951e53d2b",".codewhale/state/subagents.v3.transaction.lock":"e3b0c44298fc1c14","NOTES.md":"f957b19529906961","README.md":"41f49bffb38de5ba"}}}

crates/tui/tests/fixtures/conformance/events/one_tool_call.golden.jsonl

@@ -25,4 +25,4 @@
 {"engine_session_id":"conformance-session","event":"session_updated","instruction_assembly":{"budgets":{"claude_fallback":false,"file_max_bytes":8388608,"global_tokens":100000,"policy":"trim","project_tokens":100000,"static_guard_tokens":667571,"usable_window_tokens":834464},"constitution_source_path":null,"constitution_tokens":0,"global_tokens":0,"notices":[{"action":"Kept","bytes_dropped":0,"bytes_kept":514,"detail":null,"fallback_selected":null,"limit":"None","origin":"Instructions","path":null,"scope":"Project","tokens_dropped":0,"tokens_kept":172}],"project_tokens":172,"retained_block_tokens":193,"source_path":null,"warnings":[]},"messages":[{"content":[{"text":"What does README.md say?","type":"text"},{"text":"<turn_meta>\nCurrent local date: <today>\nCurrent workspace: <WORKSPACE>\nCurrent permission posture: Ask\nCurrent sandbox posture: workspace-write (writes inside the workspace; network blocked) (local OS sandbox applied)\nEstimated conversation input: 1972 / 1000000 context tokens (0.2%). Automatic compaction is enabled.\n## Repo Working Set\nKey files: README.md\nActive paths (prioritize these):\n- README.md (file)\nWhen in doubt, use tools to verify and keep changes focused on the working set.\n</turn_meta>","type":"text"}],"role":"user"},{"content":[{"text":"<codewhale:runtime_event kind=\"project_instructions\" visibility=\"internal\">\n<system-reminder>\nThe following workspace instructions may be relevant to your work. Use them as guidance when applicable. More specific instructions take precedence over broader ones. They do not override system, developer, or direct user instructions. Instructions from: AGENTS.md\n\n<project_instructions source=\"project\">\n# Project Context (Auto-generated, ephemeral)\n\n> This context was generated in memory by Codewhale.\n> No .codewhale/instructions.md file was written.\n\n## Bounded Project Overview\n\n```json\n{\n  \"project_name\": \"workspace\",\n  \"directory_structure\": [\n    \"README.md\",\n    \"NOTES.md\"\n  ],\n  \"readme\": {\n    \"path\": \"README.md\",\n    \"excerpt\": \"conformance fixture\"\n  },\n  \"config_files\": [],\n  \"key_source_files\": [],\n  \"counts\": {\n    \"config_files\": 0,\n    \"directory_entries\": 2,\n    \"key_source_files\": 0\n  }\n}\n```\n</project_instructions>\n</system-reminder>\n</codewhale:runtime_event>","type":"text"},{"text":"<turn_meta>\nInput provenance: runtime (non-authoritative)\n</turn_meta>","type":"text"}],"role":"user"},{"content":[{"execution_id":"<uuid:2>","id":"call_read_readme","input":{"action":"read","path":"README.md"},"name":"File","type":"tool_use"}],"role":"assistant"},{"content":[{"content":"content_hash=\"sha256:41f49bffb38de5ba88945f09121ffc590f9d7f6ff80fdb9ea8ad10224fecea61\"\nconformance fixture","execution_id":"<uuid:2>","tool_use_id":"call_read_readme","type":"tool_result"}],"role":"user"},{"content":[{"text":"It says: conformance fixture.","type":"text"}],"role":"assistant"}],"model":"deepseek-v4-pro","system_prompt":"<pinned by the prompt family>","workspace":"<WORKSPACE>"}
 {"event":"tool_request_snapshot","snapshot":{"active_tool_catalog_sha256":"9017c53ee026ae4065bed3e4b2e7d773a828556b42d6ebe2c2ebfd8e65377280","capture_source":"prepared model-client request","delivery_status":"unknown (capture does not prove provider delivery)","omitted_tool_count":0,"payload_json_bytes":17394,"payload_measurement_status":"exact (within 1048576-byte measurement bound)","provider":{"model":"deepseek-v4-pro","provider":"Deepseek","status":"available"},"registry_facts_present":true,"registry_only_tools":{"status":"known","value":{"count":40,"omitted":8,"rendered":[{"truncated":false,"value":"Git"},{"truncated":false,"value":"Run"},{"truncated":false,"value":"Web"},{"truncated":false,"value":"apply_patch"},{"truncated":false,"value":"automation"},{"truncated":false,"value":"context_archive_get"},{"truncated":false,"value":"context_archive_search"},{"truncated":false,"value":"diagnostics"},{"truncated":false,"value":"finance"},{"truncated":false,"value":"github"},{"truncated":false,"value":"handle_read"},{"truncated":false,"value":"harness"},{"truncated":false,"value":"image_ocr"},{"truncated":false,"value":"list_dir"},{"truncated":false,"value":"lsp"},{"truncated":false,"value":"note"},{"truncated":false,"value":"notify"},{"truncated":false,"value":"pandoc_convert"},{"truncated":false,"value":"project_map"},{"truncated":false,"value":"registry_sync"},{"truncated":false,"value":"request_plugin_install"},{"truncated":false,"value":"request_user_input"},{"truncated":false,"value":"retrieve_tool_result"},{"truncated":false,"value":"revert_turn"},{"truncated":false,"value":"review"},{"truncated":false,"value":"send_later"},{"truncated":false,"value":"session_get"},{"truncated":false,"value":"session_search"},{"truncated":false,"value":"start_mcp_server"},{"truncated":false,"value":"start_registry_mcp_server"},{"truncated":false,"value":"tasks"},{"truncated":false,"value":"terminal/cancel"}]}},"registry_tool_count":{"status":"known","value":65},"rendered_tool_count":15,"schema_version":1,"step":1,"terminal":{"automatic_compaction_attempts":0,"effective_max_steps":null,"emergency_compaction_attempts":0,"empty_stop_retries":0,"final_report_requested":false,"last_prepared_output_limit_tokens":65536,"last_provider_finish_reason":{"truncated":false,"value":"end_turn"},"last_reported_input_tokens":200,"last_response_tool_calls":0,"last_response_tool_calls_suppressed":0,"model_requests_started":2,"model_step_index":1,"permission_denial_rounds_without_progress":0,"permission_strategy_switches":0,"reason":"provider_no_tool_call","reasoning_only_reprompts":0,"route_context_window_tokens":1000000,"status":"completed","step_budget_source":"max_steps","stream_resumes":0,"transparent_stream_retries":0,"transport_retries":0},"tool_count":15,"tools":[{"allowed_callers":{"status":"known","value":{"count":1,"omitted":0,"rendered":[{"truncated":false,"value":"direct"}]}},"approval":{"status":"known","value":{"truncated":false,"value":"Required"}},"cache_control_type":{"reason":"request field absent","status":"unknown"},"capabilities":{"status":"known","value":{"count":3,"omitted":0,"rendered":[{"truncated":false,"value":"ExecutesCode"},{"truncated":false,"value":"Sandboxable"},{"truncated":false,"value":"RequiresApproval"}]}},"defer_loading":{"status":"known","value":false},"description":{"truncated":true,"value":"Execute a shell command in the workspace and return stdout and stderr (last 2000 lines or 50KB). Optional timeout is foreground seconds (default 30 seconds); a command still running then moves to the background by itself — never killed for time — returning output so far, last-output age, build phase, and a task_id. Call task_shell_wait with that task_id to read more or wait; do not sleep-poll with bash. Before a final answer, collect every still-relevant background task (wait only when genuinely blocked) an"},"input_examples":{"reason":"request field absent","status":"unknown"},"input_schema_json":{"truncated":false,"value":"{\"additionalProperties\":false,\"properties\":{\"command\":{\"description\":\"The command to execute. Actual execution shell: `/bin/bash`. Use Bash syntax: pipelines, redirections, $(command), and && / || are supported. Quote paths and variable expansions, such as \\\"$path\\\"; use single quotes for literal text. For literal multiline input, use a quoted heredoc delimiter (<<'EOF') with its closing delimiter on a separate line. Use only installed programs; do not assume GNU-specific flags on macOS/BSD. Example: printf '%s\\\\n' 'sample'.\",\"type\":\"string\"},\"description\":{\"description\":\"Optional few-word summary shown to the user beside the command.\",\"type\":\"string\"},\"justification\":{\"description\":\"Required with sandbox_permissions: one sentence explaining why this exact command needs wider access.\",\"type\":\"string\"},\"read_only\":{\"description\":\"Set true to run analysis code (including Python/SQLite) or a network fetch (curl) with mandatory native filesysteLine truncated
 {"event":"turn_complete","parent_route_usage":{"input_tokens":350,"output_tokens":26},"routed_usage_dropped_records":0,"status":"completed","tool_catalog":"<pinned by the prompt family>","turn_id":"<uuid:1>","usage":{"input_tokens":350,"output_tokens":26}}
-{"harness_summary":{"model_requests":2,"non_streaming_requests":0,"workspace_after":{".codewhale/state/.gitignore":"cdbcae15105d6b78",".codewhale/state/subagents.v1.json/legacy.json":"9064f16acf90984c",".codewhale/state/subagents.v1.lock":"e3b0c44298fc1c14",".codewhale/state/subagents.v3.json":"e874da2951e53d2b",".codewhale/state/subagents.v3.transaction.lock":"e3b0c44298fc1c14","NOTES.md":"f957b19529906961","README.md":"41f49bffb38de5ba"}}}
+{"harness_summary":{"model_requests":2,"non_streaming_requests":0,"workspace_after":{".codewhale/state/.gitignore":"cdbcae15105d6b78",".codewhale/state/subagents.v1.json/legacy.json":"9064f16acf90984c",".codewhale/state/subagents.v3.json":"e874da2951e53d2b",".codewhale/state/subagents.v3.transaction.lock":"e3b0c44298fc1c14","NOTES.md":"f957b19529906961","README.md":"41f49bffb38de5ba"}}}

crates/tui/tests/fixtures/conformance/events/parallel_tool_calls.golden.jsonl

@@ -31,4 +31,4 @@
 {"engine_session_id":"conformance-session","event":"session_updated","instruction_assembly":{"budgets":{"claude_fallback":false,"file_max_bytes":8388608,"global_tokens":100000,"policy":"trim","project_tokens":100000,"static_guard_tokens":667571,"usable_window_tokens":834464},"constitution_source_path":null,"constitution_tokens":0,"global_tokens":0,"notices":[{"action":"Kept","bytes_dropped":0,"bytes_kept":514,"detail":null,"fallback_selected":null,"limit":"None","origin":"Instructions","path":null,"scope":"Project","tokens_dropped":0,"tokens_kept":172}],"project_tokens":172,"retained_block_tokens":193,"source_path":null,"warnings":[]},"messages":[{"content":[{"text":"Read README.md and NOTES.md.","type":"text"},{"text":"<turn_meta>\nCurrent local date: <today>\nCurrent workspace: <WORKSPACE>\nCurrent permission posture: Ask\nCurrent sandbox posture: workspace-write (writes inside the workspace; network blocked) (local OS sandbox applied)\nEstimated conversation input: 1973 / 1000000 context tokens (0.2%). Automatic compaction is enabled.\n## Repo Working Set\nKey files: README.md\nActive paths (prioritize these):\n- NOTES.md (file)\n- README.md (file)\nWhen in doubt, use tools to verify and keep changes focused on the working set.\n</turn_meta>","type":"text"}],"role":"user"},{"content":[{"text":"<codewhale:runtime_event kind=\"project_instructions\" visibility=\"internal\">\n<system-reminder>\nThe following workspace instructions may be relevant to your work. Use them as guidance when applicable. More specific instructions take precedence over broader ones. They do not override system, developer, or direct user instructions. Instructions from: AGENTS.md\n\n<project_instructions source=\"project\">\n# Project Context (Auto-generated, ephemeral)\n\n> This context was generated in memory by Codewhale.\n> No .codewhale/instructions.md file was written.\n\n## Bounded Project Overview\n\n```json\n{\n  \"project_name\": \"workspace\",\n  \"directory_structure\": [\n    \"README.md\",\n    \"NOTES.md\"\n  ],\n  \"readme\": {\n    \"path\": \"README.md\",\n    \"excerpt\": \"conformance fixture\"\n  },\n  \"config_files\": [],\n  \"key_source_files\": [],\n  \"counts\": {\n    \"config_files\": 0,\n    \"directory_entries\": 2,\n    \"key_source_files\": 0\n  }\n}\n```\n</project_instructions>\n</system-reminder>\n</codewhale:runtime_event>","type":"text"},{"text":"<turn_meta>\nInput provenance: runtime (non-authoritative)\n</turn_meta>","type":"text"}],"role":"user"},{"content":[{"execution_id":"<uuid:2>","id":"call_read_a","input":{"action":"read","path":"README.md"},"name":"File","type":"tool_use"},{"execution_id":"<uuid:3>","id":"call_read_b","input":{"action":"read","path":"NOTES.md"},"name":"File","type":"tool_use"}],"role":"assistant"},{"content":[{"content":"content_hash=\"sha256:41f49bffb38de5ba88945f09121ffc590f9d7f6ff80fdb9ea8ad10224fecea61\"\nconformance fixture","execution_id":"<uuid:2>","tool_use_id":"call_read_a","type":"tool_result"}],"role":"user"},{"content":[{"content":"content_hash=\"sha256:f957b19529906961933c5c30f8713c500a9bb5d9d0695c40d48c97a26a3594ec\"\nsecond file","execution_id":"<uuid:3>","tool_use_id":"call_read_b","type":"tool_result"}],"role":"user"},{"content":[{"text":"Both files read.","type":"text"}],"role":"assistant"}],"model":"deepseek-v4-pro","system_prompt":"<pinned by the prompt family>","workspace":"<WORKSPACE>"}
 {"event":"tool_request_snapshot","snapshot":{"active_tool_catalog_sha256":"9017c53ee026ae4065bed3e4b2e7d773a828556b42d6ebe2c2ebfd8e65377280","capture_source":"prepared model-client request","delivery_status":"unknown (capture does not prove provider delivery)","omitted_tool_count":0,"payload_json_bytes":17394,"payload_measurement_status":"exact (within 1048576-byte measurement bound)","provider":{"model":"deepseek-v4-pro","provider":"Deepseek","status":"available"},"registry_facts_present":true,"registry_only_tools":{"status":"known","value":{"count":40,"omitted":8,"rendered":[{"truncated":false,"value":"Git"},{"truncated":false,"value":"Run"},{"truncated":false,"value":"Web"},{"truncated":false,"value":"apply_patch"},{"truncated":false,"value":"automation"},{"truncated":false,"value":"context_archive_get"},{"truncated":false,"value":"context_archive_search"},{"truncated":false,"value":"diagnostics"},{"truncated":false,"value":"finance"},{"truncated":false,"value":"github"},{"truncated":false,"value":"handle_read"},{"truncated":false,"value":"harness"},{"truncated":false,"value":"image_ocr"},{"truncated":false,"value":"list_dir"},{"truncated":false,"value":"lsp"},{"truncated":false,"value":"note"},{"truncated":false,"value":"notify"},{"truncated":false,"value":"pandoc_convert"},{"truncated":false,"value":"project_map"},{"truncated":false,"value":"registry_sync"},{"truncated":false,"value":"request_plugin_install"},{"truncated":false,"value":"request_user_input"},{"truncated":false,"value":"retrieve_tool_result"},{"truncated":false,"value":"revert_turn"},{"truncated":false,"value":"review"},{"truncated":false,"value":"send_later"},{"truncated":false,"value":"session_get"},{"truncated":false,"value":"session_search"},{"truncated":false,"value":"start_mcp_server"},{"truncated":false,"value":"start_registry_mcp_server"},{"truncated":false,"value":"tasks"},{"truncated":false,"value":"terminal/cancel"}]}},"registry_tool_count":{"status":"known","value":65},"rendered_tool_count":15,"schema_version":1,"step":1,"terminal":{"automatic_compaction_attempts":0,"effective_max_steps":null,"emergency_compaction_attempts":0,"empty_stop_retries":0,"final_report_requested":false,"last_prepared_output_limit_tokens":65536,"last_provider_finish_reason":{"truncated":false,"value":"end_turn"},"last_reported_input_tokens":200,"last_response_tool_calls":0,"last_response_tool_calls_suppressed":0,"model_requests_started":2,"model_step_index":1,"permission_denial_rounds_without_progress":0,"permission_strategy_switches":0,"reason":"provider_no_tool_call","reasoning_only_reprompts":0,"route_context_window_tokens":1000000,"status":"completed","step_budget_source":"max_steps","stream_resumes":0,"transparent_stream_retries":0,"transport_retries":0},"tool_count":15,"tools":[{"allowed_callers":{"status":"known","value":{"count":1,"omitted":0,"rendered":[{"truncated":false,"value":"direct"}]}},"approval":{"status":"known","value":{"truncated":false,"value":"Required"}},"cache_control_type":{"reason":"request field absent","status":"unknown"},"capabilities":{"status":"known","value":{"count":3,"omitted":0,"rendered":[{"truncated":false,"value":"ExecutesCode"},{"truncated":false,"value":"Sandboxable"},{"truncated":false,"value":"RequiresApproval"}]}},"defer_loading":{"status":"known","value":false},"description":{"truncated":true,"value":"Execute a shell command in the workspace and return stdout and stderr (last 2000 lines or 50KB). Optional timeout is foreground seconds (default 30 seconds); a command still running then moves to the background by itself — never killed for time — returning output so far, last-output age, build phase, and a task_id. Call task_shell_wait with that task_id to read more or wait; do not sleep-poll with bash. Before a final answer, collect every still-relevant background task (wait only when genuinely blocked) an"},"input_examples":{"reason":"request field absent","status":"unknown"},"input_schema_json":{"truncated":false,"value":"{\"additionalProperties\":false,\"properties\":{\"command\":{\"description\":\"The command to execute. Actual execution shell: `/bin/bash`. Use Bash syntax: pipelines, redirections, $(command), and && / || are supported. Quote paths and variable expansions, such as \\\"$path\\\"; use single quotes for literal text. For literal multiline input, use a quoted heredoc delimiter (<<'EOF') with its closing delimiter on a separate line. Use only installed programs; do not assume GNU-specific flags on macOS/BSD. Example: printf '%s\\\\n' 'sample'.\",\"type\":\"string\"},\"description\":{\"description\":\"Optional few-word summary shown to the user beside the command.\",\"type\":\"string\"},\"justification\":{\"description\":\"Required with sandbox_permissions: one sentence explaining why this exact command needs wider access.\",\"type\":\"string\"},\"read_only\":{\"description\":\"Set true to run analysis code (including Python/SQLite) or a network fetch (curl) with mandatory native filesysteLine truncated
 {"event":"turn_complete","parent_route_usage":{"input_tokens":360,"output_tokens":46},"routed_usage_dropped_records":0,"status":"completed","tool_catalog":"<pinned by the prompt family>","turn_id":"<uuid:1>","usage":{"input_tokens":360,"output_tokens":46}}
-{"harness_summary":{"model_requests":2,"non_streaming_requests":0,"workspace_after":{".codewhale/state/.gitignore":"cdbcae15105d6b78",".codewhale/state/subagents.v1.json/legacy.json":"9064f16acf90984c",".codewhale/state/subagents.v1.lock":"e3b0c44298fc1c14",".codewhale/state/subagents.v3.json":"e874da2951e53d2b",".codewhale/state/subagents.v3.transaction.lock":"e3b0c44298fc1c14","NOTES.md":"f957b19529906961","README.md":"41f49bffb38de5ba"}}}
+{"harness_summary":{"model_requests":2,"non_streaming_requests":0,"workspace_after":{".codewhale/state/.gitignore":"cdbcae15105d6b78",".codewhale/state/subagents.v1.json/legacy.json":"9064f16acf90984c",".codewhale/state/subagents.v3.json":"e874da2951e53d2b",".codewhale/state/subagents.v3.transaction.lock":"e3b0c44298fc1c14","NOTES.md":"f957b19529906961","README.md":"41f49bffb38de5ba"}}}

crates/tui/tests/fixtures/conformance/events/plain_answer.golden.jsonl

@@ -15,4 +15,4 @@
 {"engine_session_id":"conformance-session","event":"session_updated","instruction_assembly":{"budgets":{"claude_fallback":false,"file_max_bytes":8388608,"global_tokens":100000,"policy":"trim","project_tokens":100000,"static_guard_tokens":667571,"usable_window_tokens":834464},"constitution_source_path":null,"constitution_tokens":0,"global_tokens":0,"notices":[{"action":"Kept","bytes_dropped":0,"bytes_kept":514,"detail":null,"fallback_selected":null,"limit":"None","origin":"Instructions","path":null,"scope":"Project","tokens_dropped":0,"tokens_kept":172}],"project_tokens":172,"retained_block_tokens":193,"source_path":null,"warnings":[]},"messages":[{"content":[{"text":"Say hello.","type":"text"},{"text":"<turn_meta>\nCurrent local date: <today>\nCurrent workspace: <WORKSPACE>\nCurrent permission posture: Ask\nCurrent sandbox posture: workspace-write (writes inside the workspace; network blocked) (local OS sandbox applied)\nEstimated conversation input: 1968 / 1000000 context tokens (0.2%). Automatic compaction is enabled.\n## Repo Working Set\nKey files: README.md\nWhen in doubt, use tools to verify and keep changes focused on the working set.\n</turn_meta>","type":"text"}],"role":"user"},{"content":[{"text":"<codewhale:runtime_event kind=\"project_instructions\" visibility=\"internal\">\n<system-reminder>\nThe following workspace instructions may be relevant to your work. Use them as guidance when applicable. More specific instructions take precedence over broader ones. They do not override system, developer, or direct user instructions. Instructions from: AGENTS.md\n\n<project_instructions source=\"project\">\n# Project Context (Auto-generated, ephemeral)\n\n> This context was generated in memory by Codewhale.\n> No .codewhale/instructions.md file was written.\n\n## Bounded Project Overview\n\n```json\n{\n  \"project_name\": \"workspace\",\n  \"directory_structure\": [\n    \"README.md\",\n    \"NOTES.md\"\n  ],\n  \"readme\": {\n    \"path\": \"README.md\",\n    \"excerpt\": \"conformance fixture\"\n  },\n  \"config_files\": [],\n  \"key_source_files\": [],\n  \"counts\": {\n    \"config_files\": 0,\n    \"directory_entries\": 2,\n    \"key_source_files\": 0\n  }\n}\n```\n</project_instructions>\n</system-reminder>\n</codewhale:runtime_event>","type":"text"},{"text":"<turn_meta>\nInput provenance: runtime (non-authoritative)\n</turn_meta>","type":"text"}],"role":"user"},{"content":[{"text":"Hello there.","type":"text"}],"role":"assistant"}],"model":"deepseek-v4-pro","system_prompt":"<pinned by the prompt family>","workspace":"<WORKSPACE>"}
 {"event":"tool_request_snapshot","snapshot":{"active_tool_catalog_sha256":"9017c53ee026ae4065bed3e4b2e7d773a828556b42d6ebe2c2ebfd8e65377280","capture_source":"prepared model-client request","delivery_status":"unknown (capture does not prove provider delivery)","omitted_tool_count":0,"payload_json_bytes":17394,"payload_measurement_status":"exact (within 1048576-byte measurement bound)","provider":{"model":"deepseek-v4-pro","provider":"Deepseek","status":"available"},"registry_facts_present":true,"registry_only_tools":{"status":"known","value":{"count":40,"omitted":8,"rendered":[{"truncated":false,"value":"Git"},{"truncated":false,"value":"Run"},{"truncated":false,"value":"Web"},{"truncated":false,"value":"apply_patch"},{"truncated":false,"value":"automation"},{"truncated":false,"value":"context_archive_get"},{"truncated":false,"value":"context_archive_search"},{"truncated":false,"value":"diagnostics"},{"truncated":false,"value":"finance"},{"truncated":false,"value":"github"},{"truncated":false,"value":"handle_read"},{"truncated":false,"value":"harness"},{"truncated":false,"value":"image_ocr"},{"truncated":false,"value":"list_dir"},{"truncated":false,"value":"lsp"},{"truncated":false,"value":"note"},{"truncated":false,"value":"notify"},{"truncated":false,"value":"pandoc_convert"},{"truncated":false,"value":"project_map"},{"truncated":false,"value":"registry_sync"},{"truncated":false,"value":"request_plugin_install"},{"truncated":false,"value":"request_user_input"},{"truncated":false,"value":"retrieve_tool_result"},{"truncated":false,"value":"revert_turn"},{"truncated":false,"value":"review"},{"truncated":false,"value":"send_later"},{"truncated":false,"value":"session_get"},{"truncated":false,"value":"session_search"},{"truncated":false,"value":"start_mcp_server"},{"truncated":false,"value":"start_registry_mcp_server"},{"truncated":false,"value":"tasks"},{"truncated":false,"value":"terminal/cancel"}]}},"registry_tool_count":{"status":"known","value":65},"rendered_tool_count":15,"schema_version":1,"step":0,"terminal":{"automatic_compaction_attempts":0,"effective_max_steps":null,"emergency_compaction_attempts":0,"empty_stop_retries":0,"final_report_requested":false,"last_prepared_output_limit_tokens":65536,"last_provider_finish_reason":{"truncated":false,"value":"end_turn"},"last_reported_input_tokens":120,"last_response_tool_calls":0,"last_response_tool_calls_suppressed":0,"model_requests_started":1,"model_step_index":0,"permission_denial_rounds_without_progress":0,"permission_strategy_switches":0,"reason":"provider_no_tool_call","reasoning_only_reprompts":0,"route_context_window_tokens":1000000,"status":"completed","step_budget_source":"max_steps","stream_resumes":0,"transparent_stream_retries":0,"transport_retries":0},"tool_count":15,"tools":[{"allowed_callers":{"status":"known","value":{"count":1,"omitted":0,"rendered":[{"truncated":false,"value":"direct"}]}},"approval":{"status":"known","value":{"truncated":false,"value":"Required"}},"cache_control_type":{"reason":"request field absent","status":"unknown"},"capabilities":{"status":"known","value":{"count":3,"omitted":0,"rendered":[{"truncated":false,"value":"ExecutesCode"},{"truncated":false,"value":"Sandboxable"},{"truncated":false,"value":"RequiresApproval"}]}},"defer_loading":{"status":"known","value":false},"description":{"truncated":true,"value":"Execute a shell command in the workspace and return stdout and stderr (last 2000 lines or 50KB). Optional timeout is foreground seconds (default 30 seconds); a command still running then moves to the background by itself — never killed for time — returning output so far, last-output age, build phase, and a task_id. Call task_shell_wait with that task_id to read more or wait; do not sleep-poll with bash. Before a final answer, collect every still-relevant background task (wait only when genuinely blocked) an"},"input_examples":{"reason":"request field absent","status":"unknown"},"input_schema_json":{"truncated":false,"value":"{\"additionalProperties\":false,\"properties\":{\"command\":{\"description\":\"The command to execute. Actual execution shell: `/bin/bash`. Use Bash syntax: pipelines, redirections, $(command), and && / || are supported. Quote paths and variable expansions, such as \\\"$path\\\"; use single quotes for literal text. For literal multiline input, use a quoted heredoc delimiter (<<'EOF') with its closing delimiter on a separate line. Use only installed programs; do not assume GNU-specific flags on macOS/BSD. Example: printf '%s\\\\n' 'sample'.\",\"type\":\"string\"},\"description\":{\"description\":\"Optional few-word summary shown to the user beside the command.\",\"type\":\"string\"},\"justification\":{\"description\":\"Required with sandbox_permissions: one sentence explaining why this exact command needs wider access.\",\"type\":\"string\"},\"read_only\":{\"description\":\"Set true to run analysis code (including Python/SQLite) or a network fetch (curl) with mandatory native filesysteLine truncated
 {"event":"turn_complete","parent_route_usage":{"input_tokens":120,"output_tokens":4},"routed_usage_dropped_records":0,"status":"completed","tool_catalog":"<pinned by the prompt family>","turn_id":"<uuid:1>","usage":{"input_tokens":120,"output_tokens":4}}
-{"harness_summary":{"model_requests":1,"non_streaming_requests":0,"workspace_after":{".codewhale/state/.gitignore":"cdbcae15105d6b78",".codewhale/state/subagents.v1.json/legacy.json":"9064f16acf90984c",".codewhale/state/subagents.v1.lock":"e3b0c44298fc1c14",".codewhale/state/subagents.v3.json":"e874da2951e53d2b",".codewhale/state/subagents.v3.transaction.lock":"e3b0c44298fc1c14","NOTES.md":"f957b19529906961","README.md":"41f49bffb38de5ba"}}}
+{"harness_summary":{"model_requests":1,"non_streaming_requests":0,"workspace_after":{".codewhale/state/.gitignore":"cdbcae15105d6b78",".codewhale/state/subagents.v1.json/legacy.json":"9064f16acf90984c",".codewhale/state/subagents.v3.json":"e874da2951e53d2b",".codewhale/state/subagents.v3.transaction.lock":"e3b0c44298fc1c14","NOTES.md":"f957b19529906961","README.md":"41f49bffb38de5ba"}}}

crates/tui/tests/fixtures/conformance/events/provider_error_after_tool_call.golden.jsonl

@@ -13,4 +13,4 @@
 {"event":"tool_call_complete","result":{"content":"Not executed: the provider stream failed before the model response completed (Model not exist.).","metadata":{"error_category":"model_stream_failed","model_output_incomplete":true,"side_effect_status":"not_started"},"outcome":"ok","success":false},"tool_call_id":"<uuid:2>","tool_name":"File"}
 {"event":"tool_request_snapshot","snapshot":{"active_tool_catalog_sha256":"9017c53ee026ae4065bed3e4b2e7d773a828556b42d6ebe2c2ebfd8e65377280","capture_source":"prepared model-client request","delivery_status":"unknown (capture does not prove provider delivery)","omitted_tool_count":0,"payload_json_bytes":17394,"payload_measurement_status":"exact (within 1048576-byte measurement bound)","provider":{"model":"deepseek-v4-pro","provider":"Deepseek","status":"available"},"registry_facts_present":true,"registry_only_tools":{"status":"known","value":{"count":40,"omitted":8,"rendered":[{"truncated":false,"value":"Git"},{"truncated":false,"value":"Run"},{"truncated":false,"value":"Web"},{"truncated":false,"value":"apply_patch"},{"truncated":false,"value":"automation"},{"truncated":false,"value":"context_archive_get"},{"truncated":false,"value":"context_archive_search"},{"truncated":false,"value":"diagnostics"},{"truncated":false,"value":"finance"},{"truncated":false,"value":"github"},{"truncated":false,"value":"handle_read"},{"truncated":false,"value":"harness"},{"truncated":false,"value":"image_ocr"},{"truncated":false,"value":"list_dir"},{"truncated":false,"value":"lsp"},{"truncated":false,"value":"note"},{"truncated":false,"value":"notify"},{"truncated":false,"value":"pandoc_convert"},{"truncated":false,"value":"project_map"},{"truncated":false,"value":"registry_sync"},{"truncated":false,"value":"request_plugin_install"},{"truncated":false,"value":"request_user_input"},{"truncated":false,"value":"retrieve_tool_result"},{"truncated":false,"value":"revert_turn"},{"truncated":false,"value":"review"},{"truncated":false,"value":"send_later"},{"truncated":false,"value":"session_get"},{"truncated":false,"value":"session_search"},{"truncated":false,"value":"start_mcp_server"},{"truncated":false,"value":"start_registry_mcp_server"},{"truncated":false,"value":"tasks"},{"truncated":false,"value":"terminal/cancel"}]}},"registry_tool_count":{"status":"known","value":65},"rendered_tool_count":15,"schema_version":1,"step":0,"terminal":{"automatic_compaction_attempts":0,"effective_max_steps":null,"emergency_compaction_attempts":0,"empty_stop_retries":0,"final_report_requested":false,"last_prepared_output_limit_tokens":65536,"last_provider_finish_reason":null,"last_reported_input_tokens":120,"last_response_tool_calls":1,"last_response_tool_calls_suppressed":1,"model_requests_started":1,"model_step_index":0,"permission_denial_rounds_without_progress":0,"permission_strategy_switches":0,"reason":"failed","reasoning_only_reprompts":0,"route_context_window_tokens":1000000,"status":"failed","step_budget_source":"max_steps","stream_resumes":0,"transparent_stream_retries":0,"transport_retries":0},"tool_count":15,"tools":[{"allowed_callers":{"status":"known","value":{"count":1,"omitted":0,"rendered":[{"truncated":false,"value":"direct"}]}},"approval":{"status":"known","value":{"truncated":false,"value":"Required"}},"cache_control_type":{"reason":"request field absent","status":"unknown"},"capabilities":{"status":"known","value":{"count":3,"omitted":0,"rendered":[{"truncated":false,"value":"ExecutesCode"},{"truncated":false,"value":"Sandboxable"},{"truncated":false,"value":"RequiresApproval"}]}},"defer_loading":{"status":"known","value":false},"description":{"truncated":true,"value":"Execute a shell command in the workspace and return stdout and stderr (last 2000 lines or 50KB). Optional timeout is foreground seconds (default 30 seconds); a command still running then moves to the background by itself — never killed for time — returning output so far, last-output age, build phase, and a task_id. Call task_shell_wait with that task_id to read more or wait; do not sleep-poll with bash. Before a final answer, collect every still-relevant background task (wait only when genuinely blocked) an"},"input_examples":{"reason":"request field absent","status":"unknown"},"input_schema_json":{"truncated":false,"value":"{\"additionalProperties\":false,\"properties\":{\"command\":{\"description\":\"The command to execute. Actual execution shell: `/bin/bash`. Use Bash syntax: pipelines, redirections, $(command), and && / || are supported. Quote paths and variable expansions, such as \\\"$path\\\"; use single quotes for literal text. For literal multiline input, use a quoted heredoc delimiter (<<'EOF') with its closing delimiter on a separate line. Use only installed programs; do not assume GNU-specific flags on macOS/BSD. Example: printf '%s\\\\n' 'sample'.\",\"type\":\"string\"},\"description\":{\"description\":\"Optional few-word summary shown to the user beside the command.\",\"type\":\"string\"},\"justification\":{\"description\":\"Required with sandbox_permissions: one sentence explaining why this exact command needs wider access.\",\"type\":\"string\"},\"read_only\":{\"description\":\"Set true to run analysis code (including Python/SQLite) or a network fetch (curl) with mandatory native filesystem read-only isolation. Outbound network is on only iLine truncated
 {"error":"Model not exist.","event":"turn_complete","parent_route_usage":{"input_tokens":120,"output_tokens":0},"routed_usage_dropped_records":0,"status":"failed","tool_catalog":"<pinned by the prompt family>","turn_id":"<uuid:1>","usage":{"input_tokens":120,"output_tokens":0}}
-{"harness_summary":{"model_requests":1,"non_streaming_requests":0,"workspace_after":{".codewhale/state/.gitignore":"cdbcae15105d6b78",".codewhale/state/subagents.v1.json/legacy.json":"9064f16acf90984c",".codewhale/state/subagents.v1.lock":"e3b0c44298fc1c14",".codewhale/state/subagents.v3.json":"e874da2951e53d2b",".codewhale/state/subagents.v3.transaction.lock":"e3b0c44298fc1c14","NOTES.md":"f957b19529906961","README.md":"41f49bffb38de5ba"}}}
+{"harness_summary":{"model_requests":1,"non_streaming_requests":0,"workspace_after":{".codewhale/state/.gitignore":"cdbcae15105d6b78",".codewhale/state/subagents.v1.json/legacy.json":"9064f16acf90984c",".codewhale/state/subagents.v3.json":"e874da2951e53d2b",".codewhale/state/subagents.v3.transaction.lock":"e3b0c44298fc1c14","NOTES.md":"f957b19529906961","README.md":"41f49bffb38de5ba"}}}

crates/util/src/workspace_dir.rs

@@ -3,6 +3,21 @@ use std::path::Path;
 pub fn open_workspace_directory(
     workspace: &Path,
 ) -> anyhow::Result<(std::path::PathBuf, std::fs::File)> {
+    open_directory(workspace, false)
+}
+
+pub fn open_pinned_workspace_directory(
+    workspace: &Path,
+) -> anyhow::Result<(std::path::PathBuf, std::fs::File)> {
+    open_directory(workspace, true)
+}
+
+fn open_directory(
+    workspace: &Path,
+    pinned: bool,
+) -> anyhow::Result<(std::path::PathBuf, std::fs::File)> {
+    #[cfg(not(windows))]
+    let _ = pinned;
     let canonical = workspace.canonicalize()?;
     let mut options = std::fs::OpenOptions::new();
     options.read(true);
@@ -15,6 +30,9 @@ pub fn open_workspace_directory(
     {
         use std::os::windows::fs::OpenOptionsExt as _;
         options.custom_flags(0x0200_0000 | 0x0020_0000); // BACKUP_SEMANTICS, OPEN_REPARSE_POINT
+        if pinned {
+            options.share_mode(0x1 | 0x2);
+        }
     }
     let directory = options.open(&canonical)?;
     let metadata = directory.metadata()?;

docs/CONVERSATION_LIFECYCLE_CONTRACT_PROPOSAL.md

@@ -68,8 +68,8 @@ ids to customers.
 ## Subagent state
 
 Subagent state lives in the workspace, under `.codewhale/state/`, in
-`subagents.v1.json` (the manager's `SUBAGENT_STATE_FILE`; the lock is
-`subagents.v1.lock`), loaded by `load_state` and written by
+`subagents.v3.json` (the manager's `SUBAGENT_STATE_FILE`), loaded by
+`load_state` and written by
 `persist_state*` in `crates/engine/src/tools/subagent/mod.rs`. A legacy
 `.deepseek/state/` copy is still read for migration.
 

docs/EXTENSIONS.md

@@ -545,7 +545,7 @@ Return `{kind:'deny', reason}`, `{kind:'ask', reason?}`, `{kind:'revise', input}
 
 Native hooks run first, then mod listeners in core registration order. Denial always wins; the last accepted input revision wins. Rust re-prepares revised arguments and reruns the existing authority, policy, and approval checks. Input revisions use the existing 32 KiB hook limit; context and reasons use the existing sanitizers. Unloading a fiber removes its listener, and disabling or revoking an owner retires its admitted handles before host teardown. Other workspaces do not receive the call.
 
-This bridge runs on Engine sessions, including model tools, gated code-mode calls, and `exec.core` calls. Sessions an editor drives over ACP (`codewhale serve --acp`) get the same extension host, under the same `[features]` flags (`extension_host`, `mcp`): reviewed plugin tools (TypeScript and DSH) and the MCP servers configured in Codewhale appear as ACP tool calls and ask through the session's permission setting; Plan stays read-only. The ACP server's capabilities say so (`agentCapabilities._meta.codewhale`). Servers an ACP client passes in `mcpServers` and configured shell hooks are not attached. Prepend/global listener ordering, DSH runtime/agent handles, around-execution wrappers, and post-result rewriting are not provided. Native `tool_call_after` remains an observer contract.
+This bridge runs on Engine sessions, including model tools, gated code-mode calls, and `exec.core` calls. Sessions an editor drives over ACP (`codewhale serve --acp`) get the same extension host, under the same `[features]` flags (`extension_host`, `mcp`): reviewed plugin tools (TypeScript and DSH) and the MCP servers configured in Codewhale appear as ACP tool calls and ask through the session's permission setting; Plan stays read-only. When a plugin tool asks the core to run a tool that needs approval (`exec.core`), the editor's permission request is shown on the plugin tool's call and names the nested tool and its input. The ACP server's capabilities say so (`agentCapabilities._meta.codewhale`). Servers an ACP client passes in `mcpServers` and configured shell hooks are not attached. Prepend/global listener ordering, DSH runtime/agent handles, around-execution wrappers, and post-result rewriting are not provided. Native `tool_call_after` remains an observer contract.
 
 ## Asking the core to run a tool
 

docs/RUNTIME_API.md

@@ -886,6 +886,13 @@ Plugin tools and configured MCP servers on this transport are on main after
 0.10.2; 0.10.2 itself does not have them.
 Client-supplied MCP servers, dynamic tools, task/PTY/background shell,
 interpreter, subagent and RLM lifecycles are unavailable on this transport.
+ACP has no tool search, so every connected MCP tool and its schema is sent with
+every request, and a server marked `lazy = true` never starts. A large MCP set
+therefore costs tokens on each turn and can exceed a provider's tool limit.
+MCP servers a model starts at run time stay out of an ACP-profile host. When
+`serve --acp` instead attaches to a running Runtime owner (see below), its turns
+use that owner's MCP pool, which includes servers started at run time in other
+sessions of the same workspace.
 Built-in overrides remove the
 whole compatibility alias family. Final dispatch rechecks the profile, so a
 fabricated alias, hook rewrite or omitted catalog entry cannot bypass it. Plan
@@ -906,7 +913,11 @@ produced.
 Tool updates begin `pending`. `in_progress` means Core reached final dispatch;
 `completed`/`failed` and typed image blocks come from the actual Core result.
 `session/request_permission` correlates a private JSON-RPC ID to the same
-Runtime-minted pending approval and Core execution ID. Only an exact live
+Runtime-minted pending approval and Core execution ID. When a plugin tool asks
+the core to run a tool that needs approval (`exec.core`), the request is shown
+on the plugin tool's call, names the nested tool and carries its input, and the
+answer releases the nested call; the nested call is decided under the session's
+permission setting. Only an exact live
 `allow-once` response can release that waiter; wrong IDs are ignored, invalid
 options deny, and cancellation withdraws it. ACP grants neither remembered
 permissions nor Native capabilities. Core typed rules, strict hooks, repo law,
@@ -2672,6 +2683,35 @@ thread deletion.
   pure over the snapshot — so a client must not look for one. Anything that
   mutates the session stays a terminal-side command.
 
+**Plugin index**
+- `GET /v1/apps/plugin-index` — `{workspace, items: [...], unavailable: [...],
+  problems: [...]}`: one list across every plugin, skill, connector, hook and
+  hand-written command. It is a projection: each item's `row` is the row its
+  owner's own route returns (`/v1/apps/plugins`, `/v1/apps/plugins/catalog`,
+  `/v1/skills`, `/v1/apps/mcp/servers`, `/v1/hooks`, `/v1/commands`), and
+  `owner` names that route. Per item: `id`, `kind` (`plugin`, `skill`,
+  `connector`, `hook`, `command`), `name`, `description`, `source`
+  (`built_in`, `user`, `project`, `other_app`, `runtime`, `plugin`), `state`
+  (`enabled`, `disabled`, `needs_review`, `needs_sign_in`, `unavailable`) and
+  `labels` (what the item adds: `skill`, `connector`, `hook`, `command`,
+  `tool`, `profile`). A plugin item also has `adds` (`skills`, `connectors`,
+  `hooks`, `commands`, `profiles`: names, not rows), and what a plugin adds is
+  not listed a second time as an item of its own. A built-in switch is a
+  `plugin` item with a `tier` and no labels. `/v1/commands` rows carry
+  `plugin_id` (the same id as `/v1/apps/plugins`, and the `plugin:<id>` item)
+  for a command a plugin adds, and `workspace_sourced` for one read from the
+  project; a command item's `plugin` is that id. An owner that fails is named in
+  `unavailable` and the other kinds still list; `problems` carries the owners'
+  load warnings. Names under `adds` are file names, so a profile's `id` inside its
+  file can differ; a command another plugin registers through the extension host
+  is an item with `source` `plugin`. For an active plugin `adds.commands` comes
+  from the `/v1/commands` rows; for any other plugin, and for `hooks` and
+  `profiles`, it is the file names found in the bundle, at most 512 per kind,
+  with names holding control characters left out; a cut list is reported
+  under `problems`. A hook's row names no plugin, so `adds.hooks` stays file
+  names. `tool` means the plugin declares native or language-server components;
+  a screen a plugin draws is not labelled yet.
+
 **Hooks**
 - `GET /v1/hooks[?thread_id=...]` — `{workspace, enabled, hooks: [...],
   problems: [...]}`: the hook set Runtime API threads run for that workspace

docs/RUNTIME_ROUTES.md

@@ -54,6 +54,7 @@ registration index.
 | POST | `/v1/apps/mcp/servers/{name}/enable` |
 | POST | `/v1/apps/mcp/servers/{name}/reconnect` |
 | GET | `/v1/apps/mcp/tools` |
+| GET | `/v1/apps/plugin-index` |
 | GET | `/v1/apps/plugins` |
 | DELETE / GET | `/v1/apps/plugins/{selector}` |
 | POST | `/v1/apps/plugins/{selector}/disable` |
@@ -263,4 +264,4 @@ registration index.
 | GET / POST | `/v1/worktrees` |
 | POST | `/v1/worktrees/remove` |
 
-The source contains 243 distinct literal paths in this table.
+The source contains 244 distinct literal paths in this table.

docs/architecture/delegated-coordination.md

@@ -29,7 +29,7 @@ resolved values are persisted in their launch manifest.
 
 By default, delegated control-plane state remains workspace-scoped at
 `<workspace>/.codewhale/state`: the worker ledger, complete transcript
-artifacts, and coordination lock share that root. An embedding host may set
+artifacts, and store locks share that root. An embedding host may set
 `EngineConfig::subagent_state_root` to keep those files under a session-owned
 root without changing child cwd, tool path authority, or the execution
 workspace recorded in receipts.
@@ -124,19 +124,32 @@ cannot replace a newer one, and a terminal receipt cannot be resurrected as
 Running by a checkpoint. An explicit terminal retry accepts only the same
 winning outcome; authoritative newer accounting metadata is retained.
 
-Normal interactive/exec/Fleet/background sessions continue to share the
-existing admission flock. The explicit exclusive Runtime constructor retains
-its host admission policy; it is not the mechanism that conserves shared
-snapshots. No manager holds the transaction lock while a child executes or
-while it waits for a provider or channel capacity. Conflicting lock contention
-returns a bounded retry error. Unsupported locking or failed store admission
-refuses durable writes rather than silently creating an empty writable ledger.
+There is no workspace-wide session lock. Interactive, exec, Fleet, background
+and Runtime managers in one folder are ordinary neighbours: each holds only its
+own boot lease and takes the transaction lock per operation. The Runtime
+constructor keeps one manager per state path inside its process. No manager
+holds the transaction lock while a child executes or while it waits for a
+provider or channel capacity. Conflicting lock contention returns a bounded
+retry error. Unsupported locking or failed store admission refuses durable
+writes rather than silently creating an empty writable ledger, and admission is
+retried on the next delegated write instead of staying refused for the life of
+the process.
+
+A Runtime that admits a selected workspace other than its own state root keeps
+that workspace's claims in its own store. Before it admits a shared-workspace
+writer there, and each time it leases such a writer, it refuses while any
+session holds a live boot lease in the selected workspace's own store, and it
+refuses when that store's directory cannot be listed. Only sessions that hold
+a boot lease are seen: a Codewhale 0.10.2 or older session holds none. A
+session that opens in that workspace later does not see the Runtime's claims,
+and its lease refuses the Runtime's next shared-workspace writer there; give
+writers isolated worktrees when both are expected.
 
 Each writer holds its own boot lease. Other managers preserve its live records
 and use its active claims during admission. An existing unlocked lease can
 establish that its writer ended; a missing, invalid or unreadable lease is
-uncertain and fails closed. Local task handles and a failed admission flock do
-not establish that another process's work stopped. Parked and headless
+uncertain and fails closed. Local task handles do not establish that another
+process's work stopped. Parked and headless
 WaitingForUser claim rules retain their existing lifecycle meaning; they do not
 transfer a still-live writer's record ownership to a different boot.
 
@@ -216,10 +229,15 @@ terminal receipt or claim that a remote effect was undone.
 
 ### Legacy cutover and recovery
 
-The first current-format admission takes the legacy admission lock exclusively
-only for migration, after previous holders have left. It retains the original
+The first current-format admission migrates under the short transaction lock.
+It does not wait for older sessions that still hold the retired
+`subagents.v1.lock`. It retains the original
 legacy bytes and a validated recovery copy, then leaves
 `subagents.v1.json` as a private directory containing that recovery material.
+An older session still open in that folder can no longer save its delegated
+state once the directory replaces its file; restart it. If it publishes its
+file between the two cutover renames, the cutover stops at a retained-file
+refusal until a person inspects both files; nothing is deleted.
 The current format3 file is published under the same short transaction lock.
 Interrupted cutover states are validated and resumed without replacing a later
 current-format revision with the old backup. Future or malformed envelopes

docs/zh_hans/EXTENSIONS.md

@@ -252,6 +252,8 @@ DSH 的 `allow` 被视为不干预，每个所有者提示一次；不能预先
 调用。编辑器通过 ACP（`codewhale serve --acp`）驱动的会话获得同一个扩展宿主，并受相同的
 `[features]` 开关（`extension_host`、`mcp`）约束：已审查的插件工具（TypeScript 与 DSH）和
 Codewhale 中配置的 MCP 服务器会作为 ACP 工具调用出现，并通过会话的权限设置询问；Plan 保持只读。
+插件工具通过 `exec.core` 请求核心执行需要审批的工具时，审批请求显示在该插件
+工具的调用上，并写明嵌套工具及其输入。
 ACP 服务器的能力声明会说明这一点（`agentCapabilities._meta.codewhale`）。ACP 客户端在
 `mcpServers` 中传入的服务器和已配置的 shell hooks 不会挂载。`prepend`/`global` 顺序
 覆盖、包裹实际执行的中间件、DSH 运行时句柄和执行后结果改写均不支持。Native

docs/zh_hans/RUNTIME_API.md

@@ -660,7 +660,11 @@ shell 工具，外加已审查的插件工具（`extension_host` 功能）和 Co
 MCP 服务器的工具（`mcp` 功能），均受同一权限设置约束；这一点见于 0.10.2 之后的 main，0.10.2 本身不含。Shell 同时要求编辑器声明
 terminal 支持、操作者允许 `allow_shell`；指定的外部沙箱不可用时不提供 shell。此接口
 不提供客户端传入的 MCP 服务器、动态工具、任务、PTY、后台 shell、解释器、子智能体
-或 RLM 生命周期。内置工具覆盖会移除整个兼容别名族。
+或 RLM 生命周期。ACP 没有工具搜索，因此每个已连接的 MCP 工具及其 schema 都会随每个请求
+发送，标记为 `lazy = true` 的服务器永不启动；MCP 集合很大时每回合都会消耗令牌，并可能超出
+提供商的工具数量上限。模型在运行时启动的 MCP 服务器不会进入 ACP profile 宿主；但当
+`serve --acp` 附着到正在运行的 Runtime owner 时（见下文），其回合使用该 owner 的 MCP 池，
+其中包含同一工作区其他会话在运行时启动的服务器。内置工具覆盖会移除整个兼容别名族。
 最终派发再次校验 profile；伪造别名、hook 改写或目录中缺失的工具不能绕过限制。
 Full Access 下 Plan 仍只读。Full Access 与普通审批姿态是服务端拥有的只读选项，
 编辑器不能放宽。`approval_policy = "never"` 不是 ACP 审批姿态，服务端会拒绝
@@ -669,7 +673,9 @@ Full Access 下 Plan 仍只读。Full Access 与普通审批姿态是服务端
 
 工具首先显示 `pending`；只有 Core 到达最终派发才显示 `in_progress`。
 `completed`/`failed` 和类型化图片块来自实际 Core 结果。审批请求的私有 JSON-RPC ID
-绑定同一个 Runtime 铸造的待决审批与 Core 执行 ID。只有精确匹配、仍有效的
+绑定同一个 Runtime 铸造的待决审批与 Core 执行 ID。插件工具通过 `exec.core` 请求核心运行
+需要审批的工具时，请求显示在该插件工具的调用上，写明嵌套工具及其输入，答复释放嵌套调用，嵌套调用在会话的
+权限设置下决定。只有精确匹配、仍有效的
 `allow-once` 响应能释放等待器；错误 ID 被忽略，无效选项拒绝，取消会撤销等待器。
 ACP 不授予记忆权限或 Native 能力。
 
@@ -1987,6 +1993,19 @@ POST 前保留预期指纹，并在响应及按键 GET 恢复时核对，之后
   保留命令回执——每个提供的处理器对快照都是纯函数——因此客户端不应寻找回执。
   任何会修改会话的操作仍是终端侧命令。
 
+**插件索引**
+- `GET /v1/apps/plugin-index` — `{workspace, items: [...], unavailable: [...],
+  problems: [...]}`：跨所有插件、技能、连接器、钩子和手写命令的统一列表。它只是投影：每个条目的
+  `row` 就是其所属路由（`/v1/apps/plugins`、`/v1/apps/plugins/catalog`、`/v1/skills`、
+  `/v1/apps/mcp/servers`、`/v1/hooks`、`/v1/commands`）返回的那一行，`owner` 给出该路由。
+  每个条目有 `id`、`kind`（`plugin`、`skill`、`connector`、`hook`、`command`）、`name`、
+  `description`、`source`（`built_in`、`user`、`project`、`other_app`、`runtime`、`plugin`）、
+  `state`（`enabled`、`disabled`、`needs_review`、`needs_sign_in`、`unavailable`）和
+  `labels`（它添加的内容：`skill`、`connector`、`hook`、`command`、`tool`、`profile`）。插件条目另有 `adds`（`skills`、`connectors`、`hooks`、`commands`、
+  `profiles`：只含名称），插件所添加的内容不会再作为独立条目重复列出。内置开关是带 `tier`、无 `labels` 的
+  `plugin` 条目。`/v1/commands` 的行对插件添加的命令带有 `plugin_id`（与 `/v1/apps/plugins` 的 id 相同，即 `plugin:<id>` 条目），对从项目读取的命令带有 `workspace_sourced`；命令条目的 `plugin` 即该 id。某个所属路由失败时记入 `unavailable`，其余种类照常列出；`problems`
+  汇总各所属路由的加载警告。`adds` 中的名称是文件名，因此档案文件内部的 `id` 可能不同；通过扩展宿主注册的命令是 `source` 为 `plugin` 的条目。对已启用的插件，`adds.commands` 取自 `/v1/commands` 的行；其他插件以及 `hooks`、`profiles` 取自包内的文件名，每类最多 512 个，含控制字符的名称被略去，列表被截断时在 `problems` 中说明。钩子的行不带插件名，因此 `adds.hooks` 仍是文件名。`tool` 表示插件声明了原生或语言服务器组件；插件绘制的界面暂无标签。
+
 **钩子**
 - `GET /v1/hooks[?thread_id=...]` — `{workspace, enabled, hooks: [...],
   problems: [...]}`：Runtime API 线程为该工作区运行的钩子集合

scripts/check-blocking-calls-budget.json

@@ -257,7 +257,7 @@
   },
   "crates/engine/src/tools/subagent/mod.rs": {
     "path_canonicalize": 4,
-    "std_fs": 3,
+    "std_fs": 2,
     "thread_sleep": 1
   },
   "crates/engine/src/tools/subagent/worktree.rs": {

web/data/agent-docs.generated.json

@@ -354,8 +354,8 @@
       },
       {
         "path": "docs/EXTENSIONS.md",
-        "sha256": "45dc87bc8293156cc221a0d1181ddcdfe6970caef3874d2127a5b86ba2b32d9d",
-        "content": "# Writing an extension tool or command\n\nThe experimental TypeScript extension host runs reviewed plugin code in a\nshared Node process (or, as an opt-in, Bun). Rust still owns sessions, tool admission, approval and\nexecution. Extensions currently contribute tools and slash commands; they\ncannot provide an approval service, run a second agent loop or replace\nbuilt-in tools or commands.\n\n## Quick start\n\nStart with [hello-extension](examples/plugins/hello-extension/hello.mts) and its\n[plugin.json](examples/plugins/hello-extension/plugin.json). The example is\nexecuted unchanged by the host tests. It returns a greeting and does not read\nfiles or use the network.\n\n1. Explicitly enable `[features] extension_host = true` in your configuration,\n   or start Codewhale with `codewhale --enable extension_host` (the flag goes\n   before any subcommand).\n2. Install the example's directory using `/plugin install <local-directory>`.\n3. Run `/plugin validate hello-extension`, then `/plugin show hello-extension`.\n4. Run `/plugin enable hello-extension` to open its content/capability review.\n   Read the review and personally run its exact `/plugin trust <token>` command,\n   then enable the plugin. Trust alone does not execute the code.\n5. Ask Codewhale to use `hello_greet`. The tool follows the normal approval gate.\n6. Run `/hello-greet Codewhale`. The command runs when you type it, and shows\n   its answer in the transcript with its origin, `extension:hello-extension`.\n\nAn authoring agent should stop after installation and validation and present\nthe review to the person, unless it runs in Full Access and the plugin is one\nit wrote and installed from a folder in its project: then it may trust and\nenable it for that project with `codewhale plugins trust` and `enable`. Those\nshell commands go through the session's approval like any other: Ask asks the\nperson, Auto-Review's reviewer judges, and Full Access runs them.\n\n## Locations, installation and trust\n\nUser bundles live under `~/.codewhale/plugins/`; workspace bundles live under\n`<workspace>/.codewhale/plugins/`. New bundles use Agent Plugins v1.0.0\n`plugin.json`. Declare `extensions[\"net.codewhale\"].native.path` as one regular\n`.mjs`, `.js` or `.mts` file inside the bundle. Directories and other extensions\nfail validation when the host is enabled. With the flag off, native entries\nremain inventory-only.\n\nA plugin may split its code across several entries with `native.paths` (up to\n64, alone or beside `path`). They are activated in the order declared, as the\nfibers of one plugin: they share one owner, so one disable, review change or\ncrash tears all of them down together. Each entry is a separate module with its\nown `apply`, and tool and command names must be unique across them. If an entry\nfails to activate (throws, requires a service the host does not provide, or has\na registration refused), only that entry is withdrawn: entries that already\nactivated stay registered, later entries still activate, and the plugin fails\nonly when no entry activates. Listing the same file twice is one entry.\n\n## Runtime\n\n`[extension_host] runtime` selects what runs the host. Node is the default.\nBun is an opt-in: it is qualified on macOS only, and becomes the default only\nafter an explicit, recorded cutover.\n\n```toml\n[extension_host]\nruntime = \"node\"   # default: Node only\n# runtime = \"bun\"  # Bun only; fails rather than falling back to Node\n# runtime = \"auto\" # Bun >= 1.4.0 if one is found and starts, otherwise Node\n# bun = \"~/.bun/bin/bun\"          # the only Bun tried when set\n# node = \"/opt/homebrew/bin/node\" # the only Node tried when set\n# mcp_backend = \"rust\" # temporary opt-out; default is \"host\"\n```\n\nThe default `mcp_backend = \"host\"` uses the pinned MCP SDK independently of\n`[features] extension_host`, which controls optional Native extensions. Existing\nstdio and HTTP servers use modern discovery when supported; explicitly configured\nlegacy SSE servers use their legacy handshake. Rust retains process and network\nauthority, credential resolution, catalog admission, tool approval and cancellation.\nThe SDK receives opaque session selectors and exact operation grants. Modern\nrequests carry Rust-approved protocol metadata and headers without a session id.\n\nA typed discovery refusal can admit a legacy handshake. Only an explicit HTTP\ntransport refusal during that handshake can admit legacy SSE with a fresh exact\nRust grant. Legacy HTTP retains its GET preflight and bounded OAuth refresh;\nmodern HTTP does not inherit those session or resend behaviors. Incomplete result\nflows are reported without automatically repeating the operation. Credentials,\nconfigured URLs, OAuth browser/login operations and Computer Use decision keys\nstay in Rust.\n\nBoth backends share recorded semantic MCP goldens and retain separate transport\ngoldens, including discovery, authentication and sessioLine truncated
+        "sha256": "8582de93c01083314119639678c1ea1ab4ba46317c5a400fb9dd139ffdcb232a",
+        "content": "# Writing an extension tool or command\n\nThe experimental TypeScript extension host runs reviewed plugin code in a\nshared Node process (or, as an opt-in, Bun). Rust still owns sessions, tool admission, approval and\nexecution. Extensions currently contribute tools and slash commands; they\ncannot provide an approval service, run a second agent loop or replace\nbuilt-in tools or commands.\n\n## Quick start\n\nStart with [hello-extension](examples/plugins/hello-extension/hello.mts) and its\n[plugin.json](examples/plugins/hello-extension/plugin.json). The example is\nexecuted unchanged by the host tests. It returns a greeting and does not read\nfiles or use the network.\n\n1. Explicitly enable `[features] extension_host = true` in your configuration,\n   or start Codewhale with `codewhale --enable extension_host` (the flag goes\n   before any subcommand).\n2. Install the example's directory using `/plugin install <local-directory>`.\n3. Run `/plugin validate hello-extension`, then `/plugin show hello-extension`.\n4. Run `/plugin enable hello-extension` to open its content/capability review.\n   Read the review and personally run its exact `/plugin trust <token>` command,\n   then enable the plugin. Trust alone does not execute the code.\n5. Ask Codewhale to use `hello_greet`. The tool follows the normal approval gate.\n6. Run `/hello-greet Codewhale`. The command runs when you type it, and shows\n   its answer in the transcript with its origin, `extension:hello-extension`.\n\nAn authoring agent should stop after installation and validation and present\nthe review to the person, unless it runs in Full Access and the plugin is one\nit wrote and installed from a folder in its project: then it may trust and\nenable it for that project with `codewhale plugins trust` and `enable`. Those\nshell commands go through the session's approval like any other: Ask asks the\nperson, Auto-Review's reviewer judges, and Full Access runs them.\n\n## Locations, installation and trust\n\nUser bundles live under `~/.codewhale/plugins/`; workspace bundles live under\n`<workspace>/.codewhale/plugins/`. New bundles use Agent Plugins v1.0.0\n`plugin.json`. Declare `extensions[\"net.codewhale\"].native.path` as one regular\n`.mjs`, `.js` or `.mts` file inside the bundle. Directories and other extensions\nfail validation when the host is enabled. With the flag off, native entries\nremain inventory-only.\n\nA plugin may split its code across several entries with `native.paths` (up to\n64, alone or beside `path`). They are activated in the order declared, as the\nfibers of one plugin: they share one owner, so one disable, review change or\ncrash tears all of them down together. Each entry is a separate module with its\nown `apply`, and tool and command names must be unique across them. If an entry\nfails to activate (throws, requires a service the host does not provide, or has\na registration refused), only that entry is withdrawn: entries that already\nactivated stay registered, later entries still activate, and the plugin fails\nonly when no entry activates. Listing the same file twice is one entry.\n\n## Runtime\n\n`[extension_host] runtime` selects what runs the host. Node is the default.\nBun is an opt-in: it is qualified on macOS only, and becomes the default only\nafter an explicit, recorded cutover.\n\n```toml\n[extension_host]\nruntime = \"node\"   # default: Node only\n# runtime = \"bun\"  # Bun only; fails rather than falling back to Node\n# runtime = \"auto\" # Bun >= 1.4.0 if one is found and starts, otherwise Node\n# bun = \"~/.bun/bin/bun\"          # the only Bun tried when set\n# node = \"/opt/homebrew/bin/node\" # the only Node tried when set\n# mcp_backend = \"rust\" # temporary opt-out; default is \"host\"\n```\n\nThe default `mcp_backend = \"host\"` uses the pinned MCP SDK independently of\n`[features] extension_host`, which controls optional Native extensions. Existing\nstdio and HTTP servers use modern discovery when supported; explicitly configured\nlegacy SSE servers use their legacy handshake. Rust retains process and network\nauthority, credential resolution, catalog admission, tool approval and cancellation.\nThe SDK receives opaque session selectors and exact operation grants. Modern\nrequests carry Rust-approved protocol metadata and headers without a session id.\n\nA typed discovery refusal can admit a legacy handshake. Only an explicit HTTP\ntransport refusal during that handshake can admit legacy SSE with a fresh exact\nRust grant. Legacy HTTP retains its GET preflight and bounded OAuth refresh;\nmodern HTTP does not inherit those session or resend behaviors. Incomplete result\nflows are reported without automatically repeating the operation. Credentials,\nconfigured URLs, OAuth browser/login operations and Computer Use decision keys\nstay in Rust.\n\nBoth backends share recorded semantic MCP goldens and retain separate transport\ngoldens, including discovery, authentication and sessioLine truncated
       }
     ]
   },
@@ -365,8 +365,8 @@
     "sources": [
       {
         "path": "docs/RUNTIME_API.md",
-        "sha256": "6f3b8885978ef2e1b33d0fdf66ad6ccf5c25464c1951b59658aec00745390db2",
-        "content": "# Codewhale Engine Runtime API & Integration Contract\n\n> 阅读简体中文版：[zh_hans/RUNTIME_API.md](zh_hans/RUNTIME_API.md)。\n\n`codewhale app-server --http` exposes the [Codewhale Engine](ARCHITECTURE.md) through\nits canonical local Runtime API and control plane.\nLocal SDKs, mobile/remote-control clients, and editor integrations talk to it\ninstead of screen-scraping terminal output. It serves the full HTTP/SSE runtime\nAPI (`/v1/*`), a JSON-RPC control transport over stdio, and the phone-friendly\nmobile page. `codewhale doctor --json` provides machine-readable health, and\n`codewhale serve --acp` speaks the Agent Client Protocol over stdio for editors\nsuch as Zed.\n\n`codewhale serve --http` / `serve --mobile` remain as **compatibility aliases**\nfor `codewhale app-server --http` / `--mobile`; both launch the identical\nserver. Desktop, web, SDK and custom integrations should target\n`app-server --http`. `--stdio` and `--socket` expose compatibility controls.\nBare `app-server` selects initialized JSONL control over stdio. Local stdio,\nsocket and ACP owners do not bind a hidden TCP listener. Explicit `--http`\nretains HTTP/SSE and compatibility routes on the same Runtime owner.\n\n`codewhale exec` is the separate one-shot headless worker path (stream-json,\nfleet worker subprocess, CI primitive). It is not part of this API, but it\nshares the same runtime, provider/model resolution, permission profiles, and\nevent vocabulary.\n\nThis document is the stable integration contract for native workbench\napplications (and other local supervisors) that embed the Codewhale Engine.\n\n## Architecture\n\n```\nlocal supervisor / SDK / automation harness\n        │\n        ├─ codewhale app-server --http     → HTTP/SSE runtime API (/v1/*)        [canonical]\n        ├─ codewhale app-server --mobile   → runtime API + mobile control page\n        ├─ codewhale app-server --stdio    → JSON-RPC control transport over stdio\n        ├─ codewhale app-server --socket   → same JSON-RPC over a unix domain socket (desktop daemon)\n        ├─ codewhale doctor --json         → machine-readable health & capability\n        ├─ codewhale serve --acp           → ACP stdio agent for editors such as Zed\n        ├─ codewhale serve --mcp           → MCP stdio server\n        ├─ codewhale serve --http/--mobile → legacy aliases for `app-server --http/--mobile`\n        └─ codewhale exec [args]           → one-shot headless worker (stream-json)\n```\n\nThe engine runs as a local-only process. All APIs bind to `localhost` by\ndefault. No hosted relay, no provider-token custody, no secret leakage.\n\nFor the read-only record of what a thread or turn did, see\n[`docs/RECEIPTS.md`](RECEIPTS.md): `codewhale receipts` on the CLI and the\n`/receipt` routes under **Threads** below.\n\n## Runtime API entrypoints\n\n| Entry | Transport | Use |\n|---|---|---|\n| `codewhale web [--port 7878]` | HTTP/SSE on `127.0.0.1:7878` + embedded client | First-class loopback-only browser client; opens the default browser |\n| `codewhale app-server --http` | HTTP/SSE on `127.0.0.1:7878` | Full `/v1/*` runtime API (canonical) |\n| `codewhale app-server --mobile` | HTTP/SSE on loopback + `/mobile` | Runtime API + local mobile control page |\n| `codewhale app-server --stdio` | Initialized JSONL over stdio | Compatibility controls and explicit tool-free turns through the held manager; no hidden TCP listener or full Codex interaction channel. |\n| `codewhale app-server --socket [--socket-path P]` | RPC text messages over WebSocket on a `0600` Unix domain socket (macOS/Linux) or an owner-only named pipe (Windows) | Desktop daemon: multi-client, kernel peer identity checked, `daemon/attach` claim handshake. Windows native-app qualification remains open. |\n| `codewhale app-server` | Initialized JSONL over stdio | Same selection as `--stdio`; HTTP requires explicit `--http`. |\n| `codewhale serve --http` / `--mobile` | same server as `app-server --http`/`--mobile` | Compatibility aliases |\n\n`app-server --http` and `--mobile` launch the same mature runtime API server\nhistorically reached through `serve --http` — no routes or behavior changed, so\nevery endpoint documented below is identical across both entrypoints. The\nruntime API token is read from `--auth-token`, then `CODEWHALE_RUNTIME_TOKEN`,\nthen `DEEPSEEK_RUNTIME_TOKEN`; use `--insecure-no-auth` only with a loopback\nbind. The `serve` compatibility aliases keep their `--insecure` flag.\nBare `app-server` does not open an HTTP port. Selected attached HTTP listeners\nretain their explicit bearer and non-loopback security checks.\n\nInitialized stdio/private-socket controls support `thread/loaded/list` with\n`{cursor?: string | null, limit?: number | null}`. The result is\n`{data: string[], nextCursor: string | null}` from the held manager's loaded\nengine snapshot, including idle and archived engines still in memory. It dLine truncated
+        "sha256": "e3040635df0cf62717f5acbe9aacf4909b6ad60db8468b06e90a5e9be1d76d1e",
+        "content": "# Codewhale Engine Runtime API & Integration Contract\n\n> 阅读简体中文版：[zh_hans/RUNTIME_API.md](zh_hans/RUNTIME_API.md)。\n\n`codewhale app-server --http` exposes the [Codewhale Engine](ARCHITECTURE.md) through\nits canonical local Runtime API and control plane.\nLocal SDKs, mobile/remote-control clients, and editor integrations talk to it\ninstead of screen-scraping terminal output. It serves the full HTTP/SSE runtime\nAPI (`/v1/*`), a JSON-RPC control transport over stdio, and the phone-friendly\nmobile page. `codewhale doctor --json` provides machine-readable health, and\n`codewhale serve --acp` speaks the Agent Client Protocol over stdio for editors\nsuch as Zed.\n\n`codewhale serve --http` / `serve --mobile` remain as **compatibility aliases**\nfor `codewhale app-server --http` / `--mobile`; both launch the identical\nserver. Desktop, web, SDK and custom integrations should target\n`app-server --http`. `--stdio` and `--socket` expose compatibility controls.\nBare `app-server` selects initialized JSONL control over stdio. Local stdio,\nsocket and ACP owners do not bind a hidden TCP listener. Explicit `--http`\nretains HTTP/SSE and compatibility routes on the same Runtime owner.\n\n`codewhale exec` is the separate one-shot headless worker path (stream-json,\nfleet worker subprocess, CI primitive). It is not part of this API, but it\nshares the same runtime, provider/model resolution, permission profiles, and\nevent vocabulary.\n\nThis document is the stable integration contract for native workbench\napplications (and other local supervisors) that embed the Codewhale Engine.\n\n## Architecture\n\n```\nlocal supervisor / SDK / automation harness\n        │\n        ├─ codewhale app-server --http     → HTTP/SSE runtime API (/v1/*)        [canonical]\n        ├─ codewhale app-server --mobile   → runtime API + mobile control page\n        ├─ codewhale app-server --stdio    → JSON-RPC control transport over stdio\n        ├─ codewhale app-server --socket   → same JSON-RPC over a unix domain socket (desktop daemon)\n        ├─ codewhale doctor --json         → machine-readable health & capability\n        ├─ codewhale serve --acp           → ACP stdio agent for editors such as Zed\n        ├─ codewhale serve --mcp           → MCP stdio server\n        ├─ codewhale serve --http/--mobile → legacy aliases for `app-server --http/--mobile`\n        └─ codewhale exec [args]           → one-shot headless worker (stream-json)\n```\n\nThe engine runs as a local-only process. All APIs bind to `localhost` by\ndefault. No hosted relay, no provider-token custody, no secret leakage.\n\nFor the read-only record of what a thread or turn did, see\n[`docs/RECEIPTS.md`](RECEIPTS.md): `codewhale receipts` on the CLI and the\n`/receipt` routes under **Threads** below.\n\n## Runtime API entrypoints\n\n| Entry | Transport | Use |\n|---|---|---|\n| `codewhale web [--port 7878]` | HTTP/SSE on `127.0.0.1:7878` + embedded client | First-class loopback-only browser client; opens the default browser |\n| `codewhale app-server --http` | HTTP/SSE on `127.0.0.1:7878` | Full `/v1/*` runtime API (canonical) |\n| `codewhale app-server --mobile` | HTTP/SSE on loopback + `/mobile` | Runtime API + local mobile control page |\n| `codewhale app-server --stdio` | Initialized JSONL over stdio | Compatibility controls and explicit tool-free turns through the held manager; no hidden TCP listener or full Codex interaction channel. |\n| `codewhale app-server --socket [--socket-path P]` | RPC text messages over WebSocket on a `0600` Unix domain socket (macOS/Linux) or an owner-only named pipe (Windows) | Desktop daemon: multi-client, kernel peer identity checked, `daemon/attach` claim handshake. Windows native-app qualification remains open. |\n| `codewhale app-server` | Initialized JSONL over stdio | Same selection as `--stdio`; HTTP requires explicit `--http`. |\n| `codewhale serve --http` / `--mobile` | same server as `app-server --http`/`--mobile` | Compatibility aliases |\n\n`app-server --http` and `--mobile` launch the same mature runtime API server\nhistorically reached through `serve --http` — no routes or behavior changed, so\nevery endpoint documented below is identical across both entrypoints. The\nruntime API token is read from `--auth-token`, then `CODEWHALE_RUNTIME_TOKEN`,\nthen `DEEPSEEK_RUNTIME_TOKEN`; use `--insecure-no-auth` only with a loopback\nbind. The `serve` compatibility aliases keep their `--insecure` flag.\nBare `app-server` does not open an HTTP port. Selected attached HTTP listeners\nretain their explicit bearer and non-loopback security checks.\n\nInitialized stdio/private-socket controls support `thread/loaded/list` with\n`{cursor?: string | null, limit?: number | null}`. The result is\n`{data: string[], nextCursor: string | null}` from the held manager's loaded\nengine snapshot, including idle and archived engines still in memory. It dLine truncated
       }
     ]
   },
@@ -434,13 +434,13 @@
     "sources": [
       {
         "path": "docs/RUNTIME_API.md",
-        "sha256": "6f3b8885978ef2e1b33d0fdf66ad6ccf5c25464c1951b59658aec00745390db2",
-        "content": "# Codewhale Engine Runtime API & Integration Contract\n\n> 阅读简体中文版：[zh_hans/RUNTIME_API.md](zh_hans/RUNTIME_API.md)。\n\n`codewhale app-server --http` exposes the [Codewhale Engine](ARCHITECTURE.md) through\nits canonical local Runtime API and control plane.\nLocal SDKs, mobile/remote-control clients, and editor integrations talk to it\ninstead of screen-scraping terminal output. It serves the full HTTP/SSE runtime\nAPI (`/v1/*`), a JSON-RPC control transport over stdio, and the phone-friendly\nmobile page. `codewhale doctor --json` provides machine-readable health, and\n`codewhale serve --acp` speaks the Agent Client Protocol over stdio for editors\nsuch as Zed.\n\n`codewhale serve --http` / `serve --mobile` remain as **compatibility aliases**\nfor `codewhale app-server --http` / `--mobile`; both launch the identical\nserver. Desktop, web, SDK and custom integrations should target\n`app-server --http`. `--stdio` and `--socket` expose compatibility controls.\nBare `app-server` selects initialized JSONL control over stdio. Local stdio,\nsocket and ACP owners do not bind a hidden TCP listener. Explicit `--http`\nretains HTTP/SSE and compatibility routes on the same Runtime owner.\n\n`codewhale exec` is the separate one-shot headless worker path (stream-json,\nfleet worker subprocess, CI primitive). It is not part of this API, but it\nshares the same runtime, provider/model resolution, permission profiles, and\nevent vocabulary.\n\nThis document is the stable integration contract for native workbench\napplications (and other local supervisors) that embed the Codewhale Engine.\n\n## Architecture\n\n```\nlocal supervisor / SDK / automation harness\n        │\n        ├─ codewhale app-server --http     → HTTP/SSE runtime API (/v1/*)        [canonical]\n        ├─ codewhale app-server --mobile   → runtime API + mobile control page\n        ├─ codewhale app-server --stdio    → JSON-RPC control transport over stdio\n        ├─ codewhale app-server --socket   → same JSON-RPC over a unix domain socket (desktop daemon)\n        ├─ codewhale doctor --json         → machine-readable health & capability\n        ├─ codewhale serve --acp           → ACP stdio agent for editors such as Zed\n        ├─ codewhale serve --mcp           → MCP stdio server\n        ├─ codewhale serve --http/--mobile → legacy aliases for `app-server --http/--mobile`\n        └─ codewhale exec [args]           → one-shot headless worker (stream-json)\n```\n\nThe engine runs as a local-only process. All APIs bind to `localhost` by\ndefault. No hosted relay, no provider-token custody, no secret leakage.\n\nFor the read-only record of what a thread or turn did, see\n[`docs/RECEIPTS.md`](RECEIPTS.md): `codewhale receipts` on the CLI and the\n`/receipt` routes under **Threads** below.\n\n## Runtime API entrypoints\n\n| Entry | Transport | Use |\n|---|---|---|\n| `codewhale web [--port 7878]` | HTTP/SSE on `127.0.0.1:7878` + embedded client | First-class loopback-only browser client; opens the default browser |\n| `codewhale app-server --http` | HTTP/SSE on `127.0.0.1:7878` | Full `/v1/*` runtime API (canonical) |\n| `codewhale app-server --mobile` | HTTP/SSE on loopback + `/mobile` | Runtime API + local mobile control page |\n| `codewhale app-server --stdio` | Initialized JSONL over stdio | Compatibility controls and explicit tool-free turns through the held manager; no hidden TCP listener or full Codex interaction channel. |\n| `codewhale app-server --socket [--socket-path P]` | RPC text messages over WebSocket on a `0600` Unix domain socket (macOS/Linux) or an owner-only named pipe (Windows) | Desktop daemon: multi-client, kernel peer identity checked, `daemon/attach` claim handshake. Windows native-app qualification remains open. |\n| `codewhale app-server` | Initialized JSONL over stdio | Same selection as `--stdio`; HTTP requires explicit `--http`. |\n| `codewhale serve --http` / `--mobile` | same server as `app-server --http`/`--mobile` | Compatibility aliases |\n\n`app-server --http` and `--mobile` launch the same mature runtime API server\nhistorically reached through `serve --http` — no routes or behavior changed, so\nevery endpoint documented below is identical across both entrypoints. The\nruntime API token is read from `--auth-token`, then `CODEWHALE_RUNTIME_TOKEN`,\nthen `DEEPSEEK_RUNTIME_TOKEN`; use `--insecure-no-auth` only with a loopback\nbind. The `serve` compatibility aliases keep their `--insecure` flag.\nBare `app-server` does not open an HTTP port. Selected attached HTTP listeners\nretain their explicit bearer and non-loopback security checks.\n\nInitialized stdio/private-socket controls support `thread/loaded/list` with\n`{cursor?: string | null, limit?: number | null}`. The result is\n`{data: string[], nextCursor: string | null}` from the held manager's loaded\nengine snapshot, including idle and archived engines still in memory. It dLine truncated
+        "sha256": "e3040635df0cf62717f5acbe9aacf4909b6ad60db8468b06e90a5e9be1d76d1e",
+        "content": "# Codewhale Engine Runtime API & Integration Contract\n\n> 阅读简体中文版：[zh_hans/RUNTIME_API.md](zh_hans/RUNTIME_API.md)。\n\n`codewhale app-server --http` exposes the [Codewhale Engine](ARCHITECTURE.md) through\nits canonical local Runtime API and control plane.\nLocal SDKs, mobile/remote-control clients, and editor integrations talk to it\ninstead of screen-scraping terminal output. It serves the full HTTP/SSE runtime\nAPI (`/v1/*`), a JSON-RPC control transport over stdio, and the phone-friendly\nmobile page. `codewhale doctor --json` provides machine-readable health, and\n`codewhale serve --acp` speaks the Agent Client Protocol over stdio for editors\nsuch as Zed.\n\n`codewhale serve --http` / `serve --mobile` remain as **compatibility aliases**\nfor `codewhale app-server --http` / `--mobile`; both launch the identical\nserver. Desktop, web, SDK and custom integrations should target\n`app-server --http`. `--stdio` and `--socket` expose compatibility controls.\nBare `app-server` selects initialized JSONL control over stdio. Local stdio,\nsocket and ACP owners do not bind a hidden TCP listener. Explicit `--http`\nretains HTTP/SSE and compatibility routes on the same Runtime owner.\n\n`codewhale exec` is the separate one-shot headless worker path (stream-json,\nfleet worker subprocess, CI primitive). It is not part of this API, but it\nshares the same runtime, provider/model resolution, permission profiles, and\nevent vocabulary.\n\nThis document is the stable integration contract for native workbench\napplications (and other local supervisors) that embed the Codewhale Engine.\n\n## Architecture\n\n```\nlocal supervisor / SDK / automation harness\n        │\n        ├─ codewhale app-server --http     → HTTP/SSE runtime API (/v1/*)        [canonical]\n        ├─ codewhale app-server --mobile   → runtime API + mobile control page\n        ├─ codewhale app-server --stdio    → JSON-RPC control transport over stdio\n        ├─ codewhale app-server --socket   → same JSON-RPC over a unix domain socket (desktop daemon)\n        ├─ codewhale doctor --json         → machine-readable health & capability\n        ├─ codewhale serve --acp           → ACP stdio agent for editors such as Zed\n        ├─ codewhale serve --mcp           → MCP stdio server\n        ├─ codewhale serve --http/--mobile → legacy aliases for `app-server --http/--mobile`\n        └─ codewhale exec [args]           → one-shot headless worker (stream-json)\n```\n\nThe engine runs as a local-only process. All APIs bind to `localhost` by\ndefault. No hosted relay, no provider-token custody, no secret leakage.\n\nFor the read-only record of what a thread or turn did, see\n[`docs/RECEIPTS.md`](RECEIPTS.md): `codewhale receipts` on the CLI and the\n`/receipt` routes under **Threads** below.\n\n## Runtime API entrypoints\n\n| Entry | Transport | Use |\n|---|---|---|\n| `codewhale web [--port 7878]` | HTTP/SSE on `127.0.0.1:7878` + embedded client | First-class loopback-only browser client; opens the default browser |\n| `codewhale app-server --http` | HTTP/SSE on `127.0.0.1:7878` | Full `/v1/*` runtime API (canonical) |\n| `codewhale app-server --mobile` | HTTP/SSE on loopback + `/mobile` | Runtime API + local mobile control page |\n| `codewhale app-server --stdio` | Initialized JSONL over stdio | Compatibility controls and explicit tool-free turns through the held manager; no hidden TCP listener or full Codex interaction channel. |\n| `codewhale app-server --socket [--socket-path P]` | RPC text messages over WebSocket on a `0600` Unix domain socket (macOS/Linux) or an owner-only named pipe (Windows) | Desktop daemon: multi-client, kernel peer identity checked, `daemon/attach` claim handshake. Windows native-app qualification remains open. |\n| `codewhale app-server` | Initialized JSONL over stdio | Same selection as `--stdio`; HTTP requires explicit `--http`. |\n| `codewhale serve --http` / `--mobile` | same server as `app-server --http`/`--mobile` | Compatibility aliases |\n\n`app-server --http` and `--mobile` launch the same mature runtime API server\nhistorically reached through `serve --http` — no routes or behavior changed, so\nevery endpoint documented below is identical across both entrypoints. The\nruntime API token is read from `--auth-token`, then `CODEWHALE_RUNTIME_TOKEN`,\nthen `DEEPSEEK_RUNTIME_TOKEN`; use `--insecure-no-auth` only with a loopback\nbind. The `serve` compatibility aliases keep their `--insecure` flag.\nBare `app-server` does not open an HTTP port. Selected attached HTTP listeners\nretain their explicit bearer and non-loopback security checks.\n\nInitialized stdio/private-socket controls support `thread/loaded/list` with\n`{cursor?: string | null, limit?: number | null}`. The result is\n`{data: string[], nextCursor: string | null}` from the held manager's loaded\nengine snapshot, including idle and archived engines still in memory. It dLine truncated
       },
       {
         "path": "docs/RUNTIME_ROUTES.md",
-        "sha256": "1a21c05b0249c2ff225f7b554e1e610fc12122ab3da52e6ac7ceb06c90448984",
-        "content": "# Runtime HTTP route inventory\n\nThis table is generated from literal route registrations in\n`crates/app-server/src/runtime_api.rs`. It names the paths and methods that\nthe current source registers, including native-client and compatibility\nsurfaces. A registered path is not a grant of permission or a promise that\na feature is enabled in your installed version.\n\nThe [Runtime API contract](RUNTIME_API.md) explains request fields, events,\nauthorization and compatibility. This inventory is a navigation index, not\na replacement for those schemas; routes used by the native client can have\nclient-specific contracts. Provider calls, file mutations and connected-service\nactions remain subject to their documented authority boundaries.\n\nRun `node web/scripts/check-runtime-routes.mjs --write` after changing a\nregistration; `npm run check:docs` refuses a stale inventory. Dynamic nested\nrouters, fallback handlers and static-asset mounts are outside this literal\nregistration index.\n\n| HTTP method | Path |\n| --- | --- |\n| GET | `/` |\n| GET | `/__codewhale/bootstrap/{nonce}` |\n| GET | `/__codewhale/mobile/bootstrap/{nonce}` |\n| POST | `/__codewhale/mobile/session` |\n| POST | `/__codewhale/mobile/stream-ticket` |\n| POST | `/__codewhale/web/stream-ticket` |\n| GET | `/assets/codewhale-192.png` |\n| GET | `/assets/codewhale-web.css` |\n| GET | `/assets/codewhale-web.js` |\n| GET | `/health` |\n| GET | `/mobile` |\n| GET | `/mobile/` |\n| DELETE / GET / PUT | `/v1/account/model-access` |\n| POST | `/v1/agent-mail` |\n| GET | `/v1/agent-runs` |\n| GET | `/v1/agent-runs/{run_id}` |\n| POST | `/v1/agent-runs/{run_id}/cancel` |\n| GET | `/v1/agents/external` |\n| GET | `/v1/agents/external/{id}/options` |\n| GET | `/v1/agents/external/quota` |\n| GET | `/v1/approvals` |\n| POST | `/v1/approvals/{approval_id}` |\n| GET | `/v1/apps/avatars` |\n| GET | `/v1/apps/avatars/{handle}/atlases/{page}` |\n| GET / POST | `/v1/apps/marketplaces` |\n| DELETE / GET | `/v1/apps/marketplaces/{name}` |\n| POST | `/v1/apps/marketplaces/{name}/install` |\n| POST | `/v1/apps/mcp/desktop-browser` |\n| GET / POST | `/v1/apps/mcp/imports` |\n| GET / POST | `/v1/apps/mcp/servers` |\n| DELETE / GET / PATCH | `/v1/apps/mcp/servers/{name}` |\n| POST | `/v1/apps/mcp/servers/{name}/disable` |\n| POST | `/v1/apps/mcp/servers/{name}/enable` |\n| POST | `/v1/apps/mcp/servers/{name}/reconnect` |\n| GET | `/v1/apps/mcp/tools` |\n| GET | `/v1/apps/plugins` |\n| DELETE / GET | `/v1/apps/plugins/{selector}` |\n| POST | `/v1/apps/plugins/{selector}/disable` |\n| POST | `/v1/apps/plugins/{selector}/enable` |\n| POST | `/v1/apps/plugins/{selector}/restage` |\n| POST | `/v1/apps/plugins/{selector}/revoke` |\n| ANY | `/v1/apps/plugins/{selector}/routes/{*path}` |\n| POST | `/v1/apps/plugins/{selector}/trust` |\n| GET | `/v1/apps/plugins/{selector}/ui` |\n| GET | `/v1/apps/plugins/{selector}/ui/{*path}` |\n| POST | `/v1/apps/plugins/{selector}/update` |\n| GET | `/v1/apps/plugins/catalog` |\n| POST | `/v1/apps/plugins/catalog/{id}/disable` |\n| POST | `/v1/apps/plugins/catalog/{id}/enable` |\n| PUT | `/v1/apps/plugins/catalog/{id}/settings` |\n| POST | `/v1/apps/plugins/import/dsh/preview` |\n| POST | `/v1/apps/plugins/install` |\n| GET / POST | `/v1/automations` |\n| DELETE / GET / PATCH | `/v1/automations/{id}` |\n| GET | `/v1/automations/{id}/missed` |\n| PUT | `/v1/automations/{id}/missed/policy` |\n| POST | `/v1/automations/{id}/missed/run` |\n| POST | `/v1/automations/{id}/missed/skip` |\n| POST | `/v1/automations/{id}/pause` |\n| POST | `/v1/automations/{id}/resume` |\n| POST | `/v1/automations/{id}/run` |\n| GET | `/v1/automations/{id}/runs` |\n| GET | `/v1/automations/missed` |\n| GET | `/v1/changes` |\n| GET / POST | `/v1/cloud` |\n| POST | `/v1/cloud/attach` |\n| GET | `/v1/commands` |\n| GET / POST | `/v1/config` |\n| POST | `/v1/config/reload` |\n| GET | `/v1/constitution` |\n| POST | `/v1/constitution/preview` |\n| GET | `/v1/crashes` |\n| GET | `/v1/crashes/{name}` |\n| GET | `/v1/definition` |\n| GET | `/v1/diagnostics` |\n| GET | `/v1/diff` |\n| POST | `/v1/fleet/placement` |\n| GET | `/v1/fleet/profiles` |\n| GET | `/v1/fleet/profiles/{id}/document` |\n| GET / POST | `/v1/fleet/runs` |\n| GET | `/v1/fleet/runs/{run_id}` |\n| GET | `/v1/fleet/runs/{run_id}/events` |\n| GET | `/v1/fleet/runs/{run_id}/events/replay` |\n| GET | `/v1/fleet/runs/{run_id}/receipts` |\n| GET | `/v1/fleet/runs/{run_id}/receipts/{task_id}` |\n| GET | `/v1/fleet/runs/{run_id}/receipts/{task_id}/evidence` |\n| POST | `/v1/fleet/runs/{run_id}/start` |\n| POST | `/v1/fleet/runs/{run_id}/stop` |\n| GET | `/v1/fleet/runs/{run_id}/workers` |\n| GET | `/v1/fleet/workers/{worker_id}` |\n| POST | `/v1/fleet/workers/{worker_id}/interrupt` |\n| POST | `/v1/fleet/workers/{worker_id}/restart` |\n| POST | `/v1/fleet/workers/{worker_id}/stop` |\n| GET | `/v1/git` |\n| POST | `/v1/git/branch` |\n| POST | `/v1/git/commit` |\n| POST | `/v1/git/discard` |\nLine truncated
+        "sha256": "eae9cc4778f7c6f4ae2db5fe0d2d39d757521337a0818b2c2bf4a4f5dd686e0e",
+        "content": "# Runtime HTTP route inventory\n\nThis table is generated from literal route registrations in\n`crates/app-server/src/runtime_api.rs`. It names the paths and methods that\nthe current source registers, including native-client and compatibility\nsurfaces. A registered path is not a grant of permission or a promise that\na feature is enabled in your installed version.\n\nThe [Runtime API contract](RUNTIME_API.md) explains request fields, events,\nauthorization and compatibility. This inventory is a navigation index, not\na replacement for those schemas; routes used by the native client can have\nclient-specific contracts. Provider calls, file mutations and connected-service\nactions remain subject to their documented authority boundaries.\n\nRun `node web/scripts/check-runtime-routes.mjs --write` after changing a\nregistration; `npm run check:docs` refuses a stale inventory. Dynamic nested\nrouters, fallback handlers and static-asset mounts are outside this literal\nregistration index.\n\n| HTTP method | Path |\n| --- | --- |\n| GET | `/` |\n| GET | `/__codewhale/bootstrap/{nonce}` |\n| GET | `/__codewhale/mobile/bootstrap/{nonce}` |\n| POST | `/__codewhale/mobile/session` |\n| POST | `/__codewhale/mobile/stream-ticket` |\n| POST | `/__codewhale/web/stream-ticket` |\n| GET | `/assets/codewhale-192.png` |\n| GET | `/assets/codewhale-web.css` |\n| GET | `/assets/codewhale-web.js` |\n| GET | `/health` |\n| GET | `/mobile` |\n| GET | `/mobile/` |\n| DELETE / GET / PUT | `/v1/account/model-access` |\n| POST | `/v1/agent-mail` |\n| GET | `/v1/agent-runs` |\n| GET | `/v1/agent-runs/{run_id}` |\n| POST | `/v1/agent-runs/{run_id}/cancel` |\n| GET | `/v1/agents/external` |\n| GET | `/v1/agents/external/{id}/options` |\n| GET | `/v1/agents/external/quota` |\n| GET | `/v1/approvals` |\n| POST | `/v1/approvals/{approval_id}` |\n| GET | `/v1/apps/avatars` |\n| GET | `/v1/apps/avatars/{handle}/atlases/{page}` |\n| GET / POST | `/v1/apps/marketplaces` |\n| DELETE / GET | `/v1/apps/marketplaces/{name}` |\n| POST | `/v1/apps/marketplaces/{name}/install` |\n| POST | `/v1/apps/mcp/desktop-browser` |\n| GET / POST | `/v1/apps/mcp/imports` |\n| GET / POST | `/v1/apps/mcp/servers` |\n| DELETE / GET / PATCH | `/v1/apps/mcp/servers/{name}` |\n| POST | `/v1/apps/mcp/servers/{name}/disable` |\n| POST | `/v1/apps/mcp/servers/{name}/enable` |\n| POST | `/v1/apps/mcp/servers/{name}/reconnect` |\n| GET | `/v1/apps/mcp/tools` |\n| GET | `/v1/apps/plugin-index` |\n| GET | `/v1/apps/plugins` |\n| DELETE / GET | `/v1/apps/plugins/{selector}` |\n| POST | `/v1/apps/plugins/{selector}/disable` |\n| POST | `/v1/apps/plugins/{selector}/enable` |\n| POST | `/v1/apps/plugins/{selector}/restage` |\n| POST | `/v1/apps/plugins/{selector}/revoke` |\n| ANY | `/v1/apps/plugins/{selector}/routes/{*path}` |\n| POST | `/v1/apps/plugins/{selector}/trust` |\n| GET | `/v1/apps/plugins/{selector}/ui` |\n| GET | `/v1/apps/plugins/{selector}/ui/{*path}` |\n| POST | `/v1/apps/plugins/{selector}/update` |\n| GET | `/v1/apps/plugins/catalog` |\n| POST | `/v1/apps/plugins/catalog/{id}/disable` |\n| POST | `/v1/apps/plugins/catalog/{id}/enable` |\n| PUT | `/v1/apps/plugins/catalog/{id}/settings` |\n| POST | `/v1/apps/plugins/import/dsh/preview` |\n| POST | `/v1/apps/plugins/install` |\n| GET / POST | `/v1/automations` |\n| DELETE / GET / PATCH | `/v1/automations/{id}` |\n| GET | `/v1/automations/{id}/missed` |\n| PUT | `/v1/automations/{id}/missed/policy` |\n| POST | `/v1/automations/{id}/missed/run` |\n| POST | `/v1/automations/{id}/missed/skip` |\n| POST | `/v1/automations/{id}/pause` |\n| POST | `/v1/automations/{id}/resume` |\n| POST | `/v1/automations/{id}/run` |\n| GET | `/v1/automations/{id}/runs` |\n| GET | `/v1/automations/missed` |\n| GET | `/v1/changes` |\n| GET / POST | `/v1/cloud` |\n| POST | `/v1/cloud/attach` |\n| GET | `/v1/commands` |\n| GET / POST | `/v1/config` |\n| POST | `/v1/config/reload` |\n| GET | `/v1/constitution` |\n| POST | `/v1/constitution/preview` |\n| GET | `/v1/crashes` |\n| GET | `/v1/crashes/{name}` |\n| GET | `/v1/definition` |\n| GET | `/v1/diagnostics` |\n| GET | `/v1/diff` |\n| POST | `/v1/fleet/placement` |\n| GET | `/v1/fleet/profiles` |\n| GET | `/v1/fleet/profiles/{id}/document` |\n| GET / POST | `/v1/fleet/runs` |\n| GET | `/v1/fleet/runs/{run_id}` |\n| GET | `/v1/fleet/runs/{run_id}/events` |\n| GET | `/v1/fleet/runs/{run_id}/events/replay` |\n| GET | `/v1/fleet/runs/{run_id}/receipts` |\n| GET | `/v1/fleet/runs/{run_id}/receipts/{task_id}` |\n| GET | `/v1/fleet/runs/{run_id}/receipts/{task_id}/evidence` |\n| POST | `/v1/fleet/runs/{run_id}/start` |\n| POST | `/v1/fleet/runs/{run_id}/stop` |\n| GET | `/v1/fleet/runs/{run_id}/workers` |\n| GET | `/v1/fleet/workers/{worker_id}` |\n| POST | `/v1/fleet/workers/{worker_id}/interrupt` |\n| POST | `/v1/fleet/workers/{worker_id}/restart` |\n| POST | `/v1/fleet/workers/{worker_id}/stop` |\n| GET | `/v1/git` |\n| POST | `/v1/git/branch` |\n| POST | `/v1/git/commitLine truncated
       }
     ]
   },