@oddessentials/agent-guild 0.4.0 → 0.5.0

package/README.md

@@ -8,8 +8,9 @@ coding tool, and see at a glance which sessions and agents are working.
 
 * **Start sessions from provider cards.** Anthropic (Claude Code), OpenAI
   (Codex CLI), Google (Gemini CLI), xAI (Grok Build), and a plain shell.
-  **New** starts a fresh session; **Existing** resumes one of
-  the tool's own earlier sessions from its id. Providers whose tool is not
+  **New** starts a fresh session; **Existing** lists the tool's own earlier
+  sessions, read from where the tool keeps them, with their ids, and
+  resumes one in its own folder, or any session by id. Providers whose tool is not
   installed are shown greyed out with an **Install** button that runs
   `npm install -g` in a session you can watch, or with install instructions
   when the tool is not an npm package. Installed tools show their version
@@ -33,13 +34,15 @@ coding tool, and see at a glance which sessions and agents are working.
 * **Close the page any time.** A separate local session manager owns the
   terminals. Reopen the page and it reconnects to the same sessions with
   their screens intact, as long as the manager is still running. Sessions do
-  not survive a computer restart. **Stop manager** in the top bar stops the
-  manager and ends every session; it asks first while any session is still
-  running.
+  not survive a computer restart. **Restart manager** in the top bar ends
+  every session and starts a fresh manager, and the page reconnects to it by
+  itself; **Stop manager** ends every session and leaves the manager
+  stopped. Both ask first while any session is still running. The top bar
+  also shows the version you are running.
 * **Stay current.** When a newer Agent Guild is on npm, an **Upgrade**
   button appears in the top bar and runs `npm install -g` in a session you
-  can watch. Sessions keep running; stop the manager and run `agent-guild
-  open` to use the new version.
+  can watch. Sessions keep running; once they are done, **Restart to use
+  vX.Y.Z** in the top bar switches to the new version.
 * **Light or dark.** The page follows your system theme and the top-bar
   toggle switches it. The guild artwork is the dark theme.
 
@@ -69,6 +72,7 @@ page stores it and then removes it from the address bar.
 | `agent-guild` or `agent-guild open` | Start the manager if needed and open the page. `--no-browser` prints the URL instead. |
 | `agent-guild status` | Show whether the manager is running and list its sessions. |
 | `agent-guild stop` | Stop the manager. This ends every session, without asking. The page's **Stop manager** button does the same and asks first while sessions are running. |
+| `agent-guild restart` | Stop the manager and start it again, on the version installed on disk. This ends every session, without asking. The page's **Restart manager** button does the same and asks first while sessions are running. |
 | `agent-guild start` | Run the manager in the foreground, for debugging. |
 | `agent-guild url` | Print the page URL with its token. |
 
@@ -100,6 +104,7 @@ one platform under a `win32` or `darwin` key. See
 | `usage` | Where the usage meters come from: `"claude"`, `"codex"`, `"gemini"`, `{ "command", "args" }` for a program that prints `{ "windows": [{ "label", "usedPercent", "resetsAt" }] }`, or `null` for none. |
 | `modelPattern` | Regular expression that finds the model name on the tool's screen when the tool does not report it. |
 | `resumeArgs` | Arguments that resume the tool's own session, with `{id}` standing for the id, e.g. `["--resume", "{id}"]`. Without it the card has no **Existing** button. |
