@wangyaoshen/remux 0.3.8-dev.bab6c95 → 0.3.10-dev.19fb76c

package/src/session.ts

@@ -160,6 +160,34 @@ function getShell(): string {
   return "/bin/bash";
 }
 
+function formatPtyError(error: unknown): string {
+  if (error instanceof Error && error.message) return error.message;
+  if (typeof error === "string" && error) return error;
+  return "unknown PTY error";
+}
+
+function markTabUnavailable(
+  tab: Tab,
+  sessionName: string,
+  error: unknown,
+): void {
+  const reason = formatPtyError(error);
+  const banner =
+    `\r\n\x1b[31mShell unavailable on this machine: ${reason}\x1b[0m\r\n`;
+
+  tab.ended = true;
+  tab.pty = null;
+  tab.daemonSocket = null;
+  tab.daemonClient = null;
+  tab.restored = false;
+  tab.scrollback.write(banner);
+  if (tab.vt) tab.vt.consume(banner);
+
+  console.error(
+    `[tab] shell unavailable for id=${tab.id} in session "${sessionName}": ${reason}`,
+  );
+}
+
 // ── State ────────────────────────────────────────────────────────
 
 let tabIdCounter = 0;
@@ -353,6 +381,8 @@ export async function reviveTab(tab: Tab, session: Session): Promise<boolean> {
     return true;
   } catch (err: any) {
     console.error(`[session] failed to revive tab ${tab.id}:`, err.message);
+    markTabUnavailable(tab, session.name, err);
+    broadcastState();
     return false;
   }
 }
@@ -501,12 +531,20 @@ export function createTab(
       console.log(`[tab] daemon connected for id=${id} in session "${session.name}"`);
     }).catch((err) => {
       console.error(`[tab] failed to connect to daemon for id=${id}:`, err.message);
-      // Fallback: spawn direct PTY
-      spawnDirectPty(tab, session, shell, cols, rows);
+      try {
+        // Fallback: spawn direct PTY
+        spawnDirectPty(tab, session, shell, cols, rows);
+      } catch (spawnError) {
+        markTabUnavailable(tab, session.name, spawnError);
+      }
     });
   } else {
-    // Direct PTY mode (fallback when daemon script not available)
-    spawnDirectPty(tab, session, shell, cols, rows);
+    try {
+      // Direct PTY mode (fallback when daemon script not available)
+      spawnDirectPty(tab, session, shell, cols, rows);
+    } catch (err) {
+      markTabUnavailable(tab, session.name, err);
+    }
   }
 
   session.tabs.push(tab);

package/tests/auth.test.js

