gsd-pi 2.78.1-dev.84a383f51 → 2.78.1

package/src/resources/extensions/gsd/worktree-command.ts

@@ -33,21 +33,29 @@ import { inferCommitType } from "./git-service.js";
 import type { FileLineStat } from "./worktree-manager.js";
 import { existsSync, realpathSync, readdirSync, rmSync, unlinkSync } from "node:fs";
 import { nativeMergeAbort } from "./native-git-bridge.js";
-import { join } from "node:path";
-import {
-  clearWorktreeOriginalCwd,
-  ensureWorktreeOriginalCwdFromPath,
-  getActiveWorktreeName,
-  getWorktreeOriginalCwd,
-  setWorktreeOriginalCwd,
-} from "./worktree-session-state.js";
-
-export { getActiveWorktreeName, getWorktreeOriginalCwd } from "./worktree-session-state.js";
+import { join, sep } from "node:path";
 
 /**
  * Tracks the original project root so we can switch back.
  * Set when we first chdir into a worktree, cleared on return.
  */
+let originalCwd: string | null = null;
+
+/** Get the original project root if currently in a worktree, or null. */
+export function getWorktreeOriginalCwd(): string | null {
+  return originalCwd;
+}
+
+/** Get the name of the active worktree, or null if not in one. */
+export function getActiveWorktreeName(): string | null {
+  if (!originalCwd) return null;
+  const cwd = process.cwd();
+  const wtDir = join(originalCwd, ".gsd", "worktrees");
+  if (!cwd.startsWith(wtDir)) return null;
+  const rel = cwd.slice(wtDir.length + 1);
+  const name = rel.split("/")[0] ?? rel.split("\\")[0];
+  return name || null;
+}
 
 // ─── Shared completions and handler (used by both /worktree and /wt) ────────
 
@@ -137,7 +145,7 @@ async function worktreeHandler(
       return;
     }
     // create and switch both do the same thing: switch if exists, create if not
