@jx0/jmux 0.3.4 → 0.3.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jx0/jmux",
-  "version": "0.3.4",
+  "version": "0.3.6",
   "description": "The terminal workspace for agentic development",
   "type": "module",
   "bin": {

package/src/main.ts

@@ -12,7 +12,7 @@ import { homedir } from "os";
 
 // --- CLI commands (run and exit before TUI) ---
 
-const VERSION = "0.3.4";
+const VERSION = "0.3.6";
 
 const HELP = `jmux — a persistent session sidebar for tmux
 
@@ -145,6 +145,7 @@ process.stdout.write("\x1b[?1049h");
 process.stdout.write("\x1b[?1000h"); // mouse button tracking
 process.stdout.write("\x1b[?1002h"); // mouse drag tracking
 process.stdout.write("\x1b[?1006h"); // SGR extended mouse mode
+process.stdout.write("\x1b[?2004h"); // bracketed paste mode
 if (process.stdin.setRawMode) {
   process.stdin.setRawMode(true);
 }
@@ -313,17 +314,51 @@ const inputRouter = new InputRouter(
 
 let writesPending = 0;
 
-// OSC 52 clipboard: \x1b]52;...;...\x07 or \x1b]52;...;...\x1b\\
-const OSC52_RE = /\x1b\]52;[^;]*;[^\x07\x1b]*(?:\x07|\x1b\\)/g;
+// OSC 52 clipboard passthrough — buffers across split chunks
+const OSC52_START = "\x1b]52;";
+let osc52Pending = "";
+
+function forwardOsc52(data: string): void {
+  let search = osc52Pending ? osc52Pending + data : data;
+  osc52Pending = "";
+
+  let pos = 0;
+  while (pos < search.length) {
+    const start = search.indexOf(OSC52_START, pos);
+    if (start < 0) break;
+
+    // Find terminator: BEL (\x07) or ST (\x1b\\)
+    let end = -1;
+    let endLen = 0;
+    for (let i = start + OSC52_START.length; i < search.length; i++) {
+      if (search[i] === "\x07") {
+        end = i;
+        endLen = 1;
+        break;
+      }
+      if (search[i] === "\x1b" && i + 1 < search.length && search[i + 1] === "\\") {
+        end = i;
+        endLen = 2;
+        break;
+      }
+    }
 
-pty.onData((data: string) => {
-  // Pass OSC 52 clipboard sequences directly to the outer terminal
-  const osc52Matches = data.match(OSC52_RE);
-  if (osc52Matches) {
-    for (const seq of osc52Matches) {
-      process.stdout.write(seq);
+    if (end >= 0) {
+      process.stdout.write(search.slice(start, end + endLen));
+      pos = end + endLen;
+    } else {
+      // Incomplete — buffer for next chunk (cap at 512KB to avoid leaks)
+      const remainder = search.slice(start);
+      if (remainder.length < 512 * 1024) {
+        osc52Pending = remainder;
+      }
+      return;
     }
   }
+}
+
+pty.onData((data: string) => {
+  forwardOsc52(data);
 
   writesPending++;
   bridge.write(data).then(() => {
@@ -466,6 +501,7 @@ async function start(): Promise<void> {
 
 function cleanup(): void {
   control.close().catch(() => {});
+  process.stdout.write("\x1b[?2004l"); // disable bracketed paste mode
   process.stdout.write("\x1b[?1000l"); // disable mouse button tracking
   process.stdout.write("\x1b[?1002l"); // disable mouse drag tracking
   process.stdout.write("\x1b[?1006l"); // disable SGR mouse mode

package/src/renderer.ts

@@ -67,7 +67,8 @@ export function compositeGrids(
     grid.cells[y][borderCol] = {
       ...DEFAULT_CELL,
       char: BORDER_CHAR,
-      dim: true,
+      fg: 8,
+      fgMode: ColorMode.Palette,
     };
     // Copy main cells
     for (let x = 0; x < main.cols; x++) {

package/src/sidebar.ts

@@ -9,10 +9,14 @@ const ACCENT_ATTRS: CellAttrs = {
   fg: 2,
   fgMode: ColorMode.Palette,
 };
+// #1e2a35 as packed RGB for subtle active row background
+const ACTIVE_BG = (0x1e << 16) | (0x2a << 8) | 0x35;
 const ACTIVE_MARKER_ATTRS: CellAttrs = {
   fg: 2,
   fgMode: ColorMode.Palette,
   bold: true,
+  bg: ACTIVE_BG,
+  bgMode: ColorMode.RGB,
 };
 const ACTIVITY_ATTRS: CellAttrs = {
   fg: 2,
@@ -24,9 +28,16 @@ const ATTENTION_ATTRS: CellAttrs = {
   bold: true,
 };
 const ACTIVE_NAME_ATTRS: CellAttrs = {
-  fg: 15,
+  fg: 2,
   fgMode: ColorMode.Palette,
   bold: true,
+  bg: ACTIVE_BG,
+  bgMode: ColorMode.RGB,
+};
+const ACTIVE_DETAIL_ATTRS: CellAttrs = {
+  dim: true,
+  bg: ACTIVE_BG,
+  bgMode: ColorMode.RGB,
 };
 const INACTIVE_NAME_ATTRS: CellAttrs = {
   fg: 7,
@@ -314,6 +325,14 @@ export class Sidebar {
       this.rowToSessionIndex.set(detailRow, sessionIdx);
     }
 
+    // Paint active background across both rows
+    if (isActive) {
+      const bgFill = " ".repeat(this.width);
+      const bgAttrs: CellAttrs = { bg: ACTIVE_BG, bgMode: ColorMode.RGB };
+      writeString(grid, nameRow, 0, bgFill, bgAttrs);
+      writeString(grid, detailRow, 0, bgFill, bgAttrs);
+    }
+
     // Active marker
     if (isActive) {
       writeString(grid, nameRow, 0, "\u258e", ACTIVE_MARKER_ATTRS);
@@ -342,11 +361,15 @@ export class Sidebar {
       : { ...INACTIVE_NAME_ATTRS };
     writeString(grid, nameRow, nameStart, displayName, nameAttrs);
 
+    const wcAttrs: CellAttrs = isActive
+      ? { ...DIM_ATTRS, bg: ACTIVE_BG, bgMode: ColorMode.RGB }
+      : DIM_ATTRS;
     if (windowCountCol > nameStart) {
-      writeString(grid, nameRow, windowCountCol, windowCountStr, DIM_ATTRS);
+      writeString(grid, nameRow, windowCountCol, windowCountStr, wcAttrs);
     }
 
     // Detail line
+    const detailAttrs: CellAttrs = isActive ? ACTIVE_DETAIL_ATTRS : DIM_ATTRS;
     if (item.grouped) {
       if (session.gitBranch) {
         const detailStart = 3;
@@ -355,7 +378,7 @@ export class Sidebar {
         if (branch.length > maxLen) {
           branch = branch.slice(0, maxLen - 1) + "\u2026";
         }
-        writeString(grid, detailRow, detailStart, branch, DIM_ATTRS);
+        writeString(grid, detailRow, detailStart, branch, detailAttrs);
       }
     } else {
       const detailStart = 3;
@@ -363,7 +386,7 @@ export class Sidebar {
       if (session.gitBranch) {
         const branchCol = this.width - session.gitBranch.length - 1;
         if (branchCol > detailStart + 1) {
-          writeString(grid, detailRow, branchCol, session.gitBranch, DIM_ATTRS);
+          writeString(grid, detailRow, branchCol, session.gitBranch, detailAttrs);
           branchCols = session.gitBranch.length + 2;
         }
       }
@@ -373,7 +396,7 @@ export class Sidebar {
         if (displayDir.length > dirMaxLen) {
           displayDir = displayDir.slice(0, dirMaxLen - 1) + "\u2026";
         }
-        writeString(grid, detailRow, detailStart, displayDir, DIM_ATTRS);
+        writeString(grid, detailRow, detailStart, displayDir, detailAttrs);
       }
     }
   }