@piagent/platform 1.45.0 → 1.46.0

package/docs-site/whats-new.html

@@ -37,7 +37,7 @@
         <span class="brand-mark"><img src="/assets/piagent-logo.svg" alt="" width="28" height="28" /></span>
         <span class="brand-name"><b>Piagent</b> <span>Platform</span></span>
       </a>
-      <a class="version-badge" href="/whats-new" data-docs-version="v1.45.0" title="v1.45.0 docs · VI"><span class="dot"></span>v1.45.0</a>
+      <a class="version-badge" href="/whats-new" data-docs-version="v1.46.0" title="v1.46.0 docs · VI"><span class="dot"></span>v1.46.0</a>
       <nav class="top-nav" aria-label="Tài liệu">
         <a href="/quickstart">Tài liệu</a>
         <a href="/whats-new" aria-current="page">Changelog</a>
@@ -108,7 +108,21 @@
 <div class="release-filter" role="toolbar" aria-label="Lọc theo loại thay đổi"><button type="button" data-filter-kind="all" aria-pressed="true">Tất cả</button><button type="button" data-filter-kind="new" aria-pressed="false">Mới</button><button type="button" data-filter-kind="improved" aria-pressed="false">Cải thiện</button><button type="button" data-filter-kind="fixed" aria-pressed="false">Sửa lỗi</button><button type="button" data-filter-kind="security" aria-pressed="false">Bảo mật</button></div>
 <section class="section releases" data-releases>
 <h2 id="latest" class="sr-only">Mới nhất</h2>
-<article class="release latest" id="v1-45-0" data-release>
+<article class="release latest" id="v1-46-0" data-release>
+  <div class="release-meta"><a class="release-version" href="#v1-46-0">v1.46.0</a><time class="release-date" datetime="2026-10-28">28/10/2026</time></div>
+  <div class="release-body">
+    <h3 data-toc-skip id="v1-46-0-title">Piagent chạy trong Pi home riêng, pi của bạn giữ nguyên bản gốc</h3>
+    <p>Piagent cài vào ~/.piagent/agent và mở bằng <code>piagent</code>. <code>pi</code> thường không còn nạp Piagent, add-on, danh sách model hay panel footer.</p>
+    <ul class="release-items">
+      <li data-kind="breaking"><span class="kind kind-breaking">Thay đổi lớn</span><span>Piagent cài vào Pi home riêng ~/.piagent/agent và mở bằng <code>piagent</code>. <code>pi</code> thường trong ~/.pi/agent giữ nguyên bản gốc.</span></li>
+      <li data-kind="new"><span class="kind kind-new">Mới</span><span>Lần cài đầu trong terminal hỏi cài add-on nào và có dùng lại login của pi không; cờ dòng lệnh trả lời trước được.</span></li>
+      <li data-kind="new"><span class="kind kind-new">Mới</span><span><code>piagent restore-pi --apply</code> dời bản cài cũ khỏi ~/.pi/agent, có sao lưu; installer tự làm khi cập nhật.</span></li>
+      <li data-kind="fixed"><span class="kind kind-fixed">Sửa lỗi</span><span>Khi cài pi-mcp-adapter, Piagent tắt mcp có sẵn của Pi trong home của mình nên /mcp không còn xung đột.</span></li>
+    </ul>
+    <p class="release-requires"><strong>Cần:</strong> Agent Watch 0.15.16 để thấy session cá nhân của Piagent</p>
+  </div>
+</article>
+<article class="release" id="v1-45-0" data-release>
   <div class="release-meta"><a class="release-version" href="#v1-45-0">v1.45.0</a><time class="release-date" datetime="2026-10-28">28/10/2026</time></div>
   <div class="release-body">
     <h3 data-toc-skip id="v1-45-0-title">File và ảnh trong prompt theo đúng quyền đọc, terminal không còn đứng hình</h3>
@@ -407,28 +421,26 @@
     </ul>
   </div>
 </article>
-<article class="release" id="v1-38-0" data-release>
-  <div class="release-meta"><a class="release-version" href="#v1-38-0">v1.38.0</a><time class="release-date" datetime="2026-10-23">23/10/2026</time></div>
-  <div class="release-body">
-    <h3 data-toc-skip id="v1-38-0-title">Piagent thành editor, Bypass không hỏi gì <span class="tag">không phát hành</span></h3>
-    <p>Dashboard có file, terminal, review inline và checkpoint, cùng chế độ Bypass không hỏi gì, cả trong cuộc trò chuyện công ty khi Harness cho phép.</p>
-    <ul class="release-items">
-      <li data-kind="breaking"><span class="kind kind-breaking">Thay đổi lớn</span><span>Cuộc trò chuyện công ty có Hỏi trước, Toàn quyền (trước đây gọi là Bypass) và Bypass, chỉ có khi Harness cho phép.</span></li>
-      <li data-kind="new"><span class="kind kind-new">Mới</span><span>Chế độ <code>bypass</code> (<code>/permission bypass</code>, <code>piagent-auto --bypass</code>) tắt mọi bước chặn; output vẫn được che secret và <code>/undo</code> vẫn hoàn tác được.</span></li>
-      <li data-kind="new"><span class="kind kind-new">Mới</span><span>Dashboard mở, sửa, lưu, đổi tên và xóa file của project, có Cmd/Ctrl+P, tìm kiếm và báo xung đột khi file đã đổi trên đĩa.</span></li>
-      <li data-kind="new"><span class="kind kind-new">Mới</span><span>Terminal của project ngay trên dashboard; terminal của cuộc trò chuyện công ty chạy trong sandbox, cả trên macOS, không bao giờ chạy trên host.</span></li>
-      <li data-kind="new"><span class="kind kind-new">Mới</span><span>Review inline từng hunk agent sửa với Giữ và Hoàn tác, và khôi phục trong Timeline có xem trước, dùng chung checkpoint với <code>/undo</code>.</span></li>
-      <li data-kind="fixed"><span class="kind kind-fixed">Sửa lỗi</span><span>Checkpoint không tạo được từng chặn mọi lần sửa; giờ thì không, và snapshot mất khoảng 0,5 s thay vì 35 s trên repo 4.000 file.</span></li>
-    </ul>
-    <p class="release-requires"><strong>Cần:</strong> Agent Studio 0.38.0 và Agent Watch 0.15.14 (Windows 0.1.17) cho mức Bypass ở chế độ công ty</p>
-  </div>
-</article>
 </section>
 <section class="section archive">
   <h2 id="archive">Các bản trước</h2>
   <p class="section-lead">Bản cũ hơn, gom theo tháng. Mở một tháng để xem từng thay đổi.</p>
   <details class="release-archive">
