clarity-ai 6.3.1 → 6.3.3

package/clarity_flash_14b.ipynb

@@ -0,0 +1,245 @@
+{
+  "cells": [
+    {
+      "cell_type": "markdown",
+      "metadata": {},
+      "source": [
+        "# CLARITY Flash 14B — TPU Fine-Tuning\n",
+        "Trains a 14B parameter model on agent CoT + tool-calling data.\n",
+        "Target: Google Colab TPU v2-8 (free tier)\n",
+        "HF token: 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"
+      ]
+    },
+    {
+      "cell_type": "code",
+      "metadata": {},
+      "source": [
+        "# === Install ===\n",
+        "!pip install -q torch torch-xla torchvision torchaudio --index-url https://download.pytorch.org/whl/cpu\n",
+        "!pip install -q transformers datasets accelerate peft bitsandbytes sentencepiece huggingface_hub"
+      ],
+      "execution_count": null,
+      "outputs": []
+    },
+    {
+      "cell_type": "code",
+      "metadata": {},
+      "source": [
+        "# === HF Auth ===\n",
+        "from huggingface_hub import login, HfApi, create_repo\n",
+        "HF_TOKEN = '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'\n",
+        "login(token=HF_TOKEN, add_to_git_credential=True)\n",
+        "api = HfApi(token=HF_TOKEN)"
+      ],
+      "execution_count": null,
+      "outputs": []
+    },
+    {
+      "cell_type": "code",
+      "metadata": {},
+      "source": [
+        "# === TPU Setup ===\n",
+        "import torch\n",
+        "import torch_xla\n",
+        "import torch_xla.core.xla_model as xm\n",
+        "device = xm.xla_device()\n",
+        "print('Device:', device)\n",
+        "print('TPU cores:', torch_xla._XLAC._xla_get_num_devices())"
+      ],
+      "execution_count": null,
+      "outputs": []
+    },
+    {
+      "cell_type": "code",
+      "metadata": {},
+      "source": [
+        "# === Data Loading ===\n",
+        "import requests\n",
+        "import json\n",
+        "from datasets import Dataset\n",
+        "\n",
+        "DATA_URLS = [\n",
+        "  'https://huggingface.co/spaces/Universal-618/Clarity-main/main-data',\n",
+        "  'https://huggingface.co/spaces/Universal-618/Clarity-2/main-data',\n",
+        "  'https://huggingface.co/spaces/Universal-618/Clarity-3/main-data',\n",
+        "]\n",
+        "\n",
+        "all_samples = []\n",
+        "for url in DATA_URLS:\n",
+        "  try:\n",
+        "    r = requests.get(url, headers={'Authorization': f'Bearer {HF_TOKEN}'}, timeout=60)\n",
+        "    if r.status_code == 200:\n",
+        "      data = r.json()\n",
+        "      samples = data if isinstance(data, list) else data.get('data', [])\n",
+        "      all_samples.extend(samples)\n",
+        "      print(f'Loaded {len(samples)} from {url}')\n",
+        "  except Exception as e:\n",
+        "    print(f'Skipped {url}: {e}')\n",
+        "\n",
+        "# Fallback: synthetic CoT samples if no data\n",
+        "if len(all_samples) < 10:\n",
+        "  print('No remote data found — using synthetic samples')\n",
+        "  all_samples = [\n",
+        "    {'instruction': 'List files in current directory', 'response': 'I will run the ls command.\\n<tool>bash</tool><cmd>ls -la</cmd>', 'tools': 'bash'},\n",
+        "    {'instruction': 'Read the file config.json', 'response': 'Let me read that file.\\n<tool>read_file</tool><path>config.json</path>', 'tools': 'read_file'},\n",
+        "    {'instruction': 'Write hello world script', 'response': 'I will create the file.\\n<tool>write_file</tool><path>hello.py</path><content>print(\"hello\")</content>', 'tools': 'write_file'},\n",
+        "  ]\n",
+        "\n",
+        "print(f'Total training samples: {len(all_samples)}')"
+      ],
+      "execution_count": null,
+      "outputs": []
+    },
+    {
+      "cell_type": "code",
+      "metadata": {},
+      "source": [
+        "# === Format for Training ===\n",
+        "def format_chat(sample):\n",
+        "  inst = sample.get('instruction', sample.get('prompt', sample.get('input', '')))\n",
+        "  resp = sample.get('response', sample.get('completion', sample.get('output', '')))\n",
+        "  return {\n",
+        "    'text': f'<|im_start|>user\\n{inst}<|im_end|>\\n<|im_start|>assistant\\n{resp}<|im_end|>'\n",
+        "  }\n",
+        "\n",
+        "dataset = Dataset.from_list([format_chat(s) for s in all_samples])\n",
+        "dataset = dataset.train_test_split(test_size=0.05, seed=42)\n",
+        "print(f'Train: {len(dataset[\"train\"])}, Test: {len(dataset[\"test\"])}')"
+      ],
+      "execution_count": null,
+      "outputs": []
+    },
+    {
+      "cell_type": "code",
+      "metadata": {},
+      "source": [
+        "# === Load Model ===\n",
+        "from transformers import AutoModelForCausalLM, AutoTokenizer, BitsAndBytesConfig\n",
+        "import torch\n",
+        "\n",
+        "MODEL_ID = 'Qwen/Qwen2.5-14B-Instruct'\n",
+        "\n",
+        "bnb = BitsAndBytesConfig(\n",
+        "  load_in_4bit=True,\n",
+        "  bnb_4bit_use_double_quant=True,\n",
+        "  bnb_4bit_quant_type='nf4',\n",
+        "  bnb_4bit_compute_dtype=torch.bfloat16,\n",
+        ")\n",
+        "\n",
+        "tokenizer = AutoTokenizer.from_pretrained(MODEL_ID, token=HF_TOKEN, trust_remote_code=True)\n",
+        "tokenizer.pad_token = tokenizer.eos_token\n",
+        "\n",
+        "model = AutoModelForCausalLM.from_pretrained(\n",
+        "  MODEL_ID,\n",
+        "  quantization_config=bnb,\n",
+        "  device_map='auto',\n",
+        "  torch_dtype=torch.bfloat16,\n",
+        "  token=HF_TOKEN,\n",
+        "  trust_remote_code=True,\n",
+        ")\n",
+        "print(f'Model loaded: {MODEL_ID}')"
+      ],
+      "execution_count": null,
+      "outputs": []
+    },
+    {
+      "cell_type": "code",
+      "metadata": {},
+      "source": [
+        "# === LoRA Config ===\n",
+        "from peft import LoraConfig, get_peft_model, TaskType\n",
+        "\n",
+        "lora_config = LoraConfig(\n",
+        "  task_type=TaskType.CAUSAL_LM,\n",
+        "  r=16,\n",
+        "  lora_alpha=32,\n",
+        "  lora_dropout=0.05,\n",
+        "  target_modules=['q_proj', 'k_proj', 'v_proj', 'o_proj', 'gate_proj', 'up_proj', 'down_proj'],\n",
+        "  bias='none',\n",
+        ")\n",
+        "model = get_peft_model(model, lora_config)\n",
+        "model.print_trainable_parameters()"
+      ],
+      "execution_count": null,
+      "outputs": []
+    },
+    {
+      "cell_type": "code",
+      "metadata": {},
+      "source": [
+        "# === Training ===\n",
+        "from transformers import TrainingArguments, Trainer, DataCollatorForSeq2Seq\n",
+        "import numpy as np\n",
+        "\n",
+        "def tokenize_fn(examples):\n",
+        "  tok = tokenizer(examples['text'], truncation=True, max_length=2048, padding=False)\n",
+        "  tok['labels'] = tok['input_ids'].copy()\n",
+        "  return tok\n",
+        "\n",
+        "tokenized = dataset.map(tokenize_fn, remove_columns=['text'], batched=True)\n",
+        "\n",
+        "args = TrainingArguments(\n",
+        "  output_dir='./clarity-flash-14b',\n",
+        "  per_device_train_batch_size=1,\n",
+        "  gradient_accumulation_steps=16,\n",
+        "  num_train_epochs=3,\n",
+        "  learning_rate=2e-4,\n",
+        "  bf16=True,\n",
+        "  logging_steps=10,\n",
+        "  save_steps=200,\n",
+        "  save_total_limit=2,\n",
+        "  optim='adamw_8bit',\n",
+        "  report_to='none',\n",
+        "  dataloader_drop_last=False,\n",
+        ")\n",
+        "\n",
+        "trainer = Trainer(\n",
+        "  model=model,\n",
+        "  args=args,\n",
+        "  train_dataset=tokenized['train'],\n",
+        "  eval_dataset=tokenized['test'],\n",
+        "  data_collator=DataCollatorForSeq2Seq(tokenizer, padding=True),\n",
+        ")\n",
+        "\n",
+        "trainer.train()"
+      ],
+      "execution_count": null,
+      "outputs": []
+    },
+    {
+      "cell_type": "code",
+      "metadata": {},
+      "source": [
+        "# === Push Weights to HF ===\n",
+        "WEIGHTS_REPO = 'Universal-618/Clarity-flash-weights'\n",
+        "try:\n",
+        "  create_repo(WEIGHTS_REPO, repo_type='dataset', exist_ok=True, token=HF_TOKEN)\n",
+        "  print(f'Repo {WEIGHTS_REPO} ready')\n",
+        "except Exception as e:\n",
+        "  print(f'Repo exists or error: {e}')\n",
+        "\n",
+        "model.push_to_hub(WEIGHTS_REPO, token=HF_TOKEN, use_temp_dir=True)\n",
+        "tokenizer.push_to_hub(WEIGHTS_REPO, token=HF_TOKEN)\n",
+        "print(f'Weights pushed to {WEIGHTS_REPO}')"
+      ],
+      "execution_count": null,
+      "outputs": []
+    }
+  ],
+  "metadata": {
+    "accelerator": "TPU",
+    "colab": {
+      "provenance": []
+    },
+    "kernelspec": {
+      "display_name": "Python 3",
+      "name": "python3"
+    },
+    "language_info": {
+      "name": "python",
+      "version": "3.10.0"
+    }
+  },
+  "nbformat": 4,
+  "nbformat_minor": 4
+}

