@bill10/agent-007 0.12.2000 → 0.12.2002

package/VERSION

@@ -1 +1 @@
-0.12.2.0
+0.12.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bill10/agent-007",
-  "version": "0.12.2000",
+  "version": "0.12.2002",
   "description": "From web terminals for your coding agents to a self-running agent company: Claude Code and Codex in parallel git worktrees, a job board they pick work from, and one agent that runs the board from a goal.",
   "license": "MIT",
   "repository": {

package/server/models.js

@@ -1,16 +1,16 @@
 // Which models a card may name, per CLI, discovered on this machine so nobody
-// keeps a list. Nothing here goes to the network: Claude Code's aliases are
-// fixed words its --model resolves to the newest model itself, and Codex
-// already caches the account's model list on disk.
+// keeps a list. Claude Code's aliases are fixed words its --model resolves to
+// the newest model itself; Codex is asked for its catalog.
 //
 // A CLI that is not on the PATH the board spawns with offers nothing — a card
 // could not run there anyway — and so does anything that fails to read. An
 // empty list leaves only the CLI's own default on offer.
 
+import { execFile } from 'child_process';
 import { readFileSync } from 'fs';
 import { homedir } from 'os';
 import { join } from 'path';
-import { commandExists } from './command-path.js';
+import { commandExists, resolveExecutable } from './command-path.js';
 import { isSafeModelName } from '../lib/jobs.js';
 
 // `claude --model` takes these as "the latest model of that family"
@@ -21,30 +21,51 @@ export const CLAUDE_ALIASES = ['fable', 'opus', 'sonnet', 'haiku'];
 
 const codexHome = (env) => env.CODEX_HOME || join(homedir(), '.codex');
 
-// Codex (0.156) keeps the models its account can use in
-// $CODEX_HOME/models_cache.json: { fetched_at, client_version, models: [{ slug,
-// visibility, priority, ... }] }. Only `visibility: "list"` entries are kept:
-// that is Codex's own filter for its /model picker, and it is what hides the
-// internal ones (codex-auto-review, the reviewer's model; gpt-reserve) that
-// are not for a coding session. Picker order is `priority`, lowest first. A
-// slug must also pass isSafeModelName, since it ends up on a command line.
-// The CLI has no plain list-models subcommand (its app-server's model/list is
-// a JSON-RPC session, not a one-shot), so this reads the cache its picker is
-// built from — read-only; nothing here ever writes under CODEX_HOME.
-export function parseCodexModels(text) {
+// Codex's catalog, from `codex debug models` (0.157: "Render the raw model
+// catalog as JSON") or, failing that, the cache its picker is built from,
+// $CODEX_HOME/models_cache.json. Both are { models: [{ slug, visibility,
+// priority, ... }] }. Only `visibility: "list"` entries are kept: that is
+// Codex's own filter for its /model picker, and it is what hides the internal
+// ones (codex-auto-review, the reviewer's model; gpt-reserve) that are not for
+// a coding session. Picker order is `priority`, lowest first. A slug must also
+// pass isSafeModelName, since it ends up on a command line. Null when the text
+// is not a catalog. Read-only; nothing here ever writes under CODEX_HOME.
+function listedCodexModels(text) {
   let models;
-  try { models = JSON.parse(text)?.models; } catch { return []; }
-  if (!Array.isArray(models)) return [];
+  try { models = JSON.parse(text)?.models; } catch { return null; }
+  if (!Array.isArray(models)) return null;
   return models
     .filter(m => m && m.visibility === 'list' && isSafeModelName(m.slug))
     .sort((a, b) => (Number(a.priority) || 0) - (Number(b.priority) || 0))
     .map(m => m.slug);
 }
 
-export function discoverModels({ env = process.env, exists = (f) => commandExists(f, env), read = (p) => readFileSync(p, 'utf8') } = {}) {
+export const parseCodexModels = (text) => listedCodexModels(text) ?? [];
+
+// The same codex, found the same way, the board launches workers with. No
+// shell. On Windows the npm install is codex.cmd, which execFile will not run
+// without one, so there this fails and the cache is read instead.
+export function runCodexModels(env) {
+  return new Promise((resolve, reject) => {
+    execFile(resolveExecutable('codex', env) ?? 'codex', ['debug', 'models'],
+      { env, timeout: 10_000, maxBuffer: 32 * 1024 * 1024, windowsHide: true },
+      (err, stdout) => (err ? reject(err) : resolve(stdout)));
+  });
+}
+
+export async function discoverModels({
+  env = process.env, exists = (f) => commandExists(f, env), read = (p) => readFileSync(p, 'utf8'),
+  run = runCodexModels, log = console.log,
+} = {}) {
   let codex = [];
   if (exists('codex')) {
-    try { codex = parseCodexModels(read(join(codexHome(env), 'models_cache.json'))); } catch { /* no cache yet */ }
+    let source = '`codex debug models`';
+    codex = await run(env).then(listedCodexModels, () => null);
+    if (!codex) {
+      source = 'models_cache.json';
+      try { codex = parseCodexModels(read(join(codexHome(env), 'models_cache.json'))); } catch { codex = []; source = 'nowhere (no models_cache.json either)'; }
+    }
+    log(`  Models: Codex's from ${source}`);
   }
   return { claude: exists('claude') ? [...CLAUDE_ALIASES] : [], codex };
 }
@@ -55,19 +76,22 @@ const STALE_MS = 10 * 60 * 1000;
 let cached = { claude: [], codex: [] };
 let cachedAt = 0;
 
-export function refreshModels(opts) {
-  cached = discoverModels(opts);
+// cachedAt is stamped before the await so a second ask while Codex is still
+// answering does not start another run. It never rejects: callers fire and
+// forget, and a failed look keeps the last answer.
+export async function refreshModels(opts) {
   cachedAt = Date.now();
+  try { cached = await discoverModels(opts); } catch (err) { console.error('  Models: discovery failed:', err); }
   return cached;
 }
 
 export function availableModels() { return cached; }
 
 // Whether a refresh changed anything, so the caller only repaints boards when it did.
-export function refreshIfStale(now = Date.now()) {
+export async function refreshIfStale(now = Date.now()) {
   if (now - cachedAt < STALE_MS) return false;
   const before = JSON.stringify(cached);
-  return JSON.stringify(refreshModels()) !== before;
+  return JSON.stringify(await refreshModels()) !== before;
 }
 
 export function startModelRefresh() {

package/server/owner.js

@@ -59,11 +59,17 @@ async function call(method, params, { env = process.env, signal } = {}) {
       ...(form ? { body: params } : { headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(params) }),
       signal,
     });
-    body = await res.json().catch(() => ({ ok: false, description: `HTTP ${res.status}` }));
+    body = await res.json().catch(() => ({ ok: false, error_code: res.status, description: `HTTP ${res.status}` }));
   } catch (err) {
-    throw new Error(redact(err.cause?.message || err.message, env));
+    // reason: a short label for the poll loop's offline line.
+    const reason = /ENOTFOUND|EAI_AGAIN/.test(err.cause?.code) ? 'DNS'
+      : err.name === 'TimeoutError' || /timeout/i.test(err.message) ? 'timeout' : 'no network';
+    throw Object.assign(new Error(redact(err.cause?.message || err.message, env)), { reason });
+  }
+  if (!body?.ok) {
+    const status = body?.error_code;
+    throw Object.assign(new Error(redact(body?.description || 'Telegram said no', env)), { status, reason: status ? `HTTP ${status}` : 'Telegram said no' });
   }
-  if (!body?.ok) throw new Error(redact(body?.description || 'Telegram said no', env));
   return body.result;
 }
 
@@ -414,6 +420,16 @@ export async function pollOnce(offset, { broadcast, env = process.env, signal }
 
 let stopper = null;
 
+// Failures that retrying will not fix, and what the owner should do about them.
+const POLL_HINTS = {
+  401: 'the bot token is wrong or revoked',
+  409: 'another process is polling this bot',
+};
+const OFFLINE_AFTER_MS = 60 * 1000;
+const OFFLINE_AFTER_FAILURES = 3;
+
+const since = ms => ms < 120e3 ? `${Math.round(ms / 1000)}s` : `${Math.round(ms / 60e3)}m`;
+
 const pause = (ms, signal) => new Promise(resolve => {
   const timer = setTimeout(resolve, ms);
   signal.addEventListener('abort', () => { clearTimeout(timer); resolve(); }, { once: true });
@@ -432,13 +448,27 @@ export function startTelegram({ broadcast, env = process.env } = {}) {
   (async () => {
     let offset = 0;
     let backoff = 1000;
+    // Sleep, wake and network changes fail a poll or two; log only going
+    // offline and coming back, not every retry.
+    let failures = 0, failingSince = 0, offline = false;
     while (!controller.signal.aborted) {
       try {
         offset = await pollOnce(offset, { broadcast, env, signal: controller.signal });
+        if (offline) console.log(`Telegram: back online after ${since(Date.now() - failingSince)}`);
+        failures = 0;
+        offline = false;
         backoff = 1000;
       } catch (err) {
         if (controller.signal.aborted) break;
-        console.error(`Telegram: getUpdates failed (${err.message}); retrying in ${backoff / 1000}s`);
+        if (!failures++) failingSince = Date.now();
+        const hint = POLL_HINTS[err.status];
+        // A hint logs even mid-outage: a token revoked while offline still needs saying.
+        if (hint ? offline !== hint : !offline && (failures >= OFFLINE_AFTER_FAILURES || Date.now() - failingSince > OFFLINE_AFTER_MS)) {
+          offline = hint || true;
+          console.error(hint
+            ? `Telegram: getUpdates failed (${err.message}): ${hint}; retrying quietly`
+            : `Telegram: offline (${err.reason || 'no network'}), retrying quietly`);
+        }
         await pause(backoff, controller.signal);
         backoff = Math.min(backoff * 2, MAX_BACKOFF_MS);
       }

package/server/ws.js

@@ -635,7 +635,7 @@ export function setupWebSocket(wss, { createSession, killSession, startBillion }
         // The card form opening: look again if the list is over 10 minutes
         // old, so a CLI installed since shows up without a restart.
         case 'models-refresh': {
-          if (refreshIfStale()) broadcastJobs(broadcast);
+          refreshIfStale().then(changed => { if (changed) broadcastJobs(broadcast); }).catch(err => console.error('models-refresh:', err));
           break;
         }
         case 'job-pause': {