pelulu-cli 1.0.0 → 1.0.3

package/README.md

@@ -1,15 +1,19 @@
-# Pelulu CLI 🐾
+# Pelulu CLI
 
-> A CLI coding agent powered by [XiaoZhi](https://xiaozhi.me) — yes, the tiny Chinese AI model that lives in ESP32 chips. We gave it 15 tools and a terminal. What could go wrong?
+> A CLI coding agent powered by [XiaoZhi](https://xiaozhi.me) — the tiny Chinese AI model that lives in ESP32 chips. We gave it 15 tools and a terminal. What could go wrong?
+
+![Pelulu CLI Preview](preview.jpg)
 
 ```
-╭────────────────────────────────────────────────╮
-│                   🐾 Pelulu CLI                   │
-├────────────────────────────────────────────────┤
-│  📁 my-project                                 │
-│  🔧 15 tools · 67 actions · 15 MCP slots used  │
-│  🟢 Connected to XiaoZhi                       │
-╰────────────────────────────────────────────────╯
+  /\_/\  
+ ( o.o )  P E L U L U - C L I
+  > ^ <   v.1.0.1  |  powered by XiaoZhi
+ /|   |\ 
+(_|   |_)  the tiny coding companion
+
+╭────────────────────────────────────────────────────────────╮
+│ pelulu-cli v.1.0.1 | ONLINE | 594c02b2 | Provider: Xiaozhi.me │
+╰────────────────────────────────────────────────────────────╯
 ```
 
 ## What is this?
@@ -21,7 +25,8 @@ Pelulu CLI is a terminal-based AI coding agent that connects to XiaoZhi (a small
 ## Features
 
 - **15 Consolidated Tools** — 67 actions packed into 15 MCP slots (because XiaoZhi has a 32-tool limit and we're not wasteful)
-- **Rich TUI** — Box drawing, colors, emoji. Your terminal will look like a hacker movie from 2003
+- **Rich TUI** — Box drawing, colors, scrollable chat. Your terminal will look like a hacker movie from 2003
+- **Scrollable Chat** — Shift+Up/Down or PageUp/PageDown to scroll through message history
 - **Auto-detect Projects** — `cd my-project && pelulu` and it figures out the rest
 - **Safety Sandbox** — Won't let the AI `rm -rf /` (we tested... extensively)
 - **Destructive Op Confirmation** — Asks before deleting your life's work
@@ -29,7 +34,8 @@ Pelulu CLI is a terminal-based AI coding agent that connects to XiaoZhi (a small
 - **Session Persistence** — Remembers your device ID so you don't have to re-activate every time
 - **Plugin System** — Add your own tools (if 67 actions aren't enough for you)
 - **Auto-reconnect** — MQTT disconnects happen. We handle them. Mostly.
-
+- **Auto-format** — Formats code after edits (prettier/black if available, basic cleanup otherwise)
+- **Mandatory Updates** — Blocks CLI when a new version is available (keeps everyone on the latest)
 
 ## Quick Start
 
@@ -58,7 +64,7 @@ First run: you'll get an activation code. Go to [xiaozhi.me](https://xiaozhi.me)
 
 | Tool | Actions | What it does |
 |------|---------|-------------|
-| `file` | read, write, edit, list, delete, mkdir, copy, move, exists | File operations (9 actions, 1 MCP slot — efficiency™) |
+| `file` | read, write, edit, list, delete, mkdir, copy, move, exists | File operations (9 actions, 1 MCP slot) |
 | `shell` | exec, bg, ps, kill | Run commands (with safety rails) |
 | `git` | init, clone, status, diff, log, add, commit, push, pull, branch | Full git workflow |
 | `search` | grep, find, web | Search files and the internet |
@@ -102,86 +108,72 @@ pelulu --wizard           # Re-run setup wizard
 ### Shortcuts (Natural Language)
 
 ```
-read index.js           → file read
-run npm test            → shell exec
-git status              → git status
-build                   → project build
-search TODO             → search grep
+read index.js           -> file read
+run npm test            -> shell exec
+git status              -> git status
+build                   -> project build
+search TODO             -> search grep
+```
+
+### Scrolling
+
+```
+Shift+Up / Shift+Down   # Scroll by 5 messages
+PageUp / PageDown       # Scroll by 20 messages
 ```
 
-## Fun Facts 🎉
+## Fun Facts
 
 - **XiaoZhi's main job** is being a voice assistant for ESP32 microcontrollers. We basically gave a thermostat the ability to `git push --force`
 - **The 32-tool limit** exists because XiaoZhi was designed to control smart home devices, not write your React app. We consolidated 67 actions into 15 tools just to fit
-- **It responds in Mandarin** sometimes. We consider this a feature, not a bug. 非常好！
+- **It responds in Mandarin** sometimes. We consider this a feature, not a bug.
 - **The MQTT protocol** was chosen because that's what IoT devices use. Your coding agent runs on the same protocol as your smart fridge
 - **XiaoZhi costs approximately $0** to run. Your coding agent is cheaper than a cup of coffee. The quality is... also about that
 - **We tested `rm -rf /`** protection extensively. The AI suggested it exactly once. It was blocked. The AI seemed disappointed
-- **The model runs on a Tenclass server** somewhere in China. Your code is being reviewed by an AI that was trained to turn on lights and play music
-- **15 MCP slots used** out of 32. That's 17 slots free for when someone inevitably asks us to add a "make coffee" tool
 
 ## Architecture
 
 ```
-┌──────────────┐     MQTT      ┌──────────────┐     MCP      ┌──────────────┐
-│  XiaoZhi AI  │ ←──────────→ │   Pelulu CLI   │ ←──────────→ │  15 Tools    │
-│  (tiny LLM)  │              │   (router)   │              │  (67 actions)│
-└──────────────┘              └──────────────┘              └──────────────┘
-                                    ↕
-                              ┌──────────────┐
-                              │   Rich TUI   │
-                              └──────────────┘
++--------------+     MQTT      +--------------+     MCP      +--------------+
+|  XiaoZhi AI  | <----------> |  Pelulu CLI  | <----------> |  15 Tools    |
+|  (tiny LLM)  |              |   (router)   |              | (67 actions) |
++--------------+              +--------------+              +--------------+
+                                  |
+                            +--------------+
+                            |   Ink TUI    |
+                            +--------------+
 ```
 
 ```
 src/
-├── index.js                ← Entry point
-├── repl.js                 ← CLI interface
-├── repl-commands.js        ← Command handlers
-├── core/
-│   ├── config.js           ← Config loader
-│   ├── event-bus.js        ← Pub/sub
-│   ├── logger.js           ← Logging
-│   ├── tool-registry.js    ← Tool registry
-│   ├── sandbox.js          ← Safety layer
-│   ├── session.js          ← Session state
-│   ├── system-prompt.js    ← Prompt builder
-│   ├── context.js          ← Context injection
-│   ├── confirm.js          ← Confirmation system
-│   ├── diff.js             ← Diff display
-│   ├── spinner.js          ← Progress indicators
-│   ├── workspace.js        ← Workspace detection
-│   ├── stats.js            ← Usage analytics
-│   ├── conversation.js     ← Conv export/import
-│   ├── wizard.js           ← Config wizard
-│   ├── formatter.js        ← Rich output formatting
-│   ├── tool-help.js        ← Tool examples
-│   ├── intent.js           ← Natural language parser
-│   ├── file-tracker.js     ← File change tracking
-│   ├── auto-format.js      ← Code auto-format
-│   ├── error-handler.js    ← Smart errors
-│   ├── thinking.js         ← AI state indicator
-│   ├── model-info.js       ← Model info
-│   ├── keybindings.js      ← Keyboard shortcuts
-│   ├── completion.js       ← Command completion
-│   └── retry.js            ← Retry logic
-├── mcp/
-│   ├── mqtt-client.js      ← MQTT connection
-│   ├── mcp-handler.js      ← MCP protocol
-│   ├── activation.js       ← Device activation
-│   ├── message-sender.js   ← Message queue
-│   └── wss-endpoint.js     ← WSS endpoint
-├── tools/
-│   ├── file.js, shell.js, git.js, search.js
-│   ├── project.js, process.js, network.js
-│   ├── env.js, ai.js, snippet.js
-│   ├── template.js, history.js, config.js
-│   ├── diff.js, watch.js
-├── plugins/
-│   └── manager.js          ← Plugin loader
-└── tui/
-    ├── renderer.js         ← Rich TUI (chalk)
-    └── status-bar.js       ← Status bar
++-- index.js                <- Entry point
++-- core/
+|   +-- config.js           <- Config loader
+|   +-- event-bus.js        <- Pub/sub
+|   +-- logger.js           <- Logging (Ink-aware)
+|   +-- tool-registry.js    <- Tool registry
+|   +-- sandbox.js          <- Safety layer
+|   +-- session.js          <- Session state
+|   +-- system-prompt.js    <- Prompt builder
+|   +-- auto-format.js      <- Code auto-format
+|   +-- intent.js           <- Natural language parser
+|   +-- formatter.js        <- Rich output formatting
+|   +-- thinking.js         <- AI state indicator
+|   +-- completion.js       <- Command completion
++-- mcp/
+|   +-- mqtt-client.js      <- MQTT connection
+|   +-- mcp-handler.js      <- MCP protocol
+|   +-- activation.js       <- Device activation
++-- tools/
+|   +-- file.js, shell.js, git.js, search.js, ...
++-- plugins/
+|   +-- manager.js          <- Plugin loader
++-- tui/
+    +-- ink-app.js          <- Main Ink React app
+    +-- ink-components.js   <- UI components
+    +-- ink-entry.js        <- Ink entry point
+    +-- renderer.js         <- Banner & helpers
+    +-- completable-input.js <- Tab completion input
 ```
 
 ## Extending
@@ -246,11 +238,6 @@ export default {
 - Complex requests (8+ files) may timeout. The model needs to think. It's doing its best.
 - The AI occasionally suggests `rm -rf /` as a solution. We block it. The AI learns nothing.
 - MQTT connections can be unstable. We reconnect. It's fine. Everything is fine.
-- The model is small. Like, really small. It runs on chips that cost less than a candy bar.
-
-## Why "Nexa"?
-
-Because it sounds cool and vaguely futuristic. Also "xiaozhi-cli" was already taken (by us, in a previous life). We wanted something that says "this is a serious developer tool" while secretly knowing it's powered by an AI that was trained to control smart light bulbs.
 
 ## Contributing
 
@@ -267,7 +254,7 @@ MIT — do whatever you want with it. If you make money using an AI that was des
 ---
 
 <p align="center">
-  Built with ❤️ and questionable decisions<br>
+  Built with questionable decisions<br>
   Powered by <a href="https://xiaozhi.me">XiaoZhi</a> — the little AI that could<br>
   <sub>It's not stupid, it's compact</sub>
 </p>

package/config.example.json

@@ -15,7 +15,8 @@
   },
   "tools": {
     "shell_timeout": 30000,
-    "max_output": 10000
+    "max_output": 10000,
+    "auto_format": true
   },
   "plugins": {
     "enabled": [],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pelulu-cli",
-  "version": "1.0.0",
+  "version": "1.0.3",
   "description": "CLI coding agent powered by XiaoZhi AI — a tiny Chinese LLM that lives in ESP32 chips",
   "type": "module",
   "main": "src/index.js",
@@ -9,8 +9,8 @@
   },
   "scripts": {
     "start": "node src/index.js",
-    "start:text": "node src/index.js --text",
     "start:debug": "node src/index.js --debug",
+    "start:fallback": "node src/index.js --no-ink",
     "tools": "node src/index.js --list-tools",
     "test": "node src/index.js --test"
   },
@@ -35,8 +35,11 @@
   "author": "chaerulchas",
   "license": "MIT",
   "dependencies": {
+    "chalk": "^5.3.0",
+    "ink": "^5.2.1",
+    "ink-text-input": "^6.0.0",
     "mqtt": "^5.3.0",
-    "chalk": "^5.3.0"
+    "react": "^18.3.1"
   },
   "engines": {
     "node": ">=18"

package/src/core/auto-format.js

@@ -1,8 +1,10 @@
 /**
  * AutoFormat — format code after edits
  * Detects project type and runs appropriate formatter
+ * Falls back to basic cleanup if no formatter is available
  */
 import { exec } from 'child_process';
+import { readFile, writeFile } from 'fs/promises';
 import { existsSync } from 'fs';
 import { join } from 'path';
 import { getConfig } from './config.js';
@@ -23,25 +25,72 @@ async function detectType(cwd) {
   return null;
 }
 
+/**
+ * Basic formatter — no external deps required
+ * Trims trailing whitespace, ensures final newline, normalizes blank lines
+ */
+async function basicFormat(filePath) {
+  try {
+    const content = await readFile(filePath, 'utf-8');
+    const formatted = content
+      .replace(/[ \t]+$/gm, '')     // trailing whitespace
+      .replace(/\n{3,}/g, '\n\n')   // max 2 consecutive blank lines
+      .replace(/\r\n/g, '\n')       // normalize line endings
+      .replace(/\r/g, '\n');
+
+    // Ensure final newline
+    const final = formatted.endsWith('\n') ? formatted : formatted + '\n';
+
+    if (final !== content) {
+      await writeFile(filePath, final, 'utf-8');
+      log('file', `formatted: ${filePath}`);
+      return true;
+    }
+    return false;
+  } catch (e) {
+    debug(`Basic format failed: ${e.message}`);
+    return false;
+  }
+}
+
+/**
+ * Try external formatter (prettier, black, etc.)
+ * Returns true if successful, false if not available or failed
+ */
+async function externalFormat(formatter, filePath, cwd) {
+  return new Promise((resolve) => {
+    exec(`${formatter.cmd} "${filePath}"`, { cwd, timeout: 10000 }, (err, stdout, stderr) => {
+      if (err) {
+        debug(`External formatter failed: ${err.message}`);
+        resolve(false);
+      } else {
+        log('file', `formatted: ${filePath}`);
+        resolve(true);
+      }
+    });
+  });
+}
+
 export async function autoFormat(filePath) {
   const cfg = getConfig();
   if (!cfg.tools?.auto_format) return; // disabled by default
 
   const cwd = cfg.agent?.workspace || process.cwd();
   const type = await detectType(cwd);
-  if (!type) return;
-
-  const formatter = FORMATTERS[type];
-  if (!formatter) return;
 
   const ext = filePath.split('.').pop()?.toLowerCase();
-  if (!formatter.ext.includes(ext)) return;
+  const codeExts = ['js', 'jsx', 'ts', 'tsx', 'json', 'md', 'py', 'rs', 'go', 'css', 'html', 'yaml', 'yml', 'toml'];
+  if (!codeExts.includes(ext)) return;
 
-  return new Promise((resolve) => {
-    exec(`${formatter.cmd} "${filePath}"`, { cwd, timeout: 10000 }, (err, stdout, stderr) => {
-      if (err) debug(`Auto-format failed: ${err.message}`);
-      else log('file', `🎨 Formatted: ${filePath}`);
-      resolve(!err);
-    });
-  });
+  // Try external formatter first
+  if (type && FORMATTERS[type]) {
+    const formatter = FORMATTERS[type];
+    if (formatter.ext.includes(ext)) {
+      const ok = await externalFormat(formatter, filePath, cwd);
+      if (ok) return;
+    }
+  }
+
+  // Fallback to basic format
+  await basicFormat(filePath);
 }

package/src/core/config.js

@@ -33,7 +33,7 @@ export async function loadConfig(root) {
     agent: { name: 'Pelulu CLI', version: '1.0.0', workspace: '~/Pelulu-CLI' },
     mqtt: { ota_url: 'https://api.tenclass.net/xiaozhi/ota/', keepalive: 240 },
     mcp: { endpoint_url: '' },
-    tools: { shell_timeout: 30000, max_output: 10000 },
+    tools: { shell_timeout: 30000, max_output: 10000, auto_format: true },
     plugins: { enabled: [], disabled: [] },
   };
 

package/src/core/confirm.js

@@ -28,7 +28,7 @@ export async function askConfirmation(toolName, args, check) {
   if (!check.destructive) return true;
 
   const color = check.level === 'danger' ? COLORS.red : COLORS.yellow;
-  const icon = check.level === 'danger' ? '🚨' : '⚠️';
+  const icon = check.level === 'danger' ? '[!]' : '[WARN]';
 
   console.log(`\n${color}${icon} ${check.msg}${COLORS.reset}`);
   console.log(`${COLORS.dim}  Tool: ${toolName}${COLORS.reset}`);
@@ -44,7 +44,7 @@ export async function askConfirmation(toolName, args, check) {
     rl.question(`${color}  Continue? (y/N): ${COLORS.reset}`, (answer) => {
       rl.close();
       const ok = answer.trim().toLowerCase() === 'y';
-      if (!ok) console.log(`${COLORS.red}  ❌ Cancelled${COLORS.reset}\n`);
+      if (!ok) console.log(`${COLORS.red}  [ERR] Cancelled${COLORS.reset}\n`);
       resolve(ok);
     });
   });

package/src/core/diff.js

@@ -9,7 +9,7 @@ export function showDiff(oldText, newText, filePath) {
   const newLines = newText.split('\n');
   const maxLen = Math.max(oldLines.length, newLines.length);
 
-  console.log(`\n${COLORS.bold}📝 Changes: ${filePath || ''}${COLORS.reset}\n`);
+  console.log(`\n${COLORS.bold}[EDIT] Changes: ${filePath || ''}${COLORS.reset}\n`);
 
   let changes = 0;
   for (let i = 0; i < maxLen; i++) {
@@ -30,7 +30,7 @@ export function showDiff(oldText, newText, filePath) {
 }
 
 export function showPatch(filePath, hunks) {
-  console.log(`\n${COLORS.bold}📝 Patch: ${filePath}${COLORS.reset}\n`);
+  console.log(`\n${COLORS.bold}[EDIT] Patch: ${filePath}${COLORS.reset}\n`);
   for (const hunk of hunks) {
     console.log(`${COLORS.cyan}@@ ${hunk.header || ''} @@${COLORS.reset}`);
     for (const line of hunk.lines) {
@@ -43,8 +43,8 @@ export function showPatch(filePath, hunks) {
 }
 
 export function formatFileChange(action, path, details) {
-  const icons = { created: '✨', modified: '📝', deleted: '🗑️', renamed: '📎' };
-  const icon = icons[action] || '📄';
+  const icons = { created: '[NEW]', modified: '[EDIT]', deleted: '[DEL]', renamed: '[REN]' };
+  const icon = icons[action] || '[FILE]';
   const detailStr = details ? ` ${COLORS.dim}(${details})${COLORS.reset}` : '';
   return `${icon} ${action}: ${path}${detailStr}`;
 }

package/src/core/doctor.js

@@ -48,10 +48,10 @@ export async function runDoctor() {
   checks.push({ name: 'Git repo', ok: hasGit, value: hasGit ? 'yes' : 'no' });
 
   // Print report
-  console.log(`\n${COLORS.bold}🩺 Doctor Report:${COLORS.reset}\n`);
+  console.log(`\n${COLORS.bold}[DOC] Doctor Report:${COLORS.reset}\n`);
   let allOk = true;
   for (const c of checks) {
-    const icon = c.ok ? `${COLORS.green}✅${COLORS.reset}` : `${COLORS.red}❌${COLORS.reset}`;
+    const icon = c.ok ? `${COLORS.green}[OK]${COLORS.reset}` : `${COLORS.red}[ERR]${COLORS.reset}`;
     console.log(`  ${icon} ${c.name.padEnd(18)} ${c.value}`);
     if (!c.ok) allOk = false;
   }

package/src/core/error-handler.js

@@ -21,7 +21,7 @@ export function handleError(error) {
   const code = error.code || error.constructor?.name || 'UNKNOWN';
   const suggestion = ERROR_SUGGESTIONS[code]?.(error) || null;
 
-  const lines = [`${COLORS.red}❌ ${error.message}${COLORS.reset}`];
+  const lines = [`${COLORS.red}[ERR] ${error.message}${COLORS.reset}`];
   if (suggestion) lines.push(`${COLORS.yellow}💡 ${suggestion}${COLORS.reset}`);
 
   return lines.join('\n');

package/src/core/file-tracker.js

@@ -32,10 +32,10 @@ export class FileTracker {
     const modified = changes.filter(c => c.action === 'modified');
     const deleted = changes.filter(c => c.action === 'deleted');
 
-    const lines = [`${COLORS.bold}📁 File Changes:${COLORS.reset}`];
-    if (created.length) lines.push(`  ${COLORS.green}✨ Created:${COLORS.reset} ${created.map(c => c.path).join(', ')}`);
-    if (modified.length) lines.push(`  ${COLORS.yellow}📝 Modified:${COLORS.reset} ${modified.map(c => `${c.path} (${c.count}x)`).join(', ')}`);
-    if (deleted.length) lines.push(`  ${COLORS.red}🗑️ Deleted:${COLORS.reset} ${deleted.map(c => c.path).join(', ')}`);
+    const lines = [`${COLORS.bold}[DIR] File Changes:${COLORS.reset}`];
+    if (created.length) lines.push(`  ${COLORS.green}[NEW] Created:${COLORS.reset} ${created.map(c => c.path).join(', ')}`);
+    if (modified.length) lines.push(`  ${COLORS.yellow}[EDIT] Modified:${COLORS.reset} ${modified.map(c => `${c.path} (${c.count}x)`).join(', ')}`);
+    if (deleted.length) lines.push(`  ${COLORS.red}[DEL] Deleted:${COLORS.reset} ${deleted.map(c => c.path).join(', ')}`);
 
     return lines.join('\n');
   }

package/src/core/formatter.js

@@ -25,35 +25,35 @@ function tryParse(text) {
 }
 
 function formatError(text) {
-  return `${COLORS.red}❌ ${text}${COLORS.reset}`;
+  return `${COLORS.red}[ERR] ${text}${COLORS.reset}`;
 }
 
 function formatFileResult(action, data) {
   if (action === 'read') {
     const lines = data.content?.split('\n').length || 0;
-    return `${COLORS.green}✅${COLORS.reset} ${data.path} (${lines} lines, ${data.totalSize} chars)`;
+    return `${COLORS.green}[OK]${COLORS.reset} ${data.path} (${lines} lines, ${data.totalSize} chars)`;
   }
-  if (action === 'write') return `${COLORS.green}✅${COLORS.reset} Written: ${data.path} (${data.written} chars)`;
-  if (action === 'edit') return `${COLORS.green}✅${COLORS.reset} Edited: ${data.path} (${data.occurrences} occurrence(s))`;
+  if (action === 'write') return `${COLORS.green}[OK]${COLORS.reset} Written: ${data.path} (${data.written} chars)`;
+  if (action === 'edit') return `${COLORS.green}[OK]${COLORS.reset} Edited: ${data.path} (${data.occurrences} occurrence(s))`;
   if (action === 'list') {
     const dirs = data.items?.filter(i => i.type === 'dir').length || 0;
     const files = data.items?.filter(i => i.type === 'file').length || 0;
-    return `${COLORS.green}✅${COLORS.reset} ${data.path}: ${dirs} dirs, ${files} files`;
+    return `${COLORS.green}[OK]${COLORS.reset} ${data.path}: ${dirs} dirs, ${files} files`;
   }
-  if (action === 'exists') return data.exists ? `✅ ${data.type}: ${data.path}` : `❌ Not found: ${data.path}`;
-  if (action === 'delete') return `${COLORS.yellow}🗑️${COLORS.reset} Deleted: ${data.path}`;
-  return `${COLORS.green}✅${COLORS.reset} ${action}: ${JSON.stringify(data)}`;
+  if (action === 'exists') return data.exists ? `[OK] ${data.type}: ${data.path}` : `[ERR] Not found: ${data.path}`;
+  if (action === 'delete') return `${COLORS.yellow}[DEL]${COLORS.reset} Deleted: ${data.path}`;
+  return `${COLORS.green}[OK]${COLORS.reset} ${action}: ${JSON.stringify(data)}`;
 }
 
 function formatGitResult(action, data) {
   if (action === 'status') {
     const dirty = data.dirty ? `${COLORS.yellow}dirty${COLORS.reset}` : `${COLORS.green}clean${COLORS.reset}`;
-    return `🌿 ${data.branch} (${dirty}) ${data.changes?.length || 0} changes`;
+    return `${data.branch} (${dirty}) ${data.changes?.length || 0} changes`;
   }
-  if (action === 'log') return `📜 ${data.commits?.length || 0} commits:\n  ${data.commits?.join('\n  ')}`;
-  if (action === 'commit') return data.committed ? `${COLORS.green}✅${COLORS.reset} Committed: ${data.message}` : `⚠️ ${data.reason}`;
-  if (action === 'branch') return data.branches ? `🌿 Branches:\n  ${data.branches.join('\n  ')}` : `✅ ${data.created || data.deleted}`;
-  return `${COLORS.green}✅${COLORS.reset} git ${action}: ${JSON.stringify(data)}`;
+  if (action === 'log') return `${data.commits?.length || 0} commits:\n  ${data.commits?.join('\n  ')}`;
+  if (action === 'commit') return data.committed ? `${COLORS.green}[OK]${COLORS.reset} Committed: ${data.message}` : `[WARN] ${data.reason}`;
+  if (action === 'branch') return data.branches ? `Branches:\n  ${data.branches.join('\n  ')}` : `[OK] ${data.created || data.deleted}`;
+  return `${COLORS.green}[OK]${COLORS.reset} git ${action}: ${JSON.stringify(data)}`;
 }
 
 function formatShellResult(data) {
@@ -65,16 +65,16 @@ function formatShellResult(data) {
 }
 
 function formatSearchResult(action, data) {
-  if (action === 'grep') return `🔍 ${data.matches} matches for "${data.pattern}":\n  ${(data.results || []).join('\n  ')}`;
-  if (action === 'find') return `🔍 ${data.matches} files matching "${data.pattern}":\n  ${(data.files || []).join('\n  ')}`;
-  if (action === 'web') return `🌐 ${data.url} (${data.status}):\n${data.body?.slice(0, 500)}`;
+  if (action === 'grep') return `${data.matches} matches for "${data.pattern}":\n  ${(data.results || []).join('\n  ')}`;
+  if (action === 'find') return `${data.matches} files matching "${data.pattern}":\n  ${(data.files || []).join('\n  ')}`;
+  if (action === 'web') return `${data.url} (${data.status}):\n${data.body?.slice(0, 500)}`;
   return JSON.stringify(data, null, 2);
 }
 
 function formatProjectResult(action, data) {
-  if (action === 'build') return data.success ? `${COLORS.green}✅ Build OK${COLORS.reset} (${data.type})` : `${COLORS.red}❌ Build failed${COLORS.reset} (exit ${data.exitCode})`;
-  if (action === 'test') return data.passed ? `${COLORS.green}✅ Tests passed${COLORS.reset}` : `${COLORS.red}❌ Tests failed${COLORS.reset} (exit ${data.exitCode})`;
-  if (action === 'info') return `📁 ${data.name || data.type}: ${data.scripts?.join(', ') || 'no scripts'}`;
+  if (action === 'build') return data.success ? `${COLORS.green}[OK] Build OK${COLORS.reset} (${data.type})` : `${COLORS.red}[ERR] Build failed${COLORS.reset} (exit ${data.exitCode})`;
+  if (action === 'test') return data.passed ? `${COLORS.green}[OK] Tests passed${COLORS.reset}` : `${COLORS.red}[ERR] Tests failed${COLORS.reset} (exit ${data.exitCode})`;
+  if (action === 'info') return `${data.name || data.type}: ${data.scripts?.join(', ') || 'no scripts'}`;
   return JSON.stringify(data, null, 2);
 }
 

package/src/core/logger.js

@@ -1,7 +1,10 @@
 /**
  * Logger — colored terminal output with levels
+ * Supports Ink mode: when active, logs go through bus instead of console
  */
 let _debug = false;
+let _inkMode = false;
+let _bus = null;
 
 export const COLORS = {
   reset: '\x1b[0m',
@@ -16,10 +19,16 @@ export const COLORS = {
   gray: '\x1b[90m',
 };
 
+export function setInkMode(enabled, bus) {
+  _inkMode = enabled;
+  _bus = bus;
+}
+export function isInkMode() { return _inkMode; }
+
 const ICONS = {
-  ok: '✅', err: '❌', warn: '⚠️', info: 'ℹ️',
-  tool: '🔧', mcp: '🔗', plugin: '🧩', system: '⚙️',
-  user: '👤', ai: '🤖', debug: '🔍', file: '📁',
+  ok: '[OK]', err: '[ERR]', warn: '[WARN]', info: '[i]',
+  tool: '[TOOL]', mcp: '[MCP]', plugin: '[PLUG]', system: '[SYS]',
+  user: '[USER]', ai: '[AI]', debug: '[DBG]', file: '[FILE]',
 };
 
 export function setDebug(enabled) { _debug = enabled; }
@@ -28,6 +37,13 @@ export function debug(msg, data) { log('debug', msg, data); }
 
 export function log(level, msg, data) {
   if (level === 'debug' && !_debug) return;
+
+  // In Ink mode, route logs through bus so they render inside the TUI
+  if (_inkMode && _bus) {
+    _bus.emit('log:message', { level, msg, data });
+    return;
+  }
+
   const icon = ICONS[level] || '';
   const color = {
     ok: COLORS.green, err: COLORS.red, warn: COLORS.yellow,

package/src/core/spinner.js

@@ -39,11 +39,11 @@ export class Spinner {
   }
 
   success(text) {
-    this.stop(`${COLORS.green}✅ ${text}${COLORS.reset}`);
+    this.stop(`${COLORS.green}[OK] ${text}${COLORS.reset}`);
   }
 
   fail(text) {
-    this.stop(`${COLORS.red}❌ ${text}${COLORS.reset}`);
+    this.stop(`${COLORS.red}[ERR] ${text}${COLORS.reset}`);
   }
 }
 

package/src/core/stats.js

@@ -41,9 +41,9 @@ export class Stats {
   formatReport() {
     const s = this.getSummary();
     const lines = [
-      `📊 Session Stats`,
+      `[STATS] Session Stats`,
       `   Uptime: ${s.uptime}s`,
-      `   Tool calls: ${s.total} (${s.success} ✅ / ${s.failed} ❌)`,
+      `   Tool calls: ${s.total} (${s.success} [OK] / ${s.failed} [ERR])`,
       `   Avg duration: ${s.avgDuration}ms`,
     ];
     if (s.topTools.length) {

package/src/core/thinking.js

@@ -6,14 +6,14 @@ import { COLORS } from './logger.js';
 import { bus } from './event-bus.js';
 
 const THINK_STATES = {
-  idle: { icon: '💤', text: 'Idle' },
-  thinking: { icon: '🤔', text: 'Thinking...' },
-  tool_call: { icon: '🔧', text: 'Using tool...' },
-  reading: { icon: '📖', text: 'Reading file...' },
-  writing: { icon: '✏️', text: 'Writing...' },
-  searching: { icon: '🔍', text: 'Searching...' },
-  building: { icon: '🔨', text: 'Building...' },
-  testing: { icon: '🧪', text: 'Testing...' },
+  idle: { icon: '-', text: 'Idle' },
+  thinking: { icon: '..', text: 'Thinking...' },
+  tool_call: { icon: '>>', text: 'Using tool...' },
+  reading: { icon: '..', text: 'Reading file...' },
+  writing: { icon: '..', text: 'Writing...' },
+  searching: { icon: '..', text: 'Searching...' },
+  building: { icon: '..', text: 'Building...' },
+  testing: { icon: '..', text: 'Testing...' },
 };
 
 export class Thinking {