termux-dev 1.4.12 → 1.4.14

package/assets/banner.svg

@@ -25,7 +25,7 @@
 
   <!-- Tagline & Badge -->
   <text x="425" y="142" font-family="system-ui, -apple-system, sans-serif" font-size="14" font-weight="600" fill="#8b949e" text-anchor="middle" letter-spacing="3">
-    THE TERMINAL-NATIVE AI CODING AGENT <tspan fill="#00f2fe" font-weight="bold">v1.4.12</tspan>
+    THE TERMINAL-NATIVE AI CODING AGENT <tspan fill="#00f2fe" font-weight="bold">v1.4.14</tspan>
   </text>
 
   <!-- Top Accent Line -->

package/dist/cli/clipboard.js

@@ -4,6 +4,15 @@ import path from 'path';
 import os from 'os';
 import { exec } from 'child_process';
 const MEDIA_DIR = path.join(process.cwd(), '.devx', 'media');
+export function expandHomePath(p) {
+    if (!p)
+        return p;
+    const trimmed = p.trim().replace(/^['"]|['"]$/g, '');
+    if (trimmed === '~' || trimmed.startsWith('~/') || trimmed.startsWith('~\\')) {
+        return path.join(os.homedir(), trimmed.slice(2));
+    }
+    return trimmed;
+}
 export function formatFileSize(bytes) {
     if (bytes < 1024)
         return `${bytes}b`;
@@ -107,7 +116,7 @@ if ($img -ne $null) {
     });
 }
 export async function processPastedFilePath(rawPath, existingNames) {
-    const cleanPath = rawPath.trim().replace(/^['"&]+|['"]+$/g, '').trim();
+    const cleanPath = expandHomePath(rawPath).trim().replace(/^['"&]+|['"]+$/g, '').trim();
     const resolved = path.resolve(process.cwd(), cleanPath);
     const imageExts = new Set(['.png', '.jpg', '.jpeg', '.webp', '.gif', '.svg', '.bmp']);
     const ext = path.extname(resolved).toLowerCase();

package/dist/cli/doctor.js

@@ -18,7 +18,7 @@ async function pingUrl(url) {
         const req = https.get(url, {
             timeout: 3000,
             headers: {
-                'User-Agent': 'devx-doctor/1.4.12'
+                'User-Agent': 'devx-doctor/1.4.14'
             }
         }, (res) => {
             res.resume(); // consume response data to free up memory and release socket

package/dist/cli/files.js

@@ -58,7 +58,7 @@ const IMAGE_EXTS = {
     '.svg': 'image/svg+xml'
 };
 export async function resolveAtMentions(text) {
-    const mentionRegex = /@([a-zA-Z0-9_\-./]+)/g;
+    const mentionRegex = /@([a-zA-Z0-9_\-./\u0400-\u04FF]+)/g;
     const attachments = [];
     const images = [];
     const seenPaths = new Set();

package/dist/cli/headless.js

@@ -35,7 +35,7 @@ export async function runHeadlessMode(userPrompt, config, options = {}) {
     });
     try {
         if (!isQuiet && !isJson) {
-            console.log(pc.bold(pc.cyan(`⚡ devx v1.4.12 (headless) | ${planMode ? 'PLAN' : 'AGENT'} | ${config.model}`)));
+            console.log(pc.bold(pc.cyan(`⚡ devx v1.4.14 (headless) | ${planMode ? 'PLAN' : 'AGENT'} | ${config.model}`)));
             console.log(pc.dim(`Task: ${userPrompt}\n`));
         }
         for await (const event of agent.run(abortController.signal)) {

package/dist/cli/index.js

@@ -16,7 +16,7 @@ import { CLIConsoleGuard } from '../permissions/guard.js';
 import { globalSnapshotManager } from '../core/snapshot.js';
 import { MemoryManager } from '../core/memory.js';
 import { startServer, stopServer, displayServerBanner } from './server.js';
-import { notifyDevice } from '../core/notify.js';
+import { notifyDevice, acquireWakeLock } from '../core/notify.js';
 import { runDoctor } from './doctor.js';
 import { ALL_PROVIDERS } from './providers.js';
 import { getModelContextLimit } from '../core/models.js';
@@ -484,7 +484,7 @@ function drawLogo() {
             theme.colorFn('  █▀▀▄ █▀▀▀ █   █ █   █'),
             theme.colorFn('  █  █ █▀▀▀  ▀▄▀   ▀▄▀ '),
             theme.colorFn('  █▄▄▀ █▄▄▄   ▀    ▀ ▀ '),
-            '  ' + theme.boldFn('v1.4.12'),
+            '  ' + theme.boldFn('v1.4.14'),
             ''
         ];
         for (const line of logo) {
@@ -499,7 +499,7 @@ function drawLogo() {
             indent + theme.colorFn('▀▀▀█▀▀▀ █▀▀▀ █▀▀█ █▄ ▄█ █  █ ▀▄ ▄▀    █▀▀▄ █▀▀▀ █   █'),
             indent + theme.colorFn('   █    █▀▀▀ █▄▄▀ █ █ █ █  █   █   ▀▀ █  █ █▀▀▀ █   █'),
             indent + theme.colorFn('   █    █▄▄▄ █ ▀▄ █   █ ▀▄▄▀ ▄▀ ▀▄    █▄▄▀ █▄▄▄  ▀▄▀ '),
-            indent + theme.boldFn('v1.4.12'),
+            indent + theme.boldFn('v1.4.14'),
             ''
         ];
         for (const line of logo) {
@@ -645,7 +645,7 @@ async function handleSettings(config) {
             const maxIterLabel = maxIter >= 9999 ? 'Unlimited' : `${maxIter} steps`;
             const currentTh = getCurrentTheme();
             const choice = await select({
-                message: `${pc.bold('⚙️  Settings')} ${pc.dim(`(devx v1.4.12 • theme: ${currentTh.name})`)}`,
+                message: `${pc.bold('⚙️  Settings')} ${pc.dim(`(devx v1.4.14 • theme: ${currentTh.name})`)}`,
                 choices: [
                     {
                         name: `🎨 Color Theme: ${currentTh.emoji} ${currentTh.name}`,
@@ -686,7 +686,7 @@ async function handleSettings(config) {
                         description: 'Limit how many tool steps (file edits, terminal commands) agent can do per request'
                     },
                     {
-                        name: `${currentTh.colorFn('✨ About devx')} ${pc.dim('(v1.4.12 by ApvCode)')}`,
+                        name: `${currentTh.colorFn('✨ About devx')} ${pc.dim('(v1.4.14 by ApvCode)')}`,
                         value: 'about',
                         description: 'Terminal-Native AI Coding Agent created by ApvCode (https://github.com/apvcode/Termux-Dev)'
                     },
@@ -702,7 +702,7 @@ async function handleSettings(config) {
                 continue;
             }
             if (choice === 'about') {
-                p.note(`⚡ devx v1.4.12 — Terminal-Native AI Coding Agent\n` +
+                p.note(`⚡ devx v1.4.14 — Terminal-Native AI Coding Agent\n` +
                     `🎨 Theme: ${currentTh.emoji} ${currentTh.name}\n` +
                     `👤 Author: ApvCode (https://github.com/apvcode)\n` +
                     `🌟 Repository: https://github.com/apvcode/Termux-Dev\n` +
@@ -767,11 +767,38 @@ async function handleSettings(config) {
     return config;
 }
 export async function main() {
+    // === Termux / Android Stability: Global Signal Handlers ===
+    // Ignore SIGHUP so the process survives when Termux is minimized
+    if (process.platform !== 'win32') {
+        process.on('SIGHUP', () => {
+            // Termux minimized or window lost focus — keep process alive
+        });
+    }
+    // Graceful shutdown on SIGTERM (closing Termux tab / kill command)
+    process.on('SIGTERM', () => {
+        try {
+            resetTerminalTheme();
+            MCPManager.getInstance().stopAll();
+        }
+        catch { }
+        process.exit(0);
+    });
+    // Protect against crash on background I/O errors (EIO/EPIPE/ERR_STREAM_DESTROYED)
+    process.on('uncaughtException', (err) => {
+        const isIgnorableIo = err.code === 'EIO' || err.code === 'EPIPE' || err.code === 'ERR_STREAM_DESTROYED';
+        if (isIgnorableIo)
+            return;
+        console.error('\n[devx runtime error]:', err.message);
+    });
+    process.on('unhandledRejection', (reason) => {
+        // Prevent Node.js crash from unhandled network promise rejections
+    });
+    acquireWakeLock();
     const program = new Command();
     program
         .name('devx')
         .description('Terminal-native AI coding assistant and vibe-coding agent')
-        .version('1.4.12')
+        .version('1.4.14')
         .option('-p, --prompt <task>', 'Run one-shot task non-interactively (headless mode)')
         .option('-y, --yolo', 'Automatically approve all tool executions without confirmation')
         .option('-m, --model <model>', 'Specify AI model to use for this execution')

package/dist/cli/prompt.js

@@ -69,6 +69,9 @@ export function askPrompt(opts = {}) {
             process.stdin.setRawMode(true);
             process.stdout.write('\x1b[?2004h'); // Enable bracketed paste mode
         }
+        const onResize = () => { if (!disposed)
+            render(); };
+        process.stdout.on('resize', onResize);
         function getTagSpans() {
             const spans = [];
             const regex = /\[(?:Pasted text #\d+ \+\d+ lines|\d+\.png \d+kb)\]/g;
@@ -79,7 +82,7 @@ export function askPrompt(opts = {}) {
             return spans;
         }
         function formatInputWithBadges(str) {
-            return str.replace(/(\[(?:Pasted text #\d+ \+\d+ lines|\d+\.png \d+kb)\])/g, (match) => theme.badgeFn(` ${match.slice(1, -1)} `));
+            return str.replace(/(\[(?:Pasted text #\d+ \+\d+ lines|\d+\.png \d+kb)\])/g, (match) => theme.badgeFn(` ${match.slice(1, -1)} `) + '\x1b[0m');
         }
         function expandPastes(text) {
             let expanded = text;
@@ -95,13 +98,11 @@ export function askPrompt(opts = {}) {
             const trimmed = text.trim();
             const lines = trimmed.split(/\r\n|\r|\n/);
             if (lines.length <= 1 && text.length < 80) {
-                // Short paste: insert normally
                 input = input.slice(0, cursorPos) + text + input.slice(cursorPos);
                 cursorPos += text.length;
                 render();
                 return;
             }
-            // Check if pasted text is an image path
             if (trimmed.match(/\.(png|jpe?g|webp|gif|bmp)$/i)) {
                 processPastedFilePath(trimmed, usedImageNames)
                     .then((imgRes) => {
@@ -130,7 +131,6 @@ export function askPrompt(opts = {}) {
             render();
         }
         function getDropdownItems() {
-            // 1. Slash commands dropdown (when input starts with /)
             if (input.startsWith('/')) {
                 const q = input.trim().toLowerCase();
                 const baseList = [
@@ -146,9 +146,8 @@ export function askPrompt(opts = {}) {
                     replaceLen: input.length
                 }));
             }
-            // 2. @ file mention autocomplete
             const beforeCursor = input.slice(0, cursorPos);
-            const atMatch = beforeCursor.match(/@([a-zA-Z0-9_\-./]*)$/);
+            const atMatch = beforeCursor.match(/@([a-zA-Z0-9_\-./\u0400-\u04FF]*)$/);
             if (atMatch && availableFiles.length > 0) {
                 const query = atMatch[1].toLowerCase();
                 const replaceStart = cursorPos - atMatch[0].length;
@@ -179,7 +178,7 @@ export function askPrompt(opts = {}) {
                 if (selectedIndex < 0)
                     selectedIndex = 0;
                 const pageSize = Math.min(4, Math.max(2, Math.floor(rows / 4)));
-                const innerBoxWidth = Math.max(14, Math.min(cols - 6, 50));
+                const innerBoxWidth = Math.max(10, Math.min(cols - 8, 48));
                 const total = items.length;
                 let startIndex = 0;
                 if (total > pageSize) {
@@ -200,47 +199,42 @@ export function askPrompt(opts = {}) {
                     const mid = Math.max(0, Math.floor(innerBoxWidth / 2) - 2);
                     botBorderStr = '─'.repeat(mid) + ' ▼ ' + '─'.repeat(Math.max(0, innerBoxWidth - mid - 3));
                 }
-                dropdownLines.push(pc.dim('│') + '  ' + pc.dim('╭' + topBorderStr + '╮'));
+                dropdownLines.push(pc.dim('│') + '  ' + pc.dim('╭' + topBorderStr + '╮') + '\x1b[0m');
                 for (let i = startIndex; i < endIndex; i++) {
                     const item = items[i];
                     const isSelected = i === selectedIndex;
                     const pointer = isSelected ? '› ' : '  ';
-                    const availWidth = innerBoxWidth - 2;
+                    const availWidth = innerBoxWidth;
                     let row = '';
-                    if (availWidth < 22) {
-                        const labelStr = item.label.length > availWidth
-                            ? item.label.slice(0, availWidth - 1) + '…'
-                            : item.label.padEnd(availWidth);
-                        const plain = pointer + labelStr;
-                        row = isSelected ? theme.badgeFn(plain) : pointer + theme.boldFn(labelStr);
+                    if (availWidth < 20) {
+                        const labelStr = item.label.length > availWidth - 2
+                            ? item.label.slice(0, availWidth - 3) + '…'
+                            : item.label.padEnd(availWidth - 2, ' ');
+                        const plain = (pointer + labelStr).padEnd(availWidth, ' ').slice(0, availWidth);
+                        row = isSelected
+                            ? theme.badgeFn(plain) + '\x1b[0m'
+                            : pointer + theme.boldFn(labelStr) + '\x1b[0m';
                     }
                     else {
-                        const labelMax = Math.min(14, Math.floor(availWidth * 0.42));
+                        const labelMax = Math.min(13, Math.max(6, Math.floor(availWidth * 0.35)));
                         const labelStr = item.label.length > labelMax
                             ? item.label.slice(0, labelMax - 1) + '…'
-                            : item.label.padEnd(labelMax);
-                        const descMax = availWidth - labelMax - 1;
+                            : item.label.padEnd(labelMax, ' ');
+                        const descMax = Math.max(4, availWidth - labelMax - pointer.length - 1);
                         const descStr = item.desc.length > descMax
                             ? item.desc.slice(0, descMax - 1) + '…'
-                            : item.desc.padEnd(descMax);
-                        const plain = `${pointer}${labelStr} ${descStr}`;
+                            : item.desc.padEnd(descMax, ' ');
+                        const plain = (pointer + labelStr + ' ' + descStr).padEnd(availWidth, ' ').slice(0, availWidth);
                         if (isSelected) {
-                            row = theme.badgeFn(plain);
+                            row = theme.badgeFn(plain) + '\x1b[0m';
                         }
                         else {
-                            row = `${pointer}${theme.boldFn(labelStr)} ${pc.gray(descStr)}`;
+                            row = `${pointer}${theme.boldFn(labelStr)} ${pc.gray(descStr)}\x1b[0m`;
                         }
                     }
-                    const currentLen = stripAnsi(row).length;
-                    if (currentLen < innerBoxWidth) {
-                        row += ' '.repeat(innerBoxWidth - currentLen);
-                    }
-                    else if (currentLen > innerBoxWidth) {
-                        row = row.slice(0, innerBoxWidth);
-                    }
-                    dropdownLines.push(pc.dim('│') + '  ' + pc.dim('│') + row + pc.dim('│'));
+                    dropdownLines.push(pc.dim('│') + '  ' + pc.dim('│') + row + pc.dim('│') + '\x1b[0m');
                 }
-                dropdownLines.push(pc.dim('│') + '  ' + pc.dim('╰' + botBorderStr + '╯'));
+                dropdownLines.push(pc.dim('│') + '  ' + pc.dim('╰' + botBorderStr + '╯') + '\x1b[0m');
             }
             // 1. Format and write the Prompt line safely (guaranteed <= cols - 1 chars)
             let inputDisplay = pc.dim('│') + '  ';
@@ -248,13 +242,13 @@ export function askPrompt(opts = {}) {
             if (input.length === 0) {
                 const maxPlace = Math.max(10, cols - 6);
                 const displayPlace = placeholder.length > maxPlace ? placeholder.slice(0, maxPlace - 1) + '…' : placeholder;
-                inputDisplay += pc.dim(displayPlace);
+                inputDisplay += pc.dim(displayPlace) + '\x1b[0m';
                 renderCursorCol = 3;
             }
             else {
                 const maxInputLen = Math.max(10, cols - 6);
                 if (input.length <= maxInputLen) {
-                    inputDisplay += formatInputWithBadges(input);
+                    inputDisplay += formatInputWithBadges(input) + '\x1b[0m';
                     renderCursorCol = 3 + cursorPos;
                 }
                 else {
@@ -263,24 +257,24 @@ export function askPrompt(opts = {}) {
                     const visibleChunk = input.slice(start, start + maxInputLen);
                     const prefix = start > 0 ? '…' : '';
                     const suffix = start + maxInputLen < input.length ? '…' : '';
-                    inputDisplay += pc.dim(prefix) + formatInputWithBadges(visibleChunk) + pc.dim(suffix);
+                    inputDisplay += pc.dim(prefix) + formatInputWithBadges(visibleChunk) + pc.dim(suffix) + '\x1b[0m';
                     renderCursorCol = 3 + (prefix ? 1 : 0) + (cursorPos - start);
                 }
             }
-            process.stdout.write(`\r\x1b[2K${inputDisplay}`);
+            process.stdout.write(`\x1b[0m\r\x1b[2K${inputDisplay}\x1b[0m`);
             // 2. Draw dropdown lines below, and clear extra lines from previous render
             const maxDropdowns = Math.max(dropdownLines.length, lastRenderedDropdownLines);
             if (maxDropdowns > 0) {
                 for (let i = 0; i < maxDropdowns; i++) {
                     if (i < dropdownLines.length) {
-                        process.stdout.write(`\n\x1b[2K${dropdownLines[i]}`);
+                        process.stdout.write(`\n\x1b[0m\x1b[2K${dropdownLines[i]}\x1b[0m`);
                     }
                     else {
-                        process.stdout.write(`\n\x1b[2K`);
+                        process.stdout.write(`\n\x1b[0m\x1b[2K`);
                     }
                 }
                 // Move cursor back up to input line (line 0)
-                process.stdout.write(`\x1b[${maxDropdowns}A`);
+                process.stdout.write(`\x1b[0m\x1b[${maxDropdowns}A`);
             }
             // 3. Place cursor precisely
             process.stdout.write(`\r\x1b[${renderCursorCol}C`);
@@ -292,6 +286,7 @@ export function askPrompt(opts = {}) {
             if (process.stdout.isTTY) {
                 process.stdout.write('\x1b[?2004l');
             }
+            process.stdout.removeListener('resize', onResize);
             process.stdin.removeListener('data', onData);
             if (process.stdin.isTTY) {
                 process.stdin.setRawMode(false);
@@ -301,9 +296,9 @@ export function askPrompt(opts = {}) {
         function clearBoxAndExit(finalInput) {
             if (lastRenderedDropdownLines > 0) {
                 for (let i = 0; i < lastRenderedDropdownLines; i++) {
-                    process.stdout.write(`\n\x1b[2K`);
+                    process.stdout.write(`\n\x1b[0m\x1b[2K`);
                 }
-                process.stdout.write(`\x1b[${lastRenderedDropdownLines}A`);
+                process.stdout.write(`\x1b[0m\x1b[${lastRenderedDropdownLines}A`);
                 lastRenderedDropdownLines = 0;
             }
             const fullText = expandPastes(finalInput);
@@ -313,7 +308,7 @@ export function askPrompt(opts = {}) {
                     GLOBAL_PROMPT_HISTORY.push(fullText.trim());
                 }
             }
-            process.stdout.write(`\r\x1b[2K${pc.dim('│')}  ${formatInputWithBadges(finalInput)}\n\n`);
+            process.stdout.write(`\x1b[0m\r\x1b[2K${pc.dim('│')}  ${formatInputWithBadges(finalInput)}\x1b[0m\n\n`);
             cleanup();
             resolve(fullText);
         }
@@ -359,12 +354,12 @@ export function askPrompt(opts = {}) {
             if (str === '\x03') {
                 if (lastRenderedDropdownLines > 0) {
                     for (let i = 0; i < lastRenderedDropdownLines; i++) {
-                        process.stdout.write(`\n\x1b[2K`);
+                        process.stdout.write(`\n\x1b[0m\x1b[2K`);
                     }
-                    process.stdout.write(`\x1b[${lastRenderedDropdownLines}A`);
+                    process.stdout.write(`\x1b[0m\x1b[${lastRenderedDropdownLines}A`);
                     lastRenderedDropdownLines = 0;
                 }
-                process.stdout.write(`\r\x1b[2K\n`);
+                process.stdout.write(`\x1b[0m\r\x1b[2K\n`);
                 cleanup();
                 resolve('__CANCEL__');
                 return;
@@ -396,7 +391,7 @@ export function askPrompt(opts = {}) {
                             render();
                         }
                         else {
-                            process.stdout.write(`\r\x1b[2K${pc.yellow('⚠️  No image in clipboard. Take a screenshot first (Win+Shift+S)\n')}`);
+                            process.stdout.write(`\x1b[0m\r\x1b[2K${pc.yellow('⚠️  No image in clipboard. Take a screenshot first (Win+Shift+S)\n')}`);
                             input = '';
                             cursorPos = 0;
                             render();
@@ -440,12 +435,12 @@ export function askPrompt(opts = {}) {
                 else {
                     if (lastRenderedDropdownLines > 0) {
                         for (let i = 0; i < lastRenderedDropdownLines; i++) {
-                            process.stdout.write(`\n\x1b[2K`);
+                            process.stdout.write(`\n\x1b[0m\x1b[2K`);
                         }
-                        process.stdout.write(`\x1b[${lastRenderedDropdownLines}A`);
+                        process.stdout.write(`\x1b[0m\x1b[${lastRenderedDropdownLines}A`);
                         lastRenderedDropdownLines = 0;
                     }
-                    process.stdout.write(`\r\x1b[2K`);
+                    process.stdout.write(`\x1b[0m\r\x1b[2K`);
                     cleanup();
                     resolve(`__TOGGLE_MODE__:${input}`);
                 }
@@ -551,7 +546,7 @@ export function askPrompt(opts = {}) {
                 }
                 return;
             }
-            // Backspace / DEL handling (including Android IME chunks)
+            // Backspace / DEL handling
             if (str.includes('\x08') || str.includes('\x7f')) {
                 for (let i = 0; i < str.length; i++) {
                     const ch = str[i];
@@ -564,8 +559,11 @@ export function askPrompt(opts = {}) {
                                 cursorPos = endingSpan.start;
                             }
                             else {
-                                input = input.slice(0, cursorPos - 1) + input.slice(cursorPos);
-                                cursorPos--;
+                                // Handle surrogate pairs (emoji)
+                                const prevChar = input.charCodeAt(cursorPos - 1);
+                                const deleteCount = (prevChar >= 0xDC00 && prevChar <= 0xDFFF && cursorPos >= 2) ? 2 : 1;
+                                input = input.slice(0, cursorPos - deleteCount) + input.slice(cursorPos);
+                                cursorPos -= deleteCount;
                             }
                         }
                     }

package/dist/cli/server.js

@@ -139,7 +139,7 @@ function renderDirectoryHtml(dirPath, relPath, files, port) {
       ${parentLink}
       ${items || '<li style="padding: 20px; text-align: center; color: #6e7681;">No visible files in this directory</li>'}
     </ul>
-    <div class="footer">devx v1.4.12 &bull; Terminal-Native AI Assistant</div>
+    <div class="footer">devx v1.4.14 &bull; Terminal-Native AI Assistant</div>
   </div>
 </body>
 </html>`;
@@ -224,15 +224,18 @@ export async function startServer(preferredPort = 3000) {
                     return;
                 }
                 // 4. SPA Fallback: check if root index.html exists
-                const rootIndex = path.join(cwd, 'index.html');
-                if (fsSync.existsSync(rootIndex)) {
-                    const content = await fs.readFile(rootIndex);
-                    res.writeHead(200, {
-                        'Content-Type': 'text/html; charset=utf-8',
-                        'Access-Control-Allow-Origin': '*'
-                    });
-                    res.end(content);
-                    return;
+                const hasAssetExt = path.extname(reqPath).length > 0;
+                if (!hasAssetExt) {
+                    const rootIndex = path.join(cwd, 'index.html');
+                    if (fsSync.existsSync(rootIndex)) {
+                        const content = await fs.readFile(rootIndex);
+                        res.writeHead(200, {
+                            'Content-Type': 'text/html; charset=utf-8',
+                            'Access-Control-Allow-Origin': '*'
+                        });
+                        res.end(content);
+                        return;
+                    }
                 }
                 res.writeHead(404, { 'Content-Type': 'text/plain; charset=utf-8' });
                 res.end(`404 Not Found: ${reqPath}`);

package/dist/cli/theme.js

@@ -8,7 +8,7 @@ export const THEMES = {
         colorFn: (s) => pc.cyan(s),
         boldFn: (s) => pc.bold(pc.cyan(s)),
         accentFn: (s) => pc.blue(s),
-        badgeFn: (s) => pc.bgCyan(pc.black(` ${s} `)),
+        badgeFn: (s) => pc.bgCyan(pc.black(s)),
         diffAddBg: (s) => pc.bgCyan(pc.black(s)),
         diffRemoveBg: (s) => pc.bgBlue(pc.white(s)),
         hex: '#00f2fe'
@@ -21,7 +21,7 @@ export const THEMES = {
         colorFn: (s) => pc.magenta(s),
         boldFn: (s) => pc.bold(pc.magenta(s)),
         accentFn: (s) => pc.blue(s),
-        badgeFn: (s) => pc.bgMagenta(pc.black(` ${s} `)),
+        badgeFn: (s) => pc.bgMagenta(pc.black(s)),
         diffAddBg: (s) => pc.bgMagenta(pc.black(s)),
         diffRemoveBg: (s) => pc.bgBlue(pc.white(s)),
         hex: '#d946ef'
@@ -34,7 +34,7 @@ export const THEMES = {
         colorFn: (s) => pc.green(s),
         boldFn: (s) => pc.bold(pc.green(s)),
         accentFn: (s) => pc.cyan(s),
-        badgeFn: (s) => pc.bgGreen(pc.black(` ${s} `)),
+        badgeFn: (s) => pc.bgGreen(pc.black(s)),
         diffAddBg: (s) => pc.bgGreen(pc.black(s)),
         diffRemoveBg: (s) => pc.bgRed(pc.white(s)),
         hex: '#22c55e'
@@ -47,7 +47,7 @@ export const THEMES = {
         colorFn: (s) => pc.yellow(s),
         boldFn: (s) => pc.bold(pc.yellow(s)),
         accentFn: (s) => pc.red(s),
-        badgeFn: (s) => pc.bgYellow(pc.black(` ${s} `)),
+        badgeFn: (s) => pc.bgYellow(pc.black(s)),
         diffAddBg: (s) => pc.bgYellow(pc.black(s)),
         diffRemoveBg: (s) => pc.bgRed(pc.white(s)),
         hex: '#f59e0b'
@@ -60,7 +60,7 @@ export const THEMES = {
         colorFn: (s) => pc.red(s),
         boldFn: (s) => pc.bold(pc.red(s)),
         accentFn: (s) => pc.magenta(s),
-        badgeFn: (s) => pc.bgRed(pc.white(` ${s} `)),
+        badgeFn: (s) => pc.bgRed(pc.white(s)),
         diffAddBg: (s) => pc.bgRed(pc.white(s)),
         diffRemoveBg: (s) => pc.bgMagenta(pc.white(s)),
         hex: '#ef4444'
@@ -73,7 +73,7 @@ export const THEMES = {
         colorFn: (s) => pc.white(s),
         boldFn: (s) => pc.bold(pc.white(s)),
         accentFn: (s) => pc.dim(s),
-        badgeFn: (s) => pc.bgWhite(pc.black(` ${s} `)),
+        badgeFn: (s) => pc.bgWhite(pc.black(s)),
         diffAddBg: (s) => pc.bgWhite(pc.black(s)),
         diffRemoveBg: (s) => pc.bgBlack(pc.white(s)),
         hex: '#ffffff'

package/dist/core/commands.js

@@ -69,7 +69,7 @@ export class CustomCommandManager {
         // Support positional parameters: $1, $2, etc.
         const parts = trimmedArgs.split(/\s+/);
         for (let i = 0; i < parts.length; i++) {
-            expanded = expanded.replace(new RegExp(`\\$${i + 1}`, 'g'), () => parts[i]);
+            expanded = expanded.replace(new RegExp(`\\$${i + 1}(?!\\d)`, 'g'), () => parts[i]);
         }
         return expanded;
     }

package/dist/core/history.js

@@ -36,18 +36,36 @@ export class History {
         const chatOnly = this.messages.filter(m => m.role !== 'system');
         return this.estimateTokens(chatOnly);
     }
-    // Эвристика: кол-во токенов = длина всех строк / 3.5
     estimateTokens(messages) {
-        let chars = 0;
+        let tokens = 0;
+        const countStringTokens = (str) => {
+            if (!str)
+                return 0;
+            let t = 0;
+            for (let i = 0; i < str.length; i++) {
+                const code = str.charCodeAt(i);
+                if (code >= 0x0400 && code <= 0x04FF) {
+                    t += 0.8;
+                }
+                else if (code > 0x07FF) {
+                    t += 1.2;
+                }
+                else {
+                    t += 0.25;
+                }
+            }
+            return t;
+        };
         for (const m of messages) {
-            chars += m.content?.length || 0;
+            tokens += countStringTokens(m.content || '');
             if (m.tool_calls) {
                 for (const tc of m.tool_calls) {
-                    chars += (tc.name.length + JSON.stringify(tc.arguments).length);
+                    tokens += countStringTokens(tc.name);
+                    tokens += countStringTokens(JSON.stringify(tc.arguments));
                 }
             }
         }
-        return Math.ceil(chars / 3.5);
+        return Math.ceil(tokens);
     }
     groupIntoBlocks(messages) {
         const blocks = [];

package/dist/core/loop.js

@@ -159,8 +159,20 @@ export class Agent {
             if (!response.toolCalls || response.toolCalls.length === 0) {
                 break;
             }
+            const executedToolCallIds = new Set();
             for (const call of response.toolCalls) {
                 if (signal?.aborted) {
+                    // Add synthetic responses for ALL remaining unexecuted tool calls
+                    for (const remaining of response.toolCalls) {
+                        if (!executedToolCallIds.has(remaining.id)) {
+                            this.history.addMessage({
+                                role: 'tool',
+                                content: '[Operation cancelled by user]',
+                                tool_call_id: remaining.id,
+                                name: remaining.name,
+                            });
+                        }
+                    }
                     return;
                 }
                 const actionDesc = getActionDescription(call.name, call.arguments);
@@ -197,6 +209,7 @@ export class Agent {
                     tool_call_id: call.id,
                     name: call.name,
                 });
+                executedToolCallIds.add(call.id);
             }
             iterations++;
         }