sanook-cli 0.5.0 → 0.5.2

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';
@@ -18,11 +19,16 @@ import { BRAND } from '../brand.js';
 import { Banner } from './banner.js';
 const execFileP = promisify(execFile);
 const PRE_TURN_COMPACT_TOKENS = 100_000; // session ยาวมากเท่านั้นถึง summarize ก่อน turn (mode summarize)
-export function App({ initialModel, fallbackModel, budgetUsd, permissionMode = 'ask', initialHistory }) {
+export function App({ initialModel, fallbackModel, budgetUsd, permissionMode = 'ask', initialHistory, initialNote }) {
     const { exit } = useApp();
-    const [history, setHistory] = useState(initialHistory?.length
-        ? [{ id: -1, role: 'system', text: `↻ ต่อจาก session ก่อน (${initialHistory.length} ข้อความ)` }]
-        : []);
+    const [history, setHistory] = useState(() => {
+        const seed = [];
+        if (initialNote)
+            seed.push({ id: -2, role: 'system', text: initialNote });
+        if (initialHistory?.length)
+            seed.push({ id: -1, role: 'system', text: `↻ ต่อจาก session ก่อน (${initialHistory.length} ข้อความ)` });
+        return seed;
+    });
     const [streaming, setStreaming] = useState('');
     const [busy, setBusy] = useState(false);
     const [model, setModel] = useState(initialModel);
@@ -35,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);
@@ -94,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);
             }
@@ -126,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);
@@ -170,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;
                 }
             }
