claude-starter 1.2.0 → 1.3.0

package/README.md

@@ -59,36 +59,25 @@ claude-starter
 - `auth` → 所有认证相关的对话
 - `refactor` → 上周的代码重构
 - `web-app fix` → 某个项目的 bug 修复
-- `#bug-fix` → 所有打了 bug-fix 标签的对话
-- `fav` → 所有收藏的对话
 
 **不需要管理模式，不需要确认。输入即搜，方向键即走。**
 
-## ⭐ 收藏 & 🏷️ 标签 — 组织你的对话
-
-按 `f` 收藏/取消收藏，按 `#` 打标签。
-
-- **收藏**：重要的对话一键标星，排序切到 `favorites` 模式收藏置顶
-- **标签**：预设 8 种标签（`bug-fix`、`feature`、`refactor` 等），支持自定义
-- **搜索联动**：`/` 搜索支持 `#tag` 语法和 `fav` 关键字
-- **持久化**：数据存在 `~/.claude/claude-starter-meta.json`，重启不丢失
-
 ## 核心能力
 
 | | 功能 | 说明 |
 |---|---|---|
 | 🎨 | **精美 TUI** | Tokyo Night 配色，分屏布局，终端里的 App |
 | ✨ | **一键新建** | 列表顶部直接新建对话 |
-| 🔍 | **即时搜索** | `/` 全文搜索，无需回车，支持 `#tag` 和 `fav` |
-| ⭐ | **收藏** | `f` 收藏重要对话，排序置顶 |
-| 🏷️ | **标签** | `#` 分类管理，预设 + 自定义标签 |
+| 🔍 | **即时搜索** | `/` 全文搜索，无需回车 |
 | 📂 | **项目过滤** | `p` 按项目筛选 |
 | ⚡ | **秒级恢复** | 选中 → Enter → 回到对话 |
 | 📋 | **对话预览** | 右侧面板展示完整元数据和对话历史 |
-| 🔀 | **多种排序** | 时间 / 大小 / 消息数 / 项目 / 收藏 |
+| 🔀 | **多种排序** | 时间 / 大小 / 消息数 / 项目 |
 | 📎 | **复制 ID** | `c` 一键复制到剪贴板 |
+| 🔒 | **权限模式** | `m` 设置权限模式，`d` 一键 danger 模式恢复 |
+| 🗑️ | **删除会话** | `x` 删除不需要的会话 |
 | 🧠 | **智能 CLI** | 自动检测 `mai-claude` / `claude` |
-| 🔒 | **完全本地** | 不联网，不上传，不追踪 |
+| 🔐 | **完全本地** | 不联网，不上传，不追踪 |
 
 ## 安装
 
@@ -107,6 +96,16 @@ npm link
 
 然后运行 `claude-starter`，就这么简单。
 
+## CLI 参数
+
+```bash
+claude-starter              # 启动交互式 TUI
+claude-starter --list [N]   # 打印最近 N 个会话（默认 30）
+claude-starter --version    # 显示版本号
+claude-starter --update     # 检查并更新到最新版本
+claude-starter --help       # 显示帮助信息
+```
+
 ## 快捷键
 
 | 按键 | 功能 |
@@ -114,14 +113,15 @@ npm link
 | `↑` `↓` | 上下导航 |
 | `Enter` | 新建 / 恢复对话 |
 | `n` | 直接新建 |
-| `/` | 搜索（支持 `#tag` 和 `fav`） |
-| `f` | 收藏 / 取消收藏 ⭐ |
-| `#` | 添加 / 管理标签 🏷️ |
+| `d` | Danger 模式恢复（bypassPermissions） |
+| `m` | 权限模式选择器 |
+| `/` | 搜索 |
 | `Backspace` | 删除搜索字符，删空自动退出 |
 | `Esc` | 清空搜索 |
 | `p` | 按项目过滤 |
-| `s` | 切换排序（时间/大小/消息数/项目/收藏） |
+| `s` | 切换排序（时间/大小/消息数/项目） |
 | `c` | 复制 Session ID |
+| `x` / `Delete` | 删除会话 |
 | `Home` / `End` | 跳到顶 / 底 |
 | `Ctrl-D` / `Ctrl-U` | 翻页 |
 | `q` / `Ctrl-C` | 退出 |
@@ -164,36 +164,25 @@ Searches across **everything** — project names, Git branches, conversation con
 - `auth` → all auth-related sessions
 - `refactor` → that cleanup from last week
 - `web-app fix` → bug fixes in a specific project
-- `#bug-fix` → all sessions tagged with bug-fix
-- `fav` → all favorited sessions
 
 **No modes. No confirmation. Just type and go.**
 
-## ⭐ Favorites & 🏷️ Tags
-
-Press `f` to favorite/unfavorite, `#` to add tags.
-
-- **Favorites**: Star important sessions, sort by favorites to pin them at top
-- **Tags**: 8 built-in tags (`bug-fix`, `feature`, `refactor`, etc.) + custom tags
-- **Search integration**: Use `#tag` syntax or `fav` keyword in search
-- **Persistent**: Stored in `~/.claude/claude-starter-meta.json`, survives restarts
-
 ## Features
 
 | | Feature | Description |
 |---|---|---|
 | 🎨 | **Beautiful TUI** | Tokyo Night color scheme, split-pane layout, feels native in your terminal |
 | ✨ | **New Session** | Launch a fresh conversation in one keystroke |
-| 🔍 | **Instant Search** | Fuzzy search across everything, supports `#tag` and `fav` |
-| ⭐ | **Favorites** | Press `f` to star important sessions |
-| 🏷️ | **Tags** | Press `#` to categorize with built-in + custom tags |
+| 🔍 | **Instant Search** | Fuzzy search across everything |
 | 📂 | **Project Filter** | Press `p` to filter by project |
 | ⚡ | **One-Key Resume** | Arrow, Enter, you're back in the conversation |
 | 📋 | **Session Preview** | Full metadata + conversation history in the right panel |
-| 🔀 | **Sort Modes** | Sort by time, size, messages, project, or favorites |
+| 🔀 | **Sort Modes** | Sort by time, size, messages, or project |
 | 📎 | **Copy ID** | Press `c` to copy session ID |
+| 🔒 | **Permission Modes** | Press `m` to configure, `d` for quick danger-mode resume |
+| 🗑️ | **Delete Sessions** | Press `x` to remove unwanted sessions |
 | 🧠 | **Smart CLI** | Auto-detects `mai-claude` vs `claude` |
-| 🔒 | **100% Local** | No network, no telemetry, no data leaves your machine |
+| 🔐 | **100% Local** | No network, no telemetry, no data leaves your machine |
 
 ## Install
 
