@volter/supercode-teams 0.2.92 → 0.2.94

package/bin/teams.mjs

@@ -271,7 +271,9 @@ async function main() {
       try { request = JSON.parse(Buffer.concat(chunks).toString('utf8')); } catch { die('mail reads one JSON request on stdin'); }
       const channel = await machineChannel();
       let stream;
-      try { stream = await channel.open('mail', { request }); } catch (error) { die(error.message, 1); }
+      // A typed line waits as long as the server retries it on a loaded machine (2 minutes), and a little longer.
+      const timeoutMs = request?.op === 'turn' ? 150_000 : undefined;
+      try { stream = await channel.open('mail', { request }, { timeoutMs }); } catch (error) { die(error.message, 1); }
       let answered = false;
       stream.on('data', (chunk) => { answered = true; process.stdout.write(`${chunk}\n`); });
       stream.on('close', (reason) => {

package/bin/workspace.mjs

@@ -730,7 +730,7 @@ async function connectorCommand(verb, { flags, rest, output, client, context, te
     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) });
+    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), onTurnWithdrawn: (turn) => connector.withdrawTurn(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`); });
     // The connector is the service's daemon and keeps serving; a daemon that took its socket path is the one to stop.
     machine.on('superseded', (path) => process.stderr.write(`supercode teams: another machine daemon replaced this connector's socket at ${path}; stop it (supercode teams status)\n`));

package/connector/index.mjs

@@ -475,6 +475,13 @@ export class TeamsConnector {
     notes[key]=[...(notes[key]??[]).filter(note=>now-note.at<TURN_NOTE_MS),{text:String(text).trim(),at,source}];
     this.save();
   }
+  /** A noted turn its session refused: nobody typed that line through this door, so nothing is named after it. */
+  withdrawTurn({harness,session,text,at}){
+    const key=`${harness}:${session}`,notes=this.state.turn_notes?.[key];if(!notes)return;
+    const kept=notes.filter(note=>!(note.at===at&&note.text===String(text).trim()));
+    if(kept.length===notes.length)return;
+    if(kept.length)this.state.turn_notes[key]=kept;else delete this.state.turn_notes[key];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]){

package/machine.mjs

@@ -98,6 +98,8 @@ function trustClaudeFolder(cwd) {
 const LAUNCH_SETTLE_MS = 500;
 /** How many typed lines' keys a machine remembers; a server retries a line for minutes, not thousands of lines. */
 const TURN_KEYS_KEPT = 1000;
+/** How long a typed line's door gets to confirm it: a loaded machine's reader types it in seconds and answers late. */
+const TURN_CONFIRM_MS = 60_000;
 
 /**
  * What a pane runs for a launch: the program with its arguments, or, when the caller named a whole command line
@@ -149,11 +151,12 @@ 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, onTurn = null } = {}) {
+  constructor({ home = teamsHome(), supercode = 'supercode', tmuxSocket, floor = null, limits = null, env = process.env, link = null, popups = false, onTurn = null, onTurnWithdrawn = 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.onTurnWithdrawn = onTurnWithdrawn;
     this.tmuxSocket = tmuxSocket ?? null;
     // Each pane launched here opens a terminal window on this machine's screen (popupWindow).
     this.popups = Boolean(popups);
@@ -501,22 +504,26 @@ export class TeamsMachine extends MachineCore {
       if (this.#turnKeys.size > TURN_KEYS_KEPT) this.#turnKeys.delete(this.#turnKeys.keys().next().value);
     }
     const reply = (value) => { settle?.(value); answer(value); };
-    const at = Date.now();
+    // Who typed it is noted before it is typed: a capture can read the session's new line before the door confirms
+    // it (a loaded machine confirmed a frozen-then-resumed line after the line was captured, and it went up unnamed).
+    // A refusal withdraws the note; an unconfirmed turn keeps it, as the line may well be in the session.
+    const note = { harness, session, text: request.text, at: Date.now(), source: { via: 'room', from: { principalId: principal ?? null, name: entry.name ?? null } } };
+    try { this.onTurn?.(note); } catch { /* naming is best-effort; the turn goes either way */ }
     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) => {
+    }, TURN_CONFIRM_MS).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 */ }
+      if (!delivered) try { this.onTurnWithdrawn?.(note); } catch { /* nothing to withdraw */ }
       reply(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) });
-      reply({ code: 1, text: error.message });
+      this.log.append({ principal, cap: 'interact', target, outcome: 'unconfirmed', detail: error.message.slice(0, 200) });
+      reply({ code: 1, text: `the session did not confirm the line (${error.message}); it may have been typed` });
     });
   }
 

package/package.json

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