@@ -183,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') {
@@ -191,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;
@@ -207,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) {
@@ -299,9 +346,8 @@ export function App({ initialModel, fallbackModel, budgetUsd, permissionMode = '
         if (next)
             void submit(next);
     }
-    const banner = useMemo(() => _jsx(Banner, { model: initialModel }), [initialModel]);
     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 }) {

package/dist/ui/brain-wizard.js

@@ -15,10 +15,10 @@ export function BrainWizard({ onComplete }) {
     return (_jsxs(Box, { flexDirection: "column", gap: 1, marginY: 1, children: [_jsx(Text, { bold: true, color: "cyan", children: "\uD83E\uDDE0 \u0E2A\u0E23\u0E49\u0E32\u0E07 Second Brain workspace" }), step === 'path' && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: "1. \u0E27\u0E32\u0E07\u0E42\u0E04\u0E23\u0E07\u0E2A\u0E23\u0E49\u0E32\u0E07\u0E44\u0E27\u0E49\u0E17\u0E35\u0E48\u0E44\u0E2B\u0E19? (Enter = default)" }), _jsxs(Text, { color: "gray", children: ["   ", DEFAULT_PATH] }), _jsx(TextInput, { defaultValue: DEFAULT_PATH, placeholder: DEFAULT_PATH, onSubmit: (v) => {
                             setPath(v.trim() || DEFAULT_PATH);
                             setStep('owner');
-                        } })] })), step === 'owner' && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: "2. \u0E40\u0E23\u0E35\u0E22\u0E01\u0E04\u0E38\u0E13\u0E27\u0E48\u0E32\u0E2D\u0E30\u0E44\u0E23\u0E14\u0E35? (\u0E0A\u0E37\u0E48\u0E2D/\u0E0A\u0E37\u0E48\u0E2D\u0E40\u0E25\u0E48\u0E19 \u2014 Enter = \u0E02\u0E49\u0E32\u0E21)" }), _jsx(TextInput, { defaultValue: BRAIN_DEFAULTS.ownerName, onSubmit: (v) => {
+                        } })] })), step === 'owner' && (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { children: ["2. \u0E40\u0E23\u0E35\u0E22\u0E01\u0E04\u0E38\u0E13\u0E27\u0E48\u0E32\u0E2D\u0E30\u0E44\u0E23\u0E14\u0E35? (\u0E0A\u0E37\u0E48\u0E2D/\u0E0A\u0E37\u0E48\u0E2D\u0E40\u0E25\u0E48\u0E19 \u2014 Enter \u0E40\u0E1B\u0E25\u0E48\u0E32 = \u0E43\u0E0A\u0E49 \"", BRAIN_DEFAULTS.ownerName, "\")"] }), _jsx(TextInput, { placeholder: BRAIN_DEFAULTS.ownerName, onSubmit: (v) => {
                             setOwnerName(v.trim() || BRAIN_DEFAULTS.ownerName);
                             setStep('ai');
-                        } })] })), step === 'ai' && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: "3. \u0E2D\u0E22\u0E32\u0E01\u0E43\u0E2B\u0E49 AI \u0E40\u0E23\u0E35\u0E22\u0E01\u0E15\u0E31\u0E27\u0E40\u0E2D\u0E07\u0E27\u0E48\u0E32\u0E2D\u0E30\u0E44\u0E23?" }), _jsx(TextInput, { defaultValue: BRAIN_DEFAULTS.aiName, onSubmit: (v) => {
+                        } })] })), step === 'ai' && (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { children: ["3. \u0E2D\u0E22\u0E32\u0E01\u0E43\u0E2B\u0E49 AI \u0E40\u0E23\u0E35\u0E22\u0E01\u0E15\u0E31\u0E27\u0E40\u0E2D\u0E07\u0E27\u0E48\u0E32\u0E2D\u0E30\u0E44\u0E23? ", _jsxs(Text, { color: "gray", children: ["(Enter \u0E40\u0E1B\u0E25\u0E48\u0E32 = \"", BRAIN_DEFAULTS.aiName, "\")"] })] }), _jsx(TextInput, { placeholder: BRAIN_DEFAULTS.aiName, onSubmit: (v) => {
                             setAiName(v.trim() || BRAIN_DEFAULTS.aiName);
                             setStep('autonomy');
                         } })] })), step === 'autonomy' && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: "4. \u0E43\u0E2B\u0E49 AI \u0E17\u0E33\u0E07\u0E32\u0E19\u0E41\u0E1A\u0E1A\u0E44\u0E2B\u0E19?" }), _jsx(Select, { options: [

package/dist/ui/history.js

@@ -1,13 +1,40 @@
-import { readFileSync, appendFileSync, mkdirSync } from 'node:fs';
+import { readFileSync, appendFileSync, chmodSync, mkdirSync, writeFileSync } from 'node:fs';
 import { appHomePath, persistenceEnabled } from '../brand.js';
 // prompt history แบบ persist ข้าม session (เลียน shell history) — เก็บที่ ~/.sanook/history
 const HISTORY_PATH = appHomePath('history');
 const MAX_ENTRIES = 500;
+function historyLines() {
+    return readFileSync(HISTORY_PATH, 'utf8')
+        .split('\n')
+        .map((line) => line.trim())
+        .filter(Boolean);
+}
+function trimHistoryFile() {
+    const lines = historyLines();
+    if (lines.length <= MAX_ENTRIES)
+        return;
+    writeFileSync(HISTORY_PATH, `${lines.slice(-MAX_ENTRIES).join('\n')}\n`, { mode: 0o600 });
+}
+function lastPersistedPrompt() {
+    try {
+        return historyLines().at(-1);
+    }
+    catch {
+        return undefined;
+    }
+}
+function persistedPrompt(prompt) {
+    return prompt.replace(/[\r\n]+/g, ' ');
+}
+function samePersistedPrompt(persisted, last) {
+    return last !== undefined && persisted === persistedPrompt(last.trim());
+}
 /** โหลด prompt เก่า (เก่า→ใหม่) สำหรับ Up/Down navigation ใน REPL */
 export function loadHistory() {
+    if (!persistenceEnabled())
+        return [];
     try {
-        const lines = readFileSync(HISTORY_PATH, 'utf8').split('\n').filter(Boolean);
-        return lines.slice(-MAX_ENTRIES);
+        return historyLines().slice(-MAX_ENTRIES);
     }
     catch {
         return [];
@@ -18,11 +45,16 @@ export function appendHistory(prompt, last) {
     if (!persistenceEnabled())
         return;
     const p = prompt.trim();
-    if (!p || p === last)
+    if (!p || p.startsWith('/'))
+        return;
+    const persisted = persistedPrompt(p);
+    if (samePersistedPrompt(persisted, last) || persisted === lastPersistedPrompt())
         return;
     try {
         mkdirSync(appHomePath(), { recursive: true });
-        appendFileSync(HISTORY_PATH, `${p.replace(/\n/g, ' ')}\n`, { mode: 0o600 });
+        appendFileSync(HISTORY_PATH, `${persisted}\n`, { mode: 0o600 });
+        trimHistoryFile();
+        chmodSync(HISTORY_PATH, 0o600);
     }
     catch {
         /* เขียนไม่ได้ = ไม่เป็นไร (history เป็น nice-to-have) */

package/dist/ui/mentions.js

@@ -1,6 +1,7 @@
 import { readFile, realpath } from 'node:fs/promises';
-import { resolve, extname } from 'node:path';
+import { extname } from 'node:path';
 import { checkReadPath } from '../tools/permission.js';
+import { resolveAgentPath } from '../tools/util.js';
 // @-file mentions: "@path" ใน prompt → inline เนื้อหาไฟล์ (text) หรือแนบเป็น image (รูป)
 // ลด tool round-trip (agent ไม่ต้อง read_file เอง) + เปิดทาง vision input
 const IMAGE_EXT = new Set(['.png', '.jpg', '.jpeg', '.gif', '.webp', '.bmp']);
@@ -15,7 +16,7 @@ export async function expandMentions(input) {
     const errors = [];
     const inlined = [];
     for (const rel of [...new Set(mentions)]) {
-        const abs = resolve(rel);
+        const abs = resolveAgentPath(rel);
         // canonicalize ก่อนเช็ก extension → symlink ที่ชื่อไม่มีนามสกุลแต่ชี้ไปรูป ก็จับเป็น image ถูก
         const real = await realpath(abs).catch(() => abs);
         if (IMAGE_EXT.has(extname(real).toLowerCase())) {

package/dist/ui/render.js

@@ -1,32 +1,72 @@
 import { jsx as _jsx } from "react/jsx-runtime";
+import { useState } from 'react';
 import { render } from 'ink';
 import { App } from './app.js';
 import { SetupWizard } from './setup.js';
 import { BrainWizard } from './brain-wizard.js';
 import { saveKey, saveGlobalConfig, saveBrainPath } from '../config.js';
-export function startRepl(props) {
-    render(_jsx(App, { ...props }));
-}
-/** render first-run wizard → save key+config → (ถ้าเลือก) ต่อ BrainWizard สร้าง second-brain → resolve */
-export function startSetup() {
-    return new Promise((resolve) => {
-        let unmount = () => { };
+/**
+ * Root — โฮสต์ setup wizard → brain wizard → REPL ใน **Ink render เดียว**
+ *
+ * ก่อนหน้านี้แยกเป็น render(SetupWizard) → unmount → render(App) = 2 Ink instances ต่อกัน
+ * พอ instance แรก unmount, stdin raw-mode/keypress listener ไม่ reattach กับ instance ที่ 2
+ * → พิมพ์ในช่องแชทไม่ได้. รวมเป็น tree เดียว (React สลับ component ภายใน) stdin ต่อเนื่องไม่หลุด.
+ */
+export function Root({ needsSetup, appProps }) {
+    const [phase, setPhase] = useState(needsSetup ? 'setup' : 'app');
+    const [model, setModel] = useState(appProps.initialModel);
+    const [brainNote, setBrainNote] = useState(undefined);
+    if (phase === 'setup') {
         const onComplete = (r) => {
             void (async () => {
                 if (r.key)
                     await saveKey(r.envVar, r.key);
                 await saveGlobalConfig({ model: r.model, provider: r.provider });
-                unmount();
-                if (r.createBrain)
-                    await startBrainSetup(); // ถาม identity + path จริง แล้ว scaffold
-                resolve(r);
+                setModel(r.model);
+                setPhase(r.createBrain ? 'brain' : 'app');
             })();
         };
-        const instance = render(_jsx(SetupWizard, { onComplete: onComplete }));
-        unmount = instance.unmount;
-    });
+        return _jsx(SetupWizard, { onComplete: onComplete });
+    }
+    if (phase === 'brain') {
+        const onComplete = (a) => {
+            void (async () => {
+                const { scaffoldBrain, BRAIN_DEFAULTS, expandHome, wireBrainMcp } = await import('../brain.js');
+                const today = new Date().toISOString().slice(0, 10);
+                const target = expandHome(a.path);
+                try {
+                    const res = await scaffoldBrain(target, {
+                        ...BRAIN_DEFAULTS,
+                        ownerName: a.ownerName,
+                        aiName: a.aiName,
+                        autonomy: a.autonomy,
+                        today,
+                    });
+                    await saveBrainPath(target);
+                    const wired = await wireBrainMcp(target).catch(() => 'skip');
+                    setBrainNote(`✅ second-brain — ${target} · สร้าง ${res.created.length} ไฟล์ · ` +
+                        `${wired === 'added' ? 'wire filesystem MCP เข้า vault แล้ว' : 'MCP เดิมอยู่แล้ว (ไม่ทับ)'} · เปิดใน Obsidian: Open folder as vault`);
+                }
+                catch (e) {
+                    setBrainNote(`⚠ สร้าง second-brain ไม่สำเร็จ: ${e.message} — ลองใหม่ด้วย ${'`'}sanook brain init${'`'}`);
+                }
+                setPhase('app');
+            })();
+        };
+        return _jsx(BrainWizard, { onComplete: onComplete });
+    }
+    // App mount สดตอน phase = 'app' → useState(initialModel) หยิบ model ที่เลือกจาก wizard ถูกต้อง
+    return _jsx(App, { ...appProps, initialModel: model, initialNote: brainNote ?? appProps.initialNote });
+}
+/** เปิดแอป: wizard (ถ้า first-run) → REPL — Ink render ครั้งเดียว (fix: พิมพ์ในช่องแชทไม่ได้) */
+export function startApp(props) {
+    render(_jsx(Root, { ...props }));
+}
+/** เปิด REPL ตรงๆ (ไม่ผ่าน wizard) — เก็บไว้เผื่อ caller อื่น */
+export function startRepl(appProps) {
+    render(_jsx(App, { ...appProps }));
 }
-/** standalone / first-run brain: ถาม path + ตัวตน → scaffold (personalized) + auto-wire filesystem MCP */
+/** standalone `sanook brain init` (interactive): ถาม path + ตัวตน → scaffold + wire MCP — single render, จบแล้ว process ออก */
 export function startBrainSetup() {
     return new Promise((resolve) => {
         let unmount = () => { };

package/dist/ui/setup.js

@@ -1,11 +1,31 @@
 import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
 import { useState, useEffect } from 'react';
-import { Box, Text } from 'ink';
+import { Box, Text, useInput } from 'ink';
 import { Select, PasswordInput } from '@inkjs/ui';
-import { PROVIDERS, consoleUrl } from '../providers/registry.js';
+import { PROVIDERS, consoleUrl, hasUsableEnvKey } from '../providers/registry.js';
+import { resolveKeyFromEnv, assertDirectApiKey } from '../providers/keys.js';
 import { listRemoteModels, mergeModelOptions } from '../providers/models.js';
+import { detectCodex } from '../providers/codex.js';
 import { BRAND } from '../brand.js';
-/** first-run setup wizard: เลือก provider → ใส่ API key → เลือก model → เสนอสร้าง second-brain */
+// จัดลำดับ provider ในเมนู: cloud ยอดนิยม → cloud อื่น → local → ChatGPT-plan (codex) ท้ายสุด
+const PROVIDER_ORDER = ['anthropic', 'openai', 'google', 'xai', 'mistral', 'groq', 'ollama', 'lmstudio', 'codex'];
+/** label + hint ต่อ provider: เจอ key ใน env / local / ChatGPT-login / ต้องมี key — ให้เลือกง่ายขึ้น */
+export function providerOption(id) {
+    const p = PROVIDERS[id];
+    let hint;
+    if (p.kind === 'delegate')
+        hint = 'login ChatGPT · ไม่ใช้ API key';
+    else if (!p.requiresKey)
+        hint = 'local · ไม่ต้อง key';
+    else if (hasUsableEnvKey(id))
+        hint = '✓ key ใน env ใช้ได้';
+    else if (resolveKeyFromEnv(p.envVar, p.envFallbacks))
+        hint = 'key ใน env ใช้ไม่ได้';
+    else
+        hint = 'ต้องมี API key';
+    return { label: `${p.label}  —  ${hint}`, value: p.id };
+}
+/** first-run setup wizard: เลือก provider → (codex login | API key) → เลือก model → เสนอสร้าง second-brain */
 export function SetupWizard({ onComplete }) {
     const [step, setStep] = useState('provider');
     const [provider, setProvider] = useState('');
@@ -13,8 +33,33 @@ export function SetupWizard({ onComplete }) {
     const [model, setModel] = useState('');
     const [remote, setRemote] = useState([]);
     const [loadingModels, setLoadingModels] = useState(false);
+    const [codexStatus, setCodexStatus] = useState(null);
+    const [recheck, setRecheck] = useState(0);
+    const [keyDraft, setKeyDraft] = useState('');
+    const [keyError, setKeyError] = useState('');
     const cfg = provider ? PROVIDERS[provider] : undefined;
-    const providerOptions = Object.values(PROVIDERS).map((p) => ({ label: p.label, value: p.id }));
+    const providerOptions = PROVIDER_ORDER.filter((id) => PROVIDERS[id]).map(providerOption);
+    // codex-auth: เช็ก codex CLI ติดตั้ง + login ChatGPT (re-run เมื่อกด "เช็กใหม่")
+    useEffect(() => {
+        if (step !== 'codex-auth')
+            return;
+        let alive = true;
+        setCodexStatus(null);
+        void detectCodex().then((s) => {
+            if (!alive)
+                return;
+            setCodexStatus(s);
+            if (s.installed && s.loggedIn) {
+                // login แล้ว → ใช้ default model ของ codex (ChatGPT-plan เลือก model เอง) ข้ามขั้นเลือก key/model
+                setModel(`codex:${PROVIDERS.codex.models.default}`);
+                setStep('brain-offer');
+            }
+        });
+        return () => {
+            alive = false;
+        };
+    }, [step, recheck]);
+    // ดึงรายชื่อ model จริงจาก provider (เฉพาะ provider แบบ SDK ที่ต้อง/ไม่ต้อง key)
     useEffect(() => {
         if (step !== 'model' || !cfg)
             return;
@@ -29,13 +74,65 @@ export function SetupWizard({ onComplete }) {
     }, [step, cfg, key]);
     const modelOptions = cfg ? mergeModelOptions(cfg, remote) : [];
     const finish = (createBrain) => onComplete({ provider, model, envVar: cfg?.envVar ?? '', key, createBrain });
-    return (_jsxs(Box, { flexDirection: "column", gap: 1, marginY: 1, children: [_jsxs(Text, { bold: true, color: "cyan", children: ["\u2699  \u0E15\u0E31\u0E49\u0E07\u0E04\u0E48\u0E32 ", BRAND.bannerTitle, " (\u0E04\u0E23\u0E31\u0E49\u0E07\u0E41\u0E23\u0E01)"] }), step === 'provider' && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: "1. \u0E40\u0E25\u0E37\u0E2D\u0E01 AI provider:" }), _jsx(Select, { options: providerOptions, onChange: (v) => {
+    const backToProvider = () => {
+        setProvider('');
+        setCodexStatus(null);
+        setKeyError('');
+        setKey('');
+        setKeyDraft('');
+        setStep('provider');
+    };
+    // Esc บนทุก step (ยกเว้น provider) = ย้อนกลับไปเลือก provider — กัน dead-end ตอนเลือกผิด
+    // หรือ codex detect ค้าง (step codex-auth ตอน pending ไม่มีปุ่มอื่น แต่ Esc ออกได้เสมอ)
+    useInput((_input, key) => {
+        if (key.return && step === 'key' && !keyDraft.trim()) {
+            setKeyError('วาง API key ก่อนค่ะ (กด Enter ทั้งที่ว่างไม่ได้) · Esc = กลับไปเลือก provider');
+            return;
+        }
+        if (key.escape && step !== 'provider')
+            backToProvider();
+    });
+    // ตรวจ API key ในขั้นใส่ key — ว่าง = ไม่ผ่าน, OAuth/format ผิด = บอก error (กัน setup จบทั้งที่ key ใช้ไม่ได้)
+    const submitKey = (raw) => {
+        const k = raw.trim();
+        if (!k) {
+            setKeyError('วาง API key ก่อนค่ะ (กด Enter ทั้งที่ว่างไม่ได้) · Esc = กลับไปเลือก provider');
+            return;
+        }
+        if (cfg) {
+            try {
+                assertDirectApiKey(cfg, k); // reject OAuth/subscription token + format ผิด (เหมือน runtime)
+            }
+            catch (e) {
+                setKeyError(e.message.split('\n')[0]);
+                return;
+            }
+        }
+        setKeyError('');
+        setKey(k);
+        setKeyDraft(k);
+        setStep('model');
+    };
+    return (_jsxs(Box, { flexDirection: "column", gap: 1, marginY: 1, children: [_jsxs(Text, { bold: true, color: "cyan", children: ["\u2699  \u0E15\u0E31\u0E49\u0E07\u0E04\u0E48\u0E32 ", BRAND.bannerTitle, " (\u0E04\u0E23\u0E31\u0E49\u0E07\u0E41\u0E23\u0E01)"] }), step === 'provider' && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: "1. \u0E40\u0E25\u0E37\u0E2D\u0E01 AI provider (\u2191\u2193 \u0E40\u0E25\u0E37\u0E2D\u0E01 \u00B7 Enter \u0E22\u0E37\u0E19\u0E22\u0E31\u0E19):" }), _jsx(Text, { color: "gray", children: "   cloud = \u0E43\u0E2A\u0E48 API key \u00B7 local = \u0E1F\u0E23\u0E35\u0E1A\u0E19\u0E40\u0E04\u0E23\u0E37\u0E48\u0E2D\u0E07 \u00B7 Codex = login \u0E14\u0E49\u0E27\u0E22 ChatGPT" }), _jsx(Select, { options: providerOptions, onChange: (v) => {
                             setProvider(v);
-                            setStep(PROVIDERS[v].requiresKey ? 'key' : 'model');
-                        } })] })), step === 'key' && cfg && (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { children: ["2. \u0E27\u0E32\u0E07 API key \u0E02\u0E2D\u0E07 ", cfg.label, ":"] }), consoleUrl(provider) ? (_jsxs(Text, { color: "cyan", children: ["   \u2192 \u0E40\u0E2D\u0E32 key \u0E17\u0E35\u0E48: ", consoleUrl(provider)] })) : null, _jsx(Text, { color: "gray", children: "   (API key \u0E15\u0E23\u0E07\u0E08\u0E32\u0E01 console \u2014 \u0E2B\u0E49\u0E32\u0E21 OAuth/subscription token)" }), _jsx(PasswordInput, { placeholder: cfg.envVar, onSubmit: (v) => {
-                            setKey(v.trim());
-                            setStep('model');
-                        } })] })), step === 'model' &&
+                            const p = PROVIDERS[v];
+                            if (p.kind === 'delegate')
+                                setStep('codex-auth');
+                            else if (p.requiresKey)
+                                setStep('key');
+                            else
+                                setStep('model');
+                        } })] })), step === 'codex-auth' && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: "2. \u0E40\u0E0A\u0E37\u0E48\u0E2D\u0E21 OpenAI Codex (\u0E43\u0E0A\u0E49\u0E42\u0E04\u0E27\u0E15\u0E49\u0E32 ChatGPT plan \u2014 \u0E44\u0E21\u0E48\u0E15\u0E49\u0E2D\u0E07\u0E21\u0E35 API key):" }), codexStatus === null ? (_jsx(Text, { color: "gray", children: "   \u0E01\u0E33\u0E25\u0E31\u0E07\u0E40\u0E0A\u0E47\u0E01 codex CLI + \u0E2A\u0E16\u0E32\u0E19\u0E30 login\u2026" })) : !codexStatus.installed ? (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: "yellow", children: "   \u274C \u0E22\u0E31\u0E07\u0E44\u0E21\u0E48\u0E44\u0E14\u0E49\u0E15\u0E34\u0E14\u0E15\u0E31\u0E49\u0E07 codex CLI" }), _jsxs(Text, { children: ['   ', "\u0E15\u0E34\u0E14\u0E15\u0E31\u0E49\u0E07\u0E43\u0E19 terminal \u0E2D\u0E35\u0E01\u0E2B\u0E19\u0E49\u0E32\u0E15\u0E48\u0E32\u0E07: ", _jsx(Text, { color: "cyan", children: "npm i -g @openai/codex" })] }), _jsx(Select, { options: [
+                                    { label: 'เช็กใหม่ (ติดตั้งเสร็จแล้ว)', value: 'recheck' },
+                                    { label: '← กลับไปเลือก provider อื่น', value: 'back' },
+                                ], onChange: (v) => (v === 'recheck' ? setRecheck((n) => n + 1) : backToProvider()) })] })) : !codexStatus.loggedIn ? (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: "yellow", children: "   \u26A0 \u0E15\u0E34\u0E14\u0E15\u0E31\u0E49\u0E07\u0E41\u0E25\u0E49\u0E27 \u0E41\u0E15\u0E48\u0E22\u0E31\u0E07\u0E44\u0E21\u0E48\u0E44\u0E14\u0E49 login ChatGPT" }), _jsxs(Text, { children: ['   ', "\u0E23\u0E31\u0E19\u0E43\u0E19 terminal \u0E2D\u0E35\u0E01\u0E2B\u0E19\u0E49\u0E32\u0E15\u0E48\u0E32\u0E07: ", _jsx(Text, { color: "cyan", children: "codex login" }), " ", _jsx(Text, { color: "gray", children: "(\u0E40\u0E1B\u0E34\u0E14 browser \u0E43\u0E2B\u0E49\u0E22\u0E37\u0E19\u0E22\u0E31\u0E19\u0E14\u0E49\u0E27\u0E22\u0E1A\u0E31\u0E0D\u0E0A\u0E35 ChatGPT)" })] }), _jsx(Select, { options: [
+                                    { label: 'เช็กใหม่ (login เสร็จแล้ว)', value: 'recheck' },
+                                    { label: '← กลับไปเลือก provider อื่น', value: 'back' },
+                                ], onChange: (v) => (v === 'recheck' ? setRecheck((n) => n + 1) : backToProvider()) })] })) : (_jsx(Text, { color: "green", children: "   \u2705 login ChatGPT \u0E41\u0E25\u0E49\u0E27 \u2014 \u0E01\u0E33\u0E25\u0E31\u0E07\u0E44\u0E1B\u0E15\u0E48\u0E2D\u2026" }))] })), step === 'key' && cfg && (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { children: ["2. \u0E27\u0E32\u0E07 API key \u0E02\u0E2D\u0E07 ", cfg.label, ": ", _jsx(Text, { color: "gray", children: "(Esc = \u0E01\u0E25\u0E31\u0E1A)" })] }), consoleUrl(provider) ? _jsxs(Text, { color: "cyan", children: ["   \u2192 \u0E40\u0E2D\u0E32 key \u0E17\u0E35\u0E48: ", consoleUrl(provider)] }) : null, cfg.keyExample ? _jsxs(Text, { color: "gray", children: ["   \u0E23\u0E39\u0E1B\u0E41\u0E1A\u0E1A key: ", cfg.keyExample] }) : null, _jsx(Text, { color: "gray", children: "   (API key \u0E15\u0E23\u0E07\u0E08\u0E32\u0E01 console \u2014 \u0E2B\u0E49\u0E32\u0E21 OAuth/subscription token \u00B7 key \u0E08\u0E30\u0E40\u0E01\u0E47\u0E1A\u0E41\u0E1A\u0E1A\u0E40\u0E02\u0E49\u0E32\u0E23\u0E2B\u0E31\u0E2A\u0E43\u0E19\u0E40\u0E04\u0E23\u0E37\u0E48\u0E2D\u0E07)" }), _jsx(PasswordInput, { placeholder: cfg.envVar, onChange: (v) => {
+                            setKeyDraft(v);
+                            if (keyError)
+                                setKeyError('');
+                        }, onSubmit: submitKey }), keyError ? _jsxs(Text, { color: "red", children: ["   \u2717 ", keyError] }) : null] })), step === 'model' &&
                 cfg &&
                 (loadingModels ? (_jsxs(Text, { color: "gray", children: ["   \u0E01\u0E33\u0E25\u0E31\u0E07\u0E14\u0E36\u0E07\u0E23\u0E32\u0E22\u0E0A\u0E37\u0E48\u0E2D model \u0E08\u0E32\u0E01 ", cfg.label, "\u2026"] })) : (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { children: ["3. \u0E40\u0E25\u0E37\u0E2D\u0E01 model \u0E40\u0E23\u0E34\u0E48\u0E21\u0E15\u0E49\u0E19", remote.length ? _jsxs(Text, { color: "gray", children: [" (", modelOptions.length, " \u0E15\u0E31\u0E27\u0E08\u0E32\u0E01 provider + alias)"] }) : null, ":"] }), _jsx(Select, { options: modelOptions, onChange: (v) => {
                                 setModel(`${provider}:${v}`);

package/dist/update.js

@@ -6,11 +6,23 @@ function packageUrl(registry, packageName) {
     const encoded = encodeURIComponent(packageName).replace(/^%40/, '@');
     return `${base}/${encoded}`;
 }
+function normalizeNumericIdentifier(part) {
+    return /^\d+$/.test(part) ? part.replace(/^0+/, '') || '0' : undefined;
+}
+function compareNumericIdentifiers(a, b) {
+    if (a === b)
+        return 0;
+    if (a.length !== b.length)
+        return a.length > b.length ? 1 : -1;
+    return a > b ? 1 : -1;
+}
 function splitVersion(version) {
     const [withoutBuild] = version.trim().replace(/^v/, '').split('+');
-    const [corePart, prereleasePart = ''] = withoutBuild.split('-', 2);
+    const prereleaseIndex = withoutBuild.indexOf('-');
+    const corePart = prereleaseIndex === -1 ? withoutBuild : withoutBuild.slice(0, prereleaseIndex);
+    const prereleasePart = prereleaseIndex === -1 ? '' : withoutBuild.slice(prereleaseIndex + 1);
     return {
-        core: corePart.split('.').map((part) => Number.parseInt(part, 10)).map((n) => (Number.isFinite(n) ? n : 0)),
+        core: corePart.split('.').map((part) => normalizeNumericIdentifier(part) ?? '0'),
         prerelease: prereleasePart ? prereleasePart.split('.') : [],
     };
 }
@@ -29,12 +41,13 @@ function comparePrerelease(a, b) {
             return -1;
         if (pb === undefined)
             return 1;
-        const na = /^\d+$/.test(pa) ? Number(pa) : Number.NaN;
-        const nb = /^\d+$/.test(pb) ? Number(pb) : Number.NaN;
-        if (Number.isFinite(na) && Number.isFinite(nb) && na !== nb)
-            return na > nb ? 1 : -1;
-        if (Number.isFinite(na) !== Number.isFinite(nb))
-            return Number.isFinite(na) ? -1 : 1;
+        const na = normalizeNumericIdentifier(pa);
+        const nb = normalizeNumericIdentifier(pb);
+        if (na !== undefined && nb !== undefined && na !== nb) {
+            return compareNumericIdentifiers(na, nb);
+        }
+        if ((na !== undefined) !== (nb !== undefined))
+            return na !== undefined ? -1 : 1;
         if (pa !== pb)
             return pa > pb ? 1 : -1;
     }
@@ -45,10 +58,10 @@ export function compareVersions(a, b) {
     const vb = splitVersion(b);
     const len = Math.max(va.core.length, vb.core.length, 3);
     for (let i = 0; i < len; i++) {
-        const na = va.core[i] ?? 0;
-        const nb = vb.core[i] ?? 0;
+        const na = va.core[i] ?? '0';
+        const nb = vb.core[i] ?? '0';
         if (na !== nb)
-            return na > nb ? 1 : -1;
+            return compareNumericIdentifiers(na, nb);
     }
     return comparePrerelease(va.prerelease, vb.prerelease);
 }