@@ -216,6 +205,16 @@ Then run:
 claude-starter
 ```
 
+## CLI Options
+
+```bash
+claude-starter              # Launch interactive TUI
+claude-starter --list [N]   # Print latest N sessions (default: 30)
+claude-starter --version    # Show version
+claude-starter --update     # Update to the latest version
+claude-starter --help       # Show help
+```
+
 ## Keyboard Shortcuts
 
 | Key | Action |
@@ -223,14 +222,15 @@ claude-starter
 | `↑` `↓` | Navigate sessions |
 | `Enter` | Start new / resume selected session |
 | `n` | New session |
-| `/` | Search (supports `#tag` and `fav`) |
-| `f` | Toggle favorite ⭐ |
-| `#` | Add/manage tags 🏷️ |
+| `d` | Resume with bypassPermissions (danger mode) |
+| `m` | Permission mode picker |
+| `/` | Search |
 | `Backspace` | Edit search, auto-exit when empty |
 | `Esc` | Clear filter |
 | `p` | Filter by project |
-| `s` | Cycle sort mode (time/size/messages/project/favorites) |
+| `s` | Cycle sort mode (time/size/messages/project) |
 | `c` | Copy session ID |
+| `x` / `Delete` | Delete session |
 | `Home` / `End` | Jump to first / last |
 | `Ctrl-D` / `Ctrl-U` | Page down / up |
 | `q` / `Ctrl-C` | Quit |

package/index.js

@@ -9,6 +9,8 @@
  *   claude-starter            # Launch interactive TUI
  *   claude-starter --list     # Print sessions as a table (no TUI)
  *   claude-starter --list N   # Print the latest N sessions
+ *   claude-starter --version  # Show version
+ *   claude-starter --update   # Update to the latest version
  *
  * Keyboard shortcuts (TUI mode):
  *   ↑/↓           Navigate sessions
@@ -16,13 +18,14 @@
  *   /              Start search (fuzzy filter)
  *   Esc            Clear search / cancel
  *   p              Filter by project (popup)
- *   s              Cycle sort: time → size → messages → project → favorites
+ *   s              Cycle sort: time → size → messages → project
  *   n              Start new session
- *   f              Toggle favorite on selected session
- *   #              Add/remove tags on selected session
+ *   d              Resume with bypassPermissions (danger mode)
+ *   m              Permission mode picker
  *   Home / End     Jump to top / bottom
  *   Ctrl-D/U       Page down / up
  *   c              Copy session ID to clipboard
+ *   x / Delete     Delete selected session
  *   q / Ctrl-C     Quit
  */
 
@@ -34,37 +37,72 @@ const os = require('os');
 
 // ─── CLI Detection ──────────────────────────────────────────────────────────
 // Detect whether `mai-claude` is available (binary, alias, or function).