package/clarity_heavy_20b_moe.ipynb

@@ -0,0 +1,270 @@
+{
+  "cells": [
+    {
+      "cell_type": "markdown",
+      "metadata": {},
+      "source": [
+        "# CLARITY Heavy 20B MoE — Multi-GPU Fine-Tuning\n",
+        "Trains a 20B Mixture-of-Experts model on deep CoT + recursive tool execution data.\n",
+        "Target: Kaggle dual T4 (2x 16GB) with 4-bit quantization + FSDP.\n",
+        "HF token: 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"
+      ]
+    },
+    {
+      "cell_type": "code",
+      "metadata": {},
+      "source": [
+        "# === Install ===\n",
+        "!pip install -q torch transformers datasets accelerate peft bitsandbytes\n",
+        "!pip install -q deepspeed sentencepiece huggingface_hub"
+      ],
+      "execution_count": null,
+      "outputs": []
+    },
+    {
+      "cell_type": "code",
+      "metadata": {},
+      "source": [
+        "# === Check GPUs ===\n",
+        "import torch\n",
+        "n_gpus = torch.cuda.device_count()\n",
+        "for i in range(n_gpus):\n",
+        "  print(f'GPU {i}: {torch.cuda.get_device_name(i)} — {torch.cuda.get_device_properties(i).total_memory / 1e9:.1f} GB')\n",
+        "assert n_gpus >= 2, 'Need at least 2 GPUs'"
+      ],
+      "execution_count": null,
+      "outputs": []
+    },
+    {
+      "cell_type": "code",
+      "metadata": {},
+      "source": [
+        "# === HF Auth ===\n",
+        "from huggingface_hub import login, HfApi, create_repo\n",
+        "HF_TOKEN = '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'\n",
+        "login(token=HF_TOKEN, add_to_git_credential=True)\n",
+        "api = HfApi(token=HF_TOKEN)"
+      ],
+      "execution_count": null,
+      "outputs": []
+    },
+    {
+      "cell_type": "code",
+      "metadata": {},
+      "source": [
+        "# === Data Loading ===\n",
+        "import requests\n",
+        "import json\n",
+        "from datasets import Dataset, concatenate_datasets\n",
+        "\n",
+        "DATA_URLS = [\n",
+        "  'https://huggingface.co/spaces/Universal-618/Clarity-4/main-data',\n",
+        "  'https://huggingface.co/spaces/Universal-618/Clarity-5/main-data',\n",
+        "  'https://huggingface.co/spaces/Universal-618/Clarity-6/main-data',\n",
+        "  'https://huggingface.co/spaces/Universal-618/Clarity-main/main-data',\n",
+        "]\n",
+        "\n",
+        "all_samples = []\n",
+        "for url in DATA_URLS:\n",
+        "  try:\n",
+        "    r = requests.get(url, headers={'Authorization': f'Bearer {HF_TOKEN}'}, timeout=120)\n",
+        "    if r.status_code == 200:\n",
+        "      data = r.json()\n",
+        "      samples = data if isinstance(data, list) else data.get('data', [])\n",
+        "      all_samples.extend(samples)\n",
+        "      print(f'Loaded {len(samples)} from {url}')\n",
+        "  except Exception as e:\n",
+        "    print(f'Skipped {url}: {e}')\n",
+        "\n",
+        "if len(all_samples) < 10:\n",
+        "  print('No remote data — generating synthetic deep CoT samples')\n",
+        "  import random\n",
+        "  code_snippets = [\n",
+        "    'def fib(n): return n if n < 2 else fib(n-1) + fib(n-2)',\n",
+        "    'for i in range(10): print(i**2)',\n",
+        "    'with open(\"data.txt\") as f: content = f.read()',\n",
+        "  ]\n",
+        "  for _ in range(50):\n",
+        "    cs = random.choice(code_snippets)\n",
+        "    all_samples.append({\n",
+        "      'instruction': f'Write and test a function',\n",
+        "      'thinking': f'I need to think step by step. First, I will analyze what the user wants. Then I will write the code. Let me reason through this carefully.',\n",
+        "      'response': f'I will write the code now.\\n<tool>bash</tool><cmd>cat > /tmp/test.py << \\'EOF\\'\\n{cs}\\nEOF\\npython3 /tmp/test.py</cmd>',\n",
+        "      'tools': 'bash,write_file',\n",
+        "    })\n",
+        "\n",
+        "print(f'Total training samples: {len(all_samples)}')"
+      ],
+      "execution_count": null,
+      "outputs": []
+    },
+    {
+      "cell_type": "code",
+      "metadata": {},
+      "source": [
+        "# === Format ===\n",
+        "def format_deep_cot(sample):\n",
+        "  inst = sample.get('instruction', sample.get('prompt', ''))\n",
+        "  thinking = sample.get('thinking', '')\n",
+        "  resp = sample.get('response', sample.get('completion', ''))\n",
+        "  thinking_block = f'<|thinking_start|>{thinking}<|thinking_end|>' if thinking else ''\n",
+        "  return {\n",
+        "    'text': f'<|im_start|>user\\n{inst}<|im_end|>\\n<|im_start|>assistant\\n{thinking_block}{resp}<|im_end|>'\n",
+        "  }\n",
+        "\n",
+        "dataset = Dataset.from_list([format_deep_cot(s) for s in all_samples])\n",
+        "split = dataset.train_test_split(test_size=0.05, seed=42)\n",
+        "print(f'Train: {len(split[\"train\"])}, Test: {len(split[\"test\"])}')"
+      ],
+      "execution_count": null,
+      "outputs": []
+    },
+    {
+      "cell_type": "code",
+      "metadata": {},
+      "source": [
+        "# === Load MoE Model (4-bit) ===\n",
+        "from transformers import AutoModelForCausalLM, AutoTokenizer, BitsAndBytesConfig\n",
+        "\n",
+        "MODEL_ID = 'deepseek-ai/DeepSeek-MoE-16B-Chat'\n",
+        "\n",
+        "bnb = BitsAndBytesConfig(\n",
+        "  load_in_4bit=True,\n",
+        "  bnb_4bit_use_double_quant=True,\n",
+        "  bnb_4bit_quant_type='nf4',\n",
+        "  bnb_4bit_compute_dtype=torch.bfloat16,\n",
+        ")\n",
+        "\n",
+        "tokenizer = AutoTokenizer.from_pretrained(MODEL_ID, token=HF_TOKEN, trust_remote_code=True)\n",
+        "tokenizer.pad_token = tokenizer.eos_token\n",
+        "\n",
+        "model = AutoModelForCausalLM.from_pretrained(\n",
+        "  MODEL_ID,\n",
+        "  quantization_config=bnb,\n",
+        "  device_map='auto',\n",
+        "  torch_dtype=torch.bfloat16,\n",
+        "  token=HF_TOKEN,\n",
+        "  trust_remote_code=True,\n",
+        ")\n",
+        "print(f'MoE model loaded: {MODEL_ID}')\n",
+        "print(f'Params: {model.num_parameters():,.0f}')"
+      ],
+      "execution_count": null,
+      "outputs": []
+    },
+    {
+      "cell_type": "code",
+      "metadata": {},
+      "source": [
+        "# === LoRA for MoE ===\n",
+        "from peft import LoraConfig, get_peft_model, TaskType\n",
+        "\n",
+        "lora_config = LoraConfig(\n",
+        "  task_type=TaskType.CAUSAL_LM,\n",
+        "  r=8,\n",
+        "  lora_alpha=16,\n",
+        "  lora_dropout=0.1,\n",
+        "  target_modules=['q_proj', 'k_proj', 'v_proj', 'o_proj', 'gate_proj', 'up_proj', 'down_proj', 'gate'],\n",
+        "  bias='none',\n",
+        ")\n",
+        "model = get_peft_model(model, lora_config)\n",
+        "model.print_trainable_parameters()"
+      ],
+      "execution_count": null,
+      "outputs": []
+    },
+    {
+      "cell_type": "code",
+      "metadata": {},
+      "source": [
+        "# === Gradient Checkpointing (prevents OOM) ===\n",
+        "model.gradient_checkpointing_enable(gradient_checkpointing_kwargs={'use_reentrant': False})\n",
+        "model.config.use_cache = False\n",
+        "print('Gradient checkpointing enabled')"
+      ],
+      "execution_count": null,
+      "outputs": []
+    },
+    {
+      "cell_type": "code",
+      "metadata": {},
+      "source": [
+        "# === Training ===\n",
+        "from transformers import TrainingArguments, Trainer, DataCollatorForSeq2Seq\n",
+        "\n",
+        "def tokenize_fn(examples):\n",
+        "  tok = tokenizer(examples['text'], truncation=True, max_length=2048, padding=False)\n",
+        "  tok['labels'] = tok['input_ids'].copy()\n",
+        "  return tok\n",
+        "\n",
+        "tokenized = split.map(tokenize_fn, remove_columns=['text'], batched=True)\n",
+        "\n",
+        "args = TrainingArguments(\n",
+        "  output_dir='./clarity-heavy-20b-moe',\n",
+        "  per_device_train_batch_size=1,\n",
+        "  per_device_eval_batch_size=1,\n",
+        "  gradient_accumulation_steps=8,\n",
+        "  num_train_epochs=3,\n",
+        "  learning_rate=1e-4,\n",
+        "  bf16=True,\n",
+        "  logging_steps=10,\n",
+        "  save_steps=200,\n",
+        "  save_total_limit=2,\n",
+        "  optim='adamw_8bit',\n",
+        "  gradient_checkpointing=True,\n",
+        "  report_to='none',\n",
+        "  ddp_find_unused_parameters=False,\n",
+        ")\n",
+        "\n",
+        "trainer = Trainer(\n",
+        "  model=model,\n",
+        "  args=args,\n",
+        "  train_dataset=tokenized['train'],\n",
+        "  eval_dataset=tokenized['test'],\n",
+        "  data_collator=DataCollatorForSeq2Seq(tokenizer, padding=True, pad_to_multiple_of=8),\n",
+        ")\n",
+        "\n",
+        "trainer.train()"
+      ],
+      "execution_count": null,
+      "outputs": []
+    },
+    {
+      "cell_type": "code",
+      "metadata": {},
+      "source": [
+        "# === Push to HF ===\n",
+        "WEIGHTS_REPO = 'Universal-618/Clarity-heavy-weights'\n",
+        "try:\n",
+        "  create_repo(WEIGHTS_REPO, repo_type='dataset', exist_ok=True, token=HF_TOKEN)\n",
+        "  print(f'Repo {WEIGHTS_REPO} ready')\n",
+        "except Exception as e:\n",
+        "  print(f'Repo notice: {e}')\n",
+        "\n",
+        "model.push_to_hub(WEIGHTS_REPO, token=HF_TOKEN, use_temp_dir=True)\n",
+        "tokenizer.push_to_hub(WEIGHTS_REPO, token=HF_TOKEN)\n",
+        "print(f'Weights pushed to https://huggingface.co/datasets/{WEIGHTS_REPO}')"
+      ],
+      "execution_count": null,
+      "outputs": []
+    }
+  ],
+  "metadata": {
+    "accelerator": "GPU",
+    "kaggle": {
+      "accelerator": "GPU",
+      "gpuModel": "T4",
+      "gpuCount": 2
+    },
+    "kernelspec": {
+      "display_name": "Python 3",
+      "name": "python3"
+    },
+    "language_info": {
+      "name": "python",
+      "version": "3.10.0"
+    }
+  },
+  "nbformat": 4,
+  "nbformat_minor": 4
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clarity-ai",
-  "version": "6.3.1",
+  "version": "6.3.3",
   "description": "Premium terminal AI agent — fixed-height viewport, box-drawing UI, TrueColor theme, streaming with abort",
   "type": "module",
   "bin": {

package/src/components/AppRoot.js

@@ -1,8 +1,9 @@
-import React, { useState, useCallback, useRef, useEffect } from 'react';
+import React, { useState, useCallback, useRef } from 'react';
 import { Box } from 'ink';
 import { createChatState, handleSend, handleCommand } from '../chat.js';
 import { hex } from '../config/theme.js';
 import { Layout } from './Layout.js';
+const { createElement: h } = React;
 
 let abortController = null;
 
@@ -73,8 +74,8 @@ export function App({ config }) {
     }));
   }
 
