sanook-cli 0.5.1 → 0.5.2

package/dist/tools/read.js

@@ -3,6 +3,17 @@ import { z } from 'zod';
 import { readFile } from 'node:fs/promises';
 import { clamp, resolveAgentPath } from './util.js';
 import { checkReadPath } from './permission.js';
+function splitReadableLines(content) {
+    if (!content)
+        return [];
+    const lines = content.split(/\r\n|\n|\r/);
+    if (/(\r\n|\n|\r)$/.test(content))
+        lines.pop();
+    return lines;
+}
+function normalizeReadableLineEndings(content) {
+    return content.replace(/\r\n|\r/g, '\n');
+}
 export const readFileTool = tool({
     description: 'อ่านไฟล์ใน workspace (UTF-8). อ่านก่อนแก้ไฟล์เสมอ. ' +
         'ไฟล์ใหญ่หรือต้องการแค่บางส่วน → ใส่ offset/limit อ่านเฉพาะช่วงบรรทัด (ประหยัด token มาก — คู่กับ grep ที่ให้เลขบรรทัด)',
@@ -20,12 +31,13 @@ export const readFileTool = tool({
             const content = await readFile(full, 'utf8');
             // ไม่ระบุช่วง → คืนทั้งไฟล์ (clamp) เหมือนเดิม
             if (offset == null && limit == null)
-                return clamp(content);
+                return clamp(normalizeReadableLineEndings(content));
             // ระบุช่วง → อ่านเฉพาะบรรทัด start..end (ส่งเฉพาะที่ต้องการเข้า context, ประหยัด token)
-            const lines = content.split('\n');
-            const start = Math.max(0, (offset ?? 1) - 1);
+            const lines = splitReadableLines(content);
+            const requestedOffset = offset ?? 1;
+            const start = Math.max(0, requestedOffset - 1);
             if (start >= lines.length)
-                return `(ไฟล์มี ${lines.length} บรรทัด — offset ${offset} เกินช่วง)`;
+                return `(ไฟล์มี ${lines.length} บรรทัด — offset ${requestedOffset} เกินช่วง)`;
             const end = limit == null ? lines.length : Math.min(lines.length, start + limit);
             const slice = lines.slice(start, end).join('\n');
             return clamp(`[บรรทัด ${start + 1}-${end} จาก ${lines.length}]\n${slice}`);

package/dist/tools/schedule.js

@@ -2,6 +2,7 @@ import { tool } from 'ai';
 import { z } from 'zod';
 import { parseSchedule } from '../gateway/schedule.js';
 import { enqueueTask, listTasks, removeTask } from '../gateway/ledger.js';
+import { formatTarget, parseSendTarget } from '../gateway/targets.js';
 /** ตั้งงานตามเวลา — agent เรียกเองเมื่อ user พูดเรื่องเวลา/รอบ ("ทุกๆ X โมง/นาที") */
 export const scheduleTaskTool = tool({
     description: 'ตั้งงานให้ทำตามเวลา/เป็นรอบ — เรียกเมื่อ user ขอให้ทำอะไร "ทุกๆ X" หรือ "ตอน X โมง" หรือเวลาในอนาคต. ' +
@@ -13,21 +14,36 @@ export const scheduleTaskTool = tool({
         when: z.string().describe('เวลา: every 30m / 09:00 / ISO / "ทุก 2 ชั่วโมง"'),
         task: z.string().describe('สิ่งที่จะให้ทำตอนถึงเวลา — เขียนเป็น prompt เต็มในตัวเอง (รันเป็น fresh agent ไม่มี context นี้)'),
         model: z.string().optional().describe('model spec (ไม่ใส่ = default ของ gateway)'),
+        deliver: z
+            .string()
+            .optional()
+            .describe('ปลายทางส่งผลลัพธ์ เช่น telegram, telegram:123, discord:channel, slack:C01, mattermost:channel, homeassistant:notification_id, email:owner@example.com, line:U123, sms:+15551234567, ntfy:topic, signal:+15551234567, whatsapp:15551234567, matrix:!room:server, googlechat:spaces/AAA, bluebubbles:user@example.com, teams'),
     }),
-    execute: async ({ when, task, model }) => {
+    execute: async ({ when, task, model, deliver }) => {
         const sched = parseSchedule(when, Date.now());
         if (!sched) {
             return `ตั้งเวลาไม่ได้: "${when}" ไม่ใช่รูปแบบที่รองรับ — ลอง "every 30m", "09:00", ISO, หรือ "ทุก 2 ชั่วโมง"`;
         }
+        let normalizedDeliver;
+        if (deliver?.trim()) {
+            try {
+                normalizedDeliver = formatTarget(parseSendTarget(deliver));
+            }
+            catch (e) {
+                return `ตั้งปลายทางส่งผลลัพธ์ไม่ได้: ${e.message}`;
+            }
+        }
         const t = await enqueueTask({
             kind: sched.recurring ? 'cron' : 'once',
             spec: task,
             schedule: sched.recurring ? sched.normalized : undefined,
             model,
+            deliver: normalizedDeliver,
             runAt: sched.runAt,
         });
         const at = new Date(t.runAt).toLocaleString();
-        return (`ตั้งงาน ${t.id} แล้ว — รัน ${at}${sched.recurring ? ` แล้วทุก ${sched.normalized}` : ' (ครั้งเดียว)'}. ` +
+        return (`ตั้งงาน ${t.id} แล้ว — รัน ${at}${sched.recurring ? ` แล้วทุก ${sched.normalized}` : ' (ครั้งเดียว)'}` +
+            `${normalizedDeliver ? ` และส่งผลลัพธ์ไป ${normalizedDeliver}` : ''}. ` +
             `งานจะทำงานเมื่อ gateway เปิดอยู่ (sanook serve)`);
     },
 });
@@ -44,7 +60,7 @@ export const listScheduledTool = tool({
         if (!tasks.length)
             return filter ? `ไม่มีงานสถานะ ${filter}` : 'ยังไม่มีงานที่ตั้งเวลาไว้';
         return tasks
-            .map((t) => `${t.id} [${t.status}] ${t.schedule ?? 'once'} → ${t.spec.slice(0, 60)} (next ${new Date(t.runAt).toLocaleString()})`)
+            .map((t) => `${t.id} [${t.status}] ${t.schedule ?? 'once'}${t.deliver ? ` to:${t.deliver}` : ''} → ${t.spec.slice(0, 60)} (next ${new Date(t.runAt).toLocaleString()})`)
             .join('\n');
     },
 });

package/dist/tools/search.js

@@ -11,17 +11,194 @@ import { agentCwd } from '../agentContext.js';
 const FALLBACK_IGNORE = new Set(['node_modules', '.git', 'dist', 'build', 'coverage', '.next', '.cache', '.turbo', '.vercel', 'vendor']);
 const FALLBACK_MAX_FILE = 2 * 1024 * 1024; // ข้ามไฟล์ใหญ่ (กันช้า/binary)
 const PER_FILE_CAP = 50; // เหมือน rg --max-count 50
+function otherAsciiCase(ch) {
+    const code = ch.charCodeAt(0);
+    if (code >= 65 && code <= 90)
+        return ch.toLowerCase();
+    if (code >= 97 && code <= 122)
+        return ch.toUpperCase();
+    return undefined;
+}
+function isAsciiLower(ch) {
+    const code = ch.charCodeAt(0);
+    return code >= 97 && code <= 122;
+}
+function isAsciiUpper(ch) {
+    const code = ch.charCodeAt(0);
+    return code >= 65 && code <= 90;
+}
+function findCharClassEnd(source, start) {
+    let escaping = false;
+    const literalRightBracket = source[start] === '^' ? start + 1 : start;
+    for (let i = start; i < source.length; i += 1) {
+        const ch = source[i];
+        if (escaping) {
+            escaping = false;
+            continue;
+        }
+        if (ch === '\\') {
+            escaping = true;
+            continue;
+        }
+        if (ch === ']' && i !== literalRightBracket)
+            return i;
+    }
+    return -1;
+}
+function findScopedGroupEnd(source, start) {
+    let depth = 1;
+    let escaping = false;
+    for (let i = start; i < source.length; i += 1) {
+        const ch = source[i];
+        if (escaping) {
+            escaping = false;
+            continue;
+        }
+        if (ch === '\\') {
+            escaping = true;
+            continue;
+        }
+        if (ch === '[') {
+            const end = findCharClassEnd(source, i + 1);
+            if (end < 0)
+                return -1;
+            i = end;
+            continue;
+        }
+        if (ch === '(')
+            depth += 1;
+        if (ch === ')') {
+            depth -= 1;
+            if (depth === 0)
+                return i;
+        }
+    }
+    return -1;
+}
+function foldAsciiRegexCharClass(source) {
+    let out = '';
+    const literalRightBracket = source[0] === '^' ? 1 : 0;
+    for (let i = 0; i < source.length; i += 1) {
+        const ch = source[i];
+        if (ch === ']' && i === literalRightBracket) {
+            out += '\\]';
+            continue;
+        }
+        if (ch === '\\' && i + 1 < source.length) {
+            out += `${ch}${source[i + 1]}`;
+            i += 1;
+            continue;
+        }
+        if (i + 2 < source.length &&
+            source[i + 1] === '-' &&
+            source[i + 2] !== ']' &&
+            ((isAsciiLower(ch) && isAsciiLower(source[i + 2])) || (isAsciiUpper(ch) && isAsciiUpper(source[i + 2]))) &&
+            ch.charCodeAt(0) <= source[i + 2].charCodeAt(0)) {
+            out += `${ch}-${source[i + 2]}${otherAsciiCase(ch)}-${otherAsciiCase(source[i + 2])}`;
+            i += 2;
+            continue;
+        }
+        const other = i === 0 && ch === '^' ? undefined : otherAsciiCase(ch);
+        out += other ? `${ch}${other}` : ch;
+    }
+    return out;
+}
+function foldAsciiRegexLetters(source) {
+    let out = '';
+    let escaping = false;
+    for (let i = 0; i < source.length; i += 1) {
+        const ch = source[i];
+        if (escaping) {
+            out += ch;
+            escaping = false;
+            continue;
+        }
+        if (ch === '\\') {
+            out += ch;
+            escaping = true;
+            continue;
+        }
+        if (ch === '[') {
+            const end = findCharClassEnd(source, i + 1);
+            if (end < 0) {
+                out += ch;
+                continue;
+            }
+            out += `[${foldAsciiRegexCharClass(source.slice(i + 1, end))}]`;
+            i = end;
+            continue;
+        }
+        const other = otherAsciiCase(ch);
+        out += other ? `[${ch}${other}]` : ch;
+    }
+    return out;
+}
+function expandScopedCaseInsensitiveGroups(pattern) {
+    let out = '';
+    let changed = false;
+    let escaping = false;
+    for (let i = 0; i < pattern.length; i += 1) {
+        const ch = pattern[i];
+        if (escaping) {
+            out += ch;
+            escaping = false;
+            continue;
+        }
+        if (ch === '\\') {
+            out += ch;
+            escaping = true;
+            continue;
+        }
+        if (ch === '[') {
+            const end = findCharClassEnd(pattern, i + 1);
+            if (end < 0)
+                return undefined;
+            out += pattern.slice(i, end + 1);
+            i = end;
+            continue;
+        }
+        if (!pattern.startsWith('(?i:', i)) {
+            out += ch;
+            continue;
+        }
+        const end = findScopedGroupEnd(pattern, i + 4);
+        if (end < 0)
+            return undefined;
+        out += `(?:${foldAsciiRegexLetters(pattern.slice(i + 4, end))})`;
+        i = end;
+        changed = true;
+    }
+    return changed ? out : undefined;
+}
+function compileFallbackRegex(pattern) {
+    const caseInsensitive = pattern.match(/^\(\?i\)([\s\S]*)$/);
+    if (caseInsensitive) {
+        const source = expandScopedCaseInsensitiveGroups(caseInsensitive[1]) ?? caseInsensitive[1];
+        return new RegExp(source, 'i');
+    }
+    const scopedCaseInsensitive = expandScopedCaseInsensitiveGroups(pattern);
+    if (scopedCaseInsensitive)
+        return new RegExp(scopedCaseInsensitive);
+    return new RegExp(pattern); // rg ใช้ Rust regex; JS regex ใกล้เคียงพอสำหรับ pattern ทั่วไป
+}
 export async function jsGrep(pattern, base, target) {
     let re;
     try {
-        re = new RegExp(pattern); // rg ใช้ Rust regex; JS regex ใกล้เคียงพอสำหรับ pattern ทั่วไป
+        re = compileFallbackRegex(pattern);
     }
     catch {
         return `ERROR: grep regex ไม่ถูกต้อง: "${pattern}"`;
     }
     const root = isAbsolute(target) ? target : join(base, target);
+    const rootGuard = await checkReadPath(root);
+    if (!rootGuard.ok)
+        return `BLOCKED: ${rootGuard.reason}`;
     const out = [];
+    let truncated = false;
     const scanFile = async (full) => {
+        const guard = await checkReadPath(full);
+        if (!guard.ok)
+            return;
         let s;
         try {
             s = await stat(full);
@@ -41,10 +218,14 @@ export async function jsGrep(pattern, base, target) {
         if (content.includes('\u0000'))
             return; // binary
         const rel = relative(base, full) || full;
-        const lines = content.split(/\r?\n/);
+        const lines = content.split(/\r\n|\n|\r/);
         let perFile = 0;
-        for (let i = 0; i < lines.length && out.length < MAX_RESULTS; i++) {
+        for (let i = 0; i < lines.length && !truncated; i++) {
             if (re.test(lines[i])) {
+                if (out.length >= MAX_RESULTS) {
+                    truncated = true;
+                    break;
+                }
                 out.push(`${rel}:${i + 1}:${lines[i].slice(0, 300)}`);
                 if (++perFile >= PER_FILE_CAP)
                     break;
@@ -52,7 +233,7 @@ export async function jsGrep(pattern, base, target) {
         }
     };
     const walk = async (dir) => {
-        if (out.length >= MAX_RESULTS)
+        if (truncated)
             return;
         let entries;
         try {
@@ -61,15 +242,19 @@ export async function jsGrep(pattern, base, target) {
         catch {
             return;
         }
-        for (const e of entries) {
-            if (out.length >= MAX_RESULTS)
+        for (const e of entries.sort((a, b) => (a.name < b.name ? -1 : a.name > b.name ? 1 : 0))) {
+            if (truncated)
                 return;
+            const full = join(dir, e.name);
+            const guard = await checkReadPath(full);
+            if (!guard.ok)
+                continue;
             if (e.isDirectory()) {
                 if (!FALLBACK_IGNORE.has(e.name) && !e.name.startsWith('.'))
-                    await walk(join(dir, e.name));
+                    await walk(full);
             }
             else if (e.isFile()) {
-                await scanFile(join(dir, e.name));
+                await scanFile(full);
             }
         }
     };
@@ -86,10 +271,22 @@ export async function jsGrep(pattern, base, target) {
         await walk(root);
     if (!out.length)
         return '(no matches)';
+    if (truncated)
+        out.push(`... [>${MAX_RESULTS} matches, truncated]`);
     return `${clamp(out.join('\n'))}\n[JS fallback — ติดตั้ง ripgrep (rg) เพื่อความเร็ว + เคารพ .gitignore: brew/apt/choco/scoop install ripgrep]`;
 }
 const execFileAsync = promisify(execFile);
 const MAX_RESULTS = 200;
+export function formatRipgrepOutput(stdout) {
+    const text = stdout.replace(/(?:\r\n|\n|\r)$/, '');
+    if (!text)
+        return '(no matches)';
+    const allLines = text.split(/\r\n|\n|\r/);
+    const lines = allLines.slice(0, MAX_RESULTS);
+    if (allLines.length > MAX_RESULTS)
+        lines.push(`... [>${MAX_RESULTS} matches, truncated]`);
+    return clamp(lines.join('\n')) || '(no matches)';
+}
 function unsafeGlobPattern(pattern) {
     return isAbsolute(pattern) || pattern.split(/[\\/]+/).includes('..');
 }
@@ -109,14 +306,22 @@ export const globTool = tool({
             return `BLOCKED: ${guard.reason}`;
         try {
             const out = [];
+            let truncated = false;
             for await (const f of glob(pattern, { cwd: base })) {
-                out.push(f);
+                const match = String(f);
+                const itemGuard = await checkReadPath(join(base, match));
+                if (!itemGuard.ok)
+                    continue;
                 if (out.length >= MAX_RESULTS) {
-                    out.push(`... [>${MAX_RESULTS} matches, truncated]`);
+                    truncated = true;
                     break;
                 }
+                out.push(match);
             }
-            return out.length ? out.sort().join('\n') : '(no matches)';
+            out.sort();
+            if (truncated)
+                out.push(`... [>${MAX_RESULTS} matches, truncated]`);
+            return out.length ? out.join('\n') : '(no matches)';
         }
         catch (err) {
             return `ERROR: glob "${pattern}" ล้มเหลว — ${err.message}`;
@@ -138,8 +343,7 @@ export const grepTool = tool({
             // execFile (args array, ไม่ผ่าน shell) → $(...)/backtick/$VAR ใน pattern/path เป็น inert
             // กัน command injection (JSON.stringify ไม่ใช่ shell quoting — เคยรั่ว); -e กัน pattern ขึ้นต้นด้วย -
             const { stdout } = await execFileAsync('rg', ['--line-number', '--no-heading', '--max-count', '50', '-e', pattern, '--', path], { cwd: base, maxBuffer: 10 * 1024 * 1024 });
-            const lines = stdout.trim().split('\n').slice(0, MAX_RESULTS);
-            return clamp(lines.join('\n')) || '(no matches)';
+            return formatRipgrepOutput(stdout);
         }
         catch (err) {
             // ripgrep exit code 1 = ไม่เจอ match (ไม่ใช่ error จริง)

package/dist/tools/task.js

@@ -2,7 +2,7 @@ import { tool } from 'ai';
 import { z } from 'zod';
 import { agentContext, agentCwd } from '../agentContext.js';
 import { approvalContext } from '../approval.js';
-import { runParallel, runThunks, TaskRegistry } from '../orchestrate.js';
+import { runParallel, runThunks, TaskRegistry, formatSubagentError, withGlobalSubagentSlot, } from '../orchestrate.js';
 import { runInWorktrees, getRepoRoot } from '../worktree.js';
 // task = มอบงานย่อยให้ sub-agent ทำใน context แยก (เลียน Claude Code Task tool)
 // depth/model/budget thread ผ่าน AsyncLocalStorage (parallel-safe, ไม่ใช่ process.env)
@@ -22,7 +22,15 @@ const registry = new TaskRegistry();
 function parentCtx() {
     const ctx = agentContext.getStore();
     const appr = approvalContext.getStore();
-    return { model: ctx?.model, budgetUsd: ctx?.budgetUsd, depth: ctx?.depth ?? 0, cwd: ctx?.cwd, mode: appr?.mode ?? 'ask', approve: appr?.approve };
+    return {
+        model: ctx?.model,
+        budgetUsd: ctx?.budgetUsd,
+        sharedBudget: ctx?.sharedBudget,
+        depth: ctx?.depth ?? 0,
+        cwd: ctx?.cwd,
+        mode: appr?.mode ?? 'ask',
+        approve: appr?.approve,
+    };
 }
 /**
  * real subagent runner — รัน runAgent ใน context แยก. ครอบด้วย agentContext.run() ให้
@@ -43,8 +51,8 @@ function makeRunner(parent) {
         const model = spec.model ?? process.env.SANOOK_SUBAGENT_MODEL ?? parent.model ?? 'sonnet';
         const depth = parent.depth + 1;
         const cwd = spec.cwd ?? parent.cwd; // worktree ของ subagent นี้ (ถ้า isolate) ไม่งั้น inherit
-        const childStore = { model, budgetUsd: parent.budgetUsd, depth, cwd };
-        const { text } = await agentContext.run(childStore, () => runAgent({
+        const childStore = { model, budgetUsd: parent.budgetUsd, sharedBudget: parent.sharedBudget, depth, cwd };
+        const { text } = await withGlobalSubagentSlot(() => agentContext.run(childStore, () => runAgent({
             model,
             budgetUsd: parent.budgetUsd, // cap เดียวกับ main (กัน subagent วิ่ง uncapped)
             subagentDepth: depth,
@@ -55,7 +63,7 @@ function makeRunner(parent) {
             maxSteps: SUB_MAX_STEPS,
             signal,
             tools: Object.fromEntries(picked),
-        }));
+        })));
         return text || '(sub-agent ไม่มีผลลัพธ์)';
     };
 }
@@ -98,12 +106,15 @@ async function runIsolated(specs, parent, concurrency) {
     const root = await getRepoRoot(parent.cwd ?? agentCwd());
     if (!root)
         return 'isolate=worktree ต้องอยู่ใน git repo — ใช้ task_parallel แบบปกติแทน (ไม่มี worktree)';
-    const runner = makeRunner(parent);
+    // isolate=true has one coarse approval at the task_parallel tool boundary. Inside
+    // the temporary worktree, subagents run auto so the REPL is not spammed with
+    // per-file approvals from hidden child turns; only the captured diff is merged.
+    const runner = makeRunner({ ...parent, mode: 'auto', approve: undefined });
     const runs = await runInWorktrees(specs, root, 
     // งานต่อ subagent: รันใน worktree (cwd) ของมัน, readonly=false (isolate มีไว้ให้แก้ไฟล์)
     (spec, cwd) => runner({ ...spec, cwd, readonly: spec.readonly ?? false }, undefined)
         .then((text) => ({ ok: true, description: spec.description, text }))
-        .catch((e) => ({ ok: false, description: spec.description, text: '', error: e.message })), (thunks) => runThunks(thunks, concurrency));
+        .catch((e) => ({ ok: false, description: spec.description, text: '', error: formatSubagentError(e) })), (thunks) => runThunks(thunks, concurrency));
     if (!runs)
         return 'สร้าง git worktree ไม่สำเร็จ (หรือไม่ใช่ git repo) — ยกเลิก isolate';
     const outcomes = runs.map((r) => r.result);

package/dist/tools/timeout.js

@@ -1,7 +1,25 @@
+import { inspect } from 'node:util';
 // ครอบ tool ด้วย timeout — กัน read/grep/glob/edit บนไฟล์ใหญ่ค้าง แล้วแขวน loop ทั้ง session ไม่จบ
-// tool ที่จัดการ timeout เองอยู่แล้ว → ไม่ครอบ: run_bash (120s ในตัว), task (sub-agent อาจรันนาน)
-const SELF_TIMED = new Set(['run_bash', 'task']);
+// tool ที่จัดการ timeout เองอยู่แล้ว → ไม่ครอบ: run_bash (120s ในตัว), sub-agent orchestration (อาจรัน/รอนานโดยตั้งใจ)
+const SELF_TIMED = new Set(['run_bash', 'task', 'task_parallel', 'task_collect']);
 export const DEFAULT_TOOL_TIMEOUT = 120_000;
+function formatToolError(e) {
+    if (e instanceof Error)
+        return e.message || e.name;
+    if (typeof e === 'string')
+        return e;
+    if (e == null)
+        return String(e);
+    try {
+        const json = JSON.stringify(e);
+        if (json)
+            return json;
+    }
+    catch {
+        return inspect(e, { breakLength: Infinity, depth: 2 });
+    }
+    return String(e);
+}
 /** Promise.race tool execute กับ timer — timeout คืนเป็น ERROR string (tool ไม่ throw เข้า loop) */
 export function wrapToolsWithTimeout(tools, ms = DEFAULT_TOOL_TIMEOUT) {
     const out = {};
@@ -22,7 +40,7 @@ export function wrapToolsWithTimeout(tools, ms = DEFAULT_TOOL_TIMEOUT) {
                     return await Promise.race([Promise.resolve(orig(input, opts)), timeout]);
                 }
                 catch (e) {
-                    return `ERROR: ${e.message}`;
+                    return `ERROR: ${formatToolError(e)}`;
                 }
                 finally {
                     if (timer)

package/dist/trust.js

@@ -20,6 +20,9 @@ async function canonical(p) {
         return resolve(p);
     }
 }
+function isUsableStoredRoot(root) {
+    return typeof root === 'string' && root.trim().length > 0 && !root.includes('\0');
+}
 export async function projectRoot(cwd = process.cwd()) {
     let dir = resolve(cwd);
     for (;;) {
@@ -35,7 +38,14 @@ export async function projectRoot(cwd = process.cwd()) {
 async function readStore() {
     try {
         const parsed = JSON.parse(await readFile(TRUST_FILE, 'utf8'));
-        return parsed && typeof parsed === 'object' ? parsed : {};
+        if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed))
+            return {};
+        const roots = parsed.trustedProjectRoots;
+        if (roots === undefined)
+            return {};
+        return {
+            trustedProjectRoots: Array.isArray(roots) ? roots.filter(isUsableStoredRoot) : [],
+        };
     }
     catch {
         return {};

package/dist/ui/app.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useState, useRef, useMemo } from 'react';
+import { useState, useRef } from 'react';
 import { execFile } from 'node:child_process';
 import { promisify } from 'node:util';
 import { Box, Text, Static, useApp, useInput } from 'ink';
@@ -9,8 +9,9 @@ import { saveSession, newSessionId } from '../session.js';
 import { getBrainPath, appendBrainWorklog } from '../memory.js';
 import { autoCompact, estimateTokens, summarizeCompact } from '../compaction.js';
 import { makeSummarizer } from '../summarize.js';
-import { agentTuning } from '../config.js';
+import { agentTuning, patchGlobalConfig } from '../config.js';
 import { snapshotWorkTree, restoreWorkTree } from '../checkpoint.js';
+import { renderInsights } from '../insights.js';
 import { useEditor } from './useEditor.js';
 import { loadHistory, appendHistory } from './history.js';
 import { expandMentions } from './mentions.js';
@@ -40,6 +41,7 @@ export function App({ initialModel, fallbackModel, budgetUsd, permissionMode = '
     const approvalResolve = useRef(null);
     const replHistory = useRef(loadHistory()); // prompt เก่า (persist) สำหรับ ↑/↓
     const checkpoints = useRef([]);
+    const lastRun = useRef(null);
     const editor = useEditor(replHistory.current);
     // real-time steering: หยุด turn ที่กำลังรัน (abort) + คิวข้อความที่พิมพ์ระหว่าง busy
     const abortRef = useRef(null);
@@ -99,6 +101,13 @@ export function App({ initialModel, fallbackModel, budgetUsd, permissionMode = '
             if (a === 'submit') {
                 const v = editor.value.trim();
                 editor.reset();
+                const slash = parseSlashInvocation(v);
+                if (slash?.name === 'stop') {
+                    addTurn('user', v);
+                    abortRef.current?.abort();
+                    clearQueue();
+                    return;
+                }
                 if (v)
                     enqueue(v);
             }
@@ -131,9 +140,26 @@ export function App({ initialModel, fallbackModel, budgetUsd, permissionMode = '
                 : ` · ไฟล์: ${r.reason}`;
         }
         msgsRef.current = msgsRef.current.slice(0, cp.msgLen);
+        lastRun.current = null;
         setHistory((h) => h.filter((t) => t.id < cp.turnId));
         addTurn('system', `↩ ย้อนกลับ 1 turn${note}`);
     }
+    async function retryLastTurn() {
+        const previous = lastRun.current;
+        if (!previous) {
+            addTurn('user', '/retry');
+            addTurn('system', 'ยังไม่มี turn ให้ retry');
+            return;
+        }
+        msgsRef.current = msgsRef.current.slice(0, previous.msgLen);
+        checkpoints.current = checkpoints.current.filter((cp) => cp.turnId < previous.turnId);
+        setHistory((h) => h.filter((t) => t.id < previous.turnId));
+        const mark = { turnId: idRef.current, msgLen: previous.msgLen };
+        const preview = previous.userText.length > 120 ? `${previous.userText.slice(0, 117)}...` : previous.userText;
+        addTurn('user', '/retry');
+        addTurn('system', `retry: ${preview}`);
+        await runAssistantTurn(previous.promptText, previous.images, mark, previous.userText);
+    }
     /** บีบ context: 'summarize' (ใช้ model ถูกย่อ) ถ้าตั้งไว้ ไม่งั้น 'truncate' (zero-LLM) */
     async function compactHistory(targetTokens, label) {
         const before = estimateTokens(msgsRef.current);
@@ -175,7 +201,7 @@ export function App({ initialModel, fallbackModel, budgetUsd, permissionMode = '
                         addTurn('system', `custom command /${slash.name} ว่าง`);
                         return;
                     }
-                    await runAssistantTurn(expanded, [], mark);
+                    await runAssistantTurn(expanded, [], mark, text);
                     return;
                 }
             }
@@ -188,6 +214,7 @@ export function App({ initialModel, fallbackModel, budgetUsd, permissionMode = '
             if (cmd.action === 'clear') {
                 msgsRef.current = [];
                 checkpoints.current = [];
+                lastRun.current = null;
                 return setHistory([]);
             }
             if (cmd.action === 'compact') {
@@ -196,6 +223,20 @@ export function App({ initialModel, fallbackModel, budgetUsd, permissionMode = '
             }
             if (cmd.action === 'diff')
                 return void runGit(['diff', '--stat'], 'diff');
+            if (cmd.action === 'retry')
+                return void retryLastTurn();
+            if (cmd.action === 'personality') {
+                void patchGlobalConfig({ personality: cmd.personalityChange || undefined })
+                    .then(() => addTurn('system', cmd.message ?? 'ตั้ง personality แล้ว'))
+                    .catch((e) => addTurn('system', `personality: ${e.message}`));
+                return;
+            }
+            if (cmd.action === 'insights') {
+                void renderInsights({ days: cmd.insightsDays, cwd: cmd.insightsAll ? null : undefined })
+                    .then((msg) => addTurn('system', msg))
+                    .catch((e) => addTurn('system', `insights: ${e.message}`));
+                return;
+            }
             if (cmd.action === 'undo') {
                 void runGit(['stash', 'push', '-u', '-m', BRAND.undoStashMessage], 'undo').then(() => addTurn('system', 'กู้คืน: git stash pop'));
                 return;
@@ -212,9 +253,10 @@ export function App({ initialModel, fallbackModel, budgetUsd, permissionMode = '
         const { text: expanded, images, errors } = await expandMentions(text);
         if (errors.length)
             addTurn('system', `@mention: ${errors.join(' · ')}`);
-        await runAssistantTurn(expanded, images, mark);
+        await runAssistantTurn(expanded, images, mark, text);
     }
-    async function runAssistantTurn(promptText, images, mark) {
+    async function runAssistantTurn(promptText, images, mark, userText = promptText) {
+        lastRun.current = { ...mark, userText, promptText, images };
         // proactive summarize-compaction สำหรับ session ยาวมาก (เฉพาะ mode summarize) — เริ่ม turn ให้ context lean
         // (mode truncate: ปล่อยให้ loop.ts ตัดต่อ-step เอา; ไม่บีบที่นี่ กัน latency)
         if (estimateTokens(msgsRef.current) > PRE_TURN_COMPACT_TOKENS) {
@@ -304,10 +346,8 @@ export function App({ initialModel, fallbackModel, budgetUsd, permissionMode = '
         if (next)
             void submit(next);
     }
-    // banner ผูกกับ live `model` (ไม่ใช่ initialModel) → /model เปลี่ยนแล้ว banner อัปเดตตาม ไม่ค้าง model เก่า
-    const banner = useMemo(() => _jsx(Banner, { model: model }), [model]);
     const costHint = lastCost.current.includes('cost ') ? lastCost.current.split('cost ')[1] : '';
-    return (_jsxs(Box, { flexDirection: "column", children: [banner, _jsx(Static, { items: history, children: (turn) => _jsx(TurnView, { turn: turn }, turn.id) }), streaming ? (_jsx(Box, { marginTop: 1, children: _jsx(Text, { children: streaming }) })) : null, queued.length ? (_jsx(Box, { flexDirection: "column", marginTop: 1, children: queued.map((q, i) => (_jsxs(Text, { dimColor: true, children: ["\u23F3 \u0E04\u0E34\u0E27 ", i + 1, ": ", q.length > 64 ? `${q.slice(0, 64)}…` : q] }, i))) })) : null, approvalReq ? (_jsxs(Box, { marginTop: 1, borderStyle: "round", borderColor: "yellow", paddingX: 1, flexDirection: "column", children: [_jsxs(Text, { color: "yellow", children: ["\u0E2D\u0E19\u0E38\u0E21\u0E31\u0E15\u0E34\u0E23\u0E31\u0E19 ", approvalReq.tool, "?"] }), _jsx(Text, { dimColor: true, children: approvalReq.summary }), _jsx(Text, { dimColor: true, children: "y = \u0E23\u0E31\u0E19 \u00B7 n = \u0E1B\u0E0F\u0E34\u0E40\u0E2A\u0E18" })] })) : (_jsxs(Box, { marginTop: 1, borderStyle: "round", borderColor: busy ? 'gray' : 'blue', paddingX: 1, children: [_jsx(Text, { color: busy ? 'gray' : 'cyan', children: busy ? '· ' : '› ' }), _jsx(InputView, { value: editor.value, cursor: editor.cursor, busy: busy })] })), _jsxs(Text, { dimColor: true, children: ['  ', model, " \u00B7 ", permissionMode === 'ask' ? 'ask-mode' : 'auto', " \u00B7 /help \u00B7 @file \u00B7 \u2191 history", costHint ? ` · ${costHint}` : ''] })] }));
+    return (_jsxs(Box, { flexDirection: "column", children: [history.length === 0 ? _jsx(Banner, { model: model }) : null, _jsx(Static, { items: history, children: (turn) => _jsx(TurnView, { turn: turn }, turn.id) }), streaming ? (_jsx(Box, { marginTop: 1, children: _jsx(Text, { children: streaming }) })) : null, queued.length ? (_jsx(Box, { flexDirection: "column", marginTop: 1, children: queued.map((q, i) => (_jsxs(Text, { dimColor: true, children: ["\u23F3 \u0E04\u0E34\u0E27 ", i + 1, ": ", q.length > 64 ? `${q.slice(0, 64)}…` : q] }, i))) })) : null, approvalReq ? (_jsxs(Box, { marginTop: 1, borderStyle: "round", borderColor: "yellow", paddingX: 1, flexDirection: "column", children: [_jsxs(Text, { color: "yellow", children: ["\u0E2D\u0E19\u0E38\u0E21\u0E31\u0E15\u0E34\u0E23\u0E31\u0E19 ", approvalReq.tool, "?"] }), _jsx(Text, { dimColor: true, children: approvalReq.summary }), _jsx(Text, { dimColor: true, children: "y = \u0E23\u0E31\u0E19 \u00B7 n = \u0E1B\u0E0F\u0E34\u0E40\u0E2A\u0E18" })] })) : (_jsxs(Box, { marginTop: 1, borderStyle: "round", borderColor: busy ? 'gray' : 'blue', paddingX: 1, children: [_jsx(Text, { color: busy ? 'gray' : 'cyan', children: busy ? '· ' : '› ' }), _jsx(InputView, { value: editor.value, cursor: editor.cursor, busy: busy })] })), _jsxs(Text, { dimColor: true, children: ['  ', model, " \u00B7 ", permissionMode === 'ask' ? 'ask-mode' : 'auto', " \u00B7 /help \u00B7 @file \u00B7 \u2191 history", costHint ? ` · ${costHint}` : ''] })] }));
 }
 /** input ที่มี cursor (inverse) + placeholder — minimal; รับ input ได้แม้ busy (ต่อคิว) */
 function InputView({ value, cursor, busy }) {