@volter/supercode-teams 0.2.178 → 0.2.179

package/machine.mjs

@@ -1080,6 +1080,16 @@ export class TeamsMachine extends MachineCore {
 
   listPorts() { return listAnnouncedPorts(this.portsDir); }
 
+  /** The attach clients on each pane's tmux session, by its label; null where panes are not tmux's (a ConPTY host). */
+  #viewerCounts() {
+    if (process.platform === 'win32') return null;
+    const listed = spawnSync('tmux', [...(this.tmuxSocket ? ['-L', this.tmuxSocket] : []), 'list-clients', '-F', '#{session_name}'], { timeout: 3_000, encoding: 'utf8' });
+    const counts = new Map();
+    if (listed.status !== 0) return counts; // no server, or no clients: nothing shows any pane
+    for (const name of listed.stdout.split('\n').filter(Boolean)) counts.set(name, (counts.get(name) ?? 0) + 1);
+    return counts;
+  }
+
   /**
    * A terminal window on this machine's screen showing the pane, so the people at the machine see what runs on it:
    * in whichever capable terminal is installed (popup-terminals.mjs), running an attach client. The pane ending ends
@@ -1087,7 +1097,7 @@ export class TeamsMachine extends MachineCore {
    */
   #popupWindow(contextKey, session) {
     const terminal = popupTerminal(this.env);
-    if (!terminal) return;
+    if (!terminal) return false;
     const attach = process.platform === 'win32'
       ? [process.execPath, fileURLToPath(new URL('./bin/fleet.mjs', import.meta.url)), 'attach', contextKey, '--mode', 'control']
       // Presented as `supercode open`'s own client is (crates/cli/src/open.rs `attach`): the terminal sets its own
@@ -1095,7 +1105,7 @@ export class TeamsMachine extends MachineCore {
       // screen override, so the window's own scrollback, wheel and selection work instead of the wheel arriving
       // in the pane as up/down arrows.
       : ['/usr/bin/env', 'TERM=screen-256color', spawnSync('which', ['tmux'], { encoding: 'utf8' }).stdout.trim() || 'tmux', ...(this.tmuxSocket ? ['-L', this.tmuxSocket] : []), '-T', 'RGB', 'attach-session', '-t', session.label ?? contextKey];
-    openPopup(terminal, attach, { ...this.env, TMUX: '' });
+    return openPopup(terminal, attach, { ...this.env, TMUX: '' });
   }
 
   /**
@@ -1445,9 +1455,12 @@ export class TeamsMachine extends MachineCore {
         // hand here: a list that made a caller ask a second door "and is anything
         // wrong with these?" would be a list that knows and will not say.
         const rows = await this.attentionEvidence();
+        // how many clients each pane has now (a popped window, a `supercode open`, a relay streaming it elsewhere): what a caller must
+        // know before it opens another view of a pane on the same screen
+        const viewers = this.#viewerCounts();
         // `title` is what a viewer should show: the override if one is set, else the tmux label.
         return rows.filter((row) => row.session.id && shown(row.session.contextKey)).map(({ session: s, attention, rank, notify, evidence }) => ({
-          pane: s.contextKey, dead: Boolean(s.dead), label: s.label, title: titles[`pane:${s.contextKey}`] ?? s.label, cwd: s.cwd, owned: s.owned, activeCommand: s.activeCommand, pid: s.rootPid ?? null, size: s.size, suspended: this.suspended.has(s.contextKey),
+          pane: s.contextKey, dead: Boolean(s.dead), label: s.label, title: titles[`pane:${s.contextKey}`] ?? s.label, cwd: s.cwd, owned: s.owned, activeCommand: s.activeCommand, pid: s.rootPid ?? null, size: s.size, suspended: this.suspended.has(s.contextKey), viewers: viewers ? (viewers.get(s.label) ?? 0) : null,
           attention, rank, notify, evidence, input_cleanup: this.inputRepairs[s.contextKey] ? {pending:true,at:this.inputRepairs[s.contextKey].at,reason:this.inputRepairs[s.contextKey].reason} : null,
         }));
       }
@@ -1541,9 +1554,11 @@ export class TeamsMachine extends MachineCore {
           this.launches.record({ key, pane: contextKey, kind: params.kind ?? null, by, ...executable, status, error: exit?.failed ? exit.how : undefined });
           return { key, pane: contextKey, reused: false, status, exit: exit?.how ?? null };
         }
-        if (params.popup !== false) this.#popupWindow(contextKey, session);
+        // the window this machine's screen shows the pane in, when one opened: the caller is told, so it does not open a
+        // second view of a pane that is already in front of the person at the machine
+        const window = params.popup !== false && this.#popupWindow(contextKey, session);
         if (params.notify) this.#noticeWhenEnded({ key, pane: contextKey, notify: params.notify, label: params.name ?? params.kind ?? params.program });
-        return { key, pane: contextKey, reused: false, status: 'ready' };
+        return { key, pane: contextKey, reused: false, status: 'ready', window };
       }
       case 'launches.get': {
         if (!operator) throw Object.assign(new Error('operators only'), { code: 403 });

package/package.json

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