pelulu-cli 1.0.0 → 1.0.1

package/src/mcp/mqtt-client.js

@@ -111,9 +111,9 @@ export class MqttClient {
     for (const r of responses) {
       if (r.type === 'mcp') { this._send(r); }
       else if (r.type === 'tool_call') {
-        log('tool', `🔧 ${r.name}`);
+        log('tool', r.name);
         this.mcp.executeTool(r.name, r.args)
-          .then(result => { log('tool', result.isError ? '❌' : '✅'); this._send({ type: 'mcp', payload: { jsonrpc: '2.0', id: r.id, result } }); })
+          .then(result => { log('tool', result.isError ? 'failed' : 'done'); this._send({ type: 'mcp', payload: { jsonrpc: '2.0', id: r.id, result } }); })
           .catch(err => { this._send({ type: 'mcp', payload: { jsonrpc: '2.0', id: r.id, result: { content: [{ type: 'text', text: err.message }], isError: true } } }); });
       }
     }
@@ -124,7 +124,7 @@ export class MqttClient {
   }
 
   _onOther(msg) {
-    if (msg.type === 'stt') { log('user', `🎤 "${msg.text}"`); bus.emit('stt', msg.text); }
+    if (msg.type === 'stt') { log('user', `"${msg.text}"`); bus.emit('stt', msg.text); }
     if (msg.type === 'llm' && msg.text) { bus.emit('llm:text', msg.text); }
     if (msg.type === 'tts' && msg.state === 'sentence_start' && msg.text) { bus.emit('tts:sentence', msg.text); }
     if (msg.type === 'goodbye') { this.sessionId = null; this.mcp.reset(); this._helloQueue = []; }
@@ -138,7 +138,7 @@ export class MqttClient {
 
   sendText(text) {
     this._send({ type: 'listen', state: 'detect', text });
-    log('user', `💬 "${text}"`);
+    log('user', `"${text}"`);
     bus.emit('user:text', text);
   }
 

package/src/repl-commands.js

@@ -76,7 +76,7 @@ export async function handleCommand(cmd, arg, ctx) {
     case '/history': {
       const recent = history.slice(-10);
       if (!recent.length) { log('info', 'No history'); break; }
-      console.log(`\n${COLORS.bold}📜 Recent:${COLORS.reset}\n`);
+      console.log(`\n${COLORS.bold}[LOG] Recent:${COLORS.reset}\n`);
       for (const h of recent) console.log(`  ${COLORS.dim}${new Date(h.ts).toLocaleTimeString()}${COLORS.reset} ${h.text.slice(0, 80)}`);
       console.log();
       break;
@@ -84,6 +84,7 @@ export async function handleCommand(cmd, arg, ctx) {
 
     case '/doctor': await runDoctor(); break;
     case '/model': console.log(`\n${formatModelInfo()}\n`); break;
+    case '/keys': return 'keys';
     case '/clear': console.clear(); break;
     default: log('info', `Unknown: ${cmd}. /help`);
   }

package/src/repl.js

@@ -9,6 +9,8 @@ import { formatToolResult } from './core/formatter.js';
 import { parseIntent } from './core/intent.js';
 import { FileTracker } from './core/file-tracker.js';
 import { handleCommand } from './repl-commands.js';
+import { getCompletions } from './core/completion.js';
+import { formatKeybindings } from './core/keybindings.js';
 import {
   renderBanner, renderStatus, renderTools, renderHelp,
   renderToolCall, renderToolResult, renderAiResponse,
@@ -16,19 +18,21 @@ import {
 } from './tui/renderer.js';
 
 export class REPL {
-  constructor(registry, mqtt, stats, session) {
+  constructor(registry, mqtt, stats, session, extras = {}) {
     this.registry = registry;
     this.mqtt = mqtt;
     this.stats = stats;
     this.session = session;
     this.fileTracker = new FileTracker();
+    this.thinking = extras.thinking || null;
+    this.sender = extras.sender || null;
+    this.autoFormat = extras.autoFormat || null;
     this.rl = null;
     this.history = [];
   }
 
   start() {
     const config = getConfig();
-    renderBanner(config, this.registry.all(), this.mqtt.connected);
     this._events();
 
     if (!process.stdin.isTTY) {
@@ -41,6 +45,10 @@ export class REPL {
     this.rl = createInterface({
       input: process.stdin, output: process.stdout,
       prompt: createPrompt(dirName), historySize: 200,
+      completer: (line) => {
+        const hits = getCompletions(line);
+        return [hits.length ? hits : [], line];
+      },
     });
     this.rl.prompt();
     this.rl.on('line', (input) => this._line(input.trim()));
@@ -49,12 +57,15 @@ export class REPL {
 
   _events() {
     bus.on('llm:text', (text) => {
+      if (this.thinking) this.thinking.set('idle');
+      // Clear any thinking indicator line
+      process.stdout.write('\r' + ' '.repeat(60) + '\r');
       renderAiResponse(text);
       if (this.rl) this.rl.prompt();
     });
 
     bus.on('tts:sentence', (text) => {
-      console.log(chalk.dim(`     🔊 ${text}`));
+      // TTS is audio output, no need to display text
     });
 
     bus.on('tool:called', ({ name, result, args }) => {
@@ -63,7 +74,7 @@ export class REPL {
     });
 
     bus.on('ready', () => {
-      console.log(chalk.green('  ✅ XiaoZhi session ready\n'));
+      if (this.rl) this.rl.prompt();
     });
   }
 
@@ -75,7 +86,11 @@ export class REPL {
     const intent = parseIntent(input);
     if (intent.matched) {
       renderUserInput(input);
+      if (this.thinking) this.thinking.set('tool_call');
       const result = await this.registry.call(intent.tool, intent.params);
+      if (this.thinking) this.thinking.set('idle');
+      // Clear thinking indicator
+      process.stdout.write('\r' + ' '.repeat(60) + '\r');
       const formatted = formatToolResult(intent.tool, intent.action, result);
       console.log(`\n${formatted}\n`);
       this.history.push({ role: 'user', text: input, ts: Date.now() });
@@ -86,6 +101,7 @@ export class REPL {
     // Send to XiaoZhi
     renderUserInput(input);
     this.history.push({ role: 'user', text: input, ts: Date.now() });
+    if (this.thinking) this.thinking.set('thinking');
     this.mqtt.sendText(input);
     this.rl?.prompt();
   }
@@ -93,15 +109,19 @@ export class REPL {
   async _cmd(input) {
     const [cmd, ...rest] = input.split(' ');
     const arg = rest.join(' ');
-    const ctx = { registry: this.registry, mqtt: this.mqtt, stats: this.stats, session: this.session, fileTracker: this.fileTracker, history: this.history };
+    const ctx = {
+      registry: this.registry, mqtt: this.mqtt, stats: this.stats,
+      session: this.session, fileTracker: this.fileTracker, history: this.history,
+    };
     const special = await handleCommand(cmd, arg, ctx);
 
     if (special === 'help') renderHelp();
     if (special === 'tools') renderTools(this.registry.list());
+    if (special === 'keys') console.log(formatKeybindings());
     if (special === 'status') {
       const s = this.session.getStats();
       renderStatus({
-        'MQTT': this.mqtt.connected ? '✅ Connected' : '❌ Disconnected',
+        'MQTT': this.mqtt.connected ? '[OK] Connected' : '[ERR] Disconnected',
         'Session': this.mqtt.sessionId || 'none',
         'Tools': `${this.registry.all().length} (${this.registry.all().reduce((s, t) => s + (t.actions?.length || 0), 0)} actions)`,
         'Turns': s.turns,

package/src/tools/config.js

@@ -36,7 +36,7 @@ const ACTIONS = {
       const config = getConfig();
       setNested(config, key, value);
       await saveConfig(config._root, config);
-      log('config', `⚙️ Set ${key} = ${value}`);
+      log('config', `[CFG] Set ${key} = ${value}`);
       return { key, value, saved: true };
     },
   },

package/src/tools/diff.js

@@ -6,6 +6,7 @@ import { readFile } from 'fs/promises';
 import { resolve } from 'path';
 import { homedir } from 'os';
 import { log } from '../core/logger.js';
+import { showDiff } from '../core/diff.js';
 
 const HOME = homedir();
 
@@ -50,6 +51,11 @@ const ACTIONS = {
 
       return { file1: abs1, file2: abs2, totalChanges: changes.length, hunks: hunks.slice(0, 20) };
     },
+    format: async ({ file1, file2 }) => {
+      const c1 = await readFile(file1, 'utf-8').catch(() => '');
+      const c2 = await readFile(file2, 'utf-8').catch(() => '');
+      if (c1 && c2) showDiff(c1, c2, file1);
+    },
   },
 
   stats: {

package/src/tools/file.js

@@ -40,7 +40,7 @@ const ACTIONS = {
       const abs = safe(path);
       await mkdir(dirname(abs), { recursive: true });
       await writeFile(abs, content, 'utf-8');
-      log('file', `📝 Written: ${abs} (${content.length} chars)`);
+      log('file', `[EDIT] Written: ${abs} (${content.length} chars)`);
       return { path: abs, written: content.length };
     },
   },
@@ -54,7 +54,7 @@ const ACTIONS = {
       const count = content.split(old_text).length - 1;
       content = content.replace(old_text, new_text);
       await writeFile(abs, content, 'utf-8');
-      log('file', `✏️ Edited: ${abs} (${count} occurrence(s))`);
+      log('file', `[EDIT] Edited: ${abs} (${count} occurrence(s))`);
       return { path: abs, edited: true, occurrences: count };
     },
   },
@@ -80,7 +80,7 @@ const ACTIONS = {
       const abs = safe(path);
       if (!existsSync(abs)) throw new Error(`Not found: ${abs}`);
       await unlink(abs);
-      log('file', `🗑️ Deleted: ${abs}`);
+      log('file', `[DEL] Deleted: ${abs}`);
       return { path: abs, deleted: true };
     },
   },

package/src/tools/git.js

@@ -85,7 +85,7 @@ const ACTIONS = {
       const msg = params.message.replace(/"/g, '\\"');
       const r = await git(`commit -m "${msg}"`, dir);
       if (r.code !== 0 && r.stderr.includes('nothing to commit')) return { committed: false, reason: 'nothing to commit' };
-      log('git', `📝 Committed: ${params.message}`);
+      log('git', `[EDIT] Committed: ${params.message}`);
       return { committed: true, message: params.message, output: r.stdout.slice(-300) };
     },
   },

package/src/tools/network.js

@@ -25,7 +25,7 @@ function httpGet(url, maxChars = 5000) {
 const ACTIONS = {
   async fetch({ url, method, body, headers }) {
     if (!url) throw new Error('url required');
-    log('network', `🌐 ${method || 'GET'} ${url}`);
+    log('network', `[WEB] ${method || 'GET'} ${url}`);
     const result = await httpGet(url);
     return { url, status: result.status, body: result.body.slice(0, 5000) };
   },

package/src/tools/project.js

@@ -57,7 +57,7 @@ const ACTIONS = {
       const type = await detectProject(dir);
       const cmd = BUILD_CMD[type];
       if (!cmd) throw new Error(`No build for ${type}`);
-      log('project', `🔨 Building (${type})...`);
+      log('project', `[BUILD] Building (${type})...`);
       const r = await run(cmd, dir);
       return { success: r.code === 0, type, exitCode: r.code, output: r.stdout.slice(-500) || r.stderr.slice(-500) };
     },
@@ -70,7 +70,7 @@ const ACTIONS = {
       const type = await detectProject(dir);
       const cmd = TEST_CMD[type];
       if (!cmd) throw new Error(`No test for ${type}`);
-      log('project', `🧪 Testing (${type})...`);
+      log('project', `[TEST] Testing (${type})...`);
       const r = await run(cmd, dir);
       return { passed: r.code === 0, type, exitCode: r.code, output: r.stdout.slice(-1000) || r.stderr.slice(-1000) };
     },

package/src/tools/search.js

@@ -34,7 +34,7 @@ const ACTIONS = {
     required: ['pattern'],
     handler: async ({ pattern, path, ignoreCase, include, context }) => {
       if (!pattern) throw new Error('pattern required');
-      log('search', `🔍 grep: ${pattern}`);
+      log('search', `[FIND] grep: ${pattern}`);
       const flags = ignoreCase ? '-rn' : '-rn';
       const ic = ignoreCase ? 'i' : '';
       const inc = include ? `--include="*.${include}"` : '';
@@ -49,7 +49,7 @@ const ACTIONS = {
   find: {
     required: ['name'],
     handler: async ({ name, path, type }) => {
-      log('search', `🔍 find: ${name}`);
+      log('search', `[FIND] find: ${name}`);
       const t = type ? `-type ${type}` : '';
       const cmd = `find "${path || '.'}" ${t} -name "${name}" 2>/dev/null | head -50`;
       const r = await runCmd(cmd);
@@ -60,7 +60,7 @@ const ACTIONS = {
   web: {
     required: ['url'],
     handler: async ({ url, maxChars }) => {
-      log('search', `🌐 fetch: ${url}`);
+      log('search', `[WEB] fetch: ${url}`);
       const r = await httpGet(url, maxChars || 8000);
       return { url, status: r.status, body: r.body.slice(0, maxChars || 8000), length: r.body.length };
     },

package/src/tools/shell.js

@@ -26,7 +26,7 @@ const ACTIONS = {
   exec: {
     required: ['command'],
     handler: async ({ command, timeout }) => {
-      log('shell', `⚙️ $ ${command}`);
+      log('shell', `[CFG] $ ${command}`);
       const result = await run(command, timeout);
       const maxLen = getConfig().tools?.max_output || 10000;
       return { stdout: result.stdout.slice(0, maxLen), stderr: result.stderr.slice(0, 2000), exitCode: result.code };
@@ -36,7 +36,7 @@ const ACTIONS = {
   bg: {
     required: ['command'],
     handler: async ({ command }) => {
-      log('shell', `⚙️ [bg] $ ${command}`);
+      log('shell', `[CFG] [bg] $ ${command}`);
       const child = spawn('bash', ['-c', command], { detached: true, stdio: 'ignore' });
       child.unref();
       return { pid: child.pid, background: true, command };

package/src/tools/template.js

@@ -71,7 +71,7 @@ const ACTIONS = {
       for (const [file, content] of Object.entries(files)) {
         await writeFile(join(dir, file), content);
       }
-      log('template', `📁 Created ${template}: ${dir}`);
+      log('template', `[DIR] Created ${template}: ${dir}`);
       return { created: true, template, path: dir, files: Object.keys(files) };
     },
   },

package/src/tools/watch.js

@@ -26,7 +26,7 @@ const ACTIONS = {
       const watcher = fsWatch(abs, { recursive: recursive !== false }, (eventType, filename) => {
         if (filter && !filename.includes(filter)) return;
         const event = { type: eventType, file: filename, path: abs, ts: Date.now() };
-        log('watch', `📁 ${eventType}: ${filename}`);
+        log('watch', `[DIR] ${eventType}: ${filename}`);
         bus.emit('file:change', event);
       });
 

package/src/tui/completable-input.js

@@ -0,0 +1,127 @@
+/**
+ * CompletableInput — TextInput with Tab auto-completion
+ * Wraps ink-text-input and adds completion support
+ */
+import React, { useState, useCallback } from 'react';
+import { Box, Text, useInput } from 'ink';
+import TextInput from 'ink-text-input';
+import { getCompletions } from '../core/completion.js';
+
+export function CompletableInput({ onSubmit, placeholder }) {
+  const [value, setValue] = useState('');
+  const [completions, setCompletions] = useState([]);
+  const [completionIndex, setCompletionIndex] = useState(0);
+  const [showCompletions, setShowCompletions] = useState(false);
+
+  // Handle Tab for completion
+  useInput((input, key) => {
+    if (key.tab) {
+      if (!showCompletions) {
+        // First Tab: show completions
+        const hits = getCompletions(value);
+        if (hits.length > 0) {
+          setCompletions(hits);
+          setCompletionIndex(0);
+          setShowCompletions(true);
+          // Auto-fill first match
+          if (hits.length === 1) {
+            setValue(hits[0] + ' ');
+            setShowCompletions(false);
+          } else {
+            setValue(hits[0]);
+          }
+        }
+      } else {
+        // Subsequent Tab: cycle through completions
+        const next = (completionIndex + 1) % completions.length;
+        setCompletionIndex(next);
+        setValue(completions[next]);
+      }
+    } else if (key.escape) {
+      // Escape: hide completions
+      setShowCompletions(false);
+      setCompletions([]);
+      setCompletionIndex(0);
+    } else if (key.return) {
+      // Enter: handled by TextInput onSubmit, do nothing here
+      setShowCompletions(false);
+      setCompletions([]);
+    } else {
+      // Any other key: reset completions
+      if (showCompletions) {
+        setShowCompletions(false);
+        setCompletions([]);
+        setCompletionIndex(0);
+      }
+    }
+  });
+
+  // Update value from TextInput (but not on Tab/Enter which are handled above)
+  const handleChange = useCallback((val) => {
+    setValue(val);
+    // Live completion hints
+    if (val.length > 0) {
+      const hits = getCompletions(val);
+      if (hits.length > 0 && hits[0] !== val) {
+        setCompletions(hits);
+        setShowCompletions(true);
+        setCompletionIndex(0);
+      } else {
+        setShowCompletions(false);
+      }
+    } else {
+      setShowCompletions(false);
+    }
+  }, []);
+
+  // Handle TextInput submit (Enter key)
+  const handleSubmit = useCallback((val) => {
+    const trimmed = val.trim();
+    if (trimmed) {
+      onSubmit(trimmed);
+      setValue('');
+    }
+    setShowCompletions(false);
+    setCompletions([]);
+  }, [onSubmit]);
+
+  return React.createElement(Box, { flexDirection: 'column', width: '100%' },
+    // Completion suggestions
+    showCompletions && completions.length > 1
+      ? React.createElement(Box, {
+          paddingLeft: 2, paddingBottom: 0,
+          flexDirection: 'row', flexWrap: 'wrap', gap: 1,
+        },
+        completions.slice(0, 8).map((c, i) =>
+          React.createElement(Text, {
+            key: c,
+            color: i === completionIndex ? 'cyan' : 'dim',
+            bold: i === completionIndex,
+            dimColor: i !== completionIndex,
+          },
+            i === completionIndex ? `[${c}]` : ` ${c} `
+          )
+        ),
+      )
+      : null,
+
+    // Input line
+    React.createElement(Box, { paddingX: 1 },
+      React.createElement(Text, { color: 'cyan' }, '> '),
+      React.createElement(TextInput, {
+        value,
+        onChange: handleChange,
+        onSubmit: handleSubmit,
+        placeholder: placeholder || 'type a message...',
+        // Don't show cursor when we have a completion suggestion
+        showCursor: !showCompletions || completions.length <= 1,
+      }),
+      // Show ghost completion (the remaining part of the suggested completion)
+      showCompletions && completions.length > 0 && value.length > 0
+        ? React.createElement(Text, { dimColor: true },
+            completions[completionIndex]?.slice(value.length) || ''
+          )
+        : null,
+    ),
+  );
+}