@volter/supercode-teams 0.2.38 → 0.2.40

package/connector/index.mjs

@@ -137,6 +137,8 @@ export class TeamsConnector {
           bindings: [...this.nativeEffects.published(), ...await bindings()],
           roots: this.localRoots.map(({id,machine_id,name,harnesses})=>({id,machine_id,name,harnesses})),
           ...(this.hostKeyId ? { host_key_id: this.hostKeyId } : {}),
+          // What each synced session's harness is doing (its turn: working, idle, …), from the last discovery.
+          ...(this.reportedActivity ? { activity: this.reportedActivity } : {}),
         });
         this.save();
       });
@@ -204,7 +206,8 @@ export class TeamsConnector {
     // A rule covers its root folder and every folder under it. Core discovery filters that subtree before it
     // reads any session's tail, so a beat costs one bounded scan per root, not one over every session on the
     // machine; rules over the same root and harnesses share the scan.
-    const discoveries=new Map(),followCandidates=[],discovered=new Set();
+    const discoveries=new Map(),followCandidates=[],discovered=new Set(),activity=[];
+    this.turnStates??=new Map();
     for(const rule of activeRules.values()){
       const root=roots.find(item=>item.id===rule.selector.root_id);
       if(!root)continue;
@@ -225,6 +228,9 @@ export class TeamsConnector {
         const locator=descriptor.locator,nativeSessionId=locator?.session_id,harness=locator?.harness;
         if(!locator||!nativeSessionId||!harness)continue;
         discovered.add(`${harness}:${nativeSessionId}`);
+        // A session's turn state as its harness reports it, and since when this connector has seen it so.
+        const turn=descriptor.activity?.turn;
+        if(typeof turn==='string'&&turn&&activity.length<4096){const key=`${harness}:${nativeSessionId}`,held=this.turnStates.get(key),since=held?.turn===turn?held.since:this.clock.nowMs();this.turnStates.set(key,{turn,since});activity.push({harness,native_id:nativeSessionId,turn,since});}
         const options={locator,descriptor,harness,nativeSessionId,ruleId:rule.id,ruleRevision:rule.revision,backfill:rule.backfill,rootPath:workspace,configuration};
         // A session whose native store has not changed since this rule last captured it is not reloaded.
         // One session that cannot be captured (a transcript that rewrote its history needs an explicit resync)
@@ -243,6 +249,8 @@ export class TeamsConnector {
       }
     }
     this.nativeEffects.endDiscovery();
+    for(const key of this.turnStates.keys())if(!discovered.has(key))this.turnStates.delete(key);
+    this.reportedActivity=activity;
     this.pruneNativeCache(discovered);
     this.rotateFollowers(followCandidates);
   }

package/machine.mjs

@@ -419,19 +419,24 @@ export class TeamsMachine extends MachineCore {
       return refuse(`no interact grant for ${target}`);
     }
     accept();
-    const child = spawn(this.supercodeBin, ['message', 'remote-deliver'], { stdio: ['pipe', 'pipe', 'pipe'], env: this.env });
-    let out = '';
-    let err = '';
-    child.stdout.on('data', (chunk) => { out += chunk; });
-    child.stderr.on('data', (chunk) => { err += chunk; });
-    child.on('error', (error) => { err += error.message; });
-    child.on('close', (code) => {
-      this.log.append({ principal, cap: 'interact', target, outcome: code === 0 ? 'turn' : 'failed', detail: err.trim().slice(0, 200) || undefined });
-      if (stream.closed) return;
-      stream.write(out.trim() || JSON.stringify({ code: 1, text: err.trim() || `remote-deliver exited ${code}` }));
-      stream.close('delivered');
+    // The user-turn door every supercode has (harness.v1 sessions.message, as_user): the session's runtime input,
+    // its pane's empty composer, or its mailbox until the composer is free. The sender is named after the member.
+    const answer = (value) => { if (!stream.closed) { stream.write(JSON.stringify(value)); stream.close('delivered'); } };
+    this.#serveRequest('harness.v1.sessions.message', {
+      locator: { harness, session_id: session, storage: { kind: 'file', path: '' } },
+      text: request.text,
+      from_name: entry.name ?? principal ?? 'a Room member',
+      as_user: true,
+    }, 15_000).then((result) => {
+      const delivered = result?.message_id && !result.refusal;
+      this.log.append({ principal, cap: 'interact', target, outcome: delivered ? 'turn' : 'failed', detail: result?.refusal?.message?.slice(0, 200) });
+      answer(delivered
+        ? { code: 0, turn_id: result.message_id, door: result.delivery?.how === 'waiting' ? 'waiting' : (result.delivery?.door ?? 'pane') }
+        : { code: 1, text: result?.refusal?.message ?? 'the session did not take the turn' });
+    }, (error) => {
+      this.log.append({ principal, cap: 'interact', target, outcome: 'failed', detail: error.message.slice(0, 200) });
+      answer({ code: 1, text: error.message });
     });
-    child.stdin.end(JSON.stringify({ op: 'turn', harness, session, text: request.text, from_name: entry.name ?? principal ?? 'a Room member', via: 'room' }));
   }
 
   // ---- terminal ------------------------------------------------------------

package/package.json

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

@@ -172,9 +172,16 @@ async function listSessions(api,res,auth,url,requestId,search){
   if(search)body.coverage={scope:'retained_text',indexed_at:boundaryNow,indexed_revision:team.journal_revision};
   send(res,200,body,requestId);
 }
+/** 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){
+  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;
+}
 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)),requestId,{ETag:`"${row.revision}"`});
+  send(res,200,result(api,auth,{...JSON.parse(row.descriptor_json),working:await workingOf(api,auth.team_id,row.id)}),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');
@@ -198,7 +205,8 @@ async function readSession(api,res,auth,id,url,requestId){
   const snapshot=await api.store.readSessionSnapshot({teamId:auth.team_id,principalId:auth.principal_id,credentialId:auth.credential_id,ref:id,now:api.clock.nowMs(),bound:auth.bound,beforeHash:query.before?cursorHash(query.before):null,requestedRevision:query.revision,tail,nextCursorHash:cursorHash(nextCursor),nextCursorToken:nextCursor});
   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)}));
-  send(res,200,{version:1,context:{server_id:api.serverId,team_id:auth.team_id,principal_id:auth.principal_id},descriptor:JSON.parse(snapshot.descriptor_json),messages,before_cursor:beforeCursor,event_cursor:snapshot.eventCursor,revision,display:{returned:messages.length,total:snapshot.total,truncated_fields:0}},requestId);
+  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);
 }
 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;