@piagent/platform 1.45.0 → 1.46.1

package/scripts/team-doctor.sh

@@ -72,8 +72,14 @@ const installations = piagentInstallations();
 if(installations.length>1) warnings.push("Multiple Piagent installations detected. Use the pinned Watch launcher; other PATHs may run an older build: "+installations.map(i=>`${i.version} [${i.fingerprint}] ${i.root}`).join("; "));
 // Personal Pi loading Piagent twice does not start; old company providers send it to Studio outside the Harness.
 const { inspect: inspectPersonalPi } = await import(pathToFileURL(path.join(platformRoot, "scripts/personal-pi-config.mjs")).href);
-for (const finding of inspectPersonalPi(process.env.PI_CODING_AGENT_DIR || path.join(process.env.HOME || "", ".pi", "agent")).findings)
-  (finding.kind === "duplicate-extensions" ? errors : warnings).push(`personal Pi: ${finding.text} Fix: piagent-update`);
+const personalPiDir = path.join(process.env.HOME || "", ".pi", "agent");
+for (const agentDir of new Set([personalPiDir, process.env.PI_CODING_AGENT_DIR || personalPiDir]))
+  for (const finding of inspectPersonalPi(agentDir).findings)
+    (finding.kind === "duplicate-extensions" ? errors : warnings).push(`${agentDir === personalPiDir ? "personal Pi" : "Piagent home"}: ${finding.text} Fix: piagent-update`);
+// Since 1.46 Piagent runs from its own home; an older install left in personal Pi keeps loading there.
+const { plan: personalPiRestorePlan } = await import(pathToFileURL(path.join(platformRoot, "scripts/personal-pi-restore.mjs")).href);
+if (personalPiRestorePlan({ personalDir: personalPiDir }).legacy)
+  warnings.push("personal Pi still loads an older Piagent install (~/.pi/agent). Fix: piagent restore-pi --apply");
 const { verifyCapabilityLock } = await import(pathToFileURL(path.join(platformRoot, "packages", "piagent-core", "capabilities", "capability-core.js")).href);
 
 function exists(rel) {
@@ -271,9 +277,9 @@ if (commandExists("pi")) {
   piHasMcpAdapter = combined.includes("pi-mcp-adapter");
   piHasSubagents = combined.includes("pi-subagents");
   piHasWebAccess = combined.includes("pi-web-access");
-  if (!piHasMcpAdapter) warnings.push("Pi MCP adapter not found in `pi list`; run setup with --with-mcp or `pi install npm:pi-mcp-adapter@2.15.0`");
-  if (!piHasSubagents) warnings.push("Pi subagents package not found in `pi list`; run setup with --with-subagents or `pi install npm:pi-subagents@0.38.0`");
-  if (!piHasWebAccess) warnings.push("Pi web access package not found in `pi list`; run `piagent-update --force` or `pi install npm:pi-web-access@0.17.0` so researcher subagents can browse/fetch external sources");
+  if (!piHasMcpAdapter) warnings.push("Pi MCP adapter not found in `pi list`; run `piagent-install --with-mcp` (installs into Piagent's home, not your personal pi)");
+  if (!piHasSubagents) warnings.push("Pi subagents package not found in `pi list`; run `piagent-install --with-subagents` if you want them");
+  if (!piHasWebAccess) warnings.push("Pi web access package not found in `pi list`; run `piagent-install --with-web-access` so researcher subagents can browse/fetch external sources");
 }
 
 const mcpFiles = [

package/scripts/uninstall-global.sh

@@ -9,7 +9,16 @@ set -euo pipefail
 # deleted.
 
 ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-PI_AGENT_DIR="${PI_CODING_AGENT_DIR:-"${HOME}/.pi/agent"}"
+# Piagent's own Pi home (same rule as packages/piagent-core/extensions/agent-home.js).
+PERSONAL_PI_DIR="${HOME}/.pi/agent"
+if [[ -n "${PIAGENT_AGENT_DIR:-}" ]]; then
+  PI_AGENT_DIR="$PIAGENT_AGENT_DIR"
+elif [[ -n "${PI_CODING_AGENT_DIR:-}" && "${PI_CODING_AGENT_DIR%/}" != "$PERSONAL_PI_DIR" ]]; then
+  PI_AGENT_DIR="$PI_CODING_AGENT_DIR"
+else
+  PI_AGENT_DIR="${HOME}/.piagent/agent"
+fi
+export PI_CODING_AGENT_DIR="$PI_AGENT_DIR"
 GLOBAL_SETTINGS="$PI_AGENT_DIR/settings.json"
 
 APPLY=false
@@ -26,7 +35,9 @@ usage() {
 Usage:
   piagent-uninstall [--apply] [--with-addons] [--with-host] [--project <path>]
 
-Removes the Pi package this platform installed from Pi's global settings.
+Removes the Pi package this platform installed from Piagent's own Pi home
+(~/.piagent/agent). An install from before 1.46 lives in your personal pi
+(~/.pi/agent): `piagent restore-pi --apply` takes it out of there.
 
   (default)        Dry run. Reports what would be removed and exits 0.
   --apply          Perform the removal.
@@ -291,6 +302,10 @@ NODE
 fi
 
 echo
+if node "$ROOT/scripts/personal-pi-restore.mjs" --json 2>/dev/null | grep -q '"legacy": true'; then
+  echo "Your personal pi ($PERSONAL_PI_DIR) still loads an older Piagent install."
+  echo "  Take it out with: piagent restore-pi --apply"
+fi
 if [[ "$APPLY" == true ]]; then
   echo "Uninstall complete."
   echo "The npm-global helper is separate and stays until you remove it:"

package/scripts/update-global.mjs

@@ -22,6 +22,7 @@ import path from "node:path";
 import { spawnSync } from "node:child_process";
 import { fileURLToPath } from "node:url";
 import { inspect as inspectPersonalPi } from "./personal-pi-config.mjs";
+import { personalPiAgentDir, piagentAgentDir } from "../packages/piagent-core/extensions/agent-home.js";
 import { hostPlan, installPrivateHost, privateHostRoot } from "../packages/piagent-core/managed/pi-host.mjs";
 
 const HELPER_PACKAGE = "@piagent/platform";
@@ -438,8 +439,10 @@ function main() {
     : `  host:    ${currentHost ?? "not installed"} -> ${targetHost}${hostNeedsChange ? "" : " (already current)"}`);
   // The Pi package can lag the helper (installed from an older tag), and
   // personal Pi can hold conflicting Piagent or old company entries.
-  const personal = inspectPersonalPi(process.env.PI_CODING_AGENT_DIR || path.join(os.homedir(), ".pi", "agent"));
-  const installedPackages = personal.packages.map((item) => item.version ?? "unknown");
+  // The package lives in Piagent's home; old company entries and an older
+  // Piagent install live in the member's personal pi.
+  const personal = inspectPersonalPi(personalPiAgentDir()), own = inspectPersonalPi(piagentAgentDir());
+  const installedPackages = own.packages.map((item) => item.version ?? "unknown");
   const packageNeedsChange = options.package && (options.force || installedPackages.length !== 1 || installedPackages[0] !== targetHelper);
   console.log(`  package: ${installedPackages.join(", ") || "not installed"} -> v${targetHelper}${options.package ? packageNeedsChange ? " (reinstalled as a resolved commit)" : " (already current)" : " (skipped)"}`);
   for (const finding of personal.findings) console.log(`  personal Pi: ${finding.text}`);