@theowlops/boombot 1.1.0 → 1.1.2

package/dist/cli/commands/gateway.js

@@ -97,11 +97,11 @@ function gatewayHostPort() {
     try {
         const config = loadConfig(resolveConfigPath());
         const host = process.env['BOOMBOT_HOST']?.trim() || config?.host || '127.0.0.1';
-        const port = Number.parseInt(process.env['BOOMBOT_PORT']?.trim() || String(config?.port ?? 8787), 10);
-        return { host, port: Number.isInteger(port) && port > 0 && port <= 65535 ? port : 8787 };
+        const port = Number.parseInt(process.env['BOOMBOT_PORT']?.trim() || String(config?.port ?? 8788), 10);
+        return { host, port: Number.isInteger(port) && port > 0 && port <= 65535 ? port : 8788 };
     }
     catch {
-        return { host: '127.0.0.1', port: 8787 };
+        return { host: '127.0.0.1', port: 8788 };
     }
 }
 /** Public URL for the browser: 0.0.0.0/:: mean "this machine". Exported for tests. */
@@ -142,7 +142,7 @@ export function initializeGateway(configPath = resolveConfigPath()) {
         ensureMasterKey(masterKeyPath);
     }
     const { apiKeyHash } = ensureApiKey(resolveApiKeyPath(configPath));
