agent-relay 15.0.0-next.6 → 15.0.0-next.8

package/dist/cli/commands/init.d.ts

@@ -68,8 +68,10 @@ export declare function withInitDefaults(overrides?: Partial<InitCommandDependen
  * machine by default, the hosted service, or your own server), then connect
  * your agent tools. By default the Agent Relay core injects messages into
  * their running sessions; `--delivery mcp` (or a machine the core cannot run
- * on) uses the Relay MCP server instead. In a terminal it asks; with `--yes`
- * or without a TTY it uses flags and defaults.
+ * on) uses the Relay MCP server instead. It asks nothing: flags, then
+ * defaults (this machine, every installed tool, global scope), and a summary
+ * of what it chose. `--interactive` asks each step in a terminal; `--yes` is
+ * accepted and changes nothing.
  *
  * @param program - The commander program to add the command to.
  * @param overrides - Dependencies to replace, typically in tests.

package/dist/cli/commands/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/init.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AASzC,OAAO,EAkBL,KAAK,YAAY,EACjB,KAAK,SAAS,EACd,KAAK,OAAO,EACZ,KAAK,WAAW,EAIjB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAA4B,KAAK,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAErF,OAAO,EAA2B,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACrF,OAAO,EAML,KAAK,YAAY,EACjB,KAAK,cAAc,EACpB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAiBL,KAAK,UAAU,EAKhB,MAAM,sBAAsB,CAAC;AAqB9B,oGAAoG;AACpG,eAAO,MAAM,oBAAoB,WAAW,CAAC;AAC7C,eAAO,MAAM,oBAAoB,6BAA8C,CAAC;AAKhF,8DAA8D;AAC9D,MAAM,WAAW,uBAAwB,SAAQ,cAAc;IAC7D,KAAK,EAAE,OAAO,KAAK,CAAC;IACpB,wDAAwD;IACxD,WAAW,EAAE,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,KAAK,MAAM,CAAC;IACnF,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;IAClC,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5B,KAAK,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,iEAAiE;IACjE,aAAa,EAAE,MAAM,OAAO,CAAC;IAC7B,QAAQ,EAAE,MAAM,YAAY,CAAC;IAC7B,iFAAiF;IACjF,WAAW,EAAE,MAAM,WAAW,CAAC;IAC/B,0CAA0C;IAC1C,OAAO,EAAE,OAAO,CAAC;IACjB,2EAA2E;IAC3E,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,yEAAyE;IACzE,aAAa,EAAE,CAAC,GAAG,EAAE,WAAW,EAAE,KAAK,EAAE,YAAY,KAAK,SAAS,CAAC;IACpE;;;OAGG;IACH,UAAU,EAAE,CAAC,MAAM,EAAE,SAAS,KAAK,IAAI,CAAC;IACxC,iFAAiF;IACjF,cAAc,EAAE,YAAY,CAAC;IAC7B,2EAA2E;IAC3E,aAAa,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;IACtD,6EAA6E;IAC7E,cAAc,EAAE,MAAM,cAAc,CAAC;IACrC,4CAA4C;IAC5C,UAAU,EAAE,MAAM,MAAM,CAAC;IACzB,oEAAoE;IACpE,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAAC;IACjE,gDAAgD;IAChD,SAAS,EAAE,CAAC,KAAK,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,KAAK,MAAM,CAAC;IAClF,sEAAsE;IACtE,aAAa,EAAE,YAAY,CAAC;IAC5B,4EAA4E;IAC5E,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;CACtD;AAgJD;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,GAAE,OAAO,CAAC,uBAAuB,CAAM,GAAG,uBAAuB,CAwB1G;AAm9CD;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,OAAO,EAChB,SAAS,GAAE,OAAO,CAAC,uBAAuB,CAAM,GAC/C,IAAI,CA4CN"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/init.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AASzC,OAAO,EAkBL,KAAK,YAAY,EACjB,KAAK,SAAS,EACd,KAAK,OAAO,EACZ,KAAK,WAAW,EAIjB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAA4B,KAAK,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAErF,OAAO,EAA2B,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACrF,OAAO,EAML,KAAK,YAAY,EACjB,KAAK,cAAc,EACpB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAiBL,KAAK,UAAU,EAKhB,MAAM,sBAAsB,CAAC;AAyB9B,oGAAoG;AACpG,eAAO,MAAM,oBAAoB,WAAW,CAAC;AAC7C,eAAO,MAAM,oBAAoB,6BAA8C,CAAC;AAKhF,8DAA8D;AAC9D,MAAM,WAAW,uBAAwB,SAAQ,cAAc;IAC7D,KAAK,EAAE,OAAO,KAAK,CAAC;IACpB,wDAAwD;IACxD,WAAW,EAAE,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,KAAK,MAAM,CAAC;IACnF,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;IAClC,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5B,KAAK,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,iEAAiE;IACjE,aAAa,EAAE,MAAM,OAAO,CAAC;IAC7B,QAAQ,EAAE,MAAM,YAAY,CAAC;IAC7B,iFAAiF;IACjF,WAAW,EAAE,MAAM,WAAW,CAAC;IAC/B,0CAA0C;IAC1C,OAAO,EAAE,OAAO,CAAC;IACjB,2EAA2E;IAC3E,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,yEAAyE;IACzE,aAAa,EAAE,CAAC,GAAG,EAAE,WAAW,EAAE,KAAK,EAAE,YAAY,KAAK,SAAS,CAAC;IACpE;;;OAGG;IACH,UAAU,EAAE,CAAC,MAAM,EAAE,SAAS,KAAK,IAAI,CAAC;IACxC,iFAAiF;IACjF,cAAc,EAAE,YAAY,CAAC;IAC7B,2EAA2E;IAC3E,aAAa,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;IACtD,6EAA6E;IAC7E,cAAc,EAAE,MAAM,cAAc,CAAC;IACrC,4CAA4C;IAC5C,UAAU,EAAE,MAAM,MAAM,CAAC;IACzB,oEAAoE;IACpE,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAAC;IACjE,gDAAgD;IAChD,SAAS,EAAE,CAAC,KAAK,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,KAAK,MAAM,CAAC;IAClF,sEAAsE;IACtE,aAAa,EAAE,YAAY,CAAC;IAC5B,4EAA4E;IAC5E,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;CACtD;AAgJD;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,GAAE,OAAO,CAAC,uBAAuB,CAAM,GAAG,uBAAuB,CAwB1G;AA6oDD;;;;;;;;;;;;GAYG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,OAAO,EAChB,SAAS,GAAE,OAAO,CAAC,uBAAuB,CAAM,GAC/C,IAAI,CAwDN"}

