@volter/supercode-orchestrator 0.5.142 → 0.5.144

package/agents.mjs

@@ -20,7 +20,8 @@ function store(root){
   CREATE INDEX IF NOT EXISTS agent_active_assignments ON agent_assignments(org,agent_id,state);
   CREATE TABLE IF NOT EXISTS agent_end_outbox(org TEXT NOT NULL,agent_id TEXT NOT NULL,reason TEXT NOT NULL,created_at INTEGER NOT NULL,PRIMARY KEY(org,agent_id));
   CREATE TABLE IF NOT EXISTS agent_runtime_sessions(org TEXT NOT NULL,runtime_ref TEXT NOT NULL,session_ref TEXT NOT NULL,PRIMARY KEY(org,runtime_ref));
-  CREATE TABLE IF NOT EXISTS agent_runs(org TEXT NOT NULL,agent_id TEXT NOT NULL,session_ref TEXT NOT NULL,machine TEXT,run_id TEXT,profile_json TEXT,ended_at INTEGER,end_reason TEXT,main INTEGER NOT NULL DEFAULT 1,starter_session TEXT,usage_json TEXT,PRIMARY KEY(org,session_ref));`);
+  CREATE TABLE IF NOT EXISTS agent_runs(org TEXT NOT NULL,agent_id TEXT NOT NULL,session_ref TEXT NOT NULL,machine TEXT,run_id TEXT,profile_json TEXT,ended_at INTEGER,end_reason TEXT,main INTEGER NOT NULL DEFAULT 1,starter_session TEXT,usage_json TEXT,PRIMARY KEY(org,session_ref));
+  CREATE TABLE IF NOT EXISTS agent_usage_unread(org TEXT NOT NULL,session_ref TEXT NOT NULL,stamp TEXT NOT NULL,PRIMARY KEY(org,session_ref));`);
   return db;
 }
 const digest=value=>createHash('sha256').update(value).digest('hex');
@@ -217,8 +218,8 @@ function adoptLocalOrg(root,scope){
       db.prepare('INSERT OR IGNORE INTO agent_declaration_heads(org,key,agent_id,generation) VALUES (?,?,?,?)').run(scope.org,rekey(head.key),ids.get(head.agent_id)??head.agent_id,head.generation);
     for(const [old,id] of ids)for(const table of ['agent_assignments','agent_runs','agent_end_outbox'])
       db.prepare(`UPDATE OR IGNORE ${table} SET org=?,agent_id=? WHERE org='local' AND agent_id=?`).run(scope.org,id,old);
-    db.prepare("UPDATE OR IGNORE agent_runtime_sessions SET org=? WHERE org='local'").run(scope.org);
-    for(const table of ['agent_intents','agent_declaration_heads','agent_assignments','agent_runs','agent_end_outbox','agent_runtime_sessions'])db.prepare(`DELETE FROM ${table} WHERE org='local'`).run();
+    for(const table of ['agent_runtime_sessions','agent_usage_unread'])db.prepare(`UPDATE OR IGNORE ${table} SET org=? WHERE org='local'`).run(scope.org);
+    for(const table of ['agent_intents','agent_declaration_heads','agent_assignments','agent_runs','agent_end_outbox','agent_runtime_sessions','agent_usage_unread'])db.prepare(`DELETE FROM ${table} WHERE org='local'`).run();
     db.exec('COMMIT');
   }catch(error){try{db.exec('ROLLBACK');}catch{}throw error;}finally{db.close();}
 }
@@ -320,7 +321,7 @@ export function recordNativeAgentSession(root,runtimeRef,session) {
     db.exec('BEGIN IMMEDIATE');
     db.prepare('INSERT INTO agent_runtime_sessions(org,runtime_ref,session_ref) VALUES (?,?,?) ON CONFLICT(org,runtime_ref) DO UPDATE SET session_ref=excluded.session_ref').run(owner.org,runtimeRef,session);
     // The lease-only row is not a session: its native session is the run now.
-    db.prepare('DELETE FROM agent_runs WHERE org=? AND session_ref=?').run(owner.org,runtimeRef);
+    for(const table of ['agent_runs','agent_usage_unread'])db.prepare(`DELETE FROM ${table} WHERE org=? AND session_ref=?`).run(owner.org,runtimeRef);
     db.exec('COMMIT');
   }catch(error){try{db.exec('ROLLBACK');}catch{}throw error;}finally{db.close();}
   return agentRunForSession(root,[runtimeRef]);