-    saveConfig({ host: '127.0.0.1', port: 8787, dataDir, apiKeyHash }, configPath, 'wx');
+    saveConfig({ host: '127.0.0.1', port: 8788, dataDir, apiKeyHash }, configPath, 'wx');
     return true;
 }
 /**

package/dist/cli/commands/setup.js

@@ -129,59 +129,69 @@ export function browserHost(host) {
     return host === '0.0.0.0' || host === '::' ? '127.0.0.1' : host;
 }
 export async function runSetup() {
-    console.log('🦉 BoomBot setup\n');
+    const cyan = (s) => `\x1b[36m${s}\x1b[0m`;
+    const bold = (s) => `\x1b[1m${s}\x1b[0m`;
+    const green = (s) => `\x1b[32m${s}\x1b[0m`;
+    const dim = (s) => `\x1b[2m${s}\x1b[0m`;
+    const yellow = (s) => `\x1b[33m${s}\x1b[0m`;
+    console.log(`
+  ${cyan('╭───────────────────────────────────────────────╮')}
+  ${cyan('│')}   ${bold('🦉 BoomBot — First-Run Setup Wizard')}       ${cyan('│')}
+  ${cyan('│')}   ${dim('Thiết lập nhanh Gateway, API Key & LLM')}   ${cyan('│')}
+  ${cyan('╰───────────────────────────────────────────────╯')}
+  `);
     const existing = loadConfig();
-    const host = await askDefault('Gateway host', existing?.host ?? '127.0.0.1');
-    const defaultPort = existing?.port ?? 8787;
-    const port = parsePort(await ask(`Gateway port [${defaultPort}]: `), defaultPort);
-    const dataDir = await askDefault('Data directory', existing?.dataDir ?? '~/.boombot/data');
+    console.log(`${bold('1. Cấu hình mạng & đường dẫn (Network & Paths)')}`);
+    const host = await askDefault(`   ${cyan('•')} Gateway host`, existing?.host ?? '127.0.0.1');
+    const defaultPort = existing?.port ?? 8788;
+    const port = parsePort(await ask(`   ${cyan('•')} Gateway port [${defaultPort}]: `), defaultPort);
+    const dataDir = await askDefault(`   ${cyan('•')} Thư mục dữ liệu (Data directory)`, existing?.dataDir ?? '~/.boombot/data');
     // API key — kept at <config-dir>/api.key (0600) so it stays recoverable; the
     // config only ever holds its sha256. An existing key is reused, never rotated.
+    console.log(`\n${bold('2. Khóa bảo mật Gateway (Security Keys)')}`);
     const { apiKey, apiKeyHash, keyPath, created, fromEnv } = ensureApiKey();
     if (fromEnv) {
-        console.log('\nUsing the API key from BOOMBOT_API_KEY (no key file written).\n');
+        console.log(`   ${green('✔')} Sử dụng API key từ biến môi trường BOOMBOT_API_KEY`);
     }
     else if (created) {
-        console.log('\n────────────────────────────────────────');
-        console.log('Your gateway API key (save it somewhere safe):');
-        console.log(`\n  ${apiKey}\n`);
-        console.log(`Also stored at ${keyPath} (mode 0600) — \`boombot gateway\` reads it from`);
-        console.log('there and signs your browser in automatically, so you can ignore this');
-        console.log('notice. Only the sha256 hash is written to config.json.');
-        console.log('────────────────────────────────────────\n');
+        console.log(`   ${yellow('┌─ Gateway API Key của bạn (Lưu vào nơi an toàn) ───────────────┐')}`);
+        console.log(`   ${yellow('│')}  ${bold(apiKey)}`);
+        console.log(`   ${yellow('└───────────────────────────────────────────────────────────────┘')}`);
+        console.log(`   ${dim(`Đã lưu tại: ${keyPath} (tự động đăng nhập web)`)}`);
     }
     else {
-        console.log(`\nKeeping the existing gateway API key from ${keyPath}.`);
-        console.log('(delete that file and re-run setup to rotate it)\n');
+        console.log(`   ${green('✔')} Giữ API key hiện có tại: ${dim(keyPath)}`);
     }
-    // Master key — encrypts provider API keys at rest. The gateway needs it
-    // as BOOMBOT_MASTER_KEY; `boombot gateway` loads this file automatically.
+    // Master key — encrypts provider API keys at rest.
     const masterKeyPath = resolveMasterKeyPath();
     const masterKey = process.env['BOOMBOT_MASTER_KEY'] || ensureMasterKey(masterKeyPath);
-    console.log(`Master key for provider encryption: ${masterKeyPath}`);
-    console.log('(mode 0600 — it decrypts your provider keys, keep it safe)\n');
+    console.log(`   ${green('✔')} Master key mã hóa AES-256: ${dim(masterKeyPath)}`);
     // Telegram (optional).
+    console.log(`\n${bold('3. Kênh kết nối Chat (Messaging Channels)')}`);
     let telegram = existing?.telegram;
-    if (await askYesNo('Configure Telegram bot?', false)) {
-        const botToken = await readSecret('Telegram bot token: ');
-        const allowlist = parseAllowlist(await ask('Allowlisted chat IDs (comma-separated, empty = none): '));
+    if (await askYesNo(`   ${cyan('?')} Cấu hình bot Telegram?`, false)) {
+        const botToken = await readSecret('     Token bot Telegram: ');
+        const allowlist = parseAllowlist(await ask('     Chat IDs được phép (phân cách bằng dấu phẩy, để trống = tất cả): '));
         telegram = { botToken: botToken.trim(), allowlistChatIds: allowlist };
+        console.log(`     ${green('✔')} Đã cấu hình Telegram.`);
     }
-    // Default provider → the real encrypted store (<dataDir>/providers.json),
-    // the same store the gateway reads. The key is pasted once, masked, and
-    // never written in plaintext anywhere.
-    let providerSaved = false;
-    if (await askYesNo('Configure a default LLM provider?', true)) {
+    else {
+        console.log(`     ${dim('Bỏ qua kết nối Telegram (có thể cấu hình sau trên Web UI).')}`);
+    }
+    // Default provider → the real encrypted store (<dataDir>/providers.json)
+    console.log(`\n${bold('4. Nhà cung cấp AI (LLM Provider)')}`);
+    if (await askYesNo(`   ${cyan('?')} Thiết lập nhà cung cấp LLM mặc định?`, true)) {
+        console.log(`     ${dim(`Các loại hỗ trợ: ${PROVIDER_KINDS.join(', ')}`)}`);
         const kind = await askProviderKind();
         if (kind !== null) {
-            const model = await askRequired('Default model: ');
+            const model = await askRequired('     Model mặc định (vd: gpt-4o, claude-3-7-sonnet): ');
             const needsBaseUrl = kind === 'openai-compatible' || kind === 'local';
             const baseUrl = needsBaseUrl
-                ? await askRequired('Base URL (required for this provider kind): ')
-                : (await ask('Base URL (empty = provider default): ')).trim();
+                ? await askRequired('     Base URL (bắt buộc cho loại này): ')
+                : (await ask('     Base URL (để trống = mặc định): ')).trim();
             const providerApiKey = kind === 'local'
-                ? (await readSecret('Provider API key (empty = none): ')).trim()
-                : await readRequiredSecret('Provider API key: ');
+                ? (await readSecret('     Provider API key (để trống nếu không có): ')).trim()
+                : await readRequiredSecret('     Provider API key: ');
             const service = createProviderService({
                 storagePath: path.join(expandTilde(dataDir), 'providers.json'),
                 masterKey,
@@ -195,11 +205,13 @@ export async function runSetup() {
                 ...(providerApiKey !== '' ? { apiKey: providerApiKey } : {}),
                 active: true,
             });
-            providerSaved = true;
-            const keyNote = providerApiKey !== '' ? ' — API key stored encrypted' : ' — no API key stored';
-            console.log(`\nSaved default provider '${saved.name}' (${saved.kind})${keyNote}.`);
+            const keyNote = providerApiKey !== '' ? ' (đã mã hóa an toàn)' : '';
+            console.log(`     ${green('✔')} Đã lưu provider '${saved.name}' [${saved.kind}]${keyNote}`);
         }
     }
+    else {
+        console.log(`     ${dim('Bỏ qua cấu hình LLM (bạn có thể thêm trực tiếp trên Web UI).')}`);
+    }
     const config = {
         ...existing,
         host,
@@ -210,21 +222,23 @@ export async function runSetup() {
     };
     const problems = validateConfig(config);
     if (problems.length > 0) {
-        console.error(`\nInvalid config: ${problems.join('; ')}`);
+        console.error(`\n❌ Cấu hình không hợp lệ: ${problems.join('; ')}`);
         process.exitCode = 1;
         return;
     }
     const configPath = resolveConfigPath();
     saveConfig(config, configPath);
-    const permsNote = process.platform === 'win32'
-        ? 'permissions NOT enforced on Windows (chmod is a no-op) — see SECURITY.md §5'
-        : 'mode 0600 — secrets protected';
-    console.log(`\nSaved config to ${configPath} (${permsNote}).`);
     const url = `http://${browserHost(host)}:${port}`;
-    console.log('\nNext steps:');
-    console.log(`  1. boombot gateway   # start the gateway — opens ${url} in your browser`);
-    console.log('  2. boombot doctor    # health check, if anything looks off');
-    if (!providerSaved) {
-        console.log('  (tip: re-run `boombot setup` any time to add a default provider)');
-    }
+    console.log(`
+  ${green('╭───────────────────────────────────────────────╮')}
+  ${green('│')}   ${bold('🎉 CÀI ĐẶT HOÀN TẤT THÀNH CÔNG!')}            ${green('│')}
+  ${green('╰───────────────────────────────────────────────╯')}
+
+  ${bold('Tệp cấu hình:')} ${dim(configPath)}
+  ${bold('Giao diện Web:')}  ${cyan(url)}
+
+  ${bold('Bắt đầu sử dụng:')}
+    ${cyan('1.')} ${bold('boombot')}           Khởi động Gateway và mở Web UI
+    ${cyan('2.')} ${bold('boombot doctor')}    Kiểm tra toàn diện tình trạng hệ thống
+  `);
 }

package/dist/gateway/config.js

@@ -1,8 +1,9 @@
+import { homedir } from 'node:os';
 import { join } from 'node:path';
 import { hashApiKey } from './auth.js';
 import { coerceChannelSection, defaultConfigDir, defaultConfigPath, readConfigObject, resolveConfigFilePath, } from './config-format.js';
 const DEFAULT_HOST = '127.0.0.1';
-const DEFAULT_PORT = 8787;
+const DEFAULT_PORT = 8788;
 /**
  * Default config path (`~/.boombot/config.yml`). The real definition lives in
  * `config-format.ts`, next to the file probe order; re-exported here so old
@@ -397,8 +398,15 @@ export function loadConfig(env = process.env) {
     const fileHost = typeof file.host === 'string' && file.host.length > 0 ? file.host : undefined;
     const host = get('BOOMBOT_HOST') ?? fileHost ?? DEFAULT_HOST;
     const port = parsePort(get('BOOMBOT_PORT') ?? file.port);
-    const fileDataDir = typeof file.dataDir === 'string' && file.dataDir.length > 0 ? file.dataDir : undefined;
-    const dataDir = get('BOOMBOT_DATA_DIR') ?? fileDataDir ?? defaultDataDir(env);
+    const fileDataDir = typeof file.dataDir === 'string' && file.dataDir.length > 0
+        ? (file.dataDir.startsWith('~/') || file.dataDir.startsWith('~\\')
+            ? join(homedir(), file.dataDir.slice(2))
+            : file.dataDir)
+        : undefined;
+    const rawDataDir = get('BOOMBOT_DATA_DIR') ?? fileDataDir ?? defaultDataDir(env);
+    const dataDir = rawDataDir.startsWith('~/') || rawDataDir.startsWith('~\\')
+        ? join(homedir(), rawDataDir.slice(2))
+        : rawDataDir;
     const apiKeyHash = resolveApiKeyHash(file.apiKeyHash, get('BOOMBOT_API_KEY'));
     const channels = mergeChannelEnv(parseChannels(file.channels, configPath), get);
     const reasoningGuard = {

package/dist/gateway/turns/session-adapter.js

@@ -84,6 +84,7 @@ function toChatMessage(m) {
         ...(metadata?.toolCalls !== undefined ? { toolCalls: metadata.toolCalls } : {}),
         ...(metadata?.toolCallId !== undefined ? { toolCallId: metadata.toolCallId } : {}),
         ...(metadata?.toolName !== undefined ? { name: metadata.toolName } : {}),
+        ...(metadata?.reasoning !== undefined ? { reasoning: metadata.reasoning } : {}),
     };
 }
 /**
@@ -105,6 +106,9 @@ function toSessionMetadata(message) {
     if (message.name !== undefined && message.name !== '') {
         metadata.toolName = message.name;
     }
+    if (message.reasoning !== undefined && message.reasoning !== '') {
+        metadata.reasoning = message.reasoning;
+    }
     return Object.keys(metadata).length > 0 ? metadata : undefined;
 }
 function boundedContext(messages, alreadyOmitted = 0) {

package/dist/node_modules/@boombot/core/agent-core/turn-loop.js

@@ -174,6 +174,7 @@ async function modelRound(deps, messages, tools, emit, signal) {
     checkCancelled(signal);
     let text = '';
     let reasoning = '';
+    let inThinkTag = false;
     const usage = { inputTokens: 0, outputTokens: 0 };
     const accumulators = new Map();
     const order = [];
@@ -188,8 +189,43 @@ async function modelRound(deps, messages, tools, emit, signal) {
             }
         }
         if (chunk.delta) {
-            text += chunk.delta;
-            emit({ type: 'text.delta', text: chunk.delta });
+            let remaining = chunk.delta;
+            while (remaining.length > 0) {
+                if (inThinkTag) {
+                    const closeIdx = remaining.indexOf('</think>');
+                    if (closeIdx !== -1) {
+                        const thinkPart = remaining.slice(0, closeIdx);
+                        remaining = remaining.slice(closeIdx + '</think>'.length);
+                        inThinkTag = false;
+                        if (thinkPart) {
+                            reasoning += thinkPart;
+                            emit({ type: 'reasoning.delta', text: thinkPart });
+                        }
+                    }
+                    else {
+                        reasoning += remaining;
+                        emit({ type: 'reasoning.delta', text: remaining });
+                        remaining = '';
+                    }
+                }
+                else {
+                    const openIdx = remaining.indexOf('<think>');
+                    if (openIdx !== -1) {
+                        const textPart = remaining.slice(0, openIdx);
+                        remaining = remaining.slice(openIdx + '<think>'.length);
+                        inThinkTag = true;
+                        if (textPart) {
+                            text += textPart;
+                            emit({ type: 'text.delta', text: textPart });
+                        }
+                    }
+                    else {
+                        text += remaining;
+                        emit({ type: 'text.delta', text: remaining });
+                        remaining = '';
+                    }
+                }
+            }
         }
         if (chunk.reasoningDelta) {
             reasoning += chunk.reasoningDelta;
@@ -244,15 +280,15 @@ async function modelRound(deps, messages, tools, emit, signal) {
             arguments: parsed,
         });
     }
-    // Fallback: If model emitted thinking/reasoning but no content tokens or tool calls,
-    // salvage reasoning as response text instead of failing with empty response.
-    const finalText = text.trim() ? text : (calls.length ? '' : reasoning.trim());
+    const finalText = text.trim();
+    const trimmedReasoning = reasoning.trim();
     const assistantMessage = {
         role: 'assistant',
         content: finalText,
+        ...(trimmedReasoning ? { reasoning: trimmedReasoning } : {}),
         ...(calls.length > 0 ? { toolCalls: calls } : {}),
     };
-    return { text: finalText, toolCalls: calls, assistantMessage, usage };
+    return { text: finalText, reasoning: trimmedReasoning || undefined, toolCalls: calls, assistantMessage, usage };
 }
 async function executeToolBatch(deps, batch, emit, signal) {
     const results = [];
@@ -431,6 +467,7 @@ export async function runTurn(deps, context, onEvent, signal) {
         let emptyRecoveryPending = false;
         let emptyRecoveryUsed = false;
         let contextRetryUsed = false;
+        let lastRoundReasoning;
         while (rounds < maxRounds) {
             checkCancelled(signal);
             rounds++;
@@ -440,7 +477,10 @@ export async function runTurn(deps, context, onEvent, signal) {
             const requestMessages = () => {
                 const prepared = [...modelMessages];
                 if (recoverEmpty) {
-                    prepared.push({ role: 'user', content: `[Lưu ý hệ thống: ${EMPTY_RESPONSE_NUDGE}]` });
+                    const nudge = lastRoundReasoning
+                        ? 'Bạn đã hoàn thành phần suy luận nhưng chưa sinh nội dung câu trả lời cho người dùng. Hãy đưa ra câu trả lời trực tiếp và chi tiết cho người dùng ngay bây giờ bằng tiếng Việt, không lặp lại phần suy luận và không gọi công cụ.'
+                        : EMPTY_RESPONSE_NUDGE;
+                    prepared.push({ role: 'user', content: `[Lưu ý hệ thống: ${nudge}]` });
                 }
                 if (answerOnly) {
                     prepared.push({
@@ -469,8 +509,36 @@ export async function runTurn(deps, context, onEvent, signal) {
                 if (!emptyRecoveryUsed && rounds < maxRounds) {
                     emptyRecoveryUsed = true;
                     emptyRecoveryPending = true;
+                    lastRoundReasoning = model.reasoning;
                     continue;
                 }
+                // Force one final synthesis round without tools if reasoning exists
+                if (model.reasoning && rounds < maxRounds) {
+                    try {
+                        const forceMessages = [
+                            ...modelMessages,
+                            {
+                                role: 'user',
+                                content: 'Hãy tổng hợp và đưa ra câu trả lời trực tiếp, đầy đủ cho người dùng ngay bây giờ dựa trên các suy luận ở trên bằng tiếng Việt. Không gọi thêm công cụ.',
+                            },
+                        ];
+                        const finalModel = await execPhase('modelRound', () => modelRound(deps, forceMessages, [], emit, signal));
+                        const finalText = finalModel.text.trim();
+                        if (finalText) {
+                            const finalMsg = {
+                                role: 'assistant',
+                                content: finalText,
+                                ...(model.reasoning ? { reasoning: model.reasoning } : {}),
+                            };
+                            messages.push(finalMsg);
+                            modelMessages.push(finalMsg);
+                            break;
+                        }
+                    }
+                    catch {
+                        // fall through to error
+                    }
+                }
                 const result = await finish('error', 'model returned an empty response');
                 emit({ type: 'turn.end', result });
                 return result;

package/dist/node_modules/@boombot/core/agent-core/types.d.ts

@@ -21,6 +21,8 @@ export type MessageRole = 'system' | 'user' | 'assistant' | 'tool';
 export interface ChatMessage {
     readonly role: MessageRole;
     readonly content: string;
+    /** Optional reasoning/thinking output from reasoning models or thinking blocks. */
+    readonly reasoning?: string;
     /** Optional image references for multimodal user messages. */
     readonly images?: readonly {
         readonly url: string;
@@ -123,6 +125,7 @@ export type EventHandler = (event: AgentEvent) => void;
 /** Phase payloads consumed by gateway middleware after Python returns them. */
 export interface ModelRoundResult {
     readonly text: string;
+    readonly reasoning?: string;
     readonly toolCalls: readonly ToolCall[];
     readonly assistantMessage: ChatMessage;
 }