@volter/supercode-teams 0.2.51 → 0.2.53

package/bin/workspace.mjs

@@ -724,11 +724,13 @@ async function connectorCommand(verb, { flags, rest, output, client, context, te
     // answers one request at a time, and a long load would hold discovery and every other capture behind it.
     const largeCore = new SupercodeHarnessClient({ command: binary, args: ['harness', 'serve'] });
     const slowCore = new SupercodeHarnessClient({ command: binary, args: ['harness', 'serve'] });
-    const connector = new TeamsConnector({ server: context.origin, teamId: context.team_id, machineId: saved.machine.id, sourceId: saved.source.id, credential: saved.credential.token, stateDir: state.directory, core, largeCore, slowCore, hostKeyId });
+    // Followed (live) sessions follow and load through one of their own, so a watched session never waits behind a pass.
+    const liveCore = new SupercodeHarnessClient({ command: binary, args: ['harness', 'serve'] });
+    const connector = new TeamsConnector({ server: context.origin, teamId: context.team_id, machineId: saved.machine.id, sourceId: saved.source.id, credential: saved.credential.token, stateDir: state.directory, core, largeCore, slowCore, liveCore, hostKeyId });
     // A connected machine is a person's: each pane it launches opens a window on its screen (SUPERCODE_POPUPS=0: none).
     const machine = new TeamsMachine({ home: daemonHome, supercode: binary, popups: process.env.SUPERCODE_POPUPS !== '0', ...(flags.tmux_socket ? { tmuxSocket: String(flags.tmux_socket) } : {}), link: { server: context.origin, teamId: context.team_id, machineId: saved.machine.id, credential: saved.credential.token, incarnationId: connector.state.incarnation_id, configuration: () => connector.configuration() }, onTurn: (turn) => connector.noteTurn(turn) });
     machine.on('link', (event) => { if (event.event === 'replaced') process.stderr.write(`supercode teams: ${event.error}. Two connectors were running for this machine; stop one of them (\`supercode teams disconnect\` where it should not run).\n`); });
-    const stopAll = async () => { await machine.stop().catch(() => {}); await connector.stop(); await core.close(); await largeCore.close(); await slowCore.close(); await lifecycle.close(); state.update(current => current ? ({ ...current, process: undefined }) : null); };
+    const stopAll = async () => { await machine.stop().catch(() => {}); await connector.stop(); await core.close(); await largeCore.close(); await slowCore.close(); await liveCore.close(); await lifecycle.close(); state.update(current => current ? ({ ...current, process: undefined }) : null); };
     try { await connector.start({ roots: () => saved.roots }); await machine.start(); } catch (error) { await stopAll(); throw error; }
     output({ version: 1, context: scope(context), data: { machine: saved.machine, source: saved.source, roots: saved.roots.map(({ path: _path, ...item }) => item), socket: machine.socketPath, foreground: true } });
     await new Promise(resolveStop => { let stopped = false; stopConnector = async () => { if (stopped) return; stopped = true; await stopAll(); resolveStop(); }; for (const signal of ['SIGINT', 'SIGTERM', ...(process.platform === 'win32' ? ['SIGHUP', 'SIGBREAK'] : [])]) process.once(signal, stopConnector); });

package/connector/index.mjs

@@ -88,7 +88,7 @@ function atomic(path, value) {
   }
 }
 export class TeamsConnector {
-  constructor({server,teamId,machineId,sourceId,credential,stateDir,core,largeCore=core,slowCore=largeCore,hostKeyId=null,effectExecutor=null,clock={nowMs:()=>Date.now()},fetch:fetchImpl=globalThis.fetch,heartbeatMs=15000,nativeIdleMs=NATIVE_IDLE_MS,nativeIdleBytes=NATIVE_IDLE_BYTES}){Object.assign(this,{server:serverOrigin(server),teamId,machineId,sourceId,credential,stateDir,core,largeCore,slowCore,hostKeyId,effectExecutor,clock,fetch:fetchImpl,heartbeatMs,nativeIdleMs,nativeIdleBytes});mkdirSync(stateDir,{recursive:true,mode:0o700});chmodSync(stateDir,0o700);this.statePath=join(stateDir,'connector.json');this.state=existsSync(this.statePath)?JSON.parse(readFileSync(this.statePath,'utf8')):{version:1,sequence:0,origins:{},outbox:[]};this.state.effects??={};if(Array.isArray(this.state.sync_status?.problems))this.state.sync_status.problems=this.state.sync_status.problems.filter(item=>item?.code!==CAPACITY_CODE);this.state.native_cache??={};this.state.incarnation_id=`inc_${randomBytes(16).toString('hex')}`;this.abort=new AbortController();this.work=Promise.resolve();this.nativeEffects=new NativeEffects(this);this.effects=new EffectConsumer(this,effectExecutor?{prepare:async effect=>({execute:()=>effectExecutor(effect,{core:this.core,signal:this.abort.signal})})}:this.nativeEffects);this.save();}
+  constructor({server,teamId,machineId,sourceId,credential,stateDir,core,largeCore=core,slowCore=largeCore,liveCore=core,hostKeyId=null,effectExecutor=null,clock={nowMs:()=>Date.now()},fetch:fetchImpl=globalThis.fetch,heartbeatMs=15000,nativeIdleMs=NATIVE_IDLE_MS,nativeIdleBytes=NATIVE_IDLE_BYTES}){Object.assign(this,{server:serverOrigin(server),teamId,machineId,sourceId,credential,stateDir,core,largeCore,slowCore,liveCore,hostKeyId,effectExecutor,clock,fetch:fetchImpl,heartbeatMs,nativeIdleMs,nativeIdleBytes});mkdirSync(stateDir,{recursive:true,mode:0o700});chmodSync(stateDir,0o700);this.statePath=join(stateDir,'connector.json');this.state=existsSync(this.statePath)?JSON.parse(readFileSync(this.statePath,'utf8')):{version:1,sequence:0,origins:{},outbox:[]};this.state.effects??={};if(Array.isArray(this.state.sync_status?.problems))this.state.sync_status.problems=this.state.sync_status.problems.filter(item=>item?.code!==CAPACITY_CODE);this.state.native_cache??={};this.state.incarnation_id=`inc_${randomBytes(16).toString('hex')}`;this.abort=new AbortController();this.work=Promise.resolve();this.nativeEffects=new NativeEffects(this);this.effects=new EffectConsumer(this,effectExecutor?{prepare:async effect=>({execute:()=>effectExecutor(effect,{core:this.core,signal:this.abort.signal})})}:this.nativeEffects);this.save();}
   save(){atomic(this.statePath,this.state);}
   // What `supercode teams status` shows about this connector: its last error, and the sessions it could not capture
   // (most recent first, bounded; an entry clears when that session next captures). They are kept in connector.json,
@@ -291,9 +291,9 @@ export class TeamsConnector {
   follow(key,options){
     const {locator}=options,controller=new AbortController(),stop=()=>controller.abort(this.abort.signal.reason);this.abort.signal.addEventListener('abort',stop,{once:true});
     // A follow event may land between beats, after the rule changed: it reads the configuration afresh.
-    const followed={...options,configuration:null,stamp:undefined};
+    const followed={...options,configuration:null,stamp:undefined,live:true};
     const task=(async()=>{
-      for await(const _event of this.core.session(locator).follow({signal:controller.signal})){
+      for await(const _event of this.liveCore.session(locator).follow({signal:controller.signal})){
         if(controller.signal.aborted)break;
         // A capture that fails is that session's problem, as on a beat; the follow goes on.
         try{await this.capture(followed);}catch(error){if(controller.signal.aborted)break;if(connectionError(error))this.lastError=error;else this.noteSessionProblem(followed,error);}
@@ -403,8 +403,16 @@ export class TeamsConnector {
     if(origin&&ruleId&&stamp)origin.capture_stamps={...origin.capture_stamps,[ruleId]:{stamp,rule_revision:ruleRevision,backfill_mode:backfillMode}};
     this.save();
   }
-  capture(options) {
-    if(!options.preloaded&&this.largeSession(options))return Promise.resolve(this.captureLarge(options));
+  // Every load happens before the capture joins the serial queue, which then holds only the quick compare and
+  // upload; a followed (live) session loads through a harness process of its own, so a watched session's new turn
+  // never waits behind a pass's loads.
+  async capture(options) {
+    if(!options.preloaded&&this.largeSession(options))return this.captureLarge(options);
+    if(!options.preloaded){
+      const {locator}=options,path=locator?.storage?.kind==='file'&&existsSync(locator.storage.path)?realpathSync(locator.storage.path):null;
+      const artifactBefore=path?statSync(path):null;
+      options={...options,preloaded:{loaded:await (options.live?this.liveCore:this.core).session(locator).load(),artifactBefore}};
+    }
     const work=this.work.then(()=>this.captureSerial(options)).then(receipt=>{this.clearSessionProblem(options.harness,options.nativeSessionId);return receipt;});
     this.work=work.catch(()=>{});
     return work;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/supercode-teams",
-  "version": "0.2.51",
+  "version": "0.2.53",
   "type": "module",
   "description": "A machine daemon serving this machine's doors, and a local or remote Teams server for shared session discovery, OpenTelemetry ingestion and access to enrolled machines.",
   "license": "MIT",

package/server/event-routes.mjs

@@ -66,6 +66,21 @@ const sessionArgs = (api, auth, ref) => ({
   credentialId: auth.credential_id, ref, now: api.clock.nowMs(), bound: auth.bound,
 });
 
+/**
+ * The people and machines a session's reader sees named: its owner's display name and the names of the machines
+ * it ran on. A Room's session token reads no member or machine list, so its view would show raw ids otherwise.
+ */
+export async function sessionNames(api, teamId, descriptor) {
+  const owner = descriptor?.user?.principal_id;
+  const ids = [...new Set(descriptor?.machine_ids ?? [])].slice(0, 20);
+  const person = owner ? await api.store.one('SELECT id, kind, display_name FROM principals WHERE id=?', [owner]) : null;
+  const machines = ids.length ? await api.store.query(`SELECT id, name, custodian_id, last_seen_at FROM machines WHERE team_id=? AND id IN (${ids.map(() => '?').join(',')})`, [teamId, ...ids]) : [];
+  return {
+    members: person ? [{ principal: { id: person.id, kind: person.kind, display_name: person.display_name }, role: 'member' }] : [],
+    machines: machines.map((row) => ({ id: row.id, name: row.name, custodian_id: row.custodian_id, connection: 'offline', last_seen_at: row.last_seen_at })),
+  };
+}
+
 async function readForEvent(api, auth, ref, tail) {
   const nextCursorToken = cursorToken();
   const snapshot = await api.store.readSessionSnapshot({
@@ -76,10 +91,11 @@ async function readForEvent(api, auth, ref, tail) {
     id: item.id, source_id: item.source_id, native_key: item.native_key,
     recorded_at: item.recorded_at, value: JSON.parse(item.value_json),
   }));
+  const descriptor = JSON.parse(snapshot.descriptor_json);
   return {
     version: 1,
     context: { server_id: api.serverId, team_id: auth.team_id, principal_id: auth.principal_id },
-    descriptor: JSON.parse(snapshot.descriptor_json), messages,
+    descriptor, messages, names: await sessionNames(api, auth.team_id, descriptor),
     before_cursor: snapshot.beforeCursor, event_cursor: snapshot.eventCursor,
     revision: snapshot.revision,
     display: { returned: messages.length, total: snapshot.total, truncated_fields: 0 },

package/server/harness-routes.mjs

@@ -10,7 +10,7 @@ import { bearer, hashToken, canRead, canManage, isAdmin } from '@volter/teams/se
 import { validateListQuery, validateSearchQuery, validateReadQuery, validateCaptureBegin, validateCapturePart, canonicalJson } from '../contracts/index.mjs';
 import { normalizeSearch, textFromContent, cursorHash, cursorToken } from './catalog.mjs';
 import { captureDigest, captureMessages, handleOtlpRoute, sha256, validateArtifactName } from './ingest.mjs';
-import { handleCatalogEvents, handleSessionEvents } from './event-routes.mjs';
+import { handleCatalogEvents, handleSessionEvents, sessionNames } from './event-routes.mjs';
 import { exact } from '@volter/teams/server/request-json';
 import { delegatedSessionOf, looksDelegated } from '@volter/teams/server/delegated';
 import { renderSourceCollectorConfig } from './otlp/collector-config.mjs';
@@ -208,7 +208,7 @@ async function readSession(api,res,auth,id,url,requestId){
   const {rows,beforeCursor,revision}=snapshot;
   const messages=rows.map(row=>({id:row.id,source_id:row.source_id,native_key:row.native_key,recorded_at:row.recorded_at,value:JSON.parse(row.value_json)}));
   const descriptor=JSON.parse(snapshot.descriptor_json);
-  send(res,200,{version:1,context:{server_id:api.serverId,team_id:auth.team_id,principal_id:auth.principal_id},descriptor,working:await workingOf(api,auth.team_id,descriptor.id),messages,before_cursor:beforeCursor,event_cursor:snapshot.eventCursor,revision,display:{returned:messages.length,total:snapshot.total,truncated_fields:0}},requestId);
+  send(res,200,{version:1,context:{server_id:api.serverId,team_id:auth.team_id,principal_id:auth.principal_id},descriptor,working:await workingOf(api,auth.team_id,descriptor.id),names:await sessionNames(api,auth.team_id,descriptor),messages,before_cursor:beforeCursor,event_cursor:snapshot.eventCursor,revision,display:{returned:messages.length,total:snapshot.total,truncated_fields:0}},requestId);
 }
 async function readArtifact(api,req,res,auth,id,uploadId,requestId){
   const artifact=await api.store.readArtifact({teamId:auth.team_id,principalId:auth.principal_id,credentialId:auth.credential_id,ref:id,uploadId,now:api.clock.nowMs()}),bytes=Buffer.from(artifact.bytes),range=req.headers.range;