@@ -100,7 +100,7 @@ function startServer(env, port) {
     const cleanEnv = { ...process.env };
     delete cleanEnv.REMUX_TOKEN;
     delete cleanEnv.REMUX_PASSWORD;
-    const proc = spawn("node", [SERVER_JS], {
+    const proc = spawn(process.execPath, [SERVER_JS], {
       env: { ...cleanEnv, ...env, PORT: String(port) },
       stdio: "pipe",
     });

package/tests/e2e/app.spec.js

@@ -76,6 +76,11 @@ test.describe.serial("Remux E2E", () => {
     // Sidebar should show "main" session
     const sessionItem = page.locator(".session-item .name", { hasText: "main" });
     await expect(sessionItem).toBeVisible();
+
+    await expect(page.locator("#btn-inspect")).toBeVisible();
+    await expect(page.locator("#btn-workspace")).toHaveCount(0);
+    await expect(page.locator("#devices-section")).toHaveCount(0);
+    await expect(page.locator("#push-section")).toHaveCount(0);
   });
 
   // ── 2. Live terminal interaction ──
@@ -174,11 +179,10 @@ test.describe.serial("Remux E2E", () => {
       { timeout: 10000 },
     );
 
-    // Listen for the prompt dialog and accept with session name
-    page.on("dialog", (d) => d.accept("test-e2e-session"));
-
-    // Click "+" to create a new session
+    // Open the inline composer and create a session
     await page.locator("#btn-new-session").click();
+    await page.locator("#new-session-input").fill("test-e2e-session");
+    await page.locator("#btn-create-session").click();
 
     // Wait for the new session to appear in sidebar
     const newSession = page.locator(".session-item .name", {
@@ -319,6 +323,42 @@ test.describe.serial("Remux E2E", () => {
     }
   });
 
+  test("mobile chrome keeps control button visible and hides compose bar outside live", async ({
+    browser,
+  }) => {
+    const context = await browser.newContext({
+      hasTouch: true,
+      isMobile: true,
+      viewport: { width: 390, height: 664 },
+    });
+    const page = await context.newPage();
+
+    try {
+      await page.goto(BASE);
+      await expect(page.locator("#terminal canvas")).toBeVisible({
+        timeout: 10000,
+      });
+      await page.waitForFunction(
+        () =>
+          window._remuxTerm &&
+          document.querySelector("#status-dot")?.classList.contains("connected"),
+        { timeout: 10000 },
+      );
+
+      await expect(page.locator("#btn-role")).toBeVisible();
+      await expect(page.locator("#devices-section")).toHaveCount(0);
+      await expect(page.locator("#compose-bar")).toHaveClass(/visible/);
+
+      await page.locator("#btn-inspect").click();
+      await expect(page.locator("#inspect")).toHaveClass(/visible/, {
+        timeout: 5000,
+      });
+      await expect(page.locator("#compose-bar")).not.toHaveClass(/visible/);
+    } finally {
+      await context.close();
+    }
+  });
+
   test("IME composition ignores viewport shrink on touch devices", async ({
     browser,
   }) => {

package/tests/pty-daemon.test.js

@@ -7,6 +7,7 @@ import net from "net";
 import fs from "fs";
 import path from "path";
 import { fileURLToPath } from "url";
+import pty from "node-pty";
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const DAEMON_SCRIPT = path.join(__dirname, "..", "pty-daemon.js");
@@ -21,6 +22,24 @@ const TAG_SNAPSHOT_REQ = 0x06;
 const TAG_SNAPSHOT_RES = 0x07;
 const TAG_SHUTDOWN = 0xff;
 
+function supportsNodePty() {
+  try {
+    const proc = pty.spawn("/bin/sh", ["-lc", "exit 0"], {
+      name: "xterm-256color",
+      cols: 80,
+      rows: 24,
+      cwd: "/tmp",
+      env: process.env,
+    });
+    proc.kill();
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+const describePtyLifecycle = supportsNodePty() ? describe : describe.skip;
+
 function encodeFrame(tag, payload) {
   const data =
     typeof payload === "string" ? Buffer.from(payload, "utf8") : payload;
@@ -137,7 +156,7 @@ describe("TLV Frame Codec", () => {
   });
 });
 
-describe("PTY Daemon Lifecycle", () => {
+describePtyLifecycle("PTY Daemon Lifecycle", () => {
   let daemon;
   let socketPath;
 

package/tests/server.test.js

@@ -11,8 +11,9 @@ import WebSocket from "ws";
 import fs from "fs";
 import path from "path";
 import { homedir } from "os";
+import pty from "node-pty";
 
-const PORT = 19876; // test-only port
+const PORT = 19876 + Math.floor(Math.random() * 1000); // randomized test port
 const TOKEN = "test-token-" + Date.now();
 const INSTANCE_ID = "test-" + Date.now();
 const PERSIST_DIR = path.join(homedir(), ".remux");
@@ -20,6 +21,24 @@ const PERSIST_FILE = path.join(PERSIST_DIR, `sessions-${INSTANCE_ID}.json`);
 const DB_FILE = path.join(PERSIST_DIR, `remux-${INSTANCE_ID}.db`);
 let serverProc;
 
+function supportsNodePty() {
+  try {
+    const proc = pty.spawn("/bin/sh", ["-lc", "exit 0"], {
+      name: "xterm-256color",
+      cols: 80,
+      rows: 24,
+      cwd: "/tmp",
+      env: process.env,
+    });
+    proc.kill();
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+const PTY_SUPPORTED = supportsNodePty();
+
 function httpGet(urlPath) {
   return new Promise((resolve, reject) => {
     http.get(`http://localhost:${PORT}${urlPath}`, (res) => {
@@ -113,7 +132,7 @@ beforeAll(async () => {
   // Explicitly remove REMUX_PASSWORD to avoid env leaking from parent
   const cleanEnv = { ...process.env };
   delete cleanEnv.REMUX_PASSWORD;
-  serverProc = spawn("node", ["server.js"], {
+  serverProc = spawn(process.execPath, ["server.js"], {
     env: {
       ...cleanEnv,
       PORT: String(PORT),
@@ -185,6 +204,15 @@ describe("HTTP", () => {
     expect(res.body).toContain("<title>Remux</title>");
   });
 
+  it("serves reduced shell without workspace or device chrome", async () => {
+    const res = await httpGet(`/?token=${TOKEN}`);
+    expect(res.status).toBe(200);
+    expect(res.body).toContain("Inspect");
+    expect(res.body).not.toContain("Workspace");
+    expect(res.body).not.toContain("Devices");
+    expect(res.body).not.toContain("Enable Notifications");
+  });
+
   it("serves ghostty-web JS", async () => {
     const res = await httpGet("/dist/ghostty-web.js");
     expect(res.status).toBe(200);
@@ -513,16 +541,18 @@ describe("client connection state", () => {
     const ws2 = await connectAuthed();
 
     // ws1 attaches first (active)
-    await sendAndCollect(
+    const msgs1 = await sendAndCollect(
       ws1,
       { type: "attach_first", session: "main", cols: 80, rows: 24 },
       { timeout: 3000 },
     );
+    const att1 = msgs1.find((m) => m.type === "attached");
+    expect(att1).toBeDefined();
 
     // ws2 attaches to same tab (observer)
     const msgs2 = await sendAndCollect(
       ws2,
-      { type: "attach_first", session: "main", cols: 80, rows: 24 },
+      { type: "attach_tab", tabId: att1.tabId, cols: 80, rows: 24 },
       { timeout: 3000 },
     );
     const att2 = msgs2.find((m) => m.type === "attached");
@@ -552,11 +582,12 @@ describe("client connection state", () => {
     const att1 = msgs1.find((m) => m.type === "attached");
     expect(att1.role).toBe("active");
     const clientId1 = att1.clientId;
+    const tabId = att1.tabId;
 
     // ws2 attaches (observer)
     const msgs2 = await sendAndCollect(
       ws2,
-      { type: "attach_first", session: "main", cols: 80, rows: 24 },
+      { type: "attach_tab", tabId, cols: 80, rows: 24 },
       { timeout: 3000 },
     );
     const att2 = msgs2.find((m) => m.type === "attached");
@@ -617,11 +648,12 @@ describe("client connection state", () => {
     const att1 = msgs1.find((m) => m.type === "attached");
     expect(att1.role).toBe("active");
     const clientId1 = att1.clientId;
+    const tabId = att1.tabId;
 
     // ws2 attaches (observer)
     const msgs2 = await sendAndCollect(
       ws2,
-      { type: "attach_first", session: "main", cols: 80, rows: 24 },
+      { type: "attach_tab", tabId, cols: 80, rows: 24 },
       { timeout: 3000 },
     );
     const att2 = msgs2.find((m) => m.type === "attached");
@@ -669,16 +701,18 @@ describe("client connection state", () => {
     const ws2 = await connectAuthed();
 
     // ws1 attaches (active)
-    await sendAndCollect(
+    const msgs1 = await sendAndCollect(
       ws1,
       { type: "attach_first", session: "main", cols: 80, rows: 24 },
       { timeout: 3000 },
     );
+    const att1 = msgs1.find((m) => m.type === "attached");
+    expect(att1).toBeDefined();
 
     // ws2 attaches (observer)
     const msgs2 = await sendAndCollect(
       ws2,
-      { type: "attach_first", session: "main", cols: 80, rows: 24 },
+      { type: "attach_tab", tabId: att1.tabId, cols: 80, rows: 24 },
       { timeout: 3000 },
     );
     const att2 = msgs2.find((m) => m.type === "attached");
@@ -720,15 +754,15 @@ describe("multi-client", () => {
       { type: "attach_first", session: "main", cols: 100, rows: 30 },
       { timeout: 3000 },
     );
+    const att1 = msgs1.find((m) => m.type === "attached");
+    expect(att1).toBeDefined();
     const msgs2 = await sendAndCollect(
       ws2,
-      { type: "attach_first", session: "main", cols: 80, rows: 24 },
+      { type: "attach_tab", tabId: att1.tabId, cols: 80, rows: 24 },
       { timeout: 3000 },
     );
 
-    const att1 = msgs1.find((m) => m.type === "attached");
     const att2 = msgs2.find((m) => m.type === "attached");
-    expect(att1).toBeDefined();
     expect(att2).toBeDefined();
     expect(att1.tabId).toBe(att2.tabId);
 
@@ -840,7 +874,11 @@ describe("inspect", () => {
     const result = msgs.find((m) => m.type === "inspect_result");
     expect(result).toBeDefined();
     expect(typeof result.text).toBe("string");
-    expect(result.text).toContain("inspect-test-output");
+    if (PTY_SUPPORTED) {
+      expect(result.text).toContain("inspect-test-output");
+    } else {
+      expect(result.text).toContain("Shell unavailable on this machine");
+    }
     expect(result.meta).toBeDefined();
     expect(result.meta.session).toBe("main");
     expect(typeof result.meta.cols).toBe("number");

package/vitest.config.js

@@ -2,6 +2,7 @@ import { defineConfig } from "vitest/config";
 
 export default defineConfig({
   test: {
+    fileParallelism: false,
     testTimeout: 20000,
     hookTimeout: 40000,
     include: ["tests/**/*.test.{js,ts}"],