diff --git a/docs/specifications/cli/CLI-SPEC.md b/docs/specifications/cli/CLI-SPEC.md
index d58bad00..28969993 100644
--- a/docs/specifications/cli/CLI-SPEC.md
+++ b/docs/specifications/cli/CLI-SPEC.md
@@ -152,9 +152,9 @@ taskplane/                              ← npm package root (= repo root)
     "templates/"
   ],
   "peerDependencies": {
-    "@mariozechner/pi-coding-agent": "*",
-    "@mariozechner/pi-tui": "*",
-    "@mariozechner/pi-ai": "*",
+    "@earendil-works/pi-coding-agent": "*",
+    "@earendil-works/pi-tui": "*",
+    "@earendil-works/pi-ai": "*",
     "@sinclair/typebox": "*"
   },
   "dependencies": {
@@ -949,9 +949,9 @@ Clear ownership prevents upgrade conflicts:
 
 | Dependency | Range | Purpose |
 |---|---|---|
-| `@mariozechner/pi-coding-agent` | `*` | Pi extension runtime |
-| `@mariozechner/pi-tui` | `*` | TUI components for widgets |
-| `@mariozechner/pi-ai` | `*` | AI utilities (StringEnum) |
+| `@earendil-works/pi-coding-agent` | `*` | Pi extension runtime |
+| `@earendil-works/pi-tui` | `*` | TUI components for widgets |
+| `@earendil-works/pi-ai` | `*` | AI utilities (StringEnum) |
 | `@sinclair/typebox` | `*` | Schema definitions for tool parameters |
 
 ### Dev
diff --git a/docs/specifications/framework/33-parallel-task-orchestrator.md b/docs/specifications/framework/33-parallel-task-orchestrator.md
index 10d54cc3..c02bdd69 100644
--- a/docs/specifications/framework/33-parallel-task-orchestrator.md
+++ b/docs/specifications/framework/33-parallel-task-orchestrator.md
@@ -1606,7 +1606,7 @@ sudo dnf install git tmux
 sudo pacman -S git tmux
 
 # Pi (via npm)
-npm install -g @mariozechner/pi-coding-agent
+npm install -g @earendil-works/pi-coding-agent
 ```
 
 TMUX and Git are standard packages on all major Linux distributions.
@@ -1619,7 +1619,7 @@ No special configuration needed.
 brew install git tmux
 
 # Pi
-npm install -g @mariozechner/pi-coding-agent
+npm install -g @earendil-works/pi-coding-agent
 ```
 
 macOS ships with Git, but the Homebrew version is typically newer.
@@ -1668,7 +1668,7 @@ Key facts about Git Bash TMUX:
 ```bash
 # Inside WSL:
 sudo apt install tmux git
-npm install -g @mariozechner/pi-coding-agent
+npm install -g @earendil-works/pi-coding-agent
 ```
 
 WSL works but introduces filesystem boundary considerations:
diff --git a/docs/specifications/taskplane/code-quality-gates.md b/docs/specifications/taskplane/code-quality-gates.md
index 45f71508..70532ff0 100644
--- a/docs/specifications/taskplane/code-quality-gates.md
+++ b/docs/specifications/taskplane/code-quality-gates.md
@@ -73,7 +73,7 @@ It slipped through:
 
 ```json
 {
-  "// NOTE": "Pi extensions are runtime-transpiled by pi's bundler. This tsconfig is for editor/CI type-checking only. Full tsc --noEmit will report module resolution errors for @mariozechner/* packages (globally installed, not in node_modules).",
+  "// NOTE": "Pi extensions are runtime-transpiled by pi's bundler. This tsconfig is for editor/CI type-checking only. Full tsc --noEmit will report module resolution errors for @earendil-works/* packages — and legacy @mariozechner/* aliases retained for back-compat — because pi packages are globally installed (not in node_modules). See extensions/tsconfig.ci.json for the CI variant that adds pi-shims path mappings.",
   "compilerOptions": {
     "target": "ES2022",
     "module": "ESNext",
@@ -93,7 +93,7 @@ It slipped through:
 
 1. The pi packages (`@earendil-works/pi-coding-agent`, `@earendil-works/pi-ai`, `@earendil-works/pi-tui` — and legacy `@mariozechner/*`) are NOT in `node_modules`. They live at `npm root -g/<scope>/<pkg>` and are aliased at runtime by Pi's extension loader. `tsc --noEmit` cannot resolve them.
 2. `include: ["task-orchestrator.ts"]` only covers ONE entry point. The reviewer extension and the rest of `extensions/taskplane/` are excluded from typecheck scope today.
-3. The `// NOTE` comment in this file is **stale** — it still references `@mariozechner/*` only, even though the canonical scope is now `@earendil-works/*` (per issue #560 and Pi v0.74.0). This is a historical reference, not the current canonical scope. **TP-191 will refresh the comment** as part of the tsconfig modernization.
+3. ~~The `// NOTE` comment in this file is **stale** — it still references `@mariozechner/*` only, even though the canonical scope is now `@earendil-works/*` (per issue #560 and Pi v0.74.0). This is a historical reference, not the current canonical scope. **TP-191 will refresh the comment** as part of the tsconfig modernization.~~ **(Addressed 2026-06-17:** the comment now mentions both scopes — `@earendil-works/*` as canonical, `@mariozechner/*` as legacy back-compat — and points readers at `tsconfig.ci.json` for the CI-shim path mappings. This was overlooked during the TP-191 implementation and folded into a follow-up cleanup pass.**)**
 
 ### 4.2 `extensions/tsconfig.test.json`
 
diff --git a/extensions/tsconfig.json b/extensions/tsconfig.json
index 981f08e2..31dde3bd 100644
--- a/extensions/tsconfig.json
+++ b/extensions/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "// NOTE": "Pi extensions are runtime-transpiled by pi's bundler. This tsconfig is for editor/CI type-checking only. Full tsc --noEmit will report module resolution errors for @mariozechner/* packages (globally installed, not in node_modules).",
+  "// NOTE": "Pi extensions are runtime-transpiled by pi's bundler. This tsconfig is for editor/CI type-checking only. Full tsc --noEmit will report module resolution errors for @earendil-works/* packages — and legacy @mariozechner/* aliases retained for back-compat — because pi packages are globally installed (not in node_modules). See extensions/tsconfig.ci.json for the CI variant that adds pi-shims path mappings.",
   "compilerOptions": {
     "target": "ES2022",
     "module": "ESNext",