package/dist/cli/commands/init.js

@@ -10,8 +10,8 @@ import { sessionBaseName } from '../lib/mcp-session-name.js';
 import { runSdk, withSdkDefaults } from '../lib/sdk-command.js';
 import { currentEnginePlatform, ensureReleaseBinary, ensureStandaloneEngine, fetchDownload, readEngineVersion, } from '../lib/relaycast-engine-install.js';
 import { AUTO_ACTIVATE, CORE_START_TIMEOUT_MS, PROBE_DELIVERY, PROBE_VERSION, connectCore, coreSocketPath, deliveryKeys, disableDelivery, enableDelivery, probeAssetName, probeAssetUrl, readCoreState, readDeliveryRecord, readProbeVersion, startCoreProcess, writePrivateJson, } from '../lib/probe-core.js';
-import { shellQuote } from '../lib/agent-registration.js';
-import { claudeFileStates, openCodeConfigDir, openCodeState, tidyClaudeSettings, tidyOpenCodePlugin, } from '../lib/init-leftovers.js';
+import { shellQuote, shellWord } from '../lib/agent-registration.js';
+import { claudeFileStates, openCodeConfigDir, openCodeState, piAgentDir, piState, tidyClaudeSettings, tidyOpenCodePlugin, tidyPiExtension, } from '../lib/init-leftovers.js';
 import { persistWorkspaceSession } from '../lib/workspace-session.js';
 import { readWorkspaceStore } from '../lib/workspace-store.js';
 import { getProjectPaths } from '@agent-relay/config';
