@gilangranggaid/kilua-agent 1.1.3 → 1.3.0

package/bin/kilua.mjs

@@ -4,13 +4,81 @@ import fs from "node:fs";
 import path from "node:path";
 import os from "node:os";
 import { execSync } from "node:child_process";
+import { fileURLToPath } from "node:url";
 
 // ponytail: autonomous single-file AI Coding Agent CLI with slash commands, local skills & test execution.
 const KILUA_DIR = path.join(os.homedir(), ".kilua");
 const SETTINGS_PATH = path.join(KILUA_DIR, "settings.json");
 const SKILLS_DIR = path.join(KILUA_DIR, "skills");
 const MAX_STEPS = 40; // ponytail: naik dari 16; agent butuh banyak langkah untuk self-fix loop
-const MAX_RETRIES = 4;
+const MAX_INJECTED_SKILLS = 5; // sama seperti web: cukup 5 skill per pesan biar konteks hemat
+let PLAN_MODE = false; // read-only mode: semua tool yang mengubah state diblokir
+
+// ponytail: match pakai substring ternormalisasi ("docker-compose" == "docker compose").
+// Regex mentah dari web terlalu kaku: trigger "docker-compose" tak pernah kena "docker compose".
+const STOPWORDS = new Set(("yang dan untuk dengan pada dari ini itu saya aku kamu anda bikin buat buatkan "
+  + "tolong cara gimana bagaimana kenapa apa apakah mana di ke the a an of for to in on "
+  + "with and or is are how what why make create build help please my our your it this that "
+  + "setup set up install pasang pakai pake integrasi terus trus juga bisa gak nggak udah sudah "
+  + "dong sih nih deh ya aja sama kalo kalau biar masih mau pengen pingin file kode code project").split(/\s+/));
+
+function normText(s) {
+  return String(s).toLowerCase().replace(/[-_/]+/g, " ").replace(/[^a-z0-9.+#\s]/g, " ")
+    .replace(/\s+/g, " ").trim();
+}
+
+function tokens(s) {
+  return normText(s).split(" ").filter(w => w.length >= 3 && !STOPWORDS.has(w));
+}
+
+// Katalog skill bawaan (1.498, port dari web). Dibaca sekali lalu di-cache.
+let BUILTIN_SKILLS = null;
+function loadBuiltinSkills() {
+  if (BUILTIN_SKILLS) return BUILTIN_SKILLS;
+  try {
+    const here = path.dirname(fileURLToPath(import.meta.url));
+    // ponytail: repo root bin/ pakai file yang sama, jangan duplikat 300KB
+    const candidates = [
+      path.join(here, "skills.json"),
+      path.join(here, "..", "packages", "kilua-agent", "bin", "skills.json"),
+    ];
+    const file = candidates.find(p => fs.existsSync(p));
+    const raw = JSON.parse(fs.readFileSync(file, "utf8"));
+    const skills = raw.map(([id, triggerStr, domain, focus]) => ({
+      name: id, domain, focus,
+      keys: [...new Set(String(triggerStr).split("|").flatMap(k => tokens(k)))],
+    }));
+    // IDF: token langka (mis. "stripe") lebih menentukan daripada token umum (mis. "api").
+    const df = new Map();
+    for (const s of skills) for (const k of s.keys) df.set(k, (df.get(k) || 0) + 1);
+    for (const s of skills) {
+      s.score = new Map();
+      for (const k of s.keys) s.score.set(k, Math.log(skills.length / (1 + (df.get(k) || 0))));
+    }
+    BUILTIN_SKILLS = skills;
+  } catch { BUILTIN_SKILLS = []; }
+  return BUILTIN_SKILLS;
+}
+
+// Relevansi skill untuk satu pesan. Ambang relatif 0.55 membuang hasil nyasar.
+function selectBuiltinSkills(userPrompt, limit = MAX_INJECTED_SKILLS) {
+  const skills = loadBuiltinSkills();
+  if (!skills.length || !userPrompt) return [];
+  const wanted = new Set(tokens(userPrompt));
+  if (!wanted.size) return [];
+  const hay = normText(userPrompt);
+  const scored = [];
+  for (const s of skills) {
+    let score = 0;
+    for (const k of s.keys) if (wanted.has(k)) score += s.score.get(k);
+    if (score > 0 && hay.includes(normText(s.name))) score += 2;
+    if (score > 0.4) scored.push({ s, score });
+  }
+  if (!scored.length) return [];
+  scored.sort((a, b) => b.score - a.score);
+  const top = scored[0].score;
+  return scored.filter(x => x.score >= top * 0.55).slice(0, limit).map(x => x.s);
+}
 
 function ensureKiluaDir() {
   if (!fs.existsSync(KILUA_DIR)) fs.mkdirSync(KILUA_DIR, { recursive: true });
@@ -47,12 +115,20 @@ function listInstalledSkills() {
   return skills;
 }
 
-function getSkillsPrompt() {
+function getSkillsPrompt(userPrompt) {
   const list = listInstalledSkills();
-  if (!list.length) return "";
-  let prompt = "\n\n=== INSTALLED SKILLS ===\n";
-  for (const s of list) {
-    prompt += `- ${s.name}: ${s.desc}\n`;
+  let prompt = "";
+  if (list.length) {
+    prompt += "\n\n=== INSTALLED SKILLS ===\n";
+    for (const s of list) prompt += `- ${s.name}: ${s.desc}\n`;
+  }
+
+  // ponytail: 1.498 skill bawaan — suntik maks 5 yang paling cocok per pesan.
+  const hits = selectBuiltinSkills(userPrompt);
+  if (hits.length) {
+    prompt += `\n\n=== RELEVANT SKILLS (built-in, ${BUILTIN_SKILLS.length} total) ===\n`;
+    for (const s of hits) prompt += `- ${s.name} (${s.domain}): ${s.focus}\n`;
+    prompt += "Pakai panduan di atas kalau relevan dengan tugas ini.\n";
   }
   return prompt;
 }
@@ -106,6 +182,14 @@ const TOOLS_OPENAI = [
       }
     }
   },
+  {
+    type: "function",
+    function: {
+      name: "delete_file",
+      description: "Menghapus file lokal.",
+      parameters: { type: "object", properties: { path: { type: "string" } }, required: ["path"] }
+    }
+  },
   {
     type: "function",
     function: {
@@ -124,6 +208,10 @@ const TOOLS_ANTHROPIC = TOOLS_OPENAI.map(t => ({
 
 function executeLocalTool(name, args) {
   const cwd = process.cwd();
+  // ponytail: plan mode = read-only. Blokir semua efek samping, bukan hanya tulis file.
+  if (PLAN_MODE && ["write_file", "edit_file", "delete_file", "run_cmd"].includes(name)) {
+    return "Error: Plan mode aktif — aksi yang mengubah state diblokir. Susun rencana dulu; user mematikan /plan untuk eksekusi.";
+  }
   try {
     if (name === "read_file") {
       const full = path.resolve(cwd, args.path);
@@ -131,9 +219,10 @@ function executeLocalTool(name, args) {
     }
     if (name === "write_file") {
       const full = path.resolve(cwd, args.path);
+      const existed = fs.existsSync(full);
       fs.mkdirSync(path.dirname(full), { recursive: true });
       fs.writeFileSync(full, args.content, "utf8");
-      return `✓ Written: ${args.path}`;
+      return `\x1b[32m● Added\x1b[0m ${args.path}${existed ? " (overwritten)" : ` (${args.content.split("\n").length} lines)`}`;
     }
     if (name === "edit_file") {
       const full = path.resolve(cwd, args.path);
@@ -141,7 +230,15 @@ function executeLocalTool(name, args) {
       const src = fs.readFileSync(full, "utf8");
       if (!src.includes(args.old_string)) return `Error: old_string not matched in ${args.path}.`;
       fs.writeFileSync(full, src.replace(args.old_string, args.new_string), "utf8");
-      return `✓ Edited: ${args.path}`;
+      const added = args.new_string.split("\n").length;
+      const removed = args.old_string.split("\n").length;
+      return `\x1b[32m+${added}\x1b[0m \x1b[31m-${removed}\x1b[0m ${args.path}`;
+    }
+    if (name === "delete_file") {
+      const full = path.resolve(cwd, args.path);
+      if (!fs.existsSync(full)) return `Error: ${args.path} not found.`;
+      fs.rmSync(full, { recursive: true, force: true });
+      return `\x1b[31m✖ Deleted\x1b[0m ${args.path}`;
     }
     if (name === "list_dir") {
       const target = path.resolve(cwd, args.path || ".");
@@ -181,6 +278,420 @@ function promptQuestion(rl, query) {
   return new Promise(res => rl.question(query, res));
 }
 
+// Prompt sekali pakai untuk slash command di luar composer.
+function promptLine(query) {
+  return new Promise(res => {
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+    rl.question(query, ans => { rl.close(); res(ans); });
+  });
+}
+
+// ===================== TEMA =====================
+const THEMES = {
+  purple: { name: "purple", accent: "\x1b[35m", sel: "\x1b[36m", dim: "\x1b[90m", ok: "\x1b[32m", warn: "\x1b[33m", err: "\x1b[31m", reset: "\x1b[0m", bold: "\x1b[1m" },
+  blue:   { name: "blue",   accent: "\x1b[34m", sel: "\x1b[36m", dim: "\x1b[90m", ok: "\x1b[32m", warn: "\x1b[33m", err: "\x1b[31m", reset: "\x1b[0m", bold: "\x1b[1m" },
+  green:  { name: "green",  accent: "\x1b[32m", sel: "\x1b[36m", dim: "\x1b[90m", ok: "\x1b[32m", warn: "\x1b[33m", err: "\x1b[31m", reset: "\x1b[0m", bold: "\x1b[1m" },
+  mono:   { name: "mono",   accent: "\x1b[1m",  sel: "\x1b[1m",  dim: "\x1b[2m",  ok: "",        warn: "",        err: "",        reset: "\x1b[0m", bold: "" },
+};
+function themeOf(settings) {
+  return THEMES[settings?.theme] || THEMES.purple;
+}
+
+// ===================== SLASH MENU =====================
+const SLASH_COMMANDS = [
+  { name: "/model", desc: "Ganti model AI aktif" },
+  { name: "/config", desc: "Ubah API key, provider, base URL" },
+  { name: "/theme", desc: "Ganti tema warna tampilan CLI" },
+  { name: "/skills", desc: "Lihat daftar skills terpasang" },
+  { name: "/mcp", desc: "Kelola server MCP" },
+  { name: "/memory", desc: "Lihat & tambah memori proyek (KILUA.md)" },
+  { name: "/plan", desc: "Nyalakan/matikan plan mode (read-only)" },
+  { name: "/clear", desc: "Bersihkan riwayat percakapan" },
+  { name: "/help", desc: "Panduan perintah" },
+  { name: "/exit", desc: "Keluar dari Kilua" },
+];
+const MENU_VISIBLE = 8;
+
+// ===================== CLIPBOARD (Windows) =====================
+function readClipboard() {
+  if (process.platform !== "win32") return null;
+  // ponytail: gambar clipboard butuh WinForms STA; platform lain = teks saja.
+  try {
+    const tmp = path.join(os.tmpdir(), `kilua-paste-${Date.now()}.png`).replace(/'/g, "''");
+    const ps = "Add-Type -AssemblyName System.Windows.Forms,System.Drawing;"
+      + "$i=[System.Windows.Forms.Clipboard]::GetImage();"
+      + `if($i){$i.Save('${tmp}',[System.Drawing.Imaging.ImageFormat]::Png);`
+      + "@{type='image';path='" + tmp + "'}|ConvertTo-Json -Compress}"
+      + "else{@{type='text';text=[System.Windows.Forms.Clipboard]::GetText()}|ConvertTo-Json -Compress}";
+    const out = execSync(`powershell -NoProfile -STA -Command "${ps.replace(/"/g, '\\"')}"`, {
+      encoding: "utf8", timeout: 10000, windowsHide: true, stdio: ["ignore", "pipe", "ignore"],
+    }).trim();
+    const j = JSON.parse(out.slice(out.indexOf("{")));
+    if (j.type === "image" && fs.existsSync(j.path)) {
+      return { type: "image", data: fs.readFileSync(j.path).toString("base64"), mediaType: "image/png" };
+    }
+    if (j.type === "text" && j.text) return { type: "text", text: j.text };
+  } catch {}
+  return null;
+}
+
+// ===================== COMPOSER (raw-mode editor) =====================
+const PASTE_AS_TOKEN_CHARS = 300;
+const PASTE_AS_TOKEN_LINES = 3;
+
+function promptComposer(settings, history) {
+  const t = themeOf(settings);
+  return new Promise(resolve => {
+    const stdin = process.stdin;
+    const stdout = process.stdout;
+    let items = [];        // string (1 char) | {type:'paste'|'image', label, ...}
+    let pos = 0;
+    let menuSel = 0;
+    let histIdx = -1;
+    let lastLines = 0;
+    let pasteN = 0;
+    let imageN = 0;
+    let escBuf = "";
+    let inPaste = false;
+    let pasteBuf = "";
+    let probe = null;
+    let escTimer = null;
+    let closed = false;
+
+    const display = () => items.map(it => (typeof it === "string" ? it : it.label)).join("");
+    const displayText = () => items.map(it => (typeof it === "string" ? it : it.type === "paste" ? it.text : "")).join("");
+    const images = () => items.filter(it => it && it.type === "image");
+
+    function insertChars(str) {
+      for (const ch of str) { items.splice(pos, 0, ch); pos++; }
+    }
+    function insertPaste(text) {
+      const lines = text.split("\n").length;
+      if (text.length < PASTE_AS_TOKEN_CHARS && lines < PASTE_AS_TOKEN_LINES) return insertChars(text);
+      pasteN++;
+      items.splice(pos, 0, { type: "paste", label: `[Pasted text #${pasteN} +${lines} lines]`, text });
+      pos++;
+    }
+    function insertImage(cls) {
+      imageN++;
+      items.splice(pos, 0, { type: "image", label: `[Image #${imageN}]`, data: cls.data, mediaType: cls.mediaType });
+      pos++;
+    }
+
+    function menu() {
+      const d = display();
+      if (!d.startsWith("/") || /\s/.test(d)) return null;
+      const q = d.toLowerCase();
+      const list = SLASH_COMMANDS.filter(c => c.name.startsWith(q));
+      return list.length ? list : null;
+    }
+
+    function layout(plain, cols, cursorIdx) {
+      const lines = [""];
+      let caret = null;
+      for (let i = 0; i <= plain.length; i++) {
+        if (i === cursorIdx) caret = { line: lines.length - 1, col: lines[lines.length - 1].length };
+        if (i === plain.length) break;
+        const ch = plain[i];
+        if (ch === "\n") { lines.push(""); continue; }
+        if (lines[lines.length - 1].length >= cols) lines.push("");
+        lines[lines.length - 1] += ch;
+      }
+      if (!caret) caret = { line: lines.length - 1, col: lines[lines.length - 1].length };
+      if (lines[lines.length - 1].length >= cols) lines.push("");
+      return { lines, ...caret };
+    }
+
+    function render() {
+      const cols = Math.max(20, stdout.columns || 80);
+      const list = menu();
+      let menuLines = [];
+      if (list) {
+        const win = Math.min(MENU_VISIBLE, list.length);
+        menuSel = Math.max(0, Math.min(menuSel, list.length - 1));
+        let start = Math.max(0, Math.min(menuSel - win + 1, list.length - win));
+        const nameW = Math.max(...list.map(c => c.name.length)) + 2;
+        for (let i = start; i < start + win; i++) {
+          const c = list[i];
+          if (i === menuSel) menuLines.push(`${t.accent}❯${t.reset} ${t.sel}${c.name.padEnd(nameW)}${t.reset}${t.dim}${c.desc}${t.reset}`);
+          else menuLines.push(`  ${t.dim}${c.name.padEnd(nameW)}${c.desc}${t.reset}`);
+        }
+        if (list.length > win) menuLines.push(`${t.dim}  ↑↓ scroll · ${list.length - win} lainnya${t.reset}`);
+      }
+
+      let before = 0;
+      for (let i = 0; i < pos; i++) before += typeof items[i] === "string" ? 1 : items[i].label.length;
+      const plain = "❯ " + display();
+      const { lines, line: cLine, col: cCol } = layout(plain, cols, 2 + before);
+      const colored = lines.map((ln, idx) => {
+        const body = idx === 0 ? ln.slice(2) : ln;
+        const prefix = idx === 0 ? `${t.accent}❯ ${t.reset}` : "";
+        const painted = body
+          .replace(/\[Pasted text #\d+ \+\d+ lines\]/g, m => `\x1b[36m${m}${t.reset}`)
+          .replace(/\[Image #\d+\]/g, m => `\x1b[35m${m}${t.reset}`);
+        return prefix + painted;
+      });
+
+      if (lastLines) stdout.write(`\x1b[${lastLines - 1}A\r\x1b[0J`);
+      else stdout.write("\r\x1b[0J");
+      const block = [...menuLines, ...colored];
+      stdout.write(block.join("\n"));
+      lastLines = block.length;
+
+      const up = menuLines.length + colored.length - 1 - (menuLines.length + cLine);
+      if (up > 0) stdout.write(`\x1b[${up}A`);
+      stdout.write(`\r${cCol > 0 ? `\x1b[${cCol}C` : ""}`);
+    }
+
+    function restore() {
+      clearProbe();
+      clearEsc();
+      closed = true;
+      stdin.removeListener("data", onData);
+      process.removeAllListeners("SIGINT");
+      if (lastLines) stdout.write(`\x1b[${lastLines - 1}A\r\x1b[0J`);
+      lastLines = 0;
+      stdout.write("\x1b[?2004l");
+      try { stdin.setRawMode(false); } catch {}
+      stdin.pause();
+    }
+
+    function finish() {
+      const text = displayText().trim();
+      const imgs = images();
+      if (!text && !imgs.length) { render(); return; }
+      const summary = display();
+      restore();
+      let shown = summary.replace(/\n/g, " ⏎ ");
+      if (shown.length > 160) shown = shown.slice(0, 157) + "...";
+      stdout.write(`${t.accent}❯${t.reset} ${shown}\n`);
+      resolve({ text, images: imgs });
+    }
+
+    // ---- clipboard ----
+    function clearProbe() {
+      if (probe) { clearTimeout(probe); probe = null; }
+    }
+    // ESC sendirian = tutup menu; tapi ESC juga awal arrow key, jadi tunggu sebentar.
+    function armEsc() {
+      if (escTimer) return;
+      escTimer = setTimeout(() => {
+        escTimer = null;
+        escBuf = "";
+        menuSel = 0;
+        items = items.filter(it => typeof it !== "string" || it !== "\x1b");
+        render();
+      }, 30);
+    }
+    function clearEsc() {
+      if (escTimer) { clearTimeout(escTimer); escTimer = null; }
+    }
+    function tryClipboard() {
+      const clip = readClipboard();
+      if (!clip) return false;
+      if (clip.type === "image") insertImage(clip);
+      else insertPaste(clip.text);
+      return true;
+    }
+    // Ctrl+V: tunggu data bracket-paste dulu; kalau kosong, berarti gambar.
+    function ctrlV() {
+      if (probe) return;
+      probe = setTimeout(() => { probe = null; tryClipboard(); render(); }, 150);
+    }
+
+    // ---- key handling ----
+    function moveTo(newPos) { pos = Math.max(0, Math.min(newPos, items.length)); render(); }
+
+    function submitOrComplete() {
+      const list = menu();
+      if (list) {
+        const pick = list[Math.max(0, Math.min(menuSel, list.length - 1))];
+        items = []; pos = 0;
+        insertChars(pick.name + " ");
+        render();
+        return;
+      }
+      finish();
+    }
+
+    function onPlain(ch) {
+      if (ch === "\r" || ch === "\n") return submitOrComplete();
+      if (ch === "\x7f") { // backspace
+        if (pos > 0) { items.splice(pos - 1, 1); pos--; }
+        return render();
+      }
+      if (ch === "\x03" || ch === "\x04") {
+        if (!display()) {
+          restore();
+          stdout.write("\n");
+          process.exit(0);
+        }
+        items = []; pos = 0; menuSel = 0;
+        return render();
+      }
+      if (ch === "\x16") return ctrlV();               // ctrl+v
+      if (ch === "\x1bv" || ch === "\x1bV") {          // alt+v
+        if (!tryClipboard()) stdout.write("\x07");
+        return render();
+      }
+      if (ch === "\t") {
+        const list = menu();
+        if (list) { items = []; pos = 0; insertChars(list[menuSel].name + " "); }
+        return render();
+      }
+      if (ch === "\x1b") return render();              // esc: tutup menu via reset
+      if (ch < " " && ch !== "\n") return;
+      insertChars(ch);
+      menuSel = 0;
+      render();
+    }
+
+    function onKey(seq) {
+      switch (seq) {
+        case "\x1b[A": if (menu()) { menuSel--; } else { navHistory(-1); } return render();
+        case "\x1b[B": if (menu()) { menuSel++; } else { navHistory(1); } return render();
+        case "\x1b[C": return moveTo(pos + 1);
+        case "\x1b[D": return moveTo(pos - 1);
+        case "\x1b[H": return moveTo(0);
+        case "\x1b[F": return moveTo(items.length);
+        case "\x1b[3~": if (pos < items.length) { items.splice(pos, 1); } return render();
+        case "\x1b\r": case "\x1b\n": items.splice(pos, 0, "\n"); pos++; return render();
+        default: return render();
+      }
+    }
+
+    function navHistory(dir) {
+      if (!history.length) return;
+      histIdx = Math.max(-1, Math.min(history.length - 1, histIdx - dir));
+      items = []; pos = 0;
+      if (histIdx >= 0) insertChars(history[history.length - 1 - histIdx]);
+      else pos = 0;
+    }
+
+    function feed(str) {
+      escBuf += str;
+      while (escBuf.length) {
+        if (inPaste) {
+          const end = escBuf.indexOf("\x1b[201~");
+          if (end === -1) { pasteBuf += escBuf; escBuf = ""; return; }
+          pasteBuf += escBuf.slice(0, end);
+          escBuf = escBuf.slice(end + 6);
+          inPaste = false;
+          insertPaste(pasteBuf.replace(/\r\n?/g, "\n"));
+          pasteBuf = "";
+          menuSel = 0;
+          render();
+          continue;
+        }
+        const pStart = escBuf.indexOf("\x1b[200~");
+        if (pStart > 0) {
+          const head = escBuf.slice(0, pStart);
+          escBuf = escBuf.slice(pStart);
+          for (const ch of head) onPlain(ch);
+          continue;
+        }
+        if (pStart === 0) { escBuf = escBuf.slice(6); inPaste = true; continue; }
+
+        if (escBuf.startsWith("\x1b")) {
+          const seqs = ["\x1b[A", "\x1b[B", "\x1b[C", "\x1b[D", "\x1b[H", "\x1b[F", "\x1b[3~", "\x1b[Z", "\x1b\r", "\x1b\n", "\x1bv", "\x1bV"];
+          const hit = seqs.find(s => escBuf.startsWith(s));
+          if (hit) { clearEsc(); escBuf = escBuf.slice(hit.length); onKey(hit); continue; }
+          // sequence CSI lengkap tapi tidak dikenal (mis. Ctrl+↑ = "\x1b[1;5A") — buang utuh, jangan ketik sebagai teks
+          const m = escBuf.match(/^\x1b\[[0-9;]*[A-Za-z~]/);
+          if (m) { clearEsc(); escBuf = escBuf.slice(m[0].length); render(); continue; }
+          if (escBuf.length < 8) { armEsc(); return; } // tunggu sisa byte sequence
+          clearEsc();
+          escBuf = escBuf.slice(1);
+          render();
+          continue;
+        }
+        const ch = escBuf[0];
+        escBuf = escBuf.slice(1);
+        onPlain(ch);
+      }
+    }
+
+    function onData(chunk) {
+      if (closed) return;
+      clearProbe();
+      feed(chunk.toString("utf8"));
+    }
+
+    // ---- start ----
+    const onSigint = () => {
+      if (!closed) { restore(); stdout.write("\n"); process.exit(0); }
+    };
+    stdout.write("\x1b[?2004h"); // bracketed paste
+    try { stdin.setRawMode(true); } catch {} // pipa/non-TTY: lanjut saja, input tetap terbaca
+    stdin.resume();
+    stdin.setEncoding("utf8");
+    stdin.on("data", onData);
+    process.on("SIGINT", onSigint);
+    render();
+  });
+}
+
+// ponytail: status spinner minimal tanpa dependency — tampilkan langkah + detik berjalan
+let spinnerTimer = null;
+let spinnerStart = 0;
+const SPINNER_FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
+
+function startStatus(label) {
+  stopStatus();
+  spinnerStart = Date.now();
+  let i = 0;
+  const paint = () => {
+    const secs = Math.floor((Date.now() - spinnerStart) / 1000);
+    const frame = SPINNER_FRAMES[i++ % SPINNER_FRAMES.length];
+    process.stdout.write(`\r\x1b[2K\x1b[35m${frame} KILUA\x1b[0m \x1b[90m${label}\x1b[0m \x1b[90m(${secs}s)\x1b[0m`);
+  };
+  paint();
+  spinnerTimer = setInterval(paint, 120);
+}
+
+function stopStatus() {
+  if (spinnerTimer) {
+    clearInterval(spinnerTimer);
+    spinnerTimer = null;
+    process.stdout.write("\r\x1b[2K");
+  }
+}
+
+function stepLabel(step, max) {
+  return step === 0 ? "Thinking…" : `Running step ${step}/${max}…`;
+}
+
+// ponytail: file ops tampil berwarna (hijau tambah, merah hapus), lainnya ringkas abu-abu
+const FILE_OPS = new Set(["write_file", "edit_file", "delete_file"]);
+
+function printToolCall(name, args, output) {
+  if (FILE_OPS.has(name)) {
+    // output sudah berisi ANSI sendiri, jangan dibungkus abu-abu
+    console.log(`  ${output}`);
+    return;
+  }
+  const brief = String(output).slice(0, 160).replace(/\n/g, " ");
+  console.log(`\x1b[36m⚡ ${name}\x1b[0m \x1b[90m${brief}${String(output).length > 160 ? "..." : ""}\x1b[0m`);
+}
+function fmtTokens(n) {
+  return n >= 1000 ? `${(n / 1000).toFixed(1)}k` : String(n);
+}
+
+function printTokenLine(usage, startedAt) {
+  const secs = ((Date.now() - startedAt) / 1000).toFixed(1);
+  if (!usage) {
+    console.log(`\x1b[90m⏱ ${secs}s · tokens not reported by provider\x1b[0m`);
+    return;
+  }
+  const inTok = usage.input_tokens ?? usage.prompt_tokens ?? 0;
+  const outTok = usage.output_tokens ?? usage.completion_tokens ?? 0;
+  const total = usage.total_tokens ?? inTok + outTok;
+  let line = `\x1b[90m⏱ ${secs}s · ↑ ${fmtTokens(inTok)} in · ↓ ${fmtTokens(outTok)} out`;
+  if (usage.cache_read_input_tokens) line += ` · ⚡ ${fmtTokens(usage.cache_read_input_tokens)} cached`;
+  line += ` · Σ ${fmtTokens(total)}\x1b[0m`;
+  console.log(line);
+}
+
 async function runInteractiveConfig() {
   const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
 
@@ -267,8 +778,33 @@ async function readSseStream(res, onChunk) {
   }
 }
 
-function buildSystemPrompt() {
-  const skillsInfo = getSkillsPrompt();
+function readMemory() {
+  try {
+    const f = path.join(process.cwd(), "KILUA.md");
+    return fs.existsSync(f) ? fs.readFileSync(f, "utf8").slice(0, 4000) : "";
+  } catch { return ""; }
+}
+
+function buildSystemPrompt(convo, settings = {}) {
+  let lastUser = "";
+  for (let i = (convo?.length ?? 0) - 1; i >= 0; i--) {
+    const c = convo[i]?.content;
+    if (convo[i].role === "user" && typeof c === "string") { lastUser = c; break; }
+    if (convo[i].role === "user" && Array.isArray(c)) {
+      const t = c.find(b => b.type === "text");
+      if (t?.text) { lastUser = t.text; break; }
+    }
+  }
+  const skillsInfo = getSkillsPrompt(lastUser);
+  const mem = readMemory().trim();
+  const memBlock = mem ? `\n\n=== MEMORI PROYEK (KILUA.md) ===\n${mem}` : "";
+  const mcpList = Array.isArray(settings.mcp) ? settings.mcp : [];
+  const mcpBlock = mcpList.length
+    ? `\n\nMCP servers terdaftar (info saja, eksekusi tool MCP belum aktif di CLI):\n${mcpList.map(m => `- ${m.name}: ${m.command || ""} ${(m.args || []).join(" ")}`).join("\n")}`
+    : "";
+  const planBlock = PLAN_MODE
+    ? "\n\nPLAN MODE AKTIF: hanya baca & analisa. JANGAN mengubah file atau menjalankan perintah yang mengubah state. Susun rencana langkah demi langkah, lalu minta user mematikan plan mode (/plan) untuk eksekusi."
+    : "";
   return `Kamu KILUA, AI Coding Agent otonom di terminal lokal. Folder aktif: ${process.cwd()}.
 KEMAMPUAN TOOLS:
 - read_file, write_file, edit_file, list_dir
@@ -284,30 +820,87 @@ CARA KERJA (WAJIB DIIKUTI):
 6. Baru setelah terbukti jalan tanpa error, laporkan hasil + cara menjalankannya ke pengguna.
 7. Jika pengguna menyuruh install skill di chat (misal: "install skill vercel-labs/skills@find-skills"), jalankan run_cmd:
    npx skills add <nama-skill> --cwd "${SKILLS_DIR}"
-   lalu beri tahu skill sudah siap dipakai.${skillsInfo}
+   lalu beri tahu skill sudah siap dipakai.${skillsInfo}${memBlock}${mcpBlock}${planBlock}
 
 Gaya: ringkas, langsung bertindak, jangan minta konfirmasi untuk langkah yang sudah jelas.`;
 }
 
+// ponytail: bedakan token habis vs koneksi putus. Token habis = berhenti + beritahu.
+// Koneksi putus = terus coba sampai nyambung lagi, maksimal ~5 menit lalu beritahu.
+const TOKEN_EXHAUSTED_RE = /insufficient_quota|quota exceeded|exceeded your current quota|credit balance|billing|payment required|no credit|saldo|quota habis/i;
+const MAX_RECONNECT_ATTEMPTS = 12;
+
+function isTokenExhausted(status, errText) {
+  if (TOKEN_EXHAUSTED_RE.test(errText || "")) return true;
+  if (status === 402) return true;
+  return false;
+}
+
+function isBadCredentials(status, errText) {
+  if (status === 403) return true;
+  return status === 401 && /api key|unauthorized|invalid.*key|authentication/i.test(errText || "");
+}
+
+function reportTokenExhausted(status, errText, badCredentials) {
+  stopStatus();
+  const hint = String(errText || "").slice(0, 200).replace(/\n/g, " ");
+  if (badCredentials) {
+    console.error(`\n\x1b[31m[✖] API KEY DITOLAK (HTTP ${status}).\x1b[0m`);
+    console.error(`\x1b[90m    ${hint}\x1b[0m`);
+    console.error(`\x1b[90m    Perbaiki key lewat: /config  (riwayat chat tetap ada, tinggal minta "lanjut").\x1b[0m\n`);
+    return;
+  }
+  console.error(`\n\x1b[31m[✖] TOKEN / KUOTA HABIS (HTTP ${status}).\x1b[0m`);
+  console.error(`\x1b[33m    Tugas dihentikan karena provider menolak permintaan.\x1b[0m`);
+  if (hint) console.error(`\x1b[90m    ${hint}\x1b[0m`);
+  console.error(`\x1b[90m    Isi ulang kuota / ganti provider lalu ketik: /config  (riwayat chat tetap ada, tinggal minta "lanjut").\x1b[0m\n`);
+}
+
+function reportConnectionLost(reason) {
+  stopStatus();
+  console.error(`\n\x1b[31m[✖] KONEKSI TERPUTUS: ${reason}\x1b[0m`);
+  console.error(`\x1b[33m    Kilua berhenti setelah ${MAX_RECONNECT_ATTEMPTS} percobaan.\x1b[0m`);
+  console.error(`\x1b[90m    Begitu internet/provider normal, minta Kilua "lanjut" — riwayat langkahnya masih tersimpan.\x1b[0m\n`);
+}
+
+// true = sudah dilaporkan, loop harus berhenti.
+function handleHttpError(status, errText) {
+  if (isTokenExhausted(status, errText) || isBadCredentials(status, errText)) {
+    reportTokenExhausted(status, errText, isBadCredentials(status, errText));
+    return true;
+  }
+  stopStatus();
+  console.error(`\n\x1b[31m[✖] Provider error (HTTP ${status}).\x1b[0m`);
+  console.error(`\x1b[90m    ${String(errText).slice(0, 300).replace(/\n/g, " ")}\x1b[0m\n`);
+  return true;
+}
+
 // ponytail: retry untuk 429/5xx/network — provider gratis sering rate-limit
 async function fetchWithRetry(url, init) {
   let lastErr;
-  for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
+  let hadFailure = false;
+  for (let attempt = 0; attempt <= MAX_RECONNECT_ATTEMPTS; attempt++) {
     try {
       const res = await fetch(url, init);
       if (res.status === 429 || res.status === 503 || res.status >= 500) {
-        if (attempt === MAX_RETRIES) return res;
+        if (attempt === MAX_RECONNECT_ATTEMPTS) return res;
+        hadFailure = true;
         const wait = Math.min(30000, 1500 * Math.pow(2, attempt));
-        process.stdout.write(`\r\x1b[2K\x1b[33m[!] Server sibuk (${res.status}), ulang ${attempt + 1}/${MAX_RETRIES} dalam ${Math.round(wait / 1000)}s...\x1b[0m`);
+        startStatus(`Connection busy (${res.status}) — retry ${attempt + 1}/${MAX_RECONNECT_ATTEMPTS} in ${Math.round(wait / 1000)}s...`);
         await new Promise(r => setTimeout(r, wait));
         continue;
       }
+      if (hadFailure) {
+        stopStatus();
+        console.log("\x1b[32m[✓] Connection restored — resuming task.\x1b[0m");
+      }
       return res;
     } catch (e) {
       lastErr = e;
-      if (attempt === MAX_RETRIES) throw e;
-      const wait = Math.min(20000, 1500 * Math.pow(2, attempt));
-      process.stdout.write(`\r\x1b[2K\x1b[33m[!] Koneksi gagal, ulang ${attempt + 1}/${MAX_RETRIES} dalam ${Math.round(wait / 1000)}s...\x1b[0m`);
+      if (attempt === MAX_RECONNECT_ATTEMPTS) throw e;
+      hadFailure = true;
+      const wait = Math.min(30000, 1500 * Math.pow(2, attempt));
+      startStatus(`Connection lost — reconnecting in ${Math.round(wait / 1000)}s (${attempt + 1}/${MAX_RECONNECT_ATTEMPTS})...`);
       await new Promise(r => setTimeout(r, wait));
     }
   }
@@ -316,13 +909,16 @@ async function fetchWithRetry(url, init) {
 
 // Loop untuk Anthropic / 9router local (/v1/messages)
 async function runAnthropicLoop(settings, convo) {
-  const SYSTEM = buildSystemPrompt();
+  const SYSTEM = buildSystemPrompt(convo, settings);
 
   let endpoint = settings.base_url.replace(/\/+$/, "");
   if (!endpoint.endsWith("/messages")) endpoint += "/messages";
 
+  let finished = false;
   for (let step = 0; step < MAX_STEPS; step++) {
-    process.stdout.write("\r\x1b[2K\x1b[35m[KILUA Berpikir...]\x1b[0m ");
+    startStatus(stepLabel(step, MAX_STEPS));
+    const turnStart = Date.now();
+    let usage = null;
     let res;
     try {
       res = await fetchWithRetry(endpoint, {
@@ -343,13 +939,12 @@ async function runAnthropicLoop(settings, convo) {
         })
       });
     } catch (e) {
-      console.error("\n[!] Connection error:", e.message);
+      reportConnectionLost(e.message || "network error");
       return;
     }
 
     if (!res.ok) {
-      const errText = await res.text().catch(() => "");
-      console.error(`\n[!] Error (${res.status}):`, errText.slice(0, 200));
+      handleHttpError(res.status, await res.text().catch(() => ""));
       return;
     }
 
@@ -358,6 +953,9 @@ async function runAnthropicLoop(settings, convo) {
     const toolBlocks = [];
 
     await readSseStream(res, (evt) => {
+      if (evt.type === "message_start" && evt.message?.usage) usage = { ...evt.message.usage };
+      if (evt.type === "message_delta" && evt.usage) usage = { ...usage, ...evt.usage };
+
       let deltaText = "";
       if (typeof evt.delta?.text === "string") deltaText = evt.delta.text;
       else if (typeof evt.delta?.content === "string") deltaText = evt.delta.content;
@@ -366,6 +964,7 @@ async function runAnthropicLoop(settings, convo) {
 
       if (deltaText) {
         if (!printedHeader) {
+          stopStatus();
           process.stdout.write("\r\x1b[2KKILUA > ");
           printedHeader = true;
         }
@@ -389,8 +988,10 @@ async function runAnthropicLoop(settings, convo) {
       }
     });
 
+    stopStatus();
     if (printedHeader) console.log();
     else process.stdout.write("\r\x1b[2K");
+    printTokenLine(usage, turnStart);
 
     const activeTools = toolBlocks.filter(Boolean);
     const assistantBlocks = [];
@@ -399,15 +1000,14 @@ async function runAnthropicLoop(settings, convo) {
 
     convo.push({ role: "assistant", content: assistantBlocks.length ? assistantBlocks : fullText });
 
-    if (!activeTools.length) break;
+    if (!activeTools.length) { finished = true; break; }
 
     const toolResultContent = [];
     for (const tu of activeTools) {
       const name = tu.name;
       const args = tu.input || {};
-      console.log(`\x1b[36m⚡ Tool: ${name}\x1b[0m(${JSON.stringify(args)})`);
       const output = executeLocalTool(name, args);
-      console.log(`\x1b[90m↳ ${output.slice(0, 160).replace(/\n/g, " ")}${output.length > 160 ? "..." : ""}\x1b[0m`);
+      printToolCall(name, args, output);
       toolResultContent.push({
         type: "tool_result",
         tool_use_id: tu.id,
@@ -416,11 +1016,16 @@ async function runAnthropicLoop(settings, convo) {
     }
     convo.push({ role: "user", content: toolResultContent });
   }
+  if (!finished) {
+    stopStatus();
+    console.log(`\x1b[33m[!] Batas ${MAX_STEPS} langkah tercapai — tugas belum tuntas.\x1b[0m`);
+    console.log(`\x1b[90m    Ketik "lanjut" untuk meneruskan (riwayat tetap tersimpan).\x1b[0m\n`);
+  }
 }
 
 // Loop untuk OpenAI / TokenHarbor / Gemini OpenAI protocol
 async function runOpenAiLoop(settings, convo) {
-  const SYSTEM = buildSystemPrompt();
+  const SYSTEM = buildSystemPrompt(convo, settings);
 
   let endpoint = settings.base_url.replace(/\/+$/, "");
   if (endpoint.includes("generativelanguage.googleapis.com") && !endpoint.includes("/openai")) {
@@ -430,8 +1035,11 @@ async function runOpenAiLoop(settings, convo) {
     endpoint += "/chat/completions";
   }
 
+  let finished = false;
   for (let step = 0; step < MAX_STEPS; step++) {
-    process.stdout.write("\r\x1b[2K\x1b[35m[KILUA Berpikir...]\x1b[0m ");
+    startStatus(stepLabel(step, MAX_STEPS));
+    const turnStart = Date.now();
+    let usage = null;
     let res;
     try {
       res = await fetchWithRetry(endpoint, {
@@ -444,19 +1052,19 @@ async function runOpenAiLoop(settings, convo) {
         body: JSON.stringify({
           model: settings.model,
           stream: true,
+          stream_options: { include_usage: true },
           messages: [{ role: "system", content: SYSTEM }, ...convo],
           tools: TOOLS_OPENAI,
           tool_choice: "auto"
         })
       });
     } catch (e) {
-      console.error("\n[!] Connection error:", e.message);
+      reportConnectionLost(e.message || "network error");
       return;
     }
 
     if (!res.ok) {
-      const errText = await res.text().catch(() => "");
-      console.error(`\n[!] Error (${res.status}):`, errText.slice(0, 200));
+      handleHttpError(res.status, await res.text().catch(() => ""));
       return;
     }
 
@@ -465,10 +1073,12 @@ async function runOpenAiLoop(settings, convo) {
     const toolCallsMap = {};
 
     await readSseStream(res, (evt) => {
+      if (evt.usage) usage = evt.usage;
       const choice = evt.choices?.[0];
       const delta = choice?.delta;
       if (delta?.content) {
         if (!printedHeader) {
+          stopStatus();
           process.stdout.write("\r\x1b[2KKILUA > ");
           printedHeader = true;
         }
@@ -485,107 +1095,173 @@ async function runOpenAiLoop(settings, convo) {
       }
     });
 
+    stopStatus();
     if (printedHeader) console.log();
     else process.stdout.write("\r\x1b[2K");
+    printTokenLine(usage, turnStart);
 
     const toolCalls = Object.values(toolCallsMap);
     convo.push({ role: "assistant", content: fullText, tool_calls: toolCalls.length ? toolCalls : undefined });
 
-    if (!toolCalls.length) break;
+    if (!toolCalls.length) { finished = true; break; }
 
     for (const tc of toolCalls) {
       const name = tc.function.name;
       let args = {};
       try { args = JSON.parse(tc.function.arguments || "{}"); } catch {}
-      console.log(`\x1b[36m⚡ Tool: ${name}\x1b[0m(${JSON.stringify(args)})`);
       const output = executeLocalTool(name, args);
-      console.log(`\x1b[90m↳ ${output.slice(0, 160).replace(/\n/g, " ")}${output.length > 160 ? "..." : ""}\x1b[0m`);
+      printToolCall(name, args, output);
       convo.push({ role: "tool", tool_call_id: tc.id, name, content: output });
     }
   }
+  if (!finished) {
+    stopStatus();
+    console.log(`\x1b[33m[!] Batas ${MAX_STEPS} langkah tercapai — tugas belum tuntas.\x1b[0m`);
+    console.log(`\x1b[90m    Ketik "lanjut" untuk meneruskan (riwayat tetap tersimpan).\x1b[0m\n`);
+  }
 }
 
-async function runAgent(settings, userPrompt, convo) {
+async function runAgent(settings, userPrompt, convo, images = []) {
   const isAnthropic = settings.provider === "anthropic" || settings.base_url.includes(":20128") || settings.model === "harobor";
-  if (isAnthropic) {
-    convo.push({ role: "user", content: userPrompt });
-    await runAnthropicLoop(settings, convo);
+  if (images.length) {
+    if (isAnthropic) {
+      const blocks = images.map(im => ({ type: "image", source: { type: "base64", media_type: im.mediaType, data: im.data } }));
+      convo.push({ role: "user", content: [...blocks, { type: "text", text: userPrompt || "Jelaskan gambar ini." }] });
+    } else {
+      const blocks = images.map(im => ({ type: "image_url", image_url: { url: `data:${im.mediaType};base64,${im.data}` } }));
+      convo.push({ role: "user", content: [...blocks, { type: "text", text: userPrompt || "Jelaskan gambar ini." }] });
+    }
   } else {
     convo.push({ role: "user", content: userPrompt });
-    await runOpenAiLoop(settings, convo);
   }
+  if (isAnthropic) await runAnthropicLoop(settings, convo);
+  else await runOpenAiLoop(settings, convo);
 }
 
-function printHelp() {
-  console.log(`
-\x1b[1m\x1b[35m=== PERINTAH SLASH KILUA (/) ===\x1b[0m
-  \x1b[36m/help\x1b[0m         Lihat panduan perintah ini
-  \x1b[36m/models\x1b[0m       Lihat dan ganti model AI saat ini
-  \x1b[36m/skills\x1b[0m       Lihat daftar skills yang terpasang di Kilua
-  \x1b[36m/clear\x1b[0m        Bersihkan riwayat percakapan sesi ini
-  \x1b[36m/config\x1b[0m       Ubah API Key, Provider, atau Base URL
-  \x1b[36m/exit\x1b[0m         Keluar dari Kilua Agent
-
-\x1b[90mTips: Untuk menginstall skill baru, cukup suruh Kilua di chat (misal: "tolong install skill find-skills")!\x1b[0m
-`);
+function printHelp(settings) {
+  const t = themeOf(settings);
+  console.log(`\n${t.bold}${t.accent}=== PERINTAH SLASH KILUA (/) ===${t.reset}`);
+  for (const c of SLASH_COMMANDS) console.log(`  ${t.sel}${c.name.padEnd(10)}${t.reset} ${t.dim}${c.desc}${t.reset}`);
+  console.log(`\n${t.dim}Tips: ketik "/" lalu ↑↓ untuk pilih perintah. Install skill baru cukup minta di chat.${t.reset}`);
+  console.log(`${t.dim}Ctrl+V / Alt+V = paste teks (ringkas otomatis) atau gambar dari clipboard.${t.reset}\n`);
 }
 
-async function handleSlashCommand(cmd, settings, convo, rl) {
-  const parts = cmd.trim().split(/\s+/);
-  const action = parts[0].toLowerCase();
-
-  if (action === "/help") {
-    printHelp();
+async function cmdModel(settings) {
+  const t = themeOf(settings);
+  if (!settings.base_url || !settings.api_key) {
+    console.log(`\n${t.warn}[!] Belum terhubung ke config provider. Jalankan /config dulu.${t.reset}\n`);
     return settings;
   }
-
-  if (action === "/models" || action === "/model") {
-    if (!settings.base_url || !settings.api_key) {
-      console.log(`\n\x1b[33m[!] Belum terhubung ke config provider. Jalankan /config terlebih dahulu.\x1b[0m\n`);
-      return settings;
-    }
-    console.log(`\n\x1b[33mModel aktif saat ini:\x1b[0m \x1b[32m${settings.model}\x1b[0m (Provider: ${settings.base_url})`);
-    const newModel = (await promptQuestion(rl, `Ganti nama model (Enter untuk tetap '${settings.model}'): `)).trim();
-    if (newModel) {
-      settings.model = newModel;
-      saveSettings(settings);
-      console.log(`\x1b[32m✓ Model diubah menjadi ${newModel}\x1b[0m\n`);
-    }
-    return settings;
+  console.log(`\n${t.warn}Model aktif:${t.reset} ${t.ok}${settings.model}${t.reset} ${t.dim}(${settings.base_url})${t.reset}`);
+  const newModel = (await promptLine(`Ganti nama model (Enter untuk tetap '${settings.model}'): `)).trim();
+  if (newModel && newModel !== settings.model) {
+    settings.model = newModel;
+    saveSettings(settings);
+    console.log(`${t.ok}✓ Model diubah menjadi ${newModel}${t.reset}\n`);
   }
+  return settings;
+}
 
-  if (action === "/skills" || action === "/skill") {
-    const list = listInstalledSkills();
-    console.log(`\n\x1b[35m=== SKILLS TERPASANG (${SKILLS_DIR}) ===\x1b[0m`);
-    if (!list.length) {
-      console.log(`Belum ada skill tambahan terpasang.`);
-      console.log(`Suruh Kilua di chat untuk install, misal: \x1b[36m"Kilua, tolong install skill vercel-labs/skills@find-skills"\x1b[0m`);
-    } else {
-      for (const s of list) {
-        console.log(`- \x1b[32m${s.name}\x1b[0m: ${s.desc}`);
-      }
-    }
-    console.log();
-    return settings;
-  }
+function cmdSkills(settings) {
+  const t = themeOf(settings);
+  const list = listInstalledSkills();
+  const builtin = loadBuiltinSkills();
+  console.log(`\n${t.bold}${t.accent}=== SKILLS TERPASANG (${SKILLS_DIR}) ===${t.reset}`);
+  if (!list.length) {
+    console.log(`Belum ada skill tambahan terpasang.`);
+    console.log(`Suruh Kilua di chat, misal: ${t.sel}"Kilua, install skill vercel-labs/skills@find-skills"${t.reset}`);
+  } else for (const s of list) console.log(`- ${t.ok}${s.name}${t.reset}: ${s.desc}`);
+  console.log(`${t.dim}+ ${builtin.length} skill bawaan aktif otomatis (maks ${MAX_INJECTED_SKILLS}/pesan)${t.reset}\n`);
+  return settings;
+}
 
-  if (action === "/clear") {
-    convo.length = 0;
-    console.clear();
-    console.log(`\x1b[32m✓ Riwayat percakapan dibersihkan.\x1b[0m\n`);
-    return settings;
+async function cmdTheme(settings) {
+  const t = themeOf(settings);
+  const names = Object.keys(THEMES);
+  console.log(`\n${t.bold}${t.accent}=== TEMA ===${t.reset}`);
+  names.forEach((n, i) => {
+    const mark = n === (settings.theme || "purple") ? `${t.ok}●${t.reset}` : " ";
+    console.log(` ${mark} ${i + 1}) ${THEMES[n].accent}${n}${t.reset}`);
+  });
+  const pick = (await promptLine(`\nPilih tema [1-${names.length}] (Enter = batal): `)).trim();
+  const idx = Number(pick) - 1;
+  if (names[idx]) {
+    settings.theme = names[idx];
+    saveSettings(settings);
+    console.log(`${themeOf(settings).ok}✓ Tema: ${settings.theme}${t.reset}\n`);
   }
+  return settings;
+}
 
-  if (action === "/config") {
-    rl.close();
-    const newSettings = await runInteractiveConfig();
-    return newSettings;
+async function cmdMcp(settings) {
+  const t = themeOf(settings);
+  if (!Array.isArray(settings.mcp)) settings.mcp = [];
+  while (true) {
+    console.log(`\n${t.bold}${t.accent}=== MCP SERVERS ===${t.reset}`);
+    if (!settings.mcp.length) console.log(`${t.dim}Belum ada server MCP.${t.reset}`);
+    settings.mcp.forEach((m, i) => console.log(` ${i + 1}) ${t.ok}${m.name}${t.reset} ${t.dim}${m.command || ""} ${(m.args || []).join(" ")}${t.reset}`));
+    const pick = (await promptLine(`\n[a] tambah · [d] hapus · [Enter] selesai: `)).trim().toLowerCase();
+    if (!pick) break;
+    if (pick === "a") {
+      const name = (await promptLine("Nama server: ")).trim();
+      const command = (await promptLine("Command (mis. npx): ")).trim();
+      const argsRaw = (await promptLine("Args (pisah spasi, opsional): ")).trim();
+      if (!name || !command) { console.log(`${t.warn}[!] Nama & command wajib.${t.reset}`); continue; }
+      settings.mcp.push({ name, command, args: argsRaw ? argsRaw.split(/\s+/) : [] });
+      saveSettings(settings);
+      console.log(`${t.ok}✓ ${name} ditambahkan.${t.reset}`);
+    } else if (pick === "d") {
+      const n = Number((await promptLine("Nomor yang dihapus: ")).trim()) - 1;
+      if (settings.mcp[n]) { const [x] = settings.mcp.splice(n, 1); saveSettings(settings); console.log(`${t.ok}✓ ${x.name} dihapus.${t.reset}`); }
+      else console.log(`${t.warn}[!] Nomor tidak valid.${t.reset}`);
+    } else break;
   }
+  return settings;
+}
+
+async function cmdMemory(settings) {
+  const t = themeOf(settings);
+  const file = path.join(process.cwd(), "KILUA.md");
+  const body = readMemory();
+  console.log(`\n${t.bold}${t.accent}=== MEMORI PROYEK ===${t.reset} ${t.dim}${file}${t.reset}`);
+  console.log(body.trim() ? body.trim() : `${t.dim}(kosong — memori ini selalu disuntik ke system prompt)${t.reset}`);
+  const add = (await promptLine(`\nTambah catatan memori (Enter = batal): `)).trim();
+  if (add) {
+    fs.appendFileSync(file, (fs.existsSync(file) ? "\n" : "# Memori Proyek (KILUA.md)\n") + "- " + add + "\n", "utf8");
+    console.log(`${t.ok}✓ Disimpan ke KILUA.md${t.reset}\n`);
+  } else console.log();
+  return settings;
+}
 
-  console.log(`Perintah tidak dikenal: ${action}. Ketik \x1b[36m/help\x1b[0m untuk daftar perintah.`);
+function cmdPlan(settings) {
+  const t = themeOf(settings);
+  PLAN_MODE = !PLAN_MODE;
+  console.log(`\n${PLAN_MODE ? t.warn + "⏸ Plan mode ON" : t.ok + "▶ Plan mode OFF"}${t.reset} ${t.dim}— ${PLAN_MODE ? "hanya baca & menyusun rencana, aksi tulis diblokir" : "agent bebas mengeksekusi"}.${t.reset}\n`);
   return settings;
 }
 
+async function handleSlashCommand(cmd, settings, convo) {
+  const action = cmd.trim().split(/\s+/)[0].toLowerCase();
+  switch (action) {
+    case "/help": return printHelp(settings), settings;
+    case "/model": case "/models": return await cmdModel(settings);
+    case "/skills": case "/skill": return cmdSkills(settings);
+    case "/theme": return await cmdTheme(settings);
+    case "/mcp": return await cmdMcp(settings);
+    case "/memory": return await cmdMemory(settings);
+    case "/plan": return cmdPlan(settings);
+    case "/clear":
+      convo.length = 0;
+      console.clear();
+      console.log(`${themeOf(settings).ok}✓ Riwayat percakapan dibersihkan.${themeOf(settings).reset}\n`);
+      return settings;
+    case "/config": return await runInteractiveConfig();
+    default:
+      console.log(`Perintah tidak dikenal: ${action}. Ketik ${themeOf(settings).sel}/help${themeOf(settings).reset}.`);
+      return settings;
+  }
+}
+
 async function main() {
   const args = process.argv.slice(2);
   const oneShot = args.join(" ").trim();
@@ -596,11 +1272,23 @@ async function main() {
   }
 
   let settings = loadSettings();
+  if (args[0] === "--version" || args[0] === "-v") {
+    const here = path.dirname(fileURLToPath(import.meta.url));
+    const candidates = [path.join(here, "..", "packages", "kilua-agent", "package.json"), path.join(here, "..", "package.json")];
+    let v = "1.3.0";
+    for (const p of candidates) {
+      try {
+        const j = JSON.parse(fs.readFileSync(p, "utf8"));
+        if (j.name === "kilua-ai" && j.private) continue; // root app, bukan paket CLI
+        if (j.version) { v = j.version; break; }
+      } catch {}
+    }
+    console.log(`kilua-agent ${v}`);
+    process.exit(0);
+  }
 
-  // Validasi ketat: jika belum ada base_url atau api_key, WAJIB setup dulu
   const isLocalProxy = settings.base_url?.includes("127.0.0.1") || settings.base_url?.includes("localhost");
   const hasValidConfig = settings.base_url && (settings.api_key || isLocalProxy);
-
   if (!hasValidConfig) {
     console.log("\x1b[33m[!] Belum ada konfigurasi AI key / provider.\x1b[0m");
     settings = await runInteractiveConfig();
@@ -612,29 +1300,25 @@ async function main() {
     process.exit(0);
   }
 
-  console.log("\x1b[1m\x1b[35m=== KILUA AI CLI AGENT ===\x1b[0m");
-  console.log(`CWD     : \x1b[33m${process.cwd()}\x1b[0m`);
-  console.log(`Provider: \x1b[32m${settings.base_url}\x1b[0m (${settings.model})`);
-  console.log(`Config  : \x1b[90m${SETTINGS_PATH}\x1b[0m (ketik \x1b[36m/help\x1b[0m untuk panduan)\n`);
-
-  let rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-  const ask = () => {
-    rl.question("\x1b[1mKAMU > \x1b[0m", async input => {
-      const q = input.trim();
-      if (!q) return ask();
-      if (q === "exit" || q === "quit" || q === "/exit") { rl.close(); process.exit(0); }
-      if (q.startsWith("/")) {
-        settings = await handleSlashCommand(q, settings, convo, rl);
-        if (q === "/config") {
-          rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-        }
-        return ask();
-      }
-      await runAgent(settings, q, convo);
-      ask();
-    });
-  };
-  ask();
+  const t = themeOf(settings);
+  console.log(`${t.bold}${t.accent}=== KILUA AI CLI AGENT ===${t.reset}`);
+  console.log(`${t.dim}CWD     :${t.reset} ${t.warn}${process.cwd()}${t.reset}`);
+  console.log(`${t.dim}Provider:${t.reset} ${t.ok}${settings.base_url}${t.reset} (${settings.model})`);
+  console.log(`${t.dim}Bantuan :${t.reset} ${t.sel}/${t.reset} perintah · ${t.sel}Ctrl+V${t.reset} paste teks/gambar\n`);
+
+  const history = [];
+  while (true) {
+    const { text, images } = await promptComposer(settings, history);
+    if (!text && !images.length) continue;
+    if (text === "exit" || text === "quit" || text === "/exit") break;
+    if (images.length && !text) { await runAgent(settings, "", convo, images); continue; }
+    if (text.startsWith("/")) { settings = await handleSlashCommand(text, settings, convo); continue; }
+    history.push(text);
+    if (history.length > 100) history.shift();
+    await runAgent(settings, text, convo, images);
+  }
+  console.log(`${t.dim}Sampai jumpa.${t.reset}`);
+  process.exit(0);
 }
 
 main();