From 6fb80cbb1e9c23e01788365d4a48ca7a9b0eeab1 Mon Sep 17 00:00:00 2001
From: Jesus God <wyattbracy@gmail.com>
Date: Mon, 19 Oct 2026 15:47:54 +0000
Subject: [PATCH 01/18] Delphi 1.3.0: add portable Codex harness and default
 Argos workspace

---
 .delphi/codex.sh                              |   6 +
 .delphi/exec.sh                               |   7 +
 .delphi/manifest.yml                          |   4 +-
 .delphi/versions                              |   1 +
 CLAUDE.md                                     |  11 +-
 README.md                                     |  31 +++-
 ci/check.sh                                   |  58 +++++--
 ci/harnesses.sh                               |  34 ++++
 ci/inherit.sh                                 |  27 ++++
 ci/sync.sh                                    |  57 ++++---
 docs/design.md                                |  92 +++++++----
 .../application-software/argos/AUTHORING.md   |  37 +++--
 software/application-software/argos/README.md |   8 +-
 .../.claude => }/skills/implement/SKILL.md    |   0
 .../skills/pr-conventions/SKILL.md            |   3 +-
 .../skills/pr-conventions/scripts/lint.sh     |   0
 .../.claude => }/skills/run-local/SKILL.md    |   0
 .../skills/run-local/scripts/run-local.sh     |   0
 .../skills/run-local/scripts/serve.sh         |   0
 .../skills/ticket-conventions/SKILL.md        |   1 -
 .../.claude => }/skills/verify-graph/SKILL.md |   1 -
 .../skills/verify-graph/scripts/check.js      |   0
 .../skills/verify-graph/scripts/check.sh      |   0
 .../skills/verify-graph/scripts/open.sh       |   0
 .../skills/verify-graph/scripts/perf.js       |   0
 .../skills/verify-graph/scripts/perf.sh       |   0
 .../skills/verify-graph/scripts/seed.sh       |   0
 .../skills/verify-graph/scripts/select-run.sh |   0
 .../skills/verify-telemetry/SKILL.md          |   0
 .../verify-telemetry/scripts/check-topic.sh   |   0
 .../argos/workspace-defaults/AGENTS.md        |  59 +++++++
 .../workspaces/default-codex/.gitattributes   |   2 +
 .../.github/workflows/delphi.yml              |  41 +++++
 .../argos/workspaces/default-codex/AGENTS.md  |  72 +++++++++
 .../workspaces/default-codex/docs/CONTEXT.md  | 102 ++++++++++++
 .../workspaces/default-codex/workspace.yml    |  17 ++
 .../skills/pr-conventions/SKILL.md            |   5 +-
 .../skills/ticket-conventions/SKILL.md        |   1 -
 .../skills/address-pr-comments/SKILL.md       |   4 +-
 .../scripts/fetch-feedback.sh                 |   0
 .../address-pr-comments/scripts/github.sh     |  10 +-
 .../.claude => }/skills/commit/SKILL.md       |   2 +-
 .../skills/consolidate-spikes/SKILL.md        |   3 +-
 .../skills/create-ticket/SKILL.md             |   2 +-
 .../.claude => }/skills/open-pr/SKILL.md      |   2 +-
 .../skills/open-pr/scripts/pr-checks.sh       |   0
 .../.claude => }/skills/report-spike/SKILL.md |   0
 .../.claude => }/skills/update-pr/SKILL.md    |   0
 .../.claude => }/skills/journal/SKILL.md      |   0
 .../skills/journal/scripts/capture.sh         |   0
 .../.claude => }/skills/new-worktree/SKILL.md |   0
 .../skills/setup-workspace/SKILL.md           |   0
 .../skills/switch-workspace/SKILL.md          |   3 +-
 templates/harnesses/codex/AGENTS.md           |  12 ++
 tests/e2e.sh                                  | 145 +++++++++++++++++-
 tools/new-workspace.sh                        |  37 +++--
 56 files changed, 767 insertions(+), 130 deletions(-)
 create mode 100644 .delphi/codex.sh
 create mode 100644 .delphi/exec.sh
 create mode 100644 ci/harnesses.sh
 create mode 100644 ci/inherit.sh
 rename software/application-software/argos/{workspace-inherit/.claude => }/skills/implement/SKILL.md (100%)
 rename software/application-software/argos/{workspace-inherit/.claude => }/skills/pr-conventions/SKILL.md (96%)
 rename software/application-software/argos/{workspace-inherit/.claude => }/skills/pr-conventions/scripts/lint.sh (100%)
 rename software/application-software/argos/{workspace-inherit/.claude => }/skills/run-local/SKILL.md (100%)
 rename software/application-software/argos/{workspace-inherit/.claude => }/skills/run-local/scripts/run-local.sh (100%)
 rename software/application-software/argos/{workspace-inherit/.claude => }/skills/run-local/scripts/serve.sh (100%)
 rename software/application-software/argos/{workspace-inherit/.claude => }/skills/ticket-conventions/SKILL.md (97%)
 rename software/application-software/argos/{workspace-inherit/.claude => }/skills/verify-graph/SKILL.md (99%)
 rename software/application-software/argos/{workspace-inherit/.claude => }/skills/verify-graph/scripts/check.js (100%)
 rename software/application-software/argos/{workspace-inherit/.claude => }/skills/verify-graph/scripts/check.sh (100%)
 rename software/application-software/argos/{workspace-inherit/.claude => }/skills/verify-graph/scripts/open.sh (100%)
 rename software/application-software/argos/{workspace-inherit/.claude => }/skills/verify-graph/scripts/perf.js (100%)
 rename software/application-software/argos/{workspace-inherit/.claude => }/skills/verify-graph/scripts/perf.sh (100%)
 rename software/application-software/argos/{workspace-inherit/.claude => }/skills/verify-graph/scripts/seed.sh (100%)
 rename software/application-software/argos/{workspace-inherit/.claude => }/skills/verify-graph/scripts/select-run.sh (100%)
 rename software/application-software/argos/{workspace-inherit/.claude => }/skills/verify-telemetry/SKILL.md (100%)
 rename software/application-software/argos/{workspace-inherit/.claude => }/skills/verify-telemetry/scripts/check-topic.sh (100%)
 create mode 100644 software/application-software/argos/workspace-defaults/AGENTS.md
 create mode 100644 software/application-software/argos/workspaces/default-codex/.gitattributes
 create mode 100644 software/application-software/argos/workspaces/default-codex/.github/workflows/delphi.yml
 create mode 100644 software/application-software/argos/workspaces/default-codex/AGENTS.md
 create mode 100644 software/application-software/argos/workspaces/default-codex/docs/CONTEXT.md
 create mode 100644 software/application-software/argos/workspaces/default-codex/workspace.yml
 rename software/application-software/nero/{workspace-inherit/.claude => }/skills/pr-conventions/SKILL.md (86%)
 rename software/application-software/nero/{workspace-inherit/.claude => }/skills/ticket-conventions/SKILL.md (96%)
 rename software/application-software/{workspace-inherit/.claude => }/skills/address-pr-comments/SKILL.md (86%)
 rename software/application-software/{workspace-inherit/.claude => }/skills/address-pr-comments/scripts/fetch-feedback.sh (100%)
 rename software/application-software/{workspace-inherit/.claude => }/skills/address-pr-comments/scripts/github.sh (66%)
 rename software/application-software/{workspace-inherit/.claude => }/skills/commit/SKILL.md (75%)
 rename software/application-software/{workspace-inherit/.claude => }/skills/consolidate-spikes/SKILL.md (84%)
 rename software/application-software/{workspace-inherit/.claude => }/skills/create-ticket/SKILL.md (97%)
 rename software/application-software/{workspace-inherit/.claude => }/skills/open-pr/SKILL.md (96%)
 rename software/application-software/{workspace-inherit/.claude => }/skills/open-pr/scripts/pr-checks.sh (100%)
 rename software/application-software/{workspace-inherit/.claude => }/skills/report-spike/SKILL.md (100%)
 rename software/application-software/{workspace-inherit/.claude => }/skills/update-pr/SKILL.md (100%)
 rename software/{workspace-inherit/.claude => }/skills/journal/SKILL.md (100%)
 rename software/{workspace-inherit/.claude => }/skills/journal/scripts/capture.sh (100%)
 rename software/{workspace-inherit/.claude => }/skills/new-worktree/SKILL.md (100%)
 rename software/{workspace-inherit/.claude => }/skills/setup-workspace/SKILL.md (100%)
 rename software/{workspace-inherit/.claude => }/skills/switch-workspace/SKILL.md (71%)
 create mode 100644 templates/harnesses/codex/AGENTS.md

diff --git a/.delphi/codex.sh b/.delphi/codex.sh
new file mode 100644
index 0000000..15f447f
--- /dev/null
+++ b/.delphi/codex.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+# Start Codex CLI at this workspace with the layout inherited by commands and child processes.
+set -euo pipefail
+# shellcheck source=.delphi/paths.sh
+source "$(dirname "$0")/paths.sh"
+exec codex -C "$DELPHI_ROOT" "$@"
diff --git a/.delphi/exec.sh b/.delphi/exec.sh
new file mode 100644
index 0000000..1cf3281
--- /dev/null
+++ b/.delphi/exec.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+# Run a command with this clone's layout, even in hosts whose fresh shells discard session exports.
+set -euo pipefail
+# shellcheck source=.delphi/paths.sh
+source "$(dirname "$0")/paths.sh"
+[ "$#" -gt 0 ] || { echo "usage: bash .delphi/exec.sh <command> [<arg>...]" >&2; exit 2; }
+exec "$@"
diff --git a/.delphi/manifest.yml b/.delphi/manifest.yml
index 8546a04..8cb1b9c 100644
--- a/.delphi/manifest.yml
+++ b/.delphi/manifest.yml
@@ -6,7 +6,7 @@
 #   MINOR  something new that existing clones need nothing for
 #   MAJOR  clones need cleanup (MINOR while 0.x): add .delphi/migrations/<version>-<slug>.sh, which
 #          setup.sh runs once per workspace in each clone (rules in Delphi's CLAUDE.md)
-version: 1.2.0
+version: 1.3.0
 files:                        # repo-relative paths; a trailing / means everything under it
   - .delphi/manifest.yml
   - .delphi/.gitattributes
@@ -14,6 +14,8 @@ files:                        # repo-relative paths; a trailing / means everythi
   - .delphi/version.sh
   - .delphi/setup.sh
   - .delphi/new-worktree.sh
+  - .delphi/exec.sh
+  - .delphi/codex.sh
   - .delphi/paths.sh
   - .delphi/plugins.sh
   - .delphi/switch.sh
diff --git a/.delphi/versions b/.delphi/versions
index 2fa678d..49053ea 100644
--- a/.delphi/versions
+++ b/.delphi/versions
@@ -17,3 +17,4 @@
 1.0.0 44693a895995 1.0: workspaces: clones live at workspaces/<name> (was linked/<name>; DELPHI_WORKSPACES, was DELPHI_LINKED); setup.sh also runs each one's own setup.sh, and a workspace inside another's workspaces/ skips its own workspaces: (migration)
 1.1.0 a3446f7f763c setup.sh clones each repos: entry at repos/<name> (a normal clone on its default branch, was a bare store) and adds no worktree; new-worktree.sh makes worktrees from that clone; older bare stores are left as they are
 1.2.0 d139aaf9f4a5 worktrees come from their own bare store, worktrees/<name>/.bare, separate from the plain clone at repos/<name>; setup.sh makes the store and the default-branch worktree again; an older bare store at repos/<name> is left as it is
+1.3.0 39487f8f28ec portable Codex harness and native shared skill inheritance
diff --git a/CLAUDE.md b/CLAUDE.md
index 4b5131d..75f7fbe 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -17,7 +17,7 @@ source of truth; `docs/goals.md` lists what any change must keep.
   labelled `by: ai` (new-workspace: `--by ai-assisted|human` when the user says so).
 - `ci/plugins.sh`: writes `.claude-plugin/marketplace.json` from the plugin sets
   (`software/**/plugins/<harness>/<set>/`, named `<scope>[.<set>]`; a folder's scope is its
-  `plugins/scope`, else its `short-name`, else its name), each workspace's `workspace.yml` `plugins:` defaults (the
+  `plugins/scope`, else its `short-name`, else its name), each Claude Code workspace's `workspace.yml` `plugins:` defaults (the
   `default` set of every folder above), and its `.claude/settings.json` (enabled sets, and the SessionStart hook that sets `$DELPHI_ROOT`; never edit
   it by hand). Run it after changing a set or a `workspace.yml`'s `plugins:`.
 - `.delphi/{setup,new-worktree,switch,park,plugins}.sh`: the scripts every workspace runs (setup.sh
@@ -31,8 +31,8 @@ source of truth; `docs/goals.md` lists what any change must keep.
   version, with its hash from `.delphi/version.sh`), `.delphi/migrations/<version>-<slug>.sh` (clone
   cleanup, run by `setup.sh`).
 - `templates/workspace/`: `workspace.yml`, `CLAUDE.md` (`{{name}}`, `{{folder}}`), the managed
-  `.github/workflows/delphi.yml` every workspace carries unchanged. The general `new-worktree`,
-  `switch-workspace`, `setup-workspace`, and `journal` skills are in `software/workspace-inherit/`.
+  `.github/workflows/delphi.yml` every workspace carries unchanged. The general skills are in `software/skills/`; Codex instructions use the native template under
+  `templates/harnesses/`.
 - `software/plugins/claude/default/`: the `delphi` plugin set, a mod whose `/ws-delphi` pane switches
   workspaces (`hooks/register.tsx`, tests in `tests/ws.test.ts`, run by `claude plugin test`);
   `/ws-delphi --web` serves the same cards in a browser tab (`web/server.py`, `web/index.html`).
@@ -43,6 +43,9 @@ source of truth; `docs/goals.md` lists what any change must keep.
   `workspace.yml` skips a path).
 - `.github/workflows/delphi.yml` (identical to the template's copy), `.github/CODEOWNERS`; issue templates (idea, spike, epic, dev work) and the PR template in `.github/`, filed with the `create-ticket` skill (`.claude/skills/`).
 - `tests/e2e.sh`: end-to-end test in a throwaway sandbox (bare origin, stub `gh` logging to `gh.log`).
+- `ci/harnesses.sh` declares supported adapters and native paths; `ci/inherit.sh` resolves neutral
+  `skills/` and legacy `workspace-inherit/` skill paths for sync and validation. Codex uses
+  `.delphi/codex.sh` for CLI startup and `.delphi/exec.sh` for hosts with independent shells.
 
 ## Rules
 
@@ -56,7 +59,7 @@ source of truth; `docs/goals.md` lists what any change must keep.
   their path in the skill's folder, `bash scripts/<script>.sh <names>…`, and reference files the same
   way. Skill scripts (inherited, plugin or workspace) take only names (repo, branch) and read the workspace
   from `$DELPHI_ROOT`, sourcing `$DELPHI_ROOT/.delphi/paths.sh` for every folder; each harness's
-  generated settings set it (Claude Code: a SessionStart hook in `.claude/settings.json`, from
+  bootstrap sets it (Claude Code: a SessionStart hook in `.claude/settings.json`, from
   `ci/plugins.sh`). Never search for the root or default to the cwd's branch.
 - `.delphi/*.sh` run on people's machines: bash 3.2 (macOS) and Git Bash safe. No bash-4
   features (associative arrays, `mapfile`, `${x,,}`, `|&`), POSIX awk only.
diff --git a/README.md b/README.md
index 4b4ba4f..a1778ea 100644
--- a/README.md
+++ b/README.md
@@ -88,6 +88,28 @@ path, except `.github/workflows/delphi.yml` (a copy of the template's). The scri
 (listed in `.delphi/manifest.yml`), live once at main's root: sync puts
 `.delphi/` on every `ws/*` branch, so change them only through PRs to main.
 
+## Codex
+
+Argos's `default-codex` workspace targets the Codex harness across hosts:
+
+```sh
+git clone -b ws/s.app.argos.default-codex https://github.com/Northeastern-Electric-Racing/Delphi.git delphi
+cd delphi
+bash .delphi/setup.sh
+bash .delphi/codex.sh
+```
+
+The CLI launcher exports the layout before starting Codex. In hosts that start Codex themselves,
+read `AGENTS.md` and use `.delphi/exec.sh` for helper commands; it sets the layout for every command
+and its child processes, even when shell exports do not persist. Start a fresh session after a
+workspace switch. Host dependencies and credentials are configured by the user or host; the
+workspace doesn't depend on a particular cloud environment. Codex does not enable Delphi's Claude
+plugin sets or install MCP servers. Use tools already available in the selected host.
+
+`harness:` is validated against `ci/harnesses.sh`. Authoring selects its native instruction template
+and skill destination while preserving shared project defaults. See `docs/design.md` for adding
+another adapter.
+
 ## Versions
 
 `.delphi/manifest.yml` lists Delphi's own files under a `version:` (MAJOR.MINOR.PATCH), and
@@ -98,7 +120,7 @@ a version needs cleanup in people's clones, it ships `.delphi/migrations/<versio
 
 ## New workspace
 
-`tools/new-workspace.sh <org-path under software/> <leaf>` copies `templates/workspace/` into
+`tools/new-workspace.sh [--harness claude-code|codex] <org-path under software/> <leaf>` copies `templates/workspace/` into
 `software/<org-path>/workspaces/<leaf>/`, adds the project's `workspace-defaults/` if it has one, and
 opens a PR to `main`, labelled `by: ai` (put `--by ai-assisted` or `--by human` first to change it).
 Once it merges, CI creates `ws/<name>` (its dotted name).
@@ -107,8 +129,13 @@ Once it merges, CI creates `ws/<name>` (its dotted name).
 can hold shared context (`README.md`), a guide to its workspaces (`AUTHORING.md`), and
 `workspace-defaults/` (what a new workspace there starts with).
 
+**Shared skills.** Put reusable workflows in `skills/<name>/` at an org or project folder.
+Sync renders them into the native skill directory declared in `ci/harnesses.sh`, with one source
+across harnesses. Edit these on `main`; workspace edits are reset on refresh. `opt-out:` uses
+the destination path in the selected harness.
+
 **Inherited files.** Any folder under `software/`, `software/` itself included, can hold
-`workspace-inherit/`: files (usually skills, never `CLAUDE.md`) that CI writes onto the `ws/*` branch
+`workspace-inherit/`: files at their workspace paths (never native workspace instructions) that CI writes onto the `ws/*` branch
 of every workspace below it on each sync. Edit them on `main`; a workspace's own edit is undone. To
 keep its own copy, a workspace lists the path under `opt-out:` in its `workspace.yml`.
 A workspace that lists `main` under `workspaces:` reads them at `workspaces/main/` (recommended for every
diff --git a/ci/check.sh b/ci/check.sh
index ebdcdfe..bc33de1 100755
--- a/ci/check.sh
+++ b/ci/check.sh
@@ -26,6 +26,8 @@
 # Lists every problem; exits 1 if any.
 set -euo pipefail
 here=$(cd "$(dirname "$0")" && pwd)
+# shellcheck source=ci/inherit.sh
+source "$here/inherit.sh"
 cd "${1:-.}"
 base=${2:-}
 problems=0
@@ -142,34 +144,60 @@ manifest() { # <workspace.yml> [<name>]: without <name> (a workspace-defaults/ m
       next }
     { print "unexpected line: " $0 }
     END { if (!h) print "harness is missing"; if (want != "" && !nm) print "name is missing" }' "$1")
+  local adapter
+  adapter=$(awk '/^harness:/ { print $2; exit }' "$1")
+  if [ -n "$adapter" ]; then
+    harness "$adapter" 2>/dev/null || { bad "$1: unknown harness '$adapter'"; return; }
+    if [ "$plugins" = none ] && awk '/^plugins:/ { s = 1; next } /^[^[:space:]#]/ { s = 0 } s && /^[[:space:]]+-/ { found = 1 } END { exit !found }' "$1"; then
+      bad "$1: $adapter does not support Delphi plugin sets"
+    fi
+    if [ -n "${2:-}" ]; then
+      [ -f "${1%/*}/$instruction" ] || bad "${1%/*}/$instruction: required for $adapter"
+      case "$adapter" in
+        codex) for incompatible in CLAUDE.md .claude; do
+          [ ! -e "${1%/*}/$incompatible" ] || bad "${1%/*}/$incompatible: belongs to a different harness"
+        done ;;
+        claude-code) for incompatible in AGENTS.md .agents .codex; do
+          [ ! -e "${1%/*}/$incompatible" ] || bad "${1%/*}/$incompatible: belongs to a different harness"
+        done ;;
+      esac
+    fi
+  fi
   while IFS= read -r v; do listed="$listed $1|$v"; done < <(awk '/^workspaces:/ { s = 1; next } /^[^[:space:]#]/ { s = 0 }
     s && /^[[:space:]]+-[[:space:]]+/ { sub(/^[[:space:]]+-[[:space:]]+/, ""); sub(/[[:space:]]*#.*$/, ""); if ($0 != "main") print }' "$1")
 }
 
-levels() { # <workspace folder>: software/ and each folder down to its project folder, top first
-  echo "${1%/workspaces/*}" | awk -F/ '{ p = $1; print p; for (i = 2; i <= NF; i++) { p = p "/" $i; print p } }'
-}
-inherits() { # <workspace folder> <workspace.yml>: what it inherits, against what it has and opts out of
-  local level p o opted seen="" used="" out
+inherits() { # <workspace folder> <workspace.yml>: validate resolved destinations, not source layout
+  local p src o opted seen="" used="" out adapter
+  adapter=$(awk '/^harness:/ { print $2; exit }' "$2")
+  harness "$adapter" 2>/dev/null || return 0
   out=$(awk '/^opt-out:/ { s = 1; next } /^[^[:space:]#]/ { s = 0 }
     s && /^[[:space:]]+-[[:space:]]+/ { sub(/^[[:space:]]+-[[:space:]]+/, ""); sub(/[[:space:]]*#.*$/, ""); sub(/\/$/, ""); print }' "$2")
-  for level in $(levels "$1"); do
-    [ -d "$level/workspace-inherit" ] || continue
-    for p in $(cd "$level/workspace-inherit" && find . -type f | sed 's#^\./##' | sort); do
-      case " $seen " in *" $p "*) bad "$level/workspace-inherit/$p: $1 also inherits it from a folder above; keep one" ;; esac
-      seen="$seen $p" opted=""
-      for o in $out; do case "$p/" in "$o"/*) opted=1 used="$used $o" ;; esac; done
-      [ -n "$opted" ] || [ ! -e "$1/$p" ] || bad "$1/$p: inherited from $level/workspace-inherit/; remove it, or list it under opt-out: in workspace.yml"
-    done
-  done
+  while IFS=$'\t' read -r _ p src; do
+    case "$adapter:$p" in
+      codex:.claude/* | claude-code:.agents/* | claude-code:.codex/*)
+        bad "$src: $p belongs to a different harness" ;;
+    esac
+    case " $seen " in *" $p "*) bad "$src: $1 also inherits it from a folder above; keep one" ;; esac
+    seen="$seen $p" opted=""
+    for o in $out; do case "$p/" in "$o"/*) opted=1 used="$used $o" ;; esac; done
+    [ -n "$opted" ] || [ ! -e "$1/$p" ] || bad "$1/$p: inherited from $src; remove it, or list it under opt-out: in workspace.yml"
+  done < <(inherited_files "" "$1" "$adapter")
   for o in $out; do case " $used " in *" $o "*) ;; *) bad "$2: opt-out: $o is nothing it inherits" ;; esac; done
 }
+
 while IFS= read -r d; do
   case "$d" in */workspaces/*) bad "$d: belongs in an org or project folder, not under workspaces/" ;; esac
-  for f in CLAUDE.md workspace.yml .delphi .claude/settings.json $managed; do
+  for f in CLAUDE.md AGENTS.md workspace.yml .delphi .claude/settings.json .codex/config.toml $managed; do
     [ ! -e "$d/$f" ] || bad "$d/$f: each workspace has its own; it can't be inherited"
   done
 done < <(find software -type d -name workspace-inherit 2>/dev/null | sort)
+while IFS= read -r d; do
+  case "$d" in */workspaces/*) continue ;; esac
+  for skill in "$d"/*; do
+    [ ! -e "$skill" ] || [ -f "$skill/SKILL.md" ] || bad "$skill: shared skills need <name>/SKILL.md"
+  done
+done < <(find software -type d -name skills ! -path '*/workspace-inherit/*' ! -path '*/workspace-defaults/*' 2>/dev/null)
 while IFS= read -r d; do
   [ ! -d "${d%/workspaces}/defaults" ] || bad "${d%/workspaces}/defaults: renamed workspace-defaults/"
 done < <(find software -type d -name workspaces 2>/dev/null)
diff --git a/ci/harnesses.sh b/ci/harnesses.sh
new file mode 100644
index 0000000..b57d920
--- /dev/null
+++ b/ci/harnesses.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+# Harness registry shared by authoring, validation and sync. Add native paths and generation here.
+set -euo pipefail
+# shellcheck disable=SC2034 # native paths are consumed by callers sourcing the registry
+harness() { # <name>: sets instruction, skills and plugins capability; rejects unknown adapters
+  case "$1" in
+    claude-code) instruction=CLAUDE.md; instruction_template=templates/workspace/CLAUDE.md; skills=.claude/skills; plugins=claude ;;
+    codex) instruction=AGENTS.md; instruction_template=templates/harnesses/codex/AGENTS.md; skills=.agents/skills; plugins=none ;;
+    *) echo "harness: unknown harness '$1'" >&2; return 1 ;;
+  esac
+}
+skill_path() { # <source kind: skills|workspace-inherit> <relative path>: native destination
+  case "$1/$2" in
+    skills/*) echo "$skills/$2" ;;
+    workspace-inherit/.claude/skills/*) echo "$skills/${2#.claude/skills/}" ;;
+    *) echo "$2" ;;
+  esac
+}
+generate_harness() { # <main checkout> <workspace folder> <workspace checkout>
+  local adapter
+  adapter=$(awk '/^harness:/ { print $2; exit }' "$3/workspace.yml")
+  harness "$adapter" || return 1
+  if [ "$plugins" = claude ]; then
+    (cd "$1" && bash ci/plugins.sh yml "$2" "$3/workspace.yml") >"$3/workspace.yml.new" || return 1
+    mv "$3/workspace.yml.new" "$3/workspace.yml"
+    mkdir -p "$3/.claude"
+    (cd "$1" && bash ci/plugins.sh settings "$2" "$3/workspace.yml") >"$3/.claude/settings.json" || return 1
+  else
+    rm -f "$3/.claude/settings.json" # generated by the previous adapter, never workspace-owned
+    if awk '/^plugins:/ { s = 1; next } /^[^[:space:]#]/ { s = 0 } s && /^[[:space:]]+-/ { found = 1 } END { exit !found }' "$3/workspace.yml"; then
+      echo "harness: $adapter does not support Delphi plugin sets" >&2; return 1
+    fi
+  fi
+}
diff --git a/ci/inherit.sh b/ci/inherit.sh
new file mode 100644
index 0000000..50be873
--- /dev/null
+++ b/ci/inherit.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+# Source this resolver for inheritance at a git revision or on disk. Destination paths are native.
+set -euo pipefail
+# shellcheck source=ci/harnesses.sh
+source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/harnesses.sh"
+inherit_levels() {
+  echo "${1%/workspaces/*}" | awk -F/ '{ p = $1; print p; for (i = 2; i <= NF; i++) { p = p "/" $i; print p } }'
+}
+inherited_files() { # <revision or '' for disk> <workspace folder> <harness>: mode blob<TAB>destination<TAB>source
+  local level kind record records meta path dest
+  harness "$3" || return 1
+  for level in $(inherit_levels "$2"); do
+    for kind in workspace-inherit skills; do
+      if [ -n "$1" ]; then
+        records=$(git ls-tree -r "$1:$level/$kind" 2>/dev/null || true)
+      elif [ -d "$level/$kind" ]; then
+        records=$(cd "$level/$kind" && find . -type f | awk '{ sub(/^\.\//, ""); print "100644 blob disk\t" $0 }' | sort)
+      else records=""; fi
+      while IFS= read -r record; do
+        [ -n "$record" ] || continue
+        meta=${record%%$'\t'*}; path=${record#*$'\t'}
+        dest=$(skill_path "$kind" "$path")
+        printf '%s %s\t%s\t%s\n' "${meta%% *}" "${meta##* }" "$dest" "$level/$kind/$path"
+      done <<<"$records"
+    done
+  done
+}
diff --git a/ci/sync.sh b/ci/sync.sh
index f8cb282..a64d644 100755
--- a/ci/sync.sh
+++ b/ci/sync.sh
@@ -24,6 +24,8 @@
 # branches without a folder, old names included, get a notice, never deleted. Merges run in a temporary worktree.
 set -euo pipefail
 here=$(cd "$(dirname "$0")" && pwd)
+# shellcheck source=ci/inherit.sh
+source "$here/inherit.sh"
 dir=both
 case "${1:-}" in refresh | propose) dir=$1 && shift ;; esac
 only=${1:-}
@@ -57,26 +59,30 @@ optouts() { # <rev:path of a workspace.yml>: its opt-out: entries, space-separat
     s && /^[[:space:]]+-[[:space:]]+/ { sub(/^[[:space:]]+-[[:space:]]+/, ""); sub(/[[:space:]]*#.*$/, ""); sub(/\/$/, ""); printf "%s ", $0 }'
 }
 
-inherited() { # <rev> <folder> <opt-outs>: `<mode> <blob><TAB><path>` for each file the workspace at
-  # <folder> inherits from <rev>'s workspace-inherit/ folders, top first, less <opt-outs> (a folder covers what's under it)
-  local level
-  for level in $(echo "${2%/workspaces/*}" | awk -F/ '{ p = $1; print p; for (i = 2; i <= NF; i++) { p = p "/" $i; print p } }'); do
-    git ls-tree -r "$1:$level/workspace-inherit" 2>/dev/null || true
-  done | awk -F'\t' -v out="$3" 'BEGIN { n = split(out, o, " ") }
+inherited() { # <revision> <folder> <opt-outs> <harness>: mode blob<TAB>native destination
+  inherited_files "$1" "$2" "$4" | awk -F'\t' -v out="$3" 'BEGIN { n = split(out, o, " ") }
     { for (i = 1; i <= n; i++) if ($2 == o[i] || index($2, o[i] "/") == 1) next
-      split($1, m, " "); print m[1] " " m[3] "\t" $2 }'
+      print $1 "\t" $2 }'
 }
 
 with_inherited() { # <tree-ish> <folder> <old main or ''> <rev:path of its workspace.yml> [<prefix>/]: without
   # <prefix>, its tree with what the workspace inherits from main written over it, and what it
   # inherited from <old> but no longer does removed; with <prefix> (a proposal), those paths under
   # <prefix> put back to main's. Opt-outs come from that workspace.yml.
-  local i=$wt.index out now p ms pre=${5:-}
+  local i=$wt.index out old_out="" now p ms adapter old_adapter old_manifest pre=${5:-}
   out=$(optouts "$4")
-  now=$(inherited "$main" "$2" "$out")
+  adapter=$(git show "$4" | awk '/^harness:/ { print $2; exit }')
+  old_adapter=$adapter
+  if [ -n "$3" ]; then
+    old_manifest=$3:$2/workspace.yml
+    git cat-file -e "$old_manifest" 2>/dev/null || old_manifest=$3:workspace.yml
+    old_adapter=$(git show "$old_manifest" | awk '/^harness:/ { print $2; exit }')
+    old_out=$(optouts "$old_manifest")
+  fi
+  now=$(inherited "$main" "$2" "$out" "$adapter")
   rm -f "$i"
   GIT_INDEX_FILE=$i git read-tree "$1"
-  { [ -z "$3" ] || inherited "$3" "$2" "$out"; [ -z "$pre" ] || printf '%s\n' "$now"; } | cut -f2 | sort -u |
+  { [ -z "$3" ] || inherited "$3" "$2" "$out $old_out" "$old_adapter"; [ -z "$pre" ] || printf '%s\n' "$now"; } | cut -f2 | sort -u |
     while IFS= read -r p; do
       [ -z "$p" ] && continue
       [ -n "$pre" ] || ! printf '%s\n' "$now" | cut -f2 | grep -qxF "$p" || continue # still inherited: written below
@@ -107,6 +113,15 @@ refresh() { # <name> <folder> <old name>: leave the worktree at ws/<name> with m
   if [ -z "$(tree "$from")" ]; then
     git -C "$wt" checkout --quiet --detach \
       "$(git commit-tree -p "$main" -m "delphi: create ws/$1 from $2" "$(with_inherited "$(with_delphi "$main:$2")" "$2" "" "$main:$2/workspace.yml")")"
+    if ! generate_harness "$mw" "$2" "$wt" 2>"$wt.err"; then
+      echo "ws/$1: $(cat "$wt.err"); not created" >&2
+      git -C "$wt" reset --quiet --hard HEAD
+      git -C "$wt" clean -qfd
+      failed=1 ok=0
+      return
+    fi
+    git -C "$wt" add -A
+    git -C "$wt" checkout --quiet --detach "$(git commit-tree -p "$main" -m "delphi: create ws/$1 from $2" "$(git -C "$wt" write-tree)")"
     git -C "$wt" push --quiet origin "HEAD:refs/heads/ws/$1"
     echo "ws/$1: created from $2"
     return
@@ -127,18 +142,16 @@ refresh() { # <name> <folder> <old name>: leave the worktree at ws/<name> with m
   if [ "$t" != "$(tree "$head")" ]; then
     git -C "$wt" checkout --quiet --detach "$(git commit-tree -p "$head" -m "delphi: sync inherited files from main" "$t")"
   fi
-  if [ "$(awk '/^harness:/ { print $2; exit }' "$wt/workspace.yml")" = claude-code ]; then
-    if ! (cd "$mw" && bash "$here/plugins.sh" yml "$2" "$wt/workspace.yml" >"$wt.yml" &&
-      bash "$here/plugins.sh" settings "$2" "$wt.yml" >"$wt.settings") 2>"$wt.err"; then
-      echo "ws/$1: $(cat "$wt.err"); not refreshed" >&2
-      failed=1 ok=0
-      return
-    fi
-    cp "$wt.yml" "$wt/workspace.yml" && mkdir -p "$wt/.claude" && cp "$wt.settings" "$wt/.claude/settings.json"
-    if [ -n "$(git -C "$wt" status --porcelain -- workspace.yml .claude/settings.json)" ]; then
-      git -C "$wt" add workspace.yml .claude/settings.json
-      git -C "$wt" commit --quiet -m "delphi: generate plugins: defaults and .claude/settings.json"
-    fi
+  if ! generate_harness "$mw" "$2" "$wt" 2>"$wt.err"; then
+    echo "ws/$1: $(cat "$wt.err"); not refreshed" >&2
+    git -C "$wt" reset --quiet --hard HEAD
+    git -C "$wt" clean -qfd
+    failed=1 ok=0
+    return
+  fi
+  if [ -n "$(git -C "$wt" status --porcelain)" ]; then
+    git -C "$wt" add -A # only the adapter has written since the inherited tree was committed
+    git -C "$wt" commit --quiet -m "delphi: generate plugins: defaults and .claude/settings.json"
   fi
   if [ "$from" = "$was" ]; then
     git -C "$wt" push --quiet origin "HEAD:refs/heads/ws/$1" "HEAD:refs/heads/ws/$3"
diff --git a/docs/design.md b/docs/design.md
index e321a2c..6be1ade 100644
--- a/docs/design.md
+++ b/docs/design.md
@@ -5,7 +5,7 @@ Goals: `docs/goals.md`. No CLI: plain git plus a few shell scripts run by GitHub
 ## 1. Model
 
 `main` holds every workspace as a folder, `software/**/workspaces/<leaf>/`, with its files at their
-normal harness paths (`CLAUDE.md`, `.claude/…`, `docs/…`). A workspace's `<name>` is the short name
+normal harness paths (declared in `ci/harnesses.sh`). A workspace's `<name>` is the short name
 of each folder from `software/` down to its project folder, then `<leaf>`, joined by dots
 (`s.app.argos.argos-dev` for `software/application-software/argos/workspaces/argos-dev`). A folder's
 short name is the one line in its `short-name` file, else its own name; `.delphi/names.sh [<rev>]`
@@ -16,11 +16,10 @@ folder name (`workspaces/<name>`, `.delphi/parked/<name>`), and no branch can be
 merges (`git merge -Xsubtree=<folder>`), so the histories stay joined and edits on either side meet
 in normal three-way merges. The one thing shared is main's root `.delphi/` (the scripts): sync
 puts it at the root of every `ws/*` branch, so it is on every branch, main included, and is edited
-only on main. Likewise each `workspace-inherit/` folder: sync writes its files onto the `ws/*`
+only on main. Likewise shared `skills/` and each `workspace-inherit/` folder: sync writes its files onto the `ws/*`
 root of every workspace below its folder and never proposes them back. Otherwise nothing is shared
 or generated between workspaces: a project's `workspace-defaults/` is copied once at creation, `workspaces:` only checks out other branches to read, and
-harness plugins (section 2) carry what workspaces opt into. The one generated workspace file is
-`.claude/settings.json`.
+harness plugins (section 2) carry what workspaces opt into. Generated workspace files belong to the adapter; Claude Code generates `.claude/settings.json`.
 
 ```
    ┌───────────────────────────────┐
@@ -52,19 +51,22 @@ harness plugins (section 2) carry what workspaces opt into. The one generated wo
 
 ```
 software/<org>/…/<project>/           README.md  AUTHORING.md  workspace-defaults/   (optional, main only)
+software/[<org>/…/]skills/<name>/     reusable Agent Skills, rendered to the native skill directory
 software/[<org>/…/]workspace-inherit/  files every workspace below gets on its ws/* root (optional, main only)
 software/<org>/…/plugins/<harness>/<set>/   a plugin set for the workspaces under that folder (optional, main only)
 software/<org>/…/short-name           the folder's short name in workspace names (optional; default: its name)
 software/<org>/…/plugins/scope        its scope in plugin names (optional; default: its short name)
 .claude-plugin/marketplace.json       every Claude Code plugin set under software/ (generated)
-software/<org>/…/workspaces/<leaf>/   workspace.yml  CLAUDE.md  .claude/…  docs/…
+software/<org>/…/workspaces/<leaf>/   workspace.yml  native instructions and skills  docs/…
                                       .github/workflows/delphi.yml  .gitattributes
 .delphi/                              {setup,new-worktree,switch,park,plugins,version}.sh  manifest.yml  versions
                                       migrations/  .gitattributes  .gitignore: on every ws/* root
 ci/sync.sh  ci/check.sh               CI scripts
+ci/harnesses.sh  ci/inherit.sh        adapter registry and native inheritance resolver
 ci/plugins.sh                         writes the marketplace and each workspace's .claude/settings.json
 tools/new-workspace.sh                new workspace as a PR
-templates/workspace/                  what new-workspace copies
+templates/workspace/                  common workspace template
+templates/harnesses/                  other adapters' native instruction templates
 .github/workflows/delphi.yml          CI
 tests/e2e.sh                          sandbox test of all of the above
 ```
@@ -89,25 +91,28 @@ workspace directly in its `workspaces/` starts with, copied once and then its ow
 is checked as a manifest (without `name:`) but is not a workspace.
 
 Any folder from `software/` down to a project folder may hold `workspace-inherit/`: files laid out as
-in a workspace root (`.claude/skills/<skill>/…`) that every workspace below it gets, at any depth.
+in a workspace root that every workspace below it gets, at any depth.
 They are never copied into the workspace folder on main; refresh writes them onto `ws/<name>` and
 propose drops them, so they stay one copy, edited on main, and a workspace's own edit to one is
 undone on refresh. A workspace that wants its own copy lists the path (or a folder above it) under
 `opt-out:` in its `workspace.yml`; refresh then leaves that path alone and propose carries it like
 any workspace file. `ci/check.sh` fails on a path inherited from two folders, a workspace file at an
 inherited path it hasn't opted out of, an `opt-out:` that matches nothing, and a workspace's own
-files in `workspace-inherit/` (`CLAUDE.md`, `workspace.yml`, `.delphi/`, `.claude/settings.json`,
-the workflow). The general skills (worktrees, switching, setup, the journal) live in
-`software/workspace-inherit/`, and the skills a folder's workspaces share live in its own (e.g.
-`application-software/` for PRs and tickets, `argos/` for running and verifying Argos). Shared
-skills go there rather than in a plugin: they're plain files on the workspace branch, with nothing
-to install.
+files in `workspace-inherit/` (the paths protected by `ci/check.sh`). Shared skills live in `skills/<name>/` beside `workspace-inherit/`, at the same org/project
+levels. The resolver in `ci/inherit.sh` maps their paths to the selected harness's native skill
+directory and uses those destinations for collision checks, opt-outs, refresh and propose. General
+skills live in `software/skills/`; other org/project folders add their own. Legacy inherited
+`.claude/skills/` sources are also mapped to the selected harness, so source moves don't duplicate
+skills. Other inherited files retain their paths, and files belonging to the wrong harness fail
+validation. Shared frontmatter uses the common Agent Skills fields; harness-specific tool
+permissions belong in the adapter or host configuration. Shared skills go here rather than in a
+plugin: they're plain files on the workspace branch, with nothing to install.
 
 A plugin set is for what `workspace-inherit/` can't do: context only some workspaces opt into, or
 harness features beyond files (hooks, MCP servers). It lives in `plugins/<harness>/<set>/` of a
 folder (`plugins/claude/` for Claude Code; a sister folder per other harness), one copy for the
 workspaces below. The one so far is `delphi`, `software/`'s `default` set (scope `delphi`): a mod
-(section 5) whose `/ws-delphi` pane switches workspaces. Every workspace gets the
+(section 5) whose `/ws-delphi` pane switches workspaces. Every Claude Code workspace gets the
 `default` set of each folder above it, which `ci/plugins.sh` lists first under `plugins:` in its
 `workspace.yml` (`- argos   # default, from software/application-software/argos/`; a removed line
 comes back); other sets are listed there by hand (`- <scope>.<set>`). `ci/plugins.sh` generates the
@@ -161,8 +166,8 @@ For every workspace on `origin/main` (or just `<name>`):
    `origin/main` into `ws/<name>` with `--no-ff -Xsubtree=<folder>`, then, if its `.delphi/` differs
    from main's, commit main's over it ("delphi: sync .delphi/ from main", built in a temporary
    index). Then write over it the files it inherits from main (every `workspace-inherit/` from
-   `software/` down to its project folder, less its `opt-out:` paths) and remove those it
-   inherited from the main it last merged (the merge base) but no longer does ("delphi: sync
+   `software/` down to its project folder, less its `opt-out:` paths) and remove the resolved destinations it
+   inherited from the main it last merged (the merge base) but no longer does, resolving the old sources with the old harness for transitions ("delphi: sync
    inherited files from main"; a new branch gets them in its one commit), and push if the tree changed. (`--no-ff` matters: once ws commits are in main, a
    fast-forward would put main's whole tree on the ws branch.) A `.delphi/` edit made on `ws/<name>`
    is undone here. Then, for a `claude-code` workspace, list main's default sets above it under the
@@ -244,23 +249,29 @@ The inherited `new-worktree` skill makes worktrees the default way to start a br
 
 `.delphi/paths.sh` is the layout in one place: sourced, it sets and exports `DELPHI_ROOT` (from the
 file's own place) and `DELPHI_REPOS`, `DELPHI_WORKTREES`, `DELPHI_REFERENCES`, `DELPHI_WORKSPACES`; run,
-it prints them as an export line. Each harness's generated settings put that line into every shell
-at session start: for Claude Code, a SessionStart hook in `.claude/settings.json` (from
+it prints them as an export line. The adapter supplies layout initialization: for Claude Code, a SessionStart hook in `.claude/settings.json` (from
 `ci/plugins.sh`) appends it to `$CLAUDE_ENV_FILE`, which reaches the model's commands, subagents' and
 skill scripts'. In a terminal, `. .delphi/paths.sh` from the root. `new-worktree.sh` sources it from
 its own folder; every skill script, plugin or workspace, sources `$DELPHI_ROOT/.delphi/paths.sh` and
 takes only names (repo, branch), never a searched-for path, so the model types only the names.
-Skills themselves stay harness-neutral (SKILL.md is the shared Agent Skills format): they call
-scripts by their path in the skill's folder (`bash scripts/<script>.sh …`) and name no harness
-variable, so another harness needs only its own settings to set `DELPHI_ROOT`.
+Skills themselves stay harness-neutral. Codex CLI starts with `.delphi/codex.sh`, which sources
+the layout and launches `codex -C` at this root. Hosts that launch Codex independently follow
+`AGENTS.md`: determine the absolute root once, then run skill helpers through that root's
+`.delphi/exec.sh`. It sources the layout on every invocation, preserves the caller's directory,
+and exports it to children; pass this explicit root/wrapper to independently started sub-agents.
+No session hook, shared shell state, or particular managed environment is assumed. Setup and
+worktree scripts already source the layout from their own known location. Host credentials and
+dependencies remain host concerns; existing authenticated GitHub tools can be used, and an
+explicit `DELPHI_GITHUB_REST_PROXY` capability enables the existing REST-proxy fallback. No
+credential or permission settings are generated for Codex.
 
 `.delphi/switch.sh <workspace>|main` moves the clone to `ws/<workspace>` (or `main`): it refuses while
 tracked files have changes, fetches the branch, switches (the hook parks and restores), fast-forwards
 to origin, and runs the new workspace's `setup.sh`. `switch.sh --list` prints `main` and each workspace with a branch, as `<name> <project folder>`, `*` before this clone's. The `delphi` mod
 (`software/plugins/claude/default/`) puts that in a pane to keep open: `/ws-delphi` shows them as cards grouped by project, this clone's
 marked current, with a warning when tracked files have changed; pressing a card selects it, and
-**Switch workspace** runs `switch.sh` (`/ws-delphi <name>` skips the pane). No restart: Claude Code
-reloads skills from `.claude/skills/` itself, and the mod sends the root's new `CLAUDE.md` with the
+**Switch workspace** runs `switch.sh` (`/ws-delphi <name>` skips the pane). Codex sessions must
+restart after a switch. Claude Code with this mod reloads skills from `.claude/skills/` itself, and the mod sends the root's new `CLAUDE.md` with the
 next prompt (once, after any change: a switch, a pull, `switch.sh` by hand), saying it replaces the
 one the session started with (a user mod can't rewrite the session's own `CLAUDE.md` block). All
 the git work stays in `switch.sh`, which `tests/e2e.sh` covers; the mod's own tests
@@ -301,14 +312,33 @@ it's switched back to (`switch.sh` runs setup). Migrations must be safe to re-ru
 fresh clone, and delete only what nothing is lost from, stopping with what to do otherwise. `setup.sh`
 also warns when `.delphi/` isn't exactly the version it says (edited in the clone).
 
-## 6. New workspaces (`tools/new-workspace.sh [--by <who>] <org-path> <leaf>`)
-
-Validates the leaf and the dotted name it gets (format, unique, no leftover `ws/<name>` or `ws/<old>`), copies `templates/workspace/`
-and then `software/<org-path>/workspace-defaults/` if present (its `CLAUDE.md` appended to the template's)
-into `software/<org-path>/workspaces/<leaf>/` (filling `{{name}}`/`{{folder}}` in `CLAUDE.md`) in a
-temporary worktree, sets `name: <name>`, generates its `.claude/settings.json`, runs `ci/check.sh`, pushes branch
-`new-workspace/<org-path>/<leaf>`, and opens a PR in the PR template's sections, labelled `by: <who>` (`ai`,
-the default, `ai-assisted` or `human`). Sync creates `ws/<name>` once it merges.
+## 6. New workspaces
+
+`tools/new-workspace.sh [--by <who>] [--harness <adapter>] <org-path> <leaf>` validates the leaf and
+dotted name, then copies `templates/workspace/` and project `workspace-defaults/` into a temporary
+worktree. The explicit harness overrides the project's manifest default (else Claude Code). Its
+native instruction template is selected by `ci/harnesses.sh`, with only the matching instruction
+default appended and placeholders filled. Repositories and ordinary defaults are preserved;
+foreign native instruction/skill files and unsupported plugin defaults are not copied across
+harnesses. Shared skills arrive on refresh, never in the workspace's main folder.
+
+The tool sets `name:` and `harness:`, generates adapter-owned files, runs `ci/check.sh`, pushes
+`new-workspace/<org-path>/<leaf>`, and opens the PR using the PR template and `by: <who>` label.
+Sync creates `ws/<name>` once it merges.
+
+### Adding a harness
+
+`ci/harnesses.sh` is the explicit registry of native instruction/template paths, skill destinations
+and plugin capabilities, plus generated-file behavior. Add the adapter there and a native template
+under `templates/`, then teach validation about foreign native paths and any new generated files.
+Adapters must reject capabilities they cannot supply; Codex currently rejects Delphi plugin sets.
+Keep common workflows in neutral skills and place harness-specific integrations behind the adapter.
+Do not infer hook, plugin, authentication or hot-reload support from another harness.
+
+Test native authoring, refresh/propose ownership, opt-outs, old/new destination cleanup and layout
+propagation in `tests/e2e.sh`, including transitions from an existing adapter. Runtime changes use
+the normal manifest version release. Environment provisioning is independent: adding a harness
+must not require a particular cloud host or account.
 
 ## 7. CI (`.github/workflows/delphi.yml`)
 
diff --git a/software/application-software/argos/AUTHORING.md b/software/application-software/argos/AUTHORING.md
index b6343df..05d0a2e 100644
--- a/software/application-software/argos/AUTHORING.md
+++ b/software/application-software/argos/AUTHORING.md
@@ -7,43 +7,48 @@ full model; this is the Argos-specific short version.
 
 1. Check out `ws/s.app.argos.<leaf>` (from another workspace: `bash .delphi/switch.sh s.app.argos.<leaf>`, the
    `switch-workspace` skill), then `git switch -c <branch>`.
-2. Edit at normal harness paths: `CLAUDE.md`, `.claude/skills/<skill>/SKILL.md`, `docs/`.
+2. Edit at normal harness paths: the native instruction file and skill paths for its `harness:` (`AGENTS.md` and `.agents/skills/` for Codex), or `docs/`.
 3. Push the branch and open a PR into `ws/<name>`. After it merges, CI proposes it to `main`.
 
 Don't edit `.delphi/`, `.github/workflows/delphi.yml`, or `.claude/settings.json`: Delphi manages
 them (`.delphi/` comes from main's root and sync resets it; `settings.json` is generated from
 `workspace.yml`'s `plugins:`, where CI lists any folder's `default` plugin set; add other sets below them), nor the skills
-inherited from `workspace-inherit/` (sync overwrites them: change them on `main`, or list one under `opt-out:` to keep your own).
+inherited from `skills/` or `workspace-inherit/` (sync overwrites them: change them on `main`, or list one under `opt-out:` to keep your own).
 Personal settings go in `.claude/settings.local.json`.
 
 ## Create a new Argos workspace
 
-From a Delphi checkout: `tools/new-workspace.sh application-software/argos <name>`. It copies
-Delphi's template, then `workspace-defaults/` (its `CLAUDE.md` is appended after the Delphi section), and opens
+From a Delphi checkout: `tools/new-workspace.sh [--harness codex] application-software/argos <name>`. It copies
+Delphi's template, then `workspace-defaults/` (its matching native instructions are appended after the Delphi section), and opens
 a PR to `main`. Trim what the new workspace doesn't need before merging.
 
 ## Change the defaults or this folder
 
 Edit on a branch of `main` and open a PR to `main` (from a workspace: `bash .delphi/switch.sh main`;
 don't edit `workspaces/main/` from a workspace). `workspace-defaults/`
-only affects workspaces created afterwards; to change existing ones, PR each workspace too. `workspace-inherit/` reaches
+only affects workspaces created afterwards; to change existing ones, PR each workspace too. `skills/` and `workspace-inherit/` reach
 every Argos workspace on the next sync.
 
 ## Writing good workspace context
 
-- Keep the Delphi section of `CLAUDE.md` as generated; put project rules below it.
+- Keep the Delphi section of the native instruction file as generated; put project rules below it.
 - One skill per repeatable workflow, with a `description` that says when to use it.
 - Agent context (glossary, conventions, skills) lives in the workspace; the glossary goes in `docs/`.
-  Skills every Argos workspace needs go in `workspace-inherit/` here (`implement`, `run-local`,
-  `verify-graph`, `verify-telemetry`, `pr-conventions`, `ticket-conventions`), and those shared with
-  other application-software projects in `software/application-software/workspace-inherit/`
-  (`commit`, `open-pr`, `update-pr`, `address-pr-comments`, `create-ticket`); Delphi's own
-  (`new-worktree`, `journal`, `setup-workspace`, `switch-workspace`) come from
-  `software/workspace-inherit/`. Sync puts them all on every Argos workspace's branch; change them by
-  PR to `main`. Context only some workspaces need goes in the workspace, or in a plugin set
-  (`plugins/claude/<set>/`) they list under `plugins:` (run `ci/plugins.sh`). Workspaces keep only
-  skills tied to that workspace (the `workflow`, `review` and `to-tickets` trial in the experimental
-  ones).
+  Shared skills go in this project's `skills/<name>/`, or the relevant org folder's `skills/`.
+  Sync renders them into each workspace's native directory; change them through PRs to `main`.
+  Ordinary inherited docs go in `workspace-inherit/`. Context only some workspaces need goes in
+  the workspace, or in a supported plugin set selected under `plugins:`. Codex does not load the
+  Claude plugin sets. Workspace-owned native skills remain editable and proposable; use a native
+  destination under `opt-out:` when taking ownership of an inherited skill.
   ADRs about a code repo live in that repo, so `docs/` holds only ADRs about the workspace itself.
   Avoid file paths and code in specs and tickets.
 - Make new branches as worktrees (`new-worktree` skill) unless told otherwise.
+
+## Codex
+
+The `default-codex` leaf is `ws/s.app.argos.default-codex`. Use `bash .delphi/codex.sh` to start
+Codex CLI after setup. In another Codex host, follow `AGENTS.md` and use `.delphi/exec.sh` for skill
+helpers in fresh shells and sub-agents. This workspace carries Argos workflows and dependency
+references without prescribing a cloud environment, credentials or Codex permission settings.
+Check required local tooling before running a workflow; use available browser/GitHub integrations
+and report verification that could not run. Start a fresh Codex session after changing workspaces.
diff --git a/software/application-software/argos/README.md b/software/application-software/argos/README.md
index d5ae31c..22d9b28 100644
--- a/software/application-software/argos/README.md
+++ b/software/application-software/argos/README.md
@@ -11,10 +11,12 @@ backend (`scylla-server/`), with schema tooling in `charybdis/` and MQTT broker
 |---|---|
 | `workspaces/<leaf>/` | One workspace per purpose; branch `ws/s.app.argos.<leaf>` is its root |
 | `workspaces/argos-dev/` | Day-to-day Argos development: tickets, specs, PRs |
+| `workspaces/default-codex/` | Argos development with the Codex harness |
 | `workspace-defaults/` | What a new Argos workspace starts with (see `AUTHORING.md`) |
-| `workspace-inherit/` | Skills every Argos workspace gets on each sync: ticket and PR conventions, `implement`, `run-local`, `verify-graph`, `verify-telemetry` |
+| `skills/` | Shared workflows rendered into each workspace's native skill directory on sync |
+| `workspace-inherit/` | Ordinary inherited files at their workspace paths, when needed |
 | `plugins/claude/<set>/` | Claude Code plugin sets a workspace lists under `plugins:` (none yet) |
 | `AUTHORING.md` | How to create and change Argos workspaces |
 
-Shared facts that every Argos workspace needs belong here, in `workspace-defaults/`, or in `workspace-inherit/`. Facts that one
-workspace needs belong in that workspace.
+Shared workflows belong in `skills/`. Shared facts belong here or in `workspace-inherit/`;
+`workspace-defaults/` seeds new workspaces. Facts that one workspace needs belong in that workspace.
diff --git a/software/application-software/argos/workspace-inherit/.claude/skills/implement/SKILL.md b/software/application-software/argos/skills/implement/SKILL.md
similarity index 100%
rename from software/application-software/argos/workspace-inherit/.claude/skills/implement/SKILL.md
rename to software/application-software/argos/skills/implement/SKILL.md
diff --git a/software/application-software/argos/workspace-inherit/.claude/skills/pr-conventions/SKILL.md b/software/application-software/argos/skills/pr-conventions/SKILL.md
similarity index 96%
rename from software/application-software/argos/workspace-inherit/.claude/skills/pr-conventions/SKILL.md
rename to software/application-software/argos/skills/pr-conventions/SKILL.md
index 90cc657..7e50492 100644
--- a/software/application-software/argos/workspace-inherit/.claude/skills/pr-conventions/SKILL.md
+++ b/software/application-software/argos/skills/pr-conventions/SKILL.md
@@ -1,14 +1,13 @@
 ---
 name: pr-conventions
 description: Argos specifics for pull requests (base branch, commit format, checks, labels, screenshots, UI QA). Load before opening, updating, or reviewing an Argos PR, alongside open-pr, update-pr, and review.
-user-invocable: false
 ---
 
 # Argos PR conventions
 
 The shared rules are in the `open-pr` skill; this adds only what is Argos's.
 
-- Base branch: `develop`. Commit format: `^#[0-9]+ - ` (the format in CLAUDE.md).
+- Base branch: `develop`. Commit format: `^#[0-9]+ - ` (the format in the workspace instructions).
 - Checks: `bash scripts/lint.sh <branch>` (frontend prettier and ng lint, only if angular-client/ changed).
 - Labels: one written-by (`by: human` if the user wrote it, `by: ai-assisted` if they gave the substance, `by: ai` if you wrote it) and at least one area label (`frontend`, `backend`, `devops`); no category label.
 - Screenshots: `pictures/<branch>/` at the worktree root (git-ignored).
diff --git a/software/application-software/argos/workspace-inherit/.claude/skills/pr-conventions/scripts/lint.sh b/software/application-software/argos/skills/pr-conventions/scripts/lint.sh
similarity index 100%
rename from software/application-software/argos/workspace-inherit/.claude/skills/pr-conventions/scripts/lint.sh
rename to software/application-software/argos/skills/pr-conventions/scripts/lint.sh
diff --git a/software/application-software/argos/workspace-inherit/.claude/skills/run-local/SKILL.md b/software/application-software/argos/skills/run-local/SKILL.md
similarity index 100%
rename from software/application-software/argos/workspace-inherit/.claude/skills/run-local/SKILL.md
rename to software/application-software/argos/skills/run-local/SKILL.md
diff --git a/software/application-software/argos/workspace-inherit/.claude/skills/run-local/scripts/run-local.sh b/software/application-software/argos/skills/run-local/scripts/run-local.sh
similarity index 100%
rename from software/application-software/argos/workspace-inherit/.claude/skills/run-local/scripts/run-local.sh
rename to software/application-software/argos/skills/run-local/scripts/run-local.sh
diff --git a/software/application-software/argos/workspace-inherit/.claude/skills/run-local/scripts/serve.sh b/software/application-software/argos/skills/run-local/scripts/serve.sh
similarity index 100%
rename from software/application-software/argos/workspace-inherit/.claude/skills/run-local/scripts/serve.sh
rename to software/application-software/argos/skills/run-local/scripts/serve.sh
diff --git a/software/application-software/argos/workspace-inherit/.claude/skills/ticket-conventions/SKILL.md b/software/application-software/argos/skills/ticket-conventions/SKILL.md
similarity index 97%
rename from software/application-software/argos/workspace-inherit/.claude/skills/ticket-conventions/SKILL.md
rename to software/application-software/argos/skills/ticket-conventions/SKILL.md
index b516657..8d9ec37 100644
--- a/software/application-software/argos/workspace-inherit/.claude/skills/ticket-conventions/SKILL.md
+++ b/software/application-software/argos/skills/ticket-conventions/SKILL.md
@@ -1,7 +1,6 @@
 ---
 name: ticket-conventions
 description: Argos specifics for tickets (repo, area labels, vocabulary, diagrams). Load before drafting or filing an Argos issue, alongside create-ticket.
-user-invocable: false
 ---
 
 # Argos ticket conventions
diff --git a/software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/SKILL.md b/software/application-software/argos/skills/verify-graph/SKILL.md
similarity index 99%
rename from software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/SKILL.md
rename to software/application-software/argos/skills/verify-graph/SKILL.md
index ae99371..c9dfe7d 100644
--- a/software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/SKILL.md
+++ b/software/application-software/argos/skills/verify-graph/SKILL.md
@@ -1,7 +1,6 @@
 ---
 name: verify-graph
 description: Playwright CLI verification of the graph page — modes, controls, topic selection, and data rendering. Use after any change to graph-page components, graph rendering, data flow, or mode switching logic.
-user-invocable: true
 ---
 
 Get the branch's client running with `run-local <branch>`; its URL is `BASE_URL`. The scripts need `playwright-cli` (`npm i -g @playwright/cli`, then `playwright-cli install-browser chromium`; cloud containers use their preinstalled Chromium). Then run the base checks:
diff --git a/software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/check.js b/software/application-software/argos/skills/verify-graph/scripts/check.js
similarity index 100%
rename from software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/check.js
rename to software/application-software/argos/skills/verify-graph/scripts/check.js
diff --git a/software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/check.sh b/software/application-software/argos/skills/verify-graph/scripts/check.sh
similarity index 100%
rename from software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/check.sh
rename to software/application-software/argos/skills/verify-graph/scripts/check.sh
diff --git a/software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/open.sh b/software/application-software/argos/skills/verify-graph/scripts/open.sh
similarity index 100%
rename from software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/open.sh
rename to software/application-software/argos/skills/verify-graph/scripts/open.sh
diff --git a/software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/perf.js b/software/application-software/argos/skills/verify-graph/scripts/perf.js
similarity index 100%
rename from software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/perf.js
rename to software/application-software/argos/skills/verify-graph/scripts/perf.js
diff --git a/software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/perf.sh b/software/application-software/argos/skills/verify-graph/scripts/perf.sh
similarity index 100%
rename from software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/perf.sh
rename to software/application-software/argos/skills/verify-graph/scripts/perf.sh
diff --git a/software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/seed.sh b/software/application-software/argos/skills/verify-graph/scripts/seed.sh
similarity index 100%
rename from software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/seed.sh
rename to software/application-software/argos/skills/verify-graph/scripts/seed.sh
diff --git a/software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/select-run.sh b/software/application-software/argos/skills/verify-graph/scripts/select-run.sh
similarity index 100%
rename from software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/select-run.sh
rename to software/application-software/argos/skills/verify-graph/scripts/select-run.sh
diff --git a/software/application-software/argos/workspace-inherit/.claude/skills/verify-telemetry/SKILL.md b/software/application-software/argos/skills/verify-telemetry/SKILL.md
similarity index 100%
rename from software/application-software/argos/workspace-inherit/.claude/skills/verify-telemetry/SKILL.md
rename to software/application-software/argos/skills/verify-telemetry/SKILL.md
diff --git a/software/application-software/argos/workspace-inherit/.claude/skills/verify-telemetry/scripts/check-topic.sh b/software/application-software/argos/skills/verify-telemetry/scripts/check-topic.sh
similarity index 100%
rename from software/application-software/argos/workspace-inherit/.claude/skills/verify-telemetry/scripts/check-topic.sh
rename to software/application-software/argos/skills/verify-telemetry/scripts/check-topic.sh
diff --git a/software/application-software/argos/workspace-defaults/AGENTS.md b/software/application-software/argos/workspace-defaults/AGENTS.md
new file mode 100644
index 0000000..cd43e4f
--- /dev/null
+++ b/software/application-software/argos/workspace-defaults/AGENTS.md
@@ -0,0 +1,59 @@
+# NER Software conventions
+
+## Branch & Commit Conventions
+
+- Branch from `develop` (not `main`) unless told otherwise. Branch name format: `{issue-number}-{kebab-case-title}` (e.g. `533-csv-upload-download-rules`), or `throwaway-{kebab-case-title}` to try something without a ticket.
+- Commit message format: `#{ticket-number} - {concise description}` (e.g. `#533 - add CSV upload endpoint`). Throwaway branches have no ticket, so any short message works.
+
+## Safety Rules
+
+- Never modify `.env` or secret files without explicit confirmation.
+- Never delete files without explicit confirmation.
+- Explain reasoning before making architectural changes.
+
+# Argos
+
+Argos is a real-time telemetry platform for Northeastern Electric Racing (NER). Angular 19 frontend (`angular-client/`) and Rust backend (`scylla-server/`), with schema tooling in `charybdis/` and MQTT broker config in `siren-base/`.
+
+The Argos repo's `develop` is checked out at `worktrees/argos/develop/`. Repo paths below (`angular-client/`, `scylla-server/`, `compose/`) are inside an Argos worktree. The ticket number is the branch's leading number (`533-csv-upload` → `#533`).
+
+## Worktrees
+
+- `worktrees/argos/develop/` mirrors `develop`: run anything there (`npm ci`, tests, the backend, `run-local`), but never edit code, branch, or commit there. The only git operations there are fetch and fast-forward.
+- To change code, make a worktree on its own branch with the `new-worktree` skill, based on `origin/develop`. Use the ticket's branch, or a `throwaway-{kebab-case-title}` branch to experiment without one. If a throwaway turns into real work, file a ticket (`create-ticket`), make the ticket's worktree from `origin/develop`, run `git -C worktrees/argos/<ticket-branch> merge --squash throwaway-{kebab-case-title}`, then `commit`, so the work lands as one commit in the ticket format.
+- A new worktree has no `node_modules`; `run-local` and `implement` install them.
+
+## Local Development
+
+- Run the app with the `run-local` skill, passing the branches you're looking at (a PR's or ticket's, with a worktree from `new-worktree`; not `develop` unless asked). It starts the backend if it's down, on the right compose profile (`client-dev` runs everything in Docker; `scylla-dev` plus `cargo run` when a target changes `scylla-server/`), and serves each worktree's client on its own port.
+- The shell workflow (`argos.sh`, the `run-local`/`verify-*` skills, and helpers like `lsof`/`pkill`) assumes a Unix shell. On Windows, run everything from WSL or Git Bash, not `cmd`/PowerShell.
+
+## Testing
+
+The checks (frontend tests, lint and format; backend build and tests) and how to run them from the root are in `implement`; `open-pr` reruns lint and format before a PR.
+
+## Workflow
+
+Per ticket: `implement` (worktree, test-first, `commit`) → `open-pr`.
+
+## PR Convention
+
+- The `commit` skill applies the commit message format.
+- Open PRs against `develop` as drafts. PR titles carry no ticket number; the body ends with `Closes #{ticket}`. The `open-pr` skill runs the pre-PR checks (lint, conflict check), pushes, and opens the draft; `update-pr` refreshes the description.
+- Keep PR descriptions tight: at most three backtick usages in the body, and never commit screenshots (`open-pr` asks before attaching them to the PR).
+
+## Screenshots
+
+Save all Playwright screenshots under `pictures/<branch-name>/` at the repo root, using kebab-case descriptive filenames. The `pictures/` folder is git-ignored, so screenshots are never committed; `open-pr` offers to attach them to the PR with `gh --attach` (drag-drop them on gh older than v2.99.0).
+
+## Code Conventions
+
+Code and ADR conventions worth stating are in the Conventions section of `docs/CONTEXT.md`; everything else follows current Angular and Rust defaults.
+
+## Issue tracker
+
+Issues live in GitHub Issues on `Northeastern-Electric-Racing/Argos` via the `gh` CLI. File tickets with the `create-ticket` skill (shared by every application-software workspace); it holds the ticket conventions and follows the repo's issue templates (idea, spike, epic, dev work), with Argos's specifics in `ticket-conventions`. When an out-of-scope but worthwhile idea comes up mid-work, offer to file it as an idea with `create-ticket`; park rough notes with `journal`.
+
+## Domain docs
+
+The glossary is a workspace doc: `docs/CONTEXT.md` at the workspace root. Edit it there and it's proposed back to Delphi. ADRs live in the Argos repo at `docs/adr/` and land through Argos PRs like any other change; filenames follow the Conventions section of `docs/CONTEXT.md`. Read `docs/CONTEXT.md` and the relevant ADRs before exploring, use the glossary's terms, and flag any conflict with an ADR.
diff --git a/software/application-software/argos/workspaces/default-codex/.gitattributes b/software/application-software/argos/workspaces/default-codex/.gitattributes
new file mode 100644
index 0000000..4965641
--- /dev/null
+++ b/software/application-software/argos/workspaces/default-codex/.gitattributes
@@ -0,0 +1,2 @@
+# LF everywhere, so .delphi/setup.sh runs in Git Bash even with core.autocrlf=true
+* text=auto eol=lf
diff --git a/software/application-software/argos/workspaces/default-codex/.github/workflows/delphi.yml b/software/application-software/argos/workspaces/default-codex/.github/workflows/delphi.yml
new file mode 100644
index 0000000..b8ffdd9
--- /dev/null
+++ b/software/application-software/argos/workspaces/default-codex/.github/workflows/delphi.yml
@@ -0,0 +1,41 @@
+# Delphi CI (docs/design.md). This file is at main's root and, identically, at the root of every
+# ws/<name> (GitHub runs a push's workflow from the pushed commit, so ws pushes need their own copy).
+# PRs to main: ci/check.sh, against main (so released versions stay as they are). Pushes to main or
+# ws/**: ci/sync.sh (refresh + propose), always run from main. Pushes and PRs made with GITHUB_TOKEN
+# trigger no workflows: no loops, and CI-opened PRs don't run `check` (sync.sh runs it itself).
+name: delphi
+on:
+  pull_request:
+    branches: [main]
+  push:
+    branches: [main, 'ws/**']
+permissions:
+  contents: read
+jobs:
+  check:
+    if: github.event_name == 'pull_request'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          persist-credentials: false
+      - run: ci/check.sh . origin/main
+  sync:
+    if: github.event_name == 'push'
+    runs-on: ubuntu-latest
+    concurrency: delphi-sync
+    permissions:
+      contents: write
+      pull-requests: write
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: main
+          fetch-depth: 0
+      - env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          git config --global user.name 'github-actions[bot]'
+          git config --global user.email '41898282+github-actions[bot]@users.noreply.github.com'
+          ci/sync.sh
diff --git a/software/application-software/argos/workspaces/default-codex/AGENTS.md b/software/application-software/argos/workspaces/default-codex/AGENTS.md
new file mode 100644
index 0000000..c9e4307
--- /dev/null
+++ b/software/application-software/argos/workspaces/default-codex/AGENTS.md
@@ -0,0 +1,72 @@
+# Delphi workspace
+
+You're in Delphi workspace `s.app.argos.default-codex` (branch `ws/s.app.argos.default-codex`); code repos are cloned at `repos/<repo>/`, and separately checked out as worktrees under `worktrees/<repo>/` (`.delphi/setup.sh` makes the default branch's). Work in worktrees: make each new branch one under `worktrees/<repo>/<branch>` (`new-worktree` skill) unless the user says not to. Read-only dependency sources from `references-git:` are checked out under `references/<name>/` at the version the workspace pins: read them to learn how a dependency behaves (prefer them over web docs), and never edit, branch, or push them. Delphi workspaces (or `main`) under `workspaces:` in `workspace.yml` (`- <name>`, a workspace's dotted name like `s.app.argos.argos-dev`, or `- main`) are clones at `workspaces/<name>/`, each on its branch, for reading their context (don't edit them from here; setup switches each back to its branch and pulls it); change what's checked out with the `setup-workspace` skill. To work in another workspace, switch this clone to it (`switch-workspace` skill). Park rough notes with the `journal` skill. Work here unless the task clearly belongs to another project.
+
+
+## Codex startup
+
+For Codex CLI, run `bash .delphi/codex.sh` from this clone. In other Codex hosts, first read `workspace.yml` and run `bash .delphi/paths.sh` from this workspace root to learn its absolute path. Run `bash .delphi/setup.sh` when the repositories have not been set up.
+
+Shell exports may not persist between commands or reach independently launched sub-agents. Run skill helpers through `bash <absolute-workspace-root>/.delphi/exec.sh bash <absolute-skill-folder>/scripts/<script>.sh <names>...`; this sets the layout on every invocation and preserves the caller's working directory. Pass the workspace's absolute path and this rule to sub-agents. Native skills live under `.agents/skills/`. After a workspace switch, start a fresh Codex session before further work.
+
+Use the tools available in the current harness for browser verification and GitHub access. If a skill requires unavailable tooling or authentication, report the missing prerequisite and the verification that remains. Delphi does not configure Codex permissions, credentials, MCP servers or host dependencies.
+
+# NER Software conventions
+
+## Branch & Commit Conventions
+
+- Branch from `develop` (not `main`) unless told otherwise. Branch name format: `{issue-number}-{kebab-case-title}` (e.g. `533-csv-upload-download-rules`), or `throwaway-{kebab-case-title}` to try something without a ticket.
+- Commit message format: `#{ticket-number} - {concise description}` (e.g. `#533 - add CSV upload endpoint`). Throwaway branches have no ticket, so any short message works.
+
+## Safety Rules
+
+- Never modify `.env` or secret files without explicit confirmation.
+- Never delete files without explicit confirmation.
+- Explain reasoning before making architectural changes.
+
+# Argos
+
+Argos is a real-time telemetry platform for Northeastern Electric Racing (NER). Angular 19 frontend (`angular-client/`) and Rust backend (`scylla-server/`), with schema tooling in `charybdis/` and MQTT broker config in `siren-base/`.
+
+The Argos repo's `develop` is checked out at `worktrees/argos/develop/`. Repo paths below (`angular-client/`, `scylla-server/`, `compose/`) are inside an Argos worktree. The ticket number is the branch's leading number (`533-csv-upload` → `#533`).
+
+## Worktrees
+
+- `worktrees/argos/develop/` mirrors `develop`: run anything there (`npm ci`, tests, the backend, `run-local`), but never edit code, branch, or commit there. The only git operations there are fetch and fast-forward.
+- To change code, make a worktree on its own branch with the `new-worktree` skill, based on `origin/develop`. Use the ticket's branch, or a `throwaway-{kebab-case-title}` branch to experiment without one. If a throwaway turns into real work, file a ticket (`create-ticket`), make the ticket's worktree from `origin/develop`, run `git -C worktrees/argos/<ticket-branch> merge --squash throwaway-{kebab-case-title}`, then `commit`, so the work lands as one commit in the ticket format.
+- A new worktree has no `node_modules`; `run-local` and `implement` install them.
+
+## Local Development
+
+- Run the app with the `run-local` skill, passing the branches you're looking at (a PR's or ticket's, with a worktree from `new-worktree`; not `develop` unless asked). It starts the backend if it's down, on the right compose profile (`client-dev` runs everything in Docker; `scylla-dev` plus `cargo run` when a target changes `scylla-server/`), and serves each worktree's client on its own port.
+- The shell workflow (`argos.sh`, the `run-local`/`verify-*` skills, and helpers like `lsof`/`pkill`) assumes a Unix shell. On Windows, run everything from WSL or Git Bash, not `cmd`/PowerShell.
+
+## Testing
+
+The checks (frontend tests, lint and format; backend build and tests) and how to run them from the root are in `implement`; `open-pr` reruns lint and format before a PR.
+
+## Workflow
+
+Per ticket: `implement` (worktree, test-first, `commit`) → `open-pr`.
+
+## PR Convention
+
+- The `commit` skill applies the commit message format.
+- Open PRs against `develop` as drafts. PR titles carry no ticket number; the body ends with `Closes #{ticket}`. The `open-pr` skill runs the pre-PR checks (lint, conflict check), pushes, and opens the draft; `update-pr` refreshes the description.
+- Keep PR descriptions tight: at most three backtick usages in the body, and never commit screenshots (`open-pr` asks before attaching them to the PR).
+
+## Screenshots
+
+Save all Playwright screenshots under `pictures/<branch-name>/` at the repo root, using kebab-case descriptive filenames. The `pictures/` folder is git-ignored, so screenshots are never committed; `open-pr` offers to attach them to the PR with `gh --attach` (drag-drop them on gh older than v2.99.0).
+
+## Code Conventions
+
+Code and ADR conventions worth stating are in the Conventions section of `docs/CONTEXT.md`; everything else follows current Angular and Rust defaults.
+
+## Issue tracker
+
+Issues live in GitHub Issues on `Northeastern-Electric-Racing/Argos` via the `gh` CLI. File tickets with the `create-ticket` skill (shared by every application-software workspace); it holds the ticket conventions and follows the repo's issue templates (idea, spike, epic, dev work), with Argos's specifics in `ticket-conventions`. When an out-of-scope but worthwhile idea comes up mid-work, offer to file it as an idea with `create-ticket`; park rough notes with `journal`.
+
+## Domain docs
+
+The glossary is a workspace doc: `docs/CONTEXT.md` at the workspace root. Edit it there and it's proposed back to Delphi. ADRs live in the Argos repo at `docs/adr/` and land through Argos PRs like any other change; filenames follow the Conventions section of `docs/CONTEXT.md`. Read `docs/CONTEXT.md` and the relevant ADRs before exploring, use the glossary's terms, and flag any conflict with an ADR.
diff --git a/software/application-software/argos/workspaces/default-codex/docs/CONTEXT.md b/software/application-software/argos/workspaces/default-codex/docs/CONTEXT.md
new file mode 100644
index 0000000..ff98e26
--- /dev/null
+++ b/software/application-software/argos/workspaces/default-codex/docs/CONTEXT.md
@@ -0,0 +1,102 @@
+# Argos
+
+Argos is the real-time telemetry platform for Northeastern Electric Racing. Data flows from the car's CAN nodes, through the Siren MQTT broker, into scylla-server (which persists it and rebroadcasts it live), and out to the angular-client dashboard. This file defines the domain vocabulary shared across those components, plus the few code conventions worth stating.
+
+## Language
+
+### Telemetry data model
+
+**DataType**:
+A named measurement class paired with a unit — e.g. `BMS/Status/Temp_Average` measured in `C`. Identified by its `name`, which is also the MQTT topic string. Every datapoint belongs to exactly one DataType.
+_Avoid_: Channel, signal, metric, field.
+
+**Run**:
+A single telemetry session, identified by `runId`, capturing the driver, location, notes, and start time. All data ingested while a run is active is stamped with its `runId`. One Run holds many datapoints.
+_Avoid_: Session, trip, lap, test.
+
+**Data** (a **datapoint**):
+One timestamped measurement for a given DataType within a given Run. Its `values` is a vector of floats (most DataTypes carry one, some carry several), keyed by `(time, dataTypeName, runId)`.
+_Avoid_: Sample, reading, record, row.
+
+**Topic**:
+The slash-delimited MQTT path a telemetry stream is published under — e.g. `VCU/CarState/speed`. A topic maps one-to-one onto a DataType `name`. A handful of synthetic topics (`Argos/Message_Rate`, `Argos/Viewers`, `Latency`) are generated server-side and broadcast live but never persisted.
+_Avoid_: Path, channel, stream.
+
+**Node**:
+An on-vehicle CAN device that reports faults — one of `Bms`, `Dti`, `Mpu`, `Charger`. Used for attributing faults to their source.
+_Avoid_: Device, ECU, board, unit.
+
+### BMS cell voltages
+
+**C-ADC voltage** (**C Volts**):
+A cell's voltage from the ADBMS chip's primary C-ADC. Published per cell at `BMS/PerCell/{Alpha|Beta}/{segment}/Volts/{cell}` in `V`; rendered as the **C Volts** BMS-heatmap view (formerly labelled "Voltage").
+_Avoid_: "the voltage" — ambiguous now that the S-ADC reading also exists.
+
+**S-ADC voltage** (**S Volts**):
+The same cell measured independently by the ADBMS chip's redundant S-ADC. Per-cell topic `BMS/PerCell/{Alpha|Beta}/{segment}/S_Volts/{cell}` in `V`, mirroring the C-ADC's `Volts`; rendered as the **S Volts** BMS-heatmap view.
+_Avoid_: sense voltage.
+
+**CvS**:
+Per-cell boolean the BMS raises when a cell's C-ADC and S-ADC readings diverge past threshold. Topic `BMS/PerCell/{Alpha|Beta}/{segment}/CvS/{cell}`; rendered as the **CvS Failure** heatmap view.
+_Avoid_: C-vs-S failure (say "CvS").
+
+### Alerting
+
+**Fault**:
+A discrete fault event raised by a Node, tracked with its first-occurrence time, last-seen time, and an expired flag once it stops recurring.
+_Avoid_: Error, alarm, warning.
+
+**Rule**:
+A user-defined condition on a topic's values (a boolean expression like `a > 100`) that notifies subscribers when it matches, subject to a debounce interval.
+_Avoid_: Trigger, alert, condition, watch.
+
+### Components
+
+**scylla-server**:
+The Rust/Axum backend. Subscribes to every MQTT topic, parses incoming protobuf into datapoints, stamps them with the active `runId`, batch-upserts them to Postgres, and rebroadcasts live data over a Socket.IO websocket. Owns the rule engine and the REST API.
+_Avoid_: Backend, server, API (when a more specific term fits).
+
+**angular-client**:
+The Angular dashboard that renders live and historical telemetry, run history, faults, and rules, and sends car commands.
+_Avoid_: Frontend, UI, app.
+
+**Siren**:
+The Mosquitto MQTT broker (`siren-base/`) that ingests CAN telemetry from the car and publishes it for scylla-server to consume.
+_Avoid_: Broker, MQTT (as a synonym for Siren specifically).
+
+**Charybdis**:
+The database schema and data migration tooling (`charybdis/`) — Prisma for the cloud DB, Diesel for local — plus the dump/upload sync between them.
+_Avoid_: Migrations, Prisma (as a synonym for Charybdis).
+
+**Calypso**:
+The car-side encoder that subscribes to `Calypso/Bidir/Command/*` topics published by scylla-server and converts them into CAN messages for the vehicle. The local stack runs a Calypso simulator in its place.
+_Avoid_: Simulator, encoder (without naming Calypso).
+
+## Conventions
+
+Project-specific choices. Everything else follows current Angular and Rust defaults.
+
+**angular-client**
+- External `templateUrl` and `styleUrls`, never inline templates or styles.
+- Icons, never emojis: Material Icons (`mat-icon` with `svgIcon`) for app-level UI, PrimeIcons (`pi pi-*`) inside PrimeNG components. Custom SVGs go in `src/assets/icons/`, registered with `MatIconRegistry`.
+- Must pass AXE checks, WCAG AA minimum.
+
+**scylla-server**
+- Controller → Service → DB: thin controllers, business logic in services, Diesel for DB access with batch upserts.
+- Log with `tracing`; schema changes go through Diesel migrations; unit tests live in `#[cfg(test)]` modules.
+
+**ADRs** (Argos `docs/adr/`)
+- Filename `<NNNN>-<prefix>-<topic-slug>.md`. The prefix is what the decision touches: `angular-client`, `scylla-server`, `siren-base`, `charybdis`, `full-stack` (client + server), `multi-comp` (any other cross-component or repo-wide infra), or `misc` (no code component, e.g. workflow).
+
+## Flagged ambiguities
+
+- **Node** is overloaded. In this glossary it means a CAN device (`Bms`/`Dti`/`Mpu`/`Charger`). The angular-client also has a `Node` type that is a UI topic-tree element, and "node" can mean an MQTT client. Always qualify: "CAN node", "tree node", "MQTT client".
+- **DataType vs Topic.** They share a string (`DataType.name` == the MQTT topic), but a Topic is the live MQTT routing path while a DataType is the persisted measurement class. Use "topic" when talking about MQTT/subscriptions, "DataType" when talking about stored data and units.
+- **Data** is both the singular and plural here; say "a datapoint" for one and "data" for the collection to avoid confusion with the `Data` struct.
+
+## Example dialogue
+
+> **Dev:** When a run starts, does each topic get its own row?
+> **Domain expert:** Not per topic — per datapoint. Each datapoint is one timestamp for one DataType inside that Run. A topic like `VCU/CarState/speed` maps to a single DataType, and you'll get a datapoint every time Siren publishes on it.
+> **Dev:** And if the pack overheats?
+> **Domain expert:** That's a Fault, raised by the `Bms` node — separate from the datapoints. If someone also wrote a Rule on `BMS/Status/Temp_Average` like `a > 60`, that Rule fires its own notification to subscribers.
diff --git a/software/application-software/argos/workspaces/default-codex/workspace.yml b/software/application-software/argos/workspaces/default-codex/workspace.yml
new file mode 100644
index 0000000..8f94d77
--- /dev/null
+++ b/software/application-software/argos/workspaces/default-codex/workspace.yml
@@ -0,0 +1,17 @@
+name: s.app.argos.default-codex
+harness: codex
+park:                     # `- <folder>`: root folders that park with this workspace on a switch (.delphi/park.sh), besides the ones it always parks
+  - pictures
+  - .playwright-mcp
+  - .playwright-cli
+# .delphi/setup.sh checks out everything below (git-ignored); re-run it after any change.
+repos:                    # `<name>: <git-url>`: code you change; a clone at repos/<name>, and separately worktrees/<name>/<branch> (default branch first)
+  argos: https://github.com/Northeastern-Electric-Racing/Argos.git
+  odyssey-definitions: https://github.com/Northeastern-Electric-Racing/Odyssey-Definitions.git
+references-git:           # `<name>: <git-url> [<tag-or-branch>]`: dependency sources to read, never edit; shallow copy at references/<name>
+  # pins match scylla-server/Cargo.lock and angular-client/package-lock.json on develop
+  socketioxide: https://github.com/Totodore/socketioxide.git socketioxide-v0.18.7
+  socket.io: https://github.com/socketio/socket.io.git socket.io-client@4.8.1   # monorepo: client, server, engine.io, parser
+  zenoh: https://github.com/eclipse-zenoh/zenoh.git 1.10.1
+workspaces:               # `- <name>` (dotted) or `- main`: Delphi workspaces to read, not edit from here; a clone on its branch at workspaces/<name or main>
+  - main
diff --git a/software/application-software/nero/workspace-inherit/.claude/skills/pr-conventions/SKILL.md b/software/application-software/nero/skills/pr-conventions/SKILL.md
similarity index 86%
rename from software/application-software/nero/workspace-inherit/.claude/skills/pr-conventions/SKILL.md
rename to software/application-software/nero/skills/pr-conventions/SKILL.md
index 9e2bb17..77b2d41 100644
--- a/software/application-software/nero/workspace-inherit/.claude/skills/pr-conventions/SKILL.md
+++ b/software/application-software/nero/skills/pr-conventions/SKILL.md
@@ -1,15 +1,14 @@
 ---
 name: pr-conventions
 description: Nero specifics for pull requests (base branch, commit format, checks, labels, screenshots, UI QA). Load before opening, updating, or reviewing a Nero PR, alongside open-pr, update-pr, and review.
-user-invocable: false
 ---
 
 # Nero PR conventions
 
 The shared rules are in the `open-pr` skill; this adds only what is Nero's.
 
-- Base branch: `develop`. Commit format: `^#[0-9]+ ` (the format in CLAUDE.md).
+- Base branch: `develop`. Commit format: `^#[0-9]+ ` (the format in the workspace instructions).
 - Checks: in the worktree, `clang-format --dry-run --Werror` on the C++ files changed since `origin/develop` (not under `deps/`); stop on any error.
 - Labels: none.
 - Screenshots: `playwright/test-results/<case>/` in the worktree, never committed.
-- UI QA, only if QML or a page changed: in the worktree's `playwright/`, add or update a case for each changed page, run `npm test`, and inspect `test-results/<case>/` (CLAUDE.md's Playwright section).
+- UI QA, only if QML or a page changed: in the worktree's `playwright/`, add or update a case for each changed page, run `npm test`, and inspect `test-results/<case>/` (the workspace instructions' Playwright section).
diff --git a/software/application-software/nero/workspace-inherit/.claude/skills/ticket-conventions/SKILL.md b/software/application-software/nero/skills/ticket-conventions/SKILL.md
similarity index 96%
rename from software/application-software/nero/workspace-inherit/.claude/skills/ticket-conventions/SKILL.md
rename to software/application-software/nero/skills/ticket-conventions/SKILL.md
index c837cd5..05ff574 100644
--- a/software/application-software/nero/workspace-inherit/.claude/skills/ticket-conventions/SKILL.md
+++ b/software/application-software/nero/skills/ticket-conventions/SKILL.md
@@ -1,7 +1,6 @@
 ---
 name: ticket-conventions
 description: Nero specifics for tickets (repo, area labels, vocabulary, diagrams). Load before drafting or filing a Nero issue, alongside create-ticket.
-user-invocable: false
 ---
 
 # Nero ticket conventions
diff --git a/software/application-software/workspace-inherit/.claude/skills/address-pr-comments/SKILL.md b/software/application-software/skills/address-pr-comments/SKILL.md
similarity index 86%
rename from software/application-software/workspace-inherit/.claude/skills/address-pr-comments/SKILL.md
rename to software/application-software/skills/address-pr-comments/SKILL.md
index 30083fa..4729436 100644
--- a/software/application-software/workspace-inherit/.claude/skills/address-pr-comments/SKILL.md
+++ b/software/application-software/skills/address-pr-comments/SKILL.md
@@ -1,13 +1,11 @@
 ---
 name: address-pr-comments
 description: Fetch review comments on a PR (Argos, Nero), judge whether each (including outdated ones) still applies, and walk through fixes in the PR's worktree
-allowed-tools: Bash(git:*), Bash(gh issue list:*), Bash(bash ${CLAUDE_SKILL_DIR}/scripts/fetch-feedback.sh *)
-user-invocable: true
 ---
 
 Propose and apply fixes for a PR's unresolved review feedback. **Never reply to threads**; the user does.
 
-1. **Fetch** from the workspace root: `bash scripts/fetch-feedback.sh <repo> <pr>|<branch>` (`<repo>` as under `repos/`, e.g. `argos`; `--all` first for unfiltered history). It checks out the PR head's worktree and prints JSON: `worktree` (target it by path from the root from now on), unresolved `threads`, `comments`, `reviews`. Any non-zero exit: use the GitHub MCP server's `pull_request_read` instead.
+1. **Fetch** from the workspace root: `bash scripts/fetch-feedback.sh <repo> <pr>|<branch>` (`<repo>` as under `repos/`, e.g. `argos`; `--all` first for unfiltered history). It checks out the PR head's worktree and prints JSON: `worktree` (target it by path from the root from now on), unresolved `threads`, `comments`, `reviews`. Any non-zero exit: use the available GitHub integration's the available GitHub PR-reading tool instead.
 2. **Judge.** Skip bot noise and anything already fixed at HEAD. For an `outdated` thread, find its `diffHunk` code by content, then label it **addressed**, **applies**, **moved**, **obsolete**, or **unclear**.
 3. **Present** before editing, grouped by file, and ask to confirm, skip, or change each (offer to batch clear ones past 8):
 
diff --git a/software/application-software/workspace-inherit/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh b/software/application-software/skills/address-pr-comments/scripts/fetch-feedback.sh
similarity index 100%
rename from software/application-software/workspace-inherit/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh
rename to software/application-software/skills/address-pr-comments/scripts/fetch-feedback.sh
diff --git a/software/application-software/workspace-inherit/.claude/skills/address-pr-comments/scripts/github.sh b/software/application-software/skills/address-pr-comments/scripts/github.sh
similarity index 66%
rename from software/application-software/workspace-inherit/.claude/skills/address-pr-comments/scripts/github.sh
rename to software/application-software/skills/address-pr-comments/scripts/github.sh
index 118d210..da0be20 100644
--- a/software/application-software/workspace-inherit/.claude/skills/address-pr-comments/scripts/github.sh
+++ b/software/application-software/skills/address-pr-comments/scripts/github.sh
@@ -1,15 +1,15 @@
 # github.sh: sourced by skill scripts that call GitHub. gh_init <tool> <git-dir> picks a backend
-# (gh when logged in, else a Claude Code remote session's REST proxy via curl; jq is needed either
+# (gh when logged in, else an explicitly enabled GitHub REST proxy via curl; jq is needed either
 # way), sets SLUG from that repo's origin, and makes any failure exit 3 so the calling skill falls
-# back to the GitHub MCP server. TMP is a scratch dir removed on exit.
+# back to the available GitHub integration. TMP is a scratch dir removed on exit.
 # shellcheck shell=bash
-fail() { echo "$TOOL: $1; use the GitHub MCP server" >&2; exit 3; }
+fail() { echo "$TOOL: $1; use the available GitHub integration" >&2; exit 3; }
 on_exit() { local rc=$?; rm -rf "$TMP"; [ "$rc" -eq 0 ] || fail "GitHub request failed ($MODE)"; }
 gh_init() {
   TOOL=$1
   if { command -v gh && gh auth status; } >/dev/null 2>&1; then MODE=gh
-  elif [ -n "${CLAUDE_CODE_REMOTE:-}" ] && command -v curl >/dev/null; then MODE=rest
-  else fail "no authenticated gh or remote-session proxy"; fi
+  elif [ -n "${DELPHI_GITHUB_REST_PROXY:-${CLAUDE_CODE_REMOTE:-}}" ] && command -v curl >/dev/null; then MODE=rest
+  else fail "no authenticated gh or enabled REST proxy"; fi
   command -v jq >/dev/null || fail "jq not installed"
   SLUG=$(git -C "$2" remote get-url origin) && SLUG=${SLUG#*github.com[:/]} && SLUG=${SLUG%.git}
   TMP=$(mktemp -d)
diff --git a/software/application-software/workspace-inherit/.claude/skills/commit/SKILL.md b/software/application-software/skills/commit/SKILL.md
similarity index 75%
rename from software/application-software/workspace-inherit/.claude/skills/commit/SKILL.md
rename to software/application-software/skills/commit/SKILL.md
index 4b56757..ad1fa37 100644
--- a/software/application-software/workspace-inherit/.claude/skills/commit/SKILL.md
+++ b/software/application-software/skills/commit/SKILL.md
@@ -3,4 +3,4 @@ name: commit
 description: Stage and commit using the project's commit message convention
 ---
 
-In the worktree you're working on, from the workspace root (`git -C worktrees/<repo>/<branch> …`), stage the relevant changes (not unrelated or generated files) and commit using the commit message format in CLAUDE.md. Keep the description imperative and 2–8 words.
+In the worktree you're working on, from the workspace root (`git -C worktrees/<repo>/<branch> …`), stage the relevant changes (not unrelated or generated files) and commit using the commit message format in the workspace instructions. Keep the description imperative and 2–8 words.
diff --git a/software/application-software/workspace-inherit/.claude/skills/consolidate-spikes/SKILL.md b/software/application-software/skills/consolidate-spikes/SKILL.md
similarity index 84%
rename from software/application-software/workspace-inherit/.claude/skills/consolidate-spikes/SKILL.md
rename to software/application-software/skills/consolidate-spikes/SKILL.md
index 4f85b66..897a1f5 100644
--- a/software/application-software/workspace-inherit/.claude/skills/consolidate-spikes/SKILL.md
+++ b/software/application-software/skills/consolidate-spikes/SKILL.md
@@ -1,6 +1,7 @@
 ---
 name: consolidate-spikes
-description: Turn finished spikes into implementation tickets: an idea's spikes, once all are done, into dev work, under an epic when it comes from an idea or splits. Use when the user wants to wrap up, settle, or consolidate an idea or spike on an application-software repo (Argos, Nero).
+description: >-
+  Turn finished spikes into implementation tickets: an idea's spikes, once all are done, into dev work, under an epic when it comes from an idea or splits. Use when the user wants to wrap up, settle, or consolidate an idea or spike on an application-software repo (Argos, Nero).
 ---
 
 Drafts and files by the `create-ticket` rules; load it and the project's `ticket-conventions` first. Takes an idea or a standalone spike.
diff --git a/software/application-software/workspace-inherit/.claude/skills/create-ticket/SKILL.md b/software/application-software/skills/create-ticket/SKILL.md
similarity index 97%
rename from software/application-software/workspace-inherit/.claude/skills/create-ticket/SKILL.md
rename to software/application-software/skills/create-ticket/SKILL.md
index 210a059..9dd28e5 100644
--- a/software/application-software/workspace-inherit/.claude/skills/create-ticket/SKILL.md
+++ b/software/application-software/skills/create-ticket/SKILL.md
@@ -7,7 +7,7 @@ description: Draft and file a GitHub issue (idea, spike, epic, or dev work) on a
 
 These are the ticket conventions for every application-software repo. The repo's own `.github/ISSUE_TEMPLATE` holds only the fields (`gh api repos/<owner>/<repo>/contents/.github/ISSUE_TEMPLATE/<file> -q .content | base64 -d`); follow each field's description.
 
-First load the project's `ticket-conventions` skill (inherited from the project's `workspace-inherit/`) for its repo, area labels, vocabulary, and diagrams. If none is enabled, ask which repo.
+First load the project's `ticket-conventions` skill (inherited from the project's `skills/`) for its repo, area labels, vocabulary, and diagrams. If none is enabled, ask which repo.
 
 ## Workflow
 
diff --git a/software/application-software/workspace-inherit/.claude/skills/open-pr/SKILL.md b/software/application-software/skills/open-pr/SKILL.md
similarity index 96%
rename from software/application-software/workspace-inherit/.claude/skills/open-pr/SKILL.md
rename to software/application-software/skills/open-pr/SKILL.md
index b1e7c71..7363dd2 100644
--- a/software/application-software/workspace-inherit/.claude/skills/open-pr/SKILL.md
+++ b/software/application-software/skills/open-pr/SKILL.md
@@ -3,7 +3,7 @@ name: open-pr
 description: Run pre-PR checks, push the branch, and open a draft pull request on an application-software repo (Argos, Nero)
 ---
 
-First load the project's `pr-conventions` skill (inherited from the project's `workspace-inherit/`) for its base branch, commit format, checks, labels, and screenshots.
+First load the project's `pr-conventions` skill (inherited from the project's `skills/`) for its base branch, commit format, checks, labels, and screenshots.
 
 1. **Check:** `bash scripts/pr-checks.sh <repo> <branch> origin/<base> '<commit format>'` (clean tree, commit subjects match the project's format, merges cleanly into the base), then the project's own checks. Stop and fix on any FAIL.
 2. **Media:** if the diff touches the UI, ask the user whether to add screenshots to the PR, listing any already in the project's screenshot folder for this branch so they can pick those instead of new ones; on no, skip this step. For new ones, use the project's UI QA to take Playwright screenshots of the changed views into its screenshot folder, or, when the change adds or changes an animation, record a short video instead (a browser context with `recordVideo: { dir }` saves a `.webm` when it closes). Images must be under 10 MB; video under 10 MB on a Free plan, 100 MB on a paid one.
diff --git a/software/application-software/workspace-inherit/.claude/skills/open-pr/scripts/pr-checks.sh b/software/application-software/skills/open-pr/scripts/pr-checks.sh
similarity index 100%
rename from software/application-software/workspace-inherit/.claude/skills/open-pr/scripts/pr-checks.sh
rename to software/application-software/skills/open-pr/scripts/pr-checks.sh
diff --git a/software/application-software/workspace-inherit/.claude/skills/report-spike/SKILL.md b/software/application-software/skills/report-spike/SKILL.md
similarity index 100%
rename from software/application-software/workspace-inherit/.claude/skills/report-spike/SKILL.md
rename to software/application-software/skills/report-spike/SKILL.md
diff --git a/software/application-software/workspace-inherit/.claude/skills/update-pr/SKILL.md b/software/application-software/skills/update-pr/SKILL.md
similarity index 100%
rename from software/application-software/workspace-inherit/.claude/skills/update-pr/SKILL.md
rename to software/application-software/skills/update-pr/SKILL.md
diff --git a/software/workspace-inherit/.claude/skills/journal/SKILL.md b/software/skills/journal/SKILL.md
similarity index 100%
rename from software/workspace-inherit/.claude/skills/journal/SKILL.md
rename to software/skills/journal/SKILL.md
diff --git a/software/workspace-inherit/.claude/skills/journal/scripts/capture.sh b/software/skills/journal/scripts/capture.sh
similarity index 100%
rename from software/workspace-inherit/.claude/skills/journal/scripts/capture.sh
rename to software/skills/journal/scripts/capture.sh
diff --git a/software/workspace-inherit/.claude/skills/new-worktree/SKILL.md b/software/skills/new-worktree/SKILL.md
similarity index 100%
rename from software/workspace-inherit/.claude/skills/new-worktree/SKILL.md
rename to software/skills/new-worktree/SKILL.md
diff --git a/software/workspace-inherit/.claude/skills/setup-workspace/SKILL.md b/software/skills/setup-workspace/SKILL.md
similarity index 100%
rename from software/workspace-inherit/.claude/skills/setup-workspace/SKILL.md
rename to software/skills/setup-workspace/SKILL.md
diff --git a/software/workspace-inherit/.claude/skills/switch-workspace/SKILL.md b/software/skills/switch-workspace/SKILL.md
similarity index 71%
rename from software/workspace-inherit/.claude/skills/switch-workspace/SKILL.md
rename to software/skills/switch-workspace/SKILL.md
index e0a8b42..0b5a91a 100644
--- a/software/workspace-inherit/.claude/skills/switch-workspace/SKILL.md
+++ b/software/skills/switch-workspace/SKILL.md
@@ -10,11 +10,10 @@ bash .delphi/switch.sh <name>        # ws/<name>: its dotted name, e.g. s.app.ar
 bash .delphi/switch.sh main          # Delphi's main: project folders, templates, CI
 ```
 
-- The user can also switch from the `/ws-delphi` pane (the `delphi` plugin's mod), which shows them as cards (`bash .delphi/switch.sh --list`): press one, then Switch workspace; `/ws-delphi <name>` switches straight away, and `/ws-delphi --web` opens the same cards in a browser tab.
 - List workspaces and their project folders: `bash .delphi/switch.sh --list`.
 - It refuses while tracked files have changes: commit them on a branch (and PR them) first. Then it fetches, switches, fast-forwards, and runs the new workspace's `.delphi/setup.sh`.
 - The post-checkout hook parks this workspace's `repos/`, `worktrees/`, `references/` and `workspaces/` in `.delphi/parked/<name>/` (git-ignored; `<name>` as in its `workspace.yml`) and brings the other's back at the same paths, so worktrees and the work in them return as they were. Switch back the same way. Never run `git clean -X` or `git stash --all` at the workspace root: they take ignored files, parked work included.
 - Before switching, stop anything running from `worktrees/` (dev servers, Docker builds): its folder moves.
-- No restart needed: skills under `.claude/skills/` reload on their own, and the `delphi` mod sends the new workspace's `CLAUDE.md` with the next prompt. Without the mod installed, this session keeps the old `CLAUDE.md`: tell the user to restart Claude Code in the same folder before starting work in the new workspace.
+- Start a fresh harness session after switching so its instructions and skills match the new workspace. A harness integration may explicitly support reloading in place; follow its documented behavior.
 - To change the workspace you switched to: `git switch -c <branch>`, commit, push, and open a PR into `ws/<name>` (or `main`).
 - To only read another workspace or main without leaving this one, list it under `workspaces:` instead (`setup-workspace` skill).
diff --git a/templates/harnesses/codex/AGENTS.md b/templates/harnesses/codex/AGENTS.md
new file mode 100644
index 0000000..1874066
--- /dev/null
+++ b/templates/harnesses/codex/AGENTS.md
@@ -0,0 +1,12 @@
+# Delphi workspace
+
+You're in Delphi workspace `{{name}}` (branch `ws/{{name}}`); code repos are cloned at `repos/<repo>/`, and separately checked out as worktrees under `worktrees/<repo>/` (`.delphi/setup.sh` makes the default branch's). Work in worktrees: make each new branch one under `worktrees/<repo>/<branch>` (`new-worktree` skill) unless the user says not to. Read-only dependency sources from `references-git:` are checked out under `references/<name>/` at the version the workspace pins: read them to learn how a dependency behaves (prefer them over web docs), and never edit, branch, or push them. Delphi workspaces (or `main`) under `workspaces:` in `workspace.yml` (`- <name>`, a workspace's dotted name like `s.app.argos.argos-dev`, or `- main`) are clones at `workspaces/<name>/`, each on its branch, for reading their context (don't edit them from here; setup switches each back to its branch and pulls it); change what's checked out with the `setup-workspace` skill. To work in another workspace, switch this clone to it (`switch-workspace` skill). Park rough notes with the `journal` skill. Work here unless the task clearly belongs to another project.
+
+
+## Codex startup
+
+For Codex CLI, run `bash .delphi/codex.sh` from this clone. In other Codex hosts, first read `workspace.yml` and run `bash .delphi/paths.sh` from this workspace root to learn its absolute path. Run `bash .delphi/setup.sh` when the repositories have not been set up.
+
+Shell exports may not persist between commands or reach independently launched sub-agents. Run skill helpers through `bash <absolute-workspace-root>/.delphi/exec.sh bash <absolute-skill-folder>/scripts/<script>.sh <names>...`; this sets the layout on every invocation and preserves the caller's working directory. Pass the workspace's absolute path and this rule to sub-agents. Native skills live under `.agents/skills/`. After a workspace switch, start a fresh Codex session before further work.
+
+Use the tools available in the current harness for browser verification and GitHub access. If a skill requires unavailable tooling or authentication, report the missing prerequisite and the verification that remains. Delphi does not configure Codex permissions, credentials, MCP servers or host dependencies.
diff --git a/tests/e2e.sh b/tests/e2e.sh
index 14f3bb5..d693e52 100644
--- a/tests/e2e.sh
+++ b/tests/e2e.sh
@@ -69,7 +69,7 @@ o() { git -C "$t/origin.git" "$@"; }
 # commit_on <branch> <file> <text>: a person's PR into <branch>, merged (edit on a branch, merge --no-ff)
 commit_on() {
   (cd "$t/dev" && git fetch -q && git checkout -q -B "edit" "origin/$1" && printf '%s\n' "$3" >>"$2" &&
-    git commit -qam "edit $2 on $1" && git checkout -q -B "tmp-$1" "origin/$1" &&
+    git add -- "$2" && git commit -qm "edit $2 on $1" && git checkout -q -B "tmp-$1" "origin/$1" &&
     git merge -q --no-ff --no-edit edit && git push -q origin "HEAD:$1")
 }
 
@@ -264,6 +264,13 @@ expect_bad() { # <label> <expected message> <setup command...>: copy the real la
   grep -q -- "$want" "$t/err" || fail "check $label: no '$want' in: $(cat "$t/err")"
   ok "check fails: $label ($want)"
 }
+CX=software/application-software/argos/workspaces/default-codex
+expect_bad unknown-harness "unknown harness 'unknown'" sed -i.bak 's/harness: codex/harness: unknown/' "$CX/workspace.yml"
+expect_bad codex-plugin "codex does not support Delphi plugin sets" sh -c "printf 'plugins:\n  - delphi\n' >>$CX/workspace.yml"
+expect_bad codex-no-instructions "AGENTS.md: required for codex" rm "$CX/AGENTS.md"
+expect_bad codex-wrong-native "CLAUDE.md: belongs to a different harness" touch "$CX/CLAUDE.md"
+expect_bad codex-inherited-wrong-native "belongs to a different harness" sh -c "mkdir -p software/workspace-inherit/.claude && echo x >software/workspace-inherit/.claude/extra.json"
+expect_bad neutral-collision "also inherits it from a folder above" sh -c "mkdir -p software/application-software/skills/journal && echo x >software/application-software/skills/journal/SKILL.md"
 expect_bad no-harness "harness is missing" sh -c "sed -i.bak 's/^harness:.*//' $A/workspace.yml && rm $A/workspace.yml.bak"
 expect_bad duplicate-harness "duplicate harness" sh -c "printf 'harness: x\n' >>$A/workspace.yml"
 expect_bad bad-repo "bad repos entry" sh -c "awk '{ print } /^repos:/ { print \"  ../x: y\" }' $A/workspace.yml >$A/y && mv $A/y $A/workspace.yml"
@@ -312,9 +319,9 @@ expect_bad workflow-drift "argos-dev/.github/workflows/delphi.yml: differs" sh -
 expect_bad defaults-manifest "workspace-defaults/workspace.yml: unexpected line" sh -c "printf 'x: y\n' >>${A%/workspaces/*}/workspace-defaults/workspace.yml"
 expect_bad defaults-named-workspace "workspace-defaults/.delphi: managed" sh -c "mkdir -p software/x/workspaces/workspace-defaults/.delphi && cp -R $A/. software/x/workspaces/workspace-defaults/"
 expect_bad old-defaults "defaults: renamed workspace-defaults/" mkdir -p "${A%/workspaces/*}/defaults"
-expect_bad inherited-file-kept "$A/.claude/skills/journal/SKILL.md: inherited from software/workspace-inherit/" sh -c "mkdir -p $A/.claude/skills/journal && echo x >$A/.claude/skills/journal/SKILL.md"
+expect_bad inherited-file-kept "$A/.claude/skills/journal/SKILL.md: inherited from software/skills/journal/" sh -c "mkdir -p $A/.claude/skills/journal && echo x >$A/.claude/skills/journal/SKILL.md"
 expect_bad inherited-twice "also inherits it from a folder above" sh -c "mkdir -p software/application-software/workspace-inherit/.claude/skills/journal && echo x >software/application-software/workspace-inherit/.claude/skills/journal/SKILL.md"
-expect_bad inherited-claude-md "software/workspace-inherit/CLAUDE.md: each workspace has its own" sh -c "echo x >software/workspace-inherit/CLAUDE.md"
+expect_bad inherited-claude-md "software/workspace-inherit/CLAUDE.md: each workspace has its own" sh -c "mkdir -p software/workspace-inherit && echo x >software/workspace-inherit/CLAUDE.md"
 expect_bad inherit-in-workspace "belongs in an org or project folder" sh -c "mkdir -p $A/workspace-inherit && echo x >$A/workspace-inherit/f"
 expect_bad bad-opt-out "bad opt-out entry" sh -c "printf 'opt-out:\n  - ../x\n' >>$A/workspace.yml"
 expect_bad opt-out-nothing "opt-out: nope is nothing it inherits" sh -c "printf 'opt-out:\n  - nope\n' >>$A/workspace.yml"
@@ -536,7 +543,7 @@ ok "new-worktree.sh makes new branches from the default or <base>, checks out ex
   fail "paths.sh layout"
 [ "$(cd "$t" && eval "$(bash "$w/.delphi/paths.sh")" && echo "$(printenv DELPHI_ROOT) $(printenv DELPHI_WORKSPACES)")" = "$w $w/workspaces" ] ||
   fail "paths.sh's export line doesn't reach child processes"
-cap=$src/software/workspace-inherit/.claude/skills/journal/scripts/capture.sh
+cap=$src/software/skills/journal/scripts/capture.sh
 { e=$(cd "$t" && DELPHI_ROOT=$w bash "$cap" -c ideas "a note") && [ "${e#"$w/.journal/ideas/"}" != "$e" ] && grep -q "a note" "$e"; } ||
   fail "capture.sh from \$DELPHI_ROOT: $e"
 ! (unset DELPHI_ROOT && bash "$cap" "a note") >/dev/null 2>&1 || fail "capture.sh ran without DELPHI_ROOT"
@@ -771,6 +778,136 @@ commit_on "ws/$CO" CLAUDE.md "old side" && commit_on "ws/$CN" .gitattributes "#
   ! o show "ws/$CN:CLAUDE.md" | grep -qx "old side"; } || fail "a diverged old name was merged or not reported: $(cat "$t/out")"
 ok "an old name with commits of its own is reported, never merged"
 
+# --- 13. portable harnesses: native skills, round trips, transitions, bootstrap and authoring
+C=software/application-software/argos/workspaces/sandbox-codex CN=s.app.argos.sandbox-codex
+# shellcheck disable=SC2016 # child shell expands its positional arguments
+on_main "add Codex and neutral skills" bash -c '
+  mkdir -p "$1" software/skills/portable/scripts
+  cp "$2/templates/harnesses/codex/AGENTS.md" "$1/AGENTS.md"
+  cp "$2/templates/workspace/.gitattributes" "$1/.gitattributes"
+  mkdir -p "$1/.github/workflows"
+  cp .github/workflows/delphi.yml "$1/.github/workflows/delphi.yml"
+  printf "name: %s\nharness: codex\n" "$3" >"$1/workspace.yml"
+  printf "portable v1\n" >software/skills/portable/SKILL.md
+  printf "helper v1\n" >software/skills/portable/scripts/helper.sh
+' _ "$C" "$src" "$CN"
+sync "$CN" >"$t/out" 2>&1 || fail "Codex creation: $(cat "$t/out")"
+for skill in top portable; do
+  o cat-file -e "ws/$CN:.agents/skills/$skill/SKILL.md" || fail "Codex lacks native $skill"
+done
+! o cat-file -e "ws/$CN:.claude" 2>/dev/null || fail "Codex inherited Claude files"
+[ "$(o rev-parse "ws/$CN^")" = "$(o rev-parse main)" ] || fail "Codex creation parent"
+ok "Codex creation maps neutral and legacy shared skills to .agents/skills without Claude settings"
+commit_on "ws/$CN" .agents/skills/portable/SKILL.md "workspace edit"
+commit_on "ws/$CN" AGENTS.md "workspace-owned instructions"
+sync propose "$CN" >"$t/out" 2>&1 || fail "Codex proposal: $(cat "$t/out")"
+! o cat-file -e "propose/$CN:$C/.agents/skills/portable/SKILL.md" 2>/dev/null || fail "native inherited skill proposed"
+o show "propose/$CN:$C/AGENTS.md" | grep -qx "workspace-owned instructions" || fail "AGENTS.md not proposed"
+sync refresh "$CN" >/dev/null
+[ "$(o show "ws/$CN:.agents/skills/portable/SKILL.md")" = "portable v1" ] || fail "Codex inherited edit not reset"
+ok "Codex proposals preserve native instructions and strip inherited native skills; refresh resets inherited edits"
+on_main "move legacy skill source, remove helper" bash -c '
+  mkdir -p software/skills
+  git mv software/workspace-inherit/.claude/skills/top software/skills/top
+  git rm -q software/skills/portable/scripts/helper.sh
+'
+sync refresh "$CN" >"$t/out" 2>&1 || fail "source migration: $(cat "$t/out")"
+! o cat-file -e "ws/$CN:.agents/skills/portable/scripts/helper.sh" 2>/dev/null || fail "stale inherited helper survived"
+o show "ws/$CN:.agents/skills/top/SKILL.md" | grep -qx "top v3" || fail "legacy source move lost skill"
+ok "neutral source migration keeps native paths stable and removes obsolete inherited files"
+# shellcheck disable=SC2016 # child shell expands its positional arguments
+on_main "switch Codex workspace to Claude" bash -c '
+  git mv "$1/AGENTS.md" "$1/CLAUDE.md"
+  sed -i.bak "s/harness: codex/harness: claude-code/" "$1/workspace.yml"
+  rm "$1/workspace.yml.bak"
+  bash ci/plugins.sh >/dev/null
+' _ "$C"
+# The ws-owned AGENTS edit would conflict with main renaming it: resolve via a normal workspace PR first.
+# Undo the test-only instruction change before the harness transition.
+(cd "$t/dev" && git fetch -q && git checkout -q -B transition "origin/ws/$CN" &&
+  git show "origin/main:$C/CLAUDE.md" >AGENTS.md && git commit -qam "prepare native instruction transition" &&
+  git push -q origin "HEAD:ws/$CN")
+sync refresh "$CN" >"$t/out" 2>&1 || fail "Codex to Claude: $(cat "$t/out")"
+{ o cat-file -e "ws/$CN:.claude/skills/portable/SKILL.md" &&
+  ! o cat-file -e "ws/$CN:.agents/skills/portable/SKILL.md" 2>/dev/null; } || fail "old native skill destination survived"
+# shellcheck disable=SC2016 # child shell expands its positional arguments
+on_main "switch workspace back to Codex" bash -c '
+  git mv "$1/CLAUDE.md" "$1/AGENTS.md"
+  git rm -q "$1/.claude/settings.json"
+  printf "name: %s\nharness: codex\n" "$2" >"$1/workspace.yml"
+' _ "$C" "$CN"
+sync "$CN" >"$t/out" 2>&1 || fail "Claude to Codex: $(cat "$t/out")"
+{ o cat-file -e "ws/$CN:.agents/skills/portable/SKILL.md" &&
+  ! o cat-file -e "ws/$CN:.claude/settings.json" 2>/dev/null &&
+  ! o cat-file -e "ws/$CN:.claude/skills/portable/SKILL.md" 2>/dev/null; } || fail "Claude files survived harness transition"
+ok "harness transitions remove old native skill destinations and generated settings in both directions"
+(cd "$t/dev" && git fetch -q && git checkout -q -B stale-settings "origin/ws/$CN" &&
+  mkdir -p .claude && echo '{}' >.claude/settings.json && git add .claude/settings.json &&
+  git commit -qm "stale settings from previous harness" && git push -q origin "HEAD:ws/$CN")
+sync refresh "$CN" >"$t/out" 2>&1 || fail "stale generated settings cleanup: $(cat "$t/out")"
+! o cat-file -e "ws/$CN:.claude/settings.json" 2>/dev/null || fail "generated settings deletion was not committed"
+ok "Codex refresh stages and commits removal of stale generated settings from a workspace branch"
+commit_on "ws/$CN" workspace.yml "$(printf 'opt-out:\n  - .agents/skills/portable')"
+commit_on "ws/$CN" .agents/skills/portable/SKILL.md "Codex own"
+commit_on "ws/$CN" .agents/skills/portable/OWN.md "workspace-owned native file"
+sync "$CN" >"$t/out" 2>&1 || fail "Codex opt-out: $(cat "$t/out")"
+o show "propose/$CN:$C/.agents/skills/portable/OWN.md" | grep -qx "workspace-owned native file" || fail "Codex owned skill not proposed"
+o show "ws/$CN:.agents/skills/portable/SKILL.md" | grep -qx "Codex own" || fail "Codex opt-out overwritten"
+ok "Codex native opt-outs preserve editable and proposable workspace-owned skills"
+
+(cd "$t/dev" && git fetch -q && git checkout -q -B tmp-main origin/main &&
+  git merge -q --no-ff --no-edit "origin/propose/$CN" && git push -q origin HEAD:main)
+sync refresh "$CN" >/dev/null
+# A formerly opted-out skill is workspace-owned even after its shared source and opt-out are removed.
+# shellcheck disable=SC2016 # child expands its arguments
+on_main "retire shared skill without deleting owned copy" bash -c '
+  git rm -rq software/skills/portable
+  printf "name: %s\nharness: codex\n" "$2" >"$1/workspace.yml"
+' _ "$C" "$CN"
+sync "$CN" >"$t/out" 2>&1 || fail "retire owned skill source: $(cat "$t/out")"
+o show "ws/$CN:.agents/skills/portable/SKILL.md" | grep -qx "Codex own" || fail "former opt-out owned skill was deleted"
+ok "removing a shared source and old opt-out preserves the former workspace-owned skill"
+
+# No real Codex invocation: assert launch arguments and exports in a stub and fresh child shell.
+cat >"$t/bin/codex" <<'CODEX'
+#!/usr/bin/env bash
+set -euo pipefail
+[ "$1" = -C ] && [ "$2" = "$DELPHI_ROOT" ] && [ "$3" = "argument with spaces" ]
+[ "$DELPHI_REPOS" = "$DELPHI_ROOT/repos" ]
+bash -c '[ "$DELPHI_WORKTREES" = "$DELPHI_ROOT/worktrees" ]'
+CODEX
+chmod +x "$t/bin/codex"
+w=$t/codex && git clone -q -b "ws/$CN" "$t/origin.git" "$w"
+(cd "$t" && env -u DELPHI_ROOT -u DELPHI_REPOS -u DELPHI_WORKTREES bash "$w/.delphi/codex.sh" "argument with spaces") || fail "Codex launcher exports/arguments"
+# shellcheck disable=SC2016 # fresh shell must receive the exports
+(cd "$t" && env -u DELPHI_ROOT bash "$w/.delphi/exec.sh" bash -c '[ "$PWD" != "$DELPHI_ROOT" ] && [ -f "$DELPHI_ROOT/AGENTS.md" ]') || fail "fresh host command wrapper"
+ok "Codex launcher and per-command bootstrap propagate layout to fresh shells and children while preserving arguments/cwd"
+# Proxy capability selection uses stubs only, without GitHub/network access.
+mkdir -p "$t/proxy-bin"
+printf '#!/usr/bin/env bash\nexit 1\n' >"$t/proxy-bin/gh"
+printf '#!/usr/bin/env bash\nprintf "proxy-response"\n' >"$t/proxy-bin/curl"
+printf '#!/usr/bin/env bash\nexit 0\n' >"$t/proxy-bin/jq"
+chmod +x "$t/proxy-bin/"*
+provider=$src/software/application-software/skills/address-pr-comments/scripts/github.sh
+# shellcheck disable=SC2016 # isolated shell sources helper and expands its variables
+proxy=$(PATH="$t/proxy-bin:$PATH" DELPHI_GITHUB_REST_PROXY=1 CLAUDE_CODE_REMOTE='' bash -c '
+  source "$1"; gh_init test "$2"; [ "$MODE" = rest ]; get repos/example/example
+' _ "$provider" "$w") || fail "explicit REST proxy capability selection"
+[ "$proxy" = proxy-response ] || fail "REST proxy did not use stubbed provider"
+ok "shared GitHub helpers support an explicit REST-proxy capability without harness-specific environment detection"
+# shellcheck disable=SC2016 # child shell expands its positional argument
+on_main "native instruction defaults" bash -c 'printf "# Codex firmware {{name}}\n" >"$1/AGENTS.md"' _ "$FD"
+(cd "$t/dev" && git fetch -q && git checkout -q -B main origin/main &&
+  tools/new-workspace.sh --harness codex electrical/firmware fw-codex >/dev/null) || fail "Codex new workspace"
+F=software/electrical/firmware/workspaces/fw-codex
+created=new-workspace/electrical/firmware/fw-codex
+o show "$created:$F/workspace.yml" | grep -qx 'harness: codex' || fail "default harness not overridden"
+o show "$created:$F/workspace.yml" | grep -q 'fw: https://example.com/fw.git' || fail "project repos lost"
+o show "$created:$F/AGENTS.md" | grep -qx '# Codex firmware s.electrical.firmware.fw-codex' || fail "Codex native instruction defaults lost"
+{ ! o cat-file -e "$created:$F/CLAUDE.md" 2>/dev/null && ! o cat-file -e "$created:$F/.claude" 2>/dev/null; } || fail "Claude defaults leaked into Codex workspace"
+(cd "$t/dev" && ! tools/new-workspace.sh --harness unknown electrical/firmware bad-harness >/dev/null 2>&1) || fail "unknown authoring harness accepted"
+ok "Codex authoring chooses native template/defaults, preserves project repos and rejects unknown harnesses"
+
 # --- 13. shellcheck, if installed
 if command -v shellcheck >/dev/null; then
   shellcheck "$src"/ci/*.sh "$src"/tools/*.sh "$src"/tests/*.sh "$src"/.delphi/*.sh "$src"/.delphi/migrations/*.sh ||
diff --git a/tools/new-workspace.sh b/tools/new-workspace.sh
index 085fe70..b0f79cc 100755
--- a/tools/new-workspace.sh
+++ b/tools/new-workspace.sh
@@ -11,9 +11,16 @@
 set -euo pipefail
 die() { echo "new-workspace: $*" >&2 && exit 1; }
 by=ai
-[ "${1:-}" != --by ] || { by=${2:-} && shift 2; }
+adapter=""
+while [ "$#" -gt 0 ]; do
+  case "$1" in
+    --by) [ "$#" -ge 2 ] || die "--by needs a value"; by=$2; shift 2 ;;
+    --harness) [ "$#" -ge 2 ] || die "--harness needs a value"; adapter=$2; shift 2 ;;
+    *) break ;;
+  esac
+done
 case "$by" in ai | ai-assisted | human) ;; *) die "--by must be ai, ai-assisted or human" ;; esac
-[ $# -eq 2 ] || die "usage: tools/new-workspace.sh [--by ai|ai-assisted|human] <org-path under software/> <leaf>"
+[ $# -eq 2 ] || die "usage: tools/new-workspace.sh [--by ai|ai-assisted|human] [--harness claude-code|codex] <org-path under software/> <leaf>"
 org=${1%/}
 org=${org#software/}
 leaf=$2
@@ -30,21 +37,31 @@ trap 'git worktree remove --force "$wt"' EXIT
 defaults=$wt/software/$org/workspace-defaults
 [ ! -e "$wt/$folder" ] || die "$folder already exists on main"
 mkdir -p "$wt/$folder"
+# shellcheck source=ci/harnesses.sh
+source "$wt/ci/harnesses.sh"
+[ -n "$adapter" ] || adapter=$(awk '/^harness:/ { print $2; exit }' "$defaults/workspace.yml" 2>/dev/null || true)
+harness "${adapter:-claude-code}" || die "unsupported harness"
+adapter=${adapter:-claude-code}
 cp -R "$wt/templates/workspace/." "$wt/$folder/"
-if [ -d "$defaults" ]; then
-  cp -R "$defaults/." "$wt/$folder/"
-  cp "$wt/templates/workspace/CLAUDE.md" "$wt/$folder/CLAUDE.md"
-  [ ! -f "$defaults/CLAUDE.md" ] || { echo && cat "$defaults/CLAUDE.md"; } >>"$wt/$folder/CLAUDE.md"
-fi
+[ ! -d "$defaults" ] || cp -R "$defaults/." "$wt/$folder/"
+# Native instruction defaults are harness-specific; other project defaults are preserved.
+rm -f "$wt/$folder/CLAUDE.md" "$wt/$folder/AGENTS.md"
+cp "$wt/$instruction_template" "$wt/$folder/$instruction"
+[ ! -f "$defaults/$instruction" ] || { echo; cat "$defaults/$instruction"; } >>"$wt/$folder/$instruction"
+case "$adapter" in
+  codex) rm -rf "$wt/$folder/.claude" ;;
+  claude-code) rm -rf "$wt/$folder/.agents" "$wt/$folder/.codex" ;;
+esac
 name=$(cd "$wt" && bash .delphi/names.sh | awk -v f="$folder" '$2 == f { print $1 }')
 taken=$(cd "$wt" && bash .delphi/names.sh | awk -v n="$name" -v f="$folder" '$1 == n && $2 != f { print $2 }')
 [ -z "$taken" ] || die "$taken is already named $name (names are unique); pick another leaf"
 for b in "ws/$name" "ws/software/$org/$leaf"; do # ws/software/…: a workspace's branch when they were named by path, which sync would carry over
   ! git rev-parse --quiet --verify "refs/remotes/origin/$b" >/dev/null || die "branch $b already exists (from a removed workspace?); pick another leaf"
 done
-sed -i.bak -e "s|{{name}}|$name|g" -e "s|{{folder}}|$folder|g" "$wt/$folder/CLAUDE.md" && rm "$wt/$folder/CLAUDE.md.bak"
+sed -i.bak -e "s|{{name}}|$name|g" -e "s|{{folder}}|$folder|g" "$wt/$folder/$instruction" && rm "$wt/$folder/$instruction.bak"
 y=$wt/$folder/workspace.yml
-{ echo "name: $name"; grep -v '^name:' "$y"; } >"$y.new" && mv "$y.new" "$y"
+{ echo "name: $name"; echo "harness: $adapter"; awk -v adapter="$adapter" '/^name:|^harness:/ { next } adapter != "claude-code" && /^plugins:/ { skip = 1; next } /^[^[:space:]#]/ { skip = 0 } !skip { print }' "$y"; } >"$y.new" && mv "$y.new" "$y"
+generate_harness "$wt" "$folder" "$wt/$folder"
 bash "$wt/ci/plugins.sh" "$wt" >/dev/null # its plugins: defaults and .claude/settings.json
 "$wt/ci/check.sh" "$wt"
 git -C "$wt" add -A "$folder"
@@ -60,7 +77,7 @@ Adds \`$folder/\` from templates/workspace (plus software/$org/workspace-default
 
 ## Notes
 
-Before merging, fill in its workspace.yml repos (and list main under workspaces:, recommended, so it can read this project's shared context) and its CLAUDE.md.
+Before merging, fill in its workspace.yml repos (and list main under workspaces:, recommended, so it can read this project's shared context) and its $instruction.
 
 ## Checklist
 

From fd503fa3e574d2a9be7b6a3ed87f944a73274a6b Mon Sep 17 00:00:00 2001
From: Jesus God <wyattbracy@gmail.com>
Date: Mon, 19 Oct 2026 16:26:34 +0000
Subject: [PATCH 02/18] Simplify harness authoring and cover project defaults

---
 .../skills/address-pr-comments/SKILL.md       |  2 +-
 tests/e2e.sh                                  | 33 ++++++++++++++++++-
 tools/new-workspace.sh                        |  7 ++--
 3 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/software/application-software/skills/address-pr-comments/SKILL.md b/software/application-software/skills/address-pr-comments/SKILL.md
index 4729436..3bf22d3 100644
--- a/software/application-software/skills/address-pr-comments/SKILL.md
+++ b/software/application-software/skills/address-pr-comments/SKILL.md
@@ -5,7 +5,7 @@ description: Fetch review comments on a PR (Argos, Nero), judge whether each (in
 
 Propose and apply fixes for a PR's unresolved review feedback. **Never reply to threads**; the user does.
 
-1. **Fetch** from the workspace root: `bash scripts/fetch-feedback.sh <repo> <pr>|<branch>` (`<repo>` as under `repos/`, e.g. `argos`; `--all` first for unfiltered history). It checks out the PR head's worktree and prints JSON: `worktree` (target it by path from the root from now on), unresolved `threads`, `comments`, `reviews`. Any non-zero exit: use the available GitHub integration's the available GitHub PR-reading tool instead.
+1. **Fetch** from the workspace root: `bash scripts/fetch-feedback.sh <repo> <pr>|<branch>` (`<repo>` as under `repos/`, e.g. `argos`; `--all` first for unfiltered history). It checks out the PR head's worktree and prints JSON: `worktree` (target it by path from the root from now on), unresolved `threads`, `comments`, `reviews`. Any non-zero exit: use the available GitHub integration's PR-reading tool instead.
 2. **Judge.** Skip bot noise and anything already fixed at HEAD. For an `outdated` thread, find its `diffHunk` code by content, then label it **addressed**, **applies**, **moved**, **obsolete**, or **unclear**.
 3. **Present** before editing, grouped by file, and ask to confirm, skip, or change each (offer to batch clear ones past 8):
 
diff --git a/tests/e2e.sh b/tests/e2e.sh
index d693e52..9189370 100644
--- a/tests/e2e.sh
+++ b/tests/e2e.sh
@@ -908,7 +908,38 @@ o show "$created:$F/AGENTS.md" | grep -qx '# Codex firmware s.electrical.firmwar
 (cd "$t/dev" && ! tools/new-workspace.sh --harness unknown electrical/firmware bad-harness >/dev/null 2>&1) || fail "unknown authoring harness accepted"
 ok "Codex authoring chooses native template/defaults, preserves project repos and rejects unknown harnesses"
 
-# --- 13. shellcheck, if installed
+# shellcheck disable=SC2016 # child shell edits the sandbox project's defaults
+on_main "project selects Codex by default" bash -c '
+  sed -i.bak "s/harness: claude-code/harness: codex/" "$1/workspace.yml"
+  rm "$1/workspace.yml.bak"
+  mkdir -p "$1/.agents/skills/fw-codex" "$1/.codex"
+  printf "Codex firmware skill\n" >"$1/.agents/skills/fw-codex/SKILL.md"
+  printf "# Codex project defaults\n" >"$1/.codex/config.toml"
+' _ "$FD"
+(cd "$t/dev" && git fetch -q && git checkout -q -B main origin/main &&
+  tools/new-workspace.sh electrical/firmware fw-project-codex >/dev/null) || fail "project-default Codex workspace"
+F=software/electrical/firmware/workspaces/fw-project-codex
+created=new-workspace/electrical/firmware/fw-project-codex
+o show "$created:$F/workspace.yml" | grep -qx 'harness: codex' || fail "project harness default ignored"
+o show "$created:$F/workspace.yml" | grep -q 'fw: https://example.com/fw.git' || fail "default Codex project repos lost"
+o show "$created:$F/AGENTS.md" | grep -qx '# Codex firmware s.electrical.firmware.fw-project-codex' || fail "default Codex native instructions lost"
+o cat-file -e "$created:$F/.agents/skills/fw-codex/SKILL.md" || fail "default Codex native skill lost"
+o cat-file -e "$created:$F/.codex/config.toml" || fail "default Codex project config lost"
+{ ! o cat-file -e "$created:$F/CLAUDE.md" 2>/dev/null && ! o cat-file -e "$created:$F/.claude" 2>/dev/null; } || fail "Claude files leaked into project-default Codex workspace"
+ok "authoring without --harness honors project Codex defaults and preserves native files and repos"
+
+(cd "$t/dev" && tools/new-workspace.sh --harness claude-code electrical/firmware fw-project-claude >/dev/null) || fail "explicit Claude override"
+F=software/electrical/firmware/workspaces/fw-project-claude
+created=new-workspace/electrical/firmware/fw-project-claude
+o show "$created:$F/workspace.yml" | grep -qx 'harness: claude-code' || fail "explicit Claude harness did not override Codex default"
+o show "$created:$F/workspace.yml" | grep -q 'fw: https://example.com/fw.git' || fail "Claude override project repos lost"
+o show "$created:$F/CLAUDE.md" | grep -qx '# Firmware for s.electrical.firmware.fw-project-claude' || fail "Claude override native instructions lost"
+o cat-file -e "$created:$F/.claude/skills/fw/SKILL.md" || fail "Claude override native skill lost"
+{ ! o cat-file -e "$created:$F/AGENTS.md" 2>/dev/null && ! o cat-file -e "$created:$F/.agents" 2>/dev/null &&
+  ! o cat-file -e "$created:$F/.codex" 2>/dev/null; } || fail "Codex files leaked into Claude override"
+ok "explicit Claude selection overrides project Codex defaults and removes foreign native files"
+
+# --- 14. shellcheck, if installed
 if command -v shellcheck >/dev/null; then
   shellcheck "$src"/ci/*.sh "$src"/tools/*.sh "$src"/tests/*.sh "$src"/.delphi/*.sh "$src"/.delphi/migrations/*.sh ||
     fail "shellcheck"
diff --git a/tools/new-workspace.sh b/tools/new-workspace.sh
index b0f79cc..48f077d 100755
--- a/tools/new-workspace.sh
+++ b/tools/new-workspace.sh
@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
-# tools/new-workspace.sh [--by ai|ai-assisted|human] <org-path under software/> <leaf>: propose a new
+# tools/new-workspace.sh [--by ai|ai-assisted|human] [--harness <adapter>] <org-path under software/> <leaf>: propose a new
 # workspace as a PR to main, labelled `by: <who>` (default ai: who wrote it, as the PR template asks).
 # In a temporary worktree of origin/main, copies templates/workspace/ and then, if present, the
-# project's software/<org-path>/workspace-defaults/ (its CLAUDE.md appended to the template's) to
+# project's software/<org-path>/workspace-defaults/ (matching native instructions appended to the template's) to
 # software/<org-path>/workspaces/<leaf>/, sets `name: <name>` in its workspace.yml (its dotted name from
 # .delphi/names.sh, like s.app.argos.argos-dev; the workspace-inherit/ folders above it reach ws/<name>
-# on each sync), lists its default plugin sets and generates its .claude/settings.json (ci/plugins.sh),
+# on each sync), and generates adapter-owned files through ci/harnesses.sh,
 # checks it, pushes branch new-workspace/<org-path>/<leaf>, and opens the PR with gh. Your checkout is
 # untouched. After merge, ci/sync.sh creates ws/<name>.
 set -euo pipefail
@@ -62,7 +62,6 @@ sed -i.bak -e "s|{{name}}|$name|g" -e "s|{{folder}}|$folder|g" "$wt/$folder/$ins
 y=$wt/$folder/workspace.yml
 { echo "name: $name"; echo "harness: $adapter"; awk -v adapter="$adapter" '/^name:|^harness:/ { next } adapter != "claude-code" && /^plugins:/ { skip = 1; next } /^[^[:space:]#]/ { skip = 0 } !skip { print }' "$y"; } >"$y.new" && mv "$y.new" "$y"
 generate_harness "$wt" "$folder" "$wt/$folder"
-bash "$wt/ci/plugins.sh" "$wt" >/dev/null # its plugins: defaults and .claude/settings.json
 "$wt/ci/check.sh" "$wt"
 git -C "$wt" add -A "$folder"
 git -C "$wt" commit --quiet -m "New workspace $name"

From 4d663f76059596c9f2ea96f6fd21b7411c987de2 Mon Sep 17 00:00:00 2001
From: Jesus God <wyattbracy@gmail.com>
Date: Mon, 19 Oct 2026 16:36:28 +0000
Subject: [PATCH 03/18] Remove unnecessary Codex launcher

---
 .delphi/codex.sh                              |  6 -----
 .delphi/manifest.yml                          |  3 +--
 .delphi/versions                              |  1 +
 CLAUDE.md                                     |  2 +-
 README.md                                     |  5 ++---
 docs/design.md                                |  6 ++---
 .../application-software/argos/AUTHORING.md   |  4 ++--
 .../argos/workspaces/default-codex/AGENTS.md  |  4 ++--
 templates/harnesses/codex/AGENTS.md           |  4 ++--
 tests/e2e.sh                                  | 22 +++++++++----------
 10 files changed, 24 insertions(+), 33 deletions(-)
 delete mode 100644 .delphi/codex.sh

diff --git a/.delphi/codex.sh b/.delphi/codex.sh
deleted file mode 100644
index 15f447f..0000000
--- a/.delphi/codex.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-# Start Codex CLI at this workspace with the layout inherited by commands and child processes.
-set -euo pipefail
-# shellcheck source=.delphi/paths.sh
-source "$(dirname "$0")/paths.sh"
-exec codex -C "$DELPHI_ROOT" "$@"
diff --git a/.delphi/manifest.yml b/.delphi/manifest.yml
index 8cb1b9c..6e021b8 100644
--- a/.delphi/manifest.yml
+++ b/.delphi/manifest.yml
@@ -6,7 +6,7 @@
 #   MINOR  something new that existing clones need nothing for
 #   MAJOR  clones need cleanup (MINOR while 0.x): add .delphi/migrations/<version>-<slug>.sh, which
 #          setup.sh runs once per workspace in each clone (rules in Delphi's CLAUDE.md)
-version: 1.3.0
+version: 1.3.1
 files:                        # repo-relative paths; a trailing / means everything under it
   - .delphi/manifest.yml
   - .delphi/.gitattributes
@@ -15,7 +15,6 @@ files:                        # repo-relative paths; a trailing / means everythi
   - .delphi/setup.sh
   - .delphi/new-worktree.sh
   - .delphi/exec.sh
-  - .delphi/codex.sh
   - .delphi/paths.sh
   - .delphi/plugins.sh
   - .delphi/switch.sh
diff --git a/.delphi/versions b/.delphi/versions
index 49053ea..335a467 100644
--- a/.delphi/versions
+++ b/.delphi/versions
@@ -18,3 +18,4 @@
 1.1.0 a3446f7f763c setup.sh clones each repos: entry at repos/<name> (a normal clone on its default branch, was a bare store) and adds no worktree; new-worktree.sh makes worktrees from that clone; older bare stores are left as they are
 1.2.0 d139aaf9f4a5 worktrees come from their own bare store, worktrees/<name>/.bare, separate from the plain clone at repos/<name>; setup.sh makes the store and the default-branch worktree again; an older bare store at repos/<name> is left as it is
 1.3.0 39487f8f28ec portable Codex harness and native shared skill inheritance
+1.3.1 2edd9e9dc9fc remove Codex launcher; discover instructions and skills from the workspace branch
diff --git a/CLAUDE.md b/CLAUDE.md
index 75f7fbe..5f30e9c 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -45,7 +45,7 @@ source of truth; `docs/goals.md` lists what any change must keep.
 - `tests/e2e.sh`: end-to-end test in a throwaway sandbox (bare origin, stub `gh` logging to `gh.log`).
 - `ci/harnesses.sh` declares supported adapters and native paths; `ci/inherit.sh` resolves neutral
   `skills/` and legacy `workspace-inherit/` skill paths for sync and validation. Codex uses
-  `.delphi/codex.sh` for CLI startup and `.delphi/exec.sh` for hosts with independent shells.
+  `.delphi/exec.sh` to initialize helper commands in independent shells.
 
 ## Rules
 
diff --git a/README.md b/README.md
index a1778ea..bf904df 100644
--- a/README.md
+++ b/README.md
@@ -96,11 +96,10 @@ Argos's `default-codex` workspace targets the Codex harness across hosts:
 git clone -b ws/s.app.argos.default-codex https://github.com/Northeastern-Electric-Racing/Delphi.git delphi
 cd delphi
 bash .delphi/setup.sh
-bash .delphi/codex.sh
 ```
 
-The CLI launcher exports the layout before starting Codex. In hosts that start Codex themselves,
-read `AGENTS.md` and use `.delphi/exec.sh` for helper commands; it sets the layout for every command
+Open the checked-out workspace in Codex normally; it discovers `AGENTS.md` and `.agents/skills/`
+from the workspace branch. Follow `AGENTS.md` and use `.delphi/exec.sh` for helper commands; it sets the layout for every command
 and its child processes, even when shell exports do not persist. Start a fresh session after a
 workspace switch. Host dependencies and credentials are configured by the user or host; the
 workspace doesn't depend on a particular cloud environment. Codex does not enable Delphi's Claude
diff --git a/docs/design.md b/docs/design.md
index 6be1ade..2500a92 100644
--- a/docs/design.md
+++ b/docs/design.md
@@ -254,9 +254,9 @@ it prints them as an export line. The adapter supplies layout initialization: fo
 skill scripts'. In a terminal, `. .delphi/paths.sh` from the root. `new-worktree.sh` sources it from
 its own folder; every skill script, plugin or workspace, sources `$DELPHI_ROOT/.delphi/paths.sh` and
 takes only names (repo, branch), never a searched-for path, so the model types only the names.
-Skills themselves stay harness-neutral. Codex CLI starts with `.delphi/codex.sh`, which sources
-the layout and launches `codex -C` at this root. Hosts that launch Codex independently follow
-`AGENTS.md`: determine the absolute root once, then run skill helpers through that root's
+Skills themselves stay harness-neutral. Codex discovers its native instructions and skills from
+the checked-out workspace branch. Agents follow `AGENTS.md`: determine the absolute root once,
+then run skill helpers through that root's
 `.delphi/exec.sh`. It sources the layout on every invocation, preserves the caller's directory,
 and exports it to children; pass this explicit root/wrapper to independently started sub-agents.
 No session hook, shared shell state, or particular managed environment is assumed. Setup and
diff --git a/software/application-software/argos/AUTHORING.md b/software/application-software/argos/AUTHORING.md
index 05d0a2e..f4488f4 100644
--- a/software/application-software/argos/AUTHORING.md
+++ b/software/application-software/argos/AUTHORING.md
@@ -46,8 +46,8 @@ every Argos workspace on the next sync.
 
 ## Codex
 
-The `default-codex` leaf is `ws/s.app.argos.default-codex`. Use `bash .delphi/codex.sh` to start
-Codex CLI after setup. In another Codex host, follow `AGENTS.md` and use `.delphi/exec.sh` for skill
+The `default-codex` leaf is `ws/s.app.argos.default-codex`. Open that workspace branch in Codex
+normally, then follow `AGENTS.md` and use `.delphi/exec.sh` for skill
 helpers in fresh shells and sub-agents. This workspace carries Argos workflows and dependency
 references without prescribing a cloud environment, credentials or Codex permission settings.
 Check required local tooling before running a workflow; use available browser/GitHub integrations
diff --git a/software/application-software/argos/workspaces/default-codex/AGENTS.md b/software/application-software/argos/workspaces/default-codex/AGENTS.md
index c9e4307..476be53 100644
--- a/software/application-software/argos/workspaces/default-codex/AGENTS.md
+++ b/software/application-software/argos/workspaces/default-codex/AGENTS.md
@@ -3,9 +3,9 @@
 You're in Delphi workspace `s.app.argos.default-codex` (branch `ws/s.app.argos.default-codex`); code repos are cloned at `repos/<repo>/`, and separately checked out as worktrees under `worktrees/<repo>/` (`.delphi/setup.sh` makes the default branch's). Work in worktrees: make each new branch one under `worktrees/<repo>/<branch>` (`new-worktree` skill) unless the user says not to. Read-only dependency sources from `references-git:` are checked out under `references/<name>/` at the version the workspace pins: read them to learn how a dependency behaves (prefer them over web docs), and never edit, branch, or push them. Delphi workspaces (or `main`) under `workspaces:` in `workspace.yml` (`- <name>`, a workspace's dotted name like `s.app.argos.argos-dev`, or `- main`) are clones at `workspaces/<name>/`, each on its branch, for reading their context (don't edit them from here; setup switches each back to its branch and pulls it); change what's checked out with the `setup-workspace` skill. To work in another workspace, switch this clone to it (`switch-workspace` skill). Park rough notes with the `journal` skill. Work here unless the task clearly belongs to another project.
 
 
-## Codex startup
+## Workspace setup
 
-For Codex CLI, run `bash .delphi/codex.sh` from this clone. In other Codex hosts, first read `workspace.yml` and run `bash .delphi/paths.sh` from this workspace root to learn its absolute path. Run `bash .delphi/setup.sh` when the repositories have not been set up.
+Work from the checked-out workspace root, where `workspace.yml` is. Run `bash .delphi/paths.sh` from this root to learn its absolute path, and run `bash .delphi/setup.sh` when the repositories have not been set up.
 
 Shell exports may not persist between commands or reach independently launched sub-agents. Run skill helpers through `bash <absolute-workspace-root>/.delphi/exec.sh bash <absolute-skill-folder>/scripts/<script>.sh <names>...`; this sets the layout on every invocation and preserves the caller's working directory. Pass the workspace's absolute path and this rule to sub-agents. Native skills live under `.agents/skills/`. After a workspace switch, start a fresh Codex session before further work.
 
diff --git a/templates/harnesses/codex/AGENTS.md b/templates/harnesses/codex/AGENTS.md
index 1874066..3ba5d97 100644
--- a/templates/harnesses/codex/AGENTS.md
+++ b/templates/harnesses/codex/AGENTS.md
@@ -3,9 +3,9 @@
 You're in Delphi workspace `{{name}}` (branch `ws/{{name}}`); code repos are cloned at `repos/<repo>/`, and separately checked out as worktrees under `worktrees/<repo>/` (`.delphi/setup.sh` makes the default branch's). Work in worktrees: make each new branch one under `worktrees/<repo>/<branch>` (`new-worktree` skill) unless the user says not to. Read-only dependency sources from `references-git:` are checked out under `references/<name>/` at the version the workspace pins: read them to learn how a dependency behaves (prefer them over web docs), and never edit, branch, or push them. Delphi workspaces (or `main`) under `workspaces:` in `workspace.yml` (`- <name>`, a workspace's dotted name like `s.app.argos.argos-dev`, or `- main`) are clones at `workspaces/<name>/`, each on its branch, for reading their context (don't edit them from here; setup switches each back to its branch and pulls it); change what's checked out with the `setup-workspace` skill. To work in another workspace, switch this clone to it (`switch-workspace` skill). Park rough notes with the `journal` skill. Work here unless the task clearly belongs to another project.
 
 
-## Codex startup
+## Workspace setup
 
-For Codex CLI, run `bash .delphi/codex.sh` from this clone. In other Codex hosts, first read `workspace.yml` and run `bash .delphi/paths.sh` from this workspace root to learn its absolute path. Run `bash .delphi/setup.sh` when the repositories have not been set up.
+Work from the checked-out workspace root, where `workspace.yml` is. Run `bash .delphi/paths.sh` from this root to learn its absolute path, and run `bash .delphi/setup.sh` when the repositories have not been set up.
 
 Shell exports may not persist between commands or reach independently launched sub-agents. Run skill helpers through `bash <absolute-workspace-root>/.delphi/exec.sh bash <absolute-skill-folder>/scripts/<script>.sh <names>...`; this sets the layout on every invocation and preserves the caller's working directory. Pass the workspace's absolute path and this rule to sub-agents. Native skills live under `.agents/skills/`. After a workspace switch, start a fresh Codex session before further work.
 
diff --git a/tests/e2e.sh b/tests/e2e.sh
index 9189370..168c1f4 100644
--- a/tests/e2e.sh
+++ b/tests/e2e.sh
@@ -868,20 +868,18 @@ sync "$CN" >"$t/out" 2>&1 || fail "retire owned skill source: $(cat "$t/out")"
 o show "ws/$CN:.agents/skills/portable/SKILL.md" | grep -qx "Codex own" || fail "former opt-out owned skill was deleted"
 ok "removing a shared source and old opt-out preserves the former workspace-owned skill"
 
-# No real Codex invocation: assert launch arguments and exports in a stub and fresh child shell.
-cat >"$t/bin/codex" <<'CODEX'
-#!/usr/bin/env bash
-set -euo pipefail
-[ "$1" = -C ] && [ "$2" = "$DELPHI_ROOT" ] && [ "$3" = "argument with spaces" ]
-[ "$DELPHI_REPOS" = "$DELPHI_ROOT/repos" ]
-bash -c '[ "$DELPHI_WORKTREES" = "$DELPHI_ROOT/worktrees" ]'
-CODEX
-chmod +x "$t/bin/codex"
+# Helper commands initialize their layout independently of Codex or the caller's shell exports.
 w=$t/codex && git clone -q -b "ws/$CN" "$t/origin.git" "$w"
-(cd "$t" && env -u DELPHI_ROOT -u DELPHI_REPOS -u DELPHI_WORKTREES bash "$w/.delphi/codex.sh" "argument with spaces") || fail "Codex launcher exports/arguments"
 # shellcheck disable=SC2016 # fresh shell must receive the exports
-(cd "$t" && env -u DELPHI_ROOT bash "$w/.delphi/exec.sh" bash -c '[ "$PWD" != "$DELPHI_ROOT" ] && [ -f "$DELPHI_ROOT/AGENTS.md" ]') || fail "fresh host command wrapper"
-ok "Codex launcher and per-command bootstrap propagate layout to fresh shells and children while preserving arguments/cwd"
+(cd "$t" && env -u DELPHI_ROOT -u DELPHI_REPOS -u DELPHI_WORKTREES bash "$w/.delphi/exec.sh" bash -c '
+  set -e
+  [ "$1" = "argument with spaces" ]
+  [ "$PWD" != "$DELPHI_ROOT" ]
+  [ -f "$DELPHI_ROOT/AGENTS.md" ]
+  [ "$DELPHI_REPOS" = "$DELPHI_ROOT/repos" ]
+  bash -c '\''[ "$DELPHI_WORKTREES" = "$DELPHI_ROOT/worktrees" ]'\''
+' _ "argument with spaces") || fail "fresh host command wrapper"
+ok "per-command bootstrap propagates layout to fresh shells and children while preserving arguments/cwd"
 # Proxy capability selection uses stubs only, without GitHub/network access.
 mkdir -p "$t/proxy-bin"
 printf '#!/usr/bin/env bash\nexit 1\n' >"$t/proxy-bin/gh"

From 95ebe3d6556696a67751c0ec7c7fb0ca887058ea Mon Sep 17 00:00:00 2001
From: Jesus God <wyattbracy@gmail.com>
Date: Tue, 20 Oct 2026 03:39:04 +0000
Subject: [PATCH 04/18] Render native workspace context on main

---
 CLAUDE.md                                     |  16 +-
 README.md                                     |  42 ++--
 ci/check.sh                                   |  69 ++----
 ci/harnesses.sh                               |  25 +-
 ci/inherit.sh                                 |  29 ++-
 ci/managed.sh                                 |  44 ++++
 ci/plugins.sh                                 |   6 +-
 ci/render.sh                                  | 115 +++++++++
 ci/sources.sh                                 |  70 ++++++
 ci/sync.sh                                    | 204 ++++++++--------
 docs/design.md                                | 181 +++++++-------
 docs/goals.md                                 |   3 +-
 .../application-software/argos/AUTHORING.md   |  11 +-
 .../argos/workspace-defaults/AGENTS.md        |  59 -----
 .../workspace-defaults/{ => files}/CLAUDE.md  |   8 +-
 .../{ => files}/workspace.yml                 |   0
 .../argos/workspace-defaults/source.yml       |   1 +
 .../skills/address-pr-comments/SKILL.md       |  18 ++
 .../scripts/fetch-feedback.sh                 |  48 ++++
 .../address-pr-comments/scripts/github.sh     |  19 ++
 .../argos-dev/.claude/skills/commit/SKILL.md  |   6 +
 .../skills/consolidate-spikes/SKILL.md        |  14 ++
 .../.claude/skills/create-ticket/SKILL.md     |  66 +++++
 .../.claude/skills/implement/SKILL.md         |  14 ++
 .../argos-dev/.claude/skills/journal/SKILL.md |  22 ++
 .../.claude/skills/journal/scripts/capture.sh |  17 ++
 .../.claude/skills/new-worktree/SKILL.md      |  16 ++
 .../argos-dev/.claude/skills/open-pr/SKILL.md |  22 ++
 .../skills/open-pr/scripts/pr-checks.sh       |  23 ++
 .../.claude/skills/pr-conventions/SKILL.md    |  14 ++
 .../skills/pr-conventions/scripts/lint.sh     |  15 ++
 .../.claude/skills/report-spike/SKILL.md      |  22 ++
 .../.claude/skills/run-local/SKILL.md         |  14 ++
 .../skills/run-local/scripts/run-local.sh     |  66 +++++
 .../.claude/skills/run-local/scripts/serve.sh |  59 +++++
 .../.claude/skills/setup-workspace/SKILL.md   |  18 ++
 .../.claude/skills/switch-workspace/SKILL.md  |  19 ++
 .../skills/ticket-conventions/SKILL.md        |  14 ++
 .../.claude/skills/update-pr/SKILL.md         |   6 +
 .../.claude/skills/verify-graph/SKILL.md      |  23 ++
 .../skills/verify-graph/scripts/check.js      |  83 +++++++
 .../skills/verify-graph/scripts/check.sh      |  14 ++
 .../skills/verify-graph/scripts/open.sh       |  14 ++
 .../skills/verify-graph/scripts/perf.js       |  38 +++
 .../skills/verify-graph/scripts/perf.sh       |  19 ++
 .../skills/verify-graph/scripts/seed.sh       |  31 +++
 .../skills/verify-graph/scripts/select-run.sh |  18 ++
 .../.claude/skills/verify-telemetry/SKILL.md  |  16 ++
 .../verify-telemetry/scripts/check-topic.sh   |  28 +++
 .../workspaces/argos-dev/workspace.generated  |  34 +++
 .../skills/address-pr-comments/SKILL.md       |  18 ++
 .../scripts/fetch-feedback.sh                 |  48 ++++
 .../address-pr-comments/scripts/github.sh     |  19 ++
 .../.agents/skills/commit/SKILL.md            |   6 +
 .../skills/consolidate-spikes/SKILL.md        |  14 ++
 .../.agents/skills/create-ticket/SKILL.md     |  66 +++++
 .../.agents/skills/implement/SKILL.md         |  14 ++
 .../.agents/skills/journal/SKILL.md           |  22 ++
 .../.agents/skills/journal/scripts/capture.sh |  17 ++
 .../.agents/skills/new-worktree/SKILL.md      |  16 ++
 .../.agents/skills/open-pr/SKILL.md           |  22 ++
 .../skills/open-pr/scripts/pr-checks.sh       |  23 ++
 .../.agents/skills/pr-conventions/SKILL.md    |  14 ++
 .../skills/pr-conventions/scripts/lint.sh     |  15 ++
 .../.agents/skills/report-spike/SKILL.md      |  22 ++
 .../.agents/skills/run-local/SKILL.md         |  14 ++
 .../skills/run-local/scripts/run-local.sh     |  66 +++++
 .../.agents/skills/run-local/scripts/serve.sh |  59 +++++
 .../.agents/skills/setup-workspace/SKILL.md   |  18 ++
 .../.agents/skills/switch-workspace/SKILL.md  |  19 ++
 .../skills/ticket-conventions/SKILL.md        |  14 ++
 .../.agents/skills/update-pr/SKILL.md         |   6 +
 .../.agents/skills/verify-graph/SKILL.md      |  23 ++
 .../skills/verify-graph/scripts/check.js      |  83 +++++++
 .../skills/verify-graph/scripts/check.sh      |  14 ++
 .../skills/verify-graph/scripts/open.sh       |  14 ++
 .../skills/verify-graph/scripts/perf.js       |  38 +++
 .../skills/verify-graph/scripts/perf.sh       |  19 ++
 .../skills/verify-graph/scripts/seed.sh       |  31 +++
 .../skills/verify-graph/scripts/select-run.sh |  18 ++
 .../.agents/skills/verify-telemetry/SKILL.md  |  16 ++
 .../verify-telemetry/scripts/check-topic.sh   |  28 +++
 .../default-codex/workspace.generated         |  33 +++
 .../skills/address-pr-comments/SKILL.md       |  18 ++
 .../scripts/fetch-feedback.sh                 |  48 ++++
 .../address-pr-comments/scripts/github.sh     |  19 ++
 .../.claude/skills/commit/SKILL.md            |   6 +
 .../skills/consolidate-spikes/SKILL.md        |  14 ++
 .../.claude/skills/create-ticket/SKILL.md     |  66 +++++
 .../.claude/skills/implement/SKILL.md         |  14 ++
 .../.claude/skills/journal/SKILL.md           |  22 ++
 .../.claude/skills/journal/scripts/capture.sh |  17 ++
 .../.claude/skills/new-worktree/SKILL.md      |  16 ++
 .../.claude/skills/open-pr/SKILL.md           |  22 ++
 .../skills/open-pr/scripts/pr-checks.sh       |  23 ++
 .../.claude/skills/pr-conventions/SKILL.md    |  14 ++
 .../skills/pr-conventions/scripts/lint.sh     |  15 ++
 .../.claude/skills/report-spike/SKILL.md      |  22 ++
 .../.claude/skills/run-local/SKILL.md         |  14 ++
 .../skills/run-local/scripts/run-local.sh     |  66 +++++
 .../.claude/skills/run-local/scripts/serve.sh |  59 +++++
 .../.claude/skills/setup-workspace/SKILL.md   |  18 ++
 .../.claude/skills/switch-workspace/SKILL.md  |  19 ++
 .../skills/ticket-conventions/SKILL.md        |  14 ++
 .../.claude/skills/update-pr/SKILL.md         |   6 +
 .../.claude/skills/verify-graph/SKILL.md      |  23 ++
 .../skills/verify-graph/scripts/check.js      |  83 +++++++
 .../skills/verify-graph/scripts/check.sh      |  14 ++
 .../skills/verify-graph/scripts/open.sh       |  14 ++
 .../skills/verify-graph/scripts/perf.js       |  38 +++
 .../skills/verify-graph/scripts/perf.sh       |  19 ++
 .../skills/verify-graph/scripts/seed.sh       |  31 +++
 .../skills/verify-graph/scripts/select-run.sh |  18 ++
 .../.claude/skills/verify-telemetry/SKILL.md  |  16 ++
 .../verify-telemetry/scripts/check-topic.sh   |  28 +++
 .../experimental/workspace.generated          |  34 +++
 .../skills/address-pr-comments/SKILL.md       |  18 ++
 .../scripts/fetch-feedback.sh                 |  48 ++++
 .../address-pr-comments/scripts/github.sh     |  19 ++
 .../.claude/skills/commit/SKILL.md            |   6 +
 .../skills/consolidate-spikes/SKILL.md        |  14 ++
 .../.claude/skills/create-ticket/SKILL.md     |  66 +++++
 .../.claude/skills/journal/SKILL.md           |  22 ++
 .../.claude/skills/journal/scripts/capture.sh |  17 ++
 .../.claude/skills/new-worktree/SKILL.md      |  16 ++
 .../.claude/skills/open-pr/SKILL.md           |  22 ++
 .../skills/open-pr/scripts/pr-checks.sh       |  23 ++
 .../.claude/skills/pr-conventions/SKILL.md    |  14 ++
 .../.claude/skills/report-spike/SKILL.md      |  22 ++
 .../.claude/skills/setup-workspace/SKILL.md   |  18 ++
 .../.claude/skills/switch-workspace/SKILL.md  |  19 ++
 .../skills/ticket-conventions/SKILL.md        |  13 +
 .../.claude/skills/update-pr/SKILL.md         |   6 +
 .../nero-experimental/workspace.generated     |  19 ++
 .../skills/address-pr-comments/SKILL.md       |  18 ++
 .../scripts/fetch-feedback.sh                 |  48 ++++
 .../address-pr-comments/scripts/github.sh     |  19 ++
 .../hub/.claude/skills/commit/SKILL.md        |   6 +
 .../skills/consolidate-spikes/SKILL.md        |  14 ++
 .../hub/.claude/skills/create-ticket/SKILL.md |  66 +++++
 .../hub/.claude/skills/journal/SKILL.md       |  22 ++
 .../.claude/skills/journal/scripts/capture.sh |  17 ++
 .../hub/.claude/skills/new-worktree/SKILL.md  |  16 ++
 .../hub/.claude/skills/open-pr/SKILL.md       |  22 ++
 .../skills/open-pr/scripts/pr-checks.sh       |  23 ++
 .../hub/.claude/skills/report-spike/SKILL.md  |  22 ++
 .../.claude/skills/setup-workspace/SKILL.md   |  18 ++
 .../.claude/skills/switch-workspace/SKILL.md  |  19 ++
 .../hub/.claude/skills/update-pr/SKILL.md     |   6 +
 .../workspaces/hub/workspace.generated        |  17 ++
 .../.claude/skills/journal/SKILL.md           |  22 ++
 .../.claude/skills/journal/scripts/capture.sh |  17 ++
 .../.claude/skills/new-worktree/SKILL.md      |  16 ++
 .../.claude/skills/setup-workspace/SKILL.md   |  18 ++
 .../.claude/skills/switch-workspace/SKILL.md  |  19 ++
 .../calypso-dev/workspace.generated           |   7 +
 tests/e2e.sh                                  | 226 +++++++++++-------
 tools/new-workspace.sh                        |  46 ++--
 158 files changed, 4067 insertions(+), 471 deletions(-)
 create mode 100644 ci/managed.sh
 create mode 100755 ci/render.sh
 create mode 100644 ci/sources.sh
 delete mode 100644 software/application-software/argos/workspace-defaults/AGENTS.md
 rename software/application-software/argos/workspace-defaults/{ => files}/CLAUDE.md (88%)
 rename software/application-software/argos/workspace-defaults/{ => files}/workspace.yml (100%)
 create mode 100644 software/application-software/argos/workspace-defaults/source.yml
 create mode 100644 software/application-software/argos/workspaces/argos-dev/.claude/skills/address-pr-comments/SKILL.md
 create mode 100755 software/application-software/argos/workspaces/argos-dev/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh
 create mode 100644 software/application-software/argos/workspaces/argos-dev/.claude/skills/address-pr-comments/scripts/github.sh
 create mode 100644 software/application-software/argos/workspaces/argos-dev/.claude/skills/commit/SKILL.md
 create mode 100644 software/application-software/argos/workspaces/argos-dev/.claude/skills/consolidate-spikes/SKILL.md
 create mode 100644 software/application-software/argos/workspaces/argos-dev/.claude/skills/create-ticket/SKILL.md
 create mode 100644 software/application-software/argos/workspaces/argos-dev/.claude/skills/implement/SKILL.md
 create mode 100644 software/application-software/argos/workspaces/argos-dev/.claude/skills/journal/SKILL.md
 create mode 100755 software/application-software/argos/workspaces/argos-dev/.claude/skills/journal/scripts/capture.sh
 create mode 100644 software/application-software/argos/workspaces/argos-dev/.claude/skills/new-worktree/SKILL.md
 create mode 100644 software/application-software/argos/workspaces/argos-dev/.claude/skills/open-pr/SKILL.md
 create mode 100755 software/application-software/argos/workspaces/argos-dev/.claude/skills/open-pr/scripts/pr-checks.sh
 create mode 100644 software/application-software/argos/workspaces/argos-dev/.claude/skills/pr-conventions/SKILL.md
 create mode 100644 software/application-software/argos/workspaces/argos-dev/.claude/skills/pr-conventions/scripts/lint.sh
 create mode 100644 software/application-software/argos/workspaces/argos-dev/.claude/skills/report-spike/SKILL.md
 create mode 100644 software/application-software/argos/workspaces/argos-dev/.claude/skills/run-local/SKILL.md
 create mode 100755 software/application-software/argos/workspaces/argos-dev/.claude/skills/run-local/scripts/run-local.sh
 create mode 100755 software/application-software/argos/workspaces/argos-dev/.claude/skills/run-local/scripts/serve.sh
 create mode 100644 software/application-software/argos/workspaces/argos-dev/.claude/skills/setup-workspace/SKILL.md
 create mode 100644 software/application-software/argos/workspaces/argos-dev/.claude/skills/switch-workspace/SKILL.md
 create mode 100644 software/application-software/argos/workspaces/argos-dev/.claude/skills/ticket-conventions/SKILL.md
 create mode 100644 software/application-software/argos/workspaces/argos-dev/.claude/skills/update-pr/SKILL.md
 create mode 100644 software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/SKILL.md
 create mode 100644 software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/check.js
 create mode 100755 software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/check.sh
 create mode 100755 software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/open.sh
 create mode 100644 software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/perf.js
 create mode 100755 software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/perf.sh
 create mode 100755 software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/seed.sh
 create mode 100755 software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/select-run.sh
 create mode 100644 software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-telemetry/SKILL.md
 create mode 100755 software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-telemetry/scripts/check-topic.sh
 create mode 100644 software/application-software/argos/workspaces/argos-dev/workspace.generated
 create mode 100644 software/application-software/argos/workspaces/default-codex/.agents/skills/address-pr-comments/SKILL.md
 create mode 100755 software/application-software/argos/workspaces/default-codex/.agents/skills/address-pr-comments/scripts/fetch-feedback.sh
 create mode 100644 software/application-software/argos/workspaces/default-codex/.agents/skills/address-pr-comments/scripts/github.sh
 create mode 100644 software/application-software/argos/workspaces/default-codex/.agents/skills/commit/SKILL.md
 create mode 100644 software/application-software/argos/workspaces/default-codex/.agents/skills/consolidate-spikes/SKILL.md
 create mode 100644 software/application-software/argos/workspaces/default-codex/.agents/skills/create-ticket/SKILL.md
 create mode 100644 software/application-software/argos/workspaces/default-codex/.agents/skills/implement/SKILL.md
 create mode 100644 software/application-software/argos/workspaces/default-codex/.agents/skills/journal/SKILL.md
 create mode 100755 software/application-software/argos/workspaces/default-codex/.agents/skills/journal/scripts/capture.sh
 create mode 100644 software/application-software/argos/workspaces/default-codex/.agents/skills/new-worktree/SKILL.md
 create mode 100644 software/application-software/argos/workspaces/default-codex/.agents/skills/open-pr/SKILL.md
 create mode 100755 software/application-software/argos/workspaces/default-codex/.agents/skills/open-pr/scripts/pr-checks.sh
 create mode 100644 software/application-software/argos/workspaces/default-codex/.agents/skills/pr-conventions/SKILL.md
 create mode 100644 software/application-software/argos/workspaces/default-codex/.agents/skills/pr-conventions/scripts/lint.sh
 create mode 100644 software/application-software/argos/workspaces/default-codex/.agents/skills/report-spike/SKILL.md
 create mode 100644 software/application-software/argos/workspaces/default-codex/.agents/skills/run-local/SKILL.md
 create mode 100755 software/application-software/argos/workspaces/default-codex/.agents/skills/run-local/scripts/run-local.sh
 create mode 100755 software/application-software/argos/workspaces/default-codex/.agents/skills/run-local/scripts/serve.sh
 create mode 100644 software/application-software/argos/workspaces/default-codex/.agents/skills/setup-workspace/SKILL.md
 create mode 100644 software/application-software/argos/workspaces/default-codex/.agents/skills/switch-workspace/SKILL.md
 create mode 100644 software/application-software/argos/workspaces/default-codex/.agents/skills/ticket-conventions/SKILL.md
 create mode 100644 software/application-software/argos/workspaces/default-codex/.agents/skills/update-pr/SKILL.md
 create mode 100644 software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/SKILL.md
 create mode 100644 software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/check.js
 create mode 100755 software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/check.sh
 create mode 100755 software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/open.sh
 create mode 100644 software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/perf.js
 create mode 100755 software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/perf.sh
 create mode 100755 software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/seed.sh
 create mode 100755 software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/select-run.sh
 create mode 100644 software/application-software/argos/workspaces/default-codex/.agents/skills/verify-telemetry/SKILL.md
 create mode 100755 software/application-software/argos/workspaces/default-codex/.agents/skills/verify-telemetry/scripts/check-topic.sh
 create mode 100644 software/application-software/argos/workspaces/default-codex/workspace.generated
 create mode 100644 software/application-software/argos/workspaces/experimental/.claude/skills/address-pr-comments/SKILL.md
 create mode 100755 software/application-software/argos/workspaces/experimental/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh
 create mode 100644 software/application-software/argos/workspaces/experimental/.claude/skills/address-pr-comments/scripts/github.sh
 create mode 100644 software/application-software/argos/workspaces/experimental/.claude/skills/commit/SKILL.md
 create mode 100644 software/application-software/argos/workspaces/experimental/.claude/skills/consolidate-spikes/SKILL.md
 create mode 100644 software/application-software/argos/workspaces/experimental/.claude/skills/create-ticket/SKILL.md
 create mode 100644 software/application-software/argos/workspaces/experimental/.claude/skills/implement/SKILL.md
 create mode 100644 software/application-software/argos/workspaces/experimental/.claude/skills/journal/SKILL.md
 create mode 100755 software/application-software/argos/workspaces/experimental/.claude/skills/journal/scripts/capture.sh
 create mode 100644 software/application-software/argos/workspaces/experimental/.claude/skills/new-worktree/SKILL.md
 create mode 100644 software/application-software/argos/workspaces/experimental/.claude/skills/open-pr/SKILL.md
 create mode 100755 software/application-software/argos/workspaces/experimental/.claude/skills/open-pr/scripts/pr-checks.sh
 create mode 100644 software/application-software/argos/workspaces/experimental/.claude/skills/pr-conventions/SKILL.md
 create mode 100644 software/application-software/argos/workspaces/experimental/.claude/skills/pr-conventions/scripts/lint.sh
 create mode 100644 software/application-software/argos/workspaces/experimental/.claude/skills/report-spike/SKILL.md
 create mode 100644 software/application-software/argos/workspaces/experimental/.claude/skills/run-local/SKILL.md
 create mode 100755 software/application-software/argos/workspaces/experimental/.claude/skills/run-local/scripts/run-local.sh
 create mode 100755 software/application-software/argos/workspaces/experimental/.claude/skills/run-local/scripts/serve.sh
 create mode 100644 software/application-software/argos/workspaces/experimental/.claude/skills/setup-workspace/SKILL.md
 create mode 100644 software/application-software/argos/workspaces/experimental/.claude/skills/switch-workspace/SKILL.md
 create mode 100644 software/application-software/argos/workspaces/experimental/.claude/skills/ticket-conventions/SKILL.md
 create mode 100644 software/application-software/argos/workspaces/experimental/.claude/skills/update-pr/SKILL.md
 create mode 100644 software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/SKILL.md
 create mode 100644 software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/check.js
 create mode 100755 software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/check.sh
 create mode 100755 software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/open.sh
 create mode 100644 software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/perf.js
 create mode 100755 software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/perf.sh
 create mode 100755 software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/seed.sh
 create mode 100755 software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/select-run.sh
 create mode 100644 software/application-software/argos/workspaces/experimental/.claude/skills/verify-telemetry/SKILL.md
 create mode 100755 software/application-software/argos/workspaces/experimental/.claude/skills/verify-telemetry/scripts/check-topic.sh
 create mode 100644 software/application-software/argos/workspaces/experimental/workspace.generated
 create mode 100644 software/application-software/nero/workspaces/nero-experimental/.claude/skills/address-pr-comments/SKILL.md
 create mode 100755 software/application-software/nero/workspaces/nero-experimental/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh
 create mode 100644 software/application-software/nero/workspaces/nero-experimental/.claude/skills/address-pr-comments/scripts/github.sh
 create mode 100644 software/application-software/nero/workspaces/nero-experimental/.claude/skills/commit/SKILL.md
 create mode 100644 software/application-software/nero/workspaces/nero-experimental/.claude/skills/consolidate-spikes/SKILL.md
 create mode 100644 software/application-software/nero/workspaces/nero-experimental/.claude/skills/create-ticket/SKILL.md
 create mode 100644 software/application-software/nero/workspaces/nero-experimental/.claude/skills/journal/SKILL.md
 create mode 100755 software/application-software/nero/workspaces/nero-experimental/.claude/skills/journal/scripts/capture.sh
 create mode 100644 software/application-software/nero/workspaces/nero-experimental/.claude/skills/new-worktree/SKILL.md
 create mode 100644 software/application-software/nero/workspaces/nero-experimental/.claude/skills/open-pr/SKILL.md
 create mode 100755 software/application-software/nero/workspaces/nero-experimental/.claude/skills/open-pr/scripts/pr-checks.sh
 create mode 100644 software/application-software/nero/workspaces/nero-experimental/.claude/skills/pr-conventions/SKILL.md
 create mode 100644 software/application-software/nero/workspaces/nero-experimental/.claude/skills/report-spike/SKILL.md
 create mode 100644 software/application-software/nero/workspaces/nero-experimental/.claude/skills/setup-workspace/SKILL.md
 create mode 100644 software/application-software/nero/workspaces/nero-experimental/.claude/skills/switch-workspace/SKILL.md
 create mode 100644 software/application-software/nero/workspaces/nero-experimental/.claude/skills/ticket-conventions/SKILL.md
 create mode 100644 software/application-software/nero/workspaces/nero-experimental/.claude/skills/update-pr/SKILL.md
 create mode 100644 software/application-software/nero/workspaces/nero-experimental/workspace.generated
 create mode 100644 software/application-software/workspaces/hub/.claude/skills/address-pr-comments/SKILL.md
 create mode 100755 software/application-software/workspaces/hub/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh
 create mode 100644 software/application-software/workspaces/hub/.claude/skills/address-pr-comments/scripts/github.sh
 create mode 100644 software/application-software/workspaces/hub/.claude/skills/commit/SKILL.md
 create mode 100644 software/application-software/workspaces/hub/.claude/skills/consolidate-spikes/SKILL.md
 create mode 100644 software/application-software/workspaces/hub/.claude/skills/create-ticket/SKILL.md
 create mode 100644 software/application-software/workspaces/hub/.claude/skills/journal/SKILL.md
 create mode 100755 software/application-software/workspaces/hub/.claude/skills/journal/scripts/capture.sh
 create mode 100644 software/application-software/workspaces/hub/.claude/skills/new-worktree/SKILL.md
 create mode 100644 software/application-software/workspaces/hub/.claude/skills/open-pr/SKILL.md
 create mode 100755 software/application-software/workspaces/hub/.claude/skills/open-pr/scripts/pr-checks.sh
 create mode 100644 software/application-software/workspaces/hub/.claude/skills/report-spike/SKILL.md
 create mode 100644 software/application-software/workspaces/hub/.claude/skills/setup-workspace/SKILL.md
 create mode 100644 software/application-software/workspaces/hub/.claude/skills/switch-workspace/SKILL.md
 create mode 100644 software/application-software/workspaces/hub/.claude/skills/update-pr/SKILL.md
 create mode 100644 software/application-software/workspaces/hub/workspace.generated
 create mode 100644 software/firmware/calypso/workspaces/calypso-dev/.claude/skills/journal/SKILL.md
 create mode 100755 software/firmware/calypso/workspaces/calypso-dev/.claude/skills/journal/scripts/capture.sh
 create mode 100644 software/firmware/calypso/workspaces/calypso-dev/.claude/skills/new-worktree/SKILL.md
 create mode 100644 software/firmware/calypso/workspaces/calypso-dev/.claude/skills/setup-workspace/SKILL.md
 create mode 100644 software/firmware/calypso/workspaces/calypso-dev/.claude/skills/switch-workspace/SKILL.md
 create mode 100644 software/firmware/calypso/workspaces/calypso-dev/workspace.generated

diff --git a/CLAUDE.md b/CLAUDE.md
index 5f30e9c..fa157f7 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -19,7 +19,7 @@ source of truth; `docs/goals.md` lists what any change must keep.
   (`software/**/plugins/<harness>/<set>/`, named `<scope>[.<set>]`; a folder's scope is its
   `plugins/scope`, else its `short-name`, else its name), each Claude Code workspace's `workspace.yml` `plugins:` defaults (the
   `default` set of every folder above), and its `.claude/settings.json` (enabled sets, and the SessionStart hook that sets `$DELPHI_ROOT`; never edit
-  it by hand). Run it after changing a set or a `workspace.yml`'s `plugins:`.
+  it by hand). `ci/render.sh` calls it on main before recording managed outputs.
 - `.delphi/{setup,new-worktree,switch,park,plugins}.sh`: the scripts every workspace runs (setup.sh
   runs `plugins.sh`, which makes this clone's local `@delphi` installs what the workspace enables and
   uninstalls ones the marketplace dropped, so plugin changes need no migration); `.delphi/paths.sh`
@@ -38,13 +38,17 @@ source of truth; `docs/goals.md` lists what any change must keep.
   `/ws-delphi --web` serves the same cards in a browser tab (`web/server.py`, `web/index.html`).
 - `software/…/workspaces/<leaf>/`: the workspaces. Org structure is plain directories. A project
   folder (the one holding `workspaces/`) may add `README.md`, `AUTHORING.md`, and `workspace-defaults/`
-  (copied once into a new workspace there). Any folder may add `workspace-inherit/` (written onto the
-  `ws/*` root of every workspace below on each refresh, never proposed; `opt-out:` in a
-  `workspace.yml` skips a path).
+  (translated once into a new workspace there). Source bundles declare `format:` in `source.yml`
+  and keep their payload under `files/`. Any org/project folder may add `workspace-inherit/`;
+  `ci/render.sh` materializes managed native copies on main, and refresh copies them to ws branches.
+  `workspace.generated` records ownership; `opt-out:` transfers a native path to the workspace.
 - `.github/workflows/delphi.yml` (identical to the template's copy), `.github/CODEOWNERS`; issue templates (idea, spike, epic, dev work) and the PR template in `.github/`, filed with the `create-ticket` skill (`.claude/skills/`).
 - `tests/e2e.sh`: end-to-end test in a throwaway sandbox (bare origin, stub `gh` logging to `gh.log`).
-- `ci/harnesses.sh` declares supported adapters and native paths; `ci/inherit.sh` resolves neutral
-  `skills/` and legacy `workspace-inherit/` skill paths for sync and validation. Codex uses
+- `ci/render.sh [--check]`: prepare native workspace output on main (or check freshness). Run it
+  after shared-source, harness, ownership or plugin changes and include outputs in the same PR.
+  `ci/harnesses.sh` declares targets; `ci/sources.sh` reads independent source formats;
+  `ci/inherit.sh` resolves sources. `ci/managed.sh` shares ownership logic with sync, which does no
+  harness conversion during refresh. Every workspace must explicitly declare its harness. Codex uses
   `.delphi/exec.sh` to initialize helper commands in independent shells.
 
 ## Rules
diff --git a/README.md b/README.md
index bf904df..2bf2cb7 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,8 @@ named by the **short name** of each folder above it, from `software/` down, then
 name, joined by dots: `software/application-software/argos/workspaces/argos-dev` is
 `s.app.argos.argos-dev` (a folder's short name is its `short-name` file, else its name;
 `.delphi/names.sh` prints them all). For each one, CI keeps a branch **`ws/<name>`**
-whose repo root *is* that folder, so people and agents work on it with plain git. Design: `docs/design.md`. Goals: `docs/goals.md`.
+whose repo root *is* that folder. Each workspace explicitly declares its harness, and its folder on
+`main` already contains native files for that harness. People and agents work on it with plain git. Design: `docs/design.md`. Goals: `docs/goals.md`.
 
 ## How it works
 
@@ -83,8 +84,9 @@ references are there too (a workspace inside another's `workspaces/` skips its o
 edited from the workspace that links them; to change one, work in its own clone or switch to it.
 
 The workspace's dotted name is repeated in `name:` so a checkout knows which workspace it is; names
-are unique (give a folder a `short-name` that no sibling's name or short name clashes with). Every other file in the folder is the workspace's own, at its normal harness
-path, except `.github/workflows/delphi.yml` (a copy of the template's). The scripts, `.delphi/*.sh`
+are unique (give a folder a `short-name` that no sibling's name or short name clashes with). Files live at normal harness paths. `workspace.generated` records main-owned rendered files;
+workspace instructions, docs and opted-out copies remain workspace-owned. The workflow comes from
+the template. The scripts, `.delphi/*.sh`
 (listed in `.delphi/manifest.yml`), live once at main's root: sync puts
 `.delphi/` on every `ws/*` branch, so change them only through PRs to main.
 
@@ -106,7 +108,8 @@ workspace doesn't depend on a particular cloud environment. Codex does not enabl
 plugin sets or install MCP servers. Use tools already available in the selected host.
 
 `harness:` is validated against `ci/harnesses.sh`. Authoring selects its native instruction template
-and skill destination while preserving shared project defaults. See `docs/design.md` for adding
+and skill destination while preserving translated project defaults. Shared source format and
+workspace harness selection are independent. See `docs/design.md` for adding
 another adapter.
 
 ## Versions
@@ -128,17 +131,26 @@ Once it merges, CI creates `ws/<name>` (its dotted name).
 can hold shared context (`README.md`), a guide to its workspaces (`AUTHORING.md`), and
 `workspace-defaults/` (what a new workspace there starts with).
 
-**Shared skills.** Put reusable workflows in `skills/<name>/` at an org or project folder.
-Sync renders them into the native skill directory declared in `ci/harnesses.sh`, with one source
-across harnesses. Edit these on `main`; workspace edits are reset on refresh. `opt-out:` uses
-the destination path in the selected harness.
-
-**Inherited files.** Any folder under `software/`, `software/` itself included, can hold
-`workspace-inherit/`: files at their workspace paths (never native workspace instructions) that CI writes onto the `ws/*` branch
-of every workspace below it on each sync. Edit them on `main`; a workspace's own edit is undone. To
-keep its own copy, a workspace lists the path under `opt-out:` in its `workspace.yml`.
-A workspace that lists `main` under `workspaces:` reads them at `workspaces/main/` (recommended for every
-new workspace); to change them, switch to `main`.
+**Source bundles.** `workspace-defaults/` and `workspace-inherit/` contain `source.yml`
+(`format: claude-code` today) and a `files/` payload. Defaults seed workspace-owned files once;
+inheritance stays managed. Every workspace independently declares `harness:` in its own manifest.
+Unsupported native conversions fail instead of dropping settings.
+
+**Shared skills.** Keep reusable Agent Skills under `skills/<name>/` at an org or project folder.
+The main-side renderer copies them unchanged into each workspace's native skill directory.
+
+**Render before merging.** After changing shared sources, harness selections, opt-outs or plugin
+configuration, run `bash ci/render.sh` on a main-based branch and include its native output in the
+PR. `bash ci/render.sh --check` checks freshness without writing; `ci/check.sh` includes it.
+Workspaces on main already contain their native instructions, skills and supported settings.
+Branch refresh copies those reviewed files without running adapters. Workspace configuration
+edits are rendered in the proposal to main and arrive back after merge.
+
+**Ownership.** Edit shared sources on main. `workspace.generated` records managed copies and
+origins; don't edit it or those copies directly. To keep a workspace's own copy, list its native
+path under `opt-out:` in `workspace.yml`, then render on main or use the normal workspace proposal
+flow. Workspace-owned files stay editable and proposable. A workspace can read shared sources by
+listing `main` under `workspaces:`.
 
 ## CI (`.github/workflows/delphi.yml`)
 
diff --git a/ci/check.sh b/ci/check.sh
index bc33de1..39fcc14 100755
--- a/ci/check.sh
+++ b/ci/check.sh
@@ -1,29 +1,6 @@
 #!/usr/bin/env bash
-# ci/check.sh [<dir> [<base>]]: validate Delphi (CI runs it on PRs to main, against main; sync.sh on
-# each proposal). Rules: a workspace is software/**/workspaces/<leaf>/ with a workspace.yml; its name
-# is the short names of its folders and <leaf>, joined by dots (.delphi/names.sh; branch ws/<name>),
-# and unique across the tree; a folder's `short-name` file is one line of lowercase letters, digits
-# and '-'; so is each <leaf>; workspaces never nest; no symlinks under
-# software/; no workspace (nor the template) has its own .delphi/ (sync puts main's on every ws/*
-# branch); .delphi/manifest.yml lists itself, every file in .delphi/ but `versions`, and only files
-# git tracks; its `version:` and the hash of those files (.delphi/version.sh) are the last line of
-# .delphi/versions, whose versions rise; each .delphi/migrations/<version>-<slug>.sh has its line
-# there, bumps MAJOR (MINOR while 0.x) over the line before, and starts like every script; against
-# <base>, .delphi/versions only gains lines and released migrations are unchanged; each manifest file
-# outside .delphi/ (the workflow) is the same in templates/workspace/ and every workspace; workspace.yml is `name: <its name>`,
-# `harness: <adapter>`, an optional `repos:` map of `<name>: <git-url>`, and an optional
-# `references-git:` map of `<name>: <git-url> [<ref>]`; names are unique across both; and an optional
-# `workspaces:` list of `- <name>` (a workspace on main) or `- main`, without duplicates or the workspace itself, and an
-# optional `plugins:` list of `- <scope>[.<set>]` without duplicates, and an optional `opt-out:` list
-# of `- <path>` it inherits, each matching something. A project's workspace-defaults/workspace.yml is
-# the same without `name:` (and a project has no old defaults/). A workspace-inherit/ folder sits in
-# an org or project folder, never holds a workspace's own files (CLAUDE.md, workspace.yml, .delphi/,
-# .claude/settings.json, the workflow), and no workspace inherits a path from two of them or has a
-# file at an inherited path it hasn't opted out of. The files ci/plugins.sh generates
-# (.claude-plugin/marketplace.json, each workspace's plugins: defaults and .claude/settings.json) are up to date.
-# No SKILL.md body names a harness variable (${CLAUDE_…}): skills call scripts by their path in the
-# skill's folder, and scripts read $DELPHI_ROOT.
-# Lists every problem; exits 1 if any.
+# ci/check.sh [<dir> [<base>]]: validate workspace identities, explicit harnesses, native main-side
+# output and the runtime release contract. Lists every problem without changing the checkout.
 set -euo pipefail
 here=$(cd "$(dirname "$0")" && pwd)
 # shellcheck source=ci/inherit.sh
@@ -91,7 +68,9 @@ while IFS= read -r at; do bad "$at: names a harness variable; call scripts as \`
   git ls-files '*SKILL.md' | while IFS= read -r f; do # frontmatter is harness metadata; the body is shared
     awk 'NR == 1 && /^---$/ { f = 1; next } f && /^---$/ { f = 0; next } !f && /\$\{CLAUDE_/ { print FILENAME ":" FNR; exit }' "$f"
   done)
-while IFS= read -r msg; do bad "${msg#plugins: }"; done < <(bash "$here/plugins.sh" --check . 2>&1 >/dev/null || true)
+if messages=$(bash "$here/render.sh" --check . 2>&1); then :
+elif [ -z "$messages" ]; then bad "native workspace output validation failed"; fi
+while IFS= read -r msg; do [ -z "$msg" ] || bad "$msg"; done <<<"$messages"
 
 manifest() { # <workspace.yml> [<name>]: without <name> (a workspace-defaults/ manifest), `name:` is not allowed
   while IFS= read -r msg; do bad "$1: $msg"; done < <(awk -v want="${2:-}" '
@@ -143,7 +122,7 @@ manifest() { # <workspace.yml> [<name>]: without <name> (a workspace-defaults/ m
       if (seen[n]++) print "duplicate repo: " n
       next }
     { print "unexpected line: " $0 }
-    END { if (!h) print "harness is missing"; if (want != "" && !nm) print "name is missing" }' "$1")
+    END { if (want != "" && !h) print "harness is missing"; if (want != "" && !nm) print "name is missing" }' "$1")
   local adapter
   adapter=$(awk '/^harness:/ { print $2; exit }' "$1")
   if [ -n "$adapter" ]; then
@@ -167,31 +146,20 @@ manifest() { # <workspace.yml> [<name>]: without <name> (a workspace-defaults/ m
     s && /^[[:space:]]+-[[:space:]]+/ { sub(/^[[:space:]]+-[[:space:]]+/, ""); sub(/[[:space:]]*#.*$/, ""); if ($0 != "main") print }' "$1")
 }
 
-inherits() { # <workspace folder> <workspace.yml>: validate resolved destinations, not source layout
-  local p src o opted seen="" used="" out adapter
-  adapter=$(awk '/^harness:/ { print $2; exit }' "$2")
-  harness "$adapter" 2>/dev/null || return 0
-  out=$(awk '/^opt-out:/ { s = 1; next } /^[^[:space:]#]/ { s = 0 }
-    s && /^[[:space:]]+-[[:space:]]+/ { sub(/^[[:space:]]+-[[:space:]]+/, ""); sub(/[[:space:]]*#.*$/, ""); sub(/\/$/, ""); print }' "$2")
-  while IFS=$'\t' read -r _ p src; do
-    case "$adapter:$p" in
-      codex:.claude/* | claude-code:.agents/* | claude-code:.codex/*)
-        bad "$src: $p belongs to a different harness" ;;
-    esac
-    case " $seen " in *" $p "*) bad "$src: $1 also inherits it from a folder above; keep one" ;; esac
-    seen="$seen $p" opted=""
-    for o in $out; do case "$p/" in "$o"/*) opted=1 used="$used $o" ;; esac; done
-    [ -n "$opted" ] || [ ! -e "$1/$p" ] || bad "$1/$p: inherited from $src; remove it, or list it under opt-out: in workspace.yml"
-  done < <(inherited_files "" "$1" "$adapter")
-  for o in $out; do case " $used " in *" $o "*) ;; *) bad "$2: opt-out: $o is nothing it inherits" ;; esac; done
-}
-
 while IFS= read -r d; do
   case "$d" in */workspaces/*) bad "$d: belongs in an org or project folder, not under workspaces/" ;; esac
-  for f in CLAUDE.md AGENTS.md workspace.yml .delphi .claude/settings.json .codex/config.toml $managed; do
-    [ ! -e "$d/$f" ] || bad "$d/$f: each workspace has its own; it can't be inherited"
+  for f in CLAUDE.md AGENTS.md workspace.yml workspace.generated .delphi .claude/settings.json .codex/config.toml $managed; do
+    [ ! -e "$d/files/$f" ] || bad "$d/files/$f: each workspace has its own; it can't be inherited"
   done
 done < <(find software -type d -name workspace-inherit 2>/dev/null | sort)
+while IFS= read -r d; do
+  case "$d" in */workspaces/*) continue ;; esac
+  if format=$(source_format "" "$d" 2>/dev/null); then
+    if ! messages=$(bundle_files "" "$d" "$format" 2>&1 >/dev/null); then bad "$messages"; fi
+  else bad "$d/source.yml: declare one supported source format"; fi
+  while IFS= read -r f; do bad "$f: source bundle files belong under files/"; done \
+    < <(find "$d" -type f ! -path "$d/files/*" ! -path "$d/source.yml")
+done < <(find software -type d \( -name workspace-defaults -o -name workspace-inherit \) 2>/dev/null | sort)
 while IFS= read -r d; do
   case "$d" in */workspaces/*) continue ;; esac
   for skill in "$d"/*; do
@@ -228,10 +196,9 @@ while IFS= read -r f; do
   [ ! -e "$folder/.delphi" ] || bad "$folder/.delphi: managed in the root .delphi/ on main; remove it"
   for m in $managed; do cmp -s "$tpl/$m" "$folder/$m" || bad "$folder/$m: differs from $tpl/$m"; done
   manifest "$f" "$name"
-  inherits "$folder" "$f"
-done < <(find software -name workspace.yml -type f ! -path '*/workspace-inherit/*' \( ! -path '*/workspace-defaults/workspace.yml' -o -path '*/workspaces/workspace-defaults/*' \) 2>/dev/null | sort)
+done < <(find software -name workspace.yml -type f ! -path '*/workspace-inherit/*' ! -path '*/workspace-defaults/files/*' 2>/dev/null | sort)
 while IFS= read -r f; do manifest "$f"; done \
-  < <(find software -path '*/workspace-defaults/workspace.yml' ! -path '*/workspaces/workspace-defaults/*' -type f 2>/dev/null)
+  < <(find software -path '*/workspace-defaults/files/workspace.yml' ! -path '*/workspaces/workspace-defaults/*' -type f 2>/dev/null)
 for l in $listed; do
   case " $names " in *" ${l#*|} "*) ;; *) bad "${l%%|*}: workspaces: lists ${l#*|}, which isn't a workspace on main" ;; esac
 done
diff --git a/ci/harnesses.sh b/ci/harnesses.sh
index b57d920..64e1ab2 100644
--- a/ci/harnesses.sh
+++ b/ci/harnesses.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Harness registry shared by authoring, validation and sync. Add native paths and generation here.
+# Target harness registry for main-side authoring and validation. Branch refresh never loads it.
 set -euo pipefail
 # shellcheck disable=SC2034 # native paths are consumed by callers sourcing the registry
 harness() { # <name>: sets instruction, skills and plugins capability; rejects unknown adapters
@@ -9,26 +9,3 @@ harness() { # <name>: sets instruction, skills and plugins capability; rejects u
     *) echo "harness: unknown harness '$1'" >&2; return 1 ;;
   esac
 }
-skill_path() { # <source kind: skills|workspace-inherit> <relative path>: native destination
-  case "$1/$2" in
-    skills/*) echo "$skills/$2" ;;
-    workspace-inherit/.claude/skills/*) echo "$skills/${2#.claude/skills/}" ;;
-    *) echo "$2" ;;
-  esac
-}
-generate_harness() { # <main checkout> <workspace folder> <workspace checkout>
-  local adapter
-  adapter=$(awk '/^harness:/ { print $2; exit }' "$3/workspace.yml")
-  harness "$adapter" || return 1
-  if [ "$plugins" = claude ]; then
-    (cd "$1" && bash ci/plugins.sh yml "$2" "$3/workspace.yml") >"$3/workspace.yml.new" || return 1
-    mv "$3/workspace.yml.new" "$3/workspace.yml"
-    mkdir -p "$3/.claude"
-    (cd "$1" && bash ci/plugins.sh settings "$2" "$3/workspace.yml") >"$3/.claude/settings.json" || return 1
-  else
-    rm -f "$3/.claude/settings.json" # generated by the previous adapter, never workspace-owned
-    if awk '/^plugins:/ { s = 1; next } /^[^[:space:]#]/ { s = 0 } s && /^[[:space:]]+-/ { found = 1 } END { exit !found }' "$3/workspace.yml"; then
-      echo "harness: $adapter does not support Delphi plugin sets" >&2; return 1
-    fi
-  fi
-}
diff --git a/ci/inherit.sh b/ci/inherit.sh
index 50be873..c9d125d 100644
--- a/ci/inherit.sh
+++ b/ci/inherit.sh
@@ -1,27 +1,26 @@
 #!/usr/bin/env bash
-# Source this resolver for inheritance at a git revision or on disk. Destination paths are native.
+# Main-side inheritance resolver. Source format and target harness are independent inputs.
 set -euo pipefail
 # shellcheck source=ci/harnesses.sh
 source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/harnesses.sh"
+# shellcheck source=ci/sources.sh
+source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/sources.sh"
 inherit_levels() {
   echo "${1%/workspaces/*}" | awk -F/ '{ p = $1; print p; for (i = 2; i <= NF; i++) { p = p "/" $i; print p } }'
 }
 inherited_files() { # <revision or '' for disk> <workspace folder> <harness>: mode blob<TAB>destination<TAB>source
-  local level kind record records meta path dest
+  local level record meta path
   harness "$3" || return 1
   for level in $(inherit_levels "$2"); do
-    for kind in workspace-inherit skills; do
-      if [ -n "$1" ]; then
-        records=$(git ls-tree -r "$1:$level/$kind" 2>/dev/null || true)
-      elif [ -d "$level/$kind" ]; then
-        records=$(cd "$level/$kind" && find . -type f | awk '{ sub(/^\.\//, ""); print "100644 blob disk\t" $0 }' | sort)
-      else records=""; fi
-      while IFS= read -r record; do
-        [ -n "$record" ] || continue
-        meta=${record%%$'\t'*}; path=${record#*$'\t'}
-        dest=$(skill_path "$kind" "$path")
-        printf '%s %s\t%s\t%s\n' "${meta%% *}" "${meta##* }" "$dest" "$level/$kind/$path"
-      done <<<"$records"
-    done
+    if { [ -n "$1" ] && git cat-file -e "$1:$level/workspace-inherit" 2>/dev/null; } ||
+      { [ -z "$1" ] && [ -d "$level/workspace-inherit" ]; }; then
+      bundle_files "$1" "$level/workspace-inherit" "$3" || return 1
+    fi
+    while IFS= read -r record; do
+      [ -n "$record" ] || continue
+      meta=${record%%$'\t'*}; path=${record#*$'\t'}
+      meta="${meta%% *} ${meta##* }"
+      printf '%s\t%s/%s\t%s/skills/%s\n' "$meta" "$skills" "$path" "$level" "$path"
+    done < <(source_files "$1" "$level/skills")
   done
 }
diff --git a/ci/managed.sh b/ci/managed.sh
new file mode 100644
index 0000000..4b20860
--- /dev/null
+++ b/ci/managed.sh
@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+# Ownership helpers shared by main-side rendering and branch sync; no harness or source-format logic.
+set -euo pipefail
+# shellcheck disable=SC2034 # sourced by render.sh and sync.sh
+generated=workspace.generated
+
+optouts() { # read a workspace.yml on stdin
+  awk '/^opt-out:/ { s = 1; next } /^[^[:space:]#]/ { s = 0 }
+    s && /^[[:space:]]+-[[:space:]]+/ { sub(/^[[:space:]]+-[[:space:]]+/, ""); sub(/[[:space:]]*#.*$/, ""); sub(/\/$/, ""); print }'
+}
+
+opted_out() { # <path> <space-separated opt-outs>
+  local out
+  for out in $2; do case "$1/" in "$out"/*) return 0 ;; esac; done
+  return 1
+}
+
+safe_path() {
+  case "$1" in '' | /* | *[!A-Za-z0-9._/-]* | */ | *//* ) return 1 ;; esac
+  case "/$1/" in */../* | */./* | */.git/*) return 1 ;; esac
+}
+
+generated_records() { # ledger on stdin: validate and print records; mode blob<TAB>destination<TAB>source
+  local meta path source extra
+  while IFS=$'\t' read -r meta path source extra; do
+    case "$meta" in '' | '#'* ) continue ;; esac
+    if ! printf '%s\n' "$meta" | grep -Eq '^(100644|100755) [0-9a-f]{40}([0-9a-f]{24})?$' ||
+      ! safe_path "$path" || ! safe_path "$source" || [ -n "$extra" ]; then
+      echo "generated: invalid ownership record" >&2; return 1
+    fi
+    case "$path" in workspace.yml | workspace.generated | .delphi | .delphi/*)
+      echo "generated: protected destination $path" >&2; return 1 ;;
+    esac
+    printf '%s\t%s\t%s\n' "$meta" "$path" "$source"
+  done
+}
+
+ledger() { # <revision:path>: missing ledgers are allowed for pre-render workspaces
+  local contents
+  contents=$(git show "$1" 2>/dev/null || true)
+  printf '%s\n' "$contents" | generated_records
+}
+
+ledger_header() { printf '# Generated by ci/render.sh; edit shared sources or opt out in workspace.yml.\n'; }
diff --git a/ci/plugins.sh b/ci/plugins.sh
index 0c73b3c..0a9b611 100755
--- a/ci/plugins.sh
+++ b/ci/plugins.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# ci/plugins.sh [--check] [<dir>]: write the generated harness files of a main checkout <dir> (default .):
+# ci/plugins.sh [--check] [<dir>]: render.sh uses this on main to write the generated harness files of a main checkout <dir> (default .):
 #   .claude-plugin/marketplace.json: marketplace `delphi`, one plugin per set folder
 #     software/**/plugins/claude/<set>/ outside workspaces, named <scope>, or <scope>.<set> unless the
 #     set is `default`. A folder's scope is the one line in its plugins/scope, else its short-name
@@ -15,7 +15,7 @@
 #     settings go in .claude/settings.local.json, shared ones here or in workspace.yml.
 #   --check writes nothing; it lists each out-of-date file or problem and exits 1 if any.
 # ci/plugins.sh yml|settings <folder> <workspace.yml>: print one workspace's workspace.yml or
-#   settings.json, from <dir> = . (sync uses them for ws/* branches, reading workspace.yml from the branch).
+#   settings.json, from <dir> = . (main-side output only; refresh copies reviewed files).
 set -euo pipefail
 repo=Northeastern-Electric-Racing/Delphi
 
@@ -124,7 +124,7 @@ put() { # <file> <what's stale> <command...>: write <command>'s output to <file>
   "$@" >"$tmp" || { problems=$((problems + 1)) && return; }
   cmp -s "$tmp" "$f" && return
   if [ "$check" = 1 ]; then
-    echo "plugins: $f $what; run ci/plugins.sh" >&2
+    echo "plugins: $f $what; run ci/render.sh" >&2
     problems=$((problems + 1))
   else
     mkdir -p "$(dirname "$f")" && cp "$tmp" "$f" && echo "plugins: wrote $f"
diff --git a/ci/render.sh b/ci/render.sh
new file mode 100755
index 0000000..e2b3dd8
--- /dev/null
+++ b/ci/render.sh
@@ -0,0 +1,115 @@
+#!/usr/bin/env bash
+# ci/render.sh [--check] [<main checkout>]: materialize native managed files before a PR reaches main.
+set -euo pipefail
+here=$(cd "$(dirname "$0")" && pwd)
+# shellcheck source=ci/inherit.sh
+source "$here/inherit.sh"
+# shellcheck source=ci/managed.sh
+source "$here/managed.sh"
+check=0
+[ "${1:-}" != --check ] || { check=1; shift; }
+cd "${1:-.}"
+tmp=$(mktemp -d)
+trap 'rm -rf "$tmp"' EXIT
+problems=0
+bad() { echo "render: $*" >&2; problems=$((problems + 1)); }
+if [ "$check" = 1 ]; then
+  bash "$here/plugins.sh" --check . || problems=$((problems + 1))
+else
+  bash "$here/plugins.sh" . || exit 1
+fi
+
+render_workspace() { # <workspace folder>
+  local folder=$1 adapter out records old meta path src seen="" used="" o start=$problems previous actual
+  adapter=$(awk '/^harness:/ { print $2; exit }' "$folder/workspace.yml")
+  harness "$adapter" || { bad "$folder/workspace.yml: unknown harness '$adapter'"; return; }
+  if [ "$plugins" = none ] && awk '/^plugins:/ { s = 1; next } /^[^[:space:]#]/ { s = 0 }
+    s && /^[[:space:]]+-/ { found = 1 } END { exit !found }' "$folder/workspace.yml"; then
+    bad "$folder/workspace.yml: $adapter does not support Delphi plugin sets"; return
+  fi
+  out=$(optouts <"$folder/workspace.yml")
+  records=$(inherited_files "" "$folder" "$adapter") || { bad "$folder: cannot resolve inherited sources"; return; }
+  old=""
+  [ ! -f "$folder/$generated" ] || old=$(generated_records <"$folder/$generated") || { bad "$folder/$generated: invalid ownership record"; return; }
+  : >"$tmp/records"
+  while IFS=$'\t' read -r meta path src; do
+    [ -n "$path" ] || continue
+    if ! safe_path "$path" || ! safe_path "$src"; then
+      bad "$src: unsafe inherited destination '$path'"; continue
+    fi
+    case "$path" in CLAUDE.md | AGENTS.md | workspace.yml | workspace.generated | .delphi | .delphi/* | .claude/settings.json | .codex/config.toml | .github/workflows/delphi.yml)
+      bad "$src: each workspace has its own $path; it can't be inherited"; continue ;;
+    esac
+    case " $seen " in *" $path "*) bad "$src: $folder also inherits it from a folder above; keep one" ;; esac
+    seen="$seen $path"
+    for o in $out; do
+      if opted_out "$path" "$o"; then used="$used $o"; fi
+    done
+    opted_out "$path" "$out" && continue
+    printf '%s\t%s\t%s\n' "$meta" "$path" "$src" >>"$tmp/records"
+  done <<<"$records"
+  for o in $out; do
+    case " $used " in *" $o "*) ;; *) bad "$folder/workspace.yml: opt-out: $o is nothing it inherits" ;; esac
+  done
+  if [ "$adapter" = claude-code ] && [ -f "$folder/.claude/settings.json" ]; then
+    printf '100644 %s\t.claude/settings.json\tci/plugins.sh\n' "$(git hash-object -- "$folder/.claude/settings.json")" >>"$tmp/records"
+  fi
+  LC_ALL=C sort -t $'\t' -k2,2 "$tmp/records" >"$tmp/sorted"
+  { ledger_header; cat "$tmp/sorted"; } >"$tmp/ledger"
+  # Explicit opt-outs transfer ownership. Only a previous managed record permits retirement.
+  while IFS=$'\t' read -r meta path src; do
+    [ -n "$path" ] || continue
+    opted_out "$path" "$out" && continue
+    awk -F'\t' -v p="$path" '$2 == p { found = 1 } END { exit !found }' "$tmp/sorted" && continue
+    [ -f "$folder/$path" ] || continue
+    if [ "$(git hash-object -- "$folder/$path")" != "${meta#* }" ]; then
+      bad "$folder/$path: retired managed file has local edits; preserve it explicitly before rendering"
+    elif [ "$check" = 1 ]; then
+      bad "$folder/$path: stale managed output; run ci/render.sh"
+    fi
+  done <<<"$old"
+  while IFS=$'\t' read -r meta path src; do
+    [ -n "$path" ] || continue
+    previous=$(printf '%s\n' "$old" | awk -F'\t' -v p="$path" '$2 == p { print $1; exit }')
+    if [ -e "$folder/$path" ] && [ -z "$previous" ] && [ "$src" != ci/plugins.sh ]; then
+      bad "$folder/$path: workspace-owned file collides with $src; opt out or remove it explicitly"
+      continue
+    fi
+    actual=""
+    [ ! -f "$folder/$path" ] || actual=$(git hash-object -- "$folder/$path")
+    if [ "$check" = 1 ]; then
+      [ "$actual" = "${meta#* }" ] || bad "$folder/$path: inherited from $src and out of date; run ci/render.sh"
+      if [ -f "$folder/$path" ]; then
+        if [ "${meta%% *}" = 100755 ]; then [ -x "$folder/$path" ] || bad "$folder/$path: executable mode is out of date; run ci/render.sh"
+        else [ ! -x "$folder/$path" ] || bad "$folder/$path: executable mode is out of date; run ci/render.sh"; fi
+      fi
+    elif [ -n "$previous" ] && [ -n "$actual" ] && [ "$actual" != "${previous#* }" ] && [ "$actual" != "${meta#* }" ]; then
+      bad "$folder/$path: managed file has local edits; edit $src or opt out before rendering"
+    fi
+  done <"$tmp/sorted"
+  if [ "$check" = 1 ]; then
+    cmp -s "$tmp/ledger" "$folder/$generated" || bad "$folder/$generated: ownership record is out of date; run ci/render.sh"
+    return
+  fi
+  [ "$problems" = "$start" ] || return 0
+  while IFS=$'\t' read -r meta path src; do
+    [ -n "$path" ] || continue
+    opted_out "$path" "$out" && continue
+    if ! awk -F'\t' -v p="$path" '$2 == p { found = 1 } END { exit !found }' "$tmp/sorted"; then
+      rm -f "$folder/$path"
+      previous=$(dirname "$folder/$path")
+      while [ "$previous" != "$folder" ] && rmdir "$previous" 2>/dev/null; do previous=$(dirname "$previous"); done
+    fi
+  done <<<"$old"
+  while IFS=$'\t' read -r meta path src; do
+    [ -n "$path" ] || continue
+    [ "$src" != ci/plugins.sh ] || continue
+    mkdir -p "$(dirname "$folder/$path")"
+    cp "$src" "$folder/$path"
+    if [ "${meta%% *}" = 100755 ]; then chmod +x "$folder/$path"; else chmod -x "$folder/$path"; fi
+  done <"$tmp/sorted"
+  cp "$tmp/ledger" "$folder/$generated"
+}
+
+while read -r _ folder; do render_workspace "$folder"; done < <(bash "$here/../.delphi/names.sh")
+[ "$problems" = 0 ] || exit 1
diff --git a/ci/sources.sh b/ci/sources.sh
new file mode 100644
index 0000000..c8bb6f7
--- /dev/null
+++ b/ci/sources.sh
@@ -0,0 +1,70 @@
+#!/usr/bin/env bash
+# Source readers: a bundle declares its authoring format independently of the consuming workspace.
+set -euo pipefail
+# shellcheck source=ci/harnesses.sh
+source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/harnesses.sh"
+
+source_format() { # <revision or '' for disk> <bundle>: print its declared format
+  local config format
+  if [ -n "$1" ]; then config=$(git show "$1:$2/source.yml" 2>/dev/null || true)
+  else config=$(cat "$2/source.yml" 2>/dev/null || true); fi
+  format=$(printf '%s\n' "$config" | awk '
+    /^[[:space:]]*#/ || /^[[:space:]]*$/ { next }
+    /^format:[[:space:]]+(claude-code|codex)[[:space:]]*(#.*)?$/ { if (!n++) value = $2; next }
+    { invalid = 1 }
+    END { if (n == 1 && !invalid) print value }')
+  [ -n "$format" ] || { echo "source: $2/source.yml: declare one supported format (claude-code or codex)" >&2; return 1; }
+  printf '%s\n' "$format"
+}
+
+source_path() { # <format> <target harness> <source path>: native destination; no semantic guesses
+  local from_instruction from_skills
+  case "$1" in
+    claude-code) from_instruction=CLAUDE.md; from_skills=.claude/skills ;;
+    codex) from_instruction=AGENTS.md; from_skills=.agents/skills ;;
+    *) echo "source: unknown format '$1'" >&2; return 1 ;;
+  esac
+  case "$3" in '' | /* | *[!A-Za-z0-9._/-]* | */ | *//* )
+    echo "source: unsafe path '$3'" >&2; return 1 ;;
+  esac
+  case "/$3/" in */../* | */./* | */.git/*)
+    echo "source: unsafe path '$3'" >&2; return 1 ;;
+  esac
+  case "$1:$3" in
+    claude-code:AGENTS.md | claude-code:.agents/* | claude-code:.codex/* | codex:CLAUDE.md | codex:.claude/*)
+      echo "source: $3 does not belong to the declared $1 format" >&2; return 1 ;;
+  esac
+  harness "$2" || return 1
+  case "$3" in
+    "$from_instruction") printf '%s\n' "$instruction" ;;
+    "$from_skills"/*) printf '%s/%s\n' "$skills" "${3#"$from_skills"/}" ;;
+    CLAUDE.md | AGENTS.md | .claude/* | .agents/* | .codex/*)
+      [ "$1" = "$2" ] || { echo "source: $1:$3 has no mapping to $2; provide an explicit adapter mapping" >&2; return 1; }
+      printf '%s\n' "$3" ;;
+    *) printf '%s\n' "$3" ;;
+  esac
+}
+
+bundle_files() { # <revision or '' for disk> <bundle> <target harness>: mode blob<TAB>destination<TAB>source
+  local format records record meta path dest
+  format=$(source_format "$1" "$2") || return 1
+  records=$(source_files "$1" "$2/files") || return 1
+  while IFS= read -r record; do
+    [ -n "$record" ] || continue
+    meta=${record%%$'\t'*}; path=${record#*$'\t'}
+    meta="${meta%% *} ${meta##* }"
+    dest=$(source_path "$format" "$3" "$path") || return 1
+    printf '%s\t%s\t%s\n' "$meta" "$dest" "$2/files/$path"
+  done <<<"$records"
+}
+
+source_files() { # <revision or '' for disk> <folder>: mode blob<TAB>relative path
+  local file mode
+  if [ -n "$1" ]; then git ls-tree -r "$1:$2" 2>/dev/null || true
+  elif [ -d "$2" ]; then
+    while IFS= read -r file; do
+      mode=100644; [ ! -x "$file" ] || mode=100755
+      printf '%s %s\t%s\n' "$mode" "$(git hash-object -- "$file")" "${file#"$2"/}"
+    done < <(find "$2" -type f | LC_ALL=C sort)
+  fi
+}
diff --git a/ci/sync.sh b/ci/sync.sh
index a64d644..ba6b106 100755
--- a/ci/sync.sh
+++ b/ci/sync.sh
@@ -1,31 +1,12 @@
 #!/usr/bin/env bash
-# ci/sync.sh [refresh|propose] [<name>]: sync each workspace folder software/**/workspaces/<leaf>/ on
-# origin/main (or just <name>) with its branch ws/<name>, whose root is the folder. A workspace's
-# <name> is .delphi/names.sh's: its folders' short names and <leaf>, joined by dots
-# (software/application-software/argos/workspaces/argos-dev -> s.app.argos.argos-dev). CI runs it
-# with no direction (both) on every push to main or ws/**.
-#   refresh: merge main into ws/<name> (-Xsubtree=<folder>), then make its .delphi/ main's root
-#            .delphi/ (a "delphi: sync" commit if that changed it), write over it the files it inherits
-#            from main (every workspace-inherit/ folder from software/ down to its project folder,
-#            less its workspace.yml's opt-out: paths) and remove those it inherited from the main it
-#            last merged but no longer does (a "delphi: sync inherited" commit), list main's default plugin sets
-#            above it under its workspace.yml's plugins: and regenerate its .claude/settings.json from
-#            that (ci/plugins.sh; a "delphi: generate" commit if that changed either), and push if the
-#            tree changed. While ws/<old> (the branch's name when workspaces were named by their
-#            folder's path, software/application-software/argos/argos-dev) is ahead of ws/<name> or
-#            ws/<name> is missing, it starts from ws/<old> (so its history and unproposed edits carry
-#            over) and pushes the result to both, so clones still on ws/<old> get the version that
-#            moves them. A missing ws/<name> with no ws/<old> is created as one commit: tree = the
-#            folder plus main's .delphi/ and inherited files, parent = main.
-#   propose: build propose/<name> = main + a subtree merge of ws/<name> without <folder>/.delphi/
-#            or its inherited files (both managed on main); if that changes main and isn't already on propose/<name>, check it (against main),
-#            force-push it, and open or update its PR.
-# A conflict is reported with its files and that workspace skipped; exits 1 if any failed. ws/*
-# branches without a folder, old names included, get a notice, never deleted. Merges run in a temporary worktree.
+# ci/sync.sh [refresh|propose] [<name>]: subtree-sync native workspace folders on main with ws/<name>.
+# Refresh copies reviewed generated files and main's runtime; it never reads source formats or runs
+# harness adapters. Propose prepares a main checkout, renders its managed output, validates and opens a PR.
+# Temporary worktrees keep the caller untouched. Conflicts in workspace-owned files are reported.
 set -euo pipefail
 here=$(cd "$(dirname "$0")" && pwd)
-# shellcheck source=ci/inherit.sh
-source "$here/inherit.sh"
+# shellcheck source=ci/managed.sh
+source "$here/managed.sh"
 dir=both
 case "${1:-}" in refresh | propose) dir=$1 && shift ;; esac
 only=${1:-}
@@ -35,12 +16,11 @@ case "$only" in *[!a-z0-9.-]*) echo "usage: ci/sync.sh [refresh|propose] [<name>
 git fetch --quiet --prune origin
 main=$(git rev-parse origin/main)
 wt=$(mktemp -d)
-mw=$(mktemp -d) # main, for ci/plugins.sh to read the plugin sets from
 git worktree add --quiet --detach "$wt" "$main"
-git worktree add --quiet --detach "$mw" "$main"
-trap 'git worktree remove --force "$wt"; git worktree remove --force "$mw"; rm -f "$wt.yml" "$wt.settings" "$wt.err"' EXIT
+trap 'git worktree remove --force "$wt"; rm -f "$wt.index"' EXIT
 failed=0 names=" "
 tree() { git -C "$wt" rev-parse --quiet --verify "$1^{tree}" || true; } # empty if <rev> is missing
+file_entry() { git ls-tree "$1" -- "$2" | awk '$1 == "100644" || $1 == "100755" { print $1 " " $3 }'; }
 
 with_delphi() { # <commit> [<folder>/]: its tree with <folder>/.delphi/ dropped, or (no folder) its
   # .delphi/ replaced by main's. Built in a temporary index, so the worktree is untouched.
@@ -54,49 +34,78 @@ with_delphi() { # <commit> [<folder>/]: its tree with <folder>/.delphi/ dropped,
   rm -f "$i"
 }
 
-optouts() { # <rev:path of a workspace.yml>: its opt-out: entries, space-separated
-  git show "$1" 2>/dev/null | awk '/^opt-out:/ { s = 1; next } /^[^[:space:]#]/ { s = 0 }
-    s && /^[[:space:]]+-[[:space:]]+/ { sub(/^[[:space:]]+-[[:space:]]+/, ""); sub(/[[:space:]]*#.*$/, ""); sub(/\/$/, ""); printf "%s ", $0 }'
+previous_records() { # <workspace commit> <folder>: ownership from the main revision it last merged
+  local base
+  base=$(git merge-base "$1" "$main" || true)
+  if [ -n "$base" ]; then
+    if git cat-file -e "$base:$2/$generated" 2>/dev/null; then ledger "$base:$2/$generated"
+    else ledger "$base:$generated"; fi
+  fi
 }
 
-inherited() { # <revision> <folder> <opt-outs> <harness>: mode blob<TAB>native destination
-  inherited_files "$1" "$2" "$4" | awk -F'\t' -v out="$3" 'BEGIN { n = split(out, o, " ") }
-    { for (i = 1; i <= n; i++) if ($2 == o[i] || index($2, o[i] "/") == 1) next
-      print $1 "\t" $2 }'
+managed_records() { # <workspace commit> <folder>: trusted previous ownership, restricted by branch ownership
+  local old trusted
+  old=$(ledger "$1:$generated") || return 1
+  trusted=$(previous_records "$1" "$2") || return 1
+  # Dropping an entry after an opt-out records the ownership transfer, even before its proposal merges.
+  printf '%s\n' "$old" | awk -F'\t' -v trusted="$trusted" 'BEGIN {
+    n = split(trusted, rows, "\n"); for (i = 1; i <= n; i++) { split(rows[i], f, "\t"); owned[f[2]] = 1 }
+  } $2 in owned'
 }
 
-with_inherited() { # <tree-ish> <folder> <old main or ''> <rev:path of its workspace.yml> [<prefix>/]: without
-  # <prefix>, its tree with what the workspace inherits from main written over it, and what it
-  # inherited from <old> but no longer does removed; with <prefix> (a proposal), those paths under
-  # <prefix> put back to main's. Opt-outs come from that workspace.yml.
-  local i=$wt.index out old_out="" now p ms adapter old_adapter old_manifest pre=${5:-}
-  out=$(optouts "$4")
-  adapter=$(git show "$4" | awk '/^harness:/ { print $2; exit }')
-  old_adapter=$adapter
-  if [ -n "$3" ]; then
-    old_manifest=$3:$2/workspace.yml
-    git cat-file -e "$old_manifest" 2>/dev/null || old_manifest=$3:workspace.yml
-    old_adapter=$(git show "$old_manifest" | awk '/^harness:/ { print $2; exit }')
-    old_out=$(optouts "$old_manifest")
-  fi
-  now=$(inherited "$main" "$2" "$out" "$adapter")
+with_generated() { # <workspace commit> <folder>: copy reviewed native output; no source resolution
+  local i=$wt.index now old out meta path src entry blob
+  now=$(ledger "$main:$2/$generated") || return 1
+  old=$(managed_records "$1" "$2") || return 1
+  out=$(git show "$1:workspace.yml" | optouts)
   rm -f "$i"
   GIT_INDEX_FILE=$i git read-tree "$1"
-  { [ -z "$3" ] || inherited "$3" "$2" "$out $old_out" "$old_adapter"; [ -z "$pre" ] || printf '%s\n' "$now"; } | cut -f2 | sort -u |
-    while IFS= read -r p; do
-      [ -z "$p" ] && continue
-      [ -n "$pre" ] || ! printf '%s\n' "$now" | cut -f2 | grep -qxF "$p" || continue # still inherited: written below
-      GIT_INDEX_FILE=$i git rm -qf --cached --ignore-unmatch -- "$pre$p" >/dev/null
-      [ -z "$pre" ] || { ms=$(git ls-tree "$main" -- "$pre$p" | cut -f1) && [ -z "$ms" ]; } ||
-        GIT_INDEX_FILE=$i git update-index --add --cacheinfo "${ms%% *},${ms##* },$pre$p"
+  printf '%s\n%s\n' "$old" "$now" | cut -f2 | LC_ALL=C sort -u |
+    while IFS= read -r path; do
+      [ -n "$path" ] || continue
+      opted_out "$path" "$out" && continue
+      GIT_INDEX_FILE=$i git update-index --force-remove -- "$path"
+      entry=$(file_entry "$main" "$2/$path")
+      [ -z "$entry" ] || GIT_INDEX_FILE=$i git update-index --add --cacheinfo "${entry%% *},${entry##* },$path"
     done
-  [ -n "$pre" ] || printf '%s\n' "$now" | while IFS=$'\t' read -r ms p; do
-    [ -z "$p" ] || GIT_INDEX_FILE=$i git update-index --add --cacheinfo "${ms% *},${ms#* },$p"
-  done
+  blob=$({ ledger_header
+    while IFS=$'\t' read -r meta path src; do
+      [ -n "$path" ] || continue
+      opted_out "$path" "$out" || printf '%s\t%s\t%s\n' "$meta" "$path" "$src"
+    done <<<"$now"
+  } | git hash-object -w --stdin)
+  GIT_INDEX_FILE=$i git update-index --add --cacheinfo "100644,$blob,$generated"
   GIT_INDEX_FILE=$i git write-tree
   rm -f "$i"
 }
 
+resolve_generated_conflicts() { # <workspace commit> <folder> <prefix>: only explicit managed ownership resolves automatically
+  local now old previous out paths path relative entry meta src
+  now=$(ledger "$main:$2/$generated") || return 1
+  old=$(managed_records "$1" "$2") || return 1
+  previous=$(previous_records "$1" "$2") || return 1
+  out=$(git show "$1:workspace.yml" | optouts)
+  paths=" $(printf '%s\n%s\n' "$old" "$now" | cut -f2 | tr '\n' ' ') $generated "
+  while IFS=$'\t' read -r meta path src; do
+    [ -z "$path" ] || ! opted_out "$path" "$out" || paths="$paths$path "
+  done <<<"$previous"
+  while IFS= read -r path; do
+    relative=${path#"$3"}
+    [ "$path" = "$3$relative" ] || continue
+    case "$paths" in *" $relative "*) ;; *) continue ;; esac
+    git -C "$wt" update-index --force-remove -- "$path"
+    if [ "$relative" = "$generated" ] || opted_out "$relative" "$out"; then
+      entry=$(file_entry "$1" "$relative")
+    else
+      entry=$(file_entry "$main" "$2/$relative")
+    fi
+    [ -z "$entry" ] || git -C "$wt" update-index --add --cacheinfo "${entry%% *},${entry##* },$path"
+  done < <(git -C "$wt" diff --name-only --diff-filter=U)
+  [ -z "$(git -C "$wt" diff --name-only --diff-filter=U)" ] || return 1
+  git -C "$wt" commit --quiet --no-edit
+  git -C "$wt" reset --quiet --hard HEAD
+}
+
 conflict() { # <message>: report the conflicted files, abort the merge, skip this workspace
   echo "$1 Files:" >&2
   git -C "$wt" diff --name-only --diff-filter=U | sed 's/^/  /' >&2
@@ -112,51 +121,33 @@ refresh() { # <name> <folder> <old name>: leave the worktree at ws/<name> with m
   fi
   if [ -z "$(tree "$from")" ]; then
     git -C "$wt" checkout --quiet --detach \
-      "$(git commit-tree -p "$main" -m "delphi: create ws/$1 from $2" "$(with_inherited "$(with_delphi "$main:$2")" "$2" "" "$main:$2/workspace.yml")")"
-    if ! generate_harness "$mw" "$2" "$wt" 2>"$wt.err"; then
-      echo "ws/$1: $(cat "$wt.err"); not created" >&2
-      git -C "$wt" reset --quiet --hard HEAD
-      git -C "$wt" clean -qfd
-      failed=1 ok=0
-      return
-    fi
-    git -C "$wt" add -A
-    git -C "$wt" checkout --quiet --detach "$(git commit-tree -p "$main" -m "delphi: create ws/$1 from $2" "$(git -C "$wt" write-tree)")"
+      "$(git commit-tree -p "$main" -m "delphi: create ws/$1 from $2" "$(with_delphi "$main:$2")")"
     git -C "$wt" push --quiet origin "HEAD:refs/heads/ws/$1"
     echo "ws/$1: created from $2"
     return
   fi
-  git -C "$wt" checkout --quiet --detach "$from"
-  local old head t
-  old=$(git merge-base "$from" "$main" || true) # the main it last merged: what it inherited then
-  # --no-ff: once ws commits are in main, a fast-forward would put main's whole tree on ws/<name>.
+  local head t ws
+  t=$(with_generated "$from" "$2") || { failed=1 ok=0; return; }
+  ws=$from
+  if [ "$t" != "$(tree "$from")" ]; then
+    ws=$(git commit-tree -p "$from" -m "delphi: sync generated files from main" "$t")
+  fi
+  git -C "$wt" checkout --quiet --detach "$ws"
   if ! git -C "$wt" merge --quiet --no-ff -Xsubtree="$2" -m "delphi: refresh ws/$1 from main" "$main" >/dev/null; then
-    conflict "ws/$1: CONFLICT refreshing from main; merge main into ws/$1 in a PR (see README)."
-    return
+    if ! resolve_generated_conflicts "$ws" "$2" ""; then
+      conflict "ws/$1: CONFLICT refreshing from main; merge main into ws/$1 in a PR (see README)."
+      return
+    fi
   fi
-  head=$(git -C "$wt" rev-parse HEAD) && t=$(with_delphi "$head")
+  head=$(git -C "$wt" rev-parse HEAD)
+  t=$(with_delphi "$head")
   if [ "$t" != "$(tree "$head")" ]; then
     git -C "$wt" checkout --quiet --detach "$(git commit-tree -p "$head" -m "delphi: sync .delphi/ from main" "$t")"
   fi
-  head=$(git -C "$wt" rev-parse HEAD) && t=$(with_inherited "$head" "$2" "$old" "$head:workspace.yml")
-  if [ "$t" != "$(tree "$head")" ]; then
-    git -C "$wt" checkout --quiet --detach "$(git commit-tree -p "$head" -m "delphi: sync inherited files from main" "$t")"
-  fi
-  if ! generate_harness "$mw" "$2" "$wt" 2>"$wt.err"; then
-    echo "ws/$1: $(cat "$wt.err"); not refreshed" >&2
-    git -C "$wt" reset --quiet --hard HEAD
-    git -C "$wt" clean -qfd
-    failed=1 ok=0
-    return
-  fi
-  if [ -n "$(git -C "$wt" status --porcelain)" ]; then
-    git -C "$wt" add -A # only the adapter has written since the inherited tree was committed
-    git -C "$wt" commit --quiet -m "delphi: generate plugins: defaults and .claude/settings.json"
-  fi
-  if [ "$from" = "$was" ]; then
+  if [ "$from" != "refs/remotes/origin/ws/$1" ]; then
     git -C "$wt" push --quiet origin "HEAD:refs/heads/ws/$1" "HEAD:refs/heads/ws/$3"
     echo "ws/$1: from ws/$3, its old name (pushed to both)"
-  elif [ "$(tree HEAD)" != "$(tree "$ws")" ]; then
+  elif [ "$(git -C "$wt" rev-parse HEAD)" != "$(git rev-parse "refs/remotes/origin/ws/$1")" ]; then
     git -C "$wt" push --quiet origin "HEAD:refs/heads/ws/$1"
     echo "ws/$1: refreshed"
   fi
@@ -165,18 +156,27 @@ refresh() { # <name> <folder> <old name>: leave the worktree at ws/<name> with m
 propose() { # <name> <folder>: PR the worktree's ws/<name> into main if it changes anything
   local ws title="ws/$1 → main" body pr
   ws=$(git -C "$wt" rev-parse HEAD)
+  local t
+  t=$(with_generated "$ws" "$2") || { failed=1 ok=0; return; }
+  [ "$t" = "$(tree "$ws")" ] || ws=$(git commit-tree -p "$ws" -m "delphi: prepare managed files for proposal" "$t")
   git -C "$wt" checkout --quiet --detach "$main"
   if ! git -C "$wt" merge --quiet --no-ff -Xsubtree="$2" -m "delphi: propose ws/$1 to main" "$ws" >/dev/null; then
-    conflict "ws/$1: CONFLICT proposing to main; merge main into ws/$1 in a PR (see README)."
-    return
+    if ! resolve_generated_conflicts "$ws" "$2" "$2/"; then
+      conflict "ws/$1: CONFLICT proposing to main; merge main into ws/$1 in a PR (see README)."
+      return
+    fi
   fi
-  local t
-  t=$(with_delphi "$(git -C "$wt" rev-parse HEAD)" "$2/") # .delphi/ and inherited files are managed on main, never proposed
-  t=$(with_inherited "$t" "$2" "$(git merge-base "$ws" "$main" || true)" "$ws:workspace.yml" "$2/")
-  [ "$t" = "$(tree HEAD)" ] ||
-    git -C "$wt" checkout --quiet --detach "$(git commit-tree -p "$main" -p "$ws" -m "delphi: propose ws/$1 to main" "$t")"
+  t=$(with_delphi "$(git -C "$wt" rev-parse HEAD)" "$2/")
+  git -C "$wt" checkout --quiet --detach "$(git commit-tree -p "$main" -p "$ws" -m "delphi: propose ws/$1 to main" "$t")"
+  if ! bash "$wt/ci/render.sh" "$wt"; then
+    echo "ws/$1: main-side rendering failed; not proposed" >&2
+    failed=1; return
+  fi
+  git -C "$wt" add -A
+  t=$(git -C "$wt" write-tree)
+  git -C "$wt" checkout --quiet --detach "$(git commit-tree -p "$main" -p "$ws" -m "delphi: propose ws/$1 to main" "$t")"
   case "$(tree HEAD)" in "$(tree "$main")" | "$(tree "refs/remotes/origin/propose/$1")") return ;; esac
-  "$wt/ci/check.sh" "$wt" "$main" || { echo "ws/$1: check failed; not proposed" >&2 && failed=1 && return; }
+  "$wt/ci/check.sh" "$wt" "$main" || { echo "ws/$1: check failed; not proposed" >&2; failed=1; return; }
   git -C "$wt" push --quiet --force origin "HEAD:refs/heads/propose/$1"
   body="## Changes
 
diff --git a/docs/design.md b/docs/design.md
index 2500a92..f982b85 100644
--- a/docs/design.md
+++ b/docs/design.md
@@ -16,10 +16,12 @@ folder name (`workspaces/<name>`, `.delphi/parked/<name>`), and no branch can be
 merges (`git merge -Xsubtree=<folder>`), so the histories stay joined and edits on either side meet
 in normal three-way merges. The one thing shared is main's root `.delphi/` (the scripts): sync
 puts it at the root of every `ws/*` branch, so it is on every branch, main included, and is edited
-only on main. Likewise shared `skills/` and each `workspace-inherit/` folder: sync writes its files onto the `ws/*`
-root of every workspace below its folder and never proposes them back. Otherwise nothing is shared
-or generated between workspaces: a project's `workspace-defaults/` is copied once at creation, `workspaces:` only checks out other branches to read, and
-harness plugins (section 2) carry what workspaces opt into. Generated workspace files belong to the adapter; Claude Code generates `.claude/settings.json`.
+only on main. Shared `skills/` and source bundles remain editable on main. `ci/render.sh`
+materializes their managed native copies inside each workspace folder before merge. The workspace's
+required `harness:` selects its target independently of the source bundle's `format:`. Branch
+refresh copies those reviewed files; it never reads source formats or runs harness adapters.
+A project's `workspace-defaults/` seeds workspace-owned files once at creation. `workspaces:` still
+checks out other branches to read, and harness plugins carry what workspaces opt into.
 
 ```
    ┌───────────────────────────────┐
@@ -50,19 +52,21 @@ harness plugins (section 2) carry what workspaces opt into. Generated workspace
 ## 2. Repository (main)
 
 ```
-software/<org>/…/<project>/           README.md  AUTHORING.md  workspace-defaults/   (optional, main only)
+software/<org>/…/<project>/           project context and optional workspace-defaults/ source bundle
 software/[<org>/…/]skills/<name>/     reusable Agent Skills, rendered to the native skill directory
-software/[<org>/…/]workspace-inherit/  files every workspace below gets on its ws/* root (optional, main only)
+software/[<org>/…/]workspace-inherit/  source.yml plus files/: managed inheritance source bundle
 software/<org>/…/plugins/<harness>/<set>/   a plugin set for the workspaces under that folder (optional, main only)
 software/<org>/…/short-name           the folder's short name in workspace names (optional; default: its name)
 software/<org>/…/plugins/scope        its scope in plugin names (optional; default: its short name)
 .claude-plugin/marketplace.json       every Claude Code plugin set under software/ (generated)
 software/<org>/…/workspaces/<leaf>/   workspace.yml  native instructions and skills  docs/…
-                                      .github/workflows/delphi.yml  .gitattributes
+                                      workspace.generated: managed output origins and hashes
 .delphi/                              {setup,new-worktree,switch,park,plugins,version}.sh  manifest.yml  versions
                                       migrations/  .gitattributes  .gitignore: on every ws/* root
 ci/sync.sh  ci/check.sh               CI scripts
-ci/harnesses.sh  ci/inherit.sh        adapter registry and native inheritance resolver
+ci/harnesses.sh  ci/sources.sh       target adapter registry and independent source reader
+ci/inherit.sh  ci/render.sh          source resolution and main-side native rendering
+ci/managed.sh                        ownership records; shared with branch sync
 ci/plugins.sh                         writes the marketplace and each workspace's .claude/settings.json
 tools/new-workspace.sh                new workspace as a PR
 templates/workspace/                  common workspace template
@@ -85,28 +89,48 @@ clones.
 `.github/CODEOWNERS` assigns reviewers per org folder.
 
 The folder holding a `workspaces/` directory is a project folder. It may hold shared context
-(`README.md`), a guide to its workspaces (`AUTHORING.md`), and `workspace-defaults/`: files a new
-workspace directly in its `workspaces/` starts with, copied once and then its own. These live only on
-`main`; workspaces read them by listing `main` under `workspaces:`. A `workspace-defaults/workspace.yml`
-is checked as a manifest (without `name:`) but is not a workspace.
-
-Any folder from `software/` down to a project folder may hold `workspace-inherit/`: files laid out as
-in a workspace root that every workspace below it gets, at any depth.
-They are never copied into the workspace folder on main; refresh writes them onto `ws/<name>` and
-propose drops them, so they stay one copy, edited on main, and a workspace's own edit to one is
-undone on refresh. A workspace that wants its own copy lists the path (or a folder above it) under
-`opt-out:` in its `workspace.yml`; refresh then leaves that path alone and propose carries it like
-any workspace file. `ci/check.sh` fails on a path inherited from two folders, a workspace file at an
-inherited path it hasn't opted out of, an `opt-out:` that matches nothing, and a workspace's own
-files in `workspace-inherit/` (the paths protected by `ci/check.sh`). Shared skills live in `skills/<name>/` beside `workspace-inherit/`, at the same org/project
-levels. The resolver in `ci/inherit.sh` maps their paths to the selected harness's native skill
-directory and uses those destinations for collision checks, opt-outs, refresh and propose. General
-skills live in `software/skills/`; other org/project folders add their own. Legacy inherited
-`.claude/skills/` sources are also mapped to the selected harness, so source moves don't duplicate
-skills. Other inherited files retain their paths, and files belonging to the wrong harness fail
-validation. Shared frontmatter uses the common Agent Skills fields; harness-specific tool
-permissions belong in the adapter or host configuration. Shared skills go here rather than in a
-plugin: they're plain files on the workspace branch, with nothing to install.
+and a `workspace-defaults/` source bundle. Every source bundle has `source.yml` with
+`format: claude-code` or `format: codex`; its payload lives under `files/`. Source metadata never
+appears in rendered workspaces. The optional `files/workspace.yml` in a defaults bundle supplies
+creation defaults without a workspace name. Its optional `harness:` is only a creation suggestion;
+the creation tool always records an explicit harness in the new workspace.
+
+A workspace's harness does not depend on its branch name, the source format, or a repository-wide
+runtime default. Each folder on main already contains its declared harness's native files, and
+`ws/<name>` exposes that folder at the root. A harness change is an explicit workspace change.
+
+Any org or project folder may hold `workspace-inherit/`. `ci/inherit.sh` resolves those bundles
+from `software/` down to a workspace's project, together with portable `skills/` sources at those
+levels. `ci/sources.sh` reads a bundle's declared source format; `ci/harnesses.sh` selects native
+destinations. Portable skill bodies and supporting files pass through unchanged. Instruction
+filenames and skill directories have explicit mappings. Unmapped native settings fail instead of
+being silently discarded or guessed. A future source reader can feed the same file records without
+changing workspace harness selections or branch sync.
+
+Run `bash ci/render.sh` on a main-based branch after changing shared sources, workspace harnesses,
+opt-outs or generated settings inputs. Include the native outputs in the same PR. `--check` writes
+nothing and rejects stale or missing outputs; `ci/check.sh` runs it. Defaults are translated only
+when creating a workspace, then become its own files. Inheritance is rendered into every applicable
+workspace folder on main and refreshed when its source changes.
+
+Each workspace's `workspace.generated` records managed destinations, source paths, modes and blob
+hashes. It is generated metadata, never an editable source. The renderer uses previous records to
+remove retired outputs, refuses to overwrite workspace-owned collisions, and reports edited retired
+files rather than deleting them. `opt-out:` uses native destination paths: it transfers a file or
+folder to workspace ownership and removes its records. Such copies remain editable and proposable.
+Shared edits go to their source; managed copies on main and workspace branches are reset from that
+source. Source bundles cannot supply workspace identity, native root instructions, runtime or workflow
+files through inheritance. Duplicate inherited destinations fail validation.
+
+```mermaid
+flowchart TD
+    S["Shared sources on main<br/>Defaults, inheritance, skills"] --> T["Separate main-side rendering<br/>Source reader and target adapter"]
+    W["Each workspace.yml<br/>Explicit harness"] --> T
+    T -->|"Reviewed PR"| C["main: Codex workspace folder<br/>AGENTS.md and .agents/skills"]
+    T -->|"Reviewed PR"| A["main: Claude workspace folder<br/>CLAUDE.md and .claude/skills"]
+    C <-->|"Refresh / propose"| CB["ws/name<br/>Codex workspace root"]
+    A <-->|"Refresh / propose"| AB["ws/name<br/>Claude workspace root"]
+```
 
 A plugin set is for what `workspace-inherit/` can't do: context only some workspaces opt into, or
 harness features beyond files (hooks, MCP servers). It lives in `plugins/<harness>/<set>/` of a
@@ -128,9 +152,9 @@ rest, and `ci/check.sh` fails if the list or either file is out of date:
 - Each `harness: claude-code` workspace's `.claude/settings.json`: the shared settings in
   `ci/plugins.sh`, plus the `delphi` marketplace (with `autoUpdate`) and the sets under `plugins:`
   in `enabledPlugins`. Never edit it by hand: personal settings go in `.claude/settings.local.json`
-  (git-ignored by Claude Code), shared ones in `workspace.yml` or the generator. Sync regenerates it
-  on every `ws/*` branch (section 3); a PR to `main` that changes a set or a `workspace.yml` runs
-  `ci/plugins.sh` itself.
+  (git-ignored by Claude Code), shared ones in `workspace.yml` or the generator. The main-side renderer regenerates it before merge; refresh copies it unchanged.
+  Configuration changes made on a workspace branch are rendered in its proposal to main and reach
+  the workspace after that proposal merges.
 - Enabled isn't installed: Claude Code only offers to install a project's enabled plugins, so
   someone may never have installed a set, and then its skills are silently missing; and a set that
   leaves the marketplace stays installed, failing to load. So `setup.sh` (on every setup, switch and
@@ -156,37 +180,25 @@ that touches a set is an update.
 
 For every workspace on `origin/main` (or just `<name>`):
 
-1. **Refresh** (main → `ws/<name>`). If `ws/<old>` (its name before dotted names, the folder's
-   path without `workspaces/`) exists and `ws/<name>` is missing or behind it, start from `ws/<old>`,
-   so its history and unproposed edits carry over, refresh as below, and push the result to both
-   (so clones still on `ws/<old>` pull the 0.8.0 migration that renames their branch; the old branch
-   is kept, with a notice to delete it once no clone is on it). Otherwise, if `ws/<name>` is missing, create it as one commit
-   (`git commit-tree <main>:<folder> -p <main>`, "delphi: create ws/<name> from <folder>"): root =
-   folder plus main's `.delphi/`, parent = main, so no unrelated histories. Otherwise merge
-   `origin/main` into `ws/<name>` with `--no-ff -Xsubtree=<folder>`, then, if its `.delphi/` differs
-   from main's, commit main's over it ("delphi: sync .delphi/ from main", built in a temporary
-   index). Then write over it the files it inherits from main (every `workspace-inherit/` from
-   `software/` down to its project folder, less its `opt-out:` paths) and remove the resolved destinations it
-   inherited from the main it last merged (the merge base) but no longer does, resolving the old sources with the old harness for transitions ("delphi: sync
-   inherited files from main"; a new branch gets them in its one commit), and push if the tree changed. (`--no-ff` matters: once ws commits are in main, a
-   fast-forward would put main's whole tree on the ws branch.) A `.delphi/` edit made on `ws/<name>`
-   is undone here. Then, for a `claude-code` workspace, list main's default sets above it under the
-   branch's `workspace.yml` `plugins:` and regenerate `.claude/settings.json` from that
-   (`ci/plugins.sh yml`, `settings`), and commit them if they changed ("delphi: generate plugins:
-   defaults and .claude/settings.json"), so a new default set or one added under `plugins:` is
-   enabled and a hand edit is undone. A set that main doesn't have is reported and that
-   workspace is skipped.
-2. **Propose** (`ws/<name>` → PR to main). Build `propose/<name>` = `origin/main` +
-   `git merge --no-ff -Xsubtree=<folder> ws/<name>`, with `<folder>/.delphi/` dropped from the result
-   (it is main's, never a workspace's) and its inherited paths put back to main's. Stop if its tree equals main's or the current
-   `propose/<name>`'s (nothing new). Otherwise run `ci/check.sh` on it, force-push it, and create or
-   update the PR `ws/<name> → main` with `gh` (body: the PR template's sections, with the ws commit subjects
-   and authors under Changes; labelled `by: ai` when opened, and labels never touched after, so a
-   changed written-by label stays).
-
-A conflict or failed check is reported (conflicts with their files); that workspace is skipped, the
-others continue, and the script exits 1. A `ws/*` branch without a folder on main gets a notice and
-is never deleted. Merges happen in a temporary worktree, so the caller's checkout is untouched.
+1. **Refresh** copies main's native managed files using `workspace.generated`, respecting the
+   workspace branch's opt-outs. It then subtree-merges main into the workspace and syncs the root
+   `.delphi/`. A new branch starts from the workspace folder plus main's runtime, parented by main.
+   No source reader or target adapter runs on refresh. Managed ownership resolves managed-file
+   changes; conflicting workspace-owned files still require a normal PR. Removed managed files
+   are identified by ownership records, so a former opt-out remains owned even before its proposal
+   merges. Dropped ownership records are carried on the workspace branch.
+2. **Propose** normalizes managed copies from main, subtree-merges the workspace into a temporary
+   main checkout, and drops the workspace's root `.delphi/`. It runs `ci/render.sh` there, so changed
+   configuration or ownership produces reviewable native output in the main-side proposal. Then
+   it runs `ci/check.sh`, compares trees, and opens or updates `propose/<name>` only if needed.
+   Existing PR labels are preserved.
+
+History stays joined through subtree merges; workspace branches are never force-pushed. Legacy
+path-named branches still carry over into dotted names while ahead, and receive the result once;
+otherwise they are kept with a notice. Removed workspace branches are kept with a notice too.
+
+A conflict or failed render/check is reported and that workspace is skipped; other workspaces keep
+syncing and the command exits 1. All work happens in temporary worktrees.
 
 ## 4. Working on a workspace
 
@@ -315,25 +327,28 @@ also warns when `.delphi/` isn't exactly the version it says (edited in the clon
 ## 6. New workspaces
 
 `tools/new-workspace.sh [--by <who>] [--harness <adapter>] <org-path> <leaf>` validates the leaf and
-dotted name, then copies `templates/workspace/` and project `workspace-defaults/` into a temporary
-worktree. The explicit harness overrides the project's manifest default (else Claude Code). Its
-native instruction template is selected by `ci/harnesses.sh`, with only the matching instruction
-default appended and placeholders filled. Repositories and ordinary defaults are preserved;
-foreign native instruction/skill files and unsupported plugin defaults are not copied across
-harnesses. Shared skills arrive on refresh, never in the workspace's main folder.
-
-The tool sets `name:` and `harness:`, generates adapter-owned files, runs `ci/check.sh`, pushes
-`new-workspace/<org-path>/<leaf>`, and opens the PR using the PR template and `by: <who>` label.
-Sync creates `ws/<name>` once it merges.
-
-### Adding a harness
-
-`ci/harnesses.sh` is the explicit registry of native instruction/template paths, skill destinations
-and plugin capabilities, plus generated-file behavior. Add the adapter there and a native template
-under `templates/`, then teach validation about foreign native paths and any new generated files.
-Adapters must reject capabilities they cannot supply; Codex currently rejects Delphi plugin sets.
-Keep common workflows in neutral skills and place harness-specific integrations behind the adapter.
-Do not infer hook, plugin, authentication or hot-reload support from another harness.
+dotted name in a temporary main checkout. Explicit selection overrides the project's creation
+suggestion, with Claude Code suggested when neither is supplied. The chosen harness is always
+written into the workspace manifest. The source reader translates project defaults into that
+harness's native paths, appends instruction defaults to its native template, fills placeholders,
+and preserves ordinary defaults. Unsupported native mappings fail.
+
+The tool runs `ci/render.sh` and `ci/check.sh`, then opens `new-workspace/<org-path>/<leaf>` as a
+main-side PR with the complete native context and a `by: <who>` label. Sync creates `ws/<name>`
+once it merges; creation never depends on branch-side translation.
+
+### Adding a harness or source format
+
+`ci/harnesses.sh` owns target-native paths, instruction templates and plugin capabilities. Add a
+harness there and its native template under `templates/`, then add explicit mappings in
+`ci/sources.sh` and validation for foreign native files or new generated capabilities. Reject
+unsupported behavior. Keep source-format rules out of inheritance ownership and branch sync.
+
+`ci/sources.sh` is the input boundary. A different source format can produce the same records
+(content mode/hash, destination, origin) without choosing the consuming workspace's harness.
+Reusable skills already use the portable Agent Skills format. There is no required primary
+harness: every workspace selects its own target, and source bundles independently select their
+format. Creation suggestions can be changed or removed without changing existing workspaces.
 
 Test native authoring, refresh/propose ownership, opt-outs, old/new destination cleanup and layout
 propagation in `tests/e2e.sh`, including transitions from an existing adapter. Runtime changes use
diff --git a/docs/goals.md b/docs/goals.md
index 1bce948..1eb906f 100644
--- a/docs/goals.md
+++ b/docs/goals.md
@@ -4,7 +4,8 @@ What Delphi must achieve, not how. Any change must keep these. Details: `docs/de
 
 ## Purpose
 
-Store NER's AI context (instructions, skills, docs, settings) once, organized by the org chart. Let
+Author reusable AI context once, organized by the org chart, and keep reviewable native copies
+in each workspace on main. Let
 anyone, person or agent, work on a workspace with plain git and send improvements back.
 
 ## Goals
diff --git a/software/application-software/argos/AUTHORING.md b/software/application-software/argos/AUTHORING.md
index f4488f4..5c39524 100644
--- a/software/application-software/argos/AUTHORING.md
+++ b/software/application-software/argos/AUTHORING.md
@@ -11,7 +11,7 @@ full model; this is the Argos-specific short version.
 3. Push the branch and open a PR into `ws/<name>`. After it merges, CI proposes it to `main`.
 
 Don't edit `.delphi/`, `.github/workflows/delphi.yml`, or `.claude/settings.json`: Delphi manages
-them (`.delphi/` comes from main's root and sync resets it; `settings.json` is generated from
+them (`.delphi/` comes from main's root and sync resets it; `settings.json` is rendered on main from
 `workspace.yml`'s `plugins:`, where CI lists any folder's `default` plugin set; add other sets below them), nor the skills
 inherited from `skills/` or `workspace-inherit/` (sync overwrites them: change them on `main`, or list one under `opt-out:` to keep your own).
 Personal settings go in `.claude/settings.local.json`.
@@ -19,7 +19,7 @@ Personal settings go in `.claude/settings.local.json`.
 ## Create a new Argos workspace
 
 From a Delphi checkout: `tools/new-workspace.sh [--harness codex] application-software/argos <name>`. It copies
-Delphi's template, then `workspace-defaults/` (its matching native instructions are appended after the Delphi section), and opens
+Delphi's template, then `workspace-defaults/` (its declared source format is translated into the selected harness), and opens
 a PR to `main`. Trim what the new workspace doesn't need before merging.
 
 ## Change the defaults or this folder
@@ -27,7 +27,8 @@ a PR to `main`. Trim what the new workspace doesn't need before merging.
 Edit on a branch of `main` and open a PR to `main` (from a workspace: `bash .delphi/switch.sh main`;
 don't edit `workspaces/main/` from a workspace). `workspace-defaults/`
 only affects workspaces created afterwards; to change existing ones, PR each workspace too. `skills/` and `workspace-inherit/` reach
-every Argos workspace on the next sync.
+every Argos workspace through managed native copies on main. Run `bash ci/render.sh` and include
+its outputs in the same PR; refresh then copies those reviewed files to workspace branches.
 
 ## Writing good workspace context
 
@@ -35,8 +36,8 @@ every Argos workspace on the next sync.
 - One skill per repeatable workflow, with a `description` that says when to use it.
 - Agent context (glossary, conventions, skills) lives in the workspace; the glossary goes in `docs/`.
   Shared skills go in this project's `skills/<name>/`, or the relevant org folder's `skills/`.
-  Sync renders them into each workspace's native directory; change them through PRs to `main`.
-  Ordinary inherited docs go in `workspace-inherit/`. Context only some workspaces need goes in
+  The main-side renderer writes them into each workspace's native directory; change them through PRs to `main`.
+  Ordinary inherited docs go in `workspace-inherit/files/`, with the source format in `workspace-inherit/source.yml`. Context only some workspaces need goes in
   the workspace, or in a supported plugin set selected under `plugins:`. Codex does not load the
   Claude plugin sets. Workspace-owned native skills remain editable and proposable; use a native
   destination under `opt-out:` when taking ownership of an inherited skill.
diff --git a/software/application-software/argos/workspace-defaults/AGENTS.md b/software/application-software/argos/workspace-defaults/AGENTS.md
deleted file mode 100644
index cd43e4f..0000000
--- a/software/application-software/argos/workspace-defaults/AGENTS.md
+++ /dev/null
@@ -1,59 +0,0 @@
-# NER Software conventions
-
-## Branch & Commit Conventions
-
-- Branch from `develop` (not `main`) unless told otherwise. Branch name format: `{issue-number}-{kebab-case-title}` (e.g. `533-csv-upload-download-rules`), or `throwaway-{kebab-case-title}` to try something without a ticket.
-- Commit message format: `#{ticket-number} - {concise description}` (e.g. `#533 - add CSV upload endpoint`). Throwaway branches have no ticket, so any short message works.
-
-## Safety Rules
-
-- Never modify `.env` or secret files without explicit confirmation.
-- Never delete files without explicit confirmation.
-- Explain reasoning before making architectural changes.
-
-# Argos
-
-Argos is a real-time telemetry platform for Northeastern Electric Racing (NER). Angular 19 frontend (`angular-client/`) and Rust backend (`scylla-server/`), with schema tooling in `charybdis/` and MQTT broker config in `siren-base/`.
-
-The Argos repo's `develop` is checked out at `worktrees/argos/develop/`. Repo paths below (`angular-client/`, `scylla-server/`, `compose/`) are inside an Argos worktree. The ticket number is the branch's leading number (`533-csv-upload` → `#533`).
-
-## Worktrees
-
-- `worktrees/argos/develop/` mirrors `develop`: run anything there (`npm ci`, tests, the backend, `run-local`), but never edit code, branch, or commit there. The only git operations there are fetch and fast-forward.
-- To change code, make a worktree on its own branch with the `new-worktree` skill, based on `origin/develop`. Use the ticket's branch, or a `throwaway-{kebab-case-title}` branch to experiment without one. If a throwaway turns into real work, file a ticket (`create-ticket`), make the ticket's worktree from `origin/develop`, run `git -C worktrees/argos/<ticket-branch> merge --squash throwaway-{kebab-case-title}`, then `commit`, so the work lands as one commit in the ticket format.
-- A new worktree has no `node_modules`; `run-local` and `implement` install them.
-
-## Local Development
-
-- Run the app with the `run-local` skill, passing the branches you're looking at (a PR's or ticket's, with a worktree from `new-worktree`; not `develop` unless asked). It starts the backend if it's down, on the right compose profile (`client-dev` runs everything in Docker; `scylla-dev` plus `cargo run` when a target changes `scylla-server/`), and serves each worktree's client on its own port.
-- The shell workflow (`argos.sh`, the `run-local`/`verify-*` skills, and helpers like `lsof`/`pkill`) assumes a Unix shell. On Windows, run everything from WSL or Git Bash, not `cmd`/PowerShell.
-
-## Testing
-
-The checks (frontend tests, lint and format; backend build and tests) and how to run them from the root are in `implement`; `open-pr` reruns lint and format before a PR.
-
-## Workflow
-
-Per ticket: `implement` (worktree, test-first, `commit`) → `open-pr`.
-
-## PR Convention
-
-- The `commit` skill applies the commit message format.
-- Open PRs against `develop` as drafts. PR titles carry no ticket number; the body ends with `Closes #{ticket}`. The `open-pr` skill runs the pre-PR checks (lint, conflict check), pushes, and opens the draft; `update-pr` refreshes the description.
-- Keep PR descriptions tight: at most three backtick usages in the body, and never commit screenshots (`open-pr` asks before attaching them to the PR).
-
-## Screenshots
-
-Save all Playwright screenshots under `pictures/<branch-name>/` at the repo root, using kebab-case descriptive filenames. The `pictures/` folder is git-ignored, so screenshots are never committed; `open-pr` offers to attach them to the PR with `gh --attach` (drag-drop them on gh older than v2.99.0).
-
-## Code Conventions
-
-Code and ADR conventions worth stating are in the Conventions section of `docs/CONTEXT.md`; everything else follows current Angular and Rust defaults.
-
-## Issue tracker
-
-Issues live in GitHub Issues on `Northeastern-Electric-Racing/Argos` via the `gh` CLI. File tickets with the `create-ticket` skill (shared by every application-software workspace); it holds the ticket conventions and follows the repo's issue templates (idea, spike, epic, dev work), with Argos's specifics in `ticket-conventions`. When an out-of-scope but worthwhile idea comes up mid-work, offer to file it as an idea with `create-ticket`; park rough notes with `journal`.
-
-## Domain docs
-
-The glossary is a workspace doc: `docs/CONTEXT.md` at the workspace root. Edit it there and it's proposed back to Delphi. ADRs live in the Argos repo at `docs/adr/` and land through Argos PRs like any other change; filenames follow the Conventions section of `docs/CONTEXT.md`. Read `docs/CONTEXT.md` and the relevant ADRs before exploring, use the glossary's terms, and flag any conflict with an ADR.
diff --git a/software/application-software/argos/workspace-defaults/CLAUDE.md b/software/application-software/argos/workspace-defaults/files/CLAUDE.md
similarity index 88%
rename from software/application-software/argos/workspace-defaults/CLAUDE.md
rename to software/application-software/argos/workspace-defaults/files/CLAUDE.md
index edbd71b..01063c1 100644
--- a/software/application-software/argos/workspace-defaults/CLAUDE.md
+++ b/software/application-software/argos/workspace-defaults/files/CLAUDE.md
@@ -41,13 +41,13 @@ The Argos repo's `develop` is checked out at `worktrees/argos/develop/`. Paths b
 
 ## PR Convention
 
-- The `/commit` skill applies the commit message format.
-- Open PRs against `develop` as drafts. The `/open-pr` skill runs the pre-PR checks (lint, conflict check), pushes, and opens the draft; `/update-pr` refreshes the description.
-- Keep PR descriptions tight: at most three backtick usages in the body, and never commit screenshots (`/open-pr` asks before attaching them to the PR).
+- The `commit` skill applies the commit message format.
+- Open PRs against `develop` as drafts. The `open-pr` skill runs the pre-PR checks (lint, conflict check), pushes, and opens the draft; `update-pr` refreshes the description.
+- Keep PR descriptions tight: at most three backtick usages in the body, and never commit screenshots (`open-pr` asks before attaching them to the PR).
 
 ## Screenshots
 
-Save all Playwright screenshots under `pictures/<branch-name>/` at the repo root, using kebab-case descriptive filenames. The `pictures/` folder is git-ignored, so screenshots are never committed; `/open-pr` offers to attach them to the PR with `gh --attach` (drag-drop them on gh older than v2.99.0).
+Save all Playwright screenshots under `pictures/<branch-name>/` at the repo root, using kebab-case descriptive filenames. The `pictures/` folder is git-ignored, so screenshots are never committed; `open-pr` offers to attach them to the PR with `gh --attach` (drag-drop them on gh older than v2.99.0).
 
 ## Code Conventions
 
diff --git a/software/application-software/argos/workspace-defaults/workspace.yml b/software/application-software/argos/workspace-defaults/files/workspace.yml
similarity index 100%
rename from software/application-software/argos/workspace-defaults/workspace.yml
rename to software/application-software/argos/workspace-defaults/files/workspace.yml
diff --git a/software/application-software/argos/workspace-defaults/source.yml b/software/application-software/argos/workspace-defaults/source.yml
new file mode 100644
index 0000000..a8c6248
--- /dev/null
+++ b/software/application-software/argos/workspace-defaults/source.yml
@@ -0,0 +1 @@
+format: claude-code
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/address-pr-comments/SKILL.md b/software/application-software/argos/workspaces/argos-dev/.claude/skills/address-pr-comments/SKILL.md
new file mode 100644
index 0000000..3bf22d3
--- /dev/null
+++ b/software/application-software/argos/workspaces/argos-dev/.claude/skills/address-pr-comments/SKILL.md
@@ -0,0 +1,18 @@
+---
+name: address-pr-comments
+description: Fetch review comments on a PR (Argos, Nero), judge whether each (including outdated ones) still applies, and walk through fixes in the PR's worktree
+---
+
+Propose and apply fixes for a PR's unresolved review feedback. **Never reply to threads**; the user does.
+
+1. **Fetch** from the workspace root: `bash scripts/fetch-feedback.sh <repo> <pr>|<branch>` (`<repo>` as under `repos/`, e.g. `argos`; `--all` first for unfiltered history). It checks out the PR head's worktree and prints JSON: `worktree` (target it by path from the root from now on), unresolved `threads`, `comments`, `reviews`. Any non-zero exit: use the available GitHub integration's PR-reading tool instead.
+2. **Judge.** Skip bot noise and anything already fixed at HEAD. For an `outdated` thread, find its `diffHunk` code by content, then label it **addressed**, **applies**, **moved**, **obsolete**, or **unclear**.
+3. **Present** before editing, grouped by file, and ask to confirm, skip, or change each (offer to batch clear ones past 8):
+
+   ```
+   <file>:<line> — <reviewer> · <active|outdated> · <label>
+   "<excerpt>" → <proposed fix>
+   <optional ≤5-line snippet, for the user only>
+   ```
+4. **Apply** in that worktree, by path, with grouped `/commit`s. For a follow-up-ticket request, reuse a match from `gh issue list --search` before filing.
+5. **Report** what was fixed (file:line, commit SHA), what was already addressed or obsolete (why), and what is unclear.
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh b/software/application-software/argos/workspaces/argos-dev/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh
new file mode 100755
index 0000000..ce1efd9
--- /dev/null
+++ b/software/application-software/argos/workspaces/argos-dev/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh
@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+# fetch-feedback.sh [--all] <repo> <pr-number>|<branch>: print a PR's review
+# feedback as one JSON object after creating or reusing the PR head's worktree
+# (worktrees/<repo>/<head>). Default output keeps unresolved threads (first + latest message,
+# bots tagged), conversation comments, and reviews with text; --all keeps everything. Exits 3 on any
+# GitHub failure (see github.sh).
+# shellcheck source-path=SCRIPTDIR source=github.sh
+set -euo pipefail
+. "$(dirname "$0")/github.sh"
+all=false
+[ "${1:-}" = --all ] && all=true && shift
+usage="usage: fetch-feedback.sh [--all] <repo> <pr-number>|<branch>"
+repo=${1:?$usage} ref=${2:?$usage}
+# shellcheck source=/dev/null
+. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
+gh_init fetch-feedback "$DELPHI_WORKTREES/$repo/.bare"
+
+case "$ref" in *[!0-9]*) get "repos/$SLUG/pulls?state=all&head=${SLUG%%/*}:$ref" | jq '.[0] // error("no PR")' ;;
+  *) get "repos/$SLUG/pulls/$ref" ;; esac >"$TMP/pr"
+num=$(jq .number "$TMP/pr")
+wt=""
+[ "$(jq -r .head.repo.full_name "$TMP/pr")" != "$SLUG" ] || wt=$(bash "$DELPHI_ROOT/.delphi/new-worktree.sh" "$repo" "$(jq -r .head.ref "$TMP/pr")")
+
+if [ "$MODE" = gh ]; then # thread state is GraphQL-only; reshape it like the proxy's ccr/review_threads
+  # shellcheck disable=SC2016 # GraphQL variables
+  gh api graphql -F o="${SLUG%%/*}" -F n="${SLUG##*/}" -F p="$num" -f query='query($o: String!, $n: String!, $p: Int!) {
+    repository(owner: $o, name: $n) { pullRequest(number: $p) { reviewThreads(first: 100) { nodes {
+      isResolved isOutdated comments(first: 50) { nodes { databaseId } } } } } } }' \
+    --jq '[.data.repository.pullRequest.reviewThreads.nodes[] |
+      {resolved: .isResolved, outdated: .isOutdated, comment_ids: [.comments.nodes[].databaseId]}]'
+else get "repos/$SLUG/pulls/$num/ccr/review_threads"; fi >"$TMP/th"
+get "repos/$SLUG/pulls/$num/comments?per_page=100" >"$TMP/rc"
+get "repos/$SLUG/issues/$num/comments?per_page=100" >"$TMP/ic"
+get "repos/$SLUG/pulls/$num/reviews?per_page=100" >"$TMP/rv"
+
+jq -n --arg wt "$wt" --argjson all "$all" --slurpfile pr "$TMP/pr" --slurpfile th "$TMP/th" \
+  --slurpfile rc "$TMP/rc" --slurpfile ic "$TMP/ic" --slurpfile rv "$TMP/rv" '
+  def who: {author: .user.login, bot: (.user.type == "Bot")};
+  ($rc[0] | map({key: (.id | tostring), value: (who + {body, path, line: (.line // .original_line), diffHunk: .diff_hunk})}) | from_entries) as $byid |
+  {pr: ($pr[0] | {number, title, url: .html_url, head: .head.ref, base: .base.ref}), worktree: $wt,
+   threads: [$th[0][] | {resolved, outdated, comments: [.comment_ids[] | $byid[tostring]]}],
+   comments: [$ic[0][] | who + {body}], reviews: [$rv[0][] | who + {state, body: (.body // "")}]} |
+  if $all then . else
+    .threads |= map(select(.resolved | not) | .comments as $c | $c[-1] + {outdated, path: $c[0].path, line: $c[0].line,
+      diffHunk: (if .outdated then $c[0].diffHunk else null end), replies: ($c | length),
+      first: (if ($c | length) > 1 then $c[0].body else null end)}) |
+    .reviews |= map(select(.body != ""))
+  end'
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/address-pr-comments/scripts/github.sh b/software/application-software/argos/workspaces/argos-dev/.claude/skills/address-pr-comments/scripts/github.sh
new file mode 100644
index 0000000..da0be20
--- /dev/null
+++ b/software/application-software/argos/workspaces/argos-dev/.claude/skills/address-pr-comments/scripts/github.sh
@@ -0,0 +1,19 @@
+# github.sh: sourced by skill scripts that call GitHub. gh_init <tool> <git-dir> picks a backend
+# (gh when logged in, else an explicitly enabled GitHub REST proxy via curl; jq is needed either
+# way), sets SLUG from that repo's origin, and makes any failure exit 3 so the calling skill falls
+# back to the available GitHub integration. TMP is a scratch dir removed on exit.
+# shellcheck shell=bash
+fail() { echo "$TOOL: $1; use the available GitHub integration" >&2; exit 3; }
+on_exit() { local rc=$?; rm -rf "$TMP"; [ "$rc" -eq 0 ] || fail "GitHub request failed ($MODE)"; }
+gh_init() {
+  TOOL=$1
+  if { command -v gh && gh auth status; } >/dev/null 2>&1; then MODE=gh
+  elif [ -n "${DELPHI_GITHUB_REST_PROXY:-${CLAUDE_CODE_REMOTE:-}}" ] && command -v curl >/dev/null; then MODE=rest
+  else fail "no authenticated gh or enabled REST proxy"; fi
+  command -v jq >/dev/null || fail "jq not installed"
+  SLUG=$(git -C "$2" remote get-url origin) && SLUG=${SLUG#*github.com[:/]} && SLUG=${SLUG%.git}
+  TMP=$(mktemp -d)
+  trap on_exit EXIT
+}
+get() { if [ "$MODE" = gh ]; then gh api "$1"; else curl -fsS "https://api.github.com/$1"; fi; }
+post() { if [ "$MODE" = gh ]; then gh api -X POST "$1" --input -; else curl -fsS -X POST --data-binary @- "https://api.github.com/$1"; fi; }
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/commit/SKILL.md b/software/application-software/argos/workspaces/argos-dev/.claude/skills/commit/SKILL.md
new file mode 100644
index 0000000..ad1fa37
--- /dev/null
+++ b/software/application-software/argos/workspaces/argos-dev/.claude/skills/commit/SKILL.md
@@ -0,0 +1,6 @@
+---
+name: commit
+description: Stage and commit using the project's commit message convention
+---
+
+In the worktree you're working on, from the workspace root (`git -C worktrees/<repo>/<branch> …`), stage the relevant changes (not unrelated or generated files) and commit using the commit message format in the workspace instructions. Keep the description imperative and 2–8 words.
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/consolidate-spikes/SKILL.md b/software/application-software/argos/workspaces/argos-dev/.claude/skills/consolidate-spikes/SKILL.md
new file mode 100644
index 0000000..897a1f5
--- /dev/null
+++ b/software/application-software/argos/workspaces/argos-dev/.claude/skills/consolidate-spikes/SKILL.md
@@ -0,0 +1,14 @@
+---
+name: consolidate-spikes
+description: >-
+  Turn finished spikes into implementation tickets: an idea's spikes, once all are done, into dev work, under an epic when it comes from an idea or splits. Use when the user wants to wrap up, settle, or consolidate an idea or spike on an application-software repo (Argos, Nero).
+---
+
+Drafts and files by the `create-ticket` rules; load it and the project's `ticket-conventions` first. Takes an idea or a standalone spike.
+
+1. **Gather** each spike's findings comment, draft PR, and the PR's reviews; from an idea, its sub-issues too.
+2. **Check it's done.** Every spike is done by `create-ticket`'s Spikes rules (the lead's latest review on its draft PR, from repos/<owner>/<repo>/pulls/<pr>/reviews, is an approval). From an idea, that's every spike under it, and every one of its areas to explore is covered by a spike area. Otherwise list what's missing, offer spikes for uncovered areas, and stop.
+3. **Choose:** per area (title prefix), propose the approach to build (one spike's, or a mix) with a one-line why, from the findings and the lead's review. The user confirms or changes each.
+4. **Plan** the dev work by `create-ticket`'s Dev work rules: one ticket unless the work is large enough to split into vertical slices, which may cross areas. Each ticket: What, the slice; Notes, links to the spikes and draft PRs it draws on, and the dropped approaches with why; context transfer, the findings' facts.
+5. **Draft** them, and, from an idea or when split, one epic (From: the idea or spike) with the dev work as its sub-issues. Show all, with which slices run in parallel if split; file what the user OKs.
+6. **Close**, each with a one-line comment: the spikes as completed ("Consolidated into #<epic or dev work>"), their draft PRs unless a dev work ticket builds on that branch, and the idea as completed ("Settled in #<epic or dev work>").
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/create-ticket/SKILL.md b/software/application-software/argos/workspaces/argos-dev/.claude/skills/create-ticket/SKILL.md
new file mode 100644
index 0000000..9dd28e5
--- /dev/null
+++ b/software/application-software/argos/workspaces/argos-dev/.claude/skills/create-ticket/SKILL.md
@@ -0,0 +1,66 @@
+---
+name: create-ticket
+description: Draft and file a GitHub issue (idea, spike, epic, or dev work) on an application-software repo (Argos, Nero) from the repo's issue templates, or rewrite an existing issue into them. Use whenever the user wants to create, file, write up, or log a ticket, issue, idea, spike, epic, bug, or task, including an out-of-scope idea that comes up mid-work.
+---
+
+# Create ticket
+
+These are the ticket conventions for every application-software repo. The repo's own `.github/ISSUE_TEMPLATE` holds only the fields (`gh api repos/<owner>/<repo>/contents/.github/ISSUE_TEMPLATE/<file> -q .content | base64 -d`); follow each field's description.
+
+First load the project's `ticket-conventions` skill (inherited from the project's `skills/`) for its repo, area labels, vocabulary, and diagrams. If none is enabled, ask which repo.
+
+## Workflow
+
+idea → spikes → epic → dev work, or a standalone spike → dev work
+
+| Ticket | What it is | Issue type | Parent |
+|---|---|---|---|
+| Idea | What could be built and why. Its areas to explore are things to improve or problems to solve, each with approaches worth trying. | none | none |
+| Spike | One approach to try on one area of an idea (it needn't cover the whole area), or a small standalone improvement: what is tried and the hypothesis. Findings go in a comment and a draft PR (`report-spike`), not the ticket. | none | its idea, if any |
+| Epic | Work too large for one dev work ticket: the goal and whole-epic outcomes, not a walkthrough of each ticket. A new issue linking the idea or spike it came from in "From". | Feature | none |
+| Dev work | Any implementation work: testable requirements, Notes for gotchas and pointers to code. Large work is cut into vertical slices (see Dev work below). | Feature, Bug, or Task | its epic, if any |
+
+If unsure, a small, clear change is dev work, a small unknown is a spike, and a big unexplored thing is an idea. Ideas and spikes explore work, so they get no issue type; bug, feature, and task are issue types, never labels.
+
+## Writing
+
+How every ticket reads, on any project:
+
+- Short and plain. Write for someone new to the project: explain project-specific terms, and use the project's vocabulary (its `ticket-conventions` says where it lives; check the code for current names).
+- Outcomes, not implementation: say what changes and why, not how to build it. A rationale gives the reasoning, not a history of the problem.
+- No prescriptions on ideas and spikes. Ideas name open options to weigh, not a plan or a recommended pick; spikes state what to learn and leave the how to whoever picks it up.
+- Facts, not instructions: Notes and context transfer hold facts (where code lives, current behavior, constraints, links), not steps or a proposed solution. Context transfer (optional on spikes, epics, and dev work) starts with a short summary, then the raw context.
+- Unknowns stay open questions in Notes; don't guess.
+- Title: concise and imperative, no prefixes (except a spike's area).
+- Requirements: clear, broad checkboxes, each a testable outcome rather than an implementation step; 3-5, never more than 7. If it needs more, split the ticket.
+- Backticks: at most three inline uses per body; name files and identifiers in plain text. Diagram and context-transfer blocks don't count.
+- Size: keep ideas short; one small enough to just try is a spike.
+
+## Dev work
+
+- One ticket by default. Split only when the work is too large for one PR or parts could run in parallel.
+- When split, cut vertical slices: each goes end to end through every part it touches (e.g. backend through UI), not one layer, and works and is testable on its own. Cut for the most parallel work; mark a slice that must wait as blocked by the one it waits on (see File).
+
+## Spikes
+
+- One approach, not a set to choose between. If a spike reads "X or Y", it is two spikes.
+- Prefer an idea with a few spikes (often 2-4) under it; a spike can also stand alone, or with siblings, to explore an area. Several spikes can take on the same area in different ways.
+- Title it `<area>: <approach>`, with the area a short kebab-case name its siblings share (`graph-saving: Save a graph to a file and re-upload it`). An area may cover more than one of an idea's bullets. A lone small improvement needs no prefix.
+- Sibling spikes share the context transfer's summary and common facts; each adds only the facts particular to its approach.
+- An idea needn't get all its spikes at once: file an area's spikes when someone is ready to try them.
+- Done: its findings are posted, review feedback is addressed, and the lead's latest review on its draft PR is an approval (GitHub's Approve), including when the recommendation is to drop the approach. A done spike stays open until `consolidate-spikes` closes it.
+
+## Draft
+
+- Check the code first: the work may be done or already tracked.
+- One `### <field label>` per field in template order, following each field's description; omit empty optional fields.
+- Diagrams: required on epics, optional on dev work. The project's `ticket-conventions` says what they show.
+- Labels: the template's category (`idea`, `spike`, `epic`, `dev work`), one written-by (`by: human` if the user dictated it, `by: ai-assisted` if they gave the substance, `by: ai` if you wrote it, including rewrites), and at least one of the project's area labels.
+- Rewriting an old ticket: keep its intent and assignees; bring it up to these rules and update vocabulary, labels, issue type, and parent.
+- Folding one ticket into another: add it as a requirement on the target, then close it as not planned. Every close gets a one-line comment saying why.
+
+## File
+
+Check for open duplicates, then show the full draft (title, type if any, labels, parent, body) in the chat, not only in a file. File or edit only what the user OKs.
+
+Use the REST API (GraphQL may be blocked): POST repos/<owner>/<repo>/issues with title, body, labels, the issue type from the table, and the user as assignee (on a spike, whoever will run it; ask), then, if it has a parent, POST repos/<owner>/<repo>/issues/<parent>/sub_issues with the new issue's id. If it waits on another issue, POST repos/<owner>/<repo>/issues/<n>/dependencies/blocked_by with the blocking issue's id. Report the URL.
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/implement/SKILL.md b/software/application-software/argos/workspaces/argos-dev/.claude/skills/implement/SKILL.md
new file mode 100644
index 0000000..f24d293
--- /dev/null
+++ b/software/application-software/argos/workspaces/argos-dev/.claude/skills/implement/SKILL.md
@@ -0,0 +1,14 @@
+---
+name: implement
+description: Implement an Argos ticket or task in its own worktree, test-first, ending in a commit, here or in a subagent (one per ticket, in parallel, for several). Use when the user asks to build, fix, or implement something in Argos.
+---
+
+1. **Worktree.** Get the ticket's branch (`{issue-number}-{kebab-case-title}`) with the `new-worktree` skill, based on `origin/develop`. Make every change in `worktrees/argos/<branch>/`, never in `worktrees/argos/develop/`, while staying at the workspace root: edit files by path, `git -C worktrees/argos/<branch> …` for git, and one-off subshells for the rest. Run `(cd worktrees/argos/<branch>/angular-client && npm ci)` before touching the client.
+2. **Hand off?** Unless the user already chose, ask whether a subagent should do the rest, and recommend one: one per ticket, in parallel, when there are several (step 1 for each first), or one for work long enough to fill this conversation. Tell it the ticket, its worktree's absolute path, and to follow this skill from step 3, change files only under that path (`git -C` for git), name temp files after the branch, stop the clients it starts, and report its commits, checks, and the port and browser it used. Never turn on the harness's own worktree isolation (`new-worktree` says why). Then confirm its commits with `git -C <path> log origin/develop..` and pass its report on.
+3. **Understand.** Read the issue (`gh issue view <n> --comments`), the code involved, and `docs/CONTEXT.md` terms.
+4. **Build test-first**, one behavior at a time: a failing test, the least code to pass it, refactor while green. Test through public interfaces; mock only at system boundaries.
+5. **Check.**
+   - Frontend, in `(cd worktrees/argos/<branch>/angular-client && …)`: `npx ng test --include='src/**/thing.spec.ts' --watch=false` while iterating; at the end `npx ng test --watch=false` (bare `ng test` blocks), then `npx prettier --check "src/**/*.{ts,html,scss}" && npx ng lint`.
+   - Backend, in `(cd worktrees/argos/<branch>/scylla-server && …)`: `cargo build` and single tests while iterating; `cargo test` at the end.
+   - UI changes: verify in the running app with `run-local <branch>`.
+6. **Commit** with `/commit`. Don't push or open a PR unless asked; that's `/open-pr`.
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/journal/SKILL.md b/software/application-software/argos/workspaces/argos-dev/.claude/skills/journal/SKILL.md
new file mode 100644
index 0000000..4917259
--- /dev/null
+++ b/software/application-software/argos/workspaces/argos-dev/.claude/skills/journal/SKILL.md
@@ -0,0 +1,22 @@
+---
+name: journal
+description: Park rough notes locally mid-task ("note to self", "remember to", "journal this"), and later export them to their permanent home (issue, spec, ADR, glossary, docs) through the skill that owns it. Use when the user wants to jot a thought without derailing, or to file parked notes.
+---
+
+Notes live in `.journal/` at the workspace root (git-excluded, outside worktrees so they survive removal). An **entry** is one file, a **category** a subfolder. The journal never pushes, files, or contacts GitHub itself.
+
+**Capture** (no git, no other skills):
+
+```
+bash scripts/capture.sh [-c <category>] ["note text"]
+```
+
+Omit `-c` for a loose entry, omit the text for an empty one to edit. Report the path it prints.
+
+**Export** (only when asked):
+
+1. Read the entries and propose a grouping: one entry → one output, a category → one merged output, or one entry split across several. Let the user adjust.
+2. For each output, pick the workspace skill whose description fits its permanent home, preferring an existing docs area. A new section always needs approval.
+3. Show the destination and reshaped text and wait for approval. Nothing lands silently.
+4. Delegate to that skill; it owns formatting, conventions, and any GitHub contact.
+5. Ask whether to delete the exported entry (default: keep).
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/journal/scripts/capture.sh b/software/application-software/argos/workspaces/argos-dev/.claude/skills/journal/scripts/capture.sh
new file mode 100755
index 0000000..1e90d7b
--- /dev/null
+++ b/software/application-software/argos/workspaces/argos-dev/.claude/skills/journal/scripts/capture.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+# capture.sh [-c <category>] [note text]: write a timestamped journal entry to
+# .journal/[<category>/] at the workspace root (adding /.journal/ to .git/info/exclude once) and print
+# its path. An empty entry is created when no text is given. Never touches git history, GitHub, or
+# other skills.
+set -euo pipefail
+usage="usage: capture.sh [-c <category>] [note text]"
+# shellcheck source=/dev/null
+. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
+dir=$DELPHI_ROOT/.journal
+[ "${1:-}" = -c ] && dir=$dir/${2:?$usage} && shift 2
+exclude=$(git -C "$DELPHI_ROOT" rev-parse --path-format=absolute --git-path info/exclude 2>/dev/null || true)
+[ -z "$exclude" ] || grep -qxF /.journal/ "$exclude" 2>/dev/null || { mkdir -p "${exclude%/*}" && echo /.journal/ >>"$exclude"; }
+mkdir -p "$dir"
+file=$dir/$(date +%Y-%m-%d-%H%M%S).md
+{ echo "<!-- captured $(date -u +%Y-%m-%dT%H:%M:%SZ) -->"; [ $# -eq 0 ] || echo "$*"; } >"$file"
+echo "$file"
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/new-worktree/SKILL.md b/software/application-software/argos/workspaces/argos-dev/.claude/skills/new-worktree/SKILL.md
new file mode 100644
index 0000000..0495fc9
--- /dev/null
+++ b/software/application-software/argos/workspaces/argos-dev/.claude/skills/new-worktree/SKILL.md
@@ -0,0 +1,16 @@
+---
+name: new-worktree
+description: Create or reuse a worktree for a branch of a code repo (worktrees/<repo>/<branch>). Use before any branch work, such as starting a ticket or reviewing or fixing a PR branch, unless the user says not to use worktrees.
+---
+
+Run from the workspace root:
+
+```
+bash .delphi/new-worktree.sh <repo> <branch> [<base>]
+```
+
+- An existing branch (local or on origin, e.g. a PR head) is checked out; anything else is created from `<base>` (default: the repo's default branch). Safe to re-run.
+- Stay at the workspace root and reach into the worktree by the printed path. Never switch branches in an existing worktree or work in its store, `worktrees/<repo>/.bare`.
+- For a subagent, make its worktree here first and hand it the path. Never use the harness's own worktree isolation: it checks out this Delphi clone from main, not the code repo, and fences the subagent out of `worktrees/`.
+- Keep `worktrees/<repo>/<default-branch>/` (made by setup) a clean reference: fetch and fast-forward only.
+- After the branch merges: `git -C worktrees/<repo>/.bare worktree remove ../<branch>`.
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/open-pr/SKILL.md b/software/application-software/argos/workspaces/argos-dev/.claude/skills/open-pr/SKILL.md
new file mode 100644
index 0000000..7363dd2
--- /dev/null
+++ b/software/application-software/argos/workspaces/argos-dev/.claude/skills/open-pr/SKILL.md
@@ -0,0 +1,22 @@
+---
+name: open-pr
+description: Run pre-PR checks, push the branch, and open a draft pull request on an application-software repo (Argos, Nero)
+---
+
+First load the project's `pr-conventions` skill (inherited from the project's `skills/`) for its base branch, commit format, checks, labels, and screenshots.
+
+1. **Check:** `bash scripts/pr-checks.sh <repo> <branch> origin/<base> '<commit format>'` (clean tree, commit subjects match the project's format, merges cleanly into the base), then the project's own checks. Stop and fix on any FAIL.
+2. **Media:** if the diff touches the UI, ask the user whether to add screenshots to the PR, listing any already in the project's screenshot folder for this branch so they can pick those instead of new ones; on no, skip this step. For new ones, use the project's UI QA to take Playwright screenshots of the changed views into its screenshot folder, or, when the change adds or changes an animation, record a short video instead (a browser context with `recordVideo: { dir }` saves a `.webm` when it closes). Images must be under 10 MB; video under 10 MB on a Free plan, 100 MB on a paid one.
+3. **Open:** push (`git -C worktrees/<repo>/<branch> push -u origin <branch>`), then run `(cd worktrees/<repo>/<branch> && gh pr create --draft --base <base> --head <branch> --title "<title>" --body-file /tmp/<branch>-pr-body.md --assignee @me)` with the project's labels (`--label`) and one `--attach <file>` per screenshot or video, and report the URL.
+4. **Spike:** the PR stays a draft; getting it merged isn't the goal. Once it's checked and working, run `report-spike`.
+
+## PR body
+
+Fill the worktree's `.github/pull_request_template.md` from the diff, following each section's comment, and write it to `/tmp/<branch>-pr-body.md`:
+
+- Title: concise and imperative, no ticket number.
+- The Changes section (not the whole body): about 50 words (1–3 sentences) on what landed and the key design choice. Describe the change, not the file list: don't enumerate components, classes or files the diff already shows. Name a specific one only when its behaviour changes in a way a reviewer must know.
+- Delete the template's comments and any optional or non-applicable sections, and check off the Checklist.
+- At most three backtick uses in the body.
+- End with `Closes #{ticket}` (the branch's leading number), or `Spike for #{ticket}` on a spike, which its PR never closes.
+- Screenshots and videos: reference each one by its path from the worktree, `![<what it shows>](<path>)`; `--attach` uploads it and rewrites the reference to its `user-attachments` URL. `--attach` needs gh v2.99.0+: if `gh pr create --help` doesn't list it, put `_screenshot pending_` instead and remind the user to drag-drop the files from the screenshot folder. Never commit screenshots or videos.
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/open-pr/scripts/pr-checks.sh b/software/application-software/argos/workspaces/argos-dev/.claude/skills/open-pr/scripts/pr-checks.sh
new file mode 100755
index 0000000..61f377f
--- /dev/null
+++ b/software/application-software/argos/workspaces/argos-dev/.claude/skills/open-pr/scripts/pr-checks.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+# pr-checks.sh <repo> <branch> [<base> [<format>]]: open-pr's shared pre-PR checks on
+# worktrees/<repo>/<branch>. Prints
+# one PASS/FAIL/SKIP line per check: clean tree, every commit subject since <base> (default
+# origin/develop, fetched first) matches <format> (an extended regex, default '^#[0-9]+ - '), and no
+# merge conflicts with <base>. Exits 1 if any check fails. The project's own checks (lint, format)
+# are in its pr-conventions skill.
+set -euo pipefail
+usage="usage: pr-checks.sh <repo> <branch> [<base> [<format>]]"
+repo=${1:?$usage} branch=${2:?$usage}
+# shellcheck source=/dev/null
+. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
+cd "$DELPHI_WORKTREES/$repo/$branch"
+base=${3:-origin/develop} format=${4:-'^#[0-9]+ - '} fail=0
+res() { echo "$1 $2"; [ "$1" != FAIL ] || fail=1; }
+git fetch -q origin "${base#origin/}" 2>/dev/null || true
+
+if [ -z "$(git status --porcelain)" ]; then res PASS "clean tree"; else res FAIL "uncommitted changes"; fi
+bad=$(git log --format=%s "$base..HEAD" | grep -Ev "$format" || true)
+if [ -z "$bad" ]; then res PASS "commit format"; else res FAIL "commit format: $(echo "$bad" | paste -sd'|' -)"; fi
+if git merge-tree --write-tree HEAD "$base" >/dev/null 2>&1; then res PASS "merges cleanly into $base"
+elif [ $? -eq 1 ]; then res FAIL "conflicts with $base"; else res SKIP "conflict check (needs git 2.38+)"; fi
+exit "$fail"
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/pr-conventions/SKILL.md b/software/application-software/argos/workspaces/argos-dev/.claude/skills/pr-conventions/SKILL.md
new file mode 100644
index 0000000..7e50492
--- /dev/null
+++ b/software/application-software/argos/workspaces/argos-dev/.claude/skills/pr-conventions/SKILL.md
@@ -0,0 +1,14 @@
+---
+name: pr-conventions
+description: Argos specifics for pull requests (base branch, commit format, checks, labels, screenshots, UI QA). Load before opening, updating, or reviewing an Argos PR, alongside open-pr, update-pr, and review.
+---
+
+# Argos PR conventions
+
+The shared rules are in the `open-pr` skill; this adds only what is Argos's.
+
+- Base branch: `develop`. Commit format: `^#[0-9]+ - ` (the format in the workspace instructions).
+- Checks: `bash scripts/lint.sh <branch>` (frontend prettier and ng lint, only if angular-client/ changed).
+- Labels: one written-by (`by: human` if the user wrote it, `by: ai-assisted` if they gave the substance, `by: ai` if you wrote it) and at least one area label (`frontend`, `backend`, `devops`); no category label.
+- Screenshots: `pictures/<branch>/` at the worktree root (git-ignored).
+- UI QA: get the branch running with `run-local <branch>`, then drive it with Playwright, using the `playwright-cdp` server if `curl -s localhost:9222/json/version` responds, otherwise `playwright`.
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/pr-conventions/scripts/lint.sh b/software/application-software/argos/workspaces/argos-dev/.claude/skills/pr-conventions/scripts/lint.sh
new file mode 100644
index 0000000..2ed67ec
--- /dev/null
+++ b/software/application-software/argos/workspaces/argos-dev/.claude/skills/pr-conventions/scripts/lint.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+# lint.sh <branch> [<base>]: Argos's pre-PR check for open-pr, on
+# worktrees/argos/<branch>. Prints one PASS/FAIL/SKIP line: frontend prettier + ng lint, only if
+# angular-client/ changed since <base> (default origin/develop). Exits 1 if it fails.
+set -euo pipefail
+usage="usage: lint.sh <branch> [<base>]"
+branch=${1:?$usage}
+# shellcheck source=/dev/null
+. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
+cd "$DELPHI_WORKTREES/argos/$branch"
+base=${2:-origin/develop}
+if git diff --quiet "$base...HEAD" -- angular-client; then echo "SKIP frontend lint (no changes)"
+elif [ ! -d angular-client/node_modules ]; then echo "FAIL frontend lint: run npm ci in angular-client/" && exit 1
+elif (cd angular-client && npx prettier --check "src/**/*.{ts,html,scss}" >/dev/null && npx ng lint >/dev/null 2>&1)
+then echo "PASS frontend lint"; else echo "FAIL frontend lint (run prettier --check / ng lint to see why)" && exit 1; fi
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/report-spike/SKILL.md b/software/application-software/argos/workspaces/argos-dev/.claude/skills/report-spike/SKILL.md
new file mode 100644
index 0000000..e673871
--- /dev/null
+++ b/software/application-software/argos/workspaces/argos-dev/.claude/skills/report-spike/SKILL.md
@@ -0,0 +1,22 @@
+---
+name: report-spike
+description: Post a spike's findings on its ticket, judged against its hypothesis, and ask the lead to review its draft PR. Use when a spike's approach has been tried on an application-software repo (Argos, Nero).
+---
+
+A spike runs like any ticket (branch, commits, a draft PR from `open-pr`); this reports it. Load the project's `pr-conventions` first.
+
+1. **Read** the spike (`gh issue view <n> --comments`), its draft PR, and the branch's diff against the base.
+2. **Draft** one findings comment, short and factual:
+
+   ```
+   ### Findings
+   **Hypothesis:** holds | partly holds | doesn't hold. One sentence why.
+   **Learned:** measurements, limits hit, surprises, with links to the draft PR's code.
+   **Recommendation:** adopt, adopt with changes, or drop, and why.
+   **Open questions:** what the spike didn't settle.
+   Draft PR: #<pr>
+   ```
+3. **Show** it and ask who the lead is; on OK, post it (`gh issue comment <n> --body-file /tmp/<branch>-findings.md`).
+4. **Request review:** `(cd worktrees/<repo>/<branch> && gh pr edit <branch> --add-reviewer <lead>)`, keeping the PR a draft, and remind the user to ping the lead on Slack.
+
+Address review feedback on the branch as on any PR (`address-pr-comments`), and edit the findings comment if it changes them. The spike is done when the lead approves the draft PR (`create-ticket`'s Spikes rules); it stays open until `consolidate-spikes` closes it.
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/run-local/SKILL.md b/software/application-software/argos/workspaces/argos-dev/.claude/skills/run-local/SKILL.md
new file mode 100644
index 0000000..7acb908
--- /dev/null
+++ b/software/application-software/argos/workspaces/argos-dev/.claude/skills/run-local/SKILL.md
@@ -0,0 +1,14 @@
+---
+name: run-local
+description: Bring up the local Argos environment for running or testing — Docker backend (right profile for what changed) + an Angular client per worktree, each on its own free port. Use whenever you need to actually run the app locally, for a PR, a ticket's branch, or develop.
+---
+
+Run the branches the user is asking about: a PR or ticket means its branch (make its worktree with `new-worktree` first), and `develop` only when they want current `develop` (fast-forward `worktrees/argos/develop/` first):
+
+```
+bash scripts/run-local.sh <branch>...
+```
+
+It starts the backend if it's down (`client-dev`, or `scylla-dev` plus `cargo run` when a target changes `scylla-server/`), and serves each target's client on the next free port; parallel runs (one per session or agent) each get their own. With no branches it reports what's running.
+
+Report each branch's client URL and the backend. A failed compile or a stale-backend warning is a finding: show it to the user. Stop a client with `kill <pid>` from its line. When every port is taken it lists what holds each; clients from other checkouts are the user's, so ask before stopping them.
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/run-local/scripts/run-local.sh b/software/application-software/argos/workspaces/argos-dev/.claude/skills/run-local/scripts/run-local.sh
new file mode 100755
index 0000000..f598657
--- /dev/null
+++ b/software/application-software/argos/workspaces/argos-dev/.claude/skills/run-local/scripts/run-local.sh
@@ -0,0 +1,66 @@
+#!/usr/bin/env bash
+# run-local.sh [<branch>...]: bring up the local Argos stack for those branches'
+# worktrees (worktrees/argos/<branch>, made beforehand with new-worktree) and print one line per
+# piece. The backend (first listener on 8000-8090, step 10) is started if down:
+# ./argos.sh client-dev when no target changes scylla-server/, else scylla-dev plus `cargo run` in the
+# one worktree that does. Each target's client is then served by serve.sh on its own port. With no
+# branches, reports what is running.
+set -euo pipefail
+here=$(cd "$(dirname "$0")" && pwd)
+# shellcheck source=/dev/null
+. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
+state=${TMPDIR:-/tmp}; state=${state%/}/argos-run-local
+up() { (exec 3<>"/dev/tcp/127.0.0.1/$1") 2>/dev/null || (exec 3<>"/dev/tcp/::1/$1") 2>/dev/null; } # ng serve binds ::1
+backend() { for p in $(seq 8000 10 8090); do up "$p" && echo "http://localhost:$p" && return; done; echo none; }
+scylla() {
+  if docker ps --filter name=scylla-server --format '{{.Names}}' 2>/dev/null | grep -q .; then echo docker
+  elif [ "$(backend)" != none ]; then echo local
+  else echo none; fi
+}
+
+if [ $# = 0 ]; then
+  clients=
+  for p in $(seq 4200 4210); do up "$p" && clients="$clients http://localhost:$p"; done
+  echo "backend=$(backend) scylla=$(scylla) clients=${clients# }"
+  exit 0
+fi
+
+wts=() rust=()
+for b in "$@"; do
+  wt=$DELPHI_WORKTREES/argos/$b
+  [ -f "$wt/argos.sh" ] && [ -d "$wt/angular-client" ] ||
+    { echo "run-local: no Argos worktree for '$b' at $wt (make it with new-worktree)" >&2 && exit 1; }
+  wts+=("$wt")
+done
+git -C "${wts[0]}" fetch -q origin # the worktrees share one store
+for wt in "${wts[@]}"; do
+  if ! git -C "$wt" diff --quiet origin/develop... -- scylla-server || ! git -C "$wt" diff --quiet HEAD -- scylla-server; then
+    rust+=("$wt")
+  fi
+done
+[ ${#rust[@]} -le 1 ] || { echo "run-local: several targets change scylla-server/; run them one at a time" >&2 && exit 1; }
+
+if [ "$(backend)" = none ]; then
+  mkdir -p "$state"
+  if [ ${#rust[@]} = 0 ]; then
+    (cd "${wts[0]}" && ./argos.sh client-dev up -d) >"$state/compose.log" 2>&1 ||
+      { echo "run-local: ./argos.sh client-dev up failed:" >&2 && tail -20 "$state/compose.log" >&2 && exit 1; }
+  else
+    (cd "${rust[0]}" && ./argos.sh scylla-dev up -d) >"$state/compose.log" 2>&1 ||
+      { echo "run-local: ./argos.sh scylla-dev up failed:" >&2 && tail -20 "$state/compose.log" >&2 && exit 1; }
+    (cd "${rust[0]}/scylla-server" &&
+      DATABASE_URL=${DATABASE_URL:-postgresql://postgres:password@127.0.0.1:${ODYSSEY_DB_PORT:-5432}/postgres} \
+        nohup cargo run >"$state/scylla.log" 2>&1 &)
+    echo "run-local: cargo run started for $(basename "${rust[0]}"); log $state/scylla.log"
+  fi
+  for _ in $(seq 600); do [ "$(backend)" != none ] && break; sleep 1; done
+  [ "$(backend)" != none ] || { echo "run-local: backend not up after 600s; see $state/" >&2 && exit 1; }
+elif [ ${#rust[@]} = 1 ] && [ "$(scylla)" = docker ]; then
+  echo "run-local: warning: backend is the scylla-server image but $(basename "${rust[0]}") changes scylla-server/;" \
+    "stop it (./argos.sh client-dev down) and re-run to test that branch's backend" >&2
+fi
+echo "backend=$(backend) scylla=$(scylla)"
+
+status=0
+for wt in "${wts[@]}"; do bash "$here/serve.sh" "$wt" || status=1; done
+exit $status
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/run-local/scripts/serve.sh b/software/application-software/argos/workspaces/argos-dev/.claude/skills/run-local/scripts/serve.sh
new file mode 100755
index 0000000..d8de89c
--- /dev/null
+++ b/software/application-software/argos/workspaces/argos-dev/.claude/skills/run-local/scripts/serve.sh
@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+# serve.sh <argos-worktree>: serve that worktree's Angular client with `ng serve` on the first free
+# port in 4200-4210, in the background, and print `<branch> client=<url> pid=<pid> log=<file>` once
+# it has compiled. Re-running for a worktree that is still being served prints its existing client.
+# Runs `npm ci` first if node_modules lacks ng (missing or half-installed). Exits 1, with the log's
+# tail, if the build fails, or with what holds each port if none is free.
+set -euo pipefail
+wt=$(cd "${1:?usage: serve.sh <argos-worktree>}" && pwd)
+branch=$(git -C "$wt" rev-parse --abbrev-ref HEAD)
+state=${TMPDIR:-/tmp}; state=${state%/}/argos-run-local
+mkdir -p "$state"
+key=$state/$(printf %s "$wt" | tr -c 'A-Za-z0-9' _)
+log=$key.log
+up() { (exec 3<>"/dev/tcp/127.0.0.1/$1") 2>/dev/null || (exec 3<>"/dev/tcp/::1/$1") 2>/dev/null; } # ng serve binds ::1
+
+if [ -f "$key.pid" ] && kill -0 "$(cat "$key.pid")" 2>/dev/null && up "$(cat "$key.port")"; then
+  echo "$branch client=http://localhost:$(cat "$key.port") pid=$(cat "$key.pid") log=$log (already running)"
+  exit 0
+fi
+
+# Claim the port under a lock, or parallel calls all pick the same one while ng serve starts. A port is
+# taken once a client listens on it or a live serve.sh has claimed it. mkdir is the lock (no flock on
+# macOS); it is held only for the claim, so nothing started below can keep it.
+lock=$state/port.lock
+n=0; until mkdir "$lock" 2>/dev/null; do n=$((n + 1)); [ $n -lt 100 ] || rm -rf "$lock"; sleep 0.1; done # stale after 10s
+trap 'rmdir "$lock" 2>/dev/null || true' EXIT
+claimed() { for f in "$state"/*.port; do [ -f "$f" ] && [ "$(cat "$f")" = "$1" ] && kill -0 "$(cat "${f%.port}.pid")" 2>/dev/null && return; done; return 1; }
+port=
+for p in $(seq 4200 4210); do up "$p" || claimed "$p" || { port=$p && break; }; done
+# Name what holds each port, so a stale client from another checkout can be stopped (lsof, where there is one).
+holders() {
+  for p in $(seq 4200 4210); do
+    pid=$(lsof -nP -iTCP:"$p" -sTCP:LISTEN -t 2>/dev/null | head -1) || true
+    if [ -n "$pid" ]; then echo "  $p pid=$pid $(lsof -a -p "$pid" -d cwd -Fn 2>/dev/null | sed -n 's/^n//p')"; fi
+  done
+}
+[ -n "$port" ] || { echo "serve: no free port in 4200-4210, held by:" >&2 && holders >&2 && exit 1; }
+echo $$ >"$key.pid" && echo "$port" >"$key.port" # claimed by this script until ng serve's pid replaces it
+rmdir "$lock" && trap - EXIT
+
+cd "$wt/angular-client"
+[ -x node_modules/.bin/ng ] || npm ci --no-audit --no-fund >"$log" 2>&1 ||
+  { echo "serve: npm ci failed in $wt/angular-client:" >&2 && tail -20 "$log" >&2 && exit 1; }
+nohup npx ng serve --port "$port" >"$log" 2>&1 &
+pid=$!
+echo "$pid" >"$key.pid" && echo "$port" >"$key.port"
+
+for _ in $(seq 180); do
+  kill -0 "$pid" 2>/dev/null || { echo "serve: ng serve exited for $branch:" >&2 && tail -20 "$log" >&2 && exit 1; }
+  if grep -q 'bundle generation failed\|\[ERROR\]' "$log"; then
+    echo "serve: $branch failed to compile (still serving on $port, pid $pid):" >&2 && tail -30 "$log" >&2 && exit 1
+  fi
+  if up "$port" && grep -q 'bundle generation complete\|Compiled successfully' "$log"; then
+    echo "$branch client=http://localhost:$port pid=$pid log=$log"
+    exit 0
+  fi
+  sleep 1
+done
+echo "serve: $branch not up after 180s (pid $pid); see $log" >&2 && exit 1
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/setup-workspace/SKILL.md b/software/application-software/argos/workspaces/argos-dev/.claude/skills/setup-workspace/SKILL.md
new file mode 100644
index 0000000..fdc1ce8
--- /dev/null
+++ b/software/application-software/argos/workspaces/argos-dev/.claude/skills/setup-workspace/SKILL.md
@@ -0,0 +1,18 @@
+---
+name: setup-workspace
+description: Change what this workspace checks out and re-run its setup. workspace.yml lists code repos (repos:), read-only dependency sources (references-git:), and clones of other Delphi workspaces or main to read (workspaces:). Use when the user wants to read or compare another workspace's or main's instructions, skills, or docs (link it), add or remove a repo or dependency reference, or run setup after cloning or pulling.
+---
+
+`workspace.yml` at the workspace root lists what `.delphi/setup.sh` checks out, all git-ignored: code repos (`repos:`), dependency sources (`references-git:`), and other Delphi workspaces or main (`workspaces:`, entries `- <name>` or `- main`; a workspace's name is the short names of its folders (each folder's `short-name` file, else its name) and its own folder name, joined by dots, like `s.app.argos.argos-dev`; `bash .delphi/switch.sh --list` lists them). The comment on each section gives its entry format and where it lands; read it, then edit the file.
+
+Run from the workspace root after any change, and to refresh references and workspace copies to their latest:
+
+```
+bash .delphi/setup.sh
+```
+
+- The clones under `workspaces/` are full clones, each on its branch (`ws/<name>` or `main`) tracking origin, for reading: don't edit, branch, or push them from this workspace. Each setup run switches a clone back to its branch if it was switched away (refused while it has uncommitted changes), pulls it, and runs its own setup, so that workspace's repos and references are under it too (it skips its own `workspaces:`, so they don't chain). To change one of those workspaces or main, work in its own clone or switch to it (`switch-workspace` skill).
+- This workspace's project folder (shared context, `AUTHORING.md`, `workspace-defaults/`) is the folder above `workspaces/<leaf>/` in `workspaces/main/` (`bash .delphi/switch.sh --list` prints it): for `s.app.argos.argos-dev`, `workspaces/main/software/application-software/argos/`. List workspaces and their project folders: `bash .delphi/switch.sh --list`.
+- `workspace.yml` is shared: change it on a branch and open a PR into `ws/<this-name>` (the `name:` in `workspace.yml`). For a one-off look, add the entry, run setup, then `git restore workspace.yml`.
+- Setup never deletes what you'd lose. A removed entry's `workspaces/<name>/`, `references/<name>/`, or repo store and worktrees stay until you delete them (ask first).
+- When Delphi releases a version that needs cleanup in clones, setup runs its migration first (`.delphi/migrations/`), once per workspace. A migration removes only what nothing is lost from, and otherwise stops setup with what to do: tell the user, do it with their go-ahead, and re-run.
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/switch-workspace/SKILL.md b/software/application-software/argos/workspaces/argos-dev/.claude/skills/switch-workspace/SKILL.md
new file mode 100644
index 0000000..0b5a91a
--- /dev/null
+++ b/software/application-software/argos/workspaces/argos-dev/.claude/skills/switch-workspace/SKILL.md
@@ -0,0 +1,19 @@
+---
+name: switch-workspace
+description: Switch this clone to another Delphi workspace, or to Delphi's main, to work in it. Use when the user wants to check out, switch to, open, or work in another workspace or project, or to change another workspace's or main's files.
+---
+
+Run from the workspace root:
+
+```
+bash .delphi/switch.sh <name>        # ws/<name>: its dotted name, e.g. s.app.argos.argos-dev
+bash .delphi/switch.sh main          # Delphi's main: project folders, templates, CI
+```
+
+- List workspaces and their project folders: `bash .delphi/switch.sh --list`.
+- It refuses while tracked files have changes: commit them on a branch (and PR them) first. Then it fetches, switches, fast-forwards, and runs the new workspace's `.delphi/setup.sh`.
+- The post-checkout hook parks this workspace's `repos/`, `worktrees/`, `references/` and `workspaces/` in `.delphi/parked/<name>/` (git-ignored; `<name>` as in its `workspace.yml`) and brings the other's back at the same paths, so worktrees and the work in them return as they were. Switch back the same way. Never run `git clean -X` or `git stash --all` at the workspace root: they take ignored files, parked work included.
+- Before switching, stop anything running from `worktrees/` (dev servers, Docker builds): its folder moves.
+- Start a fresh harness session after switching so its instructions and skills match the new workspace. A harness integration may explicitly support reloading in place; follow its documented behavior.
+- To change the workspace you switched to: `git switch -c <branch>`, commit, push, and open a PR into `ws/<name>` (or `main`).
+- To only read another workspace or main without leaving this one, list it under `workspaces:` instead (`setup-workspace` skill).
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/ticket-conventions/SKILL.md b/software/application-software/argos/workspaces/argos-dev/.claude/skills/ticket-conventions/SKILL.md
new file mode 100644
index 0000000..8d9ec37
--- /dev/null
+++ b/software/application-software/argos/workspaces/argos-dev/.claude/skills/ticket-conventions/SKILL.md
@@ -0,0 +1,14 @@
+---
+name: ticket-conventions
+description: Argos specifics for tickets (repo, area labels, vocabulary, diagrams). Load before drafting or filing an Argos issue, alongside create-ticket.
+---
+
+# Argos ticket conventions
+
+The shared rules are in the `create-ticket` skill; this adds only what is Argos's.
+
+- Repo: Northeastern-Electric-Racing/Argos (base branch `develop`).
+- Area labels: `frontend`, `backend`, `devops` (any combination).
+- Vocabulary: use the workspace glossary's terms (`docs/CONTEXT.md`), and check the code for current names, which may have moved past it (e.g. Zenoh key expressions, not MQTT topics).
+- Title example: "Add pagination to the run list".
+- Diagrams: Mermaid where it fits. Show the change across the parts it touches (car, Siren, scylla-server, angular-client), before and after.
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/update-pr/SKILL.md b/software/application-software/argos/workspaces/argos-dev/.claude/skills/update-pr/SKILL.md
new file mode 100644
index 0000000..069b517
--- /dev/null
+++ b/software/application-software/argos/workspaces/argos-dev/.claude/skills/update-pr/SKILL.md
@@ -0,0 +1,6 @@
+---
+name: update-pr
+description: Update a branch's PR description to reflect the latest changes
+---
+
+Load the project's `pr-conventions` skill, then rewrite the branch's PR body (`(cd worktrees/<repo>/<branch> && gh pr view)`) to match `git -C worktrees/<repo>/<branch> diff origin/<base>...HEAD`, following the PR body rules in the `open-pr` skill. Keep human-written text that's still accurate, `user-attachments` screenshots, and `Closes`/`Fixes` refs; new screenshots or videos follow open-pr's media step, attached with `gh pr edit --attach`. Write it to `/tmp/<branch>-pr-body.md`, apply it with `gh pr edit <branch> --body-file` from the worktree, and add any of the project's labels that are missing with `--add-label`.
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/SKILL.md b/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/SKILL.md
new file mode 100644
index 0000000..c9dfe7d
--- /dev/null
+++ b/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/SKILL.md
@@ -0,0 +1,23 @@
+---
+name: verify-graph
+description: Playwright CLI verification of the graph page — modes, controls, topic selection, and data rendering. Use after any change to graph-page components, graph rendering, data flow, or mode switching logic.
+---
+
+Get the branch's client running with `run-local <branch>`; its URL is `BASE_URL`. The scripts need `playwright-cli` (`npm i -g @playwright/cli`, then `playwright-cli install-browser chromium`; cloud containers use their preinstalled Chromium). Then run the base checks:
+
+```
+bash scripts/check.sh <branch> "$BASE_URL"
+```
+
+It seeds a 50-hour run spanning two midnights (once, shared by parallel checks), opens a `playwright-cli` session named after the branch (`scripts/open.sh`: output to `pictures/<branch>/`, config to `.playwright-cli/<branch>/`), and runs `scripts/check.js`. That covers: page loads in real time, a topic from the tree draws live, the seeded run, historical Quick Select, back to real time, and no console errors beyond develop's NG0100. It prints `[x]`/`[ ]` per check and exits 1 on a failure. Each `look:` line names a screenshot and what it should show: open it and judge it, since only a picture shows whether a chart is right.
+
+Go further where the diff points, by hand in the same session (`P="playwright-cli -s=<branch>"`): controls the diff touches (Pause↔Play, Time Range↔Point Range, Tog Sidebar, Tog Mult Yaxis, Y Min/Max, Custom range, Clear Graph), zoom, pan and hover, several topics, or mode switching for console errors. Reproduce a failed check the same way before fixing it; `check.js` has its steps.
+
+- Act: `$P click "button:has-text('Pause')"`, `role=combobox[name='Quick Select']`, `role=option[name='5 minutes']`, or a ref from `$P snapshot`.
+- Assert: `$P find "<text>"`, `$P snapshot`, `$P console error`; longer Playwright code with `$P run-code "async (page) => {…}"`, or `--filename` for a file kept in `.playwright-cli/<branch>/`.
+- The seeded run: click Select Run, then `bash scripts/select-run.sh <branch> $(bash scripts/seed.sh)`.
+- Screenshots: `$P screenshot --filename=pictures/<branch>/verify-graph/NN-<name>.png` (gitignored).
+
+When the diff touches rendering or the live data path, measure it too: `bash scripts/perf.sh <branch> "$BASE_URL" [<topic>,…]` prints retained JS heap, allocation rate, frame rate and long tasks (`scripts/perf.js`), then the browser's GPU-process memory, where a WebGL chart's buffers show up. The numbers drift with machine load, so run the branch and its base side by side, twice, at the same topics. Calypso sends about one point a second per topic and has no rate setting, so the chart's own data is small next to the app's: a JS-heap gap of a few MB is noise, and more topics widen real ones.
+
+When a hand check keeps coming back, add it to `check.js`. Report `check.sh`'s lines plus one line per hand check, and the screenshot folder. `$P close` at the end.
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/check.js b/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/check.js
new file mode 100644
index 0000000..3fcb734
--- /dev/null
+++ b/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/check.js
@@ -0,0 +1,83 @@
+// The base verify-graph checks, for check.sh to run with `playwright-cli run-code` (it fills in __URL__,
+// __RUN__ and __OUT__). Each check asserts what the DOM can show; what only a picture can show (a series
+// drawn, the x-axis span) is a screenshot with a `look:` line for the agent to judge.
+async (page) => {
+  const URL = '__URL__', RUN = __RUN__, OUT = '__OUT__';
+  const lines = [], errors = [];
+  page.on('console', (m) => {
+    if (m.type() === 'error' && !m.text().includes('NG0100')) errors.push(m.text().split('\n')[0].slice(0, 160));
+  }); // develop already logs NG0100 (ExpressionChangedAfterItHasBeenChecked)
+  const text = (t) => page.getByText(t, { exact: true });
+  const button = (name) => page.getByRole('button', { name, exact: true });
+  const tree = page.getByRole('tree');
+  const absent = async (name) => { if (await button(name).isVisible()) throw new Error(`"${name}" is shown`); };
+  const shot = async (name, look) => {
+    await page.screenshot({ path: `${OUT}/${name}.png` });
+    lines.push(`    look: ${OUT}/${name}.png: ${look}`);
+  };
+  const check = async (name, steps) => {
+    const at = lines.length;
+    try {
+      await steps();
+      lines.splice(at, 0, `[x] ${name}`);
+    } catch (e) {
+      lines.push(`[ ] ${name}: ${String(e.message).split('\n')[0]}`);
+    }
+  };
+
+  await check('1 page loads in real time', async () => {
+    await page.goto(`${URL}/graph`);
+    await text('Real Time').waitFor({ timeout: 30000 });
+    for (const b of ['Pause', 'Time Range', 'Select Run', 'Clear Graph', 'Custom']) await button(b).waitFor({ timeout: 2000 });
+    await page.getByRole('combobox', { name: 'Quick Select' }).waitFor({ timeout: 2000 });
+    await absent('Realtime');
+  });
+  await check('2 topic from the tree draws live', async () => {
+    const node = (name) => tree.getByRole('treeitem').filter({ has: page.getByText(name, { exact: true }) }).last(); // innermost
+    for (const name of ['BMS', 'Segment_Total_Volt']) await node(name).locator('.p-tree-node-toggle-button').first().click();
+    await tree.getByText('0', { exact: true }).first().click();
+    await page.waitForURL(/topics=BMS%2FSegment_Total_Volt%2F0/, { timeout: 5000 });
+    await page.waitForTimeout(3000);
+    await shot('02-live-topic', 'a live series is drawn');
+  });
+  await check(`3 seeded run #${RUN}`, async () => {
+    await button('Select Run').click();
+    await page.locator('.run-card').first().waitFor({ timeout: 10000 });
+    await page.evaluate((id) => {
+      const card = [...document.querySelectorAll('.run-card')]
+        .find((c) => [...c.querySelectorAll('*')].some((e) => !e.childElementCount && e.textContent.trim() === 'Run #' + id));
+      const pick = card?.parentElement?.querySelector('.run-select-button button');
+      if (!pick) throw new Error(`no Run #${id} in the Select Run dialog`);
+      pick.dispatchEvent(new MouseEvent('click', { bubbles: true, cancelable: true })); // under a PrimeNG overlay
+    }, RUN);
+    await page.locator('.run-card').first().waitFor({ state: 'detached', timeout: 5000 });
+    await text(`Run #${RUN}`).waitFor({ timeout: 10000 });
+    await button('Realtime').waitFor({ timeout: 2000 });
+    await absent('Pause');
+    await page.waitForTimeout(3000);
+    await shot('03-seeded-run', 'x-axis spans 50 hours, with a dated day-boundary line at each of the two midnights');
+  });
+  await check('4 historical Quick Select', async () => {
+    await button('Realtime').click();
+    await text('Real Time').waitFor({ timeout: 5000 });
+    await page.getByRole('combobox', { name: 'Quick Select' }).click();
+    await page.getByRole('option').first().waitFor({ timeout: 5000 });
+    const options = await page.getByRole('option').count();
+    if (options !== 11) throw new Error(`${options} Quick Select options, not 11`);
+    await page.getByRole('option', { name: '5 minutes', exact: true }).click();
+    await text('Historical').waitFor({ timeout: 5000 });
+    await absent('Pause');
+    await page.waitForTimeout(3000);
+    await shot('04-historical-5-min', 'x-axis about 5 minutes, or since the data starts');
+  });
+  await check('5 back to real time', async () => {
+    await button('Realtime').click();
+    await text('Real Time').waitFor({ timeout: 5000 });
+    await page.waitForTimeout(10000);
+    await shot('05-real-time-after', 'x-axis about 30 seconds, not the whole session');
+  });
+  await check('6 no new console errors', async () => {
+    if (errors.length) throw new Error(`${errors.length}, first: ${errors[0]}`);
+  });
+  return lines.join('\n');
+}
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/check.sh b/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/check.sh
new file mode 100755
index 0000000..c8710cd
--- /dev/null
+++ b/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/check.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+# check.sh <branch> <base-url>: run the base verify-graph checks (check.js) in <branch>'s playwright-cli
+# session, opening it if needed, against the seeded multi-day run. Prints one `[x]`/`[ ]` line per check
+# and `look:` lines for screenshots in pictures/<branch>/verify-graph/; exits 1 if a check failed.
+set -euo pipefail
+here=$(cd "$(dirname "$0")" && pwd)
+branch=${1:?usage: check.sh <branch> <base-url>}; url=${2:?usage: check.sh <branch> <base-url>}; url=${url%/}
+run=$(bash "$here/seed.sh")
+out=${DELPHI_ROOT:?unset: start the session at the workspace root}/pictures/$branch/verify-graph
+playwright-cli list | grep -q "^- $branch:" || bash "$here/open.sh" "$branch" "$url/graph" >/dev/null
+code=$(sed -e "s|__URL__|$url|; s|__RUN__|$run|; s|__OUT__|$out|" "$here/check.js")
+result=$(playwright-cli -s="$branch" --raw run-code "$code" | node -e 'process.stdout.write(JSON.parse(require("fs").readFileSync(0, "utf8")))')
+echo "$result"
+! grep -q '^\[ \]' <<<"$result"
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/open.sh b/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/open.sh
new file mode 100755
index 0000000..5a1b49b
--- /dev/null
+++ b/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/open.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+# open.sh <branch> <url>: open a playwright-cli session named <branch> on <url>, so parallel checks don't
+# share a browser. Its output (snapshots, console logs, unnamed screenshots) goes to pictures/<branch>/;
+# its config, and any throwaway Playwright code, to .playwright-cli/<branch>/. Both are gitignored. Uses
+# the preinstalled Chromium in cloud containers (/opt/pw-browsers); elsewhere, Playwright's own
+# (`playwright-cli install-browser`).
+set -euo pipefail
+branch=${1:?usage: open.sh <branch> <url>}; url=${2:?usage: open.sh <branch> <url>}
+root=${DELPHI_ROOT:?unset: start the session at the workspace root}
+out=$root/pictures/$branch scratch=$root/.playwright-cli/$branch
+mkdir -p "$out" "$scratch"
+launch=; [ -x /opt/pw-browsers/chromium ] && launch=',"launchOptions":{"executablePath":"/opt/pw-browsers/chromium","headless":true}'
+printf '{"browser":{"browserName":"chromium"%s},"outputDir":"%s"}\n' "$launch" "$out" >"$scratch/cli.config.json"
+playwright-cli -s="$branch" open --config="$scratch/cli.config.json" "$url"
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/perf.js b/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/perf.js
new file mode 100644
index 0000000..404ac25
--- /dev/null
+++ b/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/perf.js
@@ -0,0 +1,38 @@
+async (page) => {
+  // Live-mode cost of the graph page with __TOPICS__ selected: retained JS heap after a GC, how fast it allocates
+  // (heap growth between 100 ms samples, GC drops ignored), and frame rate. Compare branches at the same topics.
+  const topics = '__TOPICS__'.split(',');
+  await page.goto(`__URL__/graph?topics=${encodeURIComponent(topics.join(','))}`);
+  await page.getByText('Real Time').first().waitFor({ timeout: 30000 });
+  const cdp = await page.context().newCDPSession(page);
+  const heap = async (gc) => {
+    if (gc) await cdp.send('HeapProfiler.collectGarbage');
+    return (await cdp.send('Runtime.getHeapUsage')).usedSize / 1e6;
+  };
+  await page.waitForTimeout(20000); // fill the live window
+  let alloc = 0, prev = await heap(false);
+  const t0 = Date.now();
+  while (Date.now() - t0 < 20000) {
+    await page.waitForTimeout(100);
+    const h = await heap(false);
+    if (h > prev) alloc += h - prev;
+    prev = h;
+  }
+  const allocMBps = alloc / ((Date.now() - t0) / 1000);
+  const frames = await page.evaluate(() => new Promise((done) => {
+    let n = 0, worst = 0, longTasks = 0, last = performance.now();
+    const end = last + 10000;
+    new PerformanceObserver((l) => (longTasks += l.getEntries().length)).observe({ type: 'longtask' });
+    const tick = (t) => {
+      worst = Math.max(worst, t - last);
+      last = t;
+      n++;
+      if (t < end) requestAnimationFrame(tick);
+      else done({ fps: n / 10, worstFrameMs: Math.round(worst), longTasks });
+    };
+    requestAnimationFrame(tick);
+  }));
+  const retainedMB = await heap(true);
+  return `retained JS heap ${retainedMB.toFixed(1)} MB, allocating ${allocMBps.toFixed(1)} MB/s, ` +
+    `${frames.fps} fps, worst frame ${frames.worstFrameMs} ms, ${frames.longTasks} long tasks`;
+}
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/perf.sh b/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/perf.sh
new file mode 100755
index 0000000..2218f42
--- /dev/null
+++ b/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/perf.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+# perf.sh <branch> <base-url> [<topic>,…]: measure the graph page live in <branch>'s playwright-cli session
+# (perf.js: JS heap, allocation rate, frames; about a minute), then its browser's GPU-process memory, where
+# a WebGL chart's buffers show up. Default topics: four BMS ones. Numbers are relative: compare branches.
+set -euo pipefail
+here=$(cd "$(dirname "$0")" && pwd)
+branch=${1:?usage: perf.sh <branch> <base-url> [<topic>,…]}; url=${2:?usage: perf.sh <branch> <base-url> [<topic>,…]}; url=${url%/}
+topics=${3:-BMS/Segment_Total_Volt/0,BMS/PerCell/Alpha/3/Volts/5,BMS/PerCell/Alpha/3/Volts/4,BMS/PerCell/Alpha/4/Therms/0}
+playwright-cli list | grep -q "^- $branch:" || bash "$here/open.sh" "$branch" "$url/graph" >/dev/null
+code=$(sed -e "s|__URL__|$url|; s|__TOPICS__|$topics|g" "$here/perf.js")
+playwright-cli -s="$branch" --raw run-code "$code" | node -e 'process.stdout.write(JSON.parse(require("fs").readFileSync(0, "utf8")) + "\n")'
+# The session's daemon runs its browser; the browser's --type=gpu-process child holds GPU memory.
+ps -axo pid=,ppid=,rss=,command= | awk -v s=" $branch " '
+  { pid[NR] = $1; ppid[NR] = $2; rss[NR] = $3; cmd[NR] = $0 }
+  index($0, "cliDaemon") && index($0 " ", s) { daemon[$1] = 1 }
+  END {
+    for (i = 1; i <= NR; i++) if (daemon[ppid[i]]) browser[pid[i]] = 1
+    for (i = 1; i <= NR; i++) if (browser[ppid[i]] && index(cmd[i], "--type=gpu-process")) printf "GPU process %d MB\n", rss[i] / 1024
+  }'
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/seed.sh b/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/seed.sh
new file mode 100755
index 0000000..fdb2631
--- /dev/null
+++ b/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/seed.sh
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+# seed.sh: make sure the local database holds verify-graph's multi-day run, and print its id. The run is
+# 50 hours of BMS/Segment_Total_Volt/0, one point every 30s, from noon UTC four days ago, so it crosses
+# two midnights in any time zone and stays out of the 24-hour Quick Select window. Parallel checks share
+# one run: it is made once, under a lock, and found by its notes after that.
+set -euo pipefail
+db=$(docker ps --filter name=odyssey-db --format '{{.Names}}' | head -1)
+[ -n "$db" ] || { echo "seed: no odyssey-db container; start the backend with run-local first" >&2 && exit 1; }
+sql() { docker exec -i "$db" psql -U postgres -v ON_ERROR_STOP=1 -qAt "$@"; }
+tag='verify-graph multi-day seed'
+state=${TMPDIR:-/tmp}; state=${state%/}/argos-run-local; mkdir -p "$state"
+lock=$state/seed.lock
+n=0; until mkdir "$lock" 2>/dev/null; do n=$((n + 1)); [ $n -lt 600 ] || rm -rf "$lock"; sleep 0.1; done # stale after 60s
+trap 'rmdir "$lock" 2>/dev/null || true' EXIT
+id=$(sql -c "select \"runId\" from run where notes = '$tag' limit 1")
+[ -n "$id" ] || id=$(sql <<SQL
+insert into data_type (name, unit) values ('BMS/Segment_Total_Volt/0', 'V') on conflict do nothing;
+with r as (
+  insert into run ("driverName", "locationName", notes, time)
+  values ('verify-graph', 'seed', '$tag', date_trunc('day', now()) - interval '84 hours')
+  returning "runId", time
+), d as (
+  insert into data (values, time, "dataTypeName", "runId")
+  select array[400 + 20 * sin(s / 3600.0)]::real[], (extract(epoch from r.time) * 1e6)::bigint + s * 1000000::bigint,
+    'BMS/Segment_Total_Volt/0', r."runId"
+  from r, generate_series(0, 50 * 3600, 30) s
+)
+select "runId" from r;
+SQL
+)
+echo "$id"
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/select-run.sh b/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/select-run.sh
new file mode 100755
index 0000000..d1237c4
--- /dev/null
+++ b/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/select-run.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+# select-run.sh <branch> <run-id>: with the Select Run dialog open in <branch>'s session, pick run
+# <run-id>. The carousel autoplays and its "Select this Run" button sits under a PrimeNG overlay, so this
+# finds the run's card by id and clicks its button with a synthetic event instead of `playwright-cli click`.
+set -euo pipefail
+branch=${1:?usage: select-run.sh <branch> <run-id>}; id=${2:?usage: select-run.sh <branch> <run-id>}
+case $id in '' | *[!0-9]*) echo "select-run: run id must be a number, got '$id'" >&2 && exit 1 ;; esac
+playwright-cli -s="$branch" run-code "async (page) => {
+  await page.waitForSelector('.run-card');
+  const found = await page.evaluate((id) => {
+    const card = [...document.querySelectorAll('.run-card')]
+      .find((c) => [...c.querySelectorAll('*')].some((e) => !e.childElementCount && e.textContent.trim() === 'Run #' + id));
+    const button = card?.parentElement?.querySelector('.run-select-button button');
+    button?.dispatchEvent(new MouseEvent('click', { bubbles: true, cancelable: true }));
+    return !!button;
+  }, $id);
+  if (!found) throw new Error('select-run: no Run #$id in the Select Run dialog');
+}"
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-telemetry/SKILL.md b/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-telemetry/SKILL.md
new file mode 100644
index 0000000..006fff6
--- /dev/null
+++ b/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-telemetry/SKILL.md
@@ -0,0 +1,16 @@
+---
+name: verify-telemetry
+description: Verification checklist for changes to MQTT-displayed telemetry values in the Angular frontend. Use whenever modifying, adding, or debugging a value that flows from the car through MQTT to the UI — including display formatting, new subscriptions, missing data, or incorrect readings.
+---
+
+Work from the workspace root against the ticket's worktree, `worktrees/argos/<branch>/` (via `new-worktree`). Stop and fix at the first failing step.
+
+1. **Trace the subscription** in that worktree, from the component: its property is updated by a `this.storage.get(topics.someTopicFn())` subscription, the function in `angular-client/src/utils/topic.utils.ts` returns the right topic, and the value is parsed right for its type (`parseInt` vs `parseFloat`). A missing subscription is the bug.
+2. **Check the topic end to end:**
+
+   ```bash
+   bash scripts/check-topic.sh <TOPIC>
+   ```
+
+   It prints the CAN definition (unit, value points; exit 1 if the topic isn't defined), refreshes the Calypso image (if it changed, restart with `(cd worktrees/argos/<branch> && ./argos.sh client-dev down)` then `run-local <branch>`), and shows the topic's last scylla-server log lines. Confirm the unit and value index match the UI; no log lines means it isn't being published.
+3. **See it live:** bring the app up with `run-local <branch>`, open the page with Playwright, wait for data, and screenshot to `pictures/<branch>/<name>.png`. Check value, formatting, and layout.
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-telemetry/scripts/check-topic.sh b/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-telemetry/scripts/check-topic.sh
new file mode 100755
index 0000000..c9a9c0a
--- /dev/null
+++ b/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-telemetry/scripts/check-topic.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+# check-topic.sh <topic>: check one MQTT topic end to end for verify-telemetry. Prints
+# its CAN definition (file, message id, unit, value points) from worktrees/odyssey-definitions/main,
+# whether the Calypso simulator image is current and running,
+# and the topic's last scylla-server log lines. Exits 1 if the topic isn't defined. Needs jq; the
+# docker checks are skipped without docker.
+set -euo pipefail
+usage="usage: check-topic.sh <topic>"
+topic=${1:?$usage}
+# shellcheck source=/dev/null
+. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
+defs=$DELPHI_WORKTREES/odyssey-definitions/main/can-messages
+[ -d "$defs" ] || { echo "no CAN definitions at $defs; add odyssey-definitions under repos: and run .delphi/setup.sh" >&2; exit 2; }
+
+echo "== CAN definition"
+jq -ce --arg t "$topic" 'input_filename as $f | .[] | . as $m | .fields[]? | select(.name == $t) |
+  {file: ($f | split("/")[-1]), id: $m.id, desc: $m.desc, unit, points: [.values[] | $m.points[. - 1].name]}' \
+  "$defs"/*.json || { echo "not found: $topic"; exit 1; }
+
+command -v docker >/dev/null || { echo "== docker not installed; skipping Calypso and logs"; exit 0; }
+echo "== Calypso"
+if docker pull -q ghcr.io/northeastern-electric-racing/calypso:Develop >/dev/null 2>&1; then
+  echo "image pulled (restart the stack if it changed)"; else echo "pull failed"; fi
+docker ps --filter name=calypso --format '{{.Names}} {{.Status}}' 2>/dev/null | grep . || echo "calypso not running"
+echo "== scylla-server log"
+c=$(docker ps --filter name=scylla-server --format '{{.Names}}' 2>/dev/null | head -1) # compose names it <project>-scylla-server-1
+if [ -z "$c" ]; then echo "scylla-server not running in docker (local cargo run? check its log)"
+else docker logs "$c" 2>&1 | grep -F "$topic" | tail -5 | grep . || echo "no log lines for $topic (not published?)"; fi
diff --git a/software/application-software/argos/workspaces/argos-dev/workspace.generated b/software/application-software/argos/workspaces/argos-dev/workspace.generated
new file mode 100644
index 0000000..09fe5ff
--- /dev/null
+++ b/software/application-software/argos/workspaces/argos-dev/workspace.generated
@@ -0,0 +1,34 @@
+# Generated by ci/render.sh; edit shared sources or opt out in workspace.yml.
+100644 61c35f28dda167e42bebc3bad3994af97c53e876	.claude/settings.json	ci/plugins.sh
+100644 3bf22d3571b9cad53804cc7a7c678c4103368780	.claude/skills/address-pr-comments/SKILL.md	software/application-software/skills/address-pr-comments/SKILL.md
+100755 ce1efd97da4a6d2ea655932486660c5008f44dae	.claude/skills/address-pr-comments/scripts/fetch-feedback.sh	software/application-software/skills/address-pr-comments/scripts/fetch-feedback.sh
+100644 da0be202ebc0a9ffc4544dbdf4bbef54cca37520	.claude/skills/address-pr-comments/scripts/github.sh	software/application-software/skills/address-pr-comments/scripts/github.sh
+100644 ad1fa37b4cf08693b5dcbf85d62df96c1a56b7e5	.claude/skills/commit/SKILL.md	software/application-software/skills/commit/SKILL.md
+100644 897a1f58386f280ce329a245baea7b562ac0b3db	.claude/skills/consolidate-spikes/SKILL.md	software/application-software/skills/consolidate-spikes/SKILL.md
+100644 9dd28e531875c0acb7f8a88a07ad15645aecf38f	.claude/skills/create-ticket/SKILL.md	software/application-software/skills/create-ticket/SKILL.md
+100644 f24d293b38a4d03b610a5a104fa97b614856d7c3	.claude/skills/implement/SKILL.md	software/application-software/argos/skills/implement/SKILL.md
+100644 4917259f9e29db28e2636496e80f80ee5d9e321e	.claude/skills/journal/SKILL.md	software/skills/journal/SKILL.md
+100755 1e90d7b9afa14b8b0e7f36e0e1d83baecc94ba5b	.claude/skills/journal/scripts/capture.sh	software/skills/journal/scripts/capture.sh
+100644 0495fc97cbe93e4331c89263aee188f6c0e9c9ea	.claude/skills/new-worktree/SKILL.md	software/skills/new-worktree/SKILL.md
+100644 7363dd2304fbb29c464e8cac0fd270acdeeb8060	.claude/skills/open-pr/SKILL.md	software/application-software/skills/open-pr/SKILL.md
+100755 61f377fef63daa10c443129df6a49571fdbeb658	.claude/skills/open-pr/scripts/pr-checks.sh	software/application-software/skills/open-pr/scripts/pr-checks.sh
+100644 7e504925c1133ff291fe29f9b0c824c945158e71	.claude/skills/pr-conventions/SKILL.md	software/application-software/argos/skills/pr-conventions/SKILL.md
+100644 2ed67ecda73634b78468cab0ccb52c86f128e064	.claude/skills/pr-conventions/scripts/lint.sh	software/application-software/argos/skills/pr-conventions/scripts/lint.sh
+100644 e67387116a753217d256d81901e5b4091b49b44c	.claude/skills/report-spike/SKILL.md	software/application-software/skills/report-spike/SKILL.md
+100644 7acb908af141defaa035f992b060d4d23c0b2a54	.claude/skills/run-local/SKILL.md	software/application-software/argos/skills/run-local/SKILL.md
+100755 f5986571d9b917264eb6cfe9c9d7f27448242ac9	.claude/skills/run-local/scripts/run-local.sh	software/application-software/argos/skills/run-local/scripts/run-local.sh
+100755 d8de89ce933cbc5302c59fab3176004bdd251d35	.claude/skills/run-local/scripts/serve.sh	software/application-software/argos/skills/run-local/scripts/serve.sh
+100644 fdc1ce85211200223040edfb5dc65a3de7f35d53	.claude/skills/setup-workspace/SKILL.md	software/skills/setup-workspace/SKILL.md
+100644 0b5a91a731df227907cf8bc40a8a2e04c4518059	.claude/skills/switch-workspace/SKILL.md	software/skills/switch-workspace/SKILL.md
+100644 8d9ec377f598b4527af20ffaa54b6cfe1a244860	.claude/skills/ticket-conventions/SKILL.md	software/application-software/argos/skills/ticket-conventions/SKILL.md
+100644 069b51714c0fd4d3d6ad972dd9f840e01f21cf15	.claude/skills/update-pr/SKILL.md	software/application-software/skills/update-pr/SKILL.md
+100644 c9dfe7d18e9c4d728d5295eeed178960289390a2	.claude/skills/verify-graph/SKILL.md	software/application-software/argos/skills/verify-graph/SKILL.md
+100644 3fcb7344ce3499a7afbba08b8c2b6deacd3f101b	.claude/skills/verify-graph/scripts/check.js	software/application-software/argos/skills/verify-graph/scripts/check.js
+100755 c8710cdf2cea12ddae0a92c3e0ba141e06a234f3	.claude/skills/verify-graph/scripts/check.sh	software/application-software/argos/skills/verify-graph/scripts/check.sh
+100755 5a1b49bc55582ec03f5e0a58c015d1b28fd21af3	.claude/skills/verify-graph/scripts/open.sh	software/application-software/argos/skills/verify-graph/scripts/open.sh
+100644 404ac250d03f0c228b8206efef46bed6149bd314	.claude/skills/verify-graph/scripts/perf.js	software/application-software/argos/skills/verify-graph/scripts/perf.js
+100755 2218f42b8f020b7d83e9d960828800444e1260ad	.claude/skills/verify-graph/scripts/perf.sh	software/application-software/argos/skills/verify-graph/scripts/perf.sh
+100755 fdb2631a755b9999c2aa83c67729fbeb13d387a8	.claude/skills/verify-graph/scripts/seed.sh	software/application-software/argos/skills/verify-graph/scripts/seed.sh
+100755 d1237c42098d2a437770c24e2f60b7110d1e90b2	.claude/skills/verify-graph/scripts/select-run.sh	software/application-software/argos/skills/verify-graph/scripts/select-run.sh
+100644 006fff61ee4658a959c921e5fd70ecc57e2b07f2	.claude/skills/verify-telemetry/SKILL.md	software/application-software/argos/skills/verify-telemetry/SKILL.md
+100755 c9a9c0a7dd4386508e1f90d595d59b50df0aad35	.claude/skills/verify-telemetry/scripts/check-topic.sh	software/application-software/argos/skills/verify-telemetry/scripts/check-topic.sh
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/address-pr-comments/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/address-pr-comments/SKILL.md
new file mode 100644
index 0000000..3bf22d3
--- /dev/null
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/address-pr-comments/SKILL.md
@@ -0,0 +1,18 @@
+---
+name: address-pr-comments
+description: Fetch review comments on a PR (Argos, Nero), judge whether each (including outdated ones) still applies, and walk through fixes in the PR's worktree
+---
+
+Propose and apply fixes for a PR's unresolved review feedback. **Never reply to threads**; the user does.
+
+1. **Fetch** from the workspace root: `bash scripts/fetch-feedback.sh <repo> <pr>|<branch>` (`<repo>` as under `repos/`, e.g. `argos`; `--all` first for unfiltered history). It checks out the PR head's worktree and prints JSON: `worktree` (target it by path from the root from now on), unresolved `threads`, `comments`, `reviews`. Any non-zero exit: use the available GitHub integration's PR-reading tool instead.
+2. **Judge.** Skip bot noise and anything already fixed at HEAD. For an `outdated` thread, find its `diffHunk` code by content, then label it **addressed**, **applies**, **moved**, **obsolete**, or **unclear**.
+3. **Present** before editing, grouped by file, and ask to confirm, skip, or change each (offer to batch clear ones past 8):
+
+   ```
+   <file>:<line> — <reviewer> · <active|outdated> · <label>
+   "<excerpt>" → <proposed fix>
+   <optional ≤5-line snippet, for the user only>
+   ```
+4. **Apply** in that worktree, by path, with grouped `/commit`s. For a follow-up-ticket request, reuse a match from `gh issue list --search` before filing.
+5. **Report** what was fixed (file:line, commit SHA), what was already addressed or obsolete (why), and what is unclear.
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/address-pr-comments/scripts/fetch-feedback.sh b/software/application-software/argos/workspaces/default-codex/.agents/skills/address-pr-comments/scripts/fetch-feedback.sh
new file mode 100755
index 0000000..ce1efd9
--- /dev/null
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/address-pr-comments/scripts/fetch-feedback.sh
@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+# fetch-feedback.sh [--all] <repo> <pr-number>|<branch>: print a PR's review
+# feedback as one JSON object after creating or reusing the PR head's worktree
+# (worktrees/<repo>/<head>). Default output keeps unresolved threads (first + latest message,
+# bots tagged), conversation comments, and reviews with text; --all keeps everything. Exits 3 on any
+# GitHub failure (see github.sh).
+# shellcheck source-path=SCRIPTDIR source=github.sh
+set -euo pipefail
+. "$(dirname "$0")/github.sh"
+all=false
+[ "${1:-}" = --all ] && all=true && shift
+usage="usage: fetch-feedback.sh [--all] <repo> <pr-number>|<branch>"
+repo=${1:?$usage} ref=${2:?$usage}
+# shellcheck source=/dev/null
+. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
+gh_init fetch-feedback "$DELPHI_WORKTREES/$repo/.bare"
+
+case "$ref" in *[!0-9]*) get "repos/$SLUG/pulls?state=all&head=${SLUG%%/*}:$ref" | jq '.[0] // error("no PR")' ;;
+  *) get "repos/$SLUG/pulls/$ref" ;; esac >"$TMP/pr"
+num=$(jq .number "$TMP/pr")
+wt=""
+[ "$(jq -r .head.repo.full_name "$TMP/pr")" != "$SLUG" ] || wt=$(bash "$DELPHI_ROOT/.delphi/new-worktree.sh" "$repo" "$(jq -r .head.ref "$TMP/pr")")
+
+if [ "$MODE" = gh ]; then # thread state is GraphQL-only; reshape it like the proxy's ccr/review_threads
+  # shellcheck disable=SC2016 # GraphQL variables
+  gh api graphql -F o="${SLUG%%/*}" -F n="${SLUG##*/}" -F p="$num" -f query='query($o: String!, $n: String!, $p: Int!) {
+    repository(owner: $o, name: $n) { pullRequest(number: $p) { reviewThreads(first: 100) { nodes {
+      isResolved isOutdated comments(first: 50) { nodes { databaseId } } } } } } }' \
+    --jq '[.data.repository.pullRequest.reviewThreads.nodes[] |
+      {resolved: .isResolved, outdated: .isOutdated, comment_ids: [.comments.nodes[].databaseId]}]'
+else get "repos/$SLUG/pulls/$num/ccr/review_threads"; fi >"$TMP/th"
+get "repos/$SLUG/pulls/$num/comments?per_page=100" >"$TMP/rc"
+get "repos/$SLUG/issues/$num/comments?per_page=100" >"$TMP/ic"
+get "repos/$SLUG/pulls/$num/reviews?per_page=100" >"$TMP/rv"
+
+jq -n --arg wt "$wt" --argjson all "$all" --slurpfile pr "$TMP/pr" --slurpfile th "$TMP/th" \
+  --slurpfile rc "$TMP/rc" --slurpfile ic "$TMP/ic" --slurpfile rv "$TMP/rv" '
+  def who: {author: .user.login, bot: (.user.type == "Bot")};
+  ($rc[0] | map({key: (.id | tostring), value: (who + {body, path, line: (.line // .original_line), diffHunk: .diff_hunk})}) | from_entries) as $byid |
+  {pr: ($pr[0] | {number, title, url: .html_url, head: .head.ref, base: .base.ref}), worktree: $wt,
+   threads: [$th[0][] | {resolved, outdated, comments: [.comment_ids[] | $byid[tostring]]}],
+   comments: [$ic[0][] | who + {body}], reviews: [$rv[0][] | who + {state, body: (.body // "")}]} |
+  if $all then . else
+    .threads |= map(select(.resolved | not) | .comments as $c | $c[-1] + {outdated, path: $c[0].path, line: $c[0].line,
+      diffHunk: (if .outdated then $c[0].diffHunk else null end), replies: ($c | length),
+      first: (if ($c | length) > 1 then $c[0].body else null end)}) |
+    .reviews |= map(select(.body != ""))
+  end'
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/address-pr-comments/scripts/github.sh b/software/application-software/argos/workspaces/default-codex/.agents/skills/address-pr-comments/scripts/github.sh
new file mode 100644
index 0000000..da0be20
--- /dev/null
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/address-pr-comments/scripts/github.sh
@@ -0,0 +1,19 @@
+# github.sh: sourced by skill scripts that call GitHub. gh_init <tool> <git-dir> picks a backend
+# (gh when logged in, else an explicitly enabled GitHub REST proxy via curl; jq is needed either
+# way), sets SLUG from that repo's origin, and makes any failure exit 3 so the calling skill falls
+# back to the available GitHub integration. TMP is a scratch dir removed on exit.
+# shellcheck shell=bash
+fail() { echo "$TOOL: $1; use the available GitHub integration" >&2; exit 3; }
+on_exit() { local rc=$?; rm -rf "$TMP"; [ "$rc" -eq 0 ] || fail "GitHub request failed ($MODE)"; }
+gh_init() {
+  TOOL=$1
+  if { command -v gh && gh auth status; } >/dev/null 2>&1; then MODE=gh
+  elif [ -n "${DELPHI_GITHUB_REST_PROXY:-${CLAUDE_CODE_REMOTE:-}}" ] && command -v curl >/dev/null; then MODE=rest
+  else fail "no authenticated gh or enabled REST proxy"; fi
+  command -v jq >/dev/null || fail "jq not installed"
+  SLUG=$(git -C "$2" remote get-url origin) && SLUG=${SLUG#*github.com[:/]} && SLUG=${SLUG%.git}
+  TMP=$(mktemp -d)
+  trap on_exit EXIT
+}
+get() { if [ "$MODE" = gh ]; then gh api "$1"; else curl -fsS "https://api.github.com/$1"; fi; }
+post() { if [ "$MODE" = gh ]; then gh api -X POST "$1" --input -; else curl -fsS -X POST --data-binary @- "https://api.github.com/$1"; fi; }
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/commit/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/commit/SKILL.md
new file mode 100644
index 0000000..ad1fa37
--- /dev/null
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/commit/SKILL.md
@@ -0,0 +1,6 @@
+---
+name: commit
+description: Stage and commit using the project's commit message convention
+---
+
+In the worktree you're working on, from the workspace root (`git -C worktrees/<repo>/<branch> …`), stage the relevant changes (not unrelated or generated files) and commit using the commit message format in the workspace instructions. Keep the description imperative and 2–8 words.
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/consolidate-spikes/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/consolidate-spikes/SKILL.md
new file mode 100644
index 0000000..897a1f5
--- /dev/null
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/consolidate-spikes/SKILL.md
@@ -0,0 +1,14 @@
+---
+name: consolidate-spikes
+description: >-
+  Turn finished spikes into implementation tickets: an idea's spikes, once all are done, into dev work, under an epic when it comes from an idea or splits. Use when the user wants to wrap up, settle, or consolidate an idea or spike on an application-software repo (Argos, Nero).
+---
+
+Drafts and files by the `create-ticket` rules; load it and the project's `ticket-conventions` first. Takes an idea or a standalone spike.
+
+1. **Gather** each spike's findings comment, draft PR, and the PR's reviews; from an idea, its sub-issues too.
+2. **Check it's done.** Every spike is done by `create-ticket`'s Spikes rules (the lead's latest review on its draft PR, from repos/<owner>/<repo>/pulls/<pr>/reviews, is an approval). From an idea, that's every spike under it, and every one of its areas to explore is covered by a spike area. Otherwise list what's missing, offer spikes for uncovered areas, and stop.
+3. **Choose:** per area (title prefix), propose the approach to build (one spike's, or a mix) with a one-line why, from the findings and the lead's review. The user confirms or changes each.
+4. **Plan** the dev work by `create-ticket`'s Dev work rules: one ticket unless the work is large enough to split into vertical slices, which may cross areas. Each ticket: What, the slice; Notes, links to the spikes and draft PRs it draws on, and the dropped approaches with why; context transfer, the findings' facts.
+5. **Draft** them, and, from an idea or when split, one epic (From: the idea or spike) with the dev work as its sub-issues. Show all, with which slices run in parallel if split; file what the user OKs.
+6. **Close**, each with a one-line comment: the spikes as completed ("Consolidated into #<epic or dev work>"), their draft PRs unless a dev work ticket builds on that branch, and the idea as completed ("Settled in #<epic or dev work>").
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/create-ticket/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/create-ticket/SKILL.md
new file mode 100644
index 0000000..9dd28e5
--- /dev/null
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/create-ticket/SKILL.md
@@ -0,0 +1,66 @@
+---
+name: create-ticket
+description: Draft and file a GitHub issue (idea, spike, epic, or dev work) on an application-software repo (Argos, Nero) from the repo's issue templates, or rewrite an existing issue into them. Use whenever the user wants to create, file, write up, or log a ticket, issue, idea, spike, epic, bug, or task, including an out-of-scope idea that comes up mid-work.
+---
+
+# Create ticket
+
+These are the ticket conventions for every application-software repo. The repo's own `.github/ISSUE_TEMPLATE` holds only the fields (`gh api repos/<owner>/<repo>/contents/.github/ISSUE_TEMPLATE/<file> -q .content | base64 -d`); follow each field's description.
+
+First load the project's `ticket-conventions` skill (inherited from the project's `skills/`) for its repo, area labels, vocabulary, and diagrams. If none is enabled, ask which repo.
+
+## Workflow
+
+idea → spikes → epic → dev work, or a standalone spike → dev work
+
+| Ticket | What it is | Issue type | Parent |
+|---|---|---|---|
+| Idea | What could be built and why. Its areas to explore are things to improve or problems to solve, each with approaches worth trying. | none | none |
+| Spike | One approach to try on one area of an idea (it needn't cover the whole area), or a small standalone improvement: what is tried and the hypothesis. Findings go in a comment and a draft PR (`report-spike`), not the ticket. | none | its idea, if any |
+| Epic | Work too large for one dev work ticket: the goal and whole-epic outcomes, not a walkthrough of each ticket. A new issue linking the idea or spike it came from in "From". | Feature | none |
+| Dev work | Any implementation work: testable requirements, Notes for gotchas and pointers to code. Large work is cut into vertical slices (see Dev work below). | Feature, Bug, or Task | its epic, if any |
+
+If unsure, a small, clear change is dev work, a small unknown is a spike, and a big unexplored thing is an idea. Ideas and spikes explore work, so they get no issue type; bug, feature, and task are issue types, never labels.
+
+## Writing
+
+How every ticket reads, on any project:
+
+- Short and plain. Write for someone new to the project: explain project-specific terms, and use the project's vocabulary (its `ticket-conventions` says where it lives; check the code for current names).
+- Outcomes, not implementation: say what changes and why, not how to build it. A rationale gives the reasoning, not a history of the problem.
+- No prescriptions on ideas and spikes. Ideas name open options to weigh, not a plan or a recommended pick; spikes state what to learn and leave the how to whoever picks it up.
+- Facts, not instructions: Notes and context transfer hold facts (where code lives, current behavior, constraints, links), not steps or a proposed solution. Context transfer (optional on spikes, epics, and dev work) starts with a short summary, then the raw context.
+- Unknowns stay open questions in Notes; don't guess.
+- Title: concise and imperative, no prefixes (except a spike's area).
+- Requirements: clear, broad checkboxes, each a testable outcome rather than an implementation step; 3-5, never more than 7. If it needs more, split the ticket.
+- Backticks: at most three inline uses per body; name files and identifiers in plain text. Diagram and context-transfer blocks don't count.
+- Size: keep ideas short; one small enough to just try is a spike.
+
+## Dev work
+
+- One ticket by default. Split only when the work is too large for one PR or parts could run in parallel.
+- When split, cut vertical slices: each goes end to end through every part it touches (e.g. backend through UI), not one layer, and works and is testable on its own. Cut for the most parallel work; mark a slice that must wait as blocked by the one it waits on (see File).
+
+## Spikes
+
+- One approach, not a set to choose between. If a spike reads "X or Y", it is two spikes.
+- Prefer an idea with a few spikes (often 2-4) under it; a spike can also stand alone, or with siblings, to explore an area. Several spikes can take on the same area in different ways.
+- Title it `<area>: <approach>`, with the area a short kebab-case name its siblings share (`graph-saving: Save a graph to a file and re-upload it`). An area may cover more than one of an idea's bullets. A lone small improvement needs no prefix.
+- Sibling spikes share the context transfer's summary and common facts; each adds only the facts particular to its approach.
+- An idea needn't get all its spikes at once: file an area's spikes when someone is ready to try them.
+- Done: its findings are posted, review feedback is addressed, and the lead's latest review on its draft PR is an approval (GitHub's Approve), including when the recommendation is to drop the approach. A done spike stays open until `consolidate-spikes` closes it.
+
+## Draft
+
+- Check the code first: the work may be done or already tracked.
+- One `### <field label>` per field in template order, following each field's description; omit empty optional fields.
+- Diagrams: required on epics, optional on dev work. The project's `ticket-conventions` says what they show.
+- Labels: the template's category (`idea`, `spike`, `epic`, `dev work`), one written-by (`by: human` if the user dictated it, `by: ai-assisted` if they gave the substance, `by: ai` if you wrote it, including rewrites), and at least one of the project's area labels.
+- Rewriting an old ticket: keep its intent and assignees; bring it up to these rules and update vocabulary, labels, issue type, and parent.
+- Folding one ticket into another: add it as a requirement on the target, then close it as not planned. Every close gets a one-line comment saying why.
+
+## File
+
+Check for open duplicates, then show the full draft (title, type if any, labels, parent, body) in the chat, not only in a file. File or edit only what the user OKs.
+
+Use the REST API (GraphQL may be blocked): POST repos/<owner>/<repo>/issues with title, body, labels, the issue type from the table, and the user as assignee (on a spike, whoever will run it; ask), then, if it has a parent, POST repos/<owner>/<repo>/issues/<parent>/sub_issues with the new issue's id. If it waits on another issue, POST repos/<owner>/<repo>/issues/<n>/dependencies/blocked_by with the blocking issue's id. Report the URL.
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/implement/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/implement/SKILL.md
new file mode 100644
index 0000000..f24d293
--- /dev/null
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/implement/SKILL.md
@@ -0,0 +1,14 @@
+---
+name: implement
+description: Implement an Argos ticket or task in its own worktree, test-first, ending in a commit, here or in a subagent (one per ticket, in parallel, for several). Use when the user asks to build, fix, or implement something in Argos.
+---
+
+1. **Worktree.** Get the ticket's branch (`{issue-number}-{kebab-case-title}`) with the `new-worktree` skill, based on `origin/develop`. Make every change in `worktrees/argos/<branch>/`, never in `worktrees/argos/develop/`, while staying at the workspace root: edit files by path, `git -C worktrees/argos/<branch> …` for git, and one-off subshells for the rest. Run `(cd worktrees/argos/<branch>/angular-client && npm ci)` before touching the client.
+2. **Hand off?** Unless the user already chose, ask whether a subagent should do the rest, and recommend one: one per ticket, in parallel, when there are several (step 1 for each first), or one for work long enough to fill this conversation. Tell it the ticket, its worktree's absolute path, and to follow this skill from step 3, change files only under that path (`git -C` for git), name temp files after the branch, stop the clients it starts, and report its commits, checks, and the port and browser it used. Never turn on the harness's own worktree isolation (`new-worktree` says why). Then confirm its commits with `git -C <path> log origin/develop..` and pass its report on.
+3. **Understand.** Read the issue (`gh issue view <n> --comments`), the code involved, and `docs/CONTEXT.md` terms.
+4. **Build test-first**, one behavior at a time: a failing test, the least code to pass it, refactor while green. Test through public interfaces; mock only at system boundaries.
+5. **Check.**
+   - Frontend, in `(cd worktrees/argos/<branch>/angular-client && …)`: `npx ng test --include='src/**/thing.spec.ts' --watch=false` while iterating; at the end `npx ng test --watch=false` (bare `ng test` blocks), then `npx prettier --check "src/**/*.{ts,html,scss}" && npx ng lint`.
+   - Backend, in `(cd worktrees/argos/<branch>/scylla-server && …)`: `cargo build` and single tests while iterating; `cargo test` at the end.
+   - UI changes: verify in the running app with `run-local <branch>`.
+6. **Commit** with `/commit`. Don't push or open a PR unless asked; that's `/open-pr`.
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/journal/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/journal/SKILL.md
new file mode 100644
index 0000000..4917259
--- /dev/null
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/journal/SKILL.md
@@ -0,0 +1,22 @@
+---
+name: journal
+description: Park rough notes locally mid-task ("note to self", "remember to", "journal this"), and later export them to their permanent home (issue, spec, ADR, glossary, docs) through the skill that owns it. Use when the user wants to jot a thought without derailing, or to file parked notes.
+---
+
+Notes live in `.journal/` at the workspace root (git-excluded, outside worktrees so they survive removal). An **entry** is one file, a **category** a subfolder. The journal never pushes, files, or contacts GitHub itself.
+
+**Capture** (no git, no other skills):
+
+```
+bash scripts/capture.sh [-c <category>] ["note text"]
+```
+
+Omit `-c` for a loose entry, omit the text for an empty one to edit. Report the path it prints.
+
+**Export** (only when asked):
+
+1. Read the entries and propose a grouping: one entry → one output, a category → one merged output, or one entry split across several. Let the user adjust.
+2. For each output, pick the workspace skill whose description fits its permanent home, preferring an existing docs area. A new section always needs approval.
+3. Show the destination and reshaped text and wait for approval. Nothing lands silently.
+4. Delegate to that skill; it owns formatting, conventions, and any GitHub contact.
+5. Ask whether to delete the exported entry (default: keep).
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/journal/scripts/capture.sh b/software/application-software/argos/workspaces/default-codex/.agents/skills/journal/scripts/capture.sh
new file mode 100755
index 0000000..1e90d7b
--- /dev/null
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/journal/scripts/capture.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+# capture.sh [-c <category>] [note text]: write a timestamped journal entry to
+# .journal/[<category>/] at the workspace root (adding /.journal/ to .git/info/exclude once) and print
+# its path. An empty entry is created when no text is given. Never touches git history, GitHub, or
+# other skills.
+set -euo pipefail
+usage="usage: capture.sh [-c <category>] [note text]"
+# shellcheck source=/dev/null
+. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
+dir=$DELPHI_ROOT/.journal
+[ "${1:-}" = -c ] && dir=$dir/${2:?$usage} && shift 2
+exclude=$(git -C "$DELPHI_ROOT" rev-parse --path-format=absolute --git-path info/exclude 2>/dev/null || true)
+[ -z "$exclude" ] || grep -qxF /.journal/ "$exclude" 2>/dev/null || { mkdir -p "${exclude%/*}" && echo /.journal/ >>"$exclude"; }
+mkdir -p "$dir"
+file=$dir/$(date +%Y-%m-%d-%H%M%S).md
+{ echo "<!-- captured $(date -u +%Y-%m-%dT%H:%M:%SZ) -->"; [ $# -eq 0 ] || echo "$*"; } >"$file"
+echo "$file"
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/new-worktree/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/new-worktree/SKILL.md
new file mode 100644
index 0000000..0495fc9
--- /dev/null
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/new-worktree/SKILL.md
@@ -0,0 +1,16 @@
+---
+name: new-worktree
+description: Create or reuse a worktree for a branch of a code repo (worktrees/<repo>/<branch>). Use before any branch work, such as starting a ticket or reviewing or fixing a PR branch, unless the user says not to use worktrees.
+---
+
+Run from the workspace root:
+
+```
+bash .delphi/new-worktree.sh <repo> <branch> [<base>]
+```
+
+- An existing branch (local or on origin, e.g. a PR head) is checked out; anything else is created from `<base>` (default: the repo's default branch). Safe to re-run.
+- Stay at the workspace root and reach into the worktree by the printed path. Never switch branches in an existing worktree or work in its store, `worktrees/<repo>/.bare`.
+- For a subagent, make its worktree here first and hand it the path. Never use the harness's own worktree isolation: it checks out this Delphi clone from main, not the code repo, and fences the subagent out of `worktrees/`.
+- Keep `worktrees/<repo>/<default-branch>/` (made by setup) a clean reference: fetch and fast-forward only.
+- After the branch merges: `git -C worktrees/<repo>/.bare worktree remove ../<branch>`.
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/open-pr/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/open-pr/SKILL.md
new file mode 100644
index 0000000..7363dd2
--- /dev/null
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/open-pr/SKILL.md
@@ -0,0 +1,22 @@
+---
+name: open-pr
+description: Run pre-PR checks, push the branch, and open a draft pull request on an application-software repo (Argos, Nero)
+---
+
+First load the project's `pr-conventions` skill (inherited from the project's `skills/`) for its base branch, commit format, checks, labels, and screenshots.
+
+1. **Check:** `bash scripts/pr-checks.sh <repo> <branch> origin/<base> '<commit format>'` (clean tree, commit subjects match the project's format, merges cleanly into the base), then the project's own checks. Stop and fix on any FAIL.
+2. **Media:** if the diff touches the UI, ask the user whether to add screenshots to the PR, listing any already in the project's screenshot folder for this branch so they can pick those instead of new ones; on no, skip this step. For new ones, use the project's UI QA to take Playwright screenshots of the changed views into its screenshot folder, or, when the change adds or changes an animation, record a short video instead (a browser context with `recordVideo: { dir }` saves a `.webm` when it closes). Images must be under 10 MB; video under 10 MB on a Free plan, 100 MB on a paid one.
+3. **Open:** push (`git -C worktrees/<repo>/<branch> push -u origin <branch>`), then run `(cd worktrees/<repo>/<branch> && gh pr create --draft --base <base> --head <branch> --title "<title>" --body-file /tmp/<branch>-pr-body.md --assignee @me)` with the project's labels (`--label`) and one `--attach <file>` per screenshot or video, and report the URL.
+4. **Spike:** the PR stays a draft; getting it merged isn't the goal. Once it's checked and working, run `report-spike`.
+
+## PR body
+
+Fill the worktree's `.github/pull_request_template.md` from the diff, following each section's comment, and write it to `/tmp/<branch>-pr-body.md`:
+
+- Title: concise and imperative, no ticket number.
+- The Changes section (not the whole body): about 50 words (1–3 sentences) on what landed and the key design choice. Describe the change, not the file list: don't enumerate components, classes or files the diff already shows. Name a specific one only when its behaviour changes in a way a reviewer must know.
+- Delete the template's comments and any optional or non-applicable sections, and check off the Checklist.
+- At most three backtick uses in the body.
+- End with `Closes #{ticket}` (the branch's leading number), or `Spike for #{ticket}` on a spike, which its PR never closes.
+- Screenshots and videos: reference each one by its path from the worktree, `![<what it shows>](<path>)`; `--attach` uploads it and rewrites the reference to its `user-attachments` URL. `--attach` needs gh v2.99.0+: if `gh pr create --help` doesn't list it, put `_screenshot pending_` instead and remind the user to drag-drop the files from the screenshot folder. Never commit screenshots or videos.
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/open-pr/scripts/pr-checks.sh b/software/application-software/argos/workspaces/default-codex/.agents/skills/open-pr/scripts/pr-checks.sh
new file mode 100755
index 0000000..61f377f
--- /dev/null
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/open-pr/scripts/pr-checks.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+# pr-checks.sh <repo> <branch> [<base> [<format>]]: open-pr's shared pre-PR checks on
+# worktrees/<repo>/<branch>. Prints
+# one PASS/FAIL/SKIP line per check: clean tree, every commit subject since <base> (default
+# origin/develop, fetched first) matches <format> (an extended regex, default '^#[0-9]+ - '), and no
+# merge conflicts with <base>. Exits 1 if any check fails. The project's own checks (lint, format)
+# are in its pr-conventions skill.
+set -euo pipefail
+usage="usage: pr-checks.sh <repo> <branch> [<base> [<format>]]"
+repo=${1:?$usage} branch=${2:?$usage}
+# shellcheck source=/dev/null
+. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
+cd "$DELPHI_WORKTREES/$repo/$branch"
+base=${3:-origin/develop} format=${4:-'^#[0-9]+ - '} fail=0
+res() { echo "$1 $2"; [ "$1" != FAIL ] || fail=1; }
+git fetch -q origin "${base#origin/}" 2>/dev/null || true
+
+if [ -z "$(git status --porcelain)" ]; then res PASS "clean tree"; else res FAIL "uncommitted changes"; fi
+bad=$(git log --format=%s "$base..HEAD" | grep -Ev "$format" || true)
+if [ -z "$bad" ]; then res PASS "commit format"; else res FAIL "commit format: $(echo "$bad" | paste -sd'|' -)"; fi
+if git merge-tree --write-tree HEAD "$base" >/dev/null 2>&1; then res PASS "merges cleanly into $base"
+elif [ $? -eq 1 ]; then res FAIL "conflicts with $base"; else res SKIP "conflict check (needs git 2.38+)"; fi
+exit "$fail"
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/pr-conventions/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/pr-conventions/SKILL.md
new file mode 100644
index 0000000..7e50492
--- /dev/null
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/pr-conventions/SKILL.md
@@ -0,0 +1,14 @@
+---
+name: pr-conventions
+description: Argos specifics for pull requests (base branch, commit format, checks, labels, screenshots, UI QA). Load before opening, updating, or reviewing an Argos PR, alongside open-pr, update-pr, and review.
+---
+
+# Argos PR conventions
+
+The shared rules are in the `open-pr` skill; this adds only what is Argos's.
+
+- Base branch: `develop`. Commit format: `^#[0-9]+ - ` (the format in the workspace instructions).
+- Checks: `bash scripts/lint.sh <branch>` (frontend prettier and ng lint, only if angular-client/ changed).
+- Labels: one written-by (`by: human` if the user wrote it, `by: ai-assisted` if they gave the substance, `by: ai` if you wrote it) and at least one area label (`frontend`, `backend`, `devops`); no category label.
+- Screenshots: `pictures/<branch>/` at the worktree root (git-ignored).
+- UI QA: get the branch running with `run-local <branch>`, then drive it with Playwright, using the `playwright-cdp` server if `curl -s localhost:9222/json/version` responds, otherwise `playwright`.
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/pr-conventions/scripts/lint.sh b/software/application-software/argos/workspaces/default-codex/.agents/skills/pr-conventions/scripts/lint.sh
new file mode 100644
index 0000000..2ed67ec
--- /dev/null
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/pr-conventions/scripts/lint.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+# lint.sh <branch> [<base>]: Argos's pre-PR check for open-pr, on
+# worktrees/argos/<branch>. Prints one PASS/FAIL/SKIP line: frontend prettier + ng lint, only if
+# angular-client/ changed since <base> (default origin/develop). Exits 1 if it fails.
+set -euo pipefail
+usage="usage: lint.sh <branch> [<base>]"
+branch=${1:?$usage}
+# shellcheck source=/dev/null
+. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
+cd "$DELPHI_WORKTREES/argos/$branch"
+base=${2:-origin/develop}
+if git diff --quiet "$base...HEAD" -- angular-client; then echo "SKIP frontend lint (no changes)"
+elif [ ! -d angular-client/node_modules ]; then echo "FAIL frontend lint: run npm ci in angular-client/" && exit 1
+elif (cd angular-client && npx prettier --check "src/**/*.{ts,html,scss}" >/dev/null && npx ng lint >/dev/null 2>&1)
+then echo "PASS frontend lint"; else echo "FAIL frontend lint (run prettier --check / ng lint to see why)" && exit 1; fi
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/report-spike/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/report-spike/SKILL.md
new file mode 100644
index 0000000..e673871
--- /dev/null
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/report-spike/SKILL.md
@@ -0,0 +1,22 @@
+---
+name: report-spike
+description: Post a spike's findings on its ticket, judged against its hypothesis, and ask the lead to review its draft PR. Use when a spike's approach has been tried on an application-software repo (Argos, Nero).
+---
+
+A spike runs like any ticket (branch, commits, a draft PR from `open-pr`); this reports it. Load the project's `pr-conventions` first.
+
+1. **Read** the spike (`gh issue view <n> --comments`), its draft PR, and the branch's diff against the base.
+2. **Draft** one findings comment, short and factual:
+
+   ```
+   ### Findings
+   **Hypothesis:** holds | partly holds | doesn't hold. One sentence why.
+   **Learned:** measurements, limits hit, surprises, with links to the draft PR's code.
+   **Recommendation:** adopt, adopt with changes, or drop, and why.
+   **Open questions:** what the spike didn't settle.
+   Draft PR: #<pr>
+   ```
+3. **Show** it and ask who the lead is; on OK, post it (`gh issue comment <n> --body-file /tmp/<branch>-findings.md`).
+4. **Request review:** `(cd worktrees/<repo>/<branch> && gh pr edit <branch> --add-reviewer <lead>)`, keeping the PR a draft, and remind the user to ping the lead on Slack.
+
+Address review feedback on the branch as on any PR (`address-pr-comments`), and edit the findings comment if it changes them. The spike is done when the lead approves the draft PR (`create-ticket`'s Spikes rules); it stays open until `consolidate-spikes` closes it.
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/run-local/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/run-local/SKILL.md
new file mode 100644
index 0000000..7acb908
--- /dev/null
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/run-local/SKILL.md
@@ -0,0 +1,14 @@
+---
+name: run-local
+description: Bring up the local Argos environment for running or testing — Docker backend (right profile for what changed) + an Angular client per worktree, each on its own free port. Use whenever you need to actually run the app locally, for a PR, a ticket's branch, or develop.
+---
+
+Run the branches the user is asking about: a PR or ticket means its branch (make its worktree with `new-worktree` first), and `develop` only when they want current `develop` (fast-forward `worktrees/argos/develop/` first):
+
+```
+bash scripts/run-local.sh <branch>...
+```
+
+It starts the backend if it's down (`client-dev`, or `scylla-dev` plus `cargo run` when a target changes `scylla-server/`), and serves each target's client on the next free port; parallel runs (one per session or agent) each get their own. With no branches it reports what's running.
+
+Report each branch's client URL and the backend. A failed compile or a stale-backend warning is a finding: show it to the user. Stop a client with `kill <pid>` from its line. When every port is taken it lists what holds each; clients from other checkouts are the user's, so ask before stopping them.
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/run-local/scripts/run-local.sh b/software/application-software/argos/workspaces/default-codex/.agents/skills/run-local/scripts/run-local.sh
new file mode 100755
index 0000000..f598657
--- /dev/null
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/run-local/scripts/run-local.sh
@@ -0,0 +1,66 @@
+#!/usr/bin/env bash
+# run-local.sh [<branch>...]: bring up the local Argos stack for those branches'
+# worktrees (worktrees/argos/<branch>, made beforehand with new-worktree) and print one line per
+# piece. The backend (first listener on 8000-8090, step 10) is started if down:
+# ./argos.sh client-dev when no target changes scylla-server/, else scylla-dev plus `cargo run` in the
+# one worktree that does. Each target's client is then served by serve.sh on its own port. With no
+# branches, reports what is running.
+set -euo pipefail
+here=$(cd "$(dirname "$0")" && pwd)
+# shellcheck source=/dev/null
+. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
+state=${TMPDIR:-/tmp}; state=${state%/}/argos-run-local
+up() { (exec 3<>"/dev/tcp/127.0.0.1/$1") 2>/dev/null || (exec 3<>"/dev/tcp/::1/$1") 2>/dev/null; } # ng serve binds ::1
+backend() { for p in $(seq 8000 10 8090); do up "$p" && echo "http://localhost:$p" && return; done; echo none; }
+scylla() {
+  if docker ps --filter name=scylla-server --format '{{.Names}}' 2>/dev/null | grep -q .; then echo docker
+  elif [ "$(backend)" != none ]; then echo local
+  else echo none; fi
+}
+
+if [ $# = 0 ]; then
+  clients=
+  for p in $(seq 4200 4210); do up "$p" && clients="$clients http://localhost:$p"; done
+  echo "backend=$(backend) scylla=$(scylla) clients=${clients# }"
+  exit 0
+fi
+
+wts=() rust=()
+for b in "$@"; do
+  wt=$DELPHI_WORKTREES/argos/$b
+  [ -f "$wt/argos.sh" ] && [ -d "$wt/angular-client" ] ||
+    { echo "run-local: no Argos worktree for '$b' at $wt (make it with new-worktree)" >&2 && exit 1; }
+  wts+=("$wt")
+done
+git -C "${wts[0]}" fetch -q origin # the worktrees share one store
+for wt in "${wts[@]}"; do
+  if ! git -C "$wt" diff --quiet origin/develop... -- scylla-server || ! git -C "$wt" diff --quiet HEAD -- scylla-server; then
+    rust+=("$wt")
+  fi
+done
+[ ${#rust[@]} -le 1 ] || { echo "run-local: several targets change scylla-server/; run them one at a time" >&2 && exit 1; }
+
+if [ "$(backend)" = none ]; then
+  mkdir -p "$state"
+  if [ ${#rust[@]} = 0 ]; then
+    (cd "${wts[0]}" && ./argos.sh client-dev up -d) >"$state/compose.log" 2>&1 ||
+      { echo "run-local: ./argos.sh client-dev up failed:" >&2 && tail -20 "$state/compose.log" >&2 && exit 1; }
+  else
+    (cd "${rust[0]}" && ./argos.sh scylla-dev up -d) >"$state/compose.log" 2>&1 ||
+      { echo "run-local: ./argos.sh scylla-dev up failed:" >&2 && tail -20 "$state/compose.log" >&2 && exit 1; }
+    (cd "${rust[0]}/scylla-server" &&
+      DATABASE_URL=${DATABASE_URL:-postgresql://postgres:password@127.0.0.1:${ODYSSEY_DB_PORT:-5432}/postgres} \
+        nohup cargo run >"$state/scylla.log" 2>&1 &)
+    echo "run-local: cargo run started for $(basename "${rust[0]}"); log $state/scylla.log"
+  fi
+  for _ in $(seq 600); do [ "$(backend)" != none ] && break; sleep 1; done
+  [ "$(backend)" != none ] || { echo "run-local: backend not up after 600s; see $state/" >&2 && exit 1; }
+elif [ ${#rust[@]} = 1 ] && [ "$(scylla)" = docker ]; then
+  echo "run-local: warning: backend is the scylla-server image but $(basename "${rust[0]}") changes scylla-server/;" \
+    "stop it (./argos.sh client-dev down) and re-run to test that branch's backend" >&2
+fi
+echo "backend=$(backend) scylla=$(scylla)"
+
+status=0
+for wt in "${wts[@]}"; do bash "$here/serve.sh" "$wt" || status=1; done
+exit $status
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/run-local/scripts/serve.sh b/software/application-software/argos/workspaces/default-codex/.agents/skills/run-local/scripts/serve.sh
new file mode 100755
index 0000000..d8de89c
--- /dev/null
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/run-local/scripts/serve.sh
@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+# serve.sh <argos-worktree>: serve that worktree's Angular client with `ng serve` on the first free
+# port in 4200-4210, in the background, and print `<branch> client=<url> pid=<pid> log=<file>` once
+# it has compiled. Re-running for a worktree that is still being served prints its existing client.
+# Runs `npm ci` first if node_modules lacks ng (missing or half-installed). Exits 1, with the log's
+# tail, if the build fails, or with what holds each port if none is free.
+set -euo pipefail
+wt=$(cd "${1:?usage: serve.sh <argos-worktree>}" && pwd)
+branch=$(git -C "$wt" rev-parse --abbrev-ref HEAD)
+state=${TMPDIR:-/tmp}; state=${state%/}/argos-run-local
+mkdir -p "$state"
+key=$state/$(printf %s "$wt" | tr -c 'A-Za-z0-9' _)
+log=$key.log
+up() { (exec 3<>"/dev/tcp/127.0.0.1/$1") 2>/dev/null || (exec 3<>"/dev/tcp/::1/$1") 2>/dev/null; } # ng serve binds ::1
+
+if [ -f "$key.pid" ] && kill -0 "$(cat "$key.pid")" 2>/dev/null && up "$(cat "$key.port")"; then
+  echo "$branch client=http://localhost:$(cat "$key.port") pid=$(cat "$key.pid") log=$log (already running)"
+  exit 0
+fi
+
+# Claim the port under a lock, or parallel calls all pick the same one while ng serve starts. A port is
+# taken once a client listens on it or a live serve.sh has claimed it. mkdir is the lock (no flock on
+# macOS); it is held only for the claim, so nothing started below can keep it.
+lock=$state/port.lock
+n=0; until mkdir "$lock" 2>/dev/null; do n=$((n + 1)); [ $n -lt 100 ] || rm -rf "$lock"; sleep 0.1; done # stale after 10s
+trap 'rmdir "$lock" 2>/dev/null || true' EXIT
+claimed() { for f in "$state"/*.port; do [ -f "$f" ] && [ "$(cat "$f")" = "$1" ] && kill -0 "$(cat "${f%.port}.pid")" 2>/dev/null && return; done; return 1; }
+port=
+for p in $(seq 4200 4210); do up "$p" || claimed "$p" || { port=$p && break; }; done
+# Name what holds each port, so a stale client from another checkout can be stopped (lsof, where there is one).
+holders() {
+  for p in $(seq 4200 4210); do
+    pid=$(lsof -nP -iTCP:"$p" -sTCP:LISTEN -t 2>/dev/null | head -1) || true
+    if [ -n "$pid" ]; then echo "  $p pid=$pid $(lsof -a -p "$pid" -d cwd -Fn 2>/dev/null | sed -n 's/^n//p')"; fi
+  done
+}
+[ -n "$port" ] || { echo "serve: no free port in 4200-4210, held by:" >&2 && holders >&2 && exit 1; }
+echo $$ >"$key.pid" && echo "$port" >"$key.port" # claimed by this script until ng serve's pid replaces it
+rmdir "$lock" && trap - EXIT
+
+cd "$wt/angular-client"
+[ -x node_modules/.bin/ng ] || npm ci --no-audit --no-fund >"$log" 2>&1 ||
+  { echo "serve: npm ci failed in $wt/angular-client:" >&2 && tail -20 "$log" >&2 && exit 1; }
+nohup npx ng serve --port "$port" >"$log" 2>&1 &
+pid=$!
+echo "$pid" >"$key.pid" && echo "$port" >"$key.port"
+
+for _ in $(seq 180); do
+  kill -0 "$pid" 2>/dev/null || { echo "serve: ng serve exited for $branch:" >&2 && tail -20 "$log" >&2 && exit 1; }
+  if grep -q 'bundle generation failed\|\[ERROR\]' "$log"; then
+    echo "serve: $branch failed to compile (still serving on $port, pid $pid):" >&2 && tail -30 "$log" >&2 && exit 1
+  fi
+  if up "$port" && grep -q 'bundle generation complete\|Compiled successfully' "$log"; then
+    echo "$branch client=http://localhost:$port pid=$pid log=$log"
+    exit 0
+  fi
+  sleep 1
+done
+echo "serve: $branch not up after 180s (pid $pid); see $log" >&2 && exit 1
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/setup-workspace/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/setup-workspace/SKILL.md
new file mode 100644
index 0000000..fdc1ce8
--- /dev/null
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/setup-workspace/SKILL.md
@@ -0,0 +1,18 @@
+---
+name: setup-workspace
+description: Change what this workspace checks out and re-run its setup. workspace.yml lists code repos (repos:), read-only dependency sources (references-git:), and clones of other Delphi workspaces or main to read (workspaces:). Use when the user wants to read or compare another workspace's or main's instructions, skills, or docs (link it), add or remove a repo or dependency reference, or run setup after cloning or pulling.
+---
+
+`workspace.yml` at the workspace root lists what `.delphi/setup.sh` checks out, all git-ignored: code repos (`repos:`), dependency sources (`references-git:`), and other Delphi workspaces or main (`workspaces:`, entries `- <name>` or `- main`; a workspace's name is the short names of its folders (each folder's `short-name` file, else its name) and its own folder name, joined by dots, like `s.app.argos.argos-dev`; `bash .delphi/switch.sh --list` lists them). The comment on each section gives its entry format and where it lands; read it, then edit the file.
+
+Run from the workspace root after any change, and to refresh references and workspace copies to their latest:
+
+```
+bash .delphi/setup.sh
+```
+
+- The clones under `workspaces/` are full clones, each on its branch (`ws/<name>` or `main`) tracking origin, for reading: don't edit, branch, or push them from this workspace. Each setup run switches a clone back to its branch if it was switched away (refused while it has uncommitted changes), pulls it, and runs its own setup, so that workspace's repos and references are under it too (it skips its own `workspaces:`, so they don't chain). To change one of those workspaces or main, work in its own clone or switch to it (`switch-workspace` skill).
+- This workspace's project folder (shared context, `AUTHORING.md`, `workspace-defaults/`) is the folder above `workspaces/<leaf>/` in `workspaces/main/` (`bash .delphi/switch.sh --list` prints it): for `s.app.argos.argos-dev`, `workspaces/main/software/application-software/argos/`. List workspaces and their project folders: `bash .delphi/switch.sh --list`.
+- `workspace.yml` is shared: change it on a branch and open a PR into `ws/<this-name>` (the `name:` in `workspace.yml`). For a one-off look, add the entry, run setup, then `git restore workspace.yml`.
+- Setup never deletes what you'd lose. A removed entry's `workspaces/<name>/`, `references/<name>/`, or repo store and worktrees stay until you delete them (ask first).
+- When Delphi releases a version that needs cleanup in clones, setup runs its migration first (`.delphi/migrations/`), once per workspace. A migration removes only what nothing is lost from, and otherwise stops setup with what to do: tell the user, do it with their go-ahead, and re-run.
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/switch-workspace/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/switch-workspace/SKILL.md
new file mode 100644
index 0000000..0b5a91a
--- /dev/null
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/switch-workspace/SKILL.md
@@ -0,0 +1,19 @@
+---
+name: switch-workspace
+description: Switch this clone to another Delphi workspace, or to Delphi's main, to work in it. Use when the user wants to check out, switch to, open, or work in another workspace or project, or to change another workspace's or main's files.
+---
+
+Run from the workspace root:
+
+```
+bash .delphi/switch.sh <name>        # ws/<name>: its dotted name, e.g. s.app.argos.argos-dev
+bash .delphi/switch.sh main          # Delphi's main: project folders, templates, CI
+```
+
+- List workspaces and their project folders: `bash .delphi/switch.sh --list`.
+- It refuses while tracked files have changes: commit them on a branch (and PR them) first. Then it fetches, switches, fast-forwards, and runs the new workspace's `.delphi/setup.sh`.
+- The post-checkout hook parks this workspace's `repos/`, `worktrees/`, `references/` and `workspaces/` in `.delphi/parked/<name>/` (git-ignored; `<name>` as in its `workspace.yml`) and brings the other's back at the same paths, so worktrees and the work in them return as they were. Switch back the same way. Never run `git clean -X` or `git stash --all` at the workspace root: they take ignored files, parked work included.
+- Before switching, stop anything running from `worktrees/` (dev servers, Docker builds): its folder moves.
+- Start a fresh harness session after switching so its instructions and skills match the new workspace. A harness integration may explicitly support reloading in place; follow its documented behavior.
+- To change the workspace you switched to: `git switch -c <branch>`, commit, push, and open a PR into `ws/<name>` (or `main`).
+- To only read another workspace or main without leaving this one, list it under `workspaces:` instead (`setup-workspace` skill).
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/ticket-conventions/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/ticket-conventions/SKILL.md
new file mode 100644
index 0000000..8d9ec37
--- /dev/null
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/ticket-conventions/SKILL.md
@@ -0,0 +1,14 @@
+---
+name: ticket-conventions
+description: Argos specifics for tickets (repo, area labels, vocabulary, diagrams). Load before drafting or filing an Argos issue, alongside create-ticket.
+---
+
+# Argos ticket conventions
+
+The shared rules are in the `create-ticket` skill; this adds only what is Argos's.
+
+- Repo: Northeastern-Electric-Racing/Argos (base branch `develop`).
+- Area labels: `frontend`, `backend`, `devops` (any combination).
+- Vocabulary: use the workspace glossary's terms (`docs/CONTEXT.md`), and check the code for current names, which may have moved past it (e.g. Zenoh key expressions, not MQTT topics).
+- Title example: "Add pagination to the run list".
+- Diagrams: Mermaid where it fits. Show the change across the parts it touches (car, Siren, scylla-server, angular-client), before and after.
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/update-pr/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/update-pr/SKILL.md
new file mode 100644
index 0000000..069b517
--- /dev/null
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/update-pr/SKILL.md
@@ -0,0 +1,6 @@
+---
+name: update-pr
+description: Update a branch's PR description to reflect the latest changes
+---
+
+Load the project's `pr-conventions` skill, then rewrite the branch's PR body (`(cd worktrees/<repo>/<branch> && gh pr view)`) to match `git -C worktrees/<repo>/<branch> diff origin/<base>...HEAD`, following the PR body rules in the `open-pr` skill. Keep human-written text that's still accurate, `user-attachments` screenshots, and `Closes`/`Fixes` refs; new screenshots or videos follow open-pr's media step, attached with `gh pr edit --attach`. Write it to `/tmp/<branch>-pr-body.md`, apply it with `gh pr edit <branch> --body-file` from the worktree, and add any of the project's labels that are missing with `--add-label`.
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/SKILL.md
new file mode 100644
index 0000000..c9dfe7d
--- /dev/null
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/SKILL.md
@@ -0,0 +1,23 @@
+---
+name: verify-graph
+description: Playwright CLI verification of the graph page — modes, controls, topic selection, and data rendering. Use after any change to graph-page components, graph rendering, data flow, or mode switching logic.
+---
+
+Get the branch's client running with `run-local <branch>`; its URL is `BASE_URL`. The scripts need `playwright-cli` (`npm i -g @playwright/cli`, then `playwright-cli install-browser chromium`; cloud containers use their preinstalled Chromium). Then run the base checks:
+
+```
+bash scripts/check.sh <branch> "$BASE_URL"
+```
+
+It seeds a 50-hour run spanning two midnights (once, shared by parallel checks), opens a `playwright-cli` session named after the branch (`scripts/open.sh`: output to `pictures/<branch>/`, config to `.playwright-cli/<branch>/`), and runs `scripts/check.js`. That covers: page loads in real time, a topic from the tree draws live, the seeded run, historical Quick Select, back to real time, and no console errors beyond develop's NG0100. It prints `[x]`/`[ ]` per check and exits 1 on a failure. Each `look:` line names a screenshot and what it should show: open it and judge it, since only a picture shows whether a chart is right.
+
+Go further where the diff points, by hand in the same session (`P="playwright-cli -s=<branch>"`): controls the diff touches (Pause↔Play, Time Range↔Point Range, Tog Sidebar, Tog Mult Yaxis, Y Min/Max, Custom range, Clear Graph), zoom, pan and hover, several topics, or mode switching for console errors. Reproduce a failed check the same way before fixing it; `check.js` has its steps.
+
+- Act: `$P click "button:has-text('Pause')"`, `role=combobox[name='Quick Select']`, `role=option[name='5 minutes']`, or a ref from `$P snapshot`.
+- Assert: `$P find "<text>"`, `$P snapshot`, `$P console error`; longer Playwright code with `$P run-code "async (page) => {…}"`, or `--filename` for a file kept in `.playwright-cli/<branch>/`.
+- The seeded run: click Select Run, then `bash scripts/select-run.sh <branch> $(bash scripts/seed.sh)`.
+- Screenshots: `$P screenshot --filename=pictures/<branch>/verify-graph/NN-<name>.png` (gitignored).
+
+When the diff touches rendering or the live data path, measure it too: `bash scripts/perf.sh <branch> "$BASE_URL" [<topic>,…]` prints retained JS heap, allocation rate, frame rate and long tasks (`scripts/perf.js`), then the browser's GPU-process memory, where a WebGL chart's buffers show up. The numbers drift with machine load, so run the branch and its base side by side, twice, at the same topics. Calypso sends about one point a second per topic and has no rate setting, so the chart's own data is small next to the app's: a JS-heap gap of a few MB is noise, and more topics widen real ones.
+
+When a hand check keeps coming back, add it to `check.js`. Report `check.sh`'s lines plus one line per hand check, and the screenshot folder. `$P close` at the end.
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/check.js b/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/check.js
new file mode 100644
index 0000000..3fcb734
--- /dev/null
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/check.js
@@ -0,0 +1,83 @@
+// The base verify-graph checks, for check.sh to run with `playwright-cli run-code` (it fills in __URL__,
+// __RUN__ and __OUT__). Each check asserts what the DOM can show; what only a picture can show (a series
+// drawn, the x-axis span) is a screenshot with a `look:` line for the agent to judge.
+async (page) => {
+  const URL = '__URL__', RUN = __RUN__, OUT = '__OUT__';
+  const lines = [], errors = [];
+  page.on('console', (m) => {
+    if (m.type() === 'error' && !m.text().includes('NG0100')) errors.push(m.text().split('\n')[0].slice(0, 160));
+  }); // develop already logs NG0100 (ExpressionChangedAfterItHasBeenChecked)
+  const text = (t) => page.getByText(t, { exact: true });
+  const button = (name) => page.getByRole('button', { name, exact: true });
+  const tree = page.getByRole('tree');
+  const absent = async (name) => { if (await button(name).isVisible()) throw new Error(`"${name}" is shown`); };
+  const shot = async (name, look) => {
+    await page.screenshot({ path: `${OUT}/${name}.png` });
+    lines.push(`    look: ${OUT}/${name}.png: ${look}`);
+  };
+  const check = async (name, steps) => {
+    const at = lines.length;
+    try {
+      await steps();
+      lines.splice(at, 0, `[x] ${name}`);
+    } catch (e) {
+      lines.push(`[ ] ${name}: ${String(e.message).split('\n')[0]}`);
+    }
+  };
+
+  await check('1 page loads in real time', async () => {
+    await page.goto(`${URL}/graph`);
+    await text('Real Time').waitFor({ timeout: 30000 });
+    for (const b of ['Pause', 'Time Range', 'Select Run', 'Clear Graph', 'Custom']) await button(b).waitFor({ timeout: 2000 });
+    await page.getByRole('combobox', { name: 'Quick Select' }).waitFor({ timeout: 2000 });
+    await absent('Realtime');
+  });
+  await check('2 topic from the tree draws live', async () => {
+    const node = (name) => tree.getByRole('treeitem').filter({ has: page.getByText(name, { exact: true }) }).last(); // innermost
+    for (const name of ['BMS', 'Segment_Total_Volt']) await node(name).locator('.p-tree-node-toggle-button').first().click();
+    await tree.getByText('0', { exact: true }).first().click();
+    await page.waitForURL(/topics=BMS%2FSegment_Total_Volt%2F0/, { timeout: 5000 });
+    await page.waitForTimeout(3000);
+    await shot('02-live-topic', 'a live series is drawn');
+  });
+  await check(`3 seeded run #${RUN}`, async () => {
+    await button('Select Run').click();
+    await page.locator('.run-card').first().waitFor({ timeout: 10000 });
+    await page.evaluate((id) => {
+      const card = [...document.querySelectorAll('.run-card')]
+        .find((c) => [...c.querySelectorAll('*')].some((e) => !e.childElementCount && e.textContent.trim() === 'Run #' + id));
+      const pick = card?.parentElement?.querySelector('.run-select-button button');
+      if (!pick) throw new Error(`no Run #${id} in the Select Run dialog`);
+      pick.dispatchEvent(new MouseEvent('click', { bubbles: true, cancelable: true })); // under a PrimeNG overlay
+    }, RUN);
+    await page.locator('.run-card').first().waitFor({ state: 'detached', timeout: 5000 });
+    await text(`Run #${RUN}`).waitFor({ timeout: 10000 });
+    await button('Realtime').waitFor({ timeout: 2000 });
+    await absent('Pause');
+    await page.waitForTimeout(3000);
+    await shot('03-seeded-run', 'x-axis spans 50 hours, with a dated day-boundary line at each of the two midnights');
+  });
+  await check('4 historical Quick Select', async () => {
+    await button('Realtime').click();
+    await text('Real Time').waitFor({ timeout: 5000 });
+    await page.getByRole('combobox', { name: 'Quick Select' }).click();
+    await page.getByRole('option').first().waitFor({ timeout: 5000 });
+    const options = await page.getByRole('option').count();
+    if (options !== 11) throw new Error(`${options} Quick Select options, not 11`);
+    await page.getByRole('option', { name: '5 minutes', exact: true }).click();
+    await text('Historical').waitFor({ timeout: 5000 });
+    await absent('Pause');
+    await page.waitForTimeout(3000);
+    await shot('04-historical-5-min', 'x-axis about 5 minutes, or since the data starts');
+  });
+  await check('5 back to real time', async () => {
+    await button('Realtime').click();
+    await text('Real Time').waitFor({ timeout: 5000 });
+    await page.waitForTimeout(10000);
+    await shot('05-real-time-after', 'x-axis about 30 seconds, not the whole session');
+  });
+  await check('6 no new console errors', async () => {
+    if (errors.length) throw new Error(`${errors.length}, first: ${errors[0]}`);
+  });
+  return lines.join('\n');
+}
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/check.sh b/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/check.sh
new file mode 100755
index 0000000..c8710cd
--- /dev/null
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/check.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+# check.sh <branch> <base-url>: run the base verify-graph checks (check.js) in <branch>'s playwright-cli
+# session, opening it if needed, against the seeded multi-day run. Prints one `[x]`/`[ ]` line per check
+# and `look:` lines for screenshots in pictures/<branch>/verify-graph/; exits 1 if a check failed.
+set -euo pipefail
+here=$(cd "$(dirname "$0")" && pwd)
+branch=${1:?usage: check.sh <branch> <base-url>}; url=${2:?usage: check.sh <branch> <base-url>}; url=${url%/}
+run=$(bash "$here/seed.sh")
+out=${DELPHI_ROOT:?unset: start the session at the workspace root}/pictures/$branch/verify-graph
+playwright-cli list | grep -q "^- $branch:" || bash "$here/open.sh" "$branch" "$url/graph" >/dev/null
+code=$(sed -e "s|__URL__|$url|; s|__RUN__|$run|; s|__OUT__|$out|" "$here/check.js")
+result=$(playwright-cli -s="$branch" --raw run-code "$code" | node -e 'process.stdout.write(JSON.parse(require("fs").readFileSync(0, "utf8")))')
+echo "$result"
+! grep -q '^\[ \]' <<<"$result"
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/open.sh b/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/open.sh
new file mode 100755
index 0000000..5a1b49b
--- /dev/null
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/open.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+# open.sh <branch> <url>: open a playwright-cli session named <branch> on <url>, so parallel checks don't
+# share a browser. Its output (snapshots, console logs, unnamed screenshots) goes to pictures/<branch>/;
+# its config, and any throwaway Playwright code, to .playwright-cli/<branch>/. Both are gitignored. Uses
+# the preinstalled Chromium in cloud containers (/opt/pw-browsers); elsewhere, Playwright's own
+# (`playwright-cli install-browser`).
+set -euo pipefail
+branch=${1:?usage: open.sh <branch> <url>}; url=${2:?usage: open.sh <branch> <url>}
+root=${DELPHI_ROOT:?unset: start the session at the workspace root}
+out=$root/pictures/$branch scratch=$root/.playwright-cli/$branch
+mkdir -p "$out" "$scratch"
+launch=; [ -x /opt/pw-browsers/chromium ] && launch=',"launchOptions":{"executablePath":"/opt/pw-browsers/chromium","headless":true}'
+printf '{"browser":{"browserName":"chromium"%s},"outputDir":"%s"}\n' "$launch" "$out" >"$scratch/cli.config.json"
+playwright-cli -s="$branch" open --config="$scratch/cli.config.json" "$url"
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/perf.js b/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/perf.js
new file mode 100644
index 0000000..404ac25
--- /dev/null
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/perf.js
@@ -0,0 +1,38 @@
+async (page) => {
+  // Live-mode cost of the graph page with __TOPICS__ selected: retained JS heap after a GC, how fast it allocates
+  // (heap growth between 100 ms samples, GC drops ignored), and frame rate. Compare branches at the same topics.
+  const topics = '__TOPICS__'.split(',');
+  await page.goto(`__URL__/graph?topics=${encodeURIComponent(topics.join(','))}`);
+  await page.getByText('Real Time').first().waitFor({ timeout: 30000 });
+  const cdp = await page.context().newCDPSession(page);
+  const heap = async (gc) => {
+    if (gc) await cdp.send('HeapProfiler.collectGarbage');
+    return (await cdp.send('Runtime.getHeapUsage')).usedSize / 1e6;
+  };
+  await page.waitForTimeout(20000); // fill the live window
+  let alloc = 0, prev = await heap(false);
+  const t0 = Date.now();
+  while (Date.now() - t0 < 20000) {
+    await page.waitForTimeout(100);
+    const h = await heap(false);
+    if (h > prev) alloc += h - prev;
+    prev = h;
+  }
+  const allocMBps = alloc / ((Date.now() - t0) / 1000);
+  const frames = await page.evaluate(() => new Promise((done) => {
+    let n = 0, worst = 0, longTasks = 0, last = performance.now();
+    const end = last + 10000;
+    new PerformanceObserver((l) => (longTasks += l.getEntries().length)).observe({ type: 'longtask' });
+    const tick = (t) => {
+      worst = Math.max(worst, t - last);
+      last = t;
+      n++;
+      if (t < end) requestAnimationFrame(tick);
+      else done({ fps: n / 10, worstFrameMs: Math.round(worst), longTasks });
+    };
+    requestAnimationFrame(tick);
+  }));
+  const retainedMB = await heap(true);
+  return `retained JS heap ${retainedMB.toFixed(1)} MB, allocating ${allocMBps.toFixed(1)} MB/s, ` +
+    `${frames.fps} fps, worst frame ${frames.worstFrameMs} ms, ${frames.longTasks} long tasks`;
+}
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/perf.sh b/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/perf.sh
new file mode 100755
index 0000000..2218f42
--- /dev/null
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/perf.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+# perf.sh <branch> <base-url> [<topic>,…]: measure the graph page live in <branch>'s playwright-cli session
+# (perf.js: JS heap, allocation rate, frames; about a minute), then its browser's GPU-process memory, where
+# a WebGL chart's buffers show up. Default topics: four BMS ones. Numbers are relative: compare branches.
+set -euo pipefail
+here=$(cd "$(dirname "$0")" && pwd)
+branch=${1:?usage: perf.sh <branch> <base-url> [<topic>,…]}; url=${2:?usage: perf.sh <branch> <base-url> [<topic>,…]}; url=${url%/}
+topics=${3:-BMS/Segment_Total_Volt/0,BMS/PerCell/Alpha/3/Volts/5,BMS/PerCell/Alpha/3/Volts/4,BMS/PerCell/Alpha/4/Therms/0}
+playwright-cli list | grep -q "^- $branch:" || bash "$here/open.sh" "$branch" "$url/graph" >/dev/null
+code=$(sed -e "s|__URL__|$url|; s|__TOPICS__|$topics|g" "$here/perf.js")
+playwright-cli -s="$branch" --raw run-code "$code" | node -e 'process.stdout.write(JSON.parse(require("fs").readFileSync(0, "utf8")) + "\n")'
+# The session's daemon runs its browser; the browser's --type=gpu-process child holds GPU memory.
+ps -axo pid=,ppid=,rss=,command= | awk -v s=" $branch " '
+  { pid[NR] = $1; ppid[NR] = $2; rss[NR] = $3; cmd[NR] = $0 }
+  index($0, "cliDaemon") && index($0 " ", s) { daemon[$1] = 1 }
+  END {
+    for (i = 1; i <= NR; i++) if (daemon[ppid[i]]) browser[pid[i]] = 1
+    for (i = 1; i <= NR; i++) if (browser[ppid[i]] && index(cmd[i], "--type=gpu-process")) printf "GPU process %d MB\n", rss[i] / 1024
+  }'
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/seed.sh b/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/seed.sh
new file mode 100755
index 0000000..fdb2631
--- /dev/null
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/seed.sh
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+# seed.sh: make sure the local database holds verify-graph's multi-day run, and print its id. The run is
+# 50 hours of BMS/Segment_Total_Volt/0, one point every 30s, from noon UTC four days ago, so it crosses
+# two midnights in any time zone and stays out of the 24-hour Quick Select window. Parallel checks share
+# one run: it is made once, under a lock, and found by its notes after that.
+set -euo pipefail
+db=$(docker ps --filter name=odyssey-db --format '{{.Names}}' | head -1)
+[ -n "$db" ] || { echo "seed: no odyssey-db container; start the backend with run-local first" >&2 && exit 1; }
+sql() { docker exec -i "$db" psql -U postgres -v ON_ERROR_STOP=1 -qAt "$@"; }
+tag='verify-graph multi-day seed'
+state=${TMPDIR:-/tmp}; state=${state%/}/argos-run-local; mkdir -p "$state"
+lock=$state/seed.lock
+n=0; until mkdir "$lock" 2>/dev/null; do n=$((n + 1)); [ $n -lt 600 ] || rm -rf "$lock"; sleep 0.1; done # stale after 60s
+trap 'rmdir "$lock" 2>/dev/null || true' EXIT
+id=$(sql -c "select \"runId\" from run where notes = '$tag' limit 1")
+[ -n "$id" ] || id=$(sql <<SQL
+insert into data_type (name, unit) values ('BMS/Segment_Total_Volt/0', 'V') on conflict do nothing;
+with r as (
+  insert into run ("driverName", "locationName", notes, time)
+  values ('verify-graph', 'seed', '$tag', date_trunc('day', now()) - interval '84 hours')
+  returning "runId", time
+), d as (
+  insert into data (values, time, "dataTypeName", "runId")
+  select array[400 + 20 * sin(s / 3600.0)]::real[], (extract(epoch from r.time) * 1e6)::bigint + s * 1000000::bigint,
+    'BMS/Segment_Total_Volt/0', r."runId"
+  from r, generate_series(0, 50 * 3600, 30) s
+)
+select "runId" from r;
+SQL
+)
+echo "$id"
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/select-run.sh b/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/select-run.sh
new file mode 100755
index 0000000..d1237c4
--- /dev/null
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/select-run.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+# select-run.sh <branch> <run-id>: with the Select Run dialog open in <branch>'s session, pick run
+# <run-id>. The carousel autoplays and its "Select this Run" button sits under a PrimeNG overlay, so this
+# finds the run's card by id and clicks its button with a synthetic event instead of `playwright-cli click`.
+set -euo pipefail
+branch=${1:?usage: select-run.sh <branch> <run-id>}; id=${2:?usage: select-run.sh <branch> <run-id>}
+case $id in '' | *[!0-9]*) echo "select-run: run id must be a number, got '$id'" >&2 && exit 1 ;; esac
+playwright-cli -s="$branch" run-code "async (page) => {
+  await page.waitForSelector('.run-card');
+  const found = await page.evaluate((id) => {
+    const card = [...document.querySelectorAll('.run-card')]
+      .find((c) => [...c.querySelectorAll('*')].some((e) => !e.childElementCount && e.textContent.trim() === 'Run #' + id));
+    const button = card?.parentElement?.querySelector('.run-select-button button');
+    button?.dispatchEvent(new MouseEvent('click', { bubbles: true, cancelable: true }));
+    return !!button;
+  }, $id);
+  if (!found) throw new Error('select-run: no Run #$id in the Select Run dialog');
+}"
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-telemetry/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-telemetry/SKILL.md
new file mode 100644
index 0000000..006fff6
--- /dev/null
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-telemetry/SKILL.md
@@ -0,0 +1,16 @@
+---
+name: verify-telemetry
+description: Verification checklist for changes to MQTT-displayed telemetry values in the Angular frontend. Use whenever modifying, adding, or debugging a value that flows from the car through MQTT to the UI — including display formatting, new subscriptions, missing data, or incorrect readings.
+---
+
+Work from the workspace root against the ticket's worktree, `worktrees/argos/<branch>/` (via `new-worktree`). Stop and fix at the first failing step.
+
+1. **Trace the subscription** in that worktree, from the component: its property is updated by a `this.storage.get(topics.someTopicFn())` subscription, the function in `angular-client/src/utils/topic.utils.ts` returns the right topic, and the value is parsed right for its type (`parseInt` vs `parseFloat`). A missing subscription is the bug.
+2. **Check the topic end to end:**
+
+   ```bash
+   bash scripts/check-topic.sh <TOPIC>
+   ```
+
+   It prints the CAN definition (unit, value points; exit 1 if the topic isn't defined), refreshes the Calypso image (if it changed, restart with `(cd worktrees/argos/<branch> && ./argos.sh client-dev down)` then `run-local <branch>`), and shows the topic's last scylla-server log lines. Confirm the unit and value index match the UI; no log lines means it isn't being published.
+3. **See it live:** bring the app up with `run-local <branch>`, open the page with Playwright, wait for data, and screenshot to `pictures/<branch>/<name>.png`. Check value, formatting, and layout.
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-telemetry/scripts/check-topic.sh b/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-telemetry/scripts/check-topic.sh
new file mode 100755
index 0000000..c9a9c0a
--- /dev/null
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-telemetry/scripts/check-topic.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+# check-topic.sh <topic>: check one MQTT topic end to end for verify-telemetry. Prints
+# its CAN definition (file, message id, unit, value points) from worktrees/odyssey-definitions/main,
+# whether the Calypso simulator image is current and running,
+# and the topic's last scylla-server log lines. Exits 1 if the topic isn't defined. Needs jq; the
+# docker checks are skipped without docker.
+set -euo pipefail
+usage="usage: check-topic.sh <topic>"
+topic=${1:?$usage}
+# shellcheck source=/dev/null
+. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
+defs=$DELPHI_WORKTREES/odyssey-definitions/main/can-messages
+[ -d "$defs" ] || { echo "no CAN definitions at $defs; add odyssey-definitions under repos: and run .delphi/setup.sh" >&2; exit 2; }
+
+echo "== CAN definition"
+jq -ce --arg t "$topic" 'input_filename as $f | .[] | . as $m | .fields[]? | select(.name == $t) |
+  {file: ($f | split("/")[-1]), id: $m.id, desc: $m.desc, unit, points: [.values[] | $m.points[. - 1].name]}' \
+  "$defs"/*.json || { echo "not found: $topic"; exit 1; }
+
+command -v docker >/dev/null || { echo "== docker not installed; skipping Calypso and logs"; exit 0; }
+echo "== Calypso"
+if docker pull -q ghcr.io/northeastern-electric-racing/calypso:Develop >/dev/null 2>&1; then
+  echo "image pulled (restart the stack if it changed)"; else echo "pull failed"; fi
+docker ps --filter name=calypso --format '{{.Names}} {{.Status}}' 2>/dev/null | grep . || echo "calypso not running"
+echo "== scylla-server log"
+c=$(docker ps --filter name=scylla-server --format '{{.Names}}' 2>/dev/null | head -1) # compose names it <project>-scylla-server-1
+if [ -z "$c" ]; then echo "scylla-server not running in docker (local cargo run? check its log)"
+else docker logs "$c" 2>&1 | grep -F "$topic" | tail -5 | grep . || echo "no log lines for $topic (not published?)"; fi
diff --git a/software/application-software/argos/workspaces/default-codex/workspace.generated b/software/application-software/argos/workspaces/default-codex/workspace.generated
new file mode 100644
index 0000000..0c3dfa1
--- /dev/null
+++ b/software/application-software/argos/workspaces/default-codex/workspace.generated
@@ -0,0 +1,33 @@
+# Generated by ci/render.sh; edit shared sources or opt out in workspace.yml.
+100644 3bf22d3571b9cad53804cc7a7c678c4103368780	.agents/skills/address-pr-comments/SKILL.md	software/application-software/skills/address-pr-comments/SKILL.md
+100755 ce1efd97da4a6d2ea655932486660c5008f44dae	.agents/skills/address-pr-comments/scripts/fetch-feedback.sh	software/application-software/skills/address-pr-comments/scripts/fetch-feedback.sh
+100644 da0be202ebc0a9ffc4544dbdf4bbef54cca37520	.agents/skills/address-pr-comments/scripts/github.sh	software/application-software/skills/address-pr-comments/scripts/github.sh
+100644 ad1fa37b4cf08693b5dcbf85d62df96c1a56b7e5	.agents/skills/commit/SKILL.md	software/application-software/skills/commit/SKILL.md
+100644 897a1f58386f280ce329a245baea7b562ac0b3db	.agents/skills/consolidate-spikes/SKILL.md	software/application-software/skills/consolidate-spikes/SKILL.md
+100644 9dd28e531875c0acb7f8a88a07ad15645aecf38f	.agents/skills/create-ticket/SKILL.md	software/application-software/skills/create-ticket/SKILL.md
+100644 f24d293b38a4d03b610a5a104fa97b614856d7c3	.agents/skills/implement/SKILL.md	software/application-software/argos/skills/implement/SKILL.md
+100644 4917259f9e29db28e2636496e80f80ee5d9e321e	.agents/skills/journal/SKILL.md	software/skills/journal/SKILL.md
+100755 1e90d7b9afa14b8b0e7f36e0e1d83baecc94ba5b	.agents/skills/journal/scripts/capture.sh	software/skills/journal/scripts/capture.sh
+100644 0495fc97cbe93e4331c89263aee188f6c0e9c9ea	.agents/skills/new-worktree/SKILL.md	software/skills/new-worktree/SKILL.md
+100644 7363dd2304fbb29c464e8cac0fd270acdeeb8060	.agents/skills/open-pr/SKILL.md	software/application-software/skills/open-pr/SKILL.md
+100755 61f377fef63daa10c443129df6a49571fdbeb658	.agents/skills/open-pr/scripts/pr-checks.sh	software/application-software/skills/open-pr/scripts/pr-checks.sh
+100644 7e504925c1133ff291fe29f9b0c824c945158e71	.agents/skills/pr-conventions/SKILL.md	software/application-software/argos/skills/pr-conventions/SKILL.md
+100644 2ed67ecda73634b78468cab0ccb52c86f128e064	.agents/skills/pr-conventions/scripts/lint.sh	software/application-software/argos/skills/pr-conventions/scripts/lint.sh
+100644 e67387116a753217d256d81901e5b4091b49b44c	.agents/skills/report-spike/SKILL.md	software/application-software/skills/report-spike/SKILL.md
+100644 7acb908af141defaa035f992b060d4d23c0b2a54	.agents/skills/run-local/SKILL.md	software/application-software/argos/skills/run-local/SKILL.md
+100755 f5986571d9b917264eb6cfe9c9d7f27448242ac9	.agents/skills/run-local/scripts/run-local.sh	software/application-software/argos/skills/run-local/scripts/run-local.sh
+100755 d8de89ce933cbc5302c59fab3176004bdd251d35	.agents/skills/run-local/scripts/serve.sh	software/application-software/argos/skills/run-local/scripts/serve.sh
+100644 fdc1ce85211200223040edfb5dc65a3de7f35d53	.agents/skills/setup-workspace/SKILL.md	software/skills/setup-workspace/SKILL.md
+100644 0b5a91a731df227907cf8bc40a8a2e04c4518059	.agents/skills/switch-workspace/SKILL.md	software/skills/switch-workspace/SKILL.md
+100644 8d9ec377f598b4527af20ffaa54b6cfe1a244860	.agents/skills/ticket-conventions/SKILL.md	software/application-software/argos/skills/ticket-conventions/SKILL.md
+100644 069b51714c0fd4d3d6ad972dd9f840e01f21cf15	.agents/skills/update-pr/SKILL.md	software/application-software/skills/update-pr/SKILL.md
+100644 c9dfe7d18e9c4d728d5295eeed178960289390a2	.agents/skills/verify-graph/SKILL.md	software/application-software/argos/skills/verify-graph/SKILL.md
+100644 3fcb7344ce3499a7afbba08b8c2b6deacd3f101b	.agents/skills/verify-graph/scripts/check.js	software/application-software/argos/skills/verify-graph/scripts/check.js
+100755 c8710cdf2cea12ddae0a92c3e0ba141e06a234f3	.agents/skills/verify-graph/scripts/check.sh	software/application-software/argos/skills/verify-graph/scripts/check.sh
+100755 5a1b49bc55582ec03f5e0a58c015d1b28fd21af3	.agents/skills/verify-graph/scripts/open.sh	software/application-software/argos/skills/verify-graph/scripts/open.sh
+100644 404ac250d03f0c228b8206efef46bed6149bd314	.agents/skills/verify-graph/scripts/perf.js	software/application-software/argos/skills/verify-graph/scripts/perf.js
+100755 2218f42b8f020b7d83e9d960828800444e1260ad	.agents/skills/verify-graph/scripts/perf.sh	software/application-software/argos/skills/verify-graph/scripts/perf.sh
+100755 fdb2631a755b9999c2aa83c67729fbeb13d387a8	.agents/skills/verify-graph/scripts/seed.sh	software/application-software/argos/skills/verify-graph/scripts/seed.sh
+100755 d1237c42098d2a437770c24e2f60b7110d1e90b2	.agents/skills/verify-graph/scripts/select-run.sh	software/application-software/argos/skills/verify-graph/scripts/select-run.sh
+100644 006fff61ee4658a959c921e5fd70ecc57e2b07f2	.agents/skills/verify-telemetry/SKILL.md	software/application-software/argos/skills/verify-telemetry/SKILL.md
+100755 c9a9c0a7dd4386508e1f90d595d59b50df0aad35	.agents/skills/verify-telemetry/scripts/check-topic.sh	software/application-software/argos/skills/verify-telemetry/scripts/check-topic.sh
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/address-pr-comments/SKILL.md b/software/application-software/argos/workspaces/experimental/.claude/skills/address-pr-comments/SKILL.md
new file mode 100644
index 0000000..3bf22d3
--- /dev/null
+++ b/software/application-software/argos/workspaces/experimental/.claude/skills/address-pr-comments/SKILL.md
@@ -0,0 +1,18 @@
+---
+name: address-pr-comments
+description: Fetch review comments on a PR (Argos, Nero), judge whether each (including outdated ones) still applies, and walk through fixes in the PR's worktree
+---
+
+Propose and apply fixes for a PR's unresolved review feedback. **Never reply to threads**; the user does.
+
+1. **Fetch** from the workspace root: `bash scripts/fetch-feedback.sh <repo> <pr>|<branch>` (`<repo>` as under `repos/`, e.g. `argos`; `--all` first for unfiltered history). It checks out the PR head's worktree and prints JSON: `worktree` (target it by path from the root from now on), unresolved `threads`, `comments`, `reviews`. Any non-zero exit: use the available GitHub integration's PR-reading tool instead.
+2. **Judge.** Skip bot noise and anything already fixed at HEAD. For an `outdated` thread, find its `diffHunk` code by content, then label it **addressed**, **applies**, **moved**, **obsolete**, or **unclear**.
+3. **Present** before editing, grouped by file, and ask to confirm, skip, or change each (offer to batch clear ones past 8):
+
+   ```
+   <file>:<line> — <reviewer> · <active|outdated> · <label>
+   "<excerpt>" → <proposed fix>
+   <optional ≤5-line snippet, for the user only>
+   ```
+4. **Apply** in that worktree, by path, with grouped `/commit`s. For a follow-up-ticket request, reuse a match from `gh issue list --search` before filing.
+5. **Report** what was fixed (file:line, commit SHA), what was already addressed or obsolete (why), and what is unclear.
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh b/software/application-software/argos/workspaces/experimental/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh
new file mode 100755
index 0000000..ce1efd9
--- /dev/null
+++ b/software/application-software/argos/workspaces/experimental/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh
@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+# fetch-feedback.sh [--all] <repo> <pr-number>|<branch>: print a PR's review
+# feedback as one JSON object after creating or reusing the PR head's worktree
+# (worktrees/<repo>/<head>). Default output keeps unresolved threads (first + latest message,
+# bots tagged), conversation comments, and reviews with text; --all keeps everything. Exits 3 on any
+# GitHub failure (see github.sh).
+# shellcheck source-path=SCRIPTDIR source=github.sh
+set -euo pipefail
+. "$(dirname "$0")/github.sh"
+all=false
+[ "${1:-}" = --all ] && all=true && shift
+usage="usage: fetch-feedback.sh [--all] <repo> <pr-number>|<branch>"
+repo=${1:?$usage} ref=${2:?$usage}
+# shellcheck source=/dev/null
+. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
+gh_init fetch-feedback "$DELPHI_WORKTREES/$repo/.bare"
+
+case "$ref" in *[!0-9]*) get "repos/$SLUG/pulls?state=all&head=${SLUG%%/*}:$ref" | jq '.[0] // error("no PR")' ;;
+  *) get "repos/$SLUG/pulls/$ref" ;; esac >"$TMP/pr"
+num=$(jq .number "$TMP/pr")
+wt=""
+[ "$(jq -r .head.repo.full_name "$TMP/pr")" != "$SLUG" ] || wt=$(bash "$DELPHI_ROOT/.delphi/new-worktree.sh" "$repo" "$(jq -r .head.ref "$TMP/pr")")
+
+if [ "$MODE" = gh ]; then # thread state is GraphQL-only; reshape it like the proxy's ccr/review_threads
+  # shellcheck disable=SC2016 # GraphQL variables
+  gh api graphql -F o="${SLUG%%/*}" -F n="${SLUG##*/}" -F p="$num" -f query='query($o: String!, $n: String!, $p: Int!) {
+    repository(owner: $o, name: $n) { pullRequest(number: $p) { reviewThreads(first: 100) { nodes {
+      isResolved isOutdated comments(first: 50) { nodes { databaseId } } } } } } }' \
+    --jq '[.data.repository.pullRequest.reviewThreads.nodes[] |
+      {resolved: .isResolved, outdated: .isOutdated, comment_ids: [.comments.nodes[].databaseId]}]'
+else get "repos/$SLUG/pulls/$num/ccr/review_threads"; fi >"$TMP/th"
+get "repos/$SLUG/pulls/$num/comments?per_page=100" >"$TMP/rc"
+get "repos/$SLUG/issues/$num/comments?per_page=100" >"$TMP/ic"
+get "repos/$SLUG/pulls/$num/reviews?per_page=100" >"$TMP/rv"
+
+jq -n --arg wt "$wt" --argjson all "$all" --slurpfile pr "$TMP/pr" --slurpfile th "$TMP/th" \
+  --slurpfile rc "$TMP/rc" --slurpfile ic "$TMP/ic" --slurpfile rv "$TMP/rv" '
+  def who: {author: .user.login, bot: (.user.type == "Bot")};
+  ($rc[0] | map({key: (.id | tostring), value: (who + {body, path, line: (.line // .original_line), diffHunk: .diff_hunk})}) | from_entries) as $byid |
+  {pr: ($pr[0] | {number, title, url: .html_url, head: .head.ref, base: .base.ref}), worktree: $wt,
+   threads: [$th[0][] | {resolved, outdated, comments: [.comment_ids[] | $byid[tostring]]}],
+   comments: [$ic[0][] | who + {body}], reviews: [$rv[0][] | who + {state, body: (.body // "")}]} |
+  if $all then . else
+    .threads |= map(select(.resolved | not) | .comments as $c | $c[-1] + {outdated, path: $c[0].path, line: $c[0].line,
+      diffHunk: (if .outdated then $c[0].diffHunk else null end), replies: ($c | length),
+      first: (if ($c | length) > 1 then $c[0].body else null end)}) |
+    .reviews |= map(select(.body != ""))
+  end'
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/address-pr-comments/scripts/github.sh b/software/application-software/argos/workspaces/experimental/.claude/skills/address-pr-comments/scripts/github.sh
new file mode 100644
index 0000000..da0be20
--- /dev/null
+++ b/software/application-software/argos/workspaces/experimental/.claude/skills/address-pr-comments/scripts/github.sh
@@ -0,0 +1,19 @@
+# github.sh: sourced by skill scripts that call GitHub. gh_init <tool> <git-dir> picks a backend
+# (gh when logged in, else an explicitly enabled GitHub REST proxy via curl; jq is needed either
+# way), sets SLUG from that repo's origin, and makes any failure exit 3 so the calling skill falls
+# back to the available GitHub integration. TMP is a scratch dir removed on exit.
+# shellcheck shell=bash
+fail() { echo "$TOOL: $1; use the available GitHub integration" >&2; exit 3; }
+on_exit() { local rc=$?; rm -rf "$TMP"; [ "$rc" -eq 0 ] || fail "GitHub request failed ($MODE)"; }
+gh_init() {
+  TOOL=$1
+  if { command -v gh && gh auth status; } >/dev/null 2>&1; then MODE=gh
+  elif [ -n "${DELPHI_GITHUB_REST_PROXY:-${CLAUDE_CODE_REMOTE:-}}" ] && command -v curl >/dev/null; then MODE=rest
+  else fail "no authenticated gh or enabled REST proxy"; fi
+  command -v jq >/dev/null || fail "jq not installed"
+  SLUG=$(git -C "$2" remote get-url origin) && SLUG=${SLUG#*github.com[:/]} && SLUG=${SLUG%.git}
+  TMP=$(mktemp -d)
+  trap on_exit EXIT
+}
+get() { if [ "$MODE" = gh ]; then gh api "$1"; else curl -fsS "https://api.github.com/$1"; fi; }
+post() { if [ "$MODE" = gh ]; then gh api -X POST "$1" --input -; else curl -fsS -X POST --data-binary @- "https://api.github.com/$1"; fi; }
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/commit/SKILL.md b/software/application-software/argos/workspaces/experimental/.claude/skills/commit/SKILL.md
new file mode 100644
index 0000000..ad1fa37
--- /dev/null
+++ b/software/application-software/argos/workspaces/experimental/.claude/skills/commit/SKILL.md
@@ -0,0 +1,6 @@
+---
+name: commit
+description: Stage and commit using the project's commit message convention
+---
+
+In the worktree you're working on, from the workspace root (`git -C worktrees/<repo>/<branch> …`), stage the relevant changes (not unrelated or generated files) and commit using the commit message format in the workspace instructions. Keep the description imperative and 2–8 words.
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/consolidate-spikes/SKILL.md b/software/application-software/argos/workspaces/experimental/.claude/skills/consolidate-spikes/SKILL.md
new file mode 100644
index 0000000..897a1f5
--- /dev/null
+++ b/software/application-software/argos/workspaces/experimental/.claude/skills/consolidate-spikes/SKILL.md
@@ -0,0 +1,14 @@
+---
+name: consolidate-spikes
+description: >-
+  Turn finished spikes into implementation tickets: an idea's spikes, once all are done, into dev work, under an epic when it comes from an idea or splits. Use when the user wants to wrap up, settle, or consolidate an idea or spike on an application-software repo (Argos, Nero).
+---
+
+Drafts and files by the `create-ticket` rules; load it and the project's `ticket-conventions` first. Takes an idea or a standalone spike.
+
+1. **Gather** each spike's findings comment, draft PR, and the PR's reviews; from an idea, its sub-issues too.
+2. **Check it's done.** Every spike is done by `create-ticket`'s Spikes rules (the lead's latest review on its draft PR, from repos/<owner>/<repo>/pulls/<pr>/reviews, is an approval). From an idea, that's every spike under it, and every one of its areas to explore is covered by a spike area. Otherwise list what's missing, offer spikes for uncovered areas, and stop.
+3. **Choose:** per area (title prefix), propose the approach to build (one spike's, or a mix) with a one-line why, from the findings and the lead's review. The user confirms or changes each.
+4. **Plan** the dev work by `create-ticket`'s Dev work rules: one ticket unless the work is large enough to split into vertical slices, which may cross areas. Each ticket: What, the slice; Notes, links to the spikes and draft PRs it draws on, and the dropped approaches with why; context transfer, the findings' facts.
+5. **Draft** them, and, from an idea or when split, one epic (From: the idea or spike) with the dev work as its sub-issues. Show all, with which slices run in parallel if split; file what the user OKs.
+6. **Close**, each with a one-line comment: the spikes as completed ("Consolidated into #<epic or dev work>"), their draft PRs unless a dev work ticket builds on that branch, and the idea as completed ("Settled in #<epic or dev work>").
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/create-ticket/SKILL.md b/software/application-software/argos/workspaces/experimental/.claude/skills/create-ticket/SKILL.md
new file mode 100644
index 0000000..9dd28e5
--- /dev/null
+++ b/software/application-software/argos/workspaces/experimental/.claude/skills/create-ticket/SKILL.md
@@ -0,0 +1,66 @@
+---
+name: create-ticket
+description: Draft and file a GitHub issue (idea, spike, epic, or dev work) on an application-software repo (Argos, Nero) from the repo's issue templates, or rewrite an existing issue into them. Use whenever the user wants to create, file, write up, or log a ticket, issue, idea, spike, epic, bug, or task, including an out-of-scope idea that comes up mid-work.
+---
+
+# Create ticket
+
+These are the ticket conventions for every application-software repo. The repo's own `.github/ISSUE_TEMPLATE` holds only the fields (`gh api repos/<owner>/<repo>/contents/.github/ISSUE_TEMPLATE/<file> -q .content | base64 -d`); follow each field's description.
+
+First load the project's `ticket-conventions` skill (inherited from the project's `skills/`) for its repo, area labels, vocabulary, and diagrams. If none is enabled, ask which repo.
+
+## Workflow
+
+idea → spikes → epic → dev work, or a standalone spike → dev work
+
+| Ticket | What it is | Issue type | Parent |
+|---|---|---|---|
+| Idea | What could be built and why. Its areas to explore are things to improve or problems to solve, each with approaches worth trying. | none | none |
+| Spike | One approach to try on one area of an idea (it needn't cover the whole area), or a small standalone improvement: what is tried and the hypothesis. Findings go in a comment and a draft PR (`report-spike`), not the ticket. | none | its idea, if any |
+| Epic | Work too large for one dev work ticket: the goal and whole-epic outcomes, not a walkthrough of each ticket. A new issue linking the idea or spike it came from in "From". | Feature | none |
+| Dev work | Any implementation work: testable requirements, Notes for gotchas and pointers to code. Large work is cut into vertical slices (see Dev work below). | Feature, Bug, or Task | its epic, if any |
+
+If unsure, a small, clear change is dev work, a small unknown is a spike, and a big unexplored thing is an idea. Ideas and spikes explore work, so they get no issue type; bug, feature, and task are issue types, never labels.
+
+## Writing
+
+How every ticket reads, on any project:
+
+- Short and plain. Write for someone new to the project: explain project-specific terms, and use the project's vocabulary (its `ticket-conventions` says where it lives; check the code for current names).
+- Outcomes, not implementation: say what changes and why, not how to build it. A rationale gives the reasoning, not a history of the problem.
+- No prescriptions on ideas and spikes. Ideas name open options to weigh, not a plan or a recommended pick; spikes state what to learn and leave the how to whoever picks it up.
+- Facts, not instructions: Notes and context transfer hold facts (where code lives, current behavior, constraints, links), not steps or a proposed solution. Context transfer (optional on spikes, epics, and dev work) starts with a short summary, then the raw context.
+- Unknowns stay open questions in Notes; don't guess.
+- Title: concise and imperative, no prefixes (except a spike's area).
+- Requirements: clear, broad checkboxes, each a testable outcome rather than an implementation step; 3-5, never more than 7. If it needs more, split the ticket.
+- Backticks: at most three inline uses per body; name files and identifiers in plain text. Diagram and context-transfer blocks don't count.
+- Size: keep ideas short; one small enough to just try is a spike.
+
+## Dev work
+
+- One ticket by default. Split only when the work is too large for one PR or parts could run in parallel.
+- When split, cut vertical slices: each goes end to end through every part it touches (e.g. backend through UI), not one layer, and works and is testable on its own. Cut for the most parallel work; mark a slice that must wait as blocked by the one it waits on (see File).
+
+## Spikes
+
+- One approach, not a set to choose between. If a spike reads "X or Y", it is two spikes.
+- Prefer an idea with a few spikes (often 2-4) under it; a spike can also stand alone, or with siblings, to explore an area. Several spikes can take on the same area in different ways.
+- Title it `<area>: <approach>`, with the area a short kebab-case name its siblings share (`graph-saving: Save a graph to a file and re-upload it`). An area may cover more than one of an idea's bullets. A lone small improvement needs no prefix.
+- Sibling spikes share the context transfer's summary and common facts; each adds only the facts particular to its approach.
+- An idea needn't get all its spikes at once: file an area's spikes when someone is ready to try them.
+- Done: its findings are posted, review feedback is addressed, and the lead's latest review on its draft PR is an approval (GitHub's Approve), including when the recommendation is to drop the approach. A done spike stays open until `consolidate-spikes` closes it.
+
+## Draft
+
+- Check the code first: the work may be done or already tracked.
+- One `### <field label>` per field in template order, following each field's description; omit empty optional fields.
+- Diagrams: required on epics, optional on dev work. The project's `ticket-conventions` says what they show.
+- Labels: the template's category (`idea`, `spike`, `epic`, `dev work`), one written-by (`by: human` if the user dictated it, `by: ai-assisted` if they gave the substance, `by: ai` if you wrote it, including rewrites), and at least one of the project's area labels.
+- Rewriting an old ticket: keep its intent and assignees; bring it up to these rules and update vocabulary, labels, issue type, and parent.
+- Folding one ticket into another: add it as a requirement on the target, then close it as not planned. Every close gets a one-line comment saying why.
+
+## File
+
+Check for open duplicates, then show the full draft (title, type if any, labels, parent, body) in the chat, not only in a file. File or edit only what the user OKs.
+
+Use the REST API (GraphQL may be blocked): POST repos/<owner>/<repo>/issues with title, body, labels, the issue type from the table, and the user as assignee (on a spike, whoever will run it; ask), then, if it has a parent, POST repos/<owner>/<repo>/issues/<parent>/sub_issues with the new issue's id. If it waits on another issue, POST repos/<owner>/<repo>/issues/<n>/dependencies/blocked_by with the blocking issue's id. Report the URL.
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/implement/SKILL.md b/software/application-software/argos/workspaces/experimental/.claude/skills/implement/SKILL.md
new file mode 100644
index 0000000..f24d293
--- /dev/null
+++ b/software/application-software/argos/workspaces/experimental/.claude/skills/implement/SKILL.md
@@ -0,0 +1,14 @@
+---
+name: implement
+description: Implement an Argos ticket or task in its own worktree, test-first, ending in a commit, here or in a subagent (one per ticket, in parallel, for several). Use when the user asks to build, fix, or implement something in Argos.
+---
+
+1. **Worktree.** Get the ticket's branch (`{issue-number}-{kebab-case-title}`) with the `new-worktree` skill, based on `origin/develop`. Make every change in `worktrees/argos/<branch>/`, never in `worktrees/argos/develop/`, while staying at the workspace root: edit files by path, `git -C worktrees/argos/<branch> …` for git, and one-off subshells for the rest. Run `(cd worktrees/argos/<branch>/angular-client && npm ci)` before touching the client.
+2. **Hand off?** Unless the user already chose, ask whether a subagent should do the rest, and recommend one: one per ticket, in parallel, when there are several (step 1 for each first), or one for work long enough to fill this conversation. Tell it the ticket, its worktree's absolute path, and to follow this skill from step 3, change files only under that path (`git -C` for git), name temp files after the branch, stop the clients it starts, and report its commits, checks, and the port and browser it used. Never turn on the harness's own worktree isolation (`new-worktree` says why). Then confirm its commits with `git -C <path> log origin/develop..` and pass its report on.
+3. **Understand.** Read the issue (`gh issue view <n> --comments`), the code involved, and `docs/CONTEXT.md` terms.
+4. **Build test-first**, one behavior at a time: a failing test, the least code to pass it, refactor while green. Test through public interfaces; mock only at system boundaries.
+5. **Check.**
+   - Frontend, in `(cd worktrees/argos/<branch>/angular-client && …)`: `npx ng test --include='src/**/thing.spec.ts' --watch=false` while iterating; at the end `npx ng test --watch=false` (bare `ng test` blocks), then `npx prettier --check "src/**/*.{ts,html,scss}" && npx ng lint`.
+   - Backend, in `(cd worktrees/argos/<branch>/scylla-server && …)`: `cargo build` and single tests while iterating; `cargo test` at the end.
+   - UI changes: verify in the running app with `run-local <branch>`.
+6. **Commit** with `/commit`. Don't push or open a PR unless asked; that's `/open-pr`.
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/journal/SKILL.md b/software/application-software/argos/workspaces/experimental/.claude/skills/journal/SKILL.md
new file mode 100644
index 0000000..4917259
--- /dev/null
+++ b/software/application-software/argos/workspaces/experimental/.claude/skills/journal/SKILL.md
@@ -0,0 +1,22 @@
+---
+name: journal
+description: Park rough notes locally mid-task ("note to self", "remember to", "journal this"), and later export them to their permanent home (issue, spec, ADR, glossary, docs) through the skill that owns it. Use when the user wants to jot a thought without derailing, or to file parked notes.
+---
+
+Notes live in `.journal/` at the workspace root (git-excluded, outside worktrees so they survive removal). An **entry** is one file, a **category** a subfolder. The journal never pushes, files, or contacts GitHub itself.
+
+**Capture** (no git, no other skills):
+
+```
+bash scripts/capture.sh [-c <category>] ["note text"]
+```
+
+Omit `-c` for a loose entry, omit the text for an empty one to edit. Report the path it prints.
+
+**Export** (only when asked):
+
+1. Read the entries and propose a grouping: one entry → one output, a category → one merged output, or one entry split across several. Let the user adjust.
+2. For each output, pick the workspace skill whose description fits its permanent home, preferring an existing docs area. A new section always needs approval.
+3. Show the destination and reshaped text and wait for approval. Nothing lands silently.
+4. Delegate to that skill; it owns formatting, conventions, and any GitHub contact.
+5. Ask whether to delete the exported entry (default: keep).
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/journal/scripts/capture.sh b/software/application-software/argos/workspaces/experimental/.claude/skills/journal/scripts/capture.sh
new file mode 100755
index 0000000..1e90d7b
--- /dev/null
+++ b/software/application-software/argos/workspaces/experimental/.claude/skills/journal/scripts/capture.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+# capture.sh [-c <category>] [note text]: write a timestamped journal entry to
+# .journal/[<category>/] at the workspace root (adding /.journal/ to .git/info/exclude once) and print
+# its path. An empty entry is created when no text is given. Never touches git history, GitHub, or
+# other skills.
+set -euo pipefail
+usage="usage: capture.sh [-c <category>] [note text]"
+# shellcheck source=/dev/null
+. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
+dir=$DELPHI_ROOT/.journal
+[ "${1:-}" = -c ] && dir=$dir/${2:?$usage} && shift 2
+exclude=$(git -C "$DELPHI_ROOT" rev-parse --path-format=absolute --git-path info/exclude 2>/dev/null || true)
+[ -z "$exclude" ] || grep -qxF /.journal/ "$exclude" 2>/dev/null || { mkdir -p "${exclude%/*}" && echo /.journal/ >>"$exclude"; }
+mkdir -p "$dir"
+file=$dir/$(date +%Y-%m-%d-%H%M%S).md
+{ echo "<!-- captured $(date -u +%Y-%m-%dT%H:%M:%SZ) -->"; [ $# -eq 0 ] || echo "$*"; } >"$file"
+echo "$file"
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/new-worktree/SKILL.md b/software/application-software/argos/workspaces/experimental/.claude/skills/new-worktree/SKILL.md
new file mode 100644
index 0000000..0495fc9
--- /dev/null
+++ b/software/application-software/argos/workspaces/experimental/.claude/skills/new-worktree/SKILL.md
@@ -0,0 +1,16 @@
+---
+name: new-worktree
+description: Create or reuse a worktree for a branch of a code repo (worktrees/<repo>/<branch>). Use before any branch work, such as starting a ticket or reviewing or fixing a PR branch, unless the user says not to use worktrees.
+---
+
+Run from the workspace root:
+
+```
+bash .delphi/new-worktree.sh <repo> <branch> [<base>]
+```
+
+- An existing branch (local or on origin, e.g. a PR head) is checked out; anything else is created from `<base>` (default: the repo's default branch). Safe to re-run.
+- Stay at the workspace root and reach into the worktree by the printed path. Never switch branches in an existing worktree or work in its store, `worktrees/<repo>/.bare`.
+- For a subagent, make its worktree here first and hand it the path. Never use the harness's own worktree isolation: it checks out this Delphi clone from main, not the code repo, and fences the subagent out of `worktrees/`.
+- Keep `worktrees/<repo>/<default-branch>/` (made by setup) a clean reference: fetch and fast-forward only.
+- After the branch merges: `git -C worktrees/<repo>/.bare worktree remove ../<branch>`.
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/open-pr/SKILL.md b/software/application-software/argos/workspaces/experimental/.claude/skills/open-pr/SKILL.md
new file mode 100644
index 0000000..7363dd2
--- /dev/null
+++ b/software/application-software/argos/workspaces/experimental/.claude/skills/open-pr/SKILL.md
@@ -0,0 +1,22 @@
+---
+name: open-pr
+description: Run pre-PR checks, push the branch, and open a draft pull request on an application-software repo (Argos, Nero)
+---
+
+First load the project's `pr-conventions` skill (inherited from the project's `skills/`) for its base branch, commit format, checks, labels, and screenshots.
+
+1. **Check:** `bash scripts/pr-checks.sh <repo> <branch> origin/<base> '<commit format>'` (clean tree, commit subjects match the project's format, merges cleanly into the base), then the project's own checks. Stop and fix on any FAIL.
+2. **Media:** if the diff touches the UI, ask the user whether to add screenshots to the PR, listing any already in the project's screenshot folder for this branch so they can pick those instead of new ones; on no, skip this step. For new ones, use the project's UI QA to take Playwright screenshots of the changed views into its screenshot folder, or, when the change adds or changes an animation, record a short video instead (a browser context with `recordVideo: { dir }` saves a `.webm` when it closes). Images must be under 10 MB; video under 10 MB on a Free plan, 100 MB on a paid one.
+3. **Open:** push (`git -C worktrees/<repo>/<branch> push -u origin <branch>`), then run `(cd worktrees/<repo>/<branch> && gh pr create --draft --base <base> --head <branch> --title "<title>" --body-file /tmp/<branch>-pr-body.md --assignee @me)` with the project's labels (`--label`) and one `--attach <file>` per screenshot or video, and report the URL.
+4. **Spike:** the PR stays a draft; getting it merged isn't the goal. Once it's checked and working, run `report-spike`.
+
+## PR body
+
+Fill the worktree's `.github/pull_request_template.md` from the diff, following each section's comment, and write it to `/tmp/<branch>-pr-body.md`:
+
+- Title: concise and imperative, no ticket number.
+- The Changes section (not the whole body): about 50 words (1–3 sentences) on what landed and the key design choice. Describe the change, not the file list: don't enumerate components, classes or files the diff already shows. Name a specific one only when its behaviour changes in a way a reviewer must know.
+- Delete the template's comments and any optional or non-applicable sections, and check off the Checklist.
+- At most three backtick uses in the body.
+- End with `Closes #{ticket}` (the branch's leading number), or `Spike for #{ticket}` on a spike, which its PR never closes.
+- Screenshots and videos: reference each one by its path from the worktree, `![<what it shows>](<path>)`; `--attach` uploads it and rewrites the reference to its `user-attachments` URL. `--attach` needs gh v2.99.0+: if `gh pr create --help` doesn't list it, put `_screenshot pending_` instead and remind the user to drag-drop the files from the screenshot folder. Never commit screenshots or videos.
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/open-pr/scripts/pr-checks.sh b/software/application-software/argos/workspaces/experimental/.claude/skills/open-pr/scripts/pr-checks.sh
new file mode 100755
index 0000000..61f377f
--- /dev/null
+++ b/software/application-software/argos/workspaces/experimental/.claude/skills/open-pr/scripts/pr-checks.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+# pr-checks.sh <repo> <branch> [<base> [<format>]]: open-pr's shared pre-PR checks on
+# worktrees/<repo>/<branch>. Prints
+# one PASS/FAIL/SKIP line per check: clean tree, every commit subject since <base> (default
+# origin/develop, fetched first) matches <format> (an extended regex, default '^#[0-9]+ - '), and no
+# merge conflicts with <base>. Exits 1 if any check fails. The project's own checks (lint, format)
+# are in its pr-conventions skill.
+set -euo pipefail
+usage="usage: pr-checks.sh <repo> <branch> [<base> [<format>]]"
+repo=${1:?$usage} branch=${2:?$usage}
+# shellcheck source=/dev/null
+. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
+cd "$DELPHI_WORKTREES/$repo/$branch"
+base=${3:-origin/develop} format=${4:-'^#[0-9]+ - '} fail=0
+res() { echo "$1 $2"; [ "$1" != FAIL ] || fail=1; }
+git fetch -q origin "${base#origin/}" 2>/dev/null || true
+
+if [ -z "$(git status --porcelain)" ]; then res PASS "clean tree"; else res FAIL "uncommitted changes"; fi
+bad=$(git log --format=%s "$base..HEAD" | grep -Ev "$format" || true)
+if [ -z "$bad" ]; then res PASS "commit format"; else res FAIL "commit format: $(echo "$bad" | paste -sd'|' -)"; fi
+if git merge-tree --write-tree HEAD "$base" >/dev/null 2>&1; then res PASS "merges cleanly into $base"
+elif [ $? -eq 1 ]; then res FAIL "conflicts with $base"; else res SKIP "conflict check (needs git 2.38+)"; fi
+exit "$fail"
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/pr-conventions/SKILL.md b/software/application-software/argos/workspaces/experimental/.claude/skills/pr-conventions/SKILL.md
new file mode 100644
index 0000000..7e50492
--- /dev/null
+++ b/software/application-software/argos/workspaces/experimental/.claude/skills/pr-conventions/SKILL.md
@@ -0,0 +1,14 @@
+---
+name: pr-conventions
+description: Argos specifics for pull requests (base branch, commit format, checks, labels, screenshots, UI QA). Load before opening, updating, or reviewing an Argos PR, alongside open-pr, update-pr, and review.
+---
+
+# Argos PR conventions
+
+The shared rules are in the `open-pr` skill; this adds only what is Argos's.
+
+- Base branch: `develop`. Commit format: `^#[0-9]+ - ` (the format in the workspace instructions).
+- Checks: `bash scripts/lint.sh <branch>` (frontend prettier and ng lint, only if angular-client/ changed).
+- Labels: one written-by (`by: human` if the user wrote it, `by: ai-assisted` if they gave the substance, `by: ai` if you wrote it) and at least one area label (`frontend`, `backend`, `devops`); no category label.
+- Screenshots: `pictures/<branch>/` at the worktree root (git-ignored).
+- UI QA: get the branch running with `run-local <branch>`, then drive it with Playwright, using the `playwright-cdp` server if `curl -s localhost:9222/json/version` responds, otherwise `playwright`.
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/pr-conventions/scripts/lint.sh b/software/application-software/argos/workspaces/experimental/.claude/skills/pr-conventions/scripts/lint.sh
new file mode 100644
index 0000000..2ed67ec
--- /dev/null
+++ b/software/application-software/argos/workspaces/experimental/.claude/skills/pr-conventions/scripts/lint.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+# lint.sh <branch> [<base>]: Argos's pre-PR check for open-pr, on
+# worktrees/argos/<branch>. Prints one PASS/FAIL/SKIP line: frontend prettier + ng lint, only if
+# angular-client/ changed since <base> (default origin/develop). Exits 1 if it fails.
+set -euo pipefail
+usage="usage: lint.sh <branch> [<base>]"
+branch=${1:?$usage}
+# shellcheck source=/dev/null
+. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
+cd "$DELPHI_WORKTREES/argos/$branch"
+base=${2:-origin/develop}
+if git diff --quiet "$base...HEAD" -- angular-client; then echo "SKIP frontend lint (no changes)"
+elif [ ! -d angular-client/node_modules ]; then echo "FAIL frontend lint: run npm ci in angular-client/" && exit 1
+elif (cd angular-client && npx prettier --check "src/**/*.{ts,html,scss}" >/dev/null && npx ng lint >/dev/null 2>&1)
+then echo "PASS frontend lint"; else echo "FAIL frontend lint (run prettier --check / ng lint to see why)" && exit 1; fi
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/report-spike/SKILL.md b/software/application-software/argos/workspaces/experimental/.claude/skills/report-spike/SKILL.md
new file mode 100644
index 0000000..e673871
--- /dev/null
+++ b/software/application-software/argos/workspaces/experimental/.claude/skills/report-spike/SKILL.md
@@ -0,0 +1,22 @@
+---
+name: report-spike
+description: Post a spike's findings on its ticket, judged against its hypothesis, and ask the lead to review its draft PR. Use when a spike's approach has been tried on an application-software repo (Argos, Nero).
+---
+
+A spike runs like any ticket (branch, commits, a draft PR from `open-pr`); this reports it. Load the project's `pr-conventions` first.
+
+1. **Read** the spike (`gh issue view <n> --comments`), its draft PR, and the branch's diff against the base.
+2. **Draft** one findings comment, short and factual:
+
+   ```
+   ### Findings
+   **Hypothesis:** holds | partly holds | doesn't hold. One sentence why.
+   **Learned:** measurements, limits hit, surprises, with links to the draft PR's code.
+   **Recommendation:** adopt, adopt with changes, or drop, and why.
+   **Open questions:** what the spike didn't settle.
+   Draft PR: #<pr>
+   ```
+3. **Show** it and ask who the lead is; on OK, post it (`gh issue comment <n> --body-file /tmp/<branch>-findings.md`).
+4. **Request review:** `(cd worktrees/<repo>/<branch> && gh pr edit <branch> --add-reviewer <lead>)`, keeping the PR a draft, and remind the user to ping the lead on Slack.
+
+Address review feedback on the branch as on any PR (`address-pr-comments`), and edit the findings comment if it changes them. The spike is done when the lead approves the draft PR (`create-ticket`'s Spikes rules); it stays open until `consolidate-spikes` closes it.
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/run-local/SKILL.md b/software/application-software/argos/workspaces/experimental/.claude/skills/run-local/SKILL.md
new file mode 100644
index 0000000..7acb908
--- /dev/null
+++ b/software/application-software/argos/workspaces/experimental/.claude/skills/run-local/SKILL.md
@@ -0,0 +1,14 @@
+---
+name: run-local
+description: Bring up the local Argos environment for running or testing — Docker backend (right profile for what changed) + an Angular client per worktree, each on its own free port. Use whenever you need to actually run the app locally, for a PR, a ticket's branch, or develop.
+---
+
+Run the branches the user is asking about: a PR or ticket means its branch (make its worktree with `new-worktree` first), and `develop` only when they want current `develop` (fast-forward `worktrees/argos/develop/` first):
+
+```
+bash scripts/run-local.sh <branch>...
+```
+
+It starts the backend if it's down (`client-dev`, or `scylla-dev` plus `cargo run` when a target changes `scylla-server/`), and serves each target's client on the next free port; parallel runs (one per session or agent) each get their own. With no branches it reports what's running.
+
+Report each branch's client URL and the backend. A failed compile or a stale-backend warning is a finding: show it to the user. Stop a client with `kill <pid>` from its line. When every port is taken it lists what holds each; clients from other checkouts are the user's, so ask before stopping them.
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/run-local/scripts/run-local.sh b/software/application-software/argos/workspaces/experimental/.claude/skills/run-local/scripts/run-local.sh
new file mode 100755
index 0000000..f598657
--- /dev/null
+++ b/software/application-software/argos/workspaces/experimental/.claude/skills/run-local/scripts/run-local.sh
@@ -0,0 +1,66 @@
+#!/usr/bin/env bash
+# run-local.sh [<branch>...]: bring up the local Argos stack for those branches'
+# worktrees (worktrees/argos/<branch>, made beforehand with new-worktree) and print one line per
+# piece. The backend (first listener on 8000-8090, step 10) is started if down:
+# ./argos.sh client-dev when no target changes scylla-server/, else scylla-dev plus `cargo run` in the
+# one worktree that does. Each target's client is then served by serve.sh on its own port. With no
+# branches, reports what is running.
+set -euo pipefail
+here=$(cd "$(dirname "$0")" && pwd)
+# shellcheck source=/dev/null
+. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
+state=${TMPDIR:-/tmp}; state=${state%/}/argos-run-local
+up() { (exec 3<>"/dev/tcp/127.0.0.1/$1") 2>/dev/null || (exec 3<>"/dev/tcp/::1/$1") 2>/dev/null; } # ng serve binds ::1
+backend() { for p in $(seq 8000 10 8090); do up "$p" && echo "http://localhost:$p" && return; done; echo none; }
+scylla() {
+  if docker ps --filter name=scylla-server --format '{{.Names}}' 2>/dev/null | grep -q .; then echo docker
+  elif [ "$(backend)" != none ]; then echo local
+  else echo none; fi
+}
+
+if [ $# = 0 ]; then
+  clients=
+  for p in $(seq 4200 4210); do up "$p" && clients="$clients http://localhost:$p"; done
+  echo "backend=$(backend) scylla=$(scylla) clients=${clients# }"
+  exit 0
+fi
+
+wts=() rust=()
+for b in "$@"; do
+  wt=$DELPHI_WORKTREES/argos/$b
+  [ -f "$wt/argos.sh" ] && [ -d "$wt/angular-client" ] ||
+    { echo "run-local: no Argos worktree for '$b' at $wt (make it with new-worktree)" >&2 && exit 1; }
+  wts+=("$wt")
+done
+git -C "${wts[0]}" fetch -q origin # the worktrees share one store
+for wt in "${wts[@]}"; do
+  if ! git -C "$wt" diff --quiet origin/develop... -- scylla-server || ! git -C "$wt" diff --quiet HEAD -- scylla-server; then
+    rust+=("$wt")
+  fi
+done
+[ ${#rust[@]} -le 1 ] || { echo "run-local: several targets change scylla-server/; run them one at a time" >&2 && exit 1; }
+
+if [ "$(backend)" = none ]; then
+  mkdir -p "$state"
+  if [ ${#rust[@]} = 0 ]; then
+    (cd "${wts[0]}" && ./argos.sh client-dev up -d) >"$state/compose.log" 2>&1 ||
+      { echo "run-local: ./argos.sh client-dev up failed:" >&2 && tail -20 "$state/compose.log" >&2 && exit 1; }
+  else
+    (cd "${rust[0]}" && ./argos.sh scylla-dev up -d) >"$state/compose.log" 2>&1 ||
+      { echo "run-local: ./argos.sh scylla-dev up failed:" >&2 && tail -20 "$state/compose.log" >&2 && exit 1; }
+    (cd "${rust[0]}/scylla-server" &&
+      DATABASE_URL=${DATABASE_URL:-postgresql://postgres:password@127.0.0.1:${ODYSSEY_DB_PORT:-5432}/postgres} \
+        nohup cargo run >"$state/scylla.log" 2>&1 &)
+    echo "run-local: cargo run started for $(basename "${rust[0]}"); log $state/scylla.log"
+  fi
+  for _ in $(seq 600); do [ "$(backend)" != none ] && break; sleep 1; done
+  [ "$(backend)" != none ] || { echo "run-local: backend not up after 600s; see $state/" >&2 && exit 1; }
+elif [ ${#rust[@]} = 1 ] && [ "$(scylla)" = docker ]; then
+  echo "run-local: warning: backend is the scylla-server image but $(basename "${rust[0]}") changes scylla-server/;" \
+    "stop it (./argos.sh client-dev down) and re-run to test that branch's backend" >&2
+fi
+echo "backend=$(backend) scylla=$(scylla)"
+
+status=0
+for wt in "${wts[@]}"; do bash "$here/serve.sh" "$wt" || status=1; done
+exit $status
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/run-local/scripts/serve.sh b/software/application-software/argos/workspaces/experimental/.claude/skills/run-local/scripts/serve.sh
new file mode 100755
index 0000000..d8de89c
--- /dev/null
+++ b/software/application-software/argos/workspaces/experimental/.claude/skills/run-local/scripts/serve.sh
@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+# serve.sh <argos-worktree>: serve that worktree's Angular client with `ng serve` on the first free
+# port in 4200-4210, in the background, and print `<branch> client=<url> pid=<pid> log=<file>` once
+# it has compiled. Re-running for a worktree that is still being served prints its existing client.
+# Runs `npm ci` first if node_modules lacks ng (missing or half-installed). Exits 1, with the log's
+# tail, if the build fails, or with what holds each port if none is free.
+set -euo pipefail
+wt=$(cd "${1:?usage: serve.sh <argos-worktree>}" && pwd)
+branch=$(git -C "$wt" rev-parse --abbrev-ref HEAD)
+state=${TMPDIR:-/tmp}; state=${state%/}/argos-run-local
+mkdir -p "$state"
+key=$state/$(printf %s "$wt" | tr -c 'A-Za-z0-9' _)
+log=$key.log
+up() { (exec 3<>"/dev/tcp/127.0.0.1/$1") 2>/dev/null || (exec 3<>"/dev/tcp/::1/$1") 2>/dev/null; } # ng serve binds ::1
+
+if [ -f "$key.pid" ] && kill -0 "$(cat "$key.pid")" 2>/dev/null && up "$(cat "$key.port")"; then
+  echo "$branch client=http://localhost:$(cat "$key.port") pid=$(cat "$key.pid") log=$log (already running)"
+  exit 0
+fi
+
+# Claim the port under a lock, or parallel calls all pick the same one while ng serve starts. A port is
+# taken once a client listens on it or a live serve.sh has claimed it. mkdir is the lock (no flock on
+# macOS); it is held only for the claim, so nothing started below can keep it.
+lock=$state/port.lock
+n=0; until mkdir "$lock" 2>/dev/null; do n=$((n + 1)); [ $n -lt 100 ] || rm -rf "$lock"; sleep 0.1; done # stale after 10s
+trap 'rmdir "$lock" 2>/dev/null || true' EXIT
+claimed() { for f in "$state"/*.port; do [ -f "$f" ] && [ "$(cat "$f")" = "$1" ] && kill -0 "$(cat "${f%.port}.pid")" 2>/dev/null && return; done; return 1; }
+port=
+for p in $(seq 4200 4210); do up "$p" || claimed "$p" || { port=$p && break; }; done
+# Name what holds each port, so a stale client from another checkout can be stopped (lsof, where there is one).
+holders() {
+  for p in $(seq 4200 4210); do
+    pid=$(lsof -nP -iTCP:"$p" -sTCP:LISTEN -t 2>/dev/null | head -1) || true
+    if [ -n "$pid" ]; then echo "  $p pid=$pid $(lsof -a -p "$pid" -d cwd -Fn 2>/dev/null | sed -n 's/^n//p')"; fi
+  done
+}
+[ -n "$port" ] || { echo "serve: no free port in 4200-4210, held by:" >&2 && holders >&2 && exit 1; }
+echo $$ >"$key.pid" && echo "$port" >"$key.port" # claimed by this script until ng serve's pid replaces it
+rmdir "$lock" && trap - EXIT
+
+cd "$wt/angular-client"
+[ -x node_modules/.bin/ng ] || npm ci --no-audit --no-fund >"$log" 2>&1 ||
+  { echo "serve: npm ci failed in $wt/angular-client:" >&2 && tail -20 "$log" >&2 && exit 1; }
+nohup npx ng serve --port "$port" >"$log" 2>&1 &
+pid=$!
+echo "$pid" >"$key.pid" && echo "$port" >"$key.port"
+
+for _ in $(seq 180); do
+  kill -0 "$pid" 2>/dev/null || { echo "serve: ng serve exited for $branch:" >&2 && tail -20 "$log" >&2 && exit 1; }
+  if grep -q 'bundle generation failed\|\[ERROR\]' "$log"; then
+    echo "serve: $branch failed to compile (still serving on $port, pid $pid):" >&2 && tail -30 "$log" >&2 && exit 1
+  fi
+  if up "$port" && grep -q 'bundle generation complete\|Compiled successfully' "$log"; then
+    echo "$branch client=http://localhost:$port pid=$pid log=$log"
+    exit 0
+  fi
+  sleep 1
+done
+echo "serve: $branch not up after 180s (pid $pid); see $log" >&2 && exit 1
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/setup-workspace/SKILL.md b/software/application-software/argos/workspaces/experimental/.claude/skills/setup-workspace/SKILL.md
new file mode 100644
index 0000000..fdc1ce8
--- /dev/null
+++ b/software/application-software/argos/workspaces/experimental/.claude/skills/setup-workspace/SKILL.md
@@ -0,0 +1,18 @@
+---
+name: setup-workspace
+description: Change what this workspace checks out and re-run its setup. workspace.yml lists code repos (repos:), read-only dependency sources (references-git:), and clones of other Delphi workspaces or main to read (workspaces:). Use when the user wants to read or compare another workspace's or main's instructions, skills, or docs (link it), add or remove a repo or dependency reference, or run setup after cloning or pulling.
+---
+
+`workspace.yml` at the workspace root lists what `.delphi/setup.sh` checks out, all git-ignored: code repos (`repos:`), dependency sources (`references-git:`), and other Delphi workspaces or main (`workspaces:`, entries `- <name>` or `- main`; a workspace's name is the short names of its folders (each folder's `short-name` file, else its name) and its own folder name, joined by dots, like `s.app.argos.argos-dev`; `bash .delphi/switch.sh --list` lists them). The comment on each section gives its entry format and where it lands; read it, then edit the file.
+
+Run from the workspace root after any change, and to refresh references and workspace copies to their latest:
+
+```
+bash .delphi/setup.sh
+```
+
+- The clones under `workspaces/` are full clones, each on its branch (`ws/<name>` or `main`) tracking origin, for reading: don't edit, branch, or push them from this workspace. Each setup run switches a clone back to its branch if it was switched away (refused while it has uncommitted changes), pulls it, and runs its own setup, so that workspace's repos and references are under it too (it skips its own `workspaces:`, so they don't chain). To change one of those workspaces or main, work in its own clone or switch to it (`switch-workspace` skill).
+- This workspace's project folder (shared context, `AUTHORING.md`, `workspace-defaults/`) is the folder above `workspaces/<leaf>/` in `workspaces/main/` (`bash .delphi/switch.sh --list` prints it): for `s.app.argos.argos-dev`, `workspaces/main/software/application-software/argos/`. List workspaces and their project folders: `bash .delphi/switch.sh --list`.
+- `workspace.yml` is shared: change it on a branch and open a PR into `ws/<this-name>` (the `name:` in `workspace.yml`). For a one-off look, add the entry, run setup, then `git restore workspace.yml`.
+- Setup never deletes what you'd lose. A removed entry's `workspaces/<name>/`, `references/<name>/`, or repo store and worktrees stay until you delete them (ask first).
+- When Delphi releases a version that needs cleanup in clones, setup runs its migration first (`.delphi/migrations/`), once per workspace. A migration removes only what nothing is lost from, and otherwise stops setup with what to do: tell the user, do it with their go-ahead, and re-run.
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/switch-workspace/SKILL.md b/software/application-software/argos/workspaces/experimental/.claude/skills/switch-workspace/SKILL.md
new file mode 100644
index 0000000..0b5a91a
--- /dev/null
+++ b/software/application-software/argos/workspaces/experimental/.claude/skills/switch-workspace/SKILL.md
@@ -0,0 +1,19 @@
+---
+name: switch-workspace
+description: Switch this clone to another Delphi workspace, or to Delphi's main, to work in it. Use when the user wants to check out, switch to, open, or work in another workspace or project, or to change another workspace's or main's files.
+---
+
+Run from the workspace root:
+
+```
+bash .delphi/switch.sh <name>        # ws/<name>: its dotted name, e.g. s.app.argos.argos-dev
+bash .delphi/switch.sh main          # Delphi's main: project folders, templates, CI
+```
+
+- List workspaces and their project folders: `bash .delphi/switch.sh --list`.
+- It refuses while tracked files have changes: commit them on a branch (and PR them) first. Then it fetches, switches, fast-forwards, and runs the new workspace's `.delphi/setup.sh`.
+- The post-checkout hook parks this workspace's `repos/`, `worktrees/`, `references/` and `workspaces/` in `.delphi/parked/<name>/` (git-ignored; `<name>` as in its `workspace.yml`) and brings the other's back at the same paths, so worktrees and the work in them return as they were. Switch back the same way. Never run `git clean -X` or `git stash --all` at the workspace root: they take ignored files, parked work included.
+- Before switching, stop anything running from `worktrees/` (dev servers, Docker builds): its folder moves.
+- Start a fresh harness session after switching so its instructions and skills match the new workspace. A harness integration may explicitly support reloading in place; follow its documented behavior.
+- To change the workspace you switched to: `git switch -c <branch>`, commit, push, and open a PR into `ws/<name>` (or `main`).
+- To only read another workspace or main without leaving this one, list it under `workspaces:` instead (`setup-workspace` skill).
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/ticket-conventions/SKILL.md b/software/application-software/argos/workspaces/experimental/.claude/skills/ticket-conventions/SKILL.md
new file mode 100644
index 0000000..8d9ec37
--- /dev/null
+++ b/software/application-software/argos/workspaces/experimental/.claude/skills/ticket-conventions/SKILL.md
@@ -0,0 +1,14 @@
+---
+name: ticket-conventions
+description: Argos specifics for tickets (repo, area labels, vocabulary, diagrams). Load before drafting or filing an Argos issue, alongside create-ticket.
+---
+
+# Argos ticket conventions
+
+The shared rules are in the `create-ticket` skill; this adds only what is Argos's.
+
+- Repo: Northeastern-Electric-Racing/Argos (base branch `develop`).
+- Area labels: `frontend`, `backend`, `devops` (any combination).
+- Vocabulary: use the workspace glossary's terms (`docs/CONTEXT.md`), and check the code for current names, which may have moved past it (e.g. Zenoh key expressions, not MQTT topics).
+- Title example: "Add pagination to the run list".
+- Diagrams: Mermaid where it fits. Show the change across the parts it touches (car, Siren, scylla-server, angular-client), before and after.
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/update-pr/SKILL.md b/software/application-software/argos/workspaces/experimental/.claude/skills/update-pr/SKILL.md
new file mode 100644
index 0000000..069b517
--- /dev/null
+++ b/software/application-software/argos/workspaces/experimental/.claude/skills/update-pr/SKILL.md
@@ -0,0 +1,6 @@
+---
+name: update-pr
+description: Update a branch's PR description to reflect the latest changes
+---
+
+Load the project's `pr-conventions` skill, then rewrite the branch's PR body (`(cd worktrees/<repo>/<branch> && gh pr view)`) to match `git -C worktrees/<repo>/<branch> diff origin/<base>...HEAD`, following the PR body rules in the `open-pr` skill. Keep human-written text that's still accurate, `user-attachments` screenshots, and `Closes`/`Fixes` refs; new screenshots or videos follow open-pr's media step, attached with `gh pr edit --attach`. Write it to `/tmp/<branch>-pr-body.md`, apply it with `gh pr edit <branch> --body-file` from the worktree, and add any of the project's labels that are missing with `--add-label`.
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/SKILL.md b/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/SKILL.md
new file mode 100644
index 0000000..c9dfe7d
--- /dev/null
+++ b/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/SKILL.md
@@ -0,0 +1,23 @@
+---
+name: verify-graph
+description: Playwright CLI verification of the graph page — modes, controls, topic selection, and data rendering. Use after any change to graph-page components, graph rendering, data flow, or mode switching logic.
+---
+
+Get the branch's client running with `run-local <branch>`; its URL is `BASE_URL`. The scripts need `playwright-cli` (`npm i -g @playwright/cli`, then `playwright-cli install-browser chromium`; cloud containers use their preinstalled Chromium). Then run the base checks:
+
+```
+bash scripts/check.sh <branch> "$BASE_URL"
+```
+
+It seeds a 50-hour run spanning two midnights (once, shared by parallel checks), opens a `playwright-cli` session named after the branch (`scripts/open.sh`: output to `pictures/<branch>/`, config to `.playwright-cli/<branch>/`), and runs `scripts/check.js`. That covers: page loads in real time, a topic from the tree draws live, the seeded run, historical Quick Select, back to real time, and no console errors beyond develop's NG0100. It prints `[x]`/`[ ]` per check and exits 1 on a failure. Each `look:` line names a screenshot and what it should show: open it and judge it, since only a picture shows whether a chart is right.
+
+Go further where the diff points, by hand in the same session (`P="playwright-cli -s=<branch>"`): controls the diff touches (Pause↔Play, Time Range↔Point Range, Tog Sidebar, Tog Mult Yaxis, Y Min/Max, Custom range, Clear Graph), zoom, pan and hover, several topics, or mode switching for console errors. Reproduce a failed check the same way before fixing it; `check.js` has its steps.
+
+- Act: `$P click "button:has-text('Pause')"`, `role=combobox[name='Quick Select']`, `role=option[name='5 minutes']`, or a ref from `$P snapshot`.
+- Assert: `$P find "<text>"`, `$P snapshot`, `$P console error`; longer Playwright code with `$P run-code "async (page) => {…}"`, or `--filename` for a file kept in `.playwright-cli/<branch>/`.
+- The seeded run: click Select Run, then `bash scripts/select-run.sh <branch> $(bash scripts/seed.sh)`.
+- Screenshots: `$P screenshot --filename=pictures/<branch>/verify-graph/NN-<name>.png` (gitignored).
+
+When the diff touches rendering or the live data path, measure it too: `bash scripts/perf.sh <branch> "$BASE_URL" [<topic>,…]` prints retained JS heap, allocation rate, frame rate and long tasks (`scripts/perf.js`), then the browser's GPU-process memory, where a WebGL chart's buffers show up. The numbers drift with machine load, so run the branch and its base side by side, twice, at the same topics. Calypso sends about one point a second per topic and has no rate setting, so the chart's own data is small next to the app's: a JS-heap gap of a few MB is noise, and more topics widen real ones.
+
+When a hand check keeps coming back, add it to `check.js`. Report `check.sh`'s lines plus one line per hand check, and the screenshot folder. `$P close` at the end.
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/check.js b/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/check.js
new file mode 100644
index 0000000..3fcb734
--- /dev/null
+++ b/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/check.js
@@ -0,0 +1,83 @@
+// The base verify-graph checks, for check.sh to run with `playwright-cli run-code` (it fills in __URL__,
+// __RUN__ and __OUT__). Each check asserts what the DOM can show; what only a picture can show (a series
+// drawn, the x-axis span) is a screenshot with a `look:` line for the agent to judge.
+async (page) => {
+  const URL = '__URL__', RUN = __RUN__, OUT = '__OUT__';
+  const lines = [], errors = [];
+  page.on('console', (m) => {
+    if (m.type() === 'error' && !m.text().includes('NG0100')) errors.push(m.text().split('\n')[0].slice(0, 160));
+  }); // develop already logs NG0100 (ExpressionChangedAfterItHasBeenChecked)
+  const text = (t) => page.getByText(t, { exact: true });
+  const button = (name) => page.getByRole('button', { name, exact: true });
+  const tree = page.getByRole('tree');
+  const absent = async (name) => { if (await button(name).isVisible()) throw new Error(`"${name}" is shown`); };
+  const shot = async (name, look) => {
+    await page.screenshot({ path: `${OUT}/${name}.png` });
+    lines.push(`    look: ${OUT}/${name}.png: ${look}`);
+  };
+  const check = async (name, steps) => {
+    const at = lines.length;
+    try {
+      await steps();
+      lines.splice(at, 0, `[x] ${name}`);
+    } catch (e) {
+      lines.push(`[ ] ${name}: ${String(e.message).split('\n')[0]}`);
+    }
+  };
+
+  await check('1 page loads in real time', async () => {
+    await page.goto(`${URL}/graph`);
+    await text('Real Time').waitFor({ timeout: 30000 });
+    for (const b of ['Pause', 'Time Range', 'Select Run', 'Clear Graph', 'Custom']) await button(b).waitFor({ timeout: 2000 });
+    await page.getByRole('combobox', { name: 'Quick Select' }).waitFor({ timeout: 2000 });
+    await absent('Realtime');
+  });
+  await check('2 topic from the tree draws live', async () => {
+    const node = (name) => tree.getByRole('treeitem').filter({ has: page.getByText(name, { exact: true }) }).last(); // innermost
+    for (const name of ['BMS', 'Segment_Total_Volt']) await node(name).locator('.p-tree-node-toggle-button').first().click();
+    await tree.getByText('0', { exact: true }).first().click();
+    await page.waitForURL(/topics=BMS%2FSegment_Total_Volt%2F0/, { timeout: 5000 });
+    await page.waitForTimeout(3000);
+    await shot('02-live-topic', 'a live series is drawn');
+  });
+  await check(`3 seeded run #${RUN}`, async () => {
+    await button('Select Run').click();
+    await page.locator('.run-card').first().waitFor({ timeout: 10000 });
+    await page.evaluate((id) => {
+      const card = [...document.querySelectorAll('.run-card')]
+        .find((c) => [...c.querySelectorAll('*')].some((e) => !e.childElementCount && e.textContent.trim() === 'Run #' + id));
+      const pick = card?.parentElement?.querySelector('.run-select-button button');
+      if (!pick) throw new Error(`no Run #${id} in the Select Run dialog`);
+      pick.dispatchEvent(new MouseEvent('click', { bubbles: true, cancelable: true })); // under a PrimeNG overlay
+    }, RUN);
+    await page.locator('.run-card').first().waitFor({ state: 'detached', timeout: 5000 });
+    await text(`Run #${RUN}`).waitFor({ timeout: 10000 });
+    await button('Realtime').waitFor({ timeout: 2000 });
+    await absent('Pause');
+    await page.waitForTimeout(3000);
+    await shot('03-seeded-run', 'x-axis spans 50 hours, with a dated day-boundary line at each of the two midnights');
+  });
+  await check('4 historical Quick Select', async () => {
+    await button('Realtime').click();
+    await text('Real Time').waitFor({ timeout: 5000 });
+    await page.getByRole('combobox', { name: 'Quick Select' }).click();
+    await page.getByRole('option').first().waitFor({ timeout: 5000 });
+    const options = await page.getByRole('option').count();
+    if (options !== 11) throw new Error(`${options} Quick Select options, not 11`);
+    await page.getByRole('option', { name: '5 minutes', exact: true }).click();
+    await text('Historical').waitFor({ timeout: 5000 });
+    await absent('Pause');
+    await page.waitForTimeout(3000);
+    await shot('04-historical-5-min', 'x-axis about 5 minutes, or since the data starts');
+  });
+  await check('5 back to real time', async () => {
+    await button('Realtime').click();
+    await text('Real Time').waitFor({ timeout: 5000 });
+    await page.waitForTimeout(10000);
+    await shot('05-real-time-after', 'x-axis about 30 seconds, not the whole session');
+  });
+  await check('6 no new console errors', async () => {
+    if (errors.length) throw new Error(`${errors.length}, first: ${errors[0]}`);
+  });
+  return lines.join('\n');
+}
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/check.sh b/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/check.sh
new file mode 100755
index 0000000..c8710cd
--- /dev/null
+++ b/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/check.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+# check.sh <branch> <base-url>: run the base verify-graph checks (check.js) in <branch>'s playwright-cli
+# session, opening it if needed, against the seeded multi-day run. Prints one `[x]`/`[ ]` line per check
+# and `look:` lines for screenshots in pictures/<branch>/verify-graph/; exits 1 if a check failed.
+set -euo pipefail
+here=$(cd "$(dirname "$0")" && pwd)
+branch=${1:?usage: check.sh <branch> <base-url>}; url=${2:?usage: check.sh <branch> <base-url>}; url=${url%/}
+run=$(bash "$here/seed.sh")
+out=${DELPHI_ROOT:?unset: start the session at the workspace root}/pictures/$branch/verify-graph
+playwright-cli list | grep -q "^- $branch:" || bash "$here/open.sh" "$branch" "$url/graph" >/dev/null
+code=$(sed -e "s|__URL__|$url|; s|__RUN__|$run|; s|__OUT__|$out|" "$here/check.js")
+result=$(playwright-cli -s="$branch" --raw run-code "$code" | node -e 'process.stdout.write(JSON.parse(require("fs").readFileSync(0, "utf8")))')
+echo "$result"
+! grep -q '^\[ \]' <<<"$result"
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/open.sh b/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/open.sh
new file mode 100755
index 0000000..5a1b49b
--- /dev/null
+++ b/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/open.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+# open.sh <branch> <url>: open a playwright-cli session named <branch> on <url>, so parallel checks don't
+# share a browser. Its output (snapshots, console logs, unnamed screenshots) goes to pictures/<branch>/;
+# its config, and any throwaway Playwright code, to .playwright-cli/<branch>/. Both are gitignored. Uses
+# the preinstalled Chromium in cloud containers (/opt/pw-browsers); elsewhere, Playwright's own
+# (`playwright-cli install-browser`).
+set -euo pipefail
+branch=${1:?usage: open.sh <branch> <url>}; url=${2:?usage: open.sh <branch> <url>}
+root=${DELPHI_ROOT:?unset: start the session at the workspace root}
+out=$root/pictures/$branch scratch=$root/.playwright-cli/$branch
+mkdir -p "$out" "$scratch"
+launch=; [ -x /opt/pw-browsers/chromium ] && launch=',"launchOptions":{"executablePath":"/opt/pw-browsers/chromium","headless":true}'
+printf '{"browser":{"browserName":"chromium"%s},"outputDir":"%s"}\n' "$launch" "$out" >"$scratch/cli.config.json"
+playwright-cli -s="$branch" open --config="$scratch/cli.config.json" "$url"
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/perf.js b/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/perf.js
new file mode 100644
index 0000000..404ac25
--- /dev/null
+++ b/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/perf.js
@@ -0,0 +1,38 @@
+async (page) => {
+  // Live-mode cost of the graph page with __TOPICS__ selected: retained JS heap after a GC, how fast it allocates
+  // (heap growth between 100 ms samples, GC drops ignored), and frame rate. Compare branches at the same topics.
+  const topics = '__TOPICS__'.split(',');
+  await page.goto(`__URL__/graph?topics=${encodeURIComponent(topics.join(','))}`);
+  await page.getByText('Real Time').first().waitFor({ timeout: 30000 });
+  const cdp = await page.context().newCDPSession(page);
+  const heap = async (gc) => {
+    if (gc) await cdp.send('HeapProfiler.collectGarbage');
+    return (await cdp.send('Runtime.getHeapUsage')).usedSize / 1e6;
+  };
+  await page.waitForTimeout(20000); // fill the live window
+  let alloc = 0, prev = await heap(false);
+  const t0 = Date.now();
+  while (Date.now() - t0 < 20000) {
+    await page.waitForTimeout(100);
+    const h = await heap(false);
+    if (h > prev) alloc += h - prev;
+    prev = h;
+  }
+  const allocMBps = alloc / ((Date.now() - t0) / 1000);
+  const frames = await page.evaluate(() => new Promise((done) => {
+    let n = 0, worst = 0, longTasks = 0, last = performance.now();
+    const end = last + 10000;
+    new PerformanceObserver((l) => (longTasks += l.getEntries().length)).observe({ type: 'longtask' });
+    const tick = (t) => {
+      worst = Math.max(worst, t - last);
+      last = t;
+      n++;
+      if (t < end) requestAnimationFrame(tick);
+      else done({ fps: n / 10, worstFrameMs: Math.round(worst), longTasks });
+    };
+    requestAnimationFrame(tick);
+  }));
+  const retainedMB = await heap(true);
+  return `retained JS heap ${retainedMB.toFixed(1)} MB, allocating ${allocMBps.toFixed(1)} MB/s, ` +
+    `${frames.fps} fps, worst frame ${frames.worstFrameMs} ms, ${frames.longTasks} long tasks`;
+}
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/perf.sh b/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/perf.sh
new file mode 100755
index 0000000..2218f42
--- /dev/null
+++ b/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/perf.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+# perf.sh <branch> <base-url> [<topic>,…]: measure the graph page live in <branch>'s playwright-cli session
+# (perf.js: JS heap, allocation rate, frames; about a minute), then its browser's GPU-process memory, where
+# a WebGL chart's buffers show up. Default topics: four BMS ones. Numbers are relative: compare branches.
+set -euo pipefail
+here=$(cd "$(dirname "$0")" && pwd)
+branch=${1:?usage: perf.sh <branch> <base-url> [<topic>,…]}; url=${2:?usage: perf.sh <branch> <base-url> [<topic>,…]}; url=${url%/}
+topics=${3:-BMS/Segment_Total_Volt/0,BMS/PerCell/Alpha/3/Volts/5,BMS/PerCell/Alpha/3/Volts/4,BMS/PerCell/Alpha/4/Therms/0}
+playwright-cli list | grep -q "^- $branch:" || bash "$here/open.sh" "$branch" "$url/graph" >/dev/null
+code=$(sed -e "s|__URL__|$url|; s|__TOPICS__|$topics|g" "$here/perf.js")
+playwright-cli -s="$branch" --raw run-code "$code" | node -e 'process.stdout.write(JSON.parse(require("fs").readFileSync(0, "utf8")) + "\n")'
+# The session's daemon runs its browser; the browser's --type=gpu-process child holds GPU memory.
+ps -axo pid=,ppid=,rss=,command= | awk -v s=" $branch " '
+  { pid[NR] = $1; ppid[NR] = $2; rss[NR] = $3; cmd[NR] = $0 }
+  index($0, "cliDaemon") && index($0 " ", s) { daemon[$1] = 1 }
+  END {
+    for (i = 1; i <= NR; i++) if (daemon[ppid[i]]) browser[pid[i]] = 1
+    for (i = 1; i <= NR; i++) if (browser[ppid[i]] && index(cmd[i], "--type=gpu-process")) printf "GPU process %d MB\n", rss[i] / 1024
+  }'
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/seed.sh b/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/seed.sh
new file mode 100755
index 0000000..fdb2631
--- /dev/null
+++ b/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/seed.sh
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+# seed.sh: make sure the local database holds verify-graph's multi-day run, and print its id. The run is
+# 50 hours of BMS/Segment_Total_Volt/0, one point every 30s, from noon UTC four days ago, so it crosses
+# two midnights in any time zone and stays out of the 24-hour Quick Select window. Parallel checks share
+# one run: it is made once, under a lock, and found by its notes after that.
+set -euo pipefail
+db=$(docker ps --filter name=odyssey-db --format '{{.Names}}' | head -1)
+[ -n "$db" ] || { echo "seed: no odyssey-db container; start the backend with run-local first" >&2 && exit 1; }
+sql() { docker exec -i "$db" psql -U postgres -v ON_ERROR_STOP=1 -qAt "$@"; }
+tag='verify-graph multi-day seed'
+state=${TMPDIR:-/tmp}; state=${state%/}/argos-run-local; mkdir -p "$state"
+lock=$state/seed.lock
+n=0; until mkdir "$lock" 2>/dev/null; do n=$((n + 1)); [ $n -lt 600 ] || rm -rf "$lock"; sleep 0.1; done # stale after 60s
+trap 'rmdir "$lock" 2>/dev/null || true' EXIT
+id=$(sql -c "select \"runId\" from run where notes = '$tag' limit 1")
+[ -n "$id" ] || id=$(sql <<SQL
+insert into data_type (name, unit) values ('BMS/Segment_Total_Volt/0', 'V') on conflict do nothing;
+with r as (
+  insert into run ("driverName", "locationName", notes, time)
+  values ('verify-graph', 'seed', '$tag', date_trunc('day', now()) - interval '84 hours')
+  returning "runId", time
+), d as (
+  insert into data (values, time, "dataTypeName", "runId")
+  select array[400 + 20 * sin(s / 3600.0)]::real[], (extract(epoch from r.time) * 1e6)::bigint + s * 1000000::bigint,
+    'BMS/Segment_Total_Volt/0', r."runId"
+  from r, generate_series(0, 50 * 3600, 30) s
+)
+select "runId" from r;
+SQL
+)
+echo "$id"
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/select-run.sh b/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/select-run.sh
new file mode 100755
index 0000000..d1237c4
--- /dev/null
+++ b/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/select-run.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+# select-run.sh <branch> <run-id>: with the Select Run dialog open in <branch>'s session, pick run
+# <run-id>. The carousel autoplays and its "Select this Run" button sits under a PrimeNG overlay, so this
+# finds the run's card by id and clicks its button with a synthetic event instead of `playwright-cli click`.
+set -euo pipefail
+branch=${1:?usage: select-run.sh <branch> <run-id>}; id=${2:?usage: select-run.sh <branch> <run-id>}
+case $id in '' | *[!0-9]*) echo "select-run: run id must be a number, got '$id'" >&2 && exit 1 ;; esac
+playwright-cli -s="$branch" run-code "async (page) => {
+  await page.waitForSelector('.run-card');
+  const found = await page.evaluate((id) => {
+    const card = [...document.querySelectorAll('.run-card')]
+      .find((c) => [...c.querySelectorAll('*')].some((e) => !e.childElementCount && e.textContent.trim() === 'Run #' + id));
+    const button = card?.parentElement?.querySelector('.run-select-button button');
+    button?.dispatchEvent(new MouseEvent('click', { bubbles: true, cancelable: true }));
+    return !!button;
+  }, $id);
+  if (!found) throw new Error('select-run: no Run #$id in the Select Run dialog');
+}"
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/verify-telemetry/SKILL.md b/software/application-software/argos/workspaces/experimental/.claude/skills/verify-telemetry/SKILL.md
new file mode 100644
index 0000000..006fff6
--- /dev/null
+++ b/software/application-software/argos/workspaces/experimental/.claude/skills/verify-telemetry/SKILL.md
@@ -0,0 +1,16 @@
+---
+name: verify-telemetry
+description: Verification checklist for changes to MQTT-displayed telemetry values in the Angular frontend. Use whenever modifying, adding, or debugging a value that flows from the car through MQTT to the UI — including display formatting, new subscriptions, missing data, or incorrect readings.
+---
+
+Work from the workspace root against the ticket's worktree, `worktrees/argos/<branch>/` (via `new-worktree`). Stop and fix at the first failing step.
+
+1. **Trace the subscription** in that worktree, from the component: its property is updated by a `this.storage.get(topics.someTopicFn())` subscription, the function in `angular-client/src/utils/topic.utils.ts` returns the right topic, and the value is parsed right for its type (`parseInt` vs `parseFloat`). A missing subscription is the bug.
+2. **Check the topic end to end:**
+
+   ```bash
+   bash scripts/check-topic.sh <TOPIC>
+   ```
+
+   It prints the CAN definition (unit, value points; exit 1 if the topic isn't defined), refreshes the Calypso image (if it changed, restart with `(cd worktrees/argos/<branch> && ./argos.sh client-dev down)` then `run-local <branch>`), and shows the topic's last scylla-server log lines. Confirm the unit and value index match the UI; no log lines means it isn't being published.
+3. **See it live:** bring the app up with `run-local <branch>`, open the page with Playwright, wait for data, and screenshot to `pictures/<branch>/<name>.png`. Check value, formatting, and layout.
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/verify-telemetry/scripts/check-topic.sh b/software/application-software/argos/workspaces/experimental/.claude/skills/verify-telemetry/scripts/check-topic.sh
new file mode 100755
index 0000000..c9a9c0a
--- /dev/null
+++ b/software/application-software/argos/workspaces/experimental/.claude/skills/verify-telemetry/scripts/check-topic.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+# check-topic.sh <topic>: check one MQTT topic end to end for verify-telemetry. Prints
+# its CAN definition (file, message id, unit, value points) from worktrees/odyssey-definitions/main,
+# whether the Calypso simulator image is current and running,
+# and the topic's last scylla-server log lines. Exits 1 if the topic isn't defined. Needs jq; the
+# docker checks are skipped without docker.
+set -euo pipefail
+usage="usage: check-topic.sh <topic>"
+topic=${1:?$usage}
+# shellcheck source=/dev/null
+. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
+defs=$DELPHI_WORKTREES/odyssey-definitions/main/can-messages
+[ -d "$defs" ] || { echo "no CAN definitions at $defs; add odyssey-definitions under repos: and run .delphi/setup.sh" >&2; exit 2; }
+
+echo "== CAN definition"
+jq -ce --arg t "$topic" 'input_filename as $f | .[] | . as $m | .fields[]? | select(.name == $t) |
+  {file: ($f | split("/")[-1]), id: $m.id, desc: $m.desc, unit, points: [.values[] | $m.points[. - 1].name]}' \
+  "$defs"/*.json || { echo "not found: $topic"; exit 1; }
+
+command -v docker >/dev/null || { echo "== docker not installed; skipping Calypso and logs"; exit 0; }
+echo "== Calypso"
+if docker pull -q ghcr.io/northeastern-electric-racing/calypso:Develop >/dev/null 2>&1; then
+  echo "image pulled (restart the stack if it changed)"; else echo "pull failed"; fi
+docker ps --filter name=calypso --format '{{.Names}} {{.Status}}' 2>/dev/null | grep . || echo "calypso not running"
+echo "== scylla-server log"
+c=$(docker ps --filter name=scylla-server --format '{{.Names}}' 2>/dev/null | head -1) # compose names it <project>-scylla-server-1
+if [ -z "$c" ]; then echo "scylla-server not running in docker (local cargo run? check its log)"
+else docker logs "$c" 2>&1 | grep -F "$topic" | tail -5 | grep . || echo "no log lines for $topic (not published?)"; fi
diff --git a/software/application-software/argos/workspaces/experimental/workspace.generated b/software/application-software/argos/workspaces/experimental/workspace.generated
new file mode 100644
index 0000000..09fe5ff
--- /dev/null
+++ b/software/application-software/argos/workspaces/experimental/workspace.generated
@@ -0,0 +1,34 @@
+# Generated by ci/render.sh; edit shared sources or opt out in workspace.yml.
+100644 61c35f28dda167e42bebc3bad3994af97c53e876	.claude/settings.json	ci/plugins.sh
+100644 3bf22d3571b9cad53804cc7a7c678c4103368780	.claude/skills/address-pr-comments/SKILL.md	software/application-software/skills/address-pr-comments/SKILL.md
+100755 ce1efd97da4a6d2ea655932486660c5008f44dae	.claude/skills/address-pr-comments/scripts/fetch-feedback.sh	software/application-software/skills/address-pr-comments/scripts/fetch-feedback.sh
+100644 da0be202ebc0a9ffc4544dbdf4bbef54cca37520	.claude/skills/address-pr-comments/scripts/github.sh	software/application-software/skills/address-pr-comments/scripts/github.sh
+100644 ad1fa37b4cf08693b5dcbf85d62df96c1a56b7e5	.claude/skills/commit/SKILL.md	software/application-software/skills/commit/SKILL.md
+100644 897a1f58386f280ce329a245baea7b562ac0b3db	.claude/skills/consolidate-spikes/SKILL.md	software/application-software/skills/consolidate-spikes/SKILL.md
+100644 9dd28e531875c0acb7f8a88a07ad15645aecf38f	.claude/skills/create-ticket/SKILL.md	software/application-software/skills/create-ticket/SKILL.md
+100644 f24d293b38a4d03b610a5a104fa97b614856d7c3	.claude/skills/implement/SKILL.md	software/application-software/argos/skills/implement/SKILL.md
+100644 4917259f9e29db28e2636496e80f80ee5d9e321e	.claude/skills/journal/SKILL.md	software/skills/journal/SKILL.md
+100755 1e90d7b9afa14b8b0e7f36e0e1d83baecc94ba5b	.claude/skills/journal/scripts/capture.sh	software/skills/journal/scripts/capture.sh
+100644 0495fc97cbe93e4331c89263aee188f6c0e9c9ea	.claude/skills/new-worktree/SKILL.md	software/skills/new-worktree/SKILL.md
+100644 7363dd2304fbb29c464e8cac0fd270acdeeb8060	.claude/skills/open-pr/SKILL.md	software/application-software/skills/open-pr/SKILL.md
+100755 61f377fef63daa10c443129df6a49571fdbeb658	.claude/skills/open-pr/scripts/pr-checks.sh	software/application-software/skills/open-pr/scripts/pr-checks.sh
+100644 7e504925c1133ff291fe29f9b0c824c945158e71	.claude/skills/pr-conventions/SKILL.md	software/application-software/argos/skills/pr-conventions/SKILL.md
+100644 2ed67ecda73634b78468cab0ccb52c86f128e064	.claude/skills/pr-conventions/scripts/lint.sh	software/application-software/argos/skills/pr-conventions/scripts/lint.sh
+100644 e67387116a753217d256d81901e5b4091b49b44c	.claude/skills/report-spike/SKILL.md	software/application-software/skills/report-spike/SKILL.md
+100644 7acb908af141defaa035f992b060d4d23c0b2a54	.claude/skills/run-local/SKILL.md	software/application-software/argos/skills/run-local/SKILL.md
+100755 f5986571d9b917264eb6cfe9c9d7f27448242ac9	.claude/skills/run-local/scripts/run-local.sh	software/application-software/argos/skills/run-local/scripts/run-local.sh
+100755 d8de89ce933cbc5302c59fab3176004bdd251d35	.claude/skills/run-local/scripts/serve.sh	software/application-software/argos/skills/run-local/scripts/serve.sh
+100644 fdc1ce85211200223040edfb5dc65a3de7f35d53	.claude/skills/setup-workspace/SKILL.md	software/skills/setup-workspace/SKILL.md
+100644 0b5a91a731df227907cf8bc40a8a2e04c4518059	.claude/skills/switch-workspace/SKILL.md	software/skills/switch-workspace/SKILL.md
+100644 8d9ec377f598b4527af20ffaa54b6cfe1a244860	.claude/skills/ticket-conventions/SKILL.md	software/application-software/argos/skills/ticket-conventions/SKILL.md
+100644 069b51714c0fd4d3d6ad972dd9f840e01f21cf15	.claude/skills/update-pr/SKILL.md	software/application-software/skills/update-pr/SKILL.md
+100644 c9dfe7d18e9c4d728d5295eeed178960289390a2	.claude/skills/verify-graph/SKILL.md	software/application-software/argos/skills/verify-graph/SKILL.md
+100644 3fcb7344ce3499a7afbba08b8c2b6deacd3f101b	.claude/skills/verify-graph/scripts/check.js	software/application-software/argos/skills/verify-graph/scripts/check.js
+100755 c8710cdf2cea12ddae0a92c3e0ba141e06a234f3	.claude/skills/verify-graph/scripts/check.sh	software/application-software/argos/skills/verify-graph/scripts/check.sh
+100755 5a1b49bc55582ec03f5e0a58c015d1b28fd21af3	.claude/skills/verify-graph/scripts/open.sh	software/application-software/argos/skills/verify-graph/scripts/open.sh
+100644 404ac250d03f0c228b8206efef46bed6149bd314	.claude/skills/verify-graph/scripts/perf.js	software/application-software/argos/skills/verify-graph/scripts/perf.js
+100755 2218f42b8f020b7d83e9d960828800444e1260ad	.claude/skills/verify-graph/scripts/perf.sh	software/application-software/argos/skills/verify-graph/scripts/perf.sh
+100755 fdb2631a755b9999c2aa83c67729fbeb13d387a8	.claude/skills/verify-graph/scripts/seed.sh	software/application-software/argos/skills/verify-graph/scripts/seed.sh
+100755 d1237c42098d2a437770c24e2f60b7110d1e90b2	.claude/skills/verify-graph/scripts/select-run.sh	software/application-software/argos/skills/verify-graph/scripts/select-run.sh
+100644 006fff61ee4658a959c921e5fd70ecc57e2b07f2	.claude/skills/verify-telemetry/SKILL.md	software/application-software/argos/skills/verify-telemetry/SKILL.md
+100755 c9a9c0a7dd4386508e1f90d595d59b50df0aad35	.claude/skills/verify-telemetry/scripts/check-topic.sh	software/application-software/argos/skills/verify-telemetry/scripts/check-topic.sh
diff --git a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/address-pr-comments/SKILL.md b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/address-pr-comments/SKILL.md
new file mode 100644
index 0000000..3bf22d3
--- /dev/null
+++ b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/address-pr-comments/SKILL.md
@@ -0,0 +1,18 @@
+---
+name: address-pr-comments
+description: Fetch review comments on a PR (Argos, Nero), judge whether each (including outdated ones) still applies, and walk through fixes in the PR's worktree
+---
+
+Propose and apply fixes for a PR's unresolved review feedback. **Never reply to threads**; the user does.
+
+1. **Fetch** from the workspace root: `bash scripts/fetch-feedback.sh <repo> <pr>|<branch>` (`<repo>` as under `repos/`, e.g. `argos`; `--all` first for unfiltered history). It checks out the PR head's worktree and prints JSON: `worktree` (target it by path from the root from now on), unresolved `threads`, `comments`, `reviews`. Any non-zero exit: use the available GitHub integration's PR-reading tool instead.
+2. **Judge.** Skip bot noise and anything already fixed at HEAD. For an `outdated` thread, find its `diffHunk` code by content, then label it **addressed**, **applies**, **moved**, **obsolete**, or **unclear**.
+3. **Present** before editing, grouped by file, and ask to confirm, skip, or change each (offer to batch clear ones past 8):
+
+   ```
+   <file>:<line> — <reviewer> · <active|outdated> · <label>
+   "<excerpt>" → <proposed fix>
+   <optional ≤5-line snippet, for the user only>
+   ```
+4. **Apply** in that worktree, by path, with grouped `/commit`s. For a follow-up-ticket request, reuse a match from `gh issue list --search` before filing.
+5. **Report** what was fixed (file:line, commit SHA), what was already addressed or obsolete (why), and what is unclear.
diff --git a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh
new file mode 100755
index 0000000..ce1efd9
--- /dev/null
+++ b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh
@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+# fetch-feedback.sh [--all] <repo> <pr-number>|<branch>: print a PR's review
+# feedback as one JSON object after creating or reusing the PR head's worktree
+# (worktrees/<repo>/<head>). Default output keeps unresolved threads (first + latest message,
+# bots tagged), conversation comments, and reviews with text; --all keeps everything. Exits 3 on any
+# GitHub failure (see github.sh).
+# shellcheck source-path=SCRIPTDIR source=github.sh
+set -euo pipefail
+. "$(dirname "$0")/github.sh"
+all=false
+[ "${1:-}" = --all ] && all=true && shift
+usage="usage: fetch-feedback.sh [--all] <repo> <pr-number>|<branch>"
+repo=${1:?$usage} ref=${2:?$usage}
+# shellcheck source=/dev/null
+. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
+gh_init fetch-feedback "$DELPHI_WORKTREES/$repo/.bare"
+
+case "$ref" in *[!0-9]*) get "repos/$SLUG/pulls?state=all&head=${SLUG%%/*}:$ref" | jq '.[0] // error("no PR")' ;;
+  *) get "repos/$SLUG/pulls/$ref" ;; esac >"$TMP/pr"
+num=$(jq .number "$TMP/pr")
+wt=""
+[ "$(jq -r .head.repo.full_name "$TMP/pr")" != "$SLUG" ] || wt=$(bash "$DELPHI_ROOT/.delphi/new-worktree.sh" "$repo" "$(jq -r .head.ref "$TMP/pr")")
+
+if [ "$MODE" = gh ]; then # thread state is GraphQL-only; reshape it like the proxy's ccr/review_threads
+  # shellcheck disable=SC2016 # GraphQL variables
+  gh api graphql -F o="${SLUG%%/*}" -F n="${SLUG##*/}" -F p="$num" -f query='query($o: String!, $n: String!, $p: Int!) {
+    repository(owner: $o, name: $n) { pullRequest(number: $p) { reviewThreads(first: 100) { nodes {
+      isResolved isOutdated comments(first: 50) { nodes { databaseId } } } } } } }' \
+    --jq '[.data.repository.pullRequest.reviewThreads.nodes[] |
+      {resolved: .isResolved, outdated: .isOutdated, comment_ids: [.comments.nodes[].databaseId]}]'
+else get "repos/$SLUG/pulls/$num/ccr/review_threads"; fi >"$TMP/th"
+get "repos/$SLUG/pulls/$num/comments?per_page=100" >"$TMP/rc"
+get "repos/$SLUG/issues/$num/comments?per_page=100" >"$TMP/ic"
+get "repos/$SLUG/pulls/$num/reviews?per_page=100" >"$TMP/rv"
+
+jq -n --arg wt "$wt" --argjson all "$all" --slurpfile pr "$TMP/pr" --slurpfile th "$TMP/th" \
+  --slurpfile rc "$TMP/rc" --slurpfile ic "$TMP/ic" --slurpfile rv "$TMP/rv" '
+  def who: {author: .user.login, bot: (.user.type == "Bot")};
+  ($rc[0] | map({key: (.id | tostring), value: (who + {body, path, line: (.line // .original_line), diffHunk: .diff_hunk})}) | from_entries) as $byid |
+  {pr: ($pr[0] | {number, title, url: .html_url, head: .head.ref, base: .base.ref}), worktree: $wt,
+   threads: [$th[0][] | {resolved, outdated, comments: [.comment_ids[] | $byid[tostring]]}],
+   comments: [$ic[0][] | who + {body}], reviews: [$rv[0][] | who + {state, body: (.body // "")}]} |
+  if $all then . else
+    .threads |= map(select(.resolved | not) | .comments as $c | $c[-1] + {outdated, path: $c[0].path, line: $c[0].line,
+      diffHunk: (if .outdated then $c[0].diffHunk else null end), replies: ($c | length),
+      first: (if ($c | length) > 1 then $c[0].body else null end)}) |
+    .reviews |= map(select(.body != ""))
+  end'
diff --git a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/address-pr-comments/scripts/github.sh b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/address-pr-comments/scripts/github.sh
new file mode 100644
index 0000000..da0be20
--- /dev/null
+++ b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/address-pr-comments/scripts/github.sh
@@ -0,0 +1,19 @@
+# github.sh: sourced by skill scripts that call GitHub. gh_init <tool> <git-dir> picks a backend
+# (gh when logged in, else an explicitly enabled GitHub REST proxy via curl; jq is needed either
+# way), sets SLUG from that repo's origin, and makes any failure exit 3 so the calling skill falls
+# back to the available GitHub integration. TMP is a scratch dir removed on exit.
+# shellcheck shell=bash
+fail() { echo "$TOOL: $1; use the available GitHub integration" >&2; exit 3; }
+on_exit() { local rc=$?; rm -rf "$TMP"; [ "$rc" -eq 0 ] || fail "GitHub request failed ($MODE)"; }
+gh_init() {
+  TOOL=$1
+  if { command -v gh && gh auth status; } >/dev/null 2>&1; then MODE=gh
+  elif [ -n "${DELPHI_GITHUB_REST_PROXY:-${CLAUDE_CODE_REMOTE:-}}" ] && command -v curl >/dev/null; then MODE=rest
+  else fail "no authenticated gh or enabled REST proxy"; fi
+  command -v jq >/dev/null || fail "jq not installed"
+  SLUG=$(git -C "$2" remote get-url origin) && SLUG=${SLUG#*github.com[:/]} && SLUG=${SLUG%.git}
+  TMP=$(mktemp -d)
+  trap on_exit EXIT
+}
+get() { if [ "$MODE" = gh ]; then gh api "$1"; else curl -fsS "https://api.github.com/$1"; fi; }
+post() { if [ "$MODE" = gh ]; then gh api -X POST "$1" --input -; else curl -fsS -X POST --data-binary @- "https://api.github.com/$1"; fi; }
diff --git a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/commit/SKILL.md b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/commit/SKILL.md
new file mode 100644
index 0000000..ad1fa37
--- /dev/null
+++ b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/commit/SKILL.md
@@ -0,0 +1,6 @@
+---
+name: commit
+description: Stage and commit using the project's commit message convention
+---
+
+In the worktree you're working on, from the workspace root (`git -C worktrees/<repo>/<branch> …`), stage the relevant changes (not unrelated or generated files) and commit using the commit message format in the workspace instructions. Keep the description imperative and 2–8 words.
diff --git a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/consolidate-spikes/SKILL.md b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/consolidate-spikes/SKILL.md
new file mode 100644
index 0000000..897a1f5
--- /dev/null
+++ b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/consolidate-spikes/SKILL.md
@@ -0,0 +1,14 @@
+---
+name: consolidate-spikes
+description: >-
+  Turn finished spikes into implementation tickets: an idea's spikes, once all are done, into dev work, under an epic when it comes from an idea or splits. Use when the user wants to wrap up, settle, or consolidate an idea or spike on an application-software repo (Argos, Nero).
+---
+
+Drafts and files by the `create-ticket` rules; load it and the project's `ticket-conventions` first. Takes an idea or a standalone spike.
+
+1. **Gather** each spike's findings comment, draft PR, and the PR's reviews; from an idea, its sub-issues too.
+2. **Check it's done.** Every spike is done by `create-ticket`'s Spikes rules (the lead's latest review on its draft PR, from repos/<owner>/<repo>/pulls/<pr>/reviews, is an approval). From an idea, that's every spike under it, and every one of its areas to explore is covered by a spike area. Otherwise list what's missing, offer spikes for uncovered areas, and stop.
+3. **Choose:** per area (title prefix), propose the approach to build (one spike's, or a mix) with a one-line why, from the findings and the lead's review. The user confirms or changes each.
+4. **Plan** the dev work by `create-ticket`'s Dev work rules: one ticket unless the work is large enough to split into vertical slices, which may cross areas. Each ticket: What, the slice; Notes, links to the spikes and draft PRs it draws on, and the dropped approaches with why; context transfer, the findings' facts.
+5. **Draft** them, and, from an idea or when split, one epic (From: the idea or spike) with the dev work as its sub-issues. Show all, with which slices run in parallel if split; file what the user OKs.
+6. **Close**, each with a one-line comment: the spikes as completed ("Consolidated into #<epic or dev work>"), their draft PRs unless a dev work ticket builds on that branch, and the idea as completed ("Settled in #<epic or dev work>").
diff --git a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/create-ticket/SKILL.md b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/create-ticket/SKILL.md
new file mode 100644
index 0000000..9dd28e5
--- /dev/null
+++ b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/create-ticket/SKILL.md
@@ -0,0 +1,66 @@
+---
+name: create-ticket
+description: Draft and file a GitHub issue (idea, spike, epic, or dev work) on an application-software repo (Argos, Nero) from the repo's issue templates, or rewrite an existing issue into them. Use whenever the user wants to create, file, write up, or log a ticket, issue, idea, spike, epic, bug, or task, including an out-of-scope idea that comes up mid-work.
+---
+
+# Create ticket
+
+These are the ticket conventions for every application-software repo. The repo's own `.github/ISSUE_TEMPLATE` holds only the fields (`gh api repos/<owner>/<repo>/contents/.github/ISSUE_TEMPLATE/<file> -q .content | base64 -d`); follow each field's description.
+
+First load the project's `ticket-conventions` skill (inherited from the project's `skills/`) for its repo, area labels, vocabulary, and diagrams. If none is enabled, ask which repo.
+
+## Workflow
+
+idea → spikes → epic → dev work, or a standalone spike → dev work
+
+| Ticket | What it is | Issue type | Parent |
+|---|---|---|---|
+| Idea | What could be built and why. Its areas to explore are things to improve or problems to solve, each with approaches worth trying. | none | none |
+| Spike | One approach to try on one area of an idea (it needn't cover the whole area), or a small standalone improvement: what is tried and the hypothesis. Findings go in a comment and a draft PR (`report-spike`), not the ticket. | none | its idea, if any |
+| Epic | Work too large for one dev work ticket: the goal and whole-epic outcomes, not a walkthrough of each ticket. A new issue linking the idea or spike it came from in "From". | Feature | none |
+| Dev work | Any implementation work: testable requirements, Notes for gotchas and pointers to code. Large work is cut into vertical slices (see Dev work below). | Feature, Bug, or Task | its epic, if any |
+
+If unsure, a small, clear change is dev work, a small unknown is a spike, and a big unexplored thing is an idea. Ideas and spikes explore work, so they get no issue type; bug, feature, and task are issue types, never labels.
+
+## Writing
+
+How every ticket reads, on any project:
+
+- Short and plain. Write for someone new to the project: explain project-specific terms, and use the project's vocabulary (its `ticket-conventions` says where it lives; check the code for current names).
+- Outcomes, not implementation: say what changes and why, not how to build it. A rationale gives the reasoning, not a history of the problem.
+- No prescriptions on ideas and spikes. Ideas name open options to weigh, not a plan or a recommended pick; spikes state what to learn and leave the how to whoever picks it up.
+- Facts, not instructions: Notes and context transfer hold facts (where code lives, current behavior, constraints, links), not steps or a proposed solution. Context transfer (optional on spikes, epics, and dev work) starts with a short summary, then the raw context.
+- Unknowns stay open questions in Notes; don't guess.
+- Title: concise and imperative, no prefixes (except a spike's area).
+- Requirements: clear, broad checkboxes, each a testable outcome rather than an implementation step; 3-5, never more than 7. If it needs more, split the ticket.
+- Backticks: at most three inline uses per body; name files and identifiers in plain text. Diagram and context-transfer blocks don't count.
+- Size: keep ideas short; one small enough to just try is a spike.
+
+## Dev work
+
+- One ticket by default. Split only when the work is too large for one PR or parts could run in parallel.
+- When split, cut vertical slices: each goes end to end through every part it touches (e.g. backend through UI), not one layer, and works and is testable on its own. Cut for the most parallel work; mark a slice that must wait as blocked by the one it waits on (see File).
+
+## Spikes
+
+- One approach, not a set to choose between. If a spike reads "X or Y", it is two spikes.
+- Prefer an idea with a few spikes (often 2-4) under it; a spike can also stand alone, or with siblings, to explore an area. Several spikes can take on the same area in different ways.
+- Title it `<area>: <approach>`, with the area a short kebab-case name its siblings share (`graph-saving: Save a graph to a file and re-upload it`). An area may cover more than one of an idea's bullets. A lone small improvement needs no prefix.
+- Sibling spikes share the context transfer's summary and common facts; each adds only the facts particular to its approach.
+- An idea needn't get all its spikes at once: file an area's spikes when someone is ready to try them.
+- Done: its findings are posted, review feedback is addressed, and the lead's latest review on its draft PR is an approval (GitHub's Approve), including when the recommendation is to drop the approach. A done spike stays open until `consolidate-spikes` closes it.
+
+## Draft
+
+- Check the code first: the work may be done or already tracked.
+- One `### <field label>` per field in template order, following each field's description; omit empty optional fields.
+- Diagrams: required on epics, optional on dev work. The project's `ticket-conventions` says what they show.
+- Labels: the template's category (`idea`, `spike`, `epic`, `dev work`), one written-by (`by: human` if the user dictated it, `by: ai-assisted` if they gave the substance, `by: ai` if you wrote it, including rewrites), and at least one of the project's area labels.
+- Rewriting an old ticket: keep its intent and assignees; bring it up to these rules and update vocabulary, labels, issue type, and parent.
+- Folding one ticket into another: add it as a requirement on the target, then close it as not planned. Every close gets a one-line comment saying why.
+
+## File
+
+Check for open duplicates, then show the full draft (title, type if any, labels, parent, body) in the chat, not only in a file. File or edit only what the user OKs.
+
+Use the REST API (GraphQL may be blocked): POST repos/<owner>/<repo>/issues with title, body, labels, the issue type from the table, and the user as assignee (on a spike, whoever will run it; ask), then, if it has a parent, POST repos/<owner>/<repo>/issues/<parent>/sub_issues with the new issue's id. If it waits on another issue, POST repos/<owner>/<repo>/issues/<n>/dependencies/blocked_by with the blocking issue's id. Report the URL.
diff --git a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/journal/SKILL.md b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/journal/SKILL.md
new file mode 100644
index 0000000..4917259
--- /dev/null
+++ b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/journal/SKILL.md
@@ -0,0 +1,22 @@
+---
+name: journal
+description: Park rough notes locally mid-task ("note to self", "remember to", "journal this"), and later export them to their permanent home (issue, spec, ADR, glossary, docs) through the skill that owns it. Use when the user wants to jot a thought without derailing, or to file parked notes.
+---
+
+Notes live in `.journal/` at the workspace root (git-excluded, outside worktrees so they survive removal). An **entry** is one file, a **category** a subfolder. The journal never pushes, files, or contacts GitHub itself.
+
+**Capture** (no git, no other skills):
+
+```
+bash scripts/capture.sh [-c <category>] ["note text"]
+```
+
+Omit `-c` for a loose entry, omit the text for an empty one to edit. Report the path it prints.
+
+**Export** (only when asked):
+
+1. Read the entries and propose a grouping: one entry → one output, a category → one merged output, or one entry split across several. Let the user adjust.
+2. For each output, pick the workspace skill whose description fits its permanent home, preferring an existing docs area. A new section always needs approval.
+3. Show the destination and reshaped text and wait for approval. Nothing lands silently.
+4. Delegate to that skill; it owns formatting, conventions, and any GitHub contact.
+5. Ask whether to delete the exported entry (default: keep).
diff --git a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/journal/scripts/capture.sh b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/journal/scripts/capture.sh
new file mode 100755
index 0000000..1e90d7b
--- /dev/null
+++ b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/journal/scripts/capture.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+# capture.sh [-c <category>] [note text]: write a timestamped journal entry to
+# .journal/[<category>/] at the workspace root (adding /.journal/ to .git/info/exclude once) and print
+# its path. An empty entry is created when no text is given. Never touches git history, GitHub, or
+# other skills.
+set -euo pipefail
+usage="usage: capture.sh [-c <category>] [note text]"
+# shellcheck source=/dev/null
+. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
+dir=$DELPHI_ROOT/.journal
+[ "${1:-}" = -c ] && dir=$dir/${2:?$usage} && shift 2
+exclude=$(git -C "$DELPHI_ROOT" rev-parse --path-format=absolute --git-path info/exclude 2>/dev/null || true)
+[ -z "$exclude" ] || grep -qxF /.journal/ "$exclude" 2>/dev/null || { mkdir -p "${exclude%/*}" && echo /.journal/ >>"$exclude"; }
+mkdir -p "$dir"
+file=$dir/$(date +%Y-%m-%d-%H%M%S).md
+{ echo "<!-- captured $(date -u +%Y-%m-%dT%H:%M:%SZ) -->"; [ $# -eq 0 ] || echo "$*"; } >"$file"
+echo "$file"
diff --git a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/new-worktree/SKILL.md b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/new-worktree/SKILL.md
new file mode 100644
index 0000000..0495fc9
--- /dev/null
+++ b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/new-worktree/SKILL.md
@@ -0,0 +1,16 @@
+---
+name: new-worktree
+description: Create or reuse a worktree for a branch of a code repo (worktrees/<repo>/<branch>). Use before any branch work, such as starting a ticket or reviewing or fixing a PR branch, unless the user says not to use worktrees.
+---
+
+Run from the workspace root:
+
+```
+bash .delphi/new-worktree.sh <repo> <branch> [<base>]
+```
+
+- An existing branch (local or on origin, e.g. a PR head) is checked out; anything else is created from `<base>` (default: the repo's default branch). Safe to re-run.
+- Stay at the workspace root and reach into the worktree by the printed path. Never switch branches in an existing worktree or work in its store, `worktrees/<repo>/.bare`.
+- For a subagent, make its worktree here first and hand it the path. Never use the harness's own worktree isolation: it checks out this Delphi clone from main, not the code repo, and fences the subagent out of `worktrees/`.
+- Keep `worktrees/<repo>/<default-branch>/` (made by setup) a clean reference: fetch and fast-forward only.
+- After the branch merges: `git -C worktrees/<repo>/.bare worktree remove ../<branch>`.
diff --git a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/open-pr/SKILL.md b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/open-pr/SKILL.md
new file mode 100644
index 0000000..7363dd2
--- /dev/null
+++ b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/open-pr/SKILL.md
@@ -0,0 +1,22 @@
+---
+name: open-pr
+description: Run pre-PR checks, push the branch, and open a draft pull request on an application-software repo (Argos, Nero)
+---
+
+First load the project's `pr-conventions` skill (inherited from the project's `skills/`) for its base branch, commit format, checks, labels, and screenshots.
+
+1. **Check:** `bash scripts/pr-checks.sh <repo> <branch> origin/<base> '<commit format>'` (clean tree, commit subjects match the project's format, merges cleanly into the base), then the project's own checks. Stop and fix on any FAIL.
+2. **Media:** if the diff touches the UI, ask the user whether to add screenshots to the PR, listing any already in the project's screenshot folder for this branch so they can pick those instead of new ones; on no, skip this step. For new ones, use the project's UI QA to take Playwright screenshots of the changed views into its screenshot folder, or, when the change adds or changes an animation, record a short video instead (a browser context with `recordVideo: { dir }` saves a `.webm` when it closes). Images must be under 10 MB; video under 10 MB on a Free plan, 100 MB on a paid one.
+3. **Open:** push (`git -C worktrees/<repo>/<branch> push -u origin <branch>`), then run `(cd worktrees/<repo>/<branch> && gh pr create --draft --base <base> --head <branch> --title "<title>" --body-file /tmp/<branch>-pr-body.md --assignee @me)` with the project's labels (`--label`) and one `--attach <file>` per screenshot or video, and report the URL.
+4. **Spike:** the PR stays a draft; getting it merged isn't the goal. Once it's checked and working, run `report-spike`.
+
+## PR body
+
+Fill the worktree's `.github/pull_request_template.md` from the diff, following each section's comment, and write it to `/tmp/<branch>-pr-body.md`:
+
+- Title: concise and imperative, no ticket number.
+- The Changes section (not the whole body): about 50 words (1–3 sentences) on what landed and the key design choice. Describe the change, not the file list: don't enumerate components, classes or files the diff already shows. Name a specific one only when its behaviour changes in a way a reviewer must know.
+- Delete the template's comments and any optional or non-applicable sections, and check off the Checklist.
+- At most three backtick uses in the body.
+- End with `Closes #{ticket}` (the branch's leading number), or `Spike for #{ticket}` on a spike, which its PR never closes.
+- Screenshots and videos: reference each one by its path from the worktree, `![<what it shows>](<path>)`; `--attach` uploads it and rewrites the reference to its `user-attachments` URL. `--attach` needs gh v2.99.0+: if `gh pr create --help` doesn't list it, put `_screenshot pending_` instead and remind the user to drag-drop the files from the screenshot folder. Never commit screenshots or videos.
diff --git a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/open-pr/scripts/pr-checks.sh b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/open-pr/scripts/pr-checks.sh
new file mode 100755
index 0000000..61f377f
--- /dev/null
+++ b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/open-pr/scripts/pr-checks.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+# pr-checks.sh <repo> <branch> [<base> [<format>]]: open-pr's shared pre-PR checks on
+# worktrees/<repo>/<branch>. Prints
+# one PASS/FAIL/SKIP line per check: clean tree, every commit subject since <base> (default
+# origin/develop, fetched first) matches <format> (an extended regex, default '^#[0-9]+ - '), and no
+# merge conflicts with <base>. Exits 1 if any check fails. The project's own checks (lint, format)
+# are in its pr-conventions skill.
+set -euo pipefail
+usage="usage: pr-checks.sh <repo> <branch> [<base> [<format>]]"
+repo=${1:?$usage} branch=${2:?$usage}
+# shellcheck source=/dev/null
+. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
+cd "$DELPHI_WORKTREES/$repo/$branch"
+base=${3:-origin/develop} format=${4:-'^#[0-9]+ - '} fail=0
+res() { echo "$1 $2"; [ "$1" != FAIL ] || fail=1; }
+git fetch -q origin "${base#origin/}" 2>/dev/null || true
+
+if [ -z "$(git status --porcelain)" ]; then res PASS "clean tree"; else res FAIL "uncommitted changes"; fi
+bad=$(git log --format=%s "$base..HEAD" | grep -Ev "$format" || true)
+if [ -z "$bad" ]; then res PASS "commit format"; else res FAIL "commit format: $(echo "$bad" | paste -sd'|' -)"; fi
+if git merge-tree --write-tree HEAD "$base" >/dev/null 2>&1; then res PASS "merges cleanly into $base"
+elif [ $? -eq 1 ]; then res FAIL "conflicts with $base"; else res SKIP "conflict check (needs git 2.38+)"; fi
+exit "$fail"
diff --git a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/pr-conventions/SKILL.md b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/pr-conventions/SKILL.md
new file mode 100644
index 0000000..77b2d41
--- /dev/null
+++ b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/pr-conventions/SKILL.md
@@ -0,0 +1,14 @@
+---
+name: pr-conventions
+description: Nero specifics for pull requests (base branch, commit format, checks, labels, screenshots, UI QA). Load before opening, updating, or reviewing a Nero PR, alongside open-pr, update-pr, and review.
+---
+
+# Nero PR conventions
+
+The shared rules are in the `open-pr` skill; this adds only what is Nero's.
+
+- Base branch: `develop`. Commit format: `^#[0-9]+ ` (the format in the workspace instructions).
+- Checks: in the worktree, `clang-format --dry-run --Werror` on the C++ files changed since `origin/develop` (not under `deps/`); stop on any error.
+- Labels: none.
+- Screenshots: `playwright/test-results/<case>/` in the worktree, never committed.
+- UI QA, only if QML or a page changed: in the worktree's `playwright/`, add or update a case for each changed page, run `npm test`, and inspect `test-results/<case>/` (the workspace instructions' Playwright section).
diff --git a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/report-spike/SKILL.md b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/report-spike/SKILL.md
new file mode 100644
index 0000000..e673871
--- /dev/null
+++ b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/report-spike/SKILL.md
@@ -0,0 +1,22 @@
+---
+name: report-spike
+description: Post a spike's findings on its ticket, judged against its hypothesis, and ask the lead to review its draft PR. Use when a spike's approach has been tried on an application-software repo (Argos, Nero).
+---
+
+A spike runs like any ticket (branch, commits, a draft PR from `open-pr`); this reports it. Load the project's `pr-conventions` first.
+
+1. **Read** the spike (`gh issue view <n> --comments`), its draft PR, and the branch's diff against the base.
+2. **Draft** one findings comment, short and factual:
+
+   ```
+   ### Findings
+   **Hypothesis:** holds | partly holds | doesn't hold. One sentence why.
+   **Learned:** measurements, limits hit, surprises, with links to the draft PR's code.
+   **Recommendation:** adopt, adopt with changes, or drop, and why.
+   **Open questions:** what the spike didn't settle.
+   Draft PR: #<pr>
+   ```
+3. **Show** it and ask who the lead is; on OK, post it (`gh issue comment <n> --body-file /tmp/<branch>-findings.md`).
+4. **Request review:** `(cd worktrees/<repo>/<branch> && gh pr edit <branch> --add-reviewer <lead>)`, keeping the PR a draft, and remind the user to ping the lead on Slack.
+
+Address review feedback on the branch as on any PR (`address-pr-comments`), and edit the findings comment if it changes them. The spike is done when the lead approves the draft PR (`create-ticket`'s Spikes rules); it stays open until `consolidate-spikes` closes it.
diff --git a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/setup-workspace/SKILL.md b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/setup-workspace/SKILL.md
new file mode 100644
index 0000000..fdc1ce8
--- /dev/null
+++ b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/setup-workspace/SKILL.md
@@ -0,0 +1,18 @@
+---
+name: setup-workspace
+description: Change what this workspace checks out and re-run its setup. workspace.yml lists code repos (repos:), read-only dependency sources (references-git:), and clones of other Delphi workspaces or main to read (workspaces:). Use when the user wants to read or compare another workspace's or main's instructions, skills, or docs (link it), add or remove a repo or dependency reference, or run setup after cloning or pulling.
+---
+
+`workspace.yml` at the workspace root lists what `.delphi/setup.sh` checks out, all git-ignored: code repos (`repos:`), dependency sources (`references-git:`), and other Delphi workspaces or main (`workspaces:`, entries `- <name>` or `- main`; a workspace's name is the short names of its folders (each folder's `short-name` file, else its name) and its own folder name, joined by dots, like `s.app.argos.argos-dev`; `bash .delphi/switch.sh --list` lists them). The comment on each section gives its entry format and where it lands; read it, then edit the file.
+
+Run from the workspace root after any change, and to refresh references and workspace copies to their latest:
+
+```
+bash .delphi/setup.sh
+```
+
+- The clones under `workspaces/` are full clones, each on its branch (`ws/<name>` or `main`) tracking origin, for reading: don't edit, branch, or push them from this workspace. Each setup run switches a clone back to its branch if it was switched away (refused while it has uncommitted changes), pulls it, and runs its own setup, so that workspace's repos and references are under it too (it skips its own `workspaces:`, so they don't chain). To change one of those workspaces or main, work in its own clone or switch to it (`switch-workspace` skill).
+- This workspace's project folder (shared context, `AUTHORING.md`, `workspace-defaults/`) is the folder above `workspaces/<leaf>/` in `workspaces/main/` (`bash .delphi/switch.sh --list` prints it): for `s.app.argos.argos-dev`, `workspaces/main/software/application-software/argos/`. List workspaces and their project folders: `bash .delphi/switch.sh --list`.
+- `workspace.yml` is shared: change it on a branch and open a PR into `ws/<this-name>` (the `name:` in `workspace.yml`). For a one-off look, add the entry, run setup, then `git restore workspace.yml`.
+- Setup never deletes what you'd lose. A removed entry's `workspaces/<name>/`, `references/<name>/`, or repo store and worktrees stay until you delete them (ask first).
+- When Delphi releases a version that needs cleanup in clones, setup runs its migration first (`.delphi/migrations/`), once per workspace. A migration removes only what nothing is lost from, and otherwise stops setup with what to do: tell the user, do it with their go-ahead, and re-run.
diff --git a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/switch-workspace/SKILL.md b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/switch-workspace/SKILL.md
new file mode 100644
index 0000000..0b5a91a
--- /dev/null
+++ b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/switch-workspace/SKILL.md
@@ -0,0 +1,19 @@
+---
+name: switch-workspace
+description: Switch this clone to another Delphi workspace, or to Delphi's main, to work in it. Use when the user wants to check out, switch to, open, or work in another workspace or project, or to change another workspace's or main's files.
+---
+
+Run from the workspace root:
+
+```
+bash .delphi/switch.sh <name>        # ws/<name>: its dotted name, e.g. s.app.argos.argos-dev
+bash .delphi/switch.sh main          # Delphi's main: project folders, templates, CI
+```
+
+- List workspaces and their project folders: `bash .delphi/switch.sh --list`.
+- It refuses while tracked files have changes: commit them on a branch (and PR them) first. Then it fetches, switches, fast-forwards, and runs the new workspace's `.delphi/setup.sh`.
+- The post-checkout hook parks this workspace's `repos/`, `worktrees/`, `references/` and `workspaces/` in `.delphi/parked/<name>/` (git-ignored; `<name>` as in its `workspace.yml`) and brings the other's back at the same paths, so worktrees and the work in them return as they were. Switch back the same way. Never run `git clean -X` or `git stash --all` at the workspace root: they take ignored files, parked work included.
+- Before switching, stop anything running from `worktrees/` (dev servers, Docker builds): its folder moves.
+- Start a fresh harness session after switching so its instructions and skills match the new workspace. A harness integration may explicitly support reloading in place; follow its documented behavior.
+- To change the workspace you switched to: `git switch -c <branch>`, commit, push, and open a PR into `ws/<name>` (or `main`).
+- To only read another workspace or main without leaving this one, list it under `workspaces:` instead (`setup-workspace` skill).
diff --git a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/ticket-conventions/SKILL.md b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/ticket-conventions/SKILL.md
new file mode 100644
index 0000000..05ff574
--- /dev/null
+++ b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/ticket-conventions/SKILL.md
@@ -0,0 +1,13 @@
+---
+name: ticket-conventions
+description: Nero specifics for tickets (repo, area labels, vocabulary, diagrams). Load before drafting or filing a Nero issue, alongside create-ticket.
+---
+
+# Nero ticket conventions
+
+The shared rules are in the `create-ticket` skill; this adds only what is Nero's.
+
+- Repo: Northeastern-Electric-Racing/Nero-2.0 (base branch `develop`).
+- Area labels: `view`, `controller`, `model`, `devops` (any combination).
+- Title example: "Add a lap timer to the pit screen".
+- Diagrams: Mermaid where it fits. Show the change across the view, controller, and model layers it touches, before and after.
diff --git a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/update-pr/SKILL.md b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/update-pr/SKILL.md
new file mode 100644
index 0000000..069b517
--- /dev/null
+++ b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/update-pr/SKILL.md
@@ -0,0 +1,6 @@
+---
+name: update-pr
+description: Update a branch's PR description to reflect the latest changes
+---
+
+Load the project's `pr-conventions` skill, then rewrite the branch's PR body (`(cd worktrees/<repo>/<branch> && gh pr view)`) to match `git -C worktrees/<repo>/<branch> diff origin/<base>...HEAD`, following the PR body rules in the `open-pr` skill. Keep human-written text that's still accurate, `user-attachments` screenshots, and `Closes`/`Fixes` refs; new screenshots or videos follow open-pr's media step, attached with `gh pr edit --attach`. Write it to `/tmp/<branch>-pr-body.md`, apply it with `gh pr edit <branch> --body-file` from the worktree, and add any of the project's labels that are missing with `--add-label`.
diff --git a/software/application-software/nero/workspaces/nero-experimental/workspace.generated b/software/application-software/nero/workspaces/nero-experimental/workspace.generated
new file mode 100644
index 0000000..fe3c0b7
--- /dev/null
+++ b/software/application-software/nero/workspaces/nero-experimental/workspace.generated
@@ -0,0 +1,19 @@
+# Generated by ci/render.sh; edit shared sources or opt out in workspace.yml.
+100644 61c35f28dda167e42bebc3bad3994af97c53e876	.claude/settings.json	ci/plugins.sh
+100644 3bf22d3571b9cad53804cc7a7c678c4103368780	.claude/skills/address-pr-comments/SKILL.md	software/application-software/skills/address-pr-comments/SKILL.md
+100755 ce1efd97da4a6d2ea655932486660c5008f44dae	.claude/skills/address-pr-comments/scripts/fetch-feedback.sh	software/application-software/skills/address-pr-comments/scripts/fetch-feedback.sh
+100644 da0be202ebc0a9ffc4544dbdf4bbef54cca37520	.claude/skills/address-pr-comments/scripts/github.sh	software/application-software/skills/address-pr-comments/scripts/github.sh
+100644 ad1fa37b4cf08693b5dcbf85d62df96c1a56b7e5	.claude/skills/commit/SKILL.md	software/application-software/skills/commit/SKILL.md
+100644 897a1f58386f280ce329a245baea7b562ac0b3db	.claude/skills/consolidate-spikes/SKILL.md	software/application-software/skills/consolidate-spikes/SKILL.md
+100644 9dd28e531875c0acb7f8a88a07ad15645aecf38f	.claude/skills/create-ticket/SKILL.md	software/application-software/skills/create-ticket/SKILL.md
+100644 4917259f9e29db28e2636496e80f80ee5d9e321e	.claude/skills/journal/SKILL.md	software/skills/journal/SKILL.md
+100755 1e90d7b9afa14b8b0e7f36e0e1d83baecc94ba5b	.claude/skills/journal/scripts/capture.sh	software/skills/journal/scripts/capture.sh
+100644 0495fc97cbe93e4331c89263aee188f6c0e9c9ea	.claude/skills/new-worktree/SKILL.md	software/skills/new-worktree/SKILL.md
+100644 7363dd2304fbb29c464e8cac0fd270acdeeb8060	.claude/skills/open-pr/SKILL.md	software/application-software/skills/open-pr/SKILL.md
+100755 61f377fef63daa10c443129df6a49571fdbeb658	.claude/skills/open-pr/scripts/pr-checks.sh	software/application-software/skills/open-pr/scripts/pr-checks.sh
+100644 77b2d415a009973dcb1facb6e4f864aa24f9615f	.claude/skills/pr-conventions/SKILL.md	software/application-software/nero/skills/pr-conventions/SKILL.md
+100644 e67387116a753217d256d81901e5b4091b49b44c	.claude/skills/report-spike/SKILL.md	software/application-software/skills/report-spike/SKILL.md
+100644 fdc1ce85211200223040edfb5dc65a3de7f35d53	.claude/skills/setup-workspace/SKILL.md	software/skills/setup-workspace/SKILL.md
+100644 0b5a91a731df227907cf8bc40a8a2e04c4518059	.claude/skills/switch-workspace/SKILL.md	software/skills/switch-workspace/SKILL.md
+100644 05ff57481c11cc43669eae13f2bbe67eba853db6	.claude/skills/ticket-conventions/SKILL.md	software/application-software/nero/skills/ticket-conventions/SKILL.md
+100644 069b51714c0fd4d3d6ad972dd9f840e01f21cf15	.claude/skills/update-pr/SKILL.md	software/application-software/skills/update-pr/SKILL.md
diff --git a/software/application-software/workspaces/hub/.claude/skills/address-pr-comments/SKILL.md b/software/application-software/workspaces/hub/.claude/skills/address-pr-comments/SKILL.md
new file mode 100644
index 0000000..3bf22d3
--- /dev/null
+++ b/software/application-software/workspaces/hub/.claude/skills/address-pr-comments/SKILL.md
@@ -0,0 +1,18 @@
+---
+name: address-pr-comments
+description: Fetch review comments on a PR (Argos, Nero), judge whether each (including outdated ones) still applies, and walk through fixes in the PR's worktree
+---
+
+Propose and apply fixes for a PR's unresolved review feedback. **Never reply to threads**; the user does.
+
+1. **Fetch** from the workspace root: `bash scripts/fetch-feedback.sh <repo> <pr>|<branch>` (`<repo>` as under `repos/`, e.g. `argos`; `--all` first for unfiltered history). It checks out the PR head's worktree and prints JSON: `worktree` (target it by path from the root from now on), unresolved `threads`, `comments`, `reviews`. Any non-zero exit: use the available GitHub integration's PR-reading tool instead.
+2. **Judge.** Skip bot noise and anything already fixed at HEAD. For an `outdated` thread, find its `diffHunk` code by content, then label it **addressed**, **applies**, **moved**, **obsolete**, or **unclear**.
+3. **Present** before editing, grouped by file, and ask to confirm, skip, or change each (offer to batch clear ones past 8):
+
+   ```
+   <file>:<line> — <reviewer> · <active|outdated> · <label>
+   "<excerpt>" → <proposed fix>
+   <optional ≤5-line snippet, for the user only>
+   ```
+4. **Apply** in that worktree, by path, with grouped `/commit`s. For a follow-up-ticket request, reuse a match from `gh issue list --search` before filing.
+5. **Report** what was fixed (file:line, commit SHA), what was already addressed or obsolete (why), and what is unclear.
diff --git a/software/application-software/workspaces/hub/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh b/software/application-software/workspaces/hub/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh
new file mode 100755
index 0000000..ce1efd9
--- /dev/null
+++ b/software/application-software/workspaces/hub/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh
@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+# fetch-feedback.sh [--all] <repo> <pr-number>|<branch>: print a PR's review
+# feedback as one JSON object after creating or reusing the PR head's worktree
+# (worktrees/<repo>/<head>). Default output keeps unresolved threads (first + latest message,
+# bots tagged), conversation comments, and reviews with text; --all keeps everything. Exits 3 on any
+# GitHub failure (see github.sh).
+# shellcheck source-path=SCRIPTDIR source=github.sh
+set -euo pipefail
+. "$(dirname "$0")/github.sh"
+all=false
+[ "${1:-}" = --all ] && all=true && shift
+usage="usage: fetch-feedback.sh [--all] <repo> <pr-number>|<branch>"
+repo=${1:?$usage} ref=${2:?$usage}
+# shellcheck source=/dev/null
+. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
+gh_init fetch-feedback "$DELPHI_WORKTREES/$repo/.bare"
+
+case "$ref" in *[!0-9]*) get "repos/$SLUG/pulls?state=all&head=${SLUG%%/*}:$ref" | jq '.[0] // error("no PR")' ;;
+  *) get "repos/$SLUG/pulls/$ref" ;; esac >"$TMP/pr"
+num=$(jq .number "$TMP/pr")
+wt=""
+[ "$(jq -r .head.repo.full_name "$TMP/pr")" != "$SLUG" ] || wt=$(bash "$DELPHI_ROOT/.delphi/new-worktree.sh" "$repo" "$(jq -r .head.ref "$TMP/pr")")
+
+if [ "$MODE" = gh ]; then # thread state is GraphQL-only; reshape it like the proxy's ccr/review_threads
+  # shellcheck disable=SC2016 # GraphQL variables
+  gh api graphql -F o="${SLUG%%/*}" -F n="${SLUG##*/}" -F p="$num" -f query='query($o: String!, $n: String!, $p: Int!) {
+    repository(owner: $o, name: $n) { pullRequest(number: $p) { reviewThreads(first: 100) { nodes {
+      isResolved isOutdated comments(first: 50) { nodes { databaseId } } } } } } }' \
+    --jq '[.data.repository.pullRequest.reviewThreads.nodes[] |
+      {resolved: .isResolved, outdated: .isOutdated, comment_ids: [.comments.nodes[].databaseId]}]'
+else get "repos/$SLUG/pulls/$num/ccr/review_threads"; fi >"$TMP/th"
+get "repos/$SLUG/pulls/$num/comments?per_page=100" >"$TMP/rc"
+get "repos/$SLUG/issues/$num/comments?per_page=100" >"$TMP/ic"
+get "repos/$SLUG/pulls/$num/reviews?per_page=100" >"$TMP/rv"
+
+jq -n --arg wt "$wt" --argjson all "$all" --slurpfile pr "$TMP/pr" --slurpfile th "$TMP/th" \
+  --slurpfile rc "$TMP/rc" --slurpfile ic "$TMP/ic" --slurpfile rv "$TMP/rv" '
+  def who: {author: .user.login, bot: (.user.type == "Bot")};
+  ($rc[0] | map({key: (.id | tostring), value: (who + {body, path, line: (.line // .original_line), diffHunk: .diff_hunk})}) | from_entries) as $byid |
+  {pr: ($pr[0] | {number, title, url: .html_url, head: .head.ref, base: .base.ref}), worktree: $wt,
+   threads: [$th[0][] | {resolved, outdated, comments: [.comment_ids[] | $byid[tostring]]}],
+   comments: [$ic[0][] | who + {body}], reviews: [$rv[0][] | who + {state, body: (.body // "")}]} |
+  if $all then . else
+    .threads |= map(select(.resolved | not) | .comments as $c | $c[-1] + {outdated, path: $c[0].path, line: $c[0].line,
+      diffHunk: (if .outdated then $c[0].diffHunk else null end), replies: ($c | length),
+      first: (if ($c | length) > 1 then $c[0].body else null end)}) |
+    .reviews |= map(select(.body != ""))
+  end'
diff --git a/software/application-software/workspaces/hub/.claude/skills/address-pr-comments/scripts/github.sh b/software/application-software/workspaces/hub/.claude/skills/address-pr-comments/scripts/github.sh
new file mode 100644
index 0000000..da0be20
--- /dev/null
+++ b/software/application-software/workspaces/hub/.claude/skills/address-pr-comments/scripts/github.sh
@@ -0,0 +1,19 @@
+# github.sh: sourced by skill scripts that call GitHub. gh_init <tool> <git-dir> picks a backend
+# (gh when logged in, else an explicitly enabled GitHub REST proxy via curl; jq is needed either
+# way), sets SLUG from that repo's origin, and makes any failure exit 3 so the calling skill falls
+# back to the available GitHub integration. TMP is a scratch dir removed on exit.
+# shellcheck shell=bash
+fail() { echo "$TOOL: $1; use the available GitHub integration" >&2; exit 3; }
+on_exit() { local rc=$?; rm -rf "$TMP"; [ "$rc" -eq 0 ] || fail "GitHub request failed ($MODE)"; }
+gh_init() {
+  TOOL=$1
+  if { command -v gh && gh auth status; } >/dev/null 2>&1; then MODE=gh
+  elif [ -n "${DELPHI_GITHUB_REST_PROXY:-${CLAUDE_CODE_REMOTE:-}}" ] && command -v curl >/dev/null; then MODE=rest
+  else fail "no authenticated gh or enabled REST proxy"; fi
+  command -v jq >/dev/null || fail "jq not installed"
+  SLUG=$(git -C "$2" remote get-url origin) && SLUG=${SLUG#*github.com[:/]} && SLUG=${SLUG%.git}
+  TMP=$(mktemp -d)
+  trap on_exit EXIT
+}
+get() { if [ "$MODE" = gh ]; then gh api "$1"; else curl -fsS "https://api.github.com/$1"; fi; }
+post() { if [ "$MODE" = gh ]; then gh api -X POST "$1" --input -; else curl -fsS -X POST --data-binary @- "https://api.github.com/$1"; fi; }
diff --git a/software/application-software/workspaces/hub/.claude/skills/commit/SKILL.md b/software/application-software/workspaces/hub/.claude/skills/commit/SKILL.md
new file mode 100644
index 0000000..ad1fa37
--- /dev/null
+++ b/software/application-software/workspaces/hub/.claude/skills/commit/SKILL.md
@@ -0,0 +1,6 @@
+---
+name: commit
+description: Stage and commit using the project's commit message convention
+---
+
+In the worktree you're working on, from the workspace root (`git -C worktrees/<repo>/<branch> …`), stage the relevant changes (not unrelated or generated files) and commit using the commit message format in the workspace instructions. Keep the description imperative and 2–8 words.
diff --git a/software/application-software/workspaces/hub/.claude/skills/consolidate-spikes/SKILL.md b/software/application-software/workspaces/hub/.claude/skills/consolidate-spikes/SKILL.md
new file mode 100644
index 0000000..897a1f5
--- /dev/null
+++ b/software/application-software/workspaces/hub/.claude/skills/consolidate-spikes/SKILL.md
@@ -0,0 +1,14 @@
+---
+name: consolidate-spikes
+description: >-
+  Turn finished spikes into implementation tickets: an idea's spikes, once all are done, into dev work, under an epic when it comes from an idea or splits. Use when the user wants to wrap up, settle, or consolidate an idea or spike on an application-software repo (Argos, Nero).
+---
+
+Drafts and files by the `create-ticket` rules; load it and the project's `ticket-conventions` first. Takes an idea or a standalone spike.
+
+1. **Gather** each spike's findings comment, draft PR, and the PR's reviews; from an idea, its sub-issues too.
+2. **Check it's done.** Every spike is done by `create-ticket`'s Spikes rules (the lead's latest review on its draft PR, from repos/<owner>/<repo>/pulls/<pr>/reviews, is an approval). From an idea, that's every spike under it, and every one of its areas to explore is covered by a spike area. Otherwise list what's missing, offer spikes for uncovered areas, and stop.
+3. **Choose:** per area (title prefix), propose the approach to build (one spike's, or a mix) with a one-line why, from the findings and the lead's review. The user confirms or changes each.
+4. **Plan** the dev work by `create-ticket`'s Dev work rules: one ticket unless the work is large enough to split into vertical slices, which may cross areas. Each ticket: What, the slice; Notes, links to the spikes and draft PRs it draws on, and the dropped approaches with why; context transfer, the findings' facts.
+5. **Draft** them, and, from an idea or when split, one epic (From: the idea or spike) with the dev work as its sub-issues. Show all, with which slices run in parallel if split; file what the user OKs.
+6. **Close**, each with a one-line comment: the spikes as completed ("Consolidated into #<epic or dev work>"), their draft PRs unless a dev work ticket builds on that branch, and the idea as completed ("Settled in #<epic or dev work>").
diff --git a/software/application-software/workspaces/hub/.claude/skills/create-ticket/SKILL.md b/software/application-software/workspaces/hub/.claude/skills/create-ticket/SKILL.md
new file mode 100644
index 0000000..9dd28e5
--- /dev/null
+++ b/software/application-software/workspaces/hub/.claude/skills/create-ticket/SKILL.md
@@ -0,0 +1,66 @@
+---
+name: create-ticket
+description: Draft and file a GitHub issue (idea, spike, epic, or dev work) on an application-software repo (Argos, Nero) from the repo's issue templates, or rewrite an existing issue into them. Use whenever the user wants to create, file, write up, or log a ticket, issue, idea, spike, epic, bug, or task, including an out-of-scope idea that comes up mid-work.
+---
+
+# Create ticket
+
+These are the ticket conventions for every application-software repo. The repo's own `.github/ISSUE_TEMPLATE` holds only the fields (`gh api repos/<owner>/<repo>/contents/.github/ISSUE_TEMPLATE/<file> -q .content | base64 -d`); follow each field's description.
+
+First load the project's `ticket-conventions` skill (inherited from the project's `skills/`) for its repo, area labels, vocabulary, and diagrams. If none is enabled, ask which repo.
+
+## Workflow
+
+idea → spikes → epic → dev work, or a standalone spike → dev work
+
+| Ticket | What it is | Issue type | Parent |
+|---|---|---|---|
+| Idea | What could be built and why. Its areas to explore are things to improve or problems to solve, each with approaches worth trying. | none | none |
+| Spike | One approach to try on one area of an idea (it needn't cover the whole area), or a small standalone improvement: what is tried and the hypothesis. Findings go in a comment and a draft PR (`report-spike`), not the ticket. | none | its idea, if any |
+| Epic | Work too large for one dev work ticket: the goal and whole-epic outcomes, not a walkthrough of each ticket. A new issue linking the idea or spike it came from in "From". | Feature | none |
+| Dev work | Any implementation work: testable requirements, Notes for gotchas and pointers to code. Large work is cut into vertical slices (see Dev work below). | Feature, Bug, or Task | its epic, if any |
+
+If unsure, a small, clear change is dev work, a small unknown is a spike, and a big unexplored thing is an idea. Ideas and spikes explore work, so they get no issue type; bug, feature, and task are issue types, never labels.
+
+## Writing
+
+How every ticket reads, on any project:
+
+- Short and plain. Write for someone new to the project: explain project-specific terms, and use the project's vocabulary (its `ticket-conventions` says where it lives; check the code for current names).
+- Outcomes, not implementation: say what changes and why, not how to build it. A rationale gives the reasoning, not a history of the problem.
+- No prescriptions on ideas and spikes. Ideas name open options to weigh, not a plan or a recommended pick; spikes state what to learn and leave the how to whoever picks it up.
+- Facts, not instructions: Notes and context transfer hold facts (where code lives, current behavior, constraints, links), not steps or a proposed solution. Context transfer (optional on spikes, epics, and dev work) starts with a short summary, then the raw context.
+- Unknowns stay open questions in Notes; don't guess.
+- Title: concise and imperative, no prefixes (except a spike's area).
+- Requirements: clear, broad checkboxes, each a testable outcome rather than an implementation step; 3-5, never more than 7. If it needs more, split the ticket.
+- Backticks: at most three inline uses per body; name files and identifiers in plain text. Diagram and context-transfer blocks don't count.
+- Size: keep ideas short; one small enough to just try is a spike.
+
+## Dev work
+
+- One ticket by default. Split only when the work is too large for one PR or parts could run in parallel.
+- When split, cut vertical slices: each goes end to end through every part it touches (e.g. backend through UI), not one layer, and works and is testable on its own. Cut for the most parallel work; mark a slice that must wait as blocked by the one it waits on (see File).
+
+## Spikes
+
+- One approach, not a set to choose between. If a spike reads "X or Y", it is two spikes.
+- Prefer an idea with a few spikes (often 2-4) under it; a spike can also stand alone, or with siblings, to explore an area. Several spikes can take on the same area in different ways.
+- Title it `<area>: <approach>`, with the area a short kebab-case name its siblings share (`graph-saving: Save a graph to a file and re-upload it`). An area may cover more than one of an idea's bullets. A lone small improvement needs no prefix.
+- Sibling spikes share the context transfer's summary and common facts; each adds only the facts particular to its approach.
+- An idea needn't get all its spikes at once: file an area's spikes when someone is ready to try them.
+- Done: its findings are posted, review feedback is addressed, and the lead's latest review on its draft PR is an approval (GitHub's Approve), including when the recommendation is to drop the approach. A done spike stays open until `consolidate-spikes` closes it.
+
+## Draft
+
+- Check the code first: the work may be done or already tracked.
+- One `### <field label>` per field in template order, following each field's description; omit empty optional fields.
+- Diagrams: required on epics, optional on dev work. The project's `ticket-conventions` says what they show.
+- Labels: the template's category (`idea`, `spike`, `epic`, `dev work`), one written-by (`by: human` if the user dictated it, `by: ai-assisted` if they gave the substance, `by: ai` if you wrote it, including rewrites), and at least one of the project's area labels.
+- Rewriting an old ticket: keep its intent and assignees; bring it up to these rules and update vocabulary, labels, issue type, and parent.
+- Folding one ticket into another: add it as a requirement on the target, then close it as not planned. Every close gets a one-line comment saying why.
+
+## File
+
+Check for open duplicates, then show the full draft (title, type if any, labels, parent, body) in the chat, not only in a file. File or edit only what the user OKs.
+
+Use the REST API (GraphQL may be blocked): POST repos/<owner>/<repo>/issues with title, body, labels, the issue type from the table, and the user as assignee (on a spike, whoever will run it; ask), then, if it has a parent, POST repos/<owner>/<repo>/issues/<parent>/sub_issues with the new issue's id. If it waits on another issue, POST repos/<owner>/<repo>/issues/<n>/dependencies/blocked_by with the blocking issue's id. Report the URL.
diff --git a/software/application-software/workspaces/hub/.claude/skills/journal/SKILL.md b/software/application-software/workspaces/hub/.claude/skills/journal/SKILL.md
new file mode 100644
index 0000000..4917259
--- /dev/null
+++ b/software/application-software/workspaces/hub/.claude/skills/journal/SKILL.md
@@ -0,0 +1,22 @@
+---
+name: journal
+description: Park rough notes locally mid-task ("note to self", "remember to", "journal this"), and later export them to their permanent home (issue, spec, ADR, glossary, docs) through the skill that owns it. Use when the user wants to jot a thought without derailing, or to file parked notes.
+---
+
+Notes live in `.journal/` at the workspace root (git-excluded, outside worktrees so they survive removal). An **entry** is one file, a **category** a subfolder. The journal never pushes, files, or contacts GitHub itself.
+
+**Capture** (no git, no other skills):
+
+```
+bash scripts/capture.sh [-c <category>] ["note text"]
+```
+
+Omit `-c` for a loose entry, omit the text for an empty one to edit. Report the path it prints.
+
+**Export** (only when asked):
+
+1. Read the entries and propose a grouping: one entry → one output, a category → one merged output, or one entry split across several. Let the user adjust.
+2. For each output, pick the workspace skill whose description fits its permanent home, preferring an existing docs area. A new section always needs approval.
+3. Show the destination and reshaped text and wait for approval. Nothing lands silently.
+4. Delegate to that skill; it owns formatting, conventions, and any GitHub contact.
+5. Ask whether to delete the exported entry (default: keep).
diff --git a/software/application-software/workspaces/hub/.claude/skills/journal/scripts/capture.sh b/software/application-software/workspaces/hub/.claude/skills/journal/scripts/capture.sh
new file mode 100755
index 0000000..1e90d7b
--- /dev/null
+++ b/software/application-software/workspaces/hub/.claude/skills/journal/scripts/capture.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+# capture.sh [-c <category>] [note text]: write a timestamped journal entry to
+# .journal/[<category>/] at the workspace root (adding /.journal/ to .git/info/exclude once) and print
+# its path. An empty entry is created when no text is given. Never touches git history, GitHub, or
+# other skills.
+set -euo pipefail
+usage="usage: capture.sh [-c <category>] [note text]"
+# shellcheck source=/dev/null
+. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
+dir=$DELPHI_ROOT/.journal
+[ "${1:-}" = -c ] && dir=$dir/${2:?$usage} && shift 2
+exclude=$(git -C "$DELPHI_ROOT" rev-parse --path-format=absolute --git-path info/exclude 2>/dev/null || true)
+[ -z "$exclude" ] || grep -qxF /.journal/ "$exclude" 2>/dev/null || { mkdir -p "${exclude%/*}" && echo /.journal/ >>"$exclude"; }
+mkdir -p "$dir"
+file=$dir/$(date +%Y-%m-%d-%H%M%S).md
+{ echo "<!-- captured $(date -u +%Y-%m-%dT%H:%M:%SZ) -->"; [ $# -eq 0 ] || echo "$*"; } >"$file"
+echo "$file"
diff --git a/software/application-software/workspaces/hub/.claude/skills/new-worktree/SKILL.md b/software/application-software/workspaces/hub/.claude/skills/new-worktree/SKILL.md
new file mode 100644
index 0000000..0495fc9
--- /dev/null
+++ b/software/application-software/workspaces/hub/.claude/skills/new-worktree/SKILL.md
@@ -0,0 +1,16 @@
+---
+name: new-worktree
+description: Create or reuse a worktree for a branch of a code repo (worktrees/<repo>/<branch>). Use before any branch work, such as starting a ticket or reviewing or fixing a PR branch, unless the user says not to use worktrees.
+---
+
+Run from the workspace root:
+
+```
+bash .delphi/new-worktree.sh <repo> <branch> [<base>]
+```
+
+- An existing branch (local or on origin, e.g. a PR head) is checked out; anything else is created from `<base>` (default: the repo's default branch). Safe to re-run.
+- Stay at the workspace root and reach into the worktree by the printed path. Never switch branches in an existing worktree or work in its store, `worktrees/<repo>/.bare`.
+- For a subagent, make its worktree here first and hand it the path. Never use the harness's own worktree isolation: it checks out this Delphi clone from main, not the code repo, and fences the subagent out of `worktrees/`.
+- Keep `worktrees/<repo>/<default-branch>/` (made by setup) a clean reference: fetch and fast-forward only.
+- After the branch merges: `git -C worktrees/<repo>/.bare worktree remove ../<branch>`.
diff --git a/software/application-software/workspaces/hub/.claude/skills/open-pr/SKILL.md b/software/application-software/workspaces/hub/.claude/skills/open-pr/SKILL.md
new file mode 100644
index 0000000..7363dd2
--- /dev/null
+++ b/software/application-software/workspaces/hub/.claude/skills/open-pr/SKILL.md
@@ -0,0 +1,22 @@
+---
+name: open-pr
+description: Run pre-PR checks, push the branch, and open a draft pull request on an application-software repo (Argos, Nero)
+---
+
+First load the project's `pr-conventions` skill (inherited from the project's `skills/`) for its base branch, commit format, checks, labels, and screenshots.
+
+1. **Check:** `bash scripts/pr-checks.sh <repo> <branch> origin/<base> '<commit format>'` (clean tree, commit subjects match the project's format, merges cleanly into the base), then the project's own checks. Stop and fix on any FAIL.
+2. **Media:** if the diff touches the UI, ask the user whether to add screenshots to the PR, listing any already in the project's screenshot folder for this branch so they can pick those instead of new ones; on no, skip this step. For new ones, use the project's UI QA to take Playwright screenshots of the changed views into its screenshot folder, or, when the change adds or changes an animation, record a short video instead (a browser context with `recordVideo: { dir }` saves a `.webm` when it closes). Images must be under 10 MB; video under 10 MB on a Free plan, 100 MB on a paid one.
+3. **Open:** push (`git -C worktrees/<repo>/<branch> push -u origin <branch>`), then run `(cd worktrees/<repo>/<branch> && gh pr create --draft --base <base> --head <branch> --title "<title>" --body-file /tmp/<branch>-pr-body.md --assignee @me)` with the project's labels (`--label`) and one `--attach <file>` per screenshot or video, and report the URL.
+4. **Spike:** the PR stays a draft; getting it merged isn't the goal. Once it's checked and working, run `report-spike`.
+
+## PR body
+
+Fill the worktree's `.github/pull_request_template.md` from the diff, following each section's comment, and write it to `/tmp/<branch>-pr-body.md`:
+
+- Title: concise and imperative, no ticket number.
+- The Changes section (not the whole body): about 50 words (1–3 sentences) on what landed and the key design choice. Describe the change, not the file list: don't enumerate components, classes or files the diff already shows. Name a specific one only when its behaviour changes in a way a reviewer must know.
+- Delete the template's comments and any optional or non-applicable sections, and check off the Checklist.
+- At most three backtick uses in the body.
+- End with `Closes #{ticket}` (the branch's leading number), or `Spike for #{ticket}` on a spike, which its PR never closes.
+- Screenshots and videos: reference each one by its path from the worktree, `![<what it shows>](<path>)`; `--attach` uploads it and rewrites the reference to its `user-attachments` URL. `--attach` needs gh v2.99.0+: if `gh pr create --help` doesn't list it, put `_screenshot pending_` instead and remind the user to drag-drop the files from the screenshot folder. Never commit screenshots or videos.
diff --git a/software/application-software/workspaces/hub/.claude/skills/open-pr/scripts/pr-checks.sh b/software/application-software/workspaces/hub/.claude/skills/open-pr/scripts/pr-checks.sh
new file mode 100755
index 0000000..61f377f
--- /dev/null
+++ b/software/application-software/workspaces/hub/.claude/skills/open-pr/scripts/pr-checks.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+# pr-checks.sh <repo> <branch> [<base> [<format>]]: open-pr's shared pre-PR checks on
+# worktrees/<repo>/<branch>. Prints
+# one PASS/FAIL/SKIP line per check: clean tree, every commit subject since <base> (default
+# origin/develop, fetched first) matches <format> (an extended regex, default '^#[0-9]+ - '), and no
+# merge conflicts with <base>. Exits 1 if any check fails. The project's own checks (lint, format)
+# are in its pr-conventions skill.
+set -euo pipefail
+usage="usage: pr-checks.sh <repo> <branch> [<base> [<format>]]"
+repo=${1:?$usage} branch=${2:?$usage}
+# shellcheck source=/dev/null
+. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
+cd "$DELPHI_WORKTREES/$repo/$branch"
+base=${3:-origin/develop} format=${4:-'^#[0-9]+ - '} fail=0
+res() { echo "$1 $2"; [ "$1" != FAIL ] || fail=1; }
+git fetch -q origin "${base#origin/}" 2>/dev/null || true
+
+if [ -z "$(git status --porcelain)" ]; then res PASS "clean tree"; else res FAIL "uncommitted changes"; fi
+bad=$(git log --format=%s "$base..HEAD" | grep -Ev "$format" || true)
+if [ -z "$bad" ]; then res PASS "commit format"; else res FAIL "commit format: $(echo "$bad" | paste -sd'|' -)"; fi
+if git merge-tree --write-tree HEAD "$base" >/dev/null 2>&1; then res PASS "merges cleanly into $base"
+elif [ $? -eq 1 ]; then res FAIL "conflicts with $base"; else res SKIP "conflict check (needs git 2.38+)"; fi
+exit "$fail"
diff --git a/software/application-software/workspaces/hub/.claude/skills/report-spike/SKILL.md b/software/application-software/workspaces/hub/.claude/skills/report-spike/SKILL.md
new file mode 100644
index 0000000..e673871
--- /dev/null
+++ b/software/application-software/workspaces/hub/.claude/skills/report-spike/SKILL.md
@@ -0,0 +1,22 @@
+---
+name: report-spike
+description: Post a spike's findings on its ticket, judged against its hypothesis, and ask the lead to review its draft PR. Use when a spike's approach has been tried on an application-software repo (Argos, Nero).
+---
+
+A spike runs like any ticket (branch, commits, a draft PR from `open-pr`); this reports it. Load the project's `pr-conventions` first.
+
+1. **Read** the spike (`gh issue view <n> --comments`), its draft PR, and the branch's diff against the base.
+2. **Draft** one findings comment, short and factual:
+
+   ```
+   ### Findings
+   **Hypothesis:** holds | partly holds | doesn't hold. One sentence why.
+   **Learned:** measurements, limits hit, surprises, with links to the draft PR's code.
+   **Recommendation:** adopt, adopt with changes, or drop, and why.
+   **Open questions:** what the spike didn't settle.
+   Draft PR: #<pr>
+   ```
+3. **Show** it and ask who the lead is; on OK, post it (`gh issue comment <n> --body-file /tmp/<branch>-findings.md`).
+4. **Request review:** `(cd worktrees/<repo>/<branch> && gh pr edit <branch> --add-reviewer <lead>)`, keeping the PR a draft, and remind the user to ping the lead on Slack.
+
+Address review feedback on the branch as on any PR (`address-pr-comments`), and edit the findings comment if it changes them. The spike is done when the lead approves the draft PR (`create-ticket`'s Spikes rules); it stays open until `consolidate-spikes` closes it.
diff --git a/software/application-software/workspaces/hub/.claude/skills/setup-workspace/SKILL.md b/software/application-software/workspaces/hub/.claude/skills/setup-workspace/SKILL.md
new file mode 100644
index 0000000..fdc1ce8
--- /dev/null
+++ b/software/application-software/workspaces/hub/.claude/skills/setup-workspace/SKILL.md
@@ -0,0 +1,18 @@
+---
+name: setup-workspace
+description: Change what this workspace checks out and re-run its setup. workspace.yml lists code repos (repos:), read-only dependency sources (references-git:), and clones of other Delphi workspaces or main to read (workspaces:). Use when the user wants to read or compare another workspace's or main's instructions, skills, or docs (link it), add or remove a repo or dependency reference, or run setup after cloning or pulling.
+---
+
+`workspace.yml` at the workspace root lists what `.delphi/setup.sh` checks out, all git-ignored: code repos (`repos:`), dependency sources (`references-git:`), and other Delphi workspaces or main (`workspaces:`, entries `- <name>` or `- main`; a workspace's name is the short names of its folders (each folder's `short-name` file, else its name) and its own folder name, joined by dots, like `s.app.argos.argos-dev`; `bash .delphi/switch.sh --list` lists them). The comment on each section gives its entry format and where it lands; read it, then edit the file.
+
+Run from the workspace root after any change, and to refresh references and workspace copies to their latest:
+
+```
+bash .delphi/setup.sh
+```
+
+- The clones under `workspaces/` are full clones, each on its branch (`ws/<name>` or `main`) tracking origin, for reading: don't edit, branch, or push them from this workspace. Each setup run switches a clone back to its branch if it was switched away (refused while it has uncommitted changes), pulls it, and runs its own setup, so that workspace's repos and references are under it too (it skips its own `workspaces:`, so they don't chain). To change one of those workspaces or main, work in its own clone or switch to it (`switch-workspace` skill).
+- This workspace's project folder (shared context, `AUTHORING.md`, `workspace-defaults/`) is the folder above `workspaces/<leaf>/` in `workspaces/main/` (`bash .delphi/switch.sh --list` prints it): for `s.app.argos.argos-dev`, `workspaces/main/software/application-software/argos/`. List workspaces and their project folders: `bash .delphi/switch.sh --list`.
+- `workspace.yml` is shared: change it on a branch and open a PR into `ws/<this-name>` (the `name:` in `workspace.yml`). For a one-off look, add the entry, run setup, then `git restore workspace.yml`.
+- Setup never deletes what you'd lose. A removed entry's `workspaces/<name>/`, `references/<name>/`, or repo store and worktrees stay until you delete them (ask first).
+- When Delphi releases a version that needs cleanup in clones, setup runs its migration first (`.delphi/migrations/`), once per workspace. A migration removes only what nothing is lost from, and otherwise stops setup with what to do: tell the user, do it with their go-ahead, and re-run.
diff --git a/software/application-software/workspaces/hub/.claude/skills/switch-workspace/SKILL.md b/software/application-software/workspaces/hub/.claude/skills/switch-workspace/SKILL.md
new file mode 100644
index 0000000..0b5a91a
--- /dev/null
+++ b/software/application-software/workspaces/hub/.claude/skills/switch-workspace/SKILL.md
@@ -0,0 +1,19 @@
+---
+name: switch-workspace
+description: Switch this clone to another Delphi workspace, or to Delphi's main, to work in it. Use when the user wants to check out, switch to, open, or work in another workspace or project, or to change another workspace's or main's files.
+---
+
+Run from the workspace root:
+
+```
+bash .delphi/switch.sh <name>        # ws/<name>: its dotted name, e.g. s.app.argos.argos-dev
+bash .delphi/switch.sh main          # Delphi's main: project folders, templates, CI
+```
+
+- List workspaces and their project folders: `bash .delphi/switch.sh --list`.
+- It refuses while tracked files have changes: commit them on a branch (and PR them) first. Then it fetches, switches, fast-forwards, and runs the new workspace's `.delphi/setup.sh`.
+- The post-checkout hook parks this workspace's `repos/`, `worktrees/`, `references/` and `workspaces/` in `.delphi/parked/<name>/` (git-ignored; `<name>` as in its `workspace.yml`) and brings the other's back at the same paths, so worktrees and the work in them return as they were. Switch back the same way. Never run `git clean -X` or `git stash --all` at the workspace root: they take ignored files, parked work included.
+- Before switching, stop anything running from `worktrees/` (dev servers, Docker builds): its folder moves.
+- Start a fresh harness session after switching so its instructions and skills match the new workspace. A harness integration may explicitly support reloading in place; follow its documented behavior.
+- To change the workspace you switched to: `git switch -c <branch>`, commit, push, and open a PR into `ws/<name>` (or `main`).
+- To only read another workspace or main without leaving this one, list it under `workspaces:` instead (`setup-workspace` skill).
diff --git a/software/application-software/workspaces/hub/.claude/skills/update-pr/SKILL.md b/software/application-software/workspaces/hub/.claude/skills/update-pr/SKILL.md
new file mode 100644
index 0000000..069b517
--- /dev/null
+++ b/software/application-software/workspaces/hub/.claude/skills/update-pr/SKILL.md
@@ -0,0 +1,6 @@
+---
+name: update-pr
+description: Update a branch's PR description to reflect the latest changes
+---
+
+Load the project's `pr-conventions` skill, then rewrite the branch's PR body (`(cd worktrees/<repo>/<branch> && gh pr view)`) to match `git -C worktrees/<repo>/<branch> diff origin/<base>...HEAD`, following the PR body rules in the `open-pr` skill. Keep human-written text that's still accurate, `user-attachments` screenshots, and `Closes`/`Fixes` refs; new screenshots or videos follow open-pr's media step, attached with `gh pr edit --attach`. Write it to `/tmp/<branch>-pr-body.md`, apply it with `gh pr edit <branch> --body-file` from the worktree, and add any of the project's labels that are missing with `--add-label`.
diff --git a/software/application-software/workspaces/hub/workspace.generated b/software/application-software/workspaces/hub/workspace.generated
new file mode 100644
index 0000000..c08144c
--- /dev/null
+++ b/software/application-software/workspaces/hub/workspace.generated
@@ -0,0 +1,17 @@
+# Generated by ci/render.sh; edit shared sources or opt out in workspace.yml.
+100644 61c35f28dda167e42bebc3bad3994af97c53e876	.claude/settings.json	ci/plugins.sh
+100644 3bf22d3571b9cad53804cc7a7c678c4103368780	.claude/skills/address-pr-comments/SKILL.md	software/application-software/skills/address-pr-comments/SKILL.md
+100755 ce1efd97da4a6d2ea655932486660c5008f44dae	.claude/skills/address-pr-comments/scripts/fetch-feedback.sh	software/application-software/skills/address-pr-comments/scripts/fetch-feedback.sh
+100644 da0be202ebc0a9ffc4544dbdf4bbef54cca37520	.claude/skills/address-pr-comments/scripts/github.sh	software/application-software/skills/address-pr-comments/scripts/github.sh
+100644 ad1fa37b4cf08693b5dcbf85d62df96c1a56b7e5	.claude/skills/commit/SKILL.md	software/application-software/skills/commit/SKILL.md
+100644 897a1f58386f280ce329a245baea7b562ac0b3db	.claude/skills/consolidate-spikes/SKILL.md	software/application-software/skills/consolidate-spikes/SKILL.md
+100644 9dd28e531875c0acb7f8a88a07ad15645aecf38f	.claude/skills/create-ticket/SKILL.md	software/application-software/skills/create-ticket/SKILL.md
+100644 4917259f9e29db28e2636496e80f80ee5d9e321e	.claude/skills/journal/SKILL.md	software/skills/journal/SKILL.md
+100755 1e90d7b9afa14b8b0e7f36e0e1d83baecc94ba5b	.claude/skills/journal/scripts/capture.sh	software/skills/journal/scripts/capture.sh
+100644 0495fc97cbe93e4331c89263aee188f6c0e9c9ea	.claude/skills/new-worktree/SKILL.md	software/skills/new-worktree/SKILL.md
+100644 7363dd2304fbb29c464e8cac0fd270acdeeb8060	.claude/skills/open-pr/SKILL.md	software/application-software/skills/open-pr/SKILL.md
+100755 61f377fef63daa10c443129df6a49571fdbeb658	.claude/skills/open-pr/scripts/pr-checks.sh	software/application-software/skills/open-pr/scripts/pr-checks.sh
+100644 e67387116a753217d256d81901e5b4091b49b44c	.claude/skills/report-spike/SKILL.md	software/application-software/skills/report-spike/SKILL.md
+100644 fdc1ce85211200223040edfb5dc65a3de7f35d53	.claude/skills/setup-workspace/SKILL.md	software/skills/setup-workspace/SKILL.md
+100644 0b5a91a731df227907cf8bc40a8a2e04c4518059	.claude/skills/switch-workspace/SKILL.md	software/skills/switch-workspace/SKILL.md
+100644 069b51714c0fd4d3d6ad972dd9f840e01f21cf15	.claude/skills/update-pr/SKILL.md	software/application-software/skills/update-pr/SKILL.md
diff --git a/software/firmware/calypso/workspaces/calypso-dev/.claude/skills/journal/SKILL.md b/software/firmware/calypso/workspaces/calypso-dev/.claude/skills/journal/SKILL.md
new file mode 100644
index 0000000..4917259
--- /dev/null
+++ b/software/firmware/calypso/workspaces/calypso-dev/.claude/skills/journal/SKILL.md
@@ -0,0 +1,22 @@
+---
+name: journal
+description: Park rough notes locally mid-task ("note to self", "remember to", "journal this"), and later export them to their permanent home (issue, spec, ADR, glossary, docs) through the skill that owns it. Use when the user wants to jot a thought without derailing, or to file parked notes.
+---
+
+Notes live in `.journal/` at the workspace root (git-excluded, outside worktrees so they survive removal). An **entry** is one file, a **category** a subfolder. The journal never pushes, files, or contacts GitHub itself.
+
+**Capture** (no git, no other skills):
+
+```
+bash scripts/capture.sh [-c <category>] ["note text"]
+```
+
+Omit `-c` for a loose entry, omit the text for an empty one to edit. Report the path it prints.
+
+**Export** (only when asked):
+
+1. Read the entries and propose a grouping: one entry → one output, a category → one merged output, or one entry split across several. Let the user adjust.
+2. For each output, pick the workspace skill whose description fits its permanent home, preferring an existing docs area. A new section always needs approval.
+3. Show the destination and reshaped text and wait for approval. Nothing lands silently.
+4. Delegate to that skill; it owns formatting, conventions, and any GitHub contact.
+5. Ask whether to delete the exported entry (default: keep).
diff --git a/software/firmware/calypso/workspaces/calypso-dev/.claude/skills/journal/scripts/capture.sh b/software/firmware/calypso/workspaces/calypso-dev/.claude/skills/journal/scripts/capture.sh
new file mode 100755
index 0000000..1e90d7b
--- /dev/null
+++ b/software/firmware/calypso/workspaces/calypso-dev/.claude/skills/journal/scripts/capture.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+# capture.sh [-c <category>] [note text]: write a timestamped journal entry to
+# .journal/[<category>/] at the workspace root (adding /.journal/ to .git/info/exclude once) and print
+# its path. An empty entry is created when no text is given. Never touches git history, GitHub, or
+# other skills.
+set -euo pipefail
+usage="usage: capture.sh [-c <category>] [note text]"
+# shellcheck source=/dev/null
+. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
+dir=$DELPHI_ROOT/.journal
+[ "${1:-}" = -c ] && dir=$dir/${2:?$usage} && shift 2
+exclude=$(git -C "$DELPHI_ROOT" rev-parse --path-format=absolute --git-path info/exclude 2>/dev/null || true)
+[ -z "$exclude" ] || grep -qxF /.journal/ "$exclude" 2>/dev/null || { mkdir -p "${exclude%/*}" && echo /.journal/ >>"$exclude"; }
+mkdir -p "$dir"
+file=$dir/$(date +%Y-%m-%d-%H%M%S).md
+{ echo "<!-- captured $(date -u +%Y-%m-%dT%H:%M:%SZ) -->"; [ $# -eq 0 ] || echo "$*"; } >"$file"
+echo "$file"
diff --git a/software/firmware/calypso/workspaces/calypso-dev/.claude/skills/new-worktree/SKILL.md b/software/firmware/calypso/workspaces/calypso-dev/.claude/skills/new-worktree/SKILL.md
new file mode 100644
index 0000000..0495fc9
--- /dev/null
+++ b/software/firmware/calypso/workspaces/calypso-dev/.claude/skills/new-worktree/SKILL.md
@@ -0,0 +1,16 @@
+---
+name: new-worktree
+description: Create or reuse a worktree for a branch of a code repo (worktrees/<repo>/<branch>). Use before any branch work, such as starting a ticket or reviewing or fixing a PR branch, unless the user says not to use worktrees.
+---
+
+Run from the workspace root:
+
+```
+bash .delphi/new-worktree.sh <repo> <branch> [<base>]
+```
+
+- An existing branch (local or on origin, e.g. a PR head) is checked out; anything else is created from `<base>` (default: the repo's default branch). Safe to re-run.
+- Stay at the workspace root and reach into the worktree by the printed path. Never switch branches in an existing worktree or work in its store, `worktrees/<repo>/.bare`.
+- For a subagent, make its worktree here first and hand it the path. Never use the harness's own worktree isolation: it checks out this Delphi clone from main, not the code repo, and fences the subagent out of `worktrees/`.
+- Keep `worktrees/<repo>/<default-branch>/` (made by setup) a clean reference: fetch and fast-forward only.
+- After the branch merges: `git -C worktrees/<repo>/.bare worktree remove ../<branch>`.
diff --git a/software/firmware/calypso/workspaces/calypso-dev/.claude/skills/setup-workspace/SKILL.md b/software/firmware/calypso/workspaces/calypso-dev/.claude/skills/setup-workspace/SKILL.md
new file mode 100644
index 0000000..fdc1ce8
--- /dev/null
+++ b/software/firmware/calypso/workspaces/calypso-dev/.claude/skills/setup-workspace/SKILL.md
@@ -0,0 +1,18 @@
+---
+name: setup-workspace
+description: Change what this workspace checks out and re-run its setup. workspace.yml lists code repos (repos:), read-only dependency sources (references-git:), and clones of other Delphi workspaces or main to read (workspaces:). Use when the user wants to read or compare another workspace's or main's instructions, skills, or docs (link it), add or remove a repo or dependency reference, or run setup after cloning or pulling.
+---
+
+`workspace.yml` at the workspace root lists what `.delphi/setup.sh` checks out, all git-ignored: code repos (`repos:`), dependency sources (`references-git:`), and other Delphi workspaces or main (`workspaces:`, entries `- <name>` or `- main`; a workspace's name is the short names of its folders (each folder's `short-name` file, else its name) and its own folder name, joined by dots, like `s.app.argos.argos-dev`; `bash .delphi/switch.sh --list` lists them). The comment on each section gives its entry format and where it lands; read it, then edit the file.
+
+Run from the workspace root after any change, and to refresh references and workspace copies to their latest:
+
+```
+bash .delphi/setup.sh
+```
+
+- The clones under `workspaces/` are full clones, each on its branch (`ws/<name>` or `main`) tracking origin, for reading: don't edit, branch, or push them from this workspace. Each setup run switches a clone back to its branch if it was switched away (refused while it has uncommitted changes), pulls it, and runs its own setup, so that workspace's repos and references are under it too (it skips its own `workspaces:`, so they don't chain). To change one of those workspaces or main, work in its own clone or switch to it (`switch-workspace` skill).
+- This workspace's project folder (shared context, `AUTHORING.md`, `workspace-defaults/`) is the folder above `workspaces/<leaf>/` in `workspaces/main/` (`bash .delphi/switch.sh --list` prints it): for `s.app.argos.argos-dev`, `workspaces/main/software/application-software/argos/`. List workspaces and their project folders: `bash .delphi/switch.sh --list`.
+- `workspace.yml` is shared: change it on a branch and open a PR into `ws/<this-name>` (the `name:` in `workspace.yml`). For a one-off look, add the entry, run setup, then `git restore workspace.yml`.
+- Setup never deletes what you'd lose. A removed entry's `workspaces/<name>/`, `references/<name>/`, or repo store and worktrees stay until you delete them (ask first).
+- When Delphi releases a version that needs cleanup in clones, setup runs its migration first (`.delphi/migrations/`), once per workspace. A migration removes only what nothing is lost from, and otherwise stops setup with what to do: tell the user, do it with their go-ahead, and re-run.
diff --git a/software/firmware/calypso/workspaces/calypso-dev/.claude/skills/switch-workspace/SKILL.md b/software/firmware/calypso/workspaces/calypso-dev/.claude/skills/switch-workspace/SKILL.md
new file mode 100644
index 0000000..0b5a91a
--- /dev/null
+++ b/software/firmware/calypso/workspaces/calypso-dev/.claude/skills/switch-workspace/SKILL.md
@@ -0,0 +1,19 @@
+---
+name: switch-workspace
+description: Switch this clone to another Delphi workspace, or to Delphi's main, to work in it. Use when the user wants to check out, switch to, open, or work in another workspace or project, or to change another workspace's or main's files.
+---
+
+Run from the workspace root:
+
+```
+bash .delphi/switch.sh <name>        # ws/<name>: its dotted name, e.g. s.app.argos.argos-dev
+bash .delphi/switch.sh main          # Delphi's main: project folders, templates, CI
+```
+
+- List workspaces and their project folders: `bash .delphi/switch.sh --list`.
+- It refuses while tracked files have changes: commit them on a branch (and PR them) first. Then it fetches, switches, fast-forwards, and runs the new workspace's `.delphi/setup.sh`.
+- The post-checkout hook parks this workspace's `repos/`, `worktrees/`, `references/` and `workspaces/` in `.delphi/parked/<name>/` (git-ignored; `<name>` as in its `workspace.yml`) and brings the other's back at the same paths, so worktrees and the work in them return as they were. Switch back the same way. Never run `git clean -X` or `git stash --all` at the workspace root: they take ignored files, parked work included.
+- Before switching, stop anything running from `worktrees/` (dev servers, Docker builds): its folder moves.
+- Start a fresh harness session after switching so its instructions and skills match the new workspace. A harness integration may explicitly support reloading in place; follow its documented behavior.
+- To change the workspace you switched to: `git switch -c <branch>`, commit, push, and open a PR into `ws/<name>` (or `main`).
+- To only read another workspace or main without leaving this one, list it under `workspaces:` instead (`setup-workspace` skill).
diff --git a/software/firmware/calypso/workspaces/calypso-dev/workspace.generated b/software/firmware/calypso/workspaces/calypso-dev/workspace.generated
new file mode 100644
index 0000000..baf5132
--- /dev/null
+++ b/software/firmware/calypso/workspaces/calypso-dev/workspace.generated
@@ -0,0 +1,7 @@
+# Generated by ci/render.sh; edit shared sources or opt out in workspace.yml.
+100644 61c35f28dda167e42bebc3bad3994af97c53e876	.claude/settings.json	ci/plugins.sh
+100644 4917259f9e29db28e2636496e80f80ee5d9e321e	.claude/skills/journal/SKILL.md	software/skills/journal/SKILL.md
+100755 1e90d7b9afa14b8b0e7f36e0e1d83baecc94ba5b	.claude/skills/journal/scripts/capture.sh	software/skills/journal/scripts/capture.sh
+100644 0495fc97cbe93e4331c89263aee188f6c0e9c9ea	.claude/skills/new-worktree/SKILL.md	software/skills/new-worktree/SKILL.md
+100644 fdc1ce85211200223040edfb5dc65a3de7f35d53	.claude/skills/setup-workspace/SKILL.md	software/skills/setup-workspace/SKILL.md
+100644 0b5a91a731df227907cf8bc40a8a2e04c4518059	.claude/skills/switch-workspace/SKILL.md	software/skills/switch-workspace/SKILL.md
diff --git a/tests/e2e.sh b/tests/e2e.sh
index 168c1f4..e8194d1 100644
--- a/tests/e2e.sh
+++ b/tests/e2e.sh
@@ -47,8 +47,9 @@ cp "$src/software/short-name" "$t/seed/software/" && cp "$src/software/applicati
 cp -R "$src/$A/." "$t/seed/$A/"
 cp -R "$src/templates/workspace/." "$t/seed/$B/"
 sed -i.bak "s|{{name}}|$BN|" "$t/seed/$B/workspace.yml" && rm "$t/seed/$B/workspace.yml.bak"
-FD=software/electrical/firmware/workspace-defaults # project defaults for new workspaces under electrical/firmware
+FD=software/electrical/firmware/workspace-defaults/files # project defaults for new workspaces under electrical/firmware
 mkdir -p "$t/seed/$FD/.claude/skills/fw"
+printf "format: claude-code\n" >"$t/seed/${FD%/files}/source.yml"
 printf 'harness: claude-code\nrepos:\n  fw: https://example.com/fw.git\n' >"$t/seed/$FD/workspace.yml"
 printf '# Firmware for {{name}}\n' >"$t/seed/$FD/CLAUDE.md"
 echo "fw skill" >"$t/seed/$FD/.claude/skills/fw/SKILL.md"
@@ -59,7 +60,7 @@ set_json "$t/seed/software/application-software" default app # its scope: its sh
 set_json "$t/seed/software/application-software/argos" default argos # default sets above argos-dev
 TS=software/application-software/argos/plugins/claude/testing # an extra set a workspace can list under plugins:
 mkdir -p "$t/seed/$TS/.claude-plugin" && printf '{\n  "name": "argos.testing"\n}\n' >"$t/seed/$TS/.claude-plugin/plugin.json"
-(cd "$t/seed" && bash ci/plugins.sh >/dev/null) # the marketplace and each workspace's .claude/settings.json
+(cd "$t/seed" && bash ci/render.sh >/dev/null) # the marketplace and each workspace's .claude/settings.json
 git -C "$t/seed" add -A && git -C "$t/seed" commit -qm init
 git clone -q --bare "$t/seed" "$t/origin.git"
 git clone -q "$t/origin.git" "$t/ci"
@@ -69,7 +70,7 @@ o() { git -C "$t/origin.git" "$@"; }
 # commit_on <branch> <file> <text>: a person's PR into <branch>, merged (edit on a branch, merge --no-ff)
 commit_on() {
   (cd "$t/dev" && git fetch -q && git checkout -q -B "edit" "origin/$1" && printf '%s\n' "$3" >>"$2" &&
-    git add -- "$2" && git commit -qm "edit $2 on $1" && git checkout -q -B "tmp-$1" "origin/$1" &&
+    { [ "$1" != main ] || bash ci/render.sh >/dev/null; } && git add -A && git commit -qm "edit $2 on $1" && git checkout -q -B "tmp-$1" "origin/$1" &&
     git merge -q --no-ff --no-edit edit && git push -q origin "HEAD:$1")
 }
 
@@ -155,63 +156,49 @@ sync "$AN" >"$t/out" 2>&1 || fail "sync after a ws .delphi/ edit failed: $(cat "
 [ "$(o diff --name-only main propose/$AN)" = "$A/docs/CONTEXT.md" ] || fail "propose carries .delphi/: $(o diff --name-only main propose/$AN)"
 ok "a ws/* edit to .delphi/ is reset by refresh and never proposed into the folder"
 
-# --- 4c. .claude/settings.json is generated: refresh writes it from the ws branch's workspace.yml
+# --- 4c. native settings are reviewed on main; branch edits are rendered in a main-side proposal
 for p in app argos; do
-  o show "ws/$AN:.claude/settings.json" | grep -q "\"$p@delphi\": true" || fail "argos-dev lacks the $p default set"
+  o show "main:$A/.claude/settings.json" | grep -q "\"$p@delphi\": true" || fail "main lacks the $p default set"
 done
-! o show "ws/$BN:.claude/settings.json" | grep -q enabledPlugins || fail "bms-dev enables plugins with none above it"
+[ "$(o rev-parse "main:$A/.claude/settings.json")" = "$(o rev-parse "ws/$AN:.claude/settings.json")" ] || fail "settings differ from main"
 # shellcheck disable=SC2016 # the hook expands them
-o show "ws/$BN:.claude/settings.json" | grep -qF '"command": "bash \"$CLAUDE_PROJECT_DIR/.delphi/paths.sh\" >> \"$CLAUDE_ENV_FILE\""' ||
-  fail "bms-dev's settings.json lacks the SessionStart hook that sets DELPHI_ROOT"
-ok "each workspace's settings.json enables the default set of every folder above it"
-for p in app argos; do
-  o show "ws/$AN:workspace.yml" | grep -Eq "^  - $p +# default, from " || fail "argos-dev's workspace.yml doesn't list the $p default"
-done
-commit_on ws/$AN workspace.yml "$(printf 'plugins:\n  - app   # by hand')"
-(cd "$t/dev" && git fetch -q && git checkout -q -B drop origin/ws/$AN && sed -i.bak '/^  - argos .*# default, from /d' workspace.yml &&
-  rm workspace.yml.bak && git commit -qam "drop the argos default" && git push -q origin HEAD:ws/$AN)
-sync "$AN" >"$t/out" 2>&1 || fail "sync after dropping a default failed: $(cat "$t/out")"
-o show "ws/$AN:workspace.yml" | grep -Eq "^  - argos +# default, from " || fail "dropped default not listed again"
-[ "$(o show "ws/$AN:workspace.yml" | grep -c '^  - app ')" = 1 ] || fail "hand-listed default not folded into the generated line"
-[ "$(o log -1 --format=%s ws/$AN)" = "delphi: generate plugins: defaults and .claude/settings.json" ] || fail "no generate commit for the yml"
-ok "refresh lists every default set first under plugins: on ws/*, restoring a removed one and folding in a hand-listed one"
+o show "ws/$BN:.claude/settings.json" | grep -qF '"command": "bash \"$CLAUDE_PROJECT_DIR/.delphi/paths.sh\" >> \"$CLAUDE_ENV_FILE\""' || fail "SessionStart hook missing"
+ok "native settings already exist on main and refresh copies them unchanged"
 commit_on ws/$AN workspace.yml "$(printf 'plugins:\n  - argos.testing')"
-sync "$AN" >"$t/out" 2>&1 || fail "sync after listing a plugin set failed: $(cat "$t/out")"
-o show "ws/$AN:.claude/settings.json" | grep -q '"argos.testing@delphi": true' || fail "listed set not enabled"
-[ "$(o log -1 --format=%s ws/$AN)" = "delphi: generate plugins: defaults and .claude/settings.json" ] || fail "no generate commit"
-o show "propose/$AN:$A/.claude/settings.json" | grep -q argos.testing || fail "proposal lacks the generated settings"
-ok "a set listed under plugins: on ws/* is enabled by refresh's generated settings.json and proposed with it"
+sync "$AN" >"$t/out" 2>&1 || fail "main-side plugin proposal failed: $(cat "$t/out")"
+! o show "ws/$AN:.claude/settings.json" | grep -q argos.testing || fail "refresh generated settings on the workspace branch"
+o show "propose/$AN:$A/.claude/settings.json" | grep -q argos.testing || fail "main proposal lacks generated settings"
+ok "workspace configuration changes generate native settings in the main-side proposal, then wait for merge"
 commit_on ws/$AN .claude/settings.json "hand edit"
-sync "$AN" >"$t/out" 2>&1 || fail "sync after a settings.json hand edit failed: $(cat "$t/out")"
-! o show "ws/$AN:.claude/settings.json" | grep -qx "hand edit" || fail "hand edit to settings.json kept"
-ok "a hand edit to .claude/settings.json on ws/* is reset by refresh"
+sync "$AN" >"$t/out" 2>&1 || fail "settings reset failed: $(cat "$t/out")"
+[ "$(o rev-parse "main:$A/.claude/settings.json")" = "$(o rev-parse "ws/$AN:.claude/settings.json")" ] || fail "hand edit kept"
+ok "refresh resets managed native settings from main without running an adapter"
 commit_on ws/$AN workspace.yml "  - argos.nope"
-ws=$(o rev-parse ws/$AN)
-if sync "$AN" >"$t/out" 2>"$t/err"; then fail "sync with an unknown plugin set exited 0"; fi
-grep -q "ws/$AN: plugins: .* lists argos.nope, which isn't a plugin set" "$t/err" || fail "unknown set not reported: $(cat "$t/err")"
+if sync "$AN" >"$t/out" 2>"$t/err"; then fail "unknown plugin set accepted"; fi
+grep -q "lists argos.nope, which isn't a plugin set" "$t/err" || fail "unknown set not reported: $(cat "$t/err")"
 (cd "$t/dev" && git fetch -q && git checkout -q -B fix origin/ws/$AN && sed -i.bak '/nope/d' workspace.yml && rm workspace.yml.bak &&
   git commit -qam "drop unknown set" && git push -q origin HEAD:ws/$AN)
-sync "$AN" >/dev/null 2>&1 || fail "sync after dropping the unknown set failed"
-ok "an unknown set under plugins: is reported, exit 1, until fixed"
+sync "$AN" >/dev/null 2>&1 || fail "sync after dropping unknown set failed"
+ok "a failed main-side render prevents publication of the proposal"
 
-# --- 4d. workspace-inherit/: every workspace below a folder gets its files on refresh, never proposes them, and can opt out
+# --- 4d. managed native copies live on main; refresh copies them and opt-outs transfer ownership
 on_main() { # <message> <command...>: a change on main, pushed
   local m=$1 && shift
-  (cd "$t/dev" && git fetch -q && git checkout -q -B tmp-main origin/main && "$@" && git add -A && git commit -qm "$m" && git push -q origin HEAD:main)
+  (cd "$t/dev" && git fetch -q && git checkout -q -B tmp-main origin/main && "$@" && bash ci/render.sh >/dev/null && git add -A && git commit -qm "$m" && git push -q origin HEAD:main)
 }
-TI=software/workspace-inherit/.claude/skills/top AI=software/application-software/workspace-inherit/notes
-on_main "inherit" sh -c "mkdir -p $TI $AI && echo 'top v1' >$TI/SKILL.md && echo 'app v1' >$AI/app.md"
+TI=software/workspace-inherit/files/.claude/skills/top AI=software/application-software/workspace-inherit/files/notes
+on_main "inherit" sh -c "mkdir -p $TI $AI && echo 'top v1' >$TI/SKILL.md && echo 'app v1' >$AI/app.md && printf 'format: claude-code\\n' >software/workspace-inherit/source.yml && printf 'format: claude-code\\n' >software/application-software/workspace-inherit/source.yml"
 sync >"$t/out" 2>&1 || fail "sync after adding workspace-inherit/ failed: $(cat "$t/out")"
 for n in "$AN" "$BN"; do o show "ws/$n:.claude/skills/top/SKILL.md" | grep -qx "top v1" || fail "ws/$n lacks software/workspace-inherit/"; done
 o show "ws/$AN:notes/app.md" | grep -qx "app v1" || fail "ws/$AN lacks application-software/workspace-inherit/"
 ! o cat-file -e "ws/$BN:notes/app.md" 2>/dev/null || fail "ws/$BN inherited from a folder it isn't under"
-[ "$(o log -1 --format=%s ws/$BN)" = "delphi: sync inherited files from main" ] || fail "no inherit commit on ws/$BN"
-! o cat-file -e "propose/$AN:$A/.claude/skills/top/SKILL.md" 2>/dev/null || fail "inherited file proposed"
-ok "refresh writes every workspace-inherit/ folder above a workspace onto ws/<name>, and only those"
+[ "$(o rev-parse "main:$A/.claude/skills/top/SKILL.md")" = "$(o rev-parse "ws/$AN:.claude/skills/top/SKILL.md")" ] || fail "native inheritance is absent on main"
+o show "propose/$AN:$A/.claude/skills/top/SKILL.md" | grep -qx "top v1" || fail "main proposal lost managed output"
+ok "main holds applicable native inheritance and refresh copies it into the workspace root"
 commit_on ws/$AN .claude/skills/top/SKILL.md "ws edit"
 sync "$AN" >"$t/out" 2>&1 || fail "sync after a ws edit to an inherited file failed: $(cat "$t/out")"
 [ "$(o show "ws/$AN:.claude/skills/top/SKILL.md")" = "top v1" ] || fail "ws edit to an inherited file not reset"
-! o cat-file -e "propose/$AN:$A/.claude/skills/top/SKILL.md" 2>/dev/null || fail "ws edit to an inherited file proposed"
+[ "$(o show "propose/$AN:$A/.claude/skills/top/SKILL.md")" = "top v1" ] || fail "ws edit to managed output proposed"
 on_main "inherit v2, drop app.md" sh -c "echo 'top v2' >$TI/SKILL.md && git rm -q $AI/app.md"
 sync >"$t/out" 2>&1 || fail "sync after changing workspace-inherit/ failed: $(cat "$t/out")"
 o show "ws/$AN:.claude/skills/top/SKILL.md" | grep -qx "top v2" || fail "inherited change not refreshed"
@@ -226,6 +213,30 @@ o show "propose/$BN:$B/.claude/skills/top/SKILL.md" | grep -qx "bms own" || fail
 o show "ws/$AN:.claude/skills/top/SKILL.md" | grep -qx "top v3" || fail "argos-dev lost the inherited file"
 ok "a workspace that lists a path under opt-out: keeps and proposes its own copy, and refresh leaves it alone"
 
+on_main "inherited file fixture" sh -c "mkdir -p $AI && echo before >$AI/layout"
+sync refresh "$AN" >/dev/null
+on_main "replace inherited file with directory" sh -c "rm $AI/layout && mkdir $AI/layout && echo after >$AI/layout/guide.md"
+sync refresh "$AN" >"$t/out" 2>&1 || fail "managed file-to-directory refresh: $(cat "$t/out")"
+o show "main:$A/notes/layout/guide.md" | grep -qx after || fail "main lacks native nested output"
+o show "ws/$AN:notes/layout/guide.md" | grep -qx after || fail "refresh lost nested output"
+ok "native managed paths can change from files to directories without creating sparse-index entries"
+
+# Source retirement must preserve ownership claimed on a workspace branch before its proposal merges.
+on_main "unmerged ownership fixture" sh -c 'mkdir -p software/skills/unmerged; echo shared >software/skills/unmerged/SKILL.md'
+sync refresh "$BN" >/dev/null
+commit_on "ws/$BN" workspace.yml "  - .claude/skills/unmerged"
+commit_on "ws/$BN" .claude/skills/unmerged/SKILL.md "workspace-owned unmerged"
+sync refresh "$BN" >/dev/null
+on_main "retire unmerged source" git rm -rq software/skills/unmerged
+sync refresh "$BN" >"$t/out" 2>&1 || fail "retiring an unmerged opt-out conflicted: $(cat "$t/out")"
+(cd "$t/dev" && git fetch -q && git checkout -q -B retire-owned "origin/ws/$BN" &&
+  sed -i.bak '\|^  - .claude/skills/unmerged$|d' workspace.yml && rm workspace.yml.bak &&
+  git commit -qam "drop obsolete opt-out" && git push -q origin "HEAD:ws/$BN")
+sync "$BN" >"$t/out" 2>&1 || fail "unmerged owned copy proposal: $(cat "$t/out")"
+o show "ws/$BN:.claude/skills/unmerged/SKILL.md" | grep -qx 'workspace-owned unmerged' || fail "unmerged ownership was deleted"
+o show "propose/$BN:$B/.claude/skills/unmerged/SKILL.md" | grep -qx 'workspace-owned unmerged' || fail "unmerged ownership not proposed"
+ok "retiring a source and obsolete opt-out preserves workspace ownership before its proposal merges"
+
 # --- 5. a conflict on bms-dev is reported; argos-dev still syncs; exit 1
 commit_on ws/$BN CLAUDE.md "ws side"
 commit_on main "$B/CLAUDE.md" "main side"
@@ -269,8 +280,20 @@ expect_bad unknown-harness "unknown harness 'unknown'" sed -i.bak 's/harness: co
 expect_bad codex-plugin "codex does not support Delphi plugin sets" sh -c "printf 'plugins:\n  - delphi\n' >>$CX/workspace.yml"
 expect_bad codex-no-instructions "AGENTS.md: required for codex" rm "$CX/AGENTS.md"
 expect_bad codex-wrong-native "CLAUDE.md: belongs to a different harness" touch "$CX/CLAUDE.md"
-expect_bad codex-inherited-wrong-native "belongs to a different harness" sh -c "mkdir -p software/workspace-inherit/.claude && echo x >software/workspace-inherit/.claude/extra.json"
+expect_bad codex-inherited-wrong-native "has no mapping to codex" sh -c "mkdir -p software/workspace-inherit/files/.claude && printf 'format: claude-code\\n' >software/workspace-inherit/source.yml && echo x >software/workspace-inherit/files/.claude/extra.json"
 expect_bad neutral-collision "also inherits it from a folder above" sh -c "mkdir -p software/application-software/skills/journal && echo x >software/application-software/skills/journal/SKILL.md"
+expect_bad missing-native-output "$CX/.agents/skills/journal/SKILL.md: inherited from" rm "$CX/.agents/skills/journal/SKILL.md"
+expect_bad changed-shared-source "out of date; run ci/render.sh" sh -c "echo changed >>software/skills/journal/SKILL.md"
+expect_bad missing-ownership-record "$CX/workspace.generated: ownership record is out of date" rm "$CX/workspace.generated"
+expect_bad unknown-source-format "declare one supported source format" sh -c "echo 'format: unknown' >${A%/workspaces/*}/workspace-defaults/source.yml"
+expect_bad mixed-source-formats "AGENTS.md does not belong to the declared claude-code format" touch "${A%/workspaces/*}/workspace-defaults/files/AGENTS.md"
+expect_bad owned-output-collision "workspace-owned file collides" sh -c "mkdir -p software/skills/collision $CX/.agents/skills/collision && echo shared >software/skills/collision/SKILL.md && echo own >$CX/.agents/skills/collision/SKILL.md"
+
+d=$t/chk-owned-output-collision
+if "$src/ci/render.sh" "$d" >"$t/out" 2>"$t/err"; then fail "renderer overwrote an owned collision"; fi
+[ "$(cat "$d/$CX/.agents/skills/collision/SKILL.md")" = own ] || fail "renderer changed the workspace-owned file"
+ok "main-side generation refuses an owned collision and preserves its content"
+
 expect_bad no-harness "harness is missing" sh -c "sed -i.bak 's/^harness:.*//' $A/workspace.yml && rm $A/workspace.yml.bak"
 expect_bad duplicate-harness "duplicate harness" sh -c "printf 'harness: x\n' >>$A/workspace.yml"
 expect_bad bad-repo "bad repos entry" sh -c "awk '{ print } /^repos:/ { print \"  ../x: y\" }' $A/workspace.yml >$A/y && mv $A/y $A/workspace.yml"
@@ -279,7 +302,7 @@ expect_bad reference-repo-clash "duplicate repo: argos" sh -c "printf 'reference
 expect_bad bad-key "unexpected line" sh -c "printf 'color: x\n' >>$A/workspace.yml"
 expect_bad wrong-name "(.delphi/names.sh)" sh -c "sed -i.bak 's/^name:.*/name: other/' $A/workspace.yml && rm $A/workspace.yml.bak"
 expect_bad no-name "name is missing" sh -c "sed -i.bak '/^name:/d' $A/workspace.yml && rm $A/workspace.yml.bak"
-expect_bad defaults-name "workspace-defaults/workspace.yml: unexpected line: name:" sh -c "printf 'name: x\n' >>${A%/workspaces/*}/workspace-defaults/workspace.yml"
+expect_bad defaults-name "workspace-defaults/files/workspace.yml: unexpected line: name:" sh -c "printf 'name: x\n' >>${A%/workspaces/*}/workspace-defaults/files/workspace.yml"
 expect_bad park-path "bad park entry" sh -c "printf 'park:\n  - a/b\n' >>$A/workspace.yml"
 expect_bad park-git "bad park entry" sh -c "printf 'park:\n  - .git\n' >>$A/workspace.yml"
 expect_bad park-duplicate "duplicate park entry: pictures" sh -c "printf 'park:\n  - pictures\n  - pictures\n' >>$A/workspace.yml"
@@ -316,18 +339,26 @@ expect_bad migration-header "start it with" sh -c "echo 'echo hi' >.delphi/migra
 expect_bad history-rewritten "only add lines" sed -i.bak 's/linked/LINKED/' .delphi/versions
 expect_bad released-migration-changed "add a new version's migration instead" sh -c "echo '# x' >>.delphi/migrations/0.0.1-linked-worktrees-to-clones.sh"
 expect_bad workflow-drift "argos-dev/.github/workflows/delphi.yml: differs" sh -c "echo x >>$A/.github/workflows/delphi.yml"
-expect_bad defaults-manifest "workspace-defaults/workspace.yml: unexpected line" sh -c "printf 'x: y\n' >>${A%/workspaces/*}/workspace-defaults/workspace.yml"
+expect_bad defaults-manifest "workspace-defaults/files/workspace.yml: unexpected line" sh -c "printf 'x: y\n' >>${A%/workspaces/*}/workspace-defaults/files/workspace.yml"
 expect_bad defaults-named-workspace "workspace-defaults/.delphi: managed" sh -c "mkdir -p software/x/workspaces/workspace-defaults/.delphi && cp -R $A/. software/x/workspaces/workspace-defaults/"
 expect_bad old-defaults "defaults: renamed workspace-defaults/" mkdir -p "${A%/workspaces/*}/defaults"
 expect_bad inherited-file-kept "$A/.claude/skills/journal/SKILL.md: inherited from software/skills/journal/" sh -c "mkdir -p $A/.claude/skills/journal && echo x >$A/.claude/skills/journal/SKILL.md"
-expect_bad inherited-twice "also inherits it from a folder above" sh -c "mkdir -p software/application-software/workspace-inherit/.claude/skills/journal && echo x >software/application-software/workspace-inherit/.claude/skills/journal/SKILL.md"
-expect_bad inherited-claude-md "software/workspace-inherit/CLAUDE.md: each workspace has its own" sh -c "mkdir -p software/workspace-inherit && echo x >software/workspace-inherit/CLAUDE.md"
+d=$t/chk-inherited-file-kept
+rm -r "$d/software/skills/journal"
+if "$src/ci/render.sh" "$d" >"$t/out" 2>"$t/err"; then fail "renderer deleted edited retired output"; fi
+grep -q 'retired managed file has local edits' "$t/err" || fail "retired edit not reported"
+[ "$(cat "$d/$A/.claude/skills/journal/SKILL.md")" = x ] || fail "retired edited output deleted"
+ok "main-side generation reports edited retired files and leaves their content intact"
+
+expect_bad inherited-twice "also inherits it from a folder above" sh -c "mkdir -p software/application-software/workspace-inherit/files/.claude/skills/journal && printf 'format: claude-code\\n' >software/application-software/workspace-inherit/source.yml && echo x >software/application-software/workspace-inherit/files/.claude/skills/journal/SKILL.md"
+expect_bad inherited-claude-md "software/workspace-inherit/files/CLAUDE.md: each workspace has its own" sh -c "mkdir -p software/workspace-inherit/files && printf 'format: claude-code\\n' >software/workspace-inherit/source.yml && echo x >software/workspace-inherit/files/CLAUDE.md"
 expect_bad inherit-in-workspace "belongs in an org or project folder" sh -c "mkdir -p $A/workspace-inherit && echo x >$A/workspace-inherit/f"
 expect_bad bad-opt-out "bad opt-out entry" sh -c "printf 'opt-out:\n  - ../x\n' >>$A/workspace.yml"
 expect_bad opt-out-nothing "opt-out: nope is nothing it inherits" sh -c "printf 'opt-out:\n  - nope\n' >>$A/workspace.yml"
 d=$t/chk-opt-out && rm -rf "$d" && mkdir "$d" && cp -R "$src/software" "$src/templates" "$src/.github" "$src/.delphi" "$src/.claude-plugin" "$d/"
 (cd "$d" && git init -q && mkdir -p $A/.claude/skills/journal && echo x >$A/.claude/skills/journal/SKILL.md &&
   printf 'opt-out:\n  - .claude/skills/journal/\n' >>$A/workspace.yml && git add -A && git commit -qm base)
+"$src/ci/render.sh" "$d" >/dev/null 2>&1 || fail "opt-out rendering failed"
 "$src/ci/check.sh" "$d" >/dev/null 2>&1 || fail "check fails on a workspace keeping an inherited path it opts out of"
 ok "a workspace may keep its own copy of an inherited path it lists under opt-out:"
 expect_bad links-renamed "links: is now workspaces:" sh -c "sed -i.bak 's/^workspaces:/links:/' $A/workspace.yml && rm $A/workspace.yml.bak"
@@ -479,7 +510,7 @@ o show "new-workspace/electrical/firmware/fw-dev:$F/CLAUDE.md" | grep -qx "# Fir
   fail "defaults workspace.yml not used, or name: not set"
 o cat-file -e "new-workspace/electrical/firmware/fw-dev:$F/.claude/skills/fw/SKILL.md" || fail "defaults skill not copied"
 o cat-file -e "new-workspace/electrical/firmware/fw-dev:$F/.claude/settings.json" || fail "new workspace has no generated settings.json"
-! o cat-file -e "new-workspace/electrical/firmware/fw-dev:$F/.claude/skills/top/SKILL.md" 2>/dev/null || fail "an inherited skill was copied into the folder"
+o cat-file -e "new-workspace/electrical/firmware/fw-dev:$F/.claude/skills/top/SKILL.md" || fail "main PR lacks inherited native skill"
 grep -q "gh pr create --base main --head new-workspace/electrical/firmware/fw-dev --title Add workspace $FN --label by: ai --body ## Changes" "$t/gh.log" ||
   fail "no PR for new workspace, or not labelled by: ai with the template's sections: $(cat "$t/gh.log")"
 (cd "$t/dev" && tools/new-workspace.sh --by ai-assisted electrical/firmware fw-two >/dev/null) || fail "new-workspace.sh --by failed"
@@ -491,7 +522,7 @@ grep -q "s.electrical.firmware.fw-two --label by: ai-assisted " "$t/gh.log" || f
 (cd "$t/dev" && ! tools/new-workspace.sh ../x ok 2>/dev/null) || fail "bad org path accepted"
 [ -z "$(git -C "$t/dev" status --porcelain)" ] || fail "new-workspace touched the checkout"
 ok "new-workspace.sh opens a PR with the templated folder; rejects duplicates and bad input"
-ok "new-workspace.sh adds the project's workspace-defaults/ (CLAUDE.md appended, placeholders filled), not inherited files"
+ok "new-workspace.sh adds the project's workspace-defaults/ (CLAUDE.md appended, placeholders filled), with native managed inheritance on main"
 ok "new-workspace.sh works when a local new-workspace/<name> branch is left over"
 ok "new-workspace.sh's PR follows the PR template, labelled by: ai unless --by says otherwise"
 
@@ -712,7 +743,8 @@ if command -v python3 >/dev/null && command -v curl >/dev/null; then
   for _ in $(seq 50); do [ -s "$t/web.out" ] && break; sleep 0.1; done
   url=$(head -1 "$t/web.out") port=${url#http://127.0.0.1:} port=${port%%/*}
   get() { curl -s -o /dev/null -w '%{http_code}' "$@"; }
-  { [ "$(get "$url")" = 200 ] && curl -s "$url" | grep -q "<title>Delphi workspaces</title>" &&
+  # Consume the whole HTML response: grep -q can make curl fail with SIGPIPE under pipefail.
+  { [ "$(get "$url")" = 200 ] && curl -s "$url" | grep "<title>Delphi workspaces</title>" >/dev/null &&
     [ "$(get "http://127.0.0.1:$port/")" = 404 ] && [ "$(get "http://127.0.0.1:$port/wrong/api/state")" = 404 ] &&
     [ "$(get -H "Host: evil.example:$port" "${url}api/state")" = 403 ]; } || fail "web/server.py let a request without its token or a local Host through"
   curl -s "${url}api/state" | python3 -c 'import json, sys; s = json.load(sys.stdin); sys.exit(not (s["here"] == sys.argv[1] and s["workspaces"] == ["main", sys.argv[1] + " software/application-software/argos"] and not s["isDirty"]))' "$AN" ||
@@ -778,7 +810,7 @@ commit_on "ws/$CO" CLAUDE.md "old side" && commit_on "ws/$CN" .gitattributes "#
   ! o show "ws/$CN:CLAUDE.md" | grep -qx "old side"; } || fail "a diverged old name was merged or not reported: $(cat "$t/out")"
 ok "an old name with commits of its own is reported, never merged"
 
-# --- 13. portable harnesses: native skills, round trips, transitions, bootstrap and authoring
+# --- 13. portable harnesses: native main-side output, round trips, transitions, bootstrap and authoring
 C=software/application-software/argos/workspaces/sandbox-codex CN=s.app.argos.sandbox-codex
 # shellcheck disable=SC2016 # child shell expands its positional arguments
 on_main "add Codex and neutral skills" bash -c '
@@ -797,21 +829,29 @@ for skill in top portable; do
 done
 ! o cat-file -e "ws/$CN:.claude" 2>/dev/null || fail "Codex inherited Claude files"
 [ "$(o rev-parse "ws/$CN^")" = "$(o rev-parse main)" ] || fail "Codex creation parent"
-ok "Codex creation maps neutral and legacy shared skills to .agents/skills without Claude settings"
+ok "main-side rendering maps portable and declared Claude-source skills to Codex native paths"
+o diff --quiet "main:$C" "ws/$CN" -- ':!.delphi' || fail "Codex branch requires native generation after main"
+ok "Codex files on main exactly match the workspace branch before runtime injection"
+
 commit_on "ws/$CN" .agents/skills/portable/SKILL.md "workspace edit"
 commit_on "ws/$CN" AGENTS.md "workspace-owned instructions"
 sync propose "$CN" >"$t/out" 2>&1 || fail "Codex proposal: $(cat "$t/out")"
-! o cat-file -e "propose/$CN:$C/.agents/skills/portable/SKILL.md" 2>/dev/null || fail "native inherited skill proposed"
+[ "$(o show "propose/$CN:$C/.agents/skills/portable/SKILL.md")" = "portable v1" ] || fail "managed skill edit proposed"
 o show "propose/$CN:$C/AGENTS.md" | grep -qx "workspace-owned instructions" || fail "AGENTS.md not proposed"
 sync refresh "$CN" >/dev/null
 [ "$(o show "ws/$CN:.agents/skills/portable/SKILL.md")" = "portable v1" ] || fail "Codex inherited edit not reset"
-ok "Codex proposals preserve native instructions and strip inherited native skills; refresh resets inherited edits"
+ok "Codex proposals preserve native instructions and retain reviewed native skills; refresh resets inherited edits"
 on_main "move legacy skill source, remove helper" bash -c '
   mkdir -p software/skills
-  git mv software/workspace-inherit/.claude/skills/top software/skills/top
+  git mv software/workspace-inherit/files/.claude/skills/top software/skills/top
   git rm -q software/skills/portable/scripts/helper.sh
 '
+mkdir "$t/adapters"
+for script in harnesses sources inherit render; do mv "$t/ci/ci/$script.sh" "$t/adapters/"; done
 sync refresh "$CN" >"$t/out" 2>&1 || fail "source migration: $(cat "$t/out")"
+for script in harnesses sources inherit render; do mv "$t/adapters/$script.sh" "$t/ci/ci/"; done
+ok "refresh delivers changed native files without loading source readers or harness adapters"
+
 ! o cat-file -e "ws/$CN:.agents/skills/portable/scripts/helper.sh" 2>/dev/null || fail "stale inherited helper survived"
 o show "ws/$CN:.agents/skills/top/SKILL.md" | grep -qx "top v3" || fail "legacy source move lost skill"
 ok "neutral source migration keeps native paths stable and removes obsolete inherited files"
@@ -833,7 +873,6 @@ sync refresh "$CN" >"$t/out" 2>&1 || fail "Codex to Claude: $(cat "$t/out")"
 # shellcheck disable=SC2016 # child shell expands its positional arguments
 on_main "switch workspace back to Codex" bash -c '
   git mv "$1/CLAUDE.md" "$1/AGENTS.md"
-  git rm -q "$1/.claude/settings.json"
   printf "name: %s\nharness: codex\n" "$2" >"$1/workspace.yml"
 ' _ "$C" "$CN"
 sync "$CN" >"$t/out" 2>&1 || fail "Claude to Codex: $(cat "$t/out")"
@@ -844,9 +883,13 @@ ok "harness transitions remove old native skill destinations and generated setti
 (cd "$t/dev" && git fetch -q && git checkout -q -B stale-settings "origin/ws/$CN" &&
   mkdir -p .claude && echo '{}' >.claude/settings.json && git add .claude/settings.json &&
   git commit -qm "stale settings from previous harness" && git push -q origin "HEAD:ws/$CN")
-sync refresh "$CN" >"$t/out" 2>&1 || fail "stale generated settings cleanup: $(cat "$t/out")"
-! o cat-file -e "ws/$CN:.claude/settings.json" 2>/dev/null || fail "generated settings deletion was not committed"
-ok "Codex refresh stages and commits removal of stale generated settings from a workspace branch"
+if sync "$CN" >"$t/out" 2>"$t/err"; then fail "unrecorded foreign native file proposed"; fi
+grep -q 'belongs to a different harness' "$t/err" || fail "foreign native file not reported"
+o cat-file -e "ws/$CN:.claude/settings.json" || fail "unrecorded file silently deleted"
+(cd "$t/dev" && git fetch -q && git checkout -q -B remove-foreign "origin/ws/$CN" &&
+  git rm -q .claude/settings.json && git commit -qm "remove foreign native configuration" && git push -q origin "HEAD:ws/$CN")
+sync "$CN" >/dev/null 2>&1 || fail "sync after explicit foreign-file removal"
+ok "unrecorded foreign files fail validation and require an explicit workspace edit"
 commit_on "ws/$CN" workspace.yml "$(printf 'opt-out:\n  - .agents/skills/portable')"
 commit_on "ws/$CN" .agents/skills/portable/SKILL.md "Codex own"
 commit_on "ws/$CN" .agents/skills/portable/OWN.md "workspace-owned native file"
@@ -893,49 +936,68 @@ proxy=$(PATH="$t/proxy-bin:$PATH" DELPHI_GITHUB_REST_PROXY=1 CLAUDE_CODE_REMOTE=
 ' _ "$provider" "$w") || fail "explicit REST proxy capability selection"
 [ "$proxy" = proxy-response ] || fail "REST proxy did not use stubbed provider"
 ok "shared GitHub helpers support an explicit REST-proxy capability without harness-specific environment detection"
-# shellcheck disable=SC2016 # child shell expands its positional argument
-on_main "native instruction defaults" bash -c 'printf "# Codex firmware {{name}}\n" >"$1/AGENTS.md"' _ "$FD"
+# A Codex target consumes the single Claude-authored defaults bundle.
 (cd "$t/dev" && git fetch -q && git checkout -q -B main origin/main &&
   tools/new-workspace.sh --harness codex electrical/firmware fw-codex >/dev/null) || fail "Codex new workspace"
 F=software/electrical/firmware/workspaces/fw-codex
 created=new-workspace/electrical/firmware/fw-codex
 o show "$created:$F/workspace.yml" | grep -qx 'harness: codex' || fail "default harness not overridden"
 o show "$created:$F/workspace.yml" | grep -q 'fw: https://example.com/fw.git' || fail "project repos lost"
-o show "$created:$F/AGENTS.md" | grep -qx '# Codex firmware s.electrical.firmware.fw-codex' || fail "Codex native instruction defaults lost"
+o show "$created:$F/AGENTS.md" | grep -qx '# Firmware for s.electrical.firmware.fw-codex' || fail "Claude-authored instructions not translated"
+o cat-file -e "$created:$F/.agents/skills/fw/SKILL.md" || fail "Claude-authored default skill not translated"
+o cat-file -e "$created:$F/.agents/skills/top/SKILL.md" || fail "main PR lacks inherited native skill"
 { ! o cat-file -e "$created:$F/CLAUDE.md" 2>/dev/null && ! o cat-file -e "$created:$F/.claude" 2>/dev/null; } || fail "Claude defaults leaked into Codex workspace"
 (cd "$t/dev" && ! tools/new-workspace.sh --harness unknown electrical/firmware bad-harness >/dev/null 2>&1) || fail "unknown authoring harness accepted"
-ok "Codex authoring chooses native template/defaults, preserves project repos and rejects unknown harnesses"
+ok "Codex creation translates one Claude-authored defaults bundle into native files before its main PR"
 
+# Changing a creation suggestion does not change the source format or any existing workspace.
 # shellcheck disable=SC2016 # child shell edits the sandbox project's defaults
-on_main "project selects Codex by default" bash -c '
+on_main "project suggests Codex" bash -c '
   sed -i.bak "s/harness: claude-code/harness: codex/" "$1/workspace.yml"
   rm "$1/workspace.yml.bak"
-  mkdir -p "$1/.agents/skills/fw-codex" "$1/.codex"
-  printf "Codex firmware skill\n" >"$1/.agents/skills/fw-codex/SKILL.md"
-  printf "# Codex project defaults\n" >"$1/.codex/config.toml"
 ' _ "$FD"
 (cd "$t/dev" && git fetch -q && git checkout -q -B main origin/main &&
   tools/new-workspace.sh electrical/firmware fw-project-codex >/dev/null) || fail "project-default Codex workspace"
 F=software/electrical/firmware/workspaces/fw-project-codex
 created=new-workspace/electrical/firmware/fw-project-codex
-o show "$created:$F/workspace.yml" | grep -qx 'harness: codex' || fail "project harness default ignored"
-o show "$created:$F/workspace.yml" | grep -q 'fw: https://example.com/fw.git' || fail "default Codex project repos lost"
-o show "$created:$F/AGENTS.md" | grep -qx '# Codex firmware s.electrical.firmware.fw-project-codex' || fail "default Codex native instructions lost"
-o cat-file -e "$created:$F/.agents/skills/fw-codex/SKILL.md" || fail "default Codex native skill lost"
-o cat-file -e "$created:$F/.codex/config.toml" || fail "default Codex project config lost"
-{ ! o cat-file -e "$created:$F/CLAUDE.md" 2>/dev/null && ! o cat-file -e "$created:$F/.claude" 2>/dev/null; } || fail "Claude files leaked into project-default Codex workspace"
-ok "authoring without --harness honors project Codex defaults and preserves native files and repos"
-
-(cd "$t/dev" && tools/new-workspace.sh --harness claude-code electrical/firmware fw-project-claude >/dev/null) || fail "explicit Claude override"
+o show "$created:$F/workspace.yml" | grep -qx 'harness: codex' || fail "project suggestion ignored"
+o show "$created:$F/AGENTS.md" | grep -qx '# Firmware for s.electrical.firmware.fw-project-codex' || fail "translated defaults lost"
+o show "main:${FD%/files}/source.yml" | grep -qx 'format: claude-code' || fail "creation suggestion changed source format"
+o show "main:$A/workspace.yml" | grep -qx 'harness: claude-code' || fail "existing workspace harness changed"
+ok "creation suggestions stay independent of source format and existing workspace harnesses"
+
+# A different source format feeds the same target adapters and unchanged branch model.
+# shellcheck disable=SC2016 # child shell migrates the source bundle
+on_main "author defaults in Codex format" bash -c '
+  printf "format: codex\n" >"${1%/files}/source.yml"
+  git mv "$1/CLAUDE.md" "$1/AGENTS.md"
+  mkdir -p "$1/.agents/skills"
+  git mv "$1/.claude/skills/fw" "$1/.agents/skills/fw"
+' _ "$FD"
+(cd "$t/dev" && git fetch -q && git checkout -q -B main origin/main &&
+  tools/new-workspace.sh --harness claude-code electrical/firmware fw-project-claude >/dev/null) || fail "Claude target from Codex source"
 F=software/electrical/firmware/workspaces/fw-project-claude
 created=new-workspace/electrical/firmware/fw-project-claude
-o show "$created:$F/workspace.yml" | grep -qx 'harness: claude-code' || fail "explicit Claude harness did not override Codex default"
-o show "$created:$F/workspace.yml" | grep -q 'fw: https://example.com/fw.git' || fail "Claude override project repos lost"
-o show "$created:$F/CLAUDE.md" | grep -qx '# Firmware for s.electrical.firmware.fw-project-claude' || fail "Claude override native instructions lost"
-o cat-file -e "$created:$F/.claude/skills/fw/SKILL.md" || fail "Claude override native skill lost"
-{ ! o cat-file -e "$created:$F/AGENTS.md" 2>/dev/null && ! o cat-file -e "$created:$F/.agents" 2>/dev/null &&
-  ! o cat-file -e "$created:$F/.codex" 2>/dev/null; } || fail "Codex files leaked into Claude override"
-ok "explicit Claude selection overrides project Codex defaults and removes foreign native files"
+o show "$created:$F/workspace.yml" | grep -qx 'harness: claude-code' || fail "explicit harness did not override suggestion"
+o show "$created:$F/workspace.yml" | grep -q 'fw: https://example.com/fw.git' || fail "project repos lost"
+o show "$created:$F/CLAUDE.md" | grep -qx '# Firmware for s.electrical.firmware.fw-project-claude' || fail "Codex source instructions not translated"
+o cat-file -e "$created:$F/.claude/skills/fw/SKILL.md" || fail "Codex source skill not translated"
+{ ! o cat-file -e "$created:$F/AGENTS.md" 2>/dev/null && ! o cat-file -e "$created:$F/.agents" 2>/dev/null; } || fail "Codex files leaked into Claude target"
+ok "changing source format preserves target adapters, native main output and explicit workspace harnesses"
+
+# Native settings require an explicit mapping, never silent removal.
+# shellcheck disable=SC2016 # child shell adds a source-native configuration
+on_main "Codex-native configuration default" bash -c 'mkdir -p "$1/.codex"; echo "# native settings" >"$1/.codex/config.toml"' _ "$FD"
+(cd "$t/dev" && git fetch -q && git checkout -q -B main origin/main &&
+  ! tools/new-workspace.sh --harness claude-code electrical/firmware unsupported >/dev/null 2>"$t/err") || fail "unsupported native settings silently accepted"
+grep -q 'has no mapping to claude-code' "$t/err" || fail "unsupported mapping not reported"
+[ -z "$(git -C "$t/dev" status --porcelain)" ] || fail "failed generation changed caller checkout"
+ok "unsupported native settings fail explicitly and leave the caller checkout untouched"
+
+(cd "$t/dev" && git fetch -q && git checkout -q -B main origin/main &&
+  bash ci/render.sh --check && [ -z "$(git status --porcelain)" ] &&
+  bash ci/render.sh >/dev/null && [ -z "$(git status --porcelain)" ]) || fail "main-side render was not idempotent"
+ok "render checks do not write and repeated rendering leaves a valid main checkout unchanged"
 
 # --- 14. shellcheck, if installed
 if command -v shellcheck >/dev/null; then
diff --git a/tools/new-workspace.sh b/tools/new-workspace.sh
index 48f077d..3587e69 100755
--- a/tools/new-workspace.sh
+++ b/tools/new-workspace.sh
@@ -1,13 +1,7 @@
 #!/usr/bin/env bash
-# tools/new-workspace.sh [--by ai|ai-assisted|human] [--harness <adapter>] <org-path under software/> <leaf>: propose a new
-# workspace as a PR to main, labelled `by: <who>` (default ai: who wrote it, as the PR template asks).
-# In a temporary worktree of origin/main, copies templates/workspace/ and then, if present, the
-# project's software/<org-path>/workspace-defaults/ (matching native instructions appended to the template's) to
-# software/<org-path>/workspaces/<leaf>/, sets `name: <name>` in its workspace.yml (its dotted name from
-# .delphi/names.sh, like s.app.argos.argos-dev; the workspace-inherit/ folders above it reach ws/<name>
-# on each sync), and generates adapter-owned files through ci/harnesses.sh,
-# checks it, pushes branch new-workspace/<org-path>/<leaf>, and opens the PR with gh. Your checkout is
-# untouched. After merge, ci/sync.sh creates ws/<name>.
+# tools/new-workspace.sh [--by ai|ai-assisted|human] [--harness <adapter>] <org-path> <leaf>:
+# prepare a main-side PR with native defaults and managed output for its explicitly recorded harness.
+# Uses a temporary checkout of origin/main; never changes the caller's checkout.
 set -euo pipefail
 die() { echo "new-workspace: $*" >&2 && exit 1; }
 by=ai
@@ -37,21 +31,27 @@ trap 'git worktree remove --force "$wt"' EXIT
 defaults=$wt/software/$org/workspace-defaults
 [ ! -e "$wt/$folder" ] || die "$folder already exists on main"
 mkdir -p "$wt/$folder"
-# shellcheck source=ci/harnesses.sh
-source "$wt/ci/harnesses.sh"
-[ -n "$adapter" ] || adapter=$(awk '/^harness:/ { print $2; exit }' "$defaults/workspace.yml" 2>/dev/null || true)
+# shellcheck source=ci/inherit.sh
+source "$wt/ci/inherit.sh"
+[ -n "$adapter" ] || adapter=$(awk '/^harness:/ { print $2; exit }' "$defaults/files/workspace.yml" 2>/dev/null || true)
 harness "${adapter:-claude-code}" || die "unsupported harness"
 adapter=${adapter:-claude-code}
 cp -R "$wt/templates/workspace/." "$wt/$folder/"
-[ ! -d "$defaults" ] || cp -R "$defaults/." "$wt/$folder/"
-# Native instruction defaults are harness-specific; other project defaults are preserved.
 rm -f "$wt/$folder/CLAUDE.md" "$wt/$folder/AGENTS.md"
 cp "$wt/$instruction_template" "$wt/$folder/$instruction"
-[ ! -f "$defaults/$instruction" ] || { echo; cat "$defaults/$instruction"; } >>"$wt/$folder/$instruction"
-case "$adapter" in
-  codex) rm -rf "$wt/$folder/.claude" ;;
-  claude-code) rm -rf "$wt/$folder/.agents" "$wt/$folder/.codex" ;;
-esac
+if [ -d "$defaults" ]; then
+  records=$(cd "$wt" && bundle_files "" "software/$org/workspace-defaults" "$adapter") || die "cannot read project defaults"
+  while IFS=$'\t' read -r meta path src; do
+    [ -n "$path" ] || continue
+    if [ "$path" = "$instruction" ]; then
+      { echo; cat "$wt/$src"; } >>"$wt/$folder/$instruction"
+    else
+      mkdir -p "$(dirname "$wt/$folder/$path")"
+      cp "$wt/$src" "$wt/$folder/$path"
+      [ "${meta%% *}" != 100755 ] || chmod +x "$wt/$folder/$path"
+    fi
+  done <<<"$records"
+fi
 name=$(cd "$wt" && bash .delphi/names.sh | awk -v f="$folder" '$2 == f { print $1 }')
 taken=$(cd "$wt" && bash .delphi/names.sh | awk -v n="$name" -v f="$folder" '$1 == n && $2 != f { print $2 }')
 [ -z "$taken" ] || die "$taken is already named $name (names are unique); pick another leaf"
@@ -60,15 +60,19 @@ for b in "ws/$name" "ws/software/$org/$leaf"; do # ws/software/…: a workspace'
 done
 sed -i.bak -e "s|{{name}}|$name|g" -e "s|{{folder}}|$folder|g" "$wt/$folder/$instruction" && rm "$wt/$folder/$instruction.bak"
 y=$wt/$folder/workspace.yml
+if [ "$plugins" = none ] && awk '/^plugins:/ { s = 1; next } /^[^[:space:]#]/ { s = 0 }
+  s && /^[[:space:]]+-/ { found = 1 } END { exit !found }' "$y"; then
+  die "$adapter does not support Delphi plugin sets in project defaults"
+fi
 { echo "name: $name"; echo "harness: $adapter"; awk -v adapter="$adapter" '/^name:|^harness:/ { next } adapter != "claude-code" && /^plugins:/ { skip = 1; next } /^[^[:space:]#]/ { skip = 0 } !skip { print }' "$y"; } >"$y.new" && mv "$y.new" "$y"
-generate_harness "$wt" "$folder" "$wt/$folder"
+bash "$wt/ci/render.sh" "$wt"
 "$wt/ci/check.sh" "$wt"
 git -C "$wt" add -A "$folder"
 git -C "$wt" commit --quiet -m "New workspace $name"
 git -C "$wt" push --quiet origin "HEAD:refs/heads/$branch"
 gh pr create --base main --head "$branch" --title "Add workspace $name" --label "by: $by" --body "## Changes
 
-Adds \`$folder/\` from templates/workspace (plus software/$org/workspace-defaults if present). After merge, CI creates branch ws/$name.
+Adds \`$folder/\` from templates/workspace (plus translated project defaults and managed inheritance). After merge, CI creates branch ws/$name.
 
 ## Testing
 

From 26818f547be86fe544b8504d45e2af3c127c5510 Mon Sep 17 00:00:00 2001
From: Jesus God <wyattbracy@gmail.com>
Date: Wed, 21 Oct 2026 04:40:35 +0000
Subject: [PATCH 05/18] Preserve existing Claude skill permissions and behavior

---
 CLAUDE.md                                     |  4 ++-
 ci/harnesses.sh                               | 27 ++++++++++++++++
 ci/render.sh                                  |  6 +++-
 docs/design.md                                |  6 +++-
 .../argos/skills/pr-conventions/SKILL.md      |  3 +-
 .../argos/skills/ticket-conventions/SKILL.md  |  1 +
 .../argos/skills/verify-graph/SKILL.md        |  1 +
 .../skills/address-pr-comments/SKILL.md       |  4 ++-
 .../argos-dev/.claude/skills/commit/SKILL.md  |  2 +-
 .../skills/consolidate-spikes/SKILL.md        |  3 +-
 .../.claude/skills/pr-conventions/SKILL.md    |  3 +-
 .../.claude/skills/switch-workspace/SKILL.md  |  3 +-
 .../skills/ticket-conventions/SKILL.md        |  1 +
 .../.claude/skills/verify-graph/SKILL.md      |  1 +
 .../workspaces/argos-dev/workspace.generated  | 14 ++++-----
 .../skills/address-pr-comments/SKILL.md       |  2 ++
 .../.agents/skills/commit/SKILL.md            |  2 +-
 .../.agents/skills/pr-conventions/SKILL.md    |  3 +-
 .../.agents/skills/switch-workspace/SKILL.md  |  2 +-
 .../skills/ticket-conventions/SKILL.md        |  1 +
 .../.agents/skills/verify-graph/SKILL.md      |  1 +
 .../default-codex/workspace.generated         | 12 +++----
 .../skills/address-pr-comments/SKILL.md       |  4 ++-
 .../.claude/skills/commit/SKILL.md            |  2 +-
 .../skills/consolidate-spikes/SKILL.md        |  3 +-
 .../.claude/skills/pr-conventions/SKILL.md    |  3 +-
 .../.claude/skills/switch-workspace/SKILL.md  |  3 +-
 .../skills/ticket-conventions/SKILL.md        |  1 +
 .../.claude/skills/verify-graph/SKILL.md      |  1 +
 .../experimental/workspace.generated          | 14 ++++-----
 .../nero/skills/pr-conventions/SKILL.md       |  5 +--
 .../nero/skills/ticket-conventions/SKILL.md   |  1 +
 .../skills/address-pr-comments/SKILL.md       |  4 ++-
 .../.claude/skills/commit/SKILL.md            |  2 +-
 .../skills/consolidate-spikes/SKILL.md        |  3 +-
 .../.claude/skills/pr-conventions/SKILL.md    |  5 +--
 .../.claude/skills/switch-workspace/SKILL.md  |  3 +-
 .../skills/ticket-conventions/SKILL.md        |  1 +
 .../nero-experimental/workspace.generated     | 12 +++----
 .../skills/address-pr-comments/SKILL.md       |  4 ++-
 .../skills/commit/SKILL.md                    |  2 +-
 .../skills/consolidate-spikes/SKILL.md        |  3 +-
 .../skills/address-pr-comments/SKILL.md       |  4 ++-
 .../hub/.claude/skills/commit/SKILL.md        |  2 +-
 .../skills/consolidate-spikes/SKILL.md        |  3 +-
 .../.claude/skills/switch-workspace/SKILL.md  |  3 +-
 .../workspaces/hub/workspace.generated        |  8 ++---
 .../.claude/skills/switch-workspace/SKILL.md  |  3 +-
 .../calypso-dev/workspace.generated           |  2 +-
 software/skills/switch-workspace/SKILL.md     |  3 +-
 tests/e2e.sh                                  | 31 +++++++++++++++++--
 tools/new-workspace.sh                        |  2 +-
 52 files changed, 166 insertions(+), 73 deletions(-)

diff --git a/CLAUDE.md b/CLAUDE.md
index fa157f7..22f8411 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -59,7 +59,9 @@ source of truth; `docs/goals.md` lists what any change must keep.
   headers): name the file or key that holds them ("the folders in `.delphi/park.list`", "each repo
   under `repos:`"), never its entries. A copied list goes stale. Runtime tools: bash, git, and `gh` (only to open or update PRs).
 - Every script: `#!/usr/bin/env bash`, `set -euo pipefail`, `shellcheck`-clean.
-- Skills name nothing harness-specific (SKILL.md is the shared Agent Skills format): call scripts by
+- Preserve existing native skill metadata and behavior, including allowed-tools and invocation flags.
+  Harness adaptations belong in ci/harnesses.sh and affect only that target's generated output.
+  Skill scripts stay harness-independent (SKILL.md uses the Agent Skills format): call scripts by
   their path in the skill's folder, `bash scripts/<script>.sh <names>…`, and reference files the same
   way. Skill scripts (inherited, plugin or workspace) take only names (repo, branch) and read the workspace
   from `$DELPHI_ROOT`, sourcing `$DELPHI_ROOT/.delphi/paths.sh` for every folder; each harness's
diff --git a/ci/harnesses.sh b/ci/harnesses.sh
index 64e1ab2..206cb5a 100644
--- a/ci/harnesses.sh
+++ b/ci/harnesses.sh
@@ -9,3 +9,30 @@ harness() { # <name>: sets instruction, skills and plugins capability; rejects u
     *) echo "harness: unknown harness '$1'" >&2; return 1 ;;
   esac
 }
+
+harness_file() { # <target harness> <source file>: Claude passes through; Codex adapts its own output only
+  case "$1:$2" in
+    codex:*/SKILL.md)
+      awk '
+        NR == 1 && /^---$/ { front = 1; print; next }
+        front && /^---$/ { front = 0; print; next }
+        front {
+          # Preserve tool/invocation metadata. Quote multiline-style descriptions for native YAML.
+          if (/^description: / && substr($0, 14) ~ /: / && substr($0, 14) !~ /^["\047>|]/) {
+            print "description: >-"; print "  " substr($0, 14)
+          } else print
+          next
+        }
+        /^- The user can also switch from the `\/ws-delphi` pane/ { next }
+        /^- No restart needed: skills under/ {
+          print "- Start a fresh Codex session after switching so its instructions and skills match the new workspace."
+          next
+        }
+        {
+          gsub(/CLAUDE[.]md/, "AGENTS.md")
+          gsub(/GitHub MCP server.s `pull_request_read`/, "available GitHub integration\047s PR-reading tool")
+          print
+        }' "$2" ;;
+    *) cat "$2" ;;
+  esac
+}
diff --git a/ci/render.sh b/ci/render.sh
index e2b3dd8..d2029b0 100755
--- a/ci/render.sh
+++ b/ci/render.sh
@@ -46,6 +46,10 @@ render_workspace() { # <workspace folder>
       if opted_out "$path" "$o"; then used="$used $o"; fi
     done
     opted_out "$path" "$out" && continue
+    if [ "$adapter" = codex ] && [ "${src##*/}" = SKILL.md ]; then
+      harness_file "$adapter" "$src" >"$tmp/native"
+      meta="${meta%% *} $(git hash-object -- "$tmp/native")"
+    fi
     printf '%s\t%s\t%s\n' "$meta" "$path" "$src" >>"$tmp/records"
   done <<<"$records"
   for o in $out; do
@@ -105,7 +109,7 @@ render_workspace() { # <workspace folder>
     [ -n "$path" ] || continue
     [ "$src" != ci/plugins.sh ] || continue
     mkdir -p "$(dirname "$folder/$path")"
-    cp "$src" "$folder/$path"
+    harness_file "$adapter" "$src" >"$folder/$path"
     if [ "${meta%% *}" = 100755 ]; then chmod +x "$folder/$path"; else chmod -x "$folder/$path"; fi
   done <"$tmp/sorted"
   cp "$tmp/ledger" "$folder/$generated"
diff --git a/docs/design.md b/docs/design.md
index f982b85..cebf920 100644
--- a/docs/design.md
+++ b/docs/design.md
@@ -102,7 +102,11 @@ runtime default. Each folder on main already contains its declared harness's nat
 Any org or project folder may hold `workspace-inherit/`. `ci/inherit.sh` resolves those bundles
 from `software/` down to a workspace's project, together with portable `skills/` sources at those
 levels. `ci/sources.sh` reads a bundle's declared source format; `ci/harnesses.sh` selects native
-destinations. Portable skill bodies and supporting files pass through unchanged. Instruction
+destinations. Claude skill definitions pass through unchanged, including tool permissions,
+invocation flags and plugin reload guidance. The Codex content adapter changes instruction-file
+references and workspace-switch guidance only in Codex output, and normalizes descriptions that
+need YAML block scalars. Skill metadata is preserved; each harness interprets the fields it supports.
+Supporting files pass through unchanged. Instruction
 filenames and skill directories have explicit mappings. Unmapped native settings fail instead of
 being silently discarded or guessed. A future source reader can feed the same file records without
 changing workspace harness selections or branch sync.
diff --git a/software/application-software/argos/skills/pr-conventions/SKILL.md b/software/application-software/argos/skills/pr-conventions/SKILL.md
index 7e50492..90cc657 100644
--- a/software/application-software/argos/skills/pr-conventions/SKILL.md
+++ b/software/application-software/argos/skills/pr-conventions/SKILL.md
@@ -1,13 +1,14 @@
 ---
 name: pr-conventions
 description: Argos specifics for pull requests (base branch, commit format, checks, labels, screenshots, UI QA). Load before opening, updating, or reviewing an Argos PR, alongside open-pr, update-pr, and review.
+user-invocable: false
 ---
 
 # Argos PR conventions
 
 The shared rules are in the `open-pr` skill; this adds only what is Argos's.
 
-- Base branch: `develop`. Commit format: `^#[0-9]+ - ` (the format in the workspace instructions).
+- Base branch: `develop`. Commit format: `^#[0-9]+ - ` (the format in CLAUDE.md).
 - Checks: `bash scripts/lint.sh <branch>` (frontend prettier and ng lint, only if angular-client/ changed).
 - Labels: one written-by (`by: human` if the user wrote it, `by: ai-assisted` if they gave the substance, `by: ai` if you wrote it) and at least one area label (`frontend`, `backend`, `devops`); no category label.
 - Screenshots: `pictures/<branch>/` at the worktree root (git-ignored).
diff --git a/software/application-software/argos/skills/ticket-conventions/SKILL.md b/software/application-software/argos/skills/ticket-conventions/SKILL.md
index 8d9ec37..b516657 100644
--- a/software/application-software/argos/skills/ticket-conventions/SKILL.md
+++ b/software/application-software/argos/skills/ticket-conventions/SKILL.md
@@ -1,6 +1,7 @@
 ---
 name: ticket-conventions
 description: Argos specifics for tickets (repo, area labels, vocabulary, diagrams). Load before drafting or filing an Argos issue, alongside create-ticket.
+user-invocable: false
 ---
 
 # Argos ticket conventions
diff --git a/software/application-software/argos/skills/verify-graph/SKILL.md b/software/application-software/argos/skills/verify-graph/SKILL.md
index c9dfe7d..ae99371 100644
--- a/software/application-software/argos/skills/verify-graph/SKILL.md
+++ b/software/application-software/argos/skills/verify-graph/SKILL.md
@@ -1,6 +1,7 @@
 ---
 name: verify-graph
 description: Playwright CLI verification of the graph page — modes, controls, topic selection, and data rendering. Use after any change to graph-page components, graph rendering, data flow, or mode switching logic.
+user-invocable: true
 ---
 
 Get the branch's client running with `run-local <branch>`; its URL is `BASE_URL`. The scripts need `playwright-cli` (`npm i -g @playwright/cli`, then `playwright-cli install-browser chromium`; cloud containers use their preinstalled Chromium). Then run the base checks:
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/address-pr-comments/SKILL.md b/software/application-software/argos/workspaces/argos-dev/.claude/skills/address-pr-comments/SKILL.md
index 3bf22d3..30083fa 100644
--- a/software/application-software/argos/workspaces/argos-dev/.claude/skills/address-pr-comments/SKILL.md
+++ b/software/application-software/argos/workspaces/argos-dev/.claude/skills/address-pr-comments/SKILL.md
@@ -1,11 +1,13 @@
 ---
 name: address-pr-comments
 description: Fetch review comments on a PR (Argos, Nero), judge whether each (including outdated ones) still applies, and walk through fixes in the PR's worktree
+allowed-tools: Bash(git:*), Bash(gh issue list:*), Bash(bash ${CLAUDE_SKILL_DIR}/scripts/fetch-feedback.sh *)
+user-invocable: true
 ---
 
 Propose and apply fixes for a PR's unresolved review feedback. **Never reply to threads**; the user does.
 
-1. **Fetch** from the workspace root: `bash scripts/fetch-feedback.sh <repo> <pr>|<branch>` (`<repo>` as under `repos/`, e.g. `argos`; `--all` first for unfiltered history). It checks out the PR head's worktree and prints JSON: `worktree` (target it by path from the root from now on), unresolved `threads`, `comments`, `reviews`. Any non-zero exit: use the available GitHub integration's PR-reading tool instead.
+1. **Fetch** from the workspace root: `bash scripts/fetch-feedback.sh <repo> <pr>|<branch>` (`<repo>` as under `repos/`, e.g. `argos`; `--all` first for unfiltered history). It checks out the PR head's worktree and prints JSON: `worktree` (target it by path from the root from now on), unresolved `threads`, `comments`, `reviews`. Any non-zero exit: use the GitHub MCP server's `pull_request_read` instead.
 2. **Judge.** Skip bot noise and anything already fixed at HEAD. For an `outdated` thread, find its `diffHunk` code by content, then label it **addressed**, **applies**, **moved**, **obsolete**, or **unclear**.
 3. **Present** before editing, grouped by file, and ask to confirm, skip, or change each (offer to batch clear ones past 8):
 
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/commit/SKILL.md b/software/application-software/argos/workspaces/argos-dev/.claude/skills/commit/SKILL.md
index ad1fa37..4b56757 100644
--- a/software/application-software/argos/workspaces/argos-dev/.claude/skills/commit/SKILL.md
+++ b/software/application-software/argos/workspaces/argos-dev/.claude/skills/commit/SKILL.md
@@ -3,4 +3,4 @@ name: commit
 description: Stage and commit using the project's commit message convention
 ---
 
-In the worktree you're working on, from the workspace root (`git -C worktrees/<repo>/<branch> …`), stage the relevant changes (not unrelated or generated files) and commit using the commit message format in the workspace instructions. Keep the description imperative and 2–8 words.
+In the worktree you're working on, from the workspace root (`git -C worktrees/<repo>/<branch> …`), stage the relevant changes (not unrelated or generated files) and commit using the commit message format in CLAUDE.md. Keep the description imperative and 2–8 words.
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/consolidate-spikes/SKILL.md b/software/application-software/argos/workspaces/argos-dev/.claude/skills/consolidate-spikes/SKILL.md
index 897a1f5..4f85b66 100644
--- a/software/application-software/argos/workspaces/argos-dev/.claude/skills/consolidate-spikes/SKILL.md
+++ b/software/application-software/argos/workspaces/argos-dev/.claude/skills/consolidate-spikes/SKILL.md
@@ -1,7 +1,6 @@
 ---
 name: consolidate-spikes
-description: >-
-  Turn finished spikes into implementation tickets: an idea's spikes, once all are done, into dev work, under an epic when it comes from an idea or splits. Use when the user wants to wrap up, settle, or consolidate an idea or spike on an application-software repo (Argos, Nero).
+description: Turn finished spikes into implementation tickets: an idea's spikes, once all are done, into dev work, under an epic when it comes from an idea or splits. Use when the user wants to wrap up, settle, or consolidate an idea or spike on an application-software repo (Argos, Nero).
 ---
 
 Drafts and files by the `create-ticket` rules; load it and the project's `ticket-conventions` first. Takes an idea or a standalone spike.
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/pr-conventions/SKILL.md b/software/application-software/argos/workspaces/argos-dev/.claude/skills/pr-conventions/SKILL.md
index 7e50492..90cc657 100644
--- a/software/application-software/argos/workspaces/argos-dev/.claude/skills/pr-conventions/SKILL.md
+++ b/software/application-software/argos/workspaces/argos-dev/.claude/skills/pr-conventions/SKILL.md
@@ -1,13 +1,14 @@
 ---
 name: pr-conventions
 description: Argos specifics for pull requests (base branch, commit format, checks, labels, screenshots, UI QA). Load before opening, updating, or reviewing an Argos PR, alongside open-pr, update-pr, and review.
+user-invocable: false
 ---
 
 # Argos PR conventions
 
 The shared rules are in the `open-pr` skill; this adds only what is Argos's.
 
-- Base branch: `develop`. Commit format: `^#[0-9]+ - ` (the format in the workspace instructions).
+- Base branch: `develop`. Commit format: `^#[0-9]+ - ` (the format in CLAUDE.md).
 - Checks: `bash scripts/lint.sh <branch>` (frontend prettier and ng lint, only if angular-client/ changed).
 - Labels: one written-by (`by: human` if the user wrote it, `by: ai-assisted` if they gave the substance, `by: ai` if you wrote it) and at least one area label (`frontend`, `backend`, `devops`); no category label.
 - Screenshots: `pictures/<branch>/` at the worktree root (git-ignored).
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/switch-workspace/SKILL.md b/software/application-software/argos/workspaces/argos-dev/.claude/skills/switch-workspace/SKILL.md
index 0b5a91a..e0a8b42 100644
--- a/software/application-software/argos/workspaces/argos-dev/.claude/skills/switch-workspace/SKILL.md
+++ b/software/application-software/argos/workspaces/argos-dev/.claude/skills/switch-workspace/SKILL.md
@@ -10,10 +10,11 @@ bash .delphi/switch.sh <name>        # ws/<name>: its dotted name, e.g. s.app.ar
 bash .delphi/switch.sh main          # Delphi's main: project folders, templates, CI
 ```
 
+- The user can also switch from the `/ws-delphi` pane (the `delphi` plugin's mod), which shows them as cards (`bash .delphi/switch.sh --list`): press one, then Switch workspace; `/ws-delphi <name>` switches straight away, and `/ws-delphi --web` opens the same cards in a browser tab.
 - List workspaces and their project folders: `bash .delphi/switch.sh --list`.
 - It refuses while tracked files have changes: commit them on a branch (and PR them) first. Then it fetches, switches, fast-forwards, and runs the new workspace's `.delphi/setup.sh`.
 - The post-checkout hook parks this workspace's `repos/`, `worktrees/`, `references/` and `workspaces/` in `.delphi/parked/<name>/` (git-ignored; `<name>` as in its `workspace.yml`) and brings the other's back at the same paths, so worktrees and the work in them return as they were. Switch back the same way. Never run `git clean -X` or `git stash --all` at the workspace root: they take ignored files, parked work included.
 - Before switching, stop anything running from `worktrees/` (dev servers, Docker builds): its folder moves.
-- Start a fresh harness session after switching so its instructions and skills match the new workspace. A harness integration may explicitly support reloading in place; follow its documented behavior.
+- No restart needed: skills under `.claude/skills/` reload on their own, and the `delphi` mod sends the new workspace's `CLAUDE.md` with the next prompt. Without the mod installed, this session keeps the old `CLAUDE.md`: tell the user to restart Claude Code in the same folder before starting work in the new workspace.
 - To change the workspace you switched to: `git switch -c <branch>`, commit, push, and open a PR into `ws/<name>` (or `main`).
 - To only read another workspace or main without leaving this one, list it under `workspaces:` instead (`setup-workspace` skill).
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/ticket-conventions/SKILL.md b/software/application-software/argos/workspaces/argos-dev/.claude/skills/ticket-conventions/SKILL.md
index 8d9ec37..b516657 100644
--- a/software/application-software/argos/workspaces/argos-dev/.claude/skills/ticket-conventions/SKILL.md
+++ b/software/application-software/argos/workspaces/argos-dev/.claude/skills/ticket-conventions/SKILL.md
@@ -1,6 +1,7 @@
 ---
 name: ticket-conventions
 description: Argos specifics for tickets (repo, area labels, vocabulary, diagrams). Load before drafting or filing an Argos issue, alongside create-ticket.
+user-invocable: false
 ---
 
 # Argos ticket conventions
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/SKILL.md b/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/SKILL.md
index c9dfe7d..ae99371 100644
--- a/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/SKILL.md
+++ b/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/SKILL.md
@@ -1,6 +1,7 @@
 ---
 name: verify-graph
 description: Playwright CLI verification of the graph page — modes, controls, topic selection, and data rendering. Use after any change to graph-page components, graph rendering, data flow, or mode switching logic.
+user-invocable: true
 ---
 
 Get the branch's client running with `run-local <branch>`; its URL is `BASE_URL`. The scripts need `playwright-cli` (`npm i -g @playwright/cli`, then `playwright-cli install-browser chromium`; cloud containers use their preinstalled Chromium). Then run the base checks:
diff --git a/software/application-software/argos/workspaces/argos-dev/workspace.generated b/software/application-software/argos/workspaces/argos-dev/workspace.generated
index 09fe5ff..f099116 100644
--- a/software/application-software/argos/workspaces/argos-dev/workspace.generated
+++ b/software/application-software/argos/workspaces/argos-dev/workspace.generated
@@ -1,10 +1,10 @@
 # Generated by ci/render.sh; edit shared sources or opt out in workspace.yml.
 100644 61c35f28dda167e42bebc3bad3994af97c53e876	.claude/settings.json	ci/plugins.sh
-100644 3bf22d3571b9cad53804cc7a7c678c4103368780	.claude/skills/address-pr-comments/SKILL.md	software/application-software/skills/address-pr-comments/SKILL.md
+100644 30083fa3b2cf735ac5a75808478dd00476e75e9c	.claude/skills/address-pr-comments/SKILL.md	software/application-software/skills/address-pr-comments/SKILL.md
 100755 ce1efd97da4a6d2ea655932486660c5008f44dae	.claude/skills/address-pr-comments/scripts/fetch-feedback.sh	software/application-software/skills/address-pr-comments/scripts/fetch-feedback.sh
 100644 da0be202ebc0a9ffc4544dbdf4bbef54cca37520	.claude/skills/address-pr-comments/scripts/github.sh	software/application-software/skills/address-pr-comments/scripts/github.sh
-100644 ad1fa37b4cf08693b5dcbf85d62df96c1a56b7e5	.claude/skills/commit/SKILL.md	software/application-software/skills/commit/SKILL.md
-100644 897a1f58386f280ce329a245baea7b562ac0b3db	.claude/skills/consolidate-spikes/SKILL.md	software/application-software/skills/consolidate-spikes/SKILL.md
+100644 4b5675711abfaef10089859f379a931206267355	.claude/skills/commit/SKILL.md	software/application-software/skills/commit/SKILL.md
+100644 4f85b66ab5c07ce4a00ba3d8555fc9272544046b	.claude/skills/consolidate-spikes/SKILL.md	software/application-software/skills/consolidate-spikes/SKILL.md
 100644 9dd28e531875c0acb7f8a88a07ad15645aecf38f	.claude/skills/create-ticket/SKILL.md	software/application-software/skills/create-ticket/SKILL.md
 100644 f24d293b38a4d03b610a5a104fa97b614856d7c3	.claude/skills/implement/SKILL.md	software/application-software/argos/skills/implement/SKILL.md
 100644 4917259f9e29db28e2636496e80f80ee5d9e321e	.claude/skills/journal/SKILL.md	software/skills/journal/SKILL.md
@@ -12,17 +12,17 @@
 100644 0495fc97cbe93e4331c89263aee188f6c0e9c9ea	.claude/skills/new-worktree/SKILL.md	software/skills/new-worktree/SKILL.md
 100644 7363dd2304fbb29c464e8cac0fd270acdeeb8060	.claude/skills/open-pr/SKILL.md	software/application-software/skills/open-pr/SKILL.md
 100755 61f377fef63daa10c443129df6a49571fdbeb658	.claude/skills/open-pr/scripts/pr-checks.sh	software/application-software/skills/open-pr/scripts/pr-checks.sh
-100644 7e504925c1133ff291fe29f9b0c824c945158e71	.claude/skills/pr-conventions/SKILL.md	software/application-software/argos/skills/pr-conventions/SKILL.md
+100644 90cc6571064f750bd5d816f44cf3064fa2df8f7e	.claude/skills/pr-conventions/SKILL.md	software/application-software/argos/skills/pr-conventions/SKILL.md
 100644 2ed67ecda73634b78468cab0ccb52c86f128e064	.claude/skills/pr-conventions/scripts/lint.sh	software/application-software/argos/skills/pr-conventions/scripts/lint.sh
 100644 e67387116a753217d256d81901e5b4091b49b44c	.claude/skills/report-spike/SKILL.md	software/application-software/skills/report-spike/SKILL.md
 100644 7acb908af141defaa035f992b060d4d23c0b2a54	.claude/skills/run-local/SKILL.md	software/application-software/argos/skills/run-local/SKILL.md
 100755 f5986571d9b917264eb6cfe9c9d7f27448242ac9	.claude/skills/run-local/scripts/run-local.sh	software/application-software/argos/skills/run-local/scripts/run-local.sh
 100755 d8de89ce933cbc5302c59fab3176004bdd251d35	.claude/skills/run-local/scripts/serve.sh	software/application-software/argos/skills/run-local/scripts/serve.sh
 100644 fdc1ce85211200223040edfb5dc65a3de7f35d53	.claude/skills/setup-workspace/SKILL.md	software/skills/setup-workspace/SKILL.md
-100644 0b5a91a731df227907cf8bc40a8a2e04c4518059	.claude/skills/switch-workspace/SKILL.md	software/skills/switch-workspace/SKILL.md
-100644 8d9ec377f598b4527af20ffaa54b6cfe1a244860	.claude/skills/ticket-conventions/SKILL.md	software/application-software/argos/skills/ticket-conventions/SKILL.md
+100644 e0a8b424d11c4897901c0ce888a6c0c726daed98	.claude/skills/switch-workspace/SKILL.md	software/skills/switch-workspace/SKILL.md
+100644 b516657698fb909e0c72f8c9a6187fdaf4a38f71	.claude/skills/ticket-conventions/SKILL.md	software/application-software/argos/skills/ticket-conventions/SKILL.md
 100644 069b51714c0fd4d3d6ad972dd9f840e01f21cf15	.claude/skills/update-pr/SKILL.md	software/application-software/skills/update-pr/SKILL.md
-100644 c9dfe7d18e9c4d728d5295eeed178960289390a2	.claude/skills/verify-graph/SKILL.md	software/application-software/argos/skills/verify-graph/SKILL.md
+100644 ae99371d623deb83d2ac5b1227eb12eaff662092	.claude/skills/verify-graph/SKILL.md	software/application-software/argos/skills/verify-graph/SKILL.md
 100644 3fcb7344ce3499a7afbba08b8c2b6deacd3f101b	.claude/skills/verify-graph/scripts/check.js	software/application-software/argos/skills/verify-graph/scripts/check.js
 100755 c8710cdf2cea12ddae0a92c3e0ba141e06a234f3	.claude/skills/verify-graph/scripts/check.sh	software/application-software/argos/skills/verify-graph/scripts/check.sh
 100755 5a1b49bc55582ec03f5e0a58c015d1b28fd21af3	.claude/skills/verify-graph/scripts/open.sh	software/application-software/argos/skills/verify-graph/scripts/open.sh
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/address-pr-comments/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/address-pr-comments/SKILL.md
index 3bf22d3..c671eef 100644
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/address-pr-comments/SKILL.md
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/address-pr-comments/SKILL.md
@@ -1,6 +1,8 @@
 ---
 name: address-pr-comments
 description: Fetch review comments on a PR (Argos, Nero), judge whether each (including outdated ones) still applies, and walk through fixes in the PR's worktree
+allowed-tools: Bash(git:*), Bash(gh issue list:*), Bash(bash ${CLAUDE_SKILL_DIR}/scripts/fetch-feedback.sh *)
+user-invocable: true
 ---
 
 Propose and apply fixes for a PR's unresolved review feedback. **Never reply to threads**; the user does.
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/commit/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/commit/SKILL.md
index ad1fa37..7a8015c 100644
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/commit/SKILL.md
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/commit/SKILL.md
@@ -3,4 +3,4 @@ name: commit
 description: Stage and commit using the project's commit message convention
 ---
 
-In the worktree you're working on, from the workspace root (`git -C worktrees/<repo>/<branch> …`), stage the relevant changes (not unrelated or generated files) and commit using the commit message format in the workspace instructions. Keep the description imperative and 2–8 words.
+In the worktree you're working on, from the workspace root (`git -C worktrees/<repo>/<branch> …`), stage the relevant changes (not unrelated or generated files) and commit using the commit message format in AGENTS.md. Keep the description imperative and 2–8 words.
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/pr-conventions/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/pr-conventions/SKILL.md
index 7e50492..94d5e4e 100644
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/pr-conventions/SKILL.md
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/pr-conventions/SKILL.md
@@ -1,13 +1,14 @@
 ---
 name: pr-conventions
 description: Argos specifics for pull requests (base branch, commit format, checks, labels, screenshots, UI QA). Load before opening, updating, or reviewing an Argos PR, alongside open-pr, update-pr, and review.
+user-invocable: false
 ---
 
 # Argos PR conventions
 
 The shared rules are in the `open-pr` skill; this adds only what is Argos's.
 
-- Base branch: `develop`. Commit format: `^#[0-9]+ - ` (the format in the workspace instructions).
+- Base branch: `develop`. Commit format: `^#[0-9]+ - ` (the format in AGENTS.md).
 - Checks: `bash scripts/lint.sh <branch>` (frontend prettier and ng lint, only if angular-client/ changed).
 - Labels: one written-by (`by: human` if the user wrote it, `by: ai-assisted` if they gave the substance, `by: ai` if you wrote it) and at least one area label (`frontend`, `backend`, `devops`); no category label.
 - Screenshots: `pictures/<branch>/` at the worktree root (git-ignored).
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/switch-workspace/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/switch-workspace/SKILL.md
index 0b5a91a..b6a8144 100644
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/switch-workspace/SKILL.md
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/switch-workspace/SKILL.md
@@ -14,6 +14,6 @@ bash .delphi/switch.sh main          # Delphi's main: project folders, templates
 - It refuses while tracked files have changes: commit them on a branch (and PR them) first. Then it fetches, switches, fast-forwards, and runs the new workspace's `.delphi/setup.sh`.
 - The post-checkout hook parks this workspace's `repos/`, `worktrees/`, `references/` and `workspaces/` in `.delphi/parked/<name>/` (git-ignored; `<name>` as in its `workspace.yml`) and brings the other's back at the same paths, so worktrees and the work in them return as they were. Switch back the same way. Never run `git clean -X` or `git stash --all` at the workspace root: they take ignored files, parked work included.
 - Before switching, stop anything running from `worktrees/` (dev servers, Docker builds): its folder moves.
-- Start a fresh harness session after switching so its instructions and skills match the new workspace. A harness integration may explicitly support reloading in place; follow its documented behavior.
+- Start a fresh Codex session after switching so its instructions and skills match the new workspace.
 - To change the workspace you switched to: `git switch -c <branch>`, commit, push, and open a PR into `ws/<name>` (or `main`).
 - To only read another workspace or main without leaving this one, list it under `workspaces:` instead (`setup-workspace` skill).
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/ticket-conventions/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/ticket-conventions/SKILL.md
index 8d9ec37..b516657 100644
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/ticket-conventions/SKILL.md
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/ticket-conventions/SKILL.md
@@ -1,6 +1,7 @@
 ---
 name: ticket-conventions
 description: Argos specifics for tickets (repo, area labels, vocabulary, diagrams). Load before drafting or filing an Argos issue, alongside create-ticket.
+user-invocable: false
 ---
 
 # Argos ticket conventions
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/SKILL.md
index c9dfe7d..ae99371 100644
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/SKILL.md
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/SKILL.md
@@ -1,6 +1,7 @@
 ---
 name: verify-graph
 description: Playwright CLI verification of the graph page — modes, controls, topic selection, and data rendering. Use after any change to graph-page components, graph rendering, data flow, or mode switching logic.
+user-invocable: true
 ---
 
 Get the branch's client running with `run-local <branch>`; its URL is `BASE_URL`. The scripts need `playwright-cli` (`npm i -g @playwright/cli`, then `playwright-cli install-browser chromium`; cloud containers use their preinstalled Chromium). Then run the base checks:
diff --git a/software/application-software/argos/workspaces/default-codex/workspace.generated b/software/application-software/argos/workspaces/default-codex/workspace.generated
index 0c3dfa1..953030a 100644
--- a/software/application-software/argos/workspaces/default-codex/workspace.generated
+++ b/software/application-software/argos/workspaces/default-codex/workspace.generated
@@ -1,8 +1,8 @@
 # Generated by ci/render.sh; edit shared sources or opt out in workspace.yml.
-100644 3bf22d3571b9cad53804cc7a7c678c4103368780	.agents/skills/address-pr-comments/SKILL.md	software/application-software/skills/address-pr-comments/SKILL.md
+100644 c671eeff00a4dbfbd738638e3f7fcd321fdd7daf	.agents/skills/address-pr-comments/SKILL.md	software/application-software/skills/address-pr-comments/SKILL.md
 100755 ce1efd97da4a6d2ea655932486660c5008f44dae	.agents/skills/address-pr-comments/scripts/fetch-feedback.sh	software/application-software/skills/address-pr-comments/scripts/fetch-feedback.sh
 100644 da0be202ebc0a9ffc4544dbdf4bbef54cca37520	.agents/skills/address-pr-comments/scripts/github.sh	software/application-software/skills/address-pr-comments/scripts/github.sh
-100644 ad1fa37b4cf08693b5dcbf85d62df96c1a56b7e5	.agents/skills/commit/SKILL.md	software/application-software/skills/commit/SKILL.md
+100644 7a8015c8555385e795638019a5bce9db2ec984f5	.agents/skills/commit/SKILL.md	software/application-software/skills/commit/SKILL.md
 100644 897a1f58386f280ce329a245baea7b562ac0b3db	.agents/skills/consolidate-spikes/SKILL.md	software/application-software/skills/consolidate-spikes/SKILL.md
 100644 9dd28e531875c0acb7f8a88a07ad15645aecf38f	.agents/skills/create-ticket/SKILL.md	software/application-software/skills/create-ticket/SKILL.md
 100644 f24d293b38a4d03b610a5a104fa97b614856d7c3	.agents/skills/implement/SKILL.md	software/application-software/argos/skills/implement/SKILL.md
@@ -11,17 +11,17 @@
 100644 0495fc97cbe93e4331c89263aee188f6c0e9c9ea	.agents/skills/new-worktree/SKILL.md	software/skills/new-worktree/SKILL.md
 100644 7363dd2304fbb29c464e8cac0fd270acdeeb8060	.agents/skills/open-pr/SKILL.md	software/application-software/skills/open-pr/SKILL.md
 100755 61f377fef63daa10c443129df6a49571fdbeb658	.agents/skills/open-pr/scripts/pr-checks.sh	software/application-software/skills/open-pr/scripts/pr-checks.sh
-100644 7e504925c1133ff291fe29f9b0c824c945158e71	.agents/skills/pr-conventions/SKILL.md	software/application-software/argos/skills/pr-conventions/SKILL.md
+100644 94d5e4e205f822c5a6b263beefbcbb49114b87ab	.agents/skills/pr-conventions/SKILL.md	software/application-software/argos/skills/pr-conventions/SKILL.md
 100644 2ed67ecda73634b78468cab0ccb52c86f128e064	.agents/skills/pr-conventions/scripts/lint.sh	software/application-software/argos/skills/pr-conventions/scripts/lint.sh
 100644 e67387116a753217d256d81901e5b4091b49b44c	.agents/skills/report-spike/SKILL.md	software/application-software/skills/report-spike/SKILL.md
 100644 7acb908af141defaa035f992b060d4d23c0b2a54	.agents/skills/run-local/SKILL.md	software/application-software/argos/skills/run-local/SKILL.md
 100755 f5986571d9b917264eb6cfe9c9d7f27448242ac9	.agents/skills/run-local/scripts/run-local.sh	software/application-software/argos/skills/run-local/scripts/run-local.sh
 100755 d8de89ce933cbc5302c59fab3176004bdd251d35	.agents/skills/run-local/scripts/serve.sh	software/application-software/argos/skills/run-local/scripts/serve.sh
 100644 fdc1ce85211200223040edfb5dc65a3de7f35d53	.agents/skills/setup-workspace/SKILL.md	software/skills/setup-workspace/SKILL.md
-100644 0b5a91a731df227907cf8bc40a8a2e04c4518059	.agents/skills/switch-workspace/SKILL.md	software/skills/switch-workspace/SKILL.md
-100644 8d9ec377f598b4527af20ffaa54b6cfe1a244860	.agents/skills/ticket-conventions/SKILL.md	software/application-software/argos/skills/ticket-conventions/SKILL.md
+100644 b6a8144466f5430a1141df53300f8c09f9dae20f	.agents/skills/switch-workspace/SKILL.md	software/skills/switch-workspace/SKILL.md
+100644 b516657698fb909e0c72f8c9a6187fdaf4a38f71	.agents/skills/ticket-conventions/SKILL.md	software/application-software/argos/skills/ticket-conventions/SKILL.md
 100644 069b51714c0fd4d3d6ad972dd9f840e01f21cf15	.agents/skills/update-pr/SKILL.md	software/application-software/skills/update-pr/SKILL.md
-100644 c9dfe7d18e9c4d728d5295eeed178960289390a2	.agents/skills/verify-graph/SKILL.md	software/application-software/argos/skills/verify-graph/SKILL.md
+100644 ae99371d623deb83d2ac5b1227eb12eaff662092	.agents/skills/verify-graph/SKILL.md	software/application-software/argos/skills/verify-graph/SKILL.md
 100644 3fcb7344ce3499a7afbba08b8c2b6deacd3f101b	.agents/skills/verify-graph/scripts/check.js	software/application-software/argos/skills/verify-graph/scripts/check.js
 100755 c8710cdf2cea12ddae0a92c3e0ba141e06a234f3	.agents/skills/verify-graph/scripts/check.sh	software/application-software/argos/skills/verify-graph/scripts/check.sh
 100755 5a1b49bc55582ec03f5e0a58c015d1b28fd21af3	.agents/skills/verify-graph/scripts/open.sh	software/application-software/argos/skills/verify-graph/scripts/open.sh
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/address-pr-comments/SKILL.md b/software/application-software/argos/workspaces/experimental/.claude/skills/address-pr-comments/SKILL.md
index 3bf22d3..30083fa 100644
--- a/software/application-software/argos/workspaces/experimental/.claude/skills/address-pr-comments/SKILL.md
+++ b/software/application-software/argos/workspaces/experimental/.claude/skills/address-pr-comments/SKILL.md
@@ -1,11 +1,13 @@
 ---
 name: address-pr-comments
 description: Fetch review comments on a PR (Argos, Nero), judge whether each (including outdated ones) still applies, and walk through fixes in the PR's worktree
+allowed-tools: Bash(git:*), Bash(gh issue list:*), Bash(bash ${CLAUDE_SKILL_DIR}/scripts/fetch-feedback.sh *)
+user-invocable: true
 ---
 
 Propose and apply fixes for a PR's unresolved review feedback. **Never reply to threads**; the user does.
 
-1. **Fetch** from the workspace root: `bash scripts/fetch-feedback.sh <repo> <pr>|<branch>` (`<repo>` as under `repos/`, e.g. `argos`; `--all` first for unfiltered history). It checks out the PR head's worktree and prints JSON: `worktree` (target it by path from the root from now on), unresolved `threads`, `comments`, `reviews`. Any non-zero exit: use the available GitHub integration's PR-reading tool instead.
+1. **Fetch** from the workspace root: `bash scripts/fetch-feedback.sh <repo> <pr>|<branch>` (`<repo>` as under `repos/`, e.g. `argos`; `--all` first for unfiltered history). It checks out the PR head's worktree and prints JSON: `worktree` (target it by path from the root from now on), unresolved `threads`, `comments`, `reviews`. Any non-zero exit: use the GitHub MCP server's `pull_request_read` instead.
 2. **Judge.** Skip bot noise and anything already fixed at HEAD. For an `outdated` thread, find its `diffHunk` code by content, then label it **addressed**, **applies**, **moved**, **obsolete**, or **unclear**.
 3. **Present** before editing, grouped by file, and ask to confirm, skip, or change each (offer to batch clear ones past 8):
 
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/commit/SKILL.md b/software/application-software/argos/workspaces/experimental/.claude/skills/commit/SKILL.md
index ad1fa37..4b56757 100644
--- a/software/application-software/argos/workspaces/experimental/.claude/skills/commit/SKILL.md
+++ b/software/application-software/argos/workspaces/experimental/.claude/skills/commit/SKILL.md
@@ -3,4 +3,4 @@ name: commit
 description: Stage and commit using the project's commit message convention
 ---
 
-In the worktree you're working on, from the workspace root (`git -C worktrees/<repo>/<branch> …`), stage the relevant changes (not unrelated or generated files) and commit using the commit message format in the workspace instructions. Keep the description imperative and 2–8 words.
+In the worktree you're working on, from the workspace root (`git -C worktrees/<repo>/<branch> …`), stage the relevant changes (not unrelated or generated files) and commit using the commit message format in CLAUDE.md. Keep the description imperative and 2–8 words.
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/consolidate-spikes/SKILL.md b/software/application-software/argos/workspaces/experimental/.claude/skills/consolidate-spikes/SKILL.md
index 897a1f5..4f85b66 100644
--- a/software/application-software/argos/workspaces/experimental/.claude/skills/consolidate-spikes/SKILL.md
+++ b/software/application-software/argos/workspaces/experimental/.claude/skills/consolidate-spikes/SKILL.md
@@ -1,7 +1,6 @@
 ---
 name: consolidate-spikes
-description: >-
-  Turn finished spikes into implementation tickets: an idea's spikes, once all are done, into dev work, under an epic when it comes from an idea or splits. Use when the user wants to wrap up, settle, or consolidate an idea or spike on an application-software repo (Argos, Nero).
+description: Turn finished spikes into implementation tickets: an idea's spikes, once all are done, into dev work, under an epic when it comes from an idea or splits. Use when the user wants to wrap up, settle, or consolidate an idea or spike on an application-software repo (Argos, Nero).
 ---
 
 Drafts and files by the `create-ticket` rules; load it and the project's `ticket-conventions` first. Takes an idea or a standalone spike.
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/pr-conventions/SKILL.md b/software/application-software/argos/workspaces/experimental/.claude/skills/pr-conventions/SKILL.md
index 7e50492..90cc657 100644
--- a/software/application-software/argos/workspaces/experimental/.claude/skills/pr-conventions/SKILL.md
+++ b/software/application-software/argos/workspaces/experimental/.claude/skills/pr-conventions/SKILL.md
@@ -1,13 +1,14 @@
 ---
 name: pr-conventions
 description: Argos specifics for pull requests (base branch, commit format, checks, labels, screenshots, UI QA). Load before opening, updating, or reviewing an Argos PR, alongside open-pr, update-pr, and review.
+user-invocable: false
 ---
 
 # Argos PR conventions
 
 The shared rules are in the `open-pr` skill; this adds only what is Argos's.
 
-- Base branch: `develop`. Commit format: `^#[0-9]+ - ` (the format in the workspace instructions).
+- Base branch: `develop`. Commit format: `^#[0-9]+ - ` (the format in CLAUDE.md).
 - Checks: `bash scripts/lint.sh <branch>` (frontend prettier and ng lint, only if angular-client/ changed).
 - Labels: one written-by (`by: human` if the user wrote it, `by: ai-assisted` if they gave the substance, `by: ai` if you wrote it) and at least one area label (`frontend`, `backend`, `devops`); no category label.
 - Screenshots: `pictures/<branch>/` at the worktree root (git-ignored).
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/switch-workspace/SKILL.md b/software/application-software/argos/workspaces/experimental/.claude/skills/switch-workspace/SKILL.md
index 0b5a91a..e0a8b42 100644
--- a/software/application-software/argos/workspaces/experimental/.claude/skills/switch-workspace/SKILL.md
+++ b/software/application-software/argos/workspaces/experimental/.claude/skills/switch-workspace/SKILL.md
@@ -10,10 +10,11 @@ bash .delphi/switch.sh <name>        # ws/<name>: its dotted name, e.g. s.app.ar
 bash .delphi/switch.sh main          # Delphi's main: project folders, templates, CI
 ```
 
+- The user can also switch from the `/ws-delphi` pane (the `delphi` plugin's mod), which shows them as cards (`bash .delphi/switch.sh --list`): press one, then Switch workspace; `/ws-delphi <name>` switches straight away, and `/ws-delphi --web` opens the same cards in a browser tab.
 - List workspaces and their project folders: `bash .delphi/switch.sh --list`.
 - It refuses while tracked files have changes: commit them on a branch (and PR them) first. Then it fetches, switches, fast-forwards, and runs the new workspace's `.delphi/setup.sh`.
 - The post-checkout hook parks this workspace's `repos/`, `worktrees/`, `references/` and `workspaces/` in `.delphi/parked/<name>/` (git-ignored; `<name>` as in its `workspace.yml`) and brings the other's back at the same paths, so worktrees and the work in them return as they were. Switch back the same way. Never run `git clean -X` or `git stash --all` at the workspace root: they take ignored files, parked work included.
 - Before switching, stop anything running from `worktrees/` (dev servers, Docker builds): its folder moves.
-- Start a fresh harness session after switching so its instructions and skills match the new workspace. A harness integration may explicitly support reloading in place; follow its documented behavior.
+- No restart needed: skills under `.claude/skills/` reload on their own, and the `delphi` mod sends the new workspace's `CLAUDE.md` with the next prompt. Without the mod installed, this session keeps the old `CLAUDE.md`: tell the user to restart Claude Code in the same folder before starting work in the new workspace.
 - To change the workspace you switched to: `git switch -c <branch>`, commit, push, and open a PR into `ws/<name>` (or `main`).
 - To only read another workspace or main without leaving this one, list it under `workspaces:` instead (`setup-workspace` skill).
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/ticket-conventions/SKILL.md b/software/application-software/argos/workspaces/experimental/.claude/skills/ticket-conventions/SKILL.md
index 8d9ec37..b516657 100644
--- a/software/application-software/argos/workspaces/experimental/.claude/skills/ticket-conventions/SKILL.md
+++ b/software/application-software/argos/workspaces/experimental/.claude/skills/ticket-conventions/SKILL.md
@@ -1,6 +1,7 @@
 ---
 name: ticket-conventions
 description: Argos specifics for tickets (repo, area labels, vocabulary, diagrams). Load before drafting or filing an Argos issue, alongside create-ticket.
+user-invocable: false
 ---
 
 # Argos ticket conventions
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/SKILL.md b/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/SKILL.md
index c9dfe7d..ae99371 100644
--- a/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/SKILL.md
+++ b/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/SKILL.md
@@ -1,6 +1,7 @@
 ---
 name: verify-graph
 description: Playwright CLI verification of the graph page — modes, controls, topic selection, and data rendering. Use after any change to graph-page components, graph rendering, data flow, or mode switching logic.
+user-invocable: true
 ---
 
 Get the branch's client running with `run-local <branch>`; its URL is `BASE_URL`. The scripts need `playwright-cli` (`npm i -g @playwright/cli`, then `playwright-cli install-browser chromium`; cloud containers use their preinstalled Chromium). Then run the base checks:
diff --git a/software/application-software/argos/workspaces/experimental/workspace.generated b/software/application-software/argos/workspaces/experimental/workspace.generated
index 09fe5ff..f099116 100644
--- a/software/application-software/argos/workspaces/experimental/workspace.generated
+++ b/software/application-software/argos/workspaces/experimental/workspace.generated
@@ -1,10 +1,10 @@
 # Generated by ci/render.sh; edit shared sources or opt out in workspace.yml.
 100644 61c35f28dda167e42bebc3bad3994af97c53e876	.claude/settings.json	ci/plugins.sh
-100644 3bf22d3571b9cad53804cc7a7c678c4103368780	.claude/skills/address-pr-comments/SKILL.md	software/application-software/skills/address-pr-comments/SKILL.md
+100644 30083fa3b2cf735ac5a75808478dd00476e75e9c	.claude/skills/address-pr-comments/SKILL.md	software/application-software/skills/address-pr-comments/SKILL.md
 100755 ce1efd97da4a6d2ea655932486660c5008f44dae	.claude/skills/address-pr-comments/scripts/fetch-feedback.sh	software/application-software/skills/address-pr-comments/scripts/fetch-feedback.sh
 100644 da0be202ebc0a9ffc4544dbdf4bbef54cca37520	.claude/skills/address-pr-comments/scripts/github.sh	software/application-software/skills/address-pr-comments/scripts/github.sh
-100644 ad1fa37b4cf08693b5dcbf85d62df96c1a56b7e5	.claude/skills/commit/SKILL.md	software/application-software/skills/commit/SKILL.md
-100644 897a1f58386f280ce329a245baea7b562ac0b3db	.claude/skills/consolidate-spikes/SKILL.md	software/application-software/skills/consolidate-spikes/SKILL.md
+100644 4b5675711abfaef10089859f379a931206267355	.claude/skills/commit/SKILL.md	software/application-software/skills/commit/SKILL.md
+100644 4f85b66ab5c07ce4a00ba3d8555fc9272544046b	.claude/skills/consolidate-spikes/SKILL.md	software/application-software/skills/consolidate-spikes/SKILL.md
 100644 9dd28e531875c0acb7f8a88a07ad15645aecf38f	.claude/skills/create-ticket/SKILL.md	software/application-software/skills/create-ticket/SKILL.md
 100644 f24d293b38a4d03b610a5a104fa97b614856d7c3	.claude/skills/implement/SKILL.md	software/application-software/argos/skills/implement/SKILL.md
 100644 4917259f9e29db28e2636496e80f80ee5d9e321e	.claude/skills/journal/SKILL.md	software/skills/journal/SKILL.md
@@ -12,17 +12,17 @@
 100644 0495fc97cbe93e4331c89263aee188f6c0e9c9ea	.claude/skills/new-worktree/SKILL.md	software/skills/new-worktree/SKILL.md
 100644 7363dd2304fbb29c464e8cac0fd270acdeeb8060	.claude/skills/open-pr/SKILL.md	software/application-software/skills/open-pr/SKILL.md
 100755 61f377fef63daa10c443129df6a49571fdbeb658	.claude/skills/open-pr/scripts/pr-checks.sh	software/application-software/skills/open-pr/scripts/pr-checks.sh
-100644 7e504925c1133ff291fe29f9b0c824c945158e71	.claude/skills/pr-conventions/SKILL.md	software/application-software/argos/skills/pr-conventions/SKILL.md
+100644 90cc6571064f750bd5d816f44cf3064fa2df8f7e	.claude/skills/pr-conventions/SKILL.md	software/application-software/argos/skills/pr-conventions/SKILL.md
 100644 2ed67ecda73634b78468cab0ccb52c86f128e064	.claude/skills/pr-conventions/scripts/lint.sh	software/application-software/argos/skills/pr-conventions/scripts/lint.sh
 100644 e67387116a753217d256d81901e5b4091b49b44c	.claude/skills/report-spike/SKILL.md	software/application-software/skills/report-spike/SKILL.md
 100644 7acb908af141defaa035f992b060d4d23c0b2a54	.claude/skills/run-local/SKILL.md	software/application-software/argos/skills/run-local/SKILL.md
 100755 f5986571d9b917264eb6cfe9c9d7f27448242ac9	.claude/skills/run-local/scripts/run-local.sh	software/application-software/argos/skills/run-local/scripts/run-local.sh
 100755 d8de89ce933cbc5302c59fab3176004bdd251d35	.claude/skills/run-local/scripts/serve.sh	software/application-software/argos/skills/run-local/scripts/serve.sh
 100644 fdc1ce85211200223040edfb5dc65a3de7f35d53	.claude/skills/setup-workspace/SKILL.md	software/skills/setup-workspace/SKILL.md
-100644 0b5a91a731df227907cf8bc40a8a2e04c4518059	.claude/skills/switch-workspace/SKILL.md	software/skills/switch-workspace/SKILL.md
-100644 8d9ec377f598b4527af20ffaa54b6cfe1a244860	.claude/skills/ticket-conventions/SKILL.md	software/application-software/argos/skills/ticket-conventions/SKILL.md
+100644 e0a8b424d11c4897901c0ce888a6c0c726daed98	.claude/skills/switch-workspace/SKILL.md	software/skills/switch-workspace/SKILL.md
+100644 b516657698fb909e0c72f8c9a6187fdaf4a38f71	.claude/skills/ticket-conventions/SKILL.md	software/application-software/argos/skills/ticket-conventions/SKILL.md
 100644 069b51714c0fd4d3d6ad972dd9f840e01f21cf15	.claude/skills/update-pr/SKILL.md	software/application-software/skills/update-pr/SKILL.md
-100644 c9dfe7d18e9c4d728d5295eeed178960289390a2	.claude/skills/verify-graph/SKILL.md	software/application-software/argos/skills/verify-graph/SKILL.md
+100644 ae99371d623deb83d2ac5b1227eb12eaff662092	.claude/skills/verify-graph/SKILL.md	software/application-software/argos/skills/verify-graph/SKILL.md
 100644 3fcb7344ce3499a7afbba08b8c2b6deacd3f101b	.claude/skills/verify-graph/scripts/check.js	software/application-software/argos/skills/verify-graph/scripts/check.js
 100755 c8710cdf2cea12ddae0a92c3e0ba141e06a234f3	.claude/skills/verify-graph/scripts/check.sh	software/application-software/argos/skills/verify-graph/scripts/check.sh
 100755 5a1b49bc55582ec03f5e0a58c015d1b28fd21af3	.claude/skills/verify-graph/scripts/open.sh	software/application-software/argos/skills/verify-graph/scripts/open.sh
diff --git a/software/application-software/nero/skills/pr-conventions/SKILL.md b/software/application-software/nero/skills/pr-conventions/SKILL.md
index 77b2d41..9e2bb17 100644
--- a/software/application-software/nero/skills/pr-conventions/SKILL.md
+++ b/software/application-software/nero/skills/pr-conventions/SKILL.md
@@ -1,14 +1,15 @@
 ---
 name: pr-conventions
 description: Nero specifics for pull requests (base branch, commit format, checks, labels, screenshots, UI QA). Load before opening, updating, or reviewing a Nero PR, alongside open-pr, update-pr, and review.
+user-invocable: false
 ---
 
 # Nero PR conventions
 
 The shared rules are in the `open-pr` skill; this adds only what is Nero's.
 
-- Base branch: `develop`. Commit format: `^#[0-9]+ ` (the format in the workspace instructions).
+- Base branch: `develop`. Commit format: `^#[0-9]+ ` (the format in CLAUDE.md).
 - Checks: in the worktree, `clang-format --dry-run --Werror` on the C++ files changed since `origin/develop` (not under `deps/`); stop on any error.
 - Labels: none.
 - Screenshots: `playwright/test-results/<case>/` in the worktree, never committed.
-- UI QA, only if QML or a page changed: in the worktree's `playwright/`, add or update a case for each changed page, run `npm test`, and inspect `test-results/<case>/` (the workspace instructions' Playwright section).
+- UI QA, only if QML or a page changed: in the worktree's `playwright/`, add or update a case for each changed page, run `npm test`, and inspect `test-results/<case>/` (CLAUDE.md's Playwright section).
diff --git a/software/application-software/nero/skills/ticket-conventions/SKILL.md b/software/application-software/nero/skills/ticket-conventions/SKILL.md
index 05ff574..c837cd5 100644
--- a/software/application-software/nero/skills/ticket-conventions/SKILL.md
+++ b/software/application-software/nero/skills/ticket-conventions/SKILL.md
@@ -1,6 +1,7 @@
 ---
 name: ticket-conventions
 description: Nero specifics for tickets (repo, area labels, vocabulary, diagrams). Load before drafting or filing a Nero issue, alongside create-ticket.
+user-invocable: false
 ---
 
 # Nero ticket conventions
diff --git a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/address-pr-comments/SKILL.md b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/address-pr-comments/SKILL.md
index 3bf22d3..30083fa 100644
--- a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/address-pr-comments/SKILL.md
+++ b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/address-pr-comments/SKILL.md
@@ -1,11 +1,13 @@
 ---
 name: address-pr-comments
 description: Fetch review comments on a PR (Argos, Nero), judge whether each (including outdated ones) still applies, and walk through fixes in the PR's worktree
+allowed-tools: Bash(git:*), Bash(gh issue list:*), Bash(bash ${CLAUDE_SKILL_DIR}/scripts/fetch-feedback.sh *)
+user-invocable: true
 ---
 
 Propose and apply fixes for a PR's unresolved review feedback. **Never reply to threads**; the user does.
 
-1. **Fetch** from the workspace root: `bash scripts/fetch-feedback.sh <repo> <pr>|<branch>` (`<repo>` as under `repos/`, e.g. `argos`; `--all` first for unfiltered history). It checks out the PR head's worktree and prints JSON: `worktree` (target it by path from the root from now on), unresolved `threads`, `comments`, `reviews`. Any non-zero exit: use the available GitHub integration's PR-reading tool instead.
+1. **Fetch** from the workspace root: `bash scripts/fetch-feedback.sh <repo> <pr>|<branch>` (`<repo>` as under `repos/`, e.g. `argos`; `--all` first for unfiltered history). It checks out the PR head's worktree and prints JSON: `worktree` (target it by path from the root from now on), unresolved `threads`, `comments`, `reviews`. Any non-zero exit: use the GitHub MCP server's `pull_request_read` instead.
 2. **Judge.** Skip bot noise and anything already fixed at HEAD. For an `outdated` thread, find its `diffHunk` code by content, then label it **addressed**, **applies**, **moved**, **obsolete**, or **unclear**.
 3. **Present** before editing, grouped by file, and ask to confirm, skip, or change each (offer to batch clear ones past 8):
 
diff --git a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/commit/SKILL.md b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/commit/SKILL.md
index ad1fa37..4b56757 100644
--- a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/commit/SKILL.md
+++ b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/commit/SKILL.md
@@ -3,4 +3,4 @@ name: commit
 description: Stage and commit using the project's commit message convention
 ---
 
-In the worktree you're working on, from the workspace root (`git -C worktrees/<repo>/<branch> …`), stage the relevant changes (not unrelated or generated files) and commit using the commit message format in the workspace instructions. Keep the description imperative and 2–8 words.
+In the worktree you're working on, from the workspace root (`git -C worktrees/<repo>/<branch> …`), stage the relevant changes (not unrelated or generated files) and commit using the commit message format in CLAUDE.md. Keep the description imperative and 2–8 words.
diff --git a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/consolidate-spikes/SKILL.md b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/consolidate-spikes/SKILL.md
index 897a1f5..4f85b66 100644
--- a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/consolidate-spikes/SKILL.md
+++ b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/consolidate-spikes/SKILL.md
@@ -1,7 +1,6 @@
 ---
 name: consolidate-spikes
-description: >-
-  Turn finished spikes into implementation tickets: an idea's spikes, once all are done, into dev work, under an epic when it comes from an idea or splits. Use when the user wants to wrap up, settle, or consolidate an idea or spike on an application-software repo (Argos, Nero).
+description: Turn finished spikes into implementation tickets: an idea's spikes, once all are done, into dev work, under an epic when it comes from an idea or splits. Use when the user wants to wrap up, settle, or consolidate an idea or spike on an application-software repo (Argos, Nero).
 ---
 
 Drafts and files by the `create-ticket` rules; load it and the project's `ticket-conventions` first. Takes an idea or a standalone spike.
diff --git a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/pr-conventions/SKILL.md b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/pr-conventions/SKILL.md
index 77b2d41..9e2bb17 100644
--- a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/pr-conventions/SKILL.md
+++ b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/pr-conventions/SKILL.md
@@ -1,14 +1,15 @@
 ---
 name: pr-conventions
 description: Nero specifics for pull requests (base branch, commit format, checks, labels, screenshots, UI QA). Load before opening, updating, or reviewing a Nero PR, alongside open-pr, update-pr, and review.
+user-invocable: false
 ---
 
 # Nero PR conventions
 
 The shared rules are in the `open-pr` skill; this adds only what is Nero's.
 
-- Base branch: `develop`. Commit format: `^#[0-9]+ ` (the format in the workspace instructions).
+- Base branch: `develop`. Commit format: `^#[0-9]+ ` (the format in CLAUDE.md).
 - Checks: in the worktree, `clang-format --dry-run --Werror` on the C++ files changed since `origin/develop` (not under `deps/`); stop on any error.
 - Labels: none.
 - Screenshots: `playwright/test-results/<case>/` in the worktree, never committed.
-- UI QA, only if QML or a page changed: in the worktree's `playwright/`, add or update a case for each changed page, run `npm test`, and inspect `test-results/<case>/` (the workspace instructions' Playwright section).
+- UI QA, only if QML or a page changed: in the worktree's `playwright/`, add or update a case for each changed page, run `npm test`, and inspect `test-results/<case>/` (CLAUDE.md's Playwright section).
diff --git a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/switch-workspace/SKILL.md b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/switch-workspace/SKILL.md
index 0b5a91a..e0a8b42 100644
--- a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/switch-workspace/SKILL.md
+++ b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/switch-workspace/SKILL.md
@@ -10,10 +10,11 @@ bash .delphi/switch.sh <name>        # ws/<name>: its dotted name, e.g. s.app.ar
 bash .delphi/switch.sh main          # Delphi's main: project folders, templates, CI
 ```
 
+- The user can also switch from the `/ws-delphi` pane (the `delphi` plugin's mod), which shows them as cards (`bash .delphi/switch.sh --list`): press one, then Switch workspace; `/ws-delphi <name>` switches straight away, and `/ws-delphi --web` opens the same cards in a browser tab.
 - List workspaces and their project folders: `bash .delphi/switch.sh --list`.
 - It refuses while tracked files have changes: commit them on a branch (and PR them) first. Then it fetches, switches, fast-forwards, and runs the new workspace's `.delphi/setup.sh`.
 - The post-checkout hook parks this workspace's `repos/`, `worktrees/`, `references/` and `workspaces/` in `.delphi/parked/<name>/` (git-ignored; `<name>` as in its `workspace.yml`) and brings the other's back at the same paths, so worktrees and the work in them return as they were. Switch back the same way. Never run `git clean -X` or `git stash --all` at the workspace root: they take ignored files, parked work included.
 - Before switching, stop anything running from `worktrees/` (dev servers, Docker builds): its folder moves.
-- Start a fresh harness session after switching so its instructions and skills match the new workspace. A harness integration may explicitly support reloading in place; follow its documented behavior.
+- No restart needed: skills under `.claude/skills/` reload on their own, and the `delphi` mod sends the new workspace's `CLAUDE.md` with the next prompt. Without the mod installed, this session keeps the old `CLAUDE.md`: tell the user to restart Claude Code in the same folder before starting work in the new workspace.
 - To change the workspace you switched to: `git switch -c <branch>`, commit, push, and open a PR into `ws/<name>` (or `main`).
 - To only read another workspace or main without leaving this one, list it under `workspaces:` instead (`setup-workspace` skill).
diff --git a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/ticket-conventions/SKILL.md b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/ticket-conventions/SKILL.md
index 05ff574..c837cd5 100644
--- a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/ticket-conventions/SKILL.md
+++ b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/ticket-conventions/SKILL.md
@@ -1,6 +1,7 @@
 ---
 name: ticket-conventions
 description: Nero specifics for tickets (repo, area labels, vocabulary, diagrams). Load before drafting or filing a Nero issue, alongside create-ticket.
+user-invocable: false
 ---
 
 # Nero ticket conventions
diff --git a/software/application-software/nero/workspaces/nero-experimental/workspace.generated b/software/application-software/nero/workspaces/nero-experimental/workspace.generated
index fe3c0b7..bb14e1e 100644
--- a/software/application-software/nero/workspaces/nero-experimental/workspace.generated
+++ b/software/application-software/nero/workspaces/nero-experimental/workspace.generated
@@ -1,19 +1,19 @@
 # Generated by ci/render.sh; edit shared sources or opt out in workspace.yml.
 100644 61c35f28dda167e42bebc3bad3994af97c53e876	.claude/settings.json	ci/plugins.sh
-100644 3bf22d3571b9cad53804cc7a7c678c4103368780	.claude/skills/address-pr-comments/SKILL.md	software/application-software/skills/address-pr-comments/SKILL.md
+100644 30083fa3b2cf735ac5a75808478dd00476e75e9c	.claude/skills/address-pr-comments/SKILL.md	software/application-software/skills/address-pr-comments/SKILL.md
 100755 ce1efd97da4a6d2ea655932486660c5008f44dae	.claude/skills/address-pr-comments/scripts/fetch-feedback.sh	software/application-software/skills/address-pr-comments/scripts/fetch-feedback.sh
 100644 da0be202ebc0a9ffc4544dbdf4bbef54cca37520	.claude/skills/address-pr-comments/scripts/github.sh	software/application-software/skills/address-pr-comments/scripts/github.sh
-100644 ad1fa37b4cf08693b5dcbf85d62df96c1a56b7e5	.claude/skills/commit/SKILL.md	software/application-software/skills/commit/SKILL.md
-100644 897a1f58386f280ce329a245baea7b562ac0b3db	.claude/skills/consolidate-spikes/SKILL.md	software/application-software/skills/consolidate-spikes/SKILL.md
+100644 4b5675711abfaef10089859f379a931206267355	.claude/skills/commit/SKILL.md	software/application-software/skills/commit/SKILL.md
+100644 4f85b66ab5c07ce4a00ba3d8555fc9272544046b	.claude/skills/consolidate-spikes/SKILL.md	software/application-software/skills/consolidate-spikes/SKILL.md
 100644 9dd28e531875c0acb7f8a88a07ad15645aecf38f	.claude/skills/create-ticket/SKILL.md	software/application-software/skills/create-ticket/SKILL.md
 100644 4917259f9e29db28e2636496e80f80ee5d9e321e	.claude/skills/journal/SKILL.md	software/skills/journal/SKILL.md
 100755 1e90d7b9afa14b8b0e7f36e0e1d83baecc94ba5b	.claude/skills/journal/scripts/capture.sh	software/skills/journal/scripts/capture.sh
 100644 0495fc97cbe93e4331c89263aee188f6c0e9c9ea	.claude/skills/new-worktree/SKILL.md	software/skills/new-worktree/SKILL.md
 100644 7363dd2304fbb29c464e8cac0fd270acdeeb8060	.claude/skills/open-pr/SKILL.md	software/application-software/skills/open-pr/SKILL.md
 100755 61f377fef63daa10c443129df6a49571fdbeb658	.claude/skills/open-pr/scripts/pr-checks.sh	software/application-software/skills/open-pr/scripts/pr-checks.sh
-100644 77b2d415a009973dcb1facb6e4f864aa24f9615f	.claude/skills/pr-conventions/SKILL.md	software/application-software/nero/skills/pr-conventions/SKILL.md
+100644 9e2bb1781bd6272ab64e9052bc7b8c13e97e7588	.claude/skills/pr-conventions/SKILL.md	software/application-software/nero/skills/pr-conventions/SKILL.md
 100644 e67387116a753217d256d81901e5b4091b49b44c	.claude/skills/report-spike/SKILL.md	software/application-software/skills/report-spike/SKILL.md
 100644 fdc1ce85211200223040edfb5dc65a3de7f35d53	.claude/skills/setup-workspace/SKILL.md	software/skills/setup-workspace/SKILL.md
-100644 0b5a91a731df227907cf8bc40a8a2e04c4518059	.claude/skills/switch-workspace/SKILL.md	software/skills/switch-workspace/SKILL.md
-100644 05ff57481c11cc43669eae13f2bbe67eba853db6	.claude/skills/ticket-conventions/SKILL.md	software/application-software/nero/skills/ticket-conventions/SKILL.md
+100644 e0a8b424d11c4897901c0ce888a6c0c726daed98	.claude/skills/switch-workspace/SKILL.md	software/skills/switch-workspace/SKILL.md
+100644 c837cd55b11831c601ffe7f4caad31d41ab3b604	.claude/skills/ticket-conventions/SKILL.md	software/application-software/nero/skills/ticket-conventions/SKILL.md
 100644 069b51714c0fd4d3d6ad972dd9f840e01f21cf15	.claude/skills/update-pr/SKILL.md	software/application-software/skills/update-pr/SKILL.md
diff --git a/software/application-software/skills/address-pr-comments/SKILL.md b/software/application-software/skills/address-pr-comments/SKILL.md
index 3bf22d3..30083fa 100644
--- a/software/application-software/skills/address-pr-comments/SKILL.md
+++ b/software/application-software/skills/address-pr-comments/SKILL.md
@@ -1,11 +1,13 @@
 ---
 name: address-pr-comments
 description: Fetch review comments on a PR (Argos, Nero), judge whether each (including outdated ones) still applies, and walk through fixes in the PR's worktree
+allowed-tools: Bash(git:*), Bash(gh issue list:*), Bash(bash ${CLAUDE_SKILL_DIR}/scripts/fetch-feedback.sh *)
+user-invocable: true
 ---
 
 Propose and apply fixes for a PR's unresolved review feedback. **Never reply to threads**; the user does.
 
-1. **Fetch** from the workspace root: `bash scripts/fetch-feedback.sh <repo> <pr>|<branch>` (`<repo>` as under `repos/`, e.g. `argos`; `--all` first for unfiltered history). It checks out the PR head's worktree and prints JSON: `worktree` (target it by path from the root from now on), unresolved `threads`, `comments`, `reviews`. Any non-zero exit: use the available GitHub integration's PR-reading tool instead.
+1. **Fetch** from the workspace root: `bash scripts/fetch-feedback.sh <repo> <pr>|<branch>` (`<repo>` as under `repos/`, e.g. `argos`; `--all` first for unfiltered history). It checks out the PR head's worktree and prints JSON: `worktree` (target it by path from the root from now on), unresolved `threads`, `comments`, `reviews`. Any non-zero exit: use the GitHub MCP server's `pull_request_read` instead.
 2. **Judge.** Skip bot noise and anything already fixed at HEAD. For an `outdated` thread, find its `diffHunk` code by content, then label it **addressed**, **applies**, **moved**, **obsolete**, or **unclear**.
 3. **Present** before editing, grouped by file, and ask to confirm, skip, or change each (offer to batch clear ones past 8):
 
diff --git a/software/application-software/skills/commit/SKILL.md b/software/application-software/skills/commit/SKILL.md
index ad1fa37..4b56757 100644
--- a/software/application-software/skills/commit/SKILL.md
+++ b/software/application-software/skills/commit/SKILL.md
@@ -3,4 +3,4 @@ name: commit
 description: Stage and commit using the project's commit message convention
 ---
 
-In the worktree you're working on, from the workspace root (`git -C worktrees/<repo>/<branch> …`), stage the relevant changes (not unrelated or generated files) and commit using the commit message format in the workspace instructions. Keep the description imperative and 2–8 words.
+In the worktree you're working on, from the workspace root (`git -C worktrees/<repo>/<branch> …`), stage the relevant changes (not unrelated or generated files) and commit using the commit message format in CLAUDE.md. Keep the description imperative and 2–8 words.
diff --git a/software/application-software/skills/consolidate-spikes/SKILL.md b/software/application-software/skills/consolidate-spikes/SKILL.md
index 897a1f5..4f85b66 100644
--- a/software/application-software/skills/consolidate-spikes/SKILL.md
+++ b/software/application-software/skills/consolidate-spikes/SKILL.md
@@ -1,7 +1,6 @@
 ---
 name: consolidate-spikes
-description: >-
-  Turn finished spikes into implementation tickets: an idea's spikes, once all are done, into dev work, under an epic when it comes from an idea or splits. Use when the user wants to wrap up, settle, or consolidate an idea or spike on an application-software repo (Argos, Nero).
+description: Turn finished spikes into implementation tickets: an idea's spikes, once all are done, into dev work, under an epic when it comes from an idea or splits. Use when the user wants to wrap up, settle, or consolidate an idea or spike on an application-software repo (Argos, Nero).
 ---
 
 Drafts and files by the `create-ticket` rules; load it and the project's `ticket-conventions` first. Takes an idea or a standalone spike.
diff --git a/software/application-software/workspaces/hub/.claude/skills/address-pr-comments/SKILL.md b/software/application-software/workspaces/hub/.claude/skills/address-pr-comments/SKILL.md
index 3bf22d3..30083fa 100644
--- a/software/application-software/workspaces/hub/.claude/skills/address-pr-comments/SKILL.md
+++ b/software/application-software/workspaces/hub/.claude/skills/address-pr-comments/SKILL.md
@@ -1,11 +1,13 @@
 ---
 name: address-pr-comments
 description: Fetch review comments on a PR (Argos, Nero), judge whether each (including outdated ones) still applies, and walk through fixes in the PR's worktree
+allowed-tools: Bash(git:*), Bash(gh issue list:*), Bash(bash ${CLAUDE_SKILL_DIR}/scripts/fetch-feedback.sh *)
+user-invocable: true
 ---
 
 Propose and apply fixes for a PR's unresolved review feedback. **Never reply to threads**; the user does.
 
-1. **Fetch** from the workspace root: `bash scripts/fetch-feedback.sh <repo> <pr>|<branch>` (`<repo>` as under `repos/`, e.g. `argos`; `--all` first for unfiltered history). It checks out the PR head's worktree and prints JSON: `worktree` (target it by path from the root from now on), unresolved `threads`, `comments`, `reviews`. Any non-zero exit: use the available GitHub integration's PR-reading tool instead.
+1. **Fetch** from the workspace root: `bash scripts/fetch-feedback.sh <repo> <pr>|<branch>` (`<repo>` as under `repos/`, e.g. `argos`; `--all` first for unfiltered history). It checks out the PR head's worktree and prints JSON: `worktree` (target it by path from the root from now on), unresolved `threads`, `comments`, `reviews`. Any non-zero exit: use the GitHub MCP server's `pull_request_read` instead.
 2. **Judge.** Skip bot noise and anything already fixed at HEAD. For an `outdated` thread, find its `diffHunk` code by content, then label it **addressed**, **applies**, **moved**, **obsolete**, or **unclear**.
 3. **Present** before editing, grouped by file, and ask to confirm, skip, or change each (offer to batch clear ones past 8):
 
diff --git a/software/application-software/workspaces/hub/.claude/skills/commit/SKILL.md b/software/application-software/workspaces/hub/.claude/skills/commit/SKILL.md
index ad1fa37..4b56757 100644
--- a/software/application-software/workspaces/hub/.claude/skills/commit/SKILL.md
+++ b/software/application-software/workspaces/hub/.claude/skills/commit/SKILL.md
@@ -3,4 +3,4 @@ name: commit
 description: Stage and commit using the project's commit message convention
 ---
 
-In the worktree you're working on, from the workspace root (`git -C worktrees/<repo>/<branch> …`), stage the relevant changes (not unrelated or generated files) and commit using the commit message format in the workspace instructions. Keep the description imperative and 2–8 words.
+In the worktree you're working on, from the workspace root (`git -C worktrees/<repo>/<branch> …`), stage the relevant changes (not unrelated or generated files) and commit using the commit message format in CLAUDE.md. Keep the description imperative and 2–8 words.
diff --git a/software/application-software/workspaces/hub/.claude/skills/consolidate-spikes/SKILL.md b/software/application-software/workspaces/hub/.claude/skills/consolidate-spikes/SKILL.md
index 897a1f5..4f85b66 100644
--- a/software/application-software/workspaces/hub/.claude/skills/consolidate-spikes/SKILL.md
+++ b/software/application-software/workspaces/hub/.claude/skills/consolidate-spikes/SKILL.md
@@ -1,7 +1,6 @@
 ---
 name: consolidate-spikes
-description: >-
-  Turn finished spikes into implementation tickets: an idea's spikes, once all are done, into dev work, under an epic when it comes from an idea or splits. Use when the user wants to wrap up, settle, or consolidate an idea or spike on an application-software repo (Argos, Nero).
+description: Turn finished spikes into implementation tickets: an idea's spikes, once all are done, into dev work, under an epic when it comes from an idea or splits. Use when the user wants to wrap up, settle, or consolidate an idea or spike on an application-software repo (Argos, Nero).
 ---
 
 Drafts and files by the `create-ticket` rules; load it and the project's `ticket-conventions` first. Takes an idea or a standalone spike.
diff --git a/software/application-software/workspaces/hub/.claude/skills/switch-workspace/SKILL.md b/software/application-software/workspaces/hub/.claude/skills/switch-workspace/SKILL.md
index 0b5a91a..e0a8b42 100644
--- a/software/application-software/workspaces/hub/.claude/skills/switch-workspace/SKILL.md
+++ b/software/application-software/workspaces/hub/.claude/skills/switch-workspace/SKILL.md
@@ -10,10 +10,11 @@ bash .delphi/switch.sh <name>        # ws/<name>: its dotted name, e.g. s.app.ar
 bash .delphi/switch.sh main          # Delphi's main: project folders, templates, CI
 ```
 
+- The user can also switch from the `/ws-delphi` pane (the `delphi` plugin's mod), which shows them as cards (`bash .delphi/switch.sh --list`): press one, then Switch workspace; `/ws-delphi <name>` switches straight away, and `/ws-delphi --web` opens the same cards in a browser tab.
 - List workspaces and their project folders: `bash .delphi/switch.sh --list`.
 - It refuses while tracked files have changes: commit them on a branch (and PR them) first. Then it fetches, switches, fast-forwards, and runs the new workspace's `.delphi/setup.sh`.
 - The post-checkout hook parks this workspace's `repos/`, `worktrees/`, `references/` and `workspaces/` in `.delphi/parked/<name>/` (git-ignored; `<name>` as in its `workspace.yml`) and brings the other's back at the same paths, so worktrees and the work in them return as they were. Switch back the same way. Never run `git clean -X` or `git stash --all` at the workspace root: they take ignored files, parked work included.
 - Before switching, stop anything running from `worktrees/` (dev servers, Docker builds): its folder moves.
-- Start a fresh harness session after switching so its instructions and skills match the new workspace. A harness integration may explicitly support reloading in place; follow its documented behavior.
+- No restart needed: skills under `.claude/skills/` reload on their own, and the `delphi` mod sends the new workspace's `CLAUDE.md` with the next prompt. Without the mod installed, this session keeps the old `CLAUDE.md`: tell the user to restart Claude Code in the same folder before starting work in the new workspace.
 - To change the workspace you switched to: `git switch -c <branch>`, commit, push, and open a PR into `ws/<name>` (or `main`).
 - To only read another workspace or main without leaving this one, list it under `workspaces:` instead (`setup-workspace` skill).
diff --git a/software/application-software/workspaces/hub/workspace.generated b/software/application-software/workspaces/hub/workspace.generated
index c08144c..3e07f6d 100644
--- a/software/application-software/workspaces/hub/workspace.generated
+++ b/software/application-software/workspaces/hub/workspace.generated
@@ -1,10 +1,10 @@
 # Generated by ci/render.sh; edit shared sources or opt out in workspace.yml.
 100644 61c35f28dda167e42bebc3bad3994af97c53e876	.claude/settings.json	ci/plugins.sh
-100644 3bf22d3571b9cad53804cc7a7c678c4103368780	.claude/skills/address-pr-comments/SKILL.md	software/application-software/skills/address-pr-comments/SKILL.md
+100644 30083fa3b2cf735ac5a75808478dd00476e75e9c	.claude/skills/address-pr-comments/SKILL.md	software/application-software/skills/address-pr-comments/SKILL.md
 100755 ce1efd97da4a6d2ea655932486660c5008f44dae	.claude/skills/address-pr-comments/scripts/fetch-feedback.sh	software/application-software/skills/address-pr-comments/scripts/fetch-feedback.sh
 100644 da0be202ebc0a9ffc4544dbdf4bbef54cca37520	.claude/skills/address-pr-comments/scripts/github.sh	software/application-software/skills/address-pr-comments/scripts/github.sh
-100644 ad1fa37b4cf08693b5dcbf85d62df96c1a56b7e5	.claude/skills/commit/SKILL.md	software/application-software/skills/commit/SKILL.md
-100644 897a1f58386f280ce329a245baea7b562ac0b3db	.claude/skills/consolidate-spikes/SKILL.md	software/application-software/skills/consolidate-spikes/SKILL.md
+100644 4b5675711abfaef10089859f379a931206267355	.claude/skills/commit/SKILL.md	software/application-software/skills/commit/SKILL.md
+100644 4f85b66ab5c07ce4a00ba3d8555fc9272544046b	.claude/skills/consolidate-spikes/SKILL.md	software/application-software/skills/consolidate-spikes/SKILL.md
 100644 9dd28e531875c0acb7f8a88a07ad15645aecf38f	.claude/skills/create-ticket/SKILL.md	software/application-software/skills/create-ticket/SKILL.md
 100644 4917259f9e29db28e2636496e80f80ee5d9e321e	.claude/skills/journal/SKILL.md	software/skills/journal/SKILL.md
 100755 1e90d7b9afa14b8b0e7f36e0e1d83baecc94ba5b	.claude/skills/journal/scripts/capture.sh	software/skills/journal/scripts/capture.sh
@@ -13,5 +13,5 @@
 100755 61f377fef63daa10c443129df6a49571fdbeb658	.claude/skills/open-pr/scripts/pr-checks.sh	software/application-software/skills/open-pr/scripts/pr-checks.sh
 100644 e67387116a753217d256d81901e5b4091b49b44c	.claude/skills/report-spike/SKILL.md	software/application-software/skills/report-spike/SKILL.md
 100644 fdc1ce85211200223040edfb5dc65a3de7f35d53	.claude/skills/setup-workspace/SKILL.md	software/skills/setup-workspace/SKILL.md
-100644 0b5a91a731df227907cf8bc40a8a2e04c4518059	.claude/skills/switch-workspace/SKILL.md	software/skills/switch-workspace/SKILL.md
+100644 e0a8b424d11c4897901c0ce888a6c0c726daed98	.claude/skills/switch-workspace/SKILL.md	software/skills/switch-workspace/SKILL.md
 100644 069b51714c0fd4d3d6ad972dd9f840e01f21cf15	.claude/skills/update-pr/SKILL.md	software/application-software/skills/update-pr/SKILL.md
diff --git a/software/firmware/calypso/workspaces/calypso-dev/.claude/skills/switch-workspace/SKILL.md b/software/firmware/calypso/workspaces/calypso-dev/.claude/skills/switch-workspace/SKILL.md
index 0b5a91a..e0a8b42 100644
--- a/software/firmware/calypso/workspaces/calypso-dev/.claude/skills/switch-workspace/SKILL.md
+++ b/software/firmware/calypso/workspaces/calypso-dev/.claude/skills/switch-workspace/SKILL.md
@@ -10,10 +10,11 @@ bash .delphi/switch.sh <name>        # ws/<name>: its dotted name, e.g. s.app.ar
 bash .delphi/switch.sh main          # Delphi's main: project folders, templates, CI
 ```
 
+- The user can also switch from the `/ws-delphi` pane (the `delphi` plugin's mod), which shows them as cards (`bash .delphi/switch.sh --list`): press one, then Switch workspace; `/ws-delphi <name>` switches straight away, and `/ws-delphi --web` opens the same cards in a browser tab.
 - List workspaces and their project folders: `bash .delphi/switch.sh --list`.
 - It refuses while tracked files have changes: commit them on a branch (and PR them) first. Then it fetches, switches, fast-forwards, and runs the new workspace's `.delphi/setup.sh`.
 - The post-checkout hook parks this workspace's `repos/`, `worktrees/`, `references/` and `workspaces/` in `.delphi/parked/<name>/` (git-ignored; `<name>` as in its `workspace.yml`) and brings the other's back at the same paths, so worktrees and the work in them return as they were. Switch back the same way. Never run `git clean -X` or `git stash --all` at the workspace root: they take ignored files, parked work included.
 - Before switching, stop anything running from `worktrees/` (dev servers, Docker builds): its folder moves.
-- Start a fresh harness session after switching so its instructions and skills match the new workspace. A harness integration may explicitly support reloading in place; follow its documented behavior.
+- No restart needed: skills under `.claude/skills/` reload on their own, and the `delphi` mod sends the new workspace's `CLAUDE.md` with the next prompt. Without the mod installed, this session keeps the old `CLAUDE.md`: tell the user to restart Claude Code in the same folder before starting work in the new workspace.
 - To change the workspace you switched to: `git switch -c <branch>`, commit, push, and open a PR into `ws/<name>` (or `main`).
 - To only read another workspace or main without leaving this one, list it under `workspaces:` instead (`setup-workspace` skill).
diff --git a/software/firmware/calypso/workspaces/calypso-dev/workspace.generated b/software/firmware/calypso/workspaces/calypso-dev/workspace.generated
index baf5132..3adc295 100644
--- a/software/firmware/calypso/workspaces/calypso-dev/workspace.generated
+++ b/software/firmware/calypso/workspaces/calypso-dev/workspace.generated
@@ -4,4 +4,4 @@
 100755 1e90d7b9afa14b8b0e7f36e0e1d83baecc94ba5b	.claude/skills/journal/scripts/capture.sh	software/skills/journal/scripts/capture.sh
 100644 0495fc97cbe93e4331c89263aee188f6c0e9c9ea	.claude/skills/new-worktree/SKILL.md	software/skills/new-worktree/SKILL.md
 100644 fdc1ce85211200223040edfb5dc65a3de7f35d53	.claude/skills/setup-workspace/SKILL.md	software/skills/setup-workspace/SKILL.md
-100644 0b5a91a731df227907cf8bc40a8a2e04c4518059	.claude/skills/switch-workspace/SKILL.md	software/skills/switch-workspace/SKILL.md
+100644 e0a8b424d11c4897901c0ce888a6c0c726daed98	.claude/skills/switch-workspace/SKILL.md	software/skills/switch-workspace/SKILL.md
diff --git a/software/skills/switch-workspace/SKILL.md b/software/skills/switch-workspace/SKILL.md
index 0b5a91a..e0a8b42 100644
--- a/software/skills/switch-workspace/SKILL.md
+++ b/software/skills/switch-workspace/SKILL.md
@@ -10,10 +10,11 @@ bash .delphi/switch.sh <name>        # ws/<name>: its dotted name, e.g. s.app.ar
 bash .delphi/switch.sh main          # Delphi's main: project folders, templates, CI
 ```
 
+- The user can also switch from the `/ws-delphi` pane (the `delphi` plugin's mod), which shows them as cards (`bash .delphi/switch.sh --list`): press one, then Switch workspace; `/ws-delphi <name>` switches straight away, and `/ws-delphi --web` opens the same cards in a browser tab.
 - List workspaces and their project folders: `bash .delphi/switch.sh --list`.
 - It refuses while tracked files have changes: commit them on a branch (and PR them) first. Then it fetches, switches, fast-forwards, and runs the new workspace's `.delphi/setup.sh`.
 - The post-checkout hook parks this workspace's `repos/`, `worktrees/`, `references/` and `workspaces/` in `.delphi/parked/<name>/` (git-ignored; `<name>` as in its `workspace.yml`) and brings the other's back at the same paths, so worktrees and the work in them return as they were. Switch back the same way. Never run `git clean -X` or `git stash --all` at the workspace root: they take ignored files, parked work included.
 - Before switching, stop anything running from `worktrees/` (dev servers, Docker builds): its folder moves.
-- Start a fresh harness session after switching so its instructions and skills match the new workspace. A harness integration may explicitly support reloading in place; follow its documented behavior.
+- No restart needed: skills under `.claude/skills/` reload on their own, and the `delphi` mod sends the new workspace's `CLAUDE.md` with the next prompt. Without the mod installed, this session keeps the old `CLAUDE.md`: tell the user to restart Claude Code in the same folder before starting work in the new workspace.
 - To change the workspace you switched to: `git switch -c <branch>`, commit, push, and open a PR into `ws/<name>` (or `main`).
 - To only read another workspace or main without leaving this one, list it under `workspaces:` instead (`setup-workspace` skill).
diff --git a/tests/e2e.sh b/tests/e2e.sh
index e8194d1..4577954 100644
--- a/tests/e2e.sh
+++ b/tests/e2e.sh
@@ -811,10 +811,22 @@ commit_on "ws/$CO" CLAUDE.md "old side" && commit_on "ws/$CN" .gitattributes "#
 ok "an old name with commits of its own is reported, never merged"
 
 # --- 13. portable harnesses: native main-side output, round trips, transitions, bootstrap and authoring
+cat >"$t/native-metadata.md" <<'SKILL'
+---
+name: native-metadata
+description: "Preserve: existing tool permissions and invocation settings."
+allowed-tools: Bash(git:*), Bash(bash ${CLAUDE_SKILL_DIR}/scripts/helper.sh *)
+user-invocable: false
+disable-model-invocation: true
+metadata:
+  custom-setting: unchanged
+---
+Read CLAUDE.md before making changes.
+SKILL
 C=software/application-software/argos/workspaces/sandbox-codex CN=s.app.argos.sandbox-codex
 # shellcheck disable=SC2016 # child shell expands its positional arguments
 on_main "add Codex and neutral skills" bash -c '
-  mkdir -p "$1" software/skills/portable/scripts
+  mkdir -p "$1" software/skills/portable/scripts software/skills/native-metadata software/skills/switch-workspace
   cp "$2/templates/harnesses/codex/AGENTS.md" "$1/AGENTS.md"
   cp "$2/templates/workspace/.gitattributes" "$1/.gitattributes"
   mkdir -p "$1/.github/workflows"
@@ -822,7 +834,9 @@ on_main "add Codex and neutral skills" bash -c '
   printf "name: %s\nharness: codex\n" "$3" >"$1/workspace.yml"
   printf "portable v1\n" >software/skills/portable/SKILL.md
   printf "helper v1\n" >software/skills/portable/scripts/helper.sh
-' _ "$C" "$src" "$CN"
+  cp "$4" software/skills/native-metadata/SKILL.md
+  cp "$2/software/skills/switch-workspace/SKILL.md" software/skills/switch-workspace/SKILL.md
+' _ "$C" "$src" "$CN" "$t/native-metadata.md"
 sync "$CN" >"$t/out" 2>&1 || fail "Codex creation: $(cat "$t/out")"
 for skill in top portable; do
   o cat-file -e "ws/$CN:.agents/skills/$skill/SKILL.md" || fail "Codex lacks native $skill"
@@ -833,6 +847,19 @@ ok "main-side rendering maps portable and declared Claude-source skills to Codex
 o diff --quiet "main:$C" "ws/$CN" -- ':!.delphi' || fail "Codex branch requires native generation after main"
 ok "Codex files on main exactly match the workspace branch before runtime injection"
 
+sync refresh "$AN" >/dev/null
+cmp -s "$t/native-metadata.md" <(o show "main:$A/.claude/skills/native-metadata/SKILL.md") || fail "main changed Claude metadata or instructions"
+cmp -s "$t/native-metadata.md" <(o show "ws/$AN:.claude/skills/native-metadata/SKILL.md") || fail "refresh changed Claude metadata"
+ok "Claude source metadata, allowed-tools and invocation flags survive main rendering and refresh byte for byte"
+sed 's/CLAUDE[.]md/AGENTS.md/g' "$t/native-metadata.md" >"$t/codex-metadata.md"
+cmp -s "$t/codex-metadata.md" <(o show "main:$C/.agents/skills/native-metadata/SKILL.md") || fail "Codex discarded native metadata or kept the wrong instruction reference"
+ok "Codex output preserves metadata while adapting its own instruction-file reference"
+cmp -s "$src/software/skills/switch-workspace/SKILL.md" <(o show "main:$A/.claude/skills/switch-workspace/SKILL.md") || fail "Claude switching instructions changed"
+o show "main:$A/.claude/skills/switch-workspace/SKILL.md" | grep -q 'No restart needed' || fail "Claude lost its hot reload workflow"
+o show "main:$C/.agents/skills/switch-workspace/SKILL.md" | grep -q 'Start a fresh Codex session' || fail "Codex lacks native restart guidance"
+! o show "main:$C/.agents/skills/switch-workspace/SKILL.md" | grep -q 'No restart needed' || fail "Claude reload behavior leaked into Codex"
+ok "existing Claude plugin and hot reload guidance stays intact while Codex gets its own switch guidance"
+
 commit_on "ws/$CN" .agents/skills/portable/SKILL.md "workspace edit"
 commit_on "ws/$CN" AGENTS.md "workspace-owned instructions"
 sync propose "$CN" >"$t/out" 2>&1 || fail "Codex proposal: $(cat "$t/out")"
diff --git a/tools/new-workspace.sh b/tools/new-workspace.sh
index 3587e69..7e2aac4 100755
--- a/tools/new-workspace.sh
+++ b/tools/new-workspace.sh
@@ -47,7 +47,7 @@ if [ -d "$defaults" ]; then
       { echo; cat "$wt/$src"; } >>"$wt/$folder/$instruction"
     else
       mkdir -p "$(dirname "$wt/$folder/$path")"
-      cp "$wt/$src" "$wt/$folder/$path"
+      harness_file "$adapter" "$wt/$src" >"$wt/$folder/$path"
       [ "${meta%% *}" != 100755 ] || chmod +x "$wt/$folder/$path"
     fi
   done <<<"$records"

From f215074dd8dd648cb15693d925614a2cd191af9f Mon Sep 17 00:00:00 2001
From: Jesus God <wyattbracy@gmail.com>
Date: Wed, 21 Oct 2026 12:43:00 +0000
Subject: [PATCH 06/18] Keep Claude inheritance sources and translate Codex
 output

---
 CLAUDE.md                                     |  8 +-
 README.md                                     | 16 ++--
 ci/check.sh                                   | 14 +--
 ci/harnesses.sh                               |  7 +-
 ci/inherit.sh                                 |  8 +-
 ci/sources.sh                                 | 16 +++-
 docs/design.md                                | 41 ++++-----
 .../application-software/argos/AUTHORING.md   | 13 +--
 software/application-software/argos/README.md |  2 +-
 .../workspace-defaults/{files => }/CLAUDE.md  |  8 +-
 .../argos/workspace-defaults/source.yml       |  1 -
 .../{files => }/workspace.yml                 |  0
 .../.claude}/skills/implement/SKILL.md        |  0
 .../.claude}/skills/pr-conventions/SKILL.md   |  0
 .../skills/pr-conventions/scripts/lint.sh     |  0
 .../.claude}/skills/run-local/SKILL.md        |  0
 .../skills/run-local/scripts/run-local.sh     |  0
 .../skills/run-local/scripts/serve.sh         |  0
 .../skills/ticket-conventions/SKILL.md        |  0
 .../.claude}/skills/verify-graph/SKILL.md     |  0
 .../skills/verify-graph/scripts/check.js      |  0
 .../skills/verify-graph/scripts/check.sh      |  0
 .../skills/verify-graph/scripts/open.sh       |  0
 .../skills/verify-graph/scripts/perf.js       |  0
 .../skills/verify-graph/scripts/perf.sh       |  0
 .../skills/verify-graph/scripts/seed.sh       |  0
 .../skills/verify-graph/scripts/select-run.sh |  0
 .../.claude}/skills/verify-telemetry/SKILL.md |  0
 .../verify-telemetry/scripts/check-topic.sh   |  0
 .../.claude/skills/create-ticket/SKILL.md     |  2 +-
 .../argos-dev/.claude/skills/open-pr/SKILL.md |  2 +-
 .../workspaces/argos-dev/workspace.generated  | 64 ++++++-------
 .../skills/address-pr-comments/SKILL.md       |  2 -
 .../.agents/skills/create-ticket/SKILL.md     |  2 +-
 .../.agents/skills/open-pr/SKILL.md           |  2 +-
 .../.agents/skills/pr-conventions/SKILL.md    |  1 -
 .../skills/ticket-conventions/SKILL.md        |  1 -
 .../.agents/skills/verify-graph/SKILL.md      |  1 -
 .../default-codex/workspace.generated         | 64 ++++++-------
 .../.claude/skills/create-ticket/SKILL.md     |  2 +-
 .../.claude/skills/open-pr/SKILL.md           |  2 +-
 .../experimental/workspace.generated          | 64 ++++++-------
 .../.claude}/skills/pr-conventions/SKILL.md   |  0
 .../skills/ticket-conventions/SKILL.md        |  0
 .../.claude/skills/create-ticket/SKILL.md     |  2 +-
 .../.claude/skills/open-pr/SKILL.md           |  2 +-
 .../nero-experimental/workspace.generated     | 34 +++----
 .../skills/address-pr-comments/SKILL.md       |  0
 .../scripts/fetch-feedback.sh                 |  0
 .../address-pr-comments/scripts/github.sh     |  0
 .../.claude}/skills/commit/SKILL.md           |  0
 .../skills/consolidate-spikes/SKILL.md        |  0
 .../.claude}/skills/create-ticket/SKILL.md    |  2 +-
 .../.claude}/skills/open-pr/SKILL.md          |  2 +-
 .../skills/open-pr/scripts/pr-checks.sh       |  0
 .../.claude}/skills/report-spike/SKILL.md     |  0
 .../.claude}/skills/update-pr/SKILL.md        |  0
 .../hub/.claude/skills/create-ticket/SKILL.md |  2 +-
 .../hub/.claude/skills/open-pr/SKILL.md       |  2 +-
 .../workspaces/hub/workspace.generated        | 30 +++---
 .../calypso-dev/workspace.generated           | 10 +-
 .../.claude}/skills/journal/SKILL.md          |  0
 .../skills/journal/scripts/capture.sh         |  0
 .../.claude}/skills/new-worktree/SKILL.md     |  0
 .../.claude}/skills/setup-workspace/SKILL.md  |  0
 .../.claude}/skills/switch-workspace/SKILL.md |  0
 tests/e2e.sh                                  | 91 ++++++++++---------
 tools/new-workspace.sh                        |  2 +-
 68 files changed, 266 insertions(+), 256 deletions(-)
 rename software/application-software/argos/workspace-defaults/{files => }/CLAUDE.md (88%)
 delete mode 100644 software/application-software/argos/workspace-defaults/source.yml
 rename software/application-software/argos/workspace-defaults/{files => }/workspace.yml (100%)
 rename software/application-software/argos/{ => workspace-inherit/.claude}/skills/implement/SKILL.md (100%)
 rename software/application-software/argos/{ => workspace-inherit/.claude}/skills/pr-conventions/SKILL.md (100%)
 rename software/application-software/argos/{ => workspace-inherit/.claude}/skills/pr-conventions/scripts/lint.sh (100%)
 rename software/application-software/argos/{ => workspace-inherit/.claude}/skills/run-local/SKILL.md (100%)
 rename software/application-software/argos/{ => workspace-inherit/.claude}/skills/run-local/scripts/run-local.sh (100%)
 rename software/application-software/argos/{ => workspace-inherit/.claude}/skills/run-local/scripts/serve.sh (100%)
 rename software/application-software/argos/{ => workspace-inherit/.claude}/skills/ticket-conventions/SKILL.md (100%)
 rename software/application-software/argos/{ => workspace-inherit/.claude}/skills/verify-graph/SKILL.md (100%)
 rename software/application-software/argos/{ => workspace-inherit/.claude}/skills/verify-graph/scripts/check.js (100%)
 rename software/application-software/argos/{ => workspace-inherit/.claude}/skills/verify-graph/scripts/check.sh (100%)
 rename software/application-software/argos/{ => workspace-inherit/.claude}/skills/verify-graph/scripts/open.sh (100%)
 rename software/application-software/argos/{ => workspace-inherit/.claude}/skills/verify-graph/scripts/perf.js (100%)
 rename software/application-software/argos/{ => workspace-inherit/.claude}/skills/verify-graph/scripts/perf.sh (100%)
 rename software/application-software/argos/{ => workspace-inherit/.claude}/skills/verify-graph/scripts/seed.sh (100%)
 rename software/application-software/argos/{ => workspace-inherit/.claude}/skills/verify-graph/scripts/select-run.sh (100%)
 rename software/application-software/argos/{ => workspace-inherit/.claude}/skills/verify-telemetry/SKILL.md (100%)
 rename software/application-software/argos/{ => workspace-inherit/.claude}/skills/verify-telemetry/scripts/check-topic.sh (100%)
 rename software/application-software/nero/{ => workspace-inherit/.claude}/skills/pr-conventions/SKILL.md (100%)
 rename software/application-software/nero/{ => workspace-inherit/.claude}/skills/ticket-conventions/SKILL.md (100%)
 rename software/application-software/{ => workspace-inherit/.claude}/skills/address-pr-comments/SKILL.md (100%)
 rename software/application-software/{ => workspace-inherit/.claude}/skills/address-pr-comments/scripts/fetch-feedback.sh (100%)
 rename software/application-software/{ => workspace-inherit/.claude}/skills/address-pr-comments/scripts/github.sh (100%)
 rename software/application-software/{ => workspace-inherit/.claude}/skills/commit/SKILL.md (100%)
 rename software/application-software/{ => workspace-inherit/.claude}/skills/consolidate-spikes/SKILL.md (100%)
 rename software/application-software/{ => workspace-inherit/.claude}/skills/create-ticket/SKILL.md (97%)
 rename software/application-software/{ => workspace-inherit/.claude}/skills/open-pr/SKILL.md (96%)
 rename software/application-software/{ => workspace-inherit/.claude}/skills/open-pr/scripts/pr-checks.sh (100%)
 rename software/application-software/{ => workspace-inherit/.claude}/skills/report-spike/SKILL.md (100%)
 rename software/application-software/{ => workspace-inherit/.claude}/skills/update-pr/SKILL.md (100%)
 rename software/{ => workspace-inherit/.claude}/skills/journal/SKILL.md (100%)
 rename software/{ => workspace-inherit/.claude}/skills/journal/scripts/capture.sh (100%)
 rename software/{ => workspace-inherit/.claude}/skills/new-worktree/SKILL.md (100%)
 rename software/{ => workspace-inherit/.claude}/skills/setup-workspace/SKILL.md (100%)
 rename software/{ => workspace-inherit/.claude}/skills/switch-workspace/SKILL.md (100%)

diff --git a/CLAUDE.md b/CLAUDE.md
index 22f8411..7feaaf4 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -31,15 +31,15 @@ source of truth; `docs/goals.md` lists what any change must keep.
   version, with its hash from `.delphi/version.sh`), `.delphi/migrations/<version>-<slug>.sh` (clone
   cleanup, run by `setup.sh`).
 - `templates/workspace/`: `workspace.yml`, `CLAUDE.md` (`{{name}}`, `{{folder}}`), the managed
-  `.github/workflows/delphi.yml` every workspace carries unchanged. The general skills are in `software/skills/`; Codex instructions use the native template under
+  `.github/workflows/delphi.yml` every workspace carries unchanged. The general skills are in `software/workspace-inherit/.claude/skills/`; Codex instructions use the native template under
   `templates/harnesses/`.
 - `software/plugins/claude/default/`: the `delphi` plugin set, a mod whose `/ws-delphi` pane switches
   workspaces (`hooks/register.tsx`, tests in `tests/ws.test.ts`, run by `claude plugin test`);
   `/ws-delphi --web` serves the same cards in a browser tab (`web/server.py`, `web/index.html`).
 - `software/…/workspaces/<leaf>/`: the workspaces. Org structure is plain directories. A project
   folder (the one holding `workspaces/`) may add `README.md`, `AUTHORING.md`, and `workspace-defaults/`
-  (translated once into a new workspace there). Source bundles declare `format:` in `source.yml`
-  and keep their payload under `files/`. Any org/project folder may add `workspace-inherit/`;
+  (translated once into a new workspace there). Existing source layouts stay intact; optional
+  `source.yml` declares a different authoring format. Any org/project folder may add `workspace-inherit/`;
   `ci/render.sh` materializes managed native copies on main, and refresh copies them to ws branches.
   `workspace.generated` records ownership; `opt-out:` transfers a native path to the workspace.
 - `.github/workflows/delphi.yml` (identical to the template's copy), `.github/CODEOWNERS`; issue templates (idea, spike, epic, dev work) and the PR template in `.github/`, filed with the `create-ticket` skill (`.claude/skills/`).
@@ -59,7 +59,7 @@ source of truth; `docs/goals.md` lists what any change must keep.
   headers): name the file or key that holds them ("the folders in `.delphi/park.list`", "each repo
   under `repos:`"), never its entries. A copied list goes stale. Runtime tools: bash, git, and `gh` (only to open or update PRs).
 - Every script: `#!/usr/bin/env bash`, `set -euo pipefail`, `shellcheck`-clean.
-- Preserve existing native skill metadata and behavior, including allowed-tools and invocation flags.
+- Keep Claude skill sources under workspace-inherit/.claude/skills with their metadata intact.
   Harness adaptations belong in ci/harnesses.sh and affect only that target's generated output.
   Skill scripts stay harness-independent (SKILL.md uses the Agent Skills format): call scripts by
   their path in the skill's folder, `bash scripts/<script>.sh <names>…`, and reference files the same
diff --git a/README.md b/README.md
index 2bf2cb7..acf2ad9 100644
--- a/README.md
+++ b/README.md
@@ -131,13 +131,15 @@ Once it merges, CI creates `ws/<name>` (its dotted name).
 can hold shared context (`README.md`), a guide to its workspaces (`AUTHORING.md`), and
 `workspace-defaults/` (what a new workspace there starts with).
 
-**Source bundles.** `workspace-defaults/` and `workspace-inherit/` contain `source.yml`
-(`format: claude-code` today) and a `files/` payload. Defaults seed workspace-owned files once;
-inheritance stays managed. Every workspace independently declares `harness:` in its own manifest.
-Unsupported native conversions fail instead of dropping settings.
-
-**Shared skills.** Keep reusable Agent Skills under `skills/<name>/` at an org or project folder.
-The main-side renderer copies them unchanged into each workspace's native skill directory.
+**Source bundles.** Keep the existing `workspace-defaults/` and `workspace-inherit/` layouts.
+They are Claude-authored by default; optional `source.yml` declares another source `format:`.
+Defaults seed workspace-owned files once; inheritance stays managed. Every workspace independently
+declares `harness:` in its own manifest. Unsupported native settings conversions fail explicitly.
+
+**Shared skills.** Keep Claude sources under `workspace-inherit/.claude/skills/<name>/` at an org
+or project folder, including their tool permissions and invocation metadata. The main-side renderer
+preserves Claude output and translates Codex output to `.agents/skills/`, omitting Claude-only
+skill fields only from the Codex copies.
 
 **Render before merging.** After changing shared sources, harness selections, opt-outs or plugin
 configuration, run `bash ci/render.sh` on a main-based branch and include its native output in the
diff --git a/ci/check.sh b/ci/check.sh
index 39fcc14..9ffa66e 100755
--- a/ci/check.sh
+++ b/ci/check.sh
@@ -149,7 +149,7 @@ manifest() { # <workspace.yml> [<name>]: without <name> (a workspace-defaults/ m
 while IFS= read -r d; do
   case "$d" in */workspaces/*) bad "$d: belongs in an org or project folder, not under workspaces/" ;; esac
   for f in CLAUDE.md AGENTS.md workspace.yml workspace.generated .delphi .claude/settings.json .codex/config.toml $managed; do
-    [ ! -e "$d/files/$f" ] || bad "$d/files/$f: each workspace has its own; it can't be inherited"
+    [ ! -e "$d/$f" ] || bad "$d/$f: each workspace has its own; it can't be inherited"
   done
 done < <(find software -type d -name workspace-inherit 2>/dev/null | sort)
 while IFS= read -r d; do
@@ -157,15 +157,13 @@ while IFS= read -r d; do
   if format=$(source_format "" "$d" 2>/dev/null); then
     if ! messages=$(bundle_files "" "$d" "$format" 2>&1 >/dev/null); then bad "$messages"; fi
   else bad "$d/source.yml: declare one supported source format"; fi
-  while IFS= read -r f; do bad "$f: source bundle files belong under files/"; done \
-    < <(find "$d" -type f ! -path "$d/files/*" ! -path "$d/source.yml")
 done < <(find software -type d \( -name workspace-defaults -o -name workspace-inherit \) 2>/dev/null | sort)
 while IFS= read -r d; do
   case "$d" in */workspaces/*) continue ;; esac
   for skill in "$d"/*; do
     [ ! -e "$skill" ] || [ -f "$skill/SKILL.md" ] || bad "$skill: shared skills need <name>/SKILL.md"
   done
-done < <(find software -type d -name skills ! -path '*/workspace-inherit/*' ! -path '*/workspace-defaults/*' 2>/dev/null)
+done < <(find software -type d \( -path '*/workspace-inherit/.claude/skills' -o -path '*/workspace-inherit/.agents/skills' \) 2>/dev/null)
 while IFS= read -r d; do
   [ ! -d "${d%/workspaces}/defaults" ] || bad "${d%/workspaces}/defaults: renamed workspace-defaults/"
 done < <(find software -type d -name workspaces 2>/dev/null)
@@ -177,6 +175,10 @@ done < <(find software -name short-name -type f 2>/dev/null | sort)
 all=$(bash .delphi/names.sh 2>/dev/null || true) # <name> <folder>
 folders="" names="" listed=""
 while IFS= read -r f; do
+  case "$f" in
+    */workspaces/*) ;; # a workspace may itself be named workspace-defaults
+    */workspace-inherit/* | */workspace-defaults/*) continue ;;
+  esac
   folder=${f%/workspace.yml}
   case "$(dirname "$folder")" in */workspaces) ;; *)
     bad "$f: must be at software/**/workspaces/<leaf>/workspace.yml" && continue ;;
@@ -196,9 +198,9 @@ while IFS= read -r f; do
   [ ! -e "$folder/.delphi" ] || bad "$folder/.delphi: managed in the root .delphi/ on main; remove it"
   for m in $managed; do cmp -s "$tpl/$m" "$folder/$m" || bad "$folder/$m: differs from $tpl/$m"; done
   manifest "$f" "$name"
-done < <(find software -name workspace.yml -type f ! -path '*/workspace-inherit/*' ! -path '*/workspace-defaults/files/*' 2>/dev/null | sort)
+done < <(find software -name workspace.yml -type f 2>/dev/null | sort)
 while IFS= read -r f; do manifest "$f"; done \
-  < <(find software -path '*/workspace-defaults/files/workspace.yml' ! -path '*/workspaces/workspace-defaults/*' -type f 2>/dev/null)
+  < <(find software -path '*/workspace-defaults/workspace.yml' ! -path '*/workspaces/workspace-defaults/*' -type f 2>/dev/null)
 for l in $listed; do
   case " $names " in *" ${l#*|} "*) ;; *) bad "${l%%|*}: workspaces: lists ${l#*|}, which isn't a workspace on main" ;; esac
 done
diff --git a/ci/harnesses.sh b/ci/harnesses.sh
index 206cb5a..7efe325 100644
--- a/ci/harnesses.sh
+++ b/ci/harnesses.sh
@@ -17,7 +17,12 @@ harness_file() { # <target harness> <source file>: Claude passes through; Codex
         NR == 1 && /^---$/ { front = 1; print; next }
         front && /^---$/ { front = 0; print; next }
         front {
-          # Preserve tool/invocation metadata. Quote multiline-style descriptions for native YAML.
+          # Claude-only fields are omitted from Codex output, including block values.
+          if (/^(allowed-tools|user-invocable|disable-model-invocation):/) { skip = 1; next }
+          if (skip && /^[[:space:]]/) next
+          if (/^[^[:space:]#]/) skip = 0
+          if (skip) next
+          # Quote descriptions that need a native YAML block scalar.
           if (/^description: / && substr($0, 14) ~ /: / && substr($0, 14) !~ /^["\047>|]/) {
             print "description: >-"; print "  " substr($0, 14)
           } else print
diff --git a/ci/inherit.sh b/ci/inherit.sh
index c9d125d..d11582d 100644
--- a/ci/inherit.sh
+++ b/ci/inherit.sh
@@ -9,18 +9,12 @@ inherit_levels() {
   echo "${1%/workspaces/*}" | awk -F/ '{ p = $1; print p; for (i = 2; i <= NF; i++) { p = p "/" $i; print p } }'
 }
 inherited_files() { # <revision or '' for disk> <workspace folder> <harness>: mode blob<TAB>destination<TAB>source
-  local level record meta path
+  local level
   harness "$3" || return 1
   for level in $(inherit_levels "$2"); do
     if { [ -n "$1" ] && git cat-file -e "$1:$level/workspace-inherit" 2>/dev/null; } ||
       { [ -z "$1" ] && [ -d "$level/workspace-inherit" ]; }; then
       bundle_files "$1" "$level/workspace-inherit" "$3" || return 1
     fi
-    while IFS= read -r record; do
-      [ -n "$record" ] || continue
-      meta=${record%%$'\t'*}; path=${record#*$'\t'}
-      meta="${meta%% *} ${meta##* }"
-      printf '%s\t%s/%s\t%s/skills/%s\n' "$meta" "$skills" "$path" "$level" "$path"
-    done < <(source_files "$1" "$level/skills")
   done
 }
diff --git a/ci/sources.sh b/ci/sources.sh
index c8bb6f7..9cb7da7 100644
--- a/ci/sources.sh
+++ b/ci/sources.sh
@@ -4,10 +4,15 @@ set -euo pipefail
 # shellcheck source=ci/harnesses.sh
 source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/harnesses.sh"
 
-source_format() { # <revision or '' for disk> <bundle>: print its declared format
+source_format() { # <revision or '' for disk> <bundle>: legacy bundles are Claude-authored
   local config format
-  if [ -n "$1" ]; then config=$(git show "$1:$2/source.yml" 2>/dev/null || true)
-  else config=$(cat "$2/source.yml" 2>/dev/null || true); fi
+  if [ -n "$1" ]; then
+    if ! git cat-file -e "$1:$2/source.yml" 2>/dev/null; then echo claude-code; return; fi
+    config=$(git show "$1:$2/source.yml")
+  else
+    if [ ! -e "$2/source.yml" ]; then echo claude-code; return; fi
+    config=$(cat "$2/source.yml")
+  fi
   format=$(printf '%s\n' "$config" | awk '
     /^[[:space:]]*#/ || /^[[:space:]]*$/ { next }
     /^format:[[:space:]]+(claude-code|codex)[[:space:]]*(#.*)?$/ { if (!n++) value = $2; next }
@@ -48,13 +53,14 @@ source_path() { # <format> <target harness> <source path>: native destination; n
 bundle_files() { # <revision or '' for disk> <bundle> <target harness>: mode blob<TAB>destination<TAB>source
   local format records record meta path dest
   format=$(source_format "$1" "$2") || return 1
-  records=$(source_files "$1" "$2/files") || return 1
+  records=$(source_files "$1" "$2") || return 1
   while IFS= read -r record; do
     [ -n "$record" ] || continue
     meta=${record%%$'\t'*}; path=${record#*$'\t'}
+    [ "$path" != source.yml ] || continue
     meta="${meta%% *} ${meta##* }"
     dest=$(source_path "$format" "$3" "$path") || return 1
-    printf '%s\t%s\t%s\n' "$meta" "$dest" "$2/files/$path"
+    printf '%s\t%s\t%s\n' "$meta" "$dest" "$2/$path"
   done <<<"$records"
 }
 
diff --git a/docs/design.md b/docs/design.md
index cebf920..5cf0ac2 100644
--- a/docs/design.md
+++ b/docs/design.md
@@ -16,7 +16,7 @@ folder name (`workspaces/<name>`, `.delphi/parked/<name>`), and no branch can be
 merges (`git merge -Xsubtree=<folder>`), so the histories stay joined and edits on either side meet
 in normal three-way merges. The one thing shared is main's root `.delphi/` (the scripts): sync
 puts it at the root of every `ws/*` branch, so it is on every branch, main included, and is edited
-only on main. Shared `skills/` and source bundles remain editable on main. `ci/render.sh`
+only on main. Shared `workspace-inherit/` and `workspace-defaults/` sources remain editable on main. `ci/render.sh`
 materializes their managed native copies inside each workspace folder before merge. The workspace's
 required `harness:` selects its target independently of the source bundle's `format:`. Branch
 refresh copies those reviewed files; it never reads source formats or runs harness adapters.
@@ -53,8 +53,7 @@ checks out other branches to read, and harness plugins carry what workspaces opt
 
 ```
 software/<org>/…/<project>/           project context and optional workspace-defaults/ source bundle
-software/[<org>/…/]skills/<name>/     reusable Agent Skills, rendered to the native skill directory
-software/[<org>/…/]workspace-inherit/  source.yml plus files/: managed inheritance source bundle
+software/[<org>/…/]workspace-inherit/  existing native sources, including .claude/skills/<name>/
 software/<org>/…/plugins/<harness>/<set>/   a plugin set for the workspaces under that folder (optional, main only)
 software/<org>/…/short-name           the folder's short name in workspace names (optional; default: its name)
 software/<org>/…/plugins/scope        its scope in plugin names (optional; default: its short name)
@@ -89,27 +88,27 @@ clones.
 `.github/CODEOWNERS` assigns reviewers per org folder.
 
 The folder holding a `workspaces/` directory is a project folder. It may hold shared context
-and a `workspace-defaults/` source bundle. Every source bundle has `source.yml` with
-`format: claude-code` or `format: codex`; its payload lives under `files/`. Source metadata never
-appears in rendered workspaces. The optional `files/workspace.yml` in a defaults bundle supplies
-creation defaults without a workspace name. Its optional `harness:` is only a creation suggestion;
-the creation tool always records an explicit harness in the new workspace.
+and `workspace-defaults/`. Files keep their existing native source paths; Claude Code is the
+legacy source format. An optional `source.yml` with `format: claude-code` or `format: codex`
+selects the authoring format independently of every workspace's harness. Source metadata never
+appears in rendered workspaces. The optional `workspace-defaults/workspace.yml` supplies creation
+defaults without a workspace name. Its optional `harness:` is only a creation suggestion; the
+creation tool always records an explicit harness in the new workspace.
 
 A workspace's harness does not depend on its branch name, the source format, or a repository-wide
 runtime default. Each folder on main already contains its declared harness's native files, and
 `ws/<name>` exposes that folder at the root. A harness change is an explicit workspace change.
 
-Any org or project folder may hold `workspace-inherit/`. `ci/inherit.sh` resolves those bundles
-from `software/` down to a workspace's project, together with portable `skills/` sources at those
-levels. `ci/sources.sh` reads a bundle's declared source format; `ci/harnesses.sh` selects native
-destinations. Claude skill definitions pass through unchanged, including tool permissions,
-invocation flags and plugin reload guidance. The Codex content adapter changes instruction-file
-references and workspace-switch guidance only in Codex output, and normalizes descriptions that
-need YAML block scalars. Skill metadata is preserved; each harness interprets the fields it supports.
-Supporting files pass through unchanged. Instruction
-filenames and skill directories have explicit mappings. Unmapped native settings fail instead of
-being silently discarded or guessed. A future source reader can feed the same file records without
-changing workspace harness selections or branch sync.
+Any org or project folder may hold `workspace-inherit/`. `ci/inherit.sh` resolves these sources
+from `software/` down to a workspace's project. Existing Claude skills stay in
+`workspace-inherit/.claude/skills/`, including their native metadata and instructions.
+`ci/sources.sh` reads the source format; `ci/harnesses.sh` selects native destinations and adapts
+content for the consuming workspace. Claude output passes through unchanged. Codex output omits
+Claude-only skill fields, adapts instruction references and workspace-switch guidance, and
+normalizes descriptions that need YAML block scalars. Supporting files pass through unchanged.
+Instruction filenames and skill directories have explicit mappings. Unmapped native settings
+fail instead of being silently discarded or guessed. A future source reader can feed the same
+file records without changing workspace harness selections or branch sync.
 
 Run `bash ci/render.sh` on a main-based branch after changing shared sources, workspace harnesses,
 opt-outs or generated settings inputs. Include the native outputs in the same PR. `--check` writes
@@ -270,7 +269,7 @@ it prints them as an export line. The adapter supplies layout initialization: fo
 skill scripts'. In a terminal, `. .delphi/paths.sh` from the root. `new-worktree.sh` sources it from
 its own folder; every skill script, plugin or workspace, sources `$DELPHI_ROOT/.delphi/paths.sh` and
 takes only names (repo, branch), never a searched-for path, so the model types only the names.
-Skills themselves stay harness-neutral. Codex discovers its native instructions and skills from
+Skill helpers remain harness-independent; native skill metadata is handled by translation. Codex discovers its native instructions and skills from
 the checked-out workspace branch. Agents follow `AGENTS.md`: determine the absolute root once,
 then run skill helpers through that root's
 `.delphi/exec.sh`. It sources the layout on every invocation, preserves the caller's directory,
@@ -350,7 +349,7 @@ unsupported behavior. Keep source-format rules out of inheritance ownership and
 
 `ci/sources.sh` is the input boundary. A different source format can produce the same records
 (content mode/hash, destination, origin) without choosing the consuming workspace's harness.
-Reusable skills already use the portable Agent Skills format. There is no required primary
+Existing sources can remain Claude-authored while targets evolve. There is no required primary
 harness: every workspace selects its own target, and source bundles independently select their
 format. Creation suggestions can be changed or removed without changing existing workspaces.
 
diff --git a/software/application-software/argos/AUTHORING.md b/software/application-software/argos/AUTHORING.md
index 5c39524..54e0c45 100644
--- a/software/application-software/argos/AUTHORING.md
+++ b/software/application-software/argos/AUTHORING.md
@@ -13,20 +13,20 @@ full model; this is the Argos-specific short version.
 Don't edit `.delphi/`, `.github/workflows/delphi.yml`, or `.claude/settings.json`: Delphi manages
 them (`.delphi/` comes from main's root and sync resets it; `settings.json` is rendered on main from
 `workspace.yml`'s `plugins:`, where CI lists any folder's `default` plugin set; add other sets below them), nor the skills
-inherited from `skills/` or `workspace-inherit/` (sync overwrites them: change them on `main`, or list one under `opt-out:` to keep your own).
+inherited from `workspace-inherit/` (sync overwrites them: change them on `main`, or list one under `opt-out:` to keep your own).
 Personal settings go in `.claude/settings.local.json`.
 
 ## Create a new Argos workspace
 
 From a Delphi checkout: `tools/new-workspace.sh [--harness codex] application-software/argos <name>`. It copies
-Delphi's template, then `workspace-defaults/` (its declared source format is translated into the selected harness), and opens
+Delphi's template, then `workspace-defaults/` (its Claude source format is translated into the selected harness), and opens
 a PR to `main`. Trim what the new workspace doesn't need before merging.
 
 ## Change the defaults or this folder
 
 Edit on a branch of `main` and open a PR to `main` (from a workspace: `bash .delphi/switch.sh main`;
 don't edit `workspaces/main/` from a workspace). `workspace-defaults/`
-only affects workspaces created afterwards; to change existing ones, PR each workspace too. `skills/` and `workspace-inherit/` reach
+only affects workspaces created afterwards; to change existing ones, PR each workspace too. `workspace-inherit/` reaches
 every Argos workspace through managed native copies on main. Run `bash ci/render.sh` and include
 its outputs in the same PR; refresh then copies those reviewed files to workspace branches.
 
@@ -35,9 +35,10 @@ its outputs in the same PR; refresh then copies those reviewed files to workspac
 - Keep the Delphi section of the native instruction file as generated; put project rules below it.
 - One skill per repeatable workflow, with a `description` that says when to use it.
 - Agent context (glossary, conventions, skills) lives in the workspace; the glossary goes in `docs/`.
-  Shared skills go in this project's `skills/<name>/`, or the relevant org folder's `skills/`.
-  The main-side renderer writes them into each workspace's native directory; change them through PRs to `main`.
-  Ordinary inherited docs go in `workspace-inherit/files/`, with the source format in `workspace-inherit/source.yml`. Context only some workspaces need goes in
+  Shared Claude skills stay in `workspace-inherit/.claude/skills/<name>/` at the project or org level.
+  The main-side renderer preserves Claude metadata and translates Codex copies into its native
+  directory; change sources through PRs to `main`. Ordinary inherited docs go in `workspace-inherit/`.
+  Optional `source.yml` selects a different authoring format. Context only some workspaces need goes in
   the workspace, or in a supported plugin set selected under `plugins:`. Codex does not load the
   Claude plugin sets. Workspace-owned native skills remain editable and proposable; use a native
   destination under `opt-out:` when taking ownership of an inherited skill.
diff --git a/software/application-software/argos/README.md b/software/application-software/argos/README.md
index 22d9b28..d496a1d 100644
--- a/software/application-software/argos/README.md
+++ b/software/application-software/argos/README.md
@@ -18,5 +18,5 @@ backend (`scylla-server/`), with schema tooling in `charybdis/` and MQTT broker
 | `plugins/claude/<set>/` | Claude Code plugin sets a workspace lists under `plugins:` (none yet) |
 | `AUTHORING.md` | How to create and change Argos workspaces |
 
-Shared workflows belong in `skills/`. Shared facts belong here or in `workspace-inherit/`;
+Shared Claude workflows stay in `workspace-inherit/.claude/skills/`. Shared facts belong here or in `workspace-inherit/`;
 `workspace-defaults/` seeds new workspaces. Facts that one workspace needs belong in that workspace.
diff --git a/software/application-software/argos/workspace-defaults/files/CLAUDE.md b/software/application-software/argos/workspace-defaults/CLAUDE.md
similarity index 88%
rename from software/application-software/argos/workspace-defaults/files/CLAUDE.md
rename to software/application-software/argos/workspace-defaults/CLAUDE.md
index 01063c1..edbd71b 100644
--- a/software/application-software/argos/workspace-defaults/files/CLAUDE.md
+++ b/software/application-software/argos/workspace-defaults/CLAUDE.md
@@ -41,13 +41,13 @@ The Argos repo's `develop` is checked out at `worktrees/argos/develop/`. Paths b
 
 ## PR Convention
 
-- The `commit` skill applies the commit message format.
-- Open PRs against `develop` as drafts. The `open-pr` skill runs the pre-PR checks (lint, conflict check), pushes, and opens the draft; `update-pr` refreshes the description.
-- Keep PR descriptions tight: at most three backtick usages in the body, and never commit screenshots (`open-pr` asks before attaching them to the PR).
+- The `/commit` skill applies the commit message format.
+- Open PRs against `develop` as drafts. The `/open-pr` skill runs the pre-PR checks (lint, conflict check), pushes, and opens the draft; `/update-pr` refreshes the description.
+- Keep PR descriptions tight: at most three backtick usages in the body, and never commit screenshots (`/open-pr` asks before attaching them to the PR).
 
 ## Screenshots
 
-Save all Playwright screenshots under `pictures/<branch-name>/` at the repo root, using kebab-case descriptive filenames. The `pictures/` folder is git-ignored, so screenshots are never committed; `open-pr` offers to attach them to the PR with `gh --attach` (drag-drop them on gh older than v2.99.0).
+Save all Playwright screenshots under `pictures/<branch-name>/` at the repo root, using kebab-case descriptive filenames. The `pictures/` folder is git-ignored, so screenshots are never committed; `/open-pr` offers to attach them to the PR with `gh --attach` (drag-drop them on gh older than v2.99.0).
 
 ## Code Conventions
 
diff --git a/software/application-software/argos/workspace-defaults/source.yml b/software/application-software/argos/workspace-defaults/source.yml
deleted file mode 100644
index a8c6248..0000000
--- a/software/application-software/argos/workspace-defaults/source.yml
+++ /dev/null
@@ -1 +0,0 @@
-format: claude-code
diff --git a/software/application-software/argos/workspace-defaults/files/workspace.yml b/software/application-software/argos/workspace-defaults/workspace.yml
similarity index 100%
rename from software/application-software/argos/workspace-defaults/files/workspace.yml
rename to software/application-software/argos/workspace-defaults/workspace.yml
diff --git a/software/application-software/argos/skills/implement/SKILL.md b/software/application-software/argos/workspace-inherit/.claude/skills/implement/SKILL.md
similarity index 100%
rename from software/application-software/argos/skills/implement/SKILL.md
rename to software/application-software/argos/workspace-inherit/.claude/skills/implement/SKILL.md
diff --git a/software/application-software/argos/skills/pr-conventions/SKILL.md b/software/application-software/argos/workspace-inherit/.claude/skills/pr-conventions/SKILL.md
similarity index 100%
rename from software/application-software/argos/skills/pr-conventions/SKILL.md
rename to software/application-software/argos/workspace-inherit/.claude/skills/pr-conventions/SKILL.md
diff --git a/software/application-software/argos/skills/pr-conventions/scripts/lint.sh b/software/application-software/argos/workspace-inherit/.claude/skills/pr-conventions/scripts/lint.sh
similarity index 100%
rename from software/application-software/argos/skills/pr-conventions/scripts/lint.sh
rename to software/application-software/argos/workspace-inherit/.claude/skills/pr-conventions/scripts/lint.sh
diff --git a/software/application-software/argos/skills/run-local/SKILL.md b/software/application-software/argos/workspace-inherit/.claude/skills/run-local/SKILL.md
similarity index 100%
rename from software/application-software/argos/skills/run-local/SKILL.md
rename to software/application-software/argos/workspace-inherit/.claude/skills/run-local/SKILL.md
diff --git a/software/application-software/argos/skills/run-local/scripts/run-local.sh b/software/application-software/argos/workspace-inherit/.claude/skills/run-local/scripts/run-local.sh
similarity index 100%
rename from software/application-software/argos/skills/run-local/scripts/run-local.sh
rename to software/application-software/argos/workspace-inherit/.claude/skills/run-local/scripts/run-local.sh
diff --git a/software/application-software/argos/skills/run-local/scripts/serve.sh b/software/application-software/argos/workspace-inherit/.claude/skills/run-local/scripts/serve.sh
similarity index 100%
rename from software/application-software/argos/skills/run-local/scripts/serve.sh
rename to software/application-software/argos/workspace-inherit/.claude/skills/run-local/scripts/serve.sh
diff --git a/software/application-software/argos/skills/ticket-conventions/SKILL.md b/software/application-software/argos/workspace-inherit/.claude/skills/ticket-conventions/SKILL.md
similarity index 100%
rename from software/application-software/argos/skills/ticket-conventions/SKILL.md
rename to software/application-software/argos/workspace-inherit/.claude/skills/ticket-conventions/SKILL.md
diff --git a/software/application-software/argos/skills/verify-graph/SKILL.md b/software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/SKILL.md
similarity index 100%
rename from software/application-software/argos/skills/verify-graph/SKILL.md
rename to software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/SKILL.md
diff --git a/software/application-software/argos/skills/verify-graph/scripts/check.js b/software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/check.js
similarity index 100%
rename from software/application-software/argos/skills/verify-graph/scripts/check.js
rename to software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/check.js
diff --git a/software/application-software/argos/skills/verify-graph/scripts/check.sh b/software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/check.sh
similarity index 100%
rename from software/application-software/argos/skills/verify-graph/scripts/check.sh
rename to software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/check.sh
diff --git a/software/application-software/argos/skills/verify-graph/scripts/open.sh b/software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/open.sh
similarity index 100%
rename from software/application-software/argos/skills/verify-graph/scripts/open.sh
rename to software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/open.sh
diff --git a/software/application-software/argos/skills/verify-graph/scripts/perf.js b/software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/perf.js
similarity index 100%
rename from software/application-software/argos/skills/verify-graph/scripts/perf.js
rename to software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/perf.js
diff --git a/software/application-software/argos/skills/verify-graph/scripts/perf.sh b/software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/perf.sh
similarity index 100%
rename from software/application-software/argos/skills/verify-graph/scripts/perf.sh
rename to software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/perf.sh
diff --git a/software/application-software/argos/skills/verify-graph/scripts/seed.sh b/software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/seed.sh
similarity index 100%
rename from software/application-software/argos/skills/verify-graph/scripts/seed.sh
rename to software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/seed.sh
diff --git a/software/application-software/argos/skills/verify-graph/scripts/select-run.sh b/software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/select-run.sh
similarity index 100%
rename from software/application-software/argos/skills/verify-graph/scripts/select-run.sh
rename to software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/select-run.sh
diff --git a/software/application-software/argos/skills/verify-telemetry/SKILL.md b/software/application-software/argos/workspace-inherit/.claude/skills/verify-telemetry/SKILL.md
similarity index 100%
rename from software/application-software/argos/skills/verify-telemetry/SKILL.md
rename to software/application-software/argos/workspace-inherit/.claude/skills/verify-telemetry/SKILL.md
diff --git a/software/application-software/argos/skills/verify-telemetry/scripts/check-topic.sh b/software/application-software/argos/workspace-inherit/.claude/skills/verify-telemetry/scripts/check-topic.sh
similarity index 100%
rename from software/application-software/argos/skills/verify-telemetry/scripts/check-topic.sh
rename to software/application-software/argos/workspace-inherit/.claude/skills/verify-telemetry/scripts/check-topic.sh
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/create-ticket/SKILL.md b/software/application-software/argos/workspaces/argos-dev/.claude/skills/create-ticket/SKILL.md
index 9dd28e5..210a059 100644
--- a/software/application-software/argos/workspaces/argos-dev/.claude/skills/create-ticket/SKILL.md
+++ b/software/application-software/argos/workspaces/argos-dev/.claude/skills/create-ticket/SKILL.md
@@ -7,7 +7,7 @@ description: Draft and file a GitHub issue (idea, spike, epic, or dev work) on a
 
 These are the ticket conventions for every application-software repo. The repo's own `.github/ISSUE_TEMPLATE` holds only the fields (`gh api repos/<owner>/<repo>/contents/.github/ISSUE_TEMPLATE/<file> -q .content | base64 -d`); follow each field's description.
 
-First load the project's `ticket-conventions` skill (inherited from the project's `skills/`) for its repo, area labels, vocabulary, and diagrams. If none is enabled, ask which repo.
+First load the project's `ticket-conventions` skill (inherited from the project's `workspace-inherit/`) for its repo, area labels, vocabulary, and diagrams. If none is enabled, ask which repo.
 
 ## Workflow
 
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/open-pr/SKILL.md b/software/application-software/argos/workspaces/argos-dev/.claude/skills/open-pr/SKILL.md
index 7363dd2..b1e7c71 100644
--- a/software/application-software/argos/workspaces/argos-dev/.claude/skills/open-pr/SKILL.md
+++ b/software/application-software/argos/workspaces/argos-dev/.claude/skills/open-pr/SKILL.md
@@ -3,7 +3,7 @@ name: open-pr
 description: Run pre-PR checks, push the branch, and open a draft pull request on an application-software repo (Argos, Nero)
 ---
 
-First load the project's `pr-conventions` skill (inherited from the project's `skills/`) for its base branch, commit format, checks, labels, and screenshots.
+First load the project's `pr-conventions` skill (inherited from the project's `workspace-inherit/`) for its base branch, commit format, checks, labels, and screenshots.
 
 1. **Check:** `bash scripts/pr-checks.sh <repo> <branch> origin/<base> '<commit format>'` (clean tree, commit subjects match the project's format, merges cleanly into the base), then the project's own checks. Stop and fix on any FAIL.
 2. **Media:** if the diff touches the UI, ask the user whether to add screenshots to the PR, listing any already in the project's screenshot folder for this branch so they can pick those instead of new ones; on no, skip this step. For new ones, use the project's UI QA to take Playwright screenshots of the changed views into its screenshot folder, or, when the change adds or changes an animation, record a short video instead (a browser context with `recordVideo: { dir }` saves a `.webm` when it closes). Images must be under 10 MB; video under 10 MB on a Free plan, 100 MB on a paid one.
diff --git a/software/application-software/argos/workspaces/argos-dev/workspace.generated b/software/application-software/argos/workspaces/argos-dev/workspace.generated
index f099116..21804a8 100644
--- a/software/application-software/argos/workspaces/argos-dev/workspace.generated
+++ b/software/application-software/argos/workspaces/argos-dev/workspace.generated
@@ -1,34 +1,34 @@
 # Generated by ci/render.sh; edit shared sources or opt out in workspace.yml.
 100644 61c35f28dda167e42bebc3bad3994af97c53e876	.claude/settings.json	ci/plugins.sh
-100644 30083fa3b2cf735ac5a75808478dd00476e75e9c	.claude/skills/address-pr-comments/SKILL.md	software/application-software/skills/address-pr-comments/SKILL.md
-100755 ce1efd97da4a6d2ea655932486660c5008f44dae	.claude/skills/address-pr-comments/scripts/fetch-feedback.sh	software/application-software/skills/address-pr-comments/scripts/fetch-feedback.sh
-100644 da0be202ebc0a9ffc4544dbdf4bbef54cca37520	.claude/skills/address-pr-comments/scripts/github.sh	software/application-software/skills/address-pr-comments/scripts/github.sh
-100644 4b5675711abfaef10089859f379a931206267355	.claude/skills/commit/SKILL.md	software/application-software/skills/commit/SKILL.md
-100644 4f85b66ab5c07ce4a00ba3d8555fc9272544046b	.claude/skills/consolidate-spikes/SKILL.md	software/application-software/skills/consolidate-spikes/SKILL.md
-100644 9dd28e531875c0acb7f8a88a07ad15645aecf38f	.claude/skills/create-ticket/SKILL.md	software/application-software/skills/create-ticket/SKILL.md
-100644 f24d293b38a4d03b610a5a104fa97b614856d7c3	.claude/skills/implement/SKILL.md	software/application-software/argos/skills/implement/SKILL.md
-100644 4917259f9e29db28e2636496e80f80ee5d9e321e	.claude/skills/journal/SKILL.md	software/skills/journal/SKILL.md
-100755 1e90d7b9afa14b8b0e7f36e0e1d83baecc94ba5b	.claude/skills/journal/scripts/capture.sh	software/skills/journal/scripts/capture.sh
-100644 0495fc97cbe93e4331c89263aee188f6c0e9c9ea	.claude/skills/new-worktree/SKILL.md	software/skills/new-worktree/SKILL.md
-100644 7363dd2304fbb29c464e8cac0fd270acdeeb8060	.claude/skills/open-pr/SKILL.md	software/application-software/skills/open-pr/SKILL.md
-100755 61f377fef63daa10c443129df6a49571fdbeb658	.claude/skills/open-pr/scripts/pr-checks.sh	software/application-software/skills/open-pr/scripts/pr-checks.sh
-100644 90cc6571064f750bd5d816f44cf3064fa2df8f7e	.claude/skills/pr-conventions/SKILL.md	software/application-software/argos/skills/pr-conventions/SKILL.md
-100644 2ed67ecda73634b78468cab0ccb52c86f128e064	.claude/skills/pr-conventions/scripts/lint.sh	software/application-software/argos/skills/pr-conventions/scripts/lint.sh
-100644 e67387116a753217d256d81901e5b4091b49b44c	.claude/skills/report-spike/SKILL.md	software/application-software/skills/report-spike/SKILL.md
-100644 7acb908af141defaa035f992b060d4d23c0b2a54	.claude/skills/run-local/SKILL.md	software/application-software/argos/skills/run-local/SKILL.md
-100755 f5986571d9b917264eb6cfe9c9d7f27448242ac9	.claude/skills/run-local/scripts/run-local.sh	software/application-software/argos/skills/run-local/scripts/run-local.sh
-100755 d8de89ce933cbc5302c59fab3176004bdd251d35	.claude/skills/run-local/scripts/serve.sh	software/application-software/argos/skills/run-local/scripts/serve.sh
-100644 fdc1ce85211200223040edfb5dc65a3de7f35d53	.claude/skills/setup-workspace/SKILL.md	software/skills/setup-workspace/SKILL.md
-100644 e0a8b424d11c4897901c0ce888a6c0c726daed98	.claude/skills/switch-workspace/SKILL.md	software/skills/switch-workspace/SKILL.md
-100644 b516657698fb909e0c72f8c9a6187fdaf4a38f71	.claude/skills/ticket-conventions/SKILL.md	software/application-software/argos/skills/ticket-conventions/SKILL.md
-100644 069b51714c0fd4d3d6ad972dd9f840e01f21cf15	.claude/skills/update-pr/SKILL.md	software/application-software/skills/update-pr/SKILL.md
-100644 ae99371d623deb83d2ac5b1227eb12eaff662092	.claude/skills/verify-graph/SKILL.md	software/application-software/argos/skills/verify-graph/SKILL.md
-100644 3fcb7344ce3499a7afbba08b8c2b6deacd3f101b	.claude/skills/verify-graph/scripts/check.js	software/application-software/argos/skills/verify-graph/scripts/check.js
-100755 c8710cdf2cea12ddae0a92c3e0ba141e06a234f3	.claude/skills/verify-graph/scripts/check.sh	software/application-software/argos/skills/verify-graph/scripts/check.sh
-100755 5a1b49bc55582ec03f5e0a58c015d1b28fd21af3	.claude/skills/verify-graph/scripts/open.sh	software/application-software/argos/skills/verify-graph/scripts/open.sh
-100644 404ac250d03f0c228b8206efef46bed6149bd314	.claude/skills/verify-graph/scripts/perf.js	software/application-software/argos/skills/verify-graph/scripts/perf.js
-100755 2218f42b8f020b7d83e9d960828800444e1260ad	.claude/skills/verify-graph/scripts/perf.sh	software/application-software/argos/skills/verify-graph/scripts/perf.sh
-100755 fdb2631a755b9999c2aa83c67729fbeb13d387a8	.claude/skills/verify-graph/scripts/seed.sh	software/application-software/argos/skills/verify-graph/scripts/seed.sh
-100755 d1237c42098d2a437770c24e2f60b7110d1e90b2	.claude/skills/verify-graph/scripts/select-run.sh	software/application-software/argos/skills/verify-graph/scripts/select-run.sh
-100644 006fff61ee4658a959c921e5fd70ecc57e2b07f2	.claude/skills/verify-telemetry/SKILL.md	software/application-software/argos/skills/verify-telemetry/SKILL.md
-100755 c9a9c0a7dd4386508e1f90d595d59b50df0aad35	.claude/skills/verify-telemetry/scripts/check-topic.sh	software/application-software/argos/skills/verify-telemetry/scripts/check-topic.sh
+100644 30083fa3b2cf735ac5a75808478dd00476e75e9c	.claude/skills/address-pr-comments/SKILL.md	software/application-software/workspace-inherit/.claude/skills/address-pr-comments/SKILL.md
+100755 ce1efd97da4a6d2ea655932486660c5008f44dae	.claude/skills/address-pr-comments/scripts/fetch-feedback.sh	software/application-software/workspace-inherit/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh
+100644 da0be202ebc0a9ffc4544dbdf4bbef54cca37520	.claude/skills/address-pr-comments/scripts/github.sh	software/application-software/workspace-inherit/.claude/skills/address-pr-comments/scripts/github.sh
+100644 4b5675711abfaef10089859f379a931206267355	.claude/skills/commit/SKILL.md	software/application-software/workspace-inherit/.claude/skills/commit/SKILL.md
+100644 4f85b66ab5c07ce4a00ba3d8555fc9272544046b	.claude/skills/consolidate-spikes/SKILL.md	software/application-software/workspace-inherit/.claude/skills/consolidate-spikes/SKILL.md
+100644 210a059f1a4b753cab90aad19f26ead483a62295	.claude/skills/create-ticket/SKILL.md	software/application-software/workspace-inherit/.claude/skills/create-ticket/SKILL.md
+100644 f24d293b38a4d03b610a5a104fa97b614856d7c3	.claude/skills/implement/SKILL.md	software/application-software/argos/workspace-inherit/.claude/skills/implement/SKILL.md
+100644 4917259f9e29db28e2636496e80f80ee5d9e321e	.claude/skills/journal/SKILL.md	software/workspace-inherit/.claude/skills/journal/SKILL.md
+100755 1e90d7b9afa14b8b0e7f36e0e1d83baecc94ba5b	.claude/skills/journal/scripts/capture.sh	software/workspace-inherit/.claude/skills/journal/scripts/capture.sh
+100644 0495fc97cbe93e4331c89263aee188f6c0e9c9ea	.claude/skills/new-worktree/SKILL.md	software/workspace-inherit/.claude/skills/new-worktree/SKILL.md
+100644 b1e7c71c13b4ea7c40cabeb12aa1674a6b543dc5	.claude/skills/open-pr/SKILL.md	software/application-software/workspace-inherit/.claude/skills/open-pr/SKILL.md
+100755 61f377fef63daa10c443129df6a49571fdbeb658	.claude/skills/open-pr/scripts/pr-checks.sh	software/application-software/workspace-inherit/.claude/skills/open-pr/scripts/pr-checks.sh
+100644 90cc6571064f750bd5d816f44cf3064fa2df8f7e	.claude/skills/pr-conventions/SKILL.md	software/application-software/argos/workspace-inherit/.claude/skills/pr-conventions/SKILL.md
+100644 2ed67ecda73634b78468cab0ccb52c86f128e064	.claude/skills/pr-conventions/scripts/lint.sh	software/application-software/argos/workspace-inherit/.claude/skills/pr-conventions/scripts/lint.sh
+100644 e67387116a753217d256d81901e5b4091b49b44c	.claude/skills/report-spike/SKILL.md	software/application-software/workspace-inherit/.claude/skills/report-spike/SKILL.md
+100644 7acb908af141defaa035f992b060d4d23c0b2a54	.claude/skills/run-local/SKILL.md	software/application-software/argos/workspace-inherit/.claude/skills/run-local/SKILL.md
+100755 f5986571d9b917264eb6cfe9c9d7f27448242ac9	.claude/skills/run-local/scripts/run-local.sh	software/application-software/argos/workspace-inherit/.claude/skills/run-local/scripts/run-local.sh
+100755 d8de89ce933cbc5302c59fab3176004bdd251d35	.claude/skills/run-local/scripts/serve.sh	software/application-software/argos/workspace-inherit/.claude/skills/run-local/scripts/serve.sh
+100644 fdc1ce85211200223040edfb5dc65a3de7f35d53	.claude/skills/setup-workspace/SKILL.md	software/workspace-inherit/.claude/skills/setup-workspace/SKILL.md
+100644 e0a8b424d11c4897901c0ce888a6c0c726daed98	.claude/skills/switch-workspace/SKILL.md	software/workspace-inherit/.claude/skills/switch-workspace/SKILL.md
+100644 b516657698fb909e0c72f8c9a6187fdaf4a38f71	.claude/skills/ticket-conventions/SKILL.md	software/application-software/argos/workspace-inherit/.claude/skills/ticket-conventions/SKILL.md
+100644 069b51714c0fd4d3d6ad972dd9f840e01f21cf15	.claude/skills/update-pr/SKILL.md	software/application-software/workspace-inherit/.claude/skills/update-pr/SKILL.md
+100644 ae99371d623deb83d2ac5b1227eb12eaff662092	.claude/skills/verify-graph/SKILL.md	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/SKILL.md
+100644 3fcb7344ce3499a7afbba08b8c2b6deacd3f101b	.claude/skills/verify-graph/scripts/check.js	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/check.js
+100755 c8710cdf2cea12ddae0a92c3e0ba141e06a234f3	.claude/skills/verify-graph/scripts/check.sh	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/check.sh
+100755 5a1b49bc55582ec03f5e0a58c015d1b28fd21af3	.claude/skills/verify-graph/scripts/open.sh	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/open.sh
+100644 404ac250d03f0c228b8206efef46bed6149bd314	.claude/skills/verify-graph/scripts/perf.js	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/perf.js
+100755 2218f42b8f020b7d83e9d960828800444e1260ad	.claude/skills/verify-graph/scripts/perf.sh	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/perf.sh
+100755 fdb2631a755b9999c2aa83c67729fbeb13d387a8	.claude/skills/verify-graph/scripts/seed.sh	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/seed.sh
+100755 d1237c42098d2a437770c24e2f60b7110d1e90b2	.claude/skills/verify-graph/scripts/select-run.sh	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/select-run.sh
+100644 006fff61ee4658a959c921e5fd70ecc57e2b07f2	.claude/skills/verify-telemetry/SKILL.md	software/application-software/argos/workspace-inherit/.claude/skills/verify-telemetry/SKILL.md
+100755 c9a9c0a7dd4386508e1f90d595d59b50df0aad35	.claude/skills/verify-telemetry/scripts/check-topic.sh	software/application-software/argos/workspace-inherit/.claude/skills/verify-telemetry/scripts/check-topic.sh
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/address-pr-comments/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/address-pr-comments/SKILL.md
index c671eef..3bf22d3 100644
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/address-pr-comments/SKILL.md
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/address-pr-comments/SKILL.md
@@ -1,8 +1,6 @@
 ---
 name: address-pr-comments
 description: Fetch review comments on a PR (Argos, Nero), judge whether each (including outdated ones) still applies, and walk through fixes in the PR's worktree
-allowed-tools: Bash(git:*), Bash(gh issue list:*), Bash(bash ${CLAUDE_SKILL_DIR}/scripts/fetch-feedback.sh *)
-user-invocable: true
 ---
 
 Propose and apply fixes for a PR's unresolved review feedback. **Never reply to threads**; the user does.
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/create-ticket/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/create-ticket/SKILL.md
index 9dd28e5..210a059 100644
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/create-ticket/SKILL.md
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/create-ticket/SKILL.md
@@ -7,7 +7,7 @@ description: Draft and file a GitHub issue (idea, spike, epic, or dev work) on a
 
 These are the ticket conventions for every application-software repo. The repo's own `.github/ISSUE_TEMPLATE` holds only the fields (`gh api repos/<owner>/<repo>/contents/.github/ISSUE_TEMPLATE/<file> -q .content | base64 -d`); follow each field's description.
 
-First load the project's `ticket-conventions` skill (inherited from the project's `skills/`) for its repo, area labels, vocabulary, and diagrams. If none is enabled, ask which repo.
+First load the project's `ticket-conventions` skill (inherited from the project's `workspace-inherit/`) for its repo, area labels, vocabulary, and diagrams. If none is enabled, ask which repo.
 
 ## Workflow
 
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/open-pr/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/open-pr/SKILL.md
index 7363dd2..b1e7c71 100644
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/open-pr/SKILL.md
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/open-pr/SKILL.md
@@ -3,7 +3,7 @@ name: open-pr
 description: Run pre-PR checks, push the branch, and open a draft pull request on an application-software repo (Argos, Nero)
 ---
 
-First load the project's `pr-conventions` skill (inherited from the project's `skills/`) for its base branch, commit format, checks, labels, and screenshots.
+First load the project's `pr-conventions` skill (inherited from the project's `workspace-inherit/`) for its base branch, commit format, checks, labels, and screenshots.
 
 1. **Check:** `bash scripts/pr-checks.sh <repo> <branch> origin/<base> '<commit format>'` (clean tree, commit subjects match the project's format, merges cleanly into the base), then the project's own checks. Stop and fix on any FAIL.
 2. **Media:** if the diff touches the UI, ask the user whether to add screenshots to the PR, listing any already in the project's screenshot folder for this branch so they can pick those instead of new ones; on no, skip this step. For new ones, use the project's UI QA to take Playwright screenshots of the changed views into its screenshot folder, or, when the change adds or changes an animation, record a short video instead (a browser context with `recordVideo: { dir }` saves a `.webm` when it closes). Images must be under 10 MB; video under 10 MB on a Free plan, 100 MB on a paid one.
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/pr-conventions/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/pr-conventions/SKILL.md
index 94d5e4e..5d80cc0 100644
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/pr-conventions/SKILL.md
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/pr-conventions/SKILL.md
@@ -1,7 +1,6 @@
 ---
 name: pr-conventions
 description: Argos specifics for pull requests (base branch, commit format, checks, labels, screenshots, UI QA). Load before opening, updating, or reviewing an Argos PR, alongside open-pr, update-pr, and review.
-user-invocable: false
 ---
 
 # Argos PR conventions
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/ticket-conventions/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/ticket-conventions/SKILL.md
index b516657..8d9ec37 100644
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/ticket-conventions/SKILL.md
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/ticket-conventions/SKILL.md
@@ -1,7 +1,6 @@
 ---
 name: ticket-conventions
 description: Argos specifics for tickets (repo, area labels, vocabulary, diagrams). Load before drafting or filing an Argos issue, alongside create-ticket.
-user-invocable: false
 ---
 
 # Argos ticket conventions
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/SKILL.md
index ae99371..c9dfe7d 100644
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/SKILL.md
+++ b/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/SKILL.md
@@ -1,7 +1,6 @@
 ---
 name: verify-graph
 description: Playwright CLI verification of the graph page — modes, controls, topic selection, and data rendering. Use after any change to graph-page components, graph rendering, data flow, or mode switching logic.
-user-invocable: true
 ---
 
 Get the branch's client running with `run-local <branch>`; its URL is `BASE_URL`. The scripts need `playwright-cli` (`npm i -g @playwright/cli`, then `playwright-cli install-browser chromium`; cloud containers use their preinstalled Chromium). Then run the base checks:
diff --git a/software/application-software/argos/workspaces/default-codex/workspace.generated b/software/application-software/argos/workspaces/default-codex/workspace.generated
index 953030a..5f816f9 100644
--- a/software/application-software/argos/workspaces/default-codex/workspace.generated
+++ b/software/application-software/argos/workspaces/default-codex/workspace.generated
@@ -1,33 +1,33 @@
 # Generated by ci/render.sh; edit shared sources or opt out in workspace.yml.
-100644 c671eeff00a4dbfbd738638e3f7fcd321fdd7daf	.agents/skills/address-pr-comments/SKILL.md	software/application-software/skills/address-pr-comments/SKILL.md
-100755 ce1efd97da4a6d2ea655932486660c5008f44dae	.agents/skills/address-pr-comments/scripts/fetch-feedback.sh	software/application-software/skills/address-pr-comments/scripts/fetch-feedback.sh
-100644 da0be202ebc0a9ffc4544dbdf4bbef54cca37520	.agents/skills/address-pr-comments/scripts/github.sh	software/application-software/skills/address-pr-comments/scripts/github.sh
-100644 7a8015c8555385e795638019a5bce9db2ec984f5	.agents/skills/commit/SKILL.md	software/application-software/skills/commit/SKILL.md
-100644 897a1f58386f280ce329a245baea7b562ac0b3db	.agents/skills/consolidate-spikes/SKILL.md	software/application-software/skills/consolidate-spikes/SKILL.md
-100644 9dd28e531875c0acb7f8a88a07ad15645aecf38f	.agents/skills/create-ticket/SKILL.md	software/application-software/skills/create-ticket/SKILL.md
-100644 f24d293b38a4d03b610a5a104fa97b614856d7c3	.agents/skills/implement/SKILL.md	software/application-software/argos/skills/implement/SKILL.md
-100644 4917259f9e29db28e2636496e80f80ee5d9e321e	.agents/skills/journal/SKILL.md	software/skills/journal/SKILL.md
-100755 1e90d7b9afa14b8b0e7f36e0e1d83baecc94ba5b	.agents/skills/journal/scripts/capture.sh	software/skills/journal/scripts/capture.sh
-100644 0495fc97cbe93e4331c89263aee188f6c0e9c9ea	.agents/skills/new-worktree/SKILL.md	software/skills/new-worktree/SKILL.md
-100644 7363dd2304fbb29c464e8cac0fd270acdeeb8060	.agents/skills/open-pr/SKILL.md	software/application-software/skills/open-pr/SKILL.md
-100755 61f377fef63daa10c443129df6a49571fdbeb658	.agents/skills/open-pr/scripts/pr-checks.sh	software/application-software/skills/open-pr/scripts/pr-checks.sh
-100644 94d5e4e205f822c5a6b263beefbcbb49114b87ab	.agents/skills/pr-conventions/SKILL.md	software/application-software/argos/skills/pr-conventions/SKILL.md
-100644 2ed67ecda73634b78468cab0ccb52c86f128e064	.agents/skills/pr-conventions/scripts/lint.sh	software/application-software/argos/skills/pr-conventions/scripts/lint.sh
-100644 e67387116a753217d256d81901e5b4091b49b44c	.agents/skills/report-spike/SKILL.md	software/application-software/skills/report-spike/SKILL.md
-100644 7acb908af141defaa035f992b060d4d23c0b2a54	.agents/skills/run-local/SKILL.md	software/application-software/argos/skills/run-local/SKILL.md
-100755 f5986571d9b917264eb6cfe9c9d7f27448242ac9	.agents/skills/run-local/scripts/run-local.sh	software/application-software/argos/skills/run-local/scripts/run-local.sh
-100755 d8de89ce933cbc5302c59fab3176004bdd251d35	.agents/skills/run-local/scripts/serve.sh	software/application-software/argos/skills/run-local/scripts/serve.sh
-100644 fdc1ce85211200223040edfb5dc65a3de7f35d53	.agents/skills/setup-workspace/SKILL.md	software/skills/setup-workspace/SKILL.md
-100644 b6a8144466f5430a1141df53300f8c09f9dae20f	.agents/skills/switch-workspace/SKILL.md	software/skills/switch-workspace/SKILL.md
-100644 b516657698fb909e0c72f8c9a6187fdaf4a38f71	.agents/skills/ticket-conventions/SKILL.md	software/application-software/argos/skills/ticket-conventions/SKILL.md
-100644 069b51714c0fd4d3d6ad972dd9f840e01f21cf15	.agents/skills/update-pr/SKILL.md	software/application-software/skills/update-pr/SKILL.md
-100644 ae99371d623deb83d2ac5b1227eb12eaff662092	.agents/skills/verify-graph/SKILL.md	software/application-software/argos/skills/verify-graph/SKILL.md
-100644 3fcb7344ce3499a7afbba08b8c2b6deacd3f101b	.agents/skills/verify-graph/scripts/check.js	software/application-software/argos/skills/verify-graph/scripts/check.js
-100755 c8710cdf2cea12ddae0a92c3e0ba141e06a234f3	.agents/skills/verify-graph/scripts/check.sh	software/application-software/argos/skills/verify-graph/scripts/check.sh
-100755 5a1b49bc55582ec03f5e0a58c015d1b28fd21af3	.agents/skills/verify-graph/scripts/open.sh	software/application-software/argos/skills/verify-graph/scripts/open.sh
-100644 404ac250d03f0c228b8206efef46bed6149bd314	.agents/skills/verify-graph/scripts/perf.js	software/application-software/argos/skills/verify-graph/scripts/perf.js
-100755 2218f42b8f020b7d83e9d960828800444e1260ad	.agents/skills/verify-graph/scripts/perf.sh	software/application-software/argos/skills/verify-graph/scripts/perf.sh
-100755 fdb2631a755b9999c2aa83c67729fbeb13d387a8	.agents/skills/verify-graph/scripts/seed.sh	software/application-software/argos/skills/verify-graph/scripts/seed.sh
-100755 d1237c42098d2a437770c24e2f60b7110d1e90b2	.agents/skills/verify-graph/scripts/select-run.sh	software/application-software/argos/skills/verify-graph/scripts/select-run.sh
-100644 006fff61ee4658a959c921e5fd70ecc57e2b07f2	.agents/skills/verify-telemetry/SKILL.md	software/application-software/argos/skills/verify-telemetry/SKILL.md
-100755 c9a9c0a7dd4386508e1f90d595d59b50df0aad35	.agents/skills/verify-telemetry/scripts/check-topic.sh	software/application-software/argos/skills/verify-telemetry/scripts/check-topic.sh
+100644 3bf22d3571b9cad53804cc7a7c678c4103368780	.agents/skills/address-pr-comments/SKILL.md	software/application-software/workspace-inherit/.claude/skills/address-pr-comments/SKILL.md
+100755 ce1efd97da4a6d2ea655932486660c5008f44dae	.agents/skills/address-pr-comments/scripts/fetch-feedback.sh	software/application-software/workspace-inherit/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh
+100644 da0be202ebc0a9ffc4544dbdf4bbef54cca37520	.agents/skills/address-pr-comments/scripts/github.sh	software/application-software/workspace-inherit/.claude/skills/address-pr-comments/scripts/github.sh
+100644 7a8015c8555385e795638019a5bce9db2ec984f5	.agents/skills/commit/SKILL.md	software/application-software/workspace-inherit/.claude/skills/commit/SKILL.md
+100644 897a1f58386f280ce329a245baea7b562ac0b3db	.agents/skills/consolidate-spikes/SKILL.md	software/application-software/workspace-inherit/.claude/skills/consolidate-spikes/SKILL.md
+100644 210a059f1a4b753cab90aad19f26ead483a62295	.agents/skills/create-ticket/SKILL.md	software/application-software/workspace-inherit/.claude/skills/create-ticket/SKILL.md
+100644 f24d293b38a4d03b610a5a104fa97b614856d7c3	.agents/skills/implement/SKILL.md	software/application-software/argos/workspace-inherit/.claude/skills/implement/SKILL.md
+100644 4917259f9e29db28e2636496e80f80ee5d9e321e	.agents/skills/journal/SKILL.md	software/workspace-inherit/.claude/skills/journal/SKILL.md
+100755 1e90d7b9afa14b8b0e7f36e0e1d83baecc94ba5b	.agents/skills/journal/scripts/capture.sh	software/workspace-inherit/.claude/skills/journal/scripts/capture.sh
+100644 0495fc97cbe93e4331c89263aee188f6c0e9c9ea	.agents/skills/new-worktree/SKILL.md	software/workspace-inherit/.claude/skills/new-worktree/SKILL.md
+100644 b1e7c71c13b4ea7c40cabeb12aa1674a6b543dc5	.agents/skills/open-pr/SKILL.md	software/application-software/workspace-inherit/.claude/skills/open-pr/SKILL.md
+100755 61f377fef63daa10c443129df6a49571fdbeb658	.agents/skills/open-pr/scripts/pr-checks.sh	software/application-software/workspace-inherit/.claude/skills/open-pr/scripts/pr-checks.sh
+100644 5d80cc0cfbc8794c3bd6e970365dc414c1eda850	.agents/skills/pr-conventions/SKILL.md	software/application-software/argos/workspace-inherit/.claude/skills/pr-conventions/SKILL.md
+100644 2ed67ecda73634b78468cab0ccb52c86f128e064	.agents/skills/pr-conventions/scripts/lint.sh	software/application-software/argos/workspace-inherit/.claude/skills/pr-conventions/scripts/lint.sh
+100644 e67387116a753217d256d81901e5b4091b49b44c	.agents/skills/report-spike/SKILL.md	software/application-software/workspace-inherit/.claude/skills/report-spike/SKILL.md
+100644 7acb908af141defaa035f992b060d4d23c0b2a54	.agents/skills/run-local/SKILL.md	software/application-software/argos/workspace-inherit/.claude/skills/run-local/SKILL.md
+100755 f5986571d9b917264eb6cfe9c9d7f27448242ac9	.agents/skills/run-local/scripts/run-local.sh	software/application-software/argos/workspace-inherit/.claude/skills/run-local/scripts/run-local.sh
+100755 d8de89ce933cbc5302c59fab3176004bdd251d35	.agents/skills/run-local/scripts/serve.sh	software/application-software/argos/workspace-inherit/.claude/skills/run-local/scripts/serve.sh
+100644 fdc1ce85211200223040edfb5dc65a3de7f35d53	.agents/skills/setup-workspace/SKILL.md	software/workspace-inherit/.claude/skills/setup-workspace/SKILL.md
+100644 b6a8144466f5430a1141df53300f8c09f9dae20f	.agents/skills/switch-workspace/SKILL.md	software/workspace-inherit/.claude/skills/switch-workspace/SKILL.md
+100644 8d9ec377f598b4527af20ffaa54b6cfe1a244860	.agents/skills/ticket-conventions/SKILL.md	software/application-software/argos/workspace-inherit/.claude/skills/ticket-conventions/SKILL.md
+100644 069b51714c0fd4d3d6ad972dd9f840e01f21cf15	.agents/skills/update-pr/SKILL.md	software/application-software/workspace-inherit/.claude/skills/update-pr/SKILL.md
+100644 c9dfe7d18e9c4d728d5295eeed178960289390a2	.agents/skills/verify-graph/SKILL.md	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/SKILL.md
+100644 3fcb7344ce3499a7afbba08b8c2b6deacd3f101b	.agents/skills/verify-graph/scripts/check.js	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/check.js
+100755 c8710cdf2cea12ddae0a92c3e0ba141e06a234f3	.agents/skills/verify-graph/scripts/check.sh	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/check.sh
+100755 5a1b49bc55582ec03f5e0a58c015d1b28fd21af3	.agents/skills/verify-graph/scripts/open.sh	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/open.sh
+100644 404ac250d03f0c228b8206efef46bed6149bd314	.agents/skills/verify-graph/scripts/perf.js	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/perf.js
+100755 2218f42b8f020b7d83e9d960828800444e1260ad	.agents/skills/verify-graph/scripts/perf.sh	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/perf.sh
+100755 fdb2631a755b9999c2aa83c67729fbeb13d387a8	.agents/skills/verify-graph/scripts/seed.sh	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/seed.sh
+100755 d1237c42098d2a437770c24e2f60b7110d1e90b2	.agents/skills/verify-graph/scripts/select-run.sh	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/select-run.sh
+100644 006fff61ee4658a959c921e5fd70ecc57e2b07f2	.agents/skills/verify-telemetry/SKILL.md	software/application-software/argos/workspace-inherit/.claude/skills/verify-telemetry/SKILL.md
+100755 c9a9c0a7dd4386508e1f90d595d59b50df0aad35	.agents/skills/verify-telemetry/scripts/check-topic.sh	software/application-software/argos/workspace-inherit/.claude/skills/verify-telemetry/scripts/check-topic.sh
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/create-ticket/SKILL.md b/software/application-software/argos/workspaces/experimental/.claude/skills/create-ticket/SKILL.md
index 9dd28e5..210a059 100644
--- a/software/application-software/argos/workspaces/experimental/.claude/skills/create-ticket/SKILL.md
+++ b/software/application-software/argos/workspaces/experimental/.claude/skills/create-ticket/SKILL.md
@@ -7,7 +7,7 @@ description: Draft and file a GitHub issue (idea, spike, epic, or dev work) on a
 
 These are the ticket conventions for every application-software repo. The repo's own `.github/ISSUE_TEMPLATE` holds only the fields (`gh api repos/<owner>/<repo>/contents/.github/ISSUE_TEMPLATE/<file> -q .content | base64 -d`); follow each field's description.
 
-First load the project's `ticket-conventions` skill (inherited from the project's `skills/`) for its repo, area labels, vocabulary, and diagrams. If none is enabled, ask which repo.
+First load the project's `ticket-conventions` skill (inherited from the project's `workspace-inherit/`) for its repo, area labels, vocabulary, and diagrams. If none is enabled, ask which repo.
 
 ## Workflow
 
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/open-pr/SKILL.md b/software/application-software/argos/workspaces/experimental/.claude/skills/open-pr/SKILL.md
index 7363dd2..b1e7c71 100644
--- a/software/application-software/argos/workspaces/experimental/.claude/skills/open-pr/SKILL.md
+++ b/software/application-software/argos/workspaces/experimental/.claude/skills/open-pr/SKILL.md
@@ -3,7 +3,7 @@ name: open-pr
 description: Run pre-PR checks, push the branch, and open a draft pull request on an application-software repo (Argos, Nero)
 ---
 
-First load the project's `pr-conventions` skill (inherited from the project's `skills/`) for its base branch, commit format, checks, labels, and screenshots.
+First load the project's `pr-conventions` skill (inherited from the project's `workspace-inherit/`) for its base branch, commit format, checks, labels, and screenshots.
 
 1. **Check:** `bash scripts/pr-checks.sh <repo> <branch> origin/<base> '<commit format>'` (clean tree, commit subjects match the project's format, merges cleanly into the base), then the project's own checks. Stop and fix on any FAIL.
 2. **Media:** if the diff touches the UI, ask the user whether to add screenshots to the PR, listing any already in the project's screenshot folder for this branch so they can pick those instead of new ones; on no, skip this step. For new ones, use the project's UI QA to take Playwright screenshots of the changed views into its screenshot folder, or, when the change adds or changes an animation, record a short video instead (a browser context with `recordVideo: { dir }` saves a `.webm` when it closes). Images must be under 10 MB; video under 10 MB on a Free plan, 100 MB on a paid one.
diff --git a/software/application-software/argos/workspaces/experimental/workspace.generated b/software/application-software/argos/workspaces/experimental/workspace.generated
index f099116..21804a8 100644
--- a/software/application-software/argos/workspaces/experimental/workspace.generated
+++ b/software/application-software/argos/workspaces/experimental/workspace.generated
@@ -1,34 +1,34 @@
 # Generated by ci/render.sh; edit shared sources or opt out in workspace.yml.
 100644 61c35f28dda167e42bebc3bad3994af97c53e876	.claude/settings.json	ci/plugins.sh
-100644 30083fa3b2cf735ac5a75808478dd00476e75e9c	.claude/skills/address-pr-comments/SKILL.md	software/application-software/skills/address-pr-comments/SKILL.md
-100755 ce1efd97da4a6d2ea655932486660c5008f44dae	.claude/skills/address-pr-comments/scripts/fetch-feedback.sh	software/application-software/skills/address-pr-comments/scripts/fetch-feedback.sh
-100644 da0be202ebc0a9ffc4544dbdf4bbef54cca37520	.claude/skills/address-pr-comments/scripts/github.sh	software/application-software/skills/address-pr-comments/scripts/github.sh
-100644 4b5675711abfaef10089859f379a931206267355	.claude/skills/commit/SKILL.md	software/application-software/skills/commit/SKILL.md
-100644 4f85b66ab5c07ce4a00ba3d8555fc9272544046b	.claude/skills/consolidate-spikes/SKILL.md	software/application-software/skills/consolidate-spikes/SKILL.md
-100644 9dd28e531875c0acb7f8a88a07ad15645aecf38f	.claude/skills/create-ticket/SKILL.md	software/application-software/skills/create-ticket/SKILL.md
-100644 f24d293b38a4d03b610a5a104fa97b614856d7c3	.claude/skills/implement/SKILL.md	software/application-software/argos/skills/implement/SKILL.md
-100644 4917259f9e29db28e2636496e80f80ee5d9e321e	.claude/skills/journal/SKILL.md	software/skills/journal/SKILL.md
-100755 1e90d7b9afa14b8b0e7f36e0e1d83baecc94ba5b	.claude/skills/journal/scripts/capture.sh	software/skills/journal/scripts/capture.sh
-100644 0495fc97cbe93e4331c89263aee188f6c0e9c9ea	.claude/skills/new-worktree/SKILL.md	software/skills/new-worktree/SKILL.md
-100644 7363dd2304fbb29c464e8cac0fd270acdeeb8060	.claude/skills/open-pr/SKILL.md	software/application-software/skills/open-pr/SKILL.md
-100755 61f377fef63daa10c443129df6a49571fdbeb658	.claude/skills/open-pr/scripts/pr-checks.sh	software/application-software/skills/open-pr/scripts/pr-checks.sh
-100644 90cc6571064f750bd5d816f44cf3064fa2df8f7e	.claude/skills/pr-conventions/SKILL.md	software/application-software/argos/skills/pr-conventions/SKILL.md
-100644 2ed67ecda73634b78468cab0ccb52c86f128e064	.claude/skills/pr-conventions/scripts/lint.sh	software/application-software/argos/skills/pr-conventions/scripts/lint.sh
-100644 e67387116a753217d256d81901e5b4091b49b44c	.claude/skills/report-spike/SKILL.md	software/application-software/skills/report-spike/SKILL.md
-100644 7acb908af141defaa035f992b060d4d23c0b2a54	.claude/skills/run-local/SKILL.md	software/application-software/argos/skills/run-local/SKILL.md
-100755 f5986571d9b917264eb6cfe9c9d7f27448242ac9	.claude/skills/run-local/scripts/run-local.sh	software/application-software/argos/skills/run-local/scripts/run-local.sh
-100755 d8de89ce933cbc5302c59fab3176004bdd251d35	.claude/skills/run-local/scripts/serve.sh	software/application-software/argos/skills/run-local/scripts/serve.sh
-100644 fdc1ce85211200223040edfb5dc65a3de7f35d53	.claude/skills/setup-workspace/SKILL.md	software/skills/setup-workspace/SKILL.md
-100644 e0a8b424d11c4897901c0ce888a6c0c726daed98	.claude/skills/switch-workspace/SKILL.md	software/skills/switch-workspace/SKILL.md
-100644 b516657698fb909e0c72f8c9a6187fdaf4a38f71	.claude/skills/ticket-conventions/SKILL.md	software/application-software/argos/skills/ticket-conventions/SKILL.md
-100644 069b51714c0fd4d3d6ad972dd9f840e01f21cf15	.claude/skills/update-pr/SKILL.md	software/application-software/skills/update-pr/SKILL.md
-100644 ae99371d623deb83d2ac5b1227eb12eaff662092	.claude/skills/verify-graph/SKILL.md	software/application-software/argos/skills/verify-graph/SKILL.md
-100644 3fcb7344ce3499a7afbba08b8c2b6deacd3f101b	.claude/skills/verify-graph/scripts/check.js	software/application-software/argos/skills/verify-graph/scripts/check.js
-100755 c8710cdf2cea12ddae0a92c3e0ba141e06a234f3	.claude/skills/verify-graph/scripts/check.sh	software/application-software/argos/skills/verify-graph/scripts/check.sh
-100755 5a1b49bc55582ec03f5e0a58c015d1b28fd21af3	.claude/skills/verify-graph/scripts/open.sh	software/application-software/argos/skills/verify-graph/scripts/open.sh
-100644 404ac250d03f0c228b8206efef46bed6149bd314	.claude/skills/verify-graph/scripts/perf.js	software/application-software/argos/skills/verify-graph/scripts/perf.js
-100755 2218f42b8f020b7d83e9d960828800444e1260ad	.claude/skills/verify-graph/scripts/perf.sh	software/application-software/argos/skills/verify-graph/scripts/perf.sh
-100755 fdb2631a755b9999c2aa83c67729fbeb13d387a8	.claude/skills/verify-graph/scripts/seed.sh	software/application-software/argos/skills/verify-graph/scripts/seed.sh
-100755 d1237c42098d2a437770c24e2f60b7110d1e90b2	.claude/skills/verify-graph/scripts/select-run.sh	software/application-software/argos/skills/verify-graph/scripts/select-run.sh
-100644 006fff61ee4658a959c921e5fd70ecc57e2b07f2	.claude/skills/verify-telemetry/SKILL.md	software/application-software/argos/skills/verify-telemetry/SKILL.md
-100755 c9a9c0a7dd4386508e1f90d595d59b50df0aad35	.claude/skills/verify-telemetry/scripts/check-topic.sh	software/application-software/argos/skills/verify-telemetry/scripts/check-topic.sh
+100644 30083fa3b2cf735ac5a75808478dd00476e75e9c	.claude/skills/address-pr-comments/SKILL.md	software/application-software/workspace-inherit/.claude/skills/address-pr-comments/SKILL.md
+100755 ce1efd97da4a6d2ea655932486660c5008f44dae	.claude/skills/address-pr-comments/scripts/fetch-feedback.sh	software/application-software/workspace-inherit/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh
+100644 da0be202ebc0a9ffc4544dbdf4bbef54cca37520	.claude/skills/address-pr-comments/scripts/github.sh	software/application-software/workspace-inherit/.claude/skills/address-pr-comments/scripts/github.sh
+100644 4b5675711abfaef10089859f379a931206267355	.claude/skills/commit/SKILL.md	software/application-software/workspace-inherit/.claude/skills/commit/SKILL.md
+100644 4f85b66ab5c07ce4a00ba3d8555fc9272544046b	.claude/skills/consolidate-spikes/SKILL.md	software/application-software/workspace-inherit/.claude/skills/consolidate-spikes/SKILL.md
+100644 210a059f1a4b753cab90aad19f26ead483a62295	.claude/skills/create-ticket/SKILL.md	software/application-software/workspace-inherit/.claude/skills/create-ticket/SKILL.md
+100644 f24d293b38a4d03b610a5a104fa97b614856d7c3	.claude/skills/implement/SKILL.md	software/application-software/argos/workspace-inherit/.claude/skills/implement/SKILL.md
+100644 4917259f9e29db28e2636496e80f80ee5d9e321e	.claude/skills/journal/SKILL.md	software/workspace-inherit/.claude/skills/journal/SKILL.md
+100755 1e90d7b9afa14b8b0e7f36e0e1d83baecc94ba5b	.claude/skills/journal/scripts/capture.sh	software/workspace-inherit/.claude/skills/journal/scripts/capture.sh
+100644 0495fc97cbe93e4331c89263aee188f6c0e9c9ea	.claude/skills/new-worktree/SKILL.md	software/workspace-inherit/.claude/skills/new-worktree/SKILL.md
+100644 b1e7c71c13b4ea7c40cabeb12aa1674a6b543dc5	.claude/skills/open-pr/SKILL.md	software/application-software/workspace-inherit/.claude/skills/open-pr/SKILL.md
+100755 61f377fef63daa10c443129df6a49571fdbeb658	.claude/skills/open-pr/scripts/pr-checks.sh	software/application-software/workspace-inherit/.claude/skills/open-pr/scripts/pr-checks.sh
+100644 90cc6571064f750bd5d816f44cf3064fa2df8f7e	.claude/skills/pr-conventions/SKILL.md	software/application-software/argos/workspace-inherit/.claude/skills/pr-conventions/SKILL.md
+100644 2ed67ecda73634b78468cab0ccb52c86f128e064	.claude/skills/pr-conventions/scripts/lint.sh	software/application-software/argos/workspace-inherit/.claude/skills/pr-conventions/scripts/lint.sh
+100644 e67387116a753217d256d81901e5b4091b49b44c	.claude/skills/report-spike/SKILL.md	software/application-software/workspace-inherit/.claude/skills/report-spike/SKILL.md
+100644 7acb908af141defaa035f992b060d4d23c0b2a54	.claude/skills/run-local/SKILL.md	software/application-software/argos/workspace-inherit/.claude/skills/run-local/SKILL.md
+100755 f5986571d9b917264eb6cfe9c9d7f27448242ac9	.claude/skills/run-local/scripts/run-local.sh	software/application-software/argos/workspace-inherit/.claude/skills/run-local/scripts/run-local.sh
+100755 d8de89ce933cbc5302c59fab3176004bdd251d35	.claude/skills/run-local/scripts/serve.sh	software/application-software/argos/workspace-inherit/.claude/skills/run-local/scripts/serve.sh
+100644 fdc1ce85211200223040edfb5dc65a3de7f35d53	.claude/skills/setup-workspace/SKILL.md	software/workspace-inherit/.claude/skills/setup-workspace/SKILL.md
+100644 e0a8b424d11c4897901c0ce888a6c0c726daed98	.claude/skills/switch-workspace/SKILL.md	software/workspace-inherit/.claude/skills/switch-workspace/SKILL.md
+100644 b516657698fb909e0c72f8c9a6187fdaf4a38f71	.claude/skills/ticket-conventions/SKILL.md	software/application-software/argos/workspace-inherit/.claude/skills/ticket-conventions/SKILL.md
+100644 069b51714c0fd4d3d6ad972dd9f840e01f21cf15	.claude/skills/update-pr/SKILL.md	software/application-software/workspace-inherit/.claude/skills/update-pr/SKILL.md
+100644 ae99371d623deb83d2ac5b1227eb12eaff662092	.claude/skills/verify-graph/SKILL.md	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/SKILL.md
+100644 3fcb7344ce3499a7afbba08b8c2b6deacd3f101b	.claude/skills/verify-graph/scripts/check.js	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/check.js
+100755 c8710cdf2cea12ddae0a92c3e0ba141e06a234f3	.claude/skills/verify-graph/scripts/check.sh	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/check.sh
+100755 5a1b49bc55582ec03f5e0a58c015d1b28fd21af3	.claude/skills/verify-graph/scripts/open.sh	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/open.sh
+100644 404ac250d03f0c228b8206efef46bed6149bd314	.claude/skills/verify-graph/scripts/perf.js	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/perf.js
+100755 2218f42b8f020b7d83e9d960828800444e1260ad	.claude/skills/verify-graph/scripts/perf.sh	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/perf.sh
+100755 fdb2631a755b9999c2aa83c67729fbeb13d387a8	.claude/skills/verify-graph/scripts/seed.sh	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/seed.sh
+100755 d1237c42098d2a437770c24e2f60b7110d1e90b2	.claude/skills/verify-graph/scripts/select-run.sh	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/select-run.sh
+100644 006fff61ee4658a959c921e5fd70ecc57e2b07f2	.claude/skills/verify-telemetry/SKILL.md	software/application-software/argos/workspace-inherit/.claude/skills/verify-telemetry/SKILL.md
+100755 c9a9c0a7dd4386508e1f90d595d59b50df0aad35	.claude/skills/verify-telemetry/scripts/check-topic.sh	software/application-software/argos/workspace-inherit/.claude/skills/verify-telemetry/scripts/check-topic.sh
diff --git a/software/application-software/nero/skills/pr-conventions/SKILL.md b/software/application-software/nero/workspace-inherit/.claude/skills/pr-conventions/SKILL.md
similarity index 100%
rename from software/application-software/nero/skills/pr-conventions/SKILL.md
rename to software/application-software/nero/workspace-inherit/.claude/skills/pr-conventions/SKILL.md
diff --git a/software/application-software/nero/skills/ticket-conventions/SKILL.md b/software/application-software/nero/workspace-inherit/.claude/skills/ticket-conventions/SKILL.md
similarity index 100%
rename from software/application-software/nero/skills/ticket-conventions/SKILL.md
rename to software/application-software/nero/workspace-inherit/.claude/skills/ticket-conventions/SKILL.md
diff --git a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/create-ticket/SKILL.md b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/create-ticket/SKILL.md
index 9dd28e5..210a059 100644
--- a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/create-ticket/SKILL.md
+++ b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/create-ticket/SKILL.md
@@ -7,7 +7,7 @@ description: Draft and file a GitHub issue (idea, spike, epic, or dev work) on a
 
 These are the ticket conventions for every application-software repo. The repo's own `.github/ISSUE_TEMPLATE` holds only the fields (`gh api repos/<owner>/<repo>/contents/.github/ISSUE_TEMPLATE/<file> -q .content | base64 -d`); follow each field's description.
 
-First load the project's `ticket-conventions` skill (inherited from the project's `skills/`) for its repo, area labels, vocabulary, and diagrams. If none is enabled, ask which repo.
+First load the project's `ticket-conventions` skill (inherited from the project's `workspace-inherit/`) for its repo, area labels, vocabulary, and diagrams. If none is enabled, ask which repo.
 
 ## Workflow
 
diff --git a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/open-pr/SKILL.md b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/open-pr/SKILL.md
index 7363dd2..b1e7c71 100644
--- a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/open-pr/SKILL.md
+++ b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/open-pr/SKILL.md
@@ -3,7 +3,7 @@ name: open-pr
 description: Run pre-PR checks, push the branch, and open a draft pull request on an application-software repo (Argos, Nero)
 ---
 
-First load the project's `pr-conventions` skill (inherited from the project's `skills/`) for its base branch, commit format, checks, labels, and screenshots.
+First load the project's `pr-conventions` skill (inherited from the project's `workspace-inherit/`) for its base branch, commit format, checks, labels, and screenshots.
 
 1. **Check:** `bash scripts/pr-checks.sh <repo> <branch> origin/<base> '<commit format>'` (clean tree, commit subjects match the project's format, merges cleanly into the base), then the project's own checks. Stop and fix on any FAIL.
 2. **Media:** if the diff touches the UI, ask the user whether to add screenshots to the PR, listing any already in the project's screenshot folder for this branch so they can pick those instead of new ones; on no, skip this step. For new ones, use the project's UI QA to take Playwright screenshots of the changed views into its screenshot folder, or, when the change adds or changes an animation, record a short video instead (a browser context with `recordVideo: { dir }` saves a `.webm` when it closes). Images must be under 10 MB; video under 10 MB on a Free plan, 100 MB on a paid one.
diff --git a/software/application-software/nero/workspaces/nero-experimental/workspace.generated b/software/application-software/nero/workspaces/nero-experimental/workspace.generated
index bb14e1e..fc3645b 100644
--- a/software/application-software/nero/workspaces/nero-experimental/workspace.generated
+++ b/software/application-software/nero/workspaces/nero-experimental/workspace.generated
@@ -1,19 +1,19 @@
 # Generated by ci/render.sh; edit shared sources or opt out in workspace.yml.
 100644 61c35f28dda167e42bebc3bad3994af97c53e876	.claude/settings.json	ci/plugins.sh
-100644 30083fa3b2cf735ac5a75808478dd00476e75e9c	.claude/skills/address-pr-comments/SKILL.md	software/application-software/skills/address-pr-comments/SKILL.md
-100755 ce1efd97da4a6d2ea655932486660c5008f44dae	.claude/skills/address-pr-comments/scripts/fetch-feedback.sh	software/application-software/skills/address-pr-comments/scripts/fetch-feedback.sh
-100644 da0be202ebc0a9ffc4544dbdf4bbef54cca37520	.claude/skills/address-pr-comments/scripts/github.sh	software/application-software/skills/address-pr-comments/scripts/github.sh
-100644 4b5675711abfaef10089859f379a931206267355	.claude/skills/commit/SKILL.md	software/application-software/skills/commit/SKILL.md
-100644 4f85b66ab5c07ce4a00ba3d8555fc9272544046b	.claude/skills/consolidate-spikes/SKILL.md	software/application-software/skills/consolidate-spikes/SKILL.md
-100644 9dd28e531875c0acb7f8a88a07ad15645aecf38f	.claude/skills/create-ticket/SKILL.md	software/application-software/skills/create-ticket/SKILL.md
-100644 4917259f9e29db28e2636496e80f80ee5d9e321e	.claude/skills/journal/SKILL.md	software/skills/journal/SKILL.md
-100755 1e90d7b9afa14b8b0e7f36e0e1d83baecc94ba5b	.claude/skills/journal/scripts/capture.sh	software/skills/journal/scripts/capture.sh
-100644 0495fc97cbe93e4331c89263aee188f6c0e9c9ea	.claude/skills/new-worktree/SKILL.md	software/skills/new-worktree/SKILL.md
-100644 7363dd2304fbb29c464e8cac0fd270acdeeb8060	.claude/skills/open-pr/SKILL.md	software/application-software/skills/open-pr/SKILL.md
-100755 61f377fef63daa10c443129df6a49571fdbeb658	.claude/skills/open-pr/scripts/pr-checks.sh	software/application-software/skills/open-pr/scripts/pr-checks.sh
-100644 9e2bb1781bd6272ab64e9052bc7b8c13e97e7588	.claude/skills/pr-conventions/SKILL.md	software/application-software/nero/skills/pr-conventions/SKILL.md
-100644 e67387116a753217d256d81901e5b4091b49b44c	.claude/skills/report-spike/SKILL.md	software/application-software/skills/report-spike/SKILL.md
-100644 fdc1ce85211200223040edfb5dc65a3de7f35d53	.claude/skills/setup-workspace/SKILL.md	software/skills/setup-workspace/SKILL.md
-100644 e0a8b424d11c4897901c0ce888a6c0c726daed98	.claude/skills/switch-workspace/SKILL.md	software/skills/switch-workspace/SKILL.md
-100644 c837cd55b11831c601ffe7f4caad31d41ab3b604	.claude/skills/ticket-conventions/SKILL.md	software/application-software/nero/skills/ticket-conventions/SKILL.md
-100644 069b51714c0fd4d3d6ad972dd9f840e01f21cf15	.claude/skills/update-pr/SKILL.md	software/application-software/skills/update-pr/SKILL.md
+100644 30083fa3b2cf735ac5a75808478dd00476e75e9c	.claude/skills/address-pr-comments/SKILL.md	software/application-software/workspace-inherit/.claude/skills/address-pr-comments/SKILL.md
+100755 ce1efd97da4a6d2ea655932486660c5008f44dae	.claude/skills/address-pr-comments/scripts/fetch-feedback.sh	software/application-software/workspace-inherit/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh
+100644 da0be202ebc0a9ffc4544dbdf4bbef54cca37520	.claude/skills/address-pr-comments/scripts/github.sh	software/application-software/workspace-inherit/.claude/skills/address-pr-comments/scripts/github.sh
+100644 4b5675711abfaef10089859f379a931206267355	.claude/skills/commit/SKILL.md	software/application-software/workspace-inherit/.claude/skills/commit/SKILL.md
+100644 4f85b66ab5c07ce4a00ba3d8555fc9272544046b	.claude/skills/consolidate-spikes/SKILL.md	software/application-software/workspace-inherit/.claude/skills/consolidate-spikes/SKILL.md
+100644 210a059f1a4b753cab90aad19f26ead483a62295	.claude/skills/create-ticket/SKILL.md	software/application-software/workspace-inherit/.claude/skills/create-ticket/SKILL.md
+100644 4917259f9e29db28e2636496e80f80ee5d9e321e	.claude/skills/journal/SKILL.md	software/workspace-inherit/.claude/skills/journal/SKILL.md
+100755 1e90d7b9afa14b8b0e7f36e0e1d83baecc94ba5b	.claude/skills/journal/scripts/capture.sh	software/workspace-inherit/.claude/skills/journal/scripts/capture.sh
+100644 0495fc97cbe93e4331c89263aee188f6c0e9c9ea	.claude/skills/new-worktree/SKILL.md	software/workspace-inherit/.claude/skills/new-worktree/SKILL.md
+100644 b1e7c71c13b4ea7c40cabeb12aa1674a6b543dc5	.claude/skills/open-pr/SKILL.md	software/application-software/workspace-inherit/.claude/skills/open-pr/SKILL.md
+100755 61f377fef63daa10c443129df6a49571fdbeb658	.claude/skills/open-pr/scripts/pr-checks.sh	software/application-software/workspace-inherit/.claude/skills/open-pr/scripts/pr-checks.sh
+100644 9e2bb1781bd6272ab64e9052bc7b8c13e97e7588	.claude/skills/pr-conventions/SKILL.md	software/application-software/nero/workspace-inherit/.claude/skills/pr-conventions/SKILL.md
+100644 e67387116a753217d256d81901e5b4091b49b44c	.claude/skills/report-spike/SKILL.md	software/application-software/workspace-inherit/.claude/skills/report-spike/SKILL.md
+100644 fdc1ce85211200223040edfb5dc65a3de7f35d53	.claude/skills/setup-workspace/SKILL.md	software/workspace-inherit/.claude/skills/setup-workspace/SKILL.md
+100644 e0a8b424d11c4897901c0ce888a6c0c726daed98	.claude/skills/switch-workspace/SKILL.md	software/workspace-inherit/.claude/skills/switch-workspace/SKILL.md
+100644 c837cd55b11831c601ffe7f4caad31d41ab3b604	.claude/skills/ticket-conventions/SKILL.md	software/application-software/nero/workspace-inherit/.claude/skills/ticket-conventions/SKILL.md
+100644 069b51714c0fd4d3d6ad972dd9f840e01f21cf15	.claude/skills/update-pr/SKILL.md	software/application-software/workspace-inherit/.claude/skills/update-pr/SKILL.md
diff --git a/software/application-software/skills/address-pr-comments/SKILL.md b/software/application-software/workspace-inherit/.claude/skills/address-pr-comments/SKILL.md
similarity index 100%
rename from software/application-software/skills/address-pr-comments/SKILL.md
rename to software/application-software/workspace-inherit/.claude/skills/address-pr-comments/SKILL.md
diff --git a/software/application-software/skills/address-pr-comments/scripts/fetch-feedback.sh b/software/application-software/workspace-inherit/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh
similarity index 100%
rename from software/application-software/skills/address-pr-comments/scripts/fetch-feedback.sh
rename to software/application-software/workspace-inherit/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh
diff --git a/software/application-software/skills/address-pr-comments/scripts/github.sh b/software/application-software/workspace-inherit/.claude/skills/address-pr-comments/scripts/github.sh
similarity index 100%
rename from software/application-software/skills/address-pr-comments/scripts/github.sh
rename to software/application-software/workspace-inherit/.claude/skills/address-pr-comments/scripts/github.sh
diff --git a/software/application-software/skills/commit/SKILL.md b/software/application-software/workspace-inherit/.claude/skills/commit/SKILL.md
similarity index 100%
rename from software/application-software/skills/commit/SKILL.md
rename to software/application-software/workspace-inherit/.claude/skills/commit/SKILL.md
diff --git a/software/application-software/skills/consolidate-spikes/SKILL.md b/software/application-software/workspace-inherit/.claude/skills/consolidate-spikes/SKILL.md
similarity index 100%
rename from software/application-software/skills/consolidate-spikes/SKILL.md
rename to software/application-software/workspace-inherit/.claude/skills/consolidate-spikes/SKILL.md
diff --git a/software/application-software/skills/create-ticket/SKILL.md b/software/application-software/workspace-inherit/.claude/skills/create-ticket/SKILL.md
similarity index 97%
rename from software/application-software/skills/create-ticket/SKILL.md
rename to software/application-software/workspace-inherit/.claude/skills/create-ticket/SKILL.md
index 9dd28e5..210a059 100644
--- a/software/application-software/skills/create-ticket/SKILL.md
+++ b/software/application-software/workspace-inherit/.claude/skills/create-ticket/SKILL.md
@@ -7,7 +7,7 @@ description: Draft and file a GitHub issue (idea, spike, epic, or dev work) on a
 
 These are the ticket conventions for every application-software repo. The repo's own `.github/ISSUE_TEMPLATE` holds only the fields (`gh api repos/<owner>/<repo>/contents/.github/ISSUE_TEMPLATE/<file> -q .content | base64 -d`); follow each field's description.
 
-First load the project's `ticket-conventions` skill (inherited from the project's `skills/`) for its repo, area labels, vocabulary, and diagrams. If none is enabled, ask which repo.
+First load the project's `ticket-conventions` skill (inherited from the project's `workspace-inherit/`) for its repo, area labels, vocabulary, and diagrams. If none is enabled, ask which repo.
 
 ## Workflow
 
diff --git a/software/application-software/skills/open-pr/SKILL.md b/software/application-software/workspace-inherit/.claude/skills/open-pr/SKILL.md
similarity index 96%
rename from software/application-software/skills/open-pr/SKILL.md
rename to software/application-software/workspace-inherit/.claude/skills/open-pr/SKILL.md
index 7363dd2..b1e7c71 100644
--- a/software/application-software/skills/open-pr/SKILL.md
+++ b/software/application-software/workspace-inherit/.claude/skills/open-pr/SKILL.md
@@ -3,7 +3,7 @@ name: open-pr
 description: Run pre-PR checks, push the branch, and open a draft pull request on an application-software repo (Argos, Nero)
 ---
 
-First load the project's `pr-conventions` skill (inherited from the project's `skills/`) for its base branch, commit format, checks, labels, and screenshots.
+First load the project's `pr-conventions` skill (inherited from the project's `workspace-inherit/`) for its base branch, commit format, checks, labels, and screenshots.
 
 1. **Check:** `bash scripts/pr-checks.sh <repo> <branch> origin/<base> '<commit format>'` (clean tree, commit subjects match the project's format, merges cleanly into the base), then the project's own checks. Stop and fix on any FAIL.
 2. **Media:** if the diff touches the UI, ask the user whether to add screenshots to the PR, listing any already in the project's screenshot folder for this branch so they can pick those instead of new ones; on no, skip this step. For new ones, use the project's UI QA to take Playwright screenshots of the changed views into its screenshot folder, or, when the change adds or changes an animation, record a short video instead (a browser context with `recordVideo: { dir }` saves a `.webm` when it closes). Images must be under 10 MB; video under 10 MB on a Free plan, 100 MB on a paid one.
diff --git a/software/application-software/skills/open-pr/scripts/pr-checks.sh b/software/application-software/workspace-inherit/.claude/skills/open-pr/scripts/pr-checks.sh
similarity index 100%
rename from software/application-software/skills/open-pr/scripts/pr-checks.sh
rename to software/application-software/workspace-inherit/.claude/skills/open-pr/scripts/pr-checks.sh
diff --git a/software/application-software/skills/report-spike/SKILL.md b/software/application-software/workspace-inherit/.claude/skills/report-spike/SKILL.md
similarity index 100%
rename from software/application-software/skills/report-spike/SKILL.md
rename to software/application-software/workspace-inherit/.claude/skills/report-spike/SKILL.md
diff --git a/software/application-software/skills/update-pr/SKILL.md b/software/application-software/workspace-inherit/.claude/skills/update-pr/SKILL.md
similarity index 100%
rename from software/application-software/skills/update-pr/SKILL.md
rename to software/application-software/workspace-inherit/.claude/skills/update-pr/SKILL.md
diff --git a/software/application-software/workspaces/hub/.claude/skills/create-ticket/SKILL.md b/software/application-software/workspaces/hub/.claude/skills/create-ticket/SKILL.md
index 9dd28e5..210a059 100644
--- a/software/application-software/workspaces/hub/.claude/skills/create-ticket/SKILL.md
+++ b/software/application-software/workspaces/hub/.claude/skills/create-ticket/SKILL.md
@@ -7,7 +7,7 @@ description: Draft and file a GitHub issue (idea, spike, epic, or dev work) on a
 
 These are the ticket conventions for every application-software repo. The repo's own `.github/ISSUE_TEMPLATE` holds only the fields (`gh api repos/<owner>/<repo>/contents/.github/ISSUE_TEMPLATE/<file> -q .content | base64 -d`); follow each field's description.
 
-First load the project's `ticket-conventions` skill (inherited from the project's `skills/`) for its repo, area labels, vocabulary, and diagrams. If none is enabled, ask which repo.
+First load the project's `ticket-conventions` skill (inherited from the project's `workspace-inherit/`) for its repo, area labels, vocabulary, and diagrams. If none is enabled, ask which repo.
 
 ## Workflow
 
diff --git a/software/application-software/workspaces/hub/.claude/skills/open-pr/SKILL.md b/software/application-software/workspaces/hub/.claude/skills/open-pr/SKILL.md
index 7363dd2..b1e7c71 100644
--- a/software/application-software/workspaces/hub/.claude/skills/open-pr/SKILL.md
+++ b/software/application-software/workspaces/hub/.claude/skills/open-pr/SKILL.md
@@ -3,7 +3,7 @@ name: open-pr
 description: Run pre-PR checks, push the branch, and open a draft pull request on an application-software repo (Argos, Nero)
 ---
 
-First load the project's `pr-conventions` skill (inherited from the project's `skills/`) for its base branch, commit format, checks, labels, and screenshots.
+First load the project's `pr-conventions` skill (inherited from the project's `workspace-inherit/`) for its base branch, commit format, checks, labels, and screenshots.
 
 1. **Check:** `bash scripts/pr-checks.sh <repo> <branch> origin/<base> '<commit format>'` (clean tree, commit subjects match the project's format, merges cleanly into the base), then the project's own checks. Stop and fix on any FAIL.
 2. **Media:** if the diff touches the UI, ask the user whether to add screenshots to the PR, listing any already in the project's screenshot folder for this branch so they can pick those instead of new ones; on no, skip this step. For new ones, use the project's UI QA to take Playwright screenshots of the changed views into its screenshot folder, or, when the change adds or changes an animation, record a short video instead (a browser context with `recordVideo: { dir }` saves a `.webm` when it closes). Images must be under 10 MB; video under 10 MB on a Free plan, 100 MB on a paid one.
diff --git a/software/application-software/workspaces/hub/workspace.generated b/software/application-software/workspaces/hub/workspace.generated
index 3e07f6d..6b1cc9a 100644
--- a/software/application-software/workspaces/hub/workspace.generated
+++ b/software/application-software/workspaces/hub/workspace.generated
@@ -1,17 +1,17 @@
 # Generated by ci/render.sh; edit shared sources or opt out in workspace.yml.
 100644 61c35f28dda167e42bebc3bad3994af97c53e876	.claude/settings.json	ci/plugins.sh
-100644 30083fa3b2cf735ac5a75808478dd00476e75e9c	.claude/skills/address-pr-comments/SKILL.md	software/application-software/skills/address-pr-comments/SKILL.md
-100755 ce1efd97da4a6d2ea655932486660c5008f44dae	.claude/skills/address-pr-comments/scripts/fetch-feedback.sh	software/application-software/skills/address-pr-comments/scripts/fetch-feedback.sh
-100644 da0be202ebc0a9ffc4544dbdf4bbef54cca37520	.claude/skills/address-pr-comments/scripts/github.sh	software/application-software/skills/address-pr-comments/scripts/github.sh
-100644 4b5675711abfaef10089859f379a931206267355	.claude/skills/commit/SKILL.md	software/application-software/skills/commit/SKILL.md
-100644 4f85b66ab5c07ce4a00ba3d8555fc9272544046b	.claude/skills/consolidate-spikes/SKILL.md	software/application-software/skills/consolidate-spikes/SKILL.md
-100644 9dd28e531875c0acb7f8a88a07ad15645aecf38f	.claude/skills/create-ticket/SKILL.md	software/application-software/skills/create-ticket/SKILL.md
-100644 4917259f9e29db28e2636496e80f80ee5d9e321e	.claude/skills/journal/SKILL.md	software/skills/journal/SKILL.md
-100755 1e90d7b9afa14b8b0e7f36e0e1d83baecc94ba5b	.claude/skills/journal/scripts/capture.sh	software/skills/journal/scripts/capture.sh
-100644 0495fc97cbe93e4331c89263aee188f6c0e9c9ea	.claude/skills/new-worktree/SKILL.md	software/skills/new-worktree/SKILL.md
-100644 7363dd2304fbb29c464e8cac0fd270acdeeb8060	.claude/skills/open-pr/SKILL.md	software/application-software/skills/open-pr/SKILL.md
-100755 61f377fef63daa10c443129df6a49571fdbeb658	.claude/skills/open-pr/scripts/pr-checks.sh	software/application-software/skills/open-pr/scripts/pr-checks.sh
-100644 e67387116a753217d256d81901e5b4091b49b44c	.claude/skills/report-spike/SKILL.md	software/application-software/skills/report-spike/SKILL.md
-100644 fdc1ce85211200223040edfb5dc65a3de7f35d53	.claude/skills/setup-workspace/SKILL.md	software/skills/setup-workspace/SKILL.md
-100644 e0a8b424d11c4897901c0ce888a6c0c726daed98	.claude/skills/switch-workspace/SKILL.md	software/skills/switch-workspace/SKILL.md
-100644 069b51714c0fd4d3d6ad972dd9f840e01f21cf15	.claude/skills/update-pr/SKILL.md	software/application-software/skills/update-pr/SKILL.md
+100644 30083fa3b2cf735ac5a75808478dd00476e75e9c	.claude/skills/address-pr-comments/SKILL.md	software/application-software/workspace-inherit/.claude/skills/address-pr-comments/SKILL.md
+100755 ce1efd97da4a6d2ea655932486660c5008f44dae	.claude/skills/address-pr-comments/scripts/fetch-feedback.sh	software/application-software/workspace-inherit/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh
+100644 da0be202ebc0a9ffc4544dbdf4bbef54cca37520	.claude/skills/address-pr-comments/scripts/github.sh	software/application-software/workspace-inherit/.claude/skills/address-pr-comments/scripts/github.sh
+100644 4b5675711abfaef10089859f379a931206267355	.claude/skills/commit/SKILL.md	software/application-software/workspace-inherit/.claude/skills/commit/SKILL.md
+100644 4f85b66ab5c07ce4a00ba3d8555fc9272544046b	.claude/skills/consolidate-spikes/SKILL.md	software/application-software/workspace-inherit/.claude/skills/consolidate-spikes/SKILL.md
+100644 210a059f1a4b753cab90aad19f26ead483a62295	.claude/skills/create-ticket/SKILL.md	software/application-software/workspace-inherit/.claude/skills/create-ticket/SKILL.md
+100644 4917259f9e29db28e2636496e80f80ee5d9e321e	.claude/skills/journal/SKILL.md	software/workspace-inherit/.claude/skills/journal/SKILL.md
+100755 1e90d7b9afa14b8b0e7f36e0e1d83baecc94ba5b	.claude/skills/journal/scripts/capture.sh	software/workspace-inherit/.claude/skills/journal/scripts/capture.sh
+100644 0495fc97cbe93e4331c89263aee188f6c0e9c9ea	.claude/skills/new-worktree/SKILL.md	software/workspace-inherit/.claude/skills/new-worktree/SKILL.md
+100644 b1e7c71c13b4ea7c40cabeb12aa1674a6b543dc5	.claude/skills/open-pr/SKILL.md	software/application-software/workspace-inherit/.claude/skills/open-pr/SKILL.md
+100755 61f377fef63daa10c443129df6a49571fdbeb658	.claude/skills/open-pr/scripts/pr-checks.sh	software/application-software/workspace-inherit/.claude/skills/open-pr/scripts/pr-checks.sh
+100644 e67387116a753217d256d81901e5b4091b49b44c	.claude/skills/report-spike/SKILL.md	software/application-software/workspace-inherit/.claude/skills/report-spike/SKILL.md
+100644 fdc1ce85211200223040edfb5dc65a3de7f35d53	.claude/skills/setup-workspace/SKILL.md	software/workspace-inherit/.claude/skills/setup-workspace/SKILL.md
+100644 e0a8b424d11c4897901c0ce888a6c0c726daed98	.claude/skills/switch-workspace/SKILL.md	software/workspace-inherit/.claude/skills/switch-workspace/SKILL.md
+100644 069b51714c0fd4d3d6ad972dd9f840e01f21cf15	.claude/skills/update-pr/SKILL.md	software/application-software/workspace-inherit/.claude/skills/update-pr/SKILL.md
diff --git a/software/firmware/calypso/workspaces/calypso-dev/workspace.generated b/software/firmware/calypso/workspaces/calypso-dev/workspace.generated
index 3adc295..19bcf5b 100644
--- a/software/firmware/calypso/workspaces/calypso-dev/workspace.generated
+++ b/software/firmware/calypso/workspaces/calypso-dev/workspace.generated
@@ -1,7 +1,7 @@
 # Generated by ci/render.sh; edit shared sources or opt out in workspace.yml.
 100644 61c35f28dda167e42bebc3bad3994af97c53e876	.claude/settings.json	ci/plugins.sh
-100644 4917259f9e29db28e2636496e80f80ee5d9e321e	.claude/skills/journal/SKILL.md	software/skills/journal/SKILL.md
-100755 1e90d7b9afa14b8b0e7f36e0e1d83baecc94ba5b	.claude/skills/journal/scripts/capture.sh	software/skills/journal/scripts/capture.sh
-100644 0495fc97cbe93e4331c89263aee188f6c0e9c9ea	.claude/skills/new-worktree/SKILL.md	software/skills/new-worktree/SKILL.md
-100644 fdc1ce85211200223040edfb5dc65a3de7f35d53	.claude/skills/setup-workspace/SKILL.md	software/skills/setup-workspace/SKILL.md
-100644 e0a8b424d11c4897901c0ce888a6c0c726daed98	.claude/skills/switch-workspace/SKILL.md	software/skills/switch-workspace/SKILL.md
+100644 4917259f9e29db28e2636496e80f80ee5d9e321e	.claude/skills/journal/SKILL.md	software/workspace-inherit/.claude/skills/journal/SKILL.md
+100755 1e90d7b9afa14b8b0e7f36e0e1d83baecc94ba5b	.claude/skills/journal/scripts/capture.sh	software/workspace-inherit/.claude/skills/journal/scripts/capture.sh
+100644 0495fc97cbe93e4331c89263aee188f6c0e9c9ea	.claude/skills/new-worktree/SKILL.md	software/workspace-inherit/.claude/skills/new-worktree/SKILL.md
+100644 fdc1ce85211200223040edfb5dc65a3de7f35d53	.claude/skills/setup-workspace/SKILL.md	software/workspace-inherit/.claude/skills/setup-workspace/SKILL.md
+100644 e0a8b424d11c4897901c0ce888a6c0c726daed98	.claude/skills/switch-workspace/SKILL.md	software/workspace-inherit/.claude/skills/switch-workspace/SKILL.md
diff --git a/software/skills/journal/SKILL.md b/software/workspace-inherit/.claude/skills/journal/SKILL.md
similarity index 100%
rename from software/skills/journal/SKILL.md
rename to software/workspace-inherit/.claude/skills/journal/SKILL.md
diff --git a/software/skills/journal/scripts/capture.sh b/software/workspace-inherit/.claude/skills/journal/scripts/capture.sh
similarity index 100%
rename from software/skills/journal/scripts/capture.sh
rename to software/workspace-inherit/.claude/skills/journal/scripts/capture.sh
diff --git a/software/skills/new-worktree/SKILL.md b/software/workspace-inherit/.claude/skills/new-worktree/SKILL.md
similarity index 100%
rename from software/skills/new-worktree/SKILL.md
rename to software/workspace-inherit/.claude/skills/new-worktree/SKILL.md
diff --git a/software/skills/setup-workspace/SKILL.md b/software/workspace-inherit/.claude/skills/setup-workspace/SKILL.md
similarity index 100%
rename from software/skills/setup-workspace/SKILL.md
rename to software/workspace-inherit/.claude/skills/setup-workspace/SKILL.md
diff --git a/software/skills/switch-workspace/SKILL.md b/software/workspace-inherit/.claude/skills/switch-workspace/SKILL.md
similarity index 100%
rename from software/skills/switch-workspace/SKILL.md
rename to software/workspace-inherit/.claude/skills/switch-workspace/SKILL.md
diff --git a/tests/e2e.sh b/tests/e2e.sh
index 4577954..ca665b7 100644
--- a/tests/e2e.sh
+++ b/tests/e2e.sh
@@ -47,9 +47,9 @@ cp "$src/software/short-name" "$t/seed/software/" && cp "$src/software/applicati
 cp -R "$src/$A/." "$t/seed/$A/"
 cp -R "$src/templates/workspace/." "$t/seed/$B/"
 sed -i.bak "s|{{name}}|$BN|" "$t/seed/$B/workspace.yml" && rm "$t/seed/$B/workspace.yml.bak"
-FD=software/electrical/firmware/workspace-defaults/files # project defaults for new workspaces under electrical/firmware
+FD=software/electrical/firmware/workspace-defaults # project defaults for new workspaces under electrical/firmware
 mkdir -p "$t/seed/$FD/.claude/skills/fw"
-printf "format: claude-code\n" >"$t/seed/${FD%/files}/source.yml"
+printf "format: claude-code\n" >"$t/seed/$FD/source.yml"
 printf 'harness: claude-code\nrepos:\n  fw: https://example.com/fw.git\n' >"$t/seed/$FD/workspace.yml"
 printf '# Firmware for {{name}}\n' >"$t/seed/$FD/CLAUDE.md"
 echo "fw skill" >"$t/seed/$FD/.claude/skills/fw/SKILL.md"
@@ -186,8 +186,8 @@ on_main() { # <message> <command...>: a change on main, pushed
   local m=$1 && shift
   (cd "$t/dev" && git fetch -q && git checkout -q -B tmp-main origin/main && "$@" && bash ci/render.sh >/dev/null && git add -A && git commit -qm "$m" && git push -q origin HEAD:main)
 }
-TI=software/workspace-inherit/files/.claude/skills/top AI=software/application-software/workspace-inherit/files/notes
-on_main "inherit" sh -c "mkdir -p $TI $AI && echo 'top v1' >$TI/SKILL.md && echo 'app v1' >$AI/app.md && printf 'format: claude-code\\n' >software/workspace-inherit/source.yml && printf 'format: claude-code\\n' >software/application-software/workspace-inherit/source.yml"
+TI=software/workspace-inherit/.claude/skills/top AI=software/application-software/workspace-inherit/notes
+on_main "inherit" sh -c "mkdir -p $TI $AI && echo 'top v1' >$TI/SKILL.md && echo 'app v1' >$AI/app.md && printf 'format: claude-code\\n' >software/application-software/workspace-inherit/source.yml"
 sync >"$t/out" 2>&1 || fail "sync after adding workspace-inherit/ failed: $(cat "$t/out")"
 for n in "$AN" "$BN"; do o show "ws/$n:.claude/skills/top/SKILL.md" | grep -qx "top v1" || fail "ws/$n lacks software/workspace-inherit/"; done
 o show "ws/$AN:notes/app.md" | grep -qx "app v1" || fail "ws/$AN lacks application-software/workspace-inherit/"
@@ -222,12 +222,12 @@ o show "ws/$AN:notes/layout/guide.md" | grep -qx after || fail "refresh lost nes
 ok "native managed paths can change from files to directories without creating sparse-index entries"
 
 # Source retirement must preserve ownership claimed on a workspace branch before its proposal merges.
-on_main "unmerged ownership fixture" sh -c 'mkdir -p software/skills/unmerged; echo shared >software/skills/unmerged/SKILL.md'
+on_main "unmerged ownership fixture" sh -c 'mkdir -p software/workspace-inherit/.claude/skills/unmerged; echo shared >software/workspace-inherit/.claude/skills/unmerged/SKILL.md'
 sync refresh "$BN" >/dev/null
 commit_on "ws/$BN" workspace.yml "  - .claude/skills/unmerged"
 commit_on "ws/$BN" .claude/skills/unmerged/SKILL.md "workspace-owned unmerged"
 sync refresh "$BN" >/dev/null
-on_main "retire unmerged source" git rm -rq software/skills/unmerged
+on_main "retire unmerged source" git rm -rq software/workspace-inherit/.claude/skills/unmerged
 sync refresh "$BN" >"$t/out" 2>&1 || fail "retiring an unmerged opt-out conflicted: $(cat "$t/out")"
 (cd "$t/dev" && git fetch -q && git checkout -q -B retire-owned "origin/ws/$BN" &&
   sed -i.bak '\|^  - .claude/skills/unmerged$|d' workspace.yml && rm workspace.yml.bak &&
@@ -280,14 +280,14 @@ expect_bad unknown-harness "unknown harness 'unknown'" sed -i.bak 's/harness: co
 expect_bad codex-plugin "codex does not support Delphi plugin sets" sh -c "printf 'plugins:\n  - delphi\n' >>$CX/workspace.yml"
 expect_bad codex-no-instructions "AGENTS.md: required for codex" rm "$CX/AGENTS.md"
 expect_bad codex-wrong-native "CLAUDE.md: belongs to a different harness" touch "$CX/CLAUDE.md"
-expect_bad codex-inherited-wrong-native "has no mapping to codex" sh -c "mkdir -p software/workspace-inherit/files/.claude && printf 'format: claude-code\\n' >software/workspace-inherit/source.yml && echo x >software/workspace-inherit/files/.claude/extra.json"
-expect_bad neutral-collision "also inherits it from a folder above" sh -c "mkdir -p software/application-software/skills/journal && echo x >software/application-software/skills/journal/SKILL.md"
+expect_bad codex-inherited-wrong-native "has no mapping to codex" sh -c "mkdir -p software/workspace-inherit/.claude && printf 'format: claude-code\\n' >software/workspace-inherit/source.yml && echo x >software/workspace-inherit/.claude/extra.json"
+expect_bad inherited-collision "also inherits it from a folder above" sh -c "mkdir -p software/application-software/workspace-inherit/.claude/skills/journal && echo x >software/application-software/workspace-inherit/.claude/skills/journal/SKILL.md"
 expect_bad missing-native-output "$CX/.agents/skills/journal/SKILL.md: inherited from" rm "$CX/.agents/skills/journal/SKILL.md"
-expect_bad changed-shared-source "out of date; run ci/render.sh" sh -c "echo changed >>software/skills/journal/SKILL.md"
+expect_bad changed-shared-source "out of date; run ci/render.sh" sh -c "echo changed >>software/workspace-inherit/.claude/skills/journal/SKILL.md"
 expect_bad missing-ownership-record "$CX/workspace.generated: ownership record is out of date" rm "$CX/workspace.generated"
 expect_bad unknown-source-format "declare one supported source format" sh -c "echo 'format: unknown' >${A%/workspaces/*}/workspace-defaults/source.yml"
-expect_bad mixed-source-formats "AGENTS.md does not belong to the declared claude-code format" touch "${A%/workspaces/*}/workspace-defaults/files/AGENTS.md"
-expect_bad owned-output-collision "workspace-owned file collides" sh -c "mkdir -p software/skills/collision $CX/.agents/skills/collision && echo shared >software/skills/collision/SKILL.md && echo own >$CX/.agents/skills/collision/SKILL.md"
+expect_bad mixed-source-formats "AGENTS.md does not belong to the declared claude-code format" touch "${A%/workspaces/*}/workspace-defaults/AGENTS.md"
+expect_bad owned-output-collision "workspace-owned file collides" sh -c "mkdir -p software/workspace-inherit/.claude/skills/collision $CX/.agents/skills/collision && echo shared >software/workspace-inherit/.claude/skills/collision/SKILL.md && echo own >$CX/.agents/skills/collision/SKILL.md"
 
 d=$t/chk-owned-output-collision
 if "$src/ci/render.sh" "$d" >"$t/out" 2>"$t/err"; then fail "renderer overwrote an owned collision"; fi
@@ -302,7 +302,7 @@ expect_bad reference-repo-clash "duplicate repo: argos" sh -c "printf 'reference
 expect_bad bad-key "unexpected line" sh -c "printf 'color: x\n' >>$A/workspace.yml"
 expect_bad wrong-name "(.delphi/names.sh)" sh -c "sed -i.bak 's/^name:.*/name: other/' $A/workspace.yml && rm $A/workspace.yml.bak"
 expect_bad no-name "name is missing" sh -c "sed -i.bak '/^name:/d' $A/workspace.yml && rm $A/workspace.yml.bak"
-expect_bad defaults-name "workspace-defaults/files/workspace.yml: unexpected line: name:" sh -c "printf 'name: x\n' >>${A%/workspaces/*}/workspace-defaults/files/workspace.yml"
+expect_bad defaults-name "workspace-defaults/workspace.yml: unexpected line: name:" sh -c "printf 'name: x\n' >>${A%/workspaces/*}/workspace-defaults/workspace.yml"
 expect_bad park-path "bad park entry" sh -c "printf 'park:\n  - a/b\n' >>$A/workspace.yml"
 expect_bad park-git "bad park entry" sh -c "printf 'park:\n  - .git\n' >>$A/workspace.yml"
 expect_bad park-duplicate "duplicate park entry: pictures" sh -c "printf 'park:\n  - pictures\n  - pictures\n' >>$A/workspace.yml"
@@ -339,19 +339,19 @@ expect_bad migration-header "start it with" sh -c "echo 'echo hi' >.delphi/migra
 expect_bad history-rewritten "only add lines" sed -i.bak 's/linked/LINKED/' .delphi/versions
 expect_bad released-migration-changed "add a new version's migration instead" sh -c "echo '# x' >>.delphi/migrations/0.0.1-linked-worktrees-to-clones.sh"
 expect_bad workflow-drift "argos-dev/.github/workflows/delphi.yml: differs" sh -c "echo x >>$A/.github/workflows/delphi.yml"
-expect_bad defaults-manifest "workspace-defaults/files/workspace.yml: unexpected line" sh -c "printf 'x: y\n' >>${A%/workspaces/*}/workspace-defaults/files/workspace.yml"
+expect_bad defaults-manifest "workspace-defaults/workspace.yml: unexpected line" sh -c "printf 'x: y\n' >>${A%/workspaces/*}/workspace-defaults/workspace.yml"
 expect_bad defaults-named-workspace "workspace-defaults/.delphi: managed" sh -c "mkdir -p software/x/workspaces/workspace-defaults/.delphi && cp -R $A/. software/x/workspaces/workspace-defaults/"
 expect_bad old-defaults "defaults: renamed workspace-defaults/" mkdir -p "${A%/workspaces/*}/defaults"
-expect_bad inherited-file-kept "$A/.claude/skills/journal/SKILL.md: inherited from software/skills/journal/" sh -c "mkdir -p $A/.claude/skills/journal && echo x >$A/.claude/skills/journal/SKILL.md"
+expect_bad inherited-file-kept "$A/.claude/skills/journal/SKILL.md: inherited from software/workspace-inherit/.claude/skills/journal/" sh -c "mkdir -p $A/.claude/skills/journal && echo x >$A/.claude/skills/journal/SKILL.md"
 d=$t/chk-inherited-file-kept
-rm -r "$d/software/skills/journal"
+rm -r "$d/software/workspace-inherit/.claude/skills/journal"
 if "$src/ci/render.sh" "$d" >"$t/out" 2>"$t/err"; then fail "renderer deleted edited retired output"; fi
 grep -q 'retired managed file has local edits' "$t/err" || fail "retired edit not reported"
 [ "$(cat "$d/$A/.claude/skills/journal/SKILL.md")" = x ] || fail "retired edited output deleted"
 ok "main-side generation reports edited retired files and leaves their content intact"
 
-expect_bad inherited-twice "also inherits it from a folder above" sh -c "mkdir -p software/application-software/workspace-inherit/files/.claude/skills/journal && printf 'format: claude-code\\n' >software/application-software/workspace-inherit/source.yml && echo x >software/application-software/workspace-inherit/files/.claude/skills/journal/SKILL.md"
-expect_bad inherited-claude-md "software/workspace-inherit/files/CLAUDE.md: each workspace has its own" sh -c "mkdir -p software/workspace-inherit/files && printf 'format: claude-code\\n' >software/workspace-inherit/source.yml && echo x >software/workspace-inherit/files/CLAUDE.md"
+expect_bad inherited-twice "also inherits it from a folder above" sh -c "mkdir -p software/application-software/workspace-inherit/.claude/skills/journal && printf 'format: claude-code\\n' >software/application-software/workspace-inherit/source.yml && echo x >software/application-software/workspace-inherit/.claude/skills/journal/SKILL.md"
+expect_bad inherited-claude-md "software/workspace-inherit/CLAUDE.md: each workspace has its own" sh -c "mkdir -p software/workspace-inherit && printf 'format: claude-code\\n' >software/workspace-inherit/source.yml && echo x >software/workspace-inherit/CLAUDE.md"
 expect_bad inherit-in-workspace "belongs in an org or project folder" sh -c "mkdir -p $A/workspace-inherit && echo x >$A/workspace-inherit/f"
 expect_bad bad-opt-out "bad opt-out entry" sh -c "printf 'opt-out:\n  - ../x\n' >>$A/workspace.yml"
 expect_bad opt-out-nothing "opt-out: nope is nothing it inherits" sh -c "printf 'opt-out:\n  - nope\n' >>$A/workspace.yml"
@@ -574,7 +574,7 @@ ok "new-worktree.sh makes new branches from the default or <base>, checks out ex
   fail "paths.sh layout"
 [ "$(cd "$t" && eval "$(bash "$w/.delphi/paths.sh")" && echo "$(printenv DELPHI_ROOT) $(printenv DELPHI_WORKSPACES)")" = "$w $w/workspaces" ] ||
   fail "paths.sh's export line doesn't reach child processes"
-cap=$src/software/skills/journal/scripts/capture.sh
+cap=$src/software/workspace-inherit/.claude/skills/journal/scripts/capture.sh
 { e=$(cd "$t" && DELPHI_ROOT=$w bash "$cap" -c ideas "a note") && [ "${e#"$w/.journal/ideas/"}" != "$e" ] && grep -q "a note" "$e"; } ||
   fail "capture.sh from \$DELPHI_ROOT: $e"
 ! (unset DELPHI_ROOT && bash "$cap" "a note") >/dev/null 2>&1 || fail "capture.sh ran without DELPHI_ROOT"
@@ -815,7 +815,9 @@ cat >"$t/native-metadata.md" <<'SKILL'
 ---
 name: native-metadata
 description: "Preserve: existing tool permissions and invocation settings."
-allowed-tools: Bash(git:*), Bash(bash ${CLAUDE_SKILL_DIR}/scripts/helper.sh *)
+allowed-tools:
+  - Bash(git:*)
+  - Bash(bash ${CLAUDE_SKILL_DIR}/scripts/helper.sh *)
 user-invocable: false
 disable-model-invocation: true
 metadata:
@@ -825,17 +827,17 @@ Read CLAUDE.md before making changes.
 SKILL
 C=software/application-software/argos/workspaces/sandbox-codex CN=s.app.argos.sandbox-codex
 # shellcheck disable=SC2016 # child shell expands its positional arguments
-on_main "add Codex and neutral skills" bash -c '
-  mkdir -p "$1" software/skills/portable/scripts software/skills/native-metadata software/skills/switch-workspace
+on_main "add Codex and inherited Claude skills" bash -c '
+  mkdir -p "$1" software/workspace-inherit/.claude/skills/portable/scripts software/workspace-inherit/.claude/skills/native-metadata software/workspace-inherit/.claude/skills/switch-workspace
   cp "$2/templates/harnesses/codex/AGENTS.md" "$1/AGENTS.md"
   cp "$2/templates/workspace/.gitattributes" "$1/.gitattributes"
   mkdir -p "$1/.github/workflows"
   cp .github/workflows/delphi.yml "$1/.github/workflows/delphi.yml"
   printf "name: %s\nharness: codex\n" "$3" >"$1/workspace.yml"
-  printf "portable v1\n" >software/skills/portable/SKILL.md
-  printf "helper v1\n" >software/skills/portable/scripts/helper.sh
-  cp "$4" software/skills/native-metadata/SKILL.md
-  cp "$2/software/skills/switch-workspace/SKILL.md" software/skills/switch-workspace/SKILL.md
+  printf "portable v1\n" >software/workspace-inherit/.claude/skills/portable/SKILL.md
+  printf "helper v1\n" >software/workspace-inherit/.claude/skills/portable/scripts/helper.sh
+  cp "$4" software/workspace-inherit/.claude/skills/native-metadata/SKILL.md
+  cp "$2/software/workspace-inherit/.claude/skills/switch-workspace/SKILL.md" software/workspace-inherit/.claude/skills/switch-workspace/SKILL.md
 ' _ "$C" "$src" "$CN" "$t/native-metadata.md"
 sync "$CN" >"$t/out" 2>&1 || fail "Codex creation: $(cat "$t/out")"
 for skill in top portable; do
@@ -843,18 +845,27 @@ for skill in top portable; do
 done
 ! o cat-file -e "ws/$CN:.claude" 2>/dev/null || fail "Codex inherited Claude files"
 [ "$(o rev-parse "ws/$CN^")" = "$(o rev-parse main)" ] || fail "Codex creation parent"
-ok "main-side rendering maps portable and declared Claude-source skills to Codex native paths"
+ok "main-side rendering translates existing inherited Claude skills to Codex native paths"
 o diff --quiet "main:$C" "ws/$CN" -- ':!.delphi' || fail "Codex branch requires native generation after main"
 ok "Codex files on main exactly match the workspace branch before runtime injection"
 
 sync refresh "$AN" >/dev/null
 cmp -s "$t/native-metadata.md" <(o show "main:$A/.claude/skills/native-metadata/SKILL.md") || fail "main changed Claude metadata or instructions"
 cmp -s "$t/native-metadata.md" <(o show "ws/$AN:.claude/skills/native-metadata/SKILL.md") || fail "refresh changed Claude metadata"
+cmp -s "$t/native-metadata.md" <(o show "main:software/workspace-inherit/.claude/skills/native-metadata/SKILL.md") || fail "translation changed the inherited Claude source"
 ok "Claude source metadata, allowed-tools and invocation flags survive main rendering and refresh byte for byte"
-sed 's/CLAUDE[.]md/AGENTS.md/g' "$t/native-metadata.md" >"$t/codex-metadata.md"
-cmp -s "$t/codex-metadata.md" <(o show "main:$C/.agents/skills/native-metadata/SKILL.md") || fail "Codex discarded native metadata or kept the wrong instruction reference"
-ok "Codex output preserves metadata while adapting its own instruction-file reference"
-cmp -s "$src/software/skills/switch-workspace/SKILL.md" <(o show "main:$A/.claude/skills/switch-workspace/SKILL.md") || fail "Claude switching instructions changed"
+cat >"$t/codex-metadata.md" <<'SKILL'
+---
+name: native-metadata
+description: "Preserve: existing tool permissions and invocation settings."
+metadata:
+  custom-setting: unchanged
+---
+Read AGENTS.md before making changes.
+SKILL
+cmp -s "$t/codex-metadata.md" <(o show "main:$C/.agents/skills/native-metadata/SKILL.md") || fail "Codex translation changed portable metadata or retained Claude-only fields"
+ok "Codex translation omits Claude-only fields and block values while preserving portable metadata"
+cmp -s "$src/software/workspace-inherit/.claude/skills/switch-workspace/SKILL.md" <(o show "main:$A/.claude/skills/switch-workspace/SKILL.md") || fail "Claude switching instructions changed"
 o show "main:$A/.claude/skills/switch-workspace/SKILL.md" | grep -q 'No restart needed' || fail "Claude lost its hot reload workflow"
 o show "main:$C/.agents/skills/switch-workspace/SKILL.md" | grep -q 'Start a fresh Codex session' || fail "Codex lacks native restart guidance"
 ! o show "main:$C/.agents/skills/switch-workspace/SKILL.md" | grep -q 'No restart needed' || fail "Claude reload behavior leaked into Codex"
@@ -868,20 +879,16 @@ o show "propose/$CN:$C/AGENTS.md" | grep -qx "workspace-owned instructions" || f
 sync refresh "$CN" >/dev/null
 [ "$(o show "ws/$CN:.agents/skills/portable/SKILL.md")" = "portable v1" ] || fail "Codex inherited edit not reset"
 ok "Codex proposals preserve native instructions and retain reviewed native skills; refresh resets inherited edits"
-on_main "move legacy skill source, remove helper" bash -c '
-  mkdir -p software/skills
-  git mv software/workspace-inherit/files/.claude/skills/top software/skills/top
-  git rm -q software/skills/portable/scripts/helper.sh
-'
+on_main "remove shared helper" git rm -q software/workspace-inherit/.claude/skills/portable/scripts/helper.sh
 mkdir "$t/adapters"
 for script in harnesses sources inherit render; do mv "$t/ci/ci/$script.sh" "$t/adapters/"; done
-sync refresh "$CN" >"$t/out" 2>&1 || fail "source migration: $(cat "$t/out")"
+sync refresh "$CN" >"$t/out" 2>&1 || fail "shared source update: $(cat "$t/out")"
 for script in harnesses sources inherit render; do mv "$t/adapters/$script.sh" "$t/ci/ci/"; done
 ok "refresh delivers changed native files without loading source readers or harness adapters"
 
 ! o cat-file -e "ws/$CN:.agents/skills/portable/scripts/helper.sh" 2>/dev/null || fail "stale inherited helper survived"
-o show "ws/$CN:.agents/skills/top/SKILL.md" | grep -qx "top v3" || fail "legacy source move lost skill"
-ok "neutral source migration keeps native paths stable and removes obsolete inherited files"
+o show "ws/$CN:.agents/skills/top/SKILL.md" | grep -qx "top v3" || fail "shared source update lost skill"
+ok "shared source updates keep native paths stable and remove obsolete inherited files"
 # shellcheck disable=SC2016 # child shell expands its positional arguments
 on_main "switch Codex workspace to Claude" bash -c '
   git mv "$1/AGENTS.md" "$1/CLAUDE.md"
@@ -931,7 +938,7 @@ sync refresh "$CN" >/dev/null
 # A formerly opted-out skill is workspace-owned even after its shared source and opt-out are removed.
 # shellcheck disable=SC2016 # child expands its arguments
 on_main "retire shared skill without deleting owned copy" bash -c '
-  git rm -rq software/skills/portable
+  git rm -rq software/workspace-inherit/.claude/skills/portable
   printf "name: %s\nharness: codex\n" "$2" >"$1/workspace.yml"
 ' _ "$C" "$CN"
 sync "$CN" >"$t/out" 2>&1 || fail "retire owned skill source: $(cat "$t/out")"
@@ -956,7 +963,7 @@ printf '#!/usr/bin/env bash\nexit 1\n' >"$t/proxy-bin/gh"
 printf '#!/usr/bin/env bash\nprintf "proxy-response"\n' >"$t/proxy-bin/curl"
 printf '#!/usr/bin/env bash\nexit 0\n' >"$t/proxy-bin/jq"
 chmod +x "$t/proxy-bin/"*
-provider=$src/software/application-software/skills/address-pr-comments/scripts/github.sh
+provider=$src/software/application-software/workspace-inherit/.claude/skills/address-pr-comments/scripts/github.sh
 # shellcheck disable=SC2016 # isolated shell sources helper and expands its variables
 proxy=$(PATH="$t/proxy-bin:$PATH" DELPHI_GITHUB_REST_PROXY=1 CLAUDE_CODE_REMOTE='' bash -c '
   source "$1"; gh_init test "$2"; [ "$MODE" = rest ]; get repos/example/example
@@ -989,14 +996,14 @@ F=software/electrical/firmware/workspaces/fw-project-codex
 created=new-workspace/electrical/firmware/fw-project-codex
 o show "$created:$F/workspace.yml" | grep -qx 'harness: codex' || fail "project suggestion ignored"
 o show "$created:$F/AGENTS.md" | grep -qx '# Firmware for s.electrical.firmware.fw-project-codex' || fail "translated defaults lost"
-o show "main:${FD%/files}/source.yml" | grep -qx 'format: claude-code' || fail "creation suggestion changed source format"
+o show "main:$FD/source.yml" | grep -qx 'format: claude-code' || fail "creation suggestion changed source format"
 o show "main:$A/workspace.yml" | grep -qx 'harness: claude-code' || fail "existing workspace harness changed"
 ok "creation suggestions stay independent of source format and existing workspace harnesses"
 
 # A different source format feeds the same target adapters and unchanged branch model.
 # shellcheck disable=SC2016 # child shell migrates the source bundle
 on_main "author defaults in Codex format" bash -c '
-  printf "format: codex\n" >"${1%/files}/source.yml"
+  printf "format: codex\n" >"$1/source.yml"
   git mv "$1/CLAUDE.md" "$1/AGENTS.md"
   mkdir -p "$1/.agents/skills"
   git mv "$1/.claude/skills/fw" "$1/.agents/skills/fw"
diff --git a/tools/new-workspace.sh b/tools/new-workspace.sh
index 7e2aac4..9f7cb9d 100755
--- a/tools/new-workspace.sh
+++ b/tools/new-workspace.sh
@@ -33,7 +33,7 @@ defaults=$wt/software/$org/workspace-defaults
 mkdir -p "$wt/$folder"
 # shellcheck source=ci/inherit.sh
 source "$wt/ci/inherit.sh"
-[ -n "$adapter" ] || adapter=$(awk '/^harness:/ { print $2; exit }' "$defaults/files/workspace.yml" 2>/dev/null || true)
+[ -n "$adapter" ] || adapter=$(awk '/^harness:/ { print $2; exit }' "$defaults/workspace.yml" 2>/dev/null || true)
 harness "${adapter:-claude-code}" || die "unsupported harness"
 adapter=${adapter:-claude-code}
 cp -R "$wt/templates/workspace/." "$wt/$folder/"

From e15034da0fef165f6b39edc2df19e3ed4ab996c6 Mon Sep 17 00:00:00 2001
From: Jesus God <wyattbracy@gmail.com>
Date: Fri, 23 Oct 2026 19:44:36 +0000
Subject: [PATCH 07/18] Simplify harness adapters and protect workspace-owned
 files

---
 README.md                                     |  51 +++-----
 ci/check.sh                                   |  15 +--
 ci/harnesses.sh                               |   6 +-
 ci/inherit.sh                                 |  13 +-
 ci/render.sh                                  |  14 +-
 ci/sources.sh                                 |  48 +++----
 ci/sync.sh                                    |  24 +++-
 docs/design.md                                | 122 ++++++++----------
 .../application-software/argos/AUTHORING.md   |  20 +--
 software/application-software/argos/README.md |   3 +-
 tests/e2e.sh                                  |  84 ++++++++++++
 tools/new-workspace.sh                        |   4 +-
 12 files changed, 224 insertions(+), 180 deletions(-)

diff --git a/README.md b/README.md
index acf2ad9..7603ce5 100644
--- a/README.md
+++ b/README.md
@@ -100,17 +100,10 @@ cd delphi
 bash .delphi/setup.sh
 ```
 
-Open the checked-out workspace in Codex normally; it discovers `AGENTS.md` and `.agents/skills/`
-from the workspace branch. Follow `AGENTS.md` and use `.delphi/exec.sh` for helper commands; it sets the layout for every command
-and its child processes, even when shell exports do not persist. Start a fresh session after a
-workspace switch. Host dependencies and credentials are configured by the user or host; the
-workspace doesn't depend on a particular cloud environment. Codex does not enable Delphi's Claude
-plugin sets or install MCP servers. Use tools already available in the selected host.
-
-`harness:` is validated against `ci/harnesses.sh`. Authoring selects its native instruction template
-and skill destination while preserving translated project defaults. Shared source format and
-workspace harness selection are independent. See `docs/design.md` for adding
-another adapter.
+Open the workspace in Codex and follow `AGENTS.md`. It discovers native skills under `.agents/skills/`.
+Use `.delphi/exec.sh` for helper commands so each shell receives the workspace layout. Start a fresh
+session after switching workspaces. The host supplies dependencies, credentials and integrations;
+Codex workspaces do not enable Delphi's Claude plugin sets.
 
 ## Versions
 
@@ -131,28 +124,20 @@ Once it merges, CI creates `ws/<name>` (its dotted name).
 can hold shared context (`README.md`), a guide to its workspaces (`AUTHORING.md`), and
 `workspace-defaults/` (what a new workspace there starts with).
 
-**Source bundles.** Keep the existing `workspace-defaults/` and `workspace-inherit/` layouts.
-They are Claude-authored by default; optional `source.yml` declares another source `format:`.
-Defaults seed workspace-owned files once; inheritance stays managed. Every workspace independently
-declares `harness:` in its own manifest. Unsupported native settings conversions fail explicitly.
-
-**Shared skills.** Keep Claude sources under `workspace-inherit/.claude/skills/<name>/` at an org
-or project folder, including their tool permissions and invocation metadata. The main-side renderer
-preserves Claude output and translates Codex output to `.agents/skills/`, omitting Claude-only
-skill fields only from the Codex copies.
-
-**Render before merging.** After changing shared sources, harness selections, opt-outs or plugin
-configuration, run `bash ci/render.sh` on a main-based branch and include its native output in the
-PR. `bash ci/render.sh --check` checks freshness without writing; `ci/check.sh` includes it.
-Workspaces on main already contain their native instructions, skills and supported settings.
-Branch refresh copies those reviewed files without running adapters. Workspace configuration
-edits are rendered in the proposal to main and arrive back after merge.
-
-**Ownership.** Edit shared sources on main. `workspace.generated` records managed copies and
-origins; don't edit it or those copies directly. To keep a workspace's own copy, list its native
-path under `opt-out:` in `workspace.yml`, then render on main or use the normal workspace proposal
-flow. Workspace-owned files stay editable and proposable. A workspace can read shared sources by
-listing `main` under `workspaces:`.
+**Shared sources.** Keep Claude skills and their metadata in
+`workspace-inherit/.claude/skills/<name>/`. The optional `source.yml` selects a different authoring
+format; each workspace's `harness:` independently selects its target. `workspace-defaults/` seeds
+workspace-owned files once; `workspace-inherit/` stays managed.
+
+**Prepare on main.** After changing shared sources, harness selections, opt-outs or plugins, run
+`bash ci/render.sh` and include its native output in the PR. `ci/check.sh` includes the read-only
+freshness check. Workspace branches receive those reviewed files through refresh. Workspace edits
+are rendered in the proposal to main and return after merge.
+
+**Ownership.** `workspace.generated` records managed copies; edit their sources instead. To keep
+an editable workspace copy, list its native path under `opt-out:` and render or use the normal
+workspace proposal. Collisions with workspace-owned files are reported. See `docs/design.md` for
+the adapter contract and ownership rules.
 
 ## CI (`.github/workflows/delphi.yml`)
 
diff --git a/ci/check.sh b/ci/check.sh
index 9ffa66e..592bb79 100755
--- a/ci/check.sh
+++ b/ci/check.sh
@@ -132,14 +132,9 @@ manifest() { # <workspace.yml> [<name>]: without <name> (a workspace-defaults/ m
     fi
     if [ -n "${2:-}" ]; then
       [ -f "${1%/*}/$instruction" ] || bad "${1%/*}/$instruction: required for $adapter"
-      case "$adapter" in
-        codex) for incompatible in CLAUDE.md .claude; do
-          [ ! -e "${1%/*}/$incompatible" ] || bad "${1%/*}/$incompatible: belongs to a different harness"
-        done ;;
-        claude-code) for incompatible in AGENTS.md .agents .codex; do
-          [ ! -e "${1%/*}/$incompatible" ] || bad "${1%/*}/$incompatible: belongs to a different harness"
-        done ;;
-      esac
+      for incompatible in $foreign; do
+        [ ! -e "${1%/*}/$incompatible" ] || bad "${1%/*}/$incompatible: belongs to a different harness"
+      done
     fi
   fi
   while IFS= read -r v; do listed="$listed $1|$v"; done < <(awk '/^workspaces:/ { s = 1; next } /^[^[:space:]#]/ { s = 0 }
@@ -154,8 +149,8 @@ while IFS= read -r d; do
 done < <(find software -type d -name workspace-inherit 2>/dev/null | sort)
 while IFS= read -r d; do
   case "$d" in */workspaces/*) continue ;; esac
-  if format=$(source_format "" "$d" 2>/dev/null); then
-    if ! messages=$(bundle_files "" "$d" "$format" 2>&1 >/dev/null); then bad "$messages"; fi
+  if format=$(source_format "$d" 2>/dev/null); then
+    if ! messages=$(bundle_files "$d" "$format" 2>&1 >/dev/null); then bad "$messages"; fi
   else bad "$d/source.yml: declare one supported source format"; fi
 done < <(find software -type d \( -name workspace-defaults -o -name workspace-inherit \) 2>/dev/null | sort)
 while IFS= read -r d; do
diff --git a/ci/harnesses.sh b/ci/harnesses.sh
index 7efe325..e2f7daf 100644
--- a/ci/harnesses.sh
+++ b/ci/harnesses.sh
@@ -2,10 +2,10 @@
 # Target harness registry for main-side authoring and validation. Branch refresh never loads it.
 set -euo pipefail
 # shellcheck disable=SC2034 # native paths are consumed by callers sourcing the registry
-harness() { # <name>: sets instruction, skills and plugins capability; rejects unknown adapters
+harness() { # <name>: native paths, template, plugin capability and foreign-file exclusions
   case "$1" in
-    claude-code) instruction=CLAUDE.md; instruction_template=templates/workspace/CLAUDE.md; skills=.claude/skills; plugins=claude ;;
-    codex) instruction=AGENTS.md; instruction_template=templates/harnesses/codex/AGENTS.md; skills=.agents/skills; plugins=none ;;
+    claude-code) instruction=CLAUDE.md; instruction_template=templates/workspace/CLAUDE.md; skills=.claude/skills; plugins=claude; foreign="AGENTS.md .agents .codex" ;;
+    codex) instruction=AGENTS.md; instruction_template=templates/harnesses/codex/AGENTS.md; skills=.agents/skills; plugins=none; foreign="CLAUDE.md .claude" ;;
     *) echo "harness: unknown harness '$1'" >&2; return 1 ;;
   esac
 }
diff --git a/ci/inherit.sh b/ci/inherit.sh
index d11582d..beb8d0c 100644
--- a/ci/inherit.sh
+++ b/ci/inherit.sh
@@ -1,20 +1,17 @@
 #!/usr/bin/env bash
 # Main-side inheritance resolver. Source format and target harness are independent inputs.
 set -euo pipefail
-# shellcheck source=ci/harnesses.sh
-source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/harnesses.sh"
 # shellcheck source=ci/sources.sh
 source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/sources.sh"
 inherit_levels() {
   echo "${1%/workspaces/*}" | awk -F/ '{ p = $1; print p; for (i = 2; i <= NF; i++) { p = p "/" $i; print p } }'
 }
-inherited_files() { # <revision or '' for disk> <workspace folder> <harness>: mode blob<TAB>destination<TAB>source
+inherited_files() { # <workspace folder> <harness>: mode blob<TAB>destination<TAB>source
   local level
-  harness "$3" || return 1
-  for level in $(inherit_levels "$2"); do
-    if { [ -n "$1" ] && git cat-file -e "$1:$level/workspace-inherit" 2>/dev/null; } ||
-      { [ -z "$1" ] && [ -d "$level/workspace-inherit" ]; }; then
-      bundle_files "$1" "$level/workspace-inherit" "$3" || return 1
+  harness "$2" || return 1
+  for level in $(inherit_levels "$1"); do
+    if [ -d "$level/workspace-inherit" ]; then
+      bundle_files "$level/workspace-inherit" "$2" || return 1
     fi
   done
 }
diff --git a/ci/render.sh b/ci/render.sh
index d2029b0..b421be2 100755
--- a/ci/render.sh
+++ b/ci/render.sh
@@ -28,9 +28,10 @@ render_workspace() { # <workspace folder>
     bad "$folder/workspace.yml: $adapter does not support Delphi plugin sets"; return
   fi
   out=$(optouts <"$folder/workspace.yml")
-  records=$(inherited_files "" "$folder" "$adapter") || { bad "$folder: cannot resolve inherited sources"; return; }
+  records=$(inherited_files "$folder" "$adapter") || { bad "$folder: cannot resolve inherited sources"; return; }
   old=""
   [ ! -f "$folder/$generated" ] || old=$(generated_records <"$folder/$generated") || { bad "$folder/$generated: invalid ownership record"; return; }
+  rm -rf "$tmp/native"
   : >"$tmp/records"
   while IFS=$'\t' read -r meta path src; do
     [ -n "$path" ] || continue
@@ -46,16 +47,15 @@ render_workspace() { # <workspace folder>
       if opted_out "$path" "$o"; then used="$used $o"; fi
     done
     opted_out "$path" "$out" && continue
-    if [ "$adapter" = codex ] && [ "${src##*/}" = SKILL.md ]; then
-      harness_file "$adapter" "$src" >"$tmp/native"
-      meta="${meta%% *} $(git hash-object -- "$tmp/native")"
-    fi
+    mkdir -p "$(dirname "$tmp/native/$path")"
+    harness_file "$adapter" "$src" >"$tmp/native/$path"
+    meta="${meta%% *} $(git hash-object -- "$tmp/native/$path")"
     printf '%s\t%s\t%s\n' "$meta" "$path" "$src" >>"$tmp/records"
   done <<<"$records"
   for o in $out; do
     case " $used " in *" $o "*) ;; *) bad "$folder/workspace.yml: opt-out: $o is nothing it inherits" ;; esac
   done
-  if [ "$adapter" = claude-code ] && [ -f "$folder/.claude/settings.json" ]; then
+  if [ "$plugins" = claude ] && [ -f "$folder/.claude/settings.json" ]; then
     printf '100644 %s\t.claude/settings.json\tci/plugins.sh\n' "$(git hash-object -- "$folder/.claude/settings.json")" >>"$tmp/records"
   fi
   LC_ALL=C sort -t $'\t' -k2,2 "$tmp/records" >"$tmp/sorted"
@@ -109,7 +109,7 @@ render_workspace() { # <workspace folder>
     [ -n "$path" ] || continue
     [ "$src" != ci/plugins.sh ] || continue
     mkdir -p "$(dirname "$folder/$path")"
-    harness_file "$adapter" "$src" >"$folder/$path"
+    cp "$tmp/native/$path" "$folder/$path"
     if [ "${meta%% *}" = 100755 ]; then chmod +x "$folder/$path"; else chmod -x "$folder/$path"; fi
   done <"$tmp/sorted"
   cp "$tmp/ledger" "$folder/$generated"
diff --git a/ci/sources.sh b/ci/sources.sh
index 9cb7da7..7f32ba3 100644
--- a/ci/sources.sh
+++ b/ci/sources.sh
@@ -4,41 +4,34 @@ set -euo pipefail
 # shellcheck source=ci/harnesses.sh
 source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/harnesses.sh"
 
-source_format() { # <revision or '' for disk> <bundle>: legacy bundles are Claude-authored
+source_format() { # <bundle>: legacy bundles are Claude-authored
   local config format
-  if [ -n "$1" ]; then
-    if ! git cat-file -e "$1:$2/source.yml" 2>/dev/null; then echo claude-code; return; fi
-    config=$(git show "$1:$2/source.yml")
-  else
-    if [ ! -e "$2/source.yml" ]; then echo claude-code; return; fi
-    config=$(cat "$2/source.yml")
-  fi
+  if [ ! -e "$1/source.yml" ]; then echo claude-code; return; fi
+  config=$(cat "$1/source.yml")
   format=$(printf '%s\n' "$config" | awk '
     /^[[:space:]]*#/ || /^[[:space:]]*$/ { next }
     /^format:[[:space:]]+(claude-code|codex)[[:space:]]*(#.*)?$/ { if (!n++) value = $2; next }
     { invalid = 1 }
     END { if (n == 1 && !invalid) print value }')
-  [ -n "$format" ] || { echo "source: $2/source.yml: declare one supported format (claude-code or codex)" >&2; return 1; }
+  [ -n "$format" ] || { echo "source: $1/source.yml: declare one supported format (claude-code or codex)" >&2; return 1; }
   printf '%s\n' "$format"
 }
 
 source_path() { # <format> <target harness> <source path>: native destination; no semantic guesses
-  local from_instruction from_skills
-  case "$1" in
-    claude-code) from_instruction=CLAUDE.md; from_skills=.claude/skills ;;
-    codex) from_instruction=AGENTS.md; from_skills=.agents/skills ;;
-    *) echo "source: unknown format '$1'" >&2; return 1 ;;
-  esac
+  local from_instruction from_skills incompatible
+  harness "$1" || return 1
+  from_instruction=$instruction; from_skills=$skills
   case "$3" in '' | /* | *[!A-Za-z0-9._/-]* | */ | *//* )
     echo "source: unsafe path '$3'" >&2; return 1 ;;
   esac
   case "/$3/" in */../* | */./* | */.git/*)
     echo "source: unsafe path '$3'" >&2; return 1 ;;
   esac
-  case "$1:$3" in
-    claude-code:AGENTS.md | claude-code:.agents/* | claude-code:.codex/* | codex:CLAUDE.md | codex:.claude/*)
+  for incompatible in $foreign; do
+    case "$3" in "$incompatible" | "$incompatible"/*)
       echo "source: $3 does not belong to the declared $1 format" >&2; return 1 ;;
-  esac
+    esac
+  done
   harness "$2" || return 1
   case "$3" in
     "$from_instruction") printf '%s\n' "$instruction" ;;
@@ -50,27 +43,26 @@ source_path() { # <format> <target harness> <source path>: native destination; n
   esac
 }
 
-bundle_files() { # <revision or '' for disk> <bundle> <target harness>: mode blob<TAB>destination<TAB>source
+bundle_files() { # <bundle> <target harness>: mode blob<TAB>destination<TAB>source
   local format records record meta path dest
-  format=$(source_format "$1" "$2") || return 1
-  records=$(source_files "$1" "$2") || return 1
+  format=$(source_format "$1") || return 1
+  records=$(source_files "$1") || return 1
   while IFS= read -r record; do
     [ -n "$record" ] || continue
     meta=${record%%$'\t'*}; path=${record#*$'\t'}
     [ "$path" != source.yml ] || continue
     meta="${meta%% *} ${meta##* }"
-    dest=$(source_path "$format" "$3" "$path") || return 1
-    printf '%s\t%s\t%s\n' "$meta" "$dest" "$2/$path"
+    dest=$(source_path "$format" "$2" "$path") || return 1
+    printf '%s\t%s\t%s\n' "$meta" "$dest" "$1/$path"
   done <<<"$records"
 }
 
-source_files() { # <revision or '' for disk> <folder>: mode blob<TAB>relative path
+source_files() { # <folder>: mode blob<TAB>relative path
   local file mode
-  if [ -n "$1" ]; then git ls-tree -r "$1:$2" 2>/dev/null || true
-  elif [ -d "$2" ]; then
+  if [ -d "$1" ]; then
     while IFS= read -r file; do
       mode=100644; [ ! -x "$file" ] || mode=100755
-      printf '%s %s\t%s\n' "$mode" "$(git hash-object -- "$file")" "${file#"$2"/}"
-    done < <(find "$2" -type f | LC_ALL=C sort)
+      printf '%s %s\t%s\n' "$mode" "$(git hash-object -- "$file")" "${file#"$1"/}"
+    done < <(find "$1" -type f | LC_ALL=C sort)
   fi
 }
diff --git a/ci/sync.sh b/ci/sync.sh
index ba6b106..ab3d8a9 100755
--- a/ci/sync.sh
+++ b/ci/sync.sh
@@ -54,20 +54,36 @@ managed_records() { # <workspace commit> <folder>: trusted previous ownership, r
 }
 
 with_generated() { # <workspace commit> <folder>: copy reviewed native output; no source resolution
-  local i=$wt.index now old out meta path src entry blob
+  local i=$wt.index now old out meta path src entry blob base legacy=0 branch_entry
   now=$(ledger "$main:$2/$generated") || return 1
   old=$(managed_records "$1" "$2") || return 1
   out=$(git show "$1:workspace.yml" | optouts)
+  base=$(git merge-base "$1" "$main" || true)
+  if [ -n "$base" ] && ! git cat-file -e "$base:$2/$generated" 2>/dev/null &&
+    ! git cat-file -e "$base:$generated" 2>/dev/null; then legacy=1; fi
+  while IFS=$'\t' read -r meta path src; do
+    [ -n "$path" ] || continue
+    opted_out "$path" "$out" && continue
+    printf '%s\n' "$old" | awk -F'\t' -v p="$path" '$2 == p { found = 1 } END { exit !found }' && continue
+    branch_entry=$(git ls-tree "$1" -- "$path" | awk '{ print $1 " " $3 }')
+    [ -n "$branch_entry" ] || continue
+    # Pre-ledger clones can adopt copies proven by reviewed output or previous main provenance.
+    if [ "$legacy" = 1 ] && { [ "$branch_entry" = "$meta" ] ||
+      [ "$branch_entry" = "$(file_entry "$base" "$src")" ] ||
+      [ "$branch_entry" = "$(file_entry "$base" "$2/$path")" ]; }; then continue; fi
+    echo "sync: $2: CONFLICT: workspace-owned $path collides with managed output; opt out or resolve it in a workspace PR" >&2
+    return 1
+  done <<<"$now"
   rm -f "$i"
   GIT_INDEX_FILE=$i git read-tree "$1"
   printf '%s\n%s\n' "$old" "$now" | cut -f2 | LC_ALL=C sort -u |
     while IFS= read -r path; do
       [ -n "$path" ] || continue
       opted_out "$path" "$out" && continue
-      GIT_INDEX_FILE=$i git update-index --force-remove -- "$path"
+      GIT_INDEX_FILE=$i git update-index --force-remove -- "$path" || return 1
       entry=$(file_entry "$main" "$2/$path")
-      [ -z "$entry" ] || GIT_INDEX_FILE=$i git update-index --add --cacheinfo "${entry%% *},${entry##* },$path"
-    done
+      [ -z "$entry" ] || GIT_INDEX_FILE=$i git update-index --add --cacheinfo "${entry%% *},${entry##* },$path" || return 1
+    done || return 1
   blob=$({ ledger_header
     while IFS=$'\t' read -r meta path src; do
       [ -n "$path" ] || continue
diff --git a/docs/design.md b/docs/design.md
index 5cf0ac2..5296402 100644
--- a/docs/design.md
+++ b/docs/design.md
@@ -16,8 +16,8 @@ folder name (`workspaces/<name>`, `.delphi/parked/<name>`), and no branch can be
 merges (`git merge -Xsubtree=<folder>`), so the histories stay joined and edits on either side meet
 in normal three-way merges. The one thing shared is main's root `.delphi/` (the scripts): sync
 puts it at the root of every `ws/*` branch, so it is on every branch, main included, and is edited
-only on main. Shared `workspace-inherit/` and `workspace-defaults/` sources remain editable on main. `ci/render.sh`
-materializes their managed native copies inside each workspace folder before merge. The workspace's
+only on main. Shared sources remain editable on main. Creation seeds defaults once; `ci/render.sh` maintains
+inherited native copies inside each workspace folder before merge. The workspace's
 required `harness:` selects its target independently of the source bundle's `format:`. Branch
 refresh copies those reviewed files; it never reads source formats or runs harness adapters.
 A project's `workspace-defaults/` seeds workspace-owned files once at creation. `workspaces:` still
@@ -87,52 +87,44 @@ workspace folder (nor the template) has a `.delphi/` of its own. Each manifest f
 clones.
 `.github/CODEOWNERS` assigns reviewers per org folder.
 
-The folder holding a `workspaces/` directory is a project folder. It may hold shared context
-and `workspace-defaults/`. Files keep their existing native source paths; Claude Code is the
-legacy source format. An optional `source.yml` with `format: claude-code` or `format: codex`
-selects the authoring format independently of every workspace's harness. Source metadata never
-appears in rendered workspaces. The optional `workspace-defaults/workspace.yml` supplies creation
-defaults without a workspace name. Its optional `harness:` is only a creation suggestion; the
-creation tool always records an explicit harness in the new workspace.
-
-A workspace's harness does not depend on its branch name, the source format, or a repository-wide
-runtime default. Each folder on main already contains its declared harness's native files, and
-`ws/<name>` exposes that folder at the root. A harness change is an explicit workspace change.
-
-Any org or project folder may hold `workspace-inherit/`. `ci/inherit.sh` resolves these sources
-from `software/` down to a workspace's project. Existing Claude skills stay in
-`workspace-inherit/.claude/skills/`, including their native metadata and instructions.
-`ci/sources.sh` reads the source format; `ci/harnesses.sh` selects native destinations and adapts
-content for the consuming workspace. Claude output passes through unchanged. Codex output omits
-Claude-only skill fields, adapts instruction references and workspace-switch guidance, and
-normalizes descriptions that need YAML block scalars. Supporting files pass through unchanged.
-Instruction filenames and skill directories have explicit mappings. Unmapped native settings
-fail instead of being silently discarded or guessed. A future source reader can feed the same
-file records without changing workspace harness selections or branch sync.
-
-Run `bash ci/render.sh` on a main-based branch after changing shared sources, workspace harnesses,
-opt-outs or generated settings inputs. Include the native outputs in the same PR. `--check` writes
-nothing and rejects stale or missing outputs; `ci/check.sh` runs it. Defaults are translated only
-when creating a workspace, then become its own files. Inheritance is rendered into every applicable
-workspace folder on main and refreshed when its source changes.
-
-Each workspace's `workspace.generated` records managed destinations, source paths, modes and blob
-hashes. It is generated metadata, never an editable source. The renderer uses previous records to
-remove retired outputs, refuses to overwrite workspace-owned collisions, and reports edited retired
-files rather than deleting them. `opt-out:` uses native destination paths: it transfers a file or
-folder to workspace ownership and removes its records. Such copies remain editable and proposable.
-Shared edits go to their source; managed copies on main and workspace branches are reset from that
-source. Source bundles cannot supply workspace identity, native root instructions, runtime or workflow
-files through inheritance. Duplicate inherited destinations fail validation.
+The folder holding `workspaces/` is a project folder. Its optional `workspace-defaults/` seeds
+workspace-owned files once. Any ancestor org or project may provide managed `workspace-inherit/`
+files. Existing Claude skills stay under `workspace-inherit/.claude/skills/` with their metadata
+intact. A source bundle is Claude-authored unless its optional `source.yml` declares another
+`format:`. Source metadata is never copied into a workspace. A defaults manifest's optional
+`harness:` suggests a creation target; every workspace records its own explicit target.
+
+`ci/render.sh` prepares native workspace files on main. `ci/inherit.sh` selects ancestor sources,
+`ci/sources.sh` maps their paths, and `ci/harnesses.sh` adapts their contents for the target. Each
+payload is prepared once; its hash and written bytes come from that same result. Claude content
+passes through unchanged. Codex adapts skill metadata, instruction references and switch guidance;
+helper scripts pass through unchanged. Unsupported native settings mappings fail.
+
+Run `bash ci/render.sh` after source, harness, ownership or plugin changes and include the outputs
+in the same PR. `ci/check.sh` runs its read-only freshness check. Workspace creation and proposals
+prepare output before their PRs; refresh copies it without running source readers or adapters.
+
+`workspace.generated` records managed destinations, origins, modes and native hashes. Edit sources,
+not the ledger or managed copies. `opt-out:` transfers a native path to workspace ownership. The
+renderer reports owned collisions, edited retirement and duplicate destinations. Sync preserves
+branch-owned additions; pre-ledger copies are adopted only when they match reviewed output or
+previous main provenance. Ambiguous edits are reported for resolution in a workspace PR.
+Inheritance cannot replace a workspace's identity, native root instructions, runtime or workflow.
 
 ```mermaid
+---
+config:
+  htmlLabels: false
+  flowchart:
+    htmlLabels: false
+---
 flowchart TD
-    S["Shared sources on main<br/>Defaults, inheritance, skills"] --> T["Separate main-side rendering<br/>Source reader and target adapter"]
-    W["Each workspace.yml<br/>Explicit harness"] --> T
-    T -->|"Reviewed PR"| C["main: Codex workspace folder<br/>AGENTS.md and .agents/skills"]
-    T -->|"Reviewed PR"| A["main: Claude workspace folder<br/>CLAUDE.md and .claude/skills"]
-    C <-->|"Refresh / propose"| CB["ws/name<br/>Codex workspace root"]
-    A <-->|"Refresh / propose"| AB["ws/name<br/>Claude workspace root"]
+    S["Shared sources on main"] --> R["ci/render.sh"]
+    W["workspace.yml: harness"] --> R
+    R --> C["Native Codex folder on main"]
+    R --> A["Native Claude folder on main"]
+    C <-->|"refresh / propose"| CB["Codex workspace branch"]
+    A <-->|"refresh / propose"| AB["Claude workspace branch"]
 ```
 
 A plugin set is for what `workspace-inherit/` can't do: context only some workspaces opt into, or
@@ -269,16 +261,11 @@ it prints them as an export line. The adapter supplies layout initialization: fo
 skill scripts'. In a terminal, `. .delphi/paths.sh` from the root. `new-worktree.sh` sources it from
 its own folder; every skill script, plugin or workspace, sources `$DELPHI_ROOT/.delphi/paths.sh` and
 takes only names (repo, branch), never a searched-for path, so the model types only the names.
-Skill helpers remain harness-independent; native skill metadata is handled by translation. Codex discovers its native instructions and skills from
-the checked-out workspace branch. Agents follow `AGENTS.md`: determine the absolute root once,
-then run skill helpers through that root's
-`.delphi/exec.sh`. It sources the layout on every invocation, preserves the caller's directory,
-and exports it to children; pass this explicit root/wrapper to independently started sub-agents.
-No session hook, shared shell state, or particular managed environment is assumed. Setup and
-worktree scripts already source the layout from their own known location. Host credentials and
-dependencies remain host concerns; existing authenticated GitHub tools can be used, and an
-explicit `DELPHI_GITHUB_REST_PROXY` capability enables the existing REST-proxy fallback. No
-credential or permission settings are generated for Codex.
+Codex uses `AGENTS.md` and `.agents/skills/` from its checked-out branch. Run helper commands through
+`bash <root>/.delphi/exec.sh <command> ...`; it initializes the layout without changing the caller's
+directory and exports it to children. Pass the root and this rule to sub-agents. The host supplies
+dependencies, credentials and integrations. `DELPHI_GITHUB_REST_PROXY` enables the shared helper's
+REST-proxy fallback; existing Claude remote sessions retain their fallback.
 
 `.delphi/switch.sh <workspace>|main` moves the clone to `ws/<workspace>` (or `main`): it refuses while
 tracked files have changes, fetches the branch, switches (the hook parks and restores), fast-forwards
@@ -342,21 +329,16 @@ once it merges; creation never depends on branch-side translation.
 
 ### Adding a harness or source format
 
-`ci/harnesses.sh` owns target-native paths, instruction templates and plugin capabilities. Add a
-harness there and its native template under `templates/`, then add explicit mappings in
-`ci/sources.sh` and validation for foreign native files or new generated capabilities. Reject
-unsupported behavior. Keep source-format rules out of inheritance ownership and branch sync.
-
-`ci/sources.sh` is the input boundary. A different source format can produce the same records
-(content mode/hash, destination, origin) without choosing the consuming workspace's harness.
-Existing sources can remain Claude-authored while targets evolve. There is no required primary
-harness: every workspace selects its own target, and source bundles independently select their
-format. Creation suggestions can be changed or removed without changing existing workspaces.
-
-Test native authoring, refresh/propose ownership, opt-outs, old/new destination cleanup and layout
-propagation in `tests/e2e.sh`, including transitions from an existing adapter. Runtime changes use
-the normal manifest version release. Environment provisioning is independent: adding a harness
-must not require a particular cloud host or account.
+Register the target's native paths, template, plugin capability and foreign-file exclusions in
+`ci/harnesses.sh`, then add its instruction template. Put content adaptation in `harness_file()`.
+Select it in a workspace manifest, render, and run the sandbox suite. Ordinary targets need no
+renderer, validator or sync changes. Add explicit settings mappings or new capability validation
+only when the target introduces them.
+
+A new source format supplies the same file records (mode/hash, destination, origin) through
+`ci/sources.sh`. It does not select a workspace's target. Creation suggestions and source formats
+can change independently of existing workspaces. Runtime changes follow the normal version rules;
+adding a harness does not require a particular host or account.
 
 ## 7. CI (`.github/workflows/delphi.yml`)
 
diff --git a/software/application-software/argos/AUTHORING.md b/software/application-software/argos/AUTHORING.md
index 54e0c45..502b6e2 100644
--- a/software/application-software/argos/AUTHORING.md
+++ b/software/application-software/argos/AUTHORING.md
@@ -10,17 +10,14 @@ full model; this is the Argos-specific short version.
 2. Edit at normal harness paths: the native instruction file and skill paths for its `harness:` (`AGENTS.md` and `.agents/skills/` for Codex), or `docs/`.
 3. Push the branch and open a PR into `ws/<name>`. After it merges, CI proposes it to `main`.
 
-Don't edit `.delphi/`, `.github/workflows/delphi.yml`, or `.claude/settings.json`: Delphi manages
-them (`.delphi/` comes from main's root and sync resets it; `settings.json` is rendered on main from
-`workspace.yml`'s `plugins:`, where CI lists any folder's `default` plugin set; add other sets below them), nor the skills
-inherited from `workspace-inherit/` (sync overwrites them: change them on `main`, or list one under `opt-out:` to keep your own).
-Personal settings go in `.claude/settings.local.json`.
+Delphi manages `.delphi/`, the workflow and generated settings. Edit shared skills through their
+`workspace-inherit/` sources on main. To keep an editable workspace copy, list its native path
+under `opt-out:`. Claude personal settings belong in `.claude/settings.local.json`.
 
 ## Create a new Argos workspace
 
 From a Delphi checkout: `tools/new-workspace.sh [--harness codex] application-software/argos <name>`. It copies
-Delphi's template, then `workspace-defaults/` (its Claude source format is translated into the selected harness), and opens
-a PR to `main`. Trim what the new workspace doesn't need before merging.
+the selected harness template and translated `workspace-defaults/`, then opens a PR to `main`.
 
 ## Change the defaults or this folder
 
@@ -48,9 +45,6 @@ its outputs in the same PR; refresh then copies those reviewed files to workspac
 
 ## Codex
 
-The `default-codex` leaf is `ws/s.app.argos.default-codex`. Open that workspace branch in Codex
-normally, then follow `AGENTS.md` and use `.delphi/exec.sh` for skill
-helpers in fresh shells and sub-agents. This workspace carries Argos workflows and dependency
-references without prescribing a cloud environment, credentials or Codex permission settings.
-Check required local tooling before running a workflow; use available browser/GitHub integrations
-and report verification that could not run. Start a fresh Codex session after changing workspaces.
+Open `ws/s.app.argos.default-codex` in Codex and follow `AGENTS.md`. Use `.delphi/exec.sh` for skill
+helpers in fresh shells and sub-agents. The host supplies tooling and credentials. Restart the
+Codex session after switching workspaces.
diff --git a/software/application-software/argos/README.md b/software/application-software/argos/README.md
index d496a1d..deb210e 100644
--- a/software/application-software/argos/README.md
+++ b/software/application-software/argos/README.md
@@ -13,8 +13,7 @@ backend (`scylla-server/`), with schema tooling in `charybdis/` and MQTT broker
 | `workspaces/argos-dev/` | Day-to-day Argos development: tickets, specs, PRs |
 | `workspaces/default-codex/` | Argos development with the Codex harness |
 | `workspace-defaults/` | What a new Argos workspace starts with (see `AUTHORING.md`) |
-| `skills/` | Shared workflows rendered into each workspace's native skill directory on sync |
-| `workspace-inherit/` | Ordinary inherited files at their workspace paths, when needed |
+| `workspace-inherit/` | Shared workflows and docs rendered on main, then refreshed to workspace branches |
 | `plugins/claude/<set>/` | Claude Code plugin sets a workspace lists under `plugins:` (none yet) |
 | `AUTHORING.md` | How to create and change Argos workspaces |
 
diff --git a/tests/e2e.sh b/tests/e2e.sh
index ca665b7..facccb0 100644
--- a/tests/e2e.sh
+++ b/tests/e2e.sh
@@ -221,6 +221,23 @@ o show "main:$A/notes/layout/guide.md" | grep -qx after || fail "main lacks nati
 o show "ws/$AN:notes/layout/guide.md" | grep -qx after || fail "refresh lost nested output"
 ok "native managed paths can change from files to directories without creating sparse-index entries"
 
+# New inheritance must not replace a file owned only on the workspace branch.
+commit_on "ws/$AN" notes/collision.txt "workspace-owned"
+on_main "new inherited collision" sh -c "echo shared >$AI/collision.txt"
+owned_head=$(o rev-parse "ws/$AN") proposal_head=$(o rev-parse "propose/$AN")
+for direction in refresh propose; do
+  if sync "$direction" "$AN" >"$t/out" 2>"$t/err"; then fail "$direction replaced an owned collision"; fi
+  grep -q 'workspace-owned notes/collision.txt collides' "$t/err" || fail "$direction did not report ownership"
+  [ "$(o rev-parse "ws/$AN")" = "$owned_head" ] || fail "$direction changed the workspace branch"
+  [ "$(o rev-parse "propose/$AN")" = "$proposal_head" ] || fail "$direction published the collision"
+done
+o show "ws/$AN:notes/collision.txt" | grep -qx workspace-owned || fail "owned content was lost"
+ok "refresh and propose report new inherited collisions without changing workspace-owned content"
+(cd "$t/dev" && git fetch -q && git checkout -q -B accept-inheritance "origin/ws/$AN" &&
+  git rm -q notes/collision.txt && git commit -qm "accept shared note" && git push -q origin "HEAD:ws/$AN")
+sync refresh "$AN" >/dev/null
+
+
 # Source retirement must preserve ownership claimed on a workspace branch before its proposal merges.
 on_main "unmerged ownership fixture" sh -c 'mkdir -p software/workspace-inherit/.claude/skills/unmerged; echo shared >software/workspace-inherit/.claude/skills/unmerged/SKILL.md'
 sync refresh "$BN" >/dev/null
@@ -1033,6 +1050,73 @@ ok "unsupported native settings fail explicitly and leave the caller checkout un
   bash ci/render.sh >/dev/null && [ -z "$(git status --porcelain)" ]) || fail "main-side render was not idempotent"
 ok "render checks do not write and repeated rendering leaves a valid main checkout unchanged"
 
+# A pre-render branch has native copies but no ledger. Prove their old source provenance.
+legacy_dev=$t/legacy-dev legacy_origin=$t/legacy-origin.git
+git clone -q "$t/seed" "$legacy_dev"
+(cd "$legacy_dev" && git rm -q "$A/workspace.generated" "$B/workspace.generated" &&
+  mkdir -p software/workspace-inherit/notes && echo old >software/workspace-inherit/notes/adoption.txt &&
+  git add -A && git commit -qm "legacy main without managed ledgers")
+legacy_base=$(git -C "$legacy_dev" rev-parse HEAD)
+git clone -q --bare "$legacy_dev" "$legacy_origin"
+git -C "$legacy_dev" remote set-url origin "$legacy_origin"
+for legacy_name in "$AN" "$BN"; do
+  legacy_folder=$A; [ "$legacy_name" != "$BN" ] || legacy_folder=$B
+  legacy_blob=$(printf 'old\n' | git -C "$legacy_dev" hash-object -w --stdin)
+  [ "$legacy_name" != "$BN" ] || legacy_blob=$(printf 'owned edit\n' | git -C "$legacy_dev" hash-object -w --stdin)
+  GIT_INDEX_FILE=$t/legacy.index git -C "$legacy_dev" read-tree "$legacy_base:$legacy_folder"
+  GIT_INDEX_FILE=$t/legacy.index git -C "$legacy_dev" read-tree --prefix=.delphi/ "$legacy_base:.delphi"
+  GIT_INDEX_FILE=$t/legacy.index git -C "$legacy_dev" update-index --add --cacheinfo "100644,$legacy_blob,notes/adoption.txt"
+  legacy_tree=$(GIT_INDEX_FILE=$t/legacy.index git -C "$legacy_dev" write-tree)
+  legacy_head=$(printf 'legacy workspace\n' | git -C "$legacy_dev" commit-tree -p "$legacy_base" "$legacy_tree")
+  git -C "$legacy_dev" push -q origin "$legacy_head:refs/heads/ws/$legacy_name"
+done
+(cd "$legacy_dev" && echo new >software/workspace-inherit/notes/adoption.txt &&
+  bash ci/render.sh && git add -A && git commit -qm "prepare native output" && git push -q origin main &&
+  bash ci/sync.sh refresh "$AN") >"$t/out" 2>"$t/err" || fail "legacy adoption: $(cat "$t/err")"
+git -C "$legacy_origin" show "ws/$AN:notes/adoption.txt" | grep -qx new || fail "legacy source was not refreshed"
+git -C "$legacy_origin" cat-file -e "ws/$AN:workspace.generated" || fail "legacy branch lacks ownership metadata"
+ok "pre-ledger branches adopt unchanged old source copies before applying reviewed updates"
+if (cd "$legacy_dev" && bash ci/sync.sh refresh "$BN") >"$t/out" 2>"$t/err"; then fail "ambiguous legacy edit overwritten"; fi
+git -C "$legacy_origin" show "ws/$BN:notes/adoption.txt" | grep -qx 'owned edit' || fail "legacy edit was lost"
+ok "ambiguous pre-ledger edits report a conflict and retain their content"
+
+# Add a target only in its registry/template; adaptations of helpers must also be hashed natively.
+d=$t/adapter-extension
+mkdir "$d"
+cp -R "$src/ci" "$src/software" "$src/templates" "$src/.github" "$src/.delphi" "$src/.claude-plugin" "$d/"
+(cd "$d" && git init -q && git add -A && git commit -qm base)
+cat >>"$d/ci/harnesses.sh" <<'ADAPTER'
+eval "$(declare -f harness | sed '1s/harness/base_harness/')"
+harness() {
+  if [ "$1" = fixture ]; then
+    instruction=TASKS.md; instruction_template=templates/harnesses/fixture/TASKS.md
+    skills=.fixture/skills; plugins=none; foreign="CLAUDE.md .claude AGENTS.md .agents .codex"
+  else base_harness "$1"; fi
+}
+eval "$(declare -f harness_file | sed '1s/harness_file/base_harness_file/')"
+harness_file() {
+  if [ "$1" = fixture ]; then
+    cat "$2"
+    case "$2" in */SKILL.md | */scripts/*.sh) printf '\n# fixture output\n' ;; esac
+  else base_harness_file "$@"; fi
+}
+ADAPTER
+F=software/application-software/argos/workspaces/fixture
+mkdir -p "$d/$F" "$d/templates/harnesses/fixture"
+cp -R "$d/templates/workspace/." "$d/$F/"
+rm "$d/$F/CLAUDE.md"
+printf 'Fixture instructions\n' >"$d/templates/harnesses/fixture/TASKS.md"
+cp "$d/templates/harnesses/fixture/TASKS.md" "$d/$F/TASKS.md"
+printf 'name: s.app.argos.fixture\nharness: fixture\n' >"$d/$F/workspace.yml"
+chmod +x "$d/software/workspace-inherit/.claude/skills/journal/scripts/capture.sh"
+(cd "$d" && bash ci/render.sh && git add -A && bash ci/check.sh . HEAD &&
+  bash ci/render.sh && git diff --quiet) >"$t/out" 2>"$t/err" || fail "adapter extension: $(cat "$t/err")"
+grep -qx '# fixture output' "$d/$F/.fixture/skills/journal/SKILL.md" || fail "new target skill was not adapted"
+grep -qx '# fixture output' "$d/$F/.fixture/skills/journal/scripts/capture.sh" || fail "new target helper was not adapted"
+[ -x "$d/$F/.fixture/skills/journal/scripts/capture.sh" ] || fail "new target lost executable mode"
+ok "new target content rules cover skills and helpers without renderer or validator changes"
+
+
 # --- 14. shellcheck, if installed
 if command -v shellcheck >/dev/null; then
   shellcheck "$src"/ci/*.sh "$src"/tools/*.sh "$src"/tests/*.sh "$src"/.delphi/*.sh "$src"/.delphi/migrations/*.sh ||
diff --git a/tools/new-workspace.sh b/tools/new-workspace.sh
index 9f7cb9d..9b15baa 100755
--- a/tools/new-workspace.sh
+++ b/tools/new-workspace.sh
@@ -40,7 +40,7 @@ cp -R "$wt/templates/workspace/." "$wt/$folder/"
 rm -f "$wt/$folder/CLAUDE.md" "$wt/$folder/AGENTS.md"
 cp "$wt/$instruction_template" "$wt/$folder/$instruction"
 if [ -d "$defaults" ]; then
-  records=$(cd "$wt" && bundle_files "" "software/$org/workspace-defaults" "$adapter") || die "cannot read project defaults"
+  records=$(cd "$wt" && bundle_files "software/$org/workspace-defaults" "$adapter") || die "cannot read project defaults"
   while IFS=$'\t' read -r meta path src; do
     [ -n "$path" ] || continue
     if [ "$path" = "$instruction" ]; then
@@ -64,7 +64,7 @@ if [ "$plugins" = none ] && awk '/^plugins:/ { s = 1; next } /^[^[:space:]#]/ {
   s && /^[[:space:]]+-/ { found = 1 } END { exit !found }' "$y"; then
   die "$adapter does not support Delphi plugin sets in project defaults"
 fi
-{ echo "name: $name"; echo "harness: $adapter"; awk -v adapter="$adapter" '/^name:|^harness:/ { next } adapter != "claude-code" && /^plugins:/ { skip = 1; next } /^[^[:space:]#]/ { skip = 0 } !skip { print }' "$y"; } >"$y.new" && mv "$y.new" "$y"
+{ echo "name: $name"; echo "harness: $adapter"; awk -v plugins="$plugins" '/^name:|^harness:/ { next } plugins == "none" && /^plugins:/ { skip = 1; next } /^[^[:space:]#]/ { skip = 0 } !skip { print }' "$y"; } >"$y.new" && mv "$y.new" "$y"
 bash "$wt/ci/render.sh" "$wt"
 "$wt/ci/check.sh" "$wt"
 git -C "$wt" add -A "$folder"

From 6379d97cb3edf5e5aca565c8dd80bfa60990ad3e Mon Sep 17 00:00:00 2001
From: Jesus God <wyattbracy@gmail.com>
Date: Fri, 23 Oct 2026 20:29:34 +0000
Subject: [PATCH 08/18] Handle native metadata variants and protect adapter
 instruction paths

---
 ci/harnesses.sh | 14 ++++++++------
 ci/render.sh    |  2 +-
 tests/e2e.sh    | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 7 deletions(-)

diff --git a/ci/harnesses.sh b/ci/harnesses.sh
index e2f7daf..ebc174d 100644
--- a/ci/harnesses.sh
+++ b/ci/harnesses.sh
@@ -14,17 +14,19 @@ harness_file() { # <target harness> <source file>: Claude passes through; Codex
   case "$1:$2" in
     codex:*/SKILL.md)
       awk '
+        { sub(/\r$/, "") }
         NR == 1 && /^---$/ { front = 1; print; next }
         front && /^---$/ { front = 0; print; next }
         front {
+          line = $0; sub(/^ */, "", line); indent = length($0) - length(line)
+          if (!root && line !~ /^(#|$)/) { root = 1; level = indent }
           # Claude-only fields are omitted from Codex output, including block values.
-          if (/^(allowed-tools|user-invocable|disable-model-invocation):/) { skip = 1; next }
-          if (skip && /^[[:space:]]/) next
-          if (/^[^[:space:]#]/) skip = 0
-          if (skip) next
+          if (indent == level && line ~ /^["\047]?(allowed-tools|user-invocable|disable-model-invocation)["\047]?[[:space:]]*:/) { skip = 1; next }
+          if (skip && (indent > level || line ~ /^(#|$|-([[:space:]]|$))/)) next
+          skip = 0
           # Quote descriptions that need a native YAML block scalar.
-          if (/^description: / && substr($0, 14) ~ /: / && substr($0, 14) !~ /^["\047>|]/) {
-            print "description: >-"; print "  " substr($0, 14)
+          if (indent == level && line ~ /^description: / && substr(line, 14) ~ /: / && substr(line, 14) !~ /^["\047>|]/) {
+            print substr($0, 1, level) "description: >-"; print substr($0, 1, level) "  " substr(line, 14)
           } else print
           next
         }
diff --git a/ci/render.sh b/ci/render.sh
index b421be2..28e416f 100755
--- a/ci/render.sh
+++ b/ci/render.sh
@@ -38,7 +38,7 @@ render_workspace() { # <workspace folder>
     if ! safe_path "$path" || ! safe_path "$src"; then
       bad "$src: unsafe inherited destination '$path'"; continue
     fi
-    case "$path" in CLAUDE.md | AGENTS.md | workspace.yml | workspace.generated | .delphi | .delphi/* | .claude/settings.json | .codex/config.toml | .github/workflows/delphi.yml)
+    case "$path" in "$instruction" | CLAUDE.md | AGENTS.md | workspace.yml | workspace.generated | .delphi | .delphi/* | .claude/settings.json | .codex/config.toml | .github/workflows/delphi.yml)
       bad "$src: each workspace has its own $path; it can't be inherited"; continue ;;
     esac
     case " $seen " in *" $path "*) bad "$src: $folder also inherits it from a folder above; keep one" ;; esac
diff --git a/tests/e2e.sh b/tests/e2e.sh
index facccb0..85e6345 100644
--- a/tests/e2e.sh
+++ b/tests/e2e.sh
@@ -828,6 +828,48 @@ commit_on "ws/$CO" CLAUDE.md "old side" && commit_on "ws/$CN" .gitattributes "#
 ok "an old name with commits of its own is reported, never merged"
 
 # --- 13. portable harnesses: native main-side output, round trips, transitions, bootstrap and authoring
+mkdir -p "$t/metadata-variants"
+cat >"$t/metadata-variants/source.md" <<'SKILL'
+---
+name: metadata-variants
+allowed-tools:
+- Read
+- Bash
+# A comment within the omitted value.
+"user-invocable" : false
+'disable-model-invocation': true
+metadata:
+  allowed-tools: preserve nested metadata
+description: |-
+  First line: useful
+  Second line
+---
+Read CLAUDE.md.
+SKILL
+cat >"$t/metadata-variants/expected.md" <<'SKILL'
+---
+name: metadata-variants
+metadata:
+  allowed-tools: preserve nested metadata
+description: |-
+  First line: useful
+  Second line
+---
+Read AGENTS.md.
+SKILL
+for indent in '' '  '; do
+  sed "/^---$/!s/^/$indent/" "$t/metadata-variants/source.md" >"$t/metadata-variants/lf.md"
+  sed "/^---$/!s/^/$indent/" "$t/metadata-variants/expected.md" >"$t/metadata-variants/want.md"
+  for eol in lf crlf; do
+    if [ "$eol" = crlf ]; then awk '{ printf "%s\r\n", $0 }' "$t/metadata-variants/lf.md" >"$t/metadata-variants/SKILL.md"
+    else cp "$t/metadata-variants/lf.md" "$t/metadata-variants/SKILL.md"; fi
+    bash -c 'source "$1"; harness_file codex "$2"' _ "$src/ci/harnesses.sh" "$t/metadata-variants/SKILL.md" >"$t/metadata-variants/actual.md"
+    cmp -s "$t/metadata-variants/want.md" "$t/metadata-variants/actual.md" || fail "Codex metadata indentation/quotes/$eol"
+    bash -c 'source "$1"; harness_file claude-code "$2"' _ "$src/ci/harnesses.sh" "$t/metadata-variants/SKILL.md" |
+      cmp -s - "$t/metadata-variants/SKILL.md" || fail "Claude metadata bytes changed"
+  done
+done
+ok "Codex metadata handles CRLF, quoted keys, indentless lists and root indentation; Claude stays byte-identical"
 cat >"$t/native-metadata.md" <<'SKILL'
 ---
 name: native-metadata
@@ -1115,6 +1157,12 @@ grep -qx '# fixture output' "$d/$F/.fixture/skills/journal/SKILL.md" || fail "ne
 grep -qx '# fixture output' "$d/$F/.fixture/skills/journal/scripts/capture.sh" || fail "new target helper was not adapted"
 [ -x "$d/$F/.fixture/skills/journal/scripts/capture.sh" ] || fail "new target lost executable mode"
 ok "new target content rules cover skills and helpers without renderer or validator changes"
+rm "$d/$F/TASKS.md"
+echo 'must remain workspace-owned' >"$d/software/workspace-inherit/TASKS.md"
+if (cd "$d" && bash ci/render.sh) >"$t/out" 2>"$t/err"; then fail "new target inherited its root instructions"; fi
+grep -q "each workspace has its own TASKS.md" "$t/err" || fail "new target root protection not reported"
+[ ! -e "$d/$F/TASKS.md" ] || fail "new target wrote inherited root instructions"
+ok "registry-only targets protect their own instruction path even when its workspace file is missing"
 
 
 # --- 14. shellcheck, if installed

From 89d45d02954e91815af4c79aff3df0a928fef184 Mon Sep 17 00:00:00 2001
From: Jesus God <wyattbracy@gmail.com>
Date: Fri, 23 Oct 2026 20:32:08 +0000
Subject: [PATCH 09/18] Clarify preservation of edited managed files during
 retirement

---
 docs/design.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/design.md b/docs/design.md
index 5296402..084f08c 100644
--- a/docs/design.md
+++ b/docs/design.md
@@ -106,8 +106,9 @@ prepare output before their PRs; refresh copies it without running source reader
 
 `workspace.generated` records managed destinations, origins, modes and native hashes. Edit sources,
 not the ledger or managed copies. `opt-out:` transfers a native path to workspace ownership. The
-renderer reports owned collisions, edited retirement and duplicate destinations. Sync preserves
-branch-owned additions; pre-ledger copies are adopted only when they match reviewed output or
+renderer rejects duplicate destinations. Rendering and sync report owned collisions and refuse
+retirement of files with edited content or executable mode. Sync preserves branch-owned additions;
+pre-ledger copies are adopted only when they match reviewed output or
 previous main provenance. Ambiguous edits are reported for resolution in a workspace PR.
 Inheritance cannot replace a workspace's identity, native root instructions, runtime or workflow.
 

From 5c2d5f90c38a11435f6cb9118b67a47c4c4bb9ca Mon Sep 17 00:00:00 2001
From: Jesus God <wyattbracy@gmail.com>
Date: Fri, 23 Oct 2026 20:33:47 +0000
Subject: [PATCH 10/18] Protect managed ownership through path topology changes
 and retirement

---
 ci/managed.sh |  4 +++
 ci/render.sh  | 28 ++++++++++++---
 ci/sync.sh    | 65 ++++++++++++++++++++++-----------
 tests/e2e.sh  | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 172 insertions(+), 24 deletions(-)

diff --git a/ci/managed.sh b/ci/managed.sh
index 4b20860..e09a4c1 100644
--- a/ci/managed.sh
+++ b/ci/managed.sh
@@ -15,6 +15,10 @@ opted_out() { # <path> <space-separated opt-outs>
   return 1
 }
 
+recorded() { # <path> <records>: exact managed ownership, including files retired by a topology change
+  printf '%s\n' "$2" | awk -F'\t' -v p="$1" '$2 == p { found = 1 } END { exit !found }'
+}
+
 safe_path() {
   case "$1" in '' | /* | *[!A-Za-z0-9._/-]* | */ | *//* ) return 1 ;; esac
   case "/$1/" in */../* | */./* | */.git/*) return 1 ;; esac
diff --git a/ci/render.sh b/ci/render.sh
index 28e416f..469e8d4 100755
--- a/ci/render.sh
+++ b/ci/render.sh
@@ -13,6 +13,9 @@ tmp=$(mktemp -d)
 trap 'rm -rf "$tmp"' EXIT
 problems=0
 bad() { echo "render: $*" >&2; problems=$((problems + 1)); }
+while IFS= read -r path; do bad "$path: symlinks are not allowed under software/"; done \
+  < <(find software -type l 2>/dev/null)
+[ "$problems" = 0 ] || exit 1
 if [ "$check" = 1 ]; then
   bash "$here/plugins.sh" --check . || problems=$((problems + 1))
 else
@@ -20,7 +23,7 @@ else
 fi
 
 render_workspace() { # <workspace folder>
-  local folder=$1 adapter out records old meta path src seen="" used="" o start=$problems previous actual
+  local folder=$1 adapter out records old meta path src seen="" used="" o start=$problems previous actual mode collision child parent
   adapter=$(awk '/^harness:/ { print $2; exit }' "$folder/workspace.yml")
   harness "$adapter" || { bad "$folder/workspace.yml: unknown harness '$adapter'"; return; }
   if [ "$plugins" = none ] && awk '/^plugins:/ { s = 1; next } /^[^[:space:]#]/ { s = 0 }
@@ -66,7 +69,8 @@ render_workspace() { # <workspace folder>
     opted_out "$path" "$out" && continue
     awk -F'\t' -v p="$path" '$2 == p { found = 1 } END { exit !found }' "$tmp/sorted" && continue
     [ -f "$folder/$path" ] || continue
-    if [ "$(git hash-object -- "$folder/$path")" != "${meta#* }" ]; then
+    mode=100644; [ ! -x "$folder/$path" ] || mode=100755
+    if [ "$mode $(git hash-object -- "$folder/$path")" != "$meta" ]; then
       bad "$folder/$path: retired managed file has local edits; preserve it explicitly before rendering"
     elif [ "$check" = 1 ]; then
       bad "$folder/$path: stale managed output; run ci/render.sh"
@@ -75,8 +79,23 @@ render_workspace() { # <workspace folder>
   while IFS=$'\t' read -r meta path src; do
     [ -n "$path" ] || continue
     previous=$(printf '%s\n' "$old" | awk -F'\t' -v p="$path" '$2 == p { print $1; exit }')
-    if [ -e "$folder/$path" ] && [ -z "$previous" ] && [ "$src" != ci/plugins.sh ]; then
-      bad "$folder/$path: workspace-owned file collides with $src; opt out or remove it explicitly"
+    collision=""
+    if [ -d "$folder/$path" ]; then
+      while IFS= read -r child; do
+        child=${child#"$folder"/}
+        if [ ! -f "$folder/$child" ] || ! recorded "$child" "$old" || opted_out "$child" "$out"; then collision=$child; break; fi
+      done < <(find "$folder/$path" ! -type d -o -empty)
+    elif [ -e "$folder/$path" ] && [ -z "$previous" ] && [ "$src" != ci/plugins.sh ]; then
+      collision=$path
+    fi
+    parent=$(dirname "$path")
+    while [ "$parent" != . ]; do
+      if [ -e "$folder/$parent" ] && [ ! -d "$folder/$parent" ] &&
+        { ! recorded "$parent" "$old" || opted_out "$parent" "$out"; }; then collision=$parent; break; fi
+      parent=$(dirname "$parent")
+    done
+    if [ -n "$collision" ]; then
+      bad "$folder/$collision: workspace-owned file collides with $src; opt out or remove it explicitly"
       continue
     fi
     actual=""
@@ -108,6 +127,7 @@ render_workspace() { # <workspace folder>
   while IFS=$'\t' read -r meta path src; do
     [ -n "$path" ] || continue
     [ "$src" != ci/plugins.sh ] || continue
+    [ ! -d "$folder/$path" ] || { bad "$folder/$path: cannot replace a remaining directory with managed output"; return; }
     mkdir -p "$(dirname "$folder/$path")"
     cp "$tmp/native/$path" "$folder/$path"
     if [ "${meta%% *}" = 100755 ]; then chmod +x "$folder/$path"; else chmod -x "$folder/$path"; fi
diff --git a/ci/sync.sh b/ci/sync.sh
index ab3d8a9..013b5d9 100755
--- a/ci/sync.sh
+++ b/ci/sync.sh
@@ -49,12 +49,12 @@ managed_records() { # <workspace commit> <folder>: trusted previous ownership, r
   trusted=$(previous_records "$1" "$2") || return 1
   # Dropping an entry after an opt-out records the ownership transfer, even before its proposal merges.
   printf '%s\n' "$old" | awk -F'\t' -v trusted="$trusted" 'BEGIN {
-    n = split(trusted, rows, "\n"); for (i = 1; i <= n; i++) { split(rows[i], f, "\t"); owned[f[2]] = 1 }
-  } $2 in owned'
+    n = split(trusted, rows, "\n"); for (i = 1; i <= n; i++) { split(rows[i], f, "\t"); owned[f[2]] = rows[i] }
+  } $2 in owned { print owned[$2] }'
 }
 
 with_generated() { # <workspace commit> <folder>: copy reviewed native output; no source resolution
-  local i=$wt.index now old out meta path src entry blob base legacy=0 branch_entry
+  local i=$wt.index now old out meta path src entry blob base legacy=0 branch_entry child parent paths
   now=$(ledger "$main:$2/$generated") || return 1
   old=$(managed_records "$1" "$2") || return 1
   out=$(git show "$1:workspace.yml" | optouts)
@@ -64,26 +64,51 @@ with_generated() { # <workspace commit> <folder>: copy reviewed native output; n
   while IFS=$'\t' read -r meta path src; do
     [ -n "$path" ] || continue
     opted_out "$path" "$out" && continue
-    printf '%s\n' "$old" | awk -F'\t' -v p="$path" '$2 == p { found = 1 } END { exit !found }' && continue
-    branch_entry=$(git ls-tree "$1" -- "$path" | awk '{ print $1 " " $3 }')
-    [ -n "$branch_entry" ] || continue
-    # Pre-ledger clones can adopt copies proven by reviewed output or previous main provenance.
-    if [ "$legacy" = 1 ] && { [ "$branch_entry" = "$meta" ] ||
-      [ "$branch_entry" = "$(file_entry "$base" "$src")" ] ||
-      [ "$branch_entry" = "$(file_entry "$base" "$2/$path")" ]; }; then continue; fi
-    echo "sync: $2: CONFLICT: workspace-owned $path collides with managed output; opt out or resolve it in a workspace PR" >&2
-    return 1
+    while IFS=$'\t' read -r branch_entry child; do
+      [ -n "$child" ] || continue
+      if recorded "$child" "$old" && ! opted_out "$child" "$out"; then continue; fi
+      branch_entry="${branch_entry%% *} ${branch_entry##* }"
+      # Pre-ledger clones can adopt copies proven by reviewed output or previous main provenance.
+      if [ "$legacy" = 1 ] && [ "$child" = "$path" ] && { [ "$branch_entry" = "$meta" ] ||
+        [ "$branch_entry" = "$(file_entry "$base" "$src")" ] ||
+        [ "$branch_entry" = "$(file_entry "$base" "$2/$path")" ]; }; then continue; fi
+      echo "sync: $2: CONFLICT: workspace-owned $child collides with managed output $path; opt out or resolve it in a workspace PR" >&2
+      return 1
+    done < <(git ls-tree -r "$1" -- "$path")
+    parent=$(dirname "$path")
+    while [ "$parent" != . ]; do
+      branch_entry=$(git ls-tree "$1" -- "$parent" | awk '$1 != "040000" { print $1 " " $3 }')
+      if [ -n "$branch_entry" ] && { ! recorded "$parent" "$old" || opted_out "$parent" "$out"; }; then
+        echo "sync: $2: CONFLICT: workspace-owned $parent collides with managed output $path; opt out or resolve it in a workspace PR" >&2
+        return 1
+      fi
+      parent=$(dirname "$parent")
+    done
   done <<<"$now"
+  while IFS=$'\t' read -r meta path src; do
+    [ -n "$path" ] || continue
+    opted_out "$path" "$out" && continue
+    recorded "$path" "$now" && continue
+    branch_entry=$(git ls-tree "$1" -- "$path" | awk '$1 != "040000" { print $1 " " $3 }')
+    if [ -n "$branch_entry" ] && [ "$branch_entry" != "$meta" ]; then
+      echo "sync: $2: CONFLICT: retired managed $path has local edits; preserve it at another path or resolve it explicitly in a workspace PR" >&2
+      return 1
+    fi
+  done <<<"$old"
   rm -f "$i"
   GIT_INDEX_FILE=$i git read-tree "$1"
-  printf '%s\n%s\n' "$old" "$now" | cut -f2 | LC_ALL=C sort -u |
-    while IFS= read -r path; do
-      [ -n "$path" ] || continue
-      opted_out "$path" "$out" && continue
-      GIT_INDEX_FILE=$i git update-index --force-remove -- "$path" || return 1
-      entry=$(file_entry "$main" "$2/$path")
-      [ -z "$entry" ] || GIT_INDEX_FILE=$i git update-index --add --cacheinfo "${entry%% *},${entry##* },$path" || return 1
-    done || return 1
+  paths=$(printf '%s\n%s\n' "$old" "$now" | cut -f2 | LC_ALL=C sort -u)
+  while IFS= read -r path; do
+    [ -n "$path" ] || continue
+    opted_out "$path" "$out" && continue
+    GIT_INDEX_FILE=$i git update-index --force-remove -- "$path" || return 1
+  done <<<"$paths"
+  while IFS= read -r path; do
+    [ -n "$path" ] || continue
+    opted_out "$path" "$out" && continue
+    entry=$(file_entry "$main" "$2/$path")
+    [ -z "$entry" ] || GIT_INDEX_FILE=$i git update-index --add --cacheinfo "${entry%% *},${entry##* },$path" || return 1
+  done <<<"$paths"
   blob=$({ ledger_header
     while IFS=$'\t' read -r meta path src; do
       [ -n "$path" ] || continue
diff --git a/tests/e2e.sh b/tests/e2e.sh
index 85e6345..63512ec 100644
--- a/tests/e2e.sh
+++ b/tests/e2e.sh
@@ -220,6 +220,38 @@ sync refresh "$AN" >"$t/out" 2>&1 || fail "managed file-to-directory refresh: $(
 o show "main:$A/notes/layout/guide.md" | grep -qx after || fail "main lacks native nested output"
 o show "ws/$AN:notes/layout/guide.md" | grep -qx after || fail "refresh lost nested output"
 ok "native managed paths can change from files to directories without creating sparse-index entries"
+on_main "replace inherited directory with file" sh -c "rm -r $AI/layout && echo final >$AI/layout"
+sync "$AN" >"$t/out" 2>&1 || fail "managed directory-to-file round trip: $(cat "$t/out")"
+o show "ws/$AN:notes/layout" | grep -qx final || fail "refresh lost replacement file"
+ok "native managed paths can change back from directories to files in refresh and propose"
+
+# Ancestor files and owned directory siblings must be reported before any index writes.
+NI=software/workspace-inherit/notes
+commit_on "ws/$AN" notes/blocked "owned ancestor"
+on_main "inherited descendant collision" sh -c "mkdir -p $NI/blocked && echo shared >$NI/blocked/guide.md"
+owned_head=$(o rev-parse "ws/$AN")
+for direction in refresh propose; do
+  if sync "$direction" >"$t/out" 2>"$t/err"; then fail "$direction replaced an owned ancestor"; fi
+  grep -q 'workspace-owned notes/blocked collides' "$t/err" || fail "$direction did not report the owned ancestor"
+  [ "$(o rev-parse "ws/$AN")" = "$owned_head" ] || fail "$direction changed the owned ancestor"
+done
+o show "ws/$BN:notes/blocked/guide.md" | grep -qx shared || fail "ancestor collision blocked another workspace"
+(cd "$t/dev" && git fetch -q && git checkout -q -B accept-descendant "origin/ws/$AN" &&
+  git rm -q notes/blocked && git commit -qm "accept managed descendant" && git push -q origin "HEAD:ws/$AN")
+sync refresh "$AN" >/dev/null
+commit_on "ws/$AN" notes/blocked/own.md "owned sibling"
+on_main "replace inherited directory around an owned sibling" sh -c "rm -r $NI/blocked && echo replacement >$NI/blocked"
+owned_head=$(o rev-parse "ws/$AN")
+for direction in refresh propose; do
+  if sync "$direction" "$AN" >"$t/out" 2>"$t/err"; then fail "$direction replaced an owned sibling"; fi
+  grep -q 'workspace-owned notes/blocked/own.md collides' "$t/err" || fail "$direction did not report the owned sibling"
+  [ "$(o rev-parse "ws/$AN")" = "$owned_head" ] || fail "$direction changed the owned sibling"
+done
+o show "ws/$AN:notes/blocked/own.md" | grep -qx 'owned sibling' || fail "owned sibling was lost"
+(cd "$t/dev" && git fetch -q && git checkout -q -B accept-replacement "origin/ws/$AN" &&
+  git rm -q notes/blocked/own.md && git commit -qm "accept managed replacement" && git push -q origin "HEAD:ws/$AN")
+sync refresh "$AN" >/dev/null
+ok "owned ancestors and directory siblings conflict explicitly while other workspaces keep refreshing"
 
 # New inheritance must not replace a file owned only on the workspace branch.
 commit_on "ws/$AN" notes/collision.txt "workspace-owned"
@@ -254,6 +286,47 @@ o show "ws/$BN:.claude/skills/unmerged/SKILL.md" | grep -qx 'workspace-owned unm
 o show "propose/$BN:$B/.claude/skills/unmerged/SKILL.md" | grep -qx 'workspace-owned unmerged' || fail "unmerged ownership not proposed"
 ok "retiring a source and obsolete opt-out preserves workspace ownership before its proposal merges"
 
+# Retirement compares against reviewed provenance, even if the branch edits its ledger hash.
+RI=software/workspace-inherit/.claude/skills/retire-safety
+on_main "retirement safety fixture" sh -c "mkdir -p $RI && echo shared >$RI/SKILL.md"
+sync refresh >/dev/null
+(cd "$t/dev" && git fetch -q && git checkout -q -B edited-retirement "origin/ws/$AN" &&
+  echo owned >>.claude/skills/retire-safety/SKILL.md &&
+  blob=$(git hash-object .claude/skills/retire-safety/SKILL.md) &&
+  awk -F'\t' -v OFS='\t' -v blob="$blob" '$2 == ".claude/skills/retire-safety/SKILL.md" { $1 = "100644 " blob } { print }' workspace.generated >ledger.tmp &&
+  mv ledger.tmp workspace.generated && git add -A && git commit -qm "edit retired payload and ledger hash" && git push -q origin "HEAD:ws/$AN")
+on_main "retire safety source" git rm -rq "$RI"
+owned_head=$(o rev-parse "ws/$AN")
+for direction in refresh propose; do
+  if sync "$direction" >"$t/out" 2>"$t/err"; then fail "$direction deleted edited retired output"; fi
+  grep -q 'retired managed .claude/skills/retire-safety/SKILL.md has local edits' "$t/err" || fail "$direction did not report retired edits"
+  [ "$(o rev-parse "ws/$AN")" = "$owned_head" ] || fail "$direction changed edited retired output"
+done
+o show "ws/$AN:.claude/skills/retire-safety/SKILL.md" | grep -qx owned || fail "edited retired payload was lost"
+! o cat-file -e "ws/$BN:.claude/skills/retire-safety/SKILL.md" 2>/dev/null || fail "retirement failure blocked another workspace"
+(cd "$t/dev" && git fetch -q && git checkout -q -B accept-retirement "origin/ws/$AN" &&
+  git rm -q .claude/skills/retire-safety/SKILL.md && git commit -qm "accept retirement" && git push -q origin "HEAD:ws/$AN")
+sync refresh "$AN" >/dev/null
+ok "retired edits refuse refresh and propose against trusted hashes while other workspaces continue"
+
+RI=software/workspace-inherit/.claude/skills/retire-optout
+on_main "unsynced opt-out fixture" sh -c "mkdir -p $RI && echo shared >$RI/SKILL.md"
+sync refresh "$BN" >/dev/null
+commit_on "ws/$BN" workspace.yml "  - .claude/skills/retire-optout"
+commit_on "ws/$BN" .claude/skills/retire-optout/SKILL.md "owned before sync"
+on_main "retire unsynced opt-out source" git rm -rq "$RI"
+(cd "$t/dev" && git fetch -q && git checkout -q -B obsolete-optout "origin/ws/$BN" &&
+  sed -i.bak '\|^  - .claude/skills/retire-optout$|d' workspace.yml && rm workspace.yml.bak &&
+  git commit -qam "drop obsolete opt-out before syncing" && git push -q origin "HEAD:ws/$BN")
+owned_head=$(o rev-parse "ws/$BN")
+if sync refresh "$BN" >"$t/out" 2>"$t/err"; then fail "retirement deleted unsynced ownership"; fi
+[ "$(o rev-parse "ws/$BN")" = "$owned_head" ] || fail "unsynced owned output changed"
+o show "ws/$BN:.claude/skills/retire-optout/SKILL.md" | grep -qx 'owned before sync' || fail "unsynced ownership was lost"
+(cd "$t/dev" && git fetch -q && git checkout -q -B accept-optout-retirement "origin/ws/$BN" &&
+  git rm -q .claude/skills/retire-optout/SKILL.md && git commit -qm "accept retirement" && git push -q origin "HEAD:ws/$BN")
+sync refresh "$BN" >/dev/null
+ok "retirement preserves an opt-out rescinded before any intermediate sync by reporting the ambiguity"
+
 # --- 5. a conflict on bms-dev is reported; argos-dev still syncs; exit 1
 commit_on ws/$BN CLAUDE.md "ws side"
 commit_on main "$B/CLAUDE.md" "main side"
@@ -366,6 +439,32 @@ if "$src/ci/render.sh" "$d" >"$t/out" 2>"$t/err"; then fail "renderer deleted ed
 grep -q 'retired managed file has local edits' "$t/err" || fail "retired edit not reported"
 [ "$(cat "$d/$A/.claude/skills/journal/SKILL.md")" = x ] || fail "retired edited output deleted"
 ok "main-side generation reports edited retired files and leaves their content intact"
+expect_bad retired-mode-edit 'retired managed file has local edits' sh -c "chmod +x $A/.claude/skills/journal/SKILL.md && rm -r software/workspace-inherit/.claude/skills/journal"
+d=$t/chk-retired-mode-edit
+if "$src/ci/render.sh" "$d" >"$t/out" 2>"$t/err"; then fail "renderer deleted mode-edited retired output"; fi
+[ -x "$d/$A/.claude/skills/journal/SKILL.md" ] || fail "retired executable mode was lost"
+ok "main-side retirement preserves executable-mode edits"
+
+expect_bad managed-file-to-owned-directory 'workspace-owned file collides' sh -c "rm $A/.claude/skills/journal/SKILL.md && mkdir $A/.claude/skills/journal/SKILL.md && echo owned >$A/.claude/skills/journal/SKILL.md/own"
+d=$t/chk-managed-file-to-owned-directory
+if "$src/ci/render.sh" "$d" >"$t/out" 2>"$t/err"; then fail "renderer wrote managed output into an owned directory"; fi
+[ "$(cat "$d/$A/.claude/skills/journal/SKILL.md/own")" = owned ] || fail "owned directory contents changed"
+[ -n "$(find "$d/$A/.claude/skills/journal/SKILL.md" -prune -perm -100)" ] || fail "owned directory traversal mode changed"
+ok "main-side generation refuses a managed file replaced by an owned directory without chmod or copy"
+
+expect_bad topology-empty-directory 'workspace-owned file collides' sh -c "mkdir $A/.claude/skills/journal/empty && rm -r software/workspace-inherit/.claude/skills/journal && echo replacement >software/workspace-inherit/.claude/skills/journal"
+d=$t/chk-topology-empty-directory
+if "$src/ci/render.sh" "$d" >"$t/out" 2>"$t/err"; then fail "renderer replaced an untracked empty directory"; fi
+[ -d "$d/$A/.claude/skills/journal/empty" ] || fail "untracked empty directory was removed"
+[ -f "$d/$A/.claude/skills/journal/SKILL.md" ] || fail "refused topology change removed managed siblings"
+ok "main-side topology changes preserve untracked empty directories"
+
+expect_bad render-symlink 'symlinks are not allowed' sh -c "cp $A/.claude/skills/journal/SKILL.md outside-symlink-target && rm $A/.claude/skills/journal/SKILL.md && ln -s ../../../../../../../../outside-symlink-target $A/.claude/skills/journal/SKILL.md && echo changed >>software/workspace-inherit/.claude/skills/journal/SKILL.md"
+d=$t/chk-render-symlink
+cp "$d/outside-symlink-target" "$t/symlink-target-before"
+if "$src/ci/render.sh" "$d" >"$t/out" 2>"$t/err"; then fail "renderer followed a symlink"; fi
+cmp -s "$d/outside-symlink-target" "$t/symlink-target-before" || fail "renderer changed a symlink target"
+ok "render refuses symlinks before changing any generated output"
 
 expect_bad inherited-twice "also inherits it from a folder above" sh -c "mkdir -p software/application-software/workspace-inherit/.claude/skills/journal && printf 'format: claude-code\\n' >software/application-software/workspace-inherit/source.yml && echo x >software/application-software/workspace-inherit/.claude/skills/journal/SKILL.md"
 expect_bad inherited-claude-md "software/workspace-inherit/CLAUDE.md: each workspace has its own" sh -c "mkdir -p software/workspace-inherit && printf 'format: claude-code\\n' >software/workspace-inherit/source.yml && echo x >software/workspace-inherit/CLAUDE.md"

From 7891f6df4b4a68ac8c4fac42808d49c0f451dd24 Mon Sep 17 00:00:00 2001
From: Jesus God <wyattbracy@gmail.com>
Date: Fri, 23 Oct 2026 20:40:32 +0000
Subject: [PATCH 11/18] Keep topology regression fixtures separate from parking
 scratch notes

---
 tests/e2e.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/e2e.sh b/tests/e2e.sh
index 63512ec..de87515 100644
--- a/tests/e2e.sh
+++ b/tests/e2e.sh
@@ -226,30 +226,30 @@ o show "ws/$AN:notes/layout" | grep -qx final || fail "refresh lost replacement
 ok "native managed paths can change back from directories to files in refresh and propose"
 
 # Ancestor files and owned directory siblings must be reported before any index writes.
-NI=software/workspace-inherit/notes
-commit_on "ws/$AN" notes/blocked "owned ancestor"
+NI=software/workspace-inherit/docs
+commit_on "ws/$AN" docs/blocked "owned ancestor"
 on_main "inherited descendant collision" sh -c "mkdir -p $NI/blocked && echo shared >$NI/blocked/guide.md"
 owned_head=$(o rev-parse "ws/$AN")
 for direction in refresh propose; do
   if sync "$direction" >"$t/out" 2>"$t/err"; then fail "$direction replaced an owned ancestor"; fi
-  grep -q 'workspace-owned notes/blocked collides' "$t/err" || fail "$direction did not report the owned ancestor"
+  grep -q 'workspace-owned docs/blocked collides' "$t/err" || fail "$direction did not report the owned ancestor"
   [ "$(o rev-parse "ws/$AN")" = "$owned_head" ] || fail "$direction changed the owned ancestor"
 done
-o show "ws/$BN:notes/blocked/guide.md" | grep -qx shared || fail "ancestor collision blocked another workspace"
+o show "ws/$BN:docs/blocked/guide.md" | grep -qx shared || fail "ancestor collision blocked another workspace"
 (cd "$t/dev" && git fetch -q && git checkout -q -B accept-descendant "origin/ws/$AN" &&
-  git rm -q notes/blocked && git commit -qm "accept managed descendant" && git push -q origin "HEAD:ws/$AN")
+  git rm -q docs/blocked && git commit -qm "accept managed descendant" && git push -q origin "HEAD:ws/$AN")
 sync refresh "$AN" >/dev/null
-commit_on "ws/$AN" notes/blocked/own.md "owned sibling"
+commit_on "ws/$AN" docs/blocked/own.md "owned sibling"
 on_main "replace inherited directory around an owned sibling" sh -c "rm -r $NI/blocked && echo replacement >$NI/blocked"
 owned_head=$(o rev-parse "ws/$AN")
 for direction in refresh propose; do
   if sync "$direction" "$AN" >"$t/out" 2>"$t/err"; then fail "$direction replaced an owned sibling"; fi
-  grep -q 'workspace-owned notes/blocked/own.md collides' "$t/err" || fail "$direction did not report the owned sibling"
+  grep -q 'workspace-owned docs/blocked/own.md collides' "$t/err" || fail "$direction did not report the owned sibling"
   [ "$(o rev-parse "ws/$AN")" = "$owned_head" ] || fail "$direction changed the owned sibling"
 done
-o show "ws/$AN:notes/blocked/own.md" | grep -qx 'owned sibling' || fail "owned sibling was lost"
+o show "ws/$AN:docs/blocked/own.md" | grep -qx 'owned sibling' || fail "owned sibling was lost"
 (cd "$t/dev" && git fetch -q && git checkout -q -B accept-replacement "origin/ws/$AN" &&
-  git rm -q notes/blocked/own.md && git commit -qm "accept managed replacement" && git push -q origin "HEAD:ws/$AN")
+  git rm -q docs/blocked/own.md && git commit -qm "accept managed replacement" && git push -q origin "HEAD:ws/$AN")
 sync refresh "$AN" >/dev/null
 ok "owned ancestors and directory siblings conflict explicitly while other workspaces keep refreshing"
 

From 646a45268ed97c4939876601bfbf37c0130be559 Mon Sep 17 00:00:00 2001
From: Jesus God <wyattbracy@gmail.com>
Date: Sat, 24 Oct 2026 06:34:39 +0000
Subject: [PATCH 12/18] Generate inherited workspace context only on workspace
 branches

---
 CLAUDE.md                                     |  16 +-
 README.md                                     |  27 +-
 ci/check.sh                                   |   6 +-
 ci/plugins.sh                                 |   2 +-
 ci/render.sh                                  | 153 ++++-------
 ci/sync.sh                                    | 253 ++++++++++++++----
 docs/design.md                                |  90 ++++---
 docs/goals.md                                 |  10 +-
 .../application-software/argos/AUTHORING.md   |  14 +-
 software/application-software/argos/README.md |   2 +-
 .../skills/address-pr-comments/SKILL.md       |  20 --
 .../scripts/fetch-feedback.sh                 |  48 ----
 .../address-pr-comments/scripts/github.sh     |  19 --
 .../argos-dev/.claude/skills/commit/SKILL.md  |   6 -
 .../skills/consolidate-spikes/SKILL.md        |  13 -
 .../.claude/skills/create-ticket/SKILL.md     |  66 -----
 .../.claude/skills/implement/SKILL.md         |  14 -
 .../argos-dev/.claude/skills/journal/SKILL.md |  22 --
 .../.claude/skills/journal/scripts/capture.sh |  17 --
 .../.claude/skills/new-worktree/SKILL.md      |  16 --
 .../argos-dev/.claude/skills/open-pr/SKILL.md |  22 --
 .../skills/open-pr/scripts/pr-checks.sh       |  23 --
 .../.claude/skills/pr-conventions/SKILL.md    |  15 --
 .../skills/pr-conventions/scripts/lint.sh     |  15 --
 .../.claude/skills/report-spike/SKILL.md      |  22 --
 .../.claude/skills/run-local/SKILL.md         |  14 -
 .../skills/run-local/scripts/run-local.sh     |  66 -----
 .../.claude/skills/run-local/scripts/serve.sh |  59 ----
 .../.claude/skills/setup-workspace/SKILL.md   |  18 --
 .../.claude/skills/switch-workspace/SKILL.md  |  20 --
 .../skills/ticket-conventions/SKILL.md        |  15 --
 .../.claude/skills/update-pr/SKILL.md         |   6 -
 .../.claude/skills/verify-graph/SKILL.md      |  24 --
 .../skills/verify-graph/scripts/check.js      |  83 ------
 .../skills/verify-graph/scripts/check.sh      |  14 -
 .../skills/verify-graph/scripts/open.sh       |  14 -
 .../skills/verify-graph/scripts/perf.js       |  38 ---
 .../skills/verify-graph/scripts/perf.sh       |  19 --
 .../skills/verify-graph/scripts/seed.sh       |  31 ---
 .../skills/verify-graph/scripts/select-run.sh |  18 --
 .../.claude/skills/verify-telemetry/SKILL.md  |  16 --
 .../verify-telemetry/scripts/check-topic.sh   |  28 --
 .../workspaces/argos-dev/workspace.generated  |  34 ---
 .../skills/address-pr-comments/SKILL.md       |  18 --
 .../scripts/fetch-feedback.sh                 |  48 ----
 .../address-pr-comments/scripts/github.sh     |  19 --
 .../.agents/skills/commit/SKILL.md            |   6 -
 .../skills/consolidate-spikes/SKILL.md        |  14 -
 .../.agents/skills/create-ticket/SKILL.md     |  66 -----
 .../.agents/skills/implement/SKILL.md         |  14 -
 .../.agents/skills/journal/SKILL.md           |  22 --
 .../.agents/skills/journal/scripts/capture.sh |  17 --
 .../.agents/skills/new-worktree/SKILL.md      |  16 --
 .../.agents/skills/open-pr/SKILL.md           |  22 --
 .../skills/open-pr/scripts/pr-checks.sh       |  23 --
 .../.agents/skills/pr-conventions/SKILL.md    |  14 -
 .../skills/pr-conventions/scripts/lint.sh     |  15 --
 .../.agents/skills/report-spike/SKILL.md      |  22 --
 .../.agents/skills/run-local/SKILL.md         |  14 -
 .../skills/run-local/scripts/run-local.sh     |  66 -----
 .../.agents/skills/run-local/scripts/serve.sh |  59 ----
 .../.agents/skills/setup-workspace/SKILL.md   |  18 --
 .../.agents/skills/switch-workspace/SKILL.md  |  19 --
 .../skills/ticket-conventions/SKILL.md        |  14 -
 .../.agents/skills/update-pr/SKILL.md         |   6 -
 .../.agents/skills/verify-graph/SKILL.md      |  23 --
 .../skills/verify-graph/scripts/check.js      |  83 ------
 .../skills/verify-graph/scripts/check.sh      |  14 -
 .../skills/verify-graph/scripts/open.sh       |  14 -
 .../skills/verify-graph/scripts/perf.js       |  38 ---
 .../skills/verify-graph/scripts/perf.sh       |  19 --
 .../skills/verify-graph/scripts/seed.sh       |  31 ---
 .../skills/verify-graph/scripts/select-run.sh |  18 --
 .../.agents/skills/verify-telemetry/SKILL.md  |  16 --
 .../verify-telemetry/scripts/check-topic.sh   |  28 --
 .../default-codex/workspace.generated         |  33 ---
 .../skills/address-pr-comments/SKILL.md       |  20 --
 .../scripts/fetch-feedback.sh                 |  48 ----
 .../address-pr-comments/scripts/github.sh     |  19 --
 .../.claude/skills/commit/SKILL.md            |   6 -
 .../skills/consolidate-spikes/SKILL.md        |  13 -
 .../.claude/skills/create-ticket/SKILL.md     |  66 -----
 .../.claude/skills/implement/SKILL.md         |  14 -
 .../.claude/skills/journal/SKILL.md           |  22 --
 .../.claude/skills/journal/scripts/capture.sh |  17 --
 .../.claude/skills/new-worktree/SKILL.md      |  16 --
 .../.claude/skills/open-pr/SKILL.md           |  22 --
 .../skills/open-pr/scripts/pr-checks.sh       |  23 --
 .../.claude/skills/pr-conventions/SKILL.md    |  15 --
 .../skills/pr-conventions/scripts/lint.sh     |  15 --
 .../.claude/skills/report-spike/SKILL.md      |  22 --
 .../.claude/skills/run-local/SKILL.md         |  14 -
 .../skills/run-local/scripts/run-local.sh     |  66 -----
 .../.claude/skills/run-local/scripts/serve.sh |  59 ----
 .../.claude/skills/setup-workspace/SKILL.md   |  18 --
 .../.claude/skills/switch-workspace/SKILL.md  |  20 --
 .../skills/ticket-conventions/SKILL.md        |  15 --
 .../.claude/skills/update-pr/SKILL.md         |   6 -
 .../.claude/skills/verify-graph/SKILL.md      |  24 --
 .../skills/verify-graph/scripts/check.js      |  83 ------
 .../skills/verify-graph/scripts/check.sh      |  14 -
 .../skills/verify-graph/scripts/open.sh       |  14 -
 .../skills/verify-graph/scripts/perf.js       |  38 ---
 .../skills/verify-graph/scripts/perf.sh       |  19 --
 .../skills/verify-graph/scripts/seed.sh       |  31 ---
 .../skills/verify-graph/scripts/select-run.sh |  18 --
 .../.claude/skills/verify-telemetry/SKILL.md  |  16 --
 .../verify-telemetry/scripts/check-topic.sh   |  28 --
 .../experimental/workspace.generated          |  34 ---
 .../skills/address-pr-comments/SKILL.md       |  20 --
 .../scripts/fetch-feedback.sh                 |  48 ----
 .../address-pr-comments/scripts/github.sh     |  19 --
 .../.claude/skills/commit/SKILL.md            |   6 -
 .../skills/consolidate-spikes/SKILL.md        |  13 -
 .../.claude/skills/create-ticket/SKILL.md     |  66 -----
 .../.claude/skills/journal/SKILL.md           |  22 --
 .../.claude/skills/journal/scripts/capture.sh |  17 --
 .../.claude/skills/new-worktree/SKILL.md      |  16 --
 .../.claude/skills/open-pr/SKILL.md           |  22 --
 .../skills/open-pr/scripts/pr-checks.sh       |  23 --
 .../.claude/skills/pr-conventions/SKILL.md    |  15 --
 .../.claude/skills/report-spike/SKILL.md      |  22 --
 .../.claude/skills/setup-workspace/SKILL.md   |  18 --
 .../.claude/skills/switch-workspace/SKILL.md  |  20 --
 .../skills/ticket-conventions/SKILL.md        |  14 -
 .../.claude/skills/update-pr/SKILL.md         |   6 -
 .../nero-experimental/workspace.generated     |  19 --
 .../skills/address-pr-comments/SKILL.md       |  20 --
 .../scripts/fetch-feedback.sh                 |  48 ----
 .../address-pr-comments/scripts/github.sh     |  19 --
 .../hub/.claude/skills/commit/SKILL.md        |   6 -
 .../skills/consolidate-spikes/SKILL.md        |  13 -
 .../hub/.claude/skills/create-ticket/SKILL.md |  66 -----
 .../hub/.claude/skills/journal/SKILL.md       |  22 --
 .../.claude/skills/journal/scripts/capture.sh |  17 --
 .../hub/.claude/skills/new-worktree/SKILL.md  |  16 --
 .../hub/.claude/skills/open-pr/SKILL.md       |  22 --
 .../skills/open-pr/scripts/pr-checks.sh       |  23 --
 .../hub/.claude/skills/report-spike/SKILL.md  |  22 --
 .../.claude/skills/setup-workspace/SKILL.md   |  18 --
 .../.claude/skills/switch-workspace/SKILL.md  |  20 --
 .../hub/.claude/skills/update-pr/SKILL.md     |   6 -
 .../workspaces/hub/workspace.generated        |  17 --
 .../.claude/skills/journal/SKILL.md           |  22 --
 .../.claude/skills/journal/scripts/capture.sh |  17 --
 .../.claude/skills/new-worktree/SKILL.md      |  16 --
 .../.claude/skills/setup-workspace/SKILL.md   |  18 --
 .../.claude/skills/switch-workspace/SKILL.md  |  20 --
 .../calypso-dev/workspace.generated           |   7 -
 tests/e2e.sh                                  | 208 ++++++++++----
 tools/new-workspace.sh                        |   4 +-
 151 files changed, 500 insertions(+), 3685 deletions(-)
 delete mode 100644 software/application-software/argos/workspaces/argos-dev/.claude/skills/address-pr-comments/SKILL.md
 delete mode 100755 software/application-software/argos/workspaces/argos-dev/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh
 delete mode 100644 software/application-software/argos/workspaces/argos-dev/.claude/skills/address-pr-comments/scripts/github.sh
 delete mode 100644 software/application-software/argos/workspaces/argos-dev/.claude/skills/commit/SKILL.md
 delete mode 100644 software/application-software/argos/workspaces/argos-dev/.claude/skills/consolidate-spikes/SKILL.md
 delete mode 100644 software/application-software/argos/workspaces/argos-dev/.claude/skills/create-ticket/SKILL.md
 delete mode 100644 software/application-software/argos/workspaces/argos-dev/.claude/skills/implement/SKILL.md
 delete mode 100644 software/application-software/argos/workspaces/argos-dev/.claude/skills/journal/SKILL.md
 delete mode 100755 software/application-software/argos/workspaces/argos-dev/.claude/skills/journal/scripts/capture.sh
 delete mode 100644 software/application-software/argos/workspaces/argos-dev/.claude/skills/new-worktree/SKILL.md
 delete mode 100644 software/application-software/argos/workspaces/argos-dev/.claude/skills/open-pr/SKILL.md
 delete mode 100755 software/application-software/argos/workspaces/argos-dev/.claude/skills/open-pr/scripts/pr-checks.sh
 delete mode 100644 software/application-software/argos/workspaces/argos-dev/.claude/skills/pr-conventions/SKILL.md
 delete mode 100644 software/application-software/argos/workspaces/argos-dev/.claude/skills/pr-conventions/scripts/lint.sh
 delete mode 100644 software/application-software/argos/workspaces/argos-dev/.claude/skills/report-spike/SKILL.md
 delete mode 100644 software/application-software/argos/workspaces/argos-dev/.claude/skills/run-local/SKILL.md
 delete mode 100755 software/application-software/argos/workspaces/argos-dev/.claude/skills/run-local/scripts/run-local.sh
 delete mode 100755 software/application-software/argos/workspaces/argos-dev/.claude/skills/run-local/scripts/serve.sh
 delete mode 100644 software/application-software/argos/workspaces/argos-dev/.claude/skills/setup-workspace/SKILL.md
 delete mode 100644 software/application-software/argos/workspaces/argos-dev/.claude/skills/switch-workspace/SKILL.md
 delete mode 100644 software/application-software/argos/workspaces/argos-dev/.claude/skills/ticket-conventions/SKILL.md
 delete mode 100644 software/application-software/argos/workspaces/argos-dev/.claude/skills/update-pr/SKILL.md
 delete mode 100644 software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/SKILL.md
 delete mode 100644 software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/check.js
 delete mode 100755 software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/check.sh
 delete mode 100755 software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/open.sh
 delete mode 100644 software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/perf.js
 delete mode 100755 software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/perf.sh
 delete mode 100755 software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/seed.sh
 delete mode 100755 software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/select-run.sh
 delete mode 100644 software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-telemetry/SKILL.md
 delete mode 100755 software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-telemetry/scripts/check-topic.sh
 delete mode 100644 software/application-software/argos/workspaces/argos-dev/workspace.generated
 delete mode 100644 software/application-software/argos/workspaces/default-codex/.agents/skills/address-pr-comments/SKILL.md
 delete mode 100755 software/application-software/argos/workspaces/default-codex/.agents/skills/address-pr-comments/scripts/fetch-feedback.sh
 delete mode 100644 software/application-software/argos/workspaces/default-codex/.agents/skills/address-pr-comments/scripts/github.sh
 delete mode 100644 software/application-software/argos/workspaces/default-codex/.agents/skills/commit/SKILL.md
 delete mode 100644 software/application-software/argos/workspaces/default-codex/.agents/skills/consolidate-spikes/SKILL.md
 delete mode 100644 software/application-software/argos/workspaces/default-codex/.agents/skills/create-ticket/SKILL.md
 delete mode 100644 software/application-software/argos/workspaces/default-codex/.agents/skills/implement/SKILL.md
 delete mode 100644 software/application-software/argos/workspaces/default-codex/.agents/skills/journal/SKILL.md
 delete mode 100755 software/application-software/argos/workspaces/default-codex/.agents/skills/journal/scripts/capture.sh
 delete mode 100644 software/application-software/argos/workspaces/default-codex/.agents/skills/new-worktree/SKILL.md
 delete mode 100644 software/application-software/argos/workspaces/default-codex/.agents/skills/open-pr/SKILL.md
 delete mode 100755 software/application-software/argos/workspaces/default-codex/.agents/skills/open-pr/scripts/pr-checks.sh
 delete mode 100644 software/application-software/argos/workspaces/default-codex/.agents/skills/pr-conventions/SKILL.md
 delete mode 100644 software/application-software/argos/workspaces/default-codex/.agents/skills/pr-conventions/scripts/lint.sh
 delete mode 100644 software/application-software/argos/workspaces/default-codex/.agents/skills/report-spike/SKILL.md
 delete mode 100644 software/application-software/argos/workspaces/default-codex/.agents/skills/run-local/SKILL.md
 delete mode 100755 software/application-software/argos/workspaces/default-codex/.agents/skills/run-local/scripts/run-local.sh
 delete mode 100755 software/application-software/argos/workspaces/default-codex/.agents/skills/run-local/scripts/serve.sh
 delete mode 100644 software/application-software/argos/workspaces/default-codex/.agents/skills/setup-workspace/SKILL.md
 delete mode 100644 software/application-software/argos/workspaces/default-codex/.agents/skills/switch-workspace/SKILL.md
 delete mode 100644 software/application-software/argos/workspaces/default-codex/.agents/skills/ticket-conventions/SKILL.md
 delete mode 100644 software/application-software/argos/workspaces/default-codex/.agents/skills/update-pr/SKILL.md
 delete mode 100644 software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/SKILL.md
 delete mode 100644 software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/check.js
 delete mode 100755 software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/check.sh
 delete mode 100755 software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/open.sh
 delete mode 100644 software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/perf.js
 delete mode 100755 software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/perf.sh
 delete mode 100755 software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/seed.sh
 delete mode 100755 software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/select-run.sh
 delete mode 100644 software/application-software/argos/workspaces/default-codex/.agents/skills/verify-telemetry/SKILL.md
 delete mode 100755 software/application-software/argos/workspaces/default-codex/.agents/skills/verify-telemetry/scripts/check-topic.sh
 delete mode 100644 software/application-software/argos/workspaces/default-codex/workspace.generated
 delete mode 100644 software/application-software/argos/workspaces/experimental/.claude/skills/address-pr-comments/SKILL.md
 delete mode 100755 software/application-software/argos/workspaces/experimental/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh
 delete mode 100644 software/application-software/argos/workspaces/experimental/.claude/skills/address-pr-comments/scripts/github.sh
 delete mode 100644 software/application-software/argos/workspaces/experimental/.claude/skills/commit/SKILL.md
 delete mode 100644 software/application-software/argos/workspaces/experimental/.claude/skills/consolidate-spikes/SKILL.md
 delete mode 100644 software/application-software/argos/workspaces/experimental/.claude/skills/create-ticket/SKILL.md
 delete mode 100644 software/application-software/argos/workspaces/experimental/.claude/skills/implement/SKILL.md
 delete mode 100644 software/application-software/argos/workspaces/experimental/.claude/skills/journal/SKILL.md
 delete mode 100755 software/application-software/argos/workspaces/experimental/.claude/skills/journal/scripts/capture.sh
 delete mode 100644 software/application-software/argos/workspaces/experimental/.claude/skills/new-worktree/SKILL.md
 delete mode 100644 software/application-software/argos/workspaces/experimental/.claude/skills/open-pr/SKILL.md
 delete mode 100755 software/application-software/argos/workspaces/experimental/.claude/skills/open-pr/scripts/pr-checks.sh
 delete mode 100644 software/application-software/argos/workspaces/experimental/.claude/skills/pr-conventions/SKILL.md
 delete mode 100644 software/application-software/argos/workspaces/experimental/.claude/skills/pr-conventions/scripts/lint.sh
 delete mode 100644 software/application-software/argos/workspaces/experimental/.claude/skills/report-spike/SKILL.md
 delete mode 100644 software/application-software/argos/workspaces/experimental/.claude/skills/run-local/SKILL.md
 delete mode 100755 software/application-software/argos/workspaces/experimental/.claude/skills/run-local/scripts/run-local.sh
 delete mode 100755 software/application-software/argos/workspaces/experimental/.claude/skills/run-local/scripts/serve.sh
 delete mode 100644 software/application-software/argos/workspaces/experimental/.claude/skills/setup-workspace/SKILL.md
 delete mode 100644 software/application-software/argos/workspaces/experimental/.claude/skills/switch-workspace/SKILL.md
 delete mode 100644 software/application-software/argos/workspaces/experimental/.claude/skills/ticket-conventions/SKILL.md
 delete mode 100644 software/application-software/argos/workspaces/experimental/.claude/skills/update-pr/SKILL.md
 delete mode 100644 software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/SKILL.md
 delete mode 100644 software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/check.js
 delete mode 100755 software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/check.sh
 delete mode 100755 software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/open.sh
 delete mode 100644 software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/perf.js
 delete mode 100755 software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/perf.sh
 delete mode 100755 software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/seed.sh
 delete mode 100755 software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/select-run.sh
 delete mode 100644 software/application-software/argos/workspaces/experimental/.claude/skills/verify-telemetry/SKILL.md
 delete mode 100755 software/application-software/argos/workspaces/experimental/.claude/skills/verify-telemetry/scripts/check-topic.sh
 delete mode 100644 software/application-software/argos/workspaces/experimental/workspace.generated
 delete mode 100644 software/application-software/nero/workspaces/nero-experimental/.claude/skills/address-pr-comments/SKILL.md
 delete mode 100755 software/application-software/nero/workspaces/nero-experimental/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh
 delete mode 100644 software/application-software/nero/workspaces/nero-experimental/.claude/skills/address-pr-comments/scripts/github.sh
 delete mode 100644 software/application-software/nero/workspaces/nero-experimental/.claude/skills/commit/SKILL.md
 delete mode 100644 software/application-software/nero/workspaces/nero-experimental/.claude/skills/consolidate-spikes/SKILL.md
 delete mode 100644 software/application-software/nero/workspaces/nero-experimental/.claude/skills/create-ticket/SKILL.md
 delete mode 100644 software/application-software/nero/workspaces/nero-experimental/.claude/skills/journal/SKILL.md
 delete mode 100755 software/application-software/nero/workspaces/nero-experimental/.claude/skills/journal/scripts/capture.sh
 delete mode 100644 software/application-software/nero/workspaces/nero-experimental/.claude/skills/new-worktree/SKILL.md
 delete mode 100644 software/application-software/nero/workspaces/nero-experimental/.claude/skills/open-pr/SKILL.md
 delete mode 100755 software/application-software/nero/workspaces/nero-experimental/.claude/skills/open-pr/scripts/pr-checks.sh
 delete mode 100644 software/application-software/nero/workspaces/nero-experimental/.claude/skills/pr-conventions/SKILL.md
 delete mode 100644 software/application-software/nero/workspaces/nero-experimental/.claude/skills/report-spike/SKILL.md
 delete mode 100644 software/application-software/nero/workspaces/nero-experimental/.claude/skills/setup-workspace/SKILL.md
 delete mode 100644 software/application-software/nero/workspaces/nero-experimental/.claude/skills/switch-workspace/SKILL.md
 delete mode 100644 software/application-software/nero/workspaces/nero-experimental/.claude/skills/ticket-conventions/SKILL.md
 delete mode 100644 software/application-software/nero/workspaces/nero-experimental/.claude/skills/update-pr/SKILL.md
 delete mode 100644 software/application-software/nero/workspaces/nero-experimental/workspace.generated
 delete mode 100644 software/application-software/workspaces/hub/.claude/skills/address-pr-comments/SKILL.md
 delete mode 100755 software/application-software/workspaces/hub/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh
 delete mode 100644 software/application-software/workspaces/hub/.claude/skills/address-pr-comments/scripts/github.sh
 delete mode 100644 software/application-software/workspaces/hub/.claude/skills/commit/SKILL.md
 delete mode 100644 software/application-software/workspaces/hub/.claude/skills/consolidate-spikes/SKILL.md
 delete mode 100644 software/application-software/workspaces/hub/.claude/skills/create-ticket/SKILL.md
 delete mode 100644 software/application-software/workspaces/hub/.claude/skills/journal/SKILL.md
 delete mode 100755 software/application-software/workspaces/hub/.claude/skills/journal/scripts/capture.sh
 delete mode 100644 software/application-software/workspaces/hub/.claude/skills/new-worktree/SKILL.md
 delete mode 100644 software/application-software/workspaces/hub/.claude/skills/open-pr/SKILL.md
 delete mode 100755 software/application-software/workspaces/hub/.claude/skills/open-pr/scripts/pr-checks.sh
 delete mode 100644 software/application-software/workspaces/hub/.claude/skills/report-spike/SKILL.md
 delete mode 100644 software/application-software/workspaces/hub/.claude/skills/setup-workspace/SKILL.md
 delete mode 100644 software/application-software/workspaces/hub/.claude/skills/switch-workspace/SKILL.md
 delete mode 100644 software/application-software/workspaces/hub/.claude/skills/update-pr/SKILL.md
 delete mode 100644 software/application-software/workspaces/hub/workspace.generated
 delete mode 100644 software/firmware/calypso/workspaces/calypso-dev/.claude/skills/journal/SKILL.md
 delete mode 100755 software/firmware/calypso/workspaces/calypso-dev/.claude/skills/journal/scripts/capture.sh
 delete mode 100644 software/firmware/calypso/workspaces/calypso-dev/.claude/skills/new-worktree/SKILL.md
 delete mode 100644 software/firmware/calypso/workspaces/calypso-dev/.claude/skills/setup-workspace/SKILL.md
 delete mode 100644 software/firmware/calypso/workspaces/calypso-dev/.claude/skills/switch-workspace/SKILL.md
 delete mode 100644 software/firmware/calypso/workspaces/calypso-dev/workspace.generated

diff --git a/CLAUDE.md b/CLAUDE.md
index 7feaaf4..d6cb38a 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -19,7 +19,7 @@ source of truth; `docs/goals.md` lists what any change must keep.
   (`software/**/plugins/<harness>/<set>/`, named `<scope>[.<set>]`; a folder's scope is its
   `plugins/scope`, else its `short-name`, else its name), each Claude Code workspace's `workspace.yml` `plugins:` defaults (the
   `default` set of every folder above), and its `.claude/settings.json` (enabled sets, and the SessionStart hook that sets `$DELPHI_ROOT`; never edit
-  it by hand). `ci/render.sh` calls it on main before recording managed outputs.
+  it by hand). `ci/render.sh` calls it for main-side plugin output.
 - `.delphi/{setup,new-worktree,switch,park,plugins}.sh`: the scripts every workspace runs (setup.sh
   runs `plugins.sh`, which makes this clone's local `@delphi` installs what the workspace enables and
   uninstalls ones the marketplace dropped, so plugin changes need no migration); `.delphi/paths.sh`
@@ -40,15 +40,17 @@ source of truth; `docs/goals.md` lists what any change must keep.
   folder (the one holding `workspaces/`) may add `README.md`, `AUTHORING.md`, and `workspace-defaults/`
   (translated once into a new workspace there). Existing source layouts stay intact; optional
   `source.yml` declares a different authoring format. Any org/project folder may add `workspace-inherit/`;
-  `ci/render.sh` materializes managed native copies on main, and refresh copies them to ws branches.
-  `workspace.generated` records ownership; `opt-out:` transfers a native path to the workspace.
+  CI prepares inheritance in temporary staging and refresh copies it only to ws branches.
+  Their `workspace.generated` records ownership; `opt-out:` transfers a native path to the workspace.
+  Main keeps owned native files and canonical sources, never inherited copies or ledgers.
 - `.github/workflows/delphi.yml` (identical to the template's copy), `.github/CODEOWNERS`; issue templates (idea, spike, epic, dev work) and the PR template in `.github/`, filed with the `create-ticket` skill (`.claude/skills/`).
 - `tests/e2e.sh`: end-to-end test in a throwaway sandbox (bare origin, stub `gh` logging to `gh.log`).
-- `ci/render.sh [--check]`: prepare native workspace output on main (or check freshness). Run it
-  after shared-source, harness, ownership or plugin changes and include outputs in the same PR.
+- `ci/render.sh [--check] [--workspace <folder>] [<main-checkout> [<staging-output>]]`: update plugin
+  output, or prepare inherited native files and ledgers in optional temporary staging. Main-side
+  checks reject managed copies, ledgers and ownership collisions; inherited output is never committed there.
   `ci/harnesses.sh` declares targets; `ci/sources.sh` reads independent source formats;
-  `ci/inherit.sh` resolves sources. `ci/managed.sh` shares ownership logic with sync, which does no
-  harness conversion during refresh. Every workspace must explicitly declare its harness. Codex uses
+  `ci/inherit.sh` resolves sources. `ci/managed.sh` shares ownership logic with sync, whose refresh
+  copies staged output. Every workspace must explicitly declare its harness. Codex uses
   `.delphi/exec.sh` to initialize helper commands in independent shells.
 
 ## Rules
diff --git a/README.md b/README.md
index 7603ce5..20ecd97 100644
--- a/README.md
+++ b/README.md
@@ -6,8 +6,10 @@ named by the **short name** of each folder above it, from `software/` down, then
 name, joined by dots: `software/application-software/argos/workspaces/argos-dev` is
 `s.app.argos.argos-dev` (a folder's short name is its `short-name` file, else its name;
 `.delphi/names.sh` prints them all). For each one, CI keeps a branch **`ws/<name>`**
-whose repo root *is* that folder. Each workspace explicitly declares its harness, and its folder on
-`main` already contains native files for that harness. People and agents work on it with plain git. Design: `docs/design.md`. Goals: `docs/goals.md`.
+whose repo root *is* that folder. Each workspace explicitly declares its harness and keeps its owned
+files at native paths on `main`. Shared skills stay in their canonical sources on main; CI adds
+inherited native copies only to `ws/*`. People and agents work with plain git. Design:
+`docs/design.md`. Goals: `docs/goals.md`.
 
 ## How it works
 
@@ -84,8 +86,9 @@ references are there too (a workspace inside another's `workspaces/` skips its o
 edited from the workspace that links them; to change one, work in its own clone or switch to it.
 
 The workspace's dotted name is repeated in `name:` so a checkout knows which workspace it is; names
-are unique (give a folder a `short-name` that no sibling's name or short name clashes with). Files live at normal harness paths. `workspace.generated` records main-owned rendered files;
-workspace instructions, docs and opted-out copies remain workspace-owned. The workflow comes from
+are unique (give a folder a `short-name` that no sibling's name or short name clashes with). Files
+live at normal harness paths. On `ws/*`, `workspace.generated` records managed copies; it never
+returns to main. Instructions, docs and opted-out copies remain workspace-owned. The workflow comes from
 the template. The scripts, `.delphi/*.sh`
 (listed in `.delphi/manifest.yml`), live once at main's root: sync puts
 `.delphi/` on every `ws/*` branch, so change them only through PRs to main.
@@ -129,15 +132,15 @@ can hold shared context (`README.md`), a guide to its workspaces (`AUTHORING.md`
 format; each workspace's `harness:` independently selects its target. `workspace-defaults/` seeds
 workspace-owned files once; `workspace-inherit/` stays managed.
 
-**Prepare on main.** After changing shared sources, harness selections, opt-outs or plugins, run
-`bash ci/render.sh` and include its native output in the PR. `ci/check.sh` includes the read-only
-freshness check. Workspace branches receive those reviewed files through refresh. Workspace edits
-are rendered in the proposal to main and return after merge.
+**Preparation and sync.** CI translates inheritance from main into temporary staging, then refresh
+copies it onto workspace branches. Main contains no inherited copies or ownership ledgers.
+After source or configuration changes, run `bash ci/render.sh` to update plugin settings and
+`bash ci/check.sh` to validate the repo. Commit sources and owned files; CI prepares inheritance.
 
-**Ownership.** `workspace.generated` records managed copies; edit their sources instead. To keep
-an editable workspace copy, list its native path under `opt-out:` and render or use the normal
-workspace proposal. Collisions with workspace-owned files are reported. See `docs/design.md` for
-the adapter contract and ownership rules.
+**Ownership.** Edit shared sources instead of their managed branch copies. To keep an editable
+workspace copy, list its native path under `opt-out:`. Proposals retain owned files and opted-out
+skills while stripping managed copies, `workspace.generated` and the branch's `.delphi/`.
+Collisions are reported. See `docs/design.md` for the adapter contract and ownership rules.
 
 ## CI (`.github/workflows/delphi.yml`)
 
diff --git a/ci/check.sh b/ci/check.sh
index 592bb79..32fa58e 100755
--- a/ci/check.sh
+++ b/ci/check.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
-# ci/check.sh [<dir> [<base>]]: validate workspace identities, explicit harnesses, native main-side
-# output and the runtime release contract. Lists every problem without changing the checkout.
+# ci/check.sh [<dir> [<base>]]: validate main-owned workspaces, staged inheritance and runtime releases.
+# Lists every problem without changing the checkout.
 set -euo pipefail
 here=$(cd "$(dirname "$0")" && pwd)
 # shellcheck source=ci/inherit.sh
@@ -69,7 +69,7 @@ while IFS= read -r at; do bad "$at: names a harness variable; call scripts as \`
     awk 'NR == 1 && /^---$/ { f = 1; next } f && /^---$/ { f = 0; next } !f && /\$\{CLAUDE_/ { print FILENAME ":" FNR; exit }' "$f"
   done)
 if messages=$(bash "$here/render.sh" --check . 2>&1); then :
-elif [ -z "$messages" ]; then bad "native workspace output validation failed"; fi
+elif [ -z "$messages" ]; then bad "inherited output validation failed"; fi
 while IFS= read -r msg; do [ -z "$msg" ] || bad "$msg"; done <<<"$messages"
 
 manifest() { # <workspace.yml> [<name>]: without <name> (a workspace-defaults/ manifest), `name:` is not allowed
diff --git a/ci/plugins.sh b/ci/plugins.sh
index 0a9b611..2fabf3b 100755
--- a/ci/plugins.sh
+++ b/ci/plugins.sh
@@ -15,7 +15,7 @@
 #     settings go in .claude/settings.local.json, shared ones here or in workspace.yml.
 #   --check writes nothing; it lists each out-of-date file or problem and exits 1 if any.
 # ci/plugins.sh yml|settings <folder> <workspace.yml>: print one workspace's workspace.yml or
-#   settings.json, from <dir> = . (main-side output only; refresh copies reviewed files).
+#   settings.json, from <dir> = . (also used for temporary branch staging).
 set -euo pipefail
 repo=Northeastern-Electric-Racing/Delphi
 
diff --git a/ci/render.sh b/ci/render.sh
index 469e8d4..648fa07 100755
--- a/ci/render.sh
+++ b/ci/render.sh
@@ -1,29 +1,44 @@
 #!/usr/bin/env bash
-# ci/render.sh [--check] [<main checkout>]: materialize native managed files before a PR reaches main.
+# ci/render.sh [--check] [--workspace <folder>] [<main checkout> [<staging output>]]:
+# validate main-owned files and prepare inherited native files outside workspace folders on main.
 set -euo pipefail
 here=$(cd "$(dirname "$0")" && pwd)
 # shellcheck source=ci/inherit.sh
 source "$here/inherit.sh"
 # shellcheck source=ci/managed.sh
 source "$here/managed.sh"
-check=0
-[ "${1:-}" != --check ] || { check=1; shift; }
-cd "${1:-.}"
+check=0 only=""
+while [ "$#" -gt 0 ]; do
+  case "$1" in
+    --check) check=1; shift ;;
+    --workspace) [ "$#" -ge 2 ] || exit 2; only=$2; shift 2 ;;
+    *) break ;;
+  esac
+done
+[ "$#" -le 2 ] || { echo "render: too many arguments" >&2; exit 2; }
+[ -z "$only" ] || { safe_path "$only" && [ "$#" = 2 ]; } || { echo "render: --workspace needs a safe folder and staging output" >&2; exit 2; }
+checkout=${1:-.} output=${2:-}
+if [ -n "$output" ]; then mkdir -p "$output"; output=$(cd "$output" && pwd -P); fi
+cd "$checkout"
 tmp=$(mktemp -d)
 trap 'rm -rf "$tmp"' EXIT
+output=${output:-$tmp/native}
+case "$output/" in "$(pwd -P)/"*) echo "render: staging output must be outside the main checkout" >&2; exit 2 ;; esac
 problems=0
 bad() { echo "render: $*" >&2; problems=$((problems + 1)); }
 while IFS= read -r path; do bad "$path: symlinks are not allowed under software/"; done \
   < <(find software -type l 2>/dev/null)
+while IFS= read -r path; do bad "$path: symlinks are not allowed in staging output"; done \
+  < <(find "$output" -type l 2>/dev/null)
 [ "$problems" = 0 ] || exit 1
-if [ "$check" = 1 ]; then
-  bash "$here/plugins.sh" --check . || problems=$((problems + 1))
-else
-  bash "$here/plugins.sh" . || exit 1
+if [ -z "$only" ]; then
+  if [ "$check" = 1 ]; then bash "$here/plugins.sh" --check . || problems=$((problems + 1))
+  else bash "$here/plugins.sh" . || exit 1; fi
 fi
 
-render_workspace() { # <workspace folder>
-  local folder=$1 adapter out records old meta path src seen="" used="" o start=$problems previous actual mode collision child parent
+render_workspace() { # <workspace folder>: main keeps owned files; inherited output and ledger go to staging
+  local folder=$1 adapter out records meta path src seen="" used="" o parent target=$output/$1
+  [ ! -e "$folder/$generated" ] || { bad "$folder/$generated: ownership records belong only on workspace branches"; return; }
   adapter=$(awk '/^harness:/ { print $2; exit }' "$folder/workspace.yml")
   harness "$adapter" || { bad "$folder/workspace.yml: unknown harness '$adapter'"; return; }
   if [ "$plugins" = none ] && awk '/^plugins:/ { s = 1; next } /^[^[:space:]#]/ { s = 0 }
@@ -32,108 +47,52 @@ render_workspace() { # <workspace folder>
   fi
   out=$(optouts <"$folder/workspace.yml")
   records=$(inherited_files "$folder" "$adapter") || { bad "$folder: cannot resolve inherited sources"; return; }
-  old=""
-  [ ! -f "$folder/$generated" ] || old=$(generated_records <"$folder/$generated") || { bad "$folder/$generated: invalid ownership record"; return; }
-  rm -rf "$tmp/native"
+  rm -rf "$target"
+  mkdir -p "$target"
   : >"$tmp/records"
   while IFS=$'\t' read -r meta path src; do
     [ -n "$path" ] || continue
-    if ! safe_path "$path" || ! safe_path "$src"; then
-      bad "$src: unsafe inherited destination '$path'"; continue
-    fi
+    if ! safe_path "$path" || ! safe_path "$src"; then bad "$src: unsafe inherited destination '$path'"; continue; fi
     case "$path" in "$instruction" | CLAUDE.md | AGENTS.md | workspace.yml | workspace.generated | .delphi | .delphi/* | .claude/settings.json | .codex/config.toml | .github/workflows/delphi.yml)
       bad "$src: each workspace has its own $path; it can't be inherited"; continue ;;
     esac
     case " $seen " in *" $path "*) bad "$src: $folder also inherits it from a folder above; keep one" ;; esac
     seen="$seen $path"
-    for o in $out; do
-      if opted_out "$path" "$o"; then used="$used $o"; fi
-    done
+    for o in $out; do if opted_out "$path" "$o"; then used="$used $o"; fi; done
     opted_out "$path" "$out" && continue
-    mkdir -p "$(dirname "$tmp/native/$path")"
-    harness_file "$adapter" "$src" >"$tmp/native/$path"
-    meta="${meta%% *} $(git hash-object -- "$tmp/native/$path")"
+    if [ -e "$folder/$path" ]; then
+      bad "$folder/$path: workspace-owned file collides with $src; inherited copies belong only on workspace branches"; continue
+    fi
+    parent=$path
+    while [ "$parent" != "${parent%/*}" ]; do
+      parent=${parent%/*}
+      if [ -e "$folder/$parent" ] && [ ! -d "$folder/$parent" ]; then
+        bad "$folder/$parent: workspace-owned file collides with $src"; break
+      fi
+    done
+    mkdir -p "$(dirname "$target/$path")"
+    harness_file "$adapter" "$src" >"$target/$path"
+    meta="${meta%% *} $(git hash-object -- "$target/$path")"
+    if [ "${meta%% *}" = 100755 ]; then chmod +x "$target/$path"; fi
     printf '%s\t%s\t%s\n' "$meta" "$path" "$src" >>"$tmp/records"
   done <<<"$records"
   for o in $out; do
+    # Refresh can carry an obsolete branch opt-out until its owner removes it in a PR.
+    [ -z "$only" ] || continue
     case " $used " in *" $o "*) ;; *) bad "$folder/workspace.yml: opt-out: $o is nothing it inherits" ;; esac
   done
-  if [ "$plugins" = claude ] && [ -f "$folder/.claude/settings.json" ]; then
-    printf '100644 %s\t.claude/settings.json\tci/plugins.sh\n' "$(git hash-object -- "$folder/.claude/settings.json")" >>"$tmp/records"
-  fi
-  LC_ALL=C sort -t $'\t' -k2,2 "$tmp/records" >"$tmp/sorted"
-  { ledger_header; cat "$tmp/sorted"; } >"$tmp/ledger"
-  # Explicit opt-outs transfer ownership. Only a previous managed record permits retirement.
-  while IFS=$'\t' read -r meta path src; do
-    [ -n "$path" ] || continue
-    opted_out "$path" "$out" && continue
-    awk -F'\t' -v p="$path" '$2 == p { found = 1 } END { exit !found }' "$tmp/sorted" && continue
-    [ -f "$folder/$path" ] || continue
-    mode=100644; [ ! -x "$folder/$path" ] || mode=100755
-    if [ "$mode $(git hash-object -- "$folder/$path")" != "$meta" ]; then
-      bad "$folder/$path: retired managed file has local edits; preserve it explicitly before rendering"
-    elif [ "$check" = 1 ]; then
-      bad "$folder/$path: stale managed output; run ci/render.sh"
-    fi
-  done <<<"$old"
-  while IFS=$'\t' read -r meta path src; do
-    [ -n "$path" ] || continue
-    previous=$(printf '%s\n' "$old" | awk -F'\t' -v p="$path" '$2 == p { print $1; exit }')
-    collision=""
-    if [ -d "$folder/$path" ]; then
-      while IFS= read -r child; do
-        child=${child#"$folder"/}
-        if [ ! -f "$folder/$child" ] || ! recorded "$child" "$old" || opted_out "$child" "$out"; then collision=$child; break; fi
-      done < <(find "$folder/$path" ! -type d -o -empty)
-    elif [ -e "$folder/$path" ] && [ -z "$previous" ] && [ "$src" != ci/plugins.sh ]; then
-      collision=$path
-    fi
-    parent=$(dirname "$path")
-    while [ "$parent" != . ]; do
-      if [ -e "$folder/$parent" ] && [ ! -d "$folder/$parent" ] &&
-        { ! recorded "$parent" "$old" || opted_out "$parent" "$out"; }; then collision=$parent; break; fi
-      parent=$(dirname "$parent")
-    done
-    if [ -n "$collision" ]; then
-      bad "$folder/$collision: workspace-owned file collides with $src; opt out or remove it explicitly"
-      continue
-    fi
-    actual=""
-    [ ! -f "$folder/$path" ] || actual=$(git hash-object -- "$folder/$path")
-    if [ "$check" = 1 ]; then
-      [ "$actual" = "${meta#* }" ] || bad "$folder/$path: inherited from $src and out of date; run ci/render.sh"
-      if [ -f "$folder/$path" ]; then
-        if [ "${meta%% *}" = 100755 ]; then [ -x "$folder/$path" ] || bad "$folder/$path: executable mode is out of date; run ci/render.sh"
-        else [ ! -x "$folder/$path" ] || bad "$folder/$path: executable mode is out of date; run ci/render.sh"; fi
-      fi
-    elif [ -n "$previous" ] && [ -n "$actual" ] && [ "$actual" != "${previous#* }" ] && [ "$actual" != "${meta#* }" ]; then
-      bad "$folder/$path: managed file has local edits; edit $src or opt out before rendering"
-    fi
-  done <"$tmp/sorted"
-  if [ "$check" = 1 ]; then
-    cmp -s "$tmp/ledger" "$folder/$generated" || bad "$folder/$generated: ownership record is out of date; run ci/render.sh"
-    return
+  if [ "$plugins" = claude ]; then
+    mkdir -p "$target/.claude"
+    bash "$here/plugins.sh" settings "$folder" "$folder/workspace.yml" >"$target/.claude/settings.json" || return 1
+    printf '100644 %s\t.claude/settings.json\tci/plugins.sh\n' "$(git hash-object -- "$target/.claude/settings.json")" >>"$tmp/records"
   fi
-  [ "$problems" = "$start" ] || return 0
-  while IFS=$'\t' read -r meta path src; do
-    [ -n "$path" ] || continue
-    opted_out "$path" "$out" && continue
-    if ! awk -F'\t' -v p="$path" '$2 == p { found = 1 } END { exit !found }' "$tmp/sorted"; then
-      rm -f "$folder/$path"
-      previous=$(dirname "$folder/$path")
-      while [ "$previous" != "$folder" ] && rmdir "$previous" 2>/dev/null; do previous=$(dirname "$previous"); done
-    fi
-  done <<<"$old"
-  while IFS=$'\t' read -r meta path src; do
-    [ -n "$path" ] || continue
-    [ "$src" != ci/plugins.sh ] || continue
-    [ ! -d "$folder/$path" ] || { bad "$folder/$path: cannot replace a remaining directory with managed output"; return; }
-    mkdir -p "$(dirname "$folder/$path")"
-    cp "$tmp/native/$path" "$folder/$path"
-    if [ "${meta%% *}" = 100755 ]; then chmod +x "$folder/$path"; else chmod -x "$folder/$path"; fi
-  done <"$tmp/sorted"
-  cp "$tmp/ledger" "$folder/$generated"
+  { ledger_header; LC_ALL=C sort -t $'\t' -k2,2 "$tmp/records"; } >"$target/$generated"
 }
 
-while read -r _ folder; do render_workspace "$folder"; done < <(bash "$here/../.delphi/names.sh")
+if [ -n "$only" ]; then
+  [ -f "$only/workspace.yml" ] || { echo "render: no workspace $only" >&2; exit 1; }
+  render_workspace "$only"
+else
+  while read -r _ folder; do render_workspace "$folder"; done < <(bash "$here/../.delphi/names.sh")
+fi
 [ "$problems" = 0 ] || exit 1
diff --git a/ci/sync.sh b/ci/sync.sh
index 013b5d9..7d0f440 100755
--- a/ci/sync.sh
+++ b/ci/sync.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # ci/sync.sh [refresh|propose] [<name>]: subtree-sync native workspace folders on main with ws/<name>.
-# Refresh copies reviewed generated files and main's runtime; it never reads source formats or runs
-# harness adapters. Propose prepares a main checkout, renders its managed output, validates and opens a PR.
+# Inherited native output is staged from main's sources and kept only on workspace branches.
+# Subtree merges carry owned files; proposals exclude inherited copies and their ownership ledger.
 # Temporary worktrees keep the caller untouched. Conflicts in workspace-owned files are reported.
 set -euo pipefail
 here=$(cd "$(dirname "$0")" && pwd)
@@ -16,8 +16,9 @@ case "$only" in *[!a-z0-9.-]*) echo "usage: ci/sync.sh [refresh|propose] [<name>
 git fetch --quiet --prune origin
 main=$(git rev-parse origin/main)
 wt=$(mktemp -d)
+cache=$(mktemp -d)
 git worktree add --quiet --detach "$wt" "$main"
-trap 'git worktree remove --force "$wt"; rm -f "$wt.index"' EXIT
+trap 'git worktree remove --force "$wt"; rm -f "$wt.index"; rm -rf "$cache"' EXIT
 failed=0 names=" "
 tree() { git -C "$wt" rev-parse --quiet --verify "$1^{tree}" || true; } # empty if <rev> is missing
 file_entry() { git ls-tree "$1" -- "$2" | awk '$1 == "100644" || $1 == "100755" { print $1 " " $3 }'; }
@@ -25,51 +26,148 @@ file_entry() { git ls-tree "$1" -- "$2" | awk '$1 == "100644" || $1 == "100755"
 with_delphi() { # <commit> [<folder>/]: its tree with <folder>/.delphi/ dropped, or (no folder) its
   # .delphi/ replaced by main's. Built in a temporary index, so the worktree is untouched.
   local i=$wt.index
-  rm -f "$i"
-  GIT_INDEX_FILE=$i git read-tree "$1"
-  GIT_INDEX_FILE=$i git rm -rqf --cached --ignore-unmatch -- "${2:-}.delphi" >/dev/null
+  rm -f "$i" || return 1
+  GIT_INDEX_FILE=$i git read-tree "$1" || return 1
+  GIT_INDEX_FILE=$i git rm -rqf --cached --ignore-unmatch -- "${2:-}.delphi" >/dev/null || return 1
   [ -n "${2:-}" ] || ! git rev-parse -q --verify "$main:.delphi" >/dev/null ||
-    GIT_INDEX_FILE=$i git read-tree --prefix=.delphi/ "$main:.delphi"
-  GIT_INDEX_FILE=$i git write-tree
+    GIT_INDEX_FILE=$i git read-tree --prefix=.delphi/ "$main:.delphi" || return 1
+  GIT_INDEX_FILE=$i git write-tree || return 1
   rm -f "$i"
 }
 
-previous_records() { # <workspace commit> <folder>: ownership from the main revision it last merged
-  local base
-  base=$(git merge-base "$1" "$main" || true)
-  if [ -n "$base" ]; then
-    if git cat-file -e "$base:$2/$generated" 2>/dev/null; then ledger "$base:$2/$generated"
-    else ledger "$base:$generated"; fi
+source_checkout() { # <main revision>: extract immutable sources once, outside the merge worktree
+  local source=$cache/$1/source
+  if [ ! -f "$cache/$1/source-ready" ]; then
+    mkdir -p "$source" || return 1
+    git archive "$1" | tar -x -C "$source" || return 1
+    : >"$cache/$1/source-ready" || return 1
+  fi
+  printf '%s\n' "$source"
+}
+
+staged() { # <main revision> <folder>: trusted native output, including historical pre-staging main
+  local source target=$cache/$1/native/$2 renderer records meta path src ready=$cache/status/main/$1/$2
+  if [ ! -f "$ready" ]; then
+    source=$(source_checkout "$1") || return 1
+    mkdir -p "$target" || return 1
+    if git cat-file -e "$1:$2/$generated" 2>/dev/null; then
+      records=$(ledger "$1:$2/$generated") || return 1
+      while IFS=$'\t' read -r meta path src; do
+        [ -n "$path" ] || continue
+        [ "$(file_entry "$1" "$2/$path")" = "$meta" ] || { echo "sync: invalid historical managed output $2/$path" >&2; return 1; }
+        mkdir -p "$(dirname "$target/$path")" || return 1
+        git show "$1:$2/$path" >"$target/$path" || return 1
+        [ "${meta%% *}" != 100755 ] || chmod +x "$target/$path" || return 1
+      done <<<"$records"
+      { ledger_header; printf '%s\n' "$records"; } >"$target/$generated" || return 1
+    else
+      renderer=$here/render.sh
+      if [ -f "$source/ci/render.sh" ] && grep -q -- '--workspace' "$source/ci/render.sh"; then renderer=$source/ci/render.sh; fi
+      if [ ! -f "$source/ci/render.sh" ] && ! grep -q '^harness:' "$source/$2/workspace.yml"; then
+        printf '\nharness: claude-code\n' >>"$source/$2/workspace.yml" || return 1
+      fi
+      bash "$renderer" --workspace "$2" "$source" "$cache/$1/native" >&2 || return 1
+    fi
+    mkdir -p "$(dirname "$ready")" || return 1
+    : >"$ready" || return 1
+  fi
+  printf '%s\n' "$target"
+}
+
+previous_main() { # <workspace commit>: newest source-shaped main ancestor, never a workspace merge-base
+  local revision
+  for revision in $(git rev-list --first-parent "$main"); do
+    if git merge-base --is-ancestor "$revision" "$1"; then printf '%s\n' "$revision"; return; fi
+  done
+}
+
+previous_records() { # <workspace commit> <folder>: reconstruct trusted ownership from previous main sources
+  local base native recipe records settings
+  recipe=$(git log --first-parent -1 --format=%H "$1" -- "$generated") || return 1
+  recipe=${recipe:-$1}
+  base=$(previous_main "$recipe") || return 1
+  [ -n "$base" ] || return 0
+  git cat-file -e "$base:$2/workspace.yml" 2>/dev/null || return 0
+  native=$(staged "$base" "$2") || return 1
+  if ! git cat-file -e "$recipe:$generated" 2>/dev/null || git cat-file -e "$base:$2/$generated" 2>/dev/null; then
+    generated_records <"$native/$generated"
+    return
+  fi
+  settings=$(generated_records <"$native/$generated" | awk -F'\t' '$3 == "ci/plugins.sh"') || return 1
+  native=$(staged_recipe "$base" "$2" "$recipe") || return 1
+  records=$(generated_records <"$native/$generated") || return 1
+  printf '%s\n' "$records" | awk -F'\t' -v settings="$settings" '$3 == "ci/plugins.sh" && settings != "" { print settings; next } { print }'
+}
+
+staged_recipe() { # recover the last generated target from its manifest; hashes come only from trusted main sources
+  local source original renderer target=$cache/recipe/$1/$3/native/$2 ready=$cache/status/recipe/$1/$3/$2
+  if [ ! -f "$ready" ]; then
+    original=$(source_checkout "$1") || return 1
+    source=$cache/recipe/$1/$3/source
+    mkdir -p "$source" || return 1
+    cp -R "$original/." "$source/" || return 1
+    rm -rf "${source:?}/$2" || return 1
+    mkdir -p "$source/$2" || return 1
+    git show "$3:workspace.yml" >"$source/$2/workspace.yml" || return 1
+    renderer=$here/render.sh
+    if [ -f "$source/ci/render.sh" ] && grep -q -- '--workspace' "$source/ci/render.sh"; then renderer=$source/ci/render.sh; fi
+    bash "$renderer" --workspace "$2" "$source" "$cache/recipe/$1/$3/native" >&2 || return 1
+    mkdir -p "$(dirname "$ready")" || return 1
+    : >"$ready" || return 1
   fi
+  printf '%s\n' "$target"
+}
+
+legacy_workspace() { # pre-ledger workspaces alone may adopt copies proven by source provenance
+  local base
+  git cat-file -e "$1:$generated" 2>/dev/null && return 1
+  base=$(previous_main "$1") || return 1
+  [ -n "$base" ] && ! git cat-file -e "$base:ci/render.sh" 2>/dev/null
 }
 
 managed_records() { # <workspace commit> <folder>: trusted previous ownership, restricted by branch ownership
-  local old trusted
+  local old trusted meta path src
   old=$(ledger "$1:$generated") || return 1
   trusted=$(previous_records "$1" "$2") || return 1
+  if legacy_workspace "$1"; then
+    while IFS=$'\t' read -r meta path src; do
+      [ -n "$path" ] || continue
+      [ "$(file_entry "$1" "$path")" != "$meta" ] || printf '%s\t%s\t%s\n' "$meta" "$path" "$src"
+    done <<<"$trusted"
+    return
+  fi
   # Dropping an entry after an opt-out records the ownership transfer, even before its proposal merges.
   printf '%s\n' "$old" | awk -F'\t' -v trusted="$trusted" 'BEGIN {
     n = split(trusted, rows, "\n"); for (i = 1; i <= n; i++) { split(rows[i], f, "\t"); owned[f[2]] = rows[i] }
   } $2 in owned { print owned[$2] }'
 }
 
-with_generated() { # <workspace commit> <folder>: copy reviewed native output; no source resolution
-  local i=$wt.index now old out meta path src entry blob base legacy=0 branch_entry child parent paths
-  now=$(ledger "$main:$2/$generated") || return 1
-  old=$(managed_records "$1" "$2") || return 1
-  out=$(git show "$1:workspace.yml" | optouts)
-  base=$(git merge-base "$1" "$main" || true)
-  if [ -n "$base" ] && ! git cat-file -e "$base:$2/$generated" 2>/dev/null &&
-    ! git cat-file -e "$base:$generated" 2>/dev/null; then legacy=1; fi
+with_generated() { # <workspace commit> <folder> [<ownership commit> [<native stage>]]: check ownership, then materialize
+  local i=$wt.index now old out meta path src entry blob base legacy=0 branch_entry child parent paths native owner=${3:-$1} trusted main_native
+  native=${4:-$(staged_recipe "$main" "$2" "$1")} || return 1
+  now=$(generated_records <"$native/$generated") || return 1
+  old=$(managed_records "$owner" "$2") || return 1
+  trusted=$(previous_records "$owner" "$2") || return 1
+  out=$(git show "$1:workspace.yml" | optouts) || return 1
+  base=$(previous_main "$owner") || return 1
+  if legacy_workspace "$owner"; then legacy=1; fi
+  main_native=$(staged "$main" "$2") || return 1
+  # Unmerged plugin choices wait for their proposal to merge, as do main's other native settings.
+  entry=$(generated_records <"$main_native/$generated" | awk -F'\t' '$3 == "ci/plugins.sh"') || return 1
+  if [ -n "$entry" ]; then
+    now=$(printf '%s\n' "$now" | awk -F'\t' -v settings="$entry" '$3 == "ci/plugins.sh" { print settings; next } { print }') || return 1
+  fi
   while IFS=$'\t' read -r meta path src; do
     [ -n "$path" ] || continue
     opted_out "$path" "$out" && continue
     while IFS=$'\t' read -r branch_entry child; do
       [ -n "$child" ] || continue
       if recorded "$child" "$old" && ! opted_out "$child" "$out"; then continue; fi
+      [ "$src" != ci/plugins.sh ] || [ "$child" != "$path" ] || continue
       branch_entry="${branch_entry%% *} ${branch_entry##* }"
       # Pre-ledger clones can adopt copies proven by reviewed output or previous main provenance.
       if [ "$legacy" = 1 ] && [ "$child" = "$path" ] && { [ "$branch_entry" = "$meta" ] ||
+        [ "$branch_entry" = "$(printf '%s\n' "$trusted" | awk -F'\t' -v p="$path" '$2 == p { print $1; exit }')" ] ||
         [ "$branch_entry" = "$(file_entry "$base" "$src")" ] ||
         [ "$branch_entry" = "$(file_entry "$base" "$2/$path")" ]; }; then continue; fi
       echo "sync: $2: CONFLICT: workspace-owned $child collides with managed output $path; opt out or resolve it in a workspace PR" >&2
@@ -95,36 +193,73 @@ with_generated() { # <workspace commit> <folder>: copy reviewed native output; n
       return 1
     fi
   done <<<"$old"
-  rm -f "$i"
-  GIT_INDEX_FILE=$i git read-tree "$1"
-  paths=$(printf '%s\n%s\n' "$old" "$now" | cut -f2 | LC_ALL=C sort -u)
+  rm -f "$i" || return 1
+  GIT_INDEX_FILE=$i git read-tree "$1" || return 1
+  paths=$(printf '%s\n%s\n' "$old" "$now" | cut -f2 | LC_ALL=C sort -u) || return 1
   while IFS= read -r path; do
     [ -n "$path" ] || continue
     opted_out "$path" "$out" && continue
     GIT_INDEX_FILE=$i git update-index --force-remove -- "$path" || return 1
   done <<<"$paths"
-  while IFS= read -r path; do
+  while IFS=$'\t' read -r meta path src; do
     [ -n "$path" ] || continue
     opted_out "$path" "$out" && continue
-    entry=$(file_entry "$main" "$2/$path")
-    [ -z "$entry" ] || GIT_INDEX_FILE=$i git update-index --add --cacheinfo "${entry%% *},${entry##* },$path" || return 1
-  done <<<"$paths"
+    entry=$native/$path
+    if [ "$src" = ci/plugins.sh ] && [ -f "$main_native/$path" ]; then entry=$main_native/$path; fi
+    blob=$(git hash-object -w -- "$entry") || return 1
+    [ "$blob" = "${meta#* }" ] || { echo "sync: staged hash mismatch for $path" >&2; return 1; }
+    GIT_INDEX_FILE=$i git update-index --add --cacheinfo "${meta%% *},$blob,$path" || return 1
+  done <<<"$now"
   blob=$({ ledger_header
     while IFS=$'\t' read -r meta path src; do
       [ -n "$path" ] || continue
       opted_out "$path" "$out" || printf '%s\t%s\t%s\n' "$meta" "$path" "$src"
     done <<<"$now"
-  } | git hash-object -w --stdin)
-  GIT_INDEX_FILE=$i git update-index --add --cacheinfo "100644,$blob,$generated"
-  GIT_INDEX_FILE=$i git write-tree
+  } | git hash-object -w --stdin) || return 1
+  GIT_INDEX_FILE=$i git update-index --add --cacheinfo "100644,$blob,$generated" || return 1
+  GIT_INDEX_FILE=$i git write-tree || return 1
+  rm -f "$i"
+}
+
+without_generated() { # <normalized workspace commit>: leave owned payloads and native settings for subtree merging
+  local i=$wt.index records meta path src
+  records=$(ledger "$1:$generated") || return 1
+  rm -f "$i" || return 1
+  GIT_INDEX_FILE=$i git read-tree "$1" || return 1
+  while IFS=$'\t' read -r meta path src; do
+    [ -n "$path" ] || continue
+    [ "$src" != ci/plugins.sh ] || continue
+    GIT_INDEX_FILE=$i git update-index --force-remove -- "$path" || return 1
+  done <<<"$records"
+  GIT_INDEX_FILE=$i git update-index --force-remove -- "$generated" || return 1
+  GIT_INDEX_FILE=$i git write-tree || return 1
   rm -f "$i"
 }
 
-resolve_generated_conflicts() { # <workspace commit> <folder> <prefix>: only explicit managed ownership resolves automatically
+staged_workspace() { # <stripped workspace commit> <folder>: render current sources with the merged owned workspace
+  local source original target=$cache/workspace/$1/native/$2 ready=$cache/status/workspace/$1/$2
+  if [ ! -f "$ready" ]; then
+    original=$(source_checkout "$main") || return 1
+    source=$cache/workspace/$1/source
+    mkdir -p "$source" || return 1
+    cp -R "$original/." "$source/" || return 1
+    rm -rf "${source:?}/$2" || return 1
+    mkdir -p "$source/$2" || return 1
+    git archive "$1" | tar -x -C "$source/$2" || return 1
+    rm -rf "$source/$2/.delphi" || return 1
+    bash "$here/render.sh" --workspace "$2" "$source" "$cache/workspace/$1/native" >&2 || return 1
+    mkdir -p "$(dirname "$ready")" || return 1
+    : >"$ready" || return 1
+  fi
+  printf '%s\n' "$target"
+}
+
+resolve_generated_conflicts() { # <stripped workspace commit> <folder> <prefix> <ownership commit>
   local now old previous out paths path relative entry meta src
-  now=$(ledger "$main:$2/$generated") || return 1
-  old=$(managed_records "$1" "$2") || return 1
-  previous=$(previous_records "$1" "$2") || return 1
+  now=$(staged "$main" "$2") || return 1
+  now=$(generated_records <"$now/$generated") || return 1
+  old=$(managed_records "$4" "$2") || return 1
+  previous=$(previous_records "$4" "$2") || return 1
   out=$(git show "$1:workspace.yml" | optouts)
   paths=" $(printf '%s\n%s\n' "$old" "$now" | cut -f2 | tr '\n' ' ') $generated "
   while IFS=$'\t' read -r meta path src; do
@@ -134,17 +269,19 @@ resolve_generated_conflicts() { # <workspace commit> <folder> <prefix>: only exp
     relative=${path#"$3"}
     [ "$path" = "$3$relative" ] || continue
     case "$paths" in *" $relative "*) ;; *) continue ;; esac
-    git -C "$wt" update-index --force-remove -- "$path"
-    if [ "$relative" = "$generated" ] || opted_out "$relative" "$out"; then
+    git -C "$wt" update-index --force-remove -- "$path" || return 1
+    entry=""
+    if [ "$relative" = "$generated" ]; then :
+    elif opted_out "$relative" "$out"; then
       entry=$(file_entry "$1" "$relative")
     else
       entry=$(file_entry "$main" "$2/$relative")
     fi
-    [ -z "$entry" ] || git -C "$wt" update-index --add --cacheinfo "${entry%% *},${entry##* },$path"
+    [ -z "$entry" ] || git -C "$wt" update-index --add --cacheinfo "${entry%% *},${entry##* },$path" || return 1
   done < <(git -C "$wt" diff --name-only --diff-filter=U)
   [ -z "$(git -C "$wt" diff --name-only --diff-filter=U)" ] || return 1
-  git -C "$wt" commit --quiet --no-edit
-  git -C "$wt" reset --quiet --hard HEAD
+  git -C "$wt" commit --quiet --no-edit || return 1
+  git -C "$wt" reset --quiet --hard HEAD || return 1
 }
 
 conflict() { # <message>: report the conflicted files, abort the merge, skip this workspace
@@ -161,30 +298,45 @@ refresh() { # <name> <folder> <old name>: leave the worktree at ws/<name> with m
     from=$was # its old name is ahead: carry that over
   fi
   if [ -z "$(tree "$from")" ]; then
+    local initial native
+    initial=$(with_delphi "$main:$2") || { failed=1 ok=0; return; }
+    initial=$(git commit-tree -p "$main" -m "delphi: prepare ws/$1" "$initial") || { failed=1 ok=0; return; }
+    initial=$(with_generated "$initial" "$2") || { failed=1 ok=0; return; }
     git -C "$wt" checkout --quiet --detach \
-      "$(git commit-tree -p "$main" -m "delphi: create ws/$1 from $2" "$(with_delphi "$main:$2")")"
-    git -C "$wt" push --quiet origin "HEAD:refs/heads/ws/$1"
+      "$(git commit-tree -p "$main" -m "delphi: create ws/$1 from $2" "$initial")" || { failed=1 ok=0; return; }
+    git -C "$wt" push --quiet origin "HEAD:refs/heads/ws/$1" || { failed=1 ok=0; return; }
     echo "ws/$1: created from $2"
     return
   fi
-  local head t ws
+  local head t ws native
   t=$(with_generated "$from" "$2") || { failed=1 ok=0; return; }
   ws=$from
   if [ "$t" != "$(tree "$from")" ]; then
     ws=$(git commit-tree -p "$from" -m "delphi: sync generated files from main" "$t")
   fi
+  t=$(without_generated "$ws") || { failed=1 ok=0; return; }
+  [ "$t" = "$(tree "$ws")" ] || ws=$(git commit-tree -p "$ws" -m "delphi: prepare owned files for refresh" "$t")
   git -C "$wt" checkout --quiet --detach "$ws"
   if ! git -C "$wt" merge --quiet --no-ff -Xsubtree="$2" -m "delphi: refresh ws/$1 from main" "$main" >/dev/null; then
-    if ! resolve_generated_conflicts "$ws" "$2" ""; then
+    if ! resolve_generated_conflicts "$ws" "$2" "" "$from"; then
       conflict "ws/$1: CONFLICT refreshing from main; merge main into ws/$1 in a PR (see README)."
       return
     fi
   fi
   head=$(git -C "$wt" rev-parse HEAD)
+  native=$(staged_workspace "$head" "$2") || { failed=1 ok=0; return; }
+  t=$(with_generated "$head" "$2" "$from" "$native") || { failed=1 ok=0; return; }
+  if [ "$t" != "$(tree "$head")" ]; then
+    head=$(git commit-tree -p "$head" -m "delphi: sync generated files from main" "$t")
+    git -C "$wt" checkout --quiet --detach "$head"
+  fi
   t=$(with_delphi "$head")
   if [ "$t" != "$(tree "$head")" ]; then
     git -C "$wt" checkout --quiet --detach "$(git commit-tree -p "$head" -m "delphi: sync .delphi/ from main" "$t")"
   fi
+  if [ "$(tree HEAD)" = "$(tree "$from")" ] && git merge-base --is-ancestor "$main" "$from"; then
+    git -C "$wt" checkout --quiet --detach "$from"
+  fi
   if [ "$from" != "refs/remotes/origin/ws/$1" ]; then
     git -C "$wt" push --quiet origin "HEAD:refs/heads/ws/$1" "HEAD:refs/heads/ws/$3"
     echo "ws/$1: from ws/$3, its old name (pushed to both)"
@@ -194,15 +346,18 @@ refresh() { # <name> <folder> <old name>: leave the worktree at ws/<name> with m
   fi
 }
 
-propose() { # <name> <folder>: PR the worktree's ws/<name> into main if it changes anything
-  local ws title="ws/$1 → main" body pr
+propose() { # <name> <folder>: PR owned workspace files into main, leaving inherited output on ws/*
+  local ws owner title="ws/$1 → main" body pr
   ws=$(git -C "$wt" rev-parse HEAD)
+  owner=$ws
   local t
   t=$(with_generated "$ws" "$2") || { failed=1 ok=0; return; }
   [ "$t" = "$(tree "$ws")" ] || ws=$(git commit-tree -p "$ws" -m "delphi: prepare managed files for proposal" "$t")
+  t=$(without_generated "$ws") || { failed=1 ok=0; return; }
+  [ "$t" = "$(tree "$ws")" ] || ws=$(git commit-tree -p "$ws" -m "delphi: propose owned files only" "$t")
   git -C "$wt" checkout --quiet --detach "$main"
   if ! git -C "$wt" merge --quiet --no-ff -Xsubtree="$2" -m "delphi: propose ws/$1 to main" "$ws" >/dev/null; then
-    if ! resolve_generated_conflicts "$ws" "$2" "$2/"; then
+    if ! resolve_generated_conflicts "$ws" "$2" "$2/" "$owner"; then
       conflict "ws/$1: CONFLICT proposing to main; merge main into ws/$1 in a PR (see README)."
       return
     fi
diff --git a/docs/design.md b/docs/design.md
index 084f08c..f969c52 100644
--- a/docs/design.md
+++ b/docs/design.md
@@ -4,8 +4,8 @@ Goals: `docs/goals.md`. No CLI: plain git plus a few shell scripts run by GitHub
 
 ## 1. Model
 
-`main` holds every workspace as a folder, `software/**/workspaces/<leaf>/`, with its files at their
-normal harness paths (declared in `ci/harnesses.sh`). A workspace's `<name>` is the short name
+`main` holds each workspace's owned files in `software/**/workspaces/<leaf>/`, at their native
+harness paths (declared in `ci/harnesses.sh`). A workspace's `<name>` is the short name
 of each folder from `software/` down to its project folder, then `<leaf>`, joined by dots
 (`s.app.argos.argos-dev` for `software/application-software/argos/workspaces/argos-dev`). A folder's
 short name is the one line in its `short-name` file, else its own name; `.delphi/names.sh [<rev>]`
@@ -16,12 +16,11 @@ folder name (`workspaces/<name>`, `.delphi/parked/<name>`), and no branch can be
 merges (`git merge -Xsubtree=<folder>`), so the histories stay joined and edits on either side meet
 in normal three-way merges. The one thing shared is main's root `.delphi/` (the scripts): sync
 puts it at the root of every `ws/*` branch, so it is on every branch, main included, and is edited
-only on main. Shared sources remain editable on main. Creation seeds defaults once; `ci/render.sh` maintains
-inherited native copies inside each workspace folder before merge. The workspace's
-required `harness:` selects its target independently of the source bundle's `format:`. Branch
-refresh copies those reviewed files; it never reads source formats or runs harness adapters.
-A project's `workspace-defaults/` seeds workspace-owned files once at creation. `workspaces:` still
-checks out other branches to read, and harness plugins carry what workspaces opt into.
+only on main. Shared context lives once in canonical sources on main. CI prepares inherited native
+files in temporary staging; refresh adds them only to `ws/*`. Each workspace explicitly selects
+its `harness:`, independently of a source bundle's `format:`. A project's `workspace-defaults/`
+seeds owned files once at creation. Proposals return owned changes and omit managed inheritance.
+`workspaces:` checks out other branches to read, and harness plugins carry optional capabilities.
 
 ```
    ┌───────────────────────────────┐
@@ -58,13 +57,12 @@ software/<org>/…/plugins/<harness>/<set>/   a plugin set for the workspaces un
 software/<org>/…/short-name           the folder's short name in workspace names (optional; default: its name)
 software/<org>/…/plugins/scope        its scope in plugin names (optional; default: its short name)
 .claude-plugin/marketplace.json       every Claude Code plugin set under software/ (generated)
-software/<org>/…/workspaces/<leaf>/   workspace.yml  native instructions and skills  docs/…
-                                      workspace.generated: managed output origins and hashes
+software/<org>/…/workspaces/<leaf>/   workspace.yml and owned native files; no inherited copies or ledger
 .delphi/                              {setup,new-worktree,switch,park,plugins,version}.sh  manifest.yml  versions
                                       migrations/  .gitattributes  .gitignore: on every ws/* root
 ci/sync.sh  ci/check.sh               CI scripts
 ci/harnesses.sh  ci/sources.sh       target adapter registry and independent source reader
-ci/inherit.sh  ci/render.sh          source resolution and main-side native rendering
+ci/inherit.sh  ci/render.sh          source resolution and temporary native staging
 ci/managed.sh                        ownership records; shared with branch sync
 ci/plugins.sh                         writes the marketplace and each workspace's .claude/settings.json
 tools/new-workspace.sh                new workspace as a PR
@@ -94,23 +92,25 @@ intact. A source bundle is Claude-authored unless its optional `source.yml` decl
 `format:`. Source metadata is never copied into a workspace. A defaults manifest's optional
 `harness:` suggests a creation target; every workspace records its own explicit target.
 
-`ci/render.sh` prepares native workspace files on main. `ci/inherit.sh` selects ancestor sources,
-`ci/sources.sh` maps their paths, and `ci/harnesses.sh` adapts their contents for the target. Each
-payload is prepared once; its hash and written bytes come from that same result. Claude content
+`ci/render.sh` prepares inheritance from a main checkout into temporary staging. `ci/inherit.sh`
+selects ancestor sources, `ci/sources.sh` maps paths, and `ci/harnesses.sh` adapts target content.
+Each payload is prepared once, then hashed and copied from those same bytes. Claude skill content
 passes through unchanged. Codex adapts skill metadata, instruction references and switch guidance;
 helper scripts pass through unchanged. Unsupported native settings mappings fail.
 
-Run `bash ci/render.sh` after source, harness, ownership or plugin changes and include the outputs
-in the same PR. `ci/check.sh` runs its read-only freshness check. Workspace creation and proposals
-prepare output before their PRs; refresh copies it without running source readers or adapters.
+`ci/render.sh [--check] [--workspace <folder>] [<main-checkout> [<staging-output>]]` updates plugin
+output by default. An optional staging destination receives inherited native files and ownership
+ledgers without adding them to main. `--workspace` selects one workspace; `--check` validates
+without changing the main checkout. `ci/check.sh` rejects committed inherited copies, ledgers,
+ownership collisions and invalid sources, and checks generated plugin settings.
 
-`workspace.generated` records managed destinations, origins, modes and native hashes. Edit sources,
-not the ledger or managed copies. `opt-out:` transfers a native path to workspace ownership. The
-renderer rejects duplicate destinations. Rendering and sync report owned collisions and refuse
-retirement of files with edited content or executable mode. Sync preserves branch-owned additions;
-pre-ledger copies are adopted only when they match reviewed output or
-previous main provenance. Ambiguous edits are reported for resolution in a workspace PR.
-Inheritance cannot replace a workspace's identity, native root instructions, runtime or workflow.
+On `ws/*`, `workspace.generated` records managed destinations, origins, modes and native hashes.
+Edit sources instead of managed copies. `opt-out:` transfers a native file or folder to workspace
+ownership; that copy can return to main through a proposal. Managed output and its ledger exist
+only in staging and workspace branches. Ownership checks protect owned additions and report
+ambiguous edits or retirements. Inheritance cannot replace workspace identity, root instructions,
+runtime or workflow files.
+When changing a workspace's harness, update its owned native files too; CI regenerates inheritance.
 
 ```mermaid
 ---
@@ -120,12 +120,14 @@ config:
     htmlLabels: false
 ---
 flowchart TD
-    S["Shared sources on main"] --> R["ci/render.sh"]
+    S["Canonical sources on main"] --> R["Temporary preparation"]
     W["workspace.yml: harness"] --> R
-    R --> C["Native Codex folder on main"]
-    R --> A["Native Claude folder on main"]
-    C <-->|"refresh / propose"| CB["Codex workspace branch"]
-    A <-->|"refresh / propose"| AB["Claude workspace branch"]
+    R --> T["Staged native inheritance"]
+    T -->|"refresh copies"| B["Workspace branch"]
+    W -->|"owned native files"| B
+    B -->|"propose strips managed"| P["PR with owned changes"]
+    P --> W
+    style R fill:#eff6ff,stroke:#2563eb,color:#111827,stroke-width:2px
 ```
 
 A plugin set is for what `workspace-inherit/` can't do: context only some workspaces opt into, or
@@ -176,18 +178,17 @@ that touches a set is an update.
 
 For every workspace on `origin/main` (or just `<name>`):
 
-1. **Refresh** copies main's native managed files using `workspace.generated`, respecting the
-   workspace branch's opt-outs. It then subtree-merges main into the workspace and syncs the root
-   `.delphi/`. A new branch starts from the workspace folder plus main's runtime, parented by main.
-   No source reader or target adapter runs on refresh. Managed ownership resolves managed-file
-   changes; conflicting workspace-owned files still require a normal PR. Removed managed files
-   are identified by ownership records, so a former opt-out remains owned even before its proposal
-   merges. Dropped ownership records are carried on the workspace branch.
-2. **Propose** normalizes managed copies from main, subtree-merges the workspace into a temporary
-   main checkout, and drops the workspace's root `.delphi/`. It runs `ci/render.sh` there, so changed
-   configuration or ownership produces reviewable native output in the main-side proposal. Then
-   it runs `ci/check.sh`, compares trees, and opens or updates `propose/<name>` only if needed.
-   Existing PR labels are preserved.
+1. **Prepare** resolves main's sources and each workspace's explicit harness into temporary native
+   staging. Shared sources and main's workspace folders remain separate from inherited output.
+2. **Refresh** subtree-merges owned files, copies staged inheritance with its `workspace.generated`,
+   and syncs main's root `.delphi/`. It respects branch opt-outs and checks ownership before
+   replacing or retiring files. A new branch has the workspace folder, staged inheritance and
+   main's runtime at its root, parented by main. Branch updates copy prepared bytes; translation
+   never runs in the workspace checkout.
+3. **Propose** strips managed inheritance, `workspace.generated` and the workspace's `.delphi/`
+   before preparing a main-side PR. Owned files and opted-out skills remain. It regenerates
+   plugin settings, runs `ci/check.sh`, and opens or updates `propose/<name>` only when the tree
+   changes. Existing PR labels are preserved. No inherited output is committed to main.
 
 History stays joined through subtree merges; workspace branches are never force-pushed. Legacy
 path-named branches still carry over into dotted names while ahead, and receive the result once;
@@ -325,14 +326,15 @@ harness's native paths, appends instruction defaults to its native template, fil
 and preserves ordinary defaults. Unsupported native mappings fail.
 
 The tool runs `ci/render.sh` and `ci/check.sh`, then opens `new-workspace/<org-path>/<leaf>` as a
-main-side PR with the complete native context and a `by: <who>` label. Sync creates `ws/<name>`
-once it merges; creation never depends on branch-side translation.
+main-side PR with owned native files and a `by: <who>` label. After merge, CI creates `ws/<name>`
+and adds staged inheritance there. Defaults are seeded once; inherited skills never enter the
+creation PR.
 
 ### Adding a harness or source format
 
 Register the target's native paths, template, plugin capability and foreign-file exclusions in
 `ci/harnesses.sh`, then add its instruction template. Put content adaptation in `harness_file()`.
-Select it in a workspace manifest, render, and run the sandbox suite. Ordinary targets need no
+Select it in a workspace manifest, validate staging, and run the sandbox suite. Ordinary targets need no
 renderer, validator or sync changes. Add explicit settings mappings or new capability validation
 only when the target introduces them.
 
diff --git a/docs/goals.md b/docs/goals.md
index 1eb906f..fe682e7 100644
--- a/docs/goals.md
+++ b/docs/goals.md
@@ -4,14 +4,14 @@ What Delphi must achieve, not how. Any change must keep these. Details: `docs/de
 
 ## Purpose
 
-Author reusable AI context once, organized by the org chart, and keep reviewable native copies
-in each workspace on main. Let
-anyone, person or agent, work on a workspace with plain git and send improvements back.
+Author reusable AI context once, organized by the org chart, and deliver native context to each
+workspace branch. Let anyone, person or agent, work with plain git and send improvements back.
 
 ## Goals
 
-- **G1. Workspaces live in Delphi.** Each workspace is a folder on `main` with every file at its
-  normal harness location.
+- **G1. Workspaces live in Delphi.** Each workspace is a folder on `main` with an explicit harness
+  and its owned files at native paths. Shared context lives once in canonical sources; inherited
+  copies exist only on workspace branches.
 - **G2. The workspace is the repo root.** Checking out `ws/<name>` gives exactly that workspace at
   the root. `.delphi/setup.sh` clones the code repos it lists and, separately, checks out their default branch as a worktree.
 - **G3. Both directions, automatically.** Refresh: changes on `main` reach `ws/<name>`. Propose:
diff --git a/software/application-software/argos/AUTHORING.md b/software/application-software/argos/AUTHORING.md
index 502b6e2..eb8bf5c 100644
--- a/software/application-software/argos/AUTHORING.md
+++ b/software/application-software/argos/AUTHORING.md
@@ -23,9 +23,10 @@ the selected harness template and translated `workspace-defaults/`, then opens a
 
 Edit on a branch of `main` and open a PR to `main` (from a workspace: `bash .delphi/switch.sh main`;
 don't edit `workspaces/main/` from a workspace). `workspace-defaults/`
-only affects workspaces created afterwards; to change existing ones, PR each workspace too. `workspace-inherit/` reaches
-every Argos workspace through managed native copies on main. Run `bash ci/render.sh` and include
-its outputs in the same PR; refresh then copies those reviewed files to workspace branches.
+only affects workspaces created afterwards; to change existing ones, PR each workspace too.
+`workspace-inherit/` reaches every Argos workspace through temporary CI preparation and refresh.
+Commit its sources, never generated skill copies or `workspace.generated`, to main. Run
+`bash ci/render.sh` for plugin output and `bash ci/check.sh` before opening the PR.
 
 ## Writing good workspace context
 
@@ -33,12 +34,13 @@ its outputs in the same PR; refresh then copies those reviewed files to workspac
 - One skill per repeatable workflow, with a `description` that says when to use it.
 - Agent context (glossary, conventions, skills) lives in the workspace; the glossary goes in `docs/`.
   Shared Claude skills stay in `workspace-inherit/.claude/skills/<name>/` at the project or org level.
-  The main-side renderer preserves Claude metadata and translates Codex copies into its native
-  directory; change sources through PRs to `main`. Ordinary inherited docs go in `workspace-inherit/`.
+  CI preserves Claude metadata and translates Codex copies into its native directory only on
+  workspace branches; change sources through PRs to `main`. Ordinary inherited docs go in `workspace-inherit/`.
   Optional `source.yml` selects a different authoring format. Context only some workspaces need goes in
   the workspace, or in a supported plugin set selected under `plugins:`. Codex does not load the
   Claude plugin sets. Workspace-owned native skills remain editable and proposable; use a native
-  destination under `opt-out:` when taking ownership of an inherited skill.
+  destination under `opt-out:` when taking ownership of an inherited skill. Proposals return that
+  owned copy to main and strip other managed inheritance.
   ADRs about a code repo live in that repo, so `docs/` holds only ADRs about the workspace itself.
   Avoid file paths and code in specs and tickets.
 - Make new branches as worktrees (`new-worktree` skill) unless told otherwise.
diff --git a/software/application-software/argos/README.md b/software/application-software/argos/README.md
index deb210e..fa64148 100644
--- a/software/application-software/argos/README.md
+++ b/software/application-software/argos/README.md
@@ -13,7 +13,7 @@ backend (`scylla-server/`), with schema tooling in `charybdis/` and MQTT broker
 | `workspaces/argos-dev/` | Day-to-day Argos development: tickets, specs, PRs |
 | `workspaces/default-codex/` | Argos development with the Codex harness |
 | `workspace-defaults/` | What a new Argos workspace starts with (see `AUTHORING.md`) |
-| `workspace-inherit/` | Shared workflows and docs rendered on main, then refreshed to workspace branches |
+| `workspace-inherit/` | Shared workflows and docs staged by CI and added only to workspace branches |
 | `plugins/claude/<set>/` | Claude Code plugin sets a workspace lists under `plugins:` (none yet) |
 | `AUTHORING.md` | How to create and change Argos workspaces |
 
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/address-pr-comments/SKILL.md b/software/application-software/argos/workspaces/argos-dev/.claude/skills/address-pr-comments/SKILL.md
deleted file mode 100644
index 30083fa..0000000
--- a/software/application-software/argos/workspaces/argos-dev/.claude/skills/address-pr-comments/SKILL.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: address-pr-comments
-description: Fetch review comments on a PR (Argos, Nero), judge whether each (including outdated ones) still applies, and walk through fixes in the PR's worktree
-allowed-tools: Bash(git:*), Bash(gh issue list:*), Bash(bash ${CLAUDE_SKILL_DIR}/scripts/fetch-feedback.sh *)
-user-invocable: true
----
-
-Propose and apply fixes for a PR's unresolved review feedback. **Never reply to threads**; the user does.
-
-1. **Fetch** from the workspace root: `bash scripts/fetch-feedback.sh <repo> <pr>|<branch>` (`<repo>` as under `repos/`, e.g. `argos`; `--all` first for unfiltered history). It checks out the PR head's worktree and prints JSON: `worktree` (target it by path from the root from now on), unresolved `threads`, `comments`, `reviews`. Any non-zero exit: use the GitHub MCP server's `pull_request_read` instead.
-2. **Judge.** Skip bot noise and anything already fixed at HEAD. For an `outdated` thread, find its `diffHunk` code by content, then label it **addressed**, **applies**, **moved**, **obsolete**, or **unclear**.
-3. **Present** before editing, grouped by file, and ask to confirm, skip, or change each (offer to batch clear ones past 8):
-
-   ```
-   <file>:<line> — <reviewer> · <active|outdated> · <label>
-   "<excerpt>" → <proposed fix>
-   <optional ≤5-line snippet, for the user only>
-   ```
-4. **Apply** in that worktree, by path, with grouped `/commit`s. For a follow-up-ticket request, reuse a match from `gh issue list --search` before filing.
-5. **Report** what was fixed (file:line, commit SHA), what was already addressed or obsolete (why), and what is unclear.
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh b/software/application-software/argos/workspaces/argos-dev/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh
deleted file mode 100755
index ce1efd9..0000000
--- a/software/application-software/argos/workspaces/argos-dev/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env bash
-# fetch-feedback.sh [--all] <repo> <pr-number>|<branch>: print a PR's review
-# feedback as one JSON object after creating or reusing the PR head's worktree
-# (worktrees/<repo>/<head>). Default output keeps unresolved threads (first + latest message,
-# bots tagged), conversation comments, and reviews with text; --all keeps everything. Exits 3 on any
-# GitHub failure (see github.sh).
-# shellcheck source-path=SCRIPTDIR source=github.sh
-set -euo pipefail
-. "$(dirname "$0")/github.sh"
-all=false
-[ "${1:-}" = --all ] && all=true && shift
-usage="usage: fetch-feedback.sh [--all] <repo> <pr-number>|<branch>"
-repo=${1:?$usage} ref=${2:?$usage}
-# shellcheck source=/dev/null
-. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
-gh_init fetch-feedback "$DELPHI_WORKTREES/$repo/.bare"
-
-case "$ref" in *[!0-9]*) get "repos/$SLUG/pulls?state=all&head=${SLUG%%/*}:$ref" | jq '.[0] // error("no PR")' ;;
-  *) get "repos/$SLUG/pulls/$ref" ;; esac >"$TMP/pr"
-num=$(jq .number "$TMP/pr")
-wt=""
-[ "$(jq -r .head.repo.full_name "$TMP/pr")" != "$SLUG" ] || wt=$(bash "$DELPHI_ROOT/.delphi/new-worktree.sh" "$repo" "$(jq -r .head.ref "$TMP/pr")")
-
-if [ "$MODE" = gh ]; then # thread state is GraphQL-only; reshape it like the proxy's ccr/review_threads
-  # shellcheck disable=SC2016 # GraphQL variables
-  gh api graphql -F o="${SLUG%%/*}" -F n="${SLUG##*/}" -F p="$num" -f query='query($o: String!, $n: String!, $p: Int!) {
-    repository(owner: $o, name: $n) { pullRequest(number: $p) { reviewThreads(first: 100) { nodes {
-      isResolved isOutdated comments(first: 50) { nodes { databaseId } } } } } } }' \
-    --jq '[.data.repository.pullRequest.reviewThreads.nodes[] |
-      {resolved: .isResolved, outdated: .isOutdated, comment_ids: [.comments.nodes[].databaseId]}]'
-else get "repos/$SLUG/pulls/$num/ccr/review_threads"; fi >"$TMP/th"
-get "repos/$SLUG/pulls/$num/comments?per_page=100" >"$TMP/rc"
-get "repos/$SLUG/issues/$num/comments?per_page=100" >"$TMP/ic"
-get "repos/$SLUG/pulls/$num/reviews?per_page=100" >"$TMP/rv"
-
-jq -n --arg wt "$wt" --argjson all "$all" --slurpfile pr "$TMP/pr" --slurpfile th "$TMP/th" \
-  --slurpfile rc "$TMP/rc" --slurpfile ic "$TMP/ic" --slurpfile rv "$TMP/rv" '
-  def who: {author: .user.login, bot: (.user.type == "Bot")};
-  ($rc[0] | map({key: (.id | tostring), value: (who + {body, path, line: (.line // .original_line), diffHunk: .diff_hunk})}) | from_entries) as $byid |
-  {pr: ($pr[0] | {number, title, url: .html_url, head: .head.ref, base: .base.ref}), worktree: $wt,
-   threads: [$th[0][] | {resolved, outdated, comments: [.comment_ids[] | $byid[tostring]]}],
-   comments: [$ic[0][] | who + {body}], reviews: [$rv[0][] | who + {state, body: (.body // "")}]} |
-  if $all then . else
-    .threads |= map(select(.resolved | not) | .comments as $c | $c[-1] + {outdated, path: $c[0].path, line: $c[0].line,
-      diffHunk: (if .outdated then $c[0].diffHunk else null end), replies: ($c | length),
-      first: (if ($c | length) > 1 then $c[0].body else null end)}) |
-    .reviews |= map(select(.body != ""))
-  end'
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/address-pr-comments/scripts/github.sh b/software/application-software/argos/workspaces/argos-dev/.claude/skills/address-pr-comments/scripts/github.sh
deleted file mode 100644
index da0be20..0000000
--- a/software/application-software/argos/workspaces/argos-dev/.claude/skills/address-pr-comments/scripts/github.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-# github.sh: sourced by skill scripts that call GitHub. gh_init <tool> <git-dir> picks a backend
-# (gh when logged in, else an explicitly enabled GitHub REST proxy via curl; jq is needed either
-# way), sets SLUG from that repo's origin, and makes any failure exit 3 so the calling skill falls
-# back to the available GitHub integration. TMP is a scratch dir removed on exit.
-# shellcheck shell=bash
-fail() { echo "$TOOL: $1; use the available GitHub integration" >&2; exit 3; }
-on_exit() { local rc=$?; rm -rf "$TMP"; [ "$rc" -eq 0 ] || fail "GitHub request failed ($MODE)"; }
-gh_init() {
-  TOOL=$1
-  if { command -v gh && gh auth status; } >/dev/null 2>&1; then MODE=gh
-  elif [ -n "${DELPHI_GITHUB_REST_PROXY:-${CLAUDE_CODE_REMOTE:-}}" ] && command -v curl >/dev/null; then MODE=rest
-  else fail "no authenticated gh or enabled REST proxy"; fi
-  command -v jq >/dev/null || fail "jq not installed"
-  SLUG=$(git -C "$2" remote get-url origin) && SLUG=${SLUG#*github.com[:/]} && SLUG=${SLUG%.git}
-  TMP=$(mktemp -d)
-  trap on_exit EXIT
-}
-get() { if [ "$MODE" = gh ]; then gh api "$1"; else curl -fsS "https://api.github.com/$1"; fi; }
-post() { if [ "$MODE" = gh ]; then gh api -X POST "$1" --input -; else curl -fsS -X POST --data-binary @- "https://api.github.com/$1"; fi; }
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/commit/SKILL.md b/software/application-software/argos/workspaces/argos-dev/.claude/skills/commit/SKILL.md
deleted file mode 100644
index 4b56757..0000000
--- a/software/application-software/argos/workspaces/argos-dev/.claude/skills/commit/SKILL.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-name: commit
-description: Stage and commit using the project's commit message convention
----
-
-In the worktree you're working on, from the workspace root (`git -C worktrees/<repo>/<branch> …`), stage the relevant changes (not unrelated or generated files) and commit using the commit message format in CLAUDE.md. Keep the description imperative and 2–8 words.
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/consolidate-spikes/SKILL.md b/software/application-software/argos/workspaces/argos-dev/.claude/skills/consolidate-spikes/SKILL.md
deleted file mode 100644
index 4f85b66..0000000
--- a/software/application-software/argos/workspaces/argos-dev/.claude/skills/consolidate-spikes/SKILL.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-name: consolidate-spikes
-description: Turn finished spikes into implementation tickets: an idea's spikes, once all are done, into dev work, under an epic when it comes from an idea or splits. Use when the user wants to wrap up, settle, or consolidate an idea or spike on an application-software repo (Argos, Nero).
----
-
-Drafts and files by the `create-ticket` rules; load it and the project's `ticket-conventions` first. Takes an idea or a standalone spike.
-
-1. **Gather** each spike's findings comment, draft PR, and the PR's reviews; from an idea, its sub-issues too.
-2. **Check it's done.** Every spike is done by `create-ticket`'s Spikes rules (the lead's latest review on its draft PR, from repos/<owner>/<repo>/pulls/<pr>/reviews, is an approval). From an idea, that's every spike under it, and every one of its areas to explore is covered by a spike area. Otherwise list what's missing, offer spikes for uncovered areas, and stop.
-3. **Choose:** per area (title prefix), propose the approach to build (one spike's, or a mix) with a one-line why, from the findings and the lead's review. The user confirms or changes each.
-4. **Plan** the dev work by `create-ticket`'s Dev work rules: one ticket unless the work is large enough to split into vertical slices, which may cross areas. Each ticket: What, the slice; Notes, links to the spikes and draft PRs it draws on, and the dropped approaches with why; context transfer, the findings' facts.
-5. **Draft** them, and, from an idea or when split, one epic (From: the idea or spike) with the dev work as its sub-issues. Show all, with which slices run in parallel if split; file what the user OKs.
-6. **Close**, each with a one-line comment: the spikes as completed ("Consolidated into #<epic or dev work>"), their draft PRs unless a dev work ticket builds on that branch, and the idea as completed ("Settled in #<epic or dev work>").
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/create-ticket/SKILL.md b/software/application-software/argos/workspaces/argos-dev/.claude/skills/create-ticket/SKILL.md
deleted file mode 100644
index 210a059..0000000
--- a/software/application-software/argos/workspaces/argos-dev/.claude/skills/create-ticket/SKILL.md
+++ /dev/null
@@ -1,66 +0,0 @@
----
-name: create-ticket
-description: Draft and file a GitHub issue (idea, spike, epic, or dev work) on an application-software repo (Argos, Nero) from the repo's issue templates, or rewrite an existing issue into them. Use whenever the user wants to create, file, write up, or log a ticket, issue, idea, spike, epic, bug, or task, including an out-of-scope idea that comes up mid-work.
----
-
-# Create ticket
-
-These are the ticket conventions for every application-software repo. The repo's own `.github/ISSUE_TEMPLATE` holds only the fields (`gh api repos/<owner>/<repo>/contents/.github/ISSUE_TEMPLATE/<file> -q .content | base64 -d`); follow each field's description.
-
-First load the project's `ticket-conventions` skill (inherited from the project's `workspace-inherit/`) for its repo, area labels, vocabulary, and diagrams. If none is enabled, ask which repo.
-
-## Workflow
-
-idea → spikes → epic → dev work, or a standalone spike → dev work
-
-| Ticket | What it is | Issue type | Parent |
-|---|---|---|---|
-| Idea | What could be built and why. Its areas to explore are things to improve or problems to solve, each with approaches worth trying. | none | none |
-| Spike | One approach to try on one area of an idea (it needn't cover the whole area), or a small standalone improvement: what is tried and the hypothesis. Findings go in a comment and a draft PR (`report-spike`), not the ticket. | none | its idea, if any |
-| Epic | Work too large for one dev work ticket: the goal and whole-epic outcomes, not a walkthrough of each ticket. A new issue linking the idea or spike it came from in "From". | Feature | none |
-| Dev work | Any implementation work: testable requirements, Notes for gotchas and pointers to code. Large work is cut into vertical slices (see Dev work below). | Feature, Bug, or Task | its epic, if any |
-
-If unsure, a small, clear change is dev work, a small unknown is a spike, and a big unexplored thing is an idea. Ideas and spikes explore work, so they get no issue type; bug, feature, and task are issue types, never labels.
-
-## Writing
-
-How every ticket reads, on any project:
-
-- Short and plain. Write for someone new to the project: explain project-specific terms, and use the project's vocabulary (its `ticket-conventions` says where it lives; check the code for current names).
-- Outcomes, not implementation: say what changes and why, not how to build it. A rationale gives the reasoning, not a history of the problem.
-- No prescriptions on ideas and spikes. Ideas name open options to weigh, not a plan or a recommended pick; spikes state what to learn and leave the how to whoever picks it up.
-- Facts, not instructions: Notes and context transfer hold facts (where code lives, current behavior, constraints, links), not steps or a proposed solution. Context transfer (optional on spikes, epics, and dev work) starts with a short summary, then the raw context.
-- Unknowns stay open questions in Notes; don't guess.
-- Title: concise and imperative, no prefixes (except a spike's area).
-- Requirements: clear, broad checkboxes, each a testable outcome rather than an implementation step; 3-5, never more than 7. If it needs more, split the ticket.
-- Backticks: at most three inline uses per body; name files and identifiers in plain text. Diagram and context-transfer blocks don't count.
-- Size: keep ideas short; one small enough to just try is a spike.
-
-## Dev work
-
-- One ticket by default. Split only when the work is too large for one PR or parts could run in parallel.
-- When split, cut vertical slices: each goes end to end through every part it touches (e.g. backend through UI), not one layer, and works and is testable on its own. Cut for the most parallel work; mark a slice that must wait as blocked by the one it waits on (see File).
-
-## Spikes
-
-- One approach, not a set to choose between. If a spike reads "X or Y", it is two spikes.
-- Prefer an idea with a few spikes (often 2-4) under it; a spike can also stand alone, or with siblings, to explore an area. Several spikes can take on the same area in different ways.
-- Title it `<area>: <approach>`, with the area a short kebab-case name its siblings share (`graph-saving: Save a graph to a file and re-upload it`). An area may cover more than one of an idea's bullets. A lone small improvement needs no prefix.
-- Sibling spikes share the context transfer's summary and common facts; each adds only the facts particular to its approach.
-- An idea needn't get all its spikes at once: file an area's spikes when someone is ready to try them.
-- Done: its findings are posted, review feedback is addressed, and the lead's latest review on its draft PR is an approval (GitHub's Approve), including when the recommendation is to drop the approach. A done spike stays open until `consolidate-spikes` closes it.
-
-## Draft
-
-- Check the code first: the work may be done or already tracked.
-- One `### <field label>` per field in template order, following each field's description; omit empty optional fields.
-- Diagrams: required on epics, optional on dev work. The project's `ticket-conventions` says what they show.
-- Labels: the template's category (`idea`, `spike`, `epic`, `dev work`), one written-by (`by: human` if the user dictated it, `by: ai-assisted` if they gave the substance, `by: ai` if you wrote it, including rewrites), and at least one of the project's area labels.
-- Rewriting an old ticket: keep its intent and assignees; bring it up to these rules and update vocabulary, labels, issue type, and parent.
-- Folding one ticket into another: add it as a requirement on the target, then close it as not planned. Every close gets a one-line comment saying why.
-
-## File
-
-Check for open duplicates, then show the full draft (title, type if any, labels, parent, body) in the chat, not only in a file. File or edit only what the user OKs.
-
-Use the REST API (GraphQL may be blocked): POST repos/<owner>/<repo>/issues with title, body, labels, the issue type from the table, and the user as assignee (on a spike, whoever will run it; ask), then, if it has a parent, POST repos/<owner>/<repo>/issues/<parent>/sub_issues with the new issue's id. If it waits on another issue, POST repos/<owner>/<repo>/issues/<n>/dependencies/blocked_by with the blocking issue's id. Report the URL.
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/implement/SKILL.md b/software/application-software/argos/workspaces/argos-dev/.claude/skills/implement/SKILL.md
deleted file mode 100644
index f24d293..0000000
--- a/software/application-software/argos/workspaces/argos-dev/.claude/skills/implement/SKILL.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-name: implement
-description: Implement an Argos ticket or task in its own worktree, test-first, ending in a commit, here or in a subagent (one per ticket, in parallel, for several). Use when the user asks to build, fix, or implement something in Argos.
----
-
-1. **Worktree.** Get the ticket's branch (`{issue-number}-{kebab-case-title}`) with the `new-worktree` skill, based on `origin/develop`. Make every change in `worktrees/argos/<branch>/`, never in `worktrees/argos/develop/`, while staying at the workspace root: edit files by path, `git -C worktrees/argos/<branch> …` for git, and one-off subshells for the rest. Run `(cd worktrees/argos/<branch>/angular-client && npm ci)` before touching the client.
-2. **Hand off?** Unless the user already chose, ask whether a subagent should do the rest, and recommend one: one per ticket, in parallel, when there are several (step 1 for each first), or one for work long enough to fill this conversation. Tell it the ticket, its worktree's absolute path, and to follow this skill from step 3, change files only under that path (`git -C` for git), name temp files after the branch, stop the clients it starts, and report its commits, checks, and the port and browser it used. Never turn on the harness's own worktree isolation (`new-worktree` says why). Then confirm its commits with `git -C <path> log origin/develop..` and pass its report on.
-3. **Understand.** Read the issue (`gh issue view <n> --comments`), the code involved, and `docs/CONTEXT.md` terms.
-4. **Build test-first**, one behavior at a time: a failing test, the least code to pass it, refactor while green. Test through public interfaces; mock only at system boundaries.
-5. **Check.**
-   - Frontend, in `(cd worktrees/argos/<branch>/angular-client && …)`: `npx ng test --include='src/**/thing.spec.ts' --watch=false` while iterating; at the end `npx ng test --watch=false` (bare `ng test` blocks), then `npx prettier --check "src/**/*.{ts,html,scss}" && npx ng lint`.
-   - Backend, in `(cd worktrees/argos/<branch>/scylla-server && …)`: `cargo build` and single tests while iterating; `cargo test` at the end.
-   - UI changes: verify in the running app with `run-local <branch>`.
-6. **Commit** with `/commit`. Don't push or open a PR unless asked; that's `/open-pr`.
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/journal/SKILL.md b/software/application-software/argos/workspaces/argos-dev/.claude/skills/journal/SKILL.md
deleted file mode 100644
index 4917259..0000000
--- a/software/application-software/argos/workspaces/argos-dev/.claude/skills/journal/SKILL.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-name: journal
-description: Park rough notes locally mid-task ("note to self", "remember to", "journal this"), and later export them to their permanent home (issue, spec, ADR, glossary, docs) through the skill that owns it. Use when the user wants to jot a thought without derailing, or to file parked notes.
----
-
-Notes live in `.journal/` at the workspace root (git-excluded, outside worktrees so they survive removal). An **entry** is one file, a **category** a subfolder. The journal never pushes, files, or contacts GitHub itself.
-
-**Capture** (no git, no other skills):
-
-```
-bash scripts/capture.sh [-c <category>] ["note text"]
-```
-
-Omit `-c` for a loose entry, omit the text for an empty one to edit. Report the path it prints.
-
-**Export** (only when asked):
-
-1. Read the entries and propose a grouping: one entry → one output, a category → one merged output, or one entry split across several. Let the user adjust.
-2. For each output, pick the workspace skill whose description fits its permanent home, preferring an existing docs area. A new section always needs approval.
-3. Show the destination and reshaped text and wait for approval. Nothing lands silently.
-4. Delegate to that skill; it owns formatting, conventions, and any GitHub contact.
-5. Ask whether to delete the exported entry (default: keep).
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/journal/scripts/capture.sh b/software/application-software/argos/workspaces/argos-dev/.claude/skills/journal/scripts/capture.sh
deleted file mode 100755
index 1e90d7b..0000000
--- a/software/application-software/argos/workspaces/argos-dev/.claude/skills/journal/scripts/capture.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-# capture.sh [-c <category>] [note text]: write a timestamped journal entry to
-# .journal/[<category>/] at the workspace root (adding /.journal/ to .git/info/exclude once) and print
-# its path. An empty entry is created when no text is given. Never touches git history, GitHub, or
-# other skills.
-set -euo pipefail
-usage="usage: capture.sh [-c <category>] [note text]"
-# shellcheck source=/dev/null
-. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
-dir=$DELPHI_ROOT/.journal
-[ "${1:-}" = -c ] && dir=$dir/${2:?$usage} && shift 2
-exclude=$(git -C "$DELPHI_ROOT" rev-parse --path-format=absolute --git-path info/exclude 2>/dev/null || true)
-[ -z "$exclude" ] || grep -qxF /.journal/ "$exclude" 2>/dev/null || { mkdir -p "${exclude%/*}" && echo /.journal/ >>"$exclude"; }
-mkdir -p "$dir"
-file=$dir/$(date +%Y-%m-%d-%H%M%S).md
-{ echo "<!-- captured $(date -u +%Y-%m-%dT%H:%M:%SZ) -->"; [ $# -eq 0 ] || echo "$*"; } >"$file"
-echo "$file"
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/new-worktree/SKILL.md b/software/application-software/argos/workspaces/argos-dev/.claude/skills/new-worktree/SKILL.md
deleted file mode 100644
index 0495fc9..0000000
--- a/software/application-software/argos/workspaces/argos-dev/.claude/skills/new-worktree/SKILL.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-name: new-worktree
-description: Create or reuse a worktree for a branch of a code repo (worktrees/<repo>/<branch>). Use before any branch work, such as starting a ticket or reviewing or fixing a PR branch, unless the user says not to use worktrees.
----
-
-Run from the workspace root:
-
-```
-bash .delphi/new-worktree.sh <repo> <branch> [<base>]
-```
-
-- An existing branch (local or on origin, e.g. a PR head) is checked out; anything else is created from `<base>` (default: the repo's default branch). Safe to re-run.
-- Stay at the workspace root and reach into the worktree by the printed path. Never switch branches in an existing worktree or work in its store, `worktrees/<repo>/.bare`.
-- For a subagent, make its worktree here first and hand it the path. Never use the harness's own worktree isolation: it checks out this Delphi clone from main, not the code repo, and fences the subagent out of `worktrees/`.
-- Keep `worktrees/<repo>/<default-branch>/` (made by setup) a clean reference: fetch and fast-forward only.
-- After the branch merges: `git -C worktrees/<repo>/.bare worktree remove ../<branch>`.
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/open-pr/SKILL.md b/software/application-software/argos/workspaces/argos-dev/.claude/skills/open-pr/SKILL.md
deleted file mode 100644
index b1e7c71..0000000
--- a/software/application-software/argos/workspaces/argos-dev/.claude/skills/open-pr/SKILL.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-name: open-pr
-description: Run pre-PR checks, push the branch, and open a draft pull request on an application-software repo (Argos, Nero)
----
-
-First load the project's `pr-conventions` skill (inherited from the project's `workspace-inherit/`) for its base branch, commit format, checks, labels, and screenshots.
-
-1. **Check:** `bash scripts/pr-checks.sh <repo> <branch> origin/<base> '<commit format>'` (clean tree, commit subjects match the project's format, merges cleanly into the base), then the project's own checks. Stop and fix on any FAIL.
-2. **Media:** if the diff touches the UI, ask the user whether to add screenshots to the PR, listing any already in the project's screenshot folder for this branch so they can pick those instead of new ones; on no, skip this step. For new ones, use the project's UI QA to take Playwright screenshots of the changed views into its screenshot folder, or, when the change adds or changes an animation, record a short video instead (a browser context with `recordVideo: { dir }` saves a `.webm` when it closes). Images must be under 10 MB; video under 10 MB on a Free plan, 100 MB on a paid one.
-3. **Open:** push (`git -C worktrees/<repo>/<branch> push -u origin <branch>`), then run `(cd worktrees/<repo>/<branch> && gh pr create --draft --base <base> --head <branch> --title "<title>" --body-file /tmp/<branch>-pr-body.md --assignee @me)` with the project's labels (`--label`) and one `--attach <file>` per screenshot or video, and report the URL.
-4. **Spike:** the PR stays a draft; getting it merged isn't the goal. Once it's checked and working, run `report-spike`.
-
-## PR body
-
-Fill the worktree's `.github/pull_request_template.md` from the diff, following each section's comment, and write it to `/tmp/<branch>-pr-body.md`:
-
-- Title: concise and imperative, no ticket number.
-- The Changes section (not the whole body): about 50 words (1–3 sentences) on what landed and the key design choice. Describe the change, not the file list: don't enumerate components, classes or files the diff already shows. Name a specific one only when its behaviour changes in a way a reviewer must know.
-- Delete the template's comments and any optional or non-applicable sections, and check off the Checklist.
-- At most three backtick uses in the body.
-- End with `Closes #{ticket}` (the branch's leading number), or `Spike for #{ticket}` on a spike, which its PR never closes.
-- Screenshots and videos: reference each one by its path from the worktree, `![<what it shows>](<path>)`; `--attach` uploads it and rewrites the reference to its `user-attachments` URL. `--attach` needs gh v2.99.0+: if `gh pr create --help` doesn't list it, put `_screenshot pending_` instead and remind the user to drag-drop the files from the screenshot folder. Never commit screenshots or videos.
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/open-pr/scripts/pr-checks.sh b/software/application-software/argos/workspaces/argos-dev/.claude/skills/open-pr/scripts/pr-checks.sh
deleted file mode 100755
index 61f377f..0000000
--- a/software/application-software/argos/workspaces/argos-dev/.claude/skills/open-pr/scripts/pr-checks.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-# pr-checks.sh <repo> <branch> [<base> [<format>]]: open-pr's shared pre-PR checks on
-# worktrees/<repo>/<branch>. Prints
-# one PASS/FAIL/SKIP line per check: clean tree, every commit subject since <base> (default
-# origin/develop, fetched first) matches <format> (an extended regex, default '^#[0-9]+ - '), and no
-# merge conflicts with <base>. Exits 1 if any check fails. The project's own checks (lint, format)
-# are in its pr-conventions skill.
-set -euo pipefail
-usage="usage: pr-checks.sh <repo> <branch> [<base> [<format>]]"
-repo=${1:?$usage} branch=${2:?$usage}
-# shellcheck source=/dev/null
-. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
-cd "$DELPHI_WORKTREES/$repo/$branch"
-base=${3:-origin/develop} format=${4:-'^#[0-9]+ - '} fail=0
-res() { echo "$1 $2"; [ "$1" != FAIL ] || fail=1; }
-git fetch -q origin "${base#origin/}" 2>/dev/null || true
-
-if [ -z "$(git status --porcelain)" ]; then res PASS "clean tree"; else res FAIL "uncommitted changes"; fi
-bad=$(git log --format=%s "$base..HEAD" | grep -Ev "$format" || true)
-if [ -z "$bad" ]; then res PASS "commit format"; else res FAIL "commit format: $(echo "$bad" | paste -sd'|' -)"; fi
-if git merge-tree --write-tree HEAD "$base" >/dev/null 2>&1; then res PASS "merges cleanly into $base"
-elif [ $? -eq 1 ]; then res FAIL "conflicts with $base"; else res SKIP "conflict check (needs git 2.38+)"; fi
-exit "$fail"
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/pr-conventions/SKILL.md b/software/application-software/argos/workspaces/argos-dev/.claude/skills/pr-conventions/SKILL.md
deleted file mode 100644
index 90cc657..0000000
--- a/software/application-software/argos/workspaces/argos-dev/.claude/skills/pr-conventions/SKILL.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-name: pr-conventions
-description: Argos specifics for pull requests (base branch, commit format, checks, labels, screenshots, UI QA). Load before opening, updating, or reviewing an Argos PR, alongside open-pr, update-pr, and review.
-user-invocable: false
----
-
-# Argos PR conventions
-
-The shared rules are in the `open-pr` skill; this adds only what is Argos's.
-
-- Base branch: `develop`. Commit format: `^#[0-9]+ - ` (the format in CLAUDE.md).
-- Checks: `bash scripts/lint.sh <branch>` (frontend prettier and ng lint, only if angular-client/ changed).
-- Labels: one written-by (`by: human` if the user wrote it, `by: ai-assisted` if they gave the substance, `by: ai` if you wrote it) and at least one area label (`frontend`, `backend`, `devops`); no category label.
-- Screenshots: `pictures/<branch>/` at the worktree root (git-ignored).
-- UI QA: get the branch running with `run-local <branch>`, then drive it with Playwright, using the `playwright-cdp` server if `curl -s localhost:9222/json/version` responds, otherwise `playwright`.
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/pr-conventions/scripts/lint.sh b/software/application-software/argos/workspaces/argos-dev/.claude/skills/pr-conventions/scripts/lint.sh
deleted file mode 100644
index 2ed67ec..0000000
--- a/software/application-software/argos/workspaces/argos-dev/.claude/skills/pr-conventions/scripts/lint.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-# lint.sh <branch> [<base>]: Argos's pre-PR check for open-pr, on
-# worktrees/argos/<branch>. Prints one PASS/FAIL/SKIP line: frontend prettier + ng lint, only if
-# angular-client/ changed since <base> (default origin/develop). Exits 1 if it fails.
-set -euo pipefail
-usage="usage: lint.sh <branch> [<base>]"
-branch=${1:?$usage}
-# shellcheck source=/dev/null
-. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
-cd "$DELPHI_WORKTREES/argos/$branch"
-base=${2:-origin/develop}
-if git diff --quiet "$base...HEAD" -- angular-client; then echo "SKIP frontend lint (no changes)"
-elif [ ! -d angular-client/node_modules ]; then echo "FAIL frontend lint: run npm ci in angular-client/" && exit 1
-elif (cd angular-client && npx prettier --check "src/**/*.{ts,html,scss}" >/dev/null && npx ng lint >/dev/null 2>&1)
-then echo "PASS frontend lint"; else echo "FAIL frontend lint (run prettier --check / ng lint to see why)" && exit 1; fi
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/report-spike/SKILL.md b/software/application-software/argos/workspaces/argos-dev/.claude/skills/report-spike/SKILL.md
deleted file mode 100644
index e673871..0000000
--- a/software/application-software/argos/workspaces/argos-dev/.claude/skills/report-spike/SKILL.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-name: report-spike
-description: Post a spike's findings on its ticket, judged against its hypothesis, and ask the lead to review its draft PR. Use when a spike's approach has been tried on an application-software repo (Argos, Nero).
----
-
-A spike runs like any ticket (branch, commits, a draft PR from `open-pr`); this reports it. Load the project's `pr-conventions` first.
-
-1. **Read** the spike (`gh issue view <n> --comments`), its draft PR, and the branch's diff against the base.
-2. **Draft** one findings comment, short and factual:
-
-   ```
-   ### Findings
-   **Hypothesis:** holds | partly holds | doesn't hold. One sentence why.
-   **Learned:** measurements, limits hit, surprises, with links to the draft PR's code.
-   **Recommendation:** adopt, adopt with changes, or drop, and why.
-   **Open questions:** what the spike didn't settle.
-   Draft PR: #<pr>
-   ```
-3. **Show** it and ask who the lead is; on OK, post it (`gh issue comment <n> --body-file /tmp/<branch>-findings.md`).
-4. **Request review:** `(cd worktrees/<repo>/<branch> && gh pr edit <branch> --add-reviewer <lead>)`, keeping the PR a draft, and remind the user to ping the lead on Slack.
-
-Address review feedback on the branch as on any PR (`address-pr-comments`), and edit the findings comment if it changes them. The spike is done when the lead approves the draft PR (`create-ticket`'s Spikes rules); it stays open until `consolidate-spikes` closes it.
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/run-local/SKILL.md b/software/application-software/argos/workspaces/argos-dev/.claude/skills/run-local/SKILL.md
deleted file mode 100644
index 7acb908..0000000
--- a/software/application-software/argos/workspaces/argos-dev/.claude/skills/run-local/SKILL.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-name: run-local
-description: Bring up the local Argos environment for running or testing — Docker backend (right profile for what changed) + an Angular client per worktree, each on its own free port. Use whenever you need to actually run the app locally, for a PR, a ticket's branch, or develop.
----
-
-Run the branches the user is asking about: a PR or ticket means its branch (make its worktree with `new-worktree` first), and `develop` only when they want current `develop` (fast-forward `worktrees/argos/develop/` first):
-
-```
-bash scripts/run-local.sh <branch>...
-```
-
-It starts the backend if it's down (`client-dev`, or `scylla-dev` plus `cargo run` when a target changes `scylla-server/`), and serves each target's client on the next free port; parallel runs (one per session or agent) each get their own. With no branches it reports what's running.
-
-Report each branch's client URL and the backend. A failed compile or a stale-backend warning is a finding: show it to the user. Stop a client with `kill <pid>` from its line. When every port is taken it lists what holds each; clients from other checkouts are the user's, so ask before stopping them.
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/run-local/scripts/run-local.sh b/software/application-software/argos/workspaces/argos-dev/.claude/skills/run-local/scripts/run-local.sh
deleted file mode 100755
index f598657..0000000
--- a/software/application-software/argos/workspaces/argos-dev/.claude/skills/run-local/scripts/run-local.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/usr/bin/env bash
-# run-local.sh [<branch>...]: bring up the local Argos stack for those branches'
-# worktrees (worktrees/argos/<branch>, made beforehand with new-worktree) and print one line per
-# piece. The backend (first listener on 8000-8090, step 10) is started if down:
-# ./argos.sh client-dev when no target changes scylla-server/, else scylla-dev plus `cargo run` in the
-# one worktree that does. Each target's client is then served by serve.sh on its own port. With no
-# branches, reports what is running.
-set -euo pipefail
-here=$(cd "$(dirname "$0")" && pwd)
-# shellcheck source=/dev/null
-. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
-state=${TMPDIR:-/tmp}; state=${state%/}/argos-run-local
-up() { (exec 3<>"/dev/tcp/127.0.0.1/$1") 2>/dev/null || (exec 3<>"/dev/tcp/::1/$1") 2>/dev/null; } # ng serve binds ::1
-backend() { for p in $(seq 8000 10 8090); do up "$p" && echo "http://localhost:$p" && return; done; echo none; }
-scylla() {
-  if docker ps --filter name=scylla-server --format '{{.Names}}' 2>/dev/null | grep -q .; then echo docker
-  elif [ "$(backend)" != none ]; then echo local
-  else echo none; fi
-}
-
-if [ $# = 0 ]; then
-  clients=
-  for p in $(seq 4200 4210); do up "$p" && clients="$clients http://localhost:$p"; done
-  echo "backend=$(backend) scylla=$(scylla) clients=${clients# }"
-  exit 0
-fi
-
-wts=() rust=()
-for b in "$@"; do
-  wt=$DELPHI_WORKTREES/argos/$b
-  [ -f "$wt/argos.sh" ] && [ -d "$wt/angular-client" ] ||
-    { echo "run-local: no Argos worktree for '$b' at $wt (make it with new-worktree)" >&2 && exit 1; }
-  wts+=("$wt")
-done
-git -C "${wts[0]}" fetch -q origin # the worktrees share one store
-for wt in "${wts[@]}"; do
-  if ! git -C "$wt" diff --quiet origin/develop... -- scylla-server || ! git -C "$wt" diff --quiet HEAD -- scylla-server; then
-    rust+=("$wt")
-  fi
-done
-[ ${#rust[@]} -le 1 ] || { echo "run-local: several targets change scylla-server/; run them one at a time" >&2 && exit 1; }
-
-if [ "$(backend)" = none ]; then
-  mkdir -p "$state"
-  if [ ${#rust[@]} = 0 ]; then
-    (cd "${wts[0]}" && ./argos.sh client-dev up -d) >"$state/compose.log" 2>&1 ||
-      { echo "run-local: ./argos.sh client-dev up failed:" >&2 && tail -20 "$state/compose.log" >&2 && exit 1; }
-  else
-    (cd "${rust[0]}" && ./argos.sh scylla-dev up -d) >"$state/compose.log" 2>&1 ||
-      { echo "run-local: ./argos.sh scylla-dev up failed:" >&2 && tail -20 "$state/compose.log" >&2 && exit 1; }
-    (cd "${rust[0]}/scylla-server" &&
-      DATABASE_URL=${DATABASE_URL:-postgresql://postgres:password@127.0.0.1:${ODYSSEY_DB_PORT:-5432}/postgres} \
-        nohup cargo run >"$state/scylla.log" 2>&1 &)
-    echo "run-local: cargo run started for $(basename "${rust[0]}"); log $state/scylla.log"
-  fi
-  for _ in $(seq 600); do [ "$(backend)" != none ] && break; sleep 1; done
-  [ "$(backend)" != none ] || { echo "run-local: backend not up after 600s; see $state/" >&2 && exit 1; }
-elif [ ${#rust[@]} = 1 ] && [ "$(scylla)" = docker ]; then
-  echo "run-local: warning: backend is the scylla-server image but $(basename "${rust[0]}") changes scylla-server/;" \
-    "stop it (./argos.sh client-dev down) and re-run to test that branch's backend" >&2
-fi
-echo "backend=$(backend) scylla=$(scylla)"
-
-status=0
-for wt in "${wts[@]}"; do bash "$here/serve.sh" "$wt" || status=1; done
-exit $status
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/run-local/scripts/serve.sh b/software/application-software/argos/workspaces/argos-dev/.claude/skills/run-local/scripts/serve.sh
deleted file mode 100755
index d8de89c..0000000
--- a/software/application-software/argos/workspaces/argos-dev/.claude/skills/run-local/scripts/serve.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/env bash
-# serve.sh <argos-worktree>: serve that worktree's Angular client with `ng serve` on the first free
-# port in 4200-4210, in the background, and print `<branch> client=<url> pid=<pid> log=<file>` once
-# it has compiled. Re-running for a worktree that is still being served prints its existing client.
-# Runs `npm ci` first if node_modules lacks ng (missing or half-installed). Exits 1, with the log's
-# tail, if the build fails, or with what holds each port if none is free.
-set -euo pipefail
-wt=$(cd "${1:?usage: serve.sh <argos-worktree>}" && pwd)
-branch=$(git -C "$wt" rev-parse --abbrev-ref HEAD)
-state=${TMPDIR:-/tmp}; state=${state%/}/argos-run-local
-mkdir -p "$state"
-key=$state/$(printf %s "$wt" | tr -c 'A-Za-z0-9' _)
-log=$key.log
-up() { (exec 3<>"/dev/tcp/127.0.0.1/$1") 2>/dev/null || (exec 3<>"/dev/tcp/::1/$1") 2>/dev/null; } # ng serve binds ::1
-
-if [ -f "$key.pid" ] && kill -0 "$(cat "$key.pid")" 2>/dev/null && up "$(cat "$key.port")"; then
-  echo "$branch client=http://localhost:$(cat "$key.port") pid=$(cat "$key.pid") log=$log (already running)"
-  exit 0
-fi
-
-# Claim the port under a lock, or parallel calls all pick the same one while ng serve starts. A port is
-# taken once a client listens on it or a live serve.sh has claimed it. mkdir is the lock (no flock on
-# macOS); it is held only for the claim, so nothing started below can keep it.
-lock=$state/port.lock
-n=0; until mkdir "$lock" 2>/dev/null; do n=$((n + 1)); [ $n -lt 100 ] || rm -rf "$lock"; sleep 0.1; done # stale after 10s
-trap 'rmdir "$lock" 2>/dev/null || true' EXIT
-claimed() { for f in "$state"/*.port; do [ -f "$f" ] && [ "$(cat "$f")" = "$1" ] && kill -0 "$(cat "${f%.port}.pid")" 2>/dev/null && return; done; return 1; }
-port=
-for p in $(seq 4200 4210); do up "$p" || claimed "$p" || { port=$p && break; }; done
-# Name what holds each port, so a stale client from another checkout can be stopped (lsof, where there is one).
-holders() {
-  for p in $(seq 4200 4210); do
-    pid=$(lsof -nP -iTCP:"$p" -sTCP:LISTEN -t 2>/dev/null | head -1) || true
-    if [ -n "$pid" ]; then echo "  $p pid=$pid $(lsof -a -p "$pid" -d cwd -Fn 2>/dev/null | sed -n 's/^n//p')"; fi
-  done
-}
-[ -n "$port" ] || { echo "serve: no free port in 4200-4210, held by:" >&2 && holders >&2 && exit 1; }
-echo $$ >"$key.pid" && echo "$port" >"$key.port" # claimed by this script until ng serve's pid replaces it
-rmdir "$lock" && trap - EXIT
-
-cd "$wt/angular-client"
-[ -x node_modules/.bin/ng ] || npm ci --no-audit --no-fund >"$log" 2>&1 ||
-  { echo "serve: npm ci failed in $wt/angular-client:" >&2 && tail -20 "$log" >&2 && exit 1; }
-nohup npx ng serve --port "$port" >"$log" 2>&1 &
-pid=$!
-echo "$pid" >"$key.pid" && echo "$port" >"$key.port"
-
-for _ in $(seq 180); do
-  kill -0 "$pid" 2>/dev/null || { echo "serve: ng serve exited for $branch:" >&2 && tail -20 "$log" >&2 && exit 1; }
-  if grep -q 'bundle generation failed\|\[ERROR\]' "$log"; then
-    echo "serve: $branch failed to compile (still serving on $port, pid $pid):" >&2 && tail -30 "$log" >&2 && exit 1
-  fi
-  if up "$port" && grep -q 'bundle generation complete\|Compiled successfully' "$log"; then
-    echo "$branch client=http://localhost:$port pid=$pid log=$log"
-    exit 0
-  fi
-  sleep 1
-done
-echo "serve: $branch not up after 180s (pid $pid); see $log" >&2 && exit 1
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/setup-workspace/SKILL.md b/software/application-software/argos/workspaces/argos-dev/.claude/skills/setup-workspace/SKILL.md
deleted file mode 100644
index fdc1ce8..0000000
--- a/software/application-software/argos/workspaces/argos-dev/.claude/skills/setup-workspace/SKILL.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-name: setup-workspace
-description: Change what this workspace checks out and re-run its setup. workspace.yml lists code repos (repos:), read-only dependency sources (references-git:), and clones of other Delphi workspaces or main to read (workspaces:). Use when the user wants to read or compare another workspace's or main's instructions, skills, or docs (link it), add or remove a repo or dependency reference, or run setup after cloning or pulling.
----
-
-`workspace.yml` at the workspace root lists what `.delphi/setup.sh` checks out, all git-ignored: code repos (`repos:`), dependency sources (`references-git:`), and other Delphi workspaces or main (`workspaces:`, entries `- <name>` or `- main`; a workspace's name is the short names of its folders (each folder's `short-name` file, else its name) and its own folder name, joined by dots, like `s.app.argos.argos-dev`; `bash .delphi/switch.sh --list` lists them). The comment on each section gives its entry format and where it lands; read it, then edit the file.
-
-Run from the workspace root after any change, and to refresh references and workspace copies to their latest:
-
-```
-bash .delphi/setup.sh
-```
-
-- The clones under `workspaces/` are full clones, each on its branch (`ws/<name>` or `main`) tracking origin, for reading: don't edit, branch, or push them from this workspace. Each setup run switches a clone back to its branch if it was switched away (refused while it has uncommitted changes), pulls it, and runs its own setup, so that workspace's repos and references are under it too (it skips its own `workspaces:`, so they don't chain). To change one of those workspaces or main, work in its own clone or switch to it (`switch-workspace` skill).
-- This workspace's project folder (shared context, `AUTHORING.md`, `workspace-defaults/`) is the folder above `workspaces/<leaf>/` in `workspaces/main/` (`bash .delphi/switch.sh --list` prints it): for `s.app.argos.argos-dev`, `workspaces/main/software/application-software/argos/`. List workspaces and their project folders: `bash .delphi/switch.sh --list`.
-- `workspace.yml` is shared: change it on a branch and open a PR into `ws/<this-name>` (the `name:` in `workspace.yml`). For a one-off look, add the entry, run setup, then `git restore workspace.yml`.
-- Setup never deletes what you'd lose. A removed entry's `workspaces/<name>/`, `references/<name>/`, or repo store and worktrees stay until you delete them (ask first).
-- When Delphi releases a version that needs cleanup in clones, setup runs its migration first (`.delphi/migrations/`), once per workspace. A migration removes only what nothing is lost from, and otherwise stops setup with what to do: tell the user, do it with their go-ahead, and re-run.
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/switch-workspace/SKILL.md b/software/application-software/argos/workspaces/argos-dev/.claude/skills/switch-workspace/SKILL.md
deleted file mode 100644
index e0a8b42..0000000
--- a/software/application-software/argos/workspaces/argos-dev/.claude/skills/switch-workspace/SKILL.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: switch-workspace
-description: Switch this clone to another Delphi workspace, or to Delphi's main, to work in it. Use when the user wants to check out, switch to, open, or work in another workspace or project, or to change another workspace's or main's files.
----
-
-Run from the workspace root:
-
-```
-bash .delphi/switch.sh <name>        # ws/<name>: its dotted name, e.g. s.app.argos.argos-dev
-bash .delphi/switch.sh main          # Delphi's main: project folders, templates, CI
-```
-
-- The user can also switch from the `/ws-delphi` pane (the `delphi` plugin's mod), which shows them as cards (`bash .delphi/switch.sh --list`): press one, then Switch workspace; `/ws-delphi <name>` switches straight away, and `/ws-delphi --web` opens the same cards in a browser tab.
-- List workspaces and their project folders: `bash .delphi/switch.sh --list`.
-- It refuses while tracked files have changes: commit them on a branch (and PR them) first. Then it fetches, switches, fast-forwards, and runs the new workspace's `.delphi/setup.sh`.
-- The post-checkout hook parks this workspace's `repos/`, `worktrees/`, `references/` and `workspaces/` in `.delphi/parked/<name>/` (git-ignored; `<name>` as in its `workspace.yml`) and brings the other's back at the same paths, so worktrees and the work in them return as they were. Switch back the same way. Never run `git clean -X` or `git stash --all` at the workspace root: they take ignored files, parked work included.
-- Before switching, stop anything running from `worktrees/` (dev servers, Docker builds): its folder moves.
-- No restart needed: skills under `.claude/skills/` reload on their own, and the `delphi` mod sends the new workspace's `CLAUDE.md` with the next prompt. Without the mod installed, this session keeps the old `CLAUDE.md`: tell the user to restart Claude Code in the same folder before starting work in the new workspace.
-- To change the workspace you switched to: `git switch -c <branch>`, commit, push, and open a PR into `ws/<name>` (or `main`).
-- To only read another workspace or main without leaving this one, list it under `workspaces:` instead (`setup-workspace` skill).
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/ticket-conventions/SKILL.md b/software/application-software/argos/workspaces/argos-dev/.claude/skills/ticket-conventions/SKILL.md
deleted file mode 100644
index b516657..0000000
--- a/software/application-software/argos/workspaces/argos-dev/.claude/skills/ticket-conventions/SKILL.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-name: ticket-conventions
-description: Argos specifics for tickets (repo, area labels, vocabulary, diagrams). Load before drafting or filing an Argos issue, alongside create-ticket.
-user-invocable: false
----
-
-# Argos ticket conventions
-
-The shared rules are in the `create-ticket` skill; this adds only what is Argos's.
-
-- Repo: Northeastern-Electric-Racing/Argos (base branch `develop`).
-- Area labels: `frontend`, `backend`, `devops` (any combination).
-- Vocabulary: use the workspace glossary's terms (`docs/CONTEXT.md`), and check the code for current names, which may have moved past it (e.g. Zenoh key expressions, not MQTT topics).
-- Title example: "Add pagination to the run list".
-- Diagrams: Mermaid where it fits. Show the change across the parts it touches (car, Siren, scylla-server, angular-client), before and after.
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/update-pr/SKILL.md b/software/application-software/argos/workspaces/argos-dev/.claude/skills/update-pr/SKILL.md
deleted file mode 100644
index 069b517..0000000
--- a/software/application-software/argos/workspaces/argos-dev/.claude/skills/update-pr/SKILL.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-name: update-pr
-description: Update a branch's PR description to reflect the latest changes
----
-
-Load the project's `pr-conventions` skill, then rewrite the branch's PR body (`(cd worktrees/<repo>/<branch> && gh pr view)`) to match `git -C worktrees/<repo>/<branch> diff origin/<base>...HEAD`, following the PR body rules in the `open-pr` skill. Keep human-written text that's still accurate, `user-attachments` screenshots, and `Closes`/`Fixes` refs; new screenshots or videos follow open-pr's media step, attached with `gh pr edit --attach`. Write it to `/tmp/<branch>-pr-body.md`, apply it with `gh pr edit <branch> --body-file` from the worktree, and add any of the project's labels that are missing with `--add-label`.
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/SKILL.md b/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/SKILL.md
deleted file mode 100644
index ae99371..0000000
--- a/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/SKILL.md
+++ /dev/null
@@ -1,24 +0,0 @@
----
-name: verify-graph
-description: Playwright CLI verification of the graph page — modes, controls, topic selection, and data rendering. Use after any change to graph-page components, graph rendering, data flow, or mode switching logic.
-user-invocable: true
----
-
-Get the branch's client running with `run-local <branch>`; its URL is `BASE_URL`. The scripts need `playwright-cli` (`npm i -g @playwright/cli`, then `playwright-cli install-browser chromium`; cloud containers use their preinstalled Chromium). Then run the base checks:
-
-```
-bash scripts/check.sh <branch> "$BASE_URL"
-```
-
-It seeds a 50-hour run spanning two midnights (once, shared by parallel checks), opens a `playwright-cli` session named after the branch (`scripts/open.sh`: output to `pictures/<branch>/`, config to `.playwright-cli/<branch>/`), and runs `scripts/check.js`. That covers: page loads in real time, a topic from the tree draws live, the seeded run, historical Quick Select, back to real time, and no console errors beyond develop's NG0100. It prints `[x]`/`[ ]` per check and exits 1 on a failure. Each `look:` line names a screenshot and what it should show: open it and judge it, since only a picture shows whether a chart is right.
-
-Go further where the diff points, by hand in the same session (`P="playwright-cli -s=<branch>"`): controls the diff touches (Pause↔Play, Time Range↔Point Range, Tog Sidebar, Tog Mult Yaxis, Y Min/Max, Custom range, Clear Graph), zoom, pan and hover, several topics, or mode switching for console errors. Reproduce a failed check the same way before fixing it; `check.js` has its steps.
-
-- Act: `$P click "button:has-text('Pause')"`, `role=combobox[name='Quick Select']`, `role=option[name='5 minutes']`, or a ref from `$P snapshot`.
-- Assert: `$P find "<text>"`, `$P snapshot`, `$P console error`; longer Playwright code with `$P run-code "async (page) => {…}"`, or `--filename` for a file kept in `.playwright-cli/<branch>/`.
-- The seeded run: click Select Run, then `bash scripts/select-run.sh <branch> $(bash scripts/seed.sh)`.
-- Screenshots: `$P screenshot --filename=pictures/<branch>/verify-graph/NN-<name>.png` (gitignored).
-
-When the diff touches rendering or the live data path, measure it too: `bash scripts/perf.sh <branch> "$BASE_URL" [<topic>,…]` prints retained JS heap, allocation rate, frame rate and long tasks (`scripts/perf.js`), then the browser's GPU-process memory, where a WebGL chart's buffers show up. The numbers drift with machine load, so run the branch and its base side by side, twice, at the same topics. Calypso sends about one point a second per topic and has no rate setting, so the chart's own data is small next to the app's: a JS-heap gap of a few MB is noise, and more topics widen real ones.
-
-When a hand check keeps coming back, add it to `check.js`. Report `check.sh`'s lines plus one line per hand check, and the screenshot folder. `$P close` at the end.
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/check.js b/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/check.js
deleted file mode 100644
index 3fcb734..0000000
--- a/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/check.js
+++ /dev/null
@@ -1,83 +0,0 @@
-// The base verify-graph checks, for check.sh to run with `playwright-cli run-code` (it fills in __URL__,
-// __RUN__ and __OUT__). Each check asserts what the DOM can show; what only a picture can show (a series
-// drawn, the x-axis span) is a screenshot with a `look:` line for the agent to judge.
-async (page) => {
-  const URL = '__URL__', RUN = __RUN__, OUT = '__OUT__';
-  const lines = [], errors = [];
-  page.on('console', (m) => {
-    if (m.type() === 'error' && !m.text().includes('NG0100')) errors.push(m.text().split('\n')[0].slice(0, 160));
-  }); // develop already logs NG0100 (ExpressionChangedAfterItHasBeenChecked)
-  const text = (t) => page.getByText(t, { exact: true });
-  const button = (name) => page.getByRole('button', { name, exact: true });
-  const tree = page.getByRole('tree');
-  const absent = async (name) => { if (await button(name).isVisible()) throw new Error(`"${name}" is shown`); };
-  const shot = async (name, look) => {
-    await page.screenshot({ path: `${OUT}/${name}.png` });
-    lines.push(`    look: ${OUT}/${name}.png: ${look}`);
-  };
-  const check = async (name, steps) => {
-    const at = lines.length;
-    try {
-      await steps();
-      lines.splice(at, 0, `[x] ${name}`);
-    } catch (e) {
-      lines.push(`[ ] ${name}: ${String(e.message).split('\n')[0]}`);
-    }
-  };
-
-  await check('1 page loads in real time', async () => {
-    await page.goto(`${URL}/graph`);
-    await text('Real Time').waitFor({ timeout: 30000 });
-    for (const b of ['Pause', 'Time Range', 'Select Run', 'Clear Graph', 'Custom']) await button(b).waitFor({ timeout: 2000 });
-    await page.getByRole('combobox', { name: 'Quick Select' }).waitFor({ timeout: 2000 });
-    await absent('Realtime');
-  });
-  await check('2 topic from the tree draws live', async () => {
-    const node = (name) => tree.getByRole('treeitem').filter({ has: page.getByText(name, { exact: true }) }).last(); // innermost
-    for (const name of ['BMS', 'Segment_Total_Volt']) await node(name).locator('.p-tree-node-toggle-button').first().click();
-    await tree.getByText('0', { exact: true }).first().click();
-    await page.waitForURL(/topics=BMS%2FSegment_Total_Volt%2F0/, { timeout: 5000 });
-    await page.waitForTimeout(3000);
-    await shot('02-live-topic', 'a live series is drawn');
-  });
-  await check(`3 seeded run #${RUN}`, async () => {
-    await button('Select Run').click();
-    await page.locator('.run-card').first().waitFor({ timeout: 10000 });
-    await page.evaluate((id) => {
-      const card = [...document.querySelectorAll('.run-card')]
-        .find((c) => [...c.querySelectorAll('*')].some((e) => !e.childElementCount && e.textContent.trim() === 'Run #' + id));
-      const pick = card?.parentElement?.querySelector('.run-select-button button');
-      if (!pick) throw new Error(`no Run #${id} in the Select Run dialog`);
-      pick.dispatchEvent(new MouseEvent('click', { bubbles: true, cancelable: true })); // under a PrimeNG overlay
-    }, RUN);
-    await page.locator('.run-card').first().waitFor({ state: 'detached', timeout: 5000 });
-    await text(`Run #${RUN}`).waitFor({ timeout: 10000 });
-    await button('Realtime').waitFor({ timeout: 2000 });
-    await absent('Pause');
-    await page.waitForTimeout(3000);
-    await shot('03-seeded-run', 'x-axis spans 50 hours, with a dated day-boundary line at each of the two midnights');
-  });
-  await check('4 historical Quick Select', async () => {
-    await button('Realtime').click();
-    await text('Real Time').waitFor({ timeout: 5000 });
-    await page.getByRole('combobox', { name: 'Quick Select' }).click();
-    await page.getByRole('option').first().waitFor({ timeout: 5000 });
-    const options = await page.getByRole('option').count();
-    if (options !== 11) throw new Error(`${options} Quick Select options, not 11`);
-    await page.getByRole('option', { name: '5 minutes', exact: true }).click();
-    await text('Historical').waitFor({ timeout: 5000 });
-    await absent('Pause');
-    await page.waitForTimeout(3000);
-    await shot('04-historical-5-min', 'x-axis about 5 minutes, or since the data starts');
-  });
-  await check('5 back to real time', async () => {
-    await button('Realtime').click();
-    await text('Real Time').waitFor({ timeout: 5000 });
-    await page.waitForTimeout(10000);
-    await shot('05-real-time-after', 'x-axis about 30 seconds, not the whole session');
-  });
-  await check('6 no new console errors', async () => {
-    if (errors.length) throw new Error(`${errors.length}, first: ${errors[0]}`);
-  });
-  return lines.join('\n');
-}
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/check.sh b/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/check.sh
deleted file mode 100755
index c8710cd..0000000
--- a/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/check.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-# check.sh <branch> <base-url>: run the base verify-graph checks (check.js) in <branch>'s playwright-cli
-# session, opening it if needed, against the seeded multi-day run. Prints one `[x]`/`[ ]` line per check
-# and `look:` lines for screenshots in pictures/<branch>/verify-graph/; exits 1 if a check failed.
-set -euo pipefail
-here=$(cd "$(dirname "$0")" && pwd)
-branch=${1:?usage: check.sh <branch> <base-url>}; url=${2:?usage: check.sh <branch> <base-url>}; url=${url%/}
-run=$(bash "$here/seed.sh")
-out=${DELPHI_ROOT:?unset: start the session at the workspace root}/pictures/$branch/verify-graph
-playwright-cli list | grep -q "^- $branch:" || bash "$here/open.sh" "$branch" "$url/graph" >/dev/null
-code=$(sed -e "s|__URL__|$url|; s|__RUN__|$run|; s|__OUT__|$out|" "$here/check.js")
-result=$(playwright-cli -s="$branch" --raw run-code "$code" | node -e 'process.stdout.write(JSON.parse(require("fs").readFileSync(0, "utf8")))')
-echo "$result"
-! grep -q '^\[ \]' <<<"$result"
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/open.sh b/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/open.sh
deleted file mode 100755
index 5a1b49b..0000000
--- a/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/open.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-# open.sh <branch> <url>: open a playwright-cli session named <branch> on <url>, so parallel checks don't
-# share a browser. Its output (snapshots, console logs, unnamed screenshots) goes to pictures/<branch>/;
-# its config, and any throwaway Playwright code, to .playwright-cli/<branch>/. Both are gitignored. Uses
-# the preinstalled Chromium in cloud containers (/opt/pw-browsers); elsewhere, Playwright's own
-# (`playwright-cli install-browser`).
-set -euo pipefail
-branch=${1:?usage: open.sh <branch> <url>}; url=${2:?usage: open.sh <branch> <url>}
-root=${DELPHI_ROOT:?unset: start the session at the workspace root}
-out=$root/pictures/$branch scratch=$root/.playwright-cli/$branch
-mkdir -p "$out" "$scratch"
-launch=; [ -x /opt/pw-browsers/chromium ] && launch=',"launchOptions":{"executablePath":"/opt/pw-browsers/chromium","headless":true}'
-printf '{"browser":{"browserName":"chromium"%s},"outputDir":"%s"}\n' "$launch" "$out" >"$scratch/cli.config.json"
-playwright-cli -s="$branch" open --config="$scratch/cli.config.json" "$url"
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/perf.js b/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/perf.js
deleted file mode 100644
index 404ac25..0000000
--- a/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/perf.js
+++ /dev/null
@@ -1,38 +0,0 @@
-async (page) => {
-  // Live-mode cost of the graph page with __TOPICS__ selected: retained JS heap after a GC, how fast it allocates
-  // (heap growth between 100 ms samples, GC drops ignored), and frame rate. Compare branches at the same topics.
-  const topics = '__TOPICS__'.split(',');
-  await page.goto(`__URL__/graph?topics=${encodeURIComponent(topics.join(','))}`);
-  await page.getByText('Real Time').first().waitFor({ timeout: 30000 });
-  const cdp = await page.context().newCDPSession(page);
-  const heap = async (gc) => {
-    if (gc) await cdp.send('HeapProfiler.collectGarbage');
-    return (await cdp.send('Runtime.getHeapUsage')).usedSize / 1e6;
-  };
-  await page.waitForTimeout(20000); // fill the live window
-  let alloc = 0, prev = await heap(false);
-  const t0 = Date.now();
-  while (Date.now() - t0 < 20000) {
-    await page.waitForTimeout(100);
-    const h = await heap(false);
-    if (h > prev) alloc += h - prev;
-    prev = h;
-  }
-  const allocMBps = alloc / ((Date.now() - t0) / 1000);
-  const frames = await page.evaluate(() => new Promise((done) => {
-    let n = 0, worst = 0, longTasks = 0, last = performance.now();
-    const end = last + 10000;
-    new PerformanceObserver((l) => (longTasks += l.getEntries().length)).observe({ type: 'longtask' });
-    const tick = (t) => {
-      worst = Math.max(worst, t - last);
-      last = t;
-      n++;
-      if (t < end) requestAnimationFrame(tick);
-      else done({ fps: n / 10, worstFrameMs: Math.round(worst), longTasks });
-    };
-    requestAnimationFrame(tick);
-  }));
-  const retainedMB = await heap(true);
-  return `retained JS heap ${retainedMB.toFixed(1)} MB, allocating ${allocMBps.toFixed(1)} MB/s, ` +
-    `${frames.fps} fps, worst frame ${frames.worstFrameMs} ms, ${frames.longTasks} long tasks`;
-}
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/perf.sh b/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/perf.sh
deleted file mode 100755
index 2218f42..0000000
--- a/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/perf.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-# perf.sh <branch> <base-url> [<topic>,…]: measure the graph page live in <branch>'s playwright-cli session
-# (perf.js: JS heap, allocation rate, frames; about a minute), then its browser's GPU-process memory, where
-# a WebGL chart's buffers show up. Default topics: four BMS ones. Numbers are relative: compare branches.
-set -euo pipefail
-here=$(cd "$(dirname "$0")" && pwd)
-branch=${1:?usage: perf.sh <branch> <base-url> [<topic>,…]}; url=${2:?usage: perf.sh <branch> <base-url> [<topic>,…]}; url=${url%/}
-topics=${3:-BMS/Segment_Total_Volt/0,BMS/PerCell/Alpha/3/Volts/5,BMS/PerCell/Alpha/3/Volts/4,BMS/PerCell/Alpha/4/Therms/0}
-playwright-cli list | grep -q "^- $branch:" || bash "$here/open.sh" "$branch" "$url/graph" >/dev/null
-code=$(sed -e "s|__URL__|$url|; s|__TOPICS__|$topics|g" "$here/perf.js")
-playwright-cli -s="$branch" --raw run-code "$code" | node -e 'process.stdout.write(JSON.parse(require("fs").readFileSync(0, "utf8")) + "\n")'
-# The session's daemon runs its browser; the browser's --type=gpu-process child holds GPU memory.
-ps -axo pid=,ppid=,rss=,command= | awk -v s=" $branch " '
-  { pid[NR] = $1; ppid[NR] = $2; rss[NR] = $3; cmd[NR] = $0 }
-  index($0, "cliDaemon") && index($0 " ", s) { daemon[$1] = 1 }
-  END {
-    for (i = 1; i <= NR; i++) if (daemon[ppid[i]]) browser[pid[i]] = 1
-    for (i = 1; i <= NR; i++) if (browser[ppid[i]] && index(cmd[i], "--type=gpu-process")) printf "GPU process %d MB\n", rss[i] / 1024
-  }'
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/seed.sh b/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/seed.sh
deleted file mode 100755
index fdb2631..0000000
--- a/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/seed.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-# seed.sh: make sure the local database holds verify-graph's multi-day run, and print its id. The run is
-# 50 hours of BMS/Segment_Total_Volt/0, one point every 30s, from noon UTC four days ago, so it crosses
-# two midnights in any time zone and stays out of the 24-hour Quick Select window. Parallel checks share
-# one run: it is made once, under a lock, and found by its notes after that.
-set -euo pipefail
-db=$(docker ps --filter name=odyssey-db --format '{{.Names}}' | head -1)
-[ -n "$db" ] || { echo "seed: no odyssey-db container; start the backend with run-local first" >&2 && exit 1; }
-sql() { docker exec -i "$db" psql -U postgres -v ON_ERROR_STOP=1 -qAt "$@"; }
-tag='verify-graph multi-day seed'
-state=${TMPDIR:-/tmp}; state=${state%/}/argos-run-local; mkdir -p "$state"
-lock=$state/seed.lock
-n=0; until mkdir "$lock" 2>/dev/null; do n=$((n + 1)); [ $n -lt 600 ] || rm -rf "$lock"; sleep 0.1; done # stale after 60s
-trap 'rmdir "$lock" 2>/dev/null || true' EXIT
-id=$(sql -c "select \"runId\" from run where notes = '$tag' limit 1")
-[ -n "$id" ] || id=$(sql <<SQL
-insert into data_type (name, unit) values ('BMS/Segment_Total_Volt/0', 'V') on conflict do nothing;
-with r as (
-  insert into run ("driverName", "locationName", notes, time)
-  values ('verify-graph', 'seed', '$tag', date_trunc('day', now()) - interval '84 hours')
-  returning "runId", time
-), d as (
-  insert into data (values, time, "dataTypeName", "runId")
-  select array[400 + 20 * sin(s / 3600.0)]::real[], (extract(epoch from r.time) * 1e6)::bigint + s * 1000000::bigint,
-    'BMS/Segment_Total_Volt/0', r."runId"
-  from r, generate_series(0, 50 * 3600, 30) s
-)
-select "runId" from r;
-SQL
-)
-echo "$id"
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/select-run.sh b/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/select-run.sh
deleted file mode 100755
index d1237c4..0000000
--- a/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-graph/scripts/select-run.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-# select-run.sh <branch> <run-id>: with the Select Run dialog open in <branch>'s session, pick run
-# <run-id>. The carousel autoplays and its "Select this Run" button sits under a PrimeNG overlay, so this
-# finds the run's card by id and clicks its button with a synthetic event instead of `playwright-cli click`.
-set -euo pipefail
-branch=${1:?usage: select-run.sh <branch> <run-id>}; id=${2:?usage: select-run.sh <branch> <run-id>}
-case $id in '' | *[!0-9]*) echo "select-run: run id must be a number, got '$id'" >&2 && exit 1 ;; esac
-playwright-cli -s="$branch" run-code "async (page) => {
-  await page.waitForSelector('.run-card');
-  const found = await page.evaluate((id) => {
-    const card = [...document.querySelectorAll('.run-card')]
-      .find((c) => [...c.querySelectorAll('*')].some((e) => !e.childElementCount && e.textContent.trim() === 'Run #' + id));
-    const button = card?.parentElement?.querySelector('.run-select-button button');
-    button?.dispatchEvent(new MouseEvent('click', { bubbles: true, cancelable: true }));
-    return !!button;
-  }, $id);
-  if (!found) throw new Error('select-run: no Run #$id in the Select Run dialog');
-}"
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-telemetry/SKILL.md b/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-telemetry/SKILL.md
deleted file mode 100644
index 006fff6..0000000
--- a/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-telemetry/SKILL.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-name: verify-telemetry
-description: Verification checklist for changes to MQTT-displayed telemetry values in the Angular frontend. Use whenever modifying, adding, or debugging a value that flows from the car through MQTT to the UI — including display formatting, new subscriptions, missing data, or incorrect readings.
----
-
-Work from the workspace root against the ticket's worktree, `worktrees/argos/<branch>/` (via `new-worktree`). Stop and fix at the first failing step.
-
-1. **Trace the subscription** in that worktree, from the component: its property is updated by a `this.storage.get(topics.someTopicFn())` subscription, the function in `angular-client/src/utils/topic.utils.ts` returns the right topic, and the value is parsed right for its type (`parseInt` vs `parseFloat`). A missing subscription is the bug.
-2. **Check the topic end to end:**
-
-   ```bash
-   bash scripts/check-topic.sh <TOPIC>
-   ```
-
-   It prints the CAN definition (unit, value points; exit 1 if the topic isn't defined), refreshes the Calypso image (if it changed, restart with `(cd worktrees/argos/<branch> && ./argos.sh client-dev down)` then `run-local <branch>`), and shows the topic's last scylla-server log lines. Confirm the unit and value index match the UI; no log lines means it isn't being published.
-3. **See it live:** bring the app up with `run-local <branch>`, open the page with Playwright, wait for data, and screenshot to `pictures/<branch>/<name>.png`. Check value, formatting, and layout.
diff --git a/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-telemetry/scripts/check-topic.sh b/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-telemetry/scripts/check-topic.sh
deleted file mode 100755
index c9a9c0a..0000000
--- a/software/application-software/argos/workspaces/argos-dev/.claude/skills/verify-telemetry/scripts/check-topic.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-# check-topic.sh <topic>: check one MQTT topic end to end for verify-telemetry. Prints
-# its CAN definition (file, message id, unit, value points) from worktrees/odyssey-definitions/main,
-# whether the Calypso simulator image is current and running,
-# and the topic's last scylla-server log lines. Exits 1 if the topic isn't defined. Needs jq; the
-# docker checks are skipped without docker.
-set -euo pipefail
-usage="usage: check-topic.sh <topic>"
-topic=${1:?$usage}
-# shellcheck source=/dev/null
-. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
-defs=$DELPHI_WORKTREES/odyssey-definitions/main/can-messages
-[ -d "$defs" ] || { echo "no CAN definitions at $defs; add odyssey-definitions under repos: and run .delphi/setup.sh" >&2; exit 2; }
-
-echo "== CAN definition"
-jq -ce --arg t "$topic" 'input_filename as $f | .[] | . as $m | .fields[]? | select(.name == $t) |
-  {file: ($f | split("/")[-1]), id: $m.id, desc: $m.desc, unit, points: [.values[] | $m.points[. - 1].name]}' \
-  "$defs"/*.json || { echo "not found: $topic"; exit 1; }
-
-command -v docker >/dev/null || { echo "== docker not installed; skipping Calypso and logs"; exit 0; }
-echo "== Calypso"
-if docker pull -q ghcr.io/northeastern-electric-racing/calypso:Develop >/dev/null 2>&1; then
-  echo "image pulled (restart the stack if it changed)"; else echo "pull failed"; fi
-docker ps --filter name=calypso --format '{{.Names}} {{.Status}}' 2>/dev/null | grep . || echo "calypso not running"
-echo "== scylla-server log"
-c=$(docker ps --filter name=scylla-server --format '{{.Names}}' 2>/dev/null | head -1) # compose names it <project>-scylla-server-1
-if [ -z "$c" ]; then echo "scylla-server not running in docker (local cargo run? check its log)"
-else docker logs "$c" 2>&1 | grep -F "$topic" | tail -5 | grep . || echo "no log lines for $topic (not published?)"; fi
diff --git a/software/application-software/argos/workspaces/argos-dev/workspace.generated b/software/application-software/argos/workspaces/argos-dev/workspace.generated
deleted file mode 100644
index 21804a8..0000000
--- a/software/application-software/argos/workspaces/argos-dev/workspace.generated
+++ /dev/null
@@ -1,34 +0,0 @@
-# Generated by ci/render.sh; edit shared sources or opt out in workspace.yml.
-100644 61c35f28dda167e42bebc3bad3994af97c53e876	.claude/settings.json	ci/plugins.sh
-100644 30083fa3b2cf735ac5a75808478dd00476e75e9c	.claude/skills/address-pr-comments/SKILL.md	software/application-software/workspace-inherit/.claude/skills/address-pr-comments/SKILL.md
-100755 ce1efd97da4a6d2ea655932486660c5008f44dae	.claude/skills/address-pr-comments/scripts/fetch-feedback.sh	software/application-software/workspace-inherit/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh
-100644 da0be202ebc0a9ffc4544dbdf4bbef54cca37520	.claude/skills/address-pr-comments/scripts/github.sh	software/application-software/workspace-inherit/.claude/skills/address-pr-comments/scripts/github.sh
-100644 4b5675711abfaef10089859f379a931206267355	.claude/skills/commit/SKILL.md	software/application-software/workspace-inherit/.claude/skills/commit/SKILL.md
-100644 4f85b66ab5c07ce4a00ba3d8555fc9272544046b	.claude/skills/consolidate-spikes/SKILL.md	software/application-software/workspace-inherit/.claude/skills/consolidate-spikes/SKILL.md
-100644 210a059f1a4b753cab90aad19f26ead483a62295	.claude/skills/create-ticket/SKILL.md	software/application-software/workspace-inherit/.claude/skills/create-ticket/SKILL.md
-100644 f24d293b38a4d03b610a5a104fa97b614856d7c3	.claude/skills/implement/SKILL.md	software/application-software/argos/workspace-inherit/.claude/skills/implement/SKILL.md
-100644 4917259f9e29db28e2636496e80f80ee5d9e321e	.claude/skills/journal/SKILL.md	software/workspace-inherit/.claude/skills/journal/SKILL.md
-100755 1e90d7b9afa14b8b0e7f36e0e1d83baecc94ba5b	.claude/skills/journal/scripts/capture.sh	software/workspace-inherit/.claude/skills/journal/scripts/capture.sh
-100644 0495fc97cbe93e4331c89263aee188f6c0e9c9ea	.claude/skills/new-worktree/SKILL.md	software/workspace-inherit/.claude/skills/new-worktree/SKILL.md
-100644 b1e7c71c13b4ea7c40cabeb12aa1674a6b543dc5	.claude/skills/open-pr/SKILL.md	software/application-software/workspace-inherit/.claude/skills/open-pr/SKILL.md
-100755 61f377fef63daa10c443129df6a49571fdbeb658	.claude/skills/open-pr/scripts/pr-checks.sh	software/application-software/workspace-inherit/.claude/skills/open-pr/scripts/pr-checks.sh
-100644 90cc6571064f750bd5d816f44cf3064fa2df8f7e	.claude/skills/pr-conventions/SKILL.md	software/application-software/argos/workspace-inherit/.claude/skills/pr-conventions/SKILL.md
-100644 2ed67ecda73634b78468cab0ccb52c86f128e064	.claude/skills/pr-conventions/scripts/lint.sh	software/application-software/argos/workspace-inherit/.claude/skills/pr-conventions/scripts/lint.sh
-100644 e67387116a753217d256d81901e5b4091b49b44c	.claude/skills/report-spike/SKILL.md	software/application-software/workspace-inherit/.claude/skills/report-spike/SKILL.md
-100644 7acb908af141defaa035f992b060d4d23c0b2a54	.claude/skills/run-local/SKILL.md	software/application-software/argos/workspace-inherit/.claude/skills/run-local/SKILL.md
-100755 f5986571d9b917264eb6cfe9c9d7f27448242ac9	.claude/skills/run-local/scripts/run-local.sh	software/application-software/argos/workspace-inherit/.claude/skills/run-local/scripts/run-local.sh
-100755 d8de89ce933cbc5302c59fab3176004bdd251d35	.claude/skills/run-local/scripts/serve.sh	software/application-software/argos/workspace-inherit/.claude/skills/run-local/scripts/serve.sh
-100644 fdc1ce85211200223040edfb5dc65a3de7f35d53	.claude/skills/setup-workspace/SKILL.md	software/workspace-inherit/.claude/skills/setup-workspace/SKILL.md
-100644 e0a8b424d11c4897901c0ce888a6c0c726daed98	.claude/skills/switch-workspace/SKILL.md	software/workspace-inherit/.claude/skills/switch-workspace/SKILL.md
-100644 b516657698fb909e0c72f8c9a6187fdaf4a38f71	.claude/skills/ticket-conventions/SKILL.md	software/application-software/argos/workspace-inherit/.claude/skills/ticket-conventions/SKILL.md
-100644 069b51714c0fd4d3d6ad972dd9f840e01f21cf15	.claude/skills/update-pr/SKILL.md	software/application-software/workspace-inherit/.claude/skills/update-pr/SKILL.md
-100644 ae99371d623deb83d2ac5b1227eb12eaff662092	.claude/skills/verify-graph/SKILL.md	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/SKILL.md
-100644 3fcb7344ce3499a7afbba08b8c2b6deacd3f101b	.claude/skills/verify-graph/scripts/check.js	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/check.js
-100755 c8710cdf2cea12ddae0a92c3e0ba141e06a234f3	.claude/skills/verify-graph/scripts/check.sh	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/check.sh
-100755 5a1b49bc55582ec03f5e0a58c015d1b28fd21af3	.claude/skills/verify-graph/scripts/open.sh	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/open.sh
-100644 404ac250d03f0c228b8206efef46bed6149bd314	.claude/skills/verify-graph/scripts/perf.js	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/perf.js
-100755 2218f42b8f020b7d83e9d960828800444e1260ad	.claude/skills/verify-graph/scripts/perf.sh	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/perf.sh
-100755 fdb2631a755b9999c2aa83c67729fbeb13d387a8	.claude/skills/verify-graph/scripts/seed.sh	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/seed.sh
-100755 d1237c42098d2a437770c24e2f60b7110d1e90b2	.claude/skills/verify-graph/scripts/select-run.sh	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/select-run.sh
-100644 006fff61ee4658a959c921e5fd70ecc57e2b07f2	.claude/skills/verify-telemetry/SKILL.md	software/application-software/argos/workspace-inherit/.claude/skills/verify-telemetry/SKILL.md
-100755 c9a9c0a7dd4386508e1f90d595d59b50df0aad35	.claude/skills/verify-telemetry/scripts/check-topic.sh	software/application-software/argos/workspace-inherit/.claude/skills/verify-telemetry/scripts/check-topic.sh
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/address-pr-comments/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/address-pr-comments/SKILL.md
deleted file mode 100644
index 3bf22d3..0000000
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/address-pr-comments/SKILL.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-name: address-pr-comments
-description: Fetch review comments on a PR (Argos, Nero), judge whether each (including outdated ones) still applies, and walk through fixes in the PR's worktree
----
-
-Propose and apply fixes for a PR's unresolved review feedback. **Never reply to threads**; the user does.
-
-1. **Fetch** from the workspace root: `bash scripts/fetch-feedback.sh <repo> <pr>|<branch>` (`<repo>` as under `repos/`, e.g. `argos`; `--all` first for unfiltered history). It checks out the PR head's worktree and prints JSON: `worktree` (target it by path from the root from now on), unresolved `threads`, `comments`, `reviews`. Any non-zero exit: use the available GitHub integration's PR-reading tool instead.
-2. **Judge.** Skip bot noise and anything already fixed at HEAD. For an `outdated` thread, find its `diffHunk` code by content, then label it **addressed**, **applies**, **moved**, **obsolete**, or **unclear**.
-3. **Present** before editing, grouped by file, and ask to confirm, skip, or change each (offer to batch clear ones past 8):
-
-   ```
-   <file>:<line> — <reviewer> · <active|outdated> · <label>
-   "<excerpt>" → <proposed fix>
-   <optional ≤5-line snippet, for the user only>
-   ```
-4. **Apply** in that worktree, by path, with grouped `/commit`s. For a follow-up-ticket request, reuse a match from `gh issue list --search` before filing.
-5. **Report** what was fixed (file:line, commit SHA), what was already addressed or obsolete (why), and what is unclear.
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/address-pr-comments/scripts/fetch-feedback.sh b/software/application-software/argos/workspaces/default-codex/.agents/skills/address-pr-comments/scripts/fetch-feedback.sh
deleted file mode 100755
index ce1efd9..0000000
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/address-pr-comments/scripts/fetch-feedback.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env bash
-# fetch-feedback.sh [--all] <repo> <pr-number>|<branch>: print a PR's review
-# feedback as one JSON object after creating or reusing the PR head's worktree
-# (worktrees/<repo>/<head>). Default output keeps unresolved threads (first + latest message,
-# bots tagged), conversation comments, and reviews with text; --all keeps everything. Exits 3 on any
-# GitHub failure (see github.sh).
-# shellcheck source-path=SCRIPTDIR source=github.sh
-set -euo pipefail
-. "$(dirname "$0")/github.sh"
-all=false
-[ "${1:-}" = --all ] && all=true && shift
-usage="usage: fetch-feedback.sh [--all] <repo> <pr-number>|<branch>"
-repo=${1:?$usage} ref=${2:?$usage}
-# shellcheck source=/dev/null
-. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
-gh_init fetch-feedback "$DELPHI_WORKTREES/$repo/.bare"
-
-case "$ref" in *[!0-9]*) get "repos/$SLUG/pulls?state=all&head=${SLUG%%/*}:$ref" | jq '.[0] // error("no PR")' ;;
-  *) get "repos/$SLUG/pulls/$ref" ;; esac >"$TMP/pr"
-num=$(jq .number "$TMP/pr")
-wt=""
-[ "$(jq -r .head.repo.full_name "$TMP/pr")" != "$SLUG" ] || wt=$(bash "$DELPHI_ROOT/.delphi/new-worktree.sh" "$repo" "$(jq -r .head.ref "$TMP/pr")")
-
-if [ "$MODE" = gh ]; then # thread state is GraphQL-only; reshape it like the proxy's ccr/review_threads
-  # shellcheck disable=SC2016 # GraphQL variables
-  gh api graphql -F o="${SLUG%%/*}" -F n="${SLUG##*/}" -F p="$num" -f query='query($o: String!, $n: String!, $p: Int!) {
-    repository(owner: $o, name: $n) { pullRequest(number: $p) { reviewThreads(first: 100) { nodes {
-      isResolved isOutdated comments(first: 50) { nodes { databaseId } } } } } } }' \
-    --jq '[.data.repository.pullRequest.reviewThreads.nodes[] |
-      {resolved: .isResolved, outdated: .isOutdated, comment_ids: [.comments.nodes[].databaseId]}]'
-else get "repos/$SLUG/pulls/$num/ccr/review_threads"; fi >"$TMP/th"
-get "repos/$SLUG/pulls/$num/comments?per_page=100" >"$TMP/rc"
-get "repos/$SLUG/issues/$num/comments?per_page=100" >"$TMP/ic"
-get "repos/$SLUG/pulls/$num/reviews?per_page=100" >"$TMP/rv"
-
-jq -n --arg wt "$wt" --argjson all "$all" --slurpfile pr "$TMP/pr" --slurpfile th "$TMP/th" \
-  --slurpfile rc "$TMP/rc" --slurpfile ic "$TMP/ic" --slurpfile rv "$TMP/rv" '
-  def who: {author: .user.login, bot: (.user.type == "Bot")};
-  ($rc[0] | map({key: (.id | tostring), value: (who + {body, path, line: (.line // .original_line), diffHunk: .diff_hunk})}) | from_entries) as $byid |
-  {pr: ($pr[0] | {number, title, url: .html_url, head: .head.ref, base: .base.ref}), worktree: $wt,
-   threads: [$th[0][] | {resolved, outdated, comments: [.comment_ids[] | $byid[tostring]]}],
-   comments: [$ic[0][] | who + {body}], reviews: [$rv[0][] | who + {state, body: (.body // "")}]} |
-  if $all then . else
-    .threads |= map(select(.resolved | not) | .comments as $c | $c[-1] + {outdated, path: $c[0].path, line: $c[0].line,
-      diffHunk: (if .outdated then $c[0].diffHunk else null end), replies: ($c | length),
-      first: (if ($c | length) > 1 then $c[0].body else null end)}) |
-    .reviews |= map(select(.body != ""))
-  end'
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/address-pr-comments/scripts/github.sh b/software/application-software/argos/workspaces/default-codex/.agents/skills/address-pr-comments/scripts/github.sh
deleted file mode 100644
index da0be20..0000000
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/address-pr-comments/scripts/github.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-# github.sh: sourced by skill scripts that call GitHub. gh_init <tool> <git-dir> picks a backend
-# (gh when logged in, else an explicitly enabled GitHub REST proxy via curl; jq is needed either
-# way), sets SLUG from that repo's origin, and makes any failure exit 3 so the calling skill falls
-# back to the available GitHub integration. TMP is a scratch dir removed on exit.
-# shellcheck shell=bash
-fail() { echo "$TOOL: $1; use the available GitHub integration" >&2; exit 3; }
-on_exit() { local rc=$?; rm -rf "$TMP"; [ "$rc" -eq 0 ] || fail "GitHub request failed ($MODE)"; }
-gh_init() {
-  TOOL=$1
-  if { command -v gh && gh auth status; } >/dev/null 2>&1; then MODE=gh
-  elif [ -n "${DELPHI_GITHUB_REST_PROXY:-${CLAUDE_CODE_REMOTE:-}}" ] && command -v curl >/dev/null; then MODE=rest
-  else fail "no authenticated gh or enabled REST proxy"; fi
-  command -v jq >/dev/null || fail "jq not installed"
-  SLUG=$(git -C "$2" remote get-url origin) && SLUG=${SLUG#*github.com[:/]} && SLUG=${SLUG%.git}
-  TMP=$(mktemp -d)
-  trap on_exit EXIT
-}
-get() { if [ "$MODE" = gh ]; then gh api "$1"; else curl -fsS "https://api.github.com/$1"; fi; }
-post() { if [ "$MODE" = gh ]; then gh api -X POST "$1" --input -; else curl -fsS -X POST --data-binary @- "https://api.github.com/$1"; fi; }
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/commit/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/commit/SKILL.md
deleted file mode 100644
index 7a8015c..0000000
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/commit/SKILL.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-name: commit
-description: Stage and commit using the project's commit message convention
----
-
-In the worktree you're working on, from the workspace root (`git -C worktrees/<repo>/<branch> …`), stage the relevant changes (not unrelated or generated files) and commit using the commit message format in AGENTS.md. Keep the description imperative and 2–8 words.
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/consolidate-spikes/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/consolidate-spikes/SKILL.md
deleted file mode 100644
index 897a1f5..0000000
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/consolidate-spikes/SKILL.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-name: consolidate-spikes
-description: >-
-  Turn finished spikes into implementation tickets: an idea's spikes, once all are done, into dev work, under an epic when it comes from an idea or splits. Use when the user wants to wrap up, settle, or consolidate an idea or spike on an application-software repo (Argos, Nero).
----
-
-Drafts and files by the `create-ticket` rules; load it and the project's `ticket-conventions` first. Takes an idea or a standalone spike.
-
-1. **Gather** each spike's findings comment, draft PR, and the PR's reviews; from an idea, its sub-issues too.
-2. **Check it's done.** Every spike is done by `create-ticket`'s Spikes rules (the lead's latest review on its draft PR, from repos/<owner>/<repo>/pulls/<pr>/reviews, is an approval). From an idea, that's every spike under it, and every one of its areas to explore is covered by a spike area. Otherwise list what's missing, offer spikes for uncovered areas, and stop.
-3. **Choose:** per area (title prefix), propose the approach to build (one spike's, or a mix) with a one-line why, from the findings and the lead's review. The user confirms or changes each.
-4. **Plan** the dev work by `create-ticket`'s Dev work rules: one ticket unless the work is large enough to split into vertical slices, which may cross areas. Each ticket: What, the slice; Notes, links to the spikes and draft PRs it draws on, and the dropped approaches with why; context transfer, the findings' facts.
-5. **Draft** them, and, from an idea or when split, one epic (From: the idea or spike) with the dev work as its sub-issues. Show all, with which slices run in parallel if split; file what the user OKs.
-6. **Close**, each with a one-line comment: the spikes as completed ("Consolidated into #<epic or dev work>"), their draft PRs unless a dev work ticket builds on that branch, and the idea as completed ("Settled in #<epic or dev work>").
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/create-ticket/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/create-ticket/SKILL.md
deleted file mode 100644
index 210a059..0000000
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/create-ticket/SKILL.md
+++ /dev/null
@@ -1,66 +0,0 @@
----
-name: create-ticket
-description: Draft and file a GitHub issue (idea, spike, epic, or dev work) on an application-software repo (Argos, Nero) from the repo's issue templates, or rewrite an existing issue into them. Use whenever the user wants to create, file, write up, or log a ticket, issue, idea, spike, epic, bug, or task, including an out-of-scope idea that comes up mid-work.
----
-
-# Create ticket
-
-These are the ticket conventions for every application-software repo. The repo's own `.github/ISSUE_TEMPLATE` holds only the fields (`gh api repos/<owner>/<repo>/contents/.github/ISSUE_TEMPLATE/<file> -q .content | base64 -d`); follow each field's description.
-
-First load the project's `ticket-conventions` skill (inherited from the project's `workspace-inherit/`) for its repo, area labels, vocabulary, and diagrams. If none is enabled, ask which repo.
-
-## Workflow
-
-idea → spikes → epic → dev work, or a standalone spike → dev work
-
-| Ticket | What it is | Issue type | Parent |
-|---|---|---|---|
-| Idea | What could be built and why. Its areas to explore are things to improve or problems to solve, each with approaches worth trying. | none | none |
-| Spike | One approach to try on one area of an idea (it needn't cover the whole area), or a small standalone improvement: what is tried and the hypothesis. Findings go in a comment and a draft PR (`report-spike`), not the ticket. | none | its idea, if any |
-| Epic | Work too large for one dev work ticket: the goal and whole-epic outcomes, not a walkthrough of each ticket. A new issue linking the idea or spike it came from in "From". | Feature | none |
-| Dev work | Any implementation work: testable requirements, Notes for gotchas and pointers to code. Large work is cut into vertical slices (see Dev work below). | Feature, Bug, or Task | its epic, if any |
-
-If unsure, a small, clear change is dev work, a small unknown is a spike, and a big unexplored thing is an idea. Ideas and spikes explore work, so they get no issue type; bug, feature, and task are issue types, never labels.
-
-## Writing
-
-How every ticket reads, on any project:
-
-- Short and plain. Write for someone new to the project: explain project-specific terms, and use the project's vocabulary (its `ticket-conventions` says where it lives; check the code for current names).
-- Outcomes, not implementation: say what changes and why, not how to build it. A rationale gives the reasoning, not a history of the problem.
-- No prescriptions on ideas and spikes. Ideas name open options to weigh, not a plan or a recommended pick; spikes state what to learn and leave the how to whoever picks it up.
-- Facts, not instructions: Notes and context transfer hold facts (where code lives, current behavior, constraints, links), not steps or a proposed solution. Context transfer (optional on spikes, epics, and dev work) starts with a short summary, then the raw context.
-- Unknowns stay open questions in Notes; don't guess.
-- Title: concise and imperative, no prefixes (except a spike's area).
-- Requirements: clear, broad checkboxes, each a testable outcome rather than an implementation step; 3-5, never more than 7. If it needs more, split the ticket.
-- Backticks: at most three inline uses per body; name files and identifiers in plain text. Diagram and context-transfer blocks don't count.
-- Size: keep ideas short; one small enough to just try is a spike.
-
-## Dev work
-
-- One ticket by default. Split only when the work is too large for one PR or parts could run in parallel.
-- When split, cut vertical slices: each goes end to end through every part it touches (e.g. backend through UI), not one layer, and works and is testable on its own. Cut for the most parallel work; mark a slice that must wait as blocked by the one it waits on (see File).
-
-## Spikes
-
-- One approach, not a set to choose between. If a spike reads "X or Y", it is two spikes.
-- Prefer an idea with a few spikes (often 2-4) under it; a spike can also stand alone, or with siblings, to explore an area. Several spikes can take on the same area in different ways.
-- Title it `<area>: <approach>`, with the area a short kebab-case name its siblings share (`graph-saving: Save a graph to a file and re-upload it`). An area may cover more than one of an idea's bullets. A lone small improvement needs no prefix.
-- Sibling spikes share the context transfer's summary and common facts; each adds only the facts particular to its approach.
-- An idea needn't get all its spikes at once: file an area's spikes when someone is ready to try them.
-- Done: its findings are posted, review feedback is addressed, and the lead's latest review on its draft PR is an approval (GitHub's Approve), including when the recommendation is to drop the approach. A done spike stays open until `consolidate-spikes` closes it.
-
-## Draft
-
-- Check the code first: the work may be done or already tracked.
-- One `### <field label>` per field in template order, following each field's description; omit empty optional fields.
-- Diagrams: required on epics, optional on dev work. The project's `ticket-conventions` says what they show.
-- Labels: the template's category (`idea`, `spike`, `epic`, `dev work`), one written-by (`by: human` if the user dictated it, `by: ai-assisted` if they gave the substance, `by: ai` if you wrote it, including rewrites), and at least one of the project's area labels.
-- Rewriting an old ticket: keep its intent and assignees; bring it up to these rules and update vocabulary, labels, issue type, and parent.
-- Folding one ticket into another: add it as a requirement on the target, then close it as not planned. Every close gets a one-line comment saying why.
-
-## File
-
-Check for open duplicates, then show the full draft (title, type if any, labels, parent, body) in the chat, not only in a file. File or edit only what the user OKs.
-
-Use the REST API (GraphQL may be blocked): POST repos/<owner>/<repo>/issues with title, body, labels, the issue type from the table, and the user as assignee (on a spike, whoever will run it; ask), then, if it has a parent, POST repos/<owner>/<repo>/issues/<parent>/sub_issues with the new issue's id. If it waits on another issue, POST repos/<owner>/<repo>/issues/<n>/dependencies/blocked_by with the blocking issue's id. Report the URL.
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/implement/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/implement/SKILL.md
deleted file mode 100644
index f24d293..0000000
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/implement/SKILL.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-name: implement
-description: Implement an Argos ticket or task in its own worktree, test-first, ending in a commit, here or in a subagent (one per ticket, in parallel, for several). Use when the user asks to build, fix, or implement something in Argos.
----
-
-1. **Worktree.** Get the ticket's branch (`{issue-number}-{kebab-case-title}`) with the `new-worktree` skill, based on `origin/develop`. Make every change in `worktrees/argos/<branch>/`, never in `worktrees/argos/develop/`, while staying at the workspace root: edit files by path, `git -C worktrees/argos/<branch> …` for git, and one-off subshells for the rest. Run `(cd worktrees/argos/<branch>/angular-client && npm ci)` before touching the client.
-2. **Hand off?** Unless the user already chose, ask whether a subagent should do the rest, and recommend one: one per ticket, in parallel, when there are several (step 1 for each first), or one for work long enough to fill this conversation. Tell it the ticket, its worktree's absolute path, and to follow this skill from step 3, change files only under that path (`git -C` for git), name temp files after the branch, stop the clients it starts, and report its commits, checks, and the port and browser it used. Never turn on the harness's own worktree isolation (`new-worktree` says why). Then confirm its commits with `git -C <path> log origin/develop..` and pass its report on.
-3. **Understand.** Read the issue (`gh issue view <n> --comments`), the code involved, and `docs/CONTEXT.md` terms.
-4. **Build test-first**, one behavior at a time: a failing test, the least code to pass it, refactor while green. Test through public interfaces; mock only at system boundaries.
-5. **Check.**
-   - Frontend, in `(cd worktrees/argos/<branch>/angular-client && …)`: `npx ng test --include='src/**/thing.spec.ts' --watch=false` while iterating; at the end `npx ng test --watch=false` (bare `ng test` blocks), then `npx prettier --check "src/**/*.{ts,html,scss}" && npx ng lint`.
-   - Backend, in `(cd worktrees/argos/<branch>/scylla-server && …)`: `cargo build` and single tests while iterating; `cargo test` at the end.
-   - UI changes: verify in the running app with `run-local <branch>`.
-6. **Commit** with `/commit`. Don't push or open a PR unless asked; that's `/open-pr`.
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/journal/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/journal/SKILL.md
deleted file mode 100644
index 4917259..0000000
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/journal/SKILL.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-name: journal
-description: Park rough notes locally mid-task ("note to self", "remember to", "journal this"), and later export them to their permanent home (issue, spec, ADR, glossary, docs) through the skill that owns it. Use when the user wants to jot a thought without derailing, or to file parked notes.
----
-
-Notes live in `.journal/` at the workspace root (git-excluded, outside worktrees so they survive removal). An **entry** is one file, a **category** a subfolder. The journal never pushes, files, or contacts GitHub itself.
-
-**Capture** (no git, no other skills):
-
-```
-bash scripts/capture.sh [-c <category>] ["note text"]
-```
-
-Omit `-c` for a loose entry, omit the text for an empty one to edit. Report the path it prints.
-
-**Export** (only when asked):
-
-1. Read the entries and propose a grouping: one entry → one output, a category → one merged output, or one entry split across several. Let the user adjust.
-2. For each output, pick the workspace skill whose description fits its permanent home, preferring an existing docs area. A new section always needs approval.
-3. Show the destination and reshaped text and wait for approval. Nothing lands silently.
-4. Delegate to that skill; it owns formatting, conventions, and any GitHub contact.
-5. Ask whether to delete the exported entry (default: keep).
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/journal/scripts/capture.sh b/software/application-software/argos/workspaces/default-codex/.agents/skills/journal/scripts/capture.sh
deleted file mode 100755
index 1e90d7b..0000000
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/journal/scripts/capture.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-# capture.sh [-c <category>] [note text]: write a timestamped journal entry to
-# .journal/[<category>/] at the workspace root (adding /.journal/ to .git/info/exclude once) and print
-# its path. An empty entry is created when no text is given. Never touches git history, GitHub, or
-# other skills.
-set -euo pipefail
-usage="usage: capture.sh [-c <category>] [note text]"
-# shellcheck source=/dev/null
-. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
-dir=$DELPHI_ROOT/.journal
-[ "${1:-}" = -c ] && dir=$dir/${2:?$usage} && shift 2
-exclude=$(git -C "$DELPHI_ROOT" rev-parse --path-format=absolute --git-path info/exclude 2>/dev/null || true)
-[ -z "$exclude" ] || grep -qxF /.journal/ "$exclude" 2>/dev/null || { mkdir -p "${exclude%/*}" && echo /.journal/ >>"$exclude"; }
-mkdir -p "$dir"
-file=$dir/$(date +%Y-%m-%d-%H%M%S).md
-{ echo "<!-- captured $(date -u +%Y-%m-%dT%H:%M:%SZ) -->"; [ $# -eq 0 ] || echo "$*"; } >"$file"
-echo "$file"
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/new-worktree/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/new-worktree/SKILL.md
deleted file mode 100644
index 0495fc9..0000000
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/new-worktree/SKILL.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-name: new-worktree
-description: Create or reuse a worktree for a branch of a code repo (worktrees/<repo>/<branch>). Use before any branch work, such as starting a ticket or reviewing or fixing a PR branch, unless the user says not to use worktrees.
----
-
-Run from the workspace root:
-
-```
-bash .delphi/new-worktree.sh <repo> <branch> [<base>]
-```
-
-- An existing branch (local or on origin, e.g. a PR head) is checked out; anything else is created from `<base>` (default: the repo's default branch). Safe to re-run.
-- Stay at the workspace root and reach into the worktree by the printed path. Never switch branches in an existing worktree or work in its store, `worktrees/<repo>/.bare`.
-- For a subagent, make its worktree here first and hand it the path. Never use the harness's own worktree isolation: it checks out this Delphi clone from main, not the code repo, and fences the subagent out of `worktrees/`.
-- Keep `worktrees/<repo>/<default-branch>/` (made by setup) a clean reference: fetch and fast-forward only.
-- After the branch merges: `git -C worktrees/<repo>/.bare worktree remove ../<branch>`.
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/open-pr/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/open-pr/SKILL.md
deleted file mode 100644
index b1e7c71..0000000
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/open-pr/SKILL.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-name: open-pr
-description: Run pre-PR checks, push the branch, and open a draft pull request on an application-software repo (Argos, Nero)
----
-
-First load the project's `pr-conventions` skill (inherited from the project's `workspace-inherit/`) for its base branch, commit format, checks, labels, and screenshots.
-
-1. **Check:** `bash scripts/pr-checks.sh <repo> <branch> origin/<base> '<commit format>'` (clean tree, commit subjects match the project's format, merges cleanly into the base), then the project's own checks. Stop and fix on any FAIL.
-2. **Media:** if the diff touches the UI, ask the user whether to add screenshots to the PR, listing any already in the project's screenshot folder for this branch so they can pick those instead of new ones; on no, skip this step. For new ones, use the project's UI QA to take Playwright screenshots of the changed views into its screenshot folder, or, when the change adds or changes an animation, record a short video instead (a browser context with `recordVideo: { dir }` saves a `.webm` when it closes). Images must be under 10 MB; video under 10 MB on a Free plan, 100 MB on a paid one.
-3. **Open:** push (`git -C worktrees/<repo>/<branch> push -u origin <branch>`), then run `(cd worktrees/<repo>/<branch> && gh pr create --draft --base <base> --head <branch> --title "<title>" --body-file /tmp/<branch>-pr-body.md --assignee @me)` with the project's labels (`--label`) and one `--attach <file>` per screenshot or video, and report the URL.
-4. **Spike:** the PR stays a draft; getting it merged isn't the goal. Once it's checked and working, run `report-spike`.
-
-## PR body
-
-Fill the worktree's `.github/pull_request_template.md` from the diff, following each section's comment, and write it to `/tmp/<branch>-pr-body.md`:
-
-- Title: concise and imperative, no ticket number.
-- The Changes section (not the whole body): about 50 words (1–3 sentences) on what landed and the key design choice. Describe the change, not the file list: don't enumerate components, classes or files the diff already shows. Name a specific one only when its behaviour changes in a way a reviewer must know.
-- Delete the template's comments and any optional or non-applicable sections, and check off the Checklist.
-- At most three backtick uses in the body.
-- End with `Closes #{ticket}` (the branch's leading number), or `Spike for #{ticket}` on a spike, which its PR never closes.
-- Screenshots and videos: reference each one by its path from the worktree, `![<what it shows>](<path>)`; `--attach` uploads it and rewrites the reference to its `user-attachments` URL. `--attach` needs gh v2.99.0+: if `gh pr create --help` doesn't list it, put `_screenshot pending_` instead and remind the user to drag-drop the files from the screenshot folder. Never commit screenshots or videos.
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/open-pr/scripts/pr-checks.sh b/software/application-software/argos/workspaces/default-codex/.agents/skills/open-pr/scripts/pr-checks.sh
deleted file mode 100755
index 61f377f..0000000
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/open-pr/scripts/pr-checks.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-# pr-checks.sh <repo> <branch> [<base> [<format>]]: open-pr's shared pre-PR checks on
-# worktrees/<repo>/<branch>. Prints
-# one PASS/FAIL/SKIP line per check: clean tree, every commit subject since <base> (default
-# origin/develop, fetched first) matches <format> (an extended regex, default '^#[0-9]+ - '), and no
-# merge conflicts with <base>. Exits 1 if any check fails. The project's own checks (lint, format)
-# are in its pr-conventions skill.
-set -euo pipefail
-usage="usage: pr-checks.sh <repo> <branch> [<base> [<format>]]"
-repo=${1:?$usage} branch=${2:?$usage}
-# shellcheck source=/dev/null
-. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
-cd "$DELPHI_WORKTREES/$repo/$branch"
-base=${3:-origin/develop} format=${4:-'^#[0-9]+ - '} fail=0
-res() { echo "$1 $2"; [ "$1" != FAIL ] || fail=1; }
-git fetch -q origin "${base#origin/}" 2>/dev/null || true
-
-if [ -z "$(git status --porcelain)" ]; then res PASS "clean tree"; else res FAIL "uncommitted changes"; fi
-bad=$(git log --format=%s "$base..HEAD" | grep -Ev "$format" || true)
-if [ -z "$bad" ]; then res PASS "commit format"; else res FAIL "commit format: $(echo "$bad" | paste -sd'|' -)"; fi
-if git merge-tree --write-tree HEAD "$base" >/dev/null 2>&1; then res PASS "merges cleanly into $base"
-elif [ $? -eq 1 ]; then res FAIL "conflicts with $base"; else res SKIP "conflict check (needs git 2.38+)"; fi
-exit "$fail"
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/pr-conventions/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/pr-conventions/SKILL.md
deleted file mode 100644
index 5d80cc0..0000000
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/pr-conventions/SKILL.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-name: pr-conventions
-description: Argos specifics for pull requests (base branch, commit format, checks, labels, screenshots, UI QA). Load before opening, updating, or reviewing an Argos PR, alongside open-pr, update-pr, and review.
----
-
-# Argos PR conventions
-
-The shared rules are in the `open-pr` skill; this adds only what is Argos's.
-
-- Base branch: `develop`. Commit format: `^#[0-9]+ - ` (the format in AGENTS.md).
-- Checks: `bash scripts/lint.sh <branch>` (frontend prettier and ng lint, only if angular-client/ changed).
-- Labels: one written-by (`by: human` if the user wrote it, `by: ai-assisted` if they gave the substance, `by: ai` if you wrote it) and at least one area label (`frontend`, `backend`, `devops`); no category label.
-- Screenshots: `pictures/<branch>/` at the worktree root (git-ignored).
-- UI QA: get the branch running with `run-local <branch>`, then drive it with Playwright, using the `playwright-cdp` server if `curl -s localhost:9222/json/version` responds, otherwise `playwright`.
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/pr-conventions/scripts/lint.sh b/software/application-software/argos/workspaces/default-codex/.agents/skills/pr-conventions/scripts/lint.sh
deleted file mode 100644
index 2ed67ec..0000000
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/pr-conventions/scripts/lint.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-# lint.sh <branch> [<base>]: Argos's pre-PR check for open-pr, on
-# worktrees/argos/<branch>. Prints one PASS/FAIL/SKIP line: frontend prettier + ng lint, only if
-# angular-client/ changed since <base> (default origin/develop). Exits 1 if it fails.
-set -euo pipefail
-usage="usage: lint.sh <branch> [<base>]"
-branch=${1:?$usage}
-# shellcheck source=/dev/null
-. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
-cd "$DELPHI_WORKTREES/argos/$branch"
-base=${2:-origin/develop}
-if git diff --quiet "$base...HEAD" -- angular-client; then echo "SKIP frontend lint (no changes)"
-elif [ ! -d angular-client/node_modules ]; then echo "FAIL frontend lint: run npm ci in angular-client/" && exit 1
-elif (cd angular-client && npx prettier --check "src/**/*.{ts,html,scss}" >/dev/null && npx ng lint >/dev/null 2>&1)
-then echo "PASS frontend lint"; else echo "FAIL frontend lint (run prettier --check / ng lint to see why)" && exit 1; fi
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/report-spike/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/report-spike/SKILL.md
deleted file mode 100644
index e673871..0000000
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/report-spike/SKILL.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-name: report-spike
-description: Post a spike's findings on its ticket, judged against its hypothesis, and ask the lead to review its draft PR. Use when a spike's approach has been tried on an application-software repo (Argos, Nero).
----
-
-A spike runs like any ticket (branch, commits, a draft PR from `open-pr`); this reports it. Load the project's `pr-conventions` first.
-
-1. **Read** the spike (`gh issue view <n> --comments`), its draft PR, and the branch's diff against the base.
-2. **Draft** one findings comment, short and factual:
-
-   ```
-   ### Findings
-   **Hypothesis:** holds | partly holds | doesn't hold. One sentence why.
-   **Learned:** measurements, limits hit, surprises, with links to the draft PR's code.
-   **Recommendation:** adopt, adopt with changes, or drop, and why.
-   **Open questions:** what the spike didn't settle.
-   Draft PR: #<pr>
-   ```
-3. **Show** it and ask who the lead is; on OK, post it (`gh issue comment <n> --body-file /tmp/<branch>-findings.md`).
-4. **Request review:** `(cd worktrees/<repo>/<branch> && gh pr edit <branch> --add-reviewer <lead>)`, keeping the PR a draft, and remind the user to ping the lead on Slack.
-
-Address review feedback on the branch as on any PR (`address-pr-comments`), and edit the findings comment if it changes them. The spike is done when the lead approves the draft PR (`create-ticket`'s Spikes rules); it stays open until `consolidate-spikes` closes it.
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/run-local/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/run-local/SKILL.md
deleted file mode 100644
index 7acb908..0000000
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/run-local/SKILL.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-name: run-local
-description: Bring up the local Argos environment for running or testing — Docker backend (right profile for what changed) + an Angular client per worktree, each on its own free port. Use whenever you need to actually run the app locally, for a PR, a ticket's branch, or develop.
----
-
-Run the branches the user is asking about: a PR or ticket means its branch (make its worktree with `new-worktree` first), and `develop` only when they want current `develop` (fast-forward `worktrees/argos/develop/` first):
-
-```
-bash scripts/run-local.sh <branch>...
-```
-
-It starts the backend if it's down (`client-dev`, or `scylla-dev` plus `cargo run` when a target changes `scylla-server/`), and serves each target's client on the next free port; parallel runs (one per session or agent) each get their own. With no branches it reports what's running.
-
-Report each branch's client URL and the backend. A failed compile or a stale-backend warning is a finding: show it to the user. Stop a client with `kill <pid>` from its line. When every port is taken it lists what holds each; clients from other checkouts are the user's, so ask before stopping them.
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/run-local/scripts/run-local.sh b/software/application-software/argos/workspaces/default-codex/.agents/skills/run-local/scripts/run-local.sh
deleted file mode 100755
index f598657..0000000
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/run-local/scripts/run-local.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/usr/bin/env bash
-# run-local.sh [<branch>...]: bring up the local Argos stack for those branches'
-# worktrees (worktrees/argos/<branch>, made beforehand with new-worktree) and print one line per
-# piece. The backend (first listener on 8000-8090, step 10) is started if down:
-# ./argos.sh client-dev when no target changes scylla-server/, else scylla-dev plus `cargo run` in the
-# one worktree that does. Each target's client is then served by serve.sh on its own port. With no
-# branches, reports what is running.
-set -euo pipefail
-here=$(cd "$(dirname "$0")" && pwd)
-# shellcheck source=/dev/null
-. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
-state=${TMPDIR:-/tmp}; state=${state%/}/argos-run-local
-up() { (exec 3<>"/dev/tcp/127.0.0.1/$1") 2>/dev/null || (exec 3<>"/dev/tcp/::1/$1") 2>/dev/null; } # ng serve binds ::1
-backend() { for p in $(seq 8000 10 8090); do up "$p" && echo "http://localhost:$p" && return; done; echo none; }
-scylla() {
-  if docker ps --filter name=scylla-server --format '{{.Names}}' 2>/dev/null | grep -q .; then echo docker
-  elif [ "$(backend)" != none ]; then echo local
-  else echo none; fi
-}
-
-if [ $# = 0 ]; then
-  clients=
-  for p in $(seq 4200 4210); do up "$p" && clients="$clients http://localhost:$p"; done
-  echo "backend=$(backend) scylla=$(scylla) clients=${clients# }"
-  exit 0
-fi
-
-wts=() rust=()
-for b in "$@"; do
-  wt=$DELPHI_WORKTREES/argos/$b
-  [ -f "$wt/argos.sh" ] && [ -d "$wt/angular-client" ] ||
-    { echo "run-local: no Argos worktree for '$b' at $wt (make it with new-worktree)" >&2 && exit 1; }
-  wts+=("$wt")
-done
-git -C "${wts[0]}" fetch -q origin # the worktrees share one store
-for wt in "${wts[@]}"; do
-  if ! git -C "$wt" diff --quiet origin/develop... -- scylla-server || ! git -C "$wt" diff --quiet HEAD -- scylla-server; then
-    rust+=("$wt")
-  fi
-done
-[ ${#rust[@]} -le 1 ] || { echo "run-local: several targets change scylla-server/; run them one at a time" >&2 && exit 1; }
-
-if [ "$(backend)" = none ]; then
-  mkdir -p "$state"
-  if [ ${#rust[@]} = 0 ]; then
-    (cd "${wts[0]}" && ./argos.sh client-dev up -d) >"$state/compose.log" 2>&1 ||
-      { echo "run-local: ./argos.sh client-dev up failed:" >&2 && tail -20 "$state/compose.log" >&2 && exit 1; }
-  else
-    (cd "${rust[0]}" && ./argos.sh scylla-dev up -d) >"$state/compose.log" 2>&1 ||
-      { echo "run-local: ./argos.sh scylla-dev up failed:" >&2 && tail -20 "$state/compose.log" >&2 && exit 1; }
-    (cd "${rust[0]}/scylla-server" &&
-      DATABASE_URL=${DATABASE_URL:-postgresql://postgres:password@127.0.0.1:${ODYSSEY_DB_PORT:-5432}/postgres} \
-        nohup cargo run >"$state/scylla.log" 2>&1 &)
-    echo "run-local: cargo run started for $(basename "${rust[0]}"); log $state/scylla.log"
-  fi
-  for _ in $(seq 600); do [ "$(backend)" != none ] && break; sleep 1; done
-  [ "$(backend)" != none ] || { echo "run-local: backend not up after 600s; see $state/" >&2 && exit 1; }
-elif [ ${#rust[@]} = 1 ] && [ "$(scylla)" = docker ]; then
-  echo "run-local: warning: backend is the scylla-server image but $(basename "${rust[0]}") changes scylla-server/;" \
-    "stop it (./argos.sh client-dev down) and re-run to test that branch's backend" >&2
-fi
-echo "backend=$(backend) scylla=$(scylla)"
-
-status=0
-for wt in "${wts[@]}"; do bash "$here/serve.sh" "$wt" || status=1; done
-exit $status
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/run-local/scripts/serve.sh b/software/application-software/argos/workspaces/default-codex/.agents/skills/run-local/scripts/serve.sh
deleted file mode 100755
index d8de89c..0000000
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/run-local/scripts/serve.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/env bash
-# serve.sh <argos-worktree>: serve that worktree's Angular client with `ng serve` on the first free
-# port in 4200-4210, in the background, and print `<branch> client=<url> pid=<pid> log=<file>` once
-# it has compiled. Re-running for a worktree that is still being served prints its existing client.
-# Runs `npm ci` first if node_modules lacks ng (missing or half-installed). Exits 1, with the log's
-# tail, if the build fails, or with what holds each port if none is free.
-set -euo pipefail
-wt=$(cd "${1:?usage: serve.sh <argos-worktree>}" && pwd)
-branch=$(git -C "$wt" rev-parse --abbrev-ref HEAD)
-state=${TMPDIR:-/tmp}; state=${state%/}/argos-run-local
-mkdir -p "$state"
-key=$state/$(printf %s "$wt" | tr -c 'A-Za-z0-9' _)
-log=$key.log
-up() { (exec 3<>"/dev/tcp/127.0.0.1/$1") 2>/dev/null || (exec 3<>"/dev/tcp/::1/$1") 2>/dev/null; } # ng serve binds ::1
-
-if [ -f "$key.pid" ] && kill -0 "$(cat "$key.pid")" 2>/dev/null && up "$(cat "$key.port")"; then
-  echo "$branch client=http://localhost:$(cat "$key.port") pid=$(cat "$key.pid") log=$log (already running)"
-  exit 0
-fi
-
-# Claim the port under a lock, or parallel calls all pick the same one while ng serve starts. A port is
-# taken once a client listens on it or a live serve.sh has claimed it. mkdir is the lock (no flock on
-# macOS); it is held only for the claim, so nothing started below can keep it.
-lock=$state/port.lock
-n=0; until mkdir "$lock" 2>/dev/null; do n=$((n + 1)); [ $n -lt 100 ] || rm -rf "$lock"; sleep 0.1; done # stale after 10s
-trap 'rmdir "$lock" 2>/dev/null || true' EXIT
-claimed() { for f in "$state"/*.port; do [ -f "$f" ] && [ "$(cat "$f")" = "$1" ] && kill -0 "$(cat "${f%.port}.pid")" 2>/dev/null && return; done; return 1; }
-port=
-for p in $(seq 4200 4210); do up "$p" || claimed "$p" || { port=$p && break; }; done
-# Name what holds each port, so a stale client from another checkout can be stopped (lsof, where there is one).
-holders() {
-  for p in $(seq 4200 4210); do
-    pid=$(lsof -nP -iTCP:"$p" -sTCP:LISTEN -t 2>/dev/null | head -1) || true
-    if [ -n "$pid" ]; then echo "  $p pid=$pid $(lsof -a -p "$pid" -d cwd -Fn 2>/dev/null | sed -n 's/^n//p')"; fi
-  done
-}
-[ -n "$port" ] || { echo "serve: no free port in 4200-4210, held by:" >&2 && holders >&2 && exit 1; }
-echo $$ >"$key.pid" && echo "$port" >"$key.port" # claimed by this script until ng serve's pid replaces it
-rmdir "$lock" && trap - EXIT
-
-cd "$wt/angular-client"
-[ -x node_modules/.bin/ng ] || npm ci --no-audit --no-fund >"$log" 2>&1 ||
-  { echo "serve: npm ci failed in $wt/angular-client:" >&2 && tail -20 "$log" >&2 && exit 1; }
-nohup npx ng serve --port "$port" >"$log" 2>&1 &
-pid=$!
-echo "$pid" >"$key.pid" && echo "$port" >"$key.port"
-
-for _ in $(seq 180); do
-  kill -0 "$pid" 2>/dev/null || { echo "serve: ng serve exited for $branch:" >&2 && tail -20 "$log" >&2 && exit 1; }
-  if grep -q 'bundle generation failed\|\[ERROR\]' "$log"; then
-    echo "serve: $branch failed to compile (still serving on $port, pid $pid):" >&2 && tail -30 "$log" >&2 && exit 1
-  fi
-  if up "$port" && grep -q 'bundle generation complete\|Compiled successfully' "$log"; then
-    echo "$branch client=http://localhost:$port pid=$pid log=$log"
-    exit 0
-  fi
-  sleep 1
-done
-echo "serve: $branch not up after 180s (pid $pid); see $log" >&2 && exit 1
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/setup-workspace/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/setup-workspace/SKILL.md
deleted file mode 100644
index fdc1ce8..0000000
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/setup-workspace/SKILL.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-name: setup-workspace
-description: Change what this workspace checks out and re-run its setup. workspace.yml lists code repos (repos:), read-only dependency sources (references-git:), and clones of other Delphi workspaces or main to read (workspaces:). Use when the user wants to read or compare another workspace's or main's instructions, skills, or docs (link it), add or remove a repo or dependency reference, or run setup after cloning or pulling.
----
-
-`workspace.yml` at the workspace root lists what `.delphi/setup.sh` checks out, all git-ignored: code repos (`repos:`), dependency sources (`references-git:`), and other Delphi workspaces or main (`workspaces:`, entries `- <name>` or `- main`; a workspace's name is the short names of its folders (each folder's `short-name` file, else its name) and its own folder name, joined by dots, like `s.app.argos.argos-dev`; `bash .delphi/switch.sh --list` lists them). The comment on each section gives its entry format and where it lands; read it, then edit the file.
-
-Run from the workspace root after any change, and to refresh references and workspace copies to their latest:
-
-```
-bash .delphi/setup.sh
-```
-
-- The clones under `workspaces/` are full clones, each on its branch (`ws/<name>` or `main`) tracking origin, for reading: don't edit, branch, or push them from this workspace. Each setup run switches a clone back to its branch if it was switched away (refused while it has uncommitted changes), pulls it, and runs its own setup, so that workspace's repos and references are under it too (it skips its own `workspaces:`, so they don't chain). To change one of those workspaces or main, work in its own clone or switch to it (`switch-workspace` skill).
-- This workspace's project folder (shared context, `AUTHORING.md`, `workspace-defaults/`) is the folder above `workspaces/<leaf>/` in `workspaces/main/` (`bash .delphi/switch.sh --list` prints it): for `s.app.argos.argos-dev`, `workspaces/main/software/application-software/argos/`. List workspaces and their project folders: `bash .delphi/switch.sh --list`.
-- `workspace.yml` is shared: change it on a branch and open a PR into `ws/<this-name>` (the `name:` in `workspace.yml`). For a one-off look, add the entry, run setup, then `git restore workspace.yml`.
-- Setup never deletes what you'd lose. A removed entry's `workspaces/<name>/`, `references/<name>/`, or repo store and worktrees stay until you delete them (ask first).
-- When Delphi releases a version that needs cleanup in clones, setup runs its migration first (`.delphi/migrations/`), once per workspace. A migration removes only what nothing is lost from, and otherwise stops setup with what to do: tell the user, do it with their go-ahead, and re-run.
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/switch-workspace/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/switch-workspace/SKILL.md
deleted file mode 100644
index b6a8144..0000000
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/switch-workspace/SKILL.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-name: switch-workspace
-description: Switch this clone to another Delphi workspace, or to Delphi's main, to work in it. Use when the user wants to check out, switch to, open, or work in another workspace or project, or to change another workspace's or main's files.
----
-
-Run from the workspace root:
-
-```
-bash .delphi/switch.sh <name>        # ws/<name>: its dotted name, e.g. s.app.argos.argos-dev
-bash .delphi/switch.sh main          # Delphi's main: project folders, templates, CI
-```
-
-- List workspaces and their project folders: `bash .delphi/switch.sh --list`.
-- It refuses while tracked files have changes: commit them on a branch (and PR them) first. Then it fetches, switches, fast-forwards, and runs the new workspace's `.delphi/setup.sh`.
-- The post-checkout hook parks this workspace's `repos/`, `worktrees/`, `references/` and `workspaces/` in `.delphi/parked/<name>/` (git-ignored; `<name>` as in its `workspace.yml`) and brings the other's back at the same paths, so worktrees and the work in them return as they were. Switch back the same way. Never run `git clean -X` or `git stash --all` at the workspace root: they take ignored files, parked work included.
-- Before switching, stop anything running from `worktrees/` (dev servers, Docker builds): its folder moves.
-- Start a fresh Codex session after switching so its instructions and skills match the new workspace.
-- To change the workspace you switched to: `git switch -c <branch>`, commit, push, and open a PR into `ws/<name>` (or `main`).
-- To only read another workspace or main without leaving this one, list it under `workspaces:` instead (`setup-workspace` skill).
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/ticket-conventions/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/ticket-conventions/SKILL.md
deleted file mode 100644
index 8d9ec37..0000000
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/ticket-conventions/SKILL.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-name: ticket-conventions
-description: Argos specifics for tickets (repo, area labels, vocabulary, diagrams). Load before drafting or filing an Argos issue, alongside create-ticket.
----
-
-# Argos ticket conventions
-
-The shared rules are in the `create-ticket` skill; this adds only what is Argos's.
-
-- Repo: Northeastern-Electric-Racing/Argos (base branch `develop`).
-- Area labels: `frontend`, `backend`, `devops` (any combination).
-- Vocabulary: use the workspace glossary's terms (`docs/CONTEXT.md`), and check the code for current names, which may have moved past it (e.g. Zenoh key expressions, not MQTT topics).
-- Title example: "Add pagination to the run list".
-- Diagrams: Mermaid where it fits. Show the change across the parts it touches (car, Siren, scylla-server, angular-client), before and after.
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/update-pr/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/update-pr/SKILL.md
deleted file mode 100644
index 069b517..0000000
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/update-pr/SKILL.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-name: update-pr
-description: Update a branch's PR description to reflect the latest changes
----
-
-Load the project's `pr-conventions` skill, then rewrite the branch's PR body (`(cd worktrees/<repo>/<branch> && gh pr view)`) to match `git -C worktrees/<repo>/<branch> diff origin/<base>...HEAD`, following the PR body rules in the `open-pr` skill. Keep human-written text that's still accurate, `user-attachments` screenshots, and `Closes`/`Fixes` refs; new screenshots or videos follow open-pr's media step, attached with `gh pr edit --attach`. Write it to `/tmp/<branch>-pr-body.md`, apply it with `gh pr edit <branch> --body-file` from the worktree, and add any of the project's labels that are missing with `--add-label`.
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/SKILL.md
deleted file mode 100644
index c9dfe7d..0000000
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/SKILL.md
+++ /dev/null
@@ -1,23 +0,0 @@
----
-name: verify-graph
-description: Playwright CLI verification of the graph page — modes, controls, topic selection, and data rendering. Use after any change to graph-page components, graph rendering, data flow, or mode switching logic.
----
-
-Get the branch's client running with `run-local <branch>`; its URL is `BASE_URL`. The scripts need `playwright-cli` (`npm i -g @playwright/cli`, then `playwright-cli install-browser chromium`; cloud containers use their preinstalled Chromium). Then run the base checks:
-
-```
-bash scripts/check.sh <branch> "$BASE_URL"
-```
-
-It seeds a 50-hour run spanning two midnights (once, shared by parallel checks), opens a `playwright-cli` session named after the branch (`scripts/open.sh`: output to `pictures/<branch>/`, config to `.playwright-cli/<branch>/`), and runs `scripts/check.js`. That covers: page loads in real time, a topic from the tree draws live, the seeded run, historical Quick Select, back to real time, and no console errors beyond develop's NG0100. It prints `[x]`/`[ ]` per check and exits 1 on a failure. Each `look:` line names a screenshot and what it should show: open it and judge it, since only a picture shows whether a chart is right.
-
-Go further where the diff points, by hand in the same session (`P="playwright-cli -s=<branch>"`): controls the diff touches (Pause↔Play, Time Range↔Point Range, Tog Sidebar, Tog Mult Yaxis, Y Min/Max, Custom range, Clear Graph), zoom, pan and hover, several topics, or mode switching for console errors. Reproduce a failed check the same way before fixing it; `check.js` has its steps.
-
-- Act: `$P click "button:has-text('Pause')"`, `role=combobox[name='Quick Select']`, `role=option[name='5 minutes']`, or a ref from `$P snapshot`.
-- Assert: `$P find "<text>"`, `$P snapshot`, `$P console error`; longer Playwright code with `$P run-code "async (page) => {…}"`, or `--filename` for a file kept in `.playwright-cli/<branch>/`.
-- The seeded run: click Select Run, then `bash scripts/select-run.sh <branch> $(bash scripts/seed.sh)`.
-- Screenshots: `$P screenshot --filename=pictures/<branch>/verify-graph/NN-<name>.png` (gitignored).
-
-When the diff touches rendering or the live data path, measure it too: `bash scripts/perf.sh <branch> "$BASE_URL" [<topic>,…]` prints retained JS heap, allocation rate, frame rate and long tasks (`scripts/perf.js`), then the browser's GPU-process memory, where a WebGL chart's buffers show up. The numbers drift with machine load, so run the branch and its base side by side, twice, at the same topics. Calypso sends about one point a second per topic and has no rate setting, so the chart's own data is small next to the app's: a JS-heap gap of a few MB is noise, and more topics widen real ones.
-
-When a hand check keeps coming back, add it to `check.js`. Report `check.sh`'s lines plus one line per hand check, and the screenshot folder. `$P close` at the end.
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/check.js b/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/check.js
deleted file mode 100644
index 3fcb734..0000000
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/check.js
+++ /dev/null
@@ -1,83 +0,0 @@
-// The base verify-graph checks, for check.sh to run with `playwright-cli run-code` (it fills in __URL__,
-// __RUN__ and __OUT__). Each check asserts what the DOM can show; what only a picture can show (a series
-// drawn, the x-axis span) is a screenshot with a `look:` line for the agent to judge.
-async (page) => {
-  const URL = '__URL__', RUN = __RUN__, OUT = '__OUT__';
-  const lines = [], errors = [];
-  page.on('console', (m) => {
-    if (m.type() === 'error' && !m.text().includes('NG0100')) errors.push(m.text().split('\n')[0].slice(0, 160));
-  }); // develop already logs NG0100 (ExpressionChangedAfterItHasBeenChecked)
-  const text = (t) => page.getByText(t, { exact: true });
-  const button = (name) => page.getByRole('button', { name, exact: true });
-  const tree = page.getByRole('tree');
-  const absent = async (name) => { if (await button(name).isVisible()) throw new Error(`"${name}" is shown`); };
-  const shot = async (name, look) => {
-    await page.screenshot({ path: `${OUT}/${name}.png` });
-    lines.push(`    look: ${OUT}/${name}.png: ${look}`);
-  };
-  const check = async (name, steps) => {
-    const at = lines.length;
-    try {
-      await steps();
-      lines.splice(at, 0, `[x] ${name}`);
-    } catch (e) {
-      lines.push(`[ ] ${name}: ${String(e.message).split('\n')[0]}`);
-    }
-  };
-
-  await check('1 page loads in real time', async () => {
-    await page.goto(`${URL}/graph`);
-    await text('Real Time').waitFor({ timeout: 30000 });
-    for (const b of ['Pause', 'Time Range', 'Select Run', 'Clear Graph', 'Custom']) await button(b).waitFor({ timeout: 2000 });
-    await page.getByRole('combobox', { name: 'Quick Select' }).waitFor({ timeout: 2000 });
-    await absent('Realtime');
-  });
-  await check('2 topic from the tree draws live', async () => {
-    const node = (name) => tree.getByRole('treeitem').filter({ has: page.getByText(name, { exact: true }) }).last(); // innermost
-    for (const name of ['BMS', 'Segment_Total_Volt']) await node(name).locator('.p-tree-node-toggle-button').first().click();
-    await tree.getByText('0', { exact: true }).first().click();
-    await page.waitForURL(/topics=BMS%2FSegment_Total_Volt%2F0/, { timeout: 5000 });
-    await page.waitForTimeout(3000);
-    await shot('02-live-topic', 'a live series is drawn');
-  });
-  await check(`3 seeded run #${RUN}`, async () => {
-    await button('Select Run').click();
-    await page.locator('.run-card').first().waitFor({ timeout: 10000 });
-    await page.evaluate((id) => {
-      const card = [...document.querySelectorAll('.run-card')]
-        .find((c) => [...c.querySelectorAll('*')].some((e) => !e.childElementCount && e.textContent.trim() === 'Run #' + id));
-      const pick = card?.parentElement?.querySelector('.run-select-button button');
-      if (!pick) throw new Error(`no Run #${id} in the Select Run dialog`);
-      pick.dispatchEvent(new MouseEvent('click', { bubbles: true, cancelable: true })); // under a PrimeNG overlay
-    }, RUN);
-    await page.locator('.run-card').first().waitFor({ state: 'detached', timeout: 5000 });
-    await text(`Run #${RUN}`).waitFor({ timeout: 10000 });
-    await button('Realtime').waitFor({ timeout: 2000 });
-    await absent('Pause');
-    await page.waitForTimeout(3000);
-    await shot('03-seeded-run', 'x-axis spans 50 hours, with a dated day-boundary line at each of the two midnights');
-  });
-  await check('4 historical Quick Select', async () => {
-    await button('Realtime').click();
-    await text('Real Time').waitFor({ timeout: 5000 });
-    await page.getByRole('combobox', { name: 'Quick Select' }).click();
-    await page.getByRole('option').first().waitFor({ timeout: 5000 });
-    const options = await page.getByRole('option').count();
-    if (options !== 11) throw new Error(`${options} Quick Select options, not 11`);
-    await page.getByRole('option', { name: '5 minutes', exact: true }).click();
-    await text('Historical').waitFor({ timeout: 5000 });
-    await absent('Pause');
-    await page.waitForTimeout(3000);
-    await shot('04-historical-5-min', 'x-axis about 5 minutes, or since the data starts');
-  });
-  await check('5 back to real time', async () => {
-    await button('Realtime').click();
-    await text('Real Time').waitFor({ timeout: 5000 });
-    await page.waitForTimeout(10000);
-    await shot('05-real-time-after', 'x-axis about 30 seconds, not the whole session');
-  });
-  await check('6 no new console errors', async () => {
-    if (errors.length) throw new Error(`${errors.length}, first: ${errors[0]}`);
-  });
-  return lines.join('\n');
-}
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/check.sh b/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/check.sh
deleted file mode 100755
index c8710cd..0000000
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/check.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-# check.sh <branch> <base-url>: run the base verify-graph checks (check.js) in <branch>'s playwright-cli
-# session, opening it if needed, against the seeded multi-day run. Prints one `[x]`/`[ ]` line per check
-# and `look:` lines for screenshots in pictures/<branch>/verify-graph/; exits 1 if a check failed.
-set -euo pipefail
-here=$(cd "$(dirname "$0")" && pwd)
-branch=${1:?usage: check.sh <branch> <base-url>}; url=${2:?usage: check.sh <branch> <base-url>}; url=${url%/}
-run=$(bash "$here/seed.sh")
-out=${DELPHI_ROOT:?unset: start the session at the workspace root}/pictures/$branch/verify-graph
-playwright-cli list | grep -q "^- $branch:" || bash "$here/open.sh" "$branch" "$url/graph" >/dev/null
-code=$(sed -e "s|__URL__|$url|; s|__RUN__|$run|; s|__OUT__|$out|" "$here/check.js")
-result=$(playwright-cli -s="$branch" --raw run-code "$code" | node -e 'process.stdout.write(JSON.parse(require("fs").readFileSync(0, "utf8")))')
-echo "$result"
-! grep -q '^\[ \]' <<<"$result"
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/open.sh b/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/open.sh
deleted file mode 100755
index 5a1b49b..0000000
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/open.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-# open.sh <branch> <url>: open a playwright-cli session named <branch> on <url>, so parallel checks don't
-# share a browser. Its output (snapshots, console logs, unnamed screenshots) goes to pictures/<branch>/;
-# its config, and any throwaway Playwright code, to .playwright-cli/<branch>/. Both are gitignored. Uses
-# the preinstalled Chromium in cloud containers (/opt/pw-browsers); elsewhere, Playwright's own
-# (`playwright-cli install-browser`).
-set -euo pipefail
-branch=${1:?usage: open.sh <branch> <url>}; url=${2:?usage: open.sh <branch> <url>}
-root=${DELPHI_ROOT:?unset: start the session at the workspace root}
-out=$root/pictures/$branch scratch=$root/.playwright-cli/$branch
-mkdir -p "$out" "$scratch"
-launch=; [ -x /opt/pw-browsers/chromium ] && launch=',"launchOptions":{"executablePath":"/opt/pw-browsers/chromium","headless":true}'
-printf '{"browser":{"browserName":"chromium"%s},"outputDir":"%s"}\n' "$launch" "$out" >"$scratch/cli.config.json"
-playwright-cli -s="$branch" open --config="$scratch/cli.config.json" "$url"
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/perf.js b/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/perf.js
deleted file mode 100644
index 404ac25..0000000
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/perf.js
+++ /dev/null
@@ -1,38 +0,0 @@
-async (page) => {
-  // Live-mode cost of the graph page with __TOPICS__ selected: retained JS heap after a GC, how fast it allocates
-  // (heap growth between 100 ms samples, GC drops ignored), and frame rate. Compare branches at the same topics.
-  const topics = '__TOPICS__'.split(',');
-  await page.goto(`__URL__/graph?topics=${encodeURIComponent(topics.join(','))}`);
-  await page.getByText('Real Time').first().waitFor({ timeout: 30000 });
-  const cdp = await page.context().newCDPSession(page);
-  const heap = async (gc) => {
-    if (gc) await cdp.send('HeapProfiler.collectGarbage');
-    return (await cdp.send('Runtime.getHeapUsage')).usedSize / 1e6;
-  };
-  await page.waitForTimeout(20000); // fill the live window
-  let alloc = 0, prev = await heap(false);
-  const t0 = Date.now();
-  while (Date.now() - t0 < 20000) {
-    await page.waitForTimeout(100);
-    const h = await heap(false);
-    if (h > prev) alloc += h - prev;
-    prev = h;
-  }
-  const allocMBps = alloc / ((Date.now() - t0) / 1000);
-  const frames = await page.evaluate(() => new Promise((done) => {
-    let n = 0, worst = 0, longTasks = 0, last = performance.now();
-    const end = last + 10000;
-    new PerformanceObserver((l) => (longTasks += l.getEntries().length)).observe({ type: 'longtask' });
-    const tick = (t) => {
-      worst = Math.max(worst, t - last);
-      last = t;
-      n++;
-      if (t < end) requestAnimationFrame(tick);
-      else done({ fps: n / 10, worstFrameMs: Math.round(worst), longTasks });
-    };
-    requestAnimationFrame(tick);
-  }));
-  const retainedMB = await heap(true);
-  return `retained JS heap ${retainedMB.toFixed(1)} MB, allocating ${allocMBps.toFixed(1)} MB/s, ` +
-    `${frames.fps} fps, worst frame ${frames.worstFrameMs} ms, ${frames.longTasks} long tasks`;
-}
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/perf.sh b/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/perf.sh
deleted file mode 100755
index 2218f42..0000000
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/perf.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-# perf.sh <branch> <base-url> [<topic>,…]: measure the graph page live in <branch>'s playwright-cli session
-# (perf.js: JS heap, allocation rate, frames; about a minute), then its browser's GPU-process memory, where
-# a WebGL chart's buffers show up. Default topics: four BMS ones. Numbers are relative: compare branches.
-set -euo pipefail
-here=$(cd "$(dirname "$0")" && pwd)
-branch=${1:?usage: perf.sh <branch> <base-url> [<topic>,…]}; url=${2:?usage: perf.sh <branch> <base-url> [<topic>,…]}; url=${url%/}
-topics=${3:-BMS/Segment_Total_Volt/0,BMS/PerCell/Alpha/3/Volts/5,BMS/PerCell/Alpha/3/Volts/4,BMS/PerCell/Alpha/4/Therms/0}
-playwright-cli list | grep -q "^- $branch:" || bash "$here/open.sh" "$branch" "$url/graph" >/dev/null
-code=$(sed -e "s|__URL__|$url|; s|__TOPICS__|$topics|g" "$here/perf.js")
-playwright-cli -s="$branch" --raw run-code "$code" | node -e 'process.stdout.write(JSON.parse(require("fs").readFileSync(0, "utf8")) + "\n")'
-# The session's daemon runs its browser; the browser's --type=gpu-process child holds GPU memory.
-ps -axo pid=,ppid=,rss=,command= | awk -v s=" $branch " '
-  { pid[NR] = $1; ppid[NR] = $2; rss[NR] = $3; cmd[NR] = $0 }
-  index($0, "cliDaemon") && index($0 " ", s) { daemon[$1] = 1 }
-  END {
-    for (i = 1; i <= NR; i++) if (daemon[ppid[i]]) browser[pid[i]] = 1
-    for (i = 1; i <= NR; i++) if (browser[ppid[i]] && index(cmd[i], "--type=gpu-process")) printf "GPU process %d MB\n", rss[i] / 1024
-  }'
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/seed.sh b/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/seed.sh
deleted file mode 100755
index fdb2631..0000000
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/seed.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-# seed.sh: make sure the local database holds verify-graph's multi-day run, and print its id. The run is
-# 50 hours of BMS/Segment_Total_Volt/0, one point every 30s, from noon UTC four days ago, so it crosses
-# two midnights in any time zone and stays out of the 24-hour Quick Select window. Parallel checks share
-# one run: it is made once, under a lock, and found by its notes after that.
-set -euo pipefail
-db=$(docker ps --filter name=odyssey-db --format '{{.Names}}' | head -1)
-[ -n "$db" ] || { echo "seed: no odyssey-db container; start the backend with run-local first" >&2 && exit 1; }
-sql() { docker exec -i "$db" psql -U postgres -v ON_ERROR_STOP=1 -qAt "$@"; }
-tag='verify-graph multi-day seed'
-state=${TMPDIR:-/tmp}; state=${state%/}/argos-run-local; mkdir -p "$state"
-lock=$state/seed.lock
-n=0; until mkdir "$lock" 2>/dev/null; do n=$((n + 1)); [ $n -lt 600 ] || rm -rf "$lock"; sleep 0.1; done # stale after 60s
-trap 'rmdir "$lock" 2>/dev/null || true' EXIT
-id=$(sql -c "select \"runId\" from run where notes = '$tag' limit 1")
-[ -n "$id" ] || id=$(sql <<SQL
-insert into data_type (name, unit) values ('BMS/Segment_Total_Volt/0', 'V') on conflict do nothing;
-with r as (
-  insert into run ("driverName", "locationName", notes, time)
-  values ('verify-graph', 'seed', '$tag', date_trunc('day', now()) - interval '84 hours')
-  returning "runId", time
-), d as (
-  insert into data (values, time, "dataTypeName", "runId")
-  select array[400 + 20 * sin(s / 3600.0)]::real[], (extract(epoch from r.time) * 1e6)::bigint + s * 1000000::bigint,
-    'BMS/Segment_Total_Volt/0', r."runId"
-  from r, generate_series(0, 50 * 3600, 30) s
-)
-select "runId" from r;
-SQL
-)
-echo "$id"
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/select-run.sh b/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/select-run.sh
deleted file mode 100755
index d1237c4..0000000
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-graph/scripts/select-run.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-# select-run.sh <branch> <run-id>: with the Select Run dialog open in <branch>'s session, pick run
-# <run-id>. The carousel autoplays and its "Select this Run" button sits under a PrimeNG overlay, so this
-# finds the run's card by id and clicks its button with a synthetic event instead of `playwright-cli click`.
-set -euo pipefail
-branch=${1:?usage: select-run.sh <branch> <run-id>}; id=${2:?usage: select-run.sh <branch> <run-id>}
-case $id in '' | *[!0-9]*) echo "select-run: run id must be a number, got '$id'" >&2 && exit 1 ;; esac
-playwright-cli -s="$branch" run-code "async (page) => {
-  await page.waitForSelector('.run-card');
-  const found = await page.evaluate((id) => {
-    const card = [...document.querySelectorAll('.run-card')]
-      .find((c) => [...c.querySelectorAll('*')].some((e) => !e.childElementCount && e.textContent.trim() === 'Run #' + id));
-    const button = card?.parentElement?.querySelector('.run-select-button button');
-    button?.dispatchEvent(new MouseEvent('click', { bubbles: true, cancelable: true }));
-    return !!button;
-  }, $id);
-  if (!found) throw new Error('select-run: no Run #$id in the Select Run dialog');
-}"
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-telemetry/SKILL.md b/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-telemetry/SKILL.md
deleted file mode 100644
index 006fff6..0000000
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-telemetry/SKILL.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-name: verify-telemetry
-description: Verification checklist for changes to MQTT-displayed telemetry values in the Angular frontend. Use whenever modifying, adding, or debugging a value that flows from the car through MQTT to the UI — including display formatting, new subscriptions, missing data, or incorrect readings.
----
-
-Work from the workspace root against the ticket's worktree, `worktrees/argos/<branch>/` (via `new-worktree`). Stop and fix at the first failing step.
-
-1. **Trace the subscription** in that worktree, from the component: its property is updated by a `this.storage.get(topics.someTopicFn())` subscription, the function in `angular-client/src/utils/topic.utils.ts` returns the right topic, and the value is parsed right for its type (`parseInt` vs `parseFloat`). A missing subscription is the bug.
-2. **Check the topic end to end:**
-
-   ```bash
-   bash scripts/check-topic.sh <TOPIC>
-   ```
-
-   It prints the CAN definition (unit, value points; exit 1 if the topic isn't defined), refreshes the Calypso image (if it changed, restart with `(cd worktrees/argos/<branch> && ./argos.sh client-dev down)` then `run-local <branch>`), and shows the topic's last scylla-server log lines. Confirm the unit and value index match the UI; no log lines means it isn't being published.
-3. **See it live:** bring the app up with `run-local <branch>`, open the page with Playwright, wait for data, and screenshot to `pictures/<branch>/<name>.png`. Check value, formatting, and layout.
diff --git a/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-telemetry/scripts/check-topic.sh b/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-telemetry/scripts/check-topic.sh
deleted file mode 100755
index c9a9c0a..0000000
--- a/software/application-software/argos/workspaces/default-codex/.agents/skills/verify-telemetry/scripts/check-topic.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-# check-topic.sh <topic>: check one MQTT topic end to end for verify-telemetry. Prints
-# its CAN definition (file, message id, unit, value points) from worktrees/odyssey-definitions/main,
-# whether the Calypso simulator image is current and running,
-# and the topic's last scylla-server log lines. Exits 1 if the topic isn't defined. Needs jq; the
-# docker checks are skipped without docker.
-set -euo pipefail
-usage="usage: check-topic.sh <topic>"
-topic=${1:?$usage}
-# shellcheck source=/dev/null
-. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
-defs=$DELPHI_WORKTREES/odyssey-definitions/main/can-messages
-[ -d "$defs" ] || { echo "no CAN definitions at $defs; add odyssey-definitions under repos: and run .delphi/setup.sh" >&2; exit 2; }
-
-echo "== CAN definition"
-jq -ce --arg t "$topic" 'input_filename as $f | .[] | . as $m | .fields[]? | select(.name == $t) |
-  {file: ($f | split("/")[-1]), id: $m.id, desc: $m.desc, unit, points: [.values[] | $m.points[. - 1].name]}' \
-  "$defs"/*.json || { echo "not found: $topic"; exit 1; }
-
-command -v docker >/dev/null || { echo "== docker not installed; skipping Calypso and logs"; exit 0; }
-echo "== Calypso"
-if docker pull -q ghcr.io/northeastern-electric-racing/calypso:Develop >/dev/null 2>&1; then
-  echo "image pulled (restart the stack if it changed)"; else echo "pull failed"; fi
-docker ps --filter name=calypso --format '{{.Names}} {{.Status}}' 2>/dev/null | grep . || echo "calypso not running"
-echo "== scylla-server log"
-c=$(docker ps --filter name=scylla-server --format '{{.Names}}' 2>/dev/null | head -1) # compose names it <project>-scylla-server-1
-if [ -z "$c" ]; then echo "scylla-server not running in docker (local cargo run? check its log)"
-else docker logs "$c" 2>&1 | grep -F "$topic" | tail -5 | grep . || echo "no log lines for $topic (not published?)"; fi
diff --git a/software/application-software/argos/workspaces/default-codex/workspace.generated b/software/application-software/argos/workspaces/default-codex/workspace.generated
deleted file mode 100644
index 5f816f9..0000000
--- a/software/application-software/argos/workspaces/default-codex/workspace.generated
+++ /dev/null
@@ -1,33 +0,0 @@
-# Generated by ci/render.sh; edit shared sources or opt out in workspace.yml.
-100644 3bf22d3571b9cad53804cc7a7c678c4103368780	.agents/skills/address-pr-comments/SKILL.md	software/application-software/workspace-inherit/.claude/skills/address-pr-comments/SKILL.md
-100755 ce1efd97da4a6d2ea655932486660c5008f44dae	.agents/skills/address-pr-comments/scripts/fetch-feedback.sh	software/application-software/workspace-inherit/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh
-100644 da0be202ebc0a9ffc4544dbdf4bbef54cca37520	.agents/skills/address-pr-comments/scripts/github.sh	software/application-software/workspace-inherit/.claude/skills/address-pr-comments/scripts/github.sh
-100644 7a8015c8555385e795638019a5bce9db2ec984f5	.agents/skills/commit/SKILL.md	software/application-software/workspace-inherit/.claude/skills/commit/SKILL.md
-100644 897a1f58386f280ce329a245baea7b562ac0b3db	.agents/skills/consolidate-spikes/SKILL.md	software/application-software/workspace-inherit/.claude/skills/consolidate-spikes/SKILL.md
-100644 210a059f1a4b753cab90aad19f26ead483a62295	.agents/skills/create-ticket/SKILL.md	software/application-software/workspace-inherit/.claude/skills/create-ticket/SKILL.md
-100644 f24d293b38a4d03b610a5a104fa97b614856d7c3	.agents/skills/implement/SKILL.md	software/application-software/argos/workspace-inherit/.claude/skills/implement/SKILL.md
-100644 4917259f9e29db28e2636496e80f80ee5d9e321e	.agents/skills/journal/SKILL.md	software/workspace-inherit/.claude/skills/journal/SKILL.md
-100755 1e90d7b9afa14b8b0e7f36e0e1d83baecc94ba5b	.agents/skills/journal/scripts/capture.sh	software/workspace-inherit/.claude/skills/journal/scripts/capture.sh
-100644 0495fc97cbe93e4331c89263aee188f6c0e9c9ea	.agents/skills/new-worktree/SKILL.md	software/workspace-inherit/.claude/skills/new-worktree/SKILL.md
-100644 b1e7c71c13b4ea7c40cabeb12aa1674a6b543dc5	.agents/skills/open-pr/SKILL.md	software/application-software/workspace-inherit/.claude/skills/open-pr/SKILL.md
-100755 61f377fef63daa10c443129df6a49571fdbeb658	.agents/skills/open-pr/scripts/pr-checks.sh	software/application-software/workspace-inherit/.claude/skills/open-pr/scripts/pr-checks.sh
-100644 5d80cc0cfbc8794c3bd6e970365dc414c1eda850	.agents/skills/pr-conventions/SKILL.md	software/application-software/argos/workspace-inherit/.claude/skills/pr-conventions/SKILL.md
-100644 2ed67ecda73634b78468cab0ccb52c86f128e064	.agents/skills/pr-conventions/scripts/lint.sh	software/application-software/argos/workspace-inherit/.claude/skills/pr-conventions/scripts/lint.sh
-100644 e67387116a753217d256d81901e5b4091b49b44c	.agents/skills/report-spike/SKILL.md	software/application-software/workspace-inherit/.claude/skills/report-spike/SKILL.md
-100644 7acb908af141defaa035f992b060d4d23c0b2a54	.agents/skills/run-local/SKILL.md	software/application-software/argos/workspace-inherit/.claude/skills/run-local/SKILL.md
-100755 f5986571d9b917264eb6cfe9c9d7f27448242ac9	.agents/skills/run-local/scripts/run-local.sh	software/application-software/argos/workspace-inherit/.claude/skills/run-local/scripts/run-local.sh
-100755 d8de89ce933cbc5302c59fab3176004bdd251d35	.agents/skills/run-local/scripts/serve.sh	software/application-software/argos/workspace-inherit/.claude/skills/run-local/scripts/serve.sh
-100644 fdc1ce85211200223040edfb5dc65a3de7f35d53	.agents/skills/setup-workspace/SKILL.md	software/workspace-inherit/.claude/skills/setup-workspace/SKILL.md
-100644 b6a8144466f5430a1141df53300f8c09f9dae20f	.agents/skills/switch-workspace/SKILL.md	software/workspace-inherit/.claude/skills/switch-workspace/SKILL.md
-100644 8d9ec377f598b4527af20ffaa54b6cfe1a244860	.agents/skills/ticket-conventions/SKILL.md	software/application-software/argos/workspace-inherit/.claude/skills/ticket-conventions/SKILL.md
-100644 069b51714c0fd4d3d6ad972dd9f840e01f21cf15	.agents/skills/update-pr/SKILL.md	software/application-software/workspace-inherit/.claude/skills/update-pr/SKILL.md
-100644 c9dfe7d18e9c4d728d5295eeed178960289390a2	.agents/skills/verify-graph/SKILL.md	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/SKILL.md
-100644 3fcb7344ce3499a7afbba08b8c2b6deacd3f101b	.agents/skills/verify-graph/scripts/check.js	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/check.js
-100755 c8710cdf2cea12ddae0a92c3e0ba141e06a234f3	.agents/skills/verify-graph/scripts/check.sh	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/check.sh
-100755 5a1b49bc55582ec03f5e0a58c015d1b28fd21af3	.agents/skills/verify-graph/scripts/open.sh	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/open.sh
-100644 404ac250d03f0c228b8206efef46bed6149bd314	.agents/skills/verify-graph/scripts/perf.js	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/perf.js
-100755 2218f42b8f020b7d83e9d960828800444e1260ad	.agents/skills/verify-graph/scripts/perf.sh	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/perf.sh
-100755 fdb2631a755b9999c2aa83c67729fbeb13d387a8	.agents/skills/verify-graph/scripts/seed.sh	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/seed.sh
-100755 d1237c42098d2a437770c24e2f60b7110d1e90b2	.agents/skills/verify-graph/scripts/select-run.sh	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/select-run.sh
-100644 006fff61ee4658a959c921e5fd70ecc57e2b07f2	.agents/skills/verify-telemetry/SKILL.md	software/application-software/argos/workspace-inherit/.claude/skills/verify-telemetry/SKILL.md
-100755 c9a9c0a7dd4386508e1f90d595d59b50df0aad35	.agents/skills/verify-telemetry/scripts/check-topic.sh	software/application-software/argos/workspace-inherit/.claude/skills/verify-telemetry/scripts/check-topic.sh
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/address-pr-comments/SKILL.md b/software/application-software/argos/workspaces/experimental/.claude/skills/address-pr-comments/SKILL.md
deleted file mode 100644
index 30083fa..0000000
--- a/software/application-software/argos/workspaces/experimental/.claude/skills/address-pr-comments/SKILL.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: address-pr-comments
-description: Fetch review comments on a PR (Argos, Nero), judge whether each (including outdated ones) still applies, and walk through fixes in the PR's worktree
-allowed-tools: Bash(git:*), Bash(gh issue list:*), Bash(bash ${CLAUDE_SKILL_DIR}/scripts/fetch-feedback.sh *)
-user-invocable: true
----
-
-Propose and apply fixes for a PR's unresolved review feedback. **Never reply to threads**; the user does.
-
-1. **Fetch** from the workspace root: `bash scripts/fetch-feedback.sh <repo> <pr>|<branch>` (`<repo>` as under `repos/`, e.g. `argos`; `--all` first for unfiltered history). It checks out the PR head's worktree and prints JSON: `worktree` (target it by path from the root from now on), unresolved `threads`, `comments`, `reviews`. Any non-zero exit: use the GitHub MCP server's `pull_request_read` instead.
-2. **Judge.** Skip bot noise and anything already fixed at HEAD. For an `outdated` thread, find its `diffHunk` code by content, then label it **addressed**, **applies**, **moved**, **obsolete**, or **unclear**.
-3. **Present** before editing, grouped by file, and ask to confirm, skip, or change each (offer to batch clear ones past 8):
-
-   ```
-   <file>:<line> — <reviewer> · <active|outdated> · <label>
-   "<excerpt>" → <proposed fix>
-   <optional ≤5-line snippet, for the user only>
-   ```
-4. **Apply** in that worktree, by path, with grouped `/commit`s. For a follow-up-ticket request, reuse a match from `gh issue list --search` before filing.
-5. **Report** what was fixed (file:line, commit SHA), what was already addressed or obsolete (why), and what is unclear.
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh b/software/application-software/argos/workspaces/experimental/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh
deleted file mode 100755
index ce1efd9..0000000
--- a/software/application-software/argos/workspaces/experimental/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env bash
-# fetch-feedback.sh [--all] <repo> <pr-number>|<branch>: print a PR's review
-# feedback as one JSON object after creating or reusing the PR head's worktree
-# (worktrees/<repo>/<head>). Default output keeps unresolved threads (first + latest message,
-# bots tagged), conversation comments, and reviews with text; --all keeps everything. Exits 3 on any
-# GitHub failure (see github.sh).
-# shellcheck source-path=SCRIPTDIR source=github.sh
-set -euo pipefail
-. "$(dirname "$0")/github.sh"
-all=false
-[ "${1:-}" = --all ] && all=true && shift
-usage="usage: fetch-feedback.sh [--all] <repo> <pr-number>|<branch>"
-repo=${1:?$usage} ref=${2:?$usage}
-# shellcheck source=/dev/null
-. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
-gh_init fetch-feedback "$DELPHI_WORKTREES/$repo/.bare"
-
-case "$ref" in *[!0-9]*) get "repos/$SLUG/pulls?state=all&head=${SLUG%%/*}:$ref" | jq '.[0] // error("no PR")' ;;
-  *) get "repos/$SLUG/pulls/$ref" ;; esac >"$TMP/pr"
-num=$(jq .number "$TMP/pr")
-wt=""
-[ "$(jq -r .head.repo.full_name "$TMP/pr")" != "$SLUG" ] || wt=$(bash "$DELPHI_ROOT/.delphi/new-worktree.sh" "$repo" "$(jq -r .head.ref "$TMP/pr")")
-
-if [ "$MODE" = gh ]; then # thread state is GraphQL-only; reshape it like the proxy's ccr/review_threads
-  # shellcheck disable=SC2016 # GraphQL variables
-  gh api graphql -F o="${SLUG%%/*}" -F n="${SLUG##*/}" -F p="$num" -f query='query($o: String!, $n: String!, $p: Int!) {
-    repository(owner: $o, name: $n) { pullRequest(number: $p) { reviewThreads(first: 100) { nodes {
-      isResolved isOutdated comments(first: 50) { nodes { databaseId } } } } } } }' \
-    --jq '[.data.repository.pullRequest.reviewThreads.nodes[] |
-      {resolved: .isResolved, outdated: .isOutdated, comment_ids: [.comments.nodes[].databaseId]}]'
-else get "repos/$SLUG/pulls/$num/ccr/review_threads"; fi >"$TMP/th"
-get "repos/$SLUG/pulls/$num/comments?per_page=100" >"$TMP/rc"
-get "repos/$SLUG/issues/$num/comments?per_page=100" >"$TMP/ic"
-get "repos/$SLUG/pulls/$num/reviews?per_page=100" >"$TMP/rv"
-
-jq -n --arg wt "$wt" --argjson all "$all" --slurpfile pr "$TMP/pr" --slurpfile th "$TMP/th" \
-  --slurpfile rc "$TMP/rc" --slurpfile ic "$TMP/ic" --slurpfile rv "$TMP/rv" '
-  def who: {author: .user.login, bot: (.user.type == "Bot")};
-  ($rc[0] | map({key: (.id | tostring), value: (who + {body, path, line: (.line // .original_line), diffHunk: .diff_hunk})}) | from_entries) as $byid |
-  {pr: ($pr[0] | {number, title, url: .html_url, head: .head.ref, base: .base.ref}), worktree: $wt,
-   threads: [$th[0][] | {resolved, outdated, comments: [.comment_ids[] | $byid[tostring]]}],
-   comments: [$ic[0][] | who + {body}], reviews: [$rv[0][] | who + {state, body: (.body // "")}]} |
-  if $all then . else
-    .threads |= map(select(.resolved | not) | .comments as $c | $c[-1] + {outdated, path: $c[0].path, line: $c[0].line,
-      diffHunk: (if .outdated then $c[0].diffHunk else null end), replies: ($c | length),
-      first: (if ($c | length) > 1 then $c[0].body else null end)}) |
-    .reviews |= map(select(.body != ""))
-  end'
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/address-pr-comments/scripts/github.sh b/software/application-software/argos/workspaces/experimental/.claude/skills/address-pr-comments/scripts/github.sh
deleted file mode 100644
index da0be20..0000000
--- a/software/application-software/argos/workspaces/experimental/.claude/skills/address-pr-comments/scripts/github.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-# github.sh: sourced by skill scripts that call GitHub. gh_init <tool> <git-dir> picks a backend
-# (gh when logged in, else an explicitly enabled GitHub REST proxy via curl; jq is needed either
-# way), sets SLUG from that repo's origin, and makes any failure exit 3 so the calling skill falls
-# back to the available GitHub integration. TMP is a scratch dir removed on exit.
-# shellcheck shell=bash
-fail() { echo "$TOOL: $1; use the available GitHub integration" >&2; exit 3; }
-on_exit() { local rc=$?; rm -rf "$TMP"; [ "$rc" -eq 0 ] || fail "GitHub request failed ($MODE)"; }
-gh_init() {
-  TOOL=$1
-  if { command -v gh && gh auth status; } >/dev/null 2>&1; then MODE=gh
-  elif [ -n "${DELPHI_GITHUB_REST_PROXY:-${CLAUDE_CODE_REMOTE:-}}" ] && command -v curl >/dev/null; then MODE=rest
-  else fail "no authenticated gh or enabled REST proxy"; fi
-  command -v jq >/dev/null || fail "jq not installed"
-  SLUG=$(git -C "$2" remote get-url origin) && SLUG=${SLUG#*github.com[:/]} && SLUG=${SLUG%.git}
-  TMP=$(mktemp -d)
-  trap on_exit EXIT
-}
-get() { if [ "$MODE" = gh ]; then gh api "$1"; else curl -fsS "https://api.github.com/$1"; fi; }
-post() { if [ "$MODE" = gh ]; then gh api -X POST "$1" --input -; else curl -fsS -X POST --data-binary @- "https://api.github.com/$1"; fi; }
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/commit/SKILL.md b/software/application-software/argos/workspaces/experimental/.claude/skills/commit/SKILL.md
deleted file mode 100644
index 4b56757..0000000
--- a/software/application-software/argos/workspaces/experimental/.claude/skills/commit/SKILL.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-name: commit
-description: Stage and commit using the project's commit message convention
----
-
-In the worktree you're working on, from the workspace root (`git -C worktrees/<repo>/<branch> …`), stage the relevant changes (not unrelated or generated files) and commit using the commit message format in CLAUDE.md. Keep the description imperative and 2–8 words.
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/consolidate-spikes/SKILL.md b/software/application-software/argos/workspaces/experimental/.claude/skills/consolidate-spikes/SKILL.md
deleted file mode 100644
index 4f85b66..0000000
--- a/software/application-software/argos/workspaces/experimental/.claude/skills/consolidate-spikes/SKILL.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-name: consolidate-spikes
-description: Turn finished spikes into implementation tickets: an idea's spikes, once all are done, into dev work, under an epic when it comes from an idea or splits. Use when the user wants to wrap up, settle, or consolidate an idea or spike on an application-software repo (Argos, Nero).
----
-
-Drafts and files by the `create-ticket` rules; load it and the project's `ticket-conventions` first. Takes an idea or a standalone spike.
-
-1. **Gather** each spike's findings comment, draft PR, and the PR's reviews; from an idea, its sub-issues too.
-2. **Check it's done.** Every spike is done by `create-ticket`'s Spikes rules (the lead's latest review on its draft PR, from repos/<owner>/<repo>/pulls/<pr>/reviews, is an approval). From an idea, that's every spike under it, and every one of its areas to explore is covered by a spike area. Otherwise list what's missing, offer spikes for uncovered areas, and stop.
-3. **Choose:** per area (title prefix), propose the approach to build (one spike's, or a mix) with a one-line why, from the findings and the lead's review. The user confirms or changes each.
-4. **Plan** the dev work by `create-ticket`'s Dev work rules: one ticket unless the work is large enough to split into vertical slices, which may cross areas. Each ticket: What, the slice; Notes, links to the spikes and draft PRs it draws on, and the dropped approaches with why; context transfer, the findings' facts.
-5. **Draft** them, and, from an idea or when split, one epic (From: the idea or spike) with the dev work as its sub-issues. Show all, with which slices run in parallel if split; file what the user OKs.
-6. **Close**, each with a one-line comment: the spikes as completed ("Consolidated into #<epic or dev work>"), their draft PRs unless a dev work ticket builds on that branch, and the idea as completed ("Settled in #<epic or dev work>").
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/create-ticket/SKILL.md b/software/application-software/argos/workspaces/experimental/.claude/skills/create-ticket/SKILL.md
deleted file mode 100644
index 210a059..0000000
--- a/software/application-software/argos/workspaces/experimental/.claude/skills/create-ticket/SKILL.md
+++ /dev/null
@@ -1,66 +0,0 @@
----
-name: create-ticket
-description: Draft and file a GitHub issue (idea, spike, epic, or dev work) on an application-software repo (Argos, Nero) from the repo's issue templates, or rewrite an existing issue into them. Use whenever the user wants to create, file, write up, or log a ticket, issue, idea, spike, epic, bug, or task, including an out-of-scope idea that comes up mid-work.
----
-
-# Create ticket
-
-These are the ticket conventions for every application-software repo. The repo's own `.github/ISSUE_TEMPLATE` holds only the fields (`gh api repos/<owner>/<repo>/contents/.github/ISSUE_TEMPLATE/<file> -q .content | base64 -d`); follow each field's description.
-
-First load the project's `ticket-conventions` skill (inherited from the project's `workspace-inherit/`) for its repo, area labels, vocabulary, and diagrams. If none is enabled, ask which repo.
-
-## Workflow
-
-idea → spikes → epic → dev work, or a standalone spike → dev work
-
-| Ticket | What it is | Issue type | Parent |
-|---|---|---|---|
-| Idea | What could be built and why. Its areas to explore are things to improve or problems to solve, each with approaches worth trying. | none | none |
-| Spike | One approach to try on one area of an idea (it needn't cover the whole area), or a small standalone improvement: what is tried and the hypothesis. Findings go in a comment and a draft PR (`report-spike`), not the ticket. | none | its idea, if any |
-| Epic | Work too large for one dev work ticket: the goal and whole-epic outcomes, not a walkthrough of each ticket. A new issue linking the idea or spike it came from in "From". | Feature | none |
-| Dev work | Any implementation work: testable requirements, Notes for gotchas and pointers to code. Large work is cut into vertical slices (see Dev work below). | Feature, Bug, or Task | its epic, if any |
-
-If unsure, a small, clear change is dev work, a small unknown is a spike, and a big unexplored thing is an idea. Ideas and spikes explore work, so they get no issue type; bug, feature, and task are issue types, never labels.
-
-## Writing
-
-How every ticket reads, on any project:
-
-- Short and plain. Write for someone new to the project: explain project-specific terms, and use the project's vocabulary (its `ticket-conventions` says where it lives; check the code for current names).
-- Outcomes, not implementation: say what changes and why, not how to build it. A rationale gives the reasoning, not a history of the problem.
-- No prescriptions on ideas and spikes. Ideas name open options to weigh, not a plan or a recommended pick; spikes state what to learn and leave the how to whoever picks it up.
-- Facts, not instructions: Notes and context transfer hold facts (where code lives, current behavior, constraints, links), not steps or a proposed solution. Context transfer (optional on spikes, epics, and dev work) starts with a short summary, then the raw context.
-- Unknowns stay open questions in Notes; don't guess.
-- Title: concise and imperative, no prefixes (except a spike's area).
-- Requirements: clear, broad checkboxes, each a testable outcome rather than an implementation step; 3-5, never more than 7. If it needs more, split the ticket.
-- Backticks: at most three inline uses per body; name files and identifiers in plain text. Diagram and context-transfer blocks don't count.
-- Size: keep ideas short; one small enough to just try is a spike.
-
-## Dev work
-
-- One ticket by default. Split only when the work is too large for one PR or parts could run in parallel.
-- When split, cut vertical slices: each goes end to end through every part it touches (e.g. backend through UI), not one layer, and works and is testable on its own. Cut for the most parallel work; mark a slice that must wait as blocked by the one it waits on (see File).
-
-## Spikes
-
-- One approach, not a set to choose between. If a spike reads "X or Y", it is two spikes.
-- Prefer an idea with a few spikes (often 2-4) under it; a spike can also stand alone, or with siblings, to explore an area. Several spikes can take on the same area in different ways.
-- Title it `<area>: <approach>`, with the area a short kebab-case name its siblings share (`graph-saving: Save a graph to a file and re-upload it`). An area may cover more than one of an idea's bullets. A lone small improvement needs no prefix.
-- Sibling spikes share the context transfer's summary and common facts; each adds only the facts particular to its approach.
-- An idea needn't get all its spikes at once: file an area's spikes when someone is ready to try them.
-- Done: its findings are posted, review feedback is addressed, and the lead's latest review on its draft PR is an approval (GitHub's Approve), including when the recommendation is to drop the approach. A done spike stays open until `consolidate-spikes` closes it.
-
-## Draft
-
-- Check the code first: the work may be done or already tracked.
-- One `### <field label>` per field in template order, following each field's description; omit empty optional fields.
-- Diagrams: required on epics, optional on dev work. The project's `ticket-conventions` says what they show.
-- Labels: the template's category (`idea`, `spike`, `epic`, `dev work`), one written-by (`by: human` if the user dictated it, `by: ai-assisted` if they gave the substance, `by: ai` if you wrote it, including rewrites), and at least one of the project's area labels.
-- Rewriting an old ticket: keep its intent and assignees; bring it up to these rules and update vocabulary, labels, issue type, and parent.
-- Folding one ticket into another: add it as a requirement on the target, then close it as not planned. Every close gets a one-line comment saying why.
-
-## File
-
-Check for open duplicates, then show the full draft (title, type if any, labels, parent, body) in the chat, not only in a file. File or edit only what the user OKs.
-
-Use the REST API (GraphQL may be blocked): POST repos/<owner>/<repo>/issues with title, body, labels, the issue type from the table, and the user as assignee (on a spike, whoever will run it; ask), then, if it has a parent, POST repos/<owner>/<repo>/issues/<parent>/sub_issues with the new issue's id. If it waits on another issue, POST repos/<owner>/<repo>/issues/<n>/dependencies/blocked_by with the blocking issue's id. Report the URL.
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/implement/SKILL.md b/software/application-software/argos/workspaces/experimental/.claude/skills/implement/SKILL.md
deleted file mode 100644
index f24d293..0000000
--- a/software/application-software/argos/workspaces/experimental/.claude/skills/implement/SKILL.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-name: implement
-description: Implement an Argos ticket or task in its own worktree, test-first, ending in a commit, here or in a subagent (one per ticket, in parallel, for several). Use when the user asks to build, fix, or implement something in Argos.
----
-
-1. **Worktree.** Get the ticket's branch (`{issue-number}-{kebab-case-title}`) with the `new-worktree` skill, based on `origin/develop`. Make every change in `worktrees/argos/<branch>/`, never in `worktrees/argos/develop/`, while staying at the workspace root: edit files by path, `git -C worktrees/argos/<branch> …` for git, and one-off subshells for the rest. Run `(cd worktrees/argos/<branch>/angular-client && npm ci)` before touching the client.
-2. **Hand off?** Unless the user already chose, ask whether a subagent should do the rest, and recommend one: one per ticket, in parallel, when there are several (step 1 for each first), or one for work long enough to fill this conversation. Tell it the ticket, its worktree's absolute path, and to follow this skill from step 3, change files only under that path (`git -C` for git), name temp files after the branch, stop the clients it starts, and report its commits, checks, and the port and browser it used. Never turn on the harness's own worktree isolation (`new-worktree` says why). Then confirm its commits with `git -C <path> log origin/develop..` and pass its report on.
-3. **Understand.** Read the issue (`gh issue view <n> --comments`), the code involved, and `docs/CONTEXT.md` terms.
-4. **Build test-first**, one behavior at a time: a failing test, the least code to pass it, refactor while green. Test through public interfaces; mock only at system boundaries.
-5. **Check.**
-   - Frontend, in `(cd worktrees/argos/<branch>/angular-client && …)`: `npx ng test --include='src/**/thing.spec.ts' --watch=false` while iterating; at the end `npx ng test --watch=false` (bare `ng test` blocks), then `npx prettier --check "src/**/*.{ts,html,scss}" && npx ng lint`.
-   - Backend, in `(cd worktrees/argos/<branch>/scylla-server && …)`: `cargo build` and single tests while iterating; `cargo test` at the end.
-   - UI changes: verify in the running app with `run-local <branch>`.
-6. **Commit** with `/commit`. Don't push or open a PR unless asked; that's `/open-pr`.
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/journal/SKILL.md b/software/application-software/argos/workspaces/experimental/.claude/skills/journal/SKILL.md
deleted file mode 100644
index 4917259..0000000
--- a/software/application-software/argos/workspaces/experimental/.claude/skills/journal/SKILL.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-name: journal
-description: Park rough notes locally mid-task ("note to self", "remember to", "journal this"), and later export them to their permanent home (issue, spec, ADR, glossary, docs) through the skill that owns it. Use when the user wants to jot a thought without derailing, or to file parked notes.
----
-
-Notes live in `.journal/` at the workspace root (git-excluded, outside worktrees so they survive removal). An **entry** is one file, a **category** a subfolder. The journal never pushes, files, or contacts GitHub itself.
-
-**Capture** (no git, no other skills):
-
-```
-bash scripts/capture.sh [-c <category>] ["note text"]
-```
-
-Omit `-c` for a loose entry, omit the text for an empty one to edit. Report the path it prints.
-
-**Export** (only when asked):
-
-1. Read the entries and propose a grouping: one entry → one output, a category → one merged output, or one entry split across several. Let the user adjust.
-2. For each output, pick the workspace skill whose description fits its permanent home, preferring an existing docs area. A new section always needs approval.
-3. Show the destination and reshaped text and wait for approval. Nothing lands silently.
-4. Delegate to that skill; it owns formatting, conventions, and any GitHub contact.
-5. Ask whether to delete the exported entry (default: keep).
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/journal/scripts/capture.sh b/software/application-software/argos/workspaces/experimental/.claude/skills/journal/scripts/capture.sh
deleted file mode 100755
index 1e90d7b..0000000
--- a/software/application-software/argos/workspaces/experimental/.claude/skills/journal/scripts/capture.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-# capture.sh [-c <category>] [note text]: write a timestamped journal entry to
-# .journal/[<category>/] at the workspace root (adding /.journal/ to .git/info/exclude once) and print
-# its path. An empty entry is created when no text is given. Never touches git history, GitHub, or
-# other skills.
-set -euo pipefail
-usage="usage: capture.sh [-c <category>] [note text]"
-# shellcheck source=/dev/null
-. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
-dir=$DELPHI_ROOT/.journal
-[ "${1:-}" = -c ] && dir=$dir/${2:?$usage} && shift 2
-exclude=$(git -C "$DELPHI_ROOT" rev-parse --path-format=absolute --git-path info/exclude 2>/dev/null || true)
-[ -z "$exclude" ] || grep -qxF /.journal/ "$exclude" 2>/dev/null || { mkdir -p "${exclude%/*}" && echo /.journal/ >>"$exclude"; }
-mkdir -p "$dir"
-file=$dir/$(date +%Y-%m-%d-%H%M%S).md
-{ echo "<!-- captured $(date -u +%Y-%m-%dT%H:%M:%SZ) -->"; [ $# -eq 0 ] || echo "$*"; } >"$file"
-echo "$file"
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/new-worktree/SKILL.md b/software/application-software/argos/workspaces/experimental/.claude/skills/new-worktree/SKILL.md
deleted file mode 100644
index 0495fc9..0000000
--- a/software/application-software/argos/workspaces/experimental/.claude/skills/new-worktree/SKILL.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-name: new-worktree
-description: Create or reuse a worktree for a branch of a code repo (worktrees/<repo>/<branch>). Use before any branch work, such as starting a ticket or reviewing or fixing a PR branch, unless the user says not to use worktrees.
----
-
-Run from the workspace root:
-
-```
-bash .delphi/new-worktree.sh <repo> <branch> [<base>]
-```
-
-- An existing branch (local or on origin, e.g. a PR head) is checked out; anything else is created from `<base>` (default: the repo's default branch). Safe to re-run.
-- Stay at the workspace root and reach into the worktree by the printed path. Never switch branches in an existing worktree or work in its store, `worktrees/<repo>/.bare`.
-- For a subagent, make its worktree here first and hand it the path. Never use the harness's own worktree isolation: it checks out this Delphi clone from main, not the code repo, and fences the subagent out of `worktrees/`.
-- Keep `worktrees/<repo>/<default-branch>/` (made by setup) a clean reference: fetch and fast-forward only.
-- After the branch merges: `git -C worktrees/<repo>/.bare worktree remove ../<branch>`.
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/open-pr/SKILL.md b/software/application-software/argos/workspaces/experimental/.claude/skills/open-pr/SKILL.md
deleted file mode 100644
index b1e7c71..0000000
--- a/software/application-software/argos/workspaces/experimental/.claude/skills/open-pr/SKILL.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-name: open-pr
-description: Run pre-PR checks, push the branch, and open a draft pull request on an application-software repo (Argos, Nero)
----
-
-First load the project's `pr-conventions` skill (inherited from the project's `workspace-inherit/`) for its base branch, commit format, checks, labels, and screenshots.
-
-1. **Check:** `bash scripts/pr-checks.sh <repo> <branch> origin/<base> '<commit format>'` (clean tree, commit subjects match the project's format, merges cleanly into the base), then the project's own checks. Stop and fix on any FAIL.
-2. **Media:** if the diff touches the UI, ask the user whether to add screenshots to the PR, listing any already in the project's screenshot folder for this branch so they can pick those instead of new ones; on no, skip this step. For new ones, use the project's UI QA to take Playwright screenshots of the changed views into its screenshot folder, or, when the change adds or changes an animation, record a short video instead (a browser context with `recordVideo: { dir }` saves a `.webm` when it closes). Images must be under 10 MB; video under 10 MB on a Free plan, 100 MB on a paid one.
-3. **Open:** push (`git -C worktrees/<repo>/<branch> push -u origin <branch>`), then run `(cd worktrees/<repo>/<branch> && gh pr create --draft --base <base> --head <branch> --title "<title>" --body-file /tmp/<branch>-pr-body.md --assignee @me)` with the project's labels (`--label`) and one `--attach <file>` per screenshot or video, and report the URL.
-4. **Spike:** the PR stays a draft; getting it merged isn't the goal. Once it's checked and working, run `report-spike`.
-
-## PR body
-
-Fill the worktree's `.github/pull_request_template.md` from the diff, following each section's comment, and write it to `/tmp/<branch>-pr-body.md`:
-
-- Title: concise and imperative, no ticket number.
-- The Changes section (not the whole body): about 50 words (1–3 sentences) on what landed and the key design choice. Describe the change, not the file list: don't enumerate components, classes or files the diff already shows. Name a specific one only when its behaviour changes in a way a reviewer must know.
-- Delete the template's comments and any optional or non-applicable sections, and check off the Checklist.
-- At most three backtick uses in the body.
-- End with `Closes #{ticket}` (the branch's leading number), or `Spike for #{ticket}` on a spike, which its PR never closes.
-- Screenshots and videos: reference each one by its path from the worktree, `![<what it shows>](<path>)`; `--attach` uploads it and rewrites the reference to its `user-attachments` URL. `--attach` needs gh v2.99.0+: if `gh pr create --help` doesn't list it, put `_screenshot pending_` instead and remind the user to drag-drop the files from the screenshot folder. Never commit screenshots or videos.
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/open-pr/scripts/pr-checks.sh b/software/application-software/argos/workspaces/experimental/.claude/skills/open-pr/scripts/pr-checks.sh
deleted file mode 100755
index 61f377f..0000000
--- a/software/application-software/argos/workspaces/experimental/.claude/skills/open-pr/scripts/pr-checks.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-# pr-checks.sh <repo> <branch> [<base> [<format>]]: open-pr's shared pre-PR checks on
-# worktrees/<repo>/<branch>. Prints
-# one PASS/FAIL/SKIP line per check: clean tree, every commit subject since <base> (default
-# origin/develop, fetched first) matches <format> (an extended regex, default '^#[0-9]+ - '), and no
-# merge conflicts with <base>. Exits 1 if any check fails. The project's own checks (lint, format)
-# are in its pr-conventions skill.
-set -euo pipefail
-usage="usage: pr-checks.sh <repo> <branch> [<base> [<format>]]"
-repo=${1:?$usage} branch=${2:?$usage}
-# shellcheck source=/dev/null
-. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
-cd "$DELPHI_WORKTREES/$repo/$branch"
-base=${3:-origin/develop} format=${4:-'^#[0-9]+ - '} fail=0
-res() { echo "$1 $2"; [ "$1" != FAIL ] || fail=1; }
-git fetch -q origin "${base#origin/}" 2>/dev/null || true
-
-if [ -z "$(git status --porcelain)" ]; then res PASS "clean tree"; else res FAIL "uncommitted changes"; fi
-bad=$(git log --format=%s "$base..HEAD" | grep -Ev "$format" || true)
-if [ -z "$bad" ]; then res PASS "commit format"; else res FAIL "commit format: $(echo "$bad" | paste -sd'|' -)"; fi
-if git merge-tree --write-tree HEAD "$base" >/dev/null 2>&1; then res PASS "merges cleanly into $base"
-elif [ $? -eq 1 ]; then res FAIL "conflicts with $base"; else res SKIP "conflict check (needs git 2.38+)"; fi
-exit "$fail"
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/pr-conventions/SKILL.md b/software/application-software/argos/workspaces/experimental/.claude/skills/pr-conventions/SKILL.md
deleted file mode 100644
index 90cc657..0000000
--- a/software/application-software/argos/workspaces/experimental/.claude/skills/pr-conventions/SKILL.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-name: pr-conventions
-description: Argos specifics for pull requests (base branch, commit format, checks, labels, screenshots, UI QA). Load before opening, updating, or reviewing an Argos PR, alongside open-pr, update-pr, and review.
-user-invocable: false
----
-
-# Argos PR conventions
-
-The shared rules are in the `open-pr` skill; this adds only what is Argos's.
-
-- Base branch: `develop`. Commit format: `^#[0-9]+ - ` (the format in CLAUDE.md).
-- Checks: `bash scripts/lint.sh <branch>` (frontend prettier and ng lint, only if angular-client/ changed).
-- Labels: one written-by (`by: human` if the user wrote it, `by: ai-assisted` if they gave the substance, `by: ai` if you wrote it) and at least one area label (`frontend`, `backend`, `devops`); no category label.
-- Screenshots: `pictures/<branch>/` at the worktree root (git-ignored).
-- UI QA: get the branch running with `run-local <branch>`, then drive it with Playwright, using the `playwright-cdp` server if `curl -s localhost:9222/json/version` responds, otherwise `playwright`.
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/pr-conventions/scripts/lint.sh b/software/application-software/argos/workspaces/experimental/.claude/skills/pr-conventions/scripts/lint.sh
deleted file mode 100644
index 2ed67ec..0000000
--- a/software/application-software/argos/workspaces/experimental/.claude/skills/pr-conventions/scripts/lint.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-# lint.sh <branch> [<base>]: Argos's pre-PR check for open-pr, on
-# worktrees/argos/<branch>. Prints one PASS/FAIL/SKIP line: frontend prettier + ng lint, only if
-# angular-client/ changed since <base> (default origin/develop). Exits 1 if it fails.
-set -euo pipefail
-usage="usage: lint.sh <branch> [<base>]"
-branch=${1:?$usage}
-# shellcheck source=/dev/null
-. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
-cd "$DELPHI_WORKTREES/argos/$branch"
-base=${2:-origin/develop}
-if git diff --quiet "$base...HEAD" -- angular-client; then echo "SKIP frontend lint (no changes)"
-elif [ ! -d angular-client/node_modules ]; then echo "FAIL frontend lint: run npm ci in angular-client/" && exit 1
-elif (cd angular-client && npx prettier --check "src/**/*.{ts,html,scss}" >/dev/null && npx ng lint >/dev/null 2>&1)
-then echo "PASS frontend lint"; else echo "FAIL frontend lint (run prettier --check / ng lint to see why)" && exit 1; fi
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/report-spike/SKILL.md b/software/application-software/argos/workspaces/experimental/.claude/skills/report-spike/SKILL.md
deleted file mode 100644
index e673871..0000000
--- a/software/application-software/argos/workspaces/experimental/.claude/skills/report-spike/SKILL.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-name: report-spike
-description: Post a spike's findings on its ticket, judged against its hypothesis, and ask the lead to review its draft PR. Use when a spike's approach has been tried on an application-software repo (Argos, Nero).
----
-
-A spike runs like any ticket (branch, commits, a draft PR from `open-pr`); this reports it. Load the project's `pr-conventions` first.
-
-1. **Read** the spike (`gh issue view <n> --comments`), its draft PR, and the branch's diff against the base.
-2. **Draft** one findings comment, short and factual:
-
-   ```
-   ### Findings
-   **Hypothesis:** holds | partly holds | doesn't hold. One sentence why.
-   **Learned:** measurements, limits hit, surprises, with links to the draft PR's code.
-   **Recommendation:** adopt, adopt with changes, or drop, and why.
-   **Open questions:** what the spike didn't settle.
-   Draft PR: #<pr>
-   ```
-3. **Show** it and ask who the lead is; on OK, post it (`gh issue comment <n> --body-file /tmp/<branch>-findings.md`).
-4. **Request review:** `(cd worktrees/<repo>/<branch> && gh pr edit <branch> --add-reviewer <lead>)`, keeping the PR a draft, and remind the user to ping the lead on Slack.
-
-Address review feedback on the branch as on any PR (`address-pr-comments`), and edit the findings comment if it changes them. The spike is done when the lead approves the draft PR (`create-ticket`'s Spikes rules); it stays open until `consolidate-spikes` closes it.
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/run-local/SKILL.md b/software/application-software/argos/workspaces/experimental/.claude/skills/run-local/SKILL.md
deleted file mode 100644
index 7acb908..0000000
--- a/software/application-software/argos/workspaces/experimental/.claude/skills/run-local/SKILL.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-name: run-local
-description: Bring up the local Argos environment for running or testing — Docker backend (right profile for what changed) + an Angular client per worktree, each on its own free port. Use whenever you need to actually run the app locally, for a PR, a ticket's branch, or develop.
----
-
-Run the branches the user is asking about: a PR or ticket means its branch (make its worktree with `new-worktree` first), and `develop` only when they want current `develop` (fast-forward `worktrees/argos/develop/` first):
-
-```
-bash scripts/run-local.sh <branch>...
-```
-
-It starts the backend if it's down (`client-dev`, or `scylla-dev` plus `cargo run` when a target changes `scylla-server/`), and serves each target's client on the next free port; parallel runs (one per session or agent) each get their own. With no branches it reports what's running.
-
-Report each branch's client URL and the backend. A failed compile or a stale-backend warning is a finding: show it to the user. Stop a client with `kill <pid>` from its line. When every port is taken it lists what holds each; clients from other checkouts are the user's, so ask before stopping them.
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/run-local/scripts/run-local.sh b/software/application-software/argos/workspaces/experimental/.claude/skills/run-local/scripts/run-local.sh
deleted file mode 100755
index f598657..0000000
--- a/software/application-software/argos/workspaces/experimental/.claude/skills/run-local/scripts/run-local.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/usr/bin/env bash
-# run-local.sh [<branch>...]: bring up the local Argos stack for those branches'
-# worktrees (worktrees/argos/<branch>, made beforehand with new-worktree) and print one line per
-# piece. The backend (first listener on 8000-8090, step 10) is started if down:
-# ./argos.sh client-dev when no target changes scylla-server/, else scylla-dev plus `cargo run` in the
-# one worktree that does. Each target's client is then served by serve.sh on its own port. With no
-# branches, reports what is running.
-set -euo pipefail
-here=$(cd "$(dirname "$0")" && pwd)
-# shellcheck source=/dev/null
-. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
-state=${TMPDIR:-/tmp}; state=${state%/}/argos-run-local
-up() { (exec 3<>"/dev/tcp/127.0.0.1/$1") 2>/dev/null || (exec 3<>"/dev/tcp/::1/$1") 2>/dev/null; } # ng serve binds ::1
-backend() { for p in $(seq 8000 10 8090); do up "$p" && echo "http://localhost:$p" && return; done; echo none; }
-scylla() {
-  if docker ps --filter name=scylla-server --format '{{.Names}}' 2>/dev/null | grep -q .; then echo docker
-  elif [ "$(backend)" != none ]; then echo local
-  else echo none; fi
-}
-
-if [ $# = 0 ]; then
-  clients=
-  for p in $(seq 4200 4210); do up "$p" && clients="$clients http://localhost:$p"; done
-  echo "backend=$(backend) scylla=$(scylla) clients=${clients# }"
-  exit 0
-fi
-
-wts=() rust=()
-for b in "$@"; do
-  wt=$DELPHI_WORKTREES/argos/$b
-  [ -f "$wt/argos.sh" ] && [ -d "$wt/angular-client" ] ||
-    { echo "run-local: no Argos worktree for '$b' at $wt (make it with new-worktree)" >&2 && exit 1; }
-  wts+=("$wt")
-done
-git -C "${wts[0]}" fetch -q origin # the worktrees share one store
-for wt in "${wts[@]}"; do
-  if ! git -C "$wt" diff --quiet origin/develop... -- scylla-server || ! git -C "$wt" diff --quiet HEAD -- scylla-server; then
-    rust+=("$wt")
-  fi
-done
-[ ${#rust[@]} -le 1 ] || { echo "run-local: several targets change scylla-server/; run them one at a time" >&2 && exit 1; }
-
-if [ "$(backend)" = none ]; then
-  mkdir -p "$state"
-  if [ ${#rust[@]} = 0 ]; then
-    (cd "${wts[0]}" && ./argos.sh client-dev up -d) >"$state/compose.log" 2>&1 ||
-      { echo "run-local: ./argos.sh client-dev up failed:" >&2 && tail -20 "$state/compose.log" >&2 && exit 1; }
-  else
-    (cd "${rust[0]}" && ./argos.sh scylla-dev up -d) >"$state/compose.log" 2>&1 ||
-      { echo "run-local: ./argos.sh scylla-dev up failed:" >&2 && tail -20 "$state/compose.log" >&2 && exit 1; }
-    (cd "${rust[0]}/scylla-server" &&
-      DATABASE_URL=${DATABASE_URL:-postgresql://postgres:password@127.0.0.1:${ODYSSEY_DB_PORT:-5432}/postgres} \
-        nohup cargo run >"$state/scylla.log" 2>&1 &)
-    echo "run-local: cargo run started for $(basename "${rust[0]}"); log $state/scylla.log"
-  fi
-  for _ in $(seq 600); do [ "$(backend)" != none ] && break; sleep 1; done
-  [ "$(backend)" != none ] || { echo "run-local: backend not up after 600s; see $state/" >&2 && exit 1; }
-elif [ ${#rust[@]} = 1 ] && [ "$(scylla)" = docker ]; then
-  echo "run-local: warning: backend is the scylla-server image but $(basename "${rust[0]}") changes scylla-server/;" \
-    "stop it (./argos.sh client-dev down) and re-run to test that branch's backend" >&2
-fi
-echo "backend=$(backend) scylla=$(scylla)"
-
-status=0
-for wt in "${wts[@]}"; do bash "$here/serve.sh" "$wt" || status=1; done
-exit $status
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/run-local/scripts/serve.sh b/software/application-software/argos/workspaces/experimental/.claude/skills/run-local/scripts/serve.sh
deleted file mode 100755
index d8de89c..0000000
--- a/software/application-software/argos/workspaces/experimental/.claude/skills/run-local/scripts/serve.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/env bash
-# serve.sh <argos-worktree>: serve that worktree's Angular client with `ng serve` on the first free
-# port in 4200-4210, in the background, and print `<branch> client=<url> pid=<pid> log=<file>` once
-# it has compiled. Re-running for a worktree that is still being served prints its existing client.
-# Runs `npm ci` first if node_modules lacks ng (missing or half-installed). Exits 1, with the log's
-# tail, if the build fails, or with what holds each port if none is free.
-set -euo pipefail
-wt=$(cd "${1:?usage: serve.sh <argos-worktree>}" && pwd)
-branch=$(git -C "$wt" rev-parse --abbrev-ref HEAD)
-state=${TMPDIR:-/tmp}; state=${state%/}/argos-run-local
-mkdir -p "$state"
-key=$state/$(printf %s "$wt" | tr -c 'A-Za-z0-9' _)
-log=$key.log
-up() { (exec 3<>"/dev/tcp/127.0.0.1/$1") 2>/dev/null || (exec 3<>"/dev/tcp/::1/$1") 2>/dev/null; } # ng serve binds ::1
-
-if [ -f "$key.pid" ] && kill -0 "$(cat "$key.pid")" 2>/dev/null && up "$(cat "$key.port")"; then
-  echo "$branch client=http://localhost:$(cat "$key.port") pid=$(cat "$key.pid") log=$log (already running)"
-  exit 0
-fi
-
-# Claim the port under a lock, or parallel calls all pick the same one while ng serve starts. A port is
-# taken once a client listens on it or a live serve.sh has claimed it. mkdir is the lock (no flock on
-# macOS); it is held only for the claim, so nothing started below can keep it.
-lock=$state/port.lock
-n=0; until mkdir "$lock" 2>/dev/null; do n=$((n + 1)); [ $n -lt 100 ] || rm -rf "$lock"; sleep 0.1; done # stale after 10s
-trap 'rmdir "$lock" 2>/dev/null || true' EXIT
-claimed() { for f in "$state"/*.port; do [ -f "$f" ] && [ "$(cat "$f")" = "$1" ] && kill -0 "$(cat "${f%.port}.pid")" 2>/dev/null && return; done; return 1; }
-port=
-for p in $(seq 4200 4210); do up "$p" || claimed "$p" || { port=$p && break; }; done
-# Name what holds each port, so a stale client from another checkout can be stopped (lsof, where there is one).
-holders() {
-  for p in $(seq 4200 4210); do
-    pid=$(lsof -nP -iTCP:"$p" -sTCP:LISTEN -t 2>/dev/null | head -1) || true
-    if [ -n "$pid" ]; then echo "  $p pid=$pid $(lsof -a -p "$pid" -d cwd -Fn 2>/dev/null | sed -n 's/^n//p')"; fi
-  done
-}
-[ -n "$port" ] || { echo "serve: no free port in 4200-4210, held by:" >&2 && holders >&2 && exit 1; }
-echo $$ >"$key.pid" && echo "$port" >"$key.port" # claimed by this script until ng serve's pid replaces it
-rmdir "$lock" && trap - EXIT
-
-cd "$wt/angular-client"
-[ -x node_modules/.bin/ng ] || npm ci --no-audit --no-fund >"$log" 2>&1 ||
-  { echo "serve: npm ci failed in $wt/angular-client:" >&2 && tail -20 "$log" >&2 && exit 1; }
-nohup npx ng serve --port "$port" >"$log" 2>&1 &
-pid=$!
-echo "$pid" >"$key.pid" && echo "$port" >"$key.port"
-
-for _ in $(seq 180); do
-  kill -0 "$pid" 2>/dev/null || { echo "serve: ng serve exited for $branch:" >&2 && tail -20 "$log" >&2 && exit 1; }
-  if grep -q 'bundle generation failed\|\[ERROR\]' "$log"; then
-    echo "serve: $branch failed to compile (still serving on $port, pid $pid):" >&2 && tail -30 "$log" >&2 && exit 1
-  fi
-  if up "$port" && grep -q 'bundle generation complete\|Compiled successfully' "$log"; then
-    echo "$branch client=http://localhost:$port pid=$pid log=$log"
-    exit 0
-  fi
-  sleep 1
-done
-echo "serve: $branch not up after 180s (pid $pid); see $log" >&2 && exit 1
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/setup-workspace/SKILL.md b/software/application-software/argos/workspaces/experimental/.claude/skills/setup-workspace/SKILL.md
deleted file mode 100644
index fdc1ce8..0000000
--- a/software/application-software/argos/workspaces/experimental/.claude/skills/setup-workspace/SKILL.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-name: setup-workspace
-description: Change what this workspace checks out and re-run its setup. workspace.yml lists code repos (repos:), read-only dependency sources (references-git:), and clones of other Delphi workspaces or main to read (workspaces:). Use when the user wants to read or compare another workspace's or main's instructions, skills, or docs (link it), add or remove a repo or dependency reference, or run setup after cloning or pulling.
----
-
-`workspace.yml` at the workspace root lists what `.delphi/setup.sh` checks out, all git-ignored: code repos (`repos:`), dependency sources (`references-git:`), and other Delphi workspaces or main (`workspaces:`, entries `- <name>` or `- main`; a workspace's name is the short names of its folders (each folder's `short-name` file, else its name) and its own folder name, joined by dots, like `s.app.argos.argos-dev`; `bash .delphi/switch.sh --list` lists them). The comment on each section gives its entry format and where it lands; read it, then edit the file.
-
-Run from the workspace root after any change, and to refresh references and workspace copies to their latest:
-
-```
-bash .delphi/setup.sh
-```
-
-- The clones under `workspaces/` are full clones, each on its branch (`ws/<name>` or `main`) tracking origin, for reading: don't edit, branch, or push them from this workspace. Each setup run switches a clone back to its branch if it was switched away (refused while it has uncommitted changes), pulls it, and runs its own setup, so that workspace's repos and references are under it too (it skips its own `workspaces:`, so they don't chain). To change one of those workspaces or main, work in its own clone or switch to it (`switch-workspace` skill).
-- This workspace's project folder (shared context, `AUTHORING.md`, `workspace-defaults/`) is the folder above `workspaces/<leaf>/` in `workspaces/main/` (`bash .delphi/switch.sh --list` prints it): for `s.app.argos.argos-dev`, `workspaces/main/software/application-software/argos/`. List workspaces and their project folders: `bash .delphi/switch.sh --list`.
-- `workspace.yml` is shared: change it on a branch and open a PR into `ws/<this-name>` (the `name:` in `workspace.yml`). For a one-off look, add the entry, run setup, then `git restore workspace.yml`.
-- Setup never deletes what you'd lose. A removed entry's `workspaces/<name>/`, `references/<name>/`, or repo store and worktrees stay until you delete them (ask first).
-- When Delphi releases a version that needs cleanup in clones, setup runs its migration first (`.delphi/migrations/`), once per workspace. A migration removes only what nothing is lost from, and otherwise stops setup with what to do: tell the user, do it with their go-ahead, and re-run.
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/switch-workspace/SKILL.md b/software/application-software/argos/workspaces/experimental/.claude/skills/switch-workspace/SKILL.md
deleted file mode 100644
index e0a8b42..0000000
--- a/software/application-software/argos/workspaces/experimental/.claude/skills/switch-workspace/SKILL.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: switch-workspace
-description: Switch this clone to another Delphi workspace, or to Delphi's main, to work in it. Use when the user wants to check out, switch to, open, or work in another workspace or project, or to change another workspace's or main's files.
----
-
-Run from the workspace root:
-
-```
-bash .delphi/switch.sh <name>        # ws/<name>: its dotted name, e.g. s.app.argos.argos-dev
-bash .delphi/switch.sh main          # Delphi's main: project folders, templates, CI
-```
-
-- The user can also switch from the `/ws-delphi` pane (the `delphi` plugin's mod), which shows them as cards (`bash .delphi/switch.sh --list`): press one, then Switch workspace; `/ws-delphi <name>` switches straight away, and `/ws-delphi --web` opens the same cards in a browser tab.
-- List workspaces and their project folders: `bash .delphi/switch.sh --list`.
-- It refuses while tracked files have changes: commit them on a branch (and PR them) first. Then it fetches, switches, fast-forwards, and runs the new workspace's `.delphi/setup.sh`.
-- The post-checkout hook parks this workspace's `repos/`, `worktrees/`, `references/` and `workspaces/` in `.delphi/parked/<name>/` (git-ignored; `<name>` as in its `workspace.yml`) and brings the other's back at the same paths, so worktrees and the work in them return as they were. Switch back the same way. Never run `git clean -X` or `git stash --all` at the workspace root: they take ignored files, parked work included.
-- Before switching, stop anything running from `worktrees/` (dev servers, Docker builds): its folder moves.
-- No restart needed: skills under `.claude/skills/` reload on their own, and the `delphi` mod sends the new workspace's `CLAUDE.md` with the next prompt. Without the mod installed, this session keeps the old `CLAUDE.md`: tell the user to restart Claude Code in the same folder before starting work in the new workspace.
-- To change the workspace you switched to: `git switch -c <branch>`, commit, push, and open a PR into `ws/<name>` (or `main`).
-- To only read another workspace or main without leaving this one, list it under `workspaces:` instead (`setup-workspace` skill).
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/ticket-conventions/SKILL.md b/software/application-software/argos/workspaces/experimental/.claude/skills/ticket-conventions/SKILL.md
deleted file mode 100644
index b516657..0000000
--- a/software/application-software/argos/workspaces/experimental/.claude/skills/ticket-conventions/SKILL.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-name: ticket-conventions
-description: Argos specifics for tickets (repo, area labels, vocabulary, diagrams). Load before drafting or filing an Argos issue, alongside create-ticket.
-user-invocable: false
----
-
-# Argos ticket conventions
-
-The shared rules are in the `create-ticket` skill; this adds only what is Argos's.
-
-- Repo: Northeastern-Electric-Racing/Argos (base branch `develop`).
-- Area labels: `frontend`, `backend`, `devops` (any combination).
-- Vocabulary: use the workspace glossary's terms (`docs/CONTEXT.md`), and check the code for current names, which may have moved past it (e.g. Zenoh key expressions, not MQTT topics).
-- Title example: "Add pagination to the run list".
-- Diagrams: Mermaid where it fits. Show the change across the parts it touches (car, Siren, scylla-server, angular-client), before and after.
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/update-pr/SKILL.md b/software/application-software/argos/workspaces/experimental/.claude/skills/update-pr/SKILL.md
deleted file mode 100644
index 069b517..0000000
--- a/software/application-software/argos/workspaces/experimental/.claude/skills/update-pr/SKILL.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-name: update-pr
-description: Update a branch's PR description to reflect the latest changes
----
-
-Load the project's `pr-conventions` skill, then rewrite the branch's PR body (`(cd worktrees/<repo>/<branch> && gh pr view)`) to match `git -C worktrees/<repo>/<branch> diff origin/<base>...HEAD`, following the PR body rules in the `open-pr` skill. Keep human-written text that's still accurate, `user-attachments` screenshots, and `Closes`/`Fixes` refs; new screenshots or videos follow open-pr's media step, attached with `gh pr edit --attach`. Write it to `/tmp/<branch>-pr-body.md`, apply it with `gh pr edit <branch> --body-file` from the worktree, and add any of the project's labels that are missing with `--add-label`.
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/SKILL.md b/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/SKILL.md
deleted file mode 100644
index ae99371..0000000
--- a/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/SKILL.md
+++ /dev/null
@@ -1,24 +0,0 @@
----
-name: verify-graph
-description: Playwright CLI verification of the graph page — modes, controls, topic selection, and data rendering. Use after any change to graph-page components, graph rendering, data flow, or mode switching logic.
-user-invocable: true
----
-
-Get the branch's client running with `run-local <branch>`; its URL is `BASE_URL`. The scripts need `playwright-cli` (`npm i -g @playwright/cli`, then `playwright-cli install-browser chromium`; cloud containers use their preinstalled Chromium). Then run the base checks:
-
-```
-bash scripts/check.sh <branch> "$BASE_URL"
-```
-
-It seeds a 50-hour run spanning two midnights (once, shared by parallel checks), opens a `playwright-cli` session named after the branch (`scripts/open.sh`: output to `pictures/<branch>/`, config to `.playwright-cli/<branch>/`), and runs `scripts/check.js`. That covers: page loads in real time, a topic from the tree draws live, the seeded run, historical Quick Select, back to real time, and no console errors beyond develop's NG0100. It prints `[x]`/`[ ]` per check and exits 1 on a failure. Each `look:` line names a screenshot and what it should show: open it and judge it, since only a picture shows whether a chart is right.
-
-Go further where the diff points, by hand in the same session (`P="playwright-cli -s=<branch>"`): controls the diff touches (Pause↔Play, Time Range↔Point Range, Tog Sidebar, Tog Mult Yaxis, Y Min/Max, Custom range, Clear Graph), zoom, pan and hover, several topics, or mode switching for console errors. Reproduce a failed check the same way before fixing it; `check.js` has its steps.
-
-- Act: `$P click "button:has-text('Pause')"`, `role=combobox[name='Quick Select']`, `role=option[name='5 minutes']`, or a ref from `$P snapshot`.
-- Assert: `$P find "<text>"`, `$P snapshot`, `$P console error`; longer Playwright code with `$P run-code "async (page) => {…}"`, or `--filename` for a file kept in `.playwright-cli/<branch>/`.
-- The seeded run: click Select Run, then `bash scripts/select-run.sh <branch> $(bash scripts/seed.sh)`.
-- Screenshots: `$P screenshot --filename=pictures/<branch>/verify-graph/NN-<name>.png` (gitignored).
-
-When the diff touches rendering or the live data path, measure it too: `bash scripts/perf.sh <branch> "$BASE_URL" [<topic>,…]` prints retained JS heap, allocation rate, frame rate and long tasks (`scripts/perf.js`), then the browser's GPU-process memory, where a WebGL chart's buffers show up. The numbers drift with machine load, so run the branch and its base side by side, twice, at the same topics. Calypso sends about one point a second per topic and has no rate setting, so the chart's own data is small next to the app's: a JS-heap gap of a few MB is noise, and more topics widen real ones.
-
-When a hand check keeps coming back, add it to `check.js`. Report `check.sh`'s lines plus one line per hand check, and the screenshot folder. `$P close` at the end.
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/check.js b/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/check.js
deleted file mode 100644
index 3fcb734..0000000
--- a/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/check.js
+++ /dev/null
@@ -1,83 +0,0 @@
-// The base verify-graph checks, for check.sh to run with `playwright-cli run-code` (it fills in __URL__,
-// __RUN__ and __OUT__). Each check asserts what the DOM can show; what only a picture can show (a series
-// drawn, the x-axis span) is a screenshot with a `look:` line for the agent to judge.
-async (page) => {
-  const URL = '__URL__', RUN = __RUN__, OUT = '__OUT__';
-  const lines = [], errors = [];
-  page.on('console', (m) => {
-    if (m.type() === 'error' && !m.text().includes('NG0100')) errors.push(m.text().split('\n')[0].slice(0, 160));
-  }); // develop already logs NG0100 (ExpressionChangedAfterItHasBeenChecked)
-  const text = (t) => page.getByText(t, { exact: true });
-  const button = (name) => page.getByRole('button', { name, exact: true });
-  const tree = page.getByRole('tree');
-  const absent = async (name) => { if (await button(name).isVisible()) throw new Error(`"${name}" is shown`); };
-  const shot = async (name, look) => {
-    await page.screenshot({ path: `${OUT}/${name}.png` });
-    lines.push(`    look: ${OUT}/${name}.png: ${look}`);
-  };
-  const check = async (name, steps) => {
-    const at = lines.length;
-    try {
-      await steps();
-      lines.splice(at, 0, `[x] ${name}`);
-    } catch (e) {
-      lines.push(`[ ] ${name}: ${String(e.message).split('\n')[0]}`);
-    }
-  };
-
-  await check('1 page loads in real time', async () => {
-    await page.goto(`${URL}/graph`);
-    await text('Real Time').waitFor({ timeout: 30000 });
-    for (const b of ['Pause', 'Time Range', 'Select Run', 'Clear Graph', 'Custom']) await button(b).waitFor({ timeout: 2000 });
-    await page.getByRole('combobox', { name: 'Quick Select' }).waitFor({ timeout: 2000 });
-    await absent('Realtime');
-  });
-  await check('2 topic from the tree draws live', async () => {
-    const node = (name) => tree.getByRole('treeitem').filter({ has: page.getByText(name, { exact: true }) }).last(); // innermost
-    for (const name of ['BMS', 'Segment_Total_Volt']) await node(name).locator('.p-tree-node-toggle-button').first().click();
-    await tree.getByText('0', { exact: true }).first().click();
-    await page.waitForURL(/topics=BMS%2FSegment_Total_Volt%2F0/, { timeout: 5000 });
-    await page.waitForTimeout(3000);
-    await shot('02-live-topic', 'a live series is drawn');
-  });
-  await check(`3 seeded run #${RUN}`, async () => {
-    await button('Select Run').click();
-    await page.locator('.run-card').first().waitFor({ timeout: 10000 });
-    await page.evaluate((id) => {
-      const card = [...document.querySelectorAll('.run-card')]
-        .find((c) => [...c.querySelectorAll('*')].some((e) => !e.childElementCount && e.textContent.trim() === 'Run #' + id));
-      const pick = card?.parentElement?.querySelector('.run-select-button button');
-      if (!pick) throw new Error(`no Run #${id} in the Select Run dialog`);
-      pick.dispatchEvent(new MouseEvent('click', { bubbles: true, cancelable: true })); // under a PrimeNG overlay
-    }, RUN);
-    await page.locator('.run-card').first().waitFor({ state: 'detached', timeout: 5000 });
-    await text(`Run #${RUN}`).waitFor({ timeout: 10000 });
-    await button('Realtime').waitFor({ timeout: 2000 });
-    await absent('Pause');
-    await page.waitForTimeout(3000);
-    await shot('03-seeded-run', 'x-axis spans 50 hours, with a dated day-boundary line at each of the two midnights');
-  });
-  await check('4 historical Quick Select', async () => {
-    await button('Realtime').click();
-    await text('Real Time').waitFor({ timeout: 5000 });
-    await page.getByRole('combobox', { name: 'Quick Select' }).click();
-    await page.getByRole('option').first().waitFor({ timeout: 5000 });
-    const options = await page.getByRole('option').count();
-    if (options !== 11) throw new Error(`${options} Quick Select options, not 11`);
-    await page.getByRole('option', { name: '5 minutes', exact: true }).click();
-    await text('Historical').waitFor({ timeout: 5000 });
-    await absent('Pause');
-    await page.waitForTimeout(3000);
-    await shot('04-historical-5-min', 'x-axis about 5 minutes, or since the data starts');
-  });
-  await check('5 back to real time', async () => {
-    await button('Realtime').click();
-    await text('Real Time').waitFor({ timeout: 5000 });
-    await page.waitForTimeout(10000);
-    await shot('05-real-time-after', 'x-axis about 30 seconds, not the whole session');
-  });
-  await check('6 no new console errors', async () => {
-    if (errors.length) throw new Error(`${errors.length}, first: ${errors[0]}`);
-  });
-  return lines.join('\n');
-}
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/check.sh b/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/check.sh
deleted file mode 100755
index c8710cd..0000000
--- a/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/check.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-# check.sh <branch> <base-url>: run the base verify-graph checks (check.js) in <branch>'s playwright-cli
-# session, opening it if needed, against the seeded multi-day run. Prints one `[x]`/`[ ]` line per check
-# and `look:` lines for screenshots in pictures/<branch>/verify-graph/; exits 1 if a check failed.
-set -euo pipefail
-here=$(cd "$(dirname "$0")" && pwd)
-branch=${1:?usage: check.sh <branch> <base-url>}; url=${2:?usage: check.sh <branch> <base-url>}; url=${url%/}
-run=$(bash "$here/seed.sh")
-out=${DELPHI_ROOT:?unset: start the session at the workspace root}/pictures/$branch/verify-graph
-playwright-cli list | grep -q "^- $branch:" || bash "$here/open.sh" "$branch" "$url/graph" >/dev/null
-code=$(sed -e "s|__URL__|$url|; s|__RUN__|$run|; s|__OUT__|$out|" "$here/check.js")
-result=$(playwright-cli -s="$branch" --raw run-code "$code" | node -e 'process.stdout.write(JSON.parse(require("fs").readFileSync(0, "utf8")))')
-echo "$result"
-! grep -q '^\[ \]' <<<"$result"
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/open.sh b/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/open.sh
deleted file mode 100755
index 5a1b49b..0000000
--- a/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/open.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-# open.sh <branch> <url>: open a playwright-cli session named <branch> on <url>, so parallel checks don't
-# share a browser. Its output (snapshots, console logs, unnamed screenshots) goes to pictures/<branch>/;
-# its config, and any throwaway Playwright code, to .playwright-cli/<branch>/. Both are gitignored. Uses
-# the preinstalled Chromium in cloud containers (/opt/pw-browsers); elsewhere, Playwright's own
-# (`playwright-cli install-browser`).
-set -euo pipefail
-branch=${1:?usage: open.sh <branch> <url>}; url=${2:?usage: open.sh <branch> <url>}
-root=${DELPHI_ROOT:?unset: start the session at the workspace root}
-out=$root/pictures/$branch scratch=$root/.playwright-cli/$branch
-mkdir -p "$out" "$scratch"
-launch=; [ -x /opt/pw-browsers/chromium ] && launch=',"launchOptions":{"executablePath":"/opt/pw-browsers/chromium","headless":true}'
-printf '{"browser":{"browserName":"chromium"%s},"outputDir":"%s"}\n' "$launch" "$out" >"$scratch/cli.config.json"
-playwright-cli -s="$branch" open --config="$scratch/cli.config.json" "$url"
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/perf.js b/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/perf.js
deleted file mode 100644
index 404ac25..0000000
--- a/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/perf.js
+++ /dev/null
@@ -1,38 +0,0 @@
-async (page) => {
-  // Live-mode cost of the graph page with __TOPICS__ selected: retained JS heap after a GC, how fast it allocates
-  // (heap growth between 100 ms samples, GC drops ignored), and frame rate. Compare branches at the same topics.
-  const topics = '__TOPICS__'.split(',');
-  await page.goto(`__URL__/graph?topics=${encodeURIComponent(topics.join(','))}`);
-  await page.getByText('Real Time').first().waitFor({ timeout: 30000 });
-  const cdp = await page.context().newCDPSession(page);
-  const heap = async (gc) => {
-    if (gc) await cdp.send('HeapProfiler.collectGarbage');
-    return (await cdp.send('Runtime.getHeapUsage')).usedSize / 1e6;
-  };
-  await page.waitForTimeout(20000); // fill the live window
-  let alloc = 0, prev = await heap(false);
-  const t0 = Date.now();
-  while (Date.now() - t0 < 20000) {
-    await page.waitForTimeout(100);
-    const h = await heap(false);
-    if (h > prev) alloc += h - prev;
-    prev = h;
-  }
-  const allocMBps = alloc / ((Date.now() - t0) / 1000);
-  const frames = await page.evaluate(() => new Promise((done) => {
-    let n = 0, worst = 0, longTasks = 0, last = performance.now();
-    const end = last + 10000;
-    new PerformanceObserver((l) => (longTasks += l.getEntries().length)).observe({ type: 'longtask' });
-    const tick = (t) => {
-      worst = Math.max(worst, t - last);
-      last = t;
-      n++;
-      if (t < end) requestAnimationFrame(tick);
-      else done({ fps: n / 10, worstFrameMs: Math.round(worst), longTasks });
-    };
-    requestAnimationFrame(tick);
-  }));
-  const retainedMB = await heap(true);
-  return `retained JS heap ${retainedMB.toFixed(1)} MB, allocating ${allocMBps.toFixed(1)} MB/s, ` +
-    `${frames.fps} fps, worst frame ${frames.worstFrameMs} ms, ${frames.longTasks} long tasks`;
-}
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/perf.sh b/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/perf.sh
deleted file mode 100755
index 2218f42..0000000
--- a/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/perf.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-# perf.sh <branch> <base-url> [<topic>,…]: measure the graph page live in <branch>'s playwright-cli session
-# (perf.js: JS heap, allocation rate, frames; about a minute), then its browser's GPU-process memory, where
-# a WebGL chart's buffers show up. Default topics: four BMS ones. Numbers are relative: compare branches.
-set -euo pipefail
-here=$(cd "$(dirname "$0")" && pwd)
-branch=${1:?usage: perf.sh <branch> <base-url> [<topic>,…]}; url=${2:?usage: perf.sh <branch> <base-url> [<topic>,…]}; url=${url%/}
-topics=${3:-BMS/Segment_Total_Volt/0,BMS/PerCell/Alpha/3/Volts/5,BMS/PerCell/Alpha/3/Volts/4,BMS/PerCell/Alpha/4/Therms/0}
-playwright-cli list | grep -q "^- $branch:" || bash "$here/open.sh" "$branch" "$url/graph" >/dev/null
-code=$(sed -e "s|__URL__|$url|; s|__TOPICS__|$topics|g" "$here/perf.js")
-playwright-cli -s="$branch" --raw run-code "$code" | node -e 'process.stdout.write(JSON.parse(require("fs").readFileSync(0, "utf8")) + "\n")'
-# The session's daemon runs its browser; the browser's --type=gpu-process child holds GPU memory.
-ps -axo pid=,ppid=,rss=,command= | awk -v s=" $branch " '
-  { pid[NR] = $1; ppid[NR] = $2; rss[NR] = $3; cmd[NR] = $0 }
-  index($0, "cliDaemon") && index($0 " ", s) { daemon[$1] = 1 }
-  END {
-    for (i = 1; i <= NR; i++) if (daemon[ppid[i]]) browser[pid[i]] = 1
-    for (i = 1; i <= NR; i++) if (browser[ppid[i]] && index(cmd[i], "--type=gpu-process")) printf "GPU process %d MB\n", rss[i] / 1024
-  }'
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/seed.sh b/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/seed.sh
deleted file mode 100755
index fdb2631..0000000
--- a/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/seed.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-# seed.sh: make sure the local database holds verify-graph's multi-day run, and print its id. The run is
-# 50 hours of BMS/Segment_Total_Volt/0, one point every 30s, from noon UTC four days ago, so it crosses
-# two midnights in any time zone and stays out of the 24-hour Quick Select window. Parallel checks share
-# one run: it is made once, under a lock, and found by its notes after that.
-set -euo pipefail
-db=$(docker ps --filter name=odyssey-db --format '{{.Names}}' | head -1)
-[ -n "$db" ] || { echo "seed: no odyssey-db container; start the backend with run-local first" >&2 && exit 1; }
-sql() { docker exec -i "$db" psql -U postgres -v ON_ERROR_STOP=1 -qAt "$@"; }
-tag='verify-graph multi-day seed'
-state=${TMPDIR:-/tmp}; state=${state%/}/argos-run-local; mkdir -p "$state"
-lock=$state/seed.lock
-n=0; until mkdir "$lock" 2>/dev/null; do n=$((n + 1)); [ $n -lt 600 ] || rm -rf "$lock"; sleep 0.1; done # stale after 60s
-trap 'rmdir "$lock" 2>/dev/null || true' EXIT
-id=$(sql -c "select \"runId\" from run where notes = '$tag' limit 1")
-[ -n "$id" ] || id=$(sql <<SQL
-insert into data_type (name, unit) values ('BMS/Segment_Total_Volt/0', 'V') on conflict do nothing;
-with r as (
-  insert into run ("driverName", "locationName", notes, time)
-  values ('verify-graph', 'seed', '$tag', date_trunc('day', now()) - interval '84 hours')
-  returning "runId", time
-), d as (
-  insert into data (values, time, "dataTypeName", "runId")
-  select array[400 + 20 * sin(s / 3600.0)]::real[], (extract(epoch from r.time) * 1e6)::bigint + s * 1000000::bigint,
-    'BMS/Segment_Total_Volt/0', r."runId"
-  from r, generate_series(0, 50 * 3600, 30) s
-)
-select "runId" from r;
-SQL
-)
-echo "$id"
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/select-run.sh b/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/select-run.sh
deleted file mode 100755
index d1237c4..0000000
--- a/software/application-software/argos/workspaces/experimental/.claude/skills/verify-graph/scripts/select-run.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-# select-run.sh <branch> <run-id>: with the Select Run dialog open in <branch>'s session, pick run
-# <run-id>. The carousel autoplays and its "Select this Run" button sits under a PrimeNG overlay, so this
-# finds the run's card by id and clicks its button with a synthetic event instead of `playwright-cli click`.
-set -euo pipefail
-branch=${1:?usage: select-run.sh <branch> <run-id>}; id=${2:?usage: select-run.sh <branch> <run-id>}
-case $id in '' | *[!0-9]*) echo "select-run: run id must be a number, got '$id'" >&2 && exit 1 ;; esac
-playwright-cli -s="$branch" run-code "async (page) => {
-  await page.waitForSelector('.run-card');
-  const found = await page.evaluate((id) => {
-    const card = [...document.querySelectorAll('.run-card')]
-      .find((c) => [...c.querySelectorAll('*')].some((e) => !e.childElementCount && e.textContent.trim() === 'Run #' + id));
-    const button = card?.parentElement?.querySelector('.run-select-button button');
-    button?.dispatchEvent(new MouseEvent('click', { bubbles: true, cancelable: true }));
-    return !!button;
-  }, $id);
-  if (!found) throw new Error('select-run: no Run #$id in the Select Run dialog');
-}"
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/verify-telemetry/SKILL.md b/software/application-software/argos/workspaces/experimental/.claude/skills/verify-telemetry/SKILL.md
deleted file mode 100644
index 006fff6..0000000
--- a/software/application-software/argos/workspaces/experimental/.claude/skills/verify-telemetry/SKILL.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-name: verify-telemetry
-description: Verification checklist for changes to MQTT-displayed telemetry values in the Angular frontend. Use whenever modifying, adding, or debugging a value that flows from the car through MQTT to the UI — including display formatting, new subscriptions, missing data, or incorrect readings.
----
-
-Work from the workspace root against the ticket's worktree, `worktrees/argos/<branch>/` (via `new-worktree`). Stop and fix at the first failing step.
-
-1. **Trace the subscription** in that worktree, from the component: its property is updated by a `this.storage.get(topics.someTopicFn())` subscription, the function in `angular-client/src/utils/topic.utils.ts` returns the right topic, and the value is parsed right for its type (`parseInt` vs `parseFloat`). A missing subscription is the bug.
-2. **Check the topic end to end:**
-
-   ```bash
-   bash scripts/check-topic.sh <TOPIC>
-   ```
-
-   It prints the CAN definition (unit, value points; exit 1 if the topic isn't defined), refreshes the Calypso image (if it changed, restart with `(cd worktrees/argos/<branch> && ./argos.sh client-dev down)` then `run-local <branch>`), and shows the topic's last scylla-server log lines. Confirm the unit and value index match the UI; no log lines means it isn't being published.
-3. **See it live:** bring the app up with `run-local <branch>`, open the page with Playwright, wait for data, and screenshot to `pictures/<branch>/<name>.png`. Check value, formatting, and layout.
diff --git a/software/application-software/argos/workspaces/experimental/.claude/skills/verify-telemetry/scripts/check-topic.sh b/software/application-software/argos/workspaces/experimental/.claude/skills/verify-telemetry/scripts/check-topic.sh
deleted file mode 100755
index c9a9c0a..0000000
--- a/software/application-software/argos/workspaces/experimental/.claude/skills/verify-telemetry/scripts/check-topic.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-# check-topic.sh <topic>: check one MQTT topic end to end for verify-telemetry. Prints
-# its CAN definition (file, message id, unit, value points) from worktrees/odyssey-definitions/main,
-# whether the Calypso simulator image is current and running,
-# and the topic's last scylla-server log lines. Exits 1 if the topic isn't defined. Needs jq; the
-# docker checks are skipped without docker.
-set -euo pipefail
-usage="usage: check-topic.sh <topic>"
-topic=${1:?$usage}
-# shellcheck source=/dev/null
-. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
-defs=$DELPHI_WORKTREES/odyssey-definitions/main/can-messages
-[ -d "$defs" ] || { echo "no CAN definitions at $defs; add odyssey-definitions under repos: and run .delphi/setup.sh" >&2; exit 2; }
-
-echo "== CAN definition"
-jq -ce --arg t "$topic" 'input_filename as $f | .[] | . as $m | .fields[]? | select(.name == $t) |
-  {file: ($f | split("/")[-1]), id: $m.id, desc: $m.desc, unit, points: [.values[] | $m.points[. - 1].name]}' \
-  "$defs"/*.json || { echo "not found: $topic"; exit 1; }
-
-command -v docker >/dev/null || { echo "== docker not installed; skipping Calypso and logs"; exit 0; }
-echo "== Calypso"
-if docker pull -q ghcr.io/northeastern-electric-racing/calypso:Develop >/dev/null 2>&1; then
-  echo "image pulled (restart the stack if it changed)"; else echo "pull failed"; fi
-docker ps --filter name=calypso --format '{{.Names}} {{.Status}}' 2>/dev/null | grep . || echo "calypso not running"
-echo "== scylla-server log"
-c=$(docker ps --filter name=scylla-server --format '{{.Names}}' 2>/dev/null | head -1) # compose names it <project>-scylla-server-1
-if [ -z "$c" ]; then echo "scylla-server not running in docker (local cargo run? check its log)"
-else docker logs "$c" 2>&1 | grep -F "$topic" | tail -5 | grep . || echo "no log lines for $topic (not published?)"; fi
diff --git a/software/application-software/argos/workspaces/experimental/workspace.generated b/software/application-software/argos/workspaces/experimental/workspace.generated
deleted file mode 100644
index 21804a8..0000000
--- a/software/application-software/argos/workspaces/experimental/workspace.generated
+++ /dev/null
@@ -1,34 +0,0 @@
-# Generated by ci/render.sh; edit shared sources or opt out in workspace.yml.
-100644 61c35f28dda167e42bebc3bad3994af97c53e876	.claude/settings.json	ci/plugins.sh
-100644 30083fa3b2cf735ac5a75808478dd00476e75e9c	.claude/skills/address-pr-comments/SKILL.md	software/application-software/workspace-inherit/.claude/skills/address-pr-comments/SKILL.md
-100755 ce1efd97da4a6d2ea655932486660c5008f44dae	.claude/skills/address-pr-comments/scripts/fetch-feedback.sh	software/application-software/workspace-inherit/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh
-100644 da0be202ebc0a9ffc4544dbdf4bbef54cca37520	.claude/skills/address-pr-comments/scripts/github.sh	software/application-software/workspace-inherit/.claude/skills/address-pr-comments/scripts/github.sh
-100644 4b5675711abfaef10089859f379a931206267355	.claude/skills/commit/SKILL.md	software/application-software/workspace-inherit/.claude/skills/commit/SKILL.md
-100644 4f85b66ab5c07ce4a00ba3d8555fc9272544046b	.claude/skills/consolidate-spikes/SKILL.md	software/application-software/workspace-inherit/.claude/skills/consolidate-spikes/SKILL.md
-100644 210a059f1a4b753cab90aad19f26ead483a62295	.claude/skills/create-ticket/SKILL.md	software/application-software/workspace-inherit/.claude/skills/create-ticket/SKILL.md
-100644 f24d293b38a4d03b610a5a104fa97b614856d7c3	.claude/skills/implement/SKILL.md	software/application-software/argos/workspace-inherit/.claude/skills/implement/SKILL.md
-100644 4917259f9e29db28e2636496e80f80ee5d9e321e	.claude/skills/journal/SKILL.md	software/workspace-inherit/.claude/skills/journal/SKILL.md
-100755 1e90d7b9afa14b8b0e7f36e0e1d83baecc94ba5b	.claude/skills/journal/scripts/capture.sh	software/workspace-inherit/.claude/skills/journal/scripts/capture.sh
-100644 0495fc97cbe93e4331c89263aee188f6c0e9c9ea	.claude/skills/new-worktree/SKILL.md	software/workspace-inherit/.claude/skills/new-worktree/SKILL.md
-100644 b1e7c71c13b4ea7c40cabeb12aa1674a6b543dc5	.claude/skills/open-pr/SKILL.md	software/application-software/workspace-inherit/.claude/skills/open-pr/SKILL.md
-100755 61f377fef63daa10c443129df6a49571fdbeb658	.claude/skills/open-pr/scripts/pr-checks.sh	software/application-software/workspace-inherit/.claude/skills/open-pr/scripts/pr-checks.sh
-100644 90cc6571064f750bd5d816f44cf3064fa2df8f7e	.claude/skills/pr-conventions/SKILL.md	software/application-software/argos/workspace-inherit/.claude/skills/pr-conventions/SKILL.md
-100644 2ed67ecda73634b78468cab0ccb52c86f128e064	.claude/skills/pr-conventions/scripts/lint.sh	software/application-software/argos/workspace-inherit/.claude/skills/pr-conventions/scripts/lint.sh
-100644 e67387116a753217d256d81901e5b4091b49b44c	.claude/skills/report-spike/SKILL.md	software/application-software/workspace-inherit/.claude/skills/report-spike/SKILL.md
-100644 7acb908af141defaa035f992b060d4d23c0b2a54	.claude/skills/run-local/SKILL.md	software/application-software/argos/workspace-inherit/.claude/skills/run-local/SKILL.md
-100755 f5986571d9b917264eb6cfe9c9d7f27448242ac9	.claude/skills/run-local/scripts/run-local.sh	software/application-software/argos/workspace-inherit/.claude/skills/run-local/scripts/run-local.sh
-100755 d8de89ce933cbc5302c59fab3176004bdd251d35	.claude/skills/run-local/scripts/serve.sh	software/application-software/argos/workspace-inherit/.claude/skills/run-local/scripts/serve.sh
-100644 fdc1ce85211200223040edfb5dc65a3de7f35d53	.claude/skills/setup-workspace/SKILL.md	software/workspace-inherit/.claude/skills/setup-workspace/SKILL.md
-100644 e0a8b424d11c4897901c0ce888a6c0c726daed98	.claude/skills/switch-workspace/SKILL.md	software/workspace-inherit/.claude/skills/switch-workspace/SKILL.md
-100644 b516657698fb909e0c72f8c9a6187fdaf4a38f71	.claude/skills/ticket-conventions/SKILL.md	software/application-software/argos/workspace-inherit/.claude/skills/ticket-conventions/SKILL.md
-100644 069b51714c0fd4d3d6ad972dd9f840e01f21cf15	.claude/skills/update-pr/SKILL.md	software/application-software/workspace-inherit/.claude/skills/update-pr/SKILL.md
-100644 ae99371d623deb83d2ac5b1227eb12eaff662092	.claude/skills/verify-graph/SKILL.md	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/SKILL.md
-100644 3fcb7344ce3499a7afbba08b8c2b6deacd3f101b	.claude/skills/verify-graph/scripts/check.js	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/check.js
-100755 c8710cdf2cea12ddae0a92c3e0ba141e06a234f3	.claude/skills/verify-graph/scripts/check.sh	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/check.sh
-100755 5a1b49bc55582ec03f5e0a58c015d1b28fd21af3	.claude/skills/verify-graph/scripts/open.sh	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/open.sh
-100644 404ac250d03f0c228b8206efef46bed6149bd314	.claude/skills/verify-graph/scripts/perf.js	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/perf.js
-100755 2218f42b8f020b7d83e9d960828800444e1260ad	.claude/skills/verify-graph/scripts/perf.sh	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/perf.sh
-100755 fdb2631a755b9999c2aa83c67729fbeb13d387a8	.claude/skills/verify-graph/scripts/seed.sh	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/seed.sh
-100755 d1237c42098d2a437770c24e2f60b7110d1e90b2	.claude/skills/verify-graph/scripts/select-run.sh	software/application-software/argos/workspace-inherit/.claude/skills/verify-graph/scripts/select-run.sh
-100644 006fff61ee4658a959c921e5fd70ecc57e2b07f2	.claude/skills/verify-telemetry/SKILL.md	software/application-software/argos/workspace-inherit/.claude/skills/verify-telemetry/SKILL.md
-100755 c9a9c0a7dd4386508e1f90d595d59b50df0aad35	.claude/skills/verify-telemetry/scripts/check-topic.sh	software/application-software/argos/workspace-inherit/.claude/skills/verify-telemetry/scripts/check-topic.sh
diff --git a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/address-pr-comments/SKILL.md b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/address-pr-comments/SKILL.md
deleted file mode 100644
index 30083fa..0000000
--- a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/address-pr-comments/SKILL.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: address-pr-comments
-description: Fetch review comments on a PR (Argos, Nero), judge whether each (including outdated ones) still applies, and walk through fixes in the PR's worktree
-allowed-tools: Bash(git:*), Bash(gh issue list:*), Bash(bash ${CLAUDE_SKILL_DIR}/scripts/fetch-feedback.sh *)
-user-invocable: true
----
-
-Propose and apply fixes for a PR's unresolved review feedback. **Never reply to threads**; the user does.
-
-1. **Fetch** from the workspace root: `bash scripts/fetch-feedback.sh <repo> <pr>|<branch>` (`<repo>` as under `repos/`, e.g. `argos`; `--all` first for unfiltered history). It checks out the PR head's worktree and prints JSON: `worktree` (target it by path from the root from now on), unresolved `threads`, `comments`, `reviews`. Any non-zero exit: use the GitHub MCP server's `pull_request_read` instead.
-2. **Judge.** Skip bot noise and anything already fixed at HEAD. For an `outdated` thread, find its `diffHunk` code by content, then label it **addressed**, **applies**, **moved**, **obsolete**, or **unclear**.
-3. **Present** before editing, grouped by file, and ask to confirm, skip, or change each (offer to batch clear ones past 8):
-
-   ```
-   <file>:<line> — <reviewer> · <active|outdated> · <label>
-   "<excerpt>" → <proposed fix>
-   <optional ≤5-line snippet, for the user only>
-   ```
-4. **Apply** in that worktree, by path, with grouped `/commit`s. For a follow-up-ticket request, reuse a match from `gh issue list --search` before filing.
-5. **Report** what was fixed (file:line, commit SHA), what was already addressed or obsolete (why), and what is unclear.
diff --git a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh
deleted file mode 100755
index ce1efd9..0000000
--- a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env bash
-# fetch-feedback.sh [--all] <repo> <pr-number>|<branch>: print a PR's review
-# feedback as one JSON object after creating or reusing the PR head's worktree
-# (worktrees/<repo>/<head>). Default output keeps unresolved threads (first + latest message,
-# bots tagged), conversation comments, and reviews with text; --all keeps everything. Exits 3 on any
-# GitHub failure (see github.sh).
-# shellcheck source-path=SCRIPTDIR source=github.sh
-set -euo pipefail
-. "$(dirname "$0")/github.sh"
-all=false
-[ "${1:-}" = --all ] && all=true && shift
-usage="usage: fetch-feedback.sh [--all] <repo> <pr-number>|<branch>"
-repo=${1:?$usage} ref=${2:?$usage}
-# shellcheck source=/dev/null
-. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
-gh_init fetch-feedback "$DELPHI_WORKTREES/$repo/.bare"
-
-case "$ref" in *[!0-9]*) get "repos/$SLUG/pulls?state=all&head=${SLUG%%/*}:$ref" | jq '.[0] // error("no PR")' ;;
-  *) get "repos/$SLUG/pulls/$ref" ;; esac >"$TMP/pr"
-num=$(jq .number "$TMP/pr")
-wt=""
-[ "$(jq -r .head.repo.full_name "$TMP/pr")" != "$SLUG" ] || wt=$(bash "$DELPHI_ROOT/.delphi/new-worktree.sh" "$repo" "$(jq -r .head.ref "$TMP/pr")")
-
-if [ "$MODE" = gh ]; then # thread state is GraphQL-only; reshape it like the proxy's ccr/review_threads
-  # shellcheck disable=SC2016 # GraphQL variables
-  gh api graphql -F o="${SLUG%%/*}" -F n="${SLUG##*/}" -F p="$num" -f query='query($o: String!, $n: String!, $p: Int!) {
-    repository(owner: $o, name: $n) { pullRequest(number: $p) { reviewThreads(first: 100) { nodes {
-      isResolved isOutdated comments(first: 50) { nodes { databaseId } } } } } } }' \
-    --jq '[.data.repository.pullRequest.reviewThreads.nodes[] |
-      {resolved: .isResolved, outdated: .isOutdated, comment_ids: [.comments.nodes[].databaseId]}]'
-else get "repos/$SLUG/pulls/$num/ccr/review_threads"; fi >"$TMP/th"
-get "repos/$SLUG/pulls/$num/comments?per_page=100" >"$TMP/rc"
-get "repos/$SLUG/issues/$num/comments?per_page=100" >"$TMP/ic"
-get "repos/$SLUG/pulls/$num/reviews?per_page=100" >"$TMP/rv"
-
-jq -n --arg wt "$wt" --argjson all "$all" --slurpfile pr "$TMP/pr" --slurpfile th "$TMP/th" \
-  --slurpfile rc "$TMP/rc" --slurpfile ic "$TMP/ic" --slurpfile rv "$TMP/rv" '
-  def who: {author: .user.login, bot: (.user.type == "Bot")};
-  ($rc[0] | map({key: (.id | tostring), value: (who + {body, path, line: (.line // .original_line), diffHunk: .diff_hunk})}) | from_entries) as $byid |
-  {pr: ($pr[0] | {number, title, url: .html_url, head: .head.ref, base: .base.ref}), worktree: $wt,
-   threads: [$th[0][] | {resolved, outdated, comments: [.comment_ids[] | $byid[tostring]]}],
-   comments: [$ic[0][] | who + {body}], reviews: [$rv[0][] | who + {state, body: (.body // "")}]} |
-  if $all then . else
-    .threads |= map(select(.resolved | not) | .comments as $c | $c[-1] + {outdated, path: $c[0].path, line: $c[0].line,
-      diffHunk: (if .outdated then $c[0].diffHunk else null end), replies: ($c | length),
-      first: (if ($c | length) > 1 then $c[0].body else null end)}) |
-    .reviews |= map(select(.body != ""))
-  end'
diff --git a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/address-pr-comments/scripts/github.sh b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/address-pr-comments/scripts/github.sh
deleted file mode 100644
index da0be20..0000000
--- a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/address-pr-comments/scripts/github.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-# github.sh: sourced by skill scripts that call GitHub. gh_init <tool> <git-dir> picks a backend
-# (gh when logged in, else an explicitly enabled GitHub REST proxy via curl; jq is needed either
-# way), sets SLUG from that repo's origin, and makes any failure exit 3 so the calling skill falls
-# back to the available GitHub integration. TMP is a scratch dir removed on exit.
-# shellcheck shell=bash
-fail() { echo "$TOOL: $1; use the available GitHub integration" >&2; exit 3; }
-on_exit() { local rc=$?; rm -rf "$TMP"; [ "$rc" -eq 0 ] || fail "GitHub request failed ($MODE)"; }
-gh_init() {
-  TOOL=$1
-  if { command -v gh && gh auth status; } >/dev/null 2>&1; then MODE=gh
-  elif [ -n "${DELPHI_GITHUB_REST_PROXY:-${CLAUDE_CODE_REMOTE:-}}" ] && command -v curl >/dev/null; then MODE=rest
-  else fail "no authenticated gh or enabled REST proxy"; fi
-  command -v jq >/dev/null || fail "jq not installed"
-  SLUG=$(git -C "$2" remote get-url origin) && SLUG=${SLUG#*github.com[:/]} && SLUG=${SLUG%.git}
-  TMP=$(mktemp -d)
-  trap on_exit EXIT
-}
-get() { if [ "$MODE" = gh ]; then gh api "$1"; else curl -fsS "https://api.github.com/$1"; fi; }
-post() { if [ "$MODE" = gh ]; then gh api -X POST "$1" --input -; else curl -fsS -X POST --data-binary @- "https://api.github.com/$1"; fi; }
diff --git a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/commit/SKILL.md b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/commit/SKILL.md
deleted file mode 100644
index 4b56757..0000000
--- a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/commit/SKILL.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-name: commit
-description: Stage and commit using the project's commit message convention
----
-
-In the worktree you're working on, from the workspace root (`git -C worktrees/<repo>/<branch> …`), stage the relevant changes (not unrelated or generated files) and commit using the commit message format in CLAUDE.md. Keep the description imperative and 2–8 words.
diff --git a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/consolidate-spikes/SKILL.md b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/consolidate-spikes/SKILL.md
deleted file mode 100644
index 4f85b66..0000000
--- a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/consolidate-spikes/SKILL.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-name: consolidate-spikes
-description: Turn finished spikes into implementation tickets: an idea's spikes, once all are done, into dev work, under an epic when it comes from an idea or splits. Use when the user wants to wrap up, settle, or consolidate an idea or spike on an application-software repo (Argos, Nero).
----
-
-Drafts and files by the `create-ticket` rules; load it and the project's `ticket-conventions` first. Takes an idea or a standalone spike.
-
-1. **Gather** each spike's findings comment, draft PR, and the PR's reviews; from an idea, its sub-issues too.
-2. **Check it's done.** Every spike is done by `create-ticket`'s Spikes rules (the lead's latest review on its draft PR, from repos/<owner>/<repo>/pulls/<pr>/reviews, is an approval). From an idea, that's every spike under it, and every one of its areas to explore is covered by a spike area. Otherwise list what's missing, offer spikes for uncovered areas, and stop.
-3. **Choose:** per area (title prefix), propose the approach to build (one spike's, or a mix) with a one-line why, from the findings and the lead's review. The user confirms or changes each.
-4. **Plan** the dev work by `create-ticket`'s Dev work rules: one ticket unless the work is large enough to split into vertical slices, which may cross areas. Each ticket: What, the slice; Notes, links to the spikes and draft PRs it draws on, and the dropped approaches with why; context transfer, the findings' facts.
-5. **Draft** them, and, from an idea or when split, one epic (From: the idea or spike) with the dev work as its sub-issues. Show all, with which slices run in parallel if split; file what the user OKs.
-6. **Close**, each with a one-line comment: the spikes as completed ("Consolidated into #<epic or dev work>"), their draft PRs unless a dev work ticket builds on that branch, and the idea as completed ("Settled in #<epic or dev work>").
diff --git a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/create-ticket/SKILL.md b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/create-ticket/SKILL.md
deleted file mode 100644
index 210a059..0000000
--- a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/create-ticket/SKILL.md
+++ /dev/null
@@ -1,66 +0,0 @@
----
-name: create-ticket
-description: Draft and file a GitHub issue (idea, spike, epic, or dev work) on an application-software repo (Argos, Nero) from the repo's issue templates, or rewrite an existing issue into them. Use whenever the user wants to create, file, write up, or log a ticket, issue, idea, spike, epic, bug, or task, including an out-of-scope idea that comes up mid-work.
----
-
-# Create ticket
-
-These are the ticket conventions for every application-software repo. The repo's own `.github/ISSUE_TEMPLATE` holds only the fields (`gh api repos/<owner>/<repo>/contents/.github/ISSUE_TEMPLATE/<file> -q .content | base64 -d`); follow each field's description.
-
-First load the project's `ticket-conventions` skill (inherited from the project's `workspace-inherit/`) for its repo, area labels, vocabulary, and diagrams. If none is enabled, ask which repo.
-
-## Workflow
-
-idea → spikes → epic → dev work, or a standalone spike → dev work
-
-| Ticket | What it is | Issue type | Parent |
-|---|---|---|---|
-| Idea | What could be built and why. Its areas to explore are things to improve or problems to solve, each with approaches worth trying. | none | none |
-| Spike | One approach to try on one area of an idea (it needn't cover the whole area), or a small standalone improvement: what is tried and the hypothesis. Findings go in a comment and a draft PR (`report-spike`), not the ticket. | none | its idea, if any |
-| Epic | Work too large for one dev work ticket: the goal and whole-epic outcomes, not a walkthrough of each ticket. A new issue linking the idea or spike it came from in "From". | Feature | none |
-| Dev work | Any implementation work: testable requirements, Notes for gotchas and pointers to code. Large work is cut into vertical slices (see Dev work below). | Feature, Bug, or Task | its epic, if any |
-
-If unsure, a small, clear change is dev work, a small unknown is a spike, and a big unexplored thing is an idea. Ideas and spikes explore work, so they get no issue type; bug, feature, and task are issue types, never labels.
-
-## Writing
-
-How every ticket reads, on any project:
-
-- Short and plain. Write for someone new to the project: explain project-specific terms, and use the project's vocabulary (its `ticket-conventions` says where it lives; check the code for current names).
-- Outcomes, not implementation: say what changes and why, not how to build it. A rationale gives the reasoning, not a history of the problem.
-- No prescriptions on ideas and spikes. Ideas name open options to weigh, not a plan or a recommended pick; spikes state what to learn and leave the how to whoever picks it up.
-- Facts, not instructions: Notes and context transfer hold facts (where code lives, current behavior, constraints, links), not steps or a proposed solution. Context transfer (optional on spikes, epics, and dev work) starts with a short summary, then the raw context.
-- Unknowns stay open questions in Notes; don't guess.
-- Title: concise and imperative, no prefixes (except a spike's area).
-- Requirements: clear, broad checkboxes, each a testable outcome rather than an implementation step; 3-5, never more than 7. If it needs more, split the ticket.
-- Backticks: at most three inline uses per body; name files and identifiers in plain text. Diagram and context-transfer blocks don't count.
-- Size: keep ideas short; one small enough to just try is a spike.
-
-## Dev work
-
-- One ticket by default. Split only when the work is too large for one PR or parts could run in parallel.
-- When split, cut vertical slices: each goes end to end through every part it touches (e.g. backend through UI), not one layer, and works and is testable on its own. Cut for the most parallel work; mark a slice that must wait as blocked by the one it waits on (see File).
-
-## Spikes
-
-- One approach, not a set to choose between. If a spike reads "X or Y", it is two spikes.
-- Prefer an idea with a few spikes (often 2-4) under it; a spike can also stand alone, or with siblings, to explore an area. Several spikes can take on the same area in different ways.
-- Title it `<area>: <approach>`, with the area a short kebab-case name its siblings share (`graph-saving: Save a graph to a file and re-upload it`). An area may cover more than one of an idea's bullets. A lone small improvement needs no prefix.
-- Sibling spikes share the context transfer's summary and common facts; each adds only the facts particular to its approach.
-- An idea needn't get all its spikes at once: file an area's spikes when someone is ready to try them.
-- Done: its findings are posted, review feedback is addressed, and the lead's latest review on its draft PR is an approval (GitHub's Approve), including when the recommendation is to drop the approach. A done spike stays open until `consolidate-spikes` closes it.
-
-## Draft
-
-- Check the code first: the work may be done or already tracked.
-- One `### <field label>` per field in template order, following each field's description; omit empty optional fields.
-- Diagrams: required on epics, optional on dev work. The project's `ticket-conventions` says what they show.
-- Labels: the template's category (`idea`, `spike`, `epic`, `dev work`), one written-by (`by: human` if the user dictated it, `by: ai-assisted` if they gave the substance, `by: ai` if you wrote it, including rewrites), and at least one of the project's area labels.
-- Rewriting an old ticket: keep its intent and assignees; bring it up to these rules and update vocabulary, labels, issue type, and parent.
-- Folding one ticket into another: add it as a requirement on the target, then close it as not planned. Every close gets a one-line comment saying why.
-
-## File
-
-Check for open duplicates, then show the full draft (title, type if any, labels, parent, body) in the chat, not only in a file. File or edit only what the user OKs.
-
-Use the REST API (GraphQL may be blocked): POST repos/<owner>/<repo>/issues with title, body, labels, the issue type from the table, and the user as assignee (on a spike, whoever will run it; ask), then, if it has a parent, POST repos/<owner>/<repo>/issues/<parent>/sub_issues with the new issue's id. If it waits on another issue, POST repos/<owner>/<repo>/issues/<n>/dependencies/blocked_by with the blocking issue's id. Report the URL.
diff --git a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/journal/SKILL.md b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/journal/SKILL.md
deleted file mode 100644
index 4917259..0000000
--- a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/journal/SKILL.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-name: journal
-description: Park rough notes locally mid-task ("note to self", "remember to", "journal this"), and later export them to their permanent home (issue, spec, ADR, glossary, docs) through the skill that owns it. Use when the user wants to jot a thought without derailing, or to file parked notes.
----
-
-Notes live in `.journal/` at the workspace root (git-excluded, outside worktrees so they survive removal). An **entry** is one file, a **category** a subfolder. The journal never pushes, files, or contacts GitHub itself.
-
-**Capture** (no git, no other skills):
-
-```
-bash scripts/capture.sh [-c <category>] ["note text"]
-```
-
-Omit `-c` for a loose entry, omit the text for an empty one to edit. Report the path it prints.
-
-**Export** (only when asked):
-
-1. Read the entries and propose a grouping: one entry → one output, a category → one merged output, or one entry split across several. Let the user adjust.
-2. For each output, pick the workspace skill whose description fits its permanent home, preferring an existing docs area. A new section always needs approval.
-3. Show the destination and reshaped text and wait for approval. Nothing lands silently.
-4. Delegate to that skill; it owns formatting, conventions, and any GitHub contact.
-5. Ask whether to delete the exported entry (default: keep).
diff --git a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/journal/scripts/capture.sh b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/journal/scripts/capture.sh
deleted file mode 100755
index 1e90d7b..0000000
--- a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/journal/scripts/capture.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-# capture.sh [-c <category>] [note text]: write a timestamped journal entry to
-# .journal/[<category>/] at the workspace root (adding /.journal/ to .git/info/exclude once) and print
-# its path. An empty entry is created when no text is given. Never touches git history, GitHub, or
-# other skills.
-set -euo pipefail
-usage="usage: capture.sh [-c <category>] [note text]"
-# shellcheck source=/dev/null
-. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
-dir=$DELPHI_ROOT/.journal
-[ "${1:-}" = -c ] && dir=$dir/${2:?$usage} && shift 2
-exclude=$(git -C "$DELPHI_ROOT" rev-parse --path-format=absolute --git-path info/exclude 2>/dev/null || true)
-[ -z "$exclude" ] || grep -qxF /.journal/ "$exclude" 2>/dev/null || { mkdir -p "${exclude%/*}" && echo /.journal/ >>"$exclude"; }
-mkdir -p "$dir"
-file=$dir/$(date +%Y-%m-%d-%H%M%S).md
-{ echo "<!-- captured $(date -u +%Y-%m-%dT%H:%M:%SZ) -->"; [ $# -eq 0 ] || echo "$*"; } >"$file"
-echo "$file"
diff --git a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/new-worktree/SKILL.md b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/new-worktree/SKILL.md
deleted file mode 100644
index 0495fc9..0000000
--- a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/new-worktree/SKILL.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-name: new-worktree
-description: Create or reuse a worktree for a branch of a code repo (worktrees/<repo>/<branch>). Use before any branch work, such as starting a ticket or reviewing or fixing a PR branch, unless the user says not to use worktrees.
----
-
-Run from the workspace root:
-
-```
-bash .delphi/new-worktree.sh <repo> <branch> [<base>]
-```
-
-- An existing branch (local or on origin, e.g. a PR head) is checked out; anything else is created from `<base>` (default: the repo's default branch). Safe to re-run.
-- Stay at the workspace root and reach into the worktree by the printed path. Never switch branches in an existing worktree or work in its store, `worktrees/<repo>/.bare`.
-- For a subagent, make its worktree here first and hand it the path. Never use the harness's own worktree isolation: it checks out this Delphi clone from main, not the code repo, and fences the subagent out of `worktrees/`.
-- Keep `worktrees/<repo>/<default-branch>/` (made by setup) a clean reference: fetch and fast-forward only.
-- After the branch merges: `git -C worktrees/<repo>/.bare worktree remove ../<branch>`.
diff --git a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/open-pr/SKILL.md b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/open-pr/SKILL.md
deleted file mode 100644
index b1e7c71..0000000
--- a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/open-pr/SKILL.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-name: open-pr
-description: Run pre-PR checks, push the branch, and open a draft pull request on an application-software repo (Argos, Nero)
----
-
-First load the project's `pr-conventions` skill (inherited from the project's `workspace-inherit/`) for its base branch, commit format, checks, labels, and screenshots.
-
-1. **Check:** `bash scripts/pr-checks.sh <repo> <branch> origin/<base> '<commit format>'` (clean tree, commit subjects match the project's format, merges cleanly into the base), then the project's own checks. Stop and fix on any FAIL.
-2. **Media:** if the diff touches the UI, ask the user whether to add screenshots to the PR, listing any already in the project's screenshot folder for this branch so they can pick those instead of new ones; on no, skip this step. For new ones, use the project's UI QA to take Playwright screenshots of the changed views into its screenshot folder, or, when the change adds or changes an animation, record a short video instead (a browser context with `recordVideo: { dir }` saves a `.webm` when it closes). Images must be under 10 MB; video under 10 MB on a Free plan, 100 MB on a paid one.
-3. **Open:** push (`git -C worktrees/<repo>/<branch> push -u origin <branch>`), then run `(cd worktrees/<repo>/<branch> && gh pr create --draft --base <base> --head <branch> --title "<title>" --body-file /tmp/<branch>-pr-body.md --assignee @me)` with the project's labels (`--label`) and one `--attach <file>` per screenshot or video, and report the URL.
-4. **Spike:** the PR stays a draft; getting it merged isn't the goal. Once it's checked and working, run `report-spike`.
-
-## PR body
-
-Fill the worktree's `.github/pull_request_template.md` from the diff, following each section's comment, and write it to `/tmp/<branch>-pr-body.md`:
-
-- Title: concise and imperative, no ticket number.
-- The Changes section (not the whole body): about 50 words (1–3 sentences) on what landed and the key design choice. Describe the change, not the file list: don't enumerate components, classes or files the diff already shows. Name a specific one only when its behaviour changes in a way a reviewer must know.
-- Delete the template's comments and any optional or non-applicable sections, and check off the Checklist.
-- At most three backtick uses in the body.
-- End with `Closes #{ticket}` (the branch's leading number), or `Spike for #{ticket}` on a spike, which its PR never closes.
-- Screenshots and videos: reference each one by its path from the worktree, `![<what it shows>](<path>)`; `--attach` uploads it and rewrites the reference to its `user-attachments` URL. `--attach` needs gh v2.99.0+: if `gh pr create --help` doesn't list it, put `_screenshot pending_` instead and remind the user to drag-drop the files from the screenshot folder. Never commit screenshots or videos.
diff --git a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/open-pr/scripts/pr-checks.sh b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/open-pr/scripts/pr-checks.sh
deleted file mode 100755
index 61f377f..0000000
--- a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/open-pr/scripts/pr-checks.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-# pr-checks.sh <repo> <branch> [<base> [<format>]]: open-pr's shared pre-PR checks on
-# worktrees/<repo>/<branch>. Prints
-# one PASS/FAIL/SKIP line per check: clean tree, every commit subject since <base> (default
-# origin/develop, fetched first) matches <format> (an extended regex, default '^#[0-9]+ - '), and no
-# merge conflicts with <base>. Exits 1 if any check fails. The project's own checks (lint, format)
-# are in its pr-conventions skill.
-set -euo pipefail
-usage="usage: pr-checks.sh <repo> <branch> [<base> [<format>]]"
-repo=${1:?$usage} branch=${2:?$usage}
-# shellcheck source=/dev/null
-. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
-cd "$DELPHI_WORKTREES/$repo/$branch"
-base=${3:-origin/develop} format=${4:-'^#[0-9]+ - '} fail=0
-res() { echo "$1 $2"; [ "$1" != FAIL ] || fail=1; }
-git fetch -q origin "${base#origin/}" 2>/dev/null || true
-
-if [ -z "$(git status --porcelain)" ]; then res PASS "clean tree"; else res FAIL "uncommitted changes"; fi
-bad=$(git log --format=%s "$base..HEAD" | grep -Ev "$format" || true)
-if [ -z "$bad" ]; then res PASS "commit format"; else res FAIL "commit format: $(echo "$bad" | paste -sd'|' -)"; fi
-if git merge-tree --write-tree HEAD "$base" >/dev/null 2>&1; then res PASS "merges cleanly into $base"
-elif [ $? -eq 1 ]; then res FAIL "conflicts with $base"; else res SKIP "conflict check (needs git 2.38+)"; fi
-exit "$fail"
diff --git a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/pr-conventions/SKILL.md b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/pr-conventions/SKILL.md
deleted file mode 100644
index 9e2bb17..0000000
--- a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/pr-conventions/SKILL.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-name: pr-conventions
-description: Nero specifics for pull requests (base branch, commit format, checks, labels, screenshots, UI QA). Load before opening, updating, or reviewing a Nero PR, alongside open-pr, update-pr, and review.
-user-invocable: false
----
-
-# Nero PR conventions
-
-The shared rules are in the `open-pr` skill; this adds only what is Nero's.
-
-- Base branch: `develop`. Commit format: `^#[0-9]+ ` (the format in CLAUDE.md).
-- Checks: in the worktree, `clang-format --dry-run --Werror` on the C++ files changed since `origin/develop` (not under `deps/`); stop on any error.
-- Labels: none.
-- Screenshots: `playwright/test-results/<case>/` in the worktree, never committed.
-- UI QA, only if QML or a page changed: in the worktree's `playwright/`, add or update a case for each changed page, run `npm test`, and inspect `test-results/<case>/` (CLAUDE.md's Playwright section).
diff --git a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/report-spike/SKILL.md b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/report-spike/SKILL.md
deleted file mode 100644
index e673871..0000000
--- a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/report-spike/SKILL.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-name: report-spike
-description: Post a spike's findings on its ticket, judged against its hypothesis, and ask the lead to review its draft PR. Use when a spike's approach has been tried on an application-software repo (Argos, Nero).
----
-
-A spike runs like any ticket (branch, commits, a draft PR from `open-pr`); this reports it. Load the project's `pr-conventions` first.
-
-1. **Read** the spike (`gh issue view <n> --comments`), its draft PR, and the branch's diff against the base.
-2. **Draft** one findings comment, short and factual:
-
-   ```
-   ### Findings
-   **Hypothesis:** holds | partly holds | doesn't hold. One sentence why.
-   **Learned:** measurements, limits hit, surprises, with links to the draft PR's code.
-   **Recommendation:** adopt, adopt with changes, or drop, and why.
-   **Open questions:** what the spike didn't settle.
-   Draft PR: #<pr>
-   ```
-3. **Show** it and ask who the lead is; on OK, post it (`gh issue comment <n> --body-file /tmp/<branch>-findings.md`).
-4. **Request review:** `(cd worktrees/<repo>/<branch> && gh pr edit <branch> --add-reviewer <lead>)`, keeping the PR a draft, and remind the user to ping the lead on Slack.
-
-Address review feedback on the branch as on any PR (`address-pr-comments`), and edit the findings comment if it changes them. The spike is done when the lead approves the draft PR (`create-ticket`'s Spikes rules); it stays open until `consolidate-spikes` closes it.
diff --git a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/setup-workspace/SKILL.md b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/setup-workspace/SKILL.md
deleted file mode 100644
index fdc1ce8..0000000
--- a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/setup-workspace/SKILL.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-name: setup-workspace
-description: Change what this workspace checks out and re-run its setup. workspace.yml lists code repos (repos:), read-only dependency sources (references-git:), and clones of other Delphi workspaces or main to read (workspaces:). Use when the user wants to read or compare another workspace's or main's instructions, skills, or docs (link it), add or remove a repo or dependency reference, or run setup after cloning or pulling.
----
-
-`workspace.yml` at the workspace root lists what `.delphi/setup.sh` checks out, all git-ignored: code repos (`repos:`), dependency sources (`references-git:`), and other Delphi workspaces or main (`workspaces:`, entries `- <name>` or `- main`; a workspace's name is the short names of its folders (each folder's `short-name` file, else its name) and its own folder name, joined by dots, like `s.app.argos.argos-dev`; `bash .delphi/switch.sh --list` lists them). The comment on each section gives its entry format and where it lands; read it, then edit the file.
-
-Run from the workspace root after any change, and to refresh references and workspace copies to their latest:
-
-```
-bash .delphi/setup.sh
-```
-
-- The clones under `workspaces/` are full clones, each on its branch (`ws/<name>` or `main`) tracking origin, for reading: don't edit, branch, or push them from this workspace. Each setup run switches a clone back to its branch if it was switched away (refused while it has uncommitted changes), pulls it, and runs its own setup, so that workspace's repos and references are under it too (it skips its own `workspaces:`, so they don't chain). To change one of those workspaces or main, work in its own clone or switch to it (`switch-workspace` skill).
-- This workspace's project folder (shared context, `AUTHORING.md`, `workspace-defaults/`) is the folder above `workspaces/<leaf>/` in `workspaces/main/` (`bash .delphi/switch.sh --list` prints it): for `s.app.argos.argos-dev`, `workspaces/main/software/application-software/argos/`. List workspaces and their project folders: `bash .delphi/switch.sh --list`.
-- `workspace.yml` is shared: change it on a branch and open a PR into `ws/<this-name>` (the `name:` in `workspace.yml`). For a one-off look, add the entry, run setup, then `git restore workspace.yml`.
-- Setup never deletes what you'd lose. A removed entry's `workspaces/<name>/`, `references/<name>/`, or repo store and worktrees stay until you delete them (ask first).
-- When Delphi releases a version that needs cleanup in clones, setup runs its migration first (`.delphi/migrations/`), once per workspace. A migration removes only what nothing is lost from, and otherwise stops setup with what to do: tell the user, do it with their go-ahead, and re-run.
diff --git a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/switch-workspace/SKILL.md b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/switch-workspace/SKILL.md
deleted file mode 100644
index e0a8b42..0000000
--- a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/switch-workspace/SKILL.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: switch-workspace
-description: Switch this clone to another Delphi workspace, or to Delphi's main, to work in it. Use when the user wants to check out, switch to, open, or work in another workspace or project, or to change another workspace's or main's files.
----
-
-Run from the workspace root:
-
-```
-bash .delphi/switch.sh <name>        # ws/<name>: its dotted name, e.g. s.app.argos.argos-dev
-bash .delphi/switch.sh main          # Delphi's main: project folders, templates, CI
-```
-
-- The user can also switch from the `/ws-delphi` pane (the `delphi` plugin's mod), which shows them as cards (`bash .delphi/switch.sh --list`): press one, then Switch workspace; `/ws-delphi <name>` switches straight away, and `/ws-delphi --web` opens the same cards in a browser tab.
-- List workspaces and their project folders: `bash .delphi/switch.sh --list`.
-- It refuses while tracked files have changes: commit them on a branch (and PR them) first. Then it fetches, switches, fast-forwards, and runs the new workspace's `.delphi/setup.sh`.
-- The post-checkout hook parks this workspace's `repos/`, `worktrees/`, `references/` and `workspaces/` in `.delphi/parked/<name>/` (git-ignored; `<name>` as in its `workspace.yml`) and brings the other's back at the same paths, so worktrees and the work in them return as they were. Switch back the same way. Never run `git clean -X` or `git stash --all` at the workspace root: they take ignored files, parked work included.
-- Before switching, stop anything running from `worktrees/` (dev servers, Docker builds): its folder moves.
-- No restart needed: skills under `.claude/skills/` reload on their own, and the `delphi` mod sends the new workspace's `CLAUDE.md` with the next prompt. Without the mod installed, this session keeps the old `CLAUDE.md`: tell the user to restart Claude Code in the same folder before starting work in the new workspace.
-- To change the workspace you switched to: `git switch -c <branch>`, commit, push, and open a PR into `ws/<name>` (or `main`).
-- To only read another workspace or main without leaving this one, list it under `workspaces:` instead (`setup-workspace` skill).
diff --git a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/ticket-conventions/SKILL.md b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/ticket-conventions/SKILL.md
deleted file mode 100644
index c837cd5..0000000
--- a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/ticket-conventions/SKILL.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-name: ticket-conventions
-description: Nero specifics for tickets (repo, area labels, vocabulary, diagrams). Load before drafting or filing a Nero issue, alongside create-ticket.
-user-invocable: false
----
-
-# Nero ticket conventions
-
-The shared rules are in the `create-ticket` skill; this adds only what is Nero's.
-
-- Repo: Northeastern-Electric-Racing/Nero-2.0 (base branch `develop`).
-- Area labels: `view`, `controller`, `model`, `devops` (any combination).
-- Title example: "Add a lap timer to the pit screen".
-- Diagrams: Mermaid where it fits. Show the change across the view, controller, and model layers it touches, before and after.
diff --git a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/update-pr/SKILL.md b/software/application-software/nero/workspaces/nero-experimental/.claude/skills/update-pr/SKILL.md
deleted file mode 100644
index 069b517..0000000
--- a/software/application-software/nero/workspaces/nero-experimental/.claude/skills/update-pr/SKILL.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-name: update-pr
-description: Update a branch's PR description to reflect the latest changes
----
-
-Load the project's `pr-conventions` skill, then rewrite the branch's PR body (`(cd worktrees/<repo>/<branch> && gh pr view)`) to match `git -C worktrees/<repo>/<branch> diff origin/<base>...HEAD`, following the PR body rules in the `open-pr` skill. Keep human-written text that's still accurate, `user-attachments` screenshots, and `Closes`/`Fixes` refs; new screenshots or videos follow open-pr's media step, attached with `gh pr edit --attach`. Write it to `/tmp/<branch>-pr-body.md`, apply it with `gh pr edit <branch> --body-file` from the worktree, and add any of the project's labels that are missing with `--add-label`.
diff --git a/software/application-software/nero/workspaces/nero-experimental/workspace.generated b/software/application-software/nero/workspaces/nero-experimental/workspace.generated
deleted file mode 100644
index fc3645b..0000000
--- a/software/application-software/nero/workspaces/nero-experimental/workspace.generated
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated by ci/render.sh; edit shared sources or opt out in workspace.yml.
-100644 61c35f28dda167e42bebc3bad3994af97c53e876	.claude/settings.json	ci/plugins.sh
-100644 30083fa3b2cf735ac5a75808478dd00476e75e9c	.claude/skills/address-pr-comments/SKILL.md	software/application-software/workspace-inherit/.claude/skills/address-pr-comments/SKILL.md
-100755 ce1efd97da4a6d2ea655932486660c5008f44dae	.claude/skills/address-pr-comments/scripts/fetch-feedback.sh	software/application-software/workspace-inherit/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh
-100644 da0be202ebc0a9ffc4544dbdf4bbef54cca37520	.claude/skills/address-pr-comments/scripts/github.sh	software/application-software/workspace-inherit/.claude/skills/address-pr-comments/scripts/github.sh
-100644 4b5675711abfaef10089859f379a931206267355	.claude/skills/commit/SKILL.md	software/application-software/workspace-inherit/.claude/skills/commit/SKILL.md
-100644 4f85b66ab5c07ce4a00ba3d8555fc9272544046b	.claude/skills/consolidate-spikes/SKILL.md	software/application-software/workspace-inherit/.claude/skills/consolidate-spikes/SKILL.md
-100644 210a059f1a4b753cab90aad19f26ead483a62295	.claude/skills/create-ticket/SKILL.md	software/application-software/workspace-inherit/.claude/skills/create-ticket/SKILL.md
-100644 4917259f9e29db28e2636496e80f80ee5d9e321e	.claude/skills/journal/SKILL.md	software/workspace-inherit/.claude/skills/journal/SKILL.md
-100755 1e90d7b9afa14b8b0e7f36e0e1d83baecc94ba5b	.claude/skills/journal/scripts/capture.sh	software/workspace-inherit/.claude/skills/journal/scripts/capture.sh
-100644 0495fc97cbe93e4331c89263aee188f6c0e9c9ea	.claude/skills/new-worktree/SKILL.md	software/workspace-inherit/.claude/skills/new-worktree/SKILL.md
-100644 b1e7c71c13b4ea7c40cabeb12aa1674a6b543dc5	.claude/skills/open-pr/SKILL.md	software/application-software/workspace-inherit/.claude/skills/open-pr/SKILL.md
-100755 61f377fef63daa10c443129df6a49571fdbeb658	.claude/skills/open-pr/scripts/pr-checks.sh	software/application-software/workspace-inherit/.claude/skills/open-pr/scripts/pr-checks.sh
-100644 9e2bb1781bd6272ab64e9052bc7b8c13e97e7588	.claude/skills/pr-conventions/SKILL.md	software/application-software/nero/workspace-inherit/.claude/skills/pr-conventions/SKILL.md
-100644 e67387116a753217d256d81901e5b4091b49b44c	.claude/skills/report-spike/SKILL.md	software/application-software/workspace-inherit/.claude/skills/report-spike/SKILL.md
-100644 fdc1ce85211200223040edfb5dc65a3de7f35d53	.claude/skills/setup-workspace/SKILL.md	software/workspace-inherit/.claude/skills/setup-workspace/SKILL.md
-100644 e0a8b424d11c4897901c0ce888a6c0c726daed98	.claude/skills/switch-workspace/SKILL.md	software/workspace-inherit/.claude/skills/switch-workspace/SKILL.md
-100644 c837cd55b11831c601ffe7f4caad31d41ab3b604	.claude/skills/ticket-conventions/SKILL.md	software/application-software/nero/workspace-inherit/.claude/skills/ticket-conventions/SKILL.md
-100644 069b51714c0fd4d3d6ad972dd9f840e01f21cf15	.claude/skills/update-pr/SKILL.md	software/application-software/workspace-inherit/.claude/skills/update-pr/SKILL.md
diff --git a/software/application-software/workspaces/hub/.claude/skills/address-pr-comments/SKILL.md b/software/application-software/workspaces/hub/.claude/skills/address-pr-comments/SKILL.md
deleted file mode 100644
index 30083fa..0000000
--- a/software/application-software/workspaces/hub/.claude/skills/address-pr-comments/SKILL.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: address-pr-comments
-description: Fetch review comments on a PR (Argos, Nero), judge whether each (including outdated ones) still applies, and walk through fixes in the PR's worktree
-allowed-tools: Bash(git:*), Bash(gh issue list:*), Bash(bash ${CLAUDE_SKILL_DIR}/scripts/fetch-feedback.sh *)
-user-invocable: true
----
-
-Propose and apply fixes for a PR's unresolved review feedback. **Never reply to threads**; the user does.
-
-1. **Fetch** from the workspace root: `bash scripts/fetch-feedback.sh <repo> <pr>|<branch>` (`<repo>` as under `repos/`, e.g. `argos`; `--all` first for unfiltered history). It checks out the PR head's worktree and prints JSON: `worktree` (target it by path from the root from now on), unresolved `threads`, `comments`, `reviews`. Any non-zero exit: use the GitHub MCP server's `pull_request_read` instead.
-2. **Judge.** Skip bot noise and anything already fixed at HEAD. For an `outdated` thread, find its `diffHunk` code by content, then label it **addressed**, **applies**, **moved**, **obsolete**, or **unclear**.
-3. **Present** before editing, grouped by file, and ask to confirm, skip, or change each (offer to batch clear ones past 8):
-
-   ```
-   <file>:<line> — <reviewer> · <active|outdated> · <label>
-   "<excerpt>" → <proposed fix>
-   <optional ≤5-line snippet, for the user only>
-   ```
-4. **Apply** in that worktree, by path, with grouped `/commit`s. For a follow-up-ticket request, reuse a match from `gh issue list --search` before filing.
-5. **Report** what was fixed (file:line, commit SHA), what was already addressed or obsolete (why), and what is unclear.
diff --git a/software/application-software/workspaces/hub/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh b/software/application-software/workspaces/hub/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh
deleted file mode 100755
index ce1efd9..0000000
--- a/software/application-software/workspaces/hub/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env bash
-# fetch-feedback.sh [--all] <repo> <pr-number>|<branch>: print a PR's review
-# feedback as one JSON object after creating or reusing the PR head's worktree
-# (worktrees/<repo>/<head>). Default output keeps unresolved threads (first + latest message,
-# bots tagged), conversation comments, and reviews with text; --all keeps everything. Exits 3 on any
-# GitHub failure (see github.sh).
-# shellcheck source-path=SCRIPTDIR source=github.sh
-set -euo pipefail
-. "$(dirname "$0")/github.sh"
-all=false
-[ "${1:-}" = --all ] && all=true && shift
-usage="usage: fetch-feedback.sh [--all] <repo> <pr-number>|<branch>"
-repo=${1:?$usage} ref=${2:?$usage}
-# shellcheck source=/dev/null
-. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
-gh_init fetch-feedback "$DELPHI_WORKTREES/$repo/.bare"
-
-case "$ref" in *[!0-9]*) get "repos/$SLUG/pulls?state=all&head=${SLUG%%/*}:$ref" | jq '.[0] // error("no PR")' ;;
-  *) get "repos/$SLUG/pulls/$ref" ;; esac >"$TMP/pr"
-num=$(jq .number "$TMP/pr")
-wt=""
-[ "$(jq -r .head.repo.full_name "$TMP/pr")" != "$SLUG" ] || wt=$(bash "$DELPHI_ROOT/.delphi/new-worktree.sh" "$repo" "$(jq -r .head.ref "$TMP/pr")")
-
-if [ "$MODE" = gh ]; then # thread state is GraphQL-only; reshape it like the proxy's ccr/review_threads
-  # shellcheck disable=SC2016 # GraphQL variables
-  gh api graphql -F o="${SLUG%%/*}" -F n="${SLUG##*/}" -F p="$num" -f query='query($o: String!, $n: String!, $p: Int!) {
-    repository(owner: $o, name: $n) { pullRequest(number: $p) { reviewThreads(first: 100) { nodes {
-      isResolved isOutdated comments(first: 50) { nodes { databaseId } } } } } } }' \
-    --jq '[.data.repository.pullRequest.reviewThreads.nodes[] |
-      {resolved: .isResolved, outdated: .isOutdated, comment_ids: [.comments.nodes[].databaseId]}]'
-else get "repos/$SLUG/pulls/$num/ccr/review_threads"; fi >"$TMP/th"
-get "repos/$SLUG/pulls/$num/comments?per_page=100" >"$TMP/rc"
-get "repos/$SLUG/issues/$num/comments?per_page=100" >"$TMP/ic"
-get "repos/$SLUG/pulls/$num/reviews?per_page=100" >"$TMP/rv"
-
-jq -n --arg wt "$wt" --argjson all "$all" --slurpfile pr "$TMP/pr" --slurpfile th "$TMP/th" \
-  --slurpfile rc "$TMP/rc" --slurpfile ic "$TMP/ic" --slurpfile rv "$TMP/rv" '
-  def who: {author: .user.login, bot: (.user.type == "Bot")};
-  ($rc[0] | map({key: (.id | tostring), value: (who + {body, path, line: (.line // .original_line), diffHunk: .diff_hunk})}) | from_entries) as $byid |
-  {pr: ($pr[0] | {number, title, url: .html_url, head: .head.ref, base: .base.ref}), worktree: $wt,
-   threads: [$th[0][] | {resolved, outdated, comments: [.comment_ids[] | $byid[tostring]]}],
-   comments: [$ic[0][] | who + {body}], reviews: [$rv[0][] | who + {state, body: (.body // "")}]} |
-  if $all then . else
-    .threads |= map(select(.resolved | not) | .comments as $c | $c[-1] + {outdated, path: $c[0].path, line: $c[0].line,
-      diffHunk: (if .outdated then $c[0].diffHunk else null end), replies: ($c | length),
-      first: (if ($c | length) > 1 then $c[0].body else null end)}) |
-    .reviews |= map(select(.body != ""))
-  end'
diff --git a/software/application-software/workspaces/hub/.claude/skills/address-pr-comments/scripts/github.sh b/software/application-software/workspaces/hub/.claude/skills/address-pr-comments/scripts/github.sh
deleted file mode 100644
index da0be20..0000000
--- a/software/application-software/workspaces/hub/.claude/skills/address-pr-comments/scripts/github.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-# github.sh: sourced by skill scripts that call GitHub. gh_init <tool> <git-dir> picks a backend
-# (gh when logged in, else an explicitly enabled GitHub REST proxy via curl; jq is needed either
-# way), sets SLUG from that repo's origin, and makes any failure exit 3 so the calling skill falls
-# back to the available GitHub integration. TMP is a scratch dir removed on exit.
-# shellcheck shell=bash
-fail() { echo "$TOOL: $1; use the available GitHub integration" >&2; exit 3; }
-on_exit() { local rc=$?; rm -rf "$TMP"; [ "$rc" -eq 0 ] || fail "GitHub request failed ($MODE)"; }
-gh_init() {
-  TOOL=$1
-  if { command -v gh && gh auth status; } >/dev/null 2>&1; then MODE=gh
-  elif [ -n "${DELPHI_GITHUB_REST_PROXY:-${CLAUDE_CODE_REMOTE:-}}" ] && command -v curl >/dev/null; then MODE=rest
-  else fail "no authenticated gh or enabled REST proxy"; fi
-  command -v jq >/dev/null || fail "jq not installed"
-  SLUG=$(git -C "$2" remote get-url origin) && SLUG=${SLUG#*github.com[:/]} && SLUG=${SLUG%.git}
-  TMP=$(mktemp -d)
-  trap on_exit EXIT
-}
-get() { if [ "$MODE" = gh ]; then gh api "$1"; else curl -fsS "https://api.github.com/$1"; fi; }
-post() { if [ "$MODE" = gh ]; then gh api -X POST "$1" --input -; else curl -fsS -X POST --data-binary @- "https://api.github.com/$1"; fi; }
diff --git a/software/application-software/workspaces/hub/.claude/skills/commit/SKILL.md b/software/application-software/workspaces/hub/.claude/skills/commit/SKILL.md
deleted file mode 100644
index 4b56757..0000000
--- a/software/application-software/workspaces/hub/.claude/skills/commit/SKILL.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-name: commit
-description: Stage and commit using the project's commit message convention
----
-
-In the worktree you're working on, from the workspace root (`git -C worktrees/<repo>/<branch> …`), stage the relevant changes (not unrelated or generated files) and commit using the commit message format in CLAUDE.md. Keep the description imperative and 2–8 words.
diff --git a/software/application-software/workspaces/hub/.claude/skills/consolidate-spikes/SKILL.md b/software/application-software/workspaces/hub/.claude/skills/consolidate-spikes/SKILL.md
deleted file mode 100644
index 4f85b66..0000000
--- a/software/application-software/workspaces/hub/.claude/skills/consolidate-spikes/SKILL.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-name: consolidate-spikes
-description: Turn finished spikes into implementation tickets: an idea's spikes, once all are done, into dev work, under an epic when it comes from an idea or splits. Use when the user wants to wrap up, settle, or consolidate an idea or spike on an application-software repo (Argos, Nero).
----
-
-Drafts and files by the `create-ticket` rules; load it and the project's `ticket-conventions` first. Takes an idea or a standalone spike.
-
-1. **Gather** each spike's findings comment, draft PR, and the PR's reviews; from an idea, its sub-issues too.
-2. **Check it's done.** Every spike is done by `create-ticket`'s Spikes rules (the lead's latest review on its draft PR, from repos/<owner>/<repo>/pulls/<pr>/reviews, is an approval). From an idea, that's every spike under it, and every one of its areas to explore is covered by a spike area. Otherwise list what's missing, offer spikes for uncovered areas, and stop.
-3. **Choose:** per area (title prefix), propose the approach to build (one spike's, or a mix) with a one-line why, from the findings and the lead's review. The user confirms or changes each.
-4. **Plan** the dev work by `create-ticket`'s Dev work rules: one ticket unless the work is large enough to split into vertical slices, which may cross areas. Each ticket: What, the slice; Notes, links to the spikes and draft PRs it draws on, and the dropped approaches with why; context transfer, the findings' facts.
-5. **Draft** them, and, from an idea or when split, one epic (From: the idea or spike) with the dev work as its sub-issues. Show all, with which slices run in parallel if split; file what the user OKs.
-6. **Close**, each with a one-line comment: the spikes as completed ("Consolidated into #<epic or dev work>"), their draft PRs unless a dev work ticket builds on that branch, and the idea as completed ("Settled in #<epic or dev work>").
diff --git a/software/application-software/workspaces/hub/.claude/skills/create-ticket/SKILL.md b/software/application-software/workspaces/hub/.claude/skills/create-ticket/SKILL.md
deleted file mode 100644
index 210a059..0000000
--- a/software/application-software/workspaces/hub/.claude/skills/create-ticket/SKILL.md
+++ /dev/null
@@ -1,66 +0,0 @@
----
-name: create-ticket
-description: Draft and file a GitHub issue (idea, spike, epic, or dev work) on an application-software repo (Argos, Nero) from the repo's issue templates, or rewrite an existing issue into them. Use whenever the user wants to create, file, write up, or log a ticket, issue, idea, spike, epic, bug, or task, including an out-of-scope idea that comes up mid-work.
----
-
-# Create ticket
-
-These are the ticket conventions for every application-software repo. The repo's own `.github/ISSUE_TEMPLATE` holds only the fields (`gh api repos/<owner>/<repo>/contents/.github/ISSUE_TEMPLATE/<file> -q .content | base64 -d`); follow each field's description.
-
-First load the project's `ticket-conventions` skill (inherited from the project's `workspace-inherit/`) for its repo, area labels, vocabulary, and diagrams. If none is enabled, ask which repo.
-
-## Workflow
-
-idea → spikes → epic → dev work, or a standalone spike → dev work
-
-| Ticket | What it is | Issue type | Parent |
-|---|---|---|---|
-| Idea | What could be built and why. Its areas to explore are things to improve or problems to solve, each with approaches worth trying. | none | none |
-| Spike | One approach to try on one area of an idea (it needn't cover the whole area), or a small standalone improvement: what is tried and the hypothesis. Findings go in a comment and a draft PR (`report-spike`), not the ticket. | none | its idea, if any |
-| Epic | Work too large for one dev work ticket: the goal and whole-epic outcomes, not a walkthrough of each ticket. A new issue linking the idea or spike it came from in "From". | Feature | none |
-| Dev work | Any implementation work: testable requirements, Notes for gotchas and pointers to code. Large work is cut into vertical slices (see Dev work below). | Feature, Bug, or Task | its epic, if any |
-
-If unsure, a small, clear change is dev work, a small unknown is a spike, and a big unexplored thing is an idea. Ideas and spikes explore work, so they get no issue type; bug, feature, and task are issue types, never labels.
-
-## Writing
-
-How every ticket reads, on any project:
-
-- Short and plain. Write for someone new to the project: explain project-specific terms, and use the project's vocabulary (its `ticket-conventions` says where it lives; check the code for current names).
-- Outcomes, not implementation: say what changes and why, not how to build it. A rationale gives the reasoning, not a history of the problem.
-- No prescriptions on ideas and spikes. Ideas name open options to weigh, not a plan or a recommended pick; spikes state what to learn and leave the how to whoever picks it up.
-- Facts, not instructions: Notes and context transfer hold facts (where code lives, current behavior, constraints, links), not steps or a proposed solution. Context transfer (optional on spikes, epics, and dev work) starts with a short summary, then the raw context.
-- Unknowns stay open questions in Notes; don't guess.
-- Title: concise and imperative, no prefixes (except a spike's area).
-- Requirements: clear, broad checkboxes, each a testable outcome rather than an implementation step; 3-5, never more than 7. If it needs more, split the ticket.
-- Backticks: at most three inline uses per body; name files and identifiers in plain text. Diagram and context-transfer blocks don't count.
-- Size: keep ideas short; one small enough to just try is a spike.
-
-## Dev work
-
-- One ticket by default. Split only when the work is too large for one PR or parts could run in parallel.
-- When split, cut vertical slices: each goes end to end through every part it touches (e.g. backend through UI), not one layer, and works and is testable on its own. Cut for the most parallel work; mark a slice that must wait as blocked by the one it waits on (see File).
-
-## Spikes
-
-- One approach, not a set to choose between. If a spike reads "X or Y", it is two spikes.
-- Prefer an idea with a few spikes (often 2-4) under it; a spike can also stand alone, or with siblings, to explore an area. Several spikes can take on the same area in different ways.
-- Title it `<area>: <approach>`, with the area a short kebab-case name its siblings share (`graph-saving: Save a graph to a file and re-upload it`). An area may cover more than one of an idea's bullets. A lone small improvement needs no prefix.
-- Sibling spikes share the context transfer's summary and common facts; each adds only the facts particular to its approach.
-- An idea needn't get all its spikes at once: file an area's spikes when someone is ready to try them.
-- Done: its findings are posted, review feedback is addressed, and the lead's latest review on its draft PR is an approval (GitHub's Approve), including when the recommendation is to drop the approach. A done spike stays open until `consolidate-spikes` closes it.
-
-## Draft
-
-- Check the code first: the work may be done or already tracked.
-- One `### <field label>` per field in template order, following each field's description; omit empty optional fields.
-- Diagrams: required on epics, optional on dev work. The project's `ticket-conventions` says what they show.
-- Labels: the template's category (`idea`, `spike`, `epic`, `dev work`), one written-by (`by: human` if the user dictated it, `by: ai-assisted` if they gave the substance, `by: ai` if you wrote it, including rewrites), and at least one of the project's area labels.
-- Rewriting an old ticket: keep its intent and assignees; bring it up to these rules and update vocabulary, labels, issue type, and parent.
-- Folding one ticket into another: add it as a requirement on the target, then close it as not planned. Every close gets a one-line comment saying why.
-
-## File
-
-Check for open duplicates, then show the full draft (title, type if any, labels, parent, body) in the chat, not only in a file. File or edit only what the user OKs.
-
-Use the REST API (GraphQL may be blocked): POST repos/<owner>/<repo>/issues with title, body, labels, the issue type from the table, and the user as assignee (on a spike, whoever will run it; ask), then, if it has a parent, POST repos/<owner>/<repo>/issues/<parent>/sub_issues with the new issue's id. If it waits on another issue, POST repos/<owner>/<repo>/issues/<n>/dependencies/blocked_by with the blocking issue's id. Report the URL.
diff --git a/software/application-software/workspaces/hub/.claude/skills/journal/SKILL.md b/software/application-software/workspaces/hub/.claude/skills/journal/SKILL.md
deleted file mode 100644
index 4917259..0000000
--- a/software/application-software/workspaces/hub/.claude/skills/journal/SKILL.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-name: journal
-description: Park rough notes locally mid-task ("note to self", "remember to", "journal this"), and later export them to their permanent home (issue, spec, ADR, glossary, docs) through the skill that owns it. Use when the user wants to jot a thought without derailing, or to file parked notes.
----
-
-Notes live in `.journal/` at the workspace root (git-excluded, outside worktrees so they survive removal). An **entry** is one file, a **category** a subfolder. The journal never pushes, files, or contacts GitHub itself.
-
-**Capture** (no git, no other skills):
-
-```
-bash scripts/capture.sh [-c <category>] ["note text"]
-```
-
-Omit `-c` for a loose entry, omit the text for an empty one to edit. Report the path it prints.
-
-**Export** (only when asked):
-
-1. Read the entries and propose a grouping: one entry → one output, a category → one merged output, or one entry split across several. Let the user adjust.
-2. For each output, pick the workspace skill whose description fits its permanent home, preferring an existing docs area. A new section always needs approval.
-3. Show the destination and reshaped text and wait for approval. Nothing lands silently.
-4. Delegate to that skill; it owns formatting, conventions, and any GitHub contact.
-5. Ask whether to delete the exported entry (default: keep).
diff --git a/software/application-software/workspaces/hub/.claude/skills/journal/scripts/capture.sh b/software/application-software/workspaces/hub/.claude/skills/journal/scripts/capture.sh
deleted file mode 100755
index 1e90d7b..0000000
--- a/software/application-software/workspaces/hub/.claude/skills/journal/scripts/capture.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-# capture.sh [-c <category>] [note text]: write a timestamped journal entry to
-# .journal/[<category>/] at the workspace root (adding /.journal/ to .git/info/exclude once) and print
-# its path. An empty entry is created when no text is given. Never touches git history, GitHub, or
-# other skills.
-set -euo pipefail
-usage="usage: capture.sh [-c <category>] [note text]"
-# shellcheck source=/dev/null
-. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
-dir=$DELPHI_ROOT/.journal
-[ "${1:-}" = -c ] && dir=$dir/${2:?$usage} && shift 2
-exclude=$(git -C "$DELPHI_ROOT" rev-parse --path-format=absolute --git-path info/exclude 2>/dev/null || true)
-[ -z "$exclude" ] || grep -qxF /.journal/ "$exclude" 2>/dev/null || { mkdir -p "${exclude%/*}" && echo /.journal/ >>"$exclude"; }
-mkdir -p "$dir"
-file=$dir/$(date +%Y-%m-%d-%H%M%S).md
-{ echo "<!-- captured $(date -u +%Y-%m-%dT%H:%M:%SZ) -->"; [ $# -eq 0 ] || echo "$*"; } >"$file"
-echo "$file"
diff --git a/software/application-software/workspaces/hub/.claude/skills/new-worktree/SKILL.md b/software/application-software/workspaces/hub/.claude/skills/new-worktree/SKILL.md
deleted file mode 100644
index 0495fc9..0000000
--- a/software/application-software/workspaces/hub/.claude/skills/new-worktree/SKILL.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-name: new-worktree
-description: Create or reuse a worktree for a branch of a code repo (worktrees/<repo>/<branch>). Use before any branch work, such as starting a ticket or reviewing or fixing a PR branch, unless the user says not to use worktrees.
----
-
-Run from the workspace root:
-
-```
-bash .delphi/new-worktree.sh <repo> <branch> [<base>]
-```
-
-- An existing branch (local or on origin, e.g. a PR head) is checked out; anything else is created from `<base>` (default: the repo's default branch). Safe to re-run.
-- Stay at the workspace root and reach into the worktree by the printed path. Never switch branches in an existing worktree or work in its store, `worktrees/<repo>/.bare`.
-- For a subagent, make its worktree here first and hand it the path. Never use the harness's own worktree isolation: it checks out this Delphi clone from main, not the code repo, and fences the subagent out of `worktrees/`.
-- Keep `worktrees/<repo>/<default-branch>/` (made by setup) a clean reference: fetch and fast-forward only.
-- After the branch merges: `git -C worktrees/<repo>/.bare worktree remove ../<branch>`.
diff --git a/software/application-software/workspaces/hub/.claude/skills/open-pr/SKILL.md b/software/application-software/workspaces/hub/.claude/skills/open-pr/SKILL.md
deleted file mode 100644
index b1e7c71..0000000
--- a/software/application-software/workspaces/hub/.claude/skills/open-pr/SKILL.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-name: open-pr
-description: Run pre-PR checks, push the branch, and open a draft pull request on an application-software repo (Argos, Nero)
----
-
-First load the project's `pr-conventions` skill (inherited from the project's `workspace-inherit/`) for its base branch, commit format, checks, labels, and screenshots.
-
-1. **Check:** `bash scripts/pr-checks.sh <repo> <branch> origin/<base> '<commit format>'` (clean tree, commit subjects match the project's format, merges cleanly into the base), then the project's own checks. Stop and fix on any FAIL.
-2. **Media:** if the diff touches the UI, ask the user whether to add screenshots to the PR, listing any already in the project's screenshot folder for this branch so they can pick those instead of new ones; on no, skip this step. For new ones, use the project's UI QA to take Playwright screenshots of the changed views into its screenshot folder, or, when the change adds or changes an animation, record a short video instead (a browser context with `recordVideo: { dir }` saves a `.webm` when it closes). Images must be under 10 MB; video under 10 MB on a Free plan, 100 MB on a paid one.
-3. **Open:** push (`git -C worktrees/<repo>/<branch> push -u origin <branch>`), then run `(cd worktrees/<repo>/<branch> && gh pr create --draft --base <base> --head <branch> --title "<title>" --body-file /tmp/<branch>-pr-body.md --assignee @me)` with the project's labels (`--label`) and one `--attach <file>` per screenshot or video, and report the URL.
-4. **Spike:** the PR stays a draft; getting it merged isn't the goal. Once it's checked and working, run `report-spike`.
-
-## PR body
-
-Fill the worktree's `.github/pull_request_template.md` from the diff, following each section's comment, and write it to `/tmp/<branch>-pr-body.md`:
-
-- Title: concise and imperative, no ticket number.
-- The Changes section (not the whole body): about 50 words (1–3 sentences) on what landed and the key design choice. Describe the change, not the file list: don't enumerate components, classes or files the diff already shows. Name a specific one only when its behaviour changes in a way a reviewer must know.
-- Delete the template's comments and any optional or non-applicable sections, and check off the Checklist.
-- At most three backtick uses in the body.
-- End with `Closes #{ticket}` (the branch's leading number), or `Spike for #{ticket}` on a spike, which its PR never closes.
-- Screenshots and videos: reference each one by its path from the worktree, `![<what it shows>](<path>)`; `--attach` uploads it and rewrites the reference to its `user-attachments` URL. `--attach` needs gh v2.99.0+: if `gh pr create --help` doesn't list it, put `_screenshot pending_` instead and remind the user to drag-drop the files from the screenshot folder. Never commit screenshots or videos.
diff --git a/software/application-software/workspaces/hub/.claude/skills/open-pr/scripts/pr-checks.sh b/software/application-software/workspaces/hub/.claude/skills/open-pr/scripts/pr-checks.sh
deleted file mode 100755
index 61f377f..0000000
--- a/software/application-software/workspaces/hub/.claude/skills/open-pr/scripts/pr-checks.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-# pr-checks.sh <repo> <branch> [<base> [<format>]]: open-pr's shared pre-PR checks on
-# worktrees/<repo>/<branch>. Prints
-# one PASS/FAIL/SKIP line per check: clean tree, every commit subject since <base> (default
-# origin/develop, fetched first) matches <format> (an extended regex, default '^#[0-9]+ - '), and no
-# merge conflicts with <base>. Exits 1 if any check fails. The project's own checks (lint, format)
-# are in its pr-conventions skill.
-set -euo pipefail
-usage="usage: pr-checks.sh <repo> <branch> [<base> [<format>]]"
-repo=${1:?$usage} branch=${2:?$usage}
-# shellcheck source=/dev/null
-. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
-cd "$DELPHI_WORKTREES/$repo/$branch"
-base=${3:-origin/develop} format=${4:-'^#[0-9]+ - '} fail=0
-res() { echo "$1 $2"; [ "$1" != FAIL ] || fail=1; }
-git fetch -q origin "${base#origin/}" 2>/dev/null || true
-
-if [ -z "$(git status --porcelain)" ]; then res PASS "clean tree"; else res FAIL "uncommitted changes"; fi
-bad=$(git log --format=%s "$base..HEAD" | grep -Ev "$format" || true)
-if [ -z "$bad" ]; then res PASS "commit format"; else res FAIL "commit format: $(echo "$bad" | paste -sd'|' -)"; fi
-if git merge-tree --write-tree HEAD "$base" >/dev/null 2>&1; then res PASS "merges cleanly into $base"
-elif [ $? -eq 1 ]; then res FAIL "conflicts with $base"; else res SKIP "conflict check (needs git 2.38+)"; fi
-exit "$fail"
diff --git a/software/application-software/workspaces/hub/.claude/skills/report-spike/SKILL.md b/software/application-software/workspaces/hub/.claude/skills/report-spike/SKILL.md
deleted file mode 100644
index e673871..0000000
--- a/software/application-software/workspaces/hub/.claude/skills/report-spike/SKILL.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-name: report-spike
-description: Post a spike's findings on its ticket, judged against its hypothesis, and ask the lead to review its draft PR. Use when a spike's approach has been tried on an application-software repo (Argos, Nero).
----
-
-A spike runs like any ticket (branch, commits, a draft PR from `open-pr`); this reports it. Load the project's `pr-conventions` first.
-
-1. **Read** the spike (`gh issue view <n> --comments`), its draft PR, and the branch's diff against the base.
-2. **Draft** one findings comment, short and factual:
-
-   ```
-   ### Findings
-   **Hypothesis:** holds | partly holds | doesn't hold. One sentence why.
-   **Learned:** measurements, limits hit, surprises, with links to the draft PR's code.
-   **Recommendation:** adopt, adopt with changes, or drop, and why.
-   **Open questions:** what the spike didn't settle.
-   Draft PR: #<pr>
-   ```
-3. **Show** it and ask who the lead is; on OK, post it (`gh issue comment <n> --body-file /tmp/<branch>-findings.md`).
-4. **Request review:** `(cd worktrees/<repo>/<branch> && gh pr edit <branch> --add-reviewer <lead>)`, keeping the PR a draft, and remind the user to ping the lead on Slack.
-
-Address review feedback on the branch as on any PR (`address-pr-comments`), and edit the findings comment if it changes them. The spike is done when the lead approves the draft PR (`create-ticket`'s Spikes rules); it stays open until `consolidate-spikes` closes it.
diff --git a/software/application-software/workspaces/hub/.claude/skills/setup-workspace/SKILL.md b/software/application-software/workspaces/hub/.claude/skills/setup-workspace/SKILL.md
deleted file mode 100644
index fdc1ce8..0000000
--- a/software/application-software/workspaces/hub/.claude/skills/setup-workspace/SKILL.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-name: setup-workspace
-description: Change what this workspace checks out and re-run its setup. workspace.yml lists code repos (repos:), read-only dependency sources (references-git:), and clones of other Delphi workspaces or main to read (workspaces:). Use when the user wants to read or compare another workspace's or main's instructions, skills, or docs (link it), add or remove a repo or dependency reference, or run setup after cloning or pulling.
----
-
-`workspace.yml` at the workspace root lists what `.delphi/setup.sh` checks out, all git-ignored: code repos (`repos:`), dependency sources (`references-git:`), and other Delphi workspaces or main (`workspaces:`, entries `- <name>` or `- main`; a workspace's name is the short names of its folders (each folder's `short-name` file, else its name) and its own folder name, joined by dots, like `s.app.argos.argos-dev`; `bash .delphi/switch.sh --list` lists them). The comment on each section gives its entry format and where it lands; read it, then edit the file.
-
-Run from the workspace root after any change, and to refresh references and workspace copies to their latest:
-
-```
-bash .delphi/setup.sh
-```
-
-- The clones under `workspaces/` are full clones, each on its branch (`ws/<name>` or `main`) tracking origin, for reading: don't edit, branch, or push them from this workspace. Each setup run switches a clone back to its branch if it was switched away (refused while it has uncommitted changes), pulls it, and runs its own setup, so that workspace's repos and references are under it too (it skips its own `workspaces:`, so they don't chain). To change one of those workspaces or main, work in its own clone or switch to it (`switch-workspace` skill).
-- This workspace's project folder (shared context, `AUTHORING.md`, `workspace-defaults/`) is the folder above `workspaces/<leaf>/` in `workspaces/main/` (`bash .delphi/switch.sh --list` prints it): for `s.app.argos.argos-dev`, `workspaces/main/software/application-software/argos/`. List workspaces and their project folders: `bash .delphi/switch.sh --list`.
-- `workspace.yml` is shared: change it on a branch and open a PR into `ws/<this-name>` (the `name:` in `workspace.yml`). For a one-off look, add the entry, run setup, then `git restore workspace.yml`.
-- Setup never deletes what you'd lose. A removed entry's `workspaces/<name>/`, `references/<name>/`, or repo store and worktrees stay until you delete them (ask first).
-- When Delphi releases a version that needs cleanup in clones, setup runs its migration first (`.delphi/migrations/`), once per workspace. A migration removes only what nothing is lost from, and otherwise stops setup with what to do: tell the user, do it with their go-ahead, and re-run.
diff --git a/software/application-software/workspaces/hub/.claude/skills/switch-workspace/SKILL.md b/software/application-software/workspaces/hub/.claude/skills/switch-workspace/SKILL.md
deleted file mode 100644
index e0a8b42..0000000
--- a/software/application-software/workspaces/hub/.claude/skills/switch-workspace/SKILL.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: switch-workspace
-description: Switch this clone to another Delphi workspace, or to Delphi's main, to work in it. Use when the user wants to check out, switch to, open, or work in another workspace or project, or to change another workspace's or main's files.
----
-
-Run from the workspace root:
-
-```
-bash .delphi/switch.sh <name>        # ws/<name>: its dotted name, e.g. s.app.argos.argos-dev
-bash .delphi/switch.sh main          # Delphi's main: project folders, templates, CI
-```
-
-- The user can also switch from the `/ws-delphi` pane (the `delphi` plugin's mod), which shows them as cards (`bash .delphi/switch.sh --list`): press one, then Switch workspace; `/ws-delphi <name>` switches straight away, and `/ws-delphi --web` opens the same cards in a browser tab.
-- List workspaces and their project folders: `bash .delphi/switch.sh --list`.
-- It refuses while tracked files have changes: commit them on a branch (and PR them) first. Then it fetches, switches, fast-forwards, and runs the new workspace's `.delphi/setup.sh`.
-- The post-checkout hook parks this workspace's `repos/`, `worktrees/`, `references/` and `workspaces/` in `.delphi/parked/<name>/` (git-ignored; `<name>` as in its `workspace.yml`) and brings the other's back at the same paths, so worktrees and the work in them return as they were. Switch back the same way. Never run `git clean -X` or `git stash --all` at the workspace root: they take ignored files, parked work included.
-- Before switching, stop anything running from `worktrees/` (dev servers, Docker builds): its folder moves.
-- No restart needed: skills under `.claude/skills/` reload on their own, and the `delphi` mod sends the new workspace's `CLAUDE.md` with the next prompt. Without the mod installed, this session keeps the old `CLAUDE.md`: tell the user to restart Claude Code in the same folder before starting work in the new workspace.
-- To change the workspace you switched to: `git switch -c <branch>`, commit, push, and open a PR into `ws/<name>` (or `main`).
-- To only read another workspace or main without leaving this one, list it under `workspaces:` instead (`setup-workspace` skill).
diff --git a/software/application-software/workspaces/hub/.claude/skills/update-pr/SKILL.md b/software/application-software/workspaces/hub/.claude/skills/update-pr/SKILL.md
deleted file mode 100644
index 069b517..0000000
--- a/software/application-software/workspaces/hub/.claude/skills/update-pr/SKILL.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-name: update-pr
-description: Update a branch's PR description to reflect the latest changes
----
-
-Load the project's `pr-conventions` skill, then rewrite the branch's PR body (`(cd worktrees/<repo>/<branch> && gh pr view)`) to match `git -C worktrees/<repo>/<branch> diff origin/<base>...HEAD`, following the PR body rules in the `open-pr` skill. Keep human-written text that's still accurate, `user-attachments` screenshots, and `Closes`/`Fixes` refs; new screenshots or videos follow open-pr's media step, attached with `gh pr edit --attach`. Write it to `/tmp/<branch>-pr-body.md`, apply it with `gh pr edit <branch> --body-file` from the worktree, and add any of the project's labels that are missing with `--add-label`.
diff --git a/software/application-software/workspaces/hub/workspace.generated b/software/application-software/workspaces/hub/workspace.generated
deleted file mode 100644
index 6b1cc9a..0000000
--- a/software/application-software/workspaces/hub/workspace.generated
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated by ci/render.sh; edit shared sources or opt out in workspace.yml.
-100644 61c35f28dda167e42bebc3bad3994af97c53e876	.claude/settings.json	ci/plugins.sh
-100644 30083fa3b2cf735ac5a75808478dd00476e75e9c	.claude/skills/address-pr-comments/SKILL.md	software/application-software/workspace-inherit/.claude/skills/address-pr-comments/SKILL.md
-100755 ce1efd97da4a6d2ea655932486660c5008f44dae	.claude/skills/address-pr-comments/scripts/fetch-feedback.sh	software/application-software/workspace-inherit/.claude/skills/address-pr-comments/scripts/fetch-feedback.sh
-100644 da0be202ebc0a9ffc4544dbdf4bbef54cca37520	.claude/skills/address-pr-comments/scripts/github.sh	software/application-software/workspace-inherit/.claude/skills/address-pr-comments/scripts/github.sh
-100644 4b5675711abfaef10089859f379a931206267355	.claude/skills/commit/SKILL.md	software/application-software/workspace-inherit/.claude/skills/commit/SKILL.md
-100644 4f85b66ab5c07ce4a00ba3d8555fc9272544046b	.claude/skills/consolidate-spikes/SKILL.md	software/application-software/workspace-inherit/.claude/skills/consolidate-spikes/SKILL.md
-100644 210a059f1a4b753cab90aad19f26ead483a62295	.claude/skills/create-ticket/SKILL.md	software/application-software/workspace-inherit/.claude/skills/create-ticket/SKILL.md
-100644 4917259f9e29db28e2636496e80f80ee5d9e321e	.claude/skills/journal/SKILL.md	software/workspace-inherit/.claude/skills/journal/SKILL.md
-100755 1e90d7b9afa14b8b0e7f36e0e1d83baecc94ba5b	.claude/skills/journal/scripts/capture.sh	software/workspace-inherit/.claude/skills/journal/scripts/capture.sh
-100644 0495fc97cbe93e4331c89263aee188f6c0e9c9ea	.claude/skills/new-worktree/SKILL.md	software/workspace-inherit/.claude/skills/new-worktree/SKILL.md
-100644 b1e7c71c13b4ea7c40cabeb12aa1674a6b543dc5	.claude/skills/open-pr/SKILL.md	software/application-software/workspace-inherit/.claude/skills/open-pr/SKILL.md
-100755 61f377fef63daa10c443129df6a49571fdbeb658	.claude/skills/open-pr/scripts/pr-checks.sh	software/application-software/workspace-inherit/.claude/skills/open-pr/scripts/pr-checks.sh
-100644 e67387116a753217d256d81901e5b4091b49b44c	.claude/skills/report-spike/SKILL.md	software/application-software/workspace-inherit/.claude/skills/report-spike/SKILL.md
-100644 fdc1ce85211200223040edfb5dc65a3de7f35d53	.claude/skills/setup-workspace/SKILL.md	software/workspace-inherit/.claude/skills/setup-workspace/SKILL.md
-100644 e0a8b424d11c4897901c0ce888a6c0c726daed98	.claude/skills/switch-workspace/SKILL.md	software/workspace-inherit/.claude/skills/switch-workspace/SKILL.md
-100644 069b51714c0fd4d3d6ad972dd9f840e01f21cf15	.claude/skills/update-pr/SKILL.md	software/application-software/workspace-inherit/.claude/skills/update-pr/SKILL.md
diff --git a/software/firmware/calypso/workspaces/calypso-dev/.claude/skills/journal/SKILL.md b/software/firmware/calypso/workspaces/calypso-dev/.claude/skills/journal/SKILL.md
deleted file mode 100644
index 4917259..0000000
--- a/software/firmware/calypso/workspaces/calypso-dev/.claude/skills/journal/SKILL.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-name: journal
-description: Park rough notes locally mid-task ("note to self", "remember to", "journal this"), and later export them to their permanent home (issue, spec, ADR, glossary, docs) through the skill that owns it. Use when the user wants to jot a thought without derailing, or to file parked notes.
----
-
-Notes live in `.journal/` at the workspace root (git-excluded, outside worktrees so they survive removal). An **entry** is one file, a **category** a subfolder. The journal never pushes, files, or contacts GitHub itself.
-
-**Capture** (no git, no other skills):
-
-```
-bash scripts/capture.sh [-c <category>] ["note text"]
-```
-
-Omit `-c` for a loose entry, omit the text for an empty one to edit. Report the path it prints.
-
-**Export** (only when asked):
-
-1. Read the entries and propose a grouping: one entry → one output, a category → one merged output, or one entry split across several. Let the user adjust.
-2. For each output, pick the workspace skill whose description fits its permanent home, preferring an existing docs area. A new section always needs approval.
-3. Show the destination and reshaped text and wait for approval. Nothing lands silently.
-4. Delegate to that skill; it owns formatting, conventions, and any GitHub contact.
-5. Ask whether to delete the exported entry (default: keep).
diff --git a/software/firmware/calypso/workspaces/calypso-dev/.claude/skills/journal/scripts/capture.sh b/software/firmware/calypso/workspaces/calypso-dev/.claude/skills/journal/scripts/capture.sh
deleted file mode 100755
index 1e90d7b..0000000
--- a/software/firmware/calypso/workspaces/calypso-dev/.claude/skills/journal/scripts/capture.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-# capture.sh [-c <category>] [note text]: write a timestamped journal entry to
-# .journal/[<category>/] at the workspace root (adding /.journal/ to .git/info/exclude once) and print
-# its path. An empty entry is created when no text is given. Never touches git history, GitHub, or
-# other skills.
-set -euo pipefail
-usage="usage: capture.sh [-c <category>] [note text]"
-# shellcheck source=/dev/null
-. "${DELPHI_ROOT:?unset: start the session at the workspace root, on Delphi 0.2.0+ (pull its ws/ branch), or source <root>/.delphi/paths.sh}/.delphi/paths.sh"
-dir=$DELPHI_ROOT/.journal
-[ "${1:-}" = -c ] && dir=$dir/${2:?$usage} && shift 2
-exclude=$(git -C "$DELPHI_ROOT" rev-parse --path-format=absolute --git-path info/exclude 2>/dev/null || true)
-[ -z "$exclude" ] || grep -qxF /.journal/ "$exclude" 2>/dev/null || { mkdir -p "${exclude%/*}" && echo /.journal/ >>"$exclude"; }
-mkdir -p "$dir"
-file=$dir/$(date +%Y-%m-%d-%H%M%S).md
-{ echo "<!-- captured $(date -u +%Y-%m-%dT%H:%M:%SZ) -->"; [ $# -eq 0 ] || echo "$*"; } >"$file"
-echo "$file"
diff --git a/software/firmware/calypso/workspaces/calypso-dev/.claude/skills/new-worktree/SKILL.md b/software/firmware/calypso/workspaces/calypso-dev/.claude/skills/new-worktree/SKILL.md
deleted file mode 100644
index 0495fc9..0000000
--- a/software/firmware/calypso/workspaces/calypso-dev/.claude/skills/new-worktree/SKILL.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-name: new-worktree
-description: Create or reuse a worktree for a branch of a code repo (worktrees/<repo>/<branch>). Use before any branch work, such as starting a ticket or reviewing or fixing a PR branch, unless the user says not to use worktrees.
----
-
-Run from the workspace root:
-
-```
-bash .delphi/new-worktree.sh <repo> <branch> [<base>]
-```
-
-- An existing branch (local or on origin, e.g. a PR head) is checked out; anything else is created from `<base>` (default: the repo's default branch). Safe to re-run.
-- Stay at the workspace root and reach into the worktree by the printed path. Never switch branches in an existing worktree or work in its store, `worktrees/<repo>/.bare`.
-- For a subagent, make its worktree here first and hand it the path. Never use the harness's own worktree isolation: it checks out this Delphi clone from main, not the code repo, and fences the subagent out of `worktrees/`.
-- Keep `worktrees/<repo>/<default-branch>/` (made by setup) a clean reference: fetch and fast-forward only.
-- After the branch merges: `git -C worktrees/<repo>/.bare worktree remove ../<branch>`.
diff --git a/software/firmware/calypso/workspaces/calypso-dev/.claude/skills/setup-workspace/SKILL.md b/software/firmware/calypso/workspaces/calypso-dev/.claude/skills/setup-workspace/SKILL.md
deleted file mode 100644
index fdc1ce8..0000000
--- a/software/firmware/calypso/workspaces/calypso-dev/.claude/skills/setup-workspace/SKILL.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-name: setup-workspace
-description: Change what this workspace checks out and re-run its setup. workspace.yml lists code repos (repos:), read-only dependency sources (references-git:), and clones of other Delphi workspaces or main to read (workspaces:). Use when the user wants to read or compare another workspace's or main's instructions, skills, or docs (link it), add or remove a repo or dependency reference, or run setup after cloning or pulling.
----
-
-`workspace.yml` at the workspace root lists what `.delphi/setup.sh` checks out, all git-ignored: code repos (`repos:`), dependency sources (`references-git:`), and other Delphi workspaces or main (`workspaces:`, entries `- <name>` or `- main`; a workspace's name is the short names of its folders (each folder's `short-name` file, else its name) and its own folder name, joined by dots, like `s.app.argos.argos-dev`; `bash .delphi/switch.sh --list` lists them). The comment on each section gives its entry format and where it lands; read it, then edit the file.
-
-Run from the workspace root after any change, and to refresh references and workspace copies to their latest:
-
-```
-bash .delphi/setup.sh
-```
-
-- The clones under `workspaces/` are full clones, each on its branch (`ws/<name>` or `main`) tracking origin, for reading: don't edit, branch, or push them from this workspace. Each setup run switches a clone back to its branch if it was switched away (refused while it has uncommitted changes), pulls it, and runs its own setup, so that workspace's repos and references are under it too (it skips its own `workspaces:`, so they don't chain). To change one of those workspaces or main, work in its own clone or switch to it (`switch-workspace` skill).
-- This workspace's project folder (shared context, `AUTHORING.md`, `workspace-defaults/`) is the folder above `workspaces/<leaf>/` in `workspaces/main/` (`bash .delphi/switch.sh --list` prints it): for `s.app.argos.argos-dev`, `workspaces/main/software/application-software/argos/`. List workspaces and their project folders: `bash .delphi/switch.sh --list`.
-- `workspace.yml` is shared: change it on a branch and open a PR into `ws/<this-name>` (the `name:` in `workspace.yml`). For a one-off look, add the entry, run setup, then `git restore workspace.yml`.
-- Setup never deletes what you'd lose. A removed entry's `workspaces/<name>/`, `references/<name>/`, or repo store and worktrees stay until you delete them (ask first).
-- When Delphi releases a version that needs cleanup in clones, setup runs its migration first (`.delphi/migrations/`), once per workspace. A migration removes only what nothing is lost from, and otherwise stops setup with what to do: tell the user, do it with their go-ahead, and re-run.
diff --git a/software/firmware/calypso/workspaces/calypso-dev/.claude/skills/switch-workspace/SKILL.md b/software/firmware/calypso/workspaces/calypso-dev/.claude/skills/switch-workspace/SKILL.md
deleted file mode 100644
index e0a8b42..0000000
--- a/software/firmware/calypso/workspaces/calypso-dev/.claude/skills/switch-workspace/SKILL.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: switch-workspace
-description: Switch this clone to another Delphi workspace, or to Delphi's main, to work in it. Use when the user wants to check out, switch to, open, or work in another workspace or project, or to change another workspace's or main's files.
----
-
-Run from the workspace root:
-
-```
-bash .delphi/switch.sh <name>        # ws/<name>: its dotted name, e.g. s.app.argos.argos-dev
-bash .delphi/switch.sh main          # Delphi's main: project folders, templates, CI
-```
-
-- The user can also switch from the `/ws-delphi` pane (the `delphi` plugin's mod), which shows them as cards (`bash .delphi/switch.sh --list`): press one, then Switch workspace; `/ws-delphi <name>` switches straight away, and `/ws-delphi --web` opens the same cards in a browser tab.
-- List workspaces and their project folders: `bash .delphi/switch.sh --list`.
-- It refuses while tracked files have changes: commit them on a branch (and PR them) first. Then it fetches, switches, fast-forwards, and runs the new workspace's `.delphi/setup.sh`.
-- The post-checkout hook parks this workspace's `repos/`, `worktrees/`, `references/` and `workspaces/` in `.delphi/parked/<name>/` (git-ignored; `<name>` as in its `workspace.yml`) and brings the other's back at the same paths, so worktrees and the work in them return as they were. Switch back the same way. Never run `git clean -X` or `git stash --all` at the workspace root: they take ignored files, parked work included.
-- Before switching, stop anything running from `worktrees/` (dev servers, Docker builds): its folder moves.
-- No restart needed: skills under `.claude/skills/` reload on their own, and the `delphi` mod sends the new workspace's `CLAUDE.md` with the next prompt. Without the mod installed, this session keeps the old `CLAUDE.md`: tell the user to restart Claude Code in the same folder before starting work in the new workspace.
-- To change the workspace you switched to: `git switch -c <branch>`, commit, push, and open a PR into `ws/<name>` (or `main`).
-- To only read another workspace or main without leaving this one, list it under `workspaces:` instead (`setup-workspace` skill).
diff --git a/software/firmware/calypso/workspaces/calypso-dev/workspace.generated b/software/firmware/calypso/workspaces/calypso-dev/workspace.generated
deleted file mode 100644
index 19bcf5b..0000000
--- a/software/firmware/calypso/workspaces/calypso-dev/workspace.generated
+++ /dev/null
@@ -1,7 +0,0 @@
-# Generated by ci/render.sh; edit shared sources or opt out in workspace.yml.
-100644 61c35f28dda167e42bebc3bad3994af97c53e876	.claude/settings.json	ci/plugins.sh
-100644 4917259f9e29db28e2636496e80f80ee5d9e321e	.claude/skills/journal/SKILL.md	software/workspace-inherit/.claude/skills/journal/SKILL.md
-100755 1e90d7b9afa14b8b0e7f36e0e1d83baecc94ba5b	.claude/skills/journal/scripts/capture.sh	software/workspace-inherit/.claude/skills/journal/scripts/capture.sh
-100644 0495fc97cbe93e4331c89263aee188f6c0e9c9ea	.claude/skills/new-worktree/SKILL.md	software/workspace-inherit/.claude/skills/new-worktree/SKILL.md
-100644 fdc1ce85211200223040edfb5dc65a3de7f35d53	.claude/skills/setup-workspace/SKILL.md	software/workspace-inherit/.claude/skills/setup-workspace/SKILL.md
-100644 e0a8b424d11c4897901c0ce888a6c0c726daed98	.claude/skills/switch-workspace/SKILL.md	software/workspace-inherit/.claude/skills/switch-workspace/SKILL.md
diff --git a/tests/e2e.sh b/tests/e2e.sh
index de87515..2b6c341 100644
--- a/tests/e2e.sh
+++ b/tests/e2e.sh
@@ -79,11 +79,13 @@ sync >"$t/out"
 main=$(o rev-parse main)
 for w in "$A" "$B"; do
   n=$BN && [ "$w" != "$A" ] || n=$AN
-  o diff --quiet "main:$w" "ws/$n" -- ':!.delphi' || fail "ws/$n root != $w"
+  o diff --quiet "main:$w" "ws/$n" -- ':!.delphi' ':!workspace.generated' || fail "ws/$n root != $w"
   [ "$(o rev-parse "ws/$n:.delphi")" = "$(o rev-parse main:.delphi)" ] || fail "ws/$n lacks main's .delphi/"
   [ "$(o rev-parse "ws/$n^")" = "$main" ] || fail "ws/$n parent is not main"
   [ "$(o log -1 --format=%s "ws/$n")" = "delphi: create ws/$n from $w" ] || fail "ws/$n message"
   o cat-file -e "ws/$n:workspace.yml" || fail "ws/$n lacks workspace.yml"
+  o cat-file -e "ws/$n:workspace.generated" || fail "ws/$n lacks staged ownership metadata"
+  ! o cat-file -e "main:$w/workspace.generated" 2>/dev/null || fail "main contains branch ownership metadata"
   { ! o cat-file -e "ws/$n:README.md" 2>/dev/null && ! o cat-file -e "ws/$n:ci" 2>/dev/null; } ||
     fail "ws/$n has Delphi root files"
   [ "$(o rev-parse "ws/$n:.github/workflows/delphi.yml")" = "$(o rev-parse main:.github/workflows/delphi.yml)" ] ||
@@ -136,7 +138,7 @@ o show ws/$AN:docs/CONTEXT.md | grep -qx "ws edit two" || fail "ws edit lost"
 ! o cat-file -e ws/$AN:README.md 2>/dev/null || fail "root file leaked into ws"
 [ "$(o diff --name-only main propose/$AN)" = "$A/docs/CONTEXT.md" ] || fail "propose diff wrong after refresh"
 ok "main-side edit refreshes cleanly alongside ws edits; propose carries only the ws edit"
-o diff --quiet "main:$B" ws/$BN -- ":!.delphi" || fail "bms-dev drifted"
+o diff --quiet "main:$B" ws/$BN -- ":!.delphi" ":!workspace.generated" || fail "bms-dev drifted"
 ok "unrelated main changes leave other ws branches' trees alone"
 
 # --- 4b. .delphi/ lives only at main's root: refresh syncs it onto every ws/*, propose never carries it
@@ -172,7 +174,7 @@ ok "workspace configuration changes generate native settings in the main-side pr
 commit_on ws/$AN .claude/settings.json "hand edit"
 sync "$AN" >"$t/out" 2>&1 || fail "settings reset failed: $(cat "$t/out")"
 [ "$(o rev-parse "main:$A/.claude/settings.json")" = "$(o rev-parse "ws/$AN:.claude/settings.json")" ] || fail "hand edit kept"
-ok "refresh resets managed native settings from main without running an adapter"
+ok "refresh resets managed native settings to main's current plugin configuration"
 commit_on ws/$AN workspace.yml "  - argos.nope"
 if sync "$AN" >"$t/out" 2>"$t/err"; then fail "unknown plugin set accepted"; fi
 grep -q "lists argos.nope, which isn't a plugin set" "$t/err" || fail "unknown set not reported: $(cat "$t/err")"
@@ -181,7 +183,7 @@ grep -q "lists argos.nope, which isn't a plugin set" "$t/err" || fail "unknown s
 sync "$AN" >/dev/null 2>&1 || fail "sync after dropping unknown set failed"
 ok "a failed main-side render prevents publication of the proposal"
 
-# --- 4d. managed native copies live on main; refresh copies them and opt-outs transfer ownership
+# --- 4d. inherited copies exist only on workspace branches; opt-outs transfer ownership
 on_main() { # <message> <command...>: a change on main, pushed
   local m=$1 && shift
   (cd "$t/dev" && git fetch -q && git checkout -q -B tmp-main origin/main && "$@" && bash ci/render.sh >/dev/null && git add -A && git commit -qm "$m" && git push -q origin HEAD:main)
@@ -192,13 +194,14 @@ sync >"$t/out" 2>&1 || fail "sync after adding workspace-inherit/ failed: $(cat
 for n in "$AN" "$BN"; do o show "ws/$n:.claude/skills/top/SKILL.md" | grep -qx "top v1" || fail "ws/$n lacks software/workspace-inherit/"; done
 o show "ws/$AN:notes/app.md" | grep -qx "app v1" || fail "ws/$AN lacks application-software/workspace-inherit/"
 ! o cat-file -e "ws/$BN:notes/app.md" 2>/dev/null || fail "ws/$BN inherited from a folder it isn't under"
-[ "$(o rev-parse "main:$A/.claude/skills/top/SKILL.md")" = "$(o rev-parse "ws/$AN:.claude/skills/top/SKILL.md")" ] || fail "native inheritance is absent on main"
-o show "propose/$AN:$A/.claude/skills/top/SKILL.md" | grep -qx "top v1" || fail "main proposal lost managed output"
-ok "main holds applicable native inheritance and refresh copies it into the workspace root"
+! o cat-file -e "main:$A/.claude/skills/top/SKILL.md" 2>/dev/null || fail "main contains inherited output"
+! o cat-file -e "propose/$AN:$A/.claude/skills/top/SKILL.md" 2>/dev/null || fail "proposal contains inherited output"
+! o cat-file -e "propose/$AN:$A/workspace.generated" 2>/dev/null || fail "proposal contains branch ownership metadata"
+ok "canonical sources stay on main while applicable native inheritance and ledgers exist only on workspace branches"
 commit_on ws/$AN .claude/skills/top/SKILL.md "ws edit"
 sync "$AN" >"$t/out" 2>&1 || fail "sync after a ws edit to an inherited file failed: $(cat "$t/out")"
 [ "$(o show "ws/$AN:.claude/skills/top/SKILL.md")" = "top v1" ] || fail "ws edit to an inherited file not reset"
-[ "$(o show "propose/$AN:$A/.claude/skills/top/SKILL.md")" = "top v1" ] || fail "ws edit to managed output proposed"
+! o cat-file -e "propose/$AN:$A/.claude/skills/top/SKILL.md" 2>/dev/null || fail "ws edit to managed output proposed"
 on_main "inherit v2, drop app.md" sh -c "echo 'top v2' >$TI/SKILL.md && git rm -q $AI/app.md"
 sync >"$t/out" 2>&1 || fail "sync after changing workspace-inherit/ failed: $(cat "$t/out")"
 o show "ws/$AN:.claude/skills/top/SKILL.md" | grep -qx "top v2" || fail "inherited change not refreshed"
@@ -217,7 +220,7 @@ on_main "inherited file fixture" sh -c "mkdir -p $AI && echo before >$AI/layout"
 sync refresh "$AN" >/dev/null
 on_main "replace inherited file with directory" sh -c "rm $AI/layout && mkdir $AI/layout && echo after >$AI/layout/guide.md"
 sync refresh "$AN" >"$t/out" 2>&1 || fail "managed file-to-directory refresh: $(cat "$t/out")"
-o show "main:$A/notes/layout/guide.md" | grep -qx after || fail "main lacks native nested output"
+! o cat-file -e "main:$A/notes/layout/guide.md" 2>/dev/null || fail "main contains native nested output"
 o show "ws/$AN:notes/layout/guide.md" | grep -qx after || fail "refresh lost nested output"
 ok "native managed paths can change from files to directories without creating sparse-index entries"
 on_main "replace inherited directory with file" sh -c "rm -r $AI/layout && echo final >$AI/layout"
@@ -309,6 +312,24 @@ o show "ws/$AN:.claude/skills/retire-safety/SKILL.md" | grep -qx owned || fail "
 sync refresh "$AN" >/dev/null
 ok "retired edits refuse refresh and propose against trusted hashes while other workspaces continue"
 
+RI=software/workspace-inherit/.claude/skills/retire-mode
+on_main "retirement mode fixture" sh -c "mkdir -p $RI && echo shared >$RI/SKILL.md && chmod +x $RI/SKILL.md"
+sync refresh "$AN" >/dev/null
+(cd "$t/dev" && git fetch -q && git checkout -q -B edited-retirement-mode "origin/ws/$AN" &&
+  chmod -x .claude/skills/retire-mode/SKILL.md && git commit -qam "edit retired executable mode" && git push -q origin "HEAD:ws/$AN")
+on_main "retire mode source" git rm -rq "$RI"
+owned_head=$(o rev-parse "ws/$AN")
+for direction in refresh propose; do
+  if sync "$direction" "$AN" >"$t/out" 2>"$t/err"; then fail "$direction deleted a mode-edited retired file"; fi
+  grep -q 'retired managed .claude/skills/retire-mode/SKILL.md has local edits' "$t/err" || fail "$direction did not report retired mode edit"
+  [ "$(o rev-parse "ws/$AN")" = "$owned_head" ] || fail "$direction changed a mode-edited retired file"
+done
+[ "$(o ls-tree "ws/$AN" .claude/skills/retire-mode/SKILL.md | cut -d' ' -f1)" = 100644 ] || fail "retired local mode was lost"
+(cd "$t/dev" && git fetch -q && git checkout -q -B accept-mode-retirement "origin/ws/$AN" &&
+  git rm -q .claude/skills/retire-mode/SKILL.md && git commit -qm "accept mode retirement" && git push -q origin "HEAD:ws/$AN")
+sync refresh "$AN" >/dev/null
+ok "branch retirement preserves executable-mode-only edits in both refresh and propose"
+
 RI=software/workspace-inherit/.claude/skills/retire-optout
 on_main "unsynced opt-out fixture" sh -c "mkdir -p $RI && echo shared >$RI/SKILL.md"
 sync refresh "$BN" >/dev/null
@@ -372,9 +393,8 @@ expect_bad codex-no-instructions "AGENTS.md: required for codex" rm "$CX/AGENTS.
 expect_bad codex-wrong-native "CLAUDE.md: belongs to a different harness" touch "$CX/CLAUDE.md"
 expect_bad codex-inherited-wrong-native "has no mapping to codex" sh -c "mkdir -p software/workspace-inherit/.claude && printf 'format: claude-code\\n' >software/workspace-inherit/source.yml && echo x >software/workspace-inherit/.claude/extra.json"
 expect_bad inherited-collision "also inherits it from a folder above" sh -c "mkdir -p software/application-software/workspace-inherit/.claude/skills/journal && echo x >software/application-software/workspace-inherit/.claude/skills/journal/SKILL.md"
-expect_bad missing-native-output "$CX/.agents/skills/journal/SKILL.md: inherited from" rm "$CX/.agents/skills/journal/SKILL.md"
-expect_bad changed-shared-source "out of date; run ci/render.sh" sh -c "echo changed >>software/workspace-inherit/.claude/skills/journal/SKILL.md"
-expect_bad missing-ownership-record "$CX/workspace.generated: ownership record is out of date" rm "$CX/workspace.generated"
+expect_bad main-inherited-copy "workspace-owned file collides" sh -c "mkdir -p $CX/.agents/skills/journal && cp software/workspace-inherit/.claude/skills/journal/SKILL.md $CX/.agents/skills/journal/SKILL.md"
+expect_bad main-ownership-record "ownership records belong only on workspace branches" touch "$CX/workspace.generated"
 expect_bad unknown-source-format "declare one supported source format" sh -c "echo 'format: unknown' >${A%/workspaces/*}/workspace-defaults/source.yml"
 expect_bad mixed-source-formats "AGENTS.md does not belong to the declared claude-code format" touch "${A%/workspaces/*}/workspace-defaults/AGENTS.md"
 expect_bad owned-output-collision "workspace-owned file collides" sh -c "mkdir -p software/workspace-inherit/.claude/skills/collision $CX/.agents/skills/collision && echo shared >software/workspace-inherit/.claude/skills/collision/SKILL.md && echo own >$CX/.agents/skills/collision/SKILL.md"
@@ -432,40 +452,69 @@ expect_bad workflow-drift "argos-dev/.github/workflows/delphi.yml: differs" sh -
 expect_bad defaults-manifest "workspace-defaults/workspace.yml: unexpected line" sh -c "printf 'x: y\n' >>${A%/workspaces/*}/workspace-defaults/workspace.yml"
 expect_bad defaults-named-workspace "workspace-defaults/.delphi: managed" sh -c "mkdir -p software/x/workspaces/workspace-defaults/.delphi && cp -R $A/. software/x/workspaces/workspace-defaults/"
 expect_bad old-defaults "defaults: renamed workspace-defaults/" mkdir -p "${A%/workspaces/*}/defaults"
-expect_bad inherited-file-kept "$A/.claude/skills/journal/SKILL.md: inherited from software/workspace-inherit/.claude/skills/journal/" sh -c "mkdir -p $A/.claude/skills/journal && echo x >$A/.claude/skills/journal/SKILL.md"
+expect_bad inherited-file-kept "workspace-owned file collides" sh -c "mkdir -p $A/.claude/skills/journal && echo x >$A/.claude/skills/journal/SKILL.md"
 d=$t/chk-inherited-file-kept
-rm -r "$d/software/workspace-inherit/.claude/skills/journal"
-if "$src/ci/render.sh" "$d" >"$t/out" 2>"$t/err"; then fail "renderer deleted edited retired output"; fi
-grep -q 'retired managed file has local edits' "$t/err" || fail "retired edit not reported"
-[ "$(cat "$d/$A/.claude/skills/journal/SKILL.md")" = x ] || fail "retired edited output deleted"
-ok "main-side generation reports edited retired files and leaves their content intact"
-expect_bad retired-mode-edit 'retired managed file has local edits' sh -c "chmod +x $A/.claude/skills/journal/SKILL.md && rm -r software/workspace-inherit/.claude/skills/journal"
-d=$t/chk-retired-mode-edit
-if "$src/ci/render.sh" "$d" >"$t/out" 2>"$t/err"; then fail "renderer deleted mode-edited retired output"; fi
-[ -x "$d/$A/.claude/skills/journal/SKILL.md" ] || fail "retired executable mode was lost"
-ok "main-side retirement preserves executable-mode edits"
+if "$src/ci/render.sh" "$d" >"$t/out" 2>"$t/err"; then fail "renderer overwrote main-owned output"; fi
+[ "$(cat "$d/$A/.claude/skills/journal/SKILL.md")" = x ] || fail "main-owned output changed"
+ok "main rejects inherited copies and preserves conflicting owned content"
 
-expect_bad managed-file-to-owned-directory 'workspace-owned file collides' sh -c "rm $A/.claude/skills/journal/SKILL.md && mkdir $A/.claude/skills/journal/SKILL.md && echo owned >$A/.claude/skills/journal/SKILL.md/own"
+expect_bad managed-file-to-owned-directory 'workspace-owned file collides' sh -c "mkdir -p $A/.claude/skills/journal/SKILL.md && echo owned >$A/.claude/skills/journal/SKILL.md/own"
 d=$t/chk-managed-file-to-owned-directory
 if "$src/ci/render.sh" "$d" >"$t/out" 2>"$t/err"; then fail "renderer wrote managed output into an owned directory"; fi
 [ "$(cat "$d/$A/.claude/skills/journal/SKILL.md/own")" = owned ] || fail "owned directory contents changed"
 [ -n "$(find "$d/$A/.claude/skills/journal/SKILL.md" -prune -perm -100)" ] || fail "owned directory traversal mode changed"
-ok "main-side generation refuses a managed file replaced by an owned directory without chmod or copy"
+ok "staging refuses an inherited destination occupied by an owned directory without chmod or copy"
 
-expect_bad topology-empty-directory 'workspace-owned file collides' sh -c "mkdir $A/.claude/skills/journal/empty && rm -r software/workspace-inherit/.claude/skills/journal && echo replacement >software/workspace-inherit/.claude/skills/journal"
+expect_bad topology-empty-directory 'workspace-owned file collides' sh -c "mkdir -p $A/.claude/skills/journal/empty && rm -r software/workspace-inherit/.claude/skills/journal && echo replacement >software/workspace-inherit/.claude/skills/journal"
 d=$t/chk-topology-empty-directory
 if "$src/ci/render.sh" "$d" >"$t/out" 2>"$t/err"; then fail "renderer replaced an untracked empty directory"; fi
 [ -d "$d/$A/.claude/skills/journal/empty" ] || fail "untracked empty directory was removed"
-[ -f "$d/$A/.claude/skills/journal/SKILL.md" ] || fail "refused topology change removed managed siblings"
-ok "main-side topology changes preserve untracked empty directories"
+ok "staging preserves untracked empty directories at inherited destinations"
 
-expect_bad render-symlink 'symlinks are not allowed' sh -c "cp $A/.claude/skills/journal/SKILL.md outside-symlink-target && rm $A/.claude/skills/journal/SKILL.md && ln -s ../../../../../../../../outside-symlink-target $A/.claude/skills/journal/SKILL.md && echo changed >>software/workspace-inherit/.claude/skills/journal/SKILL.md"
+expect_bad render-symlink 'symlinks are not allowed' sh -c "mkdir -p $A/.claude/skills/journal && cp software/workspace-inherit/.claude/skills/journal/SKILL.md outside-symlink-target && ln -s ../../../../../../../../outside-symlink-target $A/.claude/skills/journal/SKILL.md && echo changed >>software/workspace-inherit/.claude/skills/journal/SKILL.md"
 d=$t/chk-render-symlink
 cp "$d/outside-symlink-target" "$t/symlink-target-before"
 if "$src/ci/render.sh" "$d" >"$t/out" 2>"$t/err"; then fail "renderer followed a symlink"; fi
 cmp -s "$d/outside-symlink-target" "$t/symlink-target-before" || fail "renderer changed a symlink target"
 ok "render refuses symlinks before changing any generated output"
 
+d=$t/staging
+mkdir "$d"
+cp -R "$src/ci" "$src/software" "$src/templates" "$src/.github" "$src/.delphi" "$src/.claude-plugin" "$d/"
+(cd "$d" && git init -q && chmod +x software/workspace-inherit/.claude/skills/journal/scripts/capture.sh &&
+  echo changed >>software/workspace-inherit/.claude/skills/journal/SKILL.md && git add -A && git commit -qm source-change &&
+  bash ci/check.sh . && bash ci/render.sh --check . "$t/staged-native" &&
+  bash ci/render.sh . "$t/staged-native-again" && [ -z "$(git status --porcelain)" ]) >"$t/out" 2>"$t/err" || fail "read-only staging: $(cat "$t/err")"
+diff -qr "$t/staged-native" "$t/staged-native-again" >/dev/null || fail "repeated staging changed native output"
+for folder in "$A" "$CX"; do
+  [ -f "$t/staged-native/$folder/workspace.generated" ] || fail "staging lacks ownership metadata"
+  [ ! -e "$d/$folder/workspace.generated" ] || fail "staging wrote a ledger to main"
+done
+[ ! -e "$d/$CX/.agents/skills/journal/SKILL.md" ] || fail "staging wrote inherited skills to main"
+while IFS=$'\t' read -r meta path _; do
+  case "$meta" in '' | '#'* ) continue ;; esac
+  [ "$(git -C "$d" hash-object -- "$t/staged-native/$CX/$path")" = "${meta#* }" ] || fail "staged ledger hash differs from native bytes"
+  if [ "${meta%% *}" = 100755 ]; then [ -x "$t/staged-native/$CX/$path" ] || fail "staged executable mode lost"; fi
+done <"$t/staged-native/$CX/workspace.generated"
+[ -x "$t/staged-native/$CX/.agents/skills/journal/scripts/capture.sh" ] || fail "staged helper lost executable mode"
+ok "source edits validate without main copies; staged native hashes, modes and repeat output are stable and leave main unchanged"
+echo stale-marker >>"$d/$A/.claude/settings.json"
+"$d/ci/render.sh" --workspace "$CX" "$d" "$t/staged-one" >"$t/out" 2>"$t/err" || fail "workspace-only staging: $(cat "$t/err")"
+grep -q stale-marker "$d/$A/.claude/settings.json" || fail "workspace-only staging rewrote global plugin output"
+[ -f "$t/staged-one/$CX/workspace.generated" ] && [ ! -e "$t/staged-one/$A" ] || fail "workspace-only staging included another workspace"
+if "$d/ci/render.sh" --workspace "$CX" "$d" >"$t/out" 2>"$t/err"; then fail "workspace-only staging accepted no output directory"; fi
+if "$d/ci/render.sh" "$d" "$d/staging" >"$t/out" 2>"$t/err"; then fail "staging output inside main was accepted"; fi
+ok "workspace-only staging requires an external output directory and skips global plugin generation"
+git -C "$d" checkout -q -- "$A/.claude/settings.json"
+mkdir "$t/staged-symlink"
+ln -s "$d/software" "$t/staged-symlink/software"
+owned_instruction=$(git -C "$d" hash-object "$CX/AGENTS.md")
+if "$d/ci/render.sh" --workspace "$CX" "$d" "$t/staged-symlink" >"$t/out" 2>"$t/err"; then fail "staging followed an output symlink into main"; fi
+grep -q 'symlink' "$t/err" || fail "unsafe staging symlink was not reported"
+[ "$(git -C "$d" hash-object "$CX/AGENTS.md")" = "$owned_instruction" ] || fail "staging output symlink changed main-owned instructions"
+[ -z "$(git -C "$d" status --porcelain)" ] || fail "refused staging output changed main"
+ok "staging refuses output symlinks before touching main-owned workspace data"
+
 expect_bad inherited-twice "also inherits it from a folder above" sh -c "mkdir -p software/application-software/workspace-inherit/.claude/skills/journal && printf 'format: claude-code\\n' >software/application-software/workspace-inherit/source.yml && echo x >software/application-software/workspace-inherit/.claude/skills/journal/SKILL.md"
 expect_bad inherited-claude-md "software/workspace-inherit/CLAUDE.md: each workspace has its own" sh -c "mkdir -p software/workspace-inherit && printf 'format: claude-code\\n' >software/workspace-inherit/source.yml && echo x >software/workspace-inherit/CLAUDE.md"
 expect_bad inherit-in-workspace "belongs in an org or project folder" sh -c "mkdir -p $A/workspace-inherit && echo x >$A/workspace-inherit/f"
@@ -626,7 +675,8 @@ o show "new-workspace/electrical/firmware/fw-dev:$F/CLAUDE.md" | grep -qx "# Fir
   fail "defaults workspace.yml not used, or name: not set"
 o cat-file -e "new-workspace/electrical/firmware/fw-dev:$F/.claude/skills/fw/SKILL.md" || fail "defaults skill not copied"
 o cat-file -e "new-workspace/electrical/firmware/fw-dev:$F/.claude/settings.json" || fail "new workspace has no generated settings.json"
-o cat-file -e "new-workspace/electrical/firmware/fw-dev:$F/.claude/skills/top/SKILL.md" || fail "main PR lacks inherited native skill"
+! o cat-file -e "new-workspace/electrical/firmware/fw-dev:$F/.claude/skills/top/SKILL.md" 2>/dev/null || fail "new workspace PR contains inherited output"
+! o cat-file -e "new-workspace/electrical/firmware/fw-dev:$F/workspace.generated" 2>/dev/null || fail "new workspace PR contains branch ownership metadata"
 grep -q "gh pr create --base main --head new-workspace/electrical/firmware/fw-dev --title Add workspace $FN --label by: ai --body ## Changes" "$t/gh.log" ||
   fail "no PR for new workspace, or not labelled by: ai with the template's sections: $(cat "$t/gh.log")"
 (cd "$t/dev" && tools/new-workspace.sh --by ai-assisted electrical/firmware fw-two >/dev/null) || fail "new-workspace.sh --by failed"
@@ -638,7 +688,7 @@ grep -q "s.electrical.firmware.fw-two --label by: ai-assisted " "$t/gh.log" || f
 (cd "$t/dev" && ! tools/new-workspace.sh ../x ok 2>/dev/null) || fail "bad org path accepted"
 [ -z "$(git -C "$t/dev" status --porcelain)" ] || fail "new-workspace touched the checkout"
 ok "new-workspace.sh opens a PR with the templated folder; rejects duplicates and bad input"
-ok "new-workspace.sh adds the project's workspace-defaults/ (CLAUDE.md appended, placeholders filled), with native managed inheritance on main"
+ok "new-workspace.sh adds the project's workspace-defaults/ (CLAUDE.md appended, placeholders filled), without inherited copies or ledgers on main"
 ok "new-workspace.sh works when a local new-workspace/<name> branch is left over"
 ok "new-workspace.sh's PR follows the PR template, labelled by: ai unless --by says otherwise"
 
@@ -889,7 +939,13 @@ C=software/electrical/workspaces/vcu-dev CN=s.electrical.vcu-dev CO=software/ele
 (cd "$t/dev" && git fetch -q && git checkout -q -B main origin/main && mkdir -p "$C" && cp -R templates/workspace/. "$C/" &&
   sed -i.bak "s|{{name}}|$CO|" "$C/workspace.yml" && rm "$C/workspace.yml.bak" && bash ci/plugins.sh >/dev/null &&
   git add -A && git commit -qm "vcu-dev, still named the old way" && git push -q origin main &&
+  bash ci/render.sh --workspace "$C" . "$t/rename-stage" &&
   i=$t/legacy.index && GIT_INDEX_FILE=$i git read-tree "main:$C" && GIT_INDEX_FILE=$i git read-tree --prefix=.delphi/ main:.delphi &&
+  while IFS= read -r stage_file; do
+    stage_mode=100644; [ ! -x "$stage_file" ] || stage_mode=100755
+    stage_blob=$(git hash-object -w -- "$stage_file") &&
+      GIT_INDEX_FILE=$i git update-index --add --cacheinfo "$stage_mode,$stage_blob,${stage_file#"$t/rename-stage/$C/"}" || exit 1
+  done < <(find "$t/rename-stage/$C" -type f | LC_ALL=C sort) &&
   git push -q origin "$(git commit-tree -p main -m "delphi: create ws/$CO" "$(GIT_INDEX_FILE=$i git write-tree)"):refs/heads/ws/$CO" &&
   git push -q origin "origin/main:refs/heads/ws/$CN" && # a stale ws/<name> behind it
   rm "$i" && sed -i.bak "s|^name:.*|name: $CN|" "$C/workspace.yml" && rm "$C/workspace.yml.bak" && git commit -qam "vcu-dev named with dots" && git push -q origin main)
@@ -926,7 +982,7 @@ commit_on "ws/$CO" CLAUDE.md "old side" && commit_on "ws/$CN" .gitattributes "#
   ! o show "ws/$CN:CLAUDE.md" | grep -qx "old side"; } || fail "a diverged old name was merged or not reported: $(cat "$t/out")"
 ok "an old name with commits of its own is reported, never merged"
 
-# --- 13. portable harnesses: native main-side output, round trips, transitions, bootstrap and authoring
+# --- 13. portable harnesses: staged native output, round trips, transitions, bootstrap and authoring
 mkdir -p "$t/metadata-variants"
 cat >"$t/metadata-variants/source.md" <<'SKILL'
 ---
@@ -1003,15 +1059,17 @@ for skill in top portable; do
 done
 ! o cat-file -e "ws/$CN:.claude" 2>/dev/null || fail "Codex inherited Claude files"
 [ "$(o rev-parse "ws/$CN^")" = "$(o rev-parse main)" ] || fail "Codex creation parent"
-ok "main-side rendering translates existing inherited Claude skills to Codex native paths"
-o diff --quiet "main:$C" "ws/$CN" -- ':!.delphi' || fail "Codex branch requires native generation after main"
-ok "Codex files on main exactly match the workspace branch before runtime injection"
+ok "refresh translates existing inherited Claude skills to Codex native paths only on the workspace branch"
+! o cat-file -e "main:$C/.agents/skills" 2>/dev/null || fail "main contains inherited Codex skills"
+! o cat-file -e "main:$C/workspace.generated" 2>/dev/null || fail "main contains Codex ownership metadata"
+[ "$(o rev-parse "main:$C/AGENTS.md")" = "$(o rev-parse "ws/$CN:AGENTS.md")" ] || fail "Codex owned instructions changed"
+ok "main keeps owned native instructions while refresh adds inherited output and ownership only to the branch"
 
 sync refresh "$AN" >/dev/null
-cmp -s "$t/native-metadata.md" <(o show "main:$A/.claude/skills/native-metadata/SKILL.md") || fail "main changed Claude metadata or instructions"
+! o cat-file -e "main:$A/.claude/skills/native-metadata/SKILL.md" 2>/dev/null || fail "main contains an inherited Claude metadata copy"
 cmp -s "$t/native-metadata.md" <(o show "ws/$AN:.claude/skills/native-metadata/SKILL.md") || fail "refresh changed Claude metadata"
 cmp -s "$t/native-metadata.md" <(o show "main:software/workspace-inherit/.claude/skills/native-metadata/SKILL.md") || fail "translation changed the inherited Claude source"
-ok "Claude source metadata, allowed-tools and invocation flags survive main rendering and refresh byte for byte"
+ok "Claude source metadata, allowed-tools and invocation flags reach the branch byte for byte and remain canonical on main"
 cat >"$t/codex-metadata.md" <<'SKILL'
 ---
 name: native-metadata
@@ -1021,28 +1079,54 @@ metadata:
 ---
 Read AGENTS.md before making changes.
 SKILL
-cmp -s "$t/codex-metadata.md" <(o show "main:$C/.agents/skills/native-metadata/SKILL.md") || fail "Codex translation changed portable metadata or retained Claude-only fields"
+cmp -s "$t/codex-metadata.md" <(o show "ws/$CN:.agents/skills/native-metadata/SKILL.md") || fail "Codex translation changed portable metadata or retained Claude-only fields"
 ok "Codex translation omits Claude-only fields and block values while preserving portable metadata"
-cmp -s "$src/software/workspace-inherit/.claude/skills/switch-workspace/SKILL.md" <(o show "main:$A/.claude/skills/switch-workspace/SKILL.md") || fail "Claude switching instructions changed"
-o show "main:$A/.claude/skills/switch-workspace/SKILL.md" | grep -q 'No restart needed' || fail "Claude lost its hot reload workflow"
-o show "main:$C/.agents/skills/switch-workspace/SKILL.md" | grep -q 'Start a fresh Codex session' || fail "Codex lacks native restart guidance"
-! o show "main:$C/.agents/skills/switch-workspace/SKILL.md" | grep -q 'No restart needed' || fail "Claude reload behavior leaked into Codex"
+cmp -s "$src/software/workspace-inherit/.claude/skills/switch-workspace/SKILL.md" <(o show "ws/$AN:.claude/skills/switch-workspace/SKILL.md") || fail "Claude switching instructions changed"
+o show "ws/$AN:.claude/skills/switch-workspace/SKILL.md" | grep -q 'No restart needed' || fail "Claude lost its hot reload workflow"
+o show "ws/$CN:.agents/skills/switch-workspace/SKILL.md" | grep -q 'Start a fresh Codex session' || fail "Codex lacks native restart guidance"
+! o show "ws/$CN:.agents/skills/switch-workspace/SKILL.md" | grep -q 'No restart needed' || fail "Claude reload behavior leaked into Codex"
 ok "existing Claude plugin and hot reload guidance stays intact while Codex gets its own switch guidance"
 
+# A workspace's target can change before its proposal merges; ownership must use that native recipe on every refresh.
+for branch_target in claude-code codex; do
+  if [ "$branch_target" = claude-code ]; then
+    branch_instruction=CLAUDE.md; branch_previous=AGENTS.md; branch_skills=.claude/skills
+  else
+    branch_instruction=AGENTS.md; branch_previous=CLAUDE.md; branch_skills=.agents/skills
+  fi
+  (cd "$t/dev" && git fetch -q && git checkout -q -B branch-target "origin/ws/$CN" &&
+    git mv "$branch_previous" "$branch_instruction" &&
+    sed -i.bak "s/^harness:.*/harness: $branch_target/" workspace.yml && rm workspace.yml.bak &&
+    printf '\nbranch-only target %s\n' "$branch_target" >>"$branch_instruction" &&
+    git commit -qam "select branch-only $branch_target" && git push -q origin "HEAD:ws/$CN")
+  sync refresh "$CN" >"$t/out" 2>&1 || fail "branch-only $branch_target refresh: $(cat "$t/out")"
+  target_head=$(o rev-parse "ws/$CN")
+  sync refresh "$CN" >"$t/out" 2>&1 || fail "repeated branch-only $branch_target refresh: $(cat "$t/out")"
+  [ "$(o rev-parse "ws/$CN")" = "$target_head" ] || fail "repeated branch-only target refresh changed refs"
+  commit_on "ws/$CN" "$branch_skills/portable/SKILL.md" "reset generated target edit"
+  sync refresh "$CN" >"$t/out" 2>&1 || fail "branch-only target reset: $(cat "$t/out")"
+  [ "$(o show "ws/$CN:$branch_skills/portable/SKILL.md")" = "portable v1" ] || fail "branch-only target lost trusted native ownership"
+  sync propose "$CN" >"$t/out" 2>&1 || fail "branch-only $branch_target proposal: $(cat "$t/out")"
+  ! o cat-file -e "propose/$CN:$C/$branch_skills/portable/SKILL.md" 2>/dev/null || fail "branch-only target proposed inherited output"
+  ! o cat-file -e "propose/$CN:$C/workspace.generated" 2>/dev/null || fail "branch-only target proposed ownership metadata"
+  o show "propose/$CN:$C/workspace.yml" | grep -qx "harness: $branch_target" || fail "branch-only target selection not proposed"
+done
+o show "main:$C/workspace.yml" | grep -qx 'harness: codex' || fail "branch-only target changed main before merge"
+ok "unmerged harness changes survive repeated refresh, reset inherited edits and propose only owned native files in both directions"
+
 commit_on "ws/$CN" .agents/skills/portable/SKILL.md "workspace edit"
 commit_on "ws/$CN" AGENTS.md "workspace-owned instructions"
 sync propose "$CN" >"$t/out" 2>&1 || fail "Codex proposal: $(cat "$t/out")"
-[ "$(o show "propose/$CN:$C/.agents/skills/portable/SKILL.md")" = "portable v1" ] || fail "managed skill edit proposed"
+! o cat-file -e "propose/$CN:$C/.agents/skills/portable/SKILL.md" 2>/dev/null || fail "managed skill edit proposed"
+! o cat-file -e "propose/$CN:$C/workspace.generated" 2>/dev/null || fail "Codex ownership metadata proposed"
 o show "propose/$CN:$C/AGENTS.md" | grep -qx "workspace-owned instructions" || fail "AGENTS.md not proposed"
 sync refresh "$CN" >/dev/null
 [ "$(o show "ws/$CN:.agents/skills/portable/SKILL.md")" = "portable v1" ] || fail "Codex inherited edit not reset"
-ok "Codex proposals preserve native instructions and retain reviewed native skills; refresh resets inherited edits"
+ok "Codex proposals preserve native instructions and omit inherited skills and ledgers; refresh resets inherited edits"
 on_main "remove shared helper" git rm -q software/workspace-inherit/.claude/skills/portable/scripts/helper.sh
-mkdir "$t/adapters"
-for script in harnesses sources inherit render; do mv "$t/ci/ci/$script.sh" "$t/adapters/"; done
 sync refresh "$CN" >"$t/out" 2>&1 || fail "shared source update: $(cat "$t/out")"
-for script in harnesses sources inherit render; do mv "$t/adapters/$script.sh" "$t/ci/ci/"; done
-ok "refresh delivers changed native files without loading source readers or harness adapters"
+! o cat-file -e "main:$C/.agents/skills/portable/SKILL.md" 2>/dev/null || fail "source update materialized inherited output on main"
+ok "refresh reads canonical sources and adapters to stage changed native branch output"
 
 ! o cat-file -e "ws/$CN:.agents/skills/portable/scripts/helper.sh" 2>/dev/null || fail "stale inherited helper survived"
 o show "ws/$CN:.agents/skills/top/SKILL.md" | grep -qx "top v3" || fail "shared source update lost skill"
@@ -1065,6 +1149,7 @@ sync refresh "$CN" >"$t/out" 2>&1 || fail "Codex to Claude: $(cat "$t/out")"
 # shellcheck disable=SC2016 # child shell expands its positional arguments
 on_main "switch workspace back to Codex" bash -c '
   git mv "$1/CLAUDE.md" "$1/AGENTS.md"
+  git rm -q "$1/.claude/settings.json"
   printf "name: %s\nharness: codex\n" "$2" >"$1/workspace.yml"
 ' _ "$C" "$CN"
 sync "$CN" >"$t/out" 2>&1 || fail "Claude to Codex: $(cat "$t/out")"
@@ -1137,7 +1222,8 @@ o show "$created:$F/workspace.yml" | grep -qx 'harness: codex' || fail "default
 o show "$created:$F/workspace.yml" | grep -q 'fw: https://example.com/fw.git' || fail "project repos lost"
 o show "$created:$F/AGENTS.md" | grep -qx '# Firmware for s.electrical.firmware.fw-codex' || fail "Claude-authored instructions not translated"
 o cat-file -e "$created:$F/.agents/skills/fw/SKILL.md" || fail "Claude-authored default skill not translated"
-o cat-file -e "$created:$F/.agents/skills/top/SKILL.md" || fail "main PR lacks inherited native skill"
+! o cat-file -e "$created:$F/.agents/skills/top/SKILL.md" 2>/dev/null || fail "main PR contains inherited native skill"
+! o cat-file -e "$created:$F/workspace.generated" 2>/dev/null || fail "main PR contains branch ownership metadata"
 { ! o cat-file -e "$created:$F/CLAUDE.md" 2>/dev/null && ! o cat-file -e "$created:$F/.claude" 2>/dev/null; } || fail "Claude defaults leaked into Codex workspace"
 (cd "$t/dev" && ! tools/new-workspace.sh --harness unknown electrical/firmware bad-harness >/dev/null 2>&1) || fail "unknown authoring harness accepted"
 ok "Codex creation translates one Claude-authored defaults bundle into native files before its main PR"
@@ -1175,7 +1261,7 @@ o show "$created:$F/workspace.yml" | grep -q 'fw: https://example.com/fw.git' ||
 o show "$created:$F/CLAUDE.md" | grep -qx '# Firmware for s.electrical.firmware.fw-project-claude' || fail "Codex source instructions not translated"
 o cat-file -e "$created:$F/.claude/skills/fw/SKILL.md" || fail "Codex source skill not translated"
 { ! o cat-file -e "$created:$F/AGENTS.md" 2>/dev/null && ! o cat-file -e "$created:$F/.agents" 2>/dev/null; } || fail "Codex files leaked into Claude target"
-ok "changing source format preserves target adapters, native main output and explicit workspace harnesses"
+ok "changing source format preserves target adapters, owned native defaults and explicit workspace harnesses"
 
 # Native settings require an explicit mapping, never silent removal.
 # shellcheck disable=SC2016 # child shell adds a source-native configuration
@@ -1194,7 +1280,7 @@ ok "render checks do not write and repeated rendering leaves a valid main checko
 # A pre-render branch has native copies but no ledger. Prove their old source provenance.
 legacy_dev=$t/legacy-dev legacy_origin=$t/legacy-origin.git
 git clone -q "$t/seed" "$legacy_dev"
-(cd "$legacy_dev" && git rm -q "$A/workspace.generated" "$B/workspace.generated" &&
+(cd "$legacy_dev" && git rm -q ci/render.sh &&
   mkdir -p software/workspace-inherit/notes && echo old >software/workspace-inherit/notes/adoption.txt &&
   git add -A && git commit -qm "legacy main without managed ledgers")
 legacy_base=$(git -C "$legacy_dev" rev-parse HEAD)
@@ -1211,7 +1297,7 @@ for legacy_name in "$AN" "$BN"; do
   legacy_head=$(printf 'legacy workspace\n' | git -C "$legacy_dev" commit-tree -p "$legacy_base" "$legacy_tree")
   git -C "$legacy_dev" push -q origin "$legacy_head:refs/heads/ws/$legacy_name"
 done
-(cd "$legacy_dev" && echo new >software/workspace-inherit/notes/adoption.txt &&
+(cd "$legacy_dev" && cp "$src/ci/render.sh" ci/render.sh && echo new >software/workspace-inherit/notes/adoption.txt &&
   bash ci/render.sh && git add -A && git commit -qm "prepare native output" && git push -q origin main &&
   bash ci/sync.sh refresh "$AN") >"$t/out" 2>"$t/err" || fail "legacy adoption: $(cat "$t/err")"
 git -C "$legacy_origin" show "ws/$AN:notes/adoption.txt" | grep -qx new || fail "legacy source was not refreshed"
@@ -1250,12 +1336,18 @@ printf 'Fixture instructions\n' >"$d/templates/harnesses/fixture/TASKS.md"
 cp "$d/templates/harnesses/fixture/TASKS.md" "$d/$F/TASKS.md"
 printf 'name: s.app.argos.fixture\nharness: fixture\n' >"$d/$F/workspace.yml"
 chmod +x "$d/software/workspace-inherit/.claude/skills/journal/scripts/capture.sh"
-(cd "$d" && bash ci/render.sh && git add -A && bash ci/check.sh . HEAD &&
-  bash ci/render.sh && git diff --quiet) >"$t/out" 2>"$t/err" || fail "adapter extension: $(cat "$t/err")"
-grep -qx '# fixture output' "$d/$F/.fixture/skills/journal/SKILL.md" || fail "new target skill was not adapted"
-grep -qx '# fixture output' "$d/$F/.fixture/skills/journal/scripts/capture.sh" || fail "new target helper was not adapted"
-[ -x "$d/$F/.fixture/skills/journal/scripts/capture.sh" ] || fail "new target lost executable mode"
-ok "new target content rules cover skills and helpers without renderer or validator changes"
+(cd "$d" && bash ci/render.sh . "$t/fixture-stage" && git add -A && bash ci/check.sh . HEAD &&
+  bash ci/render.sh . "$t/fixture-stage-again" && git diff --quiet) >"$t/out" 2>"$t/err" || fail "adapter extension: $(cat "$t/err")"
+grep -qx '# fixture output' "$t/fixture-stage/$F/.fixture/skills/journal/SKILL.md" || fail "new target skill was not adapted"
+grep -qx '# fixture output' "$t/fixture-stage/$F/.fixture/skills/journal/scripts/capture.sh" || fail "new target helper was not adapted"
+[ -x "$t/fixture-stage/$F/.fixture/skills/journal/scripts/capture.sh" ] || fail "new target lost executable mode"
+diff -qr "$t/fixture-stage" "$t/fixture-stage-again" >/dev/null || fail "new target staging was not deterministic"
+[ ! -e "$d/$F/.fixture" ] && [ ! -e "$d/$F/workspace.generated" ] || fail "new target generated files on main"
+while IFS=$'\t' read -r meta path _; do
+  case "$meta" in '' | '#'* ) continue ;; esac
+  [ "$(git -C "$d" hash-object -- "$t/fixture-stage/$F/$path")" = "${meta#* }" ] || fail "new target ledger did not hash native bytes"
+done <"$t/fixture-stage/$F/workspace.generated"
+ok "registry-only targets stage adapted skills and helpers with native hashes and modes without generating copies on main"
 rm "$d/$F/TASKS.md"
 echo 'must remain workspace-owned' >"$d/software/workspace-inherit/TASKS.md"
 if (cd "$d" && bash ci/render.sh) >"$t/out" 2>"$t/err"; then fail "new target inherited its root instructions"; fi
diff --git a/tools/new-workspace.sh b/tools/new-workspace.sh
index 9b15baa..eab6e67 100755
--- a/tools/new-workspace.sh
+++ b/tools/new-workspace.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # tools/new-workspace.sh [--by ai|ai-assisted|human] [--harness <adapter>] <org-path> <leaf>:
-# prepare a main-side PR with native defaults and managed output for its explicitly recorded harness.
+# prepare a main-side PR with owned native defaults; CI adds inheritance on the workspace branch.
 # Uses a temporary checkout of origin/main; never changes the caller's checkout.
 set -euo pipefail
 die() { echo "new-workspace: $*" >&2 && exit 1; }
@@ -72,7 +72,7 @@ git -C "$wt" commit --quiet -m "New workspace $name"
 git -C "$wt" push --quiet origin "HEAD:refs/heads/$branch"
 gh pr create --base main --head "$branch" --title "Add workspace $name" --label "by: $by" --body "## Changes
 
-Adds \`$folder/\` from templates/workspace (plus translated project defaults and managed inheritance). After merge, CI creates branch ws/$name.
+Adds \`$folder/\` from templates/workspace (plus translated project defaults). After merge, CI creates branch ws/$name with its inherited context.
 
 ## Testing
 

From 312630958fd3ce2c24e8fea94b14e78ed9b5e432 Mon Sep 17 00:00:00 2001
From: Jesus God <wyattbracy@gmail.com>
Date: Tue, 27 Oct 2026 20:57:24 +0000
Subject: [PATCH 13/18] Address Codex workspace review feedback

---
 CLAUDE.md                                     |  19 +-
 README.md                                     |  16 +-
 ci/check.sh                                   |  22 +-
 ci/harnesses.sh                               | 155 ++++++---
 ci/harnesses/claude-code.sh                   |  15 +
 ci/harnesses/codex.sh                         |  15 +
 ci/inherit.sh                                 |   4 +-
 ci/managed.sh                                 |   7 +-
 ci/render.sh                                  |  28 +-
 ci/sources.sh                                 |  71 +++--
 ci/sync.sh                                    | 140 +++++++--
 docs/design.md                                |  61 +++-
 .../application-software/argos/AUTHORING.md   |  10 +-
 software/application-software/argos/README.md |   2 +
 .../skills/pr-conventions/BODY.codex.md       |   9 +
 .../argos/workspaces/default-codex/AGENTS.md  |  65 +---
 .../workspaces/default-codex/docs/CONTEXT.md  | 106 +------
 .../skills/pr-conventions/BODY.codex.md       |   9 +
 .../skills/address-pr-comments/BODY.codex.md  |  13 +
 .../.claude/skills/commit/BODY.codex.md       |   1 +
 .../skills/switch-workspace/BODY.codex.md     |  14 +
 templates/harnesses/codex/AGENTS.md           |   3 -
 tests/e2e.sh                                  | 295 ++++++++++++++++--
 tools/new-workspace.sh                        |  13 +-
 24 files changed, 759 insertions(+), 334 deletions(-)
 create mode 100644 ci/harnesses/claude-code.sh
 create mode 100644 ci/harnesses/codex.sh
 create mode 100644 software/application-software/argos/workspace-inherit/.claude/skills/pr-conventions/BODY.codex.md
 create mode 100644 software/application-software/nero/workspace-inherit/.claude/skills/pr-conventions/BODY.codex.md
 create mode 100644 software/application-software/workspace-inherit/.claude/skills/address-pr-comments/BODY.codex.md
 create mode 100644 software/application-software/workspace-inherit/.claude/skills/commit/BODY.codex.md
 create mode 100644 software/workspace-inherit/.claude/skills/switch-workspace/BODY.codex.md

diff --git a/CLAUDE.md b/CLAUDE.md
index d6cb38a..c4c8425 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -19,7 +19,8 @@ source of truth; `docs/goals.md` lists what any change must keep.
   (`software/**/plugins/<harness>/<set>/`, named `<scope>[.<set>]`; a folder's scope is its
   `plugins/scope`, else its `short-name`, else its name), each Claude Code workspace's `workspace.yml` `plugins:` defaults (the
   `default` set of every folder above), and its `.claude/settings.json` (enabled sets, and the SessionStart hook that sets `$DELPHI_ROOT`; never edit
-  it by hand). `ci/render.sh` calls it for main-side plugin output.
+  it by hand). `ci/render.sh` calls it for main-side plugin output; sync keeps branch-selected
+  plugin sets active while their proposal to main is pending.
 - `.delphi/{setup,new-worktree,switch,park,plugins}.sh`: the scripts every workspace runs (setup.sh
   runs `plugins.sh`, which makes this clone's local `@delphi` installs what the workspace enables and
   uninstalls ones the marketplace dropped, so plugin changes need no migration); `.delphi/paths.sh`
@@ -31,8 +32,9 @@ source of truth; `docs/goals.md` lists what any change must keep.
   version, with its hash from `.delphi/version.sh`), `.delphi/migrations/<version>-<slug>.sh` (clone
   cleanup, run by `setup.sh`).
 - `templates/workspace/`: `workspace.yml`, `CLAUDE.md` (`{{name}}`, `{{folder}}`), the managed
-  `.github/workflows/delphi.yml` every workspace carries unchanged. The general skills are in `software/workspace-inherit/.claude/skills/`; Codex instructions use the native template under
-  `templates/harnesses/`.
+  `.github/workflows/delphi.yml` every workspace carries unchanged. The general skills are in
+  `software/workspace-inherit/.claude/skills/`; Codex adds its bootstrap from `templates/harnesses/`
+  to the common instruction base once at creation.
 - `software/plugins/claude/default/`: the `delphi` plugin set, a mod whose `/ws-delphi` pane switches
   workspaces (`hooks/register.tsx`, tests in `tests/ws.test.ts`, run by `claude plugin test`);
   `/ws-delphi --web` serves the same cards in a browser tab (`web/server.py`, `web/index.html`).
@@ -48,8 +50,9 @@ source of truth; `docs/goals.md` lists what any change must keep.
 - `ci/render.sh [--check] [--workspace <folder>] [<main-checkout> [<staging-output>]]`: update plugin
   output, or prepare inherited native files and ledgers in optional temporary staging. Main-side
   checks reject managed copies, ledgers and ownership collisions; inherited output is never committed there.
-  `ci/harnesses.sh` declares targets; `ci/sources.sh` reads independent source formats;
-  `ci/inherit.sh` resolves sources. `ci/managed.sh` shares ownership logic with sync, whose refresh
+  `ci/harnesses.sh` reads `ci/harnesses/<name>.sh` through pure `harness_field` queries;
+  `ci/sources.sh` reads independently selected formats; `ci/inherit.sh` resolves sources.
+  `ci/managed.sh` shares ownership logic with sync, whose refresh
   copies staged output. Every workspace must explicitly declare its harness. Codex uses
   `.delphi/exec.sh` to initialize helper commands in independent shells.
 
@@ -62,7 +65,11 @@ source of truth; `docs/goals.md` lists what any change must keep.
   under `repos:`"), never its entries. A copied list goes stale. Runtime tools: bash, git, and `gh` (only to open or update PRs).
 - Every script: `#!/usr/bin/env bash`, `set -euo pipefail`, `shellcheck`-clean.
 - Keep Claude skill sources under workspace-inherit/.claude/skills with their metadata intact.
-  Harness adaptations belong in ci/harnesses.sh and affect only that target's generated output.
+  Native metadata conversion and helper bootstrap belong in the registered harness adapter and
+  affect only generated output. Put target-specific skill prose in its `BODY.<harness>.md` sidecar;
+  never match source sentences or replace instruction filenames throughout a body.
+  Shared-source paths and opt-out keys follow `docs/design.md`'s portable-path rule; existing owned
+  workspace filenames are unaffected.
   Skill scripts stay harness-independent (SKILL.md uses the Agent Skills format): call scripts by
   their path in the skill's folder, `bash scripts/<script>.sh <names>…`, and reference files the same
   way. Skill scripts (inherited, plugin or workspace) take only names (repo, branch) and read the workspace
diff --git a/README.md b/README.md
index 20ecd97..774d5c9 100644
--- a/README.md
+++ b/README.md
@@ -107,6 +107,8 @@ Open the workspace in Codex and follow `AGENTS.md`. It discovers native skills u
 Use `.delphi/exec.sh` for helper commands so each shell receives the workspace layout. Start a fresh
 session after switching workspaces. The host supplies dependencies, credentials and integrations;
 Codex workspaces do not enable Delphi's Claude plugin sets.
+Generated Codex skills include the complete helper invocation in each script command, so fresh
+shells and sub-agents initialize the same layout.
 
 ## Versions
 
@@ -118,7 +120,7 @@ a version needs cleanup in people's clones, it ships `.delphi/migrations/<versio
 
 ## New workspace
 
-`tools/new-workspace.sh [--harness claude-code|codex] <org-path under software/> <leaf>` copies `templates/workspace/` into
+`tools/new-workspace.sh [--harness <adapter>] <org-path under software/> <leaf>` copies `templates/workspace/` into
 `software/<org-path>/workspaces/<leaf>/`, adds the project's `workspace-defaults/` if it has one, and
 opens a PR to `main`, labelled `by: ai` (put `--by ai-assisted` or `--by human` first to change it).
 Once it merges, CI creates `ws/<name>` (its dotted name).
@@ -128,9 +130,12 @@ can hold shared context (`README.md`), a guide to its workspaces (`AUTHORING.md`
 `workspace-defaults/` (what a new workspace there starts with).
 
 **Shared sources.** Keep Claude skills and their metadata in
-`workspace-inherit/.claude/skills/<name>/`. The optional `source.yml` selects a different authoring
-format; each workspace's `harness:` independently selects its target. `workspace-defaults/` seeds
-workspace-owned files once; `workspace-inherit/` stays managed.
+`workspace-inherit/.claude/skills/<name>/`. The optional `source.yml` selects an authoring format
+from the harness registry; each workspace's `harness:` independently selects its target.
+`workspace-defaults/` seeds owned files once; `workspace-inherit/` stays managed.
+An optional `BODY.<harness>.md` beside a skill supplies target-specific prose without changing its
+canonical `SKILL.md` or rewriting unrelated instruction references.
+Register a target or source format in `ci/harnesses/<name>.sh`; its entry owns the native contract.
 
 **Preparation and sync.** CI translates inheritance from main into temporary staging, then refresh
 copies it onto workspace branches. Main contains no inherited copies or ownership ledgers.
@@ -141,6 +146,9 @@ After source or configuration changes, run `bash ci/render.sh` to update plugin
 workspace copy, list its native path under `opt-out:`. Proposals retain owned files and opted-out
 skills while stripping managed copies, `workspace.generated` and the branch's `.delphi/`.
 Collisions are reported. See `docs/design.md` for the adapter contract and ownership rules.
+Source-native opt-outs also exclude unsupported inputs before mapping. Shared paths and opt-out
+keys use portable ASCII names without spaces or control characters; this naming rule does not
+restrict workspace-owned files.
 
 ## CI (`.github/workflows/delphi.yml`)
 
diff --git a/ci/check.sh b/ci/check.sh
index 32fa58e..79042db 100755
--- a/ci/check.sh
+++ b/ci/check.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
-# ci/check.sh [<dir> [<base>]]: validate main-owned workspaces, staged inheritance and runtime releases.
-# Lists every problem without changing the checkout.
+# ci/check.sh [<dir> [<base>]]: validate docs/design.md's workspace, source and runtime contracts.
+# Main owns native files/settings; inherited copies and ledgers are branch-only. Checks never write.
 set -euo pipefail
 here=$(cd "$(dirname "$0")" && pwd)
 # shellcheck source=ci/inherit.sh
@@ -94,7 +94,7 @@ manifest() { # <workspace.yml> [<name>]: without <name> (a workspace-defaults/ m
       if (pk[v]++) print "duplicate park entry: " v
       next }
     r == 5 && /^[[:space:]]/ {
-      if ($0 !~ /^[[:space:]]+-[[:space:]]+[A-Za-z0-9._][A-Za-z0-9._\/-]*[[:space:]]*(#.*)?$/ || $0 ~ /(^|[[:space:]\/])\.\.(\/|[[:space:]]|$)/) {
+      if ($0 !~ /^[[:space:]]+-[[:space:]]+[A-Za-z0-9._@+][A-Za-z0-9._/@+-]*[[:space:]]*(#.*)?$/ || $0 ~ /(^|[[:space:]\/])\.\.(\/|[[:space:]]|$)/) {
         print "bad opt-out entry (want `  - <path it inherits>`, e.g. .claude/skills/journal): " $0; next }
       v = $0; sub(/^[[:space:]]+-[[:space:]]+/, "", v); sub(/[[:space:]]*#.*$/, "", v)
       if (opt[v]++) print "duplicate opt-out: " v
@@ -123,10 +123,13 @@ manifest() { # <workspace.yml> [<name>]: without <name> (a workspace-defaults/ m
       next }
     { print "unexpected line: " $0 }
     END { if (want != "" && !h) print "harness is missing"; if (want != "" && !nm) print "name is missing" }' "$1")
-  local adapter
+  local adapter instruction foreign plugins
   adapter=$(awk '/^harness:/ { print $2; exit }' "$1")
   if [ -n "$adapter" ]; then
-    harness "$adapter" 2>/dev/null || { bad "$1: unknown harness '$adapter'"; return; }
+    harness_exists "$adapter" || { bad "$1: unknown harness '$adapter'"; return; }
+    plugins=$(harness_field "$adapter" plugins)
+    instruction=$(harness_field "$adapter" instruction)
+    foreign=$(harness_foreign "$adapter")
     if [ "$plugins" = none ] && awk '/^plugins:/ { s = 1; next } /^[^[:space:]#]/ { s = 0 } s && /^[[:space:]]+-/ { found = 1 } END { exit !found }' "$1"; then
       bad "$1: $adapter does not support Delphi plugin sets"
     fi
@@ -143,7 +146,7 @@ manifest() { # <workspace.yml> [<name>]: without <name> (a workspace-defaults/ m
 
 while IFS= read -r d; do
   case "$d" in */workspaces/*) bad "$d: belongs in an org or project folder, not under workspaces/" ;; esac
-  for f in CLAUDE.md AGENTS.md workspace.yml workspace.generated .delphi .claude/settings.json .codex/config.toml $managed; do
+  for f in $(harness_protected) workspace.yml workspace.generated .delphi $managed; do
     [ ! -e "$d/$f" ] || bad "$d/$f: each workspace has its own; it can't be inherited"
   done
 done < <(find software -type d -name workspace-inherit 2>/dev/null | sort)
@@ -155,10 +158,13 @@ while IFS= read -r d; do
 done < <(find software -type d \( -name workspace-defaults -o -name workspace-inherit \) 2>/dev/null | sort)
 while IFS= read -r d; do
   case "$d" in */workspaces/*) continue ;; esac
-  for skill in "$d"/*; do
+  format=$(source_format "$d" 2>/dev/null) || continue
+  skills=$(harness_field "$format" skills)
+  [ -d "$d/$skills" ] || continue
+  for skill in "$d/$skills"/*; do
     [ ! -e "$skill" ] || [ -f "$skill/SKILL.md" ] || bad "$skill: shared skills need <name>/SKILL.md"
   done
-done < <(find software -type d \( -path '*/workspace-inherit/.claude/skills' -o -path '*/workspace-inherit/.agents/skills' \) 2>/dev/null)
+done < <(find software -type d -name workspace-inherit 2>/dev/null)
 while IFS= read -r d; do
   [ ! -d "${d%/workspaces}/defaults" ] || bad "${d%/workspaces}/defaults: renamed workspace-defaults/"
 done < <(find software -type d -name workspaces 2>/dev/null)
diff --git a/ci/harnesses.sh b/ci/harnesses.sh
index ebc174d..da07238 100644
--- a/ci/harnesses.sh
+++ b/ci/harnesses.sh
@@ -1,45 +1,124 @@
 #!/usr/bin/env bash
-# Target harness registry for main-side authoring and validation. Branch refresh never loads it.
+# Harness registry and shared skill rendering. Per-target facts live in harnesses/<name>.sh.
 set -euo pipefail
-# shellcheck disable=SC2034 # native paths are consumed by callers sourcing the registry
-harness() { # <name>: native paths, template, plugin capability and foreign-file exclusions
-  case "$1" in
-    claude-code) instruction=CLAUDE.md; instruction_template=templates/workspace/CLAUDE.md; skills=.claude/skills; plugins=claude; foreign="AGENTS.md .agents .codex" ;;
-    codex) instruction=AGENTS.md; instruction_template=templates/harnesses/codex/AGENTS.md; skills=.agents/skills; plugins=none; foreign="CLAUDE.md .claude" ;;
-    *) echo "harness: unknown harness '$1'" >&2; return 1 ;;
+harness_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")/harnesses" && pwd)
+
+harnesses() { # registered target/source formats
+  local file
+  for file in "$harness_dir"/*.sh; do
+    [ -f "$file" ] || continue
+    file=${file##*/}; printf '%s\n' "${file%.sh}"
+  done
+}
+
+harness_exists() {
+  case "$1" in '' | *[!a-z0-9-]*) return 1 ;; esac
+  [ -f "$harness_dir/$1.sh" ]
+}
+
+harness_field() { # <target> <property>: local descriptor fields never mutate a caller's target
+  harness_exists "$1" || { echo "harness: unknown harness '$1'" >&2; return 1; }
+  case "$2" in instruction | instruction_base | instruction_template | skills | native | protected | plugins | settings_file | settings_generator | bootstrap | skill_format) ;;
+    *) echo "harness: unknown property '$2'" >&2; return 1 ;;
   esac
+  # shellcheck disable=SC2034 # descriptors are read through indirect property expansion
+  local instruction='' instruction_base='' instruction_template='' skills='' native='' protected='' plugins=none
+  # shellcheck disable=SC2034 # optional descriptor properties
+  local settings_file='' settings_generator='' bootstrap='' skill_format=claude-code
+  # shellcheck disable=SC1090 # a registered, trusted main-side descriptor
+  source "$harness_dir/$1.sh"
+  printf '%s\n' "${!2}"
+}
+
+harness_foreign() { # paths owned by other targets, excluding shared native conventions
+  local own other path
+  own="$(harness_field "$1" instruction) $(harness_field "$1" native)"
+  for other in $(harnesses); do
+    [ "$other" != "$1" ] || continue
+    for path in $(harness_field "$other" instruction) $(harness_field "$other" native); do
+      case " $own " in *" $path "*) ;; *) printf '%s\n' "$path" ;; esac
+    done
+  done
+}
+
+harness_protected() { # native root instructions and target-owned configuration are never inherited
+  local target
+  for target in $(harnesses); do
+    harness_field "$target" instruction
+    harness_field "$target" settings_file
+    harness_field "$target" protected
+  done
+}
+
+harness_settings() { # <target> <folder> <manifest>: the target's registered settings generator
+  local generator
+  generator=$(harness_field "$1" settings_generator) || return 1
+  [ -n "$generator" ] || return 0
+  bash "$harness_dir/../../$generator" settings "$2" "$3"
 }
 
-harness_file() { # <target harness> <source file>: Claude passes through; Codex adapts its own output only
-  case "$1:$2" in
-    codex:*/SKILL.md)
+harness_file() { # <target harness> <source file>: metadata format, explicit body variant and bootstrap
+  local target=$1 file=$2 format bootstrap variant
+  case "$file" in */SKILL.md) ;; *) cat "$file"; return ;; esac
+  format=$(harness_field "$target" skill_format) || return 1
+  bootstrap=$(harness_field "$target" bootstrap) || return 1
+  variant=${file%/*}/BODY.$target.md
+  # Preserve canonical native output byte for byte unless this target asks for adaptation.
+  if [ "$format" = claude-code ] && [ "$bootstrap" != exec ] && [ ! -f "$variant" ]; then
+    cat "$file"; return
+  fi
+  # Read metadata only; prose and code-repository instruction references stay source-owned.
+  awk -v format="$format" '
+    { sub(/\r$/, "") }
+    NR == 1 { if ($0 !~ /^---$/) exit; front = 1; print; next }
+    front && /^---$/ { print; exit }
+    front {
+      if (format != "codex") { print; next }
+      line = $0; sub(/^ */, "", line); indent = length($0) - length(line)
+      if (!root && line !~ /^(#|$)/) { root = 1; level = indent }
+      # Claude-only fields are omitted from Codex output, including block values.
+      if (indent == level && line ~ /^["\047]?(allowed-tools|user-invocable|disable-model-invocation)["\047]?[[:space:]]*:/) { skip = 1; next }
+      if (skip && (indent > level || line ~ /^(#|$|-([[:space:]]|$))/)) next
+      skip = 0
+      # Quote descriptions that need a native YAML block scalar.
+      if (indent == level && line ~ /^description: / && substr(line, 14) ~ /: / && substr(line, 14) !~ /^["\047>|]/) {
+        print substr($0, 1, level) "description: >-"; print substr($0, 1, level) "  " substr(line, 14)
+      } else print
+    }' "$file"
+  if [ "$bootstrap" = exec ]; then
+    cat <<'BOOTSTRAP'
+
+Run every skill helper through the workspace bootstrap, including in fresh shells and sub-agents:
+
+```sh
+bash "<absolute-workspace-root>/.delphi/exec.sh" bash "<absolute-installed-skill-folder>/scripts/<script>.sh" <arguments...>
+```
+
+Replace the placeholders with the known workspace root, this skill's installed native folder, the script name, and its arguments. Obtain the workspace's absolute path once with `bash .delphi/paths.sh` from the checked-out workspace root. The wrapper sets `DELPHI_ROOT` for every invocation and preserves the caller's working directory; do not assume shell exports persist.
+
+BOOTSTRAP
+  fi
+  {
+    if [ -f "$variant" ]; then cat "$variant"
+    else
       awk '
-        { sub(/\r$/, "") }
-        NR == 1 && /^---$/ { front = 1; print; next }
-        front && /^---$/ { front = 0; print; next }
-        front {
-          line = $0; sub(/^ */, "", line); indent = length($0) - length(line)
-          if (!root && line !~ /^(#|$)/) { root = 1; level = indent }
-          # Claude-only fields are omitted from Codex output, including block values.
-          if (indent == level && line ~ /^["\047]?(allowed-tools|user-invocable|disable-model-invocation)["\047]?[[:space:]]*:/) { skip = 1; next }
-          if (skip && (indent > level || line ~ /^(#|$|-([[:space:]]|$))/)) next
-          skip = 0
-          # Quote descriptions that need a native YAML block scalar.
-          if (indent == level && line ~ /^description: / && substr(line, 14) ~ /: / && substr(line, 14) !~ /^["\047>|]/) {
-            print substr($0, 1, level) "description: >-"; print substr($0, 1, level) "  " substr(line, 14)
-          } else print
-          next
-        }
-        /^- The user can also switch from the `\/ws-delphi` pane/ { next }
-        /^- No restart needed: skills under/ {
-          print "- Start a fresh Codex session after switching so its instructions and skills match the new workspace."
-          next
-        }
-        {
-          gsub(/CLAUDE[.]md/, "AGENTS.md")
-          gsub(/GitHub MCP server.s `pull_request_read`/, "available GitHub integration\047s PR-reading tool")
-          print
-        }' "$2" ;;
-    *) cat "$2" ;;
-  esac
+        NR == 1 && /^---\r?$/ { front = 1; next }
+        front && /^---\r?$/ { front = 0; next }
+        !front { print }
+      ' "$file"
+    fi
+  } | awk -v bootstrap="$bootstrap" '
+    bootstrap == "exec" {
+      rest = $0; adapted = ""
+      # Translate the command syntax, including nested command substitutions, without editing prose.
+      while (match(rest, /(^|[[:space:]`(;])bash scripts\/[A-Za-z0-9._\/-]+/)) {
+        before = substr(rest, 1, RSTART - 1); command = substr(rest, RSTART, RLENGTH)
+        rest = substr(rest, RSTART + RLENGTH)
+        at = index(command, "bash scripts/")
+        adapted = adapted before substr(command, 1, at - 1) "bash \"<absolute-workspace-root>/.delphi/exec.sh\" bash \"<absolute-installed-skill-folder>/" substr(command, at + 5) "\""
+      }
+      print adapted rest; next
+    }
+    { print }
+  '
 }
diff --git a/ci/harnesses/claude-code.sh b/ci/harnesses/claude-code.sh
new file mode 100644
index 0000000..8d566ce
--- /dev/null
+++ b/ci/harnesses/claude-code.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC2034
+# Claude-native paths and CI capabilities; read by the shared registry.
+set -euo pipefail
+instruction=CLAUDE.md
+instruction_base=''
+instruction_template=templates/workspace/CLAUDE.md
+skills=.claude/skills
+native='.claude'
+protected='.claude/settings.json'
+plugins=claude
+settings_file=.claude/settings.json
+settings_generator=ci/plugins.sh
+bootstrap=hook
+skill_format=claude-code
diff --git a/ci/harnesses/codex.sh b/ci/harnesses/codex.sh
new file mode 100644
index 0000000..ce7d52f
--- /dev/null
+++ b/ci/harnesses/codex.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC2034
+# Codex-native paths and CI capabilities; host credentials and integrations stay external.
+set -euo pipefail
+instruction=AGENTS.md
+instruction_base=templates/workspace/CLAUDE.md
+instruction_template=templates/harnesses/codex/AGENTS.md
+skills=.agents/skills
+native='.agents .codex'
+protected='.codex/config.toml'
+plugins=none
+settings_file=''
+settings_generator=''
+bootstrap='exec'
+skill_format=codex
diff --git a/ci/inherit.sh b/ci/inherit.sh
index beb8d0c..efe0903 100644
--- a/ci/inherit.sh
+++ b/ci/inherit.sh
@@ -8,10 +8,10 @@ inherit_levels() {
 }
 inherited_files() { # <workspace folder> <harness>: mode blob<TAB>destination<TAB>source
   local level
-  harness "$2" || return 1
+  harness_exists "$2" || return 1
   for level in $(inherit_levels "$1"); do
     if [ -d "$level/workspace-inherit" ]; then
-      bundle_files "$level/workspace-inherit" "$2" || return 1
+      bundle_files "$level/workspace-inherit" "$2" "${3:-}" || return 1
     fi
   done
 }
diff --git a/ci/managed.sh b/ci/managed.sh
index e09a4c1..f351683 100644
--- a/ci/managed.sh
+++ b/ci/managed.sh
@@ -19,8 +19,13 @@ recorded() { # <path> <records>: exact managed ownership, including files retire
   printf '%s\n' "$2" | awk -F'\t' -v p="$1" '$2 == p { found = 1 } END { exit !found }'
 }
 
+settings_source() { # CI generator origins are separate from inherited software/ source paths
+  case "$1" in ci/*) return 0 ;; esac
+  return 1
+}
+
 safe_path() {
-  case "$1" in '' | /* | *[!A-Za-z0-9._/-]* | */ | *//* ) return 1 ;; esac
+  case "$1" in '' | /* | *[!A-Za-z0-9._/@+-]* | */ | *//* ) return 1 ;; esac
   case "/$1/" in */../* | */./* | */.git/*) return 1 ;; esac
 }
 
diff --git a/ci/render.sh b/ci/render.sh
index 648fa07..385835f 100755
--- a/ci/render.sh
+++ b/ci/render.sh
@@ -37,25 +37,31 @@ if [ -z "$only" ]; then
 fi
 
 render_workspace() { # <workspace folder>: main keeps owned files; inherited output and ledger go to staging
-  local folder=$1 adapter out records meta path src seen="" used="" o parent target=$output/$1
+  local folder=$1 adapter out records meta path src seen="" used="" o parent protected_path settings_file plugins target=$output/$1
   [ ! -e "$folder/$generated" ] || { bad "$folder/$generated: ownership records belong only on workspace branches"; return; }
   adapter=$(awk '/^harness:/ { print $2; exit }' "$folder/workspace.yml")
-  harness "$adapter" || { bad "$folder/workspace.yml: unknown harness '$adapter'"; return; }
+  harness_exists "$adapter" || { bad "$folder/workspace.yml: unknown harness '$adapter'"; return; }
+  plugins=$(harness_field "$adapter" plugins)
   if [ "$plugins" = none ] && awk '/^plugins:/ { s = 1; next } /^[^[:space:]#]/ { s = 0 }
     s && /^[[:space:]]+-/ { found = 1 } END { exit !found }' "$folder/workspace.yml"; then
     bad "$folder/workspace.yml: $adapter does not support Delphi plugin sets"; return
   fi
   out=$(optouts <"$folder/workspace.yml")
-  records=$(inherited_files "$folder" "$adapter") || { bad "$folder: cannot resolve inherited sources"; return; }
+  records=$(inherited_files "$folder" "$adapter" "$out") || { bad "$folder: cannot resolve inherited sources"; return; }
   rm -rf "$target"
   mkdir -p "$target"
   : >"$tmp/records"
   while IFS=$'\t' read -r meta path src; do
     [ -n "$path" ] || continue
     if ! safe_path "$path" || ! safe_path "$src"; then bad "$src: unsafe inherited destination '$path'"; continue; fi
-    case "$path" in "$instruction" | CLAUDE.md | AGENTS.md | workspace.yml | workspace.generated | .delphi | .delphi/* | .claude/settings.json | .codex/config.toml | .github/workflows/delphi.yml)
+    case "$path" in workspace.yml | workspace.generated | .delphi | .delphi/* | .github/workflows/delphi.yml)
       bad "$src: each workspace has its own $path; it can't be inherited"; continue ;;
     esac
+    protected_path=0
+    for o in $(harness_protected); do
+      if [ "$path" = "$o" ]; then bad "$src: each workspace has its own $path; it can't be inherited"; protected_path=1; break; fi
+    done
+    [ "$protected_path" = 0 ] || continue
     case " $seen " in *" $path "*) bad "$src: $folder also inherits it from a folder above; keep one" ;; esac
     seen="$seen $path"
     for o in $out; do if opted_out "$path" "$o"; then used="$used $o"; fi; done
@@ -81,10 +87,16 @@ render_workspace() { # <workspace folder>: main keeps owned files; inherited out
     [ -z "$only" ] || continue
     case " $used " in *" $o "*) ;; *) bad "$folder/workspace.yml: opt-out: $o is nothing it inherits" ;; esac
   done
-  if [ "$plugins" = claude ]; then
-    mkdir -p "$target/.claude"
-    bash "$here/plugins.sh" settings "$folder" "$folder/workspace.yml" >"$target/.claude/settings.json" || return 1
-    printf '100644 %s\t.claude/settings.json\tci/plugins.sh\n' "$(git hash-object -- "$target/.claude/settings.json")" >>"$tmp/records"
+  settings_file=$(harness_field "$adapter" settings_file)
+  if [ -n "$settings_file" ]; then
+    mkdir -p "$(dirname "$target/$settings_file")"
+    harness_settings "$adapter" "$folder" "$folder/workspace.yml" >"$target/$settings_file" || return 1
+    printf '100644 %s\t%s\tci/harnesses/%s.sh\n' "$(git hash-object -- "$target/$settings_file")" "$settings_file" "$adapter" >>"$tmp/records"
+    if [ -z "$only" ]; then
+      if [ "$check" = 1 ]; then
+        cmp -s "$target/$settings_file" "$folder/$settings_file" || bad "$folder/$settings_file: generated settings are out of date"
+      else mkdir -p "$(dirname "$folder/$settings_file")"; cp "$target/$settings_file" "$folder/$settings_file"; fi
+    fi
   fi
   { ledger_header; LC_ALL=C sort -t $'\t' -k2,2 "$tmp/records"; } >"$target/$generated"
 }
diff --git a/ci/sources.sh b/ci/sources.sh
index 7f32ba3..aaa3fce 100644
--- a/ci/sources.sh
+++ b/ci/sources.sh
@@ -3,6 +3,8 @@
 set -euo pipefail
 # shellcheck source=ci/harnesses.sh
 source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/harnesses.sh"
+# shellcheck source=ci/managed.sh
+source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/managed.sh"
 
 source_format() { # <bundle>: legacy bundles are Claude-authored
   local config format
@@ -10,40 +12,40 @@ source_format() { # <bundle>: legacy bundles are Claude-authored
   config=$(cat "$1/source.yml")
   format=$(printf '%s\n' "$config" | awk '
     /^[[:space:]]*#/ || /^[[:space:]]*$/ { next }
-    /^format:[[:space:]]+(claude-code|codex)[[:space:]]*(#.*)?$/ { if (!n++) value = $2; next }
+    /^format:[[:space:]]+[a-z0-9-]+[[:space:]]*(#.*)?$/ { if (!n++) value = $2; next }
     { invalid = 1 }
     END { if (n == 1 && !invalid) print value }')
-  [ -n "$format" ] || { echo "source: $1/source.yml: declare one supported format (claude-code or codex)" >&2; return 1; }
+  { [ -n "$format" ] && harness_exists "$format"; } || { echo "source: $1/source.yml: declare one supported source format" >&2; return 1; }
   printf '%s\n' "$format"
 }
 
-source_path() { # <format> <target harness> <source path>: native destination; no semantic guesses
-  local from_instruction from_skills incompatible
-  harness "$1" || return 1
-  from_instruction=$instruction; from_skills=$skills
-  case "$3" in '' | /* | *[!A-Za-z0-9._/-]* | */ | *//* )
-    echo "source: unsafe path '$3'" >&2; return 1 ;;
-  esac
-  case "/$3/" in */../* | */./* | */.git/*)
-    echo "source: unsafe path '$3'" >&2; return 1 ;;
-  esac
-  for incompatible in $foreign; do
+source_path() { # <format> <target> <path>: explicit native mapping without global registry mutation
+  local from_instruction from_skills incompatible native to_skills
+  from_instruction=$(harness_field "$1" instruction) || return 1
+  from_skills=$(harness_field "$1" skills) || return 1
+  safe_path "$3" || { echo "source: unsafe path '$3'" >&2; return 1; }
+  for incompatible in $(harness_foreign "$1"); do
     case "$3" in "$incompatible" | "$incompatible"/*)
       echo "source: $3 does not belong to the declared $1 format" >&2; return 1 ;;
     esac
   done
-  harness "$2" || return 1
   case "$3" in
-    "$from_instruction") printf '%s\n' "$instruction" ;;
-    "$from_skills"/*) printf '%s/%s\n' "$skills" "${3#"$from_skills"/}" ;;
-    CLAUDE.md | AGENTS.md | .claude/* | .agents/* | .codex/*)
-      [ "$1" = "$2" ] || { echo "source: $1:$3 has no mapping to $2; provide an explicit adapter mapping" >&2; return 1; }
+    "$from_instruction") harness_field "$2" instruction ;;
+    "$from_skills"/*)
+      to_skills=$(harness_field "$2" skills) || return 1
+      [ -n "$to_skills" ] || { echo "source: $1:$3 has no skill mapping to $2" >&2; return 1; }
+      printf '%s/%s\n' "$to_skills" "${3#"$from_skills"/}" ;;
+    *)
+      for native in $(harness_field "$1" native); do
+        case "$3" in "$native" | "$native"/*)
+          [ "$1" = "$2" ] || { echo "source: $1:$3 has no mapping to $2; opt out of its source path or provide an adapter mapping" >&2; return 1; } ;;
+        esac
+      done
       printf '%s\n' "$3" ;;
-    *) printf '%s\n' "$3" ;;
   esac
 }
 
-bundle_files() { # <bundle> <target harness>: mode blob<TAB>destination<TAB>source
+bundle_files() { # <bundle> <target> [<source exclusions>]: mode blob<TAB>destination<TAB>source
   local format records record meta path dest
   format=$(source_format "$1") || return 1
   records=$(source_files "$1") || return 1
@@ -51,18 +53,29 @@ bundle_files() { # <bundle> <target harness>: mode blob<TAB>destination<TAB>sour
     [ -n "$record" ] || continue
     meta=${record%%$'\t'*}; path=${record#*$'\t'}
     [ "$path" != source.yml ] || continue
+    case "$path" in */BODY.*.md) [ ! -f "$1/${path%/*}/SKILL.md" ] || continue ;; esac
     meta="${meta%% *} ${meta##* }"
-    dest=$(source_path "$format" "$2" "$path") || return 1
+    if opted_out "$path" "${3:-}"; then
+      # A source-path exclusion can skip unavailable mappings. Mapped files still use native opt-outs.
+      if dest=$(source_path "$format" "$2" "$path" 2>/dev/null); then
+        if [ "$dest" != "$path" ] && ! opted_out "$dest" "${3:-}"; then
+          echo "source: opt-out for $path must use its native destination $dest" >&2; return 1
+        fi
+      else dest=$path; fi
+    else
+      dest=$(source_path "$format" "$2" "$path") || return 1
+    fi
     printf '%s\t%s\t%s\n' "$meta" "$dest" "$1/$path"
   done <<<"$records"
 }
 
-source_files() { # <folder>: mode blob<TAB>relative path
-  local file mode
-  if [ -d "$1" ]; then
-    while IFS= read -r file; do
-      mode=100644; [ ! -x "$file" ] || mode=100755
-      printf '%s %s\t%s\n' "$mode" "$(git hash-object -- "$file")" "${file#"$1"/}"
-    done < <(find "$1" -type f | LC_ALL=C sort)
-  fi
+source_files() { # <folder>: validate NUL-delimited names before emitting sorted newline/tab records
+  local file mode path
+  [ -d "$1" ] || return 0
+  while IFS= read -r -d '' file; do
+    path=${file#"$1"/}
+    safe_path "$path" || { echo "source: unsafe path '$path'" >&2; return 1; }
+    mode=100644; [ ! -x "$file" ] || mode=100755
+    printf '%s %s\t%s\n' "$mode" "$(git hash-object -- "$file")" "$path"
+  done < <(find "$1" -type f -print0) | LC_ALL=C sort -t $'\t' -k2,2
 }
diff --git a/ci/sync.sh b/ci/sync.sh
index 7d0f440..a0f72a9 100755
--- a/ci/sync.sh
+++ b/ci/sync.sh
@@ -75,35 +75,107 @@ staged() { # <main revision> <folder>: trusted native output, including historic
 }
 
 previous_main() { # <workspace commit>: newest source-shaped main ancestor, never a workspace merge-base
-  local revision
-  for revision in $(git rev-list --first-parent "$main"); do
-    if git merge-base --is-ancestor "$revision" "$1"; then printf '%s\n' "$revision"; return; fi
-  done
+  local commit result last revision=""
+  commit=$(git rev-parse "$1^{commit}") || return 1
+  result=$cache/previous-main/$commit
+  if [ ! -f "$result" ]; then
+    last=$(git rev-list --first-parent "$main" --not "$commit" | tail -n 1) || return 1
+    if [ -z "$last" ]; then revision=$main
+    else revision=$(git rev-parse --verify "$last^1" 2>/dev/null || true); fi
+    if [ -n "$revision" ]; then git merge-base --is-ancestor "$revision" "$commit" || return 1; fi
+    mkdir -p "$(dirname "$result")" || return 1
+    printf '%s\n' "$revision" >"$result" || return 1
+  fi
+  cat "$result"
+}
+
+workspace_names() { # <main revision>: names remain stable when folders move under unchanged short names
+  local result=$cache/names/$1
+  if [ ! -f "$result" ]; then
+    mkdir -p "$(dirname "$result")" || return 1
+    bash "$here/../.delphi/names.sh" "$1" >"$result.tmp" || return 1
+    mv "$result.tmp" "$result" || return 1
+  fi
+  cat "$result"
+}
+
+historical_folder() { # <old main revision> <current folder>: resolve the same logical workspace on old main
+  local name
+  name=$(workspace_names "$main" | awk -v folder="$2" '$2 == folder { print $1; exit }') || return 1
+  workspace_names "$1" | awk -v name="$name" '$1 == name { print $2; exit }'
+}
+
+aligned_refs() { # <stripped workspace> <current folder> <ownership commit>: align a moved subtree's merge base
+  local base old common folder fragment i=$wt.index aligned ws incoming t
+  base=$(previous_main "$3") || return 1
+  old=""
+  [ -z "$base" ] || old=$(historical_folder "$base" "$2") || return 1
+  if [ -z "$old" ] || [ "$old" = "$2" ]; then printf '%s %s\n' "$1" "$main"; return; fi
+  common=$(git merge-base --all "$1" "$main") || return 1
+  case "$common" in *$'\n'*) echo "sync: $2: CONFLICT: moved workspace has multiple merge bases; resolve the folder move in a workspace PR" >&2; return 1 ;; esac
+  if git cat-file -e "$common:workspace.yml" 2>/dev/null; then fragment=$(tree "$common")
+  else
+    folder=$(historical_folder "$common" "$2") || return 1
+    [ -n "$folder" ] || return 1
+    fragment=$(git rev-parse --verify "$common:$folder") || return 1
+  fi
+  [ -n "$fragment" ] || return 1
+  rm -f "$i" || return 1
+  GIT_INDEX_FILE=$i git read-tree "$base" || return 1
+  GIT_INDEX_FILE=$i git rm -rqf --cached --ignore-unmatch -- "$old" "$2" >/dev/null || return 1
+  GIT_INDEX_FILE=$i git read-tree --prefix="$2/" "$fragment" || return 1
+  t=$(GIT_INDEX_FILE=$i git write-tree) || return 1
+  rm -f "$i" || return 1
+  # A shared virtual base corrects Git's prefix alignment without changing either owned file tree.
+  aligned=$(git commit-tree -p "$common" -m "delphi: align moved workspace base" "$t") || return 1
+  ws=$(git commit-tree -p "$1" -p "$aligned" -m "delphi: align workspace merge" "$(tree "$1")") || return 1
+  incoming=$(git commit-tree -p "$main" -p "$aligned" -m "delphi: align main merge" "$(tree "$main")") || return 1
+  printf '%s %s\n' "$ws" "$incoming"
+}
+
+previous_records() { # <workspace commit> <folder>: cache reconstructed records, including an empty ownership set
+  local commit result
+  commit=$(git rev-parse "$1^{commit}") || return 1
+  result=$cache/records/$commit/$2
+  if [ ! -f "$result" ]; then
+    mkdir -p "$(dirname "$result")" || return 1
+    reconstruct_records "$commit" "$2" >"$result.tmp" || { rm -f "$result.tmp"; return 1; }
+    mv "$result.tmp" "$result" || return 1
+  fi
+  cat "$result"
 }
 
-previous_records() { # <workspace commit> <folder>: reconstruct trusted ownership from previous main sources
-  local base native recipe records settings
+reconstruct_records() { # <workspace commit> <folder>: only trusted main sources supply native hashes and modes
+  local base folder native recipe records settings source
   recipe=$(git log --first-parent -1 --format=%H "$1" -- "$generated") || return 1
   recipe=${recipe:-$1}
   base=$(previous_main "$recipe") || return 1
   [ -n "$base" ] || return 0
-  git cat-file -e "$base:$2/workspace.yml" 2>/dev/null || return 0
-  native=$(staged "$base" "$2") || return 1
-  if ! git cat-file -e "$recipe:$generated" 2>/dev/null || git cat-file -e "$base:$2/$generated" 2>/dev/null; then
+  folder=$(historical_folder "$base" "$2") || return 1
+  [ -n "$folder" ] || return 0
+  native=$(staged "$base" "$folder") || return 1
+  if ! git cat-file -e "$recipe:$generated" 2>/dev/null || git cat-file -e "$base:$folder/$generated" 2>/dev/null; then
     generated_records <"$native/$generated"
     return
   fi
-  settings=$(generated_records <"$native/$generated" | awk -F'\t' '$3 == "ci/plugins.sh"') || return 1
-  native=$(staged_recipe "$base" "$2" "$recipe") || return 1
+  settings=$(generated_records <"$native/$generated" | awk -F'\t' '$3 ~ /^ci\//') || return 1
+  source=$(source_checkout "$base") || return 1
+  # Earlier sync copied main's settings even when the stored recipe selected branch-only plugins.
+  # shellcheck disable=SC2016 # match historical shell code, not this process's variables
+  if ! grep -q 'then entry=\$main_native/\$path; fi$' "$source/ci/sync.sh"; then settings=""; fi
+  native=$(staged_recipe "$base" "$folder" "$recipe") || return 1
   records=$(generated_records <"$native/$generated") || return 1
-  printf '%s\n' "$records" | awk -F'\t' -v settings="$settings" '$3 == "ci/plugins.sh" && settings != "" { print settings; next } { print }'
+  printf '%s\n' "$records" | awk -F'\t' -v settings="$settings" '$3 ~ /^ci\// && settings != "" { print settings; next } { print }'
 }
 
 staged_recipe() { # recover the last generated target from its manifest; hashes come only from trusted main sources
-  local source original renderer target=$cache/recipe/$1/$3/native/$2 ready=$cache/status/recipe/$1/$3/$2
+  local source original renderer manifest target ready
+  manifest=$(git rev-parse "$3:workspace.yml") || return 1
+  if [ "$manifest" = "$(git rev-parse "$1:$2/workspace.yml" 2>/dev/null || true)" ]; then staged "$1" "$2"; return; fi
+  target=$cache/recipe/$1/$manifest/native/$2 ready=$cache/status/recipe/$1/$manifest/$2
   if [ ! -f "$ready" ]; then
     original=$(source_checkout "$1") || return 1
-    source=$cache/recipe/$1/$3/source
+    source=$cache/recipe/$1/$manifest/source
     mkdir -p "$source" || return 1
     cp -R "$original/." "$source/" || return 1
     rm -rf "${source:?}/$2" || return 1
@@ -111,7 +183,7 @@ staged_recipe() { # recover the last generated target from its manifest; hashes
     git show "$3:workspace.yml" >"$source/$2/workspace.yml" || return 1
     renderer=$here/render.sh
     if [ -f "$source/ci/render.sh" ] && grep -q -- '--workspace' "$source/ci/render.sh"; then renderer=$source/ci/render.sh; fi
-    bash "$renderer" --workspace "$2" "$source" "$cache/recipe/$1/$3/native" >&2 || return 1
+    bash "$renderer" --workspace "$2" "$source" "$cache/recipe/$1/$manifest/native" >&2 || return 1
     mkdir -p "$(dirname "$ready")" || return 1
     : >"$ready" || return 1
   fi
@@ -143,19 +215,16 @@ managed_records() { # <workspace commit> <folder>: trusted previous ownership, r
 }
 
 with_generated() { # <workspace commit> <folder> [<ownership commit> [<native stage>]]: check ownership, then materialize
-  local i=$wt.index now old out meta path src entry blob base legacy=0 branch_entry child parent paths native owner=${3:-$1} trusted main_native
+  local i=$wt.index now old out meta path src entry blob base="" legacy=0 branch_entry child parent paths native owner=${3:-$1} trusted folder
   native=${4:-$(staged_recipe "$main" "$2" "$1")} || return 1
   now=$(generated_records <"$native/$generated") || return 1
   old=$(managed_records "$owner" "$2") || return 1
   trusted=$(previous_records "$owner" "$2") || return 1
   out=$(git show "$1:workspace.yml" | optouts) || return 1
-  base=$(previous_main "$owner") || return 1
-  if legacy_workspace "$owner"; then legacy=1; fi
-  main_native=$(staged "$main" "$2") || return 1
-  # Unmerged plugin choices wait for their proposal to merge, as do main's other native settings.
-  entry=$(generated_records <"$main_native/$generated" | awk -F'\t' '$3 == "ci/plugins.sh"') || return 1
-  if [ -n "$entry" ]; then
-    now=$(printf '%s\n' "$now" | awk -F'\t' -v settings="$entry" '$3 == "ci/plugins.sh" { print settings; next } { print }') || return 1
+  if legacy_workspace "$owner"; then
+    legacy=1
+    base=$(previous_main "$owner") || return 1
+    folder=$(historical_folder "$base" "$2") || return 1
   fi
   while IFS=$'\t' read -r meta path src; do
     [ -n "$path" ] || continue
@@ -163,13 +232,13 @@ with_generated() { # <workspace commit> <folder> [<ownership commit> [<native st
     while IFS=$'\t' read -r branch_entry child; do
       [ -n "$child" ] || continue
       if recorded "$child" "$old" && ! opted_out "$child" "$out"; then continue; fi
-      [ "$src" != ci/plugins.sh ] || [ "$child" != "$path" ] || continue
+      ! settings_source "$src" || [ "$child" != "$path" ] || continue
       branch_entry="${branch_entry%% *} ${branch_entry##* }"
       # Pre-ledger clones can adopt copies proven by reviewed output or previous main provenance.
       if [ "$legacy" = 1 ] && [ "$child" = "$path" ] && { [ "$branch_entry" = "$meta" ] ||
         [ "$branch_entry" = "$(printf '%s\n' "$trusted" | awk -F'\t' -v p="$path" '$2 == p { print $1; exit }')" ] ||
         [ "$branch_entry" = "$(file_entry "$base" "$src")" ] ||
-        [ "$branch_entry" = "$(file_entry "$base" "$2/$path")" ]; }; then continue; fi
+        [ "$branch_entry" = "$(file_entry "$base" "$folder/$path")" ]; }; then continue; fi
       echo "sync: $2: CONFLICT: workspace-owned $child collides with managed output $path; opt out or resolve it in a workspace PR" >&2
       return 1
     done < <(git ls-tree -r "$1" -- "$path")
@@ -205,7 +274,6 @@ with_generated() { # <workspace commit> <folder> [<ownership commit> [<native st
     [ -n "$path" ] || continue
     opted_out "$path" "$out" && continue
     entry=$native/$path
-    if [ "$src" = ci/plugins.sh ] && [ -f "$main_native/$path" ]; then entry=$main_native/$path; fi
     blob=$(git hash-object -w -- "$entry") || return 1
     [ "$blob" = "${meta#* }" ] || { echo "sync: staged hash mismatch for $path" >&2; return 1; }
     GIT_INDEX_FILE=$i git update-index --add --cacheinfo "${meta%% *},$blob,$path" || return 1
@@ -228,7 +296,7 @@ without_generated() { # <normalized workspace commit>: leave owned payloads and
   GIT_INDEX_FILE=$i git read-tree "$1" || return 1
   while IFS=$'\t' read -r meta path src; do
     [ -n "$path" ] || continue
-    [ "$src" != ci/plugins.sh ] || continue
+    ! settings_source "$src" || continue
     GIT_INDEX_FILE=$i git update-index --force-remove -- "$path" || return 1
   done <<<"$records"
   GIT_INDEX_FILE=$i git update-index --force-remove -- "$generated" || return 1
@@ -238,6 +306,7 @@ without_generated() { # <normalized workspace commit>: leave owned payloads and
 
 staged_workspace() { # <stripped workspace commit> <folder>: render current sources with the merged owned workspace
   local source original target=$cache/workspace/$1/native/$2 ready=$cache/status/workspace/$1/$2
+  if git diff --quiet "$1" "$main:$2" -- . ':!.delphi'; then staged "$main" "$2"; return; fi
   if [ ! -f "$ready" ]; then
     original=$(source_checkout "$main") || return 1
     source=$cache/workspace/$1/source
@@ -308,7 +377,7 @@ refresh() { # <name> <folder> <old name>: leave the worktree at ws/<name> with m
     echo "ws/$1: created from $2"
     return
   fi
-  local head t ws native
+  local head t ws native alignment incoming
   t=$(with_generated "$from" "$2") || { failed=1 ok=0; return; }
   ws=$from
   if [ "$t" != "$(tree "$from")" ]; then
@@ -316,8 +385,10 @@ refresh() { # <name> <folder> <old name>: leave the worktree at ws/<name> with m
   fi
   t=$(without_generated "$ws") || { failed=1 ok=0; return; }
   [ "$t" = "$(tree "$ws")" ] || ws=$(git commit-tree -p "$ws" -m "delphi: prepare owned files for refresh" "$t")
+  alignment=$(aligned_refs "$ws" "$2" "$from") || { failed=1 ok=0; return; }
+  ws=${alignment%% *} incoming=${alignment#* }
   git -C "$wt" checkout --quiet --detach "$ws"
-  if ! git -C "$wt" merge --quiet --no-ff -Xsubtree="$2" -m "delphi: refresh ws/$1 from main" "$main" >/dev/null; then
+  if ! git -C "$wt" merge --quiet --no-ff -Xsubtree="$2" -m "delphi: refresh ws/$1 from main" "$incoming" >/dev/null; then
     if ! resolve_generated_conflicts "$ws" "$2" "" "$from"; then
       conflict "ws/$1: CONFLICT refreshing from main; merge main into ws/$1 in a PR (see README)."
       return
@@ -334,7 +405,8 @@ refresh() { # <name> <folder> <old name>: leave the worktree at ws/<name> with m
   if [ "$t" != "$(tree "$head")" ]; then
     git -C "$wt" checkout --quiet --detach "$(git commit-tree -p "$head" -m "delphi: sync .delphi/ from main" "$t")"
   fi
-  if [ "$(tree HEAD)" = "$(tree "$from")" ] && git merge-base --is-ancestor "$main" "$from"; then
+  # The tree includes the ownership ledger, so changed provenance and opt-out transfers still advance the branch.
+  if [ "$(tree HEAD)" = "$(tree "$from")" ]; then
     git -C "$wt" checkout --quiet --detach "$from"
   fi
   if [ "$from" != "refs/remotes/origin/ws/$1" ]; then
@@ -350,12 +422,14 @@ propose() { # <name> <folder>: PR owned workspace files into main, leaving inher
   local ws owner title="ws/$1 → main" body pr
   ws=$(git -C "$wt" rev-parse HEAD)
   owner=$ws
-  local t
+  local t alignment incoming
   t=$(with_generated "$ws" "$2") || { failed=1 ok=0; return; }
   [ "$t" = "$(tree "$ws")" ] || ws=$(git commit-tree -p "$ws" -m "delphi: prepare managed files for proposal" "$t")
   t=$(without_generated "$ws") || { failed=1 ok=0; return; }
   [ "$t" = "$(tree "$ws")" ] || ws=$(git commit-tree -p "$ws" -m "delphi: propose owned files only" "$t")
-  git -C "$wt" checkout --quiet --detach "$main"
+  alignment=$(aligned_refs "$ws" "$2" "$owner") || { failed=1 ok=0; return; }
+  ws=${alignment%% *} incoming=${alignment#* }
+  git -C "$wt" checkout --quiet --detach "$incoming"
   if ! git -C "$wt" merge --quiet --no-ff -Xsubtree="$2" -m "delphi: propose ws/$1 to main" "$ws" >/dev/null; then
     if ! resolve_generated_conflicts "$ws" "$2" "$2/" "$owner"; then
       conflict "ws/$1: CONFLICT proposing to main; merge main into ws/$1 in a PR (see README)."
@@ -409,7 +483,7 @@ while read -r name folder; do
     git -C "$wt" checkout --quiet --detach "refs/remotes/origin/ws/$name" # propose ws/<name> as is
   else ok=0; fi
   if [ "$ok" = 1 ] && [ "$dir" != refresh ]; then propose "$name" "$folder"; fi
-done < <(bash "$here/../.delphi/names.sh" "$main")
+done < <(workspace_names "$main")
 
 [ -z "$only" ] || case "$names" in *" $only "*) ;; *) echo "no workspace '$only' on main" >&2 && exit 1 ;; esac
 for b in $(git for-each-ref --format='%(refname:lstrip=3)' refs/remotes/origin/ws/); do
diff --git a/docs/design.md b/docs/design.md
index f969c52..e4e46fd 100644
--- a/docs/design.md
+++ b/docs/design.md
@@ -5,7 +5,7 @@ Goals: `docs/goals.md`. No CLI: plain git plus a few shell scripts run by GitHub
 ## 1. Model
 
 `main` holds each workspace's owned files in `software/**/workspaces/<leaf>/`, at their native
-harness paths (declared in `ci/harnesses.sh`). A workspace's `<name>` is the short name
+harness paths (declared in `ci/harnesses/<name>.sh`). A workspace's `<name>` is the short name
 of each folder from `software/` down to its project folder, then `<leaf>`, joined by dots
 (`s.app.argos.argos-dev` for `software/application-software/argos/workspaces/argos-dev`). A folder's
 short name is the one line in its `short-name` file, else its own name; `.delphi/names.sh [<rev>]`
@@ -61,7 +61,8 @@ software/<org>/…/workspaces/<leaf>/   workspace.yml and owned native files; no
 .delphi/                              {setup,new-worktree,switch,park,plugins,version}.sh  manifest.yml  versions
                                       migrations/  .gitattributes  .gitignore: on every ws/* root
 ci/sync.sh  ci/check.sh               CI scripts
-ci/harnesses.sh  ci/sources.sh       target adapter registry and independent source reader
+ci/harnesses/                        one native contract per registered target or source format
+ci/harnesses.sh  ci/sources.sh       registry queries and independent source reader
 ci/inherit.sh  ci/render.sh          source resolution and temporary native staging
 ci/managed.sh                        ownership records; shared with branch sync
 ci/plugins.sh                         writes the marketplace and each workspace's .claude/settings.json
@@ -89,14 +90,18 @@ The folder holding `workspaces/` is a project folder. Its optional `workspace-de
 workspace-owned files once. Any ancestor org or project may provide managed `workspace-inherit/`
 files. Existing Claude skills stay under `workspace-inherit/.claude/skills/` with their metadata
 intact. A source bundle is Claude-authored unless its optional `source.yml` declares another
-`format:`. Source metadata is never copied into a workspace. A defaults manifest's optional
-`harness:` suggests a creation target; every workspace records its own explicit target.
+`format:` from the harness registry. Source metadata is never copied into a workspace.
+A defaults manifest's optional `harness:` suggests a creation target; every workspace records its
+own explicit target.
 
 `ci/render.sh` prepares inheritance from a main checkout into temporary staging. `ci/inherit.sh`
 selects ancestor sources, `ci/sources.sh` maps paths, and `ci/harnesses.sh` adapts target content.
 Each payload is prepared once, then hashed and copied from those same bytes. Claude skill content
-passes through unchanged. Codex adapts skill metadata, instruction references and switch guidance;
-helper scripts pass through unchanged. Unsupported native settings mappings fail.
+passes through unchanged. An optional `BODY.<harness>.md` beside a skill supplies target-specific
+prose; otherwise its prose is unchanged. Codex converts native metadata and wraps literal
+`bash scripts/...` helper calls with the full `.delphi/exec.sh` invocation. Body variants are
+authoring inputs, not installed files, when beside a `SKILL.md`. Sentence wording and unrelated
+instruction references do not drive translation. Helper scripts pass through unchanged.
 
 `ci/render.sh [--check] [--workspace <folder>] [<main-checkout> [<staging-output>]]` updates plugin
 output by default. An optional staging destination receives inherited native files and ownership
@@ -112,6 +117,14 @@ ambiguous edits or retirements. Inheritance cannot replace workspace identity, r
 runtime or workflow files.
 When changing a workspace's harness, update its owned native files too; CI regenerates inheritance.
 
+Source-native `opt-out:` paths are applied before mapping, so a Codex workspace can exclude a
+Claude-only input such as `.claude/commands`. Mapped native opt-outs still transfer copies to
+workspace ownership. Unsupported native mappings fail unless explicitly excluded.
+
+Shared-source paths, generated ledger paths and opt-out keys accept only ASCII
+`[A-Za-z0-9._/@+-]`. Spaces and control characters are unsupported; paths must be relative without
+`.`, `..` or `.git` components. This restriction does not apply to workspace-owned filenames.
+
 ```mermaid
 ---
 config:
@@ -150,9 +163,9 @@ rest, and `ci/check.sh` fails if the list or either file is out of date:
 - Each `harness: claude-code` workspace's `.claude/settings.json`: the shared settings in
   `ci/plugins.sh`, plus the `delphi` marketplace (with `autoUpdate`) and the sets under `plugins:`
   in `enabledPlugins`. Never edit it by hand: personal settings go in `.claude/settings.local.json`
-  (git-ignored by Claude Code), shared ones in `workspace.yml` or the generator. The main-side renderer regenerates it before merge; refresh copies it unchanged.
-  Configuration changes made on a workspace branch are rendered in its proposal to main and reach
-  the workspace after that proposal merges.
+  (git-ignored by Claude Code), shared ones in `workspace.yml` or the generator. Main's settings
+  are generated before merge. Refresh generates branch settings from its plugin selections and
+  main's plugin catalog, so enabled sets remain active while their proposal to main is pending.
 - Enabled isn't installed: Claude Code only offers to install a project's enabled plugins, so
   someone may never have installed a set, and then its skills are silently missing; and a set that
   leaves the marketplace stays installed, failing to load. So `setup.sh` (on every setup, switch and
@@ -184,7 +197,8 @@ For every workspace on `origin/main` (or just `<name>`):
    and syncs main's root `.delphi/`. It respects branch opt-outs and checks ownership before
    replacing or retiring files. A new branch has the workspace folder, staged inheritance and
    main's runtime at its root, parented by main. Branch updates copy prepared bytes; translation
-   never runs in the workspace checkout.
+   never runs in the workspace checkout. Branch plugin selections stay active before their
+   proposal merges.
 3. **Propose** strips managed inheritance, `workspace.generated` and the workspace's `.delphi/`
    before preparing a main-side PR. Owned files and opted-out skills remain. It regenerates
    plugin settings, runs `ci/check.sh`, and opens or updates `propose/<name>` only when the tree
@@ -193,6 +207,9 @@ For every workspace on `origin/main` (or just `<name>`):
 History stays joined through subtree merges; workspace branches are never force-pushed. Legacy
 path-named branches still carry over into dotted names while ahead, and receive the result once;
 otherwise they are kept with a notice. Removed workspace branches are kept with a notice too.
+An unchanged result leaves the workspace ref untouched. Renaming an org or project folder while
+keeping its dotted workspace name preserves ownership history. Sync aligns the common ancestor's
+folder prefix before merging a move, so later owned edits still use their original merge base.
 
 A conflict or failed render/check is reported and that workspace is skipped; other workspaces keep
 syncing and the command exits 1. All work happens in temporary worktrees.
@@ -264,8 +281,10 @@ skill scripts'. In a terminal, `. .delphi/paths.sh` from the root. `new-worktree
 its own folder; every skill script, plugin or workspace, sources `$DELPHI_ROOT/.delphi/paths.sh` and
 takes only names (repo, branch), never a searched-for path, so the model types only the names.
 Codex uses `AGENTS.md` and `.agents/skills/` from its checked-out branch. Run helper commands through
-`bash <root>/.delphi/exec.sh <command> ...`; it initializes the layout without changing the caller's
-directory and exports it to children. Pass the root and this rule to sub-agents. The host supplies
+`bash "<root>/.delphi/exec.sh" <command> ...`; it initializes the layout without changing the caller's
+directory and exports it to children. Generated Codex skills use the full wrapper command for
+helper calls. Fill its explicit root and installed-skill placeholders from the known checkout,
+then use the same invocation in fresh shells and sub-agents. The host supplies
 dependencies, credentials and integrations. `DELPHI_GITHUB_REST_PROXY` enables the shared helper's
 REST-proxy fallback; existing Claude remote sessions retain their fallback.
 
@@ -332,11 +351,19 @@ creation PR.
 
 ### Adding a harness or source format
 
-Register the target's native paths, template, plugin capability and foreign-file exclusions in
-`ci/harnesses.sh`, then add its instruction template. Put content adaptation in `harness_file()`.
-Select it in a workspace manifest, validate staging, and run the sandbox suite. Ordinary targets need no
-renderer, validator or sync changes. Add explicit settings mappings or new capability validation
-only when the target introduces them.
+Add `ci/harnesses/<name>.sh` and the template its `instruction_template` field names.
+Creation combines optional `instruction_base` with the harness's `instruction_template`, keeping
+common layout authored once and the result an owned snapshot.
+`ci/harnesses.sh` exposes pure `harness_field <name> <field>` queries; native, protected and foreign
+paths are derived from the registered entries. The same registry recognizes source formats.
+Put target-specific skill prose in `BODY.<harness>.md`; the shared adapter handles native metadata
+and helper bootstrap. Select the target in a workspace
+manifest, validate staging, and run the sandbox suite. Ordinary targets need no renderer, validator
+or sync changes. Add a capability implementation only when the target introduces one.
+
+An optional `settings_generator` implements `settings <folder> <manifest>`; a file-only target
+needs no generator. The entry also selects its helper bootstrap. Template locations are entry data,
+so the existing Claude template stays where seed-once creation already reads it.
 
 A new source format supplies the same file records (mode/hash, destination, origin) through
 `ci/sources.sh`. It does not select a workspace's target. Creation suggestions and source formats
diff --git a/software/application-software/argos/AUTHORING.md b/software/application-software/argos/AUTHORING.md
index eb8bf5c..3c92ab9 100644
--- a/software/application-software/argos/AUTHORING.md
+++ b/software/application-software/argos/AUTHORING.md
@@ -17,13 +17,15 @@ under `opt-out:`. Claude personal settings belong in `.claude/settings.local.jso
 ## Create a new Argos workspace
 
 From a Delphi checkout: `tools/new-workspace.sh [--harness codex] application-software/argos <name>`. It copies
-the selected harness template and translated `workspace-defaults/`, then opens a PR to `main`.
+the resolved harness instructions and translated `workspace-defaults/`, then opens a PR to `main`.
 
 ## Change the defaults or this folder
 
 Edit on a branch of `main` and open a PR to `main` (from a workspace: `bash .delphi/switch.sh main`;
 don't edit `workspaces/main/` from a workspace). `workspace-defaults/`
 only affects workspaces created afterwards; to change existing ones, PR each workspace too.
+Seeded instruction files are owned snapshots. For context that should stay current across
+workspaces, use inheritance or a read-only reference through `workspaces/main/`.
 `workspace-inherit/` reaches every Argos workspace through temporary CI preparation and refresh.
 Commit its sources, never generated skill copies or `workspace.generated`, to main. Run
 `bash ci/render.sh` for plugin output and `bash ci/check.sh` before opening the PR.
@@ -36,11 +38,15 @@ Commit its sources, never generated skill copies or `workspace.generated`, to ma
   Shared Claude skills stay in `workspace-inherit/.claude/skills/<name>/` at the project or org level.
   CI preserves Claude metadata and translates Codex copies into its native directory only on
   workspace branches; change sources through PRs to `main`. Ordinary inherited docs go in `workspace-inherit/`.
+  Put target-specific skill prose in an optional `BODY.<harness>.md` beside its `SKILL.md`; keep the
+  canonical Claude skill intact. Generated Codex skills carry their complete helper bootstrap command.
   Optional `source.yml` selects a different authoring format. Context only some workspaces need goes in
   the workspace, or in a supported plugin set selected under `plugins:`. Codex does not load the
   Claude plugin sets. Workspace-owned native skills remain editable and proposable; use a native
   destination under `opt-out:` when taking ownership of an inherited skill. Proposals return that
   owned copy to main and strip other managed inheritance.
+  A source-native opt-out can exclude a harness-only file before translation. Shared-source and
+  opt-out paths follow the portable ASCII rule in Delphi's `docs/design.md`; spaces are unsupported.
   ADRs about a code repo live in that repo, so `docs/` holds only ADRs about the workspace itself.
   Avoid file paths and code in specs and tickets.
 - Make new branches as worktrees (`new-worktree` skill) unless told otherwise.
@@ -50,3 +56,5 @@ Commit its sources, never generated skill copies or `workspace.generated`, to ma
 Open `ws/s.app.argos.default-codex` in Codex and follow `AGENTS.md`. Use `.delphi/exec.sh` for skill
 helpers in fresh shells and sub-agents. The host supplies tooling and credentials. Restart the
 Codex session after switching workspaces.
+Its project rules and glossary point to the existing Argos development context in the read-only
+main link; edit those canonical files through PRs to main, not through the link.
diff --git a/software/application-software/argos/README.md b/software/application-software/argos/README.md
index fa64148..9d26bea 100644
--- a/software/application-software/argos/README.md
+++ b/software/application-software/argos/README.md
@@ -19,3 +19,5 @@ backend (`scylla-server/`), with schema tooling in `charybdis/` and MQTT broker
 
 Shared Claude workflows stay in `workspace-inherit/.claude/skills/`. Shared facts belong here or in `workspace-inherit/`;
 `workspace-defaults/` seeds new workspaces. Facts that one workspace needs belong in that workspace.
+The Codex workspace reads the existing Argos development rules and glossary through its read-only
+`workspaces/main/` link, so those facts have one maintained copy.
diff --git a/software/application-software/argos/workspace-inherit/.claude/skills/pr-conventions/BODY.codex.md b/software/application-software/argos/workspace-inherit/.claude/skills/pr-conventions/BODY.codex.md
new file mode 100644
index 0000000..e161216
--- /dev/null
+++ b/software/application-software/argos/workspace-inherit/.claude/skills/pr-conventions/BODY.codex.md
@@ -0,0 +1,9 @@
+# Argos PR conventions
+
+The shared rules are in the `open-pr` skill; this adds only what is Argos's.
+
+- Base branch: `develop`. Commit format: `^#[0-9]+ - ` (the format in the workspace instructions).
+- Checks: `bash scripts/lint.sh <branch>` (frontend prettier and ng lint, only if angular-client/ changed).
+- Labels: one written-by (`by: human` if the user wrote it, `by: ai-assisted` if they gave the substance, `by: ai` if you wrote it) and at least one area label (`frontend`, `backend`, `devops`), besides `open-pr`'s category label.
+- Screenshots: `pictures/<branch>/` at the worktree root (git-ignored).
+- UI QA: get the branch running with the `run-local` skill, then verify the relevant UI with the browser tools available in this Codex host. If browser tooling is unavailable, report the verification that remains.
diff --git a/software/application-software/argos/workspaces/default-codex/AGENTS.md b/software/application-software/argos/workspaces/default-codex/AGENTS.md
index 476be53..aafef6e 100644
--- a/software/application-software/argos/workspaces/default-codex/AGENTS.md
+++ b/software/application-software/argos/workspaces/default-codex/AGENTS.md
@@ -11,62 +11,15 @@ Shell exports may not persist between commands or reach independently launched s
 
 Use the tools available in the current harness for browser verification and GitHub access. If a skill requires unavailable tooling or authentication, report the missing prerequisite and the verification that remains. Delphi does not configure Codex permissions, credentials, MCP servers or host dependencies.
 
-# NER Software conventions
-
-## Branch & Commit Conventions
-
-- Branch from `develop` (not `main`) unless told otherwise. Branch name format: `{issue-number}-{kebab-case-title}` (e.g. `533-csv-upload-download-rules`), or `throwaway-{kebab-case-title}` to try something without a ticket.
-- Commit message format: `#{ticket-number} - {concise description}` (e.g. `#533 - add CSV upload endpoint`). Throwaway branches have no ticket, so any short message works.
-
-## Safety Rules
-
-- Never modify `.env` or secret files without explicit confirmation.
-- Never delete files without explicit confirmation.
-- Explain reasoning before making architectural changes.
-
 # Argos
 
-Argos is a real-time telemetry platform for Northeastern Electric Racing (NER). Angular 19 frontend (`angular-client/`) and Rust backend (`scylla-server/`), with schema tooling in `charybdis/` and MQTT broker config in `siren-base/`.
-
-The Argos repo's `develop` is checked out at `worktrees/argos/develop/`. Repo paths below (`angular-client/`, `scylla-server/`, `compose/`) are inside an Argos worktree. The ticket number is the branch's leading number (`533-csv-upload` → `#533`).
-
-## Worktrees
-
-- `worktrees/argos/develop/` mirrors `develop`: run anything there (`npm ci`, tests, the backend, `run-local`), but never edit code, branch, or commit there. The only git operations there are fetch and fast-forward.
-- To change code, make a worktree on its own branch with the `new-worktree` skill, based on `origin/develop`. Use the ticket's branch, or a `throwaway-{kebab-case-title}` branch to experiment without one. If a throwaway turns into real work, file a ticket (`create-ticket`), make the ticket's worktree from `origin/develop`, run `git -C worktrees/argos/<ticket-branch> merge --squash throwaway-{kebab-case-title}`, then `commit`, so the work lands as one commit in the ticket format.
-- A new worktree has no `node_modules`; `run-local` and `implement` install them.
-
-## Local Development
-
-- Run the app with the `run-local` skill, passing the branches you're looking at (a PR's or ticket's, with a worktree from `new-worktree`; not `develop` unless asked). It starts the backend if it's down, on the right compose profile (`client-dev` runs everything in Docker; `scylla-dev` plus `cargo run` when a target changes `scylla-server/`), and serves each worktree's client on its own port.
-- The shell workflow (`argos.sh`, the `run-local`/`verify-*` skills, and helpers like `lsof`/`pkill`) assumes a Unix shell. On Windows, run everything from WSL or Git Bash, not `cmd`/PowerShell.
-
-## Testing
-
-The checks (frontend tests, lint and format; backend build and tests) and how to run them from the root are in `implement`; `open-pr` reruns lint and format before a PR.
-
-## Workflow
-
-Per ticket: `implement` (worktree, test-first, `commit`) → `open-pr`.
-
-## PR Convention
-
-- The `commit` skill applies the commit message format.
-- Open PRs against `develop` as drafts. PR titles carry no ticket number; the body ends with `Closes #{ticket}`. The `open-pr` skill runs the pre-PR checks (lint, conflict check), pushes, and opens the draft; `update-pr` refreshes the description.
-- Keep PR descriptions tight: at most three backtick usages in the body, and never commit screenshots (`open-pr` asks before attaching them to the PR).
-
-## Screenshots
-
-Save all Playwright screenshots under `pictures/<branch-name>/` at the repo root, using kebab-case descriptive filenames. The `pictures/` folder is git-ignored, so screenshots are never committed; `open-pr` offers to attach them to the PR with `gh --attach` (drag-drop them on gh older than v2.99.0).
-
-## Code Conventions
-
-Code and ADR conventions worth stating are in the Conventions section of `docs/CONTEXT.md`; everything else follows current Angular and Rust defaults.
-
-## Issue tracker
-
-Issues live in GitHub Issues on `Northeastern-Electric-Racing/Argos` via the `gh` CLI. File tickets with the `create-ticket` skill (shared by every application-software workspace); it holds the ticket conventions and follows the repo's issue templates (idea, spike, epic, dev work), with Argos's specifics in `ticket-conventions`. When an out-of-scope but worthwhile idea comes up mid-work, offer to file it as an idea with `create-ticket`; park rough notes with `journal`.
-
-## Domain docs
+Before working on Argos, read the project rules in
+`workspaces/main/software/application-software/argos/workspaces/argos-dev/CLAUDE.md`, starting at
+`NER Software conventions`, and follow `docs/CONTEXT.md` for the canonical glossary and code
+conventions. These live references keep this workspace aligned with Argos development without
+copying its project context. Use the corresponding native Codex skills when those rules name
+slash commands; use the Codex bootstrap above for helper commands.
 
-The glossary is a workspace doc: `docs/CONTEXT.md` at the workspace root. Edit it there and it's proposed back to Delphi. ADRs live in the Argos repo at `docs/adr/` and land through Argos PRs like any other change; filenames follow the Conventions section of `docs/CONTEXT.md`. Read `docs/CONTEXT.md` and the relevant ADRs before exploring, use the glossary's terms, and flag any conflict with an ADR.
+The linked `main` checkout is read-only from this workspace. Run `bash .delphi/setup.sh` if it is
+missing or needs refreshing. Propose shared context changes through a normal PR to Delphi main
+from a separate checkout or after switching workspaces; do not edit the linked clone here.
diff --git a/software/application-software/argos/workspaces/default-codex/docs/CONTEXT.md b/software/application-software/argos/workspaces/default-codex/docs/CONTEXT.md
index ff98e26..e1ce7a4 100644
--- a/software/application-software/argos/workspaces/default-codex/docs/CONTEXT.md
+++ b/software/application-software/argos/workspaces/default-codex/docs/CONTEXT.md
@@ -1,102 +1,8 @@
-# Argos
+# Argos context
 
-Argos is the real-time telemetry platform for Northeastern Electric Racing. Data flows from the car's CAN nodes, through the Siren MQTT broker, into scylla-server (which persists it and rebroadcasts it live), and out to the angular-client dashboard. This file defines the domain vocabulary shared across those components, plus the few code conventions worth stating.
+Read the canonical glossary and code conventions at
+`workspaces/main/software/application-software/argos/workspaces/argos-dev/docs/CONTEXT.md`
+from the workspace root. Read the relevant ADRs in the Argos code worktree too.
 
-## Language
-
-### Telemetry data model
-
-**DataType**:
-A named measurement class paired with a unit — e.g. `BMS/Status/Temp_Average` measured in `C`. Identified by its `name`, which is also the MQTT topic string. Every datapoint belongs to exactly one DataType.
-_Avoid_: Channel, signal, metric, field.
-
-**Run**:
-A single telemetry session, identified by `runId`, capturing the driver, location, notes, and start time. All data ingested while a run is active is stamped with its `runId`. One Run holds many datapoints.
-_Avoid_: Session, trip, lap, test.
-
-**Data** (a **datapoint**):
-One timestamped measurement for a given DataType within a given Run. Its `values` is a vector of floats (most DataTypes carry one, some carry several), keyed by `(time, dataTypeName, runId)`.
-_Avoid_: Sample, reading, record, row.
-
-**Topic**:
-The slash-delimited MQTT path a telemetry stream is published under — e.g. `VCU/CarState/speed`. A topic maps one-to-one onto a DataType `name`. A handful of synthetic topics (`Argos/Message_Rate`, `Argos/Viewers`, `Latency`) are generated server-side and broadcast live but never persisted.
-_Avoid_: Path, channel, stream.
-
-**Node**:
-An on-vehicle CAN device that reports faults — one of `Bms`, `Dti`, `Mpu`, `Charger`. Used for attributing faults to their source.
-_Avoid_: Device, ECU, board, unit.
-
-### BMS cell voltages
-
-**C-ADC voltage** (**C Volts**):
-A cell's voltage from the ADBMS chip's primary C-ADC. Published per cell at `BMS/PerCell/{Alpha|Beta}/{segment}/Volts/{cell}` in `V`; rendered as the **C Volts** BMS-heatmap view (formerly labelled "Voltage").
-_Avoid_: "the voltage" — ambiguous now that the S-ADC reading also exists.
-
-**S-ADC voltage** (**S Volts**):
-The same cell measured independently by the ADBMS chip's redundant S-ADC. Per-cell topic `BMS/PerCell/{Alpha|Beta}/{segment}/S_Volts/{cell}` in `V`, mirroring the C-ADC's `Volts`; rendered as the **S Volts** BMS-heatmap view.
-_Avoid_: sense voltage.
-
-**CvS**:
-Per-cell boolean the BMS raises when a cell's C-ADC and S-ADC readings diverge past threshold. Topic `BMS/PerCell/{Alpha|Beta}/{segment}/CvS/{cell}`; rendered as the **CvS Failure** heatmap view.
-_Avoid_: C-vs-S failure (say "CvS").
-
-### Alerting
-
-**Fault**:
-A discrete fault event raised by a Node, tracked with its first-occurrence time, last-seen time, and an expired flag once it stops recurring.
-_Avoid_: Error, alarm, warning.
-
-**Rule**:
-A user-defined condition on a topic's values (a boolean expression like `a > 100`) that notifies subscribers when it matches, subject to a debounce interval.
-_Avoid_: Trigger, alert, condition, watch.
-
-### Components
-
-**scylla-server**:
-The Rust/Axum backend. Subscribes to every MQTT topic, parses incoming protobuf into datapoints, stamps them with the active `runId`, batch-upserts them to Postgres, and rebroadcasts live data over a Socket.IO websocket. Owns the rule engine and the REST API.
-_Avoid_: Backend, server, API (when a more specific term fits).
-
-**angular-client**:
-The Angular dashboard that renders live and historical telemetry, run history, faults, and rules, and sends car commands.
-_Avoid_: Frontend, UI, app.
-
-**Siren**:
-The Mosquitto MQTT broker (`siren-base/`) that ingests CAN telemetry from the car and publishes it for scylla-server to consume.
-_Avoid_: Broker, MQTT (as a synonym for Siren specifically).
-
-**Charybdis**:
-The database schema and data migration tooling (`charybdis/`) — Prisma for the cloud DB, Diesel for local — plus the dump/upload sync between them.
-_Avoid_: Migrations, Prisma (as a synonym for Charybdis).
-
-**Calypso**:
-The car-side encoder that subscribes to `Calypso/Bidir/Command/*` topics published by scylla-server and converts them into CAN messages for the vehicle. The local stack runs a Calypso simulator in its place.
-_Avoid_: Simulator, encoder (without naming Calypso).
-
-## Conventions
-
-Project-specific choices. Everything else follows current Angular and Rust defaults.
-
-**angular-client**
-- External `templateUrl` and `styleUrls`, never inline templates or styles.
-- Icons, never emojis: Material Icons (`mat-icon` with `svgIcon`) for app-level UI, PrimeIcons (`pi pi-*`) inside PrimeNG components. Custom SVGs go in `src/assets/icons/`, registered with `MatIconRegistry`.
-- Must pass AXE checks, WCAG AA minimum.
-
-**scylla-server**
-- Controller → Service → DB: thin controllers, business logic in services, Diesel for DB access with batch upserts.
-- Log with `tracing`; schema changes go through Diesel migrations; unit tests live in `#[cfg(test)]` modules.
-
-**ADRs** (Argos `docs/adr/`)
-- Filename `<NNNN>-<prefix>-<topic-slug>.md`. The prefix is what the decision touches: `angular-client`, `scylla-server`, `siren-base`, `charybdis`, `full-stack` (client + server), `multi-comp` (any other cross-component or repo-wide infra), or `misc` (no code component, e.g. workflow).
-
-## Flagged ambiguities
-
-- **Node** is overloaded. In this glossary it means a CAN device (`Bms`/`Dti`/`Mpu`/`Charger`). The angular-client also has a `Node` type that is a UI topic-tree element, and "node" can mean an MQTT client. Always qualify: "CAN node", "tree node", "MQTT client".
-- **DataType vs Topic.** They share a string (`DataType.name` == the MQTT topic), but a Topic is the live MQTT routing path while a DataType is the persisted measurement class. Use "topic" when talking about MQTT/subscriptions, "DataType" when talking about stored data and units.
-- **Data** is both the singular and plural here; say "a datapoint" for one and "data" for the collection to avoid confusion with the `Data` struct.
-
-## Example dialogue
-
-> **Dev:** When a run starts, does each topic get its own row?
-> **Domain expert:** Not per topic — per datapoint. Each datapoint is one timestamp for one DataType inside that Run. A topic like `VCU/CarState/speed` maps to a single DataType, and you'll get a datapoint every time Siren publishes on it.
-> **Dev:** And if the pack overheats?
-> **Domain expert:** That's a Fault, raised by the `Bms` node — separate from the datapoints. If someone also wrote a Rule on `BMS/Status/Temp_Average` like `a > 60`, that Rule fires its own notification to subscribers.
+The `main` link is read-only here and refreshed by `bash .delphi/setup.sh`. Shared vocabulary
+changes belong in a PR to Delphi main at that canonical path; keep this file as a pointer.
diff --git a/software/application-software/nero/workspace-inherit/.claude/skills/pr-conventions/BODY.codex.md b/software/application-software/nero/workspace-inherit/.claude/skills/pr-conventions/BODY.codex.md
new file mode 100644
index 0000000..27775a7
--- /dev/null
+++ b/software/application-software/nero/workspace-inherit/.claude/skills/pr-conventions/BODY.codex.md
@@ -0,0 +1,9 @@
+# Nero PR conventions
+
+The shared rules are in the `open-pr` skill; this adds only what is Nero's.
+
+- Base branch: `develop`. Commit format: `^#[0-9]+ ` (the format in the workspace instructions).
+- Checks: in the worktree, `clang-format --dry-run --Werror` on the C++ files changed since `origin/develop` (not under `deps/`); stop on any error.
+- Labels: only `open-pr`'s category label.
+- Screenshots: `playwright/test-results/<case>/` in the worktree, never committed.
+- UI QA, only if QML or a page changed: in the worktree's `playwright/`, add or update a case for each changed page, run `npm test`, and inspect `test-results/<case>/` (CLAUDE.md's Playwright section).
diff --git a/software/application-software/workspace-inherit/.claude/skills/address-pr-comments/BODY.codex.md b/software/application-software/workspace-inherit/.claude/skills/address-pr-comments/BODY.codex.md
new file mode 100644
index 0000000..8bcbc0c
--- /dev/null
+++ b/software/application-software/workspace-inherit/.claude/skills/address-pr-comments/BODY.codex.md
@@ -0,0 +1,13 @@
+Propose and apply fixes for a PR's unresolved review feedback. **Never reply to threads**; the user does.
+
+1. **Fetch** from the workspace root: `bash scripts/fetch-feedback.sh <repo> <pr>|<branch>` (`<repo>` as under `repos/`, e.g. `argos`; `--all` first for unfiltered history). It checks out the PR head's worktree and prints JSON: `worktree` (target it by path from the root from now on), unresolved `threads`, `comments`, `reviews`. If the helper fails, use an available authenticated GitHub integration to read the PR's reviews and comments. If neither is available, report the missing access.
+2. **Judge.** Skip bot noise and anything already fixed at HEAD. For an `outdated` thread, find its `diffHunk` code by content, then label it **addressed**, **applies**, **moved**, **obsolete**, or **unclear**.
+3. **Present** before editing, grouped by file, and ask to confirm, skip, or change each (offer to batch clear ones past 8):
+
+   ```
+   <file>:<line> — <reviewer> · <active|outdated> · <label>
+   "<excerpt>" → <proposed fix>
+   <optional ≤5-line snippet, for the user only>
+   ```
+4. **Apply** in that worktree, by path, with grouped commits using the `commit` skill. For a follow-up-ticket request, reuse a matching existing GitHub issue before filing.
+5. **Report** what was fixed (file:line, commit SHA), what was already addressed or obsolete (why), and what is unclear.
diff --git a/software/application-software/workspace-inherit/.claude/skills/commit/BODY.codex.md b/software/application-software/workspace-inherit/.claude/skills/commit/BODY.codex.md
new file mode 100644
index 0000000..cc30fdd
--- /dev/null
+++ b/software/application-software/workspace-inherit/.claude/skills/commit/BODY.codex.md
@@ -0,0 +1 @@
+In the worktree you're working on, from the workspace root (`git -C worktrees/<repo>/<branch> …`), stage the relevant changes (not unrelated or generated files) and commit using the commit message format in the workspace's `AGENTS.md`. Keep the description imperative and 2–8 words.
diff --git a/software/workspace-inherit/.claude/skills/switch-workspace/BODY.codex.md b/software/workspace-inherit/.claude/skills/switch-workspace/BODY.codex.md
new file mode 100644
index 0000000..03532c3
--- /dev/null
+++ b/software/workspace-inherit/.claude/skills/switch-workspace/BODY.codex.md
@@ -0,0 +1,14 @@
+Run from the checked-out workspace root:
+
+```
+bash .delphi/switch.sh <name>        # ws/<name>: its dotted name, e.g. s.app.argos.argos-dev
+bash .delphi/switch.sh main          # Delphi's main: project folders, templates, CI
+```
+
+- List workspaces and their project folders: `bash .delphi/switch.sh --list`.
+- Switching refuses tracked changes. Commit them on a branch and open its PR first. The switch fetches, fast-forwards, and runs the destination workspace's setup.
+- The post-checkout hook parks this workspace's ignored working folders under `.delphi/parked/<name>/` and restores the destination workspace's folders at their original paths. Never run `git clean -X` or `git stash --all` at the workspace root: they take parked work too.
+- Before switching, stop processes that run from the workspace's working folders, since their paths move.
+- Start a fresh Codex session after switching. The new workspace's instructions and skills must load before starting its work.
+- To change the destination workspace, create a branch, commit, push, and open a PR into its `ws/<name>` branch (or `main`).
+- To read another workspace without switching, list it under `workspaces:` instead (`setup-workspace` skill).
diff --git a/templates/harnesses/codex/AGENTS.md b/templates/harnesses/codex/AGENTS.md
index 3ba5d97..7ad803f 100644
--- a/templates/harnesses/codex/AGENTS.md
+++ b/templates/harnesses/codex/AGENTS.md
@@ -1,6 +1,3 @@
-# Delphi workspace
-
-You're in Delphi workspace `{{name}}` (branch `ws/{{name}}`); code repos are cloned at `repos/<repo>/`, and separately checked out as worktrees under `worktrees/<repo>/` (`.delphi/setup.sh` makes the default branch's). Work in worktrees: make each new branch one under `worktrees/<repo>/<branch>` (`new-worktree` skill) unless the user says not to. Read-only dependency sources from `references-git:` are checked out under `references/<name>/` at the version the workspace pins: read them to learn how a dependency behaves (prefer them over web docs), and never edit, branch, or push them. Delphi workspaces (or `main`) under `workspaces:` in `workspace.yml` (`- <name>`, a workspace's dotted name like `s.app.argos.argos-dev`, or `- main`) are clones at `workspaces/<name>/`, each on its branch, for reading their context (don't edit them from here; setup switches each back to its branch and pulls it); change what's checked out with the `setup-workspace` skill. To work in another workspace, switch this clone to it (`switch-workspace` skill). Park rough notes with the `journal` skill. Work here unless the task clearly belongs to another project.
 
 
 ## Workspace setup
diff --git a/tests/e2e.sh b/tests/e2e.sh
index 4b54b2d..841729e 100644
--- a/tests/e2e.sh
+++ b/tests/e2e.sh
@@ -127,6 +127,13 @@ sync >"$t/out" || fail "sync after merging propose failed"
 [ "$(o rev-parse "ws/$AN^{tree}")" = "$(o rev-parse "$ws^{tree}")" ] || fail "ws tree changed"
 [ ! -s "$t/gh.log" ] || fail "gh called after propose merged: $(cat "$t/gh.log")"
 ok "after the propose PR merges into main, sync is clean and opens no PR"
+before=$(o for-each-ref --format='%(refname) %(objectname)' refs/heads/ws refs/heads/propose)
+commit_on main README.md "documentation-only edit"
+: >"$t/gh.log"
+sync >"$t/out" 2>"$t/err" || fail "documentation-only sync failed: $(cat "$t/err")"
+[ "$before" = "$(o for-each-ref --format='%(refname) %(objectname)' refs/heads/ws refs/heads/propose)" ] || fail "documentation-only main edit changed workspace or proposal refs"
+[ ! -s "$t/gh.log" ] || fail "documentation-only main edit contacted the PR stub"
+ok "a README-only main change leaves workspace and proposal refs unchanged"
 
 # --- 4. a main change to another file refreshes into a ws branch with its own edits, then propose
 commit_on ws/$AN docs/CONTEXT.md "ws edit two"
@@ -168,13 +175,18 @@ o show "ws/$BN:.claude/settings.json" | grep -qF '"command": "bash \"$CLAUDE_PRO
 ok "native settings already exist on main and refresh copies them unchanged"
 commit_on ws/$AN workspace.yml "$(printf 'plugins:\n  - argos.testing')"
 sync "$AN" >"$t/out" 2>&1 || fail "main-side plugin proposal failed: $(cat "$t/out")"
-! o show "ws/$AN:.claude/settings.json" | grep -q argos.testing || fail "refresh generated settings on the workspace branch"
+o show "ws/$AN:.claude/settings.json" | grep -q argos.testing || fail "branch-selected plugin is disabled before its proposal merges"
+! o show "main:$A/.claude/settings.json" | grep -q argos.testing || fail "branch plugin choice changed main before merge"
 o show "propose/$AN:$A/.claude/settings.json" | grep -q argos.testing || fail "main proposal lacks generated settings"
-ok "workspace configuration changes generate native settings in the main-side proposal, then wait for merge"
+branch_settings=$(o rev-parse "ws/$AN:.claude/settings.json")
+plugin_head=$(o rev-parse "ws/$AN")
+sync refresh "$AN" >/dev/null 2>&1 || fail "repeated branch plugin refresh failed"
+[ "$(o rev-parse "ws/$AN")" = "$plugin_head" ] || fail "repeated branch plugin refresh changed its ref"
+ok "branch-selected plugins stay enabled while their main proposal is pending, without advancing unchanged refs"
 commit_on ws/$AN .claude/settings.json "hand edit"
 sync "$AN" >"$t/out" 2>&1 || fail "settings reset failed: $(cat "$t/out")"
-[ "$(o rev-parse "main:$A/.claude/settings.json")" = "$(o rev-parse "ws/$AN:.claude/settings.json")" ] || fail "hand edit kept"
-ok "refresh resets managed native settings to main's current plugin configuration"
+[ "$branch_settings" = "$(o rev-parse "ws/$AN:.claude/settings.json")" ] || fail "hand edit kept or branch plugin selection lost"
+ok "refresh resets hand-edited settings to the branch's selected plugins"
 commit_on ws/$AN workspace.yml "  - argos.nope"
 if sync "$AN" >"$t/out" 2>"$t/err"; then fail "unknown plugin set accepted"; fi
 grep -q "lists argos.nope, which isn't a plugin set" "$t/err" || fail "unknown set not reported: $(cat "$t/err")"
@@ -348,6 +360,124 @@ o show "ws/$BN:.claude/skills/retire-optout/SKILL.md" | grep -qx 'owned before s
 sync refresh "$BN" >/dev/null
 ok "retirement preserves an opt-out rescinded before any intermediate sync by reporting the ambiguity"
 
+# A folder can move without changing its dotted workspace name or losing trusted ownership.
+d=$t/stable-name-rename
+git clone -q "$t/seed" "$d"
+bash -euo pipefail -s -- "$d" "$t/stable-name-origin.git" "$A" "$AN" <<'RENAME' >"$t/out" 2>"$t/err" || fail "stable-name ancestor rename: $(cat "$t/err")"
+cd "$1"
+origin=$2 folder=$3 name=$4
+project=${folder%/workspaces/*} leaf=${folder##*/}
+printf 'argos\n' >"$project/short-name"
+mkdir -p "$project/workspace-inherit/notes"
+echo shared >"$project/workspace-inherit/notes/project.txt"
+bash ci/render.sh
+git add -A; git commit -qm 'project inheritance before rename'
+git clone -q --bare . "$origin"
+git remote set-url origin "$origin"
+bash ci/sync.sh refresh "$name"
+git mv "$project" software/application-software/product
+bash ci/render.sh
+git add -A; git commit -qm 'move project with stable short name'; git push -q origin main
+folder=software/application-software/product/workspaces/$leaf
+bash ci/sync.sh refresh "$name"
+git -C "$origin" show "ws/$name:workspace.generated" | grep -q 'software/application-software/product/workspace-inherit/notes/project.txt'
+! git -C "$origin" show "ws/$name:workspace.generated" | grep -q 'software/application-software/argos/workspace-inherit/notes/project.txt'
+git fetch -q; git checkout -q -B edit "origin/ws/$name"
+echo 'active edit must reset' >notes/project.txt
+git commit -qam 'edit moved managed file'; git push -q origin "HEAD:ws/$name"; git checkout -q main
+bash ci/sync.sh refresh "$name"
+[ "$(git -C "$origin" show "ws/$name:notes/project.txt")" = shared ]
+echo updated >software/application-software/product/workspace-inherit/notes/project.txt
+git commit -qam 'update source after project move'; git push -q origin main
+bash ci/sync.sh refresh "$name"
+[ "$(git -C "$origin" show "ws/$name:notes/project.txt")" = updated ]
+git fetch -q; git checkout -q -B edit "origin/ws/$name"
+printf 'opt-out:\n  - notes/project.txt\n' >>workspace.yml
+echo 'owned after rename' >notes/project.txt
+echo 'owned proposal' >own.txt
+git add -A; git commit -qm 'own moved context'; git push -q origin "HEAD:ws/$name"; git checkout -q main
+bash ci/sync.sh refresh "$name"
+git rm -q software/application-software/product/workspace-inherit/notes/project.txt
+git commit -qm 'retire moved source'; git push -q origin main
+bash ci/sync.sh refresh "$name"
+git fetch -q; git checkout -q -B edit "origin/ws/$name"
+sed -i.bak '/^opt-out:$/d;\|^  - notes/project.txt$|d' workspace.yml; rm workspace.yml.bak
+git commit -qam 'drop obsolete exclusion'; git push -q origin "HEAD:ws/$name"; git checkout -q main
+bash ci/sync.sh "$name"
+[ "$(git -C "$origin" show "propose/$name:$folder/notes/project.txt")" = 'owned after rename' ]
+[ "$(git -C "$origin" show "propose/$name:$folder/own.txt")" = 'owned proposal' ]
+! git -C "$origin" cat-file -e "propose/$name:$folder/workspace.generated" 2>/dev/null
+RENAME
+ok "a stable-name ancestor move preserves source origins, reset, updates, opt-out retirement and owned proposals"
+
+# A metadata-only move is a no-op even when its unmerged workspace has ordinary manifest edits.
+for rename_timing in before after; do
+  for rename_direction in refresh propose; do
+    d=$t/rename-manifest-$rename_timing-$rename_direction
+    git clone -q "$t/seed" "$d"
+    bash -euo pipefail -s -- "$d" "$d-origin.git" "$A" "$AN" "$rename_timing" "$rename_direction" <<'MANIFEST' >"$t/out" 2>"$t/err" || fail "rename manifest $rename_timing/$rename_direction: $(cat "$t/err")"
+cd "$1"
+origin=$2 folder=$3 name=$4 timing=$5 direction=$6
+project=${folder%/workspaces/*} leaf=${folder##*/}
+printf 'argos\n' >"$project/short-name"
+git rm -rq "$folder/CLAUDE.md" "$folder/.claude"
+printf '# Codex rename fixture\n' >"$folder/AGENTS.md"
+printf 'name: %s\nharness: codex\n' "$name" >"$folder/workspace.yml"
+mkdir -p software/workspace-inherit/notes
+echo shared >software/workspace-inherit/notes/common.txt
+bash ci/render.sh
+git add -A; git commit -qm 'metadata rename baseline'
+git clone -q --bare . "$origin"
+git remote set-url origin "$origin"
+bash ci/sync.sh refresh "$name"
+before=$(git -C "$origin" rev-parse "ws/$name")
+git mv "$project" software/application-software/product
+bash ci/render.sh
+git add -A; git commit -qm 'metadata-only project move'; git push -q origin main
+folder=software/application-software/product/workspaces/$leaf
+if [ "$timing" = after ]; then
+  bash ci/sync.sh refresh "$name"
+  [ "$(git -C "$origin" rev-parse "ws/$name")" = "$before" ]
+fi
+git fetch -q; git checkout -q -B edit "origin/ws/$name"
+printf 'repos:\n  sample: https://example.invalid/sample.git\n' >>workspace.yml
+git commit -qam 'ordinary workspace manifest edit'; git push -q origin "HEAD:ws/$name"; git checkout -q main
+owned=$(git -C "$origin" rev-parse "ws/$name")
+bash ci/sync.sh "$direction" "$name"
+git -C "$origin" show "ws/$name:workspace.yml" | grep -qx '  sample: https://example.invalid/sample.git'
+[ "$(git -C "$origin" show "ws/$name:notes/common.txt")" = shared ]
+[ "$(git -C "$origin" rev-parse "ws/$name")" = "$owned" ]
+bash ci/sync.sh propose "$name"
+git -C "$origin" show "propose/$name:$folder/workspace.yml" | grep -qx '  sample: https://example.invalid/sample.git'
+! git -C "$origin" cat-file -e "propose/$name:$folder/workspace.generated" 2>/dev/null
+! git -C "$origin" cat-file -e "propose/$name:$folder/notes/common.txt" 2>/dev/null
+if [ "$timing/$direction" = after/propose ]; then
+  # Once a proposal merges, Git may use its workspace-shaped ancestor as the next merge base.
+  git fetch -q; git merge -q --no-ff --no-edit "origin/propose/$name"; git push -q origin main
+  sed -i.bak 's|https://example.invalid/sample.git|https://example.invalid/main.git|' "$folder/workspace.yml"
+  rm "$folder/workspace.yml.bak"
+  git commit -qam 'main edits the same repository'; git push -q origin main
+  git checkout -q -B edit "origin/ws/$name"
+  sed -i.bak 's|https://example.invalid/sample.git|https://example.invalid/branch.git|' workspace.yml
+  rm workspace.yml.bak
+  git commit -qam 'workspace edits the same repository'; git push -q origin "HEAD:ws/$name"; git checkout -q main
+  owned=$(git -C "$origin" rev-parse "ws/$name")
+  proposal=$(git -C "$origin" rev-parse "propose/$name")
+  for attempt in refresh propose; do
+    if bash ci/sync.sh "$attempt" "$name" >conflict.log 2>&1; then exit 1; fi
+    grep -q CONFLICT conflict.log; grep -q workspace.yml conflict.log
+    [ "$(git -C "$origin" rev-parse "ws/$name")" = "$owned" ]
+    [ "$(git -C "$origin" rev-parse "propose/$name")" = "$proposal" ]
+  done
+  git -C "$origin" show "main:$folder/workspace.yml" | grep -qx '  sample: https://example.invalid/main.git'
+  git -C "$origin" show "ws/$name:workspace.yml" | grep -qx '  sample: https://example.invalid/branch.git'
+fi
+MANIFEST
+  done
+done
+ok "metadata-only stable-name moves preserve ordinary manifest edits before or after refresh and in propose-only runs"
+ok "after a moved workspace proposal merges, same-key manifest conflicts preserve both refs and contents"
+
 # --- 5. a conflict on bms-dev is reported; argos-dev still syncs; exit 1
 commit_on ws/$BN CLAUDE.md "ws side"
 commit_on main "$B/CLAUDE.md" "main side"
@@ -398,6 +528,12 @@ expect_bad main-ownership-record "ownership records belong only on workspace bra
 expect_bad unknown-source-format "declare one supported source format" sh -c "echo 'format: unknown' >${A%/workspaces/*}/workspace-defaults/source.yml"
 expect_bad mixed-source-formats "AGENTS.md does not belong to the declared claude-code format" touch "${A%/workspaces/*}/workspace-defaults/AGENTS.md"
 expect_bad owned-output-collision "workspace-owned file collides" sh -c "mkdir -p software/workspace-inherit/.claude/skills/collision $CX/.agents/skills/collision && echo shared >software/workspace-inherit/.claude/skills/collision/SKILL.md && echo own >$CX/.agents/skills/collision/SKILL.md"
+source_with_name() { mkdir -p "$1"; printf x >"$1/$2"; }
+expect_bad inherited-space-path 'unsafe path' source_with_name software/workspace-inherit/docs 'has space.md'
+printf -v unsafe_tab 'has\tname.md'
+expect_bad inherited-tab-path 'unsafe path' source_with_name software/workspace-inherit/docs "$unsafe_tab"
+printf -v unsafe_newline 'has\nname.md'
+expect_bad inherited-newline-path 'unsafe path' source_with_name software/workspace-inherit/docs "$unsafe_newline"
 
 d=$t/chk-owned-output-collision
 if "$src/ci/render.sh" "$d" >"$t/out" 2>"$t/err"; then fail "renderer overwrote an owned collision"; fi
@@ -482,6 +618,8 @@ d=$t/staging
 mkdir "$d"
 cp -R "$src/ci" "$src/software" "$src/templates" "$src/.github" "$src/.delphi" "$src/.claude-plugin" "$d/"
 (cd "$d" && git init -q && chmod +x software/workspace-inherit/.claude/skills/journal/scripts/capture.sh &&
+  mkdir -p software/workspace-inherit/docs/C++ && printf 'portable punctuation\n' >software/workspace-inherit/docs/C++/@config.md &&
+  printf 'ordinary body-named document\n' >software/workspace-inherit/docs/BODY.codex.md &&
   echo changed >>software/workspace-inherit/.claude/skills/journal/SKILL.md && git add -A && git commit -qm source-change &&
   bash ci/check.sh . && bash ci/render.sh --check . "$t/staged-native" &&
   bash ci/render.sh . "$t/staged-native-again" && [ -z "$(git status --porcelain)" ]) >"$t/out" 2>"$t/err" || fail "read-only staging: $(cat "$t/err")"
@@ -491,6 +629,8 @@ for folder in "$A" "$CX"; do
   [ ! -e "$d/$folder/workspace.generated" ] || fail "staging wrote a ledger to main"
 done
 [ ! -e "$d/$CX/.agents/skills/journal/SKILL.md" ] || fail "staging wrote inherited skills to main"
+cmp -s "$d/software/workspace-inherit/docs/C++/@config.md" "$t/staged-native/$CX/docs/C++/@config.md" || fail "staging rejected or changed supported +/@ filenames"
+cmp -s "$d/software/workspace-inherit/docs/BODY.codex.md" "$t/staged-native/$CX/docs/BODY.codex.md" || fail "a BODY filename outside a skill was incorrectly omitted"
 while IFS=$'\t' read -r meta path _; do
   case "$meta" in '' | '#'* ) continue ;; esac
   [ "$(git -C "$d" hash-object -- "$t/staged-native/$CX/$path")" = "${meta#* }" ] || fail "staged ledger hash differs from native bytes"
@@ -515,6 +655,33 @@ grep -q 'symlink' "$t/err" || fail "unsafe staging symlink was not reported"
 [ -z "$(git -C "$d" status --porcelain)" ] || fail "refused staging output changed main"
 ok "staging refuses output symlinks before touching main-owned workspace data"
 
+d=$t/source-exclusions
+mkdir "$d"
+cp -R "$src/ci" "$src/software" "$src/templates" "$src/.github" "$src/.delphi" "$src/.claude-plugin" "$d/"
+mkdir -p "$d/software/application-software/argos/workspace-inherit/.claude/commands" "$d/$CX/.agents/skills/journal"
+mkdir -p "$d/software/workspace-inherit/docs/C++" "$d/$CX/docs/C++"
+echo 'Claude-only command' >"$d/software/application-software/argos/workspace-inherit/.claude/commands/only.md"
+echo 'owned native skill' >"$d/$CX/.agents/skills/journal/SKILL.md"
+echo 'shared punctuation' >"$d/software/workspace-inherit/docs/C++/@config.md"
+echo 'owned punctuation' >"$d/$CX/docs/C++/@config.md"
+printf 'opt-out:\n  - .claude/commands\n  - .agents/skills/journal\n  - docs/C++/@config.md\n' >>"$d/$CX/workspace.yml"
+(cd "$d" && git init -q && git add -A && git commit -qm exclusions &&
+  bash ci/render.sh --check . "$t/excluded-stage" && bash ci/check.sh .) >"$t/out" 2>"$t/err" || fail "source exclusions before mapping: $(cat "$t/err")"
+[ ! -e "$t/excluded-stage/$CX/.claude/commands" ] && [ ! -e "$t/excluded-stage/$CX/.agents/skills/journal" ] || fail "excluded source or native output was staged"
+[ "$(cat "$d/$CX/.agents/skills/journal/SKILL.md")" = 'owned native skill' ] || fail "native opt-out lost owned content"
+[ ! -e "$t/excluded-stage/$CX/docs/C++/@config.md" ] && [ "$(cat "$d/$CX/docs/C++/@config.md")" = 'owned punctuation' ] || fail "+/@ opt-out key was not respected"
+cmp -s "$d/software/application-software/argos/workspace-inherit/.claude/commands/only.md" "$t/excluded-stage/$A/.claude/commands/only.md" || fail "Claude-native command was not inherited by Claude"
+cp "$d/$CX/workspace.yml" "$t/source-exclusion-manifest"
+sed -i.bak '\|^  - .claude/commands$|d' "$d/$CX/workspace.yml"; rm "$d/$CX/workspace.yml.bak"
+if "$d/ci/render.sh" --check "$d" >"$t/out" 2>"$t/err"; then fail "unsupported unexcluded native command mapping was accepted"; fi
+grep -q 'has no mapping to codex' "$t/err" || fail "unsupported native command mapping was not explained"
+cp "$t/source-exclusion-manifest" "$d/$CX/workspace.yml"
+sed -i.bak 's|.agents/skills/journal|.claude/skills/journal|' "$d/$CX/workspace.yml"; rm "$d/$CX/workspace.yml.bak"
+if "$d/ci/render.sh" --workspace "$CX" "$d" "$t/wrong-native-exclusion" >"$t/out" 2>"$t/err"; then fail "mapped skill accepted a source-path ownership exclusion"; fi
+grep -q 'must use its native destination' "$t/err" || fail "mapped skill exclusion did not explain its native destination"
+[ "$(cat "$d/$CX/.agents/skills/journal/SKILL.md")" = 'owned native skill' ] || fail "wrong source exclusion changed native owned content"
+ok "source-native exclusions run before mapping while native destination opt-outs preserve owned files"
+
 expect_bad inherited-twice "also inherits it from a folder above" sh -c "mkdir -p software/application-software/workspace-inherit/.claude/skills/journal && printf 'format: claude-code\\n' >software/application-software/workspace-inherit/source.yml && echo x >software/application-software/workspace-inherit/.claude/skills/journal/SKILL.md"
 expect_bad inherited-claude-md "software/workspace-inherit/CLAUDE.md: each workspace has its own" sh -c "mkdir -p software/workspace-inherit && printf 'format: claude-code\\n' >software/workspace-inherit/source.yml && echo x >software/workspace-inherit/CLAUDE.md"
 expect_bad inherit-in-workspace "belongs in an org or project folder" sh -c "mkdir -p $A/workspace-inherit && echo x >$A/workspace-inherit/f"
@@ -998,6 +1165,7 @@ commit_on "ws/$CO" CLAUDE.md "old side" && commit_on "ws/$CN" .gitattributes "#
 ok "an old name with commits of its own is reported, never merged"
 
 # --- 13. portable harnesses: staged native output, round trips, transitions, bootstrap and authoring
+frontmatter() { awk 'NR == 1 && /^---\r?$/ { front = 1; sub(/\r$/, ""); print; next } front { sub(/\r$/, ""); print; if (/^---$/) exit }'; }
 mkdir -p "$t/metadata-variants"
 cat >"$t/metadata-variants/source.md" <<'SKILL'
 ---
@@ -1025,7 +1193,7 @@ description: |-
   First line: useful
   Second line
 ---
-Read AGENTS.md.
+Read CLAUDE.md.
 SKILL
 for indent in '' '  '; do
   sed "/^---$/!s/^/$indent/" "$t/metadata-variants/source.md" >"$t/metadata-variants/lf.md"
@@ -1034,7 +1202,8 @@ for indent in '' '  '; do
     if [ "$eol" = crlf ]; then awk '{ printf "%s\r\n", $0 }' "$t/metadata-variants/lf.md" >"$t/metadata-variants/SKILL.md"
     else cp "$t/metadata-variants/lf.md" "$t/metadata-variants/SKILL.md"; fi
     bash -c 'source "$1"; harness_file codex "$2"' _ "$src/ci/harnesses.sh" "$t/metadata-variants/SKILL.md" >"$t/metadata-variants/actual.md"
-    cmp -s "$t/metadata-variants/want.md" "$t/metadata-variants/actual.md" || fail "Codex metadata indentation/quotes/$eol"
+    cmp -s <(frontmatter <"$t/metadata-variants/want.md") <(frontmatter <"$t/metadata-variants/actual.md") || fail "Codex metadata indentation/quotes/$eol"
+    grep -qF 'Read CLAUDE.md.' "$t/metadata-variants/actual.md" || fail "Codex changed an opaque source instruction reference"
     bash -c 'source "$1"; harness_file claude-code "$2"' _ "$src/ci/harnesses.sh" "$t/metadata-variants/SKILL.md" |
       cmp -s - "$t/metadata-variants/SKILL.md" || fail "Claude metadata bytes changed"
   done
@@ -1053,7 +1222,28 @@ metadata:
   custom-setting: unchanged
 ---
 Read CLAUDE.md before making changes.
+Keep literal `CLAUDE.md` in code-repository commands and English examples.
+`printf 'CLAUDE.md\n'`
 SKILL
+mkdir "$t/portable"
+cat >"$t/portable/SKILL.md" <<'SKILL'
+---
+name: portable
+description: Run the portable helper.
+---
+portable v1
+
+```sh
+bash scripts/helper.sh "argument with spaces"
+```
+SKILL
+cat >"$t/portable/helper.sh" <<'HELPER'
+#!/usr/bin/env bash
+set -euo pipefail
+source "$DELPHI_ROOT/.delphi/paths.sh"
+printf '%s|%s|%s\n' "$DELPHI_ROOT" "$PWD" "$1"
+HELPER
+bash -c 'source "$1"; harness_file codex "$2"' _ "$src/ci/harnesses.sh" "$t/portable/SKILL.md" >"$t/portable-codex.md"
 C=software/application-software/argos/workspaces/sandbox-codex CN=s.app.argos.sandbox-codex
 # shellcheck disable=SC2016 # child shell expands its positional arguments
 on_main "add Codex and inherited Claude skills" bash -c '
@@ -1063,11 +1253,12 @@ on_main "add Codex and inherited Claude skills" bash -c '
   mkdir -p "$1/.github/workflows"
   cp .github/workflows/delphi.yml "$1/.github/workflows/delphi.yml"
   printf "name: %s\nharness: codex\n" "$3" >"$1/workspace.yml"
-  printf "portable v1\n" >software/workspace-inherit/.claude/skills/portable/SKILL.md
-  printf "helper v1\n" >software/workspace-inherit/.claude/skills/portable/scripts/helper.sh
+  cp "$5/SKILL.md" software/workspace-inherit/.claude/skills/portable/SKILL.md
+  cp "$5/helper.sh" software/workspace-inherit/.claude/skills/portable/scripts/helper.sh
   cp "$4" software/workspace-inherit/.claude/skills/native-metadata/SKILL.md
   cp "$2/software/workspace-inherit/.claude/skills/switch-workspace/SKILL.md" software/workspace-inherit/.claude/skills/switch-workspace/SKILL.md
-' _ "$C" "$src" "$CN" "$t/native-metadata.md"
+  cp "$2/software/workspace-inherit/.claude/skills/switch-workspace/BODY.codex.md" software/workspace-inherit/.claude/skills/switch-workspace/BODY.codex.md
+' _ "$C" "$src" "$CN" "$t/native-metadata.md" "$t/portable"
 sync "$CN" >"$t/out" 2>&1 || fail "Codex creation: $(cat "$t/out")"
 for skill in top portable; do
   o cat-file -e "ws/$CN:.agents/skills/$skill/SKILL.md" || fail "Codex lacks native $skill"
@@ -1092,15 +1283,26 @@ description: "Preserve: existing tool permissions and invocation settings."
 metadata:
   custom-setting: unchanged
 ---
-Read AGENTS.md before making changes.
 SKILL
-cmp -s "$t/codex-metadata.md" <(o show "ws/$CN:.agents/skills/native-metadata/SKILL.md") || fail "Codex translation changed portable metadata or retained Claude-only fields"
+cmp -s "$t/codex-metadata.md" <(o show "ws/$CN:.agents/skills/native-metadata/SKILL.md" | frontmatter) || fail "Codex translation changed portable metadata or retained Claude-only fields"
+o show "ws/$CN:.agents/skills/native-metadata/SKILL.md" | grep -qx 'Read CLAUDE.md before making changes.' || fail "Codex changed source-owned prose"
+o show "ws/$CN:.agents/skills/native-metadata/SKILL.md" | grep -qF "printf 'CLAUDE.md\n'" || fail "Codex changed an opaque code reference"
 ok "Codex translation omits Claude-only fields and block values while preserving portable metadata"
 cmp -s "$src/software/workspace-inherit/.claude/skills/switch-workspace/SKILL.md" <(o show "ws/$AN:.claude/skills/switch-workspace/SKILL.md") || fail "Claude switching instructions changed"
 o show "ws/$AN:.claude/skills/switch-workspace/SKILL.md" | grep -q 'No restart needed' || fail "Claude lost its hot reload workflow"
 o show "ws/$CN:.agents/skills/switch-workspace/SKILL.md" | grep -q 'Start a fresh Codex session' || fail "Codex lacks native restart guidance"
 ! o show "ws/$CN:.agents/skills/switch-workspace/SKILL.md" | grep -q 'No restart needed' || fail "Claude reload behavior leaked into Codex"
 ok "existing Claude plugin and hot reload guidance stays intact while Codex gets its own switch guidance"
+! o cat-file -e "ws/$CN:.agents/skills/switch-workspace/BODY.codex.md" 2>/dev/null || fail "target body sidecar was installed as a support file"
+helper_root=$t/native-helper
+git clone -q -b "ws/$CN" "$t/origin.git" "$helper_root"
+helper_command=$(o show "ws/$CN:.agents/skills/portable/SKILL.md" | grep -F '<absolute-installed-skill-folder>/scripts/helper.sh')
+helper_command=${helper_command//<absolute-workspace-root>/$helper_root}
+helper_command=${helper_command//<absolute-installed-skill-folder>/$helper_root/.agents/skills/portable}
+helper_result=$(cd "$t" && env -u DELPHI_ROOT -u DELPHI_REPOS -u DELPHI_WORKTREES -u DELPHI_REFERENCES -u DELPHI_WORKSPACES bash -c "$helper_command") || fail "generated helper call failed in a fresh shell"
+[ "$helper_result" = "$helper_root|$t|argument with spaces" ] || fail "generated helper call lost root, caller directory or arguments"
+grep -qF 'Run every skill helper through the workspace bootstrap' "$helper_root/.agents/skills/portable/SKILL.md" || fail "translated skill lacks its bootstrap instructions"
+ok "translated helper commands initialize fresh shells with the known root while preserving arguments and caller directory"
 
 # A workspace's target can change before its proposal merges; ownership must use that native recipe on every refresh.
 for branch_target in claude-code codex; do
@@ -1120,7 +1322,8 @@ for branch_target in claude-code codex; do
   [ "$(o rev-parse "ws/$CN")" = "$target_head" ] || fail "repeated branch-only target refresh changed refs"
   commit_on "ws/$CN" "$branch_skills/portable/SKILL.md" "reset generated target edit"
   sync refresh "$CN" >"$t/out" 2>&1 || fail "branch-only target reset: $(cat "$t/out")"
-  [ "$(o show "ws/$CN:$branch_skills/portable/SKILL.md")" = "portable v1" ] || fail "branch-only target lost trusted native ownership"
+  portable_expected=$t/portable-codex.md; [ "$branch_target" != claude-code ] || portable_expected=$t/portable/SKILL.md
+  cmp -s "$portable_expected" <(o show "ws/$CN:$branch_skills/portable/SKILL.md") || fail "branch-only target lost trusted native ownership"
   sync propose "$CN" >"$t/out" 2>&1 || fail "branch-only $branch_target proposal: $(cat "$t/out")"
   ! o cat-file -e "propose/$CN:$C/$branch_skills/portable/SKILL.md" 2>/dev/null || fail "branch-only target proposed inherited output"
   ! o cat-file -e "propose/$CN:$C/workspace.generated" 2>/dev/null || fail "branch-only target proposed ownership metadata"
@@ -1136,7 +1339,7 @@ sync propose "$CN" >"$t/out" 2>&1 || fail "Codex proposal: $(cat "$t/out")"
 ! o cat-file -e "propose/$CN:$C/workspace.generated" 2>/dev/null || fail "Codex ownership metadata proposed"
 o show "propose/$CN:$C/AGENTS.md" | grep -qx "workspace-owned instructions" || fail "AGENTS.md not proposed"
 sync refresh "$CN" >/dev/null
-[ "$(o show "ws/$CN:.agents/skills/portable/SKILL.md")" = "portable v1" ] || fail "Codex inherited edit not reset"
+cmp -s "$t/portable-codex.md" <(o show "ws/$CN:.agents/skills/portable/SKILL.md") || fail "Codex inherited edit not reset"
 ok "Codex proposals preserve native instructions and omit inherited skills and ledgers; refresh resets inherited edits"
 on_main "remove shared helper" git rm -q software/workspace-inherit/.claude/skills/portable/scripts/helper.sh
 sync refresh "$CN" >"$t/out" 2>&1 || fail "shared source update: $(cat "$t/out")"
@@ -1236,6 +1439,13 @@ created=new-workspace/electrical/firmware/fw-codex
 o show "$created:$F/workspace.yml" | grep -qx 'harness: codex' || fail "default harness not overridden"
 o show "$created:$F/workspace.yml" | grep -q 'fw: https://example.com/fw.git' || fail "project repos lost"
 o show "$created:$F/AGENTS.md" | grep -qx '# Firmware for s.electrical.firmware.fw-codex' || fail "Claude-authored instructions not translated"
+{
+  o show main:templates/workspace/CLAUDE.md
+  o show main:templates/harnesses/codex/AGENTS.md
+  echo
+  o show "main:$FD/CLAUDE.md"
+} | sed -e 's|{{name}}|s.electrical.firmware.fw-codex|g' -e "s|{{folder}}|$F|g" >"$t/expected-codex-instructions.md"
+o show "$created:$F/AGENTS.md" | cmp -s - "$t/expected-codex-instructions.md" || fail "Codex instruction base/template composition"
 o cat-file -e "$created:$F/.agents/skills/fw/SKILL.md" || fail "Claude-authored default skill not translated"
 ! o cat-file -e "$created:$F/.agents/skills/top/SKILL.md" 2>/dev/null || fail "main PR contains inherited native skill"
 ! o cat-file -e "$created:$F/workspace.generated" 2>/dev/null || fail "main PR contains branch ownership metadata"
@@ -1327,14 +1537,19 @@ d=$t/adapter-extension
 mkdir "$d"
 cp -R "$src/ci" "$src/software" "$src/templates" "$src/.github" "$src/.delphi" "$src/.claude-plugin" "$d/"
 (cd "$d" && git init -q && git add -A && git commit -qm base)
+cat >"$d/ci/harnesses/fixture.sh" <<'DESCRIPTOR'
+#!/usr/bin/env bash
+# Fixture native conventions, registered without editing the shared resolver.
+set -euo pipefail
+# shellcheck disable=SC2034 # declarative properties consumed by harness_field
+instruction=TASKS.md
+instruction_template=templates/harnesses/fixture/TASKS.md
+skills=.fixture/skills
+native=.fixture
+protected=.fixture/config.ini
+plugins=none
+DESCRIPTOR
 cat >>"$d/ci/harnesses.sh" <<'ADAPTER'
-eval "$(declare -f harness | sed '1s/harness/base_harness/')"
-harness() {
-  if [ "$1" = fixture ]; then
-    instruction=TASKS.md; instruction_template=templates/harnesses/fixture/TASKS.md
-    skills=.fixture/skills; plugins=none; foreign="CLAUDE.md .claude AGENTS.md .agents .codex"
-  else base_harness "$1"; fi
-}
 eval "$(declare -f harness_file | sed '1s/harness_file/base_harness_file/')"
 harness_file() {
   if [ "$1" = fixture ]; then
@@ -1343,13 +1558,13 @@ harness_file() {
   else base_harness_file "$@"; fi
 }
 ADAPTER
-F=software/application-software/argos/workspaces/fixture
+F=software/fixture-target/workspaces/fixture
 mkdir -p "$d/$F" "$d/templates/harnesses/fixture"
 cp -R "$d/templates/workspace/." "$d/$F/"
 rm "$d/$F/CLAUDE.md"
 printf 'Fixture instructions\n' >"$d/templates/harnesses/fixture/TASKS.md"
 cp "$d/templates/harnesses/fixture/TASKS.md" "$d/$F/TASKS.md"
-printf 'name: s.app.argos.fixture\nharness: fixture\n' >"$d/$F/workspace.yml"
+printf 'name: s.fixture-target.fixture\nharness: fixture\n' >"$d/$F/workspace.yml"
 chmod +x "$d/software/workspace-inherit/.claude/skills/journal/scripts/capture.sh"
 (cd "$d" && bash ci/render.sh . "$t/fixture-stage" && git add -A && bash ci/check.sh . HEAD &&
   bash ci/render.sh . "$t/fixture-stage-again" && git diff --quiet) >"$t/out" 2>"$t/err" || fail "adapter extension: $(cat "$t/err")"
@@ -1363,17 +1578,49 @@ while IFS=$'\t' read -r meta path _; do
   [ "$(git -C "$d" hash-object -- "$t/fixture-stage/$F/$path")" = "${meta#* }" ] || fail "new target ledger did not hash native bytes"
 done <"$t/fixture-stage/$F/workspace.generated"
 ok "registry-only targets stage adapted skills and helpers with native hashes and modes without generating copies on main"
+bash -euo pipefail -c '
+  source "$1/ci/harnesses.sh"
+  instruction=unchanged skills=unchanged plugins=unchanged
+  harness_field fixture instruction >"$2"
+  [ "$(cat "$2")" = TASKS.md ]
+  [ "$instruction:$skills:$plugins" = unchanged:unchanged:unchanged ]
+  ! declare -F harness >/dev/null
+  harness_foreign codex | grep -qx .fixture
+' _ "$d" "$t/fixture-field.txt" || fail "registry properties mutated caller state or did not compute new foreign paths"
+mkdir -p "$d/software/fixture-target/workspace-defaults/.fixture/skills/source"
+printf 'format: fixture\n' >"$d/software/fixture-target/workspace-defaults/source.yml"
+printf '# Fixture defaults\n' >"$d/software/fixture-target/workspace-defaults/TASKS.md"
+printf 'fixture source\n' >"$d/software/fixture-target/workspace-defaults/.fixture/skills/source/SKILL.md"
+(cd "$d" && bash -euo pipefail -c 'source ci/sources.sh; [ "$(source_format "$1")" = fixture ]; bundle_files "$1" codex' _ software/fixture-target/workspace-defaults) >"$t/fixture-source-records" || fail "new registry entry was not usable as a source format"
+grep -q $'\t.agents/skills/source/SKILL.md\t' "$t/fixture-source-records" || fail "new source skill path was not mapped"
+grep -q $'\tAGENTS.md\t' "$t/fixture-source-records" || fail "new source instruction path was not mapped"
+mkdir -p "$d/$CX/.fixture"
+echo foreign >"$d/$CX/.fixture/config.ini"
+if (cd "$d" && bash ci/check.sh) >"$t/out" 2>"$t/err"; then fail "new target native files were accepted in Codex"; fi
+grep -q '.fixture: belongs to a different harness' "$t/err" || fail "registry foreign-path exclusion was not automatic"
+rm -r "$d/$CX/.fixture"
+ok "registry reads are pure and new entries automatically provide source formats and foreign-path exclusions"
 rm "$d/$F/TASKS.md"
-echo 'must remain workspace-owned' >"$d/software/workspace-inherit/TASKS.md"
+mkdir -p "$d/software/fixture-target/workspace-inherit"
+printf 'format: fixture\n' >"$d/software/fixture-target/workspace-inherit/source.yml"
+echo 'must remain workspace-owned' >"$d/software/fixture-target/workspace-inherit/TASKS.md"
 if (cd "$d" && bash ci/render.sh) >"$t/out" 2>"$t/err"; then fail "new target inherited its root instructions"; fi
 grep -q "each workspace has its own TASKS.md" "$t/err" || fail "new target root protection not reported"
 [ ! -e "$d/$F/TASKS.md" ] || fail "new target wrote inherited root instructions"
 ok "registry-only targets protect their own instruction path even when its workspace file is missing"
+cp "$d/templates/harnesses/fixture/TASKS.md" "$d/$F/TASKS.md"
+rm "$d/software/fixture-target/workspace-inherit/TASKS.md"
+mkdir "$d/software/fixture-target/workspace-inherit/.fixture"
+echo forbidden >"$d/software/fixture-target/workspace-inherit/.fixture/config.ini"
+if (cd "$d" && bash ci/render.sh) >"$t/out" 2>"$t/err"; then fail "new target inherited its protected configuration"; fi
+grep -q 'each workspace has its own .fixture/config.ini' "$t/err" || fail "registry-protected configuration was not enforced"
+[ ! -e "$d/$F/.fixture/config.ini" ] || fail "protected native configuration was written to main"
+ok "new registry entries protect their declared native configuration without validator changes"
 
 
 # --- 14. shellcheck, if installed
 if command -v shellcheck >/dev/null; then
-  shellcheck "$src"/ci/*.sh "$src"/tools/*.sh "$src"/tests/*.sh "$src"/.delphi/*.sh "$src"/.delphi/migrations/*.sh ||
+  shellcheck "$src"/ci/*.sh "$src"/ci/harnesses/*.sh "$src"/tools/*.sh "$src"/tests/*.sh "$src"/.delphi/*.sh "$src"/.delphi/migrations/*.sh ||
     fail "shellcheck"
   ok "shellcheck clean"
 fi
diff --git a/tools/new-workspace.sh b/tools/new-workspace.sh
index eab6e67..6da8961 100755
--- a/tools/new-workspace.sh
+++ b/tools/new-workspace.sh
@@ -14,7 +14,7 @@ while [ "$#" -gt 0 ]; do
   esac
 done
 case "$by" in ai | ai-assisted | human) ;; *) die "--by must be ai, ai-assisted or human" ;; esac
-[ $# -eq 2 ] || die "usage: tools/new-workspace.sh [--by ai|ai-assisted|human] [--harness claude-code|codex] <org-path under software/> <leaf>"
+[ $# -eq 2 ] || die "usage: tools/new-workspace.sh [--by ai|ai-assisted|human] [--harness <adapter>] <org-path under software/> <leaf>"
 org=${1%/}
 org=${org#software/}
 leaf=$2
@@ -34,11 +34,16 @@ mkdir -p "$wt/$folder"
 # shellcheck source=ci/inherit.sh
 source "$wt/ci/inherit.sh"
 [ -n "$adapter" ] || adapter=$(awk '/^harness:/ { print $2; exit }' "$defaults/workspace.yml" 2>/dev/null || true)
-harness "${adapter:-claude-code}" || die "unsupported harness"
+harness_exists "${adapter:-claude-code}" || die "unsupported harness"
 adapter=${adapter:-claude-code}
+instruction=$(harness_field "$adapter" instruction)
+instruction_template=$(harness_field "$adapter" instruction_template)
+instruction_base=$(harness_field "$adapter" instruction_base)
+plugins=$(harness_field "$adapter" plugins)
 cp -R "$wt/templates/workspace/." "$wt/$folder/"
-rm -f "$wt/$folder/CLAUDE.md" "$wt/$folder/AGENTS.md"
-cp "$wt/$instruction_template" "$wt/$folder/$instruction"
+for target in $(harnesses); do rm -f "$wt/$folder/$(harness_field "$target" instruction)"; done
+mkdir -p "$(dirname "$wt/$folder/$instruction")"
+{ [ -z "$instruction_base" ] || cat "$wt/$instruction_base"; cat "$wt/$instruction_template"; } >"$wt/$folder/$instruction"
 if [ -d "$defaults" ]; then
   records=$(cd "$wt" && bundle_files "software/$org/workspace-defaults" "$adapter") || die "cannot read project defaults"
   while IFS=$'\t' read -r meta path src; do

From 86e548139906a3ec81ce5dfc1ae414898851c7c9 Mon Sep 17 00:00:00 2001
From: Jesus God <wyattbracy@gmail.com>
Date: Tue, 27 Oct 2026 22:15:08 +0000
Subject: [PATCH 14/18] Translate skills per harness and keep sync history
 clean

---
 CLAUDE.md                                     |  7 +-
 README.md                                     |  4 +-
 ci/harnesses.sh                               | 67 +++++--------
 ci/harnesses/claude-code.sh                   | 76 ++++++++++++++-
 ci/harnesses/codex.sh                         | 32 ++++++-
 ci/render.sh                                  |  5 +-
 ci/sources.sh                                 |  1 -
 ci/sync.sh                                    | 27 +++---
 docs/design.md                                | 20 ++--
 .../application-software/argos/AUTHORING.md   |  4 +-
 .../skills/pr-conventions/BODY.codex.md       |  9 --
 .../skills/pr-conventions/BODY.codex.md       |  9 --
 .../skills/address-pr-comments/BODY.codex.md  | 13 ---
 .../.claude/skills/commit/BODY.codex.md       |  1 -
 .../skills/switch-workspace/BODY.codex.md     | 14 ---
 tests/e2e.sh                                  | 93 +++++++++++++++++--
 16 files changed, 251 insertions(+), 131 deletions(-)
 delete mode 100644 software/application-software/argos/workspace-inherit/.claude/skills/pr-conventions/BODY.codex.md
 delete mode 100644 software/application-software/nero/workspace-inherit/.claude/skills/pr-conventions/BODY.codex.md
 delete mode 100644 software/application-software/workspace-inherit/.claude/skills/address-pr-comments/BODY.codex.md
 delete mode 100644 software/application-software/workspace-inherit/.claude/skills/commit/BODY.codex.md
 delete mode 100644 software/workspace-inherit/.claude/skills/switch-workspace/BODY.codex.md

diff --git a/CLAUDE.md b/CLAUDE.md
index c4c8425..1d042da 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -65,9 +65,10 @@ source of truth; `docs/goals.md` lists what any change must keep.
   under `repos:`"), never its entries. A copied list goes stale. Runtime tools: bash, git, and `gh` (only to open or update PRs).
 - Every script: `#!/usr/bin/env bash`, `set -euo pipefail`, `shellcheck`-clean.
 - Keep Claude skill sources under workspace-inherit/.claude/skills with their metadata intact.
-  Native metadata conversion and helper bootstrap belong in the registered harness adapter and
-  affect only generated output. Put target-specific skill prose in its `BODY.<harness>.md` sidecar;
-  never match source sentences or replace instruction filenames throughout a body.
+  Each descriptor owns `translate_skill`; native metadata conversion, identifier mappings and
+  helper bootstrap affect only generated output. Write skills once in Claude format; translate
+  identifiers and feature bullets, never exact source sentences or per-skill copies. Validation
+  rejects unmapped Claude identifiers in other harnesses; qualified code-repository paths stay literal.
   Shared-source paths and opt-out keys follow `docs/design.md`'s portable-path rule; existing owned
   workspace filenames are unaffected.
   Skill scripts stay harness-independent (SKILL.md uses the Agent Skills format): call scripts by
diff --git a/README.md b/README.md
index 774d5c9..c6a5b99 100644
--- a/README.md
+++ b/README.md
@@ -133,8 +133,8 @@ can hold shared context (`README.md`), a guide to its workspaces (`AUTHORING.md`
 `workspace-inherit/.claude/skills/<name>/`. The optional `source.yml` selects an authoring format
 from the harness registry; each workspace's `harness:` independently selects its target.
 `workspace-defaults/` seeds owned files once; `workspace-inherit/` stays managed.
-An optional `BODY.<harness>.md` beside a skill supplies target-specific prose without changing its
-canonical `SKILL.md` or rewriting unrelated instruction references.
+Each harness descriptor owns its translation function. Skills are authored once in Claude format;
+CI rejects Claude identifiers that a non-Claude translator leaves unmapped.
 Register a target or source format in `ci/harnesses/<name>.sh`; its entry owns the native contract.
 
 **Preparation and sync.** CI translates inheritance from main into temporary staging, then refresh
diff --git a/ci/harnesses.sh b/ci/harnesses.sh
index da07238..e9aa7a8 100644
--- a/ci/harnesses.sh
+++ b/ci/harnesses.sh
@@ -2,6 +2,8 @@
 # Harness registry and shared skill rendering. Per-target facts live in harnesses/<name>.sh.
 set -euo pipefail
 harness_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")/harnesses" && pwd)
+harness_skill_names=$(if [ -d "$harness_dir/../../software" ]; then find "$harness_dir/../../software" -type f -name SKILL.md; fi |
+  sed 's|/SKILL.md$||; s|.*/||' | LC_ALL=C sort -u | tr '\n' ' ')
 
 harnesses() { # registered target/source formats
   local file
@@ -16,19 +18,19 @@ harness_exists() {
   [ -f "$harness_dir/$1.sh" ]
 }
 
-harness_field() { # <target> <property>: local descriptor fields never mutate a caller's target
+harness_field() ( # <target> <property>: descriptor fields and functions never escape the query
   harness_exists "$1" || { echo "harness: unknown harness '$1'" >&2; return 1; }
-  case "$2" in instruction | instruction_base | instruction_template | skills | native | protected | plugins | settings_file | settings_generator | bootstrap | skill_format) ;;
+  case "$2" in instruction | instruction_base | instruction_template | skills | native | protected | plugins | settings_file | settings_generator | bootstrap | skill_ref) ;;
     *) echo "harness: unknown property '$2'" >&2; return 1 ;;
   esac
   # shellcheck disable=SC2034 # descriptors are read through indirect property expansion
   local instruction='' instruction_base='' instruction_template='' skills='' native='' protected='' plugins=none
   # shellcheck disable=SC2034 # optional descriptor properties
-  local settings_file='' settings_generator='' bootstrap='' skill_format=claude-code
+  local settings_file='' settings_generator='' bootstrap='' skill_ref='/%s'
   # shellcheck disable=SC1090 # a registered, trusted main-side descriptor
   source "$harness_dir/$1.sh"
   printf '%s\n' "${!2}"
-}
+)
 
 harness_foreign() { # paths owned by other targets, excluding shared native conventions
   local own other path
@@ -57,36 +59,19 @@ harness_settings() { # <target> <folder> <manifest>: the target's registered set
   bash "$harness_dir/../../$generator" settings "$2" "$3"
 }
 
-harness_file() { # <target harness> <source file>: metadata format, explicit body variant and bootstrap
-  local target=$1 file=$2 format bootstrap variant
+harness_file() ( # <target> <source>: each descriptor owns its translator; validate every non-Claude output
+  local target=$1 file=$2
   case "$file" in */SKILL.md) ;; *) cat "$file"; return ;; esac
-  format=$(harness_field "$target" skill_format) || return 1
-  bootstrap=$(harness_field "$target" bootstrap) || return 1
-  variant=${file%/*}/BODY.$target.md
-  # Preserve canonical native output byte for byte unless this target asks for adaptation.
-  if [ "$format" = claude-code ] && [ "$bootstrap" != exec ] && [ ! -f "$variant" ]; then
-    cat "$file"; return
-  fi
-  # Read metadata only; prose and code-repository instruction references stay source-owned.
-  awk -v format="$format" '
-    { sub(/\r$/, "") }
-    NR == 1 { if ($0 !~ /^---$/) exit; front = 1; print; next }
-    front && /^---$/ { print; exit }
-    front {
-      if (format != "codex") { print; next }
-      line = $0; sub(/^ */, "", line); indent = length($0) - length(line)
-      if (!root && line !~ /^(#|$)/) { root = 1; level = indent }
-      # Claude-only fields are omitted from Codex output, including block values.
-      if (indent == level && line ~ /^["\047]?(allowed-tools|user-invocable|disable-model-invocation)["\047]?[[:space:]]*:/) { skip = 1; next }
-      if (skip && (indent > level || line ~ /^(#|$|-([[:space:]]|$))/)) next
-      skip = 0
-      # Quote descriptions that need a native YAML block scalar.
-      if (indent == level && line ~ /^description: / && substr(line, 14) ~ /: / && substr(line, 14) !~ /^["\047>|]/) {
-        print substr($0, 1, level) "description: >-"; print substr($0, 1, level) "  " substr(line, 14)
-      } else print
-    }' "$file"
-  if [ "$bootstrap" = exec ]; then
-    cat <<'BOOTSTRAP'
+  # shellcheck source=ci/harnesses/claude-code.sh
+  source "$harness_dir/claude-code.sh"
+  # shellcheck disable=SC1090 # trusted target descriptor, isolated from caller state
+  source "$harness_dir/$target.sh"
+  if [ "$target" = claude-code ]; then translate_skill "$file"
+  else translate_skill "$file" | claude_identifiers check; fi
+)
+
+skill_bootstrap() { # target translators place this after their native metadata
+  cat <<'BOOTSTRAP'
 
 Run every skill helper through the workspace bootstrap, including in fresh shells and sub-agents:
 
@@ -97,17 +82,11 @@ bash "<absolute-workspace-root>/.delphi/exec.sh" bash "<absolute-installed-skill
 Replace the placeholders with the known workspace root, this skill's installed native folder, the script name, and its arguments. Obtain the workspace's absolute path once with `bash .delphi/paths.sh` from the checked-out workspace root. The wrapper sets `DELPHI_ROOT` for every invocation and preserves the caller's working directory; do not assume shell exports persist.
 
 BOOTSTRAP
-  fi
-  {
-    if [ -f "$variant" ]; then cat "$variant"
-    else
-      awk '
-        NR == 1 && /^---\r?$/ { front = 1; next }
-        front && /^---\r?$/ { front = 0; next }
-        !front { print }
-      ' "$file"
-    fi
-  } | awk -v bootstrap="$bootstrap" '
+}
+
+skill_commands() { # common shell syntax; targets choose whether helper commands need bootstrap
+  # shellcheck disable=SC2031 # called inside the same descriptor subshell that sets bootstrap
+  awk -v bootstrap="$bootstrap" '
     bootstrap == "exec" {
       rest = $0; adapted = ""
       # Translate the command syntax, including nested command substitutions, without editing prose.
diff --git a/ci/harnesses/claude-code.sh b/ci/harnesses/claude-code.sh
index 8d566ce..58fd1f6 100644
--- a/ci/harnesses/claude-code.sh
+++ b/ci/harnesses/claude-code.sh
@@ -12,4 +12,78 @@ plugins=claude
 settings_file=.claude/settings.json
 settings_generator=ci/plugins.sh
 bootstrap=hook
-skill_format=claude-code
+skill_ref='/%s'
+github_tool=''
+github_integration=''
+browser_tool=''
+pane_guidance=''
+reload_guidance=''
+
+translate_skill() { cat "$1"; }
+
+claude_identifiers() { # [check]: Claude's identifier contract, shared by target translators and leak validation
+  # shellcheck disable=SC2154 # target, file and the skill catalog come from the registry's translator scope
+  awk -v check="${1:-}" -v target="$target" -v file="$file" -v instruction="$instruction" \
+    -v skills="$skills" -v ref="$skill_ref" -v ids="$harness_skill_names" \
+    -v github="$github_tool" -v integration="$github_integration" -v browser="$browser_tool" \
+    -v pane="$pane_guidance" -v reload="$reload_guidance" '
+    function literal(s, from, to, at, out) {
+      while ((at = index(s, from))) { out = out substr(s, 1, at - 1) to; s = substr(s, at + length(from)) }
+      return out s
+    }
+    function missing(id) { print "harness: " target ": missing Claude mapping for " id " in " file ":" NR > "/dev/stderr"; failed = 1 }
+    function native_skills(s, at, out) {
+      while (match(s, /(^|[^A-Za-z0-9_.\/-])[.]claude\/skills/)) {
+        at = RSTART + RLENGTH - 14
+        out = out substr(s, 1, at - 1) skills; s = substr(s, at + 14)
+      }
+      return out s
+    }
+    BEGIN { n = split(ids, names, " "); for (i = 1; i <= n; i++) known[names[i]] = 1 }
+    {
+      line = $0
+      if (!check) {
+        # Feature bullets are selected by identifiers, never by their English wording.
+        if (line ~ /^[-*] / && index(line, "/ws-delphi") && pane != "") {
+          if (pane != "drop") print "- " pane
+          next
+        }
+        if (line ~ /^[-*] / && index(line, "`delphi` mod") && reload != "") { print "- " reload; next }
+        if (integration != "") line = literal(line, "GitHub MCP server", integration)
+        if (github != "") {
+          line = literal(line, "mcp__github__pull_request_read", github)
+          line = literal(line, "pull_request_read", github)
+        }
+        if (browser != "") {
+          line = literal(line, "`playwright-cdp`", "`" browser "`")
+          line = literal(line, "`playwright`", "`" browser "`")
+        }
+        line = native_skills(line)
+      }
+      # Qualified code-repository filenames are literal paths, not workspace instruction identifiers.
+      rest = line; out = ""
+      while (match(rest, /(^|[^A-Za-z0-9_.\/-])CLAUDE[.]md/)) {
+        at = RSTART + RLENGTH - 9
+        out = out substr(rest, 1, at - 1)
+        if (check) { if (instruction != "CLAUDE.md") missing("CLAUDE.md"); out = out "CLAUDE.md" }
+        else out = out instruction
+        rest = substr(rest, at + 9)
+      }
+      line = out rest; rest = line; out = ""
+      while (match(rest, /(^|[[:space:]`(])\/[a-z][a-z0-9-]*/)) {
+        at = RSTART; token = substr(rest, at, RLENGTH); slash = index(token, "/")
+        id = substr(token, slash + 1); following = substr(rest, at + RLENGTH, 1)
+        active = id in known && following != "/" && (following != "." || substr(rest, at + RLENGTH + 1, 1) !~ /[A-Za-z0-9]/)
+        out = out substr(rest, 1, at - 1) substr(token, 1, slash - 1)
+        if (active && check && ref != "/%s") missing("/" id)
+        out = out (active && !check ? sprintf(ref, id) : "/" id)
+        rest = substr(rest, at + RLENGTH)
+      }
+      line = out rest
+      if (check) {
+        if (match(line, /mcp__[A-Za-z0-9_]+|CLAUDE_[A-Za-z0-9_]+|(^|[^A-Za-z0-9_.\/-])[.]claude([\/`[:space:]]|$)|\/ws-delphi|pull_request_read|playwright-cdp|GitHub MCP server|Claude Code|`delphi` mod/)) missing(substr(line, RSTART, RLENGTH))
+      }
+      print line
+    }
+    END { exit failed }'
+}
diff --git a/ci/harnesses/codex.sh b/ci/harnesses/codex.sh
index ce7d52f..b63cb06 100644
--- a/ci/harnesses/codex.sh
+++ b/ci/harnesses/codex.sh
@@ -12,4 +12,34 @@ plugins=none
 settings_file=''
 settings_generator=''
 bootstrap='exec'
-skill_format=codex
+skill_ref='$%s'
+github_tool='PR-reading tool'
+github_integration='available authenticated GitHub integration'
+browser_tool='browser automation available in this harness'
+pane_guidance=drop
+reload_guidance="Start a fresh Codex session after switching so the new workspace's instructions and skills load before further work."
+
+translate_skill() { # Claude metadata becomes Codex metadata; identifiers follow this descriptor's contract.
+  {
+    awk '
+      { sub(/\r$/, "") }
+      NR == 1 { if ($0 !~ /^---$/) exit; front = 1; print; next }
+      front && /^---$/ { print; exit }
+      front {
+        line = $0; sub(/^ */, "", line); indent = length($0) - length(line)
+        if (!root && line !~ /^(#|$)/) { root = 1; level = indent }
+        if (indent == level && line ~ /^["\047]?(allowed-tools|user-invocable|disable-model-invocation)["\047]?[[:space:]]*:/) { skip = 1; next }
+        if (skip && (indent > level || line ~ /^(#|$|-([[:space:]]|$))/)) next
+        skip = 0
+        if (indent == level && line ~ /^description: / && substr(line, 14) ~ /: / && substr(line, 14) !~ /^["\047>|]/) {
+          print substr($0, 1, level) "description: >-"; print substr($0, 1, level) "  " substr(line, 14)
+        } else print
+      }' "$1"
+    skill_bootstrap
+    awk '
+      NR == 1 && /^---\r?$/ { front = 1; next }
+      front && /^---\r?$/ { front = 0; next }
+      !front { print }
+    ' "$1"
+  } | claude_identifiers | skill_commands
+}
diff --git a/ci/render.sh b/ci/render.sh
index 385835f..b782b39 100755
--- a/ci/render.sh
+++ b/ci/render.sh
@@ -7,16 +7,18 @@ here=$(cd "$(dirname "$0")" && pwd)
 source "$here/inherit.sh"
 # shellcheck source=ci/managed.sh
 source "$here/managed.sh"
-check=0 only=""
+check=0 only="" extra_optouts=""
 while [ "$#" -gt 0 ]; do
   case "$1" in
     --check) check=1; shift ;;
     --workspace) [ "$#" -ge 2 ] || exit 2; only=$2; shift 2 ;;
+    --opt-outs) [ "$#" -ge 2 ] || exit 2; extra_optouts=$2; shift 2 ;;
     *) break ;;
   esac
 done
 [ "$#" -le 2 ] || { echo "render: too many arguments" >&2; exit 2; }
 [ -z "$only" ] || { safe_path "$only" && [ "$#" = 2 ]; } || { echo "render: --workspace needs a safe folder and staging output" >&2; exit 2; }
+[ -z "$extra_optouts" ] || [ -n "$only" ] || { echo "render: --opt-outs requires --workspace" >&2; exit 2; }
 checkout=${1:-.} output=${2:-}
 if [ -n "$output" ]; then mkdir -p "$output"; output=$(cd "$output" && pwd -P); fi
 cd "$checkout"
@@ -47,6 +49,7 @@ render_workspace() { # <workspace folder>: main keeps owned files; inherited out
     bad "$folder/workspace.yml: $adapter does not support Delphi plugin sets"; return
   fi
   out=$(optouts <"$folder/workspace.yml")
+  [ -z "$extra_optouts" ] || out="$out $(optouts <"$extra_optouts")"
   records=$(inherited_files "$folder" "$adapter" "$out") || { bad "$folder: cannot resolve inherited sources"; return; }
   rm -rf "$target"
   mkdir -p "$target"
diff --git a/ci/sources.sh b/ci/sources.sh
index aaa3fce..8d1605e 100644
--- a/ci/sources.sh
+++ b/ci/sources.sh
@@ -53,7 +53,6 @@ bundle_files() { # <bundle> <target> [<source exclusions>]: mode blob<TAB>destin
     [ -n "$record" ] || continue
     meta=${record%%$'\t'*}; path=${record#*$'\t'}
     [ "$path" != source.yml ] || continue
-    case "$path" in */BODY.*.md) [ ! -f "$1/${path%/*}/SKILL.md" ] || continue ;; esac
     meta="${meta%% *} ${meta##* }"
     if opted_out "$path" "${3:-}"; then
       # A source-path exclusion can skip unavailable mappings. Mapped files still use native opt-outs.
diff --git a/ci/sync.sh b/ci/sync.sh
index a0f72a9..e56228c 100755
--- a/ci/sync.sh
+++ b/ci/sync.sh
@@ -146,30 +146,24 @@ previous_records() { # <workspace commit> <folder>: cache reconstructed records,
 }
 
 reconstruct_records() { # <workspace commit> <folder>: only trusted main sources supply native hashes and modes
-  local base folder native recipe records settings source
+  local base folder native recipe
   recipe=$(git log --first-parent -1 --format=%H "$1" -- "$generated") || return 1
   recipe=${recipe:-$1}
   base=$(previous_main "$recipe") || return 1
   [ -n "$base" ] || return 0
   folder=$(historical_folder "$base" "$2") || return 1
   [ -n "$folder" ] || return 0
-  native=$(staged "$base" "$folder") || return 1
   if ! git cat-file -e "$recipe:$generated" 2>/dev/null || git cat-file -e "$base:$folder/$generated" 2>/dev/null; then
+    native=$(staged "$base" "$folder") || return 1
     generated_records <"$native/$generated"
     return
   fi
-  settings=$(generated_records <"$native/$generated" | awk -F'\t' '$3 ~ /^ci\//') || return 1
-  source=$(source_checkout "$base") || return 1
-  # Earlier sync copied main's settings even when the stored recipe selected branch-only plugins.
-  # shellcheck disable=SC2016 # match historical shell code, not this process's variables
-  if ! grep -q 'then entry=\$main_native/\$path; fi$' "$source/ci/sync.sh"; then settings=""; fi
   native=$(staged_recipe "$base" "$folder" "$recipe") || return 1
-  records=$(generated_records <"$native/$generated") || return 1
-  printf '%s\n' "$records" | awk -F'\t' -v settings="$settings" '$3 ~ /^ci\// && settings != "" { print settings; next } { print }'
+  generated_records <"$native/$generated"
 }
 
 staged_recipe() { # recover the last generated target from its manifest; hashes come only from trusted main sources
-  local source original renderer manifest target ready
+  local source original renderer manifest target ready extra=()
   manifest=$(git rev-parse "$3:workspace.yml") || return 1
   if [ "$manifest" = "$(git rev-parse "$1:$2/workspace.yml" 2>/dev/null || true)" ]; then staged "$1" "$2"; return; fi
   target=$cache/recipe/$1/$manifest/native/$2 ready=$cache/status/recipe/$1/$manifest/$2
@@ -183,7 +177,8 @@ staged_recipe() { # recover the last generated target from its manifest; hashes
     git show "$3:workspace.yml" >"$source/$2/workspace.yml" || return 1
     renderer=$here/render.sh
     if [ -f "$source/ci/render.sh" ] && grep -q -- '--workspace' "$source/ci/render.sh"; then renderer=$source/ci/render.sh; fi
-    bash "$renderer" --workspace "$2" "$source" "$cache/recipe/$1/$manifest/native" >&2 || return 1
+    if [ "$1" = "$main" ]; then extra=(--opt-outs "$original/$2/workspace.yml"); fi
+    bash "$renderer" --workspace "$2" "${extra[@]}" "$source" "$cache/recipe/$1/$manifest/native" >&2 || return 1
     mkdir -p "$(dirname "$ready")" || return 1
     : >"$ready" || return 1
   fi
@@ -221,6 +216,8 @@ with_generated() { # <workspace commit> <folder> [<ownership commit> [<native st
   old=$(managed_records "$owner" "$2") || return 1
   trusted=$(previous_records "$owner" "$2") || return 1
   out=$(git show "$1:workspace.yml" | optouts) || return 1
+  # Before merging, main's new exclusions must already apply to its new sources.
+  [ -n "${4:-}" ] || out="$out $(git show "$main:$2/workspace.yml" | optouts)" || return 1
   if legacy_workspace "$owner"; then
     legacy=1
     base=$(previous_main "$owner") || return 1
@@ -408,6 +405,10 @@ refresh() { # <name> <folder> <old name>: leave the worktree at ws/<name> with m
   # The tree includes the ownership ledger, so changed provenance and opt-out transfers still advance the branch.
   if [ "$(tree HEAD)" = "$(tree "$from")" ]; then
     git -C "$wt" checkout --quiet --detach "$from"
+  else
+    # Publish one real merge; preparation and prefix-alignment commits stay temporary.
+    t=$(tree HEAD)
+    git -C "$wt" checkout --quiet --detach "$(git commit-tree -p "$from" -p "$main" -m "delphi: refresh ws/$1 from main" "$t")"
   fi
   if [ "$from" != "refs/remotes/origin/ws/$1" ]; then
     git -C "$wt" push --quiet origin "HEAD:refs/heads/ws/$1" "HEAD:refs/heads/ws/$3"
@@ -437,14 +438,14 @@ propose() { # <name> <folder>: PR owned workspace files into main, leaving inher
     fi
   fi
   t=$(with_delphi "$(git -C "$wt" rev-parse HEAD)" "$2/")
-  git -C "$wt" checkout --quiet --detach "$(git commit-tree -p "$main" -p "$ws" -m "delphi: propose ws/$1 to main" "$t")"
+  git -C "$wt" checkout --quiet --detach "$(git commit-tree -p "$main" -p "$owner" -m "delphi: propose ws/$1 to main" "$t")"
   if ! bash "$wt/ci/render.sh" "$wt"; then
     echo "ws/$1: main-side rendering failed; not proposed" >&2
     failed=1; return
   fi
   git -C "$wt" add -A
   t=$(git -C "$wt" write-tree)
-  git -C "$wt" checkout --quiet --detach "$(git commit-tree -p "$main" -p "$ws" -m "delphi: propose ws/$1 to main" "$t")"
+  git -C "$wt" checkout --quiet --detach "$(git commit-tree -p "$main" -p "$owner" -m "delphi: propose ws/$1 to main" "$t")"
   case "$(tree HEAD)" in "$(tree "$main")" | "$(tree "refs/remotes/origin/propose/$1")") return ;; esac
   "$wt/ci/check.sh" "$wt" "$main" || { echo "ws/$1: check failed; not proposed" >&2; failed=1; return; }
   git -C "$wt" push --quiet --force origin "HEAD:refs/heads/propose/$1"
diff --git a/docs/design.md b/docs/design.md
index e4e46fd..8f64636 100644
--- a/docs/design.md
+++ b/docs/design.md
@@ -97,11 +97,11 @@ own explicit target.
 `ci/render.sh` prepares inheritance from a main checkout into temporary staging. `ci/inherit.sh`
 selects ancestor sources, `ci/sources.sh` maps paths, and `ci/harnesses.sh` adapts target content.
 Each payload is prepared once, then hashed and copied from those same bytes. Claude skill content
-passes through unchanged. An optional `BODY.<harness>.md` beside a skill supplies target-specific
-prose; otherwise its prose is unchanged. Codex converts native metadata and wraps literal
-`bash scripts/...` helper calls with the full `.delphi/exec.sh` invocation. Body variants are
-authoring inputs, not installed files, when beside a `SKILL.md`. Sentence wording and unrelated
-instruction references do not drive translation. Helper scripts pass through unchanged.
+passes through unchanged. Each harness descriptor owns `translate_skill`: it converts metadata,
+workspace identifiers and capability-specific bullets. Codex uses `$skill` calls and wraps literal
+`bash scripts/...` commands with `.delphi/exec.sh`. Claude identifiers are defined in its descriptor;
+non-Claude output with an unmapped identifier fails validation and names the target and source.
+Qualified code-repository paths stay literal. Helper scripts pass through unchanged.
 
 `ci/render.sh [--check] [--workspace <folder>] [<main-checkout> [<staging-output>]]` updates plugin
 output by default. An optional staging destination receives inherited native files and ownership
@@ -119,7 +119,9 @@ When changing a workspace's harness, update its owned native files too; CI regen
 
 Source-native `opt-out:` paths are applied before mapping, so a Codex workspace can exclude a
 Claude-only input such as `.claude/commands`. Mapped native opt-outs still transfer copies to
-workspace ownership. Unsupported native mappings fail unless explicitly excluded.
+workspace ownership. Unsupported native mappings fail unless explicitly excluded. Before merging, sync stages with both
+main and branch opt-outs (`render.sh --opt-outs <main-manifest>`), so a new source and its exclusion
+can arrive together without blocking refresh.
 
 Shared-source paths, generated ledger paths and opt-out keys accept only ASCII
 `[A-Za-z0-9._/@+-]`. Spaces and control characters are unsupported; paths must be relative without
@@ -210,6 +212,8 @@ otherwise they are kept with a notice. Removed workspace branches are kept with
 An unchanged result leaves the workspace ref untouched. Renaming an org or project folder while
 keeping its dotted workspace name preserves ownership history. Sync aligns the common ancestor's
 folder prefix before merging a move, so later owned edits still use their original merge base.
+Preparation commits stay temporary: each changed refresh publishes one merge parented by the
+original workspace tip and main; proposals likewise use the actual workspace tip.
 
 A conflict or failed render/check is reported and that workspace is skipped; other workspaces keep
 syncing and the command exits 1. All work happens in temporary worktrees.
@@ -356,8 +360,8 @@ Creation combines optional `instruction_base` with the harness's `instruction_te
 common layout authored once and the result an owned snapshot.
 `ci/harnesses.sh` exposes pure `harness_field <name> <field>` queries; native, protected and foreign
 paths are derived from the registered entries. The same registry recognizes source formats.
-Put target-specific skill prose in `BODY.<harness>.md`; the shared adapter handles native metadata
-and helper bootstrap. Select the target in a workspace
+Define `translate_skill` in the descriptor; reuse Claude's identifier translator and the shared
+bootstrap helpers where appropriate. New metadata formats belong in that function. Select the target in a workspace
 manifest, validate staging, and run the sandbox suite. Ordinary targets need no renderer, validator
 or sync changes. Add a capability implementation only when the target introduces one.
 
diff --git a/software/application-software/argos/AUTHORING.md b/software/application-software/argos/AUTHORING.md
index 3c92ab9..9b60e2f 100644
--- a/software/application-software/argos/AUTHORING.md
+++ b/software/application-software/argos/AUTHORING.md
@@ -38,8 +38,8 @@ Commit its sources, never generated skill copies or `workspace.generated`, to ma
   Shared Claude skills stay in `workspace-inherit/.claude/skills/<name>/` at the project or org level.
   CI preserves Claude metadata and translates Codex copies into its native directory only on
   workspace branches; change sources through PRs to `main`. Ordinary inherited docs go in `workspace-inherit/`.
-  Put target-specific skill prose in an optional `BODY.<harness>.md` beside its `SKILL.md`; keep the
-  canonical Claude skill intact. Generated Codex skills carry their complete helper bootstrap command.
+  Write skills once in Claude format; harness descriptors translate identifiers and native metadata.
+  Fix missing mappings in the translator. Generated Codex skills carry their helper bootstrap command.
   Optional `source.yml` selects a different authoring format. Context only some workspaces need goes in
   the workspace, or in a supported plugin set selected under `plugins:`. Codex does not load the
   Claude plugin sets. Workspace-owned native skills remain editable and proposable; use a native
diff --git a/software/application-software/argos/workspace-inherit/.claude/skills/pr-conventions/BODY.codex.md b/software/application-software/argos/workspace-inherit/.claude/skills/pr-conventions/BODY.codex.md
deleted file mode 100644
index e161216..0000000
--- a/software/application-software/argos/workspace-inherit/.claude/skills/pr-conventions/BODY.codex.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Argos PR conventions
-
-The shared rules are in the `open-pr` skill; this adds only what is Argos's.
-
-- Base branch: `develop`. Commit format: `^#[0-9]+ - ` (the format in the workspace instructions).
-- Checks: `bash scripts/lint.sh <branch>` (frontend prettier and ng lint, only if angular-client/ changed).
-- Labels: one written-by (`by: human` if the user wrote it, `by: ai-assisted` if they gave the substance, `by: ai` if you wrote it) and at least one area label (`frontend`, `backend`, `devops`), besides `open-pr`'s category label.
-- Screenshots: `pictures/<branch>/` at the worktree root (git-ignored).
-- UI QA: get the branch running with the `run-local` skill, then verify the relevant UI with the browser tools available in this Codex host. If browser tooling is unavailable, report the verification that remains.
diff --git a/software/application-software/nero/workspace-inherit/.claude/skills/pr-conventions/BODY.codex.md b/software/application-software/nero/workspace-inherit/.claude/skills/pr-conventions/BODY.codex.md
deleted file mode 100644
index 27775a7..0000000
--- a/software/application-software/nero/workspace-inherit/.claude/skills/pr-conventions/BODY.codex.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Nero PR conventions
-
-The shared rules are in the `open-pr` skill; this adds only what is Nero's.
-
-- Base branch: `develop`. Commit format: `^#[0-9]+ ` (the format in the workspace instructions).
-- Checks: in the worktree, `clang-format --dry-run --Werror` on the C++ files changed since `origin/develop` (not under `deps/`); stop on any error.
-- Labels: only `open-pr`'s category label.
-- Screenshots: `playwright/test-results/<case>/` in the worktree, never committed.
-- UI QA, only if QML or a page changed: in the worktree's `playwright/`, add or update a case for each changed page, run `npm test`, and inspect `test-results/<case>/` (CLAUDE.md's Playwright section).
diff --git a/software/application-software/workspace-inherit/.claude/skills/address-pr-comments/BODY.codex.md b/software/application-software/workspace-inherit/.claude/skills/address-pr-comments/BODY.codex.md
deleted file mode 100644
index 8bcbc0c..0000000
--- a/software/application-software/workspace-inherit/.claude/skills/address-pr-comments/BODY.codex.md
+++ /dev/null
@@ -1,13 +0,0 @@
-Propose and apply fixes for a PR's unresolved review feedback. **Never reply to threads**; the user does.
-
-1. **Fetch** from the workspace root: `bash scripts/fetch-feedback.sh <repo> <pr>|<branch>` (`<repo>` as under `repos/`, e.g. `argos`; `--all` first for unfiltered history). It checks out the PR head's worktree and prints JSON: `worktree` (target it by path from the root from now on), unresolved `threads`, `comments`, `reviews`. If the helper fails, use an available authenticated GitHub integration to read the PR's reviews and comments. If neither is available, report the missing access.
-2. **Judge.** Skip bot noise and anything already fixed at HEAD. For an `outdated` thread, find its `diffHunk` code by content, then label it **addressed**, **applies**, **moved**, **obsolete**, or **unclear**.
-3. **Present** before editing, grouped by file, and ask to confirm, skip, or change each (offer to batch clear ones past 8):
-
-   ```
-   <file>:<line> — <reviewer> · <active|outdated> · <label>
-   "<excerpt>" → <proposed fix>
-   <optional ≤5-line snippet, for the user only>
-   ```
-4. **Apply** in that worktree, by path, with grouped commits using the `commit` skill. For a follow-up-ticket request, reuse a matching existing GitHub issue before filing.
-5. **Report** what was fixed (file:line, commit SHA), what was already addressed or obsolete (why), and what is unclear.
diff --git a/software/application-software/workspace-inherit/.claude/skills/commit/BODY.codex.md b/software/application-software/workspace-inherit/.claude/skills/commit/BODY.codex.md
deleted file mode 100644
index cc30fdd..0000000
--- a/software/application-software/workspace-inherit/.claude/skills/commit/BODY.codex.md
+++ /dev/null
@@ -1 +0,0 @@
-In the worktree you're working on, from the workspace root (`git -C worktrees/<repo>/<branch> …`), stage the relevant changes (not unrelated or generated files) and commit using the commit message format in the workspace's `AGENTS.md`. Keep the description imperative and 2–8 words.
diff --git a/software/workspace-inherit/.claude/skills/switch-workspace/BODY.codex.md b/software/workspace-inherit/.claude/skills/switch-workspace/BODY.codex.md
deleted file mode 100644
index 03532c3..0000000
--- a/software/workspace-inherit/.claude/skills/switch-workspace/BODY.codex.md
+++ /dev/null
@@ -1,14 +0,0 @@
-Run from the checked-out workspace root:
-
-```
-bash .delphi/switch.sh <name>        # ws/<name>: its dotted name, e.g. s.app.argos.argos-dev
-bash .delphi/switch.sh main          # Delphi's main: project folders, templates, CI
-```
-
-- List workspaces and their project folders: `bash .delphi/switch.sh --list`.
-- Switching refuses tracked changes. Commit them on a branch and open its PR first. The switch fetches, fast-forwards, and runs the destination workspace's setup.
-- The post-checkout hook parks this workspace's ignored working folders under `.delphi/parked/<name>/` and restores the destination workspace's folders at their original paths. Never run `git clean -X` or `git stash --all` at the workspace root: they take parked work too.
-- Before switching, stop processes that run from the workspace's working folders, since their paths move.
-- Start a fresh Codex session after switching. The new workspace's instructions and skills must load before starting its work.
-- To change the destination workspace, create a branch, commit, push, and open a PR into its `ws/<name>` branch (or `main`).
-- To read another workspace without switching, list it under `workspaces:` instead (`setup-workspace` skill).
diff --git a/tests/e2e.sh b/tests/e2e.sh
index 841729e..ed074ef 100644
--- a/tests/e2e.sh
+++ b/tests/e2e.sh
@@ -157,7 +157,7 @@ sync >"$t/out" 2>&1 || fail "sync after a .delphi/ change failed: $(cat "$t/out"
 for n in "$AN" "$BN"; do
   [ "$(o rev-parse "ws/$n:.delphi")" = "$(o rev-parse main:.delphi)" ] || fail "ws/$n .delphi/ not synced from main"
 done
-[ "$(o log -1 --format=%s ws/$AN)" = "delphi: sync .delphi/ from main" ] || fail "no sync commit on ws/$AN"
+[ "$(o rev-parse "ws/$AN^2")" = "$(o rev-parse main)" ] || fail "runtime refresh is not joined directly to main"
 ok "a main change to .delphi/, released as a new version, reaches every ws/* branch on refresh"
 commit_on ws/$AN .delphi/setup.sh "# ws edit"
 sync "$AN" >"$t/out" 2>&1 || fail "sync after a ws .delphi/ edit failed: $(cat "$t/out")"
@@ -478,6 +478,46 @@ done
 ok "metadata-only stable-name moves preserve ordinary manifest edits before or after refresh and in propose-only runs"
 ok "after a moved workspace proposal merges, same-key manifest conflicts preserve both refs and contents"
 
+# A new source and its main-side exclusion must reach an already-created Codex branch together.
+d=$t/sync-source-exclusion
+git clone -q "$t/seed" "$d"
+bash -euo pipefail -s -- "$d" "$d-origin.git" "$A" "$AN" <<'EXCLUSION' >"$t/out" 2>"$t/err" || fail "sync source exclusion: $(cat "$t/err")"
+cd "$1"
+origin=$2 folder=$3 name=$4
+git rm -rq "$folder/CLAUDE.md" "$folder/.claude"
+echo '# Codex' >"$folder/AGENTS.md"
+printf 'name: %s\nharness: codex\n' "$name" >"$folder/workspace.yml"
+bash ci/render.sh; git add -A; git commit -qm 'Codex exclusion baseline'
+git clone -q --bare . "$origin"; git remote set-url origin "$origin"
+bash ci/sync.sh refresh "$name"
+git fetch -q; git checkout -q -B edit "origin/ws/$name"
+echo owned >own.txt; git add own.txt; git commit -qm 'workspace owned change'
+git push -q origin "HEAD:ws/$name"; git checkout -q main
+before=$(git -C "$origin" rev-parse "ws/$name")
+mkdir -p software/workspace-inherit/.claude/commands software/workspace-inherit/notes
+echo 'Claude command' >software/workspace-inherit/.claude/commands/x.md
+echo shared >software/workspace-inherit/notes/arrived.txt
+printf 'opt-out:\n  - .claude/commands\n' >>"$folder/workspace.yml"
+bash ci/render.sh; bash ci/check.sh
+git add -A; git commit -qm 'add source with its target exclusion'; git push -q origin main
+bash ci/sync.sh propose "$name"
+[ "$(git -C "$origin" rev-parse "ws/$name")" = "$before" ]
+[ "$(git -C "$origin" show "propose/$name:$folder/own.txt")" = owned ]
+[ "$(git -C "$origin" rev-parse "propose/$name^2")" = "$before" ]
+bash ci/sync.sh refresh "$name"
+after=$(git -C "$origin" rev-parse "ws/$name")
+[ "$(git -C "$origin" rev-parse "$after^1")" = "$before" ]
+[ "$(git -C "$origin" rev-parse "$after^2")" = "$(git -C "$origin" rev-parse main)" ]
+[ "$(git -C "$origin" rev-list --count "$before..$after" --not main)" = 1 ]
+git -C "$origin" show "$after:workspace.yml" | grep -qx '  - .claude/commands'
+[ "$(git -C "$origin" show "$after:notes/arrived.txt")" = shared ]
+[ "$(git -C "$origin" show "$after:own.txt")" = owned ]
+! git -C "$origin" cat-file -e "$after:.claude/commands/x.md" 2>/dev/null
+bash ci/sync.sh refresh "$name"
+[ "$(git -C "$origin" rev-parse "ws/$name")" = "$after" ]
+EXCLUSION
+ok "main source additions and exclusions sync together in both directions; refresh publishes one real merge and repeats unchanged"
+
 # --- 5. a conflict on bms-dev is reported; argos-dev still syncs; exit 1
 commit_on ws/$BN CLAUDE.md "ws side"
 commit_on main "$B/CLAUDE.md" "main side"
@@ -521,6 +561,7 @@ expect_bad unknown-harness "unknown harness 'unknown'" sed -i.bak 's/harness: co
 expect_bad codex-plugin "codex does not support Delphi plugin sets" sh -c "printf 'plugins:\n  - delphi\n' >>$CX/workspace.yml"
 expect_bad codex-no-instructions "AGENTS.md: required for codex" rm "$CX/AGENTS.md"
 expect_bad codex-wrong-native "CLAUDE.md: belongs to a different harness" touch "$CX/CLAUDE.md"
+expect_bad codex-unmapped-identifier 'codex: missing Claude mapping for mcp__unmapped__new_tool' sh -c 'echo "Use mcp__unmapped__new_tool." >>software/workspace-inherit/.claude/skills/journal/SKILL.md'
 expect_bad codex-inherited-wrong-native "has no mapping to codex" sh -c "mkdir -p software/workspace-inherit/.claude && printf 'format: claude-code\\n' >software/workspace-inherit/source.yml && echo x >software/workspace-inherit/.claude/extra.json"
 expect_bad inherited-collision "also inherits it from a folder above" sh -c "mkdir -p software/application-software/workspace-inherit/.claude/skills/journal && echo x >software/application-software/workspace-inherit/.claude/skills/journal/SKILL.md"
 expect_bad main-inherited-copy "workspace-owned file collides" sh -c "mkdir -p $CX/.agents/skills/journal && cp software/workspace-inherit/.claude/skills/journal/SKILL.md $CX/.agents/skills/journal/SKILL.md"
@@ -1166,6 +1207,29 @@ ok "an old name with commits of its own is reported, never merged"
 
 # --- 13. portable harnesses: staged native output, round trips, transitions, bootstrap and authoring
 frontmatter() { awk 'NR == 1 && /^---\r?$/ { front = 1; sub(/\r$/, ""); print; next } front { sub(/\r$/, ""); print; if (/^---$/) exit }'; }
+mkdir -p "$t/identifier-translation"
+cat >"$t/identifier-translation/SKILL.md" <<'IDENTIFIERS'
+---
+name: identifier-translation
+description: Use /commit and read CLAUDE.md.
+---
+Follow CLAUDE.md; invoke `/commit` and /open-pr.
+Keep `repos/example/CLAUDE.md`, `/tmp` and `https://example.invalid/commit` unchanged.
+Use the GitHub MCP server's `pull_request_read` or mcp__github__pull_request_read.
+- Reworded pane explanation: `/ws-delphi` can switch.
+- Reworded reload explanation: the `delphi` mod handles `.claude/skills/`.
+IDENTIFIERS
+bash -c 'source "$1"; harness_file codex "$2"' _ "$src/ci/harnesses.sh" "$t/identifier-translation/SKILL.md" >"$t/identifier-translation/native.md"
+# shellcheck disable=SC2016 # native skill references are literal assertion text
+grep -qF 'Follow AGENTS.md; invoke `$commit` and $open-pr.' "$t/identifier-translation/native.md" || fail "native instruction and direct skill references"
+# shellcheck disable=SC2016 # native skill references are literal assertion text
+grep -qF 'description: Use $commit and read AGENTS.md.' "$t/identifier-translation/native.md" || fail "metadata identifier translation"
+# shellcheck disable=SC2016 # code paths and backticks are literal assertion text
+grep -qF 'Keep `repos/example/CLAUDE.md`, `/tmp` and `https://example.invalid/commit` unchanged.' "$t/identifier-translation/native.md" || fail "qualified file or URL was treated as a harness identifier"
+! grep -qF /ws-delphi "$t/identifier-translation/native.md" || fail "reworded Claude-only pane leaked"
+grep -q 'Start a fresh Codex session' "$t/identifier-translation/native.md" || fail "reworded Claude reload feature was not translated"
+bash -c 'source "$1"; harness_file claude-code "$2"' _ "$src/ci/harnesses.sh" "$t/identifier-translation/SKILL.md" | cmp -s - "$t/identifier-translation/SKILL.md" || fail "Claude identifier output changed"
+ok "descriptor translators map identifiers and direct skill calls after prose changes, preserving literal code paths and Claude bytes"
 mkdir -p "$t/metadata-variants"
 cat >"$t/metadata-variants/source.md" <<'SKILL'
 ---
@@ -1203,7 +1267,7 @@ for indent in '' '  '; do
     else cp "$t/metadata-variants/lf.md" "$t/metadata-variants/SKILL.md"; fi
     bash -c 'source "$1"; harness_file codex "$2"' _ "$src/ci/harnesses.sh" "$t/metadata-variants/SKILL.md" >"$t/metadata-variants/actual.md"
     cmp -s <(frontmatter <"$t/metadata-variants/want.md") <(frontmatter <"$t/metadata-variants/actual.md") || fail "Codex metadata indentation/quotes/$eol"
-    grep -qF 'Read CLAUDE.md.' "$t/metadata-variants/actual.md" || fail "Codex changed an opaque source instruction reference"
+    grep -qF 'Read AGENTS.md.' "$t/metadata-variants/actual.md" || fail "Codex did not translate the workspace instruction identifier"
     bash -c 'source "$1"; harness_file claude-code "$2"' _ "$src/ci/harnesses.sh" "$t/metadata-variants/SKILL.md" |
       cmp -s - "$t/metadata-variants/SKILL.md" || fail "Claude metadata bytes changed"
   done
@@ -1222,8 +1286,8 @@ metadata:
   custom-setting: unchanged
 ---
 Read CLAUDE.md before making changes.
-Keep literal `CLAUDE.md` in code-repository commands and English examples.
-`printf 'CLAUDE.md\n'`
+Keep literal `repos/sample/CLAUDE.md` in code-repository commands and English examples.
+`printf 'repos/sample/CLAUDE.md\n'`
 SKILL
 mkdir "$t/portable"
 cat >"$t/portable/SKILL.md" <<'SKILL'
@@ -1257,7 +1321,6 @@ on_main "add Codex and inherited Claude skills" bash -c '
   cp "$5/helper.sh" software/workspace-inherit/.claude/skills/portable/scripts/helper.sh
   cp "$4" software/workspace-inherit/.claude/skills/native-metadata/SKILL.md
   cp "$2/software/workspace-inherit/.claude/skills/switch-workspace/SKILL.md" software/workspace-inherit/.claude/skills/switch-workspace/SKILL.md
-  cp "$2/software/workspace-inherit/.claude/skills/switch-workspace/BODY.codex.md" software/workspace-inherit/.claude/skills/switch-workspace/BODY.codex.md
 ' _ "$C" "$src" "$CN" "$t/native-metadata.md" "$t/portable"
 sync "$CN" >"$t/out" 2>&1 || fail "Codex creation: $(cat "$t/out")"
 for skill in top portable; do
@@ -1285,15 +1348,14 @@ metadata:
 ---
 SKILL
 cmp -s "$t/codex-metadata.md" <(o show "ws/$CN:.agents/skills/native-metadata/SKILL.md" | frontmatter) || fail "Codex translation changed portable metadata or retained Claude-only fields"
-o show "ws/$CN:.agents/skills/native-metadata/SKILL.md" | grep -qx 'Read CLAUDE.md before making changes.' || fail "Codex changed source-owned prose"
-o show "ws/$CN:.agents/skills/native-metadata/SKILL.md" | grep -qF "printf 'CLAUDE.md\n'" || fail "Codex changed an opaque code reference"
+o show "ws/$CN:.agents/skills/native-metadata/SKILL.md" | grep -qx 'Read AGENTS.md before making changes.' || fail "Codex did not translate workspace instructions"
+o show "ws/$CN:.agents/skills/native-metadata/SKILL.md" | grep -qF "printf 'repos/sample/CLAUDE.md\n'" || fail "Codex changed an opaque code reference"
 ok "Codex translation omits Claude-only fields and block values while preserving portable metadata"
 cmp -s "$src/software/workspace-inherit/.claude/skills/switch-workspace/SKILL.md" <(o show "ws/$AN:.claude/skills/switch-workspace/SKILL.md") || fail "Claude switching instructions changed"
 o show "ws/$AN:.claude/skills/switch-workspace/SKILL.md" | grep -q 'No restart needed' || fail "Claude lost its hot reload workflow"
 o show "ws/$CN:.agents/skills/switch-workspace/SKILL.md" | grep -q 'Start a fresh Codex session' || fail "Codex lacks native restart guidance"
 ! o show "ws/$CN:.agents/skills/switch-workspace/SKILL.md" | grep -q 'No restart needed' || fail "Claude reload behavior leaked into Codex"
 ok "existing Claude plugin and hot reload guidance stays intact while Codex gets its own switch guidance"
-! o cat-file -e "ws/$CN:.agents/skills/switch-workspace/BODY.codex.md" 2>/dev/null || fail "target body sidecar was installed as a support file"
 helper_root=$t/native-helper
 git clone -q -b "ws/$CN" "$t/origin.git" "$helper_root"
 helper_command=$(o show "ws/$CN:.agents/skills/portable/SKILL.md" | grep -F '<absolute-installed-skill-folder>/scripts/helper.sh')
@@ -1544,6 +1606,16 @@ set -euo pipefail
 # shellcheck disable=SC2034 # declarative properties consumed by harness_field
 instruction=TASKS.md
 instruction_template=templates/harnesses/fixture/TASKS.md
+skill_ref='@%s'
+pane_guidance=drop
+reload_guidance='Restart the fixture harness after switching.'
+github_tool='PR reader'
+github_integration='authenticated GitHub integration'
+browser_tool='browser automation'
+translate_skill() {
+  printf 'fixture-format: native\n'
+  awk 'NR == 1 && /^---$/ { front = 1; next } front && /^---$/ { front = 0; next } !front { print }' "$1" | claude_identifiers
+}
 skills=.fixture/skills
 native=.fixture
 protected=.fixture/config.ini
@@ -1553,7 +1625,7 @@ cat >>"$d/ci/harnesses.sh" <<'ADAPTER'
 eval "$(declare -f harness_file | sed '1s/harness_file/base_harness_file/')"
 harness_file() {
   if [ "$1" = fixture ]; then
-    cat "$2"
+    base_harness_file "$@"
     case "$2" in */SKILL.md | */scripts/*.sh) printf '\n# fixture output\n' ;; esac
   else base_harness_file "$@"; fi
 }
@@ -1569,6 +1641,7 @@ chmod +x "$d/software/workspace-inherit/.claude/skills/journal/scripts/capture.s
 (cd "$d" && bash ci/render.sh . "$t/fixture-stage" && git add -A && bash ci/check.sh . HEAD &&
   bash ci/render.sh . "$t/fixture-stage-again" && git diff --quiet) >"$t/out" 2>"$t/err" || fail "adapter extension: $(cat "$t/err")"
 grep -qx '# fixture output' "$t/fixture-stage/$F/.fixture/skills/journal/SKILL.md" || fail "new target skill was not adapted"
+grep -qx 'fixture-format: native' "$t/fixture-stage/$F/.fixture/skills/journal/SKILL.md" || fail "descriptor-owned metadata format was not rendered"
 grep -qx '# fixture output' "$t/fixture-stage/$F/.fixture/skills/journal/scripts/capture.sh" || fail "new target helper was not adapted"
 [ -x "$t/fixture-stage/$F/.fixture/skills/journal/scripts/capture.sh" ] || fail "new target lost executable mode"
 diff -qr "$t/fixture-stage" "$t/fixture-stage-again" >/dev/null || fail "new target staging was not deterministic"
@@ -1585,6 +1658,8 @@ bash -euo pipefail -c '
   [ "$(cat "$2")" = TASKS.md ]
   [ "$instruction:$skills:$plugins" = unchanged:unchanged:unchanged ]
   ! declare -F harness >/dev/null
+  ! declare -F translate_skill >/dev/null
+  ! declare -F claude_identifiers >/dev/null
   harness_foreign codex | grep -qx .fixture
 ' _ "$d" "$t/fixture-field.txt" || fail "registry properties mutated caller state or did not compute new foreign paths"
 mkdir -p "$d/software/fixture-target/workspace-defaults/.fixture/skills/source"

From 3a39aadebf8691bdfa23c79887d11ebecbff6b74 Mon Sep 17 00:00:00 2001
From: Jesus God <wyattbracy@gmail.com>
Date: Wed, 28 Oct 2026 01:32:49 +0000
Subject: [PATCH 15/18] Clarify when workspace context is translated

---
 docs/design.md | 42 ++++++++++++++++++++++++++++++++++--------
 1 file changed, 34 insertions(+), 8 deletions(-)

diff --git a/docs/design.md b/docs/design.md
index 8f64636..efc80f1 100644
--- a/docs/design.md
+++ b/docs/design.md
@@ -130,21 +130,47 @@ Shared-source paths, generated ledger paths and opt-out keys accept only ASCII
 ```mermaid
 ---
 config:
+  theme: base
   htmlLabels: false
+  fontSize: 16
+  themeVariables:
+    primaryColor: '#f3f4f6'
+    primaryTextColor: '#111827'
+    primaryBorderColor: '#64748b'
+    nodeTextColor: '#111827'
+    clusterBkg: '#f8fafc'
+    clusterBorder: '#94a3b8'
+    titleColor: '#111827'
+    lineColor: '#64748b'
+    edgeLabelBackground: '#f3f4f6'
   flowchart:
     htmlLabels: false
+    subGraphTitleMargin:
+      top: 10
+      bottom: 18
 ---
 flowchart TD
-    S["Canonical sources on main"] --> R["Temporary preparation"]
-    W["workspace.yml: harness"] --> R
-    R --> T["Staged native inheritance"]
-    T -->|"refresh copies"| B["Workspace branch"]
-    W -->|"owned native files"| B
-    B -->|"propose strips managed"| P["PR with owned changes"]
-    P --> W
-    style R fill:#eff6ff,stroke:#2563eb,color:#111827,stroke-width:2px
+    subgraph MAIN["Stored on main"]
+        S["Canonical inherited sources"]
+        O["Owned native workspace files"]
+    end
+    subgraph CI["Temporary CI staging"]
+        T["1. Map paths and translate skills"]
+        H["2. Hash native bytes and write ledger"]
+        T --> H
+    end
+    S --> T
+    H -->|"refresh copies"| B["ws/name: owned + inherited + runtime"]
+    O -->|"merge owned files"| B
+    B -->|"strip managed output"| P["PR: owned native changes"]
+    P --> O
+    style T fill:#eff6ff,stroke:#2563eb,color:#111827,stroke-width:2px
 ```
 
+The blue step runs before branch publication. Refresh uses it before the owned-file merge for
+ownership checks, then with the merged manifest for final output; cached stages may be reused.
+Proposals discard staged inheritance and return owned files in their existing native format.
+
 A plugin set is for what `workspace-inherit/` can't do: context only some workspaces opt into, or
 harness features beyond files (hooks, MCP servers). It lives in `plugins/<harness>/<set>/` of a
 folder (`plugins/claude/` for Claude Code; a sister folder per other harness), one copy for the

From b2c53a5976052d43687b098066713d999fcd8a6b Mon Sep 17 00:00:00 2001
From: Jesus God <wyattbracy@gmail.com>
Date: Wed, 28 Oct 2026 02:41:58 +0000
Subject: [PATCH 16/18] Merge workspace changes before preparing native
 inheritance

---
 ci/render.sh   |   5 +-
 ci/sync.sh     | 112 ++++++++++++++++++----------------------
 docs/design.md |  52 ++++++++++---------
 tests/e2e.sh   | 136 +++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 213 insertions(+), 92 deletions(-)

diff --git a/ci/render.sh b/ci/render.sh
index b782b39..385835f 100755
--- a/ci/render.sh
+++ b/ci/render.sh
@@ -7,18 +7,16 @@ here=$(cd "$(dirname "$0")" && pwd)
 source "$here/inherit.sh"
 # shellcheck source=ci/managed.sh
 source "$here/managed.sh"
-check=0 only="" extra_optouts=""
+check=0 only=""
 while [ "$#" -gt 0 ]; do
   case "$1" in
     --check) check=1; shift ;;
     --workspace) [ "$#" -ge 2 ] || exit 2; only=$2; shift 2 ;;
-    --opt-outs) [ "$#" -ge 2 ] || exit 2; extra_optouts=$2; shift 2 ;;
     *) break ;;
   esac
 done
 [ "$#" -le 2 ] || { echo "render: too many arguments" >&2; exit 2; }
 [ -z "$only" ] || { safe_path "$only" && [ "$#" = 2 ]; } || { echo "render: --workspace needs a safe folder and staging output" >&2; exit 2; }
-[ -z "$extra_optouts" ] || [ -n "$only" ] || { echo "render: --opt-outs requires --workspace" >&2; exit 2; }
 checkout=${1:-.} output=${2:-}
 if [ -n "$output" ]; then mkdir -p "$output"; output=$(cd "$output" && pwd -P); fi
 cd "$checkout"
@@ -49,7 +47,6 @@ render_workspace() { # <workspace folder>: main keeps owned files; inherited out
     bad "$folder/workspace.yml: $adapter does not support Delphi plugin sets"; return
   fi
   out=$(optouts <"$folder/workspace.yml")
-  [ -z "$extra_optouts" ] || out="$out $(optouts <"$extra_optouts")"
   records=$(inherited_files "$folder" "$adapter" "$out") || { bad "$folder: cannot resolve inherited sources"; return; }
   rm -rf "$target"
   mkdir -p "$target"
diff --git a/ci/sync.sh b/ci/sync.sh
index e56228c..53a650b 100755
--- a/ci/sync.sh
+++ b/ci/sync.sh
@@ -7,6 +7,8 @@ set -euo pipefail
 here=$(cd "$(dirname "$0")" && pwd)
 # shellcheck source=ci/managed.sh
 source "$here/managed.sh"
+# shellcheck source=ci/harnesses.sh
+source "$here/harnesses.sh"
 dir=both
 case "${1:-}" in refresh | propose) dir=$1 && shift ;; esac
 only=${1:-}
@@ -105,7 +107,7 @@ historical_folder() { # <old main revision> <current folder>: resolve the same l
   workspace_names "$1" | awk -v name="$name" '$1 == name { print $2; exit }'
 }
 
-aligned_refs() { # <stripped workspace> <current folder> <ownership commit>: align a moved subtree's merge base
+aligned_refs() { # <workspace commit> <current folder> <ownership commit>: align a moved subtree's merge base
   local base old common folder fragment i=$wt.index aligned ws incoming t
   base=$(previous_main "$3") || return 1
   old=""
@@ -158,12 +160,12 @@ reconstruct_records() { # <workspace commit> <folder>: only trusted main sources
     generated_records <"$native/$generated"
     return
   fi
-  native=$(staged_recipe "$base" "$folder" "$recipe") || return 1
+  native=$(stage_inheritance "$base" "$folder" "$recipe") || return 1
   generated_records <"$native/$generated"
 }
 
-staged_recipe() { # recover the last generated target from its manifest; hashes come only from trusted main sources
-  local source original renderer manifest target ready extra=()
+stage_inheritance() { # <source revision> <folder> <workspace commit>: render its manifest with trusted source-side code
+  local source original renderer manifest target ready
   manifest=$(git rev-parse "$3:workspace.yml") || return 1
   if [ "$manifest" = "$(git rev-parse "$1:$2/workspace.yml" 2>/dev/null || true)" ]; then staged "$1" "$2"; return; fi
   target=$cache/recipe/$1/$manifest/native/$2 ready=$cache/status/recipe/$1/$manifest/$2
@@ -177,8 +179,7 @@ staged_recipe() { # recover the last generated target from its manifest; hashes
     git show "$3:workspace.yml" >"$source/$2/workspace.yml" || return 1
     renderer=$here/render.sh
     if [ -f "$source/ci/render.sh" ] && grep -q -- '--workspace' "$source/ci/render.sh"; then renderer=$source/ci/render.sh; fi
-    if [ "$1" = "$main" ]; then extra=(--opt-outs "$original/$2/workspace.yml"); fi
-    bash "$renderer" --workspace "$2" "${extra[@]}" "$source" "$cache/recipe/$1/$manifest/native" >&2 || return 1
+    bash "$renderer" --workspace "$2" "$source" "$cache/recipe/$1/$manifest/native" >&2 || return 1
     mkdir -p "$(dirname "$ready")" || return 1
     : >"$ready" || return 1
   fi
@@ -209,15 +210,19 @@ managed_records() { # <workspace commit> <folder>: trusted previous ownership, r
   } $2 in owned { print owned[$2] }'
 }
 
-with_generated() { # <workspace commit> <folder> [<ownership commit> [<native stage>]]: check ownership, then materialize
-  local i=$wt.index now old out meta path src entry blob base="" legacy=0 branch_entry child parent paths native owner=${3:-$1} trusted folder
-  native=${4:-$(staged_recipe "$main" "$2" "$1")} || return 1
+apply_inheritance() { # <merged workspace> <folder> <original workspace> <native stage>: validate ownership, apply prepared bytes
+  local i=$wt.index now old out meta path src entry blob base="" legacy=0 branch_entry child parent paths native owner=$3 trusted folder
+  native=$4
   now=$(generated_records <"$native/$generated") || return 1
   old=$(managed_records "$owner" "$2") || return 1
   trusted=$(previous_records "$owner" "$2") || return 1
   out=$(git show "$1:workspace.yml" | optouts) || return 1
-  # Before merging, main's new exclusions must already apply to its new sources.
-  [ -n "${4:-}" ] || out="$out $(git show "$main:$2/workspace.yml" | optouts)" || return 1
+  # A branch's ledger cannot authorize removal of a file outside trusted prior output.
+  while IFS=$'\t' read -r meta path src; do
+    [ -z "$path" ] || recorded "$path" "$trusted" || {
+      echo "sync: $2: CONFLICT: untrusted managed path $path in $generated" >&2; return 1;
+    }
+  done <<<"$(ledger "$owner:$generated")"
   if legacy_workspace "$owner"; then
     legacy=1
     base=$(previous_main "$owner") || return 1
@@ -253,7 +258,8 @@ with_generated() { # <workspace commit> <folder> [<ownership commit> [<native st
     [ -n "$path" ] || continue
     opted_out "$path" "$out" && continue
     recorded "$path" "$now" && continue
-    branch_entry=$(git ls-tree "$1" -- "$path" | awk '$1 != "040000" { print $1 " " $3 }')
+    settings_source "$src" && continue
+    branch_entry=$(git ls-tree "$owner" -- "$path" | awk '$1 != "040000" { print $1 " " $3 }')
     if [ -n "$branch_entry" ] && [ "$branch_entry" != "$meta" ]; then
       echo "sync: $2: CONFLICT: retired managed $path has local edits; preserve it at another path or resolve it explicitly in a workspace PR" >&2
       return 1
@@ -265,6 +271,11 @@ with_generated() { # <workspace commit> <folder> [<ownership commit> [<native st
   while IFS= read -r path; do
     [ -n "$path" ] || continue
     opted_out "$path" "$out" && continue
+    # A retired inherited path may now hold a reviewed, workspace-owned file on main.
+    if ! recorded "$path" "$now" && [ -n "$(file_entry "$main" "$2/$path")" ]; then
+      src=$(printf '%s\n' "$old" | awk -F'\t' -v p="$path" '$2 == p { print $3; exit }')
+      settings_source "$src" || continue
+    fi
     GIT_INDEX_FILE=$i git update-index --force-remove -- "$path" || return 1
   done <<<"$paths"
   while IFS=$'\t' read -r meta path src; do
@@ -286,7 +297,7 @@ with_generated() { # <workspace commit> <folder> [<ownership commit> [<native st
   rm -f "$i"
 }
 
-without_generated() { # <normalized workspace commit>: leave owned payloads and native settings for subtree merging
+without_generated() { # <normalized workspace commit>: leave owned payloads and native settings for a proposal
   local i=$wt.index records meta path src
   records=$(ledger "$1:$generated") || return 1
   rm -f "$i" || return 1
@@ -301,45 +312,20 @@ without_generated() { # <normalized workspace commit>: leave owned payloads and
   rm -f "$i"
 }
 
-staged_workspace() { # <stripped workspace commit> <folder>: render current sources with the merged owned workspace
-  local source original target=$cache/workspace/$1/native/$2 ready=$cache/status/workspace/$1/$2
-  if git diff --quiet "$1" "$main:$2" -- . ':!.delphi'; then staged "$main" "$2"; return; fi
-  if [ ! -f "$ready" ]; then
-    original=$(source_checkout "$main") || return 1
-    source=$cache/workspace/$1/source
-    mkdir -p "$source" || return 1
-    cp -R "$original/." "$source/" || return 1
-    rm -rf "${source:?}/$2" || return 1
-    mkdir -p "$source/$2" || return 1
-    git archive "$1" | tar -x -C "$source/$2" || return 1
-    rm -rf "$source/$2/.delphi" || return 1
-    bash "$here/render.sh" --workspace "$2" "$source" "$cache/workspace/$1/native" >&2 || return 1
-    mkdir -p "$(dirname "$ready")" || return 1
-    : >"$ready" || return 1
-  fi
-  printf '%s\n' "$target"
-}
-
-resolve_generated_conflicts() { # <stripped workspace commit> <folder> <prefix> <ownership commit>
-  local now old previous out paths path relative entry meta src
-  now=$(staged "$main" "$2") || return 1
-  now=$(generated_records <"$now/$generated") || return 1
-  old=$(managed_records "$4" "$2") || return 1
-  previous=$(previous_records "$4" "$2") || return 1
-  out=$(git show "$1:workspace.yml" | optouts)
-  paths=" $(printf '%s\n%s\n' "$old" "$now" | cut -f2 | tr '\n' ' ') $generated "
-  while IFS=$'\t' read -r meta path src; do
-    [ -z "$path" ] || ! opted_out "$path" "$out" || paths="$paths$path "
-  done <<<"$previous"
+resolve_managed_conflicts() { # <original workspace> <folder> <prefix>: defer only managed-file conflicts; validate after rendering
+  local records out paths path relative entry target
+  records=$(ledger "$1:$generated") || return 1
+  out="$(git show "$1:workspace.yml" | optouts) $(git show "$main:$2/workspace.yml" | optouts)"
+  paths=" $(printf '%s\n' "$records" | cut -f2 | tr '\n' ' ') $generated "
+  for target in $(harnesses); do paths="$paths$(harness_field "$target" settings_file) "; done
   while IFS= read -r path; do
     relative=${path#"$3"}
     [ "$path" = "$3$relative" ] || continue
     case "$paths" in *" $relative "*) ;; *) continue ;; esac
+    opted_out "$relative" "$out" && continue
     git -C "$wt" update-index --force-remove -- "$path" || return 1
     entry=""
     if [ "$relative" = "$generated" ]; then :
-    elif opted_out "$relative" "$out"; then
-      entry=$(file_entry "$1" "$relative")
     else
       entry=$(file_entry "$main" "$2/$relative")
     fi
@@ -367,7 +353,8 @@ refresh() { # <name> <folder> <old name>: leave the worktree at ws/<name> with m
     local initial native
     initial=$(with_delphi "$main:$2") || { failed=1 ok=0; return; }
     initial=$(git commit-tree -p "$main" -m "delphi: prepare ws/$1" "$initial") || { failed=1 ok=0; return; }
-    initial=$(with_generated "$initial" "$2") || { failed=1 ok=0; return; }
+    native=$(staged "$main" "$2") || { failed=1 ok=0; return; }
+    initial=$(apply_inheritance "$initial" "$2" "$initial" "$native") || { failed=1 ok=0; return; }
     git -C "$wt" checkout --quiet --detach \
       "$(git commit-tree -p "$main" -m "delphi: create ws/$1 from $2" "$initial")" || { failed=1 ok=0; return; }
     git -C "$wt" push --quiet origin "HEAD:refs/heads/ws/$1" || { failed=1 ok=0; return; }
@@ -375,25 +362,19 @@ refresh() { # <name> <folder> <old name>: leave the worktree at ws/<name> with m
     return
   fi
   local head t ws native alignment incoming
-  t=$(with_generated "$from" "$2") || { failed=1 ok=0; return; }
   ws=$from
-  if [ "$t" != "$(tree "$from")" ]; then
-    ws=$(git commit-tree -p "$from" -m "delphi: sync generated files from main" "$t")
-  fi
-  t=$(without_generated "$ws") || { failed=1 ok=0; return; }
-  [ "$t" = "$(tree "$ws")" ] || ws=$(git commit-tree -p "$ws" -m "delphi: prepare owned files for refresh" "$t")
   alignment=$(aligned_refs "$ws" "$2" "$from") || { failed=1 ok=0; return; }
   ws=${alignment%% *} incoming=${alignment#* }
   git -C "$wt" checkout --quiet --detach "$ws"
   if ! git -C "$wt" merge --quiet --no-ff -Xsubtree="$2" -m "delphi: refresh ws/$1 from main" "$incoming" >/dev/null; then
-    if ! resolve_generated_conflicts "$ws" "$2" "" "$from"; then
+    if ! resolve_managed_conflicts "$from" "$2" ""; then
       conflict "ws/$1: CONFLICT refreshing from main; merge main into ws/$1 in a PR (see README)."
       return
     fi
   fi
   head=$(git -C "$wt" rev-parse HEAD)
-  native=$(staged_workspace "$head" "$2") || { failed=1 ok=0; return; }
-  t=$(with_generated "$head" "$2" "$from" "$native") || { failed=1 ok=0; return; }
+  native=$(stage_inheritance "$main" "$2" "$head") || { failed=1 ok=0; return; }
+  t=$(apply_inheritance "$head" "$2" "$from" "$native") || { failed=1 ok=0; return; }
   if [ "$t" != "$(tree "$head")" ]; then
     head=$(git commit-tree -p "$head" -m "delphi: sync generated files from main" "$t")
     git -C "$wt" checkout --quiet --detach "$head"
@@ -423,22 +404,27 @@ propose() { # <name> <folder>: PR owned workspace files into main, leaving inher
   local ws owner title="ws/$1 → main" body pr
   ws=$(git -C "$wt" rev-parse HEAD)
   owner=$ws
-  local t alignment incoming
-  t=$(with_generated "$ws" "$2") || { failed=1 ok=0; return; }
-  [ "$t" = "$(tree "$ws")" ] || ws=$(git commit-tree -p "$ws" -m "delphi: prepare managed files for proposal" "$t")
-  t=$(without_generated "$ws") || { failed=1 ok=0; return; }
-  [ "$t" = "$(tree "$ws")" ] || ws=$(git commit-tree -p "$ws" -m "delphi: propose owned files only" "$t")
+  local t alignment incoming candidate native normalized
   alignment=$(aligned_refs "$ws" "$2" "$owner") || { failed=1 ok=0; return; }
   ws=${alignment%% *} incoming=${alignment#* }
   git -C "$wt" checkout --quiet --detach "$incoming"
   if ! git -C "$wt" merge --quiet --no-ff -Xsubtree="$2" -m "delphi: propose ws/$1 to main" "$ws" >/dev/null; then
-    if ! resolve_generated_conflicts "$ws" "$2" "$2/" "$owner"; then
+    if ! resolve_managed_conflicts "$owner" "$2" "$2/"; then
       conflict "ws/$1: CONFLICT proposing to main; merge main into ws/$1 in a PR (see README)."
       return
     fi
   fi
-  t=$(with_delphi "$(git -C "$wt" rev-parse HEAD)" "$2/")
-  git -C "$wt" checkout --quiet --detach "$(git commit-tree -p "$main" -p "$owner" -m "delphi: propose ws/$1 to main" "$t")"
+  candidate=$(git -C "$wt" rev-parse "HEAD:$2")
+  candidate=$(git commit-tree -p "$owner" -m "delphi: prepare proposal ownership" "$candidate")
+  native=$(stage_inheritance "$main" "$2" "$candidate") || { failed=1 ok=0; return; }
+  t=$(apply_inheritance "$candidate" "$2" "$owner" "$native") || { failed=1 ok=0; return; }
+  normalized=$(git commit-tree -p "$owner" -m "delphi: prepare proposal files" "$t")
+  t=$(without_generated "$normalized") || { failed=1 ok=0; return; }
+  git -C "$wt" rm -rq -- "$2"
+  git -C "$wt" read-tree --prefix="$2/" -u "$t"
+  git -C "$wt" rm -rq --ignore-unmatch -- "$2/.delphi"
+  t=$(git -C "$wt" write-tree)
+  git -C "$wt" checkout --quiet --detach "$(git commit-tree -p "$main" -p "$owner" -m "delphi: prepare main candidate" "$t")"
   if ! bash "$wt/ci/render.sh" "$wt"; then
     echo "ws/$1: main-side rendering failed; not proposed" >&2
     failed=1; return
diff --git a/docs/design.md b/docs/design.md
index efc80f1..d9abbc2 100644
--- a/docs/design.md
+++ b/docs/design.md
@@ -119,9 +119,8 @@ When changing a workspace's harness, update its owned native files too; CI regen
 
 Source-native `opt-out:` paths are applied before mapping, so a Codex workspace can exclude a
 Claude-only input such as `.claude/commands`. Mapped native opt-outs still transfer copies to
-workspace ownership. Unsupported native mappings fail unless explicitly excluded. Before merging, sync stages with both
-main and branch opt-outs (`render.sh --opt-outs <main-manifest>`), so a new source and its exclusion
-can arrive together without blocking refresh.
+workspace ownership. Unsupported native mappings fail unless explicitly excluded. Refresh merges
+the manifest before rendering, so a new source and its exclusion can arrive together.
 
 Shared-source paths, generated ledger paths and opt-out keys accept only ASCII
 `[A-Za-z0-9._/@+-]`. Spaces and control characters are unsupported; paths must be relative without
@@ -155,21 +154,23 @@ flowchart TD
         O["Owned native workspace files"]
     end
     subgraph CI["Temporary CI staging"]
-        T["1. Map paths and translate skills"]
-        H["2. Hash native bytes and write ledger"]
-        T --> H
+        M["1. Merge main into workspace tree"]
+        T["2. Prepare inheritance for merged harness"]
+        H["3. Check ownership and apply files"]
+        C["4. Commit changed workspace tree"]
+        M --> T --> H --> C
     end
     S --> T
-    H -->|"refresh copies"| B["ws/name: owned + inherited + runtime"]
-    O -->|"merge owned files"| B
+    C -->|"push"| B["Workspace branch"]
+    O --> M
     B -->|"strip managed output"| P["PR: owned native changes"]
-    P --> O
     style T fill:#eff6ff,stroke:#2563eb,color:#111827,stroke-width:2px
 ```
 
-The blue step runs before branch publication. Refresh uses it before the owned-file merge for
-ownership checks, then with the merged manifest for final output; cached stages may be reused.
-Proposals discard staged inheritance and return owned files in their existing native format.
+The blue step runs after the merge, using its manifest to select the harness and opt-outs.
+`stage_inheritance()` calls the renderer; `apply_inheritance()` checks ownership and installs the
+prepared bytes. Historical output may be replayed to verify prior ownership. Proposals discard
+staged inheritance and return owned files in their existing native format.
 
 A plugin set is for what `workspace-inherit/` can't do: context only some workspaces opt into, or
 harness features beyond files (hooks, MCP servers). It lives in `plugins/<harness>/<set>/` of a
@@ -192,7 +193,7 @@ rest, and `ci/check.sh` fails if the list or either file is out of date:
   `ci/plugins.sh`, plus the `delphi` marketplace (with `autoUpdate`) and the sets under `plugins:`
   in `enabledPlugins`. Never edit it by hand: personal settings go in `.claude/settings.local.json`
   (git-ignored by Claude Code), shared ones in `workspace.yml` or the generator. Main's settings
-  are generated before merge. Refresh generates branch settings from its plugin selections and
+  are generated before their PR merges into main. Refresh generates branch settings from its plugin selections and
   main's plugin catalog, so enabled sets remain active while their proposal to main is pending.
 - Enabled isn't installed: Claude Code only offers to install a project's enabled plugins, so
   someone may never have installed a set, and then its skills are silently missing; and a set that
@@ -219,18 +220,19 @@ that touches a set is an update.
 
 For every workspace on `origin/main` (or just `<name>`):
 
-1. **Prepare** resolves main's sources and each workspace's explicit harness into temporary native
-   staging. Shared sources and main's workspace folders remain separate from inherited output.
-2. **Refresh** subtree-merges owned files, copies staged inheritance with its `workspace.generated`,
-   and syncs main's root `.delphi/`. It respects branch opt-outs and checks ownership before
-   replacing or retiring files. A new branch has the workspace folder, staged inheritance and
-   main's runtime at its root, parented by main. Branch updates copy prepared bytes; translation
-   never runs in the workspace checkout. Branch plugin selections stay active before their
-   proposal merges.
-3. **Propose** strips managed inheritance, `workspace.generated` and the workspace's `.delphi/`
-   before preparing a main-side PR. Owned files and opted-out skills remain. It regenerates
-   plugin settings, runs `ci/check.sh`, and opens or updates `propose/<name>` only when the tree
-   changes. Existing PR labels are preserved. No inherited output is committed to main.
+1. **Merge** main into the workspace tree in a temporary checkout. Owned-file conflicts are
+   reported. Managed-file conflicts can be deferred using ownership metadata, then verified
+   against trusted source history before publication.
+2. **Prepare inheritance** once from main's sources and the merged manifest. The registered
+   harness maps paths and converts skill content; Claude copies its original bytes. Ownership
+   checks protect local files and retired edits before prepared output and `workspace.generated`
+   are applied. Sync adds main's `.delphi/`, commits only a changed tree, then pushes `ws/<name>`.
+   A missing workspace branch starts from its main folder and gets the same preparation step.
+   Branch plugin selections remain active while their proposal is pending.
+3. **Propose** merges the workspace into a temporary main candidate, verifies ownership and strips
+   managed inheritance, `workspace.generated` and the branch runtime. Owned files and opted-out
+   copies remain native. It regenerates settings, runs `ci/check.sh`, and updates `propose/<name>`
+   only when the tree changes. Existing PR labels are preserved.
 
 History stays joined through subtree merges; workspace branches are never force-pushed. Legacy
 path-named branches still carry over into dotted names while ahead, and receive the result once;
diff --git a/tests/e2e.sh b/tests/e2e.sh
index ed074ef..94c9c2c 100644
--- a/tests/e2e.sh
+++ b/tests/e2e.sh
@@ -518,6 +518,142 @@ bash ci/sync.sh refresh "$name"
 EXCLUSION
 ok "main source additions and exclusions sync together in both directions; refresh publishes one real merge and repeats unchanged"
 
+# The incoming harness is selected after the merge, and its skill renderer runs once.
+d=$t/merge-first
+git clone -q "$t/seed" "$d"
+bash -euo pipefail -s -- "$d" "$d-origin.git" "$A" "$AN" <<'MERGE_FIRST' >"$t/out" 2>"$t/err" || fail "merge-first generation: $(cat "$t/err")"
+cd "$1"
+origin=$2 folder=$3 name=$4
+for descriptor in ci/harnesses/claude-code.sh ci/harnesses/codex.sh; do
+  cat >>"$descriptor" <<'TRACE'
+eval "$(declare -f translate_skill | sed '1s/translate_skill/original_translate_skill/')"
+translate_skill() {
+  if [ -n "${DELPHI_RENDER_TRACE:-}" ]; then
+    printf '%s|%s|%s\n' "$(cat "$harness_dir/../../render-revision")" \
+      "$(awk '/^harness:/ { print $2 }' "$folder/workspace.yml")" \
+      "$(awk '/^  sample:/ { print $2 }' "$folder/workspace.yml")" >>"$DELPHI_RENDER_TRACE"
+  fi
+  original_translate_skill "$@"
+}
+TRACE
+done
+echo old >render-revision
+echo base >"$folder/owned.txt"
+git rm -rq --ignore-unmatch "$folder/.claude/skills"
+printf 'name: %s\nharness: claude-code\nworkspaces:\n  - main\n' "$name" >"$folder/workspace.yml"
+mkdir -p software/workspace-inherit/.claude/skills/render-order
+printf '%s\n' '---' 'name: render-order' 'description: Render order fixture' '---' 'Read CLAUDE.md.' >software/workspace-inherit/.claude/skills/render-order/SKILL.md
+bash ci/render.sh; git add -A; git commit -qm 'merge-first baseline'
+git clone -q --bare . "$origin"; git remote set-url origin "$origin"
+bash ci/sync.sh refresh "$name"
+git fetch -q; git checkout -q -B edit "origin/ws/$name"
+printf 'repos:\n  sample: https://example.invalid/branch.git\n' >>workspace.yml
+git commit -qam 'branch-owned repository choice'; git push -q origin "HEAD:ws/$name"; git checkout -q main
+before=$(git -C "$origin" rev-parse "ws/$name")
+echo new >render-revision
+git rm -rq "$folder/CLAUDE.md" "$folder/.claude"
+echo '# Codex workspace' >"$folder/AGENTS.md"
+printf 'name: %s\nharness: codex\nworkspaces:\n  - main\n' "$name" >"$folder/workspace.yml"
+bash ci/render.sh; bash ci/check.sh
+git add -A; git commit -qm 'main selects the next harness'; git push -q origin main
+DELPHI_RENDER_TRACE=$PWD/render-trace.log bash ci/sync.sh refresh "$name"
+[ "$(grep -c '^new|' render-trace.log)" = 1 ]
+grep -qx 'new|codex|https://example.invalid/branch.git' render-trace.log
+[ "$(head -n 1 render-trace.log)" = 'new|codex|https://example.invalid/branch.git' ]
+after=$(git -C "$origin" rev-parse "ws/$name")
+[ "$(git -C "$origin" rev-parse "$after^1")" = "$before" ]
+[ "$(git -C "$origin" rev-parse "$after^2")" = "$(git -C "$origin" rev-parse main)" ]
+git -C "$origin" show "$after:.agents/skills/render-order/SKILL.md" | grep -qx 'Read AGENTS.md.'
+! git -C "$origin" cat-file -e "$after:.claude/skills/render-order/SKILL.md" 2>/dev/null
+
+# A retired managed path can become an explicitly owned file on main.
+git rm -rq software/workspace-inherit/.claude/skills/render-order
+mkdir -p "$folder/.agents/skills/render-order"
+printf '%s\n' '---' 'name: render-order' 'description: Owned fixture' '---' 'Owned on main.' >"$folder/.agents/skills/render-order/SKILL.md"
+bash ci/render.sh; git add -A; git commit -qm 'replace inheritance with owned native context'; git push -q origin main
+bash ci/sync.sh refresh "$name"
+git -C "$origin" show "ws/$name:.agents/skills/render-order/SKILL.md" | grep -qx 'Owned on main.'
+! git -C "$origin" show "ws/$name:workspace.generated" | grep -q 'render-order/SKILL.md'
+
+# A forged ledger cannot hide a real conflict in an owned file.
+git fetch -q; git checkout -q -B edit "origin/ws/$name"
+echo branch >owned.txt
+printf '100644 %s\towned.txt\tsoftware/workspace-inherit/fake.txt\n' "$(git hash-object owned.txt)" >>workspace.generated
+git commit -qam 'forge an owned-file claim'; git push -q origin "HEAD:ws/$name"; git checkout -q main
+echo main >"$folder/owned.txt"
+git commit -qam 'main edits the same owned file'; git push -q origin main
+before=$(git -C "$origin" for-each-ref --format='%(refname) %(objectname)' "refs/heads/ws/$name" "refs/heads/propose/$name")
+for direction in refresh propose; do
+  if bash ci/sync.sh "$direction" "$name" >conflict.log 2>&1; then exit 1; fi
+  grep -q 'untrusted managed path owned.txt' conflict.log
+  [ "$(git -C "$origin" for-each-ref --format='%(refname) %(objectname)' "refs/heads/ws/$name" "refs/heads/propose/$name")" = "$before" ]
+done
+[ "$(git -C "$origin" show "ws/$name:owned.txt")" = branch ]
+[ "$(git -C "$origin" show "main:$folder/owned.txt")" = main ]
+MERGE_FIRST
+ok "refresh renders the merged harness/configuration once, then publishes one commit"
+ok "retired inheritance preserves main-owned replacements; forged ledgers cannot bypass owned-file conflicts"
+
+d=$t/branch-only-harness
+git clone -q "$t/seed" "$d"
+bash -euo pipefail -s -- "$d" "$d-origin.git" "$A" "$AN" <<'BRANCH_HARNESS' >"$t/out" 2>"$t/err" || fail "branch-only harness: $(cat "$t/err")"
+cd "$1"
+origin=$2 folder=$3 name=$4
+git rm -rq --ignore-unmatch "$folder/.claude/skills"
+git add -A; git commit -qm 'branch harness fixture'
+git clone -q --bare . "$origin"; git remote set-url origin "$origin"
+bash ci/sync.sh refresh "$name"
+git fetch -q; git checkout -q -B edit "origin/ws/$name"
+git mv CLAUDE.md AGENTS.md
+awk '/^plugins:/ { skip = 1; next } /^[^[:space:]#]/ { skip = 0 } !skip { print }' workspace.yml >manifest.tmp
+sed 's/harness: claude-code/harness: codex/' manifest.tmp >workspace.yml; rm manifest.tmp
+git commit -qam 'branch selects Codex before main'; git push -q origin "HEAD:ws/$name"; git checkout -q main
+bash ci/sync.sh refresh "$name"
+! git -C "$origin" cat-file -e "ws/$name:.claude/settings.json" 2>/dev/null
+git -C "$origin" show "main:$folder/workspace.yml" | grep -qx 'harness: claude-code'
+git -C "$origin" cat-file -e "main:$folder/.claude/settings.json"
+bash ci/sync.sh propose "$name"
+git -C "$origin" show "propose/$name:$folder/workspace.yml" | grep -qx 'harness: codex'
+! git -C "$origin" cat-file -e "propose/$name:$folder/.claude/settings.json" 2>/dev/null
+BRANCH_HARNESS
+ok "branch-only harness switches retire generated settings while main keeps the original harness"
+
+# A failed main-candidate generator must leave the temporary worktree ready for the next workspace.
+d=$t/proposal-isolation
+git clone -q "$t/seed" "$d"
+bash -euo pipefail -s -- "$d" "$d-origin.git" "$A" "$AN" "$B" "$BN" <<'ISOLATION' >"$t/out" 2>"$t/err" || fail "proposal failure isolation: $(cat "$t/err")"
+cd "$1"
+origin=$2 a=$3 an=$4 b=$5 bn=$6
+mv ci/render.sh ci/render-base.sh
+cat >ci/render.sh <<'WRAPPER'
+#!/usr/bin/env bash
+set -euo pipefail
+case "${1:-}" in --workspace) ;; *)
+  if [ -f "${1:-.}/software/application-software/argos/workspaces/argos-dev/fail-proposal.txt" ]; then
+    echo 'forced proposal render failure' >&2; exit 1
+  fi ;;
+esac
+exec bash "$(dirname "$0")/render-base.sh" "$@"
+WRAPPER
+git add -A; git commit -qm 'proposal isolation fixture'
+git clone -q --bare . "$origin"; git remote set-url origin "$origin"
+bash ci/sync.sh refresh
+git fetch -q
+for name in "$an" "$bn"; do
+  git checkout -q -B edit "origin/ws/$name"
+  file=surviving-proposal.txt; [ "$name" != "$an" ] || file=fail-proposal.txt
+  echo owned >"$file"; git add "$file"; git commit -qm 'workspace edit'
+  git push -q origin "HEAD:ws/$name"
+done
+git checkout -q main
+if bash ci/sync.sh propose >isolation.log 2>&1; then exit 1; fi
+grep -q 'forced proposal render failure' isolation.log
+! git -C "$origin" rev-parse --quiet --verify "refs/heads/propose/$an" >/dev/null
+[ "$(git -C "$origin" show "propose/$bn:$b/surviving-proposal.txt")" = owned ]
+[ "$(git -C "$origin" diff --name-only main "propose/$bn")" = "$b/surviving-proposal.txt" ]
+ISOLATION
+ok "a failed proposal generator preserves other workspace proposals without leaking its candidate files"
+
 # --- 5. a conflict on bms-dev is reported; argos-dev still syncs; exit 1
 commit_on ws/$BN CLAUDE.md "ws side"
 commit_on main "$B/CLAUDE.md" "main side"

From d28f42f0bd02b5cf5e90d481ce4444423e2633e6 Mon Sep 17 00:00:00 2001
From: Jesus God <wyattbracy@gmail.com>
Date: Wed, 28 Oct 2026 04:21:21 +0000
Subject: [PATCH 17/18] Preserve literal references and scope harness skill
 translation

---
 ci/harnesses.sh             | 25 ++++++++--
 ci/harnesses/claude-code.sh | 84 ++++++++++++++++++++++---------
 ci/harnesses/codex.sh       |  2 +-
 ci/render.sh                |  5 +-
 docs/design.md              |  7 ++-
 tests/e2e.sh                |  4 +-
 tests/harnesses.sh          | 98 +++++++++++++++++++++++++++++++++++++
 tools/new-workspace.sh      |  6 ++-
 8 files changed, 197 insertions(+), 34 deletions(-)
 create mode 100644 tests/harnesses.sh

diff --git a/ci/harnesses.sh b/ci/harnesses.sh
index e9aa7a8..c7e438d 100644
--- a/ci/harnesses.sh
+++ b/ci/harnesses.sh
@@ -2,8 +2,6 @@
 # Harness registry and shared skill rendering. Per-target facts live in harnesses/<name>.sh.
 set -euo pipefail
 harness_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")/harnesses" && pwd)
-harness_skill_names=$(if [ -d "$harness_dir/../../software" ]; then find "$harness_dir/../../software" -type f -name SKILL.md; fi |
-  sed 's|/SKILL.md$||; s|.*/||' | LC_ALL=C sort -u | tr '\n' ' ')
 
 harnesses() { # registered target/source formats
   local file
@@ -59,8 +57,27 @@ harness_settings() { # <target> <folder> <manifest>: the target's registered set
   bash "$harness_dir/../../$generator" settings "$2" "$3"
 }
 
-harness_file() ( # <target> <source>: each descriptor owns its translator; validate every non-Claude output
-  local target=$1 file=$2
+harness_skill_names() { # <target> <workspace folder> <records> [opt-outs]: only this workspace's native skills
+  local prefix path exclusion skip
+  prefix=$(harness_field "$1" skills) || return 1
+  [ -n "$prefix" ] || return 0
+  {
+    while IFS=$'\t' read -r _ path _; do
+      skip=0
+      for exclusion in ${4:-}; do case "$path/" in "$exclusion"/*) skip=1 ;; esac; done
+      [ "$skip" = 1 ] || printf '%s\n' "$path"
+    done <<<"$3"
+    if [ -d "$2/$prefix" ]; then
+      while IFS= read -r path; do printf '%s\n' "${path#"$2"/}"; done < <(find "$2/$prefix" -type f -name SKILL.md)
+    fi
+  } | awk -v prefix="$prefix/" 'index($0, prefix) == 1 {
+    path = substr($0, length(prefix) + 1)
+    if (path ~ /^[a-z0-9-]+\/SKILL[.]md$/) { sub(/\/SKILL[.]md$/, "", path); print path }
+  }' | LC_ALL=C sort -u | tr '\n' ' '
+}
+
+harness_file() ( # <target> <source> [skill names]: each descriptor owns its translator; validate every non-Claude output
+  local target=$1 file=$2 harness_skill_names=${3:-}
   case "$file" in */SKILL.md) ;; *) cat "$file"; return ;; esac
   # shellcheck source=ci/harnesses/claude-code.sh
   source "$harness_dir/claude-code.sh"
diff --git a/ci/harnesses/claude-code.sh b/ci/harnesses/claude-code.sh
index 58fd1f6..d7d5e22 100644
--- a/ci/harnesses/claude-code.sh
+++ b/ci/harnesses/claude-code.sh
@@ -31,7 +31,7 @@ claude_identifiers() { # [check]: Claude's identifier contract, shared by target
       while ((at = index(s, from))) { out = out substr(s, 1, at - 1) to; s = substr(s, at + length(from)) }
       return out s
     }
-    function missing(id) { print "harness: " target ": missing Claude mapping for " id " in " file ":" NR > "/dev/stderr"; failed = 1 }
+    function missing(id) { print "harness: " target ": missing Claude mapping for " id " in " file " (translated line " NR ")" > "/dev/stderr"; failed = 1 }
     function native_skills(s, at, out) {
       while (match(s, /(^|[^A-Za-z0-9_.\/-])[.]claude\/skills/)) {
         at = RSTART + RLENGTH - 14
@@ -39,16 +39,67 @@ claude_identifiers() { # [check]: Claude's identifier contract, shared by target
       }
       return out s
     }
+    function repository_file(s, at, before, after) {
+      before = tolower(substr(s, 1, at - 1)); after = tolower(substr(s, at + 9))
+      return before ~ /(^|[^a-z])(repo|repository|worktree)(\047s|[ -]local)?([[:space:]]+own)?[[:space:]]*$/ ||
+        after ~ /^[[:space:]]+(in|from|of)[[:space:]]+(the[[:space:]]+)?(code[[:space:]]+)?(repo|repository|worktree)([^a-z]|$)/
+    }
+    function refs(s, code, start, at, size, before, after, id, active, out) {
+      start = 1
+      while (!code && match(substr(s, start), /CLAUDE[.]md/)) {
+        at = start + RSTART - 1; before = substr(s, at - 1, 1); after = substr(s, at + 9, 1)
+        active = (at == 1 || before !~ /[A-Za-z0-9_.\/-]/) && after !~ /[A-Za-z0-9_\/-]/ &&
+          (after != "." || substr(s, at + 10, 1) !~ /[A-Za-z0-9]/) && !repository_file(s, at)
+        out = out substr(s, start, at - start)
+        if (active && check && instruction != "CLAUDE.md") missing("CLAUDE.md")
+        out = out (active && !check ? instruction : "CLAUDE.md"); start = at + 9
+      }
+      s = out substr(s, start); start = 1; out = ""
+      # Always inspect boundaries in the original string, including after an unmatched path segment.
+      while (match(substr(s, start), /\/[a-z][a-z0-9-]*/)) {
+        at = start + RSTART - 1; size = RLENGTH; id = substr(s, at + 1, size - 1)
+        before = substr(s, at - 1, 1); after = substr(s, at + size, 1)
+        active = id in known && (at == 1 || before ~ /[[:space:](]/) && after != "/" &&
+          (after != "." || substr(s, at + size + 1, 1) !~ /[A-Za-z0-9]/) && (!code || at == 1)
+        out = out substr(s, start, at - start)
+        if (active && check && ref != "/%s") missing("/" id)
+        out = out (active && !check ? sprintf(ref, id) : "/" id); start = at + size
+      }
+      return out substr(s, start)
+    }
+    function spans(s, out, marker, tail, search, closing, size, offset) {
+      while (match(s, /`+/)) {
+        offset = RSTART; marker = substr(s, offset, RLENGTH); tail = substr(s, offset + RLENGTH)
+        search = tail; closing = 0; size = 0
+        while (match(search, /`+/)) {
+          if (RLENGTH == length(marker)) { closing = size + RSTART; break }
+          size += RSTART + RLENGTH - 1; search = substr(search, RSTART + RLENGTH)
+        }
+        if (!closing) break
+        out = out refs(substr(s, 1, offset - 1), 0) marker refs(substr(tail, 1, closing - 1), 1) marker
+        s = substr(tail, closing + length(marker))
+      }
+      return out refs(s, 0)
+    }
+    function fence_line(s, marker, size, suffix) {
+      sub(/^[[:space:]]*/, "", s)
+      if (!match(s, /^(```+|~~~+)/)) return 0
+      marker = substr(s, 1, 1); size = RLENGTH; suffix = substr(s, size + 1)
+      if (!fence) { fence = marker; fence_size = size; return 1 }
+      if (fence == marker && size >= fence_size && suffix ~ /^[[:space:]]*$/) { fence = ""; return 1 }
+      return 0
+    }
     BEGIN { n = split(ids, names, " "); for (i = 1; i <= n; i++) known[names[i]] = 1 }
     {
       line = $0
+      if (fence_line(line)) { print line; next }
       if (!check) {
         # Feature bullets are selected by identifiers, never by their English wording.
-        if (line ~ /^[-*] / && index(line, "/ws-delphi") && pane != "") {
+        if (!fence && line ~ /^[-*] / && index(line, "/ws-delphi") && pane != "") {
           if (pane != "drop") print "- " pane
           next
         }
-        if (line ~ /^[-*] / && index(line, "`delphi` mod") && reload != "") { print "- " reload; next }
+        if (!fence && line ~ /^[-*] / && index(line, "`delphi` mod") && reload != "") { print "- " reload; next }
         if (integration != "") line = literal(line, "GitHub MCP server", integration)
         if (github != "") {
           line = literal(line, "mcp__github__pull_request_read", github)
@@ -60,28 +111,13 @@ claude_identifiers() { # [check]: Claude's identifier contract, shared by target
         }
         line = native_skills(line)
       }
-      # Qualified code-repository filenames are literal paths, not workspace instruction identifiers.
-      rest = line; out = ""
-      while (match(rest, /(^|[^A-Za-z0-9_.\/-])CLAUDE[.]md/)) {
-        at = RSTART + RLENGTH - 9
-        out = out substr(rest, 1, at - 1)
-        if (check) { if (instruction != "CLAUDE.md") missing("CLAUDE.md"); out = out "CLAUDE.md" }
-        else out = out instruction
-        rest = substr(rest, at + 9)
-      }
-      line = out rest; rest = line; out = ""
-      while (match(rest, /(^|[[:space:]`(])\/[a-z][a-z0-9-]*/)) {
-        at = RSTART; token = substr(rest, at, RLENGTH); slash = index(token, "/")
-        id = substr(token, slash + 1); following = substr(rest, at + RLENGTH, 1)
-        active = id in known && following != "/" && (following != "." || substr(rest, at + RLENGTH + 1, 1) !~ /[A-Za-z0-9]/)
-        out = out substr(rest, 1, at - 1) substr(token, 1, slash - 1)
-        if (active && check && ref != "/%s") missing("/" id)
-        out = out (active && !check ? sprintf(ref, id) : "/" id)
-        rest = substr(rest, at + RLENGTH)
-      }
-      line = out rest
+      # Code filenames and explicitly repository-scoped references are literal; backticked skill calls still adapt.
+      if (!fence) line = spans(line)
       if (check) {
-        if (match(line, /mcp__[A-Za-z0-9_]+|CLAUDE_[A-Za-z0-9_]+|(^|[^A-Za-z0-9_.\/-])[.]claude([\/`[:space:]]|$)|\/ws-delphi|pull_request_read|playwright-cdp|GitHub MCP server|Claude Code|`delphi` mod/)) missing(substr(line, RSTART, RLENGTH))
+        rest = line
+        while (match(rest, /mcp__[A-Za-z0-9_]+|CLAUDE_[A-Za-z0-9_]+|(^|[^A-Za-z0-9_.\/-])[.]claude([\/`[:space:]]|$)|(~|\$HOME|\$\{HOME\})\/[.]claude([\/`[:space:]]|$)|\/ws-delphi|pull_request_read|playwright-cdp|GitHub MCP server|Claude Code|`delphi` mod|subagent_type[[:space:]]*=[[:space:]]*Explore|(^|[^A-Za-z0-9_])(WebFetch|ultrathink)([^A-Za-z0-9_]|$)|claude[[:space:]]+plugin[[:space:]]+install/)) {
+          missing(substr(rest, RSTART, RLENGTH)); rest = substr(rest, RSTART + RLENGTH)
+        }
       }
       print line
     }
diff --git a/ci/harnesses/codex.sh b/ci/harnesses/codex.sh
index b63cb06..9b58812 100644
--- a/ci/harnesses/codex.sh
+++ b/ci/harnesses/codex.sh
@@ -13,7 +13,7 @@ settings_file=''
 settings_generator=''
 bootstrap='exec'
 skill_ref='$%s'
-github_tool='PR-reading tool'
+github_tool='PR reader'
 github_integration='available authenticated GitHub integration'
 browser_tool='browser automation available in this harness'
 pane_guidance=drop
diff --git a/ci/render.sh b/ci/render.sh
index 385835f..39e53f3 100755
--- a/ci/render.sh
+++ b/ci/render.sh
@@ -37,7 +37,7 @@ if [ -z "$only" ]; then
 fi
 
 render_workspace() { # <workspace folder>: main keeps owned files; inherited output and ledger go to staging
-  local folder=$1 adapter out records meta path src seen="" used="" o parent protected_path settings_file plugins target=$output/$1
+  local folder=$1 adapter out records meta path src seen="" used="" o parent protected_path settings_file plugins skill_names target=$output/$1
   [ ! -e "$folder/$generated" ] || { bad "$folder/$generated: ownership records belong only on workspace branches"; return; }
   adapter=$(awk '/^harness:/ { print $2; exit }' "$folder/workspace.yml")
   harness_exists "$adapter" || { bad "$folder/workspace.yml: unknown harness '$adapter'"; return; }
@@ -48,6 +48,7 @@ render_workspace() { # <workspace folder>: main keeps owned files; inherited out
   fi
   out=$(optouts <"$folder/workspace.yml")
   records=$(inherited_files "$folder" "$adapter" "$out") || { bad "$folder: cannot resolve inherited sources"; return; }
+  skill_names=$(harness_skill_names "$adapter" "$folder" "$records" "$out") || return 1
   rm -rf "$target"
   mkdir -p "$target"
   : >"$tmp/records"
@@ -77,7 +78,7 @@ render_workspace() { # <workspace folder>: main keeps owned files; inherited out
       fi
     done
     mkdir -p "$(dirname "$target/$path")"
-    harness_file "$adapter" "$src" >"$target/$path"
+    harness_file "$adapter" "$src" "$skill_names" >"$target/$path"
     meta="${meta%% *} $(git hash-object -- "$target/$path")"
     if [ "${meta%% *}" = 100755 ]; then chmod +x "$target/$path"; fi
     printf '%s\t%s\t%s\n' "$meta" "$path" "$src" >>"$tmp/records"
diff --git a/docs/design.md b/docs/design.md
index d9abbc2..0bfee42 100644
--- a/docs/design.md
+++ b/docs/design.md
@@ -101,7 +101,12 @@ passes through unchanged. Each harness descriptor owns `translate_skill`: it con
 workspace identifiers and capability-specific bullets. Codex uses `$skill` calls and wraps literal
 `bash scripts/...` commands with `.delphi/exec.sh`. Claude identifiers are defined in its descriptor;
 non-Claude output with an unmapped identifier fails validation and names the target and source.
-Qualified code-repository paths stay literal. Helper scripts pass through unchanged.
+Qualified paths, code filenames and explicitly repository-scoped instruction references stay literal;
+standalone backticked skill calls still translate. Use a qualified path or code formatting for literal
+filenames; bare instruction names in prose refer to the workspace. Skill names come from that
+workspace's selected inheritance and owned native skills. Helper scripts pass through unchanged.
+Leak checks cover recognized Claude identifiers, report every hit and label translated-output line
+numbers; they do not establish that arbitrary tooling or prose is portable.
 
 `ci/render.sh [--check] [--workspace <folder>] [<main-checkout> [<staging-output>]]` updates plugin
 output by default. An optional staging destination receives inherited native files and ownership
diff --git a/tests/e2e.sh b/tests/e2e.sh
index 94c9c2c..fd9d04f 100644
--- a/tests/e2e.sh
+++ b/tests/e2e.sh
@@ -1342,6 +1342,8 @@ commit_on "ws/$CO" CLAUDE.md "old side" && commit_on "ws/$CN" .gitattributes "#
 ok "an old name with commits of its own is reported, never merged"
 
 # --- 13. portable harnesses: staged native output, round trips, transitions, bootstrap and authoring
+bash "$src/tests/harnesses.sh" >"$t/out" 2>"$t/err" || fail "harness regressions: $(cat "$t/out" "$t/err")"
+ok "harness translation preserves literal references, rejects known leaks and scopes skill names to the receiving workspace"
 frontmatter() { awk 'NR == 1 && /^---\r?$/ { front = 1; sub(/\r$/, ""); print; next } front { sub(/\r$/, ""); print; if (/^---$/) exit }'; }
 mkdir -p "$t/identifier-translation"
 cat >"$t/identifier-translation/SKILL.md" <<'IDENTIFIERS'
@@ -1355,7 +1357,7 @@ Use the GitHub MCP server's `pull_request_read` or mcp__github__pull_request_rea
 - Reworded pane explanation: `/ws-delphi` can switch.
 - Reworded reload explanation: the `delphi` mod handles `.claude/skills/`.
 IDENTIFIERS
-bash -c 'source "$1"; harness_file codex "$2"' _ "$src/ci/harnesses.sh" "$t/identifier-translation/SKILL.md" >"$t/identifier-translation/native.md"
+bash -c 'source "$1"; harness_file codex "$2" "commit open-pr"' _ "$src/ci/harnesses.sh" "$t/identifier-translation/SKILL.md" >"$t/identifier-translation/native.md"
 # shellcheck disable=SC2016 # native skill references are literal assertion text
 grep -qF 'Follow AGENTS.md; invoke `$commit` and $open-pr.' "$t/identifier-translation/native.md" || fail "native instruction and direct skill references"
 # shellcheck disable=SC2016 # native skill references are literal assertion text
diff --git a/tests/harnesses.sh b/tests/harnesses.sh
new file mode 100644
index 0000000..9af8ab0
--- /dev/null
+++ b/tests/harnesses.sh
@@ -0,0 +1,98 @@
+#!/usr/bin/env bash
+# Focused translation regressions; runs without GitHub, a model or changes to the checkout.
+set -euo pipefail
+src=$(cd "$(dirname "$0")/.." && pwd)
+t=$(mktemp -d)
+trap 'rm -rf "$t"' EXIT
+fail() { echo "FAIL - $*" >&2; exit 1; }
+header() { printf '%s\n' '---' 'name: fixture' 'description: Translation fixture.' '---'; }
+render() { bash -euo pipefail -c 'source "$1"; harness_file "$2" "$3" "commit open-pr"' _ "$src/ci/harnesses.sh" "$1" "$t/SKILL.md"; }
+
+cat >"$t/body.md" <<'SOURCE'
+Read the code repo's CLAUDE.md; follow workspace CLAUDE.md.
+Read CLAUDE.md from the repository.
+Read the repository's own CLAUDE.md.
+Keep `CLAUDE.md` and `grep -n rules CLAUDE.md` literal.
+Keep ``printf '`CLAUDE.md`'`` literal; invoke ``/commit``.
+Keep src/CLAUDE.md, ./CLAUDE.md, CLAUDE.md.backup and _CLAUDE.md.
+Keep /tmp/commit, /tmp/open-pr, /commit.txt and /commit/README.
+Keep https://example.invalid/commit and `cat /commit` literal.
+Invoke /commit and (/open-pr); then `/commit`.
+```sh
+grep -n rules CLAUDE.md
+cat /commit
+```
+~~~~sh
+cat CLAUDE.md
+```
+~~~~
+Use the pull_request_read tool.
+Use slack_send_message if that integration is available.
+SOURCE
+cat >"$t/expected.md" <<'NATIVE'
+Read the code repo's CLAUDE.md; follow workspace AGENTS.md.
+Read CLAUDE.md from the repository.
+Read the repository's own CLAUDE.md.
+Keep `CLAUDE.md` and `grep -n rules CLAUDE.md` literal.
+Keep ``printf '`CLAUDE.md`'`` literal; invoke ``$commit``.
+Keep src/CLAUDE.md, ./CLAUDE.md, CLAUDE.md.backup and _CLAUDE.md.
+Keep /tmp/commit, /tmp/open-pr, /commit.txt and /commit/README.
+Keep https://example.invalid/commit and `cat /commit` literal.
+Invoke $commit and ($open-pr); then `$commit`.
+```sh
+grep -n rules CLAUDE.md
+cat /commit
+```
+~~~~sh
+cat CLAUDE.md
+```
+~~~~
+Use the PR reader tool.
+Use slack_send_message if that integration is available.
+NATIVE
+{ header; cat "$t/body.md"; } >"$t/SKILL.md"
+render codex >"$t/native.md"
+tail -n "$(wc -l <"$t/body.md")" "$t/native.md" >"$t/actual.md"
+cmp -s "$t/expected.md" "$t/actual.md" || fail "literal references or native skill calls changed: $(diff -u "$t/expected.md" "$t/actual.md")"
+render claude-code | cmp -s - "$t/SKILL.md" || fail "Claude source bytes changed"
+echo 'ok - literal filenames, paths and commands survive; native skill calls and PR-tool wording translate'
+
+while IFS= read -r identifier; do
+  { header; printf 'Use %s.\n' "$identifier"; } >"$t/SKILL.md"
+  if render codex >"$t/native.md" 2>"$t/errors"; then fail "accepted known Claude identifier: $identifier"; fi
+  grep -qF 'missing Claude mapping' "$t/errors" || fail "no mapping diagnostic: $identifier"
+  grep -qF '(translated line ' "$t/errors" || fail "misleading source line number: $identifier"
+done <<'IDENTIFIERS'
+~/.claude/settings.json
+$HOME/.claude/CLAUDE.md
+${HOME}/.claude/CLAUDE.md
+subagent_type=Explore
+WebFetch
+claude plugin install
+ultrathink
+IDENTIFIERS
+{ header; echo 'Use Claude Code and mcp__unmapped__action.'; } >"$t/SKILL.md"
+if render codex >"$t/native.md" 2>"$t/errors"; then fail 'accepted unmapped identifiers'; fi
+[ "$(grep -c 'missing Claude mapping' "$t/errors")" = 2 ] || fail 'diagnostics omitted a hit on the same line'
+number=$(sed -n '1s/.*(translated line \([0-9]*\)).*/\1/p' "$t/errors")
+sed -n "${number}p" "$t/native.md" | grep -qF 'Claude Code and mcp__unmapped__action' || fail 'translated line number points at the wrong line'
+echo 'ok - known Claude paths and tools fail with every hit and accurate translated-line diagnostics'
+
+# Exercise the real renderer, including owned skills and opt-outs, rather than injecting a catalog.
+d=$t/main folder=software/project/workspaces/native
+mkdir -p "$d/$folder/.agents/skills/local" "$d/software/project/workspace-inherit/.claude/skills/commit" \
+  "$d/software/project/workspace-inherit/.claude/skills/retired"
+cp -R "$src/ci" "$d/"
+printf 'name: s.project.native\nharness: codex\nopt-out:\n  - .agents/skills/retired\n' >"$d/$folder/workspace.yml"
+{ header; echo 'Invoke /commit, /local, /review, /plugin and /retired.'; } >"$d/software/project/workspace-inherit/.claude/skills/commit/SKILL.md"
+header >"$d/software/project/workspace-inherit/.claude/skills/retired/SKILL.md"
+header >"$d/$folder/.agents/skills/local/SKILL.md"
+bash "$d/ci/render.sh" --workspace "$folder" "$d" "$t/before"
+mkdir -p "$d/software/elsewhere/workspaces/other/.claude/skills/review" "$d/software/plugins/claude/extra/skills/plugin"
+header >"$d/software/elsewhere/workspaces/other/.claude/skills/review/SKILL.md"
+header >"$d/software/plugins/claude/extra/skills/plugin/SKILL.md"
+bash "$d/ci/render.sh" --workspace "$folder" "$d" "$t/after"
+diff -qr "$t/before" "$t/after" >/dev/null || fail 'unrelated skills changed native output'
+# shellcheck disable=SC2016 # native skill syntax is literal assertion text
+grep -qF 'Invoke $commit, $local, /review, /plugin and /retired.' "$t/after/$folder/.agents/skills/commit/SKILL.md" || fail 'workspace skill catalog omitted available skills or included unrelated/excluded ones'
+echo 'ok - workspace rendering scopes names to selected inherited and owned native skills'
diff --git a/tools/new-workspace.sh b/tools/new-workspace.sh
index 6da8961..d50aa2b 100755
--- a/tools/new-workspace.sh
+++ b/tools/new-workspace.sh
@@ -46,13 +46,17 @@ mkdir -p "$(dirname "$wt/$folder/$instruction")"
 { [ -z "$instruction_base" ] || cat "$wt/$instruction_base"; cat "$wt/$instruction_template"; } >"$wt/$folder/$instruction"
 if [ -d "$defaults" ]; then
   records=$(cd "$wt" && bundle_files "software/$org/workspace-defaults" "$adapter") || die "cannot read project defaults"
+  exclusions=''
+  [ ! -f "$defaults/workspace.yml" ] || exclusions=$(optouts <"$defaults/workspace.yml")
+  inherited=$(cd "$wt" && inherited_files "$folder" "$adapter" "$exclusions") || die "cannot read inherited sources"
+  skill_names=$(harness_skill_names "$adapter" "$wt/$folder" "$records"$'\n'"$inherited" "$exclusions")
   while IFS=$'\t' read -r meta path src; do
     [ -n "$path" ] || continue
     if [ "$path" = "$instruction" ]; then
       { echo; cat "$wt/$src"; } >>"$wt/$folder/$instruction"
     else
       mkdir -p "$(dirname "$wt/$folder/$path")"
-      harness_file "$adapter" "$wt/$src" >"$wt/$folder/$path"
+      harness_file "$adapter" "$wt/$src" "$skill_names" >"$wt/$folder/$path"
       [ "${meta%% *}" != 100755 ] || chmod +x "$wt/$folder/$path"
     fi
   done <<<"$records"

From 08ea3279f1691eba0be83d03bdac9d0a4f9ed57a Mon Sep 17 00:00:00 2001
From: Jesus God <wyattbracy@gmail.com>
Date: Wed, 28 Oct 2026 12:14:05 +0000
Subject: [PATCH 18/18] Remove prose heuristics from instruction reference
 translation

---
 ci/harnesses/claude-code.sh | 9 ++-------
 docs/design.md              | 6 +++---
 tests/harnesses.sh          | 6 +++---
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/ci/harnesses/claude-code.sh b/ci/harnesses/claude-code.sh
index d7d5e22..af39a79 100644
--- a/ci/harnesses/claude-code.sh
+++ b/ci/harnesses/claude-code.sh
@@ -39,17 +39,12 @@ claude_identifiers() { # [check]: Claude's identifier contract, shared by target
       }
       return out s
     }
-    function repository_file(s, at, before, after) {
-      before = tolower(substr(s, 1, at - 1)); after = tolower(substr(s, at + 9))
-      return before ~ /(^|[^a-z])(repo|repository|worktree)(\047s|[ -]local)?([[:space:]]+own)?[[:space:]]*$/ ||
-        after ~ /^[[:space:]]+(in|from|of)[[:space:]]+(the[[:space:]]+)?(code[[:space:]]+)?(repo|repository|worktree)([^a-z]|$)/
-    }
     function refs(s, code, start, at, size, before, after, id, active, out) {
       start = 1
       while (!code && match(substr(s, start), /CLAUDE[.]md/)) {
         at = start + RSTART - 1; before = substr(s, at - 1, 1); after = substr(s, at + 9, 1)
         active = (at == 1 || before !~ /[A-Za-z0-9_.\/-]/) && after !~ /[A-Za-z0-9_\/-]/ &&
-          (after != "." || substr(s, at + 10, 1) !~ /[A-Za-z0-9]/) && !repository_file(s, at)
+          (after != "." || substr(s, at + 10, 1) !~ /[A-Za-z0-9]/)
         out = out substr(s, start, at - start)
         if (active && check && instruction != "CLAUDE.md") missing("CLAUDE.md")
         out = out (active && !check ? instruction : "CLAUDE.md"); start = at + 9
@@ -111,7 +106,7 @@ claude_identifiers() { # [check]: Claude's identifier contract, shared by target
         }
         line = native_skills(line)
       }
-      # Code filenames and explicitly repository-scoped references are literal; backticked skill calls still adapt.
+      # Code filenames and qualified paths are literal; backticked skill calls still adapt.
       if (!fence) line = spans(line)
       if (check) {
         rest = line
diff --git a/docs/design.md b/docs/design.md
index 0bfee42..40f6479 100644
--- a/docs/design.md
+++ b/docs/design.md
@@ -101,9 +101,9 @@ passes through unchanged. Each harness descriptor owns `translate_skill`: it con
 workspace identifiers and capability-specific bullets. Codex uses `$skill` calls and wraps literal
 `bash scripts/...` commands with `.delphi/exec.sh`. Claude identifiers are defined in its descriptor;
 non-Claude output with an unmapped identifier fails validation and names the target and source.
-Qualified paths, code filenames and explicitly repository-scoped instruction references stay literal;
-standalone backticked skill calls still translate. Use a qualified path or code formatting for literal
-filenames; bare instruction names in prose refer to the workspace. Skill names come from that
+Qualified paths and filenames in inline or fenced code stay literal; standalone backticked skill
+calls still translate. Bare instruction names in prose always map to the target instruction file.
+Use a qualified path for a code repository's own file. Skill names come from that
 workspace's selected inheritance and owned native skills. Helper scripts pass through unchanged.
 Leak checks cover recognized Claude identifiers, report every hit and label translated-output line
 numbers; they do not establish that arbitrary tooling or prose is portable.
diff --git a/tests/harnesses.sh b/tests/harnesses.sh
index 9af8ab0..5fa8d91 100644
--- a/tests/harnesses.sh
+++ b/tests/harnesses.sh
@@ -30,9 +30,9 @@ Use the pull_request_read tool.
 Use slack_send_message if that integration is available.
 SOURCE
 cat >"$t/expected.md" <<'NATIVE'
-Read the code repo's CLAUDE.md; follow workspace AGENTS.md.
-Read CLAUDE.md from the repository.
-Read the repository's own CLAUDE.md.
+Read the code repo's AGENTS.md; follow workspace AGENTS.md.
+Read AGENTS.md from the repository.
+Read the repository's own AGENTS.md.
 Keep `CLAUDE.md` and `grep -n rules CLAUDE.md` literal.
 Keep ``printf '`CLAUDE.md`'`` literal; invoke ``$commit``.
 Keep src/CLAUDE.md, ./CLAUDE.md, CLAUDE.md.backup and _CLAUDE.md.