paseo-room 0.18.0 → 0.19.0

package/README.md

@@ -54,7 +54,7 @@ interactive stdin/stdout/stderr, and targets exactly one selected agent and role
 | `--room-home <path>` | `~/.paseo-room` | Where role homes are written. |
 | `--codex-home <path>` | `~/.codex` | Source Codex configuration. |
 | `--claude-home <path>` | `~/.claude` | Source Claude Code configuration. |
-| `--pi-home <path>` | `~/.pi/agent` | Source Pi configuration and global adapter package. |
+| `--pi-home <path>` | `~/.pi/agent` | Source Pi configuration and the packages `--pi-extension` selects. |
 | `--codex-bin`, `--claude-bin`, `--pi-bin`, `--paseo-bin` | found on `PATH` | Executable overrides. |
 
 Environment equivalents: `PASEO_ROOM_HOME`, `CODEX_HOME`, `CLAUDE_CONFIG_DIR`, `PASEO_HOME`,
@@ -71,7 +71,9 @@ starts, its exit code is preserved; a signal is returned using the conventional
 
 - Node 22 or newer, macOS or Linux.
 - A running Paseo daemon with CLI and daemon on the same version. Codex requires
-  **0.8.0-beta.1 or newer**; any selection containing Claude or Pi requires **0.8.0 or newer**.
+  **0.8.0-beta.1 or newer**; any selection containing Claude requires **0.8.0 or newer**, and
+  any selection containing Pi **0.11.1 or newer**, the first Paseo that hands a Pi seat its tools
+  through Pi's built-in MCP extension.
   Claude also requires Paseo plugins to be enabled explicitly: the generated trusted server plugin
   is the strong contract carrier, and `paseo-room` never enables plugins for you. The plugin
   requires Paseo `>=0.8.0` and has no upper bound. `paseo-room` checks compatibility before
@@ -84,12 +86,9 @@ starts, its exit code is preserved; a signal is returned using the conventional
   pins both `CLAUDE_CONFIG_DIR` and `CLAUDE_SECURESTORAGE_CONFIG_DIR` per role. It does not
   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` (`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.
+- An initialised Pi home (`~/.pi/agent`) and Pi 1.1.0 or newer. Seats use Pi's built-in `mcp`
+  and `codemode` extensions; `pi-mcp-adapter` is not needed, and the room never loads it. The
+  room never installs or upgrades Pi.
 
 ## What gets created
 
@@ -175,10 +174,9 @@ configuration.
 Pi role homes deliberately do not link `extensions`, `npm`, `git`, `trust.json`, runtime
 caches or session state. Their copied `settings.json` removes `packages` and `extensions`,
 so startup cannot install configured packages or discover unrelated configured extensions.
-The intended adapter remains in the operator's Pi package store and is loaded by canonical
-path. Every Pi provider pins `PI_MCP_CONFIG_MODE=exclusive`, making the role home's linked
-`mcp.json` the adapter's only configuration source and excluding generic global and project
-MCP config discovery.
+Pi's built-in MCP extension reads only the role home's linked `mcp.json` and, for a trusted
+project, its `.pi/mcp.json`; seats run with `--no-approve`, so no project is trusted and the
+role home's file is the only configuration source besides the servers Paseo registers.
 
 ### Role authentication diagnostics
 
@@ -218,7 +216,7 @@ a minimal interactive login session in that role's home, isolated from the calle
 `--no-extensions --no-approve --append-system-prompt ''` and visibly asks you to run `/login`.
 The explicit empty append override suppresses discovery of the generated role
 `APPEND_SYSTEM.md`, including its runtime capsule and role instructions. This direct launch
-does not load `pi-mcp-adapter`, Paseo's integration extension, or the room-equivalent provider
+does not load Pi's MCP extension, Paseo's integration extension, or the room-equivalent provider
 argv. No login path reads, copies, links, replaces, validates, or deletes a credential store.
 
 Codex diagnostics recognize an explicit `cli_auth_credentials_store` of `file`, `ephemeral`,
@@ -288,7 +286,7 @@ 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-extensions --extension builtin:mcp --extension builtin:codemode
 [--extension <canonical entry of each selected package>] --no-approve
 --append-system-prompt <role APPEND_SYSTEM.md>
 ```
@@ -301,8 +299,8 @@ paseo-room setup --agent pi --pi-extension pi-blackbytes --pi-extension pi-provi
 ```
 
 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
+Packages load only from your Pi home's `npm/node_modules`, and every declared entry must
+resolve inside the package; 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
@@ -312,15 +310,16 @@ flag removes the extensions and warns which ones. See
 
 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 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