-    <summary><span>Tháng 10/2026</span><span class="archive-count">56</span></summary>
+    <summary><span>Tháng 10/2026</span><span class="archive-count">57</span></summary>
+    <div class="archive-row" id="v1-38-0">
+      <div class="archive-head"><a class="release-version" href="#v1-38-0">v1.38.0</a> <span class="release-date">23/10/2026</span></div>
+      <div class="archive-body">
+        <p><strong>Piagent thành editor, Bypass không hỏi gì</strong> <span class="tag">không phát hành</span> — Dashboard có file, terminal, review inline và checkpoint, cùng chế độ Bypass không hỏi gì, cả trong cuộc trò chuyện công ty khi Harness cho phép.</p>
+        <ul class="release-items">
+        <li data-kind="breaking"><span class="kind kind-breaking">Thay đổi lớn</span><span>Cuộc trò chuyện công ty có Hỏi trước, Toàn quyền (trước đây gọi là Bypass) và Bypass, chỉ có khi Harness cho phép.</span></li>
+        <li data-kind="new"><span class="kind kind-new">Mới</span><span>Chế độ <code>bypass</code> (<code>/permission bypass</code>, <code>piagent-auto --bypass</code>) tắt mọi bước chặn; output vẫn được che secret và <code>/undo</code> vẫn hoàn tác được.</span></li>
+        <li data-kind="new"><span class="kind kind-new">Mới</span><span>Dashboard mở, sửa, lưu, đổi tên và xóa file của project, có Cmd/Ctrl+P, tìm kiếm và báo xung đột khi file đã đổi trên đĩa.</span></li>
+        <li data-kind="new"><span class="kind kind-new">Mới</span><span>Terminal của project ngay trên dashboard; terminal của cuộc trò chuyện công ty chạy trong sandbox, cả trên macOS, không bao giờ chạy trên host.</span></li>
+        <li data-kind="new"><span class="kind kind-new">Mới</span><span>Review inline từng hunk agent sửa với Giữ và Hoàn tác, và khôi phục trong Timeline có xem trước, dùng chung checkpoint với <code>/undo</code>.</span></li>
+        <li data-kind="fixed"><span class="kind kind-fixed">Sửa lỗi</span><span>Checkpoint không tạo được từng chặn mọi lần sửa; giờ thì không, và snapshot mất khoảng 0,5 s thay vì 35 s trên repo 4.000 file.</span></li>
+        </ul>
+      </div>
+    </div>
     <div class="archive-row" id="v1-37-1">
       <div class="archive-head"><a class="release-version" href="#v1-37-1">v1.37.1</a> <span class="release-date">22/10/2026</span></div>
       <div class="archive-body">

package/docs-site/windows.html

@@ -37,7 +37,7 @@
         <span class="brand-mark"><img src="/assets/piagent-logo.svg" alt="" width="28" height="28" /></span>
         <span class="brand-name"><b>Piagent</b> <span>Platform</span></span>
       </a>
-      <a class="version-badge" href="/whats-new" data-docs-version="v1.45.0" title="v1.45.0 docs · VI"><span class="dot"></span>v1.45.0</a>
+      <a class="version-badge" href="/whats-new" data-docs-version="v1.46.0" title="v1.46.0 docs · VI"><span class="dot"></span>v1.46.0</a>
       <nav class="top-nav" aria-label="Tài liệu">
         <a href="/quickstart">Tài liệu</a>
         <a href="/whats-new">Changelog</a>

package/docs-site/workflows.html

@@ -37,7 +37,7 @@
         <span class="brand-mark"><img src="/assets/piagent-logo.svg" alt="" width="28" height="28" /></span>
         <span class="brand-name"><b>Piagent</b> <span>Platform</span></span>
       </a>
-      <a class="version-badge" href="/whats-new" data-docs-version="v1.45.0" title="v1.45.0 docs · VI"><span class="dot"></span>v1.45.0</a>
+      <a class="version-badge" href="/whats-new" data-docs-version="v1.46.0" title="v1.46.0 docs · VI"><span class="dot"></span>v1.46.0</a>
       <nav class="top-nav" aria-label="Tài liệu">
         <a href="/quickstart">Tài liệu</a>
         <a href="/whats-new">Changelog</a>

package/evals/private-holdout-v1/public-exposure.v2.json

@@ -256,8 +256,8 @@
     },
     {
       "path": "tests",
-      "fileCount": 634,
-      "sha256": "a3731ca8ba76de242f6ce801a4bd1e9a1e61951fe6dcada375503ab9976197be"
+      "fileCount": 635,
+      "sha256": "e192ed7528a5d5a992cd33c3837ee6f779b404e45cedc06f79978e2bfa9272eb"
     }
   ],
   "custodianComparisonRules": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@piagent/platform",
