@volter/supercode-terminal 0.2.57 → 0.2.58

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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/supercode-terminal",
-  "version": "0.2.57",
+  "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.