-  return Box({ flexDirection: 'column', backgroundColor: hex.bg },
-    Layout({
+  return h(Box, { flexDirection: 'column', backgroundColor: hex.bg },
+    h(Layout, {
       state,
       streamContent,
       model,

package/src/components/CommandPicker.js

@@ -1,6 +1,7 @@
 import React, { useState } from 'react';
 import { Box, Text, useInput } from 'ink';
-import { hex, usym } from '../config/theme.js';
+import { hex, sym } from '../config/theme.js';
+import { getLayout } from '../config/layout.js';
 const { createElement: h } = React;
 
 const COMMANDS = [
@@ -8,7 +9,7 @@ const COMMANDS = [
   { name: '/model',    desc: 'Switch model' },
   { name: '/provider', desc: 'Switch provider' },
   { name: '/agent',    desc: 'Toggle agent mode' },
-  { name: '/stop',     desc: 'Cancel streaming' },
+  { name: '/stop',     desc: 'Cancel running stream' },
   { name: '/clear',    desc: 'Clear conversation' },
   { name: '/export',   desc: 'Export conversation' },
   { name: '/help',     desc: 'Show all commands' },
@@ -18,6 +19,7 @@ const COMMANDS = [
 export function CommandPicker({ query, onSelect, onClose }) {
   const [search, setSearch] = useState('');
   const [idx, setIdx] = useState(0);
+  const { cols } = getLayout();
 
   const filtered = COMMANDS.filter(c =>
     c.name.includes(search) || c.desc.toLowerCase().includes(search.toLowerCase())
@@ -26,40 +28,36 @@ export function CommandPicker({ query, onSelect, onClose }) {
   useInput((input, key) => {
     if (key.upArrow) setIdx(i => Math.max(0, i - 1));
     if (key.downArrow) setIdx(i => Math.min(filtered.length - 1, i + 1));
-    if (key.return) onSelect(filtered[idx]?.name || '');
+    if (key.return && filtered[idx]) onSelect(filtered[idx].name);
     if (key.escape) onClose();
     if (key.backspace) setSearch(s => s.slice(0, -1));
     else if (input && !key.ctrl && !key.meta) setSearch(s => s + input);
   });
 
-  const tw = process.stdout.columns || 80;
-  const boxWidth = Math.min(tw - 4, 50);
+  const w = Math.min(cols - 4, 48);
 
-  return h(Box, { flexDirection: 'column', width: boxWidth },
-    h(Box, { flexDirection: 'row', marginBottom: 1, gap: 1 },
-      h(Text, { color: hex.textMuted }, usym.bulb),
-      h(Text, { color: search ? hex.text : hex.textMuted }, search || 'type to filter...'),
+  return h(Box, { flexDirection: 'column', backgroundColor: hex.surfaceAlt, width: w },
+    h(Box, { height: 1, backgroundColor: hex.surfaceAlt },
+      h(Text, { color: hex.textMuted, backgroundColor: hex.surfaceAlt }, '  ' + sym.star + ' ' + (search || 'filter commands...'))
     ),
     filtered.map((cmd, i) =>
       h(Box, {
-        key: cmd.name,
-        flexDirection: 'row',
-        backgroundColor: i === idx ? hex.selectionBg : undefined,
-        width: boxWidth,
+        key: cmd.name, height: 1,
+        backgroundColor: i === idx ? hex.selectionBg : 'transparent',
       },
         h(Text, {
           color: i === idx ? hex.selectionText : hex.text,
           bold: i === idx,
-          backgroundColor: i === idx ? hex.selectionBg : undefined,
-          wrap: 'truncate-end',
-        }, '  ' + cmd.name.padEnd(16)),
+          backgroundColor: i === idx ? hex.selectionBg : 'transparent',
+        }, '  ' + cmd.name + '  '),
         h(Text, {
           color: i === idx ? hex.selectionText : hex.textDim,
-          backgroundColor: i === idx ? hex.selectionBg : undefined,
-          wrap: 'truncate-end',
+          backgroundColor: i === idx ? hex.selectionBg : 'transparent',
         }, cmd.desc)
       )
     ),
-    h(Text, { color: hex.textMuted }, ' ' + usym.arrowU + usym.arrowD + ' nav Enter select Esc close')
+    h(Box, { height: 1, backgroundColor: hex.surfaceAlt },
+      h(Text, { color: hex.textMuted, backgroundColor: hex.surfaceAlt }, '  ' + sym.arrowU + sym.arrowD + ' nav  ' + sym.arrowR + ' select  Esc close')
+    )
   );
 }