@@ -286,22 +286,22 @@ async function verifyWorkspace(deps, origin, key) {
     }
     if (!response.ok)
         throw new Error(`${origin} answered ${response.status} when checking the workspace.`);
-    return workspaceIdIn(response);
+    return workspaceInfoIn(response);
 }
-/** The `id` of a `GET /v1/workspace` answer (`{ok, data: {id}}`), read leniently. */
-async function workspaceIdIn(response) {
+/** The `id` and `name` of a `GET /v1/workspace` answer (`{ok, data: {id, name}}`), read leniently. */
+async function workspaceInfoIn(response) {
+    const text = (value) => typeof value === 'string' && value.trim() ? value.trim() : undefined;
     try {
         const body = (await response.json());
-        const id = body?.data?.id ?? body?.id;
-        return typeof id === 'string' && id.trim() ? id.trim() : undefined;
+        return { id: text(body?.data?.id ?? body?.id), name: text(body?.data?.name ?? body?.name) };
     }
     catch {
-        return undefined;
+        return {};
     }
 }
 /** The workspace id a key belongs to, when its server can say; never throws. */
 async function workspaceIdOf(deps, origin, key) {
-    return verifyWorkspace(deps, origin, key).catch(() => undefined);
+    return verifyWorkspace(deps, origin, key).then((workspace) => workspace.id, () => undefined);
 }
 function parsePort(value) {
     const port = Number.parseInt(value, 10);
@@ -322,14 +322,45 @@ function parseTools(value) {
         throw new InvalidArgumentError(error.message);
     }
 }
-/** A word as the shell reads it: quoted unless it is plainly safe to paste. */
-function shellWord(value) {
-    return /^[A-Za-z0-9._@%+=:,/-]+$/.test(value) ? value : shellQuote(value);
-}
 /** The command that makes `name` the machine-wide active workspace. */
 function switchCommand(name) {
     return `relay workspace switch ${shellWord(name)}`;
 }
+/**
+ * The npm package spec a teammate's `npx` runs: the `next` dist-tag for a
+ * `-next` prerelease (or a build that is not a published version), else
+ * this exact version.
+ */
+function teammatePackage(version) {
+    const published = version?.trim();
+    if (!published || !/^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?$/.test(published) || published.includes('-next')) {
+        return 'agent-relay@next';
+    }
+    return `agent-relay@${published}`;
+}
+/**
+ * The one command a teammate runs in their project to join a hosted
+ * workspace, Relay installed or not: it saves the workspace (named as the
+ * server names it), starts the Agent Relay core and turns on message
+ * injection for their agent tools. `relay workspace join` only saves it.
+ */
+function joinCommand(key, version) {
+    return `npx -y ${teammatePackage(version)} init --key ${shellQuote(key)}`;
+}
+/**
+ * A free name for a workspace joined by key: `name`, unless a saved
+ * workspace under it holds another key, then `name-2` and on.
+ */
+function freeWorkspaceName(name, key) {
+    const saved = readWorkspaceStore().workspaces;
+    const free = (candidate) => !saved[candidate] || saved[candidate]?.key === key;
+    if (free(name))
+        return name;
+    for (let n = 2;; n += 1) {
+        if (free(`${name}-${n}`))
+            return `${name}-${n}`;
+    }
+}
 /**
  * Save the workspace and bind it to this project. It becomes the machine-wide
  * active workspace only when no other one is: a machine already serving a
@@ -362,22 +393,79 @@ function globalScopeNote(setup, scope, installed) {
     return (`In projects without their own workspace, globally set up agent tools use the active workspace "${setup.keptActive}". ` +
         `To make "${setup.workspace}" the machine-wide fallback, run: ${switchCommand(setup.workspace)}`);
 }
+/** A workspace name part: lowercase letters, digits and single dashes. */
+function nameSlug(value) {
+    return value
+        .toLowerCase()
+        .replace(/[^a-z0-9]+/g, '-')
+        .replace(/^-+|-+$/g, '');
+}
+/**
+ * The name `relay init --hosted` gives a new workspace without `--name`:
+ * the person and the project folder (`alice-api`), with a numeric suffix
+ * when a saved workspace already has that name, so a second hosted
+ * workspace never replaces the first in the store.
+ */
+function defaultHostedName(projectRoot) {
+    let user = '';
+    try {
+        user = os.userInfo().username;
+    }
+    catch {
+        // No passwd entry (some containers): the folder alone.
+    }
+    const base = [nameSlug(user), nameSlug(path.basename(projectRoot))].filter(Boolean).join('-').slice(0, 40) || 'relay';
+    const taken = new Set(Object.keys(readWorkspaceStore().workspaces));
+    if (!taken.has(base))
+        return base;
+    for (let n = 2;; n += 1) {
+        if (!taken.has(`${base}-${n}`))
+            return `${base}-${n}`;
+    }
+}
 /**
  * Connect to (or start) the server and save its workspace for this project.
  * This is the original `relay init`; the agent-tool setup comes after it.
  */
 async function setupServer(deps, choice) {
     if (choice.mode === 'own') {
-        const { url, key } = choice;
-        if (!url || !key)
-            throw new Error('Pass --url and --key together for your own server.');
+        const { key } = choice;
+        if (!key)
+            throw new Error('Pass --key with --url for your own server.');
+        // `--key` alone joins the hosted service. A key already bound to a
+        // self-hosted server is never sent there: only an explicit --url moves it.
+        const url = choice.url ?? HOSTED_ORIGIN;
+        const bound = choice.url ? undefined : boundOrigin(key);
+        if (bound && new URL(bound).origin !== HOSTED_ORIGIN) {
+            throw new Error(`This workspace key belongs to ${new URL(bound).origin}, so relay init will not send it to the hosted ` +
+                `service. To use it there, run: relay init --url ${shellWord(new URL(bound).origin)} --key <key>`);
+        }
         const origin = configuredOrigin(url, '--url');
         if (!origin)
             throw new Error('--url is empty.');
-        const workspaceId = await verifyWorkspace(deps, origin, key);
+        const workspace = await verifyWorkspace(deps, origin, key);
+        const workspaceId = workspace.id;
         guardCredentialOrigin(key, url);
-        const name = choice.name ?? new URL(origin).hostname;
+        const hosted = origin === HOSTED_ORIGIN;
+        // Named as the person says, else as the server names the workspace.
+        const name = choice.name ??
+            freeWorkspaceName(workspace.name ??
+                (hosted ? defaultHostedName(deps.toolContext().projectRoot) : new URL(origin).hostname), key);
         const { lines, ...saved } = saveWorkspace(name, key);
+        // A teammate joining a hosted workspace by key: the hosted service, not
+        // a server of their own. It stays an `own` setup: init did not create
+        // the workspace, so its name never stands in for a workspace id when
+        // checking which workspace the core serves (`sameWorkspace`).
+        if (hosted) {
+            return {
+                ...saved,
+                workspaceId,
+                mode: 'own',
+                origin,
+                headline: `Joined hosted workspace "${name}" (${origin}).`,
+                details: ['Your key is only ever sent to the hosted service.', ...lines],
+            };
+        }
         return {
             ...saved,
             workspaceId,
@@ -388,7 +476,7 @@ async function setupServer(deps, choice) {
         };
     }
     if (choice.mode === 'hosted') {
-        const name = choice.name ?? `relay-${os.hostname().split('.')[0]}`;
+        const name = choice.name ?? defaultHostedName(deps.toolContext().projectRoot);
         const relay = await deps.createWorkspace(name, HOSTED_ORIGIN);
         if (!relay.workspaceKey)
             throw new Error('The hosted service did not return a workspace key.');
@@ -400,9 +488,11 @@ async function setupServer(deps, choice) {
             origin: HOSTED_ORIGIN,
             headline: `Created hosted workspace "${name}".`,
             details: [
+                ...(choice.name ? [] : [`Named after you and this folder; pass --name to choose another.`]),
                 ...lines,
-                'On another machine, join it with (treat this key like a password):',
-                `  relay workspace join ${name} ${relay.workspaceKey}`,
+                'On another machine, run this in the project to join it and connect its agent tools ' +
+                    '(treat this key like a password):',
+                `  ${joinCommand(relay.workspaceKey, deps.cliVersion)}`,
             ],
         };
     }
@@ -416,7 +506,7 @@ async function setupServer(deps, choice) {
         // Only a key the server refuses is replaced. A timeout or server
         // error is reported instead, so a hiccup never swaps the workspace
         // (and its agents and messages) for a new one.
-        workspaceId = await verifyWorkspace(deps, origin, workspaceKey).catch((error) => {
+        workspaceId = await verifyWorkspace(deps, origin, workspaceKey).then((workspace) => workspace.id, (error) => {
             if (!(error instanceof WorkspaceKeyRejectedError))
                 throw error;
             workspaceKey = undefined;
@@ -726,10 +816,12 @@ async function setupInjection(deps, tools, setup) {
         // included, instead of the hold the core writes on each login.
         const before = tools.includes('claude') ? claudeInboundValues(ctx) : {};
         // The files the core is about to edit, as they are now: what --uninstall
-        // tidies back to (a settings.json or plugins folder init created).
+        // tidies back to (a settings.json, plugins or extensions folder, or off
+        // marker init created).
         const files = {
             claudeFiles: tools.includes('claude') ? claudeFileStates(claudeLoginSettings(ctx)) : undefined,
             openCode: tools.includes('opencode') ? openCodeState(openCodeConfigDir(ctx.env, ctx.home)) : undefined,
+            pi: tools.includes('pi') ? piState(piAgentDir(ctx.env, ctx.home), ctx.home) : undefined,
         };
         const { results, turnedOn, turnedOff } = await enableDelivery(session.client, tools, record.turnedOn);
         // Applied to the record as it is now, not as it was read: another
@@ -756,6 +848,7 @@ async function setupInjection(deps, tools, setup) {
                 openCode: touched.includes('opencode_plugin')
                     ? (current.openCode ?? files.openCode)
                     : current.openCode,
+                pi: touched.includes('pi_extension') ? (current.pi ?? files.pi) : current.pi,
             });
         });
         try {
@@ -787,6 +880,31 @@ async function setupInjection(deps, tools, setup) {
         session.client.close();
     }
 }
+/** The bytes of the regular file `file` is or links to; undefined when there is none. */
+function readIfFile(file) {
+    let fd;
+    try {
+        // One descriptor for the check and the read, so they see the same file.
+        fd = fs.openSync(file, fs.constants.O_RDONLY | fs.constants.O_NONBLOCK);
+        return fs.fstatSync(fd).isFile() ? fs.readFileSync(fd) : undefined;
+    }
+    catch {
+        return undefined;
+    }
+    finally {
+        if (fd !== undefined)
+            fs.closeSync(fd);
+    }
+}
+/** Puts `bytes` back in `file`; a failure leaves the core's marker, which means the same. */
+function restoreBytes(file, bytes) {
+    try {
+        fs.writeFileSync(file, bytes);
+    }
+    catch {
+        // The core's own marker stays: Pi is still off.
+    }
+}
 /** Settings init turned on that are neither recorded nor turned off: setup stops. */
 class InjectionStuckError extends Error {
 }
@@ -809,6 +927,9 @@ async function undoUnrecorded(client, turnedOn, before, files, cause) {
     if (turnedOn.includes('opencode_plugin') && !failed('opencode_plugin') && files.openCode) {
         tidyOpenCodePlugin(files.openCode);
     }
+    if (turnedOn.includes('pi_extension') && !failed('pi_extension') && files.pi) {
+        tidyPiExtension(files.pi);
+    }
     if (failures.length > 0) {
         throw new InjectionStuckError(`Could not save ${deliveryRecordPath()} (${cause.message}), and these settings relay init turned on ` +
             `could not be turned off again: ${failures.join('; ')}. Turn them off with ` +
@@ -1000,13 +1121,14 @@ const CLAUDE_FILE_KEYS = ['direct_delivery', 'claude_session_hook'];
 /**
  * Once nothing init turned on edits a tool's files any more, tidies them
  * back to how init found them (a Claude settings.json init created, the
- * OpenCode plugin's off marker) and drops their recorded state. Run after
+ * OpenCode plugin's and Pi extension's off markers) and drops their
+ * recorded state. Run after
  * the core turned the settings off and the original crossSessionInbound is
  * back.
  * @returns The record without the states it used
  */
 function tidyLeftovers(record) {
-    let { claudeFiles, openCode } = record;
+    let { claudeFiles, openCode, pi } = record;
     if (claudeFiles && !record.turnedOn.some((key) => CLAUDE_FILE_KEYS.includes(key))) {
         tidyClaudeSettings(claudeFiles);
         claudeFiles = undefined;
@@ -1015,11 +1137,16 @@ function tidyLeftovers(record) {
         tidyOpenCodePlugin(openCode);
         openCode = undefined;
     }
+    if (pi && !record.turnedOn.includes('pi_extension')) {
+        tidyPiExtension(pi);
+        pi = undefined;
+    }
     return {
         turnedOn: record.turnedOn,
         claudeInbound: record.claudeInbound,
         ...(claudeFiles ? { claudeFiles } : {}),
         ...(openCode ? { openCode } : {}),
+        ...(pi ? { pi } : {}),
     };
 }
 /**
@@ -1040,6 +1167,7 @@ function writeDeliveryRecord(record) {
         ...(Object.keys(record.claudeInbound).length > 0 ? { claudeInbound: record.claudeInbound } : {}),
         ...(record.claudeFiles ? { claudeFiles: record.claudeFiles } : {}),
         ...(record.openCode ? { openCode: record.openCode } : {}),
+        ...(record.pi ? { pi: record.pi } : {}),
     });
 }
 /**
@@ -1070,7 +1198,17 @@ async function turnOffInjection(deps, keys) {
         throw new Error(`Could not reach the Agent Relay core to turn off message injection: ${session.reason}`);
     }
     try {
+        // A Pi off marker already there was the person's own opt-out after init
+        // (the desktop app's switch), not this run's: it is kept, byte for byte,
+        // though turning pi_extension off rewrites it.
+        const pi = readDeliveryRecord(deliveryRecordPath()).pi;
+        const piOptedOut = keys.includes('pi_extension') &&
+            pi !== undefined &&
+            fs.lstatSync(pi.marker, { throwIfNoEntry: false }) !== undefined;
+        const piMarker = piOptedOut && pi ? readIfFile(pi.marker) : undefined;
         const failures = await disableDelivery(session.client, keys);
+        if (pi && piMarker)
+            restoreBytes(pi.marker, piMarker);
         const done = keys.filter((key) => !failures.some((failure) => failure.startsWith(`${key}:`)));
         const ctx = deps.toolContext();
         updateDeliveryRecord((current) => {
@@ -1078,6 +1216,8 @@ async function turnOffInjection(deps, keys) {
                 restoreClaudeInbound(recordedClaudeFiles(current, ctx));
             return tidyLeftovers({
                 ...current,
+                // Kept as if it had been there before init; an extensions folder init created still goes.
+                ...(piOptedOut && current.pi ? { pi: { ...current.pi, off: true } } : {}),
                 turnedOn: current.turnedOn.filter((key) => !done.includes(key)),
                 claudeInbound: done.includes('direct_delivery') ? {} : current.claudeInbound,
             });
@@ -1132,11 +1272,12 @@ async function stopCore(deps, quiet = false) {
     fs.rmSync(coreStatePath(), { force: true });
 }
 function serverChoiceFromFlags(o) {
-    if (Boolean(o.url) !== Boolean(o.key))
-        throw new Error('Pass --url and --key together for your own server.');
+    if (o.url && !o.key)
+        throw new Error('Pass --key with --url for your own server.');
     if (o.url && o.hosted)
         throw new Error('Choose either --hosted or --url/--key.');
-    if (o.url)
+    // A key joins its workspace: on --url's server, else on the hosted service.
+    if (o.key)
         return { mode: 'own', url: o.url, key: o.key, name: o.name, port: o.port };
     if (o.hosted)
         return { mode: 'hosted', name: o.name, port: o.port };
@@ -1231,7 +1372,7 @@ async function runPlain(deps, o) {
         deps.log(line);
     const ctx = deps.toolContext();
     const tools = o.tools ?? detectTools(ctx).map((tool) => tool.id);
-    const scope = o.scope ?? 'project';
+    const scope = o.scope ?? 'global';
     const plan = await planDelivery(deps, tools, o.delivery ?? 'inject', setup, ctx);
     if (plan.injection) {
         deps.log('');
@@ -1279,6 +1420,28 @@ async function runPlain(deps, o) {
         deps.log(`  ${line}`);
     for (const line of CLI_FALLBACK)
         deps.log(`  ${line}`);
+    deps.log('');
+    for (const line of choicesSummary(o, setup, tools, scope))
+        deps.log(line);
+}
+/**
+ * What a `relay init` that asked nothing chose, each with the flag that
+ * changes it, so the defaults are never a surprise.
+ */
+function choicesSummary(o, setup, tools, scope) {
+    const where = setup.mode === 'local'
+        ? 'this machine (--hosted for agents on other machines, or --url and --key for your own server)'
+        : setup.mode === 'hosted' && !o.url
+            ? `hosted workspace "${setup.workspace}"${o.name ? '' : ' (--name to name it)'}`
+            : `workspace "${setup.workspace}" on ${setup.origin}`;
+    const toolList = tools.length > 0 ? tools.join(', ') : 'none';
+    return [
+        'Chosen without asking:',
+        `  Server:  ${where}`,
+        `  Tools:   ${toolList}${o.tools ? '' : ' (the ones installed here; --tools to choose)'}`,
+        `  Scope:   ${scope}${o.scope ? '' : ' (--scope project for this project only)'}`,
+        'To choose each step yourself, run: relay init --interactive',
+    ];
 }
 /**
  * Codex reads a project's .codex/config.toml only once that project is
@@ -1425,11 +1588,10 @@ async function runGuided(deps, o) {
     p.note(summary.join('\n'), 'Installation Summary');
     if (delivery === 'mcp' && launch.warning)
         p.warn(launch.warning);
-    if (!o.yes) {
-        const proceed = await p.confirm({ message: 'Proceed with installation?', initialValue: true });
-        if (proceed === CANCELLED || !proceed)
-            return cancelled();
-    }
+    // `--interactive` asks to the end; `--yes` changes nothing here either.
+    const proceed = await p.confirm({ message: 'Proceed with installation?', initialValue: true });
+    if (proceed === CANCELLED || !proceed)
+        return cancelled();
     const injecting = p.spinner();
     if (delivery === 'inject')
         injecting.start('Setting up message injection');
@@ -1483,8 +1645,10 @@ function parseDelivery(value) {
  * machine by default, the hosted service, or your own server), then connect
  * your agent tools. By default the Agent Relay core injects messages into
  * their running sessions; `--delivery mcp` (or a machine the core cannot run
- * on) uses the Relay MCP server instead. In a terminal it asks; with `--yes`
- * or without a TTY it uses flags and defaults.
+ * on) uses the Relay MCP server instead. It asks nothing: flags, then
+ * defaults (this machine, every installed tool, global scope), and a summary
+ * of what it chose. `--interactive` asks each step in a terminal; `--yes` is
+ * accepted and changes nothing.
  *
  * @param program - The commander program to add the command to.
  * @param overrides - Dependencies to replace, typically in tests.
@@ -1493,19 +1657,21 @@ export function registerInitCommand(program, overrides = {}) {
     const deps = withInitDefaults(overrides);
     program
         .command('init')
-        .description('Set up Relay and connect your agent tools: a private server on this machine (default), the hosted ' +
-        'service (--hosted), or your own server (--url and --key); then the Agent Relay core injects messages ' +
-        'into running Claude Code, Codex, OpenCode, Grok, Pi and Devin sessions')
+        .description('Set up Relay and connect your agent tools without asking: a private server on this machine (default), ' +
+        'the hosted service (--hosted), or your own server (--url and --key), every installed agent tool, and ' +
+        'the Agent Relay core injecting messages into running Claude Code, Codex, OpenCode, Grok, Pi and Devin ' +
+        'sessions. --interactive asks each step instead')
         .option('--hosted', 'Use the hosted service so agents on other machines can join')
-        .option('--url <url>', 'Your own Relaycast server')
-        .option('--key <key>', 'Workspace key for your own server')
-        .option('--name <name>', 'Workspace name to save this as')
+        .option('--url <url>', 'Your own Relaycast server (with --key)')
+        .option('--key <key>', 'Join the workspace this key belongs to: hosted, or on --url')
+        .option('--name <name>', 'Workspace name to save this as (default: the one its server names)')
         .option('--port <port>', 'Port for the local server', parsePort, DEFAULT_LOCAL_PORT)
         .option('--tools <tools>', `Agent tools to connect: ${TOOL_IDS.join(',')}, all, or none (default: the ones installed here)`, parseTools)
         .option('--delivery <delivery>', 'inject (default): the Agent Relay core types messages into running sessions; mcp: the Relay MCP ' +
         'server, whose inbox agents check', parseDelivery)
-        .option('--scope <scope>', 'Where the Relay MCP server goes: project or global (injection is always per user)', parseScope)
-        .option('-y, --yes', 'Do not ask; use flags and defaults')
+        .option('--scope <scope>', 'Where the Relay MCP server goes: global (default) or project (injection is always per user)', parseScope)
+        .option('-i, --interactive', 'Ask where agents talk, which agent tools to connect and where the MCP server goes')
+        .option('-y, --yes', 'Accepted for older scripts: relay init asks nothing unless --interactive')
         .option('--uninstall', 'Remove the Relay MCP entries relay init added (both scopes unless --scope) and turn off the injection it turned on')
         .option('--stop', 'Stop the local server and the Agent Relay core started by relay init')
         .action(async (o) => {
@@ -1514,8 +1680,12 @@ export function registerInitCommand(program, overrides = {}) {
                 return stopLocalServer(deps);
             if (o.uninstall)
                 return uninstall(deps, o);
-            if (!o.yes && deps.isInteractive())
+            if (o.interactive) {
+                if (!deps.isInteractive()) {
+                    throw new Error('relay init --interactive needs a terminal; run relay init without it to use the defaults.');
+                }
                 return runGuided(deps, o);
+            }
             return runPlain(deps, o);
         });
     });