@volter/supercode-teams 0.2.42 → 0.2.44

package/bin/workspace.mjs

@@ -722,7 +722,7 @@ async function connectorCommand(verb, { flags, rest, output, client, context, te
     const hostKeyId = publicKeyId(loadOrCreateKeyPair(paths(daemonHome).machineKey).publicKeyPem);
     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, 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() } });
+    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 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; }

package/connector/index.mjs

@@ -66,6 +66,9 @@ const NATIVE_IDLE_MS=60000,NATIVE_IDLE_BYTES=8*1024*1024;
 // LARGE_CAPTURE_EVERY_MS (tried or not), its load given a second per megabyte, and one past NATIVE_MAX_BYTES is
 // published without a native bundle, which could not be built in time.
 const LARGE_CAPTURE_BYTES=8*1024*1024,LARGE_CAPTURE_EVERY_MS=5*60000,NATIVE_MAX_BYTES=64*1024*1024;
+// A turn a Room member typed here waits this long to be found in its session's transcript.
+const TURN_NOTE_MS=24*3600000;
+const messageText=value=>typeof value?.content==='string'?value.content.trim():Array.isArray(value?.content)?value.content.map(part=>typeof part==='string'?part:part?.type==='text'?part.text??'':'').join('').trim():'';
 const fileStamp=stat=>`${stat.dev}:${stat.ino}:${stat.size}:${stat.mtimeMs}`;
 const recordedAt=entry=>{if(Number.isSafeInteger(entry.recorded_at))return entry.recorded_at;if(Number.isSafeInteger(entry.timestamp))return entry.timestamp;const value=entry.metadata?.timestamp??entry.value?.metadata?.timestamp??entry.timestamp;if(typeof value!=='string')return null;const parsed=Date.parse(value);return Number.isSafeInteger(parsed)?parsed:null;};
 const serverOrigin=value=>{const url=new URL(value),loopback=url.hostname==='localhost'||url.hostname==='::1'||url.hostname==='[::1]'||/^127(?:\.\d{1,3}){3}$/.test(url.hostname);if(!['http:','https:'].includes(url.protocol)||url.username||url.password||url.search||url.hash||(url.pathname!==''&&url.pathname!=='/')||(url.protocol==='http:'&&!loopback))throw new TypeError('server must be an HTTPS origin (HTTP is loopback-only)');return url.origin;};
@@ -401,22 +404,71 @@ export class TeamsConnector {
     this.save();
   }
   capture(options) {
+    if(!options.preloaded&&this.largeSession(options))return Promise.resolve(this.captureLarge(options));
     const work=this.work.then(()=>this.captureSerial(options)).then(receipt=>{this.clearSessionProblem(options.harness,options.nativeSessionId);return receipt;});
     this.work=work.catch(()=>{});
     return work;
   }
