@piagent/platform 1.48.0 → 1.48.2

package/packages/piagent-webui/gateway/session-inspection-registry.ts

@@ -249,13 +249,18 @@ export class SessionInspectionRegistry {
         ...(provider === "agent_watch_managed" && value.managedFast === true ? { managedFast: true } : {}),
         ...(provider === "agent_watch_managed" && value.managedBypass === true ? { managedBypass: true } : {}) }];
     });
-    // Only offer a default present in the authenticated host catalog. Retain
-    // the previous Sol baseline for accounts that have not received GPT-6 yet.
+    // A new conversation starts where the Terminal does: the model and thinking
+    // level Pi keeps in settings.json (the last ones chosen with /model). Only
+    // a default present in the authenticated host catalog is offered; an account
+    // that set none gets the Sol baseline (GPT-5.6 before GPT-6 reached it).
     const managed = models.length === 1 && models[0].provider === 'agent_watch_managed';
-    const defaultModel = managed ? models[0] : ["gpt-6-sol", "gpt-5.6-sol"].map((id) => models.find((value) => value.provider === "openai-codex" && value.modelId === id)).find(Boolean);
+    const settings = this.#agentDir ? safeRead(() => JSON.parse(fs.readFileSync(path.join(this.#agentDir!, "settings.json"), "utf8")) as Record<string, unknown>, {}) : {};
+    const chosen = models.find((value) => value.provider === settings.defaultProvider && value.modelId === settings.defaultModel);
+    const defaultModel = managed ? models[0] : chosen ?? ["gpt-6-sol", "gpt-5.6-sol"].map((id) => models.find((value) => value.provider === "openai-codex" && value.modelId === id)).find(Boolean);
+    const chosenThinking = !managed && typeof settings.defaultThinkingLevel === "string" && defaultModel?.thinkingLevels.includes(settings.defaultThinkingLevel) ? settings.defaultThinkingLevel : null;
     return { schemaVersion: 1, version: "piagent-session-creation-options-v1", generatedAt: new Date().toISOString(),
       projects: [...projects.values()].slice(0, 200), models,
-      defaultModelRef: defaultModel?.modelRef ?? null, defaultThinkingLevel: defaultModel ? (defaultModel.thinkingLevels.includes("high") ? "high" : defaultModel.thinkingLevels[0] ?? null) : null,
+      defaultModelRef: defaultModel?.modelRef ?? null, defaultThinkingLevel: defaultModel ? chosenThinking ?? (defaultModel.thinkingLevels.includes("high") ? "high" : defaultModel.thinkingLevels[0] ?? null) : null,
       profiles: managed ? [] : profiles, workflows: [],
       runtimeActions: managed ? [] : WEBUI_RUNTIME_ACTIONS,
       webSearch: inspectWebSearchCapability({ agentDir: this.#agentDir, models: availableModels }),

package/scripts/company-terminal.mjs

@@ -9,6 +9,7 @@ import { execFile } from 'node:child_process';
 import { pathToFileURL } from 'node:url';
 
 import { registerTerminalUpdateOffer } from '../packages/piagent-core/runtime/update/terminal-update-offer.mjs';
+import { watchTerminalReload } from '../packages/piagent-core/runtime/update/terminal-reload.mjs';
 import { registerStyleCommand } from '../packages/piagent-core/runtime/terminal/terminal-style.mjs';
 import { parseFailure } from '../packages/piagent-core/runtime/managed-failure.mjs';
 import { checkpointsOf } from '../packages/piagent-core/managed/checkpoints.mjs';
@@ -258,6 +259,16 @@ export function companyMode(Base, { summary, whatsNew, components }) {
   const say = (mode, name, tone = 'warning') => mode.showExtensionNotify(companyCommandText(name, summary()), tone);
   return class CompanyInteractiveMode extends Base {
     async handleShareCommand() { say(this, 'share'); }
+    // Pi's own shutdown without its process.exit: the Terminal is restored and
+    // the session closed, then piagent-studio.mjs hands over to the new release.
+    async stopForRestart() {
+      if (this.isShuttingDown) return;
+      this.isShuttingDown = true;
+      this.themeController?.disableAutoSync?.();
+      await this.ui.terminal.drainInput(1000);
+      this.stop();
+      await this.runtimeHost.dispose();
+    }
     async handleBugCommand() { say(this, 'bug'); }
     suggestBugReport() {}
     crashReportInstructions() { return 'Lần sau mở lại: piagent studio, rồi /resume. Gửi admin của team giờ xảy ra lỗi.'; }
@@ -285,7 +296,7 @@ export function companyMode(Base, { summary, whatsNew, components }) {
   };
 }
 
-export function companyTerminalExtension({ managed, packageRoot, sdkRoot, bindingChanged = () => false }) {
+export function companyTerminalExtension({ managed, packageRoot, sdkRoot, bindingChanged = () => false, restartInPlace = null }) {
   const require = createRequire(path.join(sdkRoot, 'package.json'));
   let tui;
   const components = async () => (tui ??= await import(pathToFileURL(require.resolve('@earendil-works/pi-tui')).href));
@@ -302,6 +313,15 @@ 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: 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 });
 
+    // `piagent reload` and a finished update: the company code is loaded once
+    // per process, so this Terminal starts again in place on the same
+    // conversation (piagent-studio.mjs), when idle. A Terminal opened by an
+    // older launcher cannot be started again for the member: it says so.
+    watchTerminalReload(pi, { apply: async (ctx, request) => {
+      if (!restartInPlace) { ctx.ui.notify(`Có Piagent ${request.version ?? 'mới'}: thoát rồi mở lại \`piagent studio\`, rồi /resume, để dùng bản mới.`, 'warning'); return; }
+      setTimeout(() => { void restartInPlace(); }, 0);
+    } });
+
     // The member's pick of look (/style); /settings is not offered here.
     registerStyleCommand(pi, { remember: true });
 

package/scripts/piagent-cli.mjs

@@ -29,7 +29,8 @@ const scriptByCommand = {
   "piagent-dashboard": "scripts/piagent-dashboard.mjs",
   "piagent-pi-host": "scripts/pi-host.mjs",
   "piagent-skills": "scripts/skill-sources.mjs",
-  "piagent-restore-pi": "scripts/personal-pi-restore.mjs"
+  "piagent-restore-pi": "scripts/personal-pi-restore.mjs",
+  "piagent-reload": "scripts/terminal-reload.mjs"
 };
 
 const packageRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
@@ -93,6 +94,7 @@ if (invokedAs === "piagent") {
     console.log("  dashboard   Open and manage the local session hub");
     console.log("  studio      Open the managed company agent imported by Agent Watch");
     console.log("  pi          Same as `piagent`: Pi on the release Piagent is qualified on, in Piagent's home");
+    console.log("  reload      Move every open Piagent Terminal to the installed release, without closing them");
     console.log("  restore-pi  Take an older Piagent install out of your own pi (~/.pi/agent)");
     console.log("  pi-host     Show or install the Pi host Piagent runs");
     console.log("  skills      Add, list or remove skill sources such as mattpocock/skills");
@@ -196,18 +198,48 @@ const runner = target.endsWith(".mjs") ? process.execPath : "bash";
 const runnerArgs = target.endsWith(".mjs")
   ? ["--disable-warning=ExperimentalWarning", "--import", pathToFileURL(path.join(sourceRoot, "scripts", "register-typescript-loader.mjs")).href, target]
   : [target];
-const child = spawn(runner, [...runnerArgs, ...forwardedArgs], {
-  cwd: process.cwd(),
-  env: script === "scripts/piagent-studio.mjs" ? { PATH: "/usr/bin:/bin", HOME: os.homedir(), TERM: process.env.TERM || "xterm-256color", LANG: "en_US.UTF-8" }
-    : { ...process.env, PI_CODING_AGENT_DIR: piagentHome(), ...(terminal ? { PIAGENT_ACTIVE: "1" } : {}) },
-  stdio: "inherit"
-});
+// The company Terminal can start again in place on a new release (`piagent
+// reload`, or after `piagent-update`): it writes the arguments that reopen its
+// conversation to this file and exits with RESTART_CODE; the files of the
+// installed release are run again with them, in the same terminal window.
+const RESTART_CODE = 75;
+const restartFile = script === "scripts/piagent-studio.mjs" ? path.join(os.homedir(), ".pi", "piagent-restart", `${process.pid}.json`) : null;
+function takeRestart() {
+  if (!restartFile) return null;
+  try {
+    const value = JSON.parse(fs.readFileSync(restartFile, "utf8"));
+    fs.rmSync(restartFile, { force: true });
+    return Array.isArray(value?.args) && value.args.every((arg) => typeof arg === "string") ? value.args : null;
+  } catch { return null; }
+}
 
-child.once("error", (error) => {
-  const code = error && typeof error === "object" && "code" in error ? ` (${error.code})` : "";
-  console.error(`Pi Agent command could not start ${runner}${code}. Ensure it is installed and available on PATH.`);
-  process.exit(1);
-});
+let child;
+function launch(args) {
+  child = spawn(runner, [...runnerArgs, ...args], {
+    cwd: process.cwd(),
+    env: script === "scripts/piagent-studio.mjs" ? { PATH: "/usr/bin:/bin", HOME: os.homedir(), TERM: process.env.TERM || "xterm-256color", LANG: "en_US.UTF-8", PIAGENT_RESTART_FILE: restartFile }
+      : { ...process.env, PI_CODING_AGENT_DIR: piagentHome(), ...(terminal ? { PIAGENT_ACTIVE: "1" } : {}) },
+    stdio: "inherit"
+  });
+
+  child.once("error", (error) => {
+    const code = error && typeof error === "object" && "code" in error ? ` (${error.code})` : "";
+    console.error(`Pi Agent command could not start ${runner}${code}. Ensure it is installed and available on PATH.`);
+    process.exit(1);
+  });
+
+  child.once("exit", (code, signal) => {
+    if (signal) {
+      process.removeAllListeners(signal);
+      process.kill(process.pid, signal);
+      return;
+    }
+    const again = code === RESTART_CODE ? takeRestart() : null;
+    if (again) { launch(again); return; }
+    process.exit(code ?? 1);
+  });
+}
+launch(forwardedArgs);
 
 // 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
@@ -215,12 +247,3 @@ child.once("error", (error) => {
 // 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;
-  }
-  process.exit(code ?? 1);
-});

package/scripts/piagent-studio.mjs

@@ -30,6 +30,11 @@ const home = os.homedir();
 // Read before the environment is cleared: a Herdr pane's socket for the
 // Terminal's reporter, and the PATH that finds the Windows browser from WSL.
 const herdr = herdrEnvironment(), ambientPath = process.env.PATH;
+// The launcher (piagent-cli.mjs) names a file for a restart in place: the
+// Terminal writes the arguments that reopen this conversation there and exits
+// with RESTART_CODE, and the launcher starts the installed release with them.
+const RESTART_CODE = 75, restartFile = /\/\.pi\/piagent-restart\/\d+\.json$/.test(process.env.PIAGENT_RESTART_FILE ?? '') ? process.env.PIAGENT_RESTART_FILE : null;
+let relaunch = null;
 // Joining Agent Watch takes a few seconds; keys typed before the Terminal draws are lost, so say so.
 if (!['--check', '--prompt', '--serve', '--doctor', '--web', '--rpc'].some((f) => flags.has(f)) && process.stderr.isTTY) process.stderr.write('Piagent công ty: đang kết nối Agent Watch, chờ ô nhập hiện ra rồi gõ…\n');
 // Do this before importing the SDK: it must not discover personal keys, Node
@@ -148,7 +153,8 @@ try {
   const { companyTerminalExtension, companyToolRenderers, companyInteractiveMode, harnessSummary } = await import('./company-terminal.mjs');
   const toolRenderers = await companyToolRenderers(config.sdk_root);
   const packageRoot = path.dirname(path.dirname(fileURLToPath(import.meta.url)));
-  const terminal = companyTerminalExtension({ managed: () => current, packageRoot, sdkRoot: config.sdk_root,
+  const restart = { request: null };
+  const terminal = companyTerminalExtension({ managed: () => current, packageRoot, sdkRoot: config.sdk_root, restartInPlace: restartFile ? () => restart.request?.() : null,
     bindingChanged: () => { try { return digest(config.entrypoint) !== config.entrypoint_sha256; } catch { return true; } } });
   // Herdr shows the Terminal's state and reopens it after a restart; scripted runs have no pane to show.
   const reportToHerdr = herdr && !['--check', '--prompt', '--rpc'].some((f) => flags.has(f));
@@ -216,7 +222,15 @@ try {
       : 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);
     // /share, /bug, /login, /model, /thinking, /settings and /changelog: company-terminal.mjs.
     const CompanyMode = await companyInteractiveMode(api, { sdkRoot: config.sdk_root, packageRoot, summary: () => harnessSummary(current) });
-    await new CompanyMode(host, { verbose: false }).run();
+    const mode = new CompanyMode(host, { verbose: false });
+    const restarting = new Promise((resolve) => { restart.request = async () => {
+      if (relaunch) return;
+      const file = current?.session.sessionManager.getSessionFile?.(), saved = file && fs.existsSync(file) ? file : null;
+      const kept = []; for (let i = 0; i < args.length; i++) { if (args[i] === '--session') { i++; continue; } kept.push(args[i]); }
+      relaunch = [...kept, ...(saved ? ['--session', saved] : [])];
+      await mode.stopForRestart(); resolve();
+    }; });
+    await Promise.race([mode.run(), restarting]);
   }
   }
 } catch (error) {
@@ -229,3 +243,9 @@ try {
     : process.platform === 'linux' ? 'Trong Agent Watch cho Windows, chọn lại Kết nối Piagent trong WSL.' : 'Mở Agent Watch → Studio, nhập lại cấu hình cho Piagent, hoặc kiểm tra quyền Keychain.');
   process.stderr.write(`Agent Watch: ${code}. ${hint}\n`); process.exitCode = 1;
 } finally { await gateway?.close(); if (current) await current.dispose(); else await broker?.dispose(); hold?.release(); }
+if (relaunch && restartFile) {
+  fs.mkdirSync(path.dirname(restartFile), { recursive: true, mode: 0o700 });
+  fs.writeFileSync(restartFile, JSON.stringify({ args: relaunch }), { mode: 0o600 });
+  process.stderr.write('Piagent công ty: đang mở lại với bản mới, giữ nguyên cuộc trò chuyện…\n');
+  process.exit(RESTART_CODE);
+}

package/scripts/terminal-reload.mjs

@@ -0,0 +1,15 @@
+#!/usr/bin/env node
+// `piagent reload`: every open Piagent Terminal on this machine (`piagent`
+// and `piagent studio`) loads the installed release when it is idle; a task
+// running in one finishes first. The conversation stays open. piagent-update
+// asks the same once it installed a release.
+import fs from "node:fs";
+import { requestTerminalReload } from "../packages/piagent-core/runtime/update/terminal-reload.mjs";
+
+if (process.argv.slice(2).some((arg) => ["--help", "-h"].includes(arg))) {
+  console.log("Usage: piagent reload\n\nEvery open Piagent Terminal (piagent, piagent studio) loads the installed release when it is idle.\nA task running in one finishes first; the conversation stays open.");
+  process.exit(0);
+}
+const manifest = JSON.parse(fs.readFileSync(new URL("../package.json", import.meta.url), "utf8"));
+requestTerminalReload({ version: manifest.version, piHost: manifest.peerDependencies?.["@earendil-works/pi-coding-agent"] ?? null });
+console.log(`Piagent ${manifest.version}: các Terminal đang mở (piagent, piagent studio) sẽ nạp bản này khi rảnh; Terminal đang chạy task thì nạp khi task xong. Cuộc trò chuyện giữ nguyên.`);

package/scripts/update-global.mjs

@@ -552,6 +552,16 @@ function main() {
     : `\nPASS: updated to v${targetHelper}.`);
   // A dashboard started before the update still serves the earlier release.
   if (!options.dryRun && helperNeedsChange) console.log("Open the dashboard with `piagent dashboard`: one still running an earlier release is restarted on the new one.");
+  // Open Terminals move to the new release when they are idle (a run in
+  // progress finishes first): the same request as `piagent reload`.
+  if (!options.dryRun && (helperNeedsChange || packageNeedsChange)) {
+    import("../packages/piagent-core/runtime/update/terminal-reload.mjs")
+      .then(({ requestTerminalReload }) => {
+        requestTerminalReload({ version: targetHelper, piHost: targetHost });
+        console.log("Open Terminals (piagent, piagent studio) load the new release when idle; a running task finishes first.");
+      })
+      .catch(() => console.log("Open Terminals keep the earlier release until reopened (`piagent reload` asks them again)."));
+  }
 }
 
 main();