@volter/supercode-teams 0.2.138 → 0.2.140

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/supercode-teams",
-  "version": "0.2.138",
+  "version": "0.2.140",
   "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/harness-routes.mjs

@@ -197,14 +197,15 @@ async function listSessions(api,res,auth,url,requestId,search){
 }
 /** A report older than this (four missed heartbeats) says nothing about what the session is doing now. */
 const ACTIVITY_FRESH_MS=60000;
-/** `{since}` while the session's harness is working on a turn, by its connector's latest fresh report; else null. */
-async function workingOf(api,teamId,sessionId){
+/** The connector's latest fresh native turn report; stale or unrecognized reports remain unknown. */
+async function activityOf(api,teamId,sessionId){
   const row=await api.store.one('SELECT a.turn,a.since,a.observed_at FROM session_activity a JOIN origins o ON o.team_id=a.team_id AND o.source_id=a.source_id AND o.harness=a.harness AND o.native_id=a.native_id WHERE a.team_id=? AND o.deleted_at IS NULL AND o.session_id IN (SELECT id FROM sessions WHERE team_id=? AND (id=? OR canonical_id=?)) ORDER BY a.observed_at DESC LIMIT 1',[teamId,teamId,sessionId,sessionId]);
-  return row&&row.turn==='working'&&api.clock.nowMs()-row.observed_at<ACTIVITY_FRESH_MS?{since:row.since??row.observed_at}:null;
+  return row&&['working','idle','needs_input'].includes(row.turn)&&api.clock.nowMs()-row.observed_at<ACTIVITY_FRESH_MS?{state:row.turn,since:row.since??row.observed_at,observedAt:row.observed_at}:{state:'unknown'};
 }
 async function sessionDescriptor(api,res,auth,id,requestId){
   const row=await api.store.authorizedSession({teamId:auth.team_id,principalId:auth.principal_id,credentialId:auth.credential_id,ref:id,now:api.clock.nowMs(),bound:auth.bound});
-  send(res,200,result(api,auth,{...JSON.parse(row.descriptor_json),working:await workingOf(api,auth.team_id,row.id)}),requestId,{ETag:`"${row.revision}"`});
+  const activity=await activityOf(api,auth.team_id,row.id);
+  send(res,200,result(api,auth,{...JSON.parse(row.descriptor_json),turnActivity:activity,working:activity.state==='working'?{since:activity.since}:null}),requestId,{ETag:`"${row.revision}"`});
 }
 async function correlateRoute(api,req,res,auth,path,requestId){
   if(!['user','service'].includes(auth.kind)||auth.role==='viewer')fail(403,'forbidden','credential cannot correlate sessions');
@@ -230,7 +231,8 @@ 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),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);
+  const activity=await activityOf(api,auth.team_id,descriptor.id);
+  send(res,200,{version:1,context:{server_id:api.serverId,team_id:auth.team_id,principal_id:auth.principal_id},descriptor,turnActivity:activity,working:activity.state==='working'?{since:activity.since}:null,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;

package/worker/index.mjs

@@ -92,7 +92,8 @@ function logStorageBreakdown(sql) {
   }
   try {
     const now = Date.now();
-    const rows = sql.exec(`WITH staging AS MATERIALIZED (SELECT team_id,begin_json FROM captures WHERE state='staging'),
+    const rows = sql.exec(`WITH chunk_sizes AS MATERIALIZED (SELECT team_id,upload_id,COUNT(*) chunks,SUM(length(bytes)) bytes FROM artifact_chunks GROUP BY team_id,upload_id),
+      staging AS MATERIALIZED (SELECT team_id,begin_json FROM captures WHERE state='staging'),
       classified AS MATERIALIZED (SELECT u.team_id,u.id,u.created_at,
         CASE WHEN EXISTS (SELECT 1 FROM session_artifacts a WHERE a.team_id=u.team_id AND a.upload_id=u.id) THEN 'version-referenced'
         WHEN EXISTS (SELECT 1 FROM continuations c WHERE c.team_id=u.team_id AND instr(c.value_json,u.id)>0) THEN 'continuation-referenced'
@@ -100,9 +101,9 @@ function logStorageBreakdown(sql) {
         WHEN u.created_at+86400000>? THEN 'unreferenced-under-one-day'
         WHEN u.committed=1 THEN 'eligible-committed' ELSE 'expired-staging' END category
         FROM uploads u)
-      SELECT u.category,COUNT(DISTINCT u.id) uploads,COUNT(*) chunks,SUM(length(c.bytes)) blob_bytes,
+      SELECT u.category,COUNT(*) uploads,SUM(c.chunks) chunks,SUM(c.bytes) blob_bytes,
         MIN(u.created_at) oldest_at,MAX(u.created_at) newest_at
-      FROM artifact_chunks c LEFT JOIN classified u ON u.team_id=c.team_id AND u.id=c.upload_id GROUP BY u.category`, now);
+      FROM chunk_sizes c LEFT JOIN classified u ON u.team_id=c.team_id AND u.id=c.upload_id GROUP BY u.category`, now);
     for (const row of rows) console.log(`storage uploads: ${JSON.stringify(row)}`);
   } catch (error) { console.log(`storage upload classification: ${error.message}`); }
 }