-// We check inside an interactive shell so aliases defined in .bashrc/.zshrc
-// are visible.  Falls back to plain `claude`.
+// First checks PATH directly, then sources shell config non-interactively
+// to resolve aliases.  Falls back to plain `claude`.
+//
+// NOTE: We deliberately avoid `shell -i` (interactive mode) because it
+// triggers SIGTTOU in terminals like Warp that strictly manage TTY process
+// groups, causing `suspended (tty output)`.
 //
 // Returns { name, cmd } where:
 //   name = display label ("mai-claude" or "claude")
 //   cmd  = the actual command string to spawn (resolves aliases)
 
 function detectCLI() {
+  // Strategy:
+  // 1. First try non-interactive lookup (safe for all terminals including Warp)
+  // 2. Only fall back to interactive shell if needed for alias resolution
+  //
+  // IMPORTANT: avoid `shell -i` (interactive mode) — it can trigger SIGTTOU
+  // in terminals like Warp that strictly manage TTY process groups, causing
+  // the process to be suspended with "suspended (tty output)".
+
   const shell = process.env.SHELL || '/bin/sh';
+
+  // 1) Non-interactive: check if mai-claude exists as a binary on PATH
   try {
-    const raw = execSync(`${shell} -ic "command -v mai-claude" 2>/dev/null`, {
+    const binPath = execSync('command -v mai-claude 2>/dev/null', {
       stdio: ['pipe', 'pipe', 'pipe'],
       timeout: 3000,
+      shell: true,
     }).toString().trim();
+    if (binPath) {
+      return { name: 'mai-claude', cmd: 'mai-claude' };
+    }
+  } catch { /* not found as binary, continue */ }
 
-    // Interactive shells may print extra lines (e.g. "Restored session: …").
-    // The relevant output is the last line(s) containing the alias or path.
-    const lines = raw.split('\n');
-    const aliasLine = lines.find(l => l.startsWith('alias ')) || lines[lines.length - 1];
-
-    // `command -v` for an alias returns: alias mai-claude='actual command'
-    // Extract the real command from inside the quotes if it's an alias.
-    const aliasMatch = aliasLine.match(/^alias [^=]+=(?:'(.+)'|"(.+)")$/s);
-    if (aliasMatch) {
-      return { name: 'mai-claude', cmd: aliasMatch[1] || aliasMatch[2] };
+  // 2) Source shell config non-interactively to resolve aliases/functions.
+  //    This avoids `-i` which would try to claim the TTY and risk SIGTTOU.
+  try {
+    const isZsh = shell.endsWith('/zsh');
+    const rcFile = isZsh
+      ? path.join(os.homedir(), '.zshrc')
+      : path.join(os.homedir(), '.bashrc');
+
+    if (fs.existsSync(rcFile)) {
+      const raw = execSync(
+        `${shell} -c 'source "${rcFile}" 2>/dev/null; command -v mai-claude 2>/dev/null'`,
+        {
+          stdio: ['pipe', 'pipe', 'pipe'],
+          timeout: 3000,
+          env: { ...process.env, PS1: '', PROMPT: '', NO_TTY: '1' },
+        },
+      ).toString().trim();
+
+      if (raw) {
+        const lines = raw.split('\n');
+        const aliasLine = lines.find(l => l.startsWith('alias ')) || lines[lines.length - 1];
+
+        const aliasMatch = aliasLine.match(/^alias [^=]+=(?:'(.+)'|"(.+)")$/s);
+        if (aliasMatch) {
+          return { name: 'mai-claude', cmd: aliasMatch[1] || aliasMatch[2] };
+        }
+        return { name: 'mai-claude', cmd: 'mai-claude' };
+      }
     }
-    // Otherwise it's a binary/function path — use the name directly
-    return { name: 'mai-claude', cmd: 'mai-claude' };
-  } catch {
-    return { name: 'claude', cmd: 'claude' };
-  }
+  } catch { /* alias resolution failed, fall back to claude */ }
+
+  return { name: 'claude', cmd: 'claude' };
 }
 
 const CLI = detectCLI();
@@ -80,11 +118,8 @@ const CLAUDE_DIR = path.join(os.homedir(), '.claude');
 const PROJECTS_DIR = path.join(CLAUDE_DIR, 'projects');
 const META_FILE = path.join(CLAUDE_DIR, 'claude-starter-meta.json');
 
-// ─── Session Meta (favorites & tags) ────────────────────────────────────────
+// ─── Session Meta ────────────────────────────────────────────────────
 // Stores user-defined metadata for sessions in a simple JSON file.
-// Schema: { "sessions": { "<sessionId>": { "favorite": bool, "tags": string[] } } }
-
-const DEFAULT_TAGS = ['bug-fix', 'feature', 'refactor', 'debug', 'review', 'config', 'docs', 'experiment'];
 
 function loadMeta() {
   try {
@@ -95,6 +130,8 @@ function loadMeta() {
   return { sessions: {} };
 }
 
+const PERMISSION_MODES = ['default', 'bypassPermissions', 'acceptEdits', 'dontAsk', 'plan', 'auto'];
+
 function saveMeta(meta) {
   try {
     fs.writeFileSync(META_FILE, JSON.stringify(meta, null, 2), 'utf-8');
@@ -102,38 +139,63 @@ function saveMeta(meta) {
 }
 
 function getSessionMeta(meta, sessionId) {
-  return meta.sessions[sessionId] || { favorite: false, tags: [] };
+  return meta.sessions[sessionId] || {};
 }
 
-function toggleFavorite(meta, sessionId) {
-  if (!meta.sessions[sessionId]) meta.sessions[sessionId] = { favorite: false, tags: [] };
-  meta.sessions[sessionId].favorite = !meta.sessions[sessionId].favorite;
-  saveMeta(meta);
-  return meta.sessions[sessionId].favorite;
+function getEffectivePermissionMode(meta, session) {
+  // Priority: per-session override > session's original mode from JSONL > global default
+  const sm = meta.sessions[session.sessionId];
+  if (sm && sm.permissionMode) return sm.permissionMode;
+  if (session.permissionMode) return session.permissionMode;
+  if (meta.defaultPermissionMode) return meta.defaultPermissionMode;
+  return '';
 }
 
-function setSessionTags(meta, sessionId, tags) {
-  if (!meta.sessions[sessionId]) meta.sessions[sessionId] = { favorite: false, tags: [] };
-  meta.sessions[sessionId].tags = tags;
+function setSessionPermissionMode(meta, sessionId, mode) {
+  if (!meta.sessions[sessionId]) meta.sessions[sessionId] = {};
+  meta.sessions[sessionId].permissionMode = mode || undefined;
+  if (!mode) delete meta.sessions[sessionId].permissionMode;
   saveMeta(meta);
 }
 
-function getAllUsedTags(meta) {
-  const tags = new Set();
-  for (const s of Object.values(meta.sessions)) {
-    if (s.tags) s.tags.forEach(t => tags.add(t));
-  }
-  return [...tags];
+function setGlobalPermissionMode(meta, mode) {
+  meta.defaultPermissionMode = mode || undefined;
+  if (!mode) delete meta.defaultPermissionMode;
+  saveMeta(meta);
 }
 
+
 // ─── Data Layer ──────────────────────────────────────────────────────────────
 
 function getProjectDisplayName(dirName) {
-  return dirName
-    .replace(/-Users-[^-]+-Desktop-MSProject-/, '')
-    .replace(/-Users-[^-]+-Desktop-/, '')
-    .replace(/-Users-[^-]+/, '~')
-    .replace(/^-/, '') || '~';
+  // Claude stores projects as path with `-` separators, e.g.:
+  //   -Users-bob-Desktop-MSProject-my-app
+  //   -Users-bob-Projects-Router-Maestro
+  //   -Users-bob-Desktop-GraphConnector
+  //   -Users-bob
+  //
+  // Strategy: strip the user home prefix, then take the last meaningful path segment.
+  // This gives clean names like "my-app", "Router-Maestro", "GraphConnector".
+
+  // Remove leading -Users-<username> prefix
+  let name = dirName.replace(/^-Users-[^-]+/, '');
+
+  // If nothing left, it was just the home dir
+  if (!name || name === '-') return '~';
+
+  // Remove leading dash
+  name = name.replace(/^-/, '');
+
+  // Get the last path segment (split by common directory markers)
+  // e.g. "Desktop-MSProject-my-app" → "my-app"
+  //      "Desktop-GraphConnector" → "GraphConnector"
+  //      "Projects-Router-Maestro" → "Router-Maestro"
+  const knownPrefixes = /^(Desktop|Documents|Projects|Downloads|dev|src|code|repos|work|home)(?:-|$)/i;
+  while (knownPrefixes.test(name)) {
+    name = name.replace(/^[^-]+-?/, '');
+  }
+
+  return name || dirName.split('-').pop() || '~';
 }
 
 function loadSessionQuick(filePath, projectName) {
@@ -156,7 +218,7 @@ function loadSessionQuick(filePath, projectName) {
   const tailStr = tailBuf.toString('utf-8');
 
   let firstTs = null, lastTs = null;
-  let version = '', gitBranch = '', cwd = '';
+  let version = '', gitBranch = '', cwd = '', permissionMode = '';
   let firstUserMsg = '';
   let userMsgCount = 0;
   let customTitle = '';
@@ -171,6 +233,7 @@ function loadSessionQuick(filePath, projectName) {
       if (!version && d.version) version = d.version;
       if (!gitBranch && d.gitBranch) gitBranch = d.gitBranch;
       if (!cwd && d.cwd) cwd = d.cwd;
+      if (!permissionMode && d.permissionMode) permissionMode = d.permissionMode;
       if (d.type === 'custom-title' && d.customTitle) customTitle = d.customTitle;
       if (d.type === 'user') {
         userMsgCount++;
@@ -209,7 +272,7 @@ function loadSessionQuick(filePath, projectName) {
   return {
     sessionId, project: projectName,
     topic: topic || '(no user messages)',
-    customTitle,
+    customTitle, permissionMode,
     firstTs, lastTs, version, gitBranch, cwd,
     fileSize: stat.size, duration: durationStr,
     estimatedMessages, filePath, _detailLoaded: false,
@@ -383,12 +446,17 @@ function createApp() {
 
   // ─── Screen ────────────────────────────────────────────────────────────
   const screen = blessed.screen({
-    smartCSR: true,
+    smartCSR: false,
+    fastCSR: false,
     title: 'Claude Starter',
     fullUnicode: true,
     autoPadding: true,
+    dockBorders: true,
   });
 
+  // Force screen-level fill color so no terminal bg leaks through
+  screen.style = { bg: 234 };  // 234 = xterm color closest to #1a1b26
+
   // ─── Header ────────────────────────────────────────────────────────────
   const header = blessed.box({
     parent: screen, top: 0, left: 0, width: '100%', height: 3,
@@ -396,23 +464,20 @@ function createApp() {
   });
 
   function updateHeader() {
-    const title = '{bold}{#7aa2f7-fg}🚀 Claude Starter{/}';
+    const title = '{bold}{#7aa2f7-fg}Claude Starter{/}';
     const count = `{#9ece6a-fg}${filteredSessions.length}{/}{#565f89-fg}/${allSessions.length} sessions{/}`;
     const proj = `{#bb9af7-fg}${uniqueProjects.length}{/}{#565f89-fg} projects{/}`;
-    const favCount = allSessions.filter(s => getSessionMeta(meta, s.sessionId).favorite).length;
-    const fav = favCount > 0 ? `{#e0af68-fg}⭐${favCount}{/}` : '';
-    const sort = `{#73daca-fg}↕${sortMode}{/}`;
+    const sort = `{#73daca-fg}[${sortMode}]{/}`;
     const search = isSearchMode
       ? `{#e0af68-fg}/ ${filterText}▌{/}`
       : (filterText ? `{#e0af68-fg}/ ${filterText}{/}` : '');
     let parts = [title, count, proj];
-    if (fav) parts.push(fav);
     parts.push(sort);
     if (search) parts.push(search);
     header.setContent(`\n ${parts.join(' {#414868-fg}│{/} ')}`);
   }
 
-  blessed.line({ parent: screen, top: 3, left: 0, width: '100%', orientation: 'horizontal', style: { fg: '#414868' } });
+  blessed.line({ parent: screen, top: 3, left: 0, width: '100%', orientation: 'horizontal', style: { fg: '#414868', bg: '#1a1b26' } });
 
   // ─── Left Panel: blessed.list for correct scroll tracking ──────────────
   const listPanel = blessed.list({
@@ -433,7 +498,7 @@ function createApp() {
     interactive: true,
   });
 
-  blessed.line({ parent: screen, top: 4, left: '50%', height: '100%-7', orientation: 'vertical', style: { fg: '#414868' } });
+  blessed.line({ parent: screen, top: 4, left: '50%', height: '100%-7', orientation: 'vertical', style: { fg: '#414868', bg: '#1a1b26' } });
 
   // ─── Right Panel ───────────────────────────────────────────────────────
   const detailPanel = blessed.box({
@@ -445,7 +510,7 @@ function createApp() {
     mouse: true,
   });
 
-  blessed.line({ parent: screen, bottom: 2, left: 0, width: '100%', orientation: 'horizontal', style: { fg: '#414868' } });
+  blessed.line({ parent: screen, bottom: 2, left: 0, width: '100%', orientation: 'horizontal', style: { fg: '#414868', bg: '#1a1b26' } });
 
   // ─── Footer ────────────────────────────────────────────────────────────
   const footer = blessed.box({
@@ -455,14 +520,15 @@ function createApp() {
 
   function updateFooter() {
     const keys = [
-      '{#7aa2f7-fg}{bold}↵{/} {#565f89-fg}Start/Resume{/}',
       '{#7aa2f7-fg}{bold}n{/} {#565f89-fg}New{/}',
+      '{#7aa2f7-fg}{bold}↵{/} {#565f89-fg}Resume{/}',
+      '{#7aa2f7-fg}{bold}m{/} {#565f89-fg}Mode{/}',
+      '{#f7768e-fg}{bold}d{/} {#565f89-fg}Danger{/}',
       '{#7aa2f7-fg}{bold}/{/} {#565f89-fg}Search{/}',
-      '{#7aa2f7-fg}{bold}f{/} {#565f89-fg}Fav{/}',
-      '{#7aa2f7-fg}{bold}#{/} {#565f89-fg}Tag{/}',
       '{#7aa2f7-fg}{bold}p{/} {#565f89-fg}Project{/}',
       '{#7aa2f7-fg}{bold}s{/} {#565f89-fg}Sort{/}',
       '{#7aa2f7-fg}{bold}c{/} {#565f89-fg}Copy ID{/}',
+      '{#f7768e-fg}{bold}x{/} {#565f89-fg}Delete{/}',
       '{#7aa2f7-fg}{bold}q{/} {#565f89-fg}Quit{/}',
     ];
     footer.setContent(`\n ${keys.join(' {#414868-fg}│{/} ')}`);
@@ -486,7 +552,7 @@ function createApp() {
       const branch = session.gitBranch
         ? `{#73daca-fg}${session.gitBranch.substring(0, 25)}{/}`
         : '';
-      const dur = session.duration ? `{#565f89-fg}⏱${session.duration}{/}` : '';
+      const dur = session.duration ? `{#565f89-fg}${session.duration}{/}` : '';
 
       // Compose a multi-line string for each list item.
       // blessed.list renders each item as a single row, so we pack info densely.
@@ -507,42 +573,30 @@ function createApp() {
 
   // ─── Populate list ─────────────────────────────────────────────────────
   // Index 0 = "New Session", index 1+ = sessions
-  const NEW_SESSION_LABEL = ' {#9ece6a-fg}{bold}✨ New Conversation{/}';
+  const NEW_SESSION_LABEL = ' {#9ece6a-fg}{bold}+ New Conversation{/}';
 
   function refreshList() {
     const listW = Math.floor((screen.width || 100) / 2) - 2;
 
     const sessionItems = filteredSessions.map((session) => {
       const color = getProjectColor(session.project, projectColorMap);
-      const sm = getSessionMeta(meta, session.sessionId);
-      const favIcon = sm.favorite ? '{#e0af68-fg}⭐{/}' : '  ';
+      const eMode = getEffectivePermissionMode(meta, session);
+      const modeIcon = (eMode === 'bypassPermissions') ? '{#f7768e-fg}!{/}' : ' ';
       const proj = `{${color}-fg}${session.project.substring(0, 12).padEnd(12)}{/}`;
       const time = `{#e0af68-fg}${formatTimestamp(session.lastTs).padEnd(16)}{/}`;
-      const msgs = `{#7aa2f7-fg}${String(session.estimatedMessages).padStart(4)}{/}{#565f89-fg}m{/}`;
 
-      const fixedLen = 2 + 12 + 1 + 16 + 1 + 5 + 2 + 3;
+      const fixedLen = 1 + 12 + 1 + 16 + 1 + 3;
       const topicMaxLen = Math.max(10, listW - fixedLen);
       let topic = session.customTitle || session.topic;
 
-      // Append tags inline after topic
-      const tagStr = sm.tags.length > 0
-        ? ' ' + sm.tags.map(t => `#${t}`).join(' ')
-        : '';
-
-      let display = topic + tagStr;
-      if (display.length > topicMaxLen) display = display.substring(0, topicMaxLen) + '…';
-
-      // Split display back into topic part and tag part for coloring
-      const topicPart = display.substring(0, Math.min(topic.length, topicMaxLen));
-      const tagPart = display.substring(topicPart.length);
+      if (topic.length > topicMaxLen) topic = topic.substring(0, topicMaxLen) + '…';
 
-      let label = `${favIcon}${proj} ${time} ${msgs} `;
+      let label = `${modeIcon}${proj} ${time} `;
       if (session.customTitle) {
-        label += `{#73daca-fg}{bold}${esc(topicPart)}{/}`;
+        label += `{#73daca-fg}{bold}${esc(topic)}{/}`;
       } else {
-        label += `{#a9b1d6-fg}${esc(topicPart)}{/}`;
+        label += `{#a9b1d6-fg}${esc(topic)}{/}`;
       }
-      if (tagPart) label += `{#f7768e-fg}${esc(tagPart)}{/}`;
 
       return label;
     });
@@ -558,14 +612,19 @@ function createApp() {
   function renderDetail() {
     if (selectedIndex === -1) {
       const cli = CLI.name;
+      const defaultMode = meta.defaultPermissionMode || '';
+      const modeFlag = (defaultMode && defaultMode !== 'default') ? ` --permission-mode ${defaultMode}` : '';
       let c = '';
-      c += `\n {#9ece6a-fg}{bold}✨ Start a New Conversation{/}\n`;
+      c += `\n {#9ece6a-fg}{bold}Start a New Conversation{/}\n`;
       c += ` {#414868-fg}${'─'.repeat(44)}{/}\n\n`;
       c += ` {#a9b1d6-fg}Open a fresh Claude session and start{/}\n`;
       c += ` {#a9b1d6-fg}coding from scratch.{/}\n\n`;
       c += ` {#565f89-fg}Working Dir{/}  {#7dcfff-fg}${process.cwd()}{/}\n`;
       c += ` {#565f89-fg}CLI{/}          {#73daca-fg}${cli}{/}\n`;
-      c += ` {#565f89-fg}Command{/}      {#565f89-fg}${cli}{/}\n\n`;
+      if (defaultMode && defaultMode !== 'default') {
+        c += ` {#565f89-fg}Mode{/}         {#f7768e-fg}${defaultMode}{/}\n`;
+      }
+      c += ` {#565f89-fg}Command{/}      {#565f89-fg}${cli}${modeFlag}{/}\n\n`;
       c += ` {#414868-fg}${'─'.repeat(44)}{/}\n`;
       c += ` {#9ece6a-fg}{bold}↵ Enter{/}{#9ece6a-fg} or {/}{#9ece6a-fg}{bold}n{/}{#9ece6a-fg} to launch{/}\n`;
       detailPanel.setContent(c);
@@ -582,15 +641,13 @@ function createApp() {
     loadSessionDetail(session);
 
     const color = getProjectColor(session.project, projectColorMap);
-    const sm = getSessionMeta(meta, session.sessionId);
     let c = '';
     const sep = ` {#414868-fg}${'─'.repeat(44)}{/}`;
 
-    // Title with favorite indicator
-    const favLabel = sm.favorite ? ' {#e0af68-fg}⭐{/}' : '';
-    c += `\n {${color}-fg}{bold}█ ${session.project}{/}${favLabel}\n`;
+    // Title
+    c += `\n {${color}-fg}{bold}█ ${session.project}{/}\n`;
     if (session.customTitle) {
-      c += ` {#73daca-fg}{bold}📌 ${esc(session.customTitle)}{/}\n`;
+      c += ` {#73daca-fg}{bold}${esc(session.customTitle)}{/}\n`;
     }
     c += sep + '\n\n';
 
@@ -606,15 +663,14 @@ function createApp() {
     if (session.version) fields.push(['Claude', `{#565f89-fg}v${session.version}{/}`]);
     if (session.cwd) fields.push(['Directory', `{#565f89-fg}${session.cwd}{/}`]);
 
-    for (const [label, value] of fields) {
-      c += ` {#565f89-fg}${label.padEnd(12)}{/} ${value}\n`;
+    const effectiveMode = getEffectivePermissionMode(meta, session);
+    if (effectiveMode && effectiveMode !== 'default') {
+      const modeColor = effectiveMode === 'bypassPermissions' ? '#f7768e' : '#e0af68';
+      fields.push(['Mode', `{${modeColor}-fg}${effectiveMode}{/}`]);
     }
 
-    // Tags section
-    if (sm.tags.length > 0) {
-      const tagChips = sm.tags.map(t => `{#414868-fg}[{/}{#f7768e-fg}#${t}{/}{#414868-fg}]{/}`).join(' ');
-      c += `\n {#f7768e-fg}{bold}🏷️ Tags{/}\n`;
-      c += ` ${tagChips}\n`;
+    for (const [label, value] of fields) {
+      c += ` {#565f89-fg}${label.padEnd(12)}{/} ${value}\n`;
     }
 
     if (session.toolsUsed && session.toolsUsed.length > 0) {
@@ -624,7 +680,7 @@ function createApp() {
       if (session.toolsUsed.length > 10) c += ` {#565f89-fg}+${session.toolsUsed.length - 10} more{/}\n`;
     }
 
-    c += `\n {#bb9af7-fg}{bold}💬 Conversation{/}\n`;
+    c += `\n {#bb9af7-fg}{bold}Conversation{/}\n`;
     c += sep + '\n';
 
     const msgs = (session.userMessages || []).slice(0, 10);
@@ -636,11 +692,11 @@ function createApp() {
       msgs.forEach((msg, i) => {
         const clean = esc(msg.replace(/\n/g, ' ').trim());
         const trunc = clean.length > 80 ? clean.substring(0, 80) + '…' : clean;
-        c += `\n {#7aa2f7-fg}{bold}You ❯{/} ${trunc}\n`;
+        c += `\n {#7aa2f7-fg}{bold}You >{/} ${trunc}\n`;
         if (assists[i]) {
           const aClean = esc(assists[i].replace(/\n/g, ' ').trim());
           const aTrunc = aClean.length > 80 ? aClean.substring(0, 80) + '…' : aClean;
-          c += ` {#9ece6a-fg}Claude ❯{/} {#565f89-fg}${aTrunc}{/}\n`;
+          c += ` {#9ece6a-fg}Claude >{/} {#565f89-fg}${aTrunc}{/}\n`;
         }
       });
     }
@@ -670,19 +726,9 @@ function createApp() {
     } else {
       const terms = filterText.toLowerCase().split(/\s+/);
       filteredSessions = allSessions.filter(s => {
-        const sm = getSessionMeta(meta, s.sessionId);
         const haystack = [s.project, s.topic, s.customTitle || '', s.gitBranch || '', s.sessionId, ...(s.userMessages || [])].join(' ').toLowerCase();
 
         return terms.every(t => {
-          // #tag syntax: match against session tags
-          if (t.startsWith('#') && t.length > 1) {
-            const tagQuery = t.substring(1);
-            return sm.tags.some(tag => tag.toLowerCase().includes(tagQuery));
-          }
-          // ⭐ or "fav" keyword: match only favorited sessions
-          if (t === '⭐' || t === 'fav' || t === 'favorite' || t === 'favorites') {
-            return sm.favorite;
-          }
           return haystack.includes(t);
         });
       });
@@ -698,19 +744,13 @@ function createApp() {
 
   // ─── Sort ──────────────────────────────────────────────────────────────
   function cycleSort() {
-    const modes = ['time', 'size', 'messages', 'project', 'favorites'];
+    const modes = ['time', 'size', 'messages', 'project'];
     sortMode = modes[(modes.indexOf(sortMode) + 1) % modes.length];
     const sorters = {
       time: (a, b) => (new Date(b.lastTs || 0).getTime()) - (new Date(a.lastTs || 0).getTime()),
       size: (a, b) => b.fileSize - a.fileSize,
       messages: (a, b) => b.estimatedMessages - a.estimatedMessages,
       project: (a, b) => a.project.localeCompare(b.project) || (new Date(b.lastTs || 0).getTime()) - (new Date(a.lastTs || 0).getTime()),
-      favorites: (a, b) => {
-        const fa = getSessionMeta(meta, a.sessionId).favorite ? 1 : 0;
-        const fb = getSessionMeta(meta, b.sessionId).favorite ? 1 : 0;
-        if (fb !== fa) return fb - fa;  // favorites first
-        return (new Date(b.lastTs || 0).getTime()) - (new Date(a.lastTs || 0).getTime());
-      },
     };
     allSessions.sort(sorters[sortMode]);
     selectedIndex = 0;
@@ -850,35 +890,46 @@ function createApp() {
   // ─── Resume Session ─────────────────────────────────────────────────────
   // Auto-detect: use mai-claude if available, otherwise fall back to claude
 
-  function resumeSession(session) {
+  function resumeSession(session, modeOverride) {
+    process.stdout.write('\x1b[0m');
     screen.destroy();
 
     const label = CLI.name;
+    const mode = modeOverride || getEffectivePermissionMode(meta, session);
+    const modeFlag = (mode && mode !== 'default') ? ` --permission-mode ${mode}` : '';
 
     console.log(`\n\x1b[36m⚡ Resuming conversation with ${label}\x1b[0m`);
     console.log(`\x1b[90m   Session: ${session.sessionId}\x1b[0m`);
-    console.log(`\x1b[90m   Project: ${session.project}  │  Branch: ${session.gitBranch || 'N/A'}  │  Messages: ${session.estimatedMessages}\x1b[0m\n`);
+    console.log(`\x1b[90m   Project: ${session.project}  │  Branch: ${session.gitBranch || 'N/A'}  │  Messages: ${session.estimatedMessages}\x1b[0m`);
+    if (mode && mode !== 'default') console.log(`\x1b[33m   Mode: ${mode}\x1b[0m`);
+    console.log('');
 
     const child = spawn(
-      `${CLI.cmd} --resume ${session.sessionId}`,
+      `${CLI.cmd} --resume ${session.sessionId}${modeFlag}`,
       { stdio: 'inherit', cwd: session.cwd || process.cwd(), shell: true },
     );
     child.on('error', (err) => {
       console.error(`\x1b[31mFailed to resume: ${err.message}\x1b[0m`);
-      console.log(`\x1b[33mManual: ${label} --resume ${session.sessionId}\x1b[0m`);
+      console.log(`\x1b[33mManual: ${label} --resume ${session.sessionId}${modeFlag}\x1b[0m`);
       process.exit(1);
     });
     child.on('exit', (code) => process.exit(code || 0));
   }
 
   function startNewSession() {
+    process.stdout.write('\x1b[0m');
     screen.destroy();
 
     const label = CLI.name;
+    const mode = meta.defaultPermissionMode || '';
+    const modeFlag = (mode && mode !== 'default') ? ` --permission-mode ${mode}` : '';
 
-    console.log(`\n\x1b[36m✨ Starting new conversation with ${label}\x1b[0m\n`);
+    console.log(`\n\x1b[36m✨ Starting new conversation with ${label}\x1b[0m`);
+    if (mode && mode !== 'default') console.log(`\x1b[33m   Mode: ${mode}\x1b[0m`);
+    console.log('');
 
-    const child = spawn(CLI.cmd, { stdio: 'inherit', cwd: process.cwd(), shell: true });
+    const cmd = modeFlag ? `${CLI.cmd}${modeFlag}` : CLI.cmd;
+    const child = spawn(cmd, { stdio: 'inherit', cwd: process.cwd(), shell: true });
     child.on('error', (err) => {
       console.error(`\x1b[31mFailed to start: ${err.message}\x1b[0m`);
       process.exit(1);
@@ -914,87 +965,127 @@ function createApp() {
     } catch (e) { /* silently fail */ }
   });
 
-  // Toggle favorite
-  screen.key(['f'], () => {
-    if (isSearchMode || popupOpen) return;
-    if (selectedIndex < 0 || selectedIndex >= filteredSessions.length) return;
-    const session = filteredSessions[selectedIndex];
-    const nowFav = toggleFavorite(meta, session.sessionId);
-    const icon = nowFav ? '⭐' : '☆';
-    footer.setContent(`\n  {#e0af68-fg}{bold}${icon} ${nowFav ? 'Favorited' : 'Unfavorited'}{/}`);
-    renderAll();
-    setTimeout(() => { updateFooter(); screen.render(); }, 1200);
-  });
 
-  // Tag management — handled via keypress since '#' is a shifted character
-  // that some terminal/blessed combos may not route through screen.key
-  screen.on('keypress', (ch, key) => {
-    if (ch === '#' && !isSearchMode && !popupOpen) {
-      if (selectedIndex < 0 || selectedIndex >= filteredSessions.length) return;
-      showTagPicker(filteredSessions[selectedIndex]);
-    }
-  });
+  // ─── Permission Mode Picker ──────────────────────────────────────────────
+
+  function showResumeConfirm(session) {
+    // Delay to avoid the Enter key from mode picker leaking into this popup
+    setTimeout(() => {
+      const mode = getEffectivePermissionMode(meta, session);
+      const modeLabel = (mode && mode !== 'default') ? `{#bb9af7-fg}${mode}{/}` : '{#565f89-fg}default{/}';
+      const confirmPopup = blessed.box({
+        parent: screen, top: 'center', left: 'center',
+        width: 44, height: 7,
+        label: ' {bold}{#9ece6a-fg}Resume?{/} ',
+        tags: true, border: { type: 'line' },
+        style: {
+          border: { fg: '#9ece6a' }, bg: '#24283b', fg: '#a9b1d6',
+          label: { fg: '#9ece6a' },
+        },
+        content: `\n  Mode: ${modeLabel}\n\n  {#9ece6a-fg}{bold}Enter{/}{#a9b1d6-fg} Resume  {/}{#565f89-fg}Esc{/}{#a9b1d6-fg} Cancel{/}`,
+      });
+      popupOpen = true;
+      confirmPopup.focus();
+      screen.render();
 
-  function showTagPicker(session) {
-    const sm = getSessionMeta(meta, session.sessionId);
-    const currentTags = new Set(sm.tags);
+      confirmPopup.key(['enter', 'return'], () => {
+        confirmPopup.destroy();
+        popupOpen = false;
+        resumeSession(session);
+      });
+      confirmPopup.key(['escape', 'q'], () => {
+        confirmPopup.destroy();
+        popupOpen = false;
+        renderAll();
+      });
+    }, 50);
+  }
 
-    // Build tag list: all known tags (defaults + used), with checkmarks for active ones
-    const usedTags = getAllUsedTags(meta);
-    const allTags = [...new Set([...DEFAULT_TAGS, ...usedTags])].sort();
+  function showPermissionModePicker(session) {
+    const currentSessionMode = (meta.sessions[session.sessionId] && meta.sessions[session.sessionId].permissionMode) || '';
+    const currentGlobalMode = meta.defaultPermissionMode || '';
+    const effectiveMode = getEffectivePermissionMode(meta, session);
 
     const items = [
-      '  {#9ece6a-fg}{bold}+ New custom tag…{/}',
-      ...allTags.map(t => {
-        const checked = currentTags.has(t) ? '{#9ece6a-fg}✓{/}' : ' ';
-        return `  ${checked} {#f7768e-fg}#${t}{/}`;
+      '  {#bb9af7-fg}{bold}── Session Override ──{/}',
+      ...PERMISSION_MODES.map(m => {
+        const checked = currentSessionMode === m ? '{#9ece6a-fg}✓{/}' : ' ';
+        const label = m === 'default' ? 'default (none)' : m;
+        return `  ${checked} {#a9b1d6-fg}${label}{/}`;
       }),
+      '  {#7aa2f7-fg}{bold}Clear session override{/}',
+      '',
+      '  {#bb9af7-fg}{bold}── Global Default ──{/}',
+      ...PERMISSION_MODES.map(m => {
+        const checked = currentGlobalMode === m ? '{#9ece6a-fg}✓{/}' : ' ';
+        const label = m === 'default' ? 'default (none)' : m;
+        return `  ${checked} {#a9b1d6-fg}${label}{/}`;
+      }),
+      '  {#7aa2f7-fg}{bold}Clear global default{/}',
     ];
 
     const popup = blessed.list({
       parent: screen, top: 'center', left: 'center',
-      width: Math.min(45, Math.max(...items.map(i => i.replace(/\{[^}]*\}/g, '').length)) + 8),
-      height: Math.min(items.length + 4, 20),
-      label: ' {bold}{#f7768e-fg}🏷️ Tags{/} ',
+      width: 42,
+      height: Math.min(items.length + 4, 24),
+      label: ' {bold}{#bb9af7-fg}Permission Mode{/} ',
       tags: true, border: { type: 'line' },
       style: {
-        border: { fg: '#f7768e' }, bg: '#24283b', fg: '#a9b1d6',
+        border: { fg: '#bb9af7' }, bg: '#24283b', fg: '#a9b1d6',
         selected: { bg: '#3d59a1', fg: 'white', bold: true },
-        label: { fg: '#f7768e' },
+        label: { fg: '#bb9af7' },
       },
       items: items, keys: true, vi: true, mouse: true,
     });
     popupOpen = true;
     popup.focus(); screen.render();
 
+    // Section header indices (0-indexed)
+    const sessionHeaderIdx = 0;
+    const sessionClearIdx = PERMISSION_MODES.length + 1;
+    const spacerIdx = sessionClearIdx + 1;
+    const globalHeaderIdx = spacerIdx + 1;
+    const globalClearIdx = globalHeaderIdx + PERMISSION_MODES.length + 1;
+
     popup.on('select', (item, index) => {
-      if (index === 0) {
-        // New custom tag — show input
-        popup.destroy();
-        popupOpen = false;
-        showTagInput(session);
+      // Skip headers and spacer
+      if (index === sessionHeaderIdx || index === globalHeaderIdx || index === spacerIdx) return;
+
+      if (index === sessionClearIdx) {
+        // Clear session override
+        setSessionPermissionMode(meta, session.sessionId, '');
+        popup.destroy(); popupOpen = false; renderAll();
+        showResumeConfirm(session);
         return;
       }
-      // Toggle the selected tag
-      const tagName = allTags[index - 1];
-      if (currentTags.has(tagName)) {
-        currentTags.delete(tagName);
-      } else {
-        currentTags.add(tagName);
+
+      if (index === globalClearIdx) {
+        // Clear global default
+        setGlobalPermissionMode(meta, '');
+        footer.setContent(`\n  {#9ece6a-fg}{bold}> Global default mode cleared{/}`);
+        popup.destroy(); popupOpen = false; renderAll();
+        setTimeout(() => { updateFooter(); screen.render(); }, 1500);
+        return;
+      }
+
+      // Session mode selection (indices 1 to PERMISSION_MODES.length)
+      if (index > sessionHeaderIdx && index <= sessionClearIdx - 1) {
+        const mode = PERMISSION_MODES[index - 1];
+        setSessionPermissionMode(meta, session.sessionId, mode === 'default' ? '' : mode);
+        popup.destroy(); popupOpen = false; renderAll();
+        showResumeConfirm(session);
+        return;
+      }
+
+      // Global mode selection
+      if (index > globalHeaderIdx && index <= globalClearIdx - 1) {
+        const mode = PERMISSION_MODES[index - globalHeaderIdx - 1];
+        setGlobalPermissionMode(meta, mode === 'default' ? '' : mode);
+        footer.setContent(`\n  {#9ece6a-fg}{bold}> Global default:{/} {#bb9af7-fg}${mode}{/}`);
+        popup.destroy(); popupOpen = false; renderAll();
+        setTimeout(() => { updateFooter(); screen.render(); }, 1500);
+        return;
       }
-      setSessionTags(meta, session.sessionId, [...currentTags]);
-
-      // Refresh the popup items to show updated checkmarks
-      const refreshedItems = [
-        '  {#9ece6a-fg}{bold}+ New custom tag…{/}',
-        ...allTags.map(t => {
-          const checked = currentTags.has(t) ? '{#9ece6a-fg}✓{/}' : ' ';
-          return `  ${checked} {#f7768e-fg}#${t}{/}`;
-        }),
-      ];
-      popup.setItems(refreshedItems);
-      popup.select(index);
-      screen.render();
     });
 
     popup.key(['escape', 'q'], () => {
@@ -1004,53 +1095,92 @@ function createApp() {
     });
   }
 
-  function showTagInput(session) {
-    const inputBox = blessed.textbox({
+  // ─── Quick dangerous resume (d key) ────────────────────────────────────
+  screen.key(['d'], () => {
+    if (isSearchMode || popupOpen) return;
+    if (selectedIndex < 0 || selectedIndex >= filteredSessions.length) return;
+    resumeSession(filteredSessions[selectedIndex], 'bypassPermissions');
+  });
+
+  // ─── Permission mode picker (m key) ───────────────────────────────────
+  screen.key(['m'], () => {
+    if (isSearchMode || popupOpen) return;
+    if (selectedIndex < 0 || selectedIndex >= filteredSessions.length) return;
+    showPermissionModePicker(filteredSessions[selectedIndex]);
+  });
+
+  // ─── Delete Session ───────────────────────────────────────────────────
+  function deleteSession(session) {
+    try {
+      // Delete the .jsonl file
+      if (fs.existsSync(session.filePath)) {
+        fs.unlinkSync(session.filePath);
+      }
+      // Clean up meta entry
+      if (meta.sessions[session.sessionId]) {
+        delete meta.sessions[session.sessionId];
+        saveMeta(meta);
+      }
+      // Remove from in-memory arrays
+      const allIdx = allSessions.indexOf(session);
+      if (allIdx !== -1) allSessions.splice(allIdx, 1);
+      const filtIdx = filteredSessions.indexOf(session);
+      if (filtIdx !== -1) filteredSessions.splice(filtIdx, 1);
+      // Adjust selection
+      if (selectedIndex >= filteredSessions.length) {
+        selectedIndex = Math.max(-1, filteredSessions.length - 1);
+      }
+    } catch (e) { /* silently fail */ }
+  }
+
+  function showDeleteConfirm(session) {
+    const topic = (session.customTitle || session.topic || '').substring(0, 30);
+    const confirmPopup = blessed.box({
       parent: screen, top: 'center', left: 'center',
-      width: 40, height: 3,
-      label: ' {bold}{#f7768e-fg}New Tag{/} ',
+      width: 50, height: 9,
+      label: ' {bold}{#f7768e-fg}Delete Session?{/} ',
       tags: true, border: { type: 'line' },
       style: {
         border: { fg: '#f7768e' }, bg: '#24283b', fg: '#a9b1d6',
         label: { fg: '#f7768e' },
       },
-      inputOnFocus: true,
+      content:
+        `\n  {#a9b1d6-fg}${esc(topic)}{/}\n`
+        + `  {#565f89-fg}${session.sessionId}{/}\n\n`
+        + `  {#f7768e-fg}{bold}y{/}{#a9b1d6-fg} Delete  {/}{#565f89-fg}n / Esc{/}{#a9b1d6-fg} Cancel{/}`,
     });
     popupOpen = true;
-    inputBox.focus();
+    confirmPopup.focus();
     screen.render();
 
-    inputBox.on('submit', (value) => {
-      inputBox.destroy();
+    confirmPopup.key(['y'], () => {
+      confirmPopup.destroy();
       popupOpen = false;
-      const tagName = value.trim().toLowerCase().replace(/[^a-z0-9_-]/g, '');
-      if (tagName) {
-        const sm = getSessionMeta(meta, session.sessionId);
-        const tags = new Set(sm.tags);
-        tags.add(tagName);
-        setSessionTags(meta, session.sessionId, [...tags]);
-        footer.setContent(`\n  {#9ece6a-fg}{bold}✓ Tagged:{/} {#f7768e-fg}#${tagName}{/}`);
-        renderAll();
-        setTimeout(() => { updateFooter(); screen.render(); }, 1500);
-      } else {
-        renderAll();
-      }
+      deleteSession(session);
+      footer.setContent(`\n  {#f7768e-fg}{bold}✗ Deleted:{/} {#565f89-fg}${session.sessionId}{/}`);
+      renderAll();
+      setTimeout(() => { updateFooter(); screen.render(); }, 1500);
     });
-
-    inputBox.on('cancel', () => {
-      inputBox.destroy();
+    confirmPopup.key(['n', 'escape', 'q'], () => {
+      confirmPopup.destroy();
       popupOpen = false;
-      renderAll();
+      screen.render();
     });
   }
 
+  screen.key(['x', 'delete'], () => {
+    if (isSearchMode || popupOpen) return;
+    if (selectedIndex < 0 || selectedIndex >= filteredSessions.length) return;
+    showDeleteConfirm(filteredSessions[selectedIndex]);
+  });
+
   screen.key(['s'], () => { if (!isSearchMode) cycleSort(); });
   screen.key(['p'], () => { if (!isSearchMode) showProjectPicker(); });
   screen.key(['escape'], () => {
     if (isSearchMode) { isSearchMode = false; filterText = ''; applyFilter(); return; }
     filterText = ''; selectedIndex = -1; applyFilter();
   });
-  screen.key(['q', 'C-c'], () => { screen.destroy(); process.exit(0); });
+  screen.key(['q', 'C-c'], () => { process.stdout.write('\x1b[0m'); screen.destroy(); process.exit(0); });
 
   // Remove blessed's built-in wheel handlers (they call select which changes selection)
   listPanel.removeAllListeners('element wheeldown');
@@ -1099,27 +1229,76 @@ function createApp() {
 
 // ─── Entry Point ─────────────────────────────────────────────────────────────
 
+const PKG = JSON.parse(fs.readFileSync(path.join(__dirname, 'package.json'), 'utf-8'));
+
 const args = process.argv.slice(2);
 
+if (args.includes('--version') || args.includes('-v') || args.includes('-V')) {
+  console.log(`claude-starter v${PKG.version}`);
+  process.exit(0);
+}
+
+if (args.includes('--update') || args.includes('-u')) {
+  const C = {
+    reset: '\x1b[0m', dim: '\x1b[2m', bold: '\x1b[1m',
+    cyan: '\x1b[36m', yellow: '\x1b[33m', green: '\x1b[32m',
+    red: '\x1b[31m',
+  };
+  console.log(`\n${C.cyan}🔄 Checking for updates…${C.reset}\n`);
+
+  try {
+    const latest = execSync('npm view claude-starter version 2>/dev/null', {
+      stdio: ['pipe', 'pipe', 'pipe'],
+      timeout: 10000,
+    }).toString().trim();
+
+    if (latest === PKG.version) {
+      console.log(`${C.green}✓ Already on the latest version (v${PKG.version})${C.reset}\n`);
+      process.exit(0);
+    }
+
+    console.log(`${C.yellow}  Current: v${PKG.version}${C.reset}`);
+    console.log(`${C.green}  Latest:  v${latest}${C.reset}\n`);
+    console.log(`${C.cyan}📦 Updating…${C.reset}\n`);
+
+    try {
+      execSync('npm install -g claude-starter@latest', { stdio: 'inherit', timeout: 60000 });
+      console.log(`\n${C.green}${C.bold}✓ Updated to v${latest}${C.reset}\n`);
+    } catch (e) {
+      console.error(`\n${C.red}✗ Update failed. Try manually:${C.reset}`);
+      console.log(`${C.yellow}  npm install -g claude-starter@latest${C.reset}\n`);
+      process.exit(1);
+    }
+  } catch (e) {
+    console.error(`${C.red}✗ Could not check for updates (network error or npm not found)${C.reset}\n`);
+    process.exit(1);
+  }
+
+  process.exit(0);
+}
+
 if (args.includes('--help') || args.includes('-h')) {
   console.log(`
-\x1b[36m🚀 Claude Starter\x1b[0m
+\x1b[36m🚀 Claude Starter\x1b[0m  \x1b[2mv${PKG.version}\x1b[0m
 
 Usage:
-  claude-starter            Launch interactive TUI
-  claude-starter --list [N] Print latest N sessions (default: 30)
-  claude-starter --help     Show this help
+  claude-starter              Launch interactive TUI
+  claude-starter --list [N]   Print latest N sessions (default: 30)
+  claude-starter --version    Show version
+  claude-starter --update     Update to the latest version
+  claude-starter --help       Show this help
 
 TUI Keyboard Shortcuts:
   ↑/↓           Navigate sessions
   Enter         Start new / resume selected session
   n             Start new session
-  /             Search (fuzzy filter, supports #tag and fav)
-  f             Toggle favorite ⭐ on selected session
-  #             Add/remove tags on selected session
+  d             Resume with bypassPermissions (danger mode)
+  m             Permission mode picker
+  /             Search (fuzzy filter)
   p             Filter by project
-  s             Cycle sort mode (time/size/messages/project/favorites)
+  s             Cycle sort mode (time/size/messages/project)
   c             Copy session ID
+  x / Delete    Delete selected session
   Home / End    Jump to top / bottom
   Ctrl-D/U      Page down / up
   Esc           Clear filter

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-starter",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "A beautiful terminal UI for managing Claude Code sessions — start new or resume past conversations",
   "main": "index.js",
   "bin": {