@volter/supercode-teams 0.2.123 → 0.2.125

package/bin/workspace.mjs

@@ -701,7 +701,14 @@ async function connectorCommand(verb, { flags, rest, output, client, context, te
       if (!serviceBin) unsupported('--install requires invocation through the native supercode CLI');
       const serviceEnv = { ...process.env, SUPERCODE_TEAMS_ENTRY: fileURLToPath(new URL('./teams.mjs', import.meta.url)) };
       // Refuse source-backed installs before Windows stops the running connector.
-      execFileSync(serviceBin, ['__teams-connector-service', 'validate', contextName, path, context.server_id, context.team_id], { encoding: 'utf8', stdio: ['ignore', 'pipe', 'pipe'], env: serviceEnv });
+      try {
+        execFileSync(serviceBin, ['__teams-connector-service', 'validate', contextName, path, context.server_id, context.team_id], { encoding: 'utf8', stdio: ['ignore', 'pipe', 'pipe'], env: serviceEnv });
+      } catch (error) {
+        // In particular, an older native CLI may not have the validation door.
+        // Its support-report child must not keep a refused Windows install alive.
+        await core.close();
+        throw error;
+      }
       // Ending a Windows task ends only the console host it started, never the connector under it, so the task
       // would refuse its new run while the old connector went on: the running one is asked to stop first.
       if (process.platform === 'win32') await stopRunningConnector(saved);

package/machine.mjs

@@ -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.123",
+  "version": "0.2.125",
   "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",