@volter/supercode-teams 0.2.122 → 0.2.124

package/machine.mjs

@@ -1294,7 +1294,7 @@ export class TeamsMachine extends MachineCore {
         if (!whole && !observesPanes(admitted)) need('view', '*');
         const sessions = (await this.host.listSessions()).filter(s => s.contextKey && (whole || holds(admitted, 'observe', `pane:${s.contextKey}`)));
         return Promise.all(sessions.map(async session => {
-          const screen = await this.host.capture(session.id, { lines: 100, preserveEscapes: true }).catch(() => null);
+          const screen = await Promise.resolve().then(() => this.host.capture(session.id, { lines: 100, preserveEscapes: true })).catch(() => null);
           const kind = this.#paneKind(session.contextKey, session);
           const composer = screen && terminal.composerText?.(kind, screen);
           return { pane: session.contextKey, idleComposer: composer != null && !/\besc to (?:interrupt|cancel)\b/iu.test(screen) };
@@ -1485,17 +1485,44 @@ export class TeamsMachine extends MachineCore {
             const screen = await this.host.capture(session.id, { lines: 200, preserveEscapes: true });
             return /\besc to (?:interrupt|cancel)\b/iu.test(screen) ? null : terminal.composerText(kind, screen);
           };
+          const painted = await read();
+          await new Promise(resolve => setTimeout(resolve, COMPOSER_RECHECK_MS));
+          if (painted === null || painted !== await read()) return { cleared: false, reason: 'composer-not-stable' };
+          // Native stderr can paint over the composer without entering its editor.
+          // Repaint first so that a stale error line is not mistaken for a draft.
+          await this.host.sendInput(session.id, '\u000c', { submitMode: 'none' });
+          await new Promise(resolve => setTimeout(resolve, COMPOSER_RECHECK_MS));
           const before = await read();
           await new Promise(resolve => setTimeout(resolve, COMPOSER_RECHECK_MS));
           if (before === null || before !== await read()) return { cleared: false, reason: 'composer-not-stable' };
-          if (before === '') return { cleared: true, alreadyEmpty: true };
-          // Explicit deletion, never submit. Readline end/kill-left clears the observed line;
-          // a multiline or changed editor is reported unconfirmed, never sent as a turn.
-          await this.host.sendInput(session.id, '\u0005\u0015', { submitMode: 'single' });
-          await new Promise(resolve => setTimeout(resolve, COMPOSER_RECHECK_MS));
-          const after = await read(), cleared = after === '';
+          if (before === '') {
+            act('control', `pane:${params.pane}`, 'draft-cleared');
+            return { cleared: true, alreadyEmpty: painted === '', repainted: painted !== '' };
+          }
+          if (before !== painted) return { cleared: false, reason: 'composer-changed' };
+          // Clear whole drafts, including lines before an empty final line. Each deletion
+          // must leave only text from the previous reading; a concurrent edit stops us.
+          let remaining = before, cleared = false, reason = 'composer-not-empty';
+          for (let line = 0; line < before.split('\n').length + 2; line += 1) {
+            if (remaining !== await read()) { reason = 'composer-changed'; break; }
+            await this.host.sendInput(session.id, '\u0005\u0015', { submitMode: 'none' });
+            await new Promise(resolve => setTimeout(resolve, COMPOSER_RECHECK_MS));
+            let after = await read();
+            if (after === '') { cleared = true; break; }
+            if (after === null || !remaining.includes(after)) { reason = 'composer-changed'; break; }
+            // Kill-left left the cursor at the line's start. Backspace joins the
+            // preceding line; it never submits or interrupts the session.
+            remaining = after;
+            if (remaining !== await read()) { reason = 'composer-changed'; break; }
+            await this.host.sendInput(session.id, '\u007f', { submitMode: 'none' });
+            await new Promise(resolve => setTimeout(resolve, COMPOSER_RECHECK_MS));
+            after = await read();
+            if (after === '') { cleared = true; break; }
+            if (after === null || !remaining.replace(/\n/g, '').includes(after.replace(/\n/g, ''))) { reason = 'composer-changed'; break; }
+            remaining = after;
+          }
           act('control', `pane:${params.pane}`, cleared ? 'draft-cleared' : 'draft-clear-unconfirmed');
-          return { cleared, reason: cleared ? null : 'composer-not-empty', beforeHash: createHash('sha256').update(before).digest('hex') };
+          return { cleared, reason: cleared ? null : reason, beforeHash: createHash('sha256').update(before).digest('hex') };
         } finally { this.inputInFlight.delete(session.id); }
       }
       case 'panes.turn': {

package/package.json

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