sanook-cli 0.5.2 → 0.5.7

package/dist/gateway/ledger.js

@@ -9,6 +9,8 @@ import { appHomePath } from '../brand.js';
 const GATEWAY_DIR = appHomePath('gateway');
 const TASKS_FILE = join(GATEWAY_DIR, 'tasks.json');
 const LOCK_FILE = join(GATEWAY_DIR, 'tasks.lock');
+const TASK_KINDS = new Set(['cron', 'message', 'once']);
+const TASK_STATUSES = new Set(['queued', 'running', 'done', 'failed']);
 function normalizeOptionalModel(model) {
     const trimmed = model?.trim();
     return trimmed ? trimmed : undefined;
@@ -17,11 +19,28 @@ function normalizeOptionalText(value) {
     const trimmed = value?.trim();
     return trimmed ? trimmed : undefined;
 }
+function isTask(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value))
+        return false;
+    const task = value;
+    return (typeof task.id === 'string' &&
+        TASK_KINDS.has(task.kind) &&
+        TASK_STATUSES.has(task.status) &&
+        typeof task.spec === 'string' &&
+        Number.isFinite(task.runAt) &&
+        Number.isFinite(task.createdAt) &&
+        (task.schedule === undefined || typeof task.schedule === 'string') &&
+        (task.model === undefined || typeof task.model === 'string') &&
+        (task.deliver === undefined || typeof task.deliver === 'string') &&
+        (task.lastRun === undefined || Number.isFinite(task.lastRun)) &&
+        (task.lastResult === undefined || typeof task.lastResult === 'string') &&
+        (task.lastError === undefined || typeof task.lastError === 'string'));
+}
 // ── low-level: read ตรงจากไฟล์ทุกครั้ง (ไม่ cache snapshot → ไม่มี stale-overwrite) ──
 async function readTasks() {
     try {
         const parsed = JSON.parse(await readFile(TASKS_FILE, 'utf8'));
-        return Array.isArray(parsed) ? parsed : [];
+        return Array.isArray(parsed) ? parsed.filter(isTask) : [];
     }
     catch {
         return []; // ไม่มีไฟล์/พัง → empty (write แบบ atomic จึงไม่ทำลายของเดิม)

package/dist/gateway/session.js

@@ -3,7 +3,7 @@ import { chmod, mkdir, readFile, readdir, rm, writeFile } from 'node:fs/promises
 import { join } from 'node:path';
 import { appHomePath, persistenceEnabled } from '../brand.js';
 import { runAgent } from '../loop.js';
-import { redactKey } from '../providers/keys.js';
+import { redactKey, redactUnknown } from '../providers/keys.js';
 import { canonicalSpec, parseSpec, PROVIDERS } from '../providers/registry.js';
 import { autoCompact, estimateTokens } from '../compaction.js';
 import { patchGlobalConfig } from '../config.js';
@@ -25,15 +25,32 @@ function sessionPath(id) {
     }
     return join(SESSION_DIR, `${id}.json`);
 }
-function redactUnknown(value) {
-    if (typeof value === 'string')
-        return redactKey(value);
-    if (Array.isArray(value))
-        return value.map(redactUnknown);
-    if (value && typeof value === 'object') {
-        return Object.fromEntries(Object.entries(value).map(([k, v]) => [k, redactUnknown(v)]));
+function isRecord(value) {
+    return value !== null && typeof value === 'object' && !Array.isArray(value);
+}
+function isModelMessage(value) {
+    if (!isRecord(value))
+        return false;
+    if (value.role === 'system')
+        return typeof value.content === 'string';
+    if (value.role === 'tool')
+        return Array.isArray(value.content);
+    if (value.role === 'user' || value.role === 'assistant') {
+        return typeof value.content === 'string' || Array.isArray(value.content);
     }
-    return value;
+    return false;
+}
+function isGatewaySession(value) {
+    if (!isRecord(value))
+        return false;
+    return (typeof value.id === 'string' &&
+        typeof value.platform === 'string' &&
+        typeof value.target === 'string' &&
+        typeof value.created === 'string' &&
+        typeof value.updated === 'string' &&
+        typeof value.model === 'string' &&
+        Array.isArray(value.messages) &&
+        value.messages.every(isModelMessage));
 }
 export function shouldSuppressDelivery(text) {
     const normalized = text.trim().toUpperCase().replace(/[\s_-]+/g, ' ');
@@ -42,7 +59,8 @@ export function shouldSuppressDelivery(text) {
 export async function loadGatewaySession(platform, target) {
     try {
         const id = gatewaySessionId(platform, target);
-        return JSON.parse(await readFile(sessionPath(id), 'utf8'));
+        const parsed = JSON.parse(await readFile(sessionPath(id), 'utf8'));
+        return isGatewaySession(parsed) && parsed.id === id ? parsed : null;
     }
     catch {
         return null;
@@ -53,7 +71,8 @@ export async function listGatewaySessions() {
         const files = (await readdir(SESSION_DIR)).filter((f) => f.endsWith('.json'));
         const sessions = await Promise.all(files.map(async (file) => {
             try {
-                return JSON.parse(await readFile(join(SESSION_DIR, file), 'utf8'));
+                const parsed = JSON.parse(await readFile(join(SESSION_DIR, file), 'utf8'));
+                return isGatewaySession(parsed) ? parsed : null;
             }
             catch {
                 return null;
@@ -153,6 +172,10 @@ async function runAndSaveGatewayTurn(opts, existing, prompt, history, model) {
         maxSteps: opts.maxSteps ?? 20,
         budgetUsd: opts.budgetUsd,
         permissionMode: opts.permissionMode ?? 'ask',
+        usageMeta: {
+            sessionId: `${opts.platform}:${opts.target}`,
+            source: 'gateway',
+        },
     });
     await saveGatewayState(opts, existing, model, messages);
     return { text, messages, suppressDelivery: shouldSuppressDelivery(text) };

package/dist/hotkeys.js

@@ -0,0 +1,21 @@
+export const HOTKEYS = [
+    ['Ctrl+C', 'clear draft / interrupt running turn / exit when input is empty'],
+    ['Esc', 'stop running turn and clear queued prompts'],
+    ['↑/↓', 'prompt history'],
+    ['Ctrl+A/E', 'start / end of line'],
+    ['Ctrl+U/K', 'delete to start / end'],
+    ['Ctrl+W', 'delete previous word'],
+    ['Alt+Enter', 'insert newline'],
+    ['\\+Enter', 'multi-line continuation fallback'],
+    ['paste 5+ lines', 'collapse into a readable token, expand before submit'],
+    ['type while busy + Enter', 'queue the next prompt'],
+    ['busy ↑/↓ + Ctrl+X', 'select and delete queued prompts'],
+    ['Ctrl+T', 'toggle tool trail compact / expanded'],
+    ['@file', 'inline a file or attach an image'],
+    ['/model <spec>', 'switch model'],
+    ['/diff /undo /rewind', 'inspect, stash, or rewind file changes'],
+];
+export function formatHotkeys() {
+    const width = HOTKEYS.reduce((max, [key]) => Math.max(max, key.length), 0);
+    return ['hotkeys:', ...HOTKEYS.map(([key, help]) => `  ${key.padEnd(width)}  ${help}`)].join('\n');
+}

package/dist/i18n/en.js

@@ -0,0 +1,98 @@
+export const en = {
+    setup: {
+        title: 'Set up Sanook AI CLI (first run)',
+        stepLanguage: '1. Choose language',
+        stepWelcome: '2. Welcome',
+        stepProvider: '3. Choose AI provider',
+        stepCodex: '4. Connect OpenAI Codex',
+        stepKey: '4. Paste API key',
+        stepModel: '5. Choose default model',
+        stepAgent: '6. Agent settings',
+        stepTools: '7. Tools & MCP',
+        stepGateway: '8. Messaging gateway',
+        stepBrain: '9. Second brain workspace',
+        stepComplete: '10. Ready',
+        languageHint: 'You can change this later with sanook config set locale en|th',
+        languageEn: 'English',
+        languageTh: 'Thai (ภาษาไทย)',
+        welcomeBody: 'Sanook is a terminal AI agent with MCP, gateway, and an optional Obsidian second brain.\nThis wizard walks you through provider, model, and vault setup step by step.',
+        welcomeContinue: 'Continue setup',
+        providerHint: '↑↓ select · Enter confirm · ★ Codex = ChatGPT plan (no API key)',
+        providerMenuHint: 'cloud = API key · ★ Codex = ChatGPT plan · local = free on device',
+        codexTitle: 'Connect OpenAI Codex (ChatGPT plan quota — no API key)',
+        codexChecking: 'Checking codex CLI + login state…',
+        codexNeedInstall: 'Codex CLI not installed yet',
+        codexNeedLogin: 'Codex CLI installed but ChatGPT not signed in',
+        codexLoggedInNeedCli: 'Signed in — install codex CLI to run the agent',
+        codexReady: 'ChatGPT signed in — continuing…',
+        codexDeviceTitle: 'Sign in with device code (Hermes-style)',
+        codexDeviceOpen: '1. Open in browser:',
+        codexDeviceEnter: '2. Enter this code:',
+        codexDeviceWaiting: '3. Waiting for sign-in…',
+        codexDeviceRetry: 'Try device code again',
+        codexDeviceBack: '← Back to other login options',
+        codexOptionDevice: 'Login with device code (recommended)',
+        codexOptionCliLogin: 'Use codex login in another terminal',
+        codexOptionRecheck: 'Re-check (after install/login)',
+        codexOptionBack: '← Choose another provider',
+        codexInstallCmd: 'npm i -g @openai/codex',
+        keyEscHint: '(Esc = back)',
+        keyOpenAiCodexHint: 'Have ChatGPT Plus/Pro? Press Esc and pick OpenAI Codex (ChatGPT plan) — no API key needed.',
+        keyFormatHint: 'Key format',
+        keyStorageHint: 'Direct console API key only — no OAuth tokens · stored at ~/.sanook/auth.json mode 0600',
+        keyEmptyError: 'Paste an API key first (Enter on empty is blocked) · Esc = back to providers',
+        modelLoading: 'Fetching models from',
+        modelPick: 'Pick a default model',
+        brainQuestion: 'Create a second-brain workspace (Obsidian) for durable AI memory?',
+        brainYes: 'Yes — a few questions (name + path)',
+        brainNo: 'Skip for now (run sanook brain init later)',
+        completeTitle: 'Setup complete',
+        completeBody: 'Your CLI is ready. Open the dashboard for config and sessions, or start chatting in the terminal.',
+        completeDashboard: 'Open Sanook Dashboard',
+        completeRepl: 'Start terminal REPL',
+        continueLabel: 'Continue',
+        backLabel: 'Back',
+        recheckLabel: 'Re-check',
+        agentTitle: 'How should Sanook handle write/bash tools?',
+        agentAsk: 'Ask before risky actions (recommended)',
+        agentAuto: 'Act first (auto mode — faster, less safe)',
+        agentHint: 'Change anytime: sanook config set permissionMode ask|auto',
+        toolsTitle: 'Built-in tools + MCP',
+        toolsBody: 'Sanook ships git, bash, MCP, web search hooks, and skills. MCP servers live in ~/.sanook/mcp.json.',
+        toolsMcpHint: 'Browse MCP: /mcp in REPL · sanook mcp search <query>',
+        toolsWebSkip: 'Continue (configure web search later)',
+        toolsWebLater: 'Note: run sanook web setup tavily for web search',
+        gatewayTitle: 'Connect messaging platforms (optional)',
+        gatewayBody: 'Run sanook serve for 24/7 gateway. Pick a platform to configure next, or skip.',
+        gatewaySkip: 'Skip gateway for now',
+        gatewayTelegram: 'Telegram — sanook gateway setup telegram',
+        gatewayDiscord: 'Discord — sanook gateway setup discord',
+        gatewaySlack: 'Slack — sanook gateway setup slack',
+        gatewayDashboard: 'Configure in Sanook Dashboard → Channels',
+    },
+    dashboard: {
+        productName: 'Sanook Dashboard',
+        tagline: 'Configure models, sessions, MCP, gateway, and your second brain',
+        nav: {
+            home: 'Home',
+            chat: 'Chat',
+            models: 'Models',
+            sessions: 'Sessions',
+            files: 'Files',
+            logs: 'Logs',
+            cron: 'Cron',
+            channels: 'Channels',
+            config: 'Config',
+            mcp: 'MCP',
+            brain: 'Brain',
+        },
+        home: {
+            title: 'System status',
+            cliVersion: 'CLI version',
+            model: 'Default model',
+            brainPath: 'Second brain',
+            gateway: 'Gateway',
+            openRepl: 'Run sanook in your terminal to chat',
+        },
+    },
+};

package/dist/i18n/index.js

@@ -0,0 +1,19 @@
+import { en } from './en.js';
+import { th } from './th.js';
+const CATALOGS = { en, th };
+export const SUPPORTED_LOCALES = ['en', 'th'];
+export function normalizeLocale(raw) {
+    const v = typeof raw === 'string' ? raw.trim().toLowerCase() : '';
+    if (v === 'en' || v.startsWith('en-'))
+        return 'en';
+    if (v === 'th' || v.startsWith('th-'))
+        return 'th';
+    return 'th';
+}
+export function getLocaleCatalog(locale) {
+    return CATALOGS[locale] ?? CATALOGS.th;
+}
+export function detectDefaultLocale() {
+    const lang = process.env.LANG ?? process.env.LC_ALL ?? process.env.LC_MESSAGES ?? '';
+    return lang.toLowerCase().includes('th') ? 'th' : 'en';
+}

package/dist/i18n/th.js

@@ -0,0 +1,98 @@
+export const th = {
+    setup: {
+        title: 'ตั้งค่า Sanook AI CLI (ครั้งแรก)',
+        stepLanguage: '1. เลือกภาษา',
+        stepWelcome: '2. ยินดีต้อนรับ',
+        stepProvider: '3. เลือก AI provider',
+        stepCodex: '4. เชื่อม OpenAI Codex',
+        stepKey: '4. วาง API key',
+        stepModel: '5. เลือก model เริ่มต้น',
+        stepAgent: '6. ตั้งค่า agent',
+        stepTools: '7. Tools & MCP',
+        stepGateway: '8. Messaging gateway',
+        stepBrain: '9. second brain workspace',
+        stepComplete: '10. พร้อมใช้งาน',
+        languageHint: 'เปลี่ยนภาษาทีหลังได้: sanook config set locale en|th',
+        languageEn: 'English (ภาษาอังกฤษ)',
+        languageTh: 'ภาษาไทย',
+        welcomeBody: 'Sanook คือ AI agent บน terminal พร้อม MCP, gateway และ second brain (Obsidian) แบบเลือกได้\nwizard นี้จะพาตั้งค่า provider → model → vault ทีละขั้น',
+        welcomeContinue: 'เริ่มตั้งค่า',
+        providerHint: '↑↓ เลือก · Enter ยืนยัน · ★ Codex = ChatGPT plan (ไม่ต้อง API key)',
+        providerMenuHint: 'cloud = ใส่ API key · ★ Codex = ChatGPT plan · local = ฟรีบนเครื่อง',
+        codexTitle: 'เชื่อม OpenAI Codex (ใช้โควต้า ChatGPT plan — ไม่ต้องมี API key)',
+        codexChecking: 'กำลังเช็ก codex CLI + สถานะ login…',
+        codexNeedInstall: 'ยังไม่ได้ติดตั้ง codex CLI',
+        codexNeedLogin: 'ติดตั้ง codex CLI แล้ว แต่ยังไม่ได้ login ChatGPT',
+        codexLoggedInNeedCli: 'login แล้ว — ติดตั้ง codex CLI ก่อนรัน agent',
+        codexReady: 'login ChatGPT แล้ว — กำลังไปต่อ…',
+        codexDeviceTitle: 'Login ด้วย device code (แบบ Hermes)',
+        codexDeviceOpen: '1. เปิดใน browser:',
+        codexDeviceEnter: '2. ใส่รหัสนี้:',
+        codexDeviceWaiting: '3. รอ sign-in…',
+        codexDeviceRetry: 'ลอง device code ใหม่',
+        codexDeviceBack: '← กลับไปเลือกวิธี login อื่น',
+        codexOptionDevice: 'Login ด้วย device code (แนะนำ)',
+        codexOptionCliLogin: 'ใช้ codex login ใน terminal อีกหน้าต่าง',
+        codexOptionRecheck: 'เช็กใหม่ (หลังติดตั้ง/login)',
+        codexOptionBack: '← กลับไปเลือก provider อื่น',
+        codexInstallCmd: 'npm i -g @openai/codex',
+        keyEscHint: '(Esc = กลับ)',
+        keyOpenAiCodexHint: 'มี ChatGPT Plus/Pro? กด Esc แล้วเลือก OpenAI Codex (ChatGPT plan) — ไม่ต้อง API key',
+        keyFormatHint: 'รูปแบบ key',
+        keyStorageHint: 'API key ตรงจาก console — ห้าม OAuth/subscription token · เก็บที่ ~/.sanook/auth.json สิทธิ์ 0600',
+        keyEmptyError: 'วาง API key ก่อนค่ะ · Esc = กลับไปเลือก provider',
+        modelLoading: 'กำลังดึงรายชื่อ model จาก',
+        modelPick: 'เลือก model เริ่มต้น',
+        brainQuestion: 'สร้าง second-brain workspace (Obsidian) สำหรับความจำ AI ข้าม session?',
+        brainYes: 'สร้างเลย — ตอบไม่กี่ข้อ (ชื่อ + ที่เก็บ)',
+        brainNo: 'ข้ามไปก่อน (สั่ง sanook brain init ทีหลังได้)',
+        completeTitle: 'ตั้งค่าเสร็จแล้ว',
+        completeBody: 'CLI พร้อมใช้แล้ว เปิด Dashboard จัดการ config/sessions หรือเริ่มแชทใน terminal',
+        completeDashboard: 'เปิด Sanook Dashboard',
+        completeRepl: 'เริ่ม REPL ใน terminal',
+        continueLabel: 'ต่อไป',
+        backLabel: 'กลับ',
+        recheckLabel: 'เช็กใหม่',
+        agentTitle: 'Sanook ควรจัดการ write/bash tools อย่างไร?',
+        agentAsk: 'ถามก่อนทำ action เสี่ยง (แนะนำ)',
+        agentAuto: 'ทำเลย (auto mode — เร็วกว่า แต่เสี่ยงกว่า)',
+        agentHint: 'เปลี่ยนทีหลังได้: sanook config set permissionMode ask|auto',
+        toolsTitle: 'Tools ในตัว + MCP',
+        toolsBody: 'Sanook มี git, bash, MCP, web search, skills · MCP อยู่ที่ ~/.sanook/mcp.json',
+        toolsMcpHint: 'ดู MCP: /mcp ใน REPL · sanook mcp search <query>',
+        toolsWebSkip: 'ต่อไป (ตั้ง web search ทีหลัง)',
+        toolsWebLater: 'หมายเหตุ: รัน sanook web setup tavily สำหรับ web search',
+        gatewayTitle: 'เชื่อม messaging platforms (ไม่บังคับ)',
+        gatewayBody: 'รัน sanook serve สำหรับ gateway 24/7 · เลือก platform หรือข้าม',
+        gatewaySkip: 'ข้าม gateway ไปก่อน',
+        gatewayTelegram: 'Telegram — sanook gateway setup telegram',
+        gatewayDiscord: 'Discord — sanook gateway setup discord',
+        gatewaySlack: 'Slack — sanook gateway setup slack',
+        gatewayDashboard: 'ตั้งใน Sanook Dashboard → Channels',
+    },
+    dashboard: {
+        productName: 'Sanook Dashboard',
+        tagline: 'จัดการ model, session, MCP, gateway และ second brain',
+        nav: {
+            home: 'หน้าแรก',
+            chat: 'Chat',
+            models: 'Models',
+            sessions: 'Sessions',
+            files: 'Files',
+            logs: 'Logs',
+            cron: 'Cron',
+            channels: 'Channels',
+            config: 'Config',
+            mcp: 'MCP',
+            brain: 'Brain',
+        },
+        home: {
+            title: 'สถานะระบบ',
+            cliVersion: 'เวอร์ชัน CLI',
+            model: 'Model หลัก',
+            brainPath: 'Second brain',
+            gateway: 'Gateway',
+            openRepl: 'รัน sanook ใน terminal เพื่อแชท',
+        },
+    },
+};

package/dist/i18n/types.js

@@ -0,0 +1 @@
+export {};

package/dist/insights-args.js

@@ -1,3 +1,4 @@
+import { inlineValue, takeValue } from './cli-option-values.js';
 function parsePositiveInteger(raw) {
     if (!raw || !/^[1-9]\d*$/.test(raw))
         return null;
@@ -28,8 +29,27 @@ export function parseInsightsDays(args) {
 }
 export function parseInsightsArgs(args) {
     const parts = typeof args === 'string' ? args.trim().split(/\s+/).filter(Boolean) : [...args];
-    const all = parts.includes('--all') || parts.includes('-a');
-    const dayParts = parts.filter((arg) => arg !== '--all' && arg !== '-a');
-    const days = parseInsightsDays(dayParts);
-    return days === null ? null : { days, all };
+    let days = 30;
+    let all = false;
+    let sawDays = false;
+    for (let i = 0; i < parts.length; i++) {
+        const arg = parts[i];
+        if (arg === '--all' || arg === '-a') {
+            all = true;
+            continue;
+        }
+        const inlineDays = inlineValue('--days', arg) ?? inlineValue('-d', arg);
+        const next = arg === '--days' || arg === '-d' ? takeValue(parts, i) : undefined;
+        const raw = next ? next.value : inlineDays ?? arg;
+        if (sawDays)
+            return null;
+        const parsed = parsePositiveInteger(raw);
+        if (parsed === null)
+            return null;
+        days = parsed;
+        sawDays = true;
+        if (next)
+            i = next.nextIndex;
+    }
+    return { days, all };
 }

package/dist/knowledge.js

@@ -2,8 +2,8 @@ import { loadStore, activeFacts } from './memory-store.js';
 import { loadSkills } from './skills.js';
 import { loadIndex } from './search/store.js';
 import { foldFacts, foldSessions, foldSkills, loadRecentSessions } from './search/indexer.js';
-import { rankSearch } from './search/engine.js';
-import { termList } from './search/index-core.js';
+import { rankSearch, search } from './search/engine.js';
+import { termList, SEARCH_SOURCES } from './search/index-core.js';
 // recall = ค้น knowledge ที่สะสม (auto-memory + vault + skills + session เก่า) แบบ BM25
 // เดิมเป็น substring term-count (ไม่มี ranking/IDF) → อัปเกรดเป็น real BM25 inverted index
 // (src/search/) ที่ rank ข้าม corpus เดียวกัน + ตัด snippet ให้
@@ -20,7 +20,7 @@ export function scoreText(text, terms) {
     return terms.reduce((s, t) => s + (l.includes(t) ? 1 : 0), 0);
 }
 /** label สั้นต่อ hit (memory ไม่มี title → ใช้ snippet; vault มี path ต่อท้าย) */
-function formatHit(h) {
+export function formatHit(h) {
     const title = h.title.trim();
     const snippet = h.snippet.trim();
     const head = title ? [title, snippet].filter(Boolean).join(' — ') : snippet;
@@ -31,37 +31,63 @@ function formatHit(h) {
  * ค้น knowledge ข้าม memory + vault + skills + sessions ด้วย BM25 (ranked + snippet).
  * คืน plain-text สำหรับ agent อ่าน (สัญญาเดิม) — ใช้โดย recall tool.
  */
-export async function recall(query, limit = 8) {
-    if (termList(query).length === 0) {
-        return 'query สั้นเกินไป — ใส่คำค้นยาวขึ้น';
-    }
+/**
+ * Ranked hits over memory + vault + skills + sessions (BM25, deterministic, no network).
+ * Loads the persisted index then folds LIVE corpora so a just-remembered fact is found
+ * immediately without a reindex. Shared by the recall tool and per-turn auto-retrieval.
+ */
+export async function recallHits(query, limit = 8, sources) {
     const now = Date.now();
+    const want = sources ? new Set(sources) : undefined; // undefined = all sources
     const { index } = await loadIndex(); // persisted (vault chunks); empty ok
-    // fold live corpora สด — memory/session/skill ล่าสุด (ไม่แตะไฟล์ persisted)
-    try {
-        foldFacts(index, activeFacts(await loadStore(now)), now);
-    }
-    catch {
-        /* ยังไม่มี memory */
-    }
-    try {
-        foldSessions(index, await loadRecentSessions());
+    // fold live corpora สด — memory/session/skill ล่าสุด (ไม่แตะไฟล์ persisted). Skip a corpus when
+    // it's filtered out (saves folding 100+ skills when callers only want project sources).
+    if (!want || want.has('memory')) {
+        try {
+            foldFacts(index, activeFacts(await loadStore(now)), now);
+        }
+        catch {
+            /* ยังไม่มี memory */
+        }
     }
-    catch {
-        /* ยังไม่มี session */
+    if (!want || want.has('session')) {
+        try {
+            foldSessions(index, await loadRecentSessions());
+        }
+        catch {
+            /* ยังไม่มี session */
+        }
     }
-    try {
-        foldSkills(index, (await loadSkills()).map((s) => ({
-            id: `skill:${s.name}`,
-            name: s.name,
-            text: `${s.description} ${s.whenToUse ?? ''}`.trim(),
-        })));
+    if (!want || want.has('skill')) {
+        try {
+            foldSkills(index, (await loadSkills()).map((s) => ({
+                id: `skill:${s.name}`,
+                name: s.name,
+                text: `${s.description} ${s.whenToUse ?? ''}`.trim(),
+            })));
+        }
+        catch {
+            /* ยังไม่มี skill */
+        }
     }
-    catch {
-        /* ยังไม่มี skill */
+    return rankSearch(index, query, { mode: 'fts', limit, sources }).hits;
+}
+/**
+ * Hybrid (semantic + BM25) recall over the persisted index + embeddings — the "lever" identified by
+ * experiment H5 for paraphrase/synonym queries. Degrades to BM25 automatically when no embedder /
+ * vectors are configured (never throws). Covers INDEXED content (run `sanook index`); just-remembered
+ * facts still surface via the default BM25 recallHits path. Opt-in per-turn (network/latency cost).
+ */
+export async function semanticRecallHits(query, limit = 8, sources) {
+    const res = await search(query, { mode: 'hybrid', limit, sources: sources ?? [...SEARCH_SOURCES] });
+    return res.hits;
+}
+export async function recall(query, limit = 8) {
+    if (termList(query).length === 0) {
+        return 'query สั้นเกินไป — ใส่คำค้นยาวขึ้น';
     }
-    const res = rankSearch(index, query, { mode: 'fts', limit });
-    if (!res.hits.length)
+    const hits = await recallHits(query, limit);
+    if (!hits.length)
         return `ไม่เจอความรู้เกี่ยวกับ "${query}" ใน memory/vault/skills/sessions`;
-    return res.hits.map(formatHit).join('\n');
+    return hits.map(formatHit).join('\n');
 }