-operator or planned role homes.
+not resolve, create or include it. Paseo registers the seat's MCP servers through that extension
+with `pi.registerMcpServer`, but only after it finds a `/mcp` command from `builtin:mcp`. Their
+tools default to `codemode` exposure, which is why `builtin:codemode` loads too: without it a
+seat would hold Paseo's tools and have no way to call them. Before planning any writes, the room
+runs one bounded offline Pi RPC `get_commands` probe that loads the same built-in extensions and
+every selected extension, with `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, so
+no operator or caller-project MCP configuration is read. The correlated response must attribute
+exactly one `/mcp` to `source: "extension"` at `builtin:mcp`; anything else fails closed. The
+probe and setup do not write the operator or planned role homes.
 
 Each seat combines generated agent configuration with Paseo provider pins. Provider fields are
 still required where Paseo launch state outranks the agent's own configuration:
@@ -333,7 +332,7 @@ still required where Paseo launch state outranks the agent's own configuration:
 | `disableWorkflows: true` + `CLAUDE_CODE_DISABLE_WORKFLOWS=1` | Claude | Disables dynamic workflows through every entry point, beyond denying the `Workflow` tool. |
 | `crossSessionInbound: "refuse"` | Claude | Prevents another Claude session from injecting a turn into a room seat. |
 | `disableClaudeAiConnectors: true` + `ENABLE_CLAUDEAI_MCP_SERVERS=0` | Claude | Keeps the signed-in account's claude.ai connectors (Canva, Claude Docs, …) out of every seat. They bypass the room's MCP check and reach Peer, and one that needs authorising makes each seat ask you to connect it. Your own Claude Code sessions keep them. |
-| strict argv + `PI_MCP_CONFIG_MODE=exclusive` + additive runtime capsule | Pi | Disables extension discovery and project trust, and restricts adapter config to the role-home `mcp.json`; forbids a second agent control plane without claiming sandboxing. |
+| strict argv + additive runtime capsule | Pi | Disables extension discovery and project trust, so Pi's built-in MCP reads only the role-home `mcp.json`; forbids a second agent control plane without claiming sandboxing. |
 | `paseoTools: {enabled}` | all | Room tools for Supervisor and Lead, never for Peer. |
 
 `verify` compares each provider's `command`, `env`, `paseoTools` and pins against what the

package/dist/index.js

@@ -15,7 +15,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "paseo-room",
-      version: "0.18.0",
+      version: "0.19.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",
@@ -1643,7 +1643,9 @@ function parsePiExtensionSpec(spec) {
   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 (name === ADAPTER_PACKAGE) {
+    throw new Error(`${ADAPTER_PACKAGE} cannot be selected: seats use Pi's built-in MCP extension, and Paseo would switch to the adapter if it were loaded.`);
+  }
   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));
@@ -1731,57 +1733,6 @@ async function resolvePiExtensions(home, choices, roles) {
   }
   return { byRole, checks };
 }
