@vinh0809it/claude-sessions 0.3.0 → 0.3.2

package/README.md

@@ -89,7 +89,7 @@ Sessions are grouped by profile in the UI. Press `m` to move a session to a diff
 |----------|---------|-------|
 | **Kitty** | ✅ new tab | Requires `allow_remote_control yes` in `kitty.conf` |
 | **WezTerm** | ✅ new tab | Uses `wezterm cli spawn` |
-| **tmux** | ✅ new window | In the current session |
+| **tmux** | ✅ new window | In the current session, also when tmux runs inside kitty or WezTerm |
 | **iTerm2** | ✅ new tab | Via `osascript` |
 | **Terminal.app** | ✅ new window | Via `osascript` |
 | **Windows Terminal** | ✅ new tab | Via `wt new-tab` (native Windows; in WSL it resumes in place) |

package/index.js

@@ -457,9 +457,11 @@ function tabComplete(input) {
 
 function detectTerminal(env = process.env, platform = process.platform) {
   if (env.CLAUDE_SESSIONS_TERMINAL) return env.CLAUDE_SESSIONS_TERMINAL;
+  // tmux first: it is always the innermost layer, and a tmux started from kitty or
+  // WezTerm inherits their variables even though their tab commands can't reach it.
+  if (env.TMUX)                          return 'tmux';
   if (env.KITTY_WINDOW_ID !== undefined) return 'kitty';
   if (env.WEZTERM_PANE    !== undefined) return 'wezterm';
-  if (env.TMUX)                          return 'tmux';
   if (env.TERM_PROGRAM === 'iTerm.app')      return 'iterm2';
   if (env.TERM_PROGRAM === 'Apple_Terminal') return 'apple-terminal';
   // WSL also sees WT_SESSION, but there `wt` would open a Windows shell, not Linux.
@@ -471,8 +473,10 @@ function shellEsc(s) { return "'" + String(s).replace(/'/g, "'\\''") + "'"; }
 function appleStr(s) { return '"' + String(s).replace(/\\/g, '\\\\').replace(/"/g, '\\"') + '"'; }
 
 function trySpawn(cmd, args) {
-  const r = spawnSync(cmd, args, { stdio: ['ignore', 'ignore', 'pipe'] });
-  if (r.error) return { ok: false, msg: `${cmd}: ${r.error.code === 'ENOENT' ? 'not found' : r.error.message}` };
+  // Tab commands return at once; the timeout keeps a stuck one (e.g. `kitty @`
+  // waiting for a reply that never comes) from freezing the UI.
+  const r = spawnSync(cmd, args, { stdio: ['ignore', 'ignore', 'pipe'], timeout: 5000 });
+  if (r.error) return { ok: false, msg: `${cmd}: ${r.error.code === 'ENOENT' ? 'not found' : r.error.code === 'ETIMEDOUT' ? 'timed out' : r.error.message}` };
   return r.status === 0
     ? { ok: true }
     : { ok: false, msg: r.stderr?.toString().trim() || `${cmd} exited with ${r.status}` };
@@ -872,23 +876,6 @@ class Picker {
   }
 }
 
-// Word-wraps text to `width` columns; words longer than a line are split.
-function wrapWords(text, width) {
-  const lines = [];
-  let cur = '';
-  for (let word of text.split(' ')) {
-    while (word.length > width) {
-      if (cur) { lines.push(cur); cur = ''; }
-      lines.push(word.slice(0, width)); word = word.slice(width);
-    }
-    if (!cur) cur = word;
-    else if (cur.length + 1 + word.length <= width) cur += ' ' + word;
-    else { lines.push(cur); cur = word; }
-  }
-  if (cur || !lines.length) lines.push(cur);
-  return lines;
-}
-
 // A stdin chunk may hold several keys (fast typing, paste): split into single
 // chars, keeping escape sequences like "\x1b[A" or "\x1b[5~" whole.
 function splitKeys(chunk) {
@@ -1123,16 +1110,14 @@ class TUI {
     const key = s.jsonlPath + ':' + s.lastModified.valueOf();
     let msgs = this._previewCache.get(key);
     if (!msgs) { msgs = readRecentMessages(s.jsonlPath); this._previewCache.set(key, msgs); }
-    const lines = [];
-    for (const m of msgs) {
-      const tag = m.role === 'user' ? fgc('92', 'you ') : fgc('96', 'cc  ');
-      const width = Math.max(10, W - 8);
-      const chunks = wrapWords(m.text, width);
-      chunks.slice(0, 3).forEach((c, i) => lines.push(`  ${i === 0 ? tag : '    '} ${i === 2 && chunks.length > 3 ? trunc(c, width - 1) + '…' : c}`));
-    }
-    if (!lines.length) lines.push(dim('  (no messages)'));
+    // One line per message with a blank line between, newest at the bottom.
+    const width = Math.max(10, W - 8);
+    const lines = msgs.flatMap(m => ['',
+      `  ${m.role === 'user' ? fgc('92', 'you ') : fgc('96', 'cc  ')} ${trunc(m.text.replace(/\s+/g, ' ').trim(), width)}`]);
+    const body = lines.slice(-(H - 2));
+    if (body[0] === '') body.shift();
     const head = dim(`  ${fmtDate(s.lastModified)} · ${fmtSize(s.size)} · ${s.sessionId}`);
-    return [head, ...lines.slice(-(H - 1))];
+    return [head, '', ...(body.length ? body : [dim('  (no messages)')])];
   }
 
   // ── Render ──────────────────────────────────────────────────────────────────
@@ -1425,6 +1410,6 @@ if (require.main === module) {
   module.exports = {
     encodePathToDir, projectDirNameFor, tabComplete, resolveProjectPath, moveSession, readSession,
     readRecentMessages, renameSession, deleteSessionFiles, emptyTrash, scanConfigDir, sortSessions,
-    detectTerminal, wtArgs, parseArgs, fmtAgo, fmtSize, splitKeys, wrapWords, cache, LineInput,
+    detectTerminal, wtArgs, parseArgs, fmtAgo, fmtSize, splitKeys, cache, LineInput,
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vinh0809it/claude-sessions",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "Fast terminal UI for browsing, previewing, resuming, renaming, moving, and deleting Claude Code sessions",
   "bin": {
     "claude-sessions": "index.js"