+| `history` | Where the list of earlier sessions comes from: `"claude"`, `"codex"`, `"gemini"`, `"grok"` (the tool's own session files under its home folder), `{ "command", "args" }` for a program that prints `{ "sessions": [{ "id", "title", "cwd", "startedAt", "updatedAt" }] }`, or `null` for none, in which case **Existing** asks for an id. |
 | `env` | Extra environment variables for the tool. |
 | `accounts` | Further sign-ins of the tool, each in its own home folder, e.g. `[{ "id": "work", "label": "Work", "dir": "~/.claude-work" }]`. Without `dir`, the folder is `accounts/<provider>/<account>` in the data folder. The card shows one chip per account with its own meters, and a session starts under the chip picked; the tool signs in from inside the first session, and its reporting hooks are copied into the folder on first use. An entry with id `default` renames the tool's own sign-in. Needs `homeVar`. |
 | `homeVar` | The environment variable that moves the tool's home folder, e.g. `CLAUDE_CONFIG_DIR`. Set for Claude Code, Codex CLI, Gemini CLI and Grok Build by default. |

package/bin/agent-guild-report.mjs

@@ -9,6 +9,7 @@
 //   agent-guild-report <agent-id> [--name N] [--status working|waiting|idle|done]
 //                      [--detail TEXT] [--kind KIND] [--remove]
 //   agent-guild-report --model NAME [--display-name TEXT]
+//   agent-guild-report --session ID          (the tool's own session id, for resuming it later)
 //   agent-guild-report --hook                (reads a hook event as JSON on stdin:
 //                                             Claude Code, Codex CLI, Gemini CLI, Grok Build)
 //   agent-guild-report --claude-statusline [--passthrough]
@@ -27,6 +28,7 @@ if (!inSession && env.AGENT_GUILD_SESSION_ID && !env.AGENT_GUILD_REPORT_TOKEN) {
 
 const USAGE = `Usage: agent-guild-report <agent-id> [--name N] [--status working|waiting|idle|done] [--detail TEXT] [--kind KIND] [--remove]
        agent-guild-report --model NAME [--display-name TEXT]
+       agent-guild-report --session ID                     (the tool's own session id)
        agent-guild-report --hook                           (reads a coding tool's hook event JSON from stdin)
        agent-guild-report --claude-statusline [--passthrough]  (reads Claude Code status line JSON from stdin)`;
 
@@ -60,7 +62,8 @@ function readStdin() {
 }
 
 async function send(report) {
-  const kind = report.agentId !== undefined || report.finishForeground === true ? 'agents' : 'model';
+  const kind = report.agentId !== undefined || report.finishForeground === true ? 'agents'
+    : report.toolSessionId !== undefined ? 'tool-session' : 'model';
   const url = `${env.AGENT_GUILD_URL}/api/v1/sessions/${env.AGENT_GUILD_SESSION_ID}/${kind}`;
   const res = await fetch(url, {
     method: 'POST',
@@ -115,6 +118,16 @@ async function main() {
     await send({ model: args.model, displayName: args['display-name'] });
     return;
   }
+  if (args.session !== undefined && args.positional.length === 0) {
+    if (!args.session) {
+      console.error('agent-guild-report: --session needs an id');
+      process.exitCode = 2;
+      return;
+    }
+    if (!inSession) return;
+    await send({ toolSessionId: args.session });
+    return;
+  }
   const agentId = args.positional[0];
   if (!agentId) {
     console.error('agent-guild-report: an agent id is required (see --help)');

package/bin/agent-guild.mjs

@@ -4,25 +4,21 @@
 //   agent-guild [open]     start the session manager if needed, open the page
 //   agent-guild start      run the session manager in the foreground
 //   agent-guild stop       stop the manager (ends all sessions)
+//   agent-guild restart    stop the manager and start it again (ends all sessions)
 //   agent-guild status     show whether the manager is running
 //   agent-guild url        print the page URL (includes the access token)
 
 import fs from 'node:fs';
-import path from 'node:path';
 import { spawn } from 'node:child_process';
-import { fileURLToPath } from 'node:url';
 import {
   DEFAULT_HOST,
   VERSION,
-  ensureDataDir,
   loadOrCreateToken,
   paths,
   readRuntimeFile,
   resolvePort,
 } from '../src/manager/config.mjs';
-
-const here = path.dirname(fileURLToPath(import.meta.url));
-const managerEntry = path.resolve(here, '../src/manager/main.mjs');
+import { spawnManager } from '../src/manager/launch.mjs';
 
 function usage() {
   console.log(`Usage: agent-guild [command] [--no-browser]
@@ -31,6 +27,7 @@ Commands:
   open      Start the session manager if needed and open the web page (default)
   start     Run the session manager in the foreground
   stop      Stop the session manager and every session it owns
+  restart   Stop the session manager and start it again; ends every session
   status    Show whether the session manager is running
   url       Print the web page URL, including the access token
 
@@ -47,6 +44,12 @@ function baseUrl() {
   return `http://${DEFAULT_HOST}:${resolvePort()}`;
 }
 
+/** The port a URL names, including the one its scheme implies. */
+function portOf(url) {
+  const parsed = new URL(url);
+  return parsed.port ? Number(parsed.port) : parsed.protocol === 'https:' ? 443 : 80;
+}
+
 async function health(url, timeoutMs = 1000) {
   try {
     const res = await fetch(`${url}/api/v1/health`, { signal: AbortSignal.timeout(timeoutMs) });
@@ -88,36 +91,21 @@ function tailLog(lines = 15) {
   }
 }
 
-const MAX_LOG_BYTES = 5 * 1024 * 1024;
+/** Start a manager unless one answers. `port` pins the one to listen on; by default the configured one. */
+async function ensureManager({ port = null } = {}) {
+  const listenPort = port ?? resolvePort();
+  const expectedUrl = `http://${DEFAULT_HOST}:${listenPort}`;
+  // A pinned port is the endpoint to serve, so it is also the one to check;
+  // a manager found anywhere else is not the one asked for.
+  const knownUrl = port === null ? baseUrl() : expectedUrl;
+  const running = await health(knownUrl);
+  if (running) return { url: knownUrl, started: false, version: running.version };
 
-/** Keep one previous log so the file cannot grow without bound. */
-function rotateLog() {
-  try {
-    if (fs.statSync(paths.log).size > MAX_LOG_BYTES) fs.renameSync(paths.log, `${paths.log}.1`);
-  } catch { /* no log yet */ }
-}
-
-async function ensureManager() {
-  const running = await health(baseUrl());
-  if (running) return { url: baseUrl(), started: false, version: running.version };
-
-  ensureDataDir();
-  rotateLog();
-  const log = fs.openSync(paths.log, 'a');
-  fs.writeSync(log, `\n--- starting manager ${new Date().toISOString()} ---\n`);
-  const child = spawn(process.execPath, [managerEntry], {
-    detached: true,
-    stdio: ['ignore', log, log],
-    windowsHide: true,
-    env: process.env,
-  });
-  child.unref();
-  fs.closeSync(log);
+  const child = spawnManager({ env: { ...process.env, AGENT_GUILD_PORT: String(listenPort) } });
 
   let exited = false;
   child.once('exit', () => { exited = true; });
   const deadline = Date.now() + 20000;
-  const expectedUrl = `http://${DEFAULT_HOST}:${resolvePort()}`;
   while (Date.now() < deadline && !exited) {
     await new Promise((r) => setTimeout(r, 250));
     const url = readRuntimeFile()?.pid === child.pid ? readRuntimeFile().url : expectedUrl;
@@ -147,30 +135,80 @@ async function cmdOpen({ browser }) {
   }
 }
 
-async function cmdStop() {
-  const url = baseUrl();
-  if (!(await health(url))) {
-    console.log('Session manager is not running.');
-    return;
-  }
-  // `stop` is documented as ending every session, so it does not ask; the
-  // web page's Stop manager button is the one that confirms first.
+/**
+ * Ask a running manager to stop, or to stop and start again. Resolves to
+ * what it reported: the running session count, and whether it will start
+ * a successor itself (a manager from before restarts only stops).
+ */
+async function requestShutdown(url, { restart = false } = {}) {
+  // `stop` and `restart` are documented as ending every session, so they do
+  // not ask; the web page's buttons are the ones that confirm first.
   const res = await fetch(`${url}/api/v1/shutdown`, {
     method: 'POST',
     headers: { Authorization: `Bearer ${loadOrCreateToken()}`, 'Content-Type': 'application/json' },
-    body: JSON.stringify({ force: true }),
+    body: JSON.stringify(restart ? { force: true, restart: true } : { force: true }),
   });
-  if (!res.ok) throw new Error(`stop failed: HTTP ${res.status}`);
-  const { running = 0 } = await res.json().catch(() => ({}));
+  if (!res.ok) throw new Error(`${restart ? 'restart' : 'stop'} failed: HTTP ${res.status}`);
+  const body = await res.json().catch(() => ({}));
+  const running = body.running ?? 0;
   if (running > 0) console.log(`Ending ${running} running session(s).`);
-  for (let i = 0; i < 40; i++) {
+  return { running, restart: body.restart === true };
+}
+
+/** Resolves to true once nothing answers at `url`, false when it still does after `timeoutMs`. */
+async function waitForStop(url, timeoutMs = 6000) {
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
     await new Promise((r) => setTimeout(r, 150));
-    if (!(await health(url, 300))) {
-      console.log('Session manager stopped.');
+    if (!(await health(url, 300))) return true;
+  }
+  return false;
+}
+
+async function cmdStop() {
+  const url = baseUrl();
+  if (!(await health(url))) {
+    console.log('Session manager is not running.');
+    return;
+  }
+  await requestShutdown(url);
+  console.log(await waitForStop(url) ? 'Session manager stopped.' : 'Stop requested; the manager is still shutting down.');
+}
+
+async function cmdRestart() {
+  const url = baseUrl();
+  const before = await health(url);
+  if (!before) {
+    // Nothing to stop: a restart of a stopped manager is a start.
+    const { url: started, version } = await ensureManager();
+    console.log(`Session manager was not running; started Agent Guild ${version} at ${started}.`);
+    return;
+  }
+  const { restart } = await requestShutdown(url, { restart: true });
+  if (!restart) {
+    // A manager from before restarts stops without starting a successor,
+    // which is the case right after an upgrade: start one here instead.
+    if (!(await waitForStop(url, 15000))) throw new Error('the session manager did not stop, so it could not be restarted.');
+    // On the port the old one served, which an ephemeral port setting would otherwise lose.
+    const { url: started, version } = await ensureManager({ port: portOf(url) });
+    const changed = version !== before.version ? `, now Agent Guild ${version} (was ${before.version})` : '';
+    console.log(`Session manager restarted at ${started}${changed}.`);
+    return;
+  }
+  // The old manager starts its successor from the package on disk once its
+  // sessions have ended and its port is free, then exits.
+  const deadline = Date.now() + 30000;
+  while (Date.now() < deadline) {
+    await new Promise((r) => setTimeout(r, 250));
+    const now = await health(url, 500);
+    if (now && now.pid !== before.pid) {
+      const changed = now.version !== before.version ? `, now Agent Guild ${now.version} (was ${before.version})` : '';
+      console.log(`Session manager restarted at ${url}${changed}.`);
       return;
     }
   }
-  console.log('Stop requested; the manager is still shutting down.');
+  const details = tailLog();
+  throw new Error(`the session manager did not come back after the restart.${details ? `\n\nRecent log (${paths.log}):\n${details}` : ''}`);
 }
 
 async function cmdStatus() {
@@ -222,6 +260,7 @@ async function main() {
       return undefined;
     }
     case 'stop': return cmdStop();
+    case 'restart': return cmdRestart();
     case 'status': return cmdStatus();
     case 'url': {
       console.log(pageUrl(baseUrl(), loadOrCreateToken()));

package/config/providers.default.json

@@ -8,6 +8,7 @@
       "package": "@anthropic-ai/claude-code",
       "versionArgs": ["--version"],
       "usage": "claude",
+      "history": "claude",
       "homeVar": "CLAUDE_CONFIG_DIR",
       "accountEnv": { "CLAUDE_SECURESTORAGE_CONFIG_DIR": "{dir}" },
       "hooks": { "path": "settings.json", "example": "claude-code-settings.json" },
@@ -44,6 +45,7 @@
       "package": "@openai/codex",
       "versionArgs": ["--version"],
       "usage": "codex",
+      "history": "codex",
       "homeVar": "CODEX_HOME",
       "hooks": { "path": "hooks.json", "example": "codex-hooks.json" },
       "modelPattern": "\\bgpt-\\d[a-z0-9.-]*",
@@ -77,6 +79,7 @@
       "package": "@google/gemini-cli",
       "versionArgs": ["--version"],
       "usage": "gemini",
+      "history": "gemini",
       "homeVar": "GEMINI_CLI_HOME",
       "accountEnv": { "GEMINI_FORCE_FILE_STORAGE": "true" },
       "hooks": { "path": ".gemini/settings.json", "example": "gemini-settings.json" },
@@ -100,6 +103,7 @@
       "command": "grok",
       "package": "@xai-official/grok",
       "versionArgs": ["--version"],
+      "history": "grok",
       "homeVar": "GROK_HOME",
       "hooks": { "path": "hooks/agent-guild.json", "example": "grok-hooks.json" },
       "modelPattern": "\\bgrok-(?:build|\\d)[a-z0-9.-]*",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oddessentials/agent-guild",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "Launch and watch AI coding-assistant terminal sessions from one local web page. A bundled session manager owns the terminals so the page can close and reconnect.",
   "license": "MIT",
   "repository": {

package/src/manager/launch.mjs

@@ -0,0 +1,64 @@
+// Starting a session manager as a detached background process. Shared by
+// the `agent-guild` CLI, which starts one when none is running, and by a
+// manager that restarts itself: both run the package on disk, so a restart
+// after an upgrade comes up on the new version.
+
+import fs from 'node:fs';
+import path from 'node:path';
+import { spawn } from 'node:child_process';
+import { fileURLToPath } from 'node:url';
+import { ensureDataDir, paths } from './config.mjs';
+
+const here = path.dirname(fileURLToPath(import.meta.url));
+/** The manager entry point, from the package files on disk. */
+export const MANAGER_ENTRY = path.join(here, 'main.mjs');
+/** The package root the manager runs from. */
+export const ROOT_DIR = path.resolve(here, '../..');
+
+const MAX_LOG_BYTES = 5 * 1024 * 1024;
+
+/** Keep one previous log so the file cannot grow without bound. */
+function rotateLog() {
+  try {
+    if (fs.statSync(paths.log).size > MAX_LOG_BYTES) fs.renameSync(paths.log, `${paths.log}.1`);
+  } catch { /* no log yet */ }
+}
+
+/**
+ * Start a manager that outlives this process, with its output appended to
+ * `manager.log`. Returns the child; the caller watches `/health` or the
+ * runtime file to learn when it is serving.
+ *
+ * @param {{ env?: NodeJS.ProcessEnv, note?: string }} [opts]
+ */
+export function spawnManager({ env = process.env, note = 'starting manager' } = {}) {
+  ensureDataDir();
+  rotateLog();
+  const log = fs.openSync(paths.log, 'a');
+  fs.writeSync(log, `\n--- ${note} ${new Date().toISOString()} ---\n`);
+  const child = spawn(process.execPath, [MANAGER_ENTRY], {
+    detached: true,
+    stdio: ['ignore', log, log],
+    windowsHide: true,
+    env,
+  });
+  child.unref();
+  fs.closeSync(log);
+  return child;
+}
+
+/**
+ * The double-click launcher for this platform, when the package carries one
+ * (a checkout of the repository; the npm package does not include them).
+ * Null otherwise, so a page never names a file that is not there.
+ */
+export function launcherPath(platform = process.platform, rootDir = ROOT_DIR) {
+  const name = platform === 'win32' ? 'AgentGuild.cmd' : platform === 'darwin' ? 'AgentGuild.command' : null;
+  if (!name) return null;
+  const file = path.join(rootDir, 'launchers', name);
+  try {
+    return fs.statSync(file).isFile() ? file : null;
+  } catch {
+    return null;
+  }
+}

package/src/manager/main.mjs

@@ -7,12 +7,14 @@ import { fileURLToPath } from 'node:url';
 import { ProviderRegistry } from './providers.mjs';
 import { SessionManager } from './session-manager.mjs';
 import { UsageMonitor } from './usage.mjs';
+import { SessionHistory } from './session-history.mjs';
 import { ModelStats } from './model-stats.mjs';
 import { NewsFeed } from './news.mjs';
 import { createManagerServer } from './server.mjs';
 import { SelfUpdate } from './self-update.mjs';
 import { resolveBaseEnv, pathReader } from './shell-env.mjs';
 import { writeReportShims } from './report-shims.mjs';
+import { launcherPath, spawnManager } from './launch.mjs';
 import {
   DEFAULT_HOST,
   PACKAGE_FILE,
@@ -59,6 +61,7 @@ export async function startManager({ port = resolvePort(), host = DEFAULT_HOST,
   const selfUpdate = new SelfUpdate({ pkg: PACKAGE_NAME, version, packageFile, registry });
   const manager = new SessionManager({ registry, baseEnv, getApiUrl: () => api.url, sessionDefaults, shimDir, selfUpdate });
   const usage = new UsageMonitor({ registry, env: baseEnv });
+  const history = new SessionHistory({ registry, env: baseEnv });
   const modelStats = new ModelStats({ registry });
   const news = new NewsFeed({ registry });
   let closing = null;
@@ -70,9 +73,14 @@ export async function startManager({ port = resolvePort(), host = DEFAULT_HOST,
   const versionTimer = setInterval(refreshVersions, VERSION_REFRESH_MS);
   versionTimer.unref();
 
-  const shutdown = (reason = 'shutdown') => {
+  /**
+   * End every session and close the API. With `restart`, a new manager is
+   * then started from the package on disk, so it comes up on the version
+   * an upgrade installed; clients reconnect to it by themselves.
+   */
+  const shutdown = (reason = 'shutdown', { restart = false } = {}) => {
     if (closing) return closing;
-    console.log(`[manager] stopping (${reason}); ending ${manager.sessions.size} session(s)`);
+    console.log(`[manager] ${restart ? 'restarting' : 'stopping'} (${reason}); ending ${manager.sessions.size} session(s)`);
     clearInterval(versionTimer);
     removeRuntimeFile();
     // Sessions end before the API closes, and the last event says whether
@@ -80,7 +88,17 @@ export async function startManager({ port = resolvePort(), host = DEFAULT_HOST,
     // from a timeout. The manager refuses new sessions meanwhile.
     closing = manager.shutdown().then(({ remaining }) => {
       if (remaining > 0) console.warn(`[manager] ${remaining} session process(es) did not confirm exiting in time`);
-      return api.close({ notice: { type: 'manager.stopped', remaining } });
+      return api.close({ notice: { type: 'manager.stopped', remaining, restart } });
+    }).then(() => {
+      // Only once the port is released: the successor listens on the same one,
+      // the bound one rather than a configured 0, so clients find it again.
+      if (!restart) return;
+      try {
+        const child = spawnManager({ note: 'restarting manager', env: { ...process.env, AGENT_GUILD_PORT: String(api.port) } });
+        console.log(`[manager] started the next manager (pid ${child.pid})`);
+      } catch (err) {
+        console.error(`[manager] could not start the next manager: ${err.message}`);
+      }
     });
     return closing;
   };
@@ -92,6 +110,7 @@ export async function startManager({ port = resolvePort(), host = DEFAULT_HOST,
     manager,
     registry,
     usage,
+    history,
     modelStats,
     news,
     token,
@@ -101,7 +120,8 @@ export async function startManager({ port = resolvePort(), host = DEFAULT_HOST,
     version,
     selfUpdate,
     extraOrigins,
-    onShutdownRequest: () => shutdown('requested via API').then(() => process.exit(0)),
+    launcher: launcherPath(),
+    onShutdownRequest: ({ restart = false } = {}) => shutdown('requested via API', { restart }).then(() => process.exit(0)),
   });
 
   try {

package/src/manager/providers.mjs

@@ -60,6 +60,15 @@ function normalizeUsage(usage) {
   return null;
 }
 
+/** "claude", "codex", "gemini", "grok", a { command, args } that prints past sessions as JSON, or null. */
+function normalizeHistory(history) {
+  if (['claude', 'codex', 'gemini', 'grok'].includes(history)) return history;
+  if (history && typeof history === 'object' && typeof history.command === 'string' && history.command) {
+    return { command: history.command, args: Array.isArray(history.args) ? history.args.map(String) : [] };
+  }
+  return null;
+}
+
 function stringList(value) {
   return Array.isArray(value) ? value.map(String).filter(Boolean) : [];
 }
@@ -153,6 +162,7 @@ function normalize(raw, platform, warnings) {
     package: merged.package ? String(merged.package) : null,
     versionArgs: Array.isArray(merged.versionArgs) && merged.versionArgs.length ? merged.versionArgs.map(String) : null,
     usage: normalizeUsage(merged.usage),
+    history: normalizeHistory(merged.history),
     modelPattern: merged.modelPattern ? String(merged.modelPattern) : null,
     args: Array.isArray(merged.args) ? merged.args.map(String) : [],
     resumeArgs: Array.isArray(merged.resumeArgs) ? merged.resumeArgs.map(String) : [],
@@ -612,6 +622,7 @@ export class ProviderRegistry extends EventEmitter {
       warnings: this.installWarnings(provider, installs),
       npmNote: provider.npmNote,
       usageSource: provider.usage === null ? null : typeof provider.usage === 'string' ? provider.usage : 'command',
+      historySource: provider.history === null ? null : typeof provider.history === 'string' ? provider.history : 'command',
       accounts: provider.accounts.map(({ id, label }) => ({ id, label })),
       modelPattern: provider.modelPattern,
       color: provider.color,

package/src/manager/server.mjs

@@ -100,6 +100,7 @@ export function createManagerServer({
   manager,
   registry,
   usage,
+  history,
   modelStats,
   news = null,
   token,
@@ -109,6 +110,9 @@ export function createManagerServer({
   version = '0.0.0',
   selfUpdate = null,
   extraOrigins = [],
+  /** The double-click launcher file for this platform, or null when the package carries none. */
+  launcher = null,
+  /** @type {(opts: { restart: boolean }) => void} */
   onShutdownRequest = () => {},
 }) {
   const upgradeInfo = () => (selfUpdate ? selfUpdate.describe() : null);
@@ -184,9 +188,10 @@ export function createManagerServer({
       return sendJson(res, 200, { ok: true, name: 'agent-guild', version, pid: process.pid });
     }
 
-    // Agent and model reports may authenticate with the per-session report
-    // token that the manager injects into each tool's environment.
-    const reportMatch = route.match(/^\/sessions\/([a-f0-9]+)\/(agents|model)$/);
+    // Agent, model and tool-session reports may authenticate with the
+    // per-session report token that the manager injects into each tool's
+    // environment.
+    const reportMatch = route.match(/^\/sessions\/([a-f0-9]+)\/(agents|model|tool-session)$/);
     if (reportMatch && method === 'POST') {
       const [, id, kind] = reportMatch;
       const body = await readJsonBody(req);
@@ -195,7 +200,8 @@ export function createManagerServer({
         reportToken: req.headers['x-agent-guild-report-token'],
       };
       if (kind === 'agents') return sendJson(res, 200, { agent: manager.reportAgent(id, body, auth) });
-      return sendJson(res, 200, { model: manager.reportModel(id, body, auth) });
+      if (kind === 'model') return sendJson(res, 200, { model: manager.reportModel(id, body, auth) });
+      return sendJson(res, 200, { toolSessionId: manager.reportToolSession(id, body, auth) });
     }
 
     requireAuth(req, url);
@@ -210,6 +216,7 @@ export function createManagerServer({
         startedAt,
         warnings: registry.warnings,
         upgrade: upgradeInfo(),
+        launcher,
       });
     }
     if (route === '/upgrade' && method === 'POST') {
@@ -234,6 +241,14 @@ export function createManagerServer({
     if (route === '/news' && method === 'GET' && news) {
       return sendJson(res, 200, news.snapshot());
     }
+    const historyMatch = route.match(/^\/providers\/([a-z0-9][a-z0-9_-]{0,31})\/history$/);
+    if (historyMatch && method === 'GET') {
+      const provider = registry.get(historyMatch[1]);
+      if (!provider) throw new HttpError(404, `unknown provider "${historyMatch[1]}"`, 'unknown_provider');
+      if (!provider.history) throw new HttpError(400, `${provider.tool} has no history source configured`, 'history_unsupported');
+      const account = registry.account(provider, url.searchParams.get('account'));
+      return sendJson(res, 200, { history: await history.list(provider, account, { limit: url.searchParams.get('limit') }) });
+    }
     const installMatch = route.match(/^\/providers\/([a-z0-9][a-z0-9_-]{0,31})\/install$/);
     if (installMatch && method === 'POST') {
       const body = await readJsonBody(req);
@@ -258,14 +273,16 @@ export function createManagerServer({
         err.running = running;
         throw err;
       }
+      // With `restart`, a new manager is started once this one has closed.
+      const restart = body.restart === true;
       // Refuse new sessions from this moment, before the shutdown itself
       // runs: a session accepted in between would be ended without warning.
       manager.closing = true;
-      sendJson(res, 202, { ok: true, running });
+      sendJson(res, 202, { ok: true, running, restart });
       // Tell every client first, so a second page shows "stopped" rather
       // than "not reachable" when its socket drops.
-      broadcast({ type: 'manager.stopping', running });
-      setImmediate(onShutdownRequest);
+      broadcast({ type: 'manager.stopping', running, restart });
+      setImmediate(() => onShutdownRequest({ restart }));
       return undefined;
     }
 
@@ -350,7 +367,7 @@ export function createManagerServer({
 
   function handleEvents(ws) {
     eventClients.add(ws);
-    safeSend(ws, { type: 'hello', version, upgrade: upgradeInfo(), sessions: manager.list() });
+    safeSend(ws, { type: 'hello', version, pid: process.pid, launcher, upgrade: upgradeInfo(), sessions: manager.list() });
     ws.on('close', () => eventClients.delete(ws));
     ws.on('message', () => { /* events socket is server -> client only */ });
   }