diff --git a/.codex/config.toml b/.codex/config.toml
new file mode 100644
index 00000000..2d9c7822
--- /dev/null
+++ b/.codex/config.toml
@@ -0,0 +1,8 @@
+developer_instructions = """
+For this repository, the default execution mode is worktree-first and concurrency-friendly.
+
+- For non-trivial implementation or debugging tasks, start from `main`, create a temporary git worktree, and do the task in that isolated worktree.
+- When tasks have independent side work, split them into concurrent lanes while keeping the main agent on the critical path.
+- When the task is complete, verify the change, merge back to `main`, and clean up the temporary worktree.
+- Do not repeatedly ask the user to re-enable this workflow for this repository unless they explicitly override it.
+"""
diff --git a/.codex/skills/xworkmate-worktree-task-mode/SKILL.md b/.codex/skills/xworkmate-worktree-task-mode/SKILL.md
new file mode 100644
index 00000000..2d694876
--- /dev/null
+++ b/.codex/skills/xworkmate-worktree-task-mode/SKILL.md
@@ -0,0 +1,32 @@
+---
+name: xworkmate-worktree-task-mode
+description: Default XWorkmate task execution mode: create an isolated git worktree, use parallel lanes for bounded independent work, verify, merge to main, and clean up.
+---
+
+# XWorkmate Worktree Task Mode
+
+Use this skill as the default execution path for non-trivial work in this repository.
+
+## Goals
+
+- Keep the main checkout clean.
+- Isolate implementation in a temporary worktree created from `main`.
+- Use concurrent lanes only when the subtasks are genuinely independent.
+- Finish the lifecycle: verify, merge back to `main`, remove the temporary worktree.
+
+## Default Flow
+
+1. Inspect the current repo state from the main checkout.
+2. Create a temporary branch and `git worktree` from `main`.
+3. Do the critical-path implementation locally in the worktree.
+4. If helpful, delegate bounded side work in parallel, but avoid blocking the main lane on exploratory tasks.
+5. Run the smallest relevant verification first, then broader checks when needed.
+6. Merge the finished branch back into `main`.
+7. Remove the temporary worktree and branch if they are no longer needed.
+
+## Guardrails
+
+- Do not use a worktree for tiny read-only or one-command tasks unless it materially helps.
+- Do not ask the user to re-confirm this mode on every task; it is the repo default.
+- Do not leave temporary worktrees behind after the task is complete unless the user explicitly wants that.
+- Preserve user changes and do not revert unrelated work.
diff --git a/AGENTS.md b/AGENTS.md
index bb6a8105..e74cc656 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -2,6 +2,14 @@
 
 - Use `xworkmate-secure-development` for any change that touches gateway auth, `.env`, secure storage, tokens, passwords, TLS, file upload, native entitlements, packaging, or release-sensitive settings.
 - Use `xworkmate-acceptance` before claiming build, packaging, installation, or release readiness for this repo.
+- For non-trivial implementation work, default to the repo skill `xworkmate-worktree-task-mode` and follow its worktree-first execution flow without asking the user to restate that preference each time.
+
+## Default Task Mode
+
+- Default to an isolated `git worktree` for non-trivial tasks. Create the worktree from `main`, do the work there, merge back to `main`, then remove the temporary worktree when done.
+- Default to concurrent execution for independent sub-tasks. Keep the main agent on the critical path and use parallel lanes only for bounded side work that does not block the next local step.
+- Do not repeatedly ask whether worktree mode or concurrent execution should be used for this repo; treat that as the default unless the user explicitly asks for a different flow.
+- Keep the branch/worktree lifecycle explicit: inspect, implement, verify, merge, clean up.
 
 ## Security Rules
 
diff --git a/CodexBar b/CodexBar
index aeb24955..d6dfa8c5 160000
--- a/CodexBar
+++ b/CodexBar
@@ -1 +1 @@
-Subproject commit aeb24955bb3a42bc12e7f40960593b7c46874f2c
+Subproject commit d6dfa8c5fb7f564903b855ac4049e0c6ddd60c81