@piagent/platform 1.28.0 → 1.28.2

package/packages/piagent-webui/dist/client/index.html

@@ -7,7 +7,7 @@
     <meta name="csp-nonce" content="__PIAGENT_CSP_NONCE__" />
     <meta name="piagent-webui-mode" content="__PIAGENT_WEBUI_MODE__" />
     <title>Piagent WebUI</title>
-    <script type="module" crossorigin src="/assets/index-DWkb1mpZ.js"></script>
+    <script type="module" crossorigin src="/assets/index-8YNd9KDA.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-B5XOKQy-.css">
   </head>
   <body>

package/packages/piagent-webui/gateway/managed-launch.ts

@@ -17,6 +17,7 @@ type Binding = { file: string; profile: string; node: string; entrypoint: string
 
 const CLEAN_ENV = { PATH: "/usr/bin:/bin", LANG: "en_US.UTF-8", TERM: "xterm-256color", ...interopEnvironment() };
 const READY = /^Agent Watch Auto: ready$/m;
+const BINDING_WAIT = /\[managed-binding-wait\]$/m, BINDING_WAIT_MS = 95_000;
 const sha256 = (file: string) => createHash("sha256").update(fs.readFileSync(file)).digest("hex");
 const HEX64 = /^[a-f0-9]{64}$/;
 
@@ -130,8 +131,12 @@ async function start(agentDir: string, home: string, timeoutMs: number): Promise
     child.once("exit", () => { exited = true; }); child.once("error", () => { exited = true; }); child.unref();
   } finally { fs.closeSync(fd); }
   try {
-    for (const started = Date.now(); Date.now() - started < timeoutMs;) {
+    // Right after an update the entrypoint waits (up to 90 s) for Agent Watch
+    // to write the new binding; give it that long before timing out.
+    let limit = timeoutMs;
+    for (const started = Date.now(); Date.now() - started < limit;) {
       const text = fs.readFileSync(log, "utf8");
+      if (limit === timeoutMs && BINDING_WAIT.test(text)) limit = timeoutMs + BINDING_WAIT_MS;
       // The launch may just have pointed this slot at the member's store.
       if (READY.test(text)) return controlSocket(home, pinned.profile);
       if (exited) throw new Error(text.match(/Agent Watch: (managed-[a-z:_-]+)\./)?.[1] ?? "managed-launch-failed");

package/packages/piagent-webui/shared/company-copy.ts

@@ -12,6 +12,8 @@ export const LAUNCH_REASONS: Record<string, [string, string]> = {
   "managed-key-unavailable": ["Agent Watch không đọc được key công ty trên máy này. Mở Agent Watch, dán lại mã kết nối, bấm Kết nối Piagent trong WSL rồi kết nối lại.", "Agent Watch cannot read the company key on this computer. Open Agent Watch, paste the connection code again, choose Connect Piagent in WSL, then connect again."],
   "managed-profile-disconnected": ["Cấu hình Piagent đang thuộc key công ty đã ngắt kết nối. Nhập lại cấu hình cho Piagent trong Agent Watch (trên Windows: Kết nối Piagent trong WSL).", "The Piagent configuration belongs to a disconnected company key. Import it again in Agent Watch (on Windows: Connect Piagent in WSL)."],
   "managed-launch-binding-changed": ["Agent Watch hoặc Piagent vừa cập nhật. Nhập lại cấu hình cho Piagent trong Agent Watch (trên Windows: Kết nối Piagent trong WSL).", "Agent Watch or Piagent changed. Import the Piagent configuration again in Agent Watch (on Windows: Connect Piagent in WSL)."],
+  "managed-binding-update-pending": ["Agent Watch đang chạy nhưng chưa cập nhật cấu hình cho bản Piagent mới. Mở Agent Watch → Studio, bấm Áp dụng cho Piagent rồi mở lại.", "Agent Watch is running but has not updated the configuration for the new Piagent yet. Open Agent Watch → Studio, apply for Piagent, then open it again."],
+  "managed-binding-watch-not-running": ["Piagent vừa cập nhật nhưng Agent Watch không chạy nên chưa cập nhật cấu hình. Mở Agent Watch, chờ vài giây rồi mở lại.", "Piagent was updated but Agent Watch is not running, so the configuration was not updated. Open Agent Watch, wait a few seconds, then open it again."],
   "managed-launch-version-mismatch": ["Agent Watch đang dùng một bản Piagent khác với dashboard này. Mở Agent Watch → Studio, bấm Áp dụng cho Piagent rồi kết nối lại.", "Agent Watch points at another Piagent install than this dashboard. Open Agent Watch → Studio, apply for Piagent, then connect again."],
   "managed-launch-stale-runtime": ["Phiên công ty của bản Piagent cũ chưa dừng được. Thử kết nối lại sau ít giây.", "The company runtime from the previous Piagent did not stop yet. Connect again in a few seconds."],
   "managed-launch-timeout": ["Phiên công ty khởi động quá lâu. Kết nối lại.", "The company runtime took too long to start. Connect again."],

package/scripts/company-terminal.mjs

@@ -15,6 +15,12 @@ import { headlineText, outcomeText, processItems } from '../packages/piagent-web
 import { turnEndCopy, turnEndOf } from '../packages/piagent-webui/shared/turn-end.ts';
 
 const LOCALE = 'vi';
+export const HELP_TEXT = [
+  'Cuộc trò chuyện công ty: /undo hoàn tác file lượt trước đã sửa · /bypass on|off|status quyền lệnh cần internet · /fast on|off|status (khi Harness cho phép) · /skill:<tên> hoặc /<lệnh> của bạn và của project.',
+  'Pi: /session thông tin cuộc trò chuyện · /resume mở cuộc trò chuyện công ty khác · /new cuộc mới · /compact nén ngữ cảnh · /tree, /fork nhánh · /name đặt tên · /copy, /export · /hotkeys toàn bộ phím tắt · /quit thoát.',
+  'Phím: ! <lệnh> chạy shell · Esc dừng lượt đang chạy · Ctrl+C xoá ô nhập, hai lần để thoát · Ctrl+O xem thêm.',
+  'Mở lại sau: piagent studio --project <thư mục>, rồi /resume. Đừng mở cuộc trò chuyện công ty bằng pi cá nhân.',
+].join('\n');
 const PERMISSION_STATUS = 'agent-watch-permission';
 const ASK = 'Hỏi trước (mặc định)', BYPASS = 'Bypass: chỉ hỏi việc bắt buộc';
 const PERMISSION_TEXT = {
@@ -62,7 +68,7 @@ export function companyTerminalExtension({ managed, packageRoot, sdkRoot, bindin
     };
 
     registerTerminalUpdateOffer(pi, { installed, packageRoot, restart: 'piagent studio',
-      afterUpdate: () => bindingChanged() ? 'Bản mới đổi trình khởi chạy công ty: mở Agent Watch → Studio và nhập lại cấu hình cho Piagent trước khi mở lại.' : null });
+      afterUpdate: () => bindingChanged() ? 'Bản mới đổi trình khởi chạy công ty: Agent Watch tự cập nhật cấu hình (cần Agent Watch đang chạy); piagent studio chờ việc này khi mở lại.' : null });
 
     // Ask first or Bypass, kept with the conversation like the dashboard's switch.
     const showPermission = (ctx) => ctx.ui?.setStatus?.(PERMISSION_STATUS, managed()?.permission === 'trusted-full-access' ? 'Bypass' : undefined);
@@ -117,6 +123,12 @@ export function companyTerminalExtension({ managed, packageRoot, sdkRoot, bindin
           : 'Fast đang tắt: các lượt chạy tốc độ thường.', 'info');
       } });
 
+    // /help is answered here, as on the dashboard: no model request (Pi has no
+    // /help of its own, so the text would otherwise go to the agent).
+    pi.registerCommand('help', {
+      description: 'Lệnh và phím tắt của Terminal công ty (không gửi model)',
+      handler: async (_args, ctx) => ctx.ui.notify(HELP_TEXT, 'info') });
+
     // The Harness's notes carry English for the agent; the member reads them in Vietnamese.
     pi.registerMessageRenderer('agent-watch-process', (message, _options, theme) => {
       const lines = processLines(message.details);

package/scripts/install-global.sh

@@ -781,6 +781,17 @@ if [[ "$WITH_HERDR" == true ]]; then
   fi
 fi
 
+# Personal Pi must not load Piagent twice (an extension path into another
+# Piagent copy beside the package) or keep old Agent Watch company providers:
+# Pi refuses to start, or personal Pi reaches Studio outside the Harness.
+echo
+echo "Personal Pi configuration:"
+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
+fi
+
 echo
 echo "Installed packages:"
 if [[ "$DRY_RUN" == true ]]; then

package/scripts/personal-pi-config.mjs

@@ -0,0 +1,137 @@
+#!/usr/bin/env node
+// What in the member's personal Pi configuration (~/.pi/agent) conflicts with
+// Piagent, and the repair. Personal Pi loads Piagent as a Pi package; an
+// extension path that points into another Piagent copy registers the same
+// tools twice and Pi refuses to start ("Tool … conflicts with …"). Older Agent
+// Watch releases also wrote company providers (agent_watch_*, a direct key
+// read from Agent Watch) and a company default model into personal Pi; with a
+// managed binding (agent-watch-managed.json) the company runs only through
+// `piagent studio`, so those entries are leftovers that send personal Pi to
+// Studio outside the team's Harness, or fail.
+//
+//   personal-pi-config.mjs check [--agent-dir <dir>] [--json]   exit 1 when something conflicts
+//   personal-pi-config.mjs repair [--agent-dir <dir>]           backs up, then removes what conflicts
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+const COMPANY_PROVIDER = /^agent_watch_/;
+const SESSION_HEADER_EXTENSION = "agentwatch-studio-session.mjs";
+
+const readJson = (file) => { try { return JSON.parse(fs.readFileSync(file, "utf8")); } catch { return null; } };
+const real = (file) => { try { return fs.realpathSync(file); } catch { return null; } };
+
+// The Piagent package a path belongs to (its root), or null.
+export function piagentRootOf(file) {
+  let dir = real(file);
+  if (!dir) return null;
+  if (!fs.statSync(dir).isDirectory()) dir = path.dirname(dir);
+  for (; dir !== path.dirname(dir); dir = path.dirname(dir)) {
+    const manifest = readJson(path.join(dir, "package.json"));
+    if (manifest?.name === "@piagent/platform") return dir;
+  }
+  return null;
+}
+
+const isPiagentSource = (source) => /^(git:github\.com\/Vt-mmm\/piagent|https:\/\/github\.com\/Vt-mmm\/piagent|npm:@piagent\/platform)(@|$)/.test(String(source));
+
+// The installed Pi package's version (git:… sources live under <agentDir>/git/…).
+export function packageVersion(agentDir, source) {
+  const match = /^git:([^@]+)/.exec(String(source));
+  if (match) return readJson(path.join(agentDir, "git", match[1], "package.json"))?.version ?? null;
+  const npm = /^npm:(@piagent\/platform)/.exec(String(source));
+  if (npm) return readJson(path.join(agentDir, "npm", "node_modules", npm[1], "package.json"))?.version ?? null;
+  return null;
+}
+
+export function inspect(agentDir) {
+  const settingsFile = path.join(agentDir, "settings.json"), modelsFile = path.join(agentDir, "models.json");
+  const settings = readJson(settingsFile) ?? {}, models = readJson(modelsFile) ?? {};
+  const managed = fs.existsSync(path.join(agentDir, "agent-watch-managed.json"));
+  const packages = Array.isArray(settings.packages) ? settings.packages : [];
+  const piagentPackages = packages.filter(isPiagentSource);
+  const extensions = Array.isArray(settings.extensions) ? settings.extensions : [];
+  const findings = [];
+
+  // Extensions inside a Piagent copy load beside the Pi package: duplicate tools.
+  const duplicate = extensions.filter((entry) => piagentRootOf(path.resolve(agentDir, String(entry))) && piagentPackages.length);
+  if (duplicate.length) findings.push({ kind: "duplicate-extensions", file: settingsFile, entries: duplicate,
+    text: `${duplicate.length} extension(s) point into another Piagent copy while the Piagent Pi package is installed: Pi refuses to start (tools registered twice).` });
+  if (piagentPackages.length > 1) findings.push({ kind: "duplicate-packages", file: settingsFile, entries: piagentPackages,
+    text: `${piagentPackages.length} Piagent Pi packages are registered; keep one.` });
+
+  if (managed) {
+    const providers = Object.keys(models.providers ?? {}).filter((name) => COMPANY_PROVIDER.test(name));
+    if (providers.length) findings.push({ kind: "company-providers", file: modelsFile, entries: providers,
+      text: `Old Agent Watch company providers (${providers.join(", ")}) are in personal Pi; company work runs only through \`piagent studio\`.` });
+    const defaults = [];
+    if (COMPANY_PROVIDER.test(String(settings.defaultProvider ?? ""))) defaults.push(`defaultProvider=${settings.defaultProvider}`);
+    for (const entry of Array.isArray(settings.enabledModels) ? settings.enabledModels : []) if (COMPANY_PROVIDER.test(String(entry))) defaults.push(`enabledModels:${entry}`);
+    if (defaults.length) findings.push({ kind: "company-defaults", file: settingsFile, entries: defaults,
+      text: "Personal Pi's default model or model list still names an old company provider." });
+    const header = extensions.filter((entry) => path.basename(String(entry)) === SESSION_HEADER_EXTENSION);
+    if (header.length) findings.push({ kind: "company-extension", file: settingsFile, entries: header,
+      text: "The old Agent Watch session-header extension is still loaded in personal Pi." });
+  }
+  return { agentDir, managed, findings, packages: piagentPackages.map((source) => ({ source, version: packageVersion(agentDir, source) })) };
+}
+
+function backup(file, stamp) {
+  if (!fs.existsSync(file)) return null;
+  const copy = `${file}.before-piagent-repair-${stamp}`;
+  fs.copyFileSync(file, copy);
+  fs.chmodSync(copy, 0o600);
+  return copy;
+}
+
+function writeJson(file, value) {
+  const tmp = `${file}.${process.pid}.tmp`;
+  fs.writeFileSync(tmp, `${JSON.stringify(value, null, 2)}\n`, { mode: 0o600 });
+  fs.renameSync(tmp, file);
+}
+
+// Removes what inspect() found (duplicate packages are left to the installer,
+// which knows the one to keep). Every changed file is backed up first.
+export function repair(agentDir, now = new Date()) {
+  const report = inspect(agentDir);
+  const kinds = new Set(report.findings.map((finding) => finding.kind));
+  const stamp = now.toISOString().replace(/[:.]/g, "-");
+  const changed = [], backups = [];
+  const settingsFile = path.join(agentDir, "settings.json"), modelsFile = path.join(agentDir, "models.json");
+  if (kinds.has("duplicate-extensions") || kinds.has("company-defaults") || kinds.has("company-extension")) {
+    const settings = readJson(settingsFile);
+    const drop = new Set(report.findings.filter((f) => f.kind === "duplicate-extensions" || f.kind === "company-extension").flatMap((f) => f.entries));
+    if (Array.isArray(settings.extensions)) settings.extensions = settings.extensions.filter((entry) => !drop.has(entry));
+    if (Array.isArray(settings.extensions) && !settings.extensions.length) delete settings.extensions;
+    if (COMPANY_PROVIDER.test(String(settings.defaultProvider ?? ""))) { delete settings.defaultProvider; delete settings.defaultModel; }
+    if (Array.isArray(settings.enabledModels)) settings.enabledModels = settings.enabledModels.filter((entry) => !COMPANY_PROVIDER.test(String(entry)));
+    backups.push(backup(settingsFile, stamp)); writeJson(settingsFile, settings); changed.push(settingsFile);
+  }
+  if (kinds.has("company-providers")) {
+    const models = readJson(modelsFile);
+    for (const name of Object.keys(models.providers ?? {})) if (COMPANY_PROVIDER.test(name)) delete models.providers[name];
+    backups.push(backup(modelsFile, stamp)); writeJson(modelsFile, models); changed.push(modelsFile);
+  }
+  return { ...report, changed, backups: backups.filter(Boolean), after: inspect(agentDir) };
+}
+
+const invoked = process.argv[1] && real(process.argv[1]) === real(fileURLToPath(import.meta.url));
+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"));
+  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));
+  else if (command === "repair") {
+    for (const finding of result.findings) console.log(`fixed: ${finding.text}`);
+    for (const file of result.backups) console.log(`backup: ${file}`);
+    if (!result.findings.length) console.log("personal Pi configuration: nothing to repair");
+  } else {
+    for (const finding of result.findings) console.log(`WARN: ${finding.text}`);
+    if (result.findings.length) console.log("Fix: piagent-update (or node scripts/personal-pi-config.mjs repair)");
+    else console.log("PASS: personal Pi configuration has no Piagent conflicts");
+  }
+  process.exit(command === "check" && result.findings.length ? 1 : 0);
+}

package/scripts/piagent-cli.mjs

@@ -158,8 +158,16 @@ child.once("error", (error) => {
   process.exit(1);
 });
 
+// A command stopped from outside (a script, an editor, a timeout) stops its
+// child too, rather than leaving a company run going in the background. A
+// terminal's Ctrl+C already reaches the whole process group: the launcher just
+// stays until the child has finished.
+for (const signal of ["SIGTERM", "SIGHUP"]) process.on(signal, () => { try { child.kill(signal); } catch { /* already gone */ } });
+process.on("SIGINT", () => {});
+
 child.once("exit", (code, signal) => {
   if (signal) {
+    process.removeAllListeners(signal);
     process.kill(process.pid, signal);
     return;
   }

package/scripts/piagent-studio.mjs

@@ -7,6 +7,7 @@ import { fileURLToPath, pathToFileURL } from 'node:url';
 import { ManagedBrokerClient } from '../packages/piagent-core/managed/broker-client.mjs';
 import { ManagedSession } from '../packages/piagent-core/managed/session.mjs';
 import { agentWatchDataDirectory, interopEnvironment, resolveStore, storedSlot } from '../packages/piagent-core/managed/store.mjs';
+import { agentWatchRunning, awaitRebind, bindingMismatch, installedAfterBinding } from '../packages/piagent-core/managed/binding-wait.mjs';
 
 const digest = file => createHash('sha256').update(fs.readFileSync(file)).digest('hex');
 // Node's experimental-feature notices (type stripping, SQLite) are not
@@ -30,18 +31,32 @@ Object.assign(process.env, clean);
 let broker, current, gateway, hold;
 try {
   const configPath = fs.realpathSync(flags.get('--config') ?? path.join(home,'.pi/agent/agent-watch-managed.json'));
-  if (!fs.statSync(configPath).isFile() || fs.statSync(configPath).size > 16384) throw Error('managed-config-invalid');
-  const config = JSON.parse(fs.readFileSync(configPath));
+  const readConfig = () => {
+    if (!fs.statSync(configPath).isFile() || fs.statSync(configPath).size > 16384) throw Error('managed-config-invalid');
+    return JSON.parse(fs.readFileSync(configPath));
+  };
+  let config = readConfig();
   // Agent Watch rewrites this when the key or its harness changes.
   const bindingRevision = () => { try { return String(JSON.parse(fs.readFileSync(configPath, 'utf8')).configuration_revision ?? '') || null; } catch { return null; } };
   // --serve backs the personal dashboard: no browser, no project of its own.
   // Its startup probe runs in an empty private folder that is never listed.
   const serve = flags.has('--serve');
   if (serve && (flags.has('--project') || flags.has('--web') || flags.has('--check') || flags.has('--prompt'))) throw Error('managed-launch-arguments');
-  if (config.schema_version !== 1 || config.model !== 'agent-watch-auto' || !/^[a-f0-9]{64}$/.test(config.profile_id)
-    || config.entrypoint !== fs.realpathSync(fileURLToPath(import.meta.url)) || config.node !== fs.realpathSync(process.execPath)
-    || digest(config.entrypoint) !== config.entrypoint_sha256 || digest(config.node) !== config.node_sha256
-    || digest(config.broker) !== config.broker_sha256) throw Error('managed-launch-binding-changed');
+  const running = { self: fs.realpathSync(fileURLToPath(import.meta.url)), node: fs.realpathSync(process.execPath) };
+  const mismatch = bindingMismatch(config, running);
+  // Right after a Piagent update only the launcher's hash differs until Agent
+  // Watch writes the new binding: wait for it. Nothing runs before every
+  // pinned path and hash matches again.
+  if (mismatch === 'entrypoint' && installedAfterBinding(configPath, config.entrypoint)) {
+    const watch = () => agentWatchRunning(config.broker);
+    const rebound = await awaitRebind({ running: watch,
+      current: () => { try { const next = readConfig(); return bindingMismatch(next, running) === null ? next : null; } catch { return null; } },
+      waiting: state => process.stderr.write(state === false
+        ? 'Piagent vừa cập nhật nhưng Agent Watch không chạy. Mở Agent Watch; Piagent tự tiếp tục khi cấu hình được cập nhật… [managed-binding-wait]\n'
+        : 'Agent Watch đang cập nhật cấu hình cho bản Piagent mới… [managed-binding-wait]\n') });
+    if (!rebound) throw Error(watch() === false ? 'managed-binding-watch-not-running' : 'managed-binding-update-pending');
+    config = rebound;
+  } else if (mismatch) throw Error('managed-launch-binding-changed');
   // What company sessions need on this machine, checked with the real sandbox
   // and broker; no conversation, no model request.
   if (flags.has('--doctor')) {
@@ -162,6 +177,10 @@ try {
     // (updating Pi breaks the Agent Watch import), no package-update, catalog or
     // install-telemetry calls. Search tools were provisioned above.
     process.env.PI_OFFLINE = '1'; process.env.PI_SKIP_VERSION_CHECK = '1';
+    // Pi's exit line names `pi --session-dir …`, which would open this company
+    // conversation in personal Pi; name the company Terminal instead.
+    const write = process.stdout.write.bind(process.stdout), project = /^[\w./~:-]+$/.test(cwd) ? cwd : `'${cwd.replaceAll("'", "'\\''")}'`;
+    process.stdout.write = (chunk, ...rest) => write(typeof chunk === 'string' && chunk.includes('To resume this session:') ? `Mở lại cuộc trò chuyện này: piagent studio --project ${project}, rồi /resume\n` : chunk, ...rest);
     await new api.InteractiveMode(host, { verbose: false }).run();
   }
   }

package/scripts/team-doctor.sh

@@ -70,6 +70,10 @@ const warnings = [];
 const { piagentInstallations } = await import(pathToFileURL(path.join(platformRoot, "scripts/piagent-installations.mjs")).href);
 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 { verifyCapabilityLock } = await import(pathToFileURL(path.join(platformRoot, "packages", "piagent-core", "capabilities", "capability-core.js")).href);
 
 function exists(rel) {

package/scripts/update-global.mjs

@@ -21,6 +21,7 @@ import os from "node:os";
 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";
 
 const HELPER_PACKAGE = "@piagent/platform";
 const HOST_PACKAGE = "@earendil-works/pi-coding-agent";
@@ -430,13 +431,19 @@ function main() {
   console.log("Pi Agent Platform update");
   console.log(`  helper:  ${currentHelper} -> ${targetHelper}${helperNeedsChange ? "" : " (already current)"}`);
   console.log(`  host:    ${currentHost ?? "not installed"} -> ${targetHost}${hostNeedsChange ? "" : " (already current)"}`);
-  console.log(`  package: reinstalled from v${targetHelper} as a resolved commit${options.package ? "" : " (skipped)"}`);
+  // 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");
+  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}`);
   if (options.project) {
     console.log(`  project: ${path.resolve(options.project)} (${options.migrate ? "migrate + doctor" : "doctor only"})`);
   }
 
   if (options.check) {
-    const pending = [helperNeedsChange && "helper", hostNeedsChange && "host"].filter(Boolean);
+    const pending = [helperNeedsChange && "helper", hostNeedsChange && "host", packageNeedsChange && "package", personal.findings.length && "personal Pi configuration"].filter(Boolean);
     console.log(pending.length ? `\nUpdate available: ${pending.join(", ")}.` : "\nEverything is on the target release.");
     return;
   }