-  "version": "1.45.0",
+  "version": "1.46.0",
   "license": "MIT",
   "publishConfig": {
     "access": "public",

package/packages/piagent-core/benchmark/benchmark-bootstrap.js

@@ -494,7 +494,9 @@ function requestedPiProvider(model, configRoot, credentials) {
 }
 
 function snapshotPiAgentHome(temporaryRoot, runtimeParent, argv, cwd, replay, { providerFreeFinalization = false } = {}) {
-  const sourceRoot = path.resolve(process.env.PI_CODING_AGENT_DIR || path.join(os.homedir(), ".pi", "agent"));
+  // Piagent's own Pi home holds the login benchmarks borrow (see extensions/agent-home.js).
+  const personal = path.resolve(os.homedir(), ".pi", "agent"), configured = process.env.PI_CODING_AGENT_DIR;
+  const sourceRoot = path.resolve(process.env.PIAGENT_AGENT_DIR || (configured && path.resolve(configured) !== personal ? configured : path.join(os.homedir(), ".piagent", "agent")));
   const configRoot = path.join(temporaryRoot, "pi-agent-config");
   fs.mkdirSync(configRoot, { recursive: true, mode: 0o700 });
   const copied = [];

package/packages/piagent-core/extensions/agent-home.d.ts

@@ -0,0 +1,4 @@
+export function personalPiAgentDir(home?: string): string;
+export function piagentAgentDir(env?: NodeJS.ProcessEnv, home?: string): string;
+export function agentWatchControlDir(home?: string): string;
+export function dormantInPersonalPi(env?: NodeJS.ProcessEnv, home?: string, argv?: string[]): boolean;

package/packages/piagent-core/extensions/agent-home.js

@@ -0,0 +1,52 @@
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+
+// Piagent runs Pi from its own home (~/.piagent/agent) so the member's
+// personal `pi` stays the stock host: no Piagent package, add-ons, model scope
+// or footer panel lands in ~/.pi/agent. Agent Watch still reads its control
+// files (runtime record, managed binding, status) from ~/.pi/agent, so those
+// stay where Watch looks; Pi itself ignores them.
+
+/** The stock Pi home, the member's personal `pi`. */
+export function personalPiAgentDir(home = os.homedir()) {
+  return path.resolve(home, ".pi", "agent");
+}
+
+/**
+ * Where Piagent's Pi keeps settings, packages, login and sessions. An explicit
+ * PIAGENT_AGENT_DIR wins; a PI_CODING_AGENT_DIR that points anywhere but the
+ * personal home is honoured (tests, benchmarks, custom setups); otherwise
+ * ~/.piagent/agent.
+ */
+export function piagentAgentDir(env = process.env, home = os.homedir()) {
+  const own = env.PIAGENT_AGENT_DIR?.trim();
+  if (own) return path.resolve(own);
+  const configured = env.PI_CODING_AGENT_DIR?.trim();
+  if (configured && path.resolve(configured) !== personalPiAgentDir(home)) return path.resolve(configured);
+  return path.resolve(home, ".piagent", "agent");
+}
+
+/** Agent Watch's files: the runtime record, the managed binding and status. */
+export function agentWatchControlDir(home = os.homedir()) {
+  return personalPiAgentDir(home);
+}
+
+function realpath(file) {
+  try { return fs.realpathSync(file); } catch { return path.resolve(file); }
+}
+
+/**
+ * True when this process is the stock `pi` command running from the personal
+ * home: Piagent was registered there by an older release or a project's
+ * .pi/settings.json, and it stays out of the member's way. Hosts that embed Pi
+ * (studio, dashboard gateway, benchmarks) and `piagent` itself are never
+ * dormant; PIAGENT_ACTIVE=1 opts a personal `pi` back in.
+ */
+export function dormantInPersonalPi(env = process.env, home = os.homedir(), argv = process.argv) {
+  if (env.PIAGENT_ACTIVE === "1") return false;
+  const configured = env.PI_CODING_AGENT_DIR?.trim();
+  if (configured && path.resolve(configured) !== personalPiAgentDir(home)) return false;
+  const entry = argv[1] ? realpath(argv[1]) : "";
+  return /[\\/]@earendil-works[\\/]pi-coding-agent[\\/]/.test(entry);
+}

package/packages/piagent-core/extensions/piagent-guard.ts

@@ -37,6 +37,7 @@ import {
 } from "./redaction-core.js";
 import { detectProfileName } from "./project-shape.js";
 import { evaluateUpdateCheck, isInstalledPlatform, readUpdateCache, startUpdateProbe } from "./update-check.js";
+import { dormantInPersonalPi, personalPiAgentDir } from "./agent-home.js";
 import {
   REPOSITORY_SCOPES,
   collectServers,
@@ -366,7 +367,7 @@ const PLATFORM_ROOT = findPlatformRoot(path.dirname(fileURLToPath(import.meta.ur
 // package's and the user's (also those kept for other coding agents, such as
 // ~/.claude/skills). Reading them is allowed; writes stay in the project.
 const SKILL_READ_ROOTS = [path.join(PLATFORM_ROOT, "packages", "piagent-core", "skills"),
-  path.join(process.env.PI_CODING_AGENT_DIR || path.join(os.homedir(), ".pi", "agent"), "skills"), ...userSkillFolders()]
+  path.join(process.env.PI_CODING_AGENT_DIR || personalPiAgentDir(), "skills"), path.join(personalPiAgentDir(), "skills"), ...userSkillFolders()]
   .flatMap((root) => { try { return [fs.realpathSync.native(root)]; } catch { return []; } });
 const UPDATE_CHECK_MODULE = fileURLToPath(new URL("./update-check.js", import.meta.url));
 // The installed version, read from the package this file ships in. A maintainer
@@ -3452,6 +3453,9 @@ function activeSessionTask(_cwd: string, _sessionId: string): TaskContract | und
 const noTask = (..._args: unknown[]): undefined => undefined;
 
 export default function piagentGuard(pi: ExtensionAPI) {
+  // The member's own `pi` stays stock even when an older install or a project
+  // still registers this package there; Piagent runs through `piagent`.
+  if (dormantInPersonalPi()) return;
   const extensionDir = path.dirname(fileURLToPath(import.meta.url));
   const policy = loadPolicy(extensionDir);
   const bashResults = createBashResultLedger({ maxEntries: 300 });

package/packages/piagent-core/mcp/mcp-config-layers.js

@@ -44,7 +44,10 @@ export function configPathForScope(scope, options = {}) {
     case "global":
       return path.join(env.XDG_CONFIG_HOME || path.join(home, ".config"), "mcp", "mcp.json");
     case "pi-global":
-      return path.join(env.PI_CODING_AGENT_DIR || path.join(home, ".pi", "agent"), "mcp.json");
+      // Piagent's own Pi home, not the member's personal pi (see extensions/agent-home.js).
+      if (env.PIAGENT_AGENT_DIR) return path.join(env.PIAGENT_AGENT_DIR, "mcp.json");
+      if (env.PI_CODING_AGENT_DIR && path.resolve(env.PI_CODING_AGENT_DIR) !== path.resolve(home, ".pi", "agent")) return path.join(env.PI_CODING_AGENT_DIR, "mcp.json");
+      return path.join(home, ".piagent", "agent", "mcp.json");
     case "project":
       return path.join(projectPath, ".mcp.json");
     case "pi-project":

package/packages/piagent-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@piagent/core",
-  "version": "1.45.0",
+  "version": "1.46.0",
   "type": "module",
   "private": true,
   "license": "MIT",

package/packages/piagent-webui/extension/piagent-webui.ts

@@ -34,6 +34,7 @@ import { VSCodeHandoff } from "./vscode-handoff.ts";
 import { browserCommand } from "../../piagent-core/runtime/host/browser-opener.mjs";
 import { TerminalSessionAdapter } from "./terminal-session-adapter.ts";
 import { isGatewayRuntimeContext } from "../ownership/gateway-runtime-context.ts";
+import { dormantInPersonalPi } from "../../piagent-core/extensions/agent-home.js";
 
 const PACKAGE_ROOT = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
 const PLATFORM_ROOT = path.resolve(PACKAGE_ROOT, "../..");
@@ -183,6 +184,7 @@ function readMethod(provider: CoreInspectionProvider, queue: HeldMessageQueue, s
 }
 
 export default function piagentWebUiExtension(pi: ExtensionAPI): void {
+  if (dormantInPersonalPi()) return;
   const runtimeInstanceId = createWebUiExtensionRuntimeInstanceRef();
   let terminalAdapter: TerminalSessionAdapter | null = null;
   const managers = new Map<string, Manager>();

package/packages/piagent-webui/gateway/gateway-service.ts

@@ -53,6 +53,7 @@ import { CompanyRelay, type CompanyConnector } from "./company-relay.ts";
 import { ProviderAuthBroker } from "./provider-auth-broker.ts";
 import { McpAuthBroker } from "./mcp-auth-broker.ts";
 import { AgentStatusFiles } from "./agent-status-files.ts";
+import { agentWatchControlDir, piagentAgentDir } from "../../piagent-core/extensions/agent-home.js";
 import type { ScopedBrokerRouter, RuntimeFactory } from "./session-runtime-factory.ts";
 import { UiPreferencesStore } from "./ui-preferences-store.ts";
 
@@ -249,7 +250,9 @@ export async function startPiagentGateway(options: {
     // Agent Watch reads the member's ~/.pi/agent/status. The dashboard's
     // agentDir is that folder; the company Gateway's is its private session
     // folder under Agent Watch, so it writes to the member's folder instead.
-    statusFiles = new AgentStatusFiles((options.managed ? path.join(os.homedir(), ".pi", "agent", "status", "company") : path.join(state.agentDir, "status", "dashboard")), async () => { const catalog = await readCatalog(); if (catalog.state !== "ready") throw new Error("catalog-not-ready"); return catalog; }, () => Boolean(options.managed)); statusFiles.start();
+    // Piagent's own home serves the member's dashboard; a test or benchmark home keeps its status beside it.
+    const watchRoot = options.managed || state.agentDir === piagentAgentDir() ? agentWatchControlDir() : state.agentDir;
+    statusFiles = new AgentStatusFiles(path.join(watchRoot, "status", options.managed ? "company" : "dashboard"), async () => { const catalog = await readCatalog(); if (catalog.state !== "ready") throw new Error("catalog-not-ready"); return catalog; }, () => Boolean(options.managed)); statusFiles.start();
     const projectFolder = async (projectRef: string) => projects.resolve(projectRef)
       ?? (await runtimes!.listSessions()).find((info) => typeof info.cwd === "string" && projectRefForCwd(key, info.cwd) === projectRef)?.cwd
       ?? (relay ? (await relay.folders()).find((folder) => projectRefForCwd(key, folder) === projectRef) : undefined);

package/packages/piagent-webui/gateway/pi-host.ts

@@ -5,6 +5,7 @@ import path from "node:path";
 import { createRequire } from "node:module";
 import { pathToFileURL } from "node:url";
 import { privateHostRoot } from "../../piagent-core/managed/pi-host.mjs";
+import { agentWatchControlDir } from "../../piagent-core/extensions/agent-home.js";
 
 const require = createRequire(import.meta.url);
 
@@ -58,8 +59,7 @@ export function installedPiHostRoot(): string {
   const home = os.homedir(), hostPackage = path.join("lib", "node_modules", "@earendil-works", "pi-coding-agent");
   let recorded: string | null = null;
   try {
-    const agentDir = process.env.PI_CODING_AGENT_DIR || path.join(home, ".pi", "agent");
-    recorded = JSON.parse(fs.readFileSync(path.join(agentDir, "piagent-runtime.json"), "utf8")).pi_sdk_root ?? null;
+    recorded = JSON.parse(fs.readFileSync(path.join(agentWatchControlDir(home), "piagent-runtime.json"), "utf8")).pi_sdk_root ?? null;
   } catch { /* no record yet */ }
   // npm's default Windows prefixes (%APPDATA%\npm, or beside node.exe) have no lib folder.
   const appData = process.env.APPDATA ?? path.join(home, "AppData", "Roaming");

package/packages/piagent-webui/ownership/profile-state.ts

@@ -47,8 +47,17 @@ function shortControlSocket(agentDir: string): string {
   return path.join(socketRoot, `${digest}.sock`);
 }
 
+// Piagent's own Pi home (~/.piagent/agent), never the member's personal pi.
+// Same rule as piagent-core/extensions/agent-home.js, which this layer cannot import.
+function defaultAgentDir(): string {
+  const own = process.env.PIAGENT_AGENT_DIR?.trim(), configured = process.env.PI_CODING_AGENT_DIR?.trim();
+  if (own) return own;
+  if (configured && path.resolve(configured) !== path.resolve(os.homedir(), ".pi", "agent")) return configured;
+  return path.join(os.homedir(), ".piagent", "agent");
+}
+
 export function gatewayProfileState(agentDirInput?: string): GatewayProfileState {
-  const agentDir = path.resolve(agentDirInput || process.env.PI_CODING_AGENT_DIR || path.join(os.homedir(), ".pi", "agent"));
+  const agentDir = path.resolve(agentDirInput || defaultAgentDir());
   fs.mkdirSync(agentDir, { recursive: true, mode: 0o700 });
   const agentStat = fs.lstatSync(agentDir);
   if (!agentStat.isDirectory() || agentStat.isSymbolicLink()

package/packages/piagent-webui/server/benchmark-release-monitor.ts

@@ -10,6 +10,7 @@ import { assertBenchmarkLedgerBinding, inspectBenchmarkLedger, validateBenchmark
 import { completedBenchmarkRecord } from "../../piagent-core/benchmark/benchmark-record-validation.js";
 import { benchmarkGitEnvironment } from "../../piagent-core/benchmark/benchmark-runtime.js";
 import { redactSensitiveText } from "../../piagent-core/extensions/redaction-core.js";
+import { piagentAgentDir } from "../../piagent-core/extensions/agent-home.js";
 
 const MAX_RUNS = 20, MAX_DIRECTORIES = 100, MAX_DIRECTORY_ENTRIES = 5_000, MAX_JSON_BYTES = 32 * 1024 * 1024;
 type Identity = { projectRef: string; runtimeInstanceId: string; sessionRef: string; taskId: string | null; taskRunId: string | null;
@@ -210,7 +211,7 @@ function releaseReadiness(cwd: string, file: string, repo: ReturnType<typeof rep
 export function projectBenchmarkReleaseMonitor(input: { cwd: string; identity: Identity; generatedAt?: string; benchmarkRoot?: string; releaseReportPath?: string }) {
   const generatedAt = input.generatedAt ?? new Date().toISOString();
   try {
-    const repo = repository(input.cwd), root = input.benchmarkRoot ?? path.join(process.env.PI_CODING_AGENT_DIR || path.join(os.homedir(), ".pi", "agent"), "benchmarks", "piagent");
+    const repo = repository(input.cwd), root = input.benchmarkRoot ?? path.join(piagentAgentDir(), "benchmarks", "piagent");
     const releasePath = input.releaseReportPath ?? path.join(input.cwd, "plans", "codex-first-product", "evidence", "p7-local-readiness", "report.json");
     const benchmark = benchmarkRuns(input.cwd, root, repo), release = releaseReadiness(input.cwd, releasePath, repo);
     const revision = `release-monitor.${createHash("sha256").update(JSON.stringify({ benchmark, release })).digest("hex")}`;

package/scripts/benchmark-runner-support.mjs

@@ -14,6 +14,7 @@ import { acquireBenchmarkRunLock } from "../packages/piagent-core/benchmark/benc
 import { recoverBenchmarkObservationCheckpoints } from "../packages/piagent-core/benchmark/benchmark-resume-recovery.js";
 import { benchmarkSurfaceLabel } from "../packages/piagent-core/benchmark/benchmark-core.js";
 import { codexModelName, codexThinkingEffort } from "../packages/piagent-core/benchmark/benchmark-codex.js";
+import { piagentAgentDir } from "../packages/piagent-core/extensions/agent-home.js";
 
 export function fail(message, code = 2) {
   const error = new Error(message);
@@ -96,7 +97,7 @@ export function registeredBenchmarkCustodyRoot(runRoot) {
 
 export function defaultOutputRoot(bootstrapMetadata) {
   if (bootstrapMetadata?.defaultOutputRoot) return bootstrapMetadata.defaultOutputRoot;
-  const agentRoot = process.env.PI_CODING_AGENT_DIR || path.join(os.homedir(), ".pi", "agent");
+  const agentRoot = piagentAgentDir();
   return path.join(agentRoot, "benchmarks", "piagent");
 }
 

package/scripts/dashboard-update-job.mjs

@@ -59,8 +59,10 @@ if (installed !== to) finish("failed", { reason: "update-version-mismatch", ...(
 // the launcher needs the binding imported again in Agent Watch.
 let bindingChanged = false;
 try {
-  const agentDir = process.env.PI_CODING_AGENT_DIR?.trim() || path.join(home, ".pi", "agent");
-  const binding = JSON.parse(fs.readFileSync(path.join(agentDir, "agent-watch-managed.json"), "utf8"));
+  // Agent Watch keeps the binding in the personal Pi folder; a test or custom home may hold its own.
+  const homes = [process.env.PI_CODING_AGENT_DIR?.trim(), path.join(home, ".pi", "agent")].filter(Boolean);
+  const file = homes.map((dir) => path.join(dir, "agent-watch-managed.json")).find((candidate) => fs.existsSync(candidate));
+  const binding = JSON.parse(fs.readFileSync(file, "utf8"));
   if (typeof binding?.entrypoint === "string" && typeof binding?.entrypoint_sha256 === "string")
     bindingChanged = crypto.createHash("sha256").update(fs.readFileSync(binding.entrypoint)).digest("hex") !== binding.entrypoint_sha256;
 } catch { /* no company binding on this machine */ }

package/scripts/install-global.sh

@@ -23,6 +23,9 @@ Options:
   --with-web-access | --no-web-access
                                   Install pi-web-access for the researcher subagent (default: install).
   --with-herdr                    Also configure Herdr integration.
+  --copy-login | --no-copy-login  Copy (or not) your personal pi login into Piagent's home.
+                                  Default: ask in a terminal; without one, copy only when
+                                  moving an older install out of your personal pi.
   --model-scope <full|codex|claude>
                                   Model families to enable in Pi (default: full). A member who
                                   already has a default model and model list keeps them; an
@@ -36,7 +39,13 @@ Options:
   -h, --help                      Print this help and exit.
 
 Purpose:
-  Install the piagent Pi package into the current user's global Pi settings.
+  Install Piagent into its own Pi home (~/.piagent/agent; PIAGENT_AGENT_DIR overrides).
+  Your personal `pi` (~/.pi/agent) stays stock: open Piagent with `piagent`.
+  An install from an older release that lives in ~/.pi/agent is moved out of it.
+
+  Run in a terminal, a first install asks which add-ons to install and whether
+  to use your pi login; flags answer those questions up front, and a run
+  without a terminal (CI, the dashboard updater) takes the defaults.
 
 Package source examples:
   # Recommended stable install: exact current release tag
@@ -61,7 +70,8 @@ Package source examples:
 Notes:
   - `currentRelease` in output is the version of the terminal helper executing this command.
   - Use exactly one package selector. The first CLI selector overrides environment defaults; a second selector fails closed.
-  - OAuth is intentionally not automated. Run `pi` then `/login`.
+  - OAuth is intentionally not automated. Run `piagent` then `/login`, or let the
+    installer copy the login your personal pi already has.
   - Model scope is configured with Pi's native `enabledModels` so users choose via `/model`, Ctrl+L, `/scoped-models`, and Ctrl+P.
   - Herdr integration is optional and modifies user-level Herdr/Pi config.
   - MCP is installed by default with the core preset: Context7 docs, Chrome DevTools, GitHub.
@@ -76,6 +86,21 @@ USAGE
 }
 
 PLATFORM_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+# Piagent's own Pi home (packages/piagent-core/extensions/agent-home.js has the
+# same rule). Every `pi` call below works there, never in the personal home.
+PERSONAL_PI_DIR="${HOME}/.pi/agent"
+if [[ -n "${PIAGENT_AGENT_DIR:-}" ]]; then
+  PIAGENT_HOME="$PIAGENT_AGENT_DIR"
+elif [[ -n "${PI_CODING_AGENT_DIR:-}" && "${PI_CODING_AGENT_DIR%/}" != "$PERSONAL_PI_DIR" ]]; then
+  PIAGENT_HOME="$PI_CODING_AGENT_DIR"
+else
+  PIAGENT_HOME="${HOME}/.piagent/agent"
+fi
+export PI_CODING_AGENT_DIR="$PIAGENT_HOME"
+MCP_EXPLICIT=false
+WEB_ACCESS_EXPLICIT=false
+MODEL_SCOPE_EXPLICIT=false
+COPY_LOGIN=""
 CURRENT_RELEASE_TAG=""
 EXPECTED_PI_VERSION=""
 EXPECTED_RELEASE_COMMIT="${PIAGENT_EXPECTED_RELEASE_COMMIT:-}"
@@ -486,10 +511,12 @@ while [[ $# -gt 0 ]]; do
       ;;
     --with-mcp)
       WITH_MCP=true
+      MCP_EXPLICIT=true
       shift
       ;;
     --no-mcp)
       WITH_MCP=false
+      MCP_EXPLICIT=true
       shift
       ;;
     --mcp-preset)
@@ -520,10 +547,12 @@ while [[ $# -gt 0 ]]; do
       ;;
     --with-web-access)
       WITH_WEB_ACCESS=true
+      WEB_ACCESS_EXPLICIT=true
       shift
       ;;
     --no-web-access)
       WITH_WEB_ACCESS=false
+      WEB_ACCESS_EXPLICIT=true
       shift
       ;;
     --with-herdr)
@@ -533,6 +562,7 @@ while [[ $# -gt 0 ]]; do
     --model-scope)
       require_value "$1" "${2:-}"
       MODEL_SCOPE_PRESET="$2"
+      MODEL_SCOPE_EXPLICIT=true
       shift 2
       ;;
     --default-model)
@@ -546,6 +576,15 @@ while [[ $# -gt 0 ]]; do
       ;;
     --no-model-scope)
       CONFIGURE_MODEL_SCOPE=false
+      MODEL_SCOPE_EXPLICIT=true
+      shift
+      ;;
+    --copy-login)
+      COPY_LOGIN=true
+      shift
+      ;;
+    --no-copy-login)
+      COPY_LOGIN=false
       shift
       ;;
     -h|--help)
@@ -569,6 +608,54 @@ fi
 
 require_node_version
 
+# What personal Pi holds from an older Piagent release (packages, login).
+LEGACY_REPORT="$(node "$PLATFORM_ROOT/scripts/personal-pi-restore.mjs" --json 2>/dev/null || echo '{}')"
+legacy_field() {
+  node -e 'const r = JSON.parse(process.argv[1] || "{}"); const v = process.argv[2].split(".").reduce((o, k) => o?.[k], r); process.stdout.write(Array.isArray(v) ? v.join("\n") : String(v ?? ""));' "$LEGACY_REPORT" "$1"
+}
+LEGACY_INSTALL="$(legacy_field legacy)"
+LEGACY_SUBAGENTS=false
+if legacy_field remove | grep -q '^npm:pi-subagents@'; then LEGACY_SUBAGENTS=true; fi
+FIRST_INSTALL=true
+if [[ -f "$PIAGENT_HOME/settings.json" ]] && grep -qE '@piagent/platform|Vt-mmm/piagent' "$PIAGENT_HOME/settings.json" 2>/dev/null; then
+  FIRST_INSTALL=false
+fi
+
+# Ask, rather than decide for the member, what goes into Piagent's home: only on
+# a first install (an update keeps what is there), only in a terminal, and never
+# for a question a flag already answered.
+ask_yes_no() {
+  local question="$1" default="$2" answer hint="[Y/n]"
+  [[ "$default" == false ]] && hint="[y/N]"
+  read -r -p "$question $hint " answer </dev/tty || answer=""
+  case "$answer" in
+    [Yy]*) echo true ;;
+    [Nn]*) echo false ;;
+    *) echo "$default" ;;
+  esac
+}
+if [[ "$FIRST_INSTALL" == true && "$DRY_RUN" == false && -t 0 && -t 1 && -z "${PIAGENT_INSTALL_DEFAULTS:-}" ]]; then
+  echo "Piagent installs into its own Pi home: $PIAGENT_HOME"
+  echo "Your personal pi ($PERSONAL_PI_DIR) is not changed by these choices."
+  [[ "$MCP_EXPLICIT" == true ]] || WITH_MCP="$(ask_yes_no "Install the MCP adapter (pi-mcp-adapter, servers: $MCP_PRESET)?" "$WITH_MCP")"
+  if [[ "$SUBAGENTS_EXPLICIT" == false ]]; then
+    WITH_SUBAGENTS="$(ask_yes_no "Install pi-subagents (optional parallel helpers; company sessions use their own)?" "$LEGACY_SUBAGENTS")"
+    SUBAGENTS_EXPLICIT=true
+  fi
+  [[ "$WEB_ACCESS_EXPLICIT" == true ]] || WITH_WEB_ACCESS="$(ask_yes_no "Install pi-web-access (web search and fetch for the researcher subagent)?" "$WITH_WEB_ACCESS")"
+  [[ "$MODEL_SCOPE_EXPLICIT" == true ]] || CONFIGURE_MODEL_SCOPE="$(ask_yes_no "Set Piagent's model list and default model ($DEFAULT_MODEL)?" "$CONFIGURE_MODEL_SCOPE")"
+  if [[ -z "$COPY_LOGIN" && "$(legacy_field loginAvailable)" == true ]]; then
+    COPY_LOGIN="$(ask_yes_no "Use the login your personal pi already has (copies auth.json once)?" true)"
+  fi
+  echo
+fi
+if [[ -z "$COPY_LOGIN" ]]; then
+  COPY_LOGIN="$LEGACY_INSTALL"
+fi
+if [[ "$LEGACY_SUBAGENTS" == true && "$SUBAGENTS_EXPLICIT" == false ]]; then
+  WITH_SUBAGENTS=true
+fi
+
 # The preset is only read at the very last step, after the platform package and
 # the MCP adapter are already installed. A name with a typo therefore failed
 # after two installs had landed, leaving a half-configured machine, and the
@@ -736,10 +823,25 @@ if [[ -n "$RESOLVED_PACKAGE_COMMIT" ]]; then
 fi
 echo "  source: $PACKAGE_SOURCE"
 sync_local_helper
+echo "  home: $PIAGENT_HOME (your personal pi stays in $PERSONAL_PI_DIR)"
+run_cmd mkdir -p "$PIAGENT_HOME"
 echo "Removing previous Pi Agent Platform package registrations:"
 remove_existing_piagent_platform_sources
 run_cmd pi install "$PACKAGE_SOURCE"
 
+# An older release installed Piagent into personal Pi. Move it out: carry the
+# member's model choices (and the login, when agreed) to Piagent's home, then
+# leave personal Pi stock. Backups of every changed file stay beside it.
+if [[ "$LEGACY_INSTALL" == true ]]; then
+  echo "Moving the older Piagent install out of your personal pi:"
+  restore_args=("$PLATFORM_ROOT/scripts/personal-pi-restore.mjs" --apply)
+  [[ "$COPY_LOGIN" == true ]] && restore_args+=(--copy-login)
+  run_cmd node "${restore_args[@]}"
+elif [[ "$COPY_LOGIN" == true && "$(legacy_field loginAvailable)" == true ]]; then
+  echo "Copying your pi login to Piagent's home:"
+  run_cmd node -e 'const fs = require("node:fs"); fs.copyFileSync(process.argv[1], process.argv[2], fs.constants.COPYFILE_EXCL); fs.chmodSync(process.argv[2], 0o600);' "$PERSONAL_PI_DIR/auth.json" "$PIAGENT_HOME/auth.json"
+fi
+
 if [[ "$WITH_MCP" == true ]]; then
   echo "Installing Pi MCP adapter:"
   if [[ "$DRY_RUN" == false ]]; then
@@ -747,6 +849,9 @@ if [[ "$WITH_MCP" == true ]]; then
   fi
   remove_existing_npm_package_sources "pi-mcp-adapter"
   run_cmd pi install "$PI_MCP_ADAPTER_SOURCE"
+  # Pi's built-in `mcp` extension registers the same /mcp command as the
+  # adapter; Piagent's home turns the built-in off so only one loads.
+  run_cmd node -e 'const fs = require("node:fs"); const f = process.argv[1]; const s = JSON.parse(fs.readFileSync(f, "utf8")); const e = Array.isArray(s.extensions) ? s.extensions : []; if (!e.includes("-builtin:mcp")) { s.extensions = [...e, "-builtin:mcp"]; fs.writeFileSync(f, JSON.stringify(s, null, 2) + "\n"); }' "$PIAGENT_HOME/settings.json"
   if [[ "$DRY_RUN" == false ]] && command -v pi-mcp-adapter >/dev/null 2>&1; then
     pi-mcp-adapter init || true
   fi
@@ -802,10 +907,13 @@ if [[ "$DRY_RUN" == true ]]; then
   print_cmd node "$PLATFORM_ROOT/scripts/personal-pi-config.mjs" repair
 else
   node "$PLATFORM_ROOT/scripts/personal-pi-config.mjs" repair || echo "WARN: could not check the personal Pi configuration; run: node \"$PLATFORM_ROOT/scripts/personal-pi-config.mjs\" check" >&2
+  node "$PLATFORM_ROOT/scripts/personal-pi-config.mjs" repair --agent-dir "$PIAGENT_HOME" >/dev/null || true
 fi
 
 echo
-echo "Installed packages:"
+echo "Open Piagent with: piagent   (your own pi in $PERSONAL_PI_DIR stays stock)"
+echo
+echo "Installed packages in $PIAGENT_HOME:"
 if [[ "$DRY_RUN" == true ]]; then
   print_cmd pi list
 else
@@ -814,8 +922,8 @@ fi
 
 echo
 echo "Next:"
-echo "  pi"
-echo "  /login"
+echo "  piagent         # Piagent in this terminal; plain \`pi\` stays your own"
+echo "  /login          # unless the login of your pi was copied"
 echo "  /model          # or Ctrl+L: select provider/model from Pi selector"
 echo "  /scoped-models  # optional: edit Ctrl+P model cycle scope"
 if [[ "$WITH_MCP" == true ]]; then

package/scripts/model-scope-prune.mjs

@@ -10,6 +10,7 @@ import fs from "node:fs";
 import path from "node:path";
 import { execFileSync } from "node:child_process";
 import { pathToFileURL } from "node:url";
+import { piagentAgentDir } from "../packages/piagent-core/extensions/agent-home.js";
 
 // The Pi install `pi` runs from.
 export function piPackageRoot(environment = process.env) {
@@ -55,7 +56,7 @@ export function pruneSettings(settingsPath, stale) {
 
 if (process.argv[1] && path.resolve(process.argv[1]) === path.resolve(new URL(import.meta.url).pathname)) {
   const args = process.argv.slice(2), at = args.indexOf("--settings");
-  const agentDir = process.env.PI_CODING_AGENT_DIR || path.join(process.env.HOME ?? "", ".pi", "agent");
+  const agentDir = piagentAgentDir(process.env, process.env.HOME ?? "");
   const settingsPath = at >= 0 && args[at + 1] ? path.resolve(args[at + 1]) : path.join(agentDir, "settings.json");
   const json = args.includes("--json"), fix = args.includes("--fix");
   const out = (value, text) => process.stdout.write(json ? `${JSON.stringify(value)}\n` : `${text}\n`);

package/scripts/personal-pi-config.mjs

@@ -120,7 +120,8 @@ const invoked = process.argv[1] && real(process.argv[1]) === real(fileURLToPath(
 if (invoked) {
   const args = process.argv.slice(2), command = args[0];
   const at = args.indexOf("--agent-dir");
-  const agentDir = at >= 0 ? path.resolve(args[at + 1]) : (process.env.PI_CODING_AGENT_DIR || path.join(os.homedir(), ".pi", "agent"));
+  // The member's personal pi, whatever home Piagent itself runs from.
+  const agentDir = at >= 0 ? path.resolve(args[at + 1]) : path.join(os.homedir(), ".pi", "agent");
   if (!["check", "repair"].includes(command)) { console.error("Usage: personal-pi-config.mjs check|repair [--agent-dir <dir>] [--json]"); process.exit(2); }
   const result = command === "repair" ? repair(agentDir) : inspect(agentDir);
   if (args.includes("--json")) console.log(JSON.stringify(result, null, 2));