@supanadit/morse-web 0.10.0 → 0.11.0

package/dist/server.mjs

@@ -38,7 +38,11 @@ var CLIENT_MESSAGE_TYPES = [
   "model/set",
   "thinking/set",
   "interaction/respond",
-  "host/command"
+  "host/command",
+  "terminal/open",
+  "terminal/input",
+  "terminal/resize",
+  "terminal/close"
 ];
 function encodeWireMessage(message) {
   return JSON.stringify(message);
@@ -75,7 +79,7 @@ function hasKnownType(value, allowed) {
 }
 
 // ../protocol/dist/version.js
-var PROTOCOL_VERSION = 19;
+var PROTOCOL_VERSION = 20;
 var FRONTEND_MANIFEST_FILE = "webview.manifest.json";
 var DEFAULT_WS_PATH = "/ws";
 
@@ -2667,6 +2671,14 @@ var HostSessionController = class {
   loadingOlderHistory = false;
   /** Discriminates history item ids across pages (see `historyItems`). */
   historyPageSeq = 0;
+  /** The shells this client has open, keyed by the terminal id it named. */
+  terminals = /* @__PURE__ */ new Map();
+  /**
+   * Bumped whenever a terminal id is opened or closed. A shell's late `exit`
+   * (a replaced one, a killed one) compares its generation and stays silent, so
+   * it cannot delete or report over the shell now holding the id.
+   */
+  terminalGenerations = /* @__PURE__ */ new Map();
   constructor(options) {
     this.options = options;
   }
@@ -2709,6 +2721,11 @@ var HostSessionController = class {
       return;
     }
     this.disposed = true;
+    for (const process2 of this.terminals.values()) {
+      process2.kill();
+    }
+    this.terminals.clear();
+    this.terminalGenerations.clear();
     this.detachRegistry?.();
     this.detachRegistry = void 0;
     this.detachTranscripts?.();
@@ -2796,10 +2813,83 @@ var HostSessionController = class {
       case "host/command":
         await this.runHostCommand(message.payload.command, message.payload.args, message.payload.requestId);
         return;
+      case "terminal/open":
+        await this.openTerminal(message.payload);
+        return;
+      case "terminal/input":
+        this.terminals.get(message.payload.terminalId)?.write(message.payload.data);
+        return;
+      case "terminal/resize":
+        this.terminals.get(message.payload.terminalId)?.resize(message.payload.cols, message.payload.rows);
+        return;
+      case "terminal/close":
+        this.closeTerminal(message.payload.terminalId);
+        return;
       default:
         return;
     }
   }
+  /**
+   * Starts a shell for the bottom panel. The directory is the viewing session's
+   * (or the draft's), never an arbitrary path the client names — the backend
+   * still re-checks it against the host policy before spawning.
+   */
+  async openTerminal(payload) {
+    if (this.options.terminal === void 0) {
+      this.emitTerminalExit(payload.terminalId, void 0, "This host has no terminal.");
+      return;
+    }
+    this.closeTerminal(payload.terminalId);
+    const generation = this.terminalGenerations.get(payload.terminalId) ?? 0;
+    const cwd = payload.cwd ?? this.currentState().workspace.cwd;
+    const cols = clampGeometry(payload.cols, 80);
+    const rows = clampGeometry(payload.rows, 24);
+    let process2;
+    try {
+      process2 = await this.options.terminal.open({ cwd, cols, rows }, {
+        output: (data) => {
+          if (this.terminalGenerations.get(payload.terminalId) === generation) {
+            this.emitTerminalOutput(payload.terminalId, data);
+          }
+        },
+        exit: (code, error) => {
+          if (this.terminalGenerations.get(payload.terminalId) !== generation) {
+            return;
+          }
+          this.terminals.delete(payload.terminalId);
+          this.emitTerminalExit(payload.terminalId, code, error);
+        }
+      });
+    } catch (error) {
+      this.options.logger.warn("Failed to open a terminal", error);
+      this.emitTerminalExit(payload.terminalId, void 0, describeTerminalError(error));
+      return;
+    }
+    if (!this.disposed && this.terminalGenerations.get(payload.terminalId) === generation) {
+      this.terminals.set(payload.terminalId, process2);
+    } else {
+      process2.kill();
+    }
+  }
+  closeTerminal(terminalId) {
+    this.terminalGenerations.set(terminalId, (this.terminalGenerations.get(terminalId) ?? 0) + 1);
+    const process2 = this.terminals.get(terminalId);
+    if (process2 === void 0) {
+      return;
+    }
+    this.terminals.delete(terminalId);
+    process2.kill();
+  }
+  emitTerminalOutput(terminalId, data) {
+    if (data.length > 0 && !this.disposed) {
+      this.options.emit({ type: "terminal/output", payload: { terminalId, data } });
+    }
+  }
+  emitTerminalExit(terminalId, code, error) {
+    if (!this.disposed) {
+      this.options.emit({ type: "terminal/exit", payload: { terminalId, code, error } });
+    }
+  }
   async openDefaultSession() {
     const existingKey = this.options.services.registry.activeKeyOf();
     if (existingKey) {
@@ -3227,15 +3317,15 @@ var HostSessionController = class {
       this.answerHostCommand(requestId, false, void 0, `This host does not support "${command}".`);
       return;
     }
-    const result = await this.guard(() => Promise.resolve(handler(command, args, { cwd: this.currentState().workspace.cwd })));
-    if (!requestId) {
-      return;
-    }
-    if (result.ok) {
-      this.answerHostCommand(requestId, true, result.value);
+    let value;
+    try {
+      value = await handler(command, args, { cwd: this.currentState().workspace.cwd });
+    } catch (error) {
+      this.options.logger.error(`Morse command failed: ${describeError(error)}`, error);
+      this.answerHostCommand(requestId, false, void 0, `"${command}" failed`);
       return;
     }
-    this.answerHostCommand(requestId, false, void 0, `"${command}" failed`);
+    this.answerHostCommand(requestId, true, value);
   }
   /** Replies to a host command the frontend asked a value for. */
   answerHostCommand(requestId, ok, data, error) {
@@ -3543,6 +3633,15 @@ function describeError(error) {
   }
   return typeof error === "string" ? error : JSON.stringify(error);
 }
+function clampGeometry(value, fallback) {
+  if (value === void 0 || !Number.isFinite(value)) {
+    return fallback;
+  }
+  return Math.max(1, Math.min(1e3, Math.floor(value)));
+}
+function describeTerminalError(error) {
+  return error instanceof MorseError ? error.message : describeError(error);
+}
 function describeAgentFailure(error, hint) {
   const code = agentErrorCode(error);
   const install = error instanceof AgentUnavailableError ? error.remedy?.install : void 0;
@@ -3667,8 +3766,75 @@ var ServerProjectPolicy = class {
   }
 };
 
-// ../server/src/internal/registry.ts
+// ../server/src/internal/terminal/terminal.service.ts
+import { spawn as spawnPty } from "node-pty";
 import { Inject as Inject2, Injectable } from "@nestjs/common";
+var SIGKILL_AFTER_MS = 1500;
+function defaultShell() {
+  const configured = process.env.SHELL?.trim();
+  if (configured !== void 0 && configured.length > 0) {
+    return configured;
+  }
+  return process.platform === "win32" ? "powershell.exe" : "/bin/bash";
+}
+var ServerTerminalBackend = class {
+  constructor(policy, logger) {
+    this.policy = policy;
+    this.logger = logger;
+  }
+  open(options, sink) {
+    if (!this.policy.canOpen(options.cwd)) {
+      throw new UnsupportedByHostError(
+        `Morse is not allowed to run a terminal in ${options.cwd}.`
+      );
+    }
+    const shell = defaultShell();
+    const pty = spawnPty(shell, [], {
+      name: "xterm-256color",
+      cols: options.cols,
+      rows: options.rows,
+      cwd: options.cwd,
+      env: { ...process.env, TERM: "xterm-256color", MORSE_TERMINAL: "1" }
+    });
+    this.logger.info(`Terminal opened in ${options.cwd} (${shell}, pid ${pty.pid})`);
+    let exited = false;
+    const data = pty.onData((chunk) => sink.output(chunk));
+    pty.onExit(({ exitCode }) => {
+      exited = true;
+      data.dispose();
+      sink.exit(exitCode);
+    });
+    return {
+      write: (input) => {
+        if (!exited) {
+          pty.write(input);
+        }
+      },
+      resize: (cols, rows) => {
+        if (!exited) {
+          pty.resize(cols, rows);
+        }
+      },
+      kill: () => {
+        if (exited) {
+          return;
+        }
+        exited = true;
+        pty.kill();
+        const timer = setTimeout(() => pty.kill("SIGKILL"), SIGKILL_AFTER_MS);
+        timer.unref?.();
+      }
+    };
+  }
+};
+ServerTerminalBackend = __decorateClass([
+  Injectable(),
+  __decorateParam(0, Inject2(MORSE_PROJECT_POLICY)),
+  __decorateParam(1, Inject2(MORSE_LOGGER))
+], ServerTerminalBackend);
+
+// ../server/src/internal/registry.ts
+import { Inject as Inject3, Injectable as Injectable2 } from "@nestjs/common";
 function createSessionRegistry(adapter, config, logger) {
   return new SessionRegistry({
     factory: adapter.factory,
@@ -3689,19 +3855,19 @@ var MorseRegistryLifecycle = class {
   }
 };
 MorseRegistryLifecycle = __decorateClass([
-  Injectable(),
-  __decorateParam(0, Inject2(MORSE_SESSION_REGISTRY)),
-  __decorateParam(1, Inject2(MORSE_TRANSCRIPT_STORE))
+  Injectable2(),
+  __decorateParam(0, Inject3(MORSE_SESSION_REGISTRY)),
+  __decorateParam(1, Inject3(MORSE_TRANSCRIPT_STORE))
 ], MorseRegistryLifecycle);
 
 // ../server/src/internal/ws/morse.gateway.ts
 import {
   WebSocketGateway
 } from "@nestjs/websockets";
-import { Inject as Inject4 } from "@nestjs/common";
+import { Inject as Inject5 } from "@nestjs/common";
 
 // ../server/src/internal/ws/session-factory.service.ts
-import { Inject as Inject3, Injectable as Injectable2 } from "@nestjs/common";
+import { Inject as Inject4, Injectable as Injectable3 } from "@nestjs/common";
 
 // ../server/src/internal/uploads/upload-store.ts
 import { existsSync } from "node:fs";
@@ -4334,12 +4500,13 @@ function toPosix3(path) {
 
 // ../server/src/internal/ws/session-factory.service.ts
 var MorseSessionFactory = class {
-  constructor(registry, transcripts, policy, logger, config) {
+  constructor(registry, transcripts, policy, logger, config, terminal) {
     this.registry = registry;
     this.transcripts = transcripts;
     this.policy = policy;
     this.logger = logger;
     this.config = config;
+    this.terminal = terminal;
   }
   capabilities() {
     return {
@@ -4361,6 +4528,10 @@ var MorseSessionFactory = class {
       // The same reasoning for history: VS Code has Source Control, so the
       // browser host is the one that answers `gitLog` for its own git panel.
       gitPanel: true,
+      // VS Code already has an integrated terminal; the browser host has none, so
+      // the bottom panel's terminal is this host's. It runs in the viewing
+      // session's directory and is gated by `ProjectPolicy`, like a session.
+      terminal: true,
       // A browser cannot hand a dragged file's path to pi, so the host takes the
       // bytes and writes them next to the session; the frontend then `@mentions`
       // the path it gets back.
@@ -4399,6 +4570,8 @@ var MorseSessionFactory = class {
       // A page load must not create a session; the first prompt opens one.
       autoOpen: false,
       onHostCommand: (command, args, context) => this.runHostCommand(command, args, context),
+      // The bottom panel's shell: this host can spawn one on its own machine.
+      terminal: this.terminal,
       agentHint: "Install the pi CLI and make sure it is on PATH, or start the server with MORSE_PI_PATH set."
     });
   }
@@ -4534,12 +4707,13 @@ var MorseSessionFactory = class {
   }
 };
 MorseSessionFactory = __decorateClass([
-  Injectable2(),
-  __decorateParam(0, Inject3(MORSE_SESSION_REGISTRY)),
-  __decorateParam(1, Inject3(MORSE_TRANSCRIPT_STORE)),
-  __decorateParam(2, Inject3(MORSE_PROJECT_POLICY)),
-  __decorateParam(3, Inject3(MORSE_LOGGER)),
-  __decorateParam(4, Inject3(MORSE_CONFIG))
+  Injectable3(),
+  __decorateParam(0, Inject4(MORSE_SESSION_REGISTRY)),
+  __decorateParam(1, Inject4(MORSE_TRANSCRIPT_STORE)),
+  __decorateParam(2, Inject4(MORSE_PROJECT_POLICY)),
+  __decorateParam(3, Inject4(MORSE_LOGGER)),
+  __decorateParam(4, Inject4(MORSE_CONFIG)),
+  __decorateParam(5, Inject4(ServerTerminalBackend))
 ], MorseSessionFactory);
 function gitPaths(args) {
   const paths = args?.paths;
@@ -4592,8 +4766,8 @@ var MorseGateway = class {
 };
 MorseGateway = __decorateClass([
   WebSocketGateway({ path: DEFAULT_WS_PATH }),
-  __decorateParam(0, Inject4(MorseSessionFactory)),
-  __decorateParam(1, Inject4(MORSE_LOGGER))
+  __decorateParam(0, Inject5(MorseSessionFactory)),
+  __decorateParam(1, Inject5(MORSE_LOGGER))
 ], MorseGateway);
 
 // ../server/src/app/config.ts
@@ -4725,6 +4899,7 @@ AppModule = __decorateClass([
         inject: [MORSE_CONFIG]
       },
       MorseRegistryLifecycle,
+      ServerTerminalBackend,
       MorseSessionFactory,
       MorseGateway
     ]