paseo-room 0.17.0 → 0.18.0

package/README.md

@@ -85,8 +85,11 @@ starts, its exit code is preserved; a signal is returned using the conventional
   query Keychain state, and reports older-runtime Keychain isolation as unverifiable. See
   Anthropic's [credential-management reference](https://code.claude.com/docs/en/authentication#credential-management).
 - An initialised Pi home (`~/.pi/agent`) and an operator-installed global
-  `pi-mcp-adapter` package under its `npm/node_modules`. The package version is diagnostic,
-  not a compatibility constraint. The room never installs or upgrades Pi or the adapter.
+  `pi-mcp-adapter` package under its `npm/node_modules` (`pi install npm:pi-mcp-adapter`). The
+  package version is diagnostic, not a compatibility constraint. Pi 1.0's built-in MCP extension
+  does not replace it: Paseo gives a Pi seat its MCP servers only through the adapter, which it
+  recognises by name and configures with the adapter's own `--mcp-config` flag. The room never
+  installs or upgrades Pi or the adapter; setup stops with that install command instead.
 
 ## What gets created
 
@@ -285,17 +288,35 @@ but what the model actually reads is not proven, and `CLAUDE.md` is what covers
 Pi providers use a strict command tail:
 
 ```text
---no-extensions --extension <canonical pi-mcp-adapter entry> --no-approve
+--no-extensions --extension <canonical pi-mcp-adapter entry>
+[--extension <canonical entry of each selected package>] --no-approve
 --append-system-prompt <role APPEND_SYSTEM.md>
 ```
 
+Each Pi provider also pins `PASEO_ROOM_ROLE=<role>`, so an extension can tell it runs as a
+seat. To load more of your own installed Pi packages in the seats, select them at setup:
+
+```bash
+paseo-room setup --agent pi --pi-extension pi-blackbytes --pi-extension pi-provider-kiro=supervisor,lead,peer --apply
+```
+
+Roles default to `supervisor,lead`; Peer gets an extension only when named, with a warning.
+Packages load only from your Pi home's `npm/node_modules`, with the same containment checks
+as the adapter; package prompts, skills and themes are not loaded. A package that is not
+installed is a warning with its `pi install npm:<package>` command and the seat starts without
+it; the room never installs one. Selecting a package states that it opens no second
+multi-agent path in a seat (`pi-blackbytes` 3.1.0 turns its sub-agents off when
+`PASEO_ROOM_ROLE` is set). The choice is recorded in `room.json`; a later `setup` without the
+flag removes the extensions and warns which ones. See
+[docs/design/pi-seat-extensions.md](docs/design/pi-seat-extensions.md).
+
 This is Paseo's core `pi` provider, not an OMP provider or compatibility layer.
 Paseo appends and owns its own generated temporary integration extension; `paseo-room` does
 not resolve, create or include it. Before planning any writes, the room validates the exact
 global package identity and canonical entry containment, then runs one bounded offline Pi RPC
-`get_commands` probe with `PI_CODING_AGENT_DIR=/dev/null`,
-`PI_MCP_CONFIG_MODE=exclusive`, and `HOME` set to a fresh temporary working directory that is
-removed afterwards. This prevents adapter startup from selecting operator-global or caller
+`get_commands` probe that loads the adapter and every selected extension, with
+`PI_MCP_CONFIG_MODE=exclusive`, `PASEO_ROOM_ROLE=lead`, `HOME` set to a fresh temporary working
+directory that is removed afterwards, and `PI_CODING_AGENT_DIR` an empty directory inside it. This prevents adapter startup from selecting operator-global or caller
 project MCP configs during the probe. The correlated response must
 attribute `/mcp` to `source: "extension"` at that same canonical path. Missing, malformed,
 path-escaped or wrongly attributed adapters fail closed. The probe and setup do not write the

package/dist/index.js

