@volter/supercode-teams 0.2.52 → 0.2.54

package/fleet.mjs

@@ -57,6 +57,9 @@ export async function fleetDiscover({ context = null, machines = null, params =
     : listed;
   const results = await Promise.all(targets.map(async (machine) => {
     if (!machine.id) return { name: machine.name, error: 'not an accessible machine of this team' };
+    // A machine the server reports offline is not asked (asking only waits for a link that is not coming); it is
+    // named as offline, not as a failure, and only when it was named or seen in the last day.
+    if (machine.connection === 'offline') return { name: machine.name, offline: true, lastSeenAt: machine.last_seen_at ?? null };
     let channel = null;
     try {
       channel = await openRemoteMachine({ origin: selected.origin, teamId: selected.team_id, machineId: machine.id, token });
@@ -70,9 +73,13 @@ export async function fleetDiscover({ context = null, machines = null, params =
   }));
   const sessions = [];
   const unreachable = [];
+  const offline = [];
+  const named = new Set(machines ?? []);
   for (const result of results) {
-    if (result.error) unreachable.push({ machine: result.name, error: result.error });
+    if (result.offline) {
+      if (named.has(result.name) || (result.lastSeenAt && Date.now() - result.lastSeenAt < 86_400_000)) offline.push({ machine: result.name, last_seen_at: result.lastSeenAt });
+    } else if (result.error) unreachable.push({ machine: result.name, error: result.error });
     else for (const session of result.sessions) sessions.push({ machine: result.name, ...session });
   }
-  return { sessions, unreachable };
+  return { sessions, unreachable, ...(offline.length ? { offline } : {}) };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/supercode-teams",
-  "version": "0.2.52",
+  "version": "0.2.54",
   "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;