@@ -349,11 +350,20 @@ export function agentRunForSession(root, references) {
 }
 /** G3: a session's usage as its harness recorded it, kept with the run that owned it. */
 export function recordRunUsage(root,org,session,usage){
-  const db=store(root);try{db.prepare('UPDATE agent_runs SET usage_json=? WHERE org=? AND session_ref=?').run(JSON.stringify(usage??[]),org,session);}finally{db.close();}
+  const db=store(root);try{
+    db.prepare('UPDATE agent_runs SET usage_json=? WHERE org=? AND session_ref=?').run(JSON.stringify(usage??[]),org,session);
+    db.prepare('DELETE FROM agent_usage_unread WHERE org=? AND session_ref=?').run(org,session);
+  }finally{db.close();}
+}
+/** A usage read its reader refused for what is in the session's record, kept with which reader that was and what the
+ * record was then (`stamp`): asked again once either differs. */
+export function recordUsageUnread(root,org,session,stamp){
+  const db=store(root);try{db.prepare('INSERT INTO agent_usage_unread(org,session_ref,stamp) VALUES (?,?,?) ON CONFLICT(org,session_ref) DO UPDATE SET stamp=excluded.stamp').run(org,session,stamp);}finally{db.close();}
 }
-/** The runs whose ended sessions have no usage recorded yet. */
+/** The runs whose ended sessions have no usage recorded yet, those never refused first; `usage_unread` is the stamp of
+ * a refused read. */
 export function runsAwaitingUsage(root,org){
-  const db=store(root);try{return db.prepare('SELECT * FROM agent_runs WHERE org=? AND usage_json IS NULL ORDER BY rowid LIMIT 50').all(org);}finally{db.close();}
+  const db=store(root);try{return db.prepare('SELECT r.*,u.stamp AS usage_unread FROM agent_runs r LEFT JOIN agent_usage_unread u ON u.org=r.org AND u.session_ref=r.session_ref WHERE r.org=? AND r.usage_json IS NULL ORDER BY u.stamp IS NOT NULL,r.rowid LIMIT 50').all(org);}finally{db.close();}
 }
 /** Usage records per agent id: every session this home ran for it. */
 export function agentUsage(root){

package/board/dispatch.mjs

@@ -30,7 +30,7 @@ import { boardLabel, boardName } from '@volter/teams/board-name';
 let fleetRoot = null;
 import { inspectCompletionEvidence, noCodeChange, openReviewPullRequests, reviewDue, withCompletionEvidence, reviewCandidate, workflowRevision, retainWorkflowTick } from './ci.mjs';
 import { runtimeDoor } from './runtime-door.mjs';
-import { agentScope, localCardAgent, localReaderContext, localAgentSessions, runBudgetRefusal, runsAwaitingUsage, recordRunUsage, agentPreamble, agentEnvironment, recordAgentRun, activeAgentAssignments,finishAgentAssignment,handOffAgents, agentRunForSession } from '../agents.mjs';
+import { agentScope, localCardAgent, localReaderContext, localAgentSessions, runBudgetRefusal, runsAwaitingUsage, recordRunUsage, recordUsageUnread, agentPreamble, agentEnvironment, recordAgentRun, activeAgentAssignments,finishAgentAssignment,handOffAgents, agentRunForSession } from '../agents.mjs';
 import { materializeAgentHome } from '../agent-home.mjs';
 import { memorySnapshot } from '../hermes-cli.mjs';
 import { createRequire } from 'node:module';
@@ -1767,6 +1767,33 @@ export async function reconcileCallerLaunch(board, sid) {
   }
 }
 