@@ -15,7 +15,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "paseo-room",
-      version: "0.17.0",
+      version: "0.18.0",
       description: "One CLI that configures Codex, Claude Code, and Pi role homes in $HOME and registers them with your local Paseo daemon.",
       keywords: [
         "paseo",
@@ -473,7 +473,7 @@ var init_roles = __esm({
 // src/room.ts
 import { join as join3 } from "path";
 import { z } from "zod";
-function renderMarker(version, agents, roles, contract, claudeMemoryContract, runtime) {
+function renderMarker(version, agents, roles, contract, claudeMemoryContract, runtime, piExtensions) {
   return JSON.stringify({
     version,
     agents: [...agents],
@@ -481,7 +481,10 @@ function renderMarker(version, agents, roles, contract, claudeMemoryContract, ru
     ...contract === void 0 ? {} : { contract },
     // Written only when it differs from the default, so an unchanged room's marker is unchanged.
     ...claudeMemoryContract === false ? { claudeMemoryContract: false } : {},
-    ...runtime === void 0 ? {} : { runtime }
+    ...runtime === void 0 ? {} : { runtime },
+    ...piExtensions === void 0 || piExtensions.length === 0 ? {} : {
+      piExtensions: piExtensions.map((choice) => ({ package: choice.package, roles: [...choice.roles] }))
+    }
   }, null, 2) + "\n";
 }
 async function readMarker(layout) {
@@ -520,7 +523,12 @@ var init_room = __esm({
        * Present only when this room opted in to runtime coordination. Missing means disabled, so a
        * marker written before runtime existed keeps parsing and keeps its behaviour.
        */
-      runtime: z.strictObject({ enabled: z.literal(true), generation: z.string().min(1), schema: z.literal(1) }).optional()
+      runtime: z.strictObject({ enabled: z.literal(true), generation: z.string().min(1), schema: z.literal(1) }).optional(),
+      /**
+       * Pi packages this room loads as explicit seat extensions (docs/design/pi-seat-extensions.md).
+       * Missing means none, so a marker written before the option existed keeps its behaviour.
+       */
+      piExtensions: z.array(z.strictObject({ package: z.string().min(1), roles: z.array(z.enum(ROLES)).min(1) })).min(1).optional()
     });
   }
 });
@@ -1608,7 +1616,7 @@ var init_codex = __esm({
 
 // src/agents/pi.ts
 import { spawn as spawn2 } from "child_process";
-import { mkdtemp, readFile as readFile3, realpath, rm as rm2, stat } from "fs/promises";
+import { mkdir as mkdir2, mkdtemp, readFile as readFile3, realpath, rm as rm2, stat } from "fs/promises";
 import { tmpdir } from "os";
 import { isAbsolute as isAbsolute2, join as join10, resolve as resolve3 } from "path";
 function asObject2(value) {
@@ -1630,16 +1638,116 @@ function renderPiAppend(source, role) {
     renderInstructions(role)
   ].filter((part) => Boolean(part)).join("\n\n");
 }
+function parsePiExtensionSpec(spec) {
+  const [name = "", roleList, ...rest] = spec.trim().split("=");
+  if (rest.length > 0 || !NPM_NAME.test(name)) {
+    throw new Error(`Not a Pi package selection: ${spec}. Use <npm package>[=<role>,<role>].`);
+  }
+  if (name === PACKAGE_NAME) throw new Error(`${PACKAGE_NAME} is always loaded and cannot be selected.`);
+  if (roleList === void 0) return { package: name, roles: DEFAULT_EXTENSION_ROLES };
+  const roles = roleList.split(",").map((role) => role.trim());
+  const unknown = roles.filter((role) => !ROLES.some((known) => known === role));
+  if (unknown.length > 0 || roles.length === 0) {
+    throw new Error(`Unknown role in ${spec}: ${unknown.join(", ") || "(none)"}. Roles are ${ROLES.join(", ")}.`);
+  }
+  return { package: name, roles: ROLES.filter((role) => roles.includes(role)) };
+}
+function normalizePiExtensions(choices) {
+  const merged = /* @__PURE__ */ new Map();
+  for (const choice of choices) {
+    const roles = merged.get(choice.package) ?? /* @__PURE__ */ new Set();
+    for (const role of choice.roles) roles.add(role);
+    merged.set(choice.package, roles);
+  }
+  return [...merged.entries()].sort(([left], [right]) => left < right ? -1 : left > right ? 1 : 0).map(([name, roles]) => ({ package: name, roles: ROLES.filter((role) => roles.has(role)) }));
+}
+async function resolvePiPackage(home, name) {
+  const packageRoot = join10(home, "npm", "node_modules", name);
+  const manifestPath = join10(packageRoot, "package.json");
+  try {
+    await stat(packageRoot);
+  } catch (error) {
+    if (error.code === "ENOENT") return { kind: "missing" };
+    return { kind: "unsafe", detail: `Could not inspect ${packageRoot}.` };
+  }
+  try {
+    const [canonicalRoot, manifestStat, raw] = await Promise.all([
+      realpath(packageRoot),
+      stat(manifestPath),
+      readFile3(manifestPath, "utf8")
+    ]);
+    if (!manifestStat.isFile()) return { kind: "unsafe", detail: `${manifestPath} is not a regular file.` };
+    const manifest = asObject2(JSON.parse(raw));
+    if (!manifest || manifest.name !== name) return { kind: "unsafe", detail: `${manifestPath} does not identify ${name}.` };
+    const declared = asObject2(manifest.pi)?.extensions;
+    if (!Array.isArray(declared) || declared.length === 0 || !declared.every((item) => typeof item === "string" && item.trim() !== "")) {
+      return { kind: "unsafe", detail: `${manifestPath} declares no Pi extension entry.` };
+    }
+    const entries = [];
+    for (const declaration of declared) {
+      if (isAbsolute2(declaration)) return { kind: "unsafe", detail: `${manifestPath} declares an unsafe absolute extension path.` };
+      const candidate = resolve3(packageRoot, declaration);
+      const [canonicalEntry, entryStat] = await Promise.all([realpath(candidate), stat(candidate)]);
+      if (!contains(canonicalRoot, canonicalEntry) || canonicalEntry === canonicalRoot || !entryStat.isFile()) {
+        return { kind: "unsafe", detail: `A declared ${name} extension escapes its package or is not a regular file.` };
+      }
+      entries.push(canonicalEntry);
+    }
+    const version = typeof manifest.version === "string" && manifest.version.trim() ? manifest.version.trim() : "unknown";
+    return { kind: "resolved", entries, version };
+  } catch {
+    return { kind: "unsafe", detail: `Could not safely resolve ${name} from ${manifestPath}.` };
+  }
+}
+async function resolvePiExtensions(home, choices, roles) {
+  const byRole = {};
+  const checks = [];
+  for (const choice of normalizePiExtensions(choices)) {
+    const seated = choice.roles.filter((role) => roles.includes(role));
+    if (seated.length === 0) continue;
+    const id2 = `pi.extension.${choice.package}`;
+    const resolution = await resolvePiPackage(home, choice.package);
+    if (resolution.kind === "missing") {
+      checks.push(warn(
+        `${id2}.missing`,
+        `Pi package ${choice.package} is selected for ${seated.join(", ")} but is not installed in ${join10(home, "npm")}; those seats start without it.`,
+        `Install it yourself with: pi install npm:${choice.package}, then run setup again. The room never installs Pi packages.`
+      ));
+      continue;
+    }
+    if (resolution.kind === "unsafe") {
+      checks.push(fail(id2, resolution.detail, `Reinstall ${choice.package} with Pi, or drop --pi-extension ${choice.package}, then run setup again.`));
+      continue;
+    }
+    for (const role of seated) byRole[role] = [...byRole[role] ?? [], ...resolution.entries];
+    checks.push(pass(id2, `${choice.package} ${resolution.version} loads for ${seated.join(", ")} from ${resolution.entries.join(", ")}.`));
+    if (seated.includes("peer")) {
+      checks.push(warn(
+        `${id2}.peer`,
+        `Peer runs ${choice.package}'s extension code. The room cannot prove it opens no second multi-agent path; selecting it states that it does not, or that it closes that path when ${SEAT_ROLE_ENV} is set.`,
+        `Drop peer from --pi-extension ${choice.package}=<roles> if that is not true.`
+      ));
+    }
+  }
+  return { byRole, checks };
+}
 function adapterFailure(home, detail) {
   return fail(
     "pi.adapter",
     detail,
-    `Install ${PACKAGE_NAME} in ${join10(home, "npm")} with Pi yourself, then run setup again.`
+    `Install ${PACKAGE_NAME} into ${join10(home, "npm")} yourself with: pi install npm:${PACKAGE_NAME}. Pi's built-in MCP extension is not a substitute: Paseo hands a Pi seat its tools only through ${PACKAGE_NAME}. The room never installs Pi packages. Then run setup again.`
   );
 }
 async function resolvePiAdapter(home) {
   const packageRoot = join10(home, "npm", "node_modules", PACKAGE_NAME);
   const manifestPath = join10(packageRoot, "package.json");
+  try {
+    await stat(packageRoot);
+  } catch (error) {
+    if (error.code === "ENOENT") {
+      return { check: adapterFailure(home, `${PACKAGE_NAME} is not installed in ${join10(home, "npm")}.`) };
+    }
+  }
   try {
     const [canonicalRoot, manifestStat, raw] = await Promise.all([
       realpath(packageRoot),
@@ -1692,7 +1800,16 @@ function terminateProbe(child) {
 function runProbeProcess(executable, adapterEntry, env, options, cwd) {
   const timeoutMs = options.timeoutMs ?? PROBE_TIMEOUT_MS;
   const outputLimit = options.outputLimit ?? PROBE_OUTPUT_LIMIT;
-  const args = ["--mode", "rpc", "--no-session", "--no-extensions", "--extension", adapterEntry, "--no-approve"];
+  const args = [
+    "--mode",
+    "rpc",
+    "--no-session",
+    "--no-extensions",
+    "--extension",
+    adapterEntry,
+    ...(options.extensions ?? []).flatMap((entry) => ["--extension", entry]),
+    "--no-approve"
+  ];
   return new Promise((resolveResult) => {
     const child = spawn2(executable, args, { cwd, detached: true, env, stdio: ["pipe", "pipe", "pipe"] });
     const stdout = [];
@@ -1750,12 +1867,15 @@ async function runProbe(executable, adapterEntry, env, options) {
   const createdCwd = await mkdtemp(join10(tmpdir(), "paseo-room-pi-probe-"));
   const cwd = await realpath(createdCwd);
   try {
+    const agentDir = join10(cwd, "agent");
+    await mkdir2(agentDir);
     return await runProbeProcess(executable, adapterEntry, {
       ...env,
       HOME: cwd,
-      PI_CODING_AGENT_DIR: "/dev/null",
+      PI_CODING_AGENT_DIR: agentDir,
       PI_MCP_CONFIG_MODE: "exclusive",
-      PI_OFFLINE: "1"
+      PI_OFFLINE: "1",
+      [SEAT_ROLE_ENV]: "lead"
     }, options, cwd);
   } finally {
     await rm2(createdCwd, { force: true, recursive: true });
@@ -1850,7 +1970,7 @@ async function piCredentialDiagnostic(layout, role, binary = "pi") {
     fix: `Start a minimal, non-room-equivalent interactive login session with: ${launch}. Run /login, then exit Pi.`
   }] };
 }
-var PACKAGE_NAME, PROBE_ID, PROBE_TIMEOUT_MS, PROBE_OUTPUT_LIMIT, SHARED3, EXECUTABLE3, MCP_FILE, MCP_KEYS, AUTH_ENV2, piAgent;
+var PACKAGE_NAME, PROBE_ID, PROBE_TIMEOUT_MS, PROBE_OUTPUT_LIMIT, SHARED3, EXECUTABLE3, MCP_FILE, MCP_KEYS, AUTH_ENV2, DEFAULT_EXTENSION_ROLES, NPM_NAME, SEAT_ROLE_ENV, piAgent;
 var init_pi = __esm({
   "src/agents/pi.ts"() {
     "use strict";
@@ -1859,6 +1979,7 @@ var init_pi = __esm({
     init_fsops();
     init_layout();
     init_result();
+    init_roles();
     init_instructions();
     init_prompts();
     init_which();
@@ -1895,13 +2016,16 @@ var init_pi = __esm({
       "KIMI_API_KEY",
       "COPILOT_GITHUB_TOKEN"
     ];
+    DEFAULT_EXTENSION_ROLES = ["supervisor", "lead"];
+    NPM_NAME = /^(?:@[a-z0-9][a-z0-9._~-]*\/)?[a-z0-9][a-z0-9._~-]*$/;
+    SEAT_ROLE_ENV = "PASEO_ROOM_ROLE";
     piAgent = {
       id: "pi",
       label: "Pi",
       homeEnv: "PI_CODING_AGENT_DIR",
       providerEnv: { PI_MCP_CONFIG_MODE: "exclusive" },
       pins: {},
-      async build(layout, roles) {
+      async build(layout, roles, options) {
         const home = layout.agentHome.pi;
         const binary = await which(layout.bin.pi, layout.searchPath);
         if (!binary) {
@@ -1914,13 +2038,22 @@ var init_pi = __esm({
         }
         const resolved = await resolvePiAdapter(home);
         if (!resolved.adapter) return { entries: [], checks: [resolved.check] };
+        const extensions = await resolvePiExtensions(home, options?.piExtensions ?? [], roles);
+        if (extensions.checks.some((check) => check.status === "fail")) {
+          return { entries: [], checks: [resolved.check, ...extensions.checks] };
+        }
+        const selected = [...new Set(Object.values(extensions.byRole).flat())];
         const capability = await probePiMcp(binary, resolved.adapter.entry, {
           HOME: layout.home,
           PATH: layout.searchPath,
-          PI_CODING_AGENT_DIR: "/dev/null",
           PI_OFFLINE: "1"
-        });
-        if (capability.status === "fail") return { entries: [], checks: [resolved.check, capability] };
+        }, { extensions: selected });
+        if (capability.status === "fail") {
+          return { entries: [], checks: [resolved.check, ...extensions.checks, selected.length === 0 ? capability : {
+            ...capability,
+            fix: `${capability.fix ?? ""} A selected Pi extension may also be what stops Pi from starting; retry without --pi-extension to tell.`.trim()
+          }] };
+        }
         const settingsPath = join10(home, "settings.json");
         let settings;
         try {
@@ -1981,6 +2114,7 @@ var init_pi = __esm({
         const entries = [];
         const credentials = [];
         const argv = {};
+        const providerEnv = {};
         const roomSkill = { name: ROOM_SKILL_NAME, source: roomSkillSource(layout) };
         for (const role of roles) {
           const target = roleHome(layout, "pi", role);
@@ -1999,14 +2133,24 @@ var init_pi = __esm({
             leadSkillProjection: leadSkillProjection(layout, "pi")
           }));
           credentials.push(await piCredentialDiagnostic(layout, role, binary));
-          argv[role] = ["--no-extensions", "--extension", resolved.adapter.entry, "--no-approve", "--append-system-prompt", appendPath];
+          argv[role] = [
+            "--no-extensions",
+            "--extension",
+            resolved.adapter.entry,
+            ...(extensions.byRole[role] ?? []).flatMap((entry) => ["--extension", entry]),
+            "--no-approve",
+            "--append-system-prompt",
+            appendPath
+          ];
+          providerEnv[role] = { [SEAT_ROLE_ENV]: role };
         }
         return {
           entries,
           credentials,
-          checks: [pass("pi.home", `Pi found at ${binary} using ${home}.`), resolved.check, capability],
+          checks: [pass("pi.home", `Pi found at ${binary} using ${home}.`), resolved.check, ...extensions.checks, capability],
           binary,
-          argv
+          argv,
+          providerEnv
         };
       }
     };
@@ -3785,13 +3929,13 @@ var init_schema = __esm({
 
 // src/runtime-plugin/server/store/publish.ts
 import { randomBytes as randomBytes2 } from "crypto";
-import { chmod as chmod2, link, lstat as lstat4, mkdir as mkdir2, open, unlink as unlink2 } from "fs/promises";
+import { chmod as chmod2, link, lstat as lstat4, mkdir as mkdir3, open, unlink as unlink2 } from "fs/promises";
 import { join as join13 } from "path";
 function code(error) {
   return typeof error === "object" && error !== null && "code" in error ? String(error.code) : void 0;
 }
 async function ensurePrivateDirectory(path) {
-  await mkdir2(path, { recursive: true, mode: PRIVATE_DIR_MODE });
+  await mkdir3(path, { recursive: true, mode: PRIVATE_DIR_MODE });
   const stat2 = await lstat4(path);
   if (!stat2.isDirectory()) throw new Error(`${path} is not a directory.`);
   if ((stat2.mode & 511) !== PRIVATE_DIR_MODE) await chmod2(path, PRIVATE_DIR_MODE);
@@ -3880,7 +4024,7 @@ var init_publish = __esm({
 
 // src/runtime-plugin/server/store/project.ts
 import { randomBytes as randomBytes3, randomUUID } from "crypto";
-import { mkdir as mkdir3, readdir as readdir3, readFile as readFile4, rename as rename2, rm as rm3, writeFile as writeFile2 } from "fs/promises";
+import { mkdir as mkdir4, readdir as readdir3, readFile as readFile4, rename as rename2, rm as rm3, writeFile as writeFile2 } from "fs/promises";
 import { basename as basename2, join as join14 } from "path";
 import { z as z12 } from "zod";
 function runtimeRoot(roomHome) {
@@ -4097,7 +4241,7 @@ var init_project = __esm({
       }
       /** Writes one disposable derived view. Cache files may be replaced; they are never authority. */
       async writeCache(name, content) {
-        await mkdir3(this.cacheDirectory, { recursive: true, mode: 448 });
+        await mkdir4(this.cacheDirectory, { recursive: true, mode: 448 });
         const temporary = join14(this.cacheDirectory, `.tmp-${String(process.pid)}-${randomBytes3(6).toString("hex")}`);
         await writeFile2(temporary, content, { mode: PRIVATE_FILE_MODE });
         await rename2(temporary, join14(this.cacheDirectory, name));
@@ -4280,7 +4424,7 @@ async function buildDesired(layout, agents, roles, build = {}) {
     entries.push(...runtimePluginEntries(layout, agents, roles));
     runtime = { enabled: true, generation: renderRuntimeManifest(agents, roles).roomGeneration, schema: 1 };
   }
-  entries.push({ kind: "file", path: join16(layout.roomHome, MARKER), content: renderMarker(package_default.version, agents, roles, contractDigest(), markerMemoryContract(agents, build.memoryContract ?? true), runtime) });
+  entries.push({ kind: "file", path: join16(layout.roomHome, MARKER), content: renderMarker(package_default.version, agents, roles, contractDigest(), markerMemoryContract(agents, build.memoryContract ?? true), runtime, markerPiExtensions(agents, build.piExtensions)) });
   return { entries, providers, profiles, checks, plugins, ...runtime === void 0 ? {} : { runtime } };
 }
 function contractProvenance(previous) {
@@ -4536,6 +4680,25 @@ async function runtimeRemovalWarning(layout) {
     "Export it first with: paseo-room export --out <dir>"
   )];
 }
+function markerPiExtensions(agents, choices) {
+  if (!agents.includes("pi") || choices === void 0 || choices.length === 0) return void 0;
+  return normalizePiExtensions(choices);
+}
+function piExtensionChanges(previous, agents, choices) {
+  const before = previous?.agents.includes("pi") === true ? previous.piExtensions ?? [] : [];
+  const now = markerPiExtensions(agents, choices) ?? [];
+  const removed = before.flatMap((choice) => {
+    const kept = now.find((item) => item.package === choice.package)?.roles ?? [];
+    const dropped = choice.roles.filter((role) => !kept.includes(role));
+    return dropped.length === 0 ? [] : [`${choice.package} (${dropped.join(", ")})`];
+  });
+  const keep = before.map((choice) => `--pi-extension ${choice.package}=${choice.roles.join(",")}`).join(" ");
+  return removed.length === 0 ? [] : [warn(
+    "pi.extensions-removed",
+    `This setup removes Pi extensions the room loaded before: ${removed.join("; ")}.`,
+    `To keep them, run setup again with: ${keep}`
+  )];
+}
 function markerMemoryContract(agents, memoryContract) {
   return agents.includes("claude") ? memoryContract : void 0;
 }
@@ -4551,8 +4714,12 @@ async function setup(options = {}) {
   const layout = resolveLayout(options, options.env);
   const agents = options.agents ?? ["codex"];
   const memoryContract = options.claudeMemoryContract ?? true;
+  const piExtensions = options.piExtensions ?? [];
   const invalid = layoutChecks(layout, agents);
   if (invalid.length > 0) return failed("setup", invalid);
+  if (piExtensions.length > 0 && !agents.includes("pi")) {
+    return failed("setup", [fail("pi.extension-without-pi", "--pi-extension selects Pi packages, but this setup does not seat Pi.", "Add --agent pi, or drop --pi-extension.")]);
+  }
   const rootSafety = await roomPathSafety(layout, [], []);
   if (hasFailure(rootSafety)) return failed("setup", rootSafety);
   const previous = await readMarker(layout);
@@ -4563,7 +4730,7 @@ async function setup(options = {}) {
   const runtime = options.runtime === true;
   const daemon = await checkDaemon(layout, options.env, minimumPaseoVersion(compatibilityAgents, runtime || previous?.runtime?.enabled === true));
   if (!daemon.daemon) return failed("setup", daemon.checks);
-  const desired = await buildDesired(layout, agents, ROLES, { memoryContract, runtime });
+  const desired = await buildDesired(layout, agents, ROLES, { memoryContract, runtime, piExtensions });
   const stale = await staleFrom(layout, previous, agents, ROLES, runtime);
   const runtimeChecks = stale.removePlugins.some((spec) => spec.id === RUNTIME_PLUGIN_ID) ? await runtimeDeselectionCheck(layout) : [];
   const retained = stale.retainedDirectories.length === 0 ? [] : [warn(
@@ -4571,7 +4738,7 @@ async function setup(options = {}) {
     `Preserved ${String(stale.retainedDirectories.length)} deselected role homes because they may contain role-owned credentials or runtime state.`,
     `Use paseo-room remove --apply to delete the entire room after reviewing its credential warning, or remove deselected homes manually: ${stale.retainedDirectories.join(", ")}`
   )];
-  const checks = [...daemon.checks, ...runtimeChecks, ...desired.checks, ...retained];
+  const checks = [...daemon.checks, ...runtimeChecks, ...desired.checks, ...retained, ...piExtensionChanges(previous, agents, piExtensions)];
   if (hasFailure(checks)) return failed("setup", checks);
   return withSession(daemon.daemon, async (session) => {
     const plan = await planRoom(session, desired, stale);
@@ -4603,13 +4770,15 @@ async function setup(options = {}) {
     await session.refresh(ids);
     const pluginChecks = await reconcilePlugins(session, desired, stale, plan, pending);
     await applyEntries(markerEntries);
+    const appliedPiExtensions = markerPiExtensions(agents, piExtensions);
     const appliedMarker = {
       version: package_default.version,
       agents: [...agents],
       roles: [...ROLES],
       contract: contractDigest(),
       ...markerMemoryContract(agents, memoryContract) === false ? { claudeMemoryContract: false } : {},
-      ...desired.runtime === void 0 ? {} : { runtime: desired.runtime }
+      ...desired.runtime === void 0 ? {} : { runtime: desired.runtime },
+      ...appliedPiExtensions === void 0 ? {} : { piExtensions: appliedPiExtensions.map((choice) => ({ package: choice.package, roles: [...choice.roles] })) }
     };
     const appliedChecks = [
       ...checks,
@@ -4647,7 +4816,8 @@ async function verify(options = {}) {
   const desired = await buildDesired(layout, marker.agents, marker.roles, {
     // The room's own recorded choices, so verify compares against what setup wrote.
     memoryContract: marker.claudeMemoryContract ?? true,
-    runtime
+    runtime,
+    ...marker.piExtensions === void 0 ? {} : { piExtensions: marker.piExtensions }
   });
   const runtimeChecks = runtime ? [marker.runtime?.generation === desired.runtime?.generation ? pass("runtime.generation", `Runtime manifest generation ${String(desired.runtime?.generation)} matches this package.`) : fail("runtime.generation", `This room was set up with runtime generation ${String(marker.runtime?.generation)}; this package generates ${String(desired.runtime?.generation)}.`, "Run: paseo-room setup --runtime --apply")] : [];
   const checks = [...daemon.checks, ...runtimeChecks, ...desired.checks];
@@ -4845,6 +5015,20 @@ async function runWizard(prompts, emit, write, options = {}, onAction) {
     if (typeof carrier === "symbol") return cancelled();
     claudeMemoryContract = carrier === "both";
   }
+  let piExtensions = options.piExtensions;
+  const recorded = agents.includes("pi") && piExtensions === void 0 ? (await readMarker(resolveLayout(options, options.env)))?.piExtensions ?? [] : [];
+  if (recorded.length > 0) {
+    const listed = recorded.map((choice) => `${choice.package} (${choice.roles.join(", ")})`).join("; ");
+    const keep = await prompts.select({
+      message: `Pi seats load these extensions: ${listed}. Keep them?`,
+      options: [
+        { value: "keep", label: "Yes \u2014 keep loading them (recommended)" },
+        { value: "drop", label: "No \u2014 start Pi seats with the MCP adapter only" }
+      ]
+    });
+    if (typeof keep === "symbol") return cancelled();
+    if (keep === "keep") piExtensions = recorded;
+  }
   const coordination = await prompts.select({
     message: "Runtime coordination (preview): track assignments, Peer reports and writer ownership through a trusted Paseo plugin?",
     options: [
@@ -4853,7 +5037,13 @@ async function runWizard(prompts, emit, write, options = {}, onAction) {
     ]
   });
   if (typeof coordination === "symbol") return cancelled();
-  const setupOptions = { ...options, agents, claudeMemoryContract, ...coordination === "runtime" ? { runtime: true } : {} };
+  const setupOptions = {
+    ...options,
+    agents,
+    claudeMemoryContract,
+    ...coordination === "runtime" ? { runtime: true } : {},
+    ...piExtensions === void 0 ? {} : { piExtensions }
+  };
   const preview = await setup(setupOptions);
   const status = emit(preview);
   if (preview.outcome !== "changes-planned") return status;
@@ -4866,6 +5056,8 @@ var init_wizard = __esm({
   "src/wizard.ts"() {
     "use strict";
     init_commands();
+    init_layout();
+    init_room();
     init_roles();
     terminalPrompts = {
       select: (options) => clack.select({ message: options.message, options: [...options.options] }),
@@ -4887,7 +5079,7 @@ init_layout();
 init_result();
 init_schema();
 init_project();
-import { copyFile, mkdir as mkdir4, readdir as readdir5, readFile as readFile5, writeFile as writeFile3 } from "fs/promises";
+import { copyFile, mkdir as mkdir5, readdir as readdir5, readFile as readFile5, writeFile as writeFile3 } from "fs/promises";
 import { join as join17, resolve as resolve4 } from "path";
 var LIMITATION = "Briefs, answers, reports and gate commands are stored as written and cannot be proven secret-free; review the export before sharing it.";
 async function isEmptyOrAbsent(path) {
@@ -4958,9 +5150,9 @@ async function exportRuntime(options = {}) {
     ...summary.filter((entry) => entry.omitted.length > 0).map((entry) => warn("export.omitted", `Project ${entry.projectId}: ${String(entry.omitted.length)} unreadable event file(s) were left out by name: ${entry.omitted.join(", ")}.`))
   ];
   if (!options.apply) return { command: "export", outcome: "changes-planned", changed: false, checks, operations };
-  await mkdir4(destination, { recursive: true, mode: 448 });
+  await mkdir5(destination, { recursive: true, mode: 448 });
   for (const [from, to] of copies) {
-    await mkdir4(join17(to, ".."), { recursive: true, mode: 448 });
+    await mkdir5(join17(to, ".."), { recursive: true, mode: 448 });
     await copyFile(from, to);
   }
   await writeFile3(join17(destination, "summary.json"), `${JSON.stringify({
@@ -5006,6 +5198,7 @@ function renderHuman(result) {
 
 // src/cli.ts
 init_result();
+init_pi();
 init_roles();
 init_prompts();
 init_skills();
@@ -5015,6 +5208,13 @@ function collectAgent(value, previous) {
   const seated = previous ?? [];
   return seated.includes(agent) ? seated : [...seated, agent];
 }
+function collectPiExtension(value, previous) {
+  try {
+    return [...previous ?? [], parsePiExtensionSpec(value)];
+  } catch (error) {
+    throw new InvalidArgumentError(error instanceof Error ? error.message : String(error));
+  }
+}
 var PATH_FLAGS = ["roomHome", "codexHome", "claudeHome", "piHome", "codexBin", "claudeBin", "piBin", "paseoBin"];
 function optionsFrom(raw, base) {
   const paths = {};
@@ -5030,7 +5230,8 @@ function optionsFrom(raw, base) {
     ...raw.apply === true ? { apply: true } : {},
     // Commander defaults a --no- flag to true, so only an explicit opt-out is carried.
     ...raw.claudeMemoryContract === false ? { claudeMemoryContract: false } : {},
-    ...raw.runtime === true ? { runtime: true } : {}
+    ...raw.runtime === true ? { runtime: true } : {},
+    ...Array.isArray(raw.piExtension) && raw.piExtension.length > 0 ? { piExtensions: raw.piExtension } : {}
   };
 }
 function failedFromThrown(command, error) {
@@ -5091,7 +5292,7 @@ async function runCli(argv, output, context = {}) {
       return emit(failedFromThrown(wizardCommand, error));
     }
   }
-  const program = new Command().name("paseo-room").description("Configure Codex/Claude/Pi role homes in $HOME and register them with your local Paseo daemon.").version(package_default.version).usage("<setup|verify|remove|export> [options]\n       auth login <codex|claude|pi> <supervisor|lead|peer> [options]").argument("<command>", "setup | verify | remove | export | auth").argument("[command-arguments...]", "auth login <agent> <role>").option("--agent <agent>", "codex, claude, or pi; repeat to combine (default: codex)", collectAgent).option("--apply", "actually make the changes (default: dry run)").option("--json", "machine-readable output").option("--no-claude-memory-contract", "omit the role contract from Claude role CLAUDE.md files, leaving the room plugin as the only Claude carrier").option("--runtime", "opt in to runtime coordination (preview): installs the trusted paseo-room-runtime plugin; omit it to deselect").option("--out <dir>", "export: destination directory (default: a new directory under the room's runtime exports)").option("--include-gate-output", "export: also copy bounded gate output tails (best-effort masked)").option("--room-home <path>", "where role homes are written (default: ~/.paseo-room)").option("--codex-home <path>", "source Codex config (default: ~/.codex)").option("--claude-home <path>", "source Claude Code config (default: ~/.claude)").option("--pi-home <path>", "source Pi config (default: ~/.pi/agent)").option("--codex-bin <path>", "Codex executable (default: found on PATH)").option("--claude-bin <path>", "Claude Code executable (default: found on PATH)").option("--pi-bin <path>", "Pi executable (default: found on PATH)").option("--paseo-bin <path>", "Paseo executable (default: found on PATH)").configureOutput({ writeOut: (text3) => {
+  const program = new Command().name("paseo-room").description("Configure Codex/Claude/Pi role homes in $HOME and register them with your local Paseo daemon.").version(package_default.version).usage("<setup|verify|remove|export> [options]\n       auth login <codex|claude|pi> <supervisor|lead|peer> [options]").argument("<command>", "setup | verify | remove | export | auth").argument("[command-arguments...]", "auth login <agent> <role>").option("--agent <agent>", "codex, claude, or pi; repeat to combine (default: codex)", collectAgent).option("--apply", "actually make the changes (default: dry run)").option("--json", "machine-readable output").option("--no-claude-memory-contract", "omit the role contract from Claude role CLAUDE.md files, leaving the room plugin as the only Claude carrier").option("--runtime", "opt in to runtime coordination (preview): installs the trusted paseo-room-runtime plugin; omit it to deselect").option("--pi-extension <package[=roles]>", "load an operator-installed Pi package in Pi seats; roles default to supervisor,lead (peer only when named); repeat for more", collectPiExtension).option("--out <dir>", "export: destination directory (default: a new directory under the room's runtime exports)").option("--include-gate-output", "export: also copy bounded gate output tails (best-effort masked)").option("--room-home <path>", "where role homes are written (default: ~/.paseo-room)").option("--codex-home <path>", "source Codex config (default: ~/.codex)").option("--claude-home <path>", "source Claude Code config (default: ~/.claude)").option("--pi-home <path>", "source Pi config (default: ~/.pi/agent)").option("--codex-bin <path>", "Codex executable (default: found on PATH)").option("--claude-bin <path>", "Claude Code executable (default: found on PATH)").option("--pi-bin <path>", "Pi executable (default: found on PATH)").option("--paseo-bin <path>", "Paseo executable (default: found on PATH)").configureOutput({ writeOut: (text3) => {
     output.stdout(text3);
   }, writeErr: (text3) => {
     output.stderr(text3);
@@ -5124,6 +5325,11 @@ async function runCli(argv, output, context = {}) {
     }
     if (raw.runtime === true && (command === "verify" || command === "remove" || command === "export")) {
       output.stderr(`paseo-room ${command}: --runtime is a setup choice recorded in the room marker; ${command} reads it from there.
+`);
+      return 2;
+    }
+    if (raw.piExtension !== void 0 && command !== "setup") {
+      output.stderr(`paseo-room ${command}: --pi-extension is a setup choice recorded in the room marker; ${command} reads it from there.
 `);
       return 2;
     }