-  async captureSerial({locator,descriptor=null,harness,nativeSessionId,visibility='restricted',ruleId=null,ruleRevision=null,coverage={completeness:'complete',reasons:[],missing:[]},backfill='all',rootPath=null,configuration=null,stamp}) {
+  // Who typed a user turn that came through a door here (a Room member through the session channel): the daemon
+  // notes it as it types the turn, and every capture carries it as `source` on the user message holding that text.
+  noteTurn({harness,session,text,at,source}){
+    const key=`${harness}:${session}`,now=this.clock.nowMs(),notes=this.state.turn_notes??={};
+    notes[key]=[...(notes[key]??[]).filter(note=>now-note.at<TURN_NOTE_MS),{text:String(text).trim(),at,source}];
+    this.save();
+  }
+  labelTurns(key,entries,messages){
+    const labels={...this.state.turn_labels?.[key]},notes=[...(this.state.turn_notes?.[key]??[])];let found=false;
+    for(const note of [...notes]){
+      const match=messages.find(message=>!labels[message.native_key]&&message.value?.role==='user'&&(message.recorded_at==null||message.recorded_at>=note.at-60000)&&messageText(message.value)===note.text);
+      if(match){labels[match.native_key]=note.source;notes.splice(notes.indexOf(note),1);found=true;}
+    }
+    if(found){(this.state.turn_labels??={})[key]=labels;if(notes.length)this.state.turn_notes[key]=notes;else delete this.state.turn_notes[key];this.save();}
+    messages.forEach((message,index)=>{
+      const source=labels[message.native_key];if(!source)return;
+      message.value={...message.value,source};
+      const entry=entries[index];if(entry.value)entry.value={...entry.value,source};else entry.source=source;
+    });
+  }
+  largeSession({locator}){
+    try{return locator?.storage?.kind==='file'&&statSync(realpathSync(locator.storage.path)).size>=LARGE_CAPTURE_BYTES;}catch{return false;}
+  }
+  // A large transcript's load takes seconds to minutes. It runs in a lane of its own, outside the serial capture
+  // queue, so no small session's capture waits behind it; only the capture of what it loaded joins the queue.
+  captureLarge(options){
+    (this.largeQueue??=new Map()).set(`${options.harness}:${options.nativeSessionId}`,options);
+    if(!this.largeLane)this.largeLane=this.runLargeLane().finally(()=>{this.largeLane=null;});
+    return null;
+  }
+  async runLargeLane(){
+    while(this.largeQueue.size&&!this.abort.signal.aborted){
+      const [key,options]=this.largeQueue.entries().next().value;this.largeQueue.delete(key);
+      try{
+        const artifactBefore=statSync(realpathSync(options.locator.storage.path));
+        this.largeCaptures??=new Map();const last=this.largeCaptures.get(key);
+        if(last!=null&&this.clock.nowMs()-last<LARGE_CAPTURE_EVERY_MS)continue;
+        this.largeCaptures.set(key,this.clock.nowMs());
+        const loaded=await this.core.session(options.locator).load({timeoutMs:Math.max(30000,Math.ceil(artifactBefore.size/(1024*1024))*1000)});
+        await this.capture({...options,preloaded:{loaded,artifactBefore}});
+      }catch(error){
+        if(this.abort.signal.aborted)return;
+        this.noteSessionProblem(options,error);
+        process.stderr.write(`supercode teams: ${options.harness} session ${options.nativeSessionId} not synced: ${error.message}\n`);
+      }
+    }
+  }
+  async captureSerial({locator,descriptor=null,harness,nativeSessionId,visibility='restricted',ruleId=null,ruleRevision=null,coverage={completeness:'complete',reasons:[],missing:[]},backfill='all',rootPath=null,configuration=null,stamp,preloaded=null}) {
     if(this.state.outbox.length)await this.flushSerial();
     // Discovery hands each session the configuration its beat fetched; a follow event fetches its own.
     if(stamp===undefined)stamp=this.sessionStamp({locator,descriptor});
     if(!configuration)configuration=await this.configuration();const rule=configuration.rules.find(item=>item.id===ruleId&&item.revision===ruleRevision&&item.state==='active');if(!rule)throw Object.assign(new Error('sync rule is absent, inactive, or stale'),{code:'forbidden'});visibility=rule.visibility;
     const artifactSource=locator?.storage?.kind==='file'&&existsSync(locator.storage.path)?realpathSync(locator.storage.path):null;
-    const artifactBefore=artifactSource?statSync(artifactSource):null;
+    const artifactBefore=preloaded?preloaded.artifactBefore:artifactSource?statSync(artifactSource):null;
     const large=(artifactBefore?.size??0)>=LARGE_CAPTURE_BYTES,sessionKey=`${harness}:${nativeSessionId}`;
-    if(large){this.largeCaptures??=new Map();const last=this.largeCaptures.get(sessionKey);if(last!=null&&this.clock.nowMs()-last<LARGE_CAPTURE_EVERY_MS)return null;this.largeCaptures.set(sessionKey,this.clock.nowMs());}
-    const loaded=await this.core.session(locator).load(large?{timeoutMs:Math.max(30000,Math.ceil(artifactBefore.size/(1024*1024))*1000)}:undefined),configuredBackfill=rule.backfill??backfill??'all',backfillPolicy=typeof configuredBackfill==='string'?{mode:configuredBackfill,since:null}:configuredBackfill;
+    if(large&&!preloaded){this.largeCaptures??=new Map();const last=this.largeCaptures.get(sessionKey);if(last!=null&&this.clock.nowMs()-last<LARGE_CAPTURE_EVERY_MS)return null;this.largeCaptures.set(sessionKey,this.clock.nowMs());}
+    const loaded=preloaded?preloaded.loaded:await this.core.session(locator).load(large?{timeoutMs:Math.max(30000,Math.ceil(artifactBefore.size/(1024*1024))*1000)}:undefined),configuredBackfill=rule.backfill??backfill??'all',backfillPolicy=typeof configuredBackfill==='string'?{mode:configuredBackfill,since:null}:configuredBackfill;
     const key=`${harness}:${nativeSessionId}`,previous=this.state.origins[key]??null;
     let messages=(loaded.messages??loaded.turns??[]).map((entry,index)=>{const value=entry.value??Object.fromEntries(Object.entries(entry).filter(([key])=>!['id','native_key','recorded_at','timestamp'].includes(key)));return{native_key:entry.id??entry.native_key??String(index),recorded_at:recordedAt(entry),value};});
+    this.labelTurns(key,loaded.messages??loaded.turns??[],messages);
     // A session published without its native bundle is captured again, with the same messages, once the bundle can be built.
     const nativeWanted=backfillPolicy.mode==='all'&&typeof this.core.translateSession==='function'&&!((artifactBefore?.size??0)>NATIVE_MAX_BYTES);
     const retryNative=Boolean(previous?.native_deferred&&nativeWanted&&artifactBefore?.isFile()&&!previous?.baseline&&this.nativeReady(key,artifactBefore));

package/machine.mjs

@@ -135,9 +135,11 @@ export class TeamsMachine extends MachineCore {
    * server link; `configuration()` resolves the machine's current configuration from the server
    * (custodian and machine grants). Without it the daemon serves its local door only.
    */
-  constructor({ home = teamsHome(), supercode = 'supercode', tmuxSocket, floor = null, limits = null, env = process.env, link = null, popups = false } = {}) {
+  constructor({ home = teamsHome(), supercode = 'supercode', tmuxSocket, floor = null, limits = null, env = process.env, link = null, popups = false, onTurn = null } = {}) {
     super({ home, floor, limits, env, link });
     this.supercodeBin = supercode;
+    // Told of each turn a Room member typed here (the connector labels the captured message with who typed it).
+    this.onTurn = onTurn;
     this.tmuxSocket = tmuxSocket ?? null;
     // Each pane launched here opens a terminal window on this machine's screen (popupWindow).
     this.popups = Boolean(popups);
@@ -422,6 +424,7 @@ export class TeamsMachine extends MachineCore {
     // 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'); } };
+    const at = Date.now();
     this.#serveRequest('harness.v1.sessions.message', {
       locator: { harness, session_id: session, storage: { kind: 'file', path: '' } },
       text: request.text,
@@ -430,6 +433,7 @@ export class TeamsMachine extends MachineCore {
     }, 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) });
+      if (delivered) try { this.onTurn?.({ harness, session, text: request.text, at, source: { via: 'room', from: { principalId: principal ?? null, name: entry.name ?? null } } }); } catch { /* the turn is delivered either way */ }
       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' });

package/package.json

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