+// The session-read doors' code for a file their reader cannot read for what is in it (session-file.mjs).
+const SESSION_UNREADABLE=-32050;
+/** An ended run's session usage, read from its harness's own records on its machine and kept with the run. One answer
+ * is kept instead of asked for again: the reader's own refusal of the record for what is in it (SESSION_UNREADABLE).
+ * It is kept with who refused (the machine's daemon: its id, release, and this run of it) and what the record was (its
+ * file's size and time here, what discovery says of it on another machine), and asked again once either differs: the
+ * same bytes get the same answer only from the same reader. Every other failure (no answer, a timeout, a fault in the
+ * door, a daemon that does not say which it is) says nothing of the record, and the read is made again. */
+async function readRunUsage(root,org,row,endedAt){
+  const [harness,...rest]=row.session_ref.split(':'),machine=row.machine&&normalMachine(row.machine)!==localMachine()?row.machine:null;
+  // the usage door loads the session by its whole locator, which discovery names
+  const sessionId=rest.join(':'),found=await runtimeDoor(machine,'harness.v1.sessions.discover',{query:sessionId,harnesses:[harness],limit:200},{timeout:30_000});
+  const descriptor=found.code===0?json(found.stdout.trim(),{})?.sessions?.find(item=>item.locator?.harness===harness&&item.locator?.session_id===sessionId):null,locator=descriptor?.locator??null;
+  let stamp=null;
+  if(locator){
+    const described=await runtimeDoor(machine,'harness.v1.machine.describe',{},{timeout:15_000}),reader=described.code===0?json(described.stdout.trim(),{}):null;
+    const file=(()=>{if(machine||locator.storage?.kind!=='file')return null;try{const stat=statSync(locator.storage.path);return [stat.size,stat.mtimeMs];}catch{return null;}})();
+    if(reader?.id&&reader.node?.release&&reader.node.started_at)stamp=JSON.stringify([reader.id,reader.node.release,reader.node.started_at,locator.storage,file??[descriptor.updated_at_ms??null,descriptor.message_count??null]]);
+  }
+  const refused=stamp!==null&&row.usage_unread===stamp;
+  const reply=locator&&!refused?await runtimeDoor(machine,'harness.v1.sessions.usage',{locator},{timeout:30_000}):{code:1,stdout:'',stderr:''};
+  if(reply.code===0)return recordRunUsage(root,org,row.session_ref,json(reply.stdout.trim(),{})?.usage??[]);
+  // a session unreadable a day after its run ended is recorded as having no usage record, so it stops retrying
+  if(now()-Number(endedAt)>86400)return recordRunUsage(root,org,row.session_ref,[]);
+  if(stamp!==null&&!refused&&json(reply.stderr.trim(),{})?.code===SESSION_UNREADABLE)recordUsageUnread(root,org,row.session_ref,stamp);
+}
+
 /** The board's agent records: each run kept in the agent store, closed cards' assignments ended, declarations and ends
  * handed to this machine's daemon, and usage read from each machine's own doors. No Teams call: the daemon declares and
  * ends agents and binds their sessions (D137). It runs in the delivery pass (`deliver`), never in a dispatch round. */
@@ -1801,14 +1828,7 @@ async function synchronizeAgents(board, report) {
     for(const row of runsAwaitingUsage(board.root,org)){
       const run=agentRuns.find(item=>String(item.id)===String(row.run_id));
       if(!run?.ended_at||read>=5)continue;
-      const [harness,...rest]=row.session_ref.split(':'),machine=row.machine&&normalMachine(row.machine)!==localMachine()?row.machine:null;
-      // the usage door loads the session by its whole locator, which discovery names
-      const sessionId=rest.join(':'),found=await runtimeDoor(machine,'harness.v1.sessions.discover',{query:sessionId,harnesses:[harness],limit:200},{timeout:30_000});
-      const locator=found.code===0?json(found.stdout.trim(),{})?.sessions?.find(item=>item.locator?.harness===harness&&item.locator?.session_id===sessionId)?.locator:null;
-      const reply=locator?await runtimeDoor(machine,'harness.v1.sessions.usage',{locator},{timeout:30_000}):{code:1};read++;
-      if(reply.code===0)recordRunUsage(board.root,org,row.session_ref,json(reply.stdout.trim(),{})?.usage??[]);
-      // a session unreadable a day after its run ended is recorded as having no usage record, so it stops retrying
-      else if(now()-Number(run.ended_at)>86400)recordRunUsage(board.root,org,row.session_ref,[]);
+      await readRunUsage(board.root,org,row,run.ended_at);read++;
     }
   }
   for(const assignment of activeAgentAssignments(board.root)){

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/supercode-orchestrator",
-  "version": "0.5.142",
+  "version": "0.5.144",
   "type": "module",
   "description": "The orchestrator runtime over the Volter Harness ontology: one typed operational model whose folder is its serialization, read and written through the harness orchestration doors (docs/ORCHESTRATOR-IR.md)",
   "exports": {
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@volter/supercode-harness-sdk": "^0.3.91",
-    "@volter/teams": "0.2.58",
+    "@volter/teams": "0.2.59",
     "@volter/ztrack": "^2.4.23",
     "yaml": "^2.9.0"
   },