@volter/supercode-terminal 0.2.56 → 0.2.58

package/index.d.ts

@@ -252,7 +252,7 @@ export type {
 export type { TerminalInputDelivery, TmuxCommand, TmuxWindowSize };
 
 /** The bounded live composer text, or null for an unrecognized screen. */
-export function composerText(kind: string, screen: string | undefined, options?: { allowBusy?: boolean }): string | null;
+export function composerText(kind: string, screen: string | undefined): string | null;
 export function restoreComposerInput(host: TmuxTerminalHost | PtyTerminalHost | PaneServerHost, sessionId: string, kind: string, text: string): Promise<{ restored: boolean; reason?: string; remaining?: string }>;
 /** Failed input is restored or returns an explicit cleanup obligation; never blindly resend. */
-export function deliverComposerInput(host: TmuxTerminalHost | PtyTerminalHost | PaneServerHost, sessionId: string, kind: string, text: string, options?: { deadlineMs?: number; signal?: AbortSignal }): Promise<{ delivered: boolean; reason?: string; phase?: 'before-paste' | 'before-submit'; busy?: { indicator: string; row: string }; restored?: boolean; cleanup_required?: boolean; cleanup_reason?: string; cleanup_remaining?: string; delivery?: TerminalInputDelivery }>;
+export function deliverComposerInput(host: TmuxTerminalHost | PtyTerminalHost | PaneServerHost, sessionId: string, kind: string, text: string, options?: { deadlineMs?: number; signal?: AbortSignal }): Promise<{ delivered: boolean; reason?: string; restored?: boolean; cleanup_required?: boolean; cleanup_reason?: string; cleanup_remaining?: string; delivery?: TerminalInputDelivery }>;

package/index.mjs

@@ -4,6 +4,7 @@ import { appendFileSync, cpSync, existsSync, mkdirSync, readFileSync, renameSync
 import { homedir } from 'node:os';
 import { dirname, join } from 'node:path';
 import { connect as netConnect } from 'node:net';
+import { createRequire } from 'node:module';
 import { fileURLToPath } from 'node:url';
 import { createServer as defaultCreateServer } from 'node:http';
 
@@ -560,11 +561,18 @@ export class PtyTerminalHost {
     if ([...this.#sessions.values()].some((entry) => entry.name === name)) {
       throw new TerminalHostError('session_exists', `A pane named ${name} already exists.`);
     }
-    const [{ default: pty }, { default: headless }, { default: serialize }] = await Promise.all([
-      import('@homebridge/node-pty-prebuilt-multiarch'),
-      import('@xterm/headless'),
-      import('@xterm/addon-serialize'),
-    ]);
+    let pty, headless, serialize;
+    try {
+      [{ default: pty }, { default: headless }, { default: serialize }] = await Promise.all([
+        import('@homebridge/node-pty-prebuilt-multiarch'),
+        import('@xterm/headless'),
+        import('@xterm/addon-serialize'),
+      ]);
+    } catch (error) {
+      // A process that failed this load may keep failing it after the package is installed (Node keeps what it read of
+      // a half-installed package): the pane server answers this code by ending itself, and the next one loads afresh.
+      throw new TerminalHostError('pane_runtime_missing', `The pane runtime could not load: ${errorMessage(error)}`);
+    }
     const env = { ...process.env, ...(input.env ?? {}) };
     const { file, args } = windowsLaunch(input.command.program, input.command.arguments ?? [], env);
     // The watchdog is running before the pane is, and the pane is on its list the moment it exists.
@@ -974,6 +982,10 @@ export class PaneServerHost {
       rmSync(staging, { recursive: true, force: true });
       cpSync(root, join(staging, 'node_modules', '@volter', 'supercode-terminal'), { recursive: true, filter: (path) => !path.slice(root.length).split(/[\\/]/).includes('node_modules') });
       for (const name of PANE_RUNTIME_PACKAGES) cpSync(packageDir(name), join(staging, 'node_modules', ...name.split('/')), { recursive: true });
+      // A copy taken of a half-installed package would stay broken under its version: it is complete only when every
+      // runtime package resolves to an entry that exists in it.
+      const fromCopy = createRequire(join(staging, 'node_modules', '@volter', 'supercode-terminal', 'package.json'));
+      for (const name of PANE_RUNTIME_PACKAGES) if (!existsSync(fromCopy.resolve(name))) throw new Error(`${name} has no entry in the copy`);
       writeFileSync(join(staging, '.complete'), `${version}\n`);
       rmSync(target, { recursive: true, force: true });
       renameSync(staging, target);
@@ -1738,11 +1750,10 @@ export function composerHoldsDraft(kind, screen) {
 /** Read only a bounded, live Claude/Codex composer, never a prompt in scrollback.
  * Unknown layouts and collapsed pastes are deliberately unconfirmed.
  */
-export function composerText(kind, screen, { allowBusy = false } = {}) {
+export function composerText(kind, screen) {
   if (kind !== 'claude-code' && kind !== 'codex') return null;
   const lines = String(screen ?? '').split('\n').map(styledCells);
   const plain = lines.map((cells) => cells.map((cell) => cell.char).join(''));
-  if (!allowBusy && composerBusy(screen)) return null;
   const rule = /^\s*[─━]{4,}\s*$/u;
   const footer = /^\s*(?:.*\btab to queue (?:a )?message\b.*$|\? for shortcuts\b|⚠\s+\d+\s+warnings?\s+·\s+f2 to view\s*$|[^\n]+ · (?:~(?:[\\/]|(?=\s|$))|[\\/]|[A-Z]:[\\/])[^\n]*$|.*← for agents\s*$|.*\bcontext(?:\s+\d+%)?\s+left\b)/iu;
   const caret = kind === 'codex' ? /^\s*›(?:\s|$)/u : /^\s*[❯>](?:\s|$)/u;
@@ -1791,22 +1802,10 @@ function composerMatches(value, wanted) {
   return offsets.has(wanted.length);
 }
 
-/** Busy evidence must come from the live UI bottom, not a fleet label or a
- * quoted phrase in the transcript. */
-function composerBusyEvidence(screen) {
-  const bottom=String(screen??'').split('\n').map(line=>styledCells(line).map(cell=>cell.char).join('')).filter(line=>line.trim()).slice(-8);
-  for (const row of bottom) {
-    const match=/\b(?:esc to (?:interrupt|cancel)|tab to queue (?:a )?message)\b/iu.exec(row);
-    if (match) return { indicator: match[0], row: row.trim().slice(0, 240) };
-  }
-  return null;
-}
-function composerBusy(screen) { return composerBusyEvidence(screen) !== null; }
-
 /** 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}),{allowBusy:true});
+  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'};
@@ -1833,7 +1832,7 @@ export async function restoreComposerInput(host, sessionId, kind, text) {
  * unreadable/concurrently changed composer returns an explicit repair obligation. */
 export async function deliverComposerInput(host, sessionId, kind, text, { deadlineMs = Date.now() + 10_000, signal } = {}) {
   const capture=()=>host.capture(sessionId,{preserveEscapes:true});
-  const read=async()=>composerText(kind,await capture(),{allowBusy:true});
+  const read=async()=>composerText(kind,await capture());
   const expired=()=>signal?.aborted||Date.now()>=deadlineMs;
   let touched=false;
   const failed=async (reason, evidence={})=>{
@@ -1847,7 +1846,6 @@ export async function deliverComposerInput(host, sessionId, kind, text, { deadli
   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);
-    if(composerBusy(screen))return failed('busy-composer',{phase:'before-paste',busy:composerBusyEvidence(screen)});
     if(before!=='')return failed(before===null?'no-composer':'draft');
     if(check===0)await sleep(200);
   }
@@ -1864,14 +1862,13 @@ export async function deliverComposerInput(host, sessionId, kind, text, { deadli
     for(let attempt=0;attempt<3;attempt++) {
       if(expired())return failed('deadline');
       const screen=await capture();
-      if(composerBusy(screen))return failed('busy-composer',{phase:'before-submit',busy:composerBusyEvidence(screen)});
       if(!composerMatches(composerText(kind,screen),wanted))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 {delivered:true,delivery};
+        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');
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/supercode-terminal",
-  "version": "0.2.56",
+  "version": "0.2.58",
   "type": "module",
   "description": "Optional leak-safe terminal and tmux host adapter for Volter Harness frontends",
   "exports": {
@@ -95,8 +95,12 @@
     "prepack": "npm run build",
     "build:substrate": "tsc -p tsconfig.substrate.json"
   },
-  "peerDependencies": {
+  "dependencies": {
     "@homebridge/node-pty-prebuilt-multiarch": "^0.13.1 || ^0.14.1",
+    "@xterm/addon-serialize": "^0.14.0",
+    "@xterm/headless": "^6.0.0"
+  },
+  "peerDependencies": {
     "@xterm/addon-fit": "^0.11.0",
     "@xterm/addon-search": "^0.16.0",
     "@xterm/addon-web-links": "^0.12.0",
@@ -104,14 +108,9 @@
     "preact": ">=10.19.0 <11",
     "react": ">=18 <20",
     "ws": "^8.21.0",
-    "@volter/supercode-harness-sdk": "^0.3.18",
-    "@xterm/headless": "^6.0.0",
-    "@xterm/addon-serialize": "^0.14.0"
+    "@volter/supercode-harness-sdk": "^0.3.18"
   },
   "peerDependenciesMeta": {
-    "@homebridge/node-pty-prebuilt-multiarch": {
-      "optional": true
-    },
     "@xterm/addon-fit": {
       "optional": true
     },
@@ -135,24 +134,15 @@
     },
     "@volter/supercode-harness-sdk": {
       "optional": true
-    },
-    "@xterm/headless": {
-      "optional": true
-    },
-    "@xterm/addon-serialize": {
-      "optional": true
     }
   },
   "devDependencies": {
-    "@homebridge/node-pty-prebuilt-multiarch": "^0.13.1",
     "@types/node": "^22.20.1",
     "@types/ws": "^8.18.1",
     "@volter/supercode-harness-sdk": "^0.3.18",
     "@xterm/addon-fit": "^0.11.0",
     "@xterm/addon-search": "^0.16.0",
-    "@xterm/addon-serialize": "^0.14.0",
     "@xterm/addon-web-links": "^0.12.0",
-    "@xterm/headless": "^6.0.0",
     "@xterm/xterm": "^6.0.0",
     "esbuild": "^0.25.0",
     "preact": "^10.19.0",

package/substrate/pane-server.mjs

@@ -86,7 +86,14 @@ 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; }
-      Promise.resolve().then(() => host[op](...args)).then((result) => answer(id, result), (error) => refuse(id, error));
+      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 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); });
+        }
+      });
     }
   });
   // A client that goes (its daemon restarting) takes only its viewers with it: the panes stay.