-    const mainBase = getWorktreeOriginalCwd() ?? basePath;
+    const mainBase = originalCwd ?? basePath;
     const existing = listWorktrees(mainBase);
     if (existing.some(wt => wt.name === name)) {
       await handleSwitch(basePath, name, ctx);
@@ -149,7 +157,7 @@ async function worktreeHandler(
 
   if (trimmed === "merge" || trimmed.startsWith("merge ")) {
     const mergeArgs = trimmed.replace(/^merge\s*/, "").trim().split(/\s+/).filter(Boolean);
-    const mainBase = getWorktreeOriginalCwd() ?? basePath;
+    const mainBase = originalCwd ?? basePath;
     const activeWt = getActiveWorktreeName();
 
     if (mergeArgs.length === 0) {
@@ -183,7 +191,7 @@ async function worktreeHandler(
 
   if (trimmed === "remove" || trimmed.startsWith("remove ")) {
     const name = trimmed.replace(/^remove\s*/, "").trim();
-    const mainBase = getWorktreeOriginalCwd() ?? basePath;
+    const mainBase = originalCwd ?? basePath;
 
     if (name === "all") {
       await handleRemoveAll(mainBase, ctx);
@@ -205,7 +213,7 @@ async function worktreeHandler(
     return;
   }
 
-  const mainBase = getWorktreeOriginalCwd() ?? basePath;
+  const mainBase = originalCwd ?? basePath;
   const nameOnly = trimmed.split(/\s+/)[0]!;
   if (trimmed !== nameOnly) {
     ctx.ui.notify(`Unknown command. Did you mean /${alias} switch ${nameOnly}?`, "warning");
@@ -233,7 +241,14 @@ export function registerWorktreeCommand(pi: ExtensionAPI): void {
   // Restore worktree state after /reload.
   // The module-level originalCwd resets to null when extensions are re-loaded,
   // but process.cwd() is still inside the worktree. Detect this and recover.
-  ensureWorktreeOriginalCwdFromPath();
+  if (!originalCwd) {
+    const cwd = process.cwd();
+    const marker = `${sep}.gsd${sep}worktrees${sep}`;
+    const markerIdx = cwd.indexOf(marker);
+    if (markerIdx !== -1) {
+      originalCwd = cwd.slice(0, markerIdx);
+    }
+  }
 
   pi.registerCommand("worktree", {
     description: "Git worktrees (also /wt): /worktree <name> | list | merge | remove",
@@ -305,7 +320,7 @@ async function handleCreate(
     const commitMsg = autoCommitCurrentBranch(basePath, "worktree-switch", name);
 
     // Create from the main tree, not from inside another worktree
-    const mainBase = getWorktreeOriginalCwd() ?? basePath;
+    const mainBase = originalCwd ?? basePath;
     const info = createWorktree(mainBase, name);
 
     // Run user-configured post-create hook (#597) — e.g. copy .env, symlink assets
@@ -315,7 +330,7 @@ async function handleCreate(
     }
 
     // Track original cwd before switching
-    if (!getWorktreeOriginalCwd()) setWorktreeOriginalCwd(basePath);
+    if (!originalCwd) originalCwd = basePath;
 
     const prevCwd = process.cwd();
     process.chdir(info.path);
@@ -375,7 +390,7 @@ async function handleSwitch(
   ctx: ExtensionCommandContext,
 ): Promise<void> {
   try {
-    const mainBase = getWorktreeOriginalCwd() ?? basePath;
+    const mainBase = originalCwd ?? basePath;
     const wtPath = worktreePath(mainBase, name);
 
     if (!existsSync(wtPath)) {
@@ -390,7 +405,7 @@ async function handleSwitch(
     const commitMsg = autoCommitCurrentBranch(basePath, "worktree-switch", name);
 
     // Track original cwd before switching
-    if (!getWorktreeOriginalCwd()) setWorktreeOriginalCwd(basePath);
+    if (!originalCwd) originalCwd = basePath;
 
     const prevCwd = process.cwd();
     process.chdir(wtPath);
@@ -418,7 +433,6 @@ async function handleSwitch(
 }
 
 async function handleReturn(ctx: ExtensionCommandContext): Promise<void> {
-  const originalCwd = getWorktreeOriginalCwd();
   if (!originalCwd) {
     ctx.ui.notify("Already in the main project tree.", "info");
     return;
@@ -428,7 +442,7 @@ async function handleReturn(ctx: ExtensionCommandContext): Promise<void> {
   const commitMsg = autoCommitCurrentBranch(process.cwd(), "worktree-return", "worktree");
 
   const returnTo = originalCwd;
-  clearWorktreeOriginalCwd();
+  originalCwd = null;
 
   const prevCwd = process.cwd();
   process.chdir(returnTo);
@@ -490,7 +504,7 @@ async function handleList(
   ctx: ExtensionCommandContext,
 ): Promise<void> {
   try {
-    const mainBase = getWorktreeOriginalCwd() ?? basePath;
+    const mainBase = originalCwd ?? basePath;
     const worktrees = listWorktrees(mainBase);
 
     if (worktrees.length === 0) {
@@ -538,7 +552,6 @@ async function handleList(
       lines.push("");
     }
 
-    const originalCwd = getWorktreeOriginalCwd();
     if (originalCwd) {
       lines.push(`  ${CLR.label("main tree")}  ${CLR.path(originalCwd)}`);
     }
@@ -638,11 +651,11 @@ async function handleMerge(
 
     // Switch to the main tree before merging.
     // Must be on the main branch to run git merge --squash.
-    if (getWorktreeOriginalCwd()) {
+    if (originalCwd) {
       const prevCwd = process.cwd();
       process.chdir(basePath);
       nudgeGitBranchCache(prevCwd);
-      clearWorktreeOriginalCwd();
+      originalCwd = null;
     }
 
     // --- Deterministic merge path (preferred) ---
@@ -741,7 +754,7 @@ async function handleRemove(
   ctx: ExtensionCommandContext,
 ): Promise<void> {
   try {
-    const mainBase = getWorktreeOriginalCwd() ?? basePath;
+    const mainBase = originalCwd ?? basePath;
 
     // Validate the worktree exists before attempting removal
     const worktrees = listWorktrees(mainBase);
@@ -766,9 +779,9 @@ async function handleRemove(
     removeWorktree(mainBase, name, { deleteBranch: true });
 
     // If we were in that worktree, removeWorktree chdir'd us out — clear tracking
-    if (getWorktreeOriginalCwd() && process.cwd() !== prevCwd) {
+    if (originalCwd && process.cwd() !== prevCwd) {
       nudgeGitBranchCache(prevCwd);
-      clearWorktreeOriginalCwd();
+      originalCwd = null;
     }
 
     ctx.ui.notify(`${CLR.ok("✓")} Worktree ${CLR.name(name)} removed ${CLR.muted("(branch deleted)")}.`, "info");
@@ -783,7 +796,7 @@ async function handleRemoveAll(
   ctx: ExtensionCommandContext,
 ): Promise<void> {
   try {
-    const mainBase = getWorktreeOriginalCwd() ?? basePath;
+    const mainBase = originalCwd ?? basePath;
     const worktrees = listWorktrees(mainBase);
 
     if (worktrees.length === 0) {
@@ -817,9 +830,9 @@ async function handleRemoveAll(
     }
 
     // If we were in a worktree that got removed, clear tracking
-    if (getWorktreeOriginalCwd() && process.cwd() !== prevCwd) {
+    if (originalCwd && process.cwd() !== prevCwd) {
       nudgeGitBranchCache(prevCwd);
-      clearWorktreeOriginalCwd();
+      originalCwd = null;
     }
 
     const lines: string[] = [];

package/src/resources/extensions/mcp-client/index.ts

@@ -2,8 +2,7 @@
  * MCP Client Extension — Native MCP server integration for pi
  *
  * Provides on-demand access to MCP servers configured in project files
- * (.mcp.json, .gsd/mcp.json) and the global ~/.gsd/mcp.json (or
- * $GSD_HOME/mcp.json) using the @modelcontextprotocol/sdk Client
+ * (.mcp.json, .gsd/mcp.json) using the @modelcontextprotocol/sdk Client
  * directly — no external CLI dependency required.
  *
  * Three tools:
@@ -25,7 +24,6 @@ import { Client } from "@modelcontextprotocol/sdk/client";
 import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
 import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
 import { readFileSync, existsSync } from "node:fs";
-import { homedir } from "node:os";
 import { join } from "node:path";
 import { buildHttpTransportOpts } from "./auth.js";
 import type { McpHttpAuthConfig } from "./auth.js";
@@ -104,7 +102,6 @@ function readConfigs(): McpServerConfig[] {
 	const configPaths = [
 		join(process.cwd(), ".mcp.json"),
 		join(process.cwd(), ".gsd", "mcp.json"),
-		join(process.env.GSD_HOME || join(homedir(), ".gsd"), "mcp.json"),
 	];
 
 	for (const configPath of configPaths) {
@@ -324,7 +321,7 @@ async function closeAll(): Promise<void> {
 // ─── Formatters ───────────────────────────────────────────────────────────────
 
 function formatServerList(servers: McpServerConfig[]): string {
-	if (servers.length === 0) return "No MCP servers configured. Add servers to .mcp.json, .gsd/mcp.json, or $GSD_HOME/mcp.json (default: ~/.gsd/mcp.json).";
+	if (servers.length === 0) return "No MCP servers configured. Add servers to .mcp.json or .gsd/mcp.json.";
 
 	const lines: string[] = [`${servers.length} MCP servers configured:\n`];
 
@@ -387,7 +384,7 @@ export default function (pi: ExtensionAPI) {
 		name: "mcp_servers",
 		label: "MCP Servers",
 		description:
-			"List all available MCP servers configured in project files (.mcp.json, .gsd/mcp.json) or globally ($GSD_HOME/mcp.json, default: ~/.gsd/mcp.json). " +
+			"List all available MCP servers configured in project files (.mcp.json, .gsd/mcp.json). " +
 			"Shows server names, transport type, and connection status. Use mcp_discover to get full tool schemas for a server.",
 		promptSnippet:
 			"List available MCP servers from project configuration",

package/src/resources/extensions/slash-commands/create-extension.ts

@@ -221,38 +221,41 @@ function sendPrompt(description: string, result: RoundResult, pi: ExtensionAPI):
 		: "";
 
 	const docHints: string[] = [
-		"- `docs/extension-sdk/README.md` — overview, quick start, directory layout",
-		"- `docs/extension-sdk/api-reference.md` — ExtensionAPI and ExtensionContext surfaces",
-		"- `docs/extension-sdk/building-extensions.md` — tools, commands, events, UI, state",
-		"- `docs/extension-sdk/rules.md` — non-negotiable rules and gotchas",
+		"- `~/.gsd/agent/docs/extending-pi/01-what-are-extensions.md` — capabilities overview",
+		"- `~/.gsd/agent/docs/extending-pi/03-getting-started.md` — minimal extension, hot reload",
+		"- `~/.gsd/agent/docs/extending-pi/08-extensioncontext-what-you-can-access.md` — ExtensionContext API",
+		"- `~/.gsd/agent/docs/extending-pi/09-extensionapi-what-you-can-do.md` — ExtensionAPI: registration, messaging",
+		"- `~/.gsd/agent/docs/extending-pi/22-key-rules-gotchas.md` — must-read rules before shipping",
 	];
 
 	if (uiSelected.includes("custom component")) {
-		docHints.push("- `docs/extension-sdk/building-extensions.md#custom-components` — ctx.ui.custom() API");
-		docHints.push("- `docs/dev/pi-ui-tui/06-ctx-ui-custom-full-custom-components.md` — step-by-step component guide");
-		docHints.push("- `docs/dev/pi-ui-tui/07-built-in-components-the-building-blocks.md` — Text, Box, SelectList");
-		docHints.push("- `docs/dev/pi-ui-tui/09-keyboard-input-how-to-handle-keys.md` — Key, matchesKey");
-		docHints.push("- `docs/dev/pi-ui-tui/10-line-width-the-cardinal-rule.md` — truncation, width rules");
+		docHints.push("- `~/.gsd/agent/docs/extending-pi/12-custom-ui-visual-components.md` — dialogs, widgets, overlays");
+		docHints.push("- `~/.gsd/agent/docs/pi-ui-tui/06-ctx-ui-custom-full-custom-components.md` — ctx.ui.custom() API");
+		docHints.push("- `~/.gsd/agent/docs/pi-ui-tui/07-built-in-components-the-building-blocks.md` — Text, Box, SelectList");
+		docHints.push("- `~/.gsd/agent/docs/pi-ui-tui/09-keyboard-input-how-to-handle-keys.md` — Key, matchesKey");
+		docHints.push("- `~/.gsd/agent/docs/pi-ui-tui/10-line-width-the-cardinal-rule.md` — truncation, width rules");
+		docHints.push("- `~/.gsd/agent/docs/pi-ui-tui/19-building-a-complete-component-step-by-step.md` — step-by-step guide");
+		docHints.push("- `~/.gsd/agent/docs/pi-ui-tui/21-common-mistakes-and-how-to-avoid-them.md` — pitfalls");
 	} else if (uiSelected.includes("Dialogs")) {
-		docHints.push("- `docs/extension-sdk/building-extensions.md#built-in-dialogs` — select, confirm, input");
+		docHints.push("- `~/.gsd/agent/docs/pi-ui-tui/04-built-in-dialog-methods.md` — select, confirm, input, editor");
 	} else if (uiSelected.includes("Status")) {
-		docHints.push("- `docs/extension-sdk/building-extensions.md#persistent-ui-elements` — status, widgets");
+		docHints.push("- `~/.gsd/agent/docs/pi-ui-tui/05-persistent-ui-elements.md` — status, widgets, footer, header");
 	}
 
 	if (uiSelected.includes("tool") || result.answers["purpose"]) {
-		docHints.push("- `docs/dev/extending-pi/14-custom-rendering-controlling-what-the-user-sees.md` — renderCall / renderResult");
+		docHints.push("- `~/.gsd/agent/docs/extending-pi/14-custom-rendering-controlling-what-the-user-sees.md` — renderCall / renderResult");
 	}
 
 	if (eventsSelected && !eventsSelected.includes("standalone")) {
-		docHints.push("- `docs/dev/extending-pi/07-events-the-nervous-system.md` — all events reference");
+		docHints.push("- `~/.gsd/agent/docs/extending-pi/07-events-the-nervous-system.md` — all events reference");
 	}
 
 	if (eventsSelected.includes("context / prompt")) {
-		docHints.push("- `docs/dev/extending-pi/15-system-prompt-modification.md` — system prompt hooks");
+		docHints.push("- `~/.gsd/agent/docs/extending-pi/15-system-prompt-modification.md` — system prompt hooks");
 	}
 
 	if (persistenceSelected.includes("session")) {
-		docHints.push("- `docs/extension-sdk/building-extensions.md#state-management` — state reconstruction, appendEntry");
+		docHints.push("- `~/.gsd/agent/docs/extending-pi/13-state-management-persistence.md` — pi.appendEntry, session state");
 	}
 
 	const prompt = `Create a new pi extension based on this description:
@@ -267,30 +270,13 @@ ${docHints.join("\n")}
 
 ## Output
 
-Write the complete implementation as a directory-based extension:
-
-\`~/.gsd/agent/extensions/<kebab-case-name>/index.ts\`
-\`~/.gsd/agent/extensions/<kebab-case-name>/extension-manifest.json\`
-
-The manifest must follow this format:
-\`\`\`json
-{
-  "id": "<kebab-case-name>",
-  "name": "<Human Name>",
-  "version": "1.0.0",
-  "description": "<one-line description>",
-  "tier": "community",
-  "requires": { "platform": ">=2.29.0" },
-  "provides": {
-    "tools": ["<tool_names_registered>"],
-    "commands": ["<command_names_registered>"],
-    "hooks": ["<event_names_subscribed>"],
-    "shortcuts": ["<shortcut_keys_registered>"]
-  }
-}
-\`\`\`
+Write the complete implementation as a single self-contained extension file:
+
+\`~/.gsd/agent/extensions/<kebab-case-name>.ts\`
+
+Then register it in the main extensions index:
 
-Only include non-empty arrays in \`provides\`. See \`docs/extension-sdk/manifest-spec.md\` for the full spec.
+\`~/.gsd/agent/extensions/index.ts\` — import and call the new extension's default export alongside existing ones
 
 ## Rules you must follow exactly
 

package/src/resources/skills/create-gsd-extension/SKILL.md

@@ -19,8 +19,8 @@ Note: `~/.gsd/agent/extensions/` is reserved for bundled extensions synced from
 3. **Commands** — Give users slash commands (`pi.registerCommand()`). Users type `/mycommand`.
 
 **Non-negotiable rules:**
-- Use `StringEnum` from `@gsd/pi-ai` for string enum params (NOT `Type.Union`/`Type.Literal` — breaks Google's API)
-- Truncate tool output to 50KB / 2000 lines max (use `truncateHead`/`truncateTail` from `@gsd/pi-coding-agent`)
+- Use `StringEnum` from `@mariozechner/pi-ai` for string enum params (NOT `Type.Union`/`Type.Literal` — breaks Google's API)
+- Truncate tool output to 50KB / 2000 lines max (use `truncateHead`/`truncateTail` from `@mariozechner/pi-coding-agent`)
 - Store stateful tool state in `details` for branching support
 - Check `signal?.aborted` in long-running tool executions
 - Use `pi.exec()` not `child_process` for shell commands
@@ -34,10 +34,10 @@ Note: `~/.gsd/agent/extensions/` is reserved for bundled extensions synced from
 
 | Package | Purpose |
 |---------|---------|
-| `@gsd/pi-coding-agent` | `ExtensionAPI`, `ExtensionContext`, `Theme`, event types, tool utilities, `DynamicBorder`, `BorderedLoader`, `CustomEditor`, `highlightCode` |
+| `@mariozechner/pi-coding-agent` | `ExtensionAPI`, `ExtensionContext`, `Theme`, event types, tool utilities, `DynamicBorder`, `BorderedLoader`, `CustomEditor`, `highlightCode` |
 | `@sinclair/typebox` | `Type.Object`, `Type.String`, `Type.Number`, `Type.Optional`, `Type.Boolean`, `Type.Array` |
-| `@gsd/pi-ai` | `StringEnum` (required for string enums), `Type` re-export |
-| `@gsd/pi-tui` | `Text`, `Box`, `Container`, `Spacer`, `Markdown`, `SelectList`, `Input`, `matchesKey`, `Key`, `truncateToWidth`, `visibleWidth` |
+| `@mariozechner/pi-ai` | `StringEnum` (required for string enums), `Type` re-export |
+| `@mariozechner/pi-tui` | `Text`, `Box`, `Container`, `Spacer`, `Markdown`, `SelectList`, `Input`, `matchesKey`, `Key`, `truncateToWidth`, `visibleWidth` |
 | Node.js built-ins | `node:fs`, `node:path`, `node:child_process`, etc. |
 
 </essential_principles>
@@ -65,9 +65,6 @@ All domain knowledge in `references/`:
 **Capabilities:** custom-tools.md, custom-commands.md, custom-ui.md, custom-rendering.md
 **Patterns:** state-management.md, system-prompt-modification.md, compaction-session-control.md
 **Infrastructure:** model-provider-management.md, remote-execution-overrides.md, packaging-distribution.md, mode-behavior.md
-**Spec:** `docs/extension-sdk/manifest-spec.md` — manifest format, tiers, validation
-**Testing:** `docs/extension-sdk/testing.md` — mock patterns, test conventions
-**SDK:** `docs/extension-sdk/` — the authoritative GSD-2 extension guide
 **Gotchas:** key-rules-gotchas.md
 </reference_index>
 
@@ -81,7 +78,6 @@ All domain knowledge in `references/`:
 
 <success_criteria>
 Extension is complete when:
-- `extension-manifest.json` exists with accurate `provides` listing all registered tools/commands/hooks/shortcuts
 - TypeScript compiles without errors (jiti handles this at runtime)
 - Extension loads on GSD startup or `/reload` without errors
 - Tools appear in the LLM's system prompt and are callable

package/src/resources/skills/create-gsd-extension/references/custom-commands.md

@@ -19,7 +19,7 @@ pi.registerCommand("deploy", {
 Add tab-completion for command arguments:
 
 ```typescript
-import type { AutocompleteItem } from "@gsd/pi-tui";
+import type { AutocompleteItem } from "@mariozechner/pi-tui";
 
 pi.registerCommand("deploy", {
   description: "Deploy to an environment",

package/src/resources/skills/create-gsd-extension/references/custom-rendering.md

@@ -6,8 +6,8 @@ Custom rendering for tools and messages — control how they appear in the TUI.
 Tools can provide `renderCall` (how the call looks) and `renderResult` (how the result looks):
 
 ```typescript
-import { Text } from "@gsd/pi-tui";
-import { keyHint } from "@gsd/pi-coding-agent";
+import { Text } from "@mariozechner/pi-tui";
+import { keyHint } from "@mariozechner/pi-coding-agent";
 
 pi.registerTool({
   name: "my_tool",
@@ -54,7 +54,7 @@ If you omit `renderCall`/`renderResult`, the built-in renderer is used. Useful f
 Key hint helpers for showing keybinding info in render output:
 
 ```typescript
-import { keyHint, appKeyHint, editorKey, rawKeyHint } from "@gsd/pi-coding-agent";
+import { keyHint, appKeyHint, editorKey, rawKeyHint } from "@mariozechner/pi-coding-agent";
 
 // Editor action hint (respects user keybinding config)
 keyHint("expandTools", "to expand")    // e.g., "Ctrl+O to expand"
@@ -69,7 +69,7 @@ rawKeyHint("Ctrl+O", "to expand")
 Register a renderer for custom message types:
 
 ```typescript
-import { Text } from "@gsd/pi-tui";
+import { Text } from "@mariozechner/pi-tui";
 
 pi.registerMessageRenderer("my-extension", (message, options, theme) => {
   const { expanded } = options;
@@ -92,7 +92,7 @@ pi.sendMessage({
 
 <syntax_highlighting>
 ```typescript
-import { highlightCode, getLanguageFromPath } from "@gsd/pi-coding-agent";
+import { highlightCode, getLanguageFromPath } from "@mariozechner/pi-coding-agent";
 
 const lang = getLanguageFromPath("/path/to/file.rs");  // "rust"
 const highlighted = highlightCode(code, lang, theme);

package/src/resources/skills/create-gsd-extension/references/custom-tools.md

@@ -5,7 +5,7 @@ Complete custom tools reference — registration, parameters, execution, output
 <registration>
 ```typescript
 import { Type } from "@sinclair/typebox";
-import { StringEnum } from "@gsd/pi-ai";
+import { StringEnum } from "@mariozechner/pi-ai";
 
 pi.registerTool({
   name: "my_tool",                    // Unique identifier (snake_case)
@@ -60,7 +60,7 @@ pi.registerTool({
 **⚠️ MUST use `StringEnum` for string enum parameters:**
 
 ```typescript
-import { StringEnum } from "@gsd/pi-ai";
+import { StringEnum } from "@mariozechner/pi-ai";
 
 // ✅ Correct — works with all providers including Google
 action: StringEnum(["list", "add", "remove"] as const)
@@ -77,7 +77,7 @@ Tools MUST truncate output to avoid context overflow. Built-in limit: 50KB / 200
 import {
   truncateHead, truncateTail, formatSize,
   DEFAULT_MAX_BYTES, DEFAULT_MAX_LINES,
-} from "@gsd/pi-coding-agent";
+} from "@mariozechner/pi-coding-agent";
 
 async execute(toolCallId, params, signal, onUpdate, ctx) {
   const output = await runCommand();
@@ -129,7 +129,7 @@ Use `pi.setActiveTools(names)` to enable/disable tools at runtime.
 Register a tool with the same name as a built-in (`read`, `bash`, `edit`, `write`, `grep`, `find`, `ls`) to override it. **Must match exact result shape including `details` type.**
 
 ```typescript
-import { createReadTool } from "@gsd/pi-coding-agent";
+import { createReadTool } from "@mariozechner/pi-coding-agent";
 
 pi.registerTool({
   name: "read",

package/src/resources/skills/create-gsd-extension/references/custom-ui.md

@@ -277,7 +277,7 @@ bottom-left  bottom-center  bottom-right
 Replace the main input editor permanently:
 
 ```typescript
-import { CustomEditor } from "@gsd/pi-coding-agent";
+import { CustomEditor } from "@mariozechner/pi-coding-agent";
 
 class VimEditor extends CustomEditor {
   private mode: "normal" | "insert" = "insert";
@@ -307,7 +307,7 @@ ctx.ui.setEditorComponent(undefined);  // Restore default
 </custom_editor>
 
 <built_in_components>
-**From `@gsd/pi-tui`:**
+**From `@mariozechner/pi-tui`:**
 
 | Component | Constructor | Purpose |
 |-----------|-------------|---------|
@@ -352,7 +352,7 @@ const settings = new SettingsList(items, 15, getSettingsListTheme(),
 );
 ```
 
-**From `@gsd/pi-coding-agent`:**
+**From `@mariozechner/pi-coding-agent`:**
 
 | Component | Constructor | Purpose |
 |-----------|-------------|---------|
@@ -363,7 +363,7 @@ const settings = new SettingsList(items, 15, getSettingsListTheme(),
 
 <keyboard_input>
 ```typescript
-import { matchesKey, Key } from "@gsd/pi-tui";
+import { matchesKey, Key } from "@mariozechner/pi-tui";
 
 handleInput(data: string) {
   // Basic keys
@@ -403,7 +403,7 @@ handleInput(data: string) {
 **Cardinal rule: each line from render() must not exceed `width` visible characters.**
 
 ```typescript
-import { visibleWidth, truncateToWidth, wrapTextWithAnsi } from "@gsd/pi-tui";
+import { visibleWidth, truncateToWidth, wrapTextWithAnsi } from "@mariozechner/pi-tui";
 
 visibleWidth("\x1b[32mHello\x1b[0m");  // Returns 5 (ignores ANSI codes)
 truncateToWidth("Very long text here", 10);         // "Very lo..."
@@ -470,7 +470,7 @@ Always use theme from callback params, never import directly.
 
 **Syntax highlighting:**
 ```typescript
-import { highlightCode, getLanguageFromPath } from "@gsd/pi-coding-agent";
+import { highlightCode, getLanguageFromPath } from "@mariozechner/pi-coding-agent";
 const lang = getLanguageFromPath("/file.rs");  // "rust"
 const highlighted = highlightCode(code, lang, theme);
 ```

package/src/resources/skills/create-gsd-extension/references/events-reference.md

@@ -47,7 +47,7 @@ pi.on("before_agent_start", async (event, ctx) => {
 
 **tool_call** — Fired before tool executes. Can block.
 ```typescript
-import { isToolCallEventType } from "@gsd/pi-coding-agent";
+import { isToolCallEventType } from "@mariozechner/pi-coding-agent";
 
 pi.on("tool_call", async (event, ctx) => {
   if (isToolCallEventType("bash", event)) {
@@ -61,7 +61,7 @@ pi.on("tool_call", async (event, ctx) => {
 
 **tool_result** — Fired after tool executes. Can modify result. Handlers chain like middleware.
 ```typescript
-import { isToolResultEventType } from "@gsd/pi-coding-agent";
+import { isToolResultEventType } from "@mariozechner/pi-coding-agent";
 
 pi.on("tool_result", async (event, ctx) => {
   if (isToolResultEventType("bash", event)) {
@@ -105,7 +105,7 @@ pi.on("model_select", async (event, ctx) => {
 Built-in type guards for tool events:
 
 ```typescript
-import { isToolCallEventType, isToolResultEventType } from "@gsd/pi-coding-agent";
+import { isToolCallEventType, isToolResultEventType } from "@mariozechner/pi-coding-agent";
 
 // Tool calls — narrows event.input type
 if (isToolCallEventType("bash", event)) { /* event.input: { command, timeout? } */ }

package/src/resources/skills/create-gsd-extension/references/packaging-distribution.md

@@ -39,7 +39,7 @@ If no `pi` manifest exists, auto-discovers:
 </convention_directories>
 
 <dependencies>
-- List `@gsd/pi-ai`, `@gsd/pi-coding-agent`, `@gsd/pi-tui`, `@sinclair/typebox` in `peerDependencies` with `"*"` — they're bundled by the runtime.
+- List `@mariozechner/pi-ai`, `@mariozechner/pi-coding-agent`, `@mariozechner/pi-tui`, `@sinclair/typebox` in `peerDependencies` with `"*"` — they're bundled by the runtime.
 - Other npm deps go in `dependencies`. The runtime runs `npm install` on package installation.
 </dependencies>
 

package/src/resources/skills/create-gsd-extension/references/remote-execution-overrides.md

@@ -6,7 +6,7 @@ Remote execution via pluggable operations, spawnHook for bash, and tool override
 Built-in tools support pluggable operations for SSH, containers, etc.:
 
 ```typescript
-import { createReadTool, createBashTool, createWriteTool } from "@gsd/pi-coding-agent";
+import { createReadTool, createBashTool, createWriteTool } from "@mariozechner/pi-coding-agent";
 
 // Create tool with custom remote operations
 const remoteBash = createBashTool(cwd, {
@@ -37,7 +37,7 @@ const bashTool = createBashTool(cwd, {
 Full SSH pattern with flag-based switching:
 
 ```typescript
-import { createBashTool, type ExtensionAPI } from "@gsd/pi-coding-agent";
+import { createBashTool, type ExtensionAPI } from "@mariozechner/pi-coding-agent";
 
 export default function (pi: ExtensionAPI) {
   pi.registerFlag("ssh", { description: "SSH target", type: "string" });
@@ -65,7 +65,7 @@ export default function (pi: ExtensionAPI) {
 Override built-in tools for logging/access control — omit renderCall/renderResult to keep built-in rendering:
 
 ```typescript
-import { createReadTool } from "@gsd/pi-coding-agent";
+import { createReadTool } from "@mariozechner/pi-coding-agent";
 import { Type } from "@sinclair/typebox";
 
 pi.registerTool({

package/src/resources/skills/create-gsd-extension/templates/extension-skeleton.ts

@@ -5,9 +5,9 @@
  * {{CAPABILITIES_LIST}}
  */
 
-import type { ExtensionAPI } from "@gsd/pi-coding-agent";
+import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
 import { Type } from "@sinclair/typebox";
-import { StringEnum } from "@gsd/pi-ai";
+import { StringEnum } from "@mariozechner/pi-ai";
 
 export default function (pi: ExtensionAPI) {
   // === Events ===

package/src/resources/skills/create-gsd-extension/templates/stateful-tool-skeleton.ts

@@ -4,10 +4,10 @@
  * State is stored in tool result details for proper branching support.
  */
 
-import type { ExtensionAPI, ExtensionContext } from "@gsd/pi-coding-agent";
+import type { ExtensionAPI, ExtensionContext } from "@mariozechner/pi-coding-agent";
 import { Type } from "@sinclair/typebox";
-import { StringEnum } from "@gsd/pi-ai";
-import { Text, truncateToWidth, matchesKey, Key } from "@gsd/pi-tui";
+import { StringEnum } from "@mariozechner/pi-ai";
+import { Text, truncateToWidth, matchesKey, Key } from "@mariozechner/pi-tui";
 
 interface {{ItemType}} {
   id: number;