@jx0/jmux 0.4.0 → 0.5.1

package/README.md

@@ -125,6 +125,7 @@ When Claude Code finishes a response, the orange `!` appears on that session in
 |-----|--------|
 | `Ctrl-a k` | Clear pane + scrollback |
 | `Ctrl-a y` | Copy pane to clipboard |
+| `Ctrl-a i` | Settings |
 
 ---
 

package/config/defaults.conf

@@ -63,6 +63,9 @@ bind y run-shell "tmux capture-pane -pS - -E - | grep . | pbcopy" \; display-mes
 # Move window to another session (C-a m)
 bind-key m display-popup -E -w 40% -h 50% -b heavy -S 'fg=#4f565d' "$JMUX_DIR/config/move-window.sh"
 
+# Settings modal (C-a i)
+bind-key i display-popup -E -w 50% -h 40% -b heavy -S 'fg=#4f565d' "$JMUX_DIR/config/settings.sh"
+
 # Rename session (C-a r)
 bind-key r display-popup -E -w 40% -h 8 -b heavy -S 'fg=#4f565d' "$JMUX_DIR/config/rename-session.sh"
 

package/config/new-session.sh

@@ -6,14 +6,24 @@ FZF_COLORS="border:#4f565d,header:#b5bcc9,prompt:#9fe8c3,label:#9fe8c3,pointer:#
 
 # ─── Step 1: Pick a directory ─────────────────────────────────────────
 
