@oddessentials/agent-guild 0.4.0 → 0.6.0

package/src/manager/main.mjs

@@ -7,12 +7,15 @@ 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 { Changelog } from './changelog.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,8 +62,10 @@ 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 });
+  const changelog = new Changelog({ latest: () => selfUpdate.latest });
   let closing = null;
 
   const refreshVersions = () => {
@@ -70,9 +75,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 +90,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,8 +112,10 @@ export async function startManager({ port = resolvePort(), host = DEFAULT_HOST,
     manager,
     registry,
     usage,
+    history,
     modelStats,
     news,
+    changelog,
     token,
     host,
     port,
@@ -101,7 +123,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/news.mjs

@@ -14,7 +14,7 @@ const LIMITS = { news: 20, releases: 5, research: 10 };
 const TITLE_MAX = 300;
 const SUMMARY_MAX = 240;
 const RAW_MAX = 8000;
-const USER_AGENT = `agent-guild/${VERSION} (+https://github.com/oddessentials/agent-guild)`;
+export const USER_AGENT = `agent-guild/${VERSION} (+https://github.com/oddessentials/agent-guild)`;
 const FEED_ACCEPT = 'application/rss+xml, application/atom+xml, application/xml;q=0.9, text/xml;q=0.8, */*;q=0.5';
 
 const latestRelease = (id, name, repo, provider) => ({
@@ -64,7 +64,7 @@ const NAMED = {
   uacute: 'ú', uuml: 'ü', ccedil: 'ç', ntilde: 'ñ', szlig: 'ß', Auml: 'Ä', Ouml: 'Ö', Uuml: 'Ü',
 };
 
-class FeedError extends Error {}
+export class FeedError extends Error {}
 
 const fields = new Map();
 const attrs = new Map();
@@ -329,7 +329,7 @@ function merge(previous, fresh, limit, now) {
   return [...byKey.values()].sort((a, b) => b.time - a.time).slice(0, limit);
 }
 
-async function readBody(res, maxBytes) {
+export async function readBody(res, maxBytes) {
   const tooLarge = () => new FeedError(`sent more than ${maxBytes / 1024 / 1024} MB`);
   if (Number(res.headers.get('content-length')) > maxBytes) throw tooLarge();
   const chunks = [];
@@ -349,12 +349,12 @@ async function readBody(res, maxBytes) {
   }
 }
 
-function refusal(res) {
+export function refusal(res) {
   if ((res.status === 403 || res.status === 429) && res.headers.get('x-ratelimit-remaining') === '0') return 'GitHub API rate limit exceeded';
   return `HTTP ${res.status}`;
 }
 
-function failure(err, timeoutMs) {
+export function failure(err, timeoutMs) {
   if (err instanceof FeedError) return err.message;
   if (err?.name === 'TimeoutError') return `did not answer within ${timeoutMs / 1000} seconds`;
   if (err instanceof SyntaxError) return 'sent data that could not be read';

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

@@ -21,6 +21,9 @@ const MIME = {
   '.css': 'text/css; charset=utf-8',
   '.svg': 'image/svg+xml',
   '.png': 'image/png',
+  '.avif': 'image/avif',
+  '.webp': 'image/webp',
+  '.woff2': 'font/woff2',
   '.ico': 'image/x-icon',
   '.json': 'application/json; charset=utf-8',
 };
@@ -100,8 +103,10 @@ export function createManagerServer({
   manager,
   registry,
   usage,
+  history,
   modelStats,
   news = null,
+  changelog = null,
   token,
   host = '127.0.0.1',
   port = 0,
@@ -109,6 +114,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);
@@ -144,16 +152,27 @@ export function createManagerServer({
     }
   }
 
-  function serveFile(res, file, { cache = false } = {}) {
-    fs.readFile(file, (err, data) => {
-      if (err) return sendJson(res, 404, { error: { code: 'not_found', message: 'not found' } });
-      res.writeHead(200, {
+  function serveFile(req, res, file, { cache = false } = {}) {
+    const notFound = () => sendJson(res, 404, { error: { code: 'not_found', message: 'not found' } });
+    fs.stat(file, (statErr, stat) => {
+      if (statErr || !stat.isFile()) return notFound();
+      const etag = `W/"${stat.size.toString(16)}-${Math.floor(stat.mtimeMs).toString(16)}"`;
+      const headers = {
         ...SECURITY_HEADERS,
         'Content-Type': MIME[path.extname(file).toLowerCase()] || 'application/octet-stream',
         'Cache-Control': cache ? 'public, max-age=3600' : 'no-cache',
-        'Content-Length': data.length,
+        ETag: etag,
+      };
+      const known = String(req.headers['if-none-match'] || '').split(',').map((tag) => tag.trim());
+      if (known.includes(etag) || known.includes('*')) {
+        res.writeHead(304, headers);
+        return res.end();
+      }
+      fs.readFile(file, (err, data) => {
+        if (err) return notFound();
+        res.writeHead(200, { ...headers, 'Content-Length': data.length });
+        res.end(data);
       });
-      res.end(data);
     });
   }
 
@@ -161,7 +180,7 @@ export function createManagerServer({
     if (req.method !== 'GET' && req.method !== 'HEAD') {
       throw new HttpError(405, 'method not allowed', 'method_not_allowed');
     }
-    if (vendor[pathname]) return serveFile(res, vendor[pathname], { cache: true });
+    if (vendor[pathname]) return serveFile(req, res, vendor[pathname], { cache: true });
     let rel;
     try {
       rel = pathname === '/' ? 'index.html' : decodeURIComponent(pathname).replace(/^\/+/, '');
@@ -173,7 +192,7 @@ export function createManagerServer({
     if (file !== webDir && !file.startsWith(webDir + path.sep)) {
       throw new HttpError(404, 'not found', 'not_found');
     }
-    return serveFile(res, file);
+    return serveFile(req, res, file);
   }
 
   async function handleApi(req, res, url) {
@@ -184,9 +203,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 +215,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 +231,7 @@ export function createManagerServer({
         startedAt,
         warnings: registry.warnings,
         upgrade: upgradeInfo(),
+        launcher,
       });
     }
     if (route === '/upgrade' && method === 'POST') {
@@ -234,6 +256,17 @@ export function createManagerServer({
     if (route === '/news' && method === 'GET' && news) {
       return sendJson(res, 200, news.snapshot());
     }
+    if (route === '/changelog' && method === 'GET' && changelog) {
+      return sendJson(res, 200, changelog.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 +291,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;
     }
 
@@ -347,10 +382,11 @@ export function createManagerServer({
   registry.on('updated', () => broadcast({ type: 'providers.updated', providers: registry.list() }));
   selfUpdate?.on('updated', () => broadcast({ type: 'manager.upgrade', upgrade: upgradeInfo() }));
   news?.on('updated', () => broadcast({ type: 'news.updated' }));
+  changelog?.on('updated', () => broadcast({ type: 'changelog.updated' }));
 
   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 */ });
   }