From 235130c6aecf77c1bc01d7f91e9ed2bc25d0ec6d Mon Sep 17 00:00:00 2001 From: Rohit Ghumare <48523873+rohitg00@users.noreply.github.com> Date: Wed, 28 Jan 2026 08:27:46 +0000 Subject: [PATCH] fix(tui): fix rendering overlap and terminal crash on quit (#18) - Remove deprecated @types/minimatch dependency (minimatch 10.x has bundled types) - Fix TUI text rendering overlap by using single text elements instead of multiple text elements in box rows (Browse, Installed, Marketplace, SkillList screens) - Fix terminal crash on 'q' press by properly unmounting React tree and restoring terminal state with escape sequences - Add signal handlers (SIGINT, SIGTERM) for clean exit - Bump version to 1.7.6 --- apps/skillkit/package.json | 2 +- packages/agents/package.json | 2 +- packages/cli/package.json | 2 +- packages/core/package.json | 3 +-- packages/tui/src/components/SkillList.tsx | 25 ++++++------------- packages/tui/src/index.tsx | 30 +++++++++++++++++++---- packages/tui/src/screens/Browse.tsx | 19 ++++++-------- packages/tui/src/screens/Installed.tsx | 13 ++++------ packages/tui/src/screens/Marketplace.tsx | 17 +++++-------- pnpm-lock.yaml | 11 --------- 10 files changed, 56 insertions(+), 68 deletions(-) diff --git a/apps/skillkit/package.json b/apps/skillkit/package.json index 79af5b39..5b5af6aa 100644 --- a/apps/skillkit/package.json +++ b/apps/skillkit/package.json @@ -1,6 +1,6 @@ { "name": "skillkit", - "version": "1.7.5", + "version": "1.7.6", "description": "Supercharge AI coding agents with portable skills. Install, translate, and share skills across Claude Code, Cursor, Codex, Copilot & 13 more", "type": "module", "bin": { diff --git a/packages/agents/package.json b/packages/agents/package.json index 7303a851..64076a02 100644 --- a/packages/agents/package.json +++ b/packages/agents/package.json @@ -1,6 +1,6 @@ { "name": "@skillkit/agents", - "version": "1.7.5", + "version": "1.7.6", "description": "Agent adapters for SkillKit - supports 17+ AI coding agents", "type": "module", "main": "./dist/index.js", diff --git a/packages/cli/package.json b/packages/cli/package.json index dc856dc6..d3c7bd46 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@skillkit/cli", - "version": "1.7.5", + "version": "1.7.6", "description": "CLI commands for SkillKit", "type": "module", "main": "./dist/index.js", diff --git a/packages/core/package.json b/packages/core/package.json index 7efc0905..93c3078a 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@skillkit/core", - "version": "1.7.5", + "version": "1.7.6", "description": "Core functionality for SkillKit - skill discovery, parsing, and translation", "type": "module", "main": "./dist/index.js", @@ -45,7 +45,6 @@ "test": "vitest run" }, "dependencies": { - "@types/minimatch": "^6.0.0", "minimatch": "^10.1.1", "yaml": "^2.6.1", "zod": "^3.24.1" diff --git a/packages/tui/src/components/SkillList.tsx b/packages/tui/src/components/SkillList.tsx index 38d566c7..1aeabde8 100644 --- a/packages/tui/src/components/SkillList.tsx +++ b/packages/tui/src/components/SkillList.tsx @@ -45,25 +45,16 @@ export function SkillList({ const pointer = isSelected ? symbols.pointer : symbols.pointerInactive; const fg = isSelected ? terminalColors.accent : terminalColors.text; const statusIcon = skill.enabled ? symbols.active : symbols.pending; - const statusColor = skill.enabled - ? terminalColors.success - : terminalColors.textMuted; + const descPart = skill.description + ? ` - ${skill.description.slice(0, 40)}${skill.description.length > 40 ? '...' : ''}` + : ''; + // Use single text element to avoid rendering overlap + const line = `${pointer} ${skill.name} ${statusIcon}${descPart}`; return ( - - - {isSelected ? {pointer} {skill.name} : <>{pointer} {skill.name}} - - - {' '}{statusIcon} - - {skill.description && ( - - {' '}- {skill.description.slice(0, 40)} - {skill.description.length > 40 ? '...' : ''} - - )} - + + {isSelected ? {line} : line} + ); })} diff --git a/packages/tui/src/index.tsx b/packages/tui/src/index.tsx index 9c466c43..490d539d 100644 --- a/packages/tui/src/index.tsx +++ b/packages/tui/src/index.tsx @@ -2,19 +2,39 @@ import { createCliRenderer } from '@opentui/core'; import { createRoot } from '@opentui/react'; import { App } from './App.js'; +let rootInstance: ReturnType | null = null; + export function exitTUI(code = 0): void { try { - process.stdout.write('\x1b[?1049l\x1b[?25h\x1b[0m'); + // Unmount React tree first + if (rootInstance) { + try { + rootInstance.unmount(); + } catch { + // Ignore unmount errors + } + rootInstance = null; + } + + // Restore terminal state: exit alt screen, show cursor, reset attributes, clear + process.stdout.write('\x1b[?1049l\x1b[?25h\x1b[0m\x1b[H\x1b[2J'); } catch { // Ignore write errors } - process.exit(code); + + // Use setImmediate to allow any pending operations to complete + setImmediate(() => process.exit(code)); } export async function startTUI(): Promise { - const renderer = await createCliRenderer({ exitOnCtrlC: true }); - const root = createRoot(renderer); - root.render(); + // Setup signal handlers for clean exit + const handleSignal = () => exitTUI(0); + process.on('SIGINT', handleSignal); + process.on('SIGTERM', handleSignal); + + const renderer = await createCliRenderer({ exitOnCtrlC: false }); + rootInstance = createRoot(renderer); + rootInstance.render(); return new Promise(() => {}); } diff --git a/packages/tui/src/screens/Browse.tsx b/packages/tui/src/screens/Browse.tsx index 4fd06fae..97413e7b 100644 --- a/packages/tui/src/screens/Browse.tsx +++ b/packages/tui/src/screens/Browse.tsx @@ -142,19 +142,16 @@ export function Browse({ onNavigate, cols = 80, rows = 24 }: BrowseProps) { const selected = actualIdx === selectedIndex; const indicator = selected ? '▸' : ' '; // Truncate source if needed - clamp to avoid negative slicing - const available = Math.max(0, contentWidth - repo.name.length - 6); - const safeSlice = Math.max(0, available - 3); - const displaySource = available > 0 && repo.source.length > available - ? repo.source.slice(0, safeSlice) + '...' + const maxSourceLen = Math.max(0, contentWidth - repo.name.length - 6); + const displaySource = maxSourceLen > 3 && repo.source.length > maxSourceLen + ? repo.source.slice(0, maxSourceLen - 3) + '...' : repo.source; + // Use single text element to avoid rendering overlap issues + const line = `${indicator}${repo.name} · ${displaySource}`; return ( - - {indicator} - - {repo.name} - - · {displaySource} - + + {line} + ); })} diff --git a/packages/tui/src/screens/Installed.tsx b/packages/tui/src/screens/Installed.tsx index 3fb55b66..ba2dadf8 100644 --- a/packages/tui/src/screens/Installed.tsx +++ b/packages/tui/src/screens/Installed.tsx @@ -188,15 +188,12 @@ export function Installed({ onNavigate, cols = 80, rows = 24 }: InstalledProps) const selected = actualIdx === selectedIndex; const indicator = selected ? '▸' : ' '; const statusIcon = skill.enabled !== false ? '●' : '○'; - const statusColor = skill.enabled !== false ? terminalColors.success : terminalColors.textMuted; + // Use single text element to avoid rendering overlap + const line = `${indicator}${statusIcon} ${skill.name}`; return ( - - {indicator} - {statusIcon} - - {skill.name} - - + + {line} + ); })} diff --git a/packages/tui/src/screens/Marketplace.tsx b/packages/tui/src/screens/Marketplace.tsx index e4ed891d..a96d07cf 100644 --- a/packages/tui/src/screens/Marketplace.tsx +++ b/packages/tui/src/screens/Marketplace.tsx @@ -109,23 +109,18 @@ export function Marketplace({ onNavigate, cols = 80, rows = 24 }: MarketplacePro {/* Featured section */} {animPhase >= 3 && ( - - Featured - · trending - + Featured · trending {visibleFeatured.map((item, idx) => { const selected = idx === selectedIndex; const indicator = selected ? '▸' : ' '; + // Use single text element to avoid rendering overlap + const line = `${indicator}${item.name} ★${item.stars}`; return ( - - {indicator} - - {item.name} - - ★{item.stars} - + + {line} + ); })} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 74646c79..9951b796 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -131,9 +131,6 @@ importers: packages/core: dependencies: - '@types/minimatch': - specifier: ^6.0.0 - version: 6.0.0 minimatch: specifier: ^10.1.1 version: 10.1.1 @@ -815,10 +812,6 @@ packages: '@types/http-cache-semantics@4.0.4': resolution: {integrity: sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==} - '@types/minimatch@6.0.0': - resolution: {integrity: sha512-zmPitbQ8+6zNutpwgcQuLcsEpn/Cj54Kbn7L5pX0Os5kdWplB7xPgEh/g+SWOB/qmows2gpuCaPyduq8ZZRnxA==} - deprecated: This is a stub types definition. minimatch provides its own type definitions, so you do not need this installed. - '@types/node@16.9.1': resolution: {integrity: sha512-QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g==} @@ -2348,10 +2341,6 @@ snapshots: '@types/http-cache-semantics@4.0.4': {} - '@types/minimatch@6.0.0': - dependencies: - minimatch: 10.1.1 - '@types/node@16.9.1': {} '@types/node@22.19.7':