+# Read project directories from config, fall back to defaults
+CONFIG_FILE="$HOME/.config/jmux/config.json"
+SEARCH_DIRS=""
+if [ -f "$CONFIG_FILE" ]; then
+    SEARCH_DIRS=$(bun -e "
+        const c = await Bun.file('$CONFIG_FILE').json().catch(() => ({}));
+        const dirs = c.projectDirs ?? [];
+        console.log(dirs.map(d => d.replace('~', process.env.HOME)).join('\n'));
+    " 2>/dev/null)
+fi
+if [ -z "$SEARCH_DIRS" ]; then
+    SEARCH_DIRS=$(printf "%s\n%s\n%s\n%s\n%s" \
+        "$HOME/Code" "$HOME/Projects" "$HOME/src" "$HOME/work" "$HOME/dev")
+fi
+
 # Build project list: find directories with .git (dir or file — worktrees use a file)
 # Search common code directories, limit depth for speed
-PROJECT_DIRS=$(find \
-    "$HOME/Code" \
-    "$HOME/Projects" \
-    "$HOME/src" \
-    "$HOME/work" \
-    "$HOME/dev" \
+PROJECT_DIRS=$(echo "$SEARCH_DIRS" | xargs -I{} find "{}" \
     -maxdepth 4 -name ".git" 2>/dev/null \
     | sed 's|/\.git$||' \
     | sort -u)
@@ -44,7 +54,11 @@ WORK_DIR="${SELECTED_DIR/#\~/$HOME}"
 
 # Check if this is a bare repo (wtm-managed) and wtm is available
 IS_BARE=false
-if command -v wtm &>/dev/null && [ -f "$WORK_DIR/.git/config" ]; then
+WTM_ENABLED=$(bun -e "
+    const c = await Bun.file('$CONFIG_FILE').json().catch(() => ({}));
+    console.log(c.wtmIntegration ?? true);
+" 2>/dev/null || echo "true")
+if [ "$WTM_ENABLED" = "true" ] && command -v wtm &>/dev/null && [ -f "$WORK_DIR/.git/config" ]; then
     if git --git-dir="$WORK_DIR/.git" config --get core.bare 2>/dev/null | grep -q "true"; then
         IS_BARE=true
     fi

package/config/release-notes.sh

@@ -0,0 +1,48 @@
+#!/bin/bash
+# Show release notes for a jmux version in a formatted popup
+# Usage: release-notes.sh <tag>
+
+TAG="${1:-v0.0.0}"
+REPO="jarredkenny/jmux"
+
+# Colors
+BOLD="\033[1m"
+DIM="\033[2m"
+GREEN="\033[32m"
+YELLOW="\033[33m"
+CYAN="\033[36m"
+RESET="\033[0m"
+
+# Fetch release data
+BODY=$(gh release view "$TAG" --repo "$REPO" --json body,publishedAt,name -q '"\(.name)\n\(.publishedAt)\n\(.body)"' 2>/dev/null)
+
+if [ -z "$BODY" ]; then
+    echo -e "\n  ${DIM}jmux ${TAG}${RESET}\n"
+    echo -e "  ${DIM}No release notes available.${RESET}\n"
+    echo -e "  ${DIM}Press q to close${RESET}"
+    read -rsn1
+    exit 0
+fi
+
+NAME=$(echo "$BODY" | head -1)
+DATE=$(echo "$BODY" | sed -n '2p' | cut -dT -f1)
+NOTES=$(echo "$BODY" | tail -n +3)
+
+{
+    echo ""
+    echo -e "  ${BOLD}${GREEN}jmux ${NAME}${RESET}"
+    echo -e "  ${DIM}Released ${DATE}${RESET}"
+    echo ""
+    # Format markdown: bold **text**, headers ##, bullet points
+    echo "$NOTES" | sed \
+        -e "s/^## \(.*\)/  $(printf '\033[1m')\1$(printf '\033[0m')/" \
+        -e "s/^- /  • /" \
+        -e "s/\*\*\([^*]*\)\*\*/$(printf '\033[1m')\1$(printf '\033[0m')/g" \
+        -e "s/\`\([^\`]*\)\`/$(printf '\033[36m')\1$(printf '\033[0m')/g" \
+        -e '/^$/s/^$//'
+    echo ""
+    echo -e "  ${DIM}https://github.com/${REPO}/releases/tag/${TAG}${RESET}"
+    echo ""
+    echo -e "  ${DIM}Press q to close${RESET}"
+}
+read -rsn1

package/config/settings.sh

@@ -0,0 +1,139 @@
+#!/bin/bash
+# jmux settings modal — reads/writes ~/.config/jmux/config.json
+# Called via: display-popup -E "settings.sh"
+
+CONFIG_DIR="$HOME/.config/jmux"
+CONFIG_FILE="$CONFIG_DIR/config.json"
+FZF_COLORS="border:#4f565d,header:#b5bcc9,prompt:#9fe8c3,label:#9fe8c3,pointer:#9fe8c3,fg:#6b7280,fg+:#b5bcc9,hl:#fbd4b8,hl+:#fbd4b8"
+
+# ─── Helpers ──────────────────────────────────────────────────────────
+
+read_config() {
+    bun -e "
+        const c = await Bun.file('$CONFIG_FILE').json().catch(() => ({}));
+        console.log(JSON.stringify(c));
+    " 2>/dev/null || echo "{}"
+}
+
+write_config() {
+    local json="$1"
+    mkdir -p "$CONFIG_DIR"
+    echo "$json" | bun -e "
+        const stdin = await Bun.stdin.text();
+        const c = JSON.parse(stdin);
+        await Bun.write('$CONFIG_FILE', JSON.stringify(c, null, 2) + '\n');
+    "
+}
+
+get_value() {
+    local json="$1" key="$2" default="$3"
+    echo "$json" | bun -e "
+        const stdin = await Bun.stdin.text();
+        const c = JSON.parse(stdin);
+        console.log(c['$key'] ?? '$default');
+    " 2>/dev/null || echo "$default"
+}
+
+set_value() {
+    local json="$1" key="$2" value="$3" type="$4"
+    echo "$json" | bun -e "
+        const stdin = await Bun.stdin.text();
+        const c = JSON.parse(stdin);
+        const v = '$value';
+        const t = '$type';
+        if (t === 'number') c['$key'] = parseInt(v, 10);
+        else if (t === 'bool') c['$key'] = v === 'true';
+        else if (t === 'array') c['$key'] = v.split(',').map(s => s.trim()).filter(Boolean);
+        else c['$key'] = v;
+        console.log(JSON.stringify(c));
+    " 2>/dev/null
+}
+
+# ─── Main loop ────────────────────────────────────────────────────────
+
+while true; do
+    CONFIG=$(read_config)
+
+    SIDEBAR_WIDTH=$(get_value "$CONFIG" "sidebarWidth" "26")
+    PROJECT_DIRS_RAW=$(echo "$CONFIG" | bun -e "
+        const c = JSON.parse(await Bun.stdin.text());
+        const dirs = c.projectDirs ?? ['~/Code', '~/Projects', '~/src', '~/work', '~/dev'];
+        console.log(dirs.join(', '));
+    " 2>/dev/null || echo "~/Code, ~/Projects, ~/src, ~/work, ~/dev")
+    WTM_ENABLED=$(get_value "$CONFIG" "wtmIntegration" "true")
+
+    # Format display
+    WTM_DISPLAY="on"
+    [ "$WTM_ENABLED" = "false" ] && WTM_DISPLAY="off"
+
+    SELECTION=$(printf "%s\n%s\n%s" \
+        "Sidebar Width            $SIDEBAR_WIDTH" \
+        "Project Directories      $PROJECT_DIRS_RAW" \
+        "wtm Integration          $WTM_DISPLAY" \
+        | fzf \
+            --height=100% \
+            --layout=reverse \
+            --border=rounded \
+            --border-label=" Settings " \
+            --header="Select a setting to change" \
+            --header-first \
+            --prompt="  " \
+            --pointer="▸" \
+            --no-info \
+            --color="$FZF_COLORS")
+
+    [ -z "$SELECTION" ] && exit 0
+
+    case "$SELECTION" in
+        "Sidebar Width"*)
+            NEW_WIDTH=$(echo "" | fzf --print-query \
+                --height=100% \
+                --layout=reverse \
+                --border=rounded \
+                --border-label=" Sidebar Width " \
+                --header="Current: $SIDEBAR_WIDTH (takes effect on restart)" \
+                --header-first \
+                --prompt="Width: " \
+                --query="$SIDEBAR_WIDTH" \
+                --pointer="" \
+                --no-info \
+                --color="$FZF_COLORS" \
+                | head -1)
+
+            if [ -n "$NEW_WIDTH" ]; then
+                CONFIG=$(set_value "$CONFIG" "sidebarWidth" "$NEW_WIDTH" "number")
+                write_config "$CONFIG"
+            fi
+            ;;
+
+        "Project Directories"*)
+            NEW_DIRS=$(echo "" | fzf --print-query \
+                --height=100% \
+                --layout=reverse \
+                --border=rounded \
+                --border-label=" Project Directories " \
+                --header="Comma-separated list of directories to search" \
+                --header-first \
+                --prompt="Dirs: " \
+                --query="$PROJECT_DIRS_RAW" \
+                --pointer="" \
+                --no-info \
+                --color="$FZF_COLORS" \
+                | head -1)
+
+            if [ -n "$NEW_DIRS" ]; then
+                CONFIG=$(set_value "$CONFIG" "projectDirs" "$NEW_DIRS" "array")
+                write_config "$CONFIG"
+            fi
+            ;;
+
+        "wtm Integration"*)
+            if [ "$WTM_ENABLED" = "true" ]; then
+                CONFIG=$(set_value "$CONFIG" "wtmIntegration" "false" "bool")
+            else
+                CONFIG=$(set_value "$CONFIG" "wtmIntegration" "true" "bool")
+            fi
+            write_config "$CONFIG"
+            ;;
+    esac
+done

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jx0/jmux",
-  "version": "0.4.0",
+  "version": "0.5.1",
   "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.4.0";
+const VERSION = "0.5.1";
 
 const HELP = `jmux — a persistent session sidebar for tmux
 
@@ -48,6 +48,12 @@ if (process.argv.includes("-v") || process.argv.includes("--version")) {
   process.exit(0);
 }
 
+if (process.env.JMUX) {
+  console.error("Already running inside jmux.");
+  process.exit(1);
+}
+process.env.JMUX = "1";
+
 if (process.argv.includes("--install-agent-hooks")) {
   installAgentHooks();
   process.exit(0);
@@ -108,9 +114,22 @@ function installAgentHooks(): void {
 
 // --- TUI startup ---
 
-const SIDEBAR_WIDTH = 26;
+// Read sidebar width from user config, fall back to default
+function loadUserConfig(): Record<string, any> {
+  const configPath = resolve(homedir(), ".config", "jmux", "config.json");
+  try {
+    if (existsSync(configPath)) {
+      return JSON.parse(readFileSync(configPath, "utf-8"));
+    }
+  } catch {
+    // Invalid config — use defaults
+  }
+  return {};
+}
+const userConfig = loadUserConfig();
+let sidebarWidth = (userConfig.sidebarWidth as number) || 26;
 const BORDER_WIDTH = 1;
-const SIDEBAR_TOTAL = SIDEBAR_WIDTH + BORDER_WIDTH;
+function sidebarTotal(): number { return sidebarWidth + BORDER_WIDTH; }
 
 // Resolve paths relative to source
 const jmuxDir = resolve(dirname(import.meta.dir));
@@ -138,7 +157,7 @@ for (let i = 2; i < process.argv.length; i++) {
 const cols = process.stdout.columns || 80;
 const rows = process.stdout.rows || 24;
 const sidebarVisible = cols >= 80;
-const mainCols = sidebarVisible ? cols - SIDEBAR_TOTAL : cols;
+const mainCols = sidebarVisible ? cols - sidebarTotal() : cols;
 
 // Enter alternate screen, raw mode, enable mouse tracking
 process.stdout.write("\x1b[?1049h");
@@ -155,13 +174,15 @@ process.stdin.resume();
 const pty = new TmuxPty({ sessionName, socketName, configFile, jmuxDir, cols: mainCols, rows });
 const bridge = new ScreenBridge(mainCols, rows);
 const renderer = new Renderer();
-const sidebar = new Sidebar(SIDEBAR_WIDTH, rows);
+const sidebar = new Sidebar(sidebarWidth, rows);
 const control = new TmuxControl();
 
 let currentSessionId: string | null = null;
 let ptyClientName: string | null = null;
 let sidebarShown = sidebarVisible;
 let currentSessions: SessionInfo[] = [];
+
+sidebar.setVersion(VERSION);
 const lastViewedTimestamps = new Map<string, number>();
 const sessionDetailsCache = new Map<string, { directory?: string; gitBranch?: string; project?: string }>();
 
@@ -303,12 +324,16 @@ function clearSessionIndicators(): void {
 
 const inputRouter = new InputRouter(
   {
-    sidebarCols: SIDEBAR_WIDTH,
+    sidebarCols: sidebarWidth,
     onPtyData: (data) => {
       pty.write(data);
       clearSessionIndicators();
     },
     onSidebarClick: (row) => {
+      if (sidebar.isVersionRow(row)) {
+        showVersionInfo();
+        return;
+      }
       const session = sidebar.getSessionByRow(row);
       if (session) switchSession(session.id);
     },
@@ -393,15 +418,76 @@ process.on("SIGWINCH", () => {
   const newCols = process.stdout.columns || 80;
   const newRows = process.stdout.rows || 24;
   const newSidebarVisible = newCols >= 80;
-  const newMainCols = newSidebarVisible ? newCols - SIDEBAR_TOTAL : newCols;
+  const newMainCols = newSidebarVisible ? newCols - sidebarTotal() : newCols;
 
   sidebarShown = newSidebarVisible;
   inputRouter.setSidebarVisible(newSidebarVisible);
   pty.resize(newMainCols, newRows);
   bridge.resize(newMainCols, newRows);
-  sidebar.resize(SIDEBAR_WIDTH, newRows);
+  sidebar.resize(sidebarWidth, newRows);
 });
 
+// --- Config file watcher ---
+
+const configPath = resolve(homedir(), ".config", "jmux", "config.json");
+try {
+  const { watch } = await import("fs");
+  watch(configPath, () => {
+    const updated = loadUserConfig();
+    const newWidth = (updated.sidebarWidth as number) || 26;
+    if (newWidth !== sidebarWidth) {
+      sidebarWidth = newWidth;
+      const cols = process.stdout.columns || 80;
+      const rows = process.stdout.rows || 24;
+      const newSidebarVisible = cols >= 80;
+      const newMainCols = newSidebarVisible ? cols - sidebarTotal() : cols;
+
+      sidebarShown = newSidebarVisible;
+      inputRouter.setSidebarVisible(newSidebarVisible);
+      pty.resize(newMainCols, rows);
+      bridge.resize(newMainCols, rows);
+      sidebar.resize(sidebarWidth, rows);
+    }
+  });
+} catch {
+  // Config file may not exist yet — watcher will fail silently
+}
+
+// --- Update check ---
+
+async function checkForUpdates(): Promise<void> {
+  try {
+    const resp = await fetch(
+      "https://api.github.com/repos/jarredkenny/jmux/releases/latest",
+      { headers: { "Accept": "application/vnd.github.v3+json" } },
+    );
+    if (!resp.ok) return;
+    const data = await resp.json() as { tag_name?: string };
+    const latest = data.tag_name?.replace(/^v/, "");
+    if (latest && latest !== VERSION) {
+      sidebar.setVersion(VERSION, latest);
+      scheduleRender();
+    }
+  } catch {
+    // Offline or rate-limited — no problem
+  }
+}
+
+async function showVersionInfo(): Promise<void> {
+  if (!ptyClientName) await resolveClientName();
+  if (!ptyClientName) return;
+  const tag = `v${VERSION}`;
+  const cmd = `${jmuxDir}/config/release-notes.sh ${tag}`;
+  // Use tmux CLI directly — confirmed working from terminal tests
+  const args = ["tmux"];
+  if (socketName) args.push("-L", socketName);
+  args.push("display-popup", "-c", ptyClientName, "-E", "-w", "70%", "-h", "40%", "-b", "heavy", "-S", "fg=#4f565d", "sh", "-c", cmd);
+  Bun.spawn(args, { stdout: "ignore", stderr: "ignore" });
+}
+
+// Check for updates in the background (non-blocking)
+checkForUpdates();
+
 // --- Control mode events ---
 
 control.onEvent((event: ControlEvent) => {

package/src/sidebar.ts

@@ -161,6 +161,11 @@ function itemHeight(item: RenderItem): number {
 
 // --- Sidebar class ---
 
+const UPDATE_AVAILABLE_ATTRS: CellAttrs = {
+  fg: 3,
+  fgMode: ColorMode.Palette,
+};
+
 export class Sidebar {
   private width: number;
   private height: number;
@@ -171,6 +176,8 @@ export class Sidebar {
   private rowToSessionIndex = new Map<number, number>();
   private activitySet = new Set<string>();
   private scrollOffset = 0;
+  private currentVersion: string = "";
+  private latestVersion: string | null = null;
 
   constructor(width: number, height: number) {
     this.width = width;
@@ -212,6 +219,19 @@ export class Sidebar {
       .filter(Boolean) as string[];
   }
 
+  setVersion(current: string, latest?: string): void {
+    this.currentVersion = current;
+    this.latestVersion = latest ?? null;
+  }
+
+  hasUpdate(): boolean {
+    return this.latestVersion !== null && this.latestVersion !== this.currentVersion;
+  }
+
+  isVersionRow(row: number): boolean {
+    return this.currentVersion !== "" && row === this.height - 1;
+  }
+
   getSessionByRow(row: number): SessionInfo | null {
     const sessionIdx = this.rowToSessionIndex.get(row);
     if (sessionIdx === undefined) return null;
@@ -231,7 +251,7 @@ export class Sidebar {
 
   scrollToActive(): void {
     if (!this.activeSessionId) return;
-    const viewportHeight = this.height - HEADER_ROWS;
+    const viewportHeight = this.viewportHeight();
     let vRow = 0;
     for (const item of this.items) {
       const h = itemHeight(item);
@@ -251,10 +271,17 @@ export class Sidebar {
     }
   }
 
+  private footerRows(): number {
+    return this.currentVersion ? 1 : 0;
+  }
+
+  private viewportHeight(): number {
+    return this.height - HEADER_ROWS - this.footerRows();
+  }
+
   private clampScroll(): void {
     const totalRows = this.items.reduce((sum, item) => sum + itemHeight(item), 0);
-    const viewportHeight = this.height - HEADER_ROWS;
-    const maxOffset = Math.max(0, totalRows - viewportHeight);
+    const maxOffset = Math.max(0, totalRows - this.viewportHeight());
     this.scrollOffset = Math.max(0, Math.min(maxOffset, this.scrollOffset));
   }
 
@@ -266,7 +293,8 @@ export class Sidebar {
     writeString(grid, 0, 1, "jmux", { ...ACCENT_ATTRS, bold: true });
     writeString(grid, 1, 0, "\u2500".repeat(this.width), DIM_ATTRS);
 
-    const viewportHeight = this.height - HEADER_ROWS;
+    const vpHeight = this.viewportHeight();
+    const contentBottom = HEADER_ROWS + vpHeight;
     let vRow = 0;
     let totalRows = 0;
 
@@ -281,7 +309,7 @@ export class Sidebar {
         continue;
       }
       // Track total rows even after viewport
-      if (screenRow >= this.height) {
+      if (screenRow >= contentBottom) {
         vRow += h;
         totalRows += h;
         continue;
@@ -307,8 +335,23 @@ export class Sidebar {
     if (this.scrollOffset > 0) {
       writeString(grid, HEADER_ROWS, this.width - 1, "\u25b2", DIM_ATTRS);
     }
-    if (this.scrollOffset + viewportHeight < totalRows) {
-      writeString(grid, this.height - 1, this.width - 1, "\u25bc", DIM_ATTRS);
+    if (this.scrollOffset + vpHeight < totalRows) {
+      const scrollRow = this.footerRows() ? contentBottom - 1 : this.height - 1;
+      writeString(grid, scrollRow, this.width - 1, "\u25bc", DIM_ATTRS);
+    }
+
+    // Version footer
+    if (this.currentVersion) {
+      const footerRow = this.height - 1;
+      const versionText = `v${this.currentVersion}`;
+      if (this.hasUpdate()) {
+        const updateText = `v${this.latestVersion} avail`;
+        const maxLen = this.width - 2;
+        const display = updateText.length <= maxLen ? updateText : `v${this.latestVersion}`;
+        writeString(grid, footerRow, 1, display, UPDATE_AVAILABLE_ATTRS);
+      } else {
+        writeString(grid, footerRow, 1, versionText, DIM_ATTRS);
+      }
     }
 
     return grid;