-function adapterFailure(home, detail) {
-  return fail(
-    "pi.adapter",
-    detail,
-    `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),
-      stat(manifestPath),
-      readFile3(manifestPath, "utf8")
-    ]);
-    if (!manifestStat.isFile()) return { check: adapterFailure(home, `${manifestPath} is not a regular file.`) };
-    const manifest = asObject2(JSON.parse(raw));
-    if (!manifest || manifest.name !== PACKAGE_NAME) {
-      return { check: adapterFailure(home, `${manifestPath} does not identify ${PACKAGE_NAME}.`) };
-    }
-    const pi = asObject2(manifest.pi);
-    const declared = pi?.extensions;
-    if (!Array.isArray(declared) || declared.length !== 1 || typeof declared[0] !== "string" || !declared[0].trim()) {
-      return { check: adapterFailure(home, `${manifestPath} must declare one Pi extension entry.`) };
-    }
-    const declaration = declared[0];
-    if (isAbsolute2(declaration)) {
-      return { check: adapterFailure(home, `${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 { check: adapterFailure(home, `The declared ${PACKAGE_NAME} extension escapes its package or is not a regular file.`) };
-    }
-    const version = typeof manifest.version === "string" && manifest.version.trim() ? manifest.version.trim() : "unknown";
-    return {
-      adapter: { entry: canonicalEntry, version },
-      check: pass("pi.adapter", `${PACKAGE_NAME} ${version} resolved to ${canonicalEntry}.`)
-    };
-  } catch {
-    return { check: adapterFailure(home, `Could not safely resolve ${PACKAGE_NAME} from ${manifestPath}.`) };
-  }
-}
 function terminateProbe(child) {
   if (child.pid !== void 0) {
     try {
@@ -1797,7 +1748,7 @@ function terminateProbe(child) {
   child.stdout?.destroy();
   child.stderr?.destroy();
 }
-function runProbeProcess(executable, adapterEntry, env, options, cwd) {
+function runProbeProcess(executable, env, options, cwd) {
   const timeoutMs = options.timeoutMs ?? PROBE_TIMEOUT_MS;
   const outputLimit = options.outputLimit ?? PROBE_OUTPUT_LIMIT;
   const args = [
@@ -1805,8 +1756,7 @@ function runProbeProcess(executable, adapterEntry, env, options, cwd) {
     "rpc",
     "--no-session",
     "--no-extensions",
-    "--extension",
-    adapterEntry,
+    ...BUILTIN_EXTENSIONS,
     ...(options.extensions ?? []).flatMap((entry) => ["--extension", entry]),
     "--no-approve"
   ];
@@ -1863,17 +1813,16 @@ function runProbeProcess(executable, adapterEntry, env, options, cwd) {
 `);
   });
 }
-async function runProbe(executable, adapterEntry, env, options) {
+async function runProbe(executable, 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, {
+    return await runProbeProcess(executable, {
       ...env,
       HOME: cwd,
       PI_CODING_AGENT_DIR: agentDir,
-      PI_MCP_CONFIG_MODE: "exclusive",
       PI_OFFLINE: "1",
       [SEAT_ROLE_ENV]: "lead"
     }, options, cwd);
@@ -1885,13 +1834,13 @@ function probeFailure(message) {
   return fail(
     "pi.capability",
     message,
-    "Use a Pi and pi-mcp-adapter installation that exposes /mcp through the declared adapter entry."
+    "Use Pi 1.1.0 or newer, whose built-in MCP extension exposes /mcp as builtin:mcp."
   );
 }
-async function probePiMcp(executable, adapterEntry, env, options = {}) {
+async function probePiMcp(executable, env, options = {}) {
   let result;
   try {
-    result = await runProbe(executable, adapterEntry, env, options);
+    result = await runProbe(executable, env, options);
   } catch {
     return probeFailure("Pi capability probe could not create or clean its isolated working directory.");
   }
@@ -1926,13 +1875,8 @@ async function probePiMcp(executable, adapterEntry, env, options = {}) {
   if (command?.source !== "extension") return probeFailure("Pi exposed /mcp from the wrong source.");
   const sourceInfo = asObject2(command.sourceInfo);
   if (typeof sourceInfo?.path !== "string") return probeFailure("Pi did not report the /mcp extension path.");
-  try {
-    const sourcePath = await realpath(sourceInfo.path);
-    if (sourcePath !== adapterEntry) return probeFailure("Pi loaded /mcp from a different extension path.");
-  } catch {
-    return probeFailure("Pi reported an unresolvable /mcp extension path.");
-  }
-  return pass("pi.capability", `Pi exposed /mcp from ${adapterEntry}.`);
+  if (sourceInfo.path !== MCP_EXTENSION) return probeFailure("Pi loaded /mcp from a different extension path.");
+  return pass("pi.capability", `Pi exposed /mcp from ${MCP_EXTENSION}.`);
 }
 async function readPiOptional(path) {
   try {
@@ -1970,7 +1914,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, DEFAULT_EXTENSION_ROLES, NPM_NAME, SEAT_ROLE_ENV, piAgent;
+var MCP_EXTENSION, CODEMODE_EXTENSION, BUILTIN_EXTENSIONS, ADAPTER_PACKAGE, 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";
@@ -1986,7 +1930,10 @@ var init_pi = __esm({
     init_mcp();
     init_resources();
     init_skills();
-    PACKAGE_NAME = "pi-mcp-adapter";
+    MCP_EXTENSION = "builtin:mcp";
+    CODEMODE_EXTENSION = "builtin:codemode";
+    BUILTIN_EXTENSIONS = ["--extension", MCP_EXTENSION, "--extension", CODEMODE_EXTENSION];
+    ADAPTER_PACKAGE = "pi-mcp-adapter";
     PROBE_ID = "paseo-room-pi-mcp-probe";
     PROBE_TIMEOUT_MS = 1e4;
     PROBE_OUTPUT_LIMIT = 1024 * 1024;
@@ -2023,7 +1970,6 @@ var init_pi = __esm({
       id: "pi",
       label: "Pi",
       homeEnv: "PI_CODING_AGENT_DIR",
-      providerEnv: { PI_MCP_CONFIG_MODE: "exclusive" },
       pins: {},
       async build(layout, roles, options) {
         const home = layout.agentHome.pi;
@@ -2036,20 +1982,18 @@ var init_pi = __esm({
         } catch {
           return { entries: [], checks: [fail("pi.home", `No Pi config directory at ${home}.`, "Run Pi once to initialise it, or pass --pi-home.")] };
         }
-        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] };
+          return { entries: [], checks: [...extensions.checks] };
         }
         const selected = [...new Set(Object.values(extensions.byRole).flat())];
-        const capability = await probePiMcp(binary, resolved.adapter.entry, {
+        const capability = await probePiMcp(binary, {
           HOME: layout.home,
           PATH: layout.searchPath,
           PI_OFFLINE: "1"
         }, { extensions: selected });
         if (capability.status === "fail") {
-          return { entries: [], checks: [resolved.check, ...extensions.checks, selected.length === 0 ? capability : {
+          return { entries: [], checks: [...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()
           }] };
@@ -2062,7 +2006,6 @@ var init_pi = __esm({
           return {
             entries: [],
             checks: [
-              resolved.check,
               capability,
               fail(
                 "pi.settings",
@@ -2080,7 +2023,6 @@ var init_pi = __esm({
           return {
             entries: [],
             checks: [
-              resolved.check,
               capability,
               fail(
                 "pi.append",
@@ -2099,7 +2041,6 @@ var init_pi = __esm({
           return {
             entries: [],
             checks: [
-              resolved.check,
               capability,
               fail(
                 "pi.mcp",
@@ -2110,7 +2051,7 @@ var init_pi = __esm({
           };
         }
         const conflict = paseoMcpCheck("pi.mcp", mcpPath, servers);
-        if (conflict) return { entries: [], checks: [resolved.check, capability, conflict] };
+        if (conflict) return { entries: [], checks: [capability, conflict] };
         const entries = [];
         const credentials = [];
         const argv = {};
@@ -2135,8 +2076,7 @@ var init_pi = __esm({
           credentials.push(await piCredentialDiagnostic(layout, role, binary));
           argv[role] = [
             "--no-extensions",
-            "--extension",
-            resolved.adapter.entry,
+            ...BUILTIN_EXTENSIONS,
             ...(extensions.byRole[role] ?? []).flatMap((entry) => ["--extension", entry]),
             "--no-approve",
             "--append-system-prompt",
@@ -2147,7 +2087,7 @@ var init_pi = __esm({
         return {
           entries,
           credentials,
-          checks: [pass("pi.home", `Pi found at ${binary} using ${home}.`), resolved.check, ...extensions.checks, capability],
+          checks: [pass("pi.home", `Pi found at ${binary} using ${home}.`), ...extensions.checks, capability],
           binary,
           argv,
           providerEnv
@@ -2161,7 +2101,8 @@ var init_pi = __esm({
 import { gte, valid } from "semver";
 import { z as z2 } from "zod";
 function minimumPaseoVersion(agents, runtime = false) {
-  return runtime || agents.includes("pi") || agents.includes("claude") ? PI_MINIMUM_VERSION : MINIMUM_VERSION;
+  if (agents.includes("pi")) return PI_MINIMUM_VERSION;
+  return runtime || agents.includes("claude") ? PLUGIN_MINIMUM_VERSION : MINIMUM_VERSION;
 }
 function normalizeUrl(listen) {
   const match = /^(?:ws:\/\/)?([^:/]+|\[[^\]]+\]):(\d+)$/.exec(listen.trim());
@@ -2352,14 +2293,15 @@ function mergeProfiles(live, desired, drop) {
   });
   return [...kept, ...desired.filter((profile) => !seen.has(profile.id)).map((profile) => ({ ...profile }))];
 }
-var MINIMUM_VERSION, PI_MINIMUM_VERSION, statusSchema, configSchema;
+var MINIMUM_VERSION, PLUGIN_MINIMUM_VERSION, PI_MINIMUM_VERSION, statusSchema, configSchema;
 var init_paseo = __esm({
   "src/paseo.ts"() {
     "use strict";
     init_result();
     init_which();
     MINIMUM_VERSION = "0.8.0-beta.1";
-    PI_MINIMUM_VERSION = "0.8.0";
+    PLUGIN_MINIMUM_VERSION = "0.8.0";
+    PI_MINIMUM_VERSION = "0.11.1";
     statusSchema = z2.object({
       listen: z2.string().min(1),
       localDaemon: z2.string().min(1),
@@ -5023,7 +4965,7 @@ async function runWizard(prompts, emit, write, options = {}, onAction) {
       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" }
+        { value: "drop", label: "No \u2014 start Pi seats with only Pi's built-in MCP" }
       ]
     });
     if (typeof keep === "symbol") return cancelled();