@gilangranggaid/kilua-agent 1.1.2 → 1.2.0

package/bin/kilua.mjs

@@ -4,11 +4,80 @@ 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_INJECTED_SKILLS = 5; // sama seperti web: cukup 5 skill per pesan biar konteks hemat
+
+// 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 });
@@ -45,12 +114,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;
 }
@@ -88,6 +165,30 @@ const TOOLS_OPENAI = [
       parameters: { type: "object", properties: { path: { type: "string" } } }
     }
   },
+  {
+    type: "function",
+    function: {
+      name: "grep_search",
+      description: "Mencari pola teks (regex) di dalam file project. Lebih hemat token daripada membaca seluruh file. Hasil: path:baris:isi.",
+      parameters: {
+        type: "object",
+        properties: {
+          pattern: { type: "string", description: "Pola regex atau teks yang dicari." },
+          path: { type: "string", description: "Folder atau file awal. Default: folder aktif." },
+          glob: { type: "string", description: "Filter file, contoh: *.js atau **/*.ts" }
+        },
+        required: ["pattern"]
+      }
+    }
+  },
+  {
+    type: "function",
+    function: {
+      name: "delete_file",
+      description: "Menghapus file lokal.",
+      parameters: { type: "object", properties: { path: { type: "string" } }, required: ["path"] }
+    }
+  },
   {
     type: "function",
     function: {
@@ -113,9 +214,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);
@@ -123,14 +225,42 @@ 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 || ".");
       return fs.readdirSync(target, { withFileTypes: true }).map(it => `${it.isDirectory() ? "[DIR]" : "[FILE]"} ${it.name}`).join("\n");
     }
+    if (name === "grep_search") {
+      const target = path.resolve(cwd, args.path || ".");
+      const pattern = args.pattern;
+      const glob = args.glob || "";
+      // ponytail: pakai findstr/Select-String bawaan OS, hindari dependency
+      const isWin = process.platform === "win32";
+      let cmd;
+      if (isWin) {
+        const p = target.replace(/\//g, "\\");
+        cmd = glob
+          ? `powershell -NoProfile -Command "Get-ChildItem -Path '${p}' -Recurse -File -Filter '${glob}' -ErrorAction SilentlyContinue | Select-String -Pattern '${pattern.replace(/'/g, "''")}' | Select-Object -First 200 | ForEach-Object { \\"$($_.Path):$($_.LineNumber):$($_.Line.Trim())\\" }"`
+          : `powershell -NoProfile -Command "Get-ChildItem -Path '${p}' -Recurse -File -ErrorAction SilentlyContinue | Where-Object { $_.Length -lt 2MB -and $_.FullName -notmatch 'node_modules|\\\\.git\\\\' } | Select-String -Pattern '${pattern.replace(/'/g, "''")}' | Select-Object -First 200 | ForEach-Object { \\"$($_.Path):$($_.LineNumber):$($_.Line.Trim())\\" }"`;
+      } else {
+        cmd = glob
+          ? `grep -rn --include='${glob}' '${pattern.replace(/'/g, "'\\''")}' '${target}' | head -200`
+          : `grep -rn --exclude-dir=node_modules --exclude-dir=.git '${pattern.replace(/'/g, "'\\''")}' '${target}' | head -200`;
+      }
+      const out = execSync(cmd, { cwd, encoding: "utf8", timeout: 60000, stdio: ["pipe", "pipe", "pipe"] });
+      return out.trim() || "(tidak ada hasil)";
+    }
     if (name === "run_cmd") {
-      const out = execSync(args.command, { cwd, encoding: "utf8", timeout: 120000, stdio: ["pipe", "pipe", "pipe"] });
+      const out = execSync(args.command, { cwd, encoding: "utf8", timeout: 180000, stdio: ["pipe", "pipe", "pipe"], maxBuffer: 10 * 1024 * 1024 });
       return out.trim() || "(Done with exit code 0)";
     }
   } catch (err) {
@@ -143,6 +273,67 @@ function promptQuestion(rl, query) {
   return new Promise(res => rl.question(query, res));
 }
 
+// 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 });
 
@@ -229,36 +420,129 @@ async function readSseStream(res, onChunk) {
   }
 }
 
-function buildSystemPrompt() {
-  const skillsInfo = getSkillsPrompt();
+function buildSystemPrompt(convo) {
+  let lastUser = "";
+  for (let i = (convo?.length ?? 0) - 1; i >= 0; i--) {
+    if (convo[i].role === "user" && typeof convo[i].content === "string") { lastUser = convo[i].content; break; }
+  }
+  const skillsInfo = getSkillsPrompt(lastUser);
   return `Kamu KILUA, AI Coding Agent otonom di terminal lokal. Folder aktif: ${process.cwd()}.
 KEMAMPUAN TOOLS:
 - read_file, write_file, edit_file, list_dir
+- grep_search: mencari pola di seluruh file project (hemat token, pakai ini sebelum read_file untuk file besar)
 - run_cmd: menjalankan perintah terminal lokal (npm, npx, git, node, python, build, test, curl, install skill, dsb).
 
-ATURAN OTONOM KILUA (SELF-TESTING & AUTO-INSTALL SKILL):
-1. Jika pengguna meminta membuat project/fitur/skrip, JANGAN langsung serahkan begitu saja. Kamu HARUS mencoba atau memvalidasinya sendiri terlebih dahulu menggunakan run_cmd (misal: jalankan skrip, test, build, atau cek sintaks).
-2. Jika ada error saat kamu mencoba, perbaiki langsung menggunakan edit_file/write_file sampai berhasil.
-3. Setelah berhasil dicoba dan dipastikan tidak error, barulah beri tahu pengguna hasil dan cara menjalankannya.
-4. Jika pengguna di chat menyuruh kamu install skill (misal: "install skill vercel-labs/skills@find-skills" atau skill lain), jalankan run_cmd dengan perintah:
+CARA KERJA (WAJIB DIIKUTI):
+1. Pahami dulu: list_dir + grep_search untuk menemukan file yang relevan. Jangan menebak isi file.
+2. Baca hanya file yang benar-benar perlu (read_file), bukan seluruh project.
+3. Tulis perubahan dengan edit_file (teks lama harus persis sama). Pakai write_file hanya untuk file baru.
+4. SETELAH mengubah kode, WAJIB verifikasi sendiri lewat run_cmd: jalankan file, test, atau build.
+5. Jika muncul error, perbaiki sendiri dengan edit_file lalu jalankan ulang. Ulangi sampai lolos.
+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 pengguna bahwa skill tersebut telah siap dipakai.${skillsInfo}
+   lalu beri tahu skill sudah siap dipakai.${skillsInfo}
+
+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;
+}
 
-Respon ringkas, padat, dan bertindak langsung.`;
+// ponytail: retry untuk 429/5xx/network — provider gratis sering rate-limit
+async function fetchWithRetry(url, init) {
+  let lastErr;
+  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_RECONNECT_ATTEMPTS) return res;
+        hadFailure = true;
+        const wait = Math.min(30000, 1500 * Math.pow(2, attempt));
+        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_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));
+    }
+  }
+  if (lastErr) throw lastErr;
 }
 
 // Loop untuk Anthropic / 9router local (/v1/messages)
 async function runAnthropicLoop(settings, convo) {
-  const SYSTEM = buildSystemPrompt();
+  const SYSTEM = buildSystemPrompt(convo);
 
   let endpoint = settings.base_url.replace(/\/+$/, "");
   if (!endpoint.endsWith("/messages")) endpoint += "/messages";
 
-  for (let step = 0; step < 16; step++) {
-    process.stdout.write("\r\x1b[2K\x1b[35m[KILUA Berpikir...]\x1b[0m ");
+  let finished = false;
+  for (let step = 0; step < MAX_STEPS; step++) {
+    startStatus(stepLabel(step, MAX_STEPS));
+    const turnStart = Date.now();
+    let usage = null;
     let res;
     try {
-      res = await fetch(endpoint, {
+      res = await fetchWithRetry(endpoint, {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
@@ -276,13 +560,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;
     }
 
@@ -291,6 +574,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;
@@ -299,6 +585,7 @@ async function runAnthropicLoop(settings, convo) {
 
       if (deltaText) {
         if (!printedHeader) {
+          stopStatus();
           process.stdout.write("\r\x1b[2KKILUA > ");
           printedHeader = true;
         }
@@ -322,8 +609,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 = [];
@@ -332,15 +621,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,
@@ -349,11 +637,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);
 
   let endpoint = settings.base_url.replace(/\/+$/, "");
   if (endpoint.includes("generativelanguage.googleapis.com") && !endpoint.includes("/openai")) {
@@ -363,11 +656,14 @@ async function runOpenAiLoop(settings, convo) {
     endpoint += "/chat/completions";
   }
 
-  for (let step = 0; step < 16; step++) {
-    process.stdout.write("\r\x1b[2K\x1b[35m[KILUA Berpikir...]\x1b[0m ");
+  let finished = false;
+  for (let step = 0; step < MAX_STEPS; step++) {
+    startStatus(stepLabel(step, MAX_STEPS));
+    const turnStart = Date.now();
+    let usage = null;
     let res;
     try {
-      res = await fetch(endpoint, {
+      res = await fetchWithRetry(endpoint, {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
@@ -377,19 +673,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;
     }
 
@@ -398,10 +694,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;
         }
@@ -418,24 +716,30 @@ 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) {
@@ -489,6 +793,7 @@ async function handleSlashCommand(cmd, settings, convo, rl) {
 
   if (action === "/skills" || action === "/skill") {
     const list = listInstalledSkills();
+    const builtin = loadBuiltinSkills();
     console.log(`\n\x1b[35m=== SKILLS TERPASANG (${SKILLS_DIR}) ===\x1b[0m`);
     if (!list.length) {
       console.log(`Belum ada skill tambahan terpasang.`);
@@ -498,6 +803,7 @@ async function handleSlashCommand(cmd, settings, convo, rl) {
         console.log(`- \x1b[32m${s.name}\x1b[0m: ${s.desc}`);
       }
     }
+    console.log(`\x1b[90m+ ${builtin.length} skill bawaan aktif otomatis (disuntik maks ${MAX_INJECTED_SKILLS}/pesan sesuai tugas)\x1b[0m`);
     console.log();
     return settings;
   }