@volter/supercode-teams 0.2.172 → 0.2.173

package/bin/teams.mjs

@@ -19,7 +19,7 @@
 //   title set <pane> <text> | title ls
 //   attention ls | rank | request <pane> [--urgency now|soon|whenever] [--reason text] | clear <pane>
 //   watch [--interval ms] [--for ms]
-//   launches get <key> | list                 operators: keyed node launch receipts
+//   launches get <key> | cancel <key> | list   operators: keyed receipts; cancel only unissued keys
 //   rpc <harness.v1 method> [json-params]   operators: one harness.v1 request
 //   log verify
 //
@@ -323,8 +323,9 @@ async function main() {
       return withNode(async (rpc) => out(await rpc.call('jobs.list', {})));
     case 'launches': {
       if (sub === 'get' && rest[0]) return withNode(async (rpc) => out(await rpc.call('launches.get', { key: rest[0] })));
+      if (sub === 'cancel' && rest[0]) return withNode(async (rpc) => out(await rpc.call('launches.cancel', { key: rest[0] })));
       if (sub === 'list') return withNode(async (rpc) => out(await rpc.call('launches.list', {})));
-      die('launches get <key> | launches list [--machine NAME]');
+      die('launches get <key> | cancel <key> | list [--machine NAME]');
       return;
     }
     case 'rpc': {

package/machine.mjs

@@ -7,7 +7,7 @@
 //                      request ids rewritten per connection, notifications routed
 //                      by the subscription/connection they name (never fanned out)
 //   stream "terminal"  a pane attachment under observe|control
-//   stream "node"      describe, launch, launches.get|list, panes.*, files.*,
+//   stream "node"      describe, launch, launches.get|cancel|list, panes.*, files.*,
 //                      ports.*, attention.*, title.*
 //   stream "frontend"  frontend.v2 to a hosted runtime, one client id per caller
 //   stream "port"      one TCP connection to an announced port
@@ -1345,6 +1345,19 @@ export class TeamsMachine extends MachineCore {
     });
   }
 
+  async #launchReceipt(found) {
+    const session = found.pane ? await this.#paneByContext(found.pane) : null;
+    return {
+      key: found.key, pane: found.pane ?? null, status: found.status, by: found.by ?? null,
+      cancelled: found.status === 'cancelled', outcome: found.outcome ?? null,
+      cancelled_at: found.cancelled_at ?? null,
+      live: Boolean(session && !session.dead), label: session?.label ?? null, activeCommand: session?.activeCommand ?? null,
+      exit_output: found.pane && (!session || session.dead) ? paneExitOutput(found.pane) : null,
+      exit: session?.dead ? deadPaneExit(session) : found.pane && !session ? paneExit(found.pane) : null,
+      ...initialInputFacts(found),
+    };
+  }
+
   async #dispatch(entry, method, params) {
     // A server-forwarded caller is re-admitted on every door: a grant revoked or expired
     // since the stream opened stops mattering NOW, not at the next stream.
@@ -1439,16 +1452,24 @@ export class TeamsMachine extends MachineCore {
         const programName = String(params.program).split(/[\\/]/).pop().replace(/\.(?:exe|cmd)$/i, '');
         if (programName === 'codex') params = { ...params, kind: 'codex' };
         const key = params.key ?? `lk_${randomBytes(9).toString('base64url')}`;
-        const existing = this.launches.find(key);
-        // A key whose launch is in flight, or whose pane still lives, is reused; a failed
-        // launch, or one whose pane has ended, may be launched again.
-        if (existing && (existing.status === 'issued' || (existing.status === 'ready' && await this.#paneByContext(existing.pane)))) {
-          return { key, pane: existing.pane, reused: true, status: existing.status };
+        const by = await this.#callerOf(entry, params).catch(() => null);
+        // No await between the final journal check and issuance: cancellation and issuance
+        // serialize in this daemon even when caller resolution or pane reads yielded.
+        let existing = this.launches.find(key);
+        while (existing) {
+          if (existing.status === 'cancelled') throw Object.assign(new Error(`launch key ${key} was cancelled before issuance; use a new key`), { code: 409, reason: 'launch_key_cancelled' });
+          if (existing.status === 'issued') return { key, pane: existing.pane, reused: true, status: existing.status };
+          if (existing.status === 'ready') {
+            const session = await this.#paneByContext(existing.pane);
+            const latest = this.launches.find(key);
+            if (JSON.stringify(latest) !== JSON.stringify(existing)) { existing = latest; continue; }
+            if (session && !session.dead) return { key, pane: existing.pane, reused: true, status: existing.status };
+          }
+          break;
         }
         const contextKey = params.pane ?? `p_${randomBytes(9).toString('base64url')}`;
         // Who started the pane: the launching session's (or board's) address, null for a person. A session's later
         // input on the pane is refused unless it is this one (#refuseForeign); close is not creator-restricted.
-        const by = await this.#callerOf(entry, params).catch(() => null);
         // Who to tell when the pane ends (`open --new … --notify-when-ended`): a session's mail address, and this
         // machine's name as the address a notice from its pane comes from.
         if (params.notify !== undefined && !(params.notify && typeof params.notify.to === 'string' && /^sc:[^:\s]+:[^:\s]+:\S+$/.test(params.notify.to) && typeof params.notify.machine === 'string' && /^[a-z0-9][a-z0-9-]*$/.test(params.notify.machine))) throw Object.assign(new Error('launch notify is { to: <sc: address>, machine: <this machine\'s mail name> }'), { code: 400 });
@@ -1523,13 +1544,21 @@ export class TeamsMachine extends MachineCore {
         if (!operator) throw Object.assign(new Error('operators only'), { code: 403 });
         const found = this.launches.find(params.key);
         if (!found) return null;
-        const session = await this.#paneByContext(found.pane);
-        return {
-          exit_output: !session || session.dead ? paneExitOutput(found.pane) : null,
-          exit: session?.dead ? deadPaneExit(session) : !session ? paneExit(found.pane) : null,
-          key: found.key, pane: found.pane, live: Boolean(session && !session.dead), label: session?.label ?? null, activeCommand: session?.activeCommand ?? null,
-          ...initialInputFacts(found),
-        };
+        return this.#launchReceipt(found);
+      }
+      case 'launches.cancel': {
+        if (!operator) throw Object.assign(new Error('operators only'), { code: 403 });
+        if (typeof params.key !== 'string' || !params.key.trim()) throw Object.assign(new Error('launch cancellation requires a nonempty key'), { code: 400 });
+        const by = await this.#callerOf(entry, params).catch(() => null);
+        // Retire only an absent key. An issued, live or failed launch keeps its actual
+        // receipt; cancellation never closes a pane or guesses that issuance did not happen.
+        let found = this.launches.find(params.key);
+        if (!found) {
+          this.launches.record({ key: params.key, pane: null, by, status: 'cancelled', outcome: 'not_issued', cancelled_at: Date.now() });
+          found = this.launches.find(params.key);
+          act('launches.cancel', params.key, 'ok', 'not issued; key retired');
+        } else act('launches.cancel', params.key, found.status === 'cancelled' ? 'ok' : 'refused', found.status);
+        return this.#launchReceipt(found);
       }
       case 'launches.list': {
         // Everything this daemon launched, by key, with whether the pane still lives: how an

package/package.json

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