@volter/supercode-terminal 0.2.61 → 0.2.63

package/index.mjs

@@ -1069,12 +1069,20 @@ export class PaneServerHost {
   }
 
   async #request(op, args, extra = {}) {
-    const connection = await this.#connect();
-    const id = this.#next++;
-    return new Promise((resolve, reject) => {
-      this.#pending.set(id, { resolve, reject });
-      connection.write(`${JSON.stringify({ id, op, args, ...extra })}\n`);
-    });
+    // A server that is leaving refuses a request unrun (`pane_server_restarting`): it is asked again of the next one.
+    for (let attempt = 0; ; attempt += 1) {
+      const connection = await this.#connect();
+      const id = this.#next++;
+      try {
+        return await new Promise((resolve, reject) => {
+          this.#pending.set(id, { resolve, reject, connection });
+          connection.write(`${JSON.stringify({ id, op, args, ...extra })}\n`);
+        });
+      } catch (error) {
+        if (error?.code !== 'pane_server_restarting' || attempt >= 20) throw error;
+        await sleep(250);
+      }
+    }
   }
 
   #connect() {
@@ -1124,15 +1132,27 @@ export class PaneServerHost {
         const waiter = this.#pending.get(message.id);
         if (!waiter) continue;
         this.#pending.delete(message.id);
-        if (message.error) waiter.reject(new TerminalHostError(message.error.code, message.error.message));
+        if (message.error) {
+          // The server ends after a runtime that failed to load: the next request opens a new connection.
+          // The server is leaving: this client lets go of it, and its next request opens (or starts) the next one.
+          if (message.error.code === 'pane_runtime_missing' || message.error.code === 'pane_server_restarting') {
+            if (this.#connection === connection) this.#connection = null;
+            connection.end();
+          }
+          waiter.reject(new TerminalHostError(message.error.code, message.error.message));
+        }
         else waiter.resolve(message.result);
       }
     });
     // The server went (or this connection did): waiting requests fail, and viewers are told; the next call reconnects.
     connection.on('close', () => {
       if (this.#connection === connection) this.#connection = null;
-      for (const waiter of this.#pending.values()) waiter.reject(new TerminalHostError('pane_server_unreachable', 'The pane server connection closed.'));
-      this.#pending.clear();
+      // Only the requests sent on this connection fail with it; one already replaced keeps the next one's requests.
+      for (const [id, waiter] of this.#pending) {
+        if (waiter.connection && waiter.connection !== connection) continue;
+        this.#pending.delete(id);
+        waiter.reject(new TerminalHostError('pane_server_unreachable', 'The pane server connection closed.'));
+      }
       for (const relay of [...this.#streams.values()]) { relay.disposed = true; relay.socket?.close?.(1011, 'pane server connection closed'); }
       this.#streams.clear();
     });
@@ -1823,13 +1843,23 @@ function composerMatches(value, wanted) {
   return offsets.has(wanted.length);
 }
 
+/** Claude collapses a multi-line paste to `[Pasted text #N +K lines]`, and its composer then shows that placeholder,
+ * never the text. It stands for `text` when K is the pasted text's line breaks (the trimmed text's, or the sent
+ * payload's with its closing newline): a placeholder whose count differs is another paste. */
+function pastePlaceholderMatches(composer, text) {
+  const placeholder=/^\[Pasted text #\d+ \+(\d+) lines?\]$/u.exec(String(composer??'').trim());
+  if(!placeholder)return false;
+  const breaks=value=>(value.match(/\n/gu)??[]).length;
+  return [breaks(String(text).trim()),breaks(`${text}\n`)].includes(Number(placeholder[1]));
+}
+
 /** Undo only text this input wrote, including when a turn started meanwhile.
  * Never Enter, Escape, or Ctrl-C: restoration must not submit or stop work. */
 export async function restoreComposerInput(host, sessionId, kind, text) {
   const read=async()=>composerText(kind,await host.capture(sessionId,{preserveEscapes:true}));
   let remaining=await read();
   if(remaining==='')return {restored:true};
-  if(!composerMatches(remaining,String(text).trim()))return {restored:false,reason:'composer-changed-or-unreadable'};
+  if(!composerMatches(remaining,String(text).trim())&&!pastePlaceholderMatches(remaining,text))return {restored:false,reason:'composer-changed-or-unreadable'};
   const lines=remaining.split('\n').length+2;
   for(let line=0;line<lines;line++) {
     if(await read()!==remaining)return {restored:false,reason:'composer-changed',remaining};
@@ -1864,6 +1894,7 @@ export async function deliverComposerInput(host, sessionId, kind, text, { deadli
   };
   if(expired())return failed('deadline');
   const wanted=String(text).trim();
+  const holds=composer=>composerMatches(composer,wanted)||pastePlaceholderMatches(composer,text);
   if(!wanted||/[\x00-\x08\x0b-\x1f\x7f]/u.test(text))return failed('unsupported-text');
   for(let check=0;check<2;check++) {
     const screen=await capture(),before=composerText(kind,screen);
@@ -1877,20 +1908,20 @@ export async function deliverComposerInput(host, sessionId, kind, text, { deadli
     let pasted=false;
     for(let attempt=0;attempt<10&&!expired();attempt++) {
       await sleep(100);
-      if(composerMatches(await read(),wanted)){pasted=true;break;}
+      if(holds(await read())){pasted=true;break;}
     }
     if(!pasted)return failed('paste-unconfirmed');
     for(let attempt=0;attempt<3;attempt++) {
       if(expired())return failed('deadline');
       const screen=await capture();
-      if(!composerMatches(composerText(kind,screen),wanted))return failed('composer-changed');
+      if(!holds(composerText(kind,screen)))return failed('composer-changed');
       if(expired())return failed('deadline');
       await host.sendInput(sessionId,'\r',{submitMode:'single',deadlineMs});
       for(let poll=0;poll<10&&!expired();poll++) {
         await sleep(100);
         const current=await read();
         if(current==='')return kind === 'claude-code' ? {delivered:true,delivery,path:'composer_submit'} : {delivered:false,reason:'native-transcript-confirmation-required',delivery};
-        if(!composerMatches(current,wanted))return failed('submission-unconfirmed');
+        if(!holds(current))return failed('submission-unconfirmed');
       }
     }
     return failed('submit-unconfirmed');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/supercode-terminal",
-  "version": "0.2.61",
+  "version": "0.2.63",
   "type": "module",
   "description": "Optional leak-safe terminal and tmux host adapter for Volter Harness frontends",
   "exports": {

package/substrate/pane-server.mjs

@@ -20,6 +20,18 @@ const clients = new Set();
 const IDLE_EXIT_MS = 60_000;
 let idleTimer = null;
 
+let leaving = false;
+/**
+ * Leave once no client holds a connection: each client closes its own on the answer that says the runtime is missing
+ * (or on a refusal while this server is leaving), so nothing it sends is lost between servers. A client that never
+ * closes (an older daemon) is ended after a few seconds.
+ */
+function leave() {
+  const done = () => { host.dispose(); process.exit(0); };
+  if (!clients.size) done();
+  setTimeout(() => { server.close(); for (const connection of clients) connection.end(); setTimeout(done, 500); }, 3_000).unref?.();
+}
+
 const OPS = new Set(['listSessions', 'createSession', 'capture', 'sendInput', 'closeSession', 'renameWindow', 'issueAttachment', 'bindContext']);
 
 function scheduleIdleExit() {
@@ -86,19 +98,23 @@ const server = createServer((connection) => {
       const { id, op, args = [] } = message;
       if (op === 'attach') { attach(id, args, message.stream); continue; }
       if (!OPS.has(op)) { refuse(id, { code: 'unsupported', message: `pane server: no operation ${op}` }); continue; }
+      // A server that is leaving runs nothing more: the request is refused unrun, and its client asks the next server.
+      if (leaving) { refuse(id, { code: 'pane_server_restarting', message: 'The pane server is restarting; ask again.' }); continue; }
       Promise.resolve().then(() => host[op](...args)).then((result) => answer(id, result), async (error) => {
-        refuse(id, error);
-        // The pane runtime failed to load in this process: with no pane to keep, it ends once the answer is out, so
+        // The pane runtime failed to load in this process: with no pane to keep, it ends once its answers are out, so
         // the next request starts a pane server that loads the runtime afresh (one installed since this one started).
-        if (error?.code === 'pane_runtime_missing' && !(await host.listSessions().catch(() => [])).length) {
-          connection.end(() => { host.dispose(); process.exit(0); });
-        }
+        if (error?.code === 'pane_runtime_missing') leaving = true;
+        refuse(id, error);
+        if (!leaving) return;
+        if ((await host.listSessions().catch(() => [])).length) { leaving = false; return; }
+        leave();
       });
     }
   });
   // A client that goes (its daemon restarting) takes only its viewers with it: the panes stay.
   connection.on('close', () => {
     clients.delete(connection);
+    if (leaving && !clients.size) { host.dispose(); process.exit(0); }
     for (const { socketLike, attachment } of streams.values()) { socketLike.emitClose(); attachment?.dispose(); }
     streams.clear();
     scheduleIdleExit();