kiosapi 0.1.26 → 0.1.28

package/dist/agent/run.js

@@ -56,32 +56,36 @@ function trimContext(messages) {
     const dropped = clean.length - tail.length;
     if (dropped <= 0)
         return [system, ...clean];
-    // Collect baca_file paths from the dropped messages so the model knows which files it
-    // already has context for — prevents it from re-orienting by re-reading config/schema files.
+    // Collect baca_file and daftar_file calls from the dropped messages so the model knows which
+    // files/directories it already has context for — prevents re-orientation loops after trimming.
     const droppedHead = clean.slice(0, clean.length - tail.length + skip);
     const droppedPaths = [];
+    const droppedDirs = [];
     for (const msg of droppedHead) {
         if (msg.role === 'assistant' && msg.tool_calls) {
             for (const tc of msg.tool_calls) {
-                if (tc.function?.name === 'baca_file') {
-                    try {
-                        const a = JSON.parse(tc.function.arguments ?? '{}');
-                        if (a.path)
-                            droppedPaths.push(a.path);
-                    }
-                    catch {
-                        /* ignore */
-                    }
+                try {
+                    const a = JSON.parse(tc.function.arguments ?? '{}');
+                    if (tc.function?.name === 'baca_file' && a.path)
+                        droppedPaths.push(a.path);
+                    if (tc.function?.name === 'daftar_file')
+                        droppedDirs.push(a.path || '.');
+                }
+                catch {
+                    /* ignore */
                 }
             }
         }
     }
     const filesNote = droppedPaths.length > 0
-        ? ` File sudah dibaca (tak lagi di window): ${[...new Set(droppedPaths)].join(', ')}. JANGAN baca ulang — gunakan cari untuk mencari teks spesifik.`
+        ? ` File sudah dibaca: ${[...new Set(droppedPaths)].join(', ')}. JANGAN baca ulang — gunakan cari untuk teks spesifik.`
+        : '';
+    const dirsNote = droppedDirs.length > 0
+        ? ` Direktori sudah terdaftar: ${[...new Set(droppedDirs)].join(', ')}. JANGAN list ulang — gunakan baca_file untuk file spesifik.`
         : '';
     const note = {
         role: 'system',
-        content: `[Kiosapi: ${dropped} pesan awal dihapus dari konteks.${filesNote}]`,
+        content: `[Kiosapi: ${dropped} pesan awal dihapus dari konteks.${filesNote}${dirsNote}]`,
     };
     return [system, note, ...tail];
 }
@@ -482,12 +486,15 @@ export async function runTurn(s, userText) {
         }
     };
     // Loop detection: count total calls per signature (tool+args) across the whole runTurn.
-    // Consecutive-3 catches obvious tight loops; count-4 catches spread-out repetition where
-    // other calls (daftar src, baca ...) appear between the repeating call.
+    // Consecutive-3 catches obvious tight loops; count-N catches spread-out repetition.
+    // daftar_file has a lower limit (3) because re-listing the same directory is almost never
+    // useful; baca_file legitimately needs more chances (range reads + post-edit re-reads).
     const callCounts = new Map();
     const lastSigs = []; // last 3 sigs for consecutive detection
-    const COUNT_LIMIT = 6; // same tool+args called 6× total → loop (higher because cache now returns content)
+    const COUNT_LIMITS = { daftar_file: 3, cari: 4 };
+    const DEFAULT_COUNT_LIMIT = 6;
     const CONSEC_LIMIT = 3; // same sig 3× in a row → loop
+    const countLimitFor = (toolName) => COUNT_LIMITS[toolName] ?? DEFAULT_COUNT_LIMIT;
     // Read-only tool cache: on 2nd+ identical call, return the previous result with a warning
     // instead of re-running. This gives the model early feedback so it can self-correct before
     // COUNT_LIMIT is reached, preventing the common "list root, list root, list root" pattern.
@@ -553,9 +560,9 @@ export async function runTurn(s, userText) {
             lastSigs.push(sig);
             if (lastSigs.length > CONSEC_LIMIT)
                 lastSigs.shift();
-            // Total count exceeded, or 3 in a row
+            // Total count exceeded (per-tool limit), or 3 in a row
             const consecutive = lastSigs.length === CONSEC_LIMIT && lastSigs.every((s) => s === sig);
-            if (count >= COUNT_LIMIT || consecutive) {
+            if (count >= countLimitFor(call.function.name) || consecutive) {
                 loopSig = sig;
                 break;
             }
@@ -588,9 +595,13 @@ export async function runTurn(s, userText) {
                 // trimContext drops old messages from its window. The escalating warning text
                 // discourages repetition; withholding the content at count=3+ only causes the model
                 // to keep retrying — counter-productive to stopping the loop.
-                const stopNote = count >= COUNT_LIMIT - 1
-                    ? `\n\n⚠ STOP (ke-${count}): JANGAN panggil "${toolName}" lagi dengan argumen yang sama. Gunakan tool "selesai" dan jelaskan kendalanya, atau gunakan cari/baca_file dengan path/range BERBEDA.`
-                    : `\n\n⚠ Cache ke-${count}: "${toolName}" sudah dipanggil ${count}× dengan argumen sama. Gunakan cari atau baca_file(path, mulai=N) untuk bagian berbeda.`;
+                const toolLimit = countLimitFor(toolName);
+                const isLastChance = count >= toolLimit - 1;
+                const stopNote = isLastChance
+                    ? `\n\n⚠ STOP (ke-${count}/${toolLimit}): JANGAN panggil "${toolName}" lagi dengan argumen yang sama. Gunakan tool "selesai" dan jelaskan kendalanya, atau gunakan cari/baca_file dengan path/range BERBEDA.`
+                    : toolName === 'daftar_file'
+                        ? `\n\n⚠ Cache ke-${count}: direktori ini SUDAH terdaftar. JANGAN list ulang — gunakan baca_file(path) untuk file spesifik di dalamnya.`
+                        : `\n\n⚠ Cache ke-${count}: "${toolName}" sudah dipanggil ${count}× dengan argumen sama. Gunakan cari atau baca_file(path, mulai=N) untuk bagian berbeda.`;
                 const warn = `[Cache ke-${count}]\n${cachedOut}${stopNote}`;
                 const cachePathHint = (() => {
                     try {

package/dist/agent/team.js

@@ -1,49 +1,128 @@
 import { modelSupportsTools } from '../api.js';
 import { bold, dim, green, yellow } from '../ui.js';
 import { newSession, runTurn } from './run.js';
-const ROLES = {
-    perencana: {
-        title: '① Perencana',
-        mode: 'rencana',
-        brief: 'Peranmu: PERENCANA. Telusuri kode seperlunya, lalu susun rencana langkah yang jelas & ringkas. JANGAN menulis kode.',
-    },
-    pengkode: {
-        title: '② Pengkode',
-        mode: 'buat',
-        brief: 'Peranmu: PENGKODE. Implementasikan tugas mengikuti rencana. Buat perubahan kecil & jelas, lalu panggil selesai.',
-    },
-    peninjau: {
-        title: '③ Peninjau',
-        mode: 'rencana',
-        brief: 'Peranmu: PENINJAU. Baca file yang relevan dan tinjau hasil implementasi: sebutkan masalah/risiko & saran perbaikan singkat.',
-    },
-};
-/** Run one role as a sub-agent (with its own model) and return its final text. */
-async function runRole(name, task, opts) {
-    const role = ROLES[name];
-    const model = opts.models[name];
-    console.log(`\n${bold(role.title)} ${dim(`(${model})`)}`);
-    const s = newSession(model, role.mode, opts.otomatis);
-    s.messages.push({ role: 'system', content: role.brief });
-    return runTurn(s, task);
+/**
+ * Try to extract a StructuredPlan from the planner's selesai output.
+ * Handles: raw JSON, ```json block, or JSON embedded in prose.
+ */
+function tryParsePlan(output) {
+    const candidates = [output.trim()];
+    const codeBlock = output.match(/```(?:json)?\s*([\s\S]*?)\s*```/);
+    if (codeBlock?.[1])
+        candidates.push(codeBlock[1].trim());
+    const embedded = output.match(/\{[\s\S]*?"langkah"[\s\S]*\}/);
+    if (embedded?.[0])
+        candidates.push(embedded[0]);
+    for (const c of candidates) {
+        try {
+            const p = JSON.parse(c);
+            if (p !== null &&
+                typeof p === 'object' &&
+                Array.isArray(p.langkah) &&
+                p.langkah.length > 0 &&
+                typeof p.langkah[0]?.tugas === 'string') {
+                return p;
+            }
+        }
+        catch {
+            /* try next */
+        }
+    }
+    return null;
 }
-/** Orchestrate the perencana → pengkode → peninjau pipeline for a task. */
+// ---------------------------------------------------------------------------
+// Built-in team: planner-executor
+// ---------------------------------------------------------------------------
+const PLANNER_BRIEF = `Peranmu: PERENCANA. Telusuri kode seperlunya lalu buat rencana langkah kecil & terstruktur.
+
+WAJIB: panggil tool "selesai" dengan parameter ringkasan berisi JSON dalam format TEPAT ini (tidak ada teks lain sebelum/sesudah JSON):
+{"ringkasan":"<ringkasan singkat>","langkah":[{"tugas":"<deskripsi spesifik & actionable>","file":["path/file1.ts"],"catatan":"<konteks tambahan, opsional>"},...]}
+
+Aturan rencana:
+- Masing-masing langkah: 1–3 file, satu perubahan jelas, bisa selesai dalam ~15 tool calls.
+- Maksimal 10 langkah — pecah yang kompleks, gabung yang trivial.
+- Sebutkan path file LENGKAP dan AKURAT (gunakan daftar_file untuk memastikan).
+- JANGAN menulis kode — hanya rencanakan.`;
+const REVIEWER_BRIEF = 'Peranmu: PENINJAU. Baca file yang relevan dan tinjau hasil implementasi: sebutkan masalah/risiko & saran perbaikan singkat.';
 export async function runTeam(task, opts) {
-    console.log(bold('👥 Tim agen: perencana → pengkode → peninjau'));
-    const plan = await runRole('perencana', task, opts);
-    await runRole('pengkode', `Tugas: ${task}\n\nRencana:\n${plan || '(tidak ada rencana eksplisit)'}`, opts);
-    await runRole('peninjau', `Tinjau hasil implementasi untuk tugas: ${task}`, opts);
+    console.log(bold('👥 Tim agen — mode perencana-eksekutor'));
+    // ① Planner
+    console.log(`\n${bold('① Perencana')} ${dim(`(${opts.models.perencana})`)}`);
+    const plannerSession = newSession(opts.models.perencana, 'rencana', opts.otomatis);
+    plannerSession.messages.push({ role: 'system', content: PLANNER_BRIEF });
+    const planOutput = await runTurn(plannerSession, task);
+    const plan = tryParsePlan(planOutput);
+    if (!plan) {
+        console.log(yellow('⚠ Perencana tidak menghasilkan rencana terstruktur — jalankan sebagai sesi pengkode tunggal.'));
+        const s = newSession(opts.models.pengkode, 'buat', opts.otomatis);
+        s.messages.push({
+            role: 'system',
+            content: 'Peranmu: PENGKODE. Implementasikan tugas mengikuti rencana. Buat perubahan kecil & jelas, lalu panggil selesai.',
+        });
+        await runTurn(s, `Tugas: ${task}\n\nRencana:\n${planOutput || '(tidak ada rencana eksplisit)'}`);
+        console.log(`\n${bold('③ Peninjau')} ${dim(`(${opts.models.peninjau})`)}`);
+        const rev = newSession(opts.models.peninjau, 'rencana', opts.otomatis);
+        rev.messages.push({ role: 'system', content: REVIEWER_BRIEF });
+        await runTurn(rev, `Tinjau hasil implementasi untuk tugas: ${task}`);
+        console.log(green('\n✓ Tim selesai.'));
+        return;
+    }
+    // Show plan
+    console.log(bold(`\n📋 ${plan.ringkasan}`));
+    for (const [i, step] of plan.langkah.entries()) {
+        console.log(`  ${dim(`${i + 1}.`)} ${step.tugas}`);
+        console.log(dim(`     📄 ${step.file.join(', ')}`));
+        if (step.catatan)
+            console.log(dim(`     💬 ${step.catatan}`));
+    }
+    console.log('');
+    // ② Execute each step in a fresh focused session
+    for (const [i, step] of plan.langkah.entries()) {
+        const label = `${i + 1}/${plan.langkah.length}`;
+        console.log(bold(`\n② Pengkode — Langkah ${label}`) + dim(`: ${step.tugas}`));
+        console.log(dim(`   📄 ${step.file.join(', ')}`));
+        const s = newSession(opts.models.pengkode, 'buat', opts.otomatis);
+        s.messages.push({
+            role: 'system',
+            content: [
+                `Peranmu: PENGKODE — langkah ${label} dari rencana keseluruhan.`,
+                `TUGAS: ${step.tugas}`,
+                `File relevan: ${step.file.join(', ')}`,
+                step.catatan ? `Catatan: ${step.catatan}` : '',
+                'Fokus HANYA pada tugas ini. Baca file relevan, buat perubahan, panggil selesai.',
+                'Jangan baca file lain kecuali diperlukan langsung untuk memahami konteks.',
+            ]
+                .filter(Boolean)
+                .join('\n'),
+        });
+        const stepPrompt = [
+            step.tugas,
+            `\nFile: ${step.file.join(', ')}`,
+            step.catatan ? `\nCatatan: ${step.catatan}` : '',
+        ]
+            .filter(Boolean)
+            .join('');
+        await runTurn(s, stepPrompt);
+    }
+    // ③ Reviewer — pass the plan so it knows which files were touched
+    console.log(`\n${bold('③ Peninjau')} ${dim(`(${opts.models.peninjau})`)}`);
+    const stepSummary = plan.langkah
+        .map((s, i) => `  ${i + 1}. ${s.tugas} [${s.file.join(', ')}]`)
+        .join('\n');
+    const rev = newSession(opts.models.peninjau, 'rencana', opts.otomatis);
+    rev.messages.push({ role: 'system', content: REVIEWER_BRIEF });
+    await runTurn(rev, `Tinjau hasil implementasi untuk tugas: ${task}\n\nLangkah yang sudah dikerjakan:\n${stepSummary}`);
     console.log(green('\n✓ Tim selesai.'));
 }
-/**
- * Run a custom team defined by a TeamConfig. Each role runs sequentially; the output of one role
- * is passed as context to the next.
- */
+// ---------------------------------------------------------------------------
+// Custom team (unchanged)
+// ---------------------------------------------------------------------------
+// Cap output passed between roles to prevent context inflation across a long pipeline.
+const MAX_ROLE_OUTPUT = 3_000;
 export async function runCustomTeam(task, opts) {
     const { config, otomatis, modelOverrides = {} } = opts;
     const alur = config.alur.filter((r) => r in config.peran);
     console.log(bold(`👥 Tim "${config.nama}": ${alur.join(' → ')}`));
-    // Warn about models that may lack tool support (best-effort, silent on network error)
     const uniqueModels = [
         ...new Set(alur.map((r) => modelOverrides[r] ?? config.peran[r]?.model).filter(Boolean)),
     ];
@@ -67,7 +146,11 @@ export async function runCustomTeam(task, opts) {
         if (roleCfg.brief)
             s.messages.push({ role: 'system', content: roleCfg.brief });
         const result = await runTurn(s, context);
-        context = `Tugas asal: ${task}\n\nOutput dari ${roleName}:\n${result || '(tidak ada output eksplisit)'}`;
+        const trimmed = (result ?? '').trim();
+        const capped = trimmed.length > MAX_ROLE_OUTPUT
+            ? `${trimmed.slice(0, MAX_ROLE_OUTPUT)}\n…[dipotong — ${trimmed.length - MAX_ROLE_OUTPUT} char lebih]`
+            : trimmed;
+        context = `Tugas asal: ${task}\n\nOutput dari ${roleName}:\n${capped || '(tidak ada output eksplisit)'}`;
     }
     console.log(green(`\n✓ Tim "${config.nama}" selesai.`));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kiosapi",
-  "version": "0.1.26",
+  "version": "0.1.28",
   "type": "module",
   "description": "CLI Kiosapi.id berbahasa Indonesia — bangun aplikasimu pakai API key Kiosapi (agen + multimodal).",
   "keywords": [