@taj-special/dravix-code 1.1.23 → 1.1.25

package/dist/cli/index.js

@@ -265,6 +265,7 @@ async function main() {
     console.log(colors.muted('  Project ') + W(path.basename(cwd)));
     console.log(colors.muted('  Path    ') + DIM(cwd));
     console.log(DIM('  ' + '─'.repeat(45)));
+    console.log(colors.muted('  ') + C('Tab') + colors.muted(' path complete  ') + C('@') + colors.muted(' file picker  ') + C('Ctrl+C') + colors.muted(' cancel  ') + C('/help') + colors.muted(' commands'));
     process.stdout.write('\n');
     await startRepl(cwd);
 }

package/dist/cli/repl.js

@@ -10,7 +10,6 @@ import { printOpResult, printError, printInfo, colors } from '../utils/display.j
 import { saveConversation, loadConversation, listConversations, generateTitle, generateId } from '../services/conversations.js';
 import { getToken } from '../services/auth.js';
 import { checkUsage, reportUsage, estimateTokens, usageBar, fmtNum, formatResetTime } from '../services/usage.js';
-import { ChatLayout } from '../utils/layout.js';
 let _serverWebDesignerSkill = '';
 const SPINNER_FRAMES = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
 const SLASH_COMMANDS = [
@@ -835,14 +834,11 @@ async function askPermission(label, key, alwaysAllowed, noAlways, diffShown, pre
         process.stdin.on('data', onData);
     });
 }
-const HINT_TEXT = (C) => colors.muted('  ') + C('Tab') + colors.muted(' path complete  ') +
-    C('@') + colors.muted(' file picker  ') +
-    C('Ctrl+C') + colors.muted(' cancel  ') +
-    C('/help') + colors.muted(' commands');
-async function readLine(prompt, cwd, layout) {
-    const C = chalk.hex('#818cf8');
-    layout.drawHint(HINT_TEXT(C));
-    layout.posInput(prompt);
+async function readLine(prompt, cwd) {
+    let SEP = colors.dim('  ' + '─'.repeat(Math.max((process.stdout.columns ?? 80) - 4, 40)));
+    let sepVisualLen = 2 + Math.max((process.stdout.columns ?? 80) - 4, 40);
+    process.stdout.write('\n' + SEP + '\n' + prompt);
+    process.stdout.write('\r\n' + SEP + '\x1b[1A\r' + prompt);
     return new Promise((resolve) => {
         let prefix = '';
         let pasteBlock = null;
@@ -870,25 +866,41 @@ async function readLine(prompt, cwd, layout) {
         let tabDrawn = false;
         let tabPreWord = ''; // prefix text before the tab-completed token
         function onResize() {
-            layout.resize();
+            const newCols = process.stdout.columns ?? 80;
+            const oldSepRows = Math.ceil(sepVisualLen / newCols);
+            SEP = colors.dim('  ' + '─'.repeat(Math.max(newCols - 4, 40)));
+            sepVisualLen = 2 + Math.max(newCols - 4, 40);
             if (atMode) {
+                for (let i = 0; i < atBoxLines + 3; i++)
+                    process.stdout.write('\x1b[1A');
+                process.stdout.write('\r\x1b[0J');
                 atDrawn = false;
                 atBoxLines = 0;
                 drawPicker();
             }
             else if (slashMode) {
+                for (let i = 0; i < slashBoxLines + 3; i++)
+                    process.stdout.write('\x1b[1A');
+                process.stdout.write('\r\x1b[0J');
                 slashDrawn = false;
                 slashBoxLines = 0;
                 drawSlashPicker();
             }
             else if (tabMode) {
+                for (let i = 0; i < tabBoxLines + 3; i++)
+                    process.stdout.write('\x1b[1A');
+                process.stdout.write('\r\x1b[0J');
                 tabDrawn = false;
                 tabBoxLines = 0;
                 drawTabPicker();
             }
             else {
+                process.stdout.write('\r\x1b[K');
+                process.stdout.write('\x1b[1B\x1b[2K\x1b[1A');
+                for (let i = 0; i < oldSepRows + 1; i++)
+                    process.stdout.write('\x1b[1A\x1b[2K');
+                process.stdout.write('\n' + SEP + '\n');
                 redraw();
-                layout.drawHint(HINT_TEXT(C));
             }
         }
         process.stdout.on('resize', onResize);
@@ -957,37 +969,35 @@ async function readLine(prompt, cwd, layout) {
         //                 then \x1b[2A\x1b[2K to skip bot-sep and clear input
         let atDrawn = false;
         function drawPicker() {
+            if (atDrawn) {
+                for (let i = 0; i < atBoxLines; i++)
+                    process.stdout.write('\x1b[1A\x1b[2K');
+                process.stdout.write('\x1b[2A\x1b[2K');
+            }
+            else {
+                process.stdout.write('\r\x1b[K');
+                atDrawn = true;
+            }
+            atBoxLines = 0;
+            const inputLine = colors.primary('  › ') + chalk.white(prefix) +
+                (pasteBlock !== null ? colors.muted(`[paste: ${pasteCount} lines]`) + chalk.white(suffix) : '') +
+                chalk.hex('#818cf8')('@') + chalk.white(atQuery);
+            process.stdout.write(inputLine + '\r\n' + SEP + '\r\n');
+            const DW = Math.min(Math.max((process.stdout.columns ?? 80) - 6, 44), 72);
+            const IW = DW - 6;
             const filtered = filterFiles(atQuery);
             if (atSel >= filtered.length && filtered.length > 0)
                 atSel = filtered.length - 1;
             const shown = filtered.slice(0, 10);
-            const DW = Math.min(Math.max(layout.cols - 6, 44), 72);
-            const IW = DW - 6;
-            const itemCount = Math.max(shown.length, 1);
-            atBoxLines = itemCount + 2; // header + items/no-match + footer
-            const totalRows = 2 + atBoxLines; // input preview + blank + box
-            const startRow = Math.max(layout.divRow - totalRows, 1);
-            process.stdout.write('\x1b7'); // save cursor at inputRow
-            // Input preview
-            const inputLine = colors.primary('  › ') + chalk.white(prefix) +
-                (pasteBlock !== null ? colors.muted(`[paste: ${pasteCount} lines]`) + chalk.white(suffix) : '') +
-                chalk.hex('#818cf8')('@') + chalk.white(atQuery);
-            process.stdout.write(`\x1b[${startRow};1H\x1b[2K${inputLine}`);
-            process.stdout.write(`\x1b[${startRow + 1};1H\x1b[2K`); // blank separator
-            let row = startRow + 2;
-            // Header
             const qLabel = atQuery ? `@${atQuery}` : 'files';
             const hDashes = Math.max(DW - 5 - qLabel.length, 1);
-            process.stdout.write(`\x1b[${row};1H\x1b[2K` +
-                colors.dim('  ╭─ ') + colors.primary(qLabel) + colors.dim(' ' + '─'.repeat(hDashes) + '╮'));
-            row++;
-            // Items
+            process.stdout.write(colors.dim('  ╭─ ') + colors.primary(qLabel) + colors.dim(' ' + '─'.repeat(hDashes) + '╮') + '\n');
+            atBoxLines++;
             if (shown.length === 0) {
                 const msg = 'no matches';
                 const pad = ' '.repeat(Math.max(IW - msg.length, 0));
-                process.stdout.write(`\x1b[${row};1H\x1b[2K` +
-                    colors.dim('  │') + '    ' + colors.muted(msg) + pad + colors.dim('│'));
-                row++;
+                process.stdout.write(colors.dim('  │') + '    ' + colors.muted(msg) + pad + colors.dim('│') + '\n');
+                atBoxLines++;
             }
             else {
                 for (let i = 0; i < shown.length; i++) {
@@ -1001,66 +1011,60 @@ async function readLine(prompt, cwd, layout) {
                         : sel ? colors.primary.bold(clip) + pad
                             : isDir ? chalk.hex('#38bdf8')(clip) + pad
                                 : chalk.hex('#94a3b8')(clip + pad);
-                    process.stdout.write(`\x1b[${row};1H\x1b[2K` +
-                        colors.dim('  │') + `  ${mark} ` + name + colors.dim('│'));
-                    row++;
+                    process.stdout.write(colors.dim('  │') + `  ${mark} ` + name + colors.dim('│') + '\n');
+                    atBoxLines++;
                 }
             }
-            // Footer
             const hint = ' ↑↓  Enter  Esc ';
             const fInner = DW - 2 - hint.length;
             const fLeft = Math.floor(fInner / 2);
             const fRight = fInner - fLeft;
-            process.stdout.write(`\x1b[${row};1H\x1b[2K` +
-                colors.dim('  ╰' + '─'.repeat(Math.max(fLeft, 0))) +
-                colors.muted(hint) +
-                colors.dim('─'.repeat(Math.max(fRight, 0)) + '╯'));
-            atDrawn = true;
-            process.stdout.write('\x1b8'); // restore cursor to inputRow
+            process.stdout.write(colors.dim('  ╰' + '─'.repeat(Math.max(fLeft, 0))) + colors.muted(hint) + colors.dim('─'.repeat(Math.max(fRight, 0)) + '╯') + '\n');
+            atBoxLines++;
         }
         function closePicker() {
             if (atDrawn) {
-                const totalRows = 2 + atBoxLines;
-                const startRow = Math.max(layout.divRow - totalRows, 1);
-                process.stdout.write('\x1b7');
-                for (let r = startRow; r < layout.divRow; r++) {
-                    process.stdout.write(`\x1b[${r};1H\x1b[2K`);
-                }
-                process.stdout.write('\x1b8');
+                for (let i = 0; i < atBoxLines; i++)
+                    process.stdout.write('\x1b[1A\x1b[2K');
+                process.stdout.write('\x1b[2A\x1b[2K');
                 atDrawn = false;
             }
+            else {
+                process.stdout.write('\r\x1b[K');
+            }
             atBoxLines = 0;
             atMode = false;
             atQuery = '';
             atSel = 0;
         }
         function drawSlashPicker() {
+            if (slashDrawn) {
+                for (let i = 0; i < slashBoxLines; i++)
+                    process.stdout.write('\x1b[1A\x1b[2K');
+                process.stdout.write('\x1b[2A\x1b[2K');
+            }
+            else {
+                process.stdout.write('\r\x1b[K');
+                slashDrawn = true;
+            }
+            slashBoxLines = 0;
+            const inputLine = colors.primary('  › ') + colors.primary('/') + chalk.white(slashQuery);
+            process.stdout.write(inputLine + '\r\n' + SEP + '\r\n');
+            const DW = Math.min(Math.max((process.stdout.columns ?? 80) - 6, 44), 72);
+            const nameW = 10;
+            const descW = DW - nameW - 8;
             const filtered = filterSlash(slashQuery);
             if (slashSel >= filtered.length && filtered.length > 0)
                 slashSel = filtered.length - 1;
-            const DW = Math.min(Math.max(layout.cols - 6, 44), 72);
-            const nameW = 10;
-            const descW = DW - nameW - 8;
-            const itemCount = Math.max(filtered.length, 1);
-            slashBoxLines = itemCount + 2;
-            const totalRows = 2 + slashBoxLines;
-            const startRow = Math.max(layout.divRow - totalRows, 1);
-            process.stdout.write('\x1b7');
-            const inputLine = colors.primary('  › ') + colors.primary('/') + chalk.white(slashQuery);
-            process.stdout.write(`\x1b[${startRow};1H\x1b[2K${inputLine}`);
-            process.stdout.write(`\x1b[${startRow + 1};1H\x1b[2K`);
-            let row = startRow + 2;
             const qLabel = slashQuery ? `/${slashQuery}` : 'commands';
             const hDashes = Math.max(DW - 5 - qLabel.length, 1);
-            process.stdout.write(`\x1b[${row};1H\x1b[2K` +
-                colors.dim('  ╭─ ') + colors.primary(qLabel) + colors.dim(' ' + '─'.repeat(hDashes) + '╮'));
-            row++;
+            process.stdout.write(colors.dim('  ╭─ ') + colors.primary(qLabel) + colors.dim(' ' + '─'.repeat(hDashes) + '╮') + '\n');
+            slashBoxLines++;
             if (filtered.length === 0) {
                 const msg = 'no matching commands';
                 const pad = ' '.repeat(Math.max(DW - 4 - msg.length, 0));
-                process.stdout.write(`\x1b[${row};1H\x1b[2K` +
-                    colors.dim('  │') + '    ' + colors.muted(msg) + pad + colors.dim('│'));
-                row++;
+                process.stdout.write(colors.dim('  │') + '    ' + colors.muted(msg) + pad + colors.dim('│') + '\n');
+                slashBoxLines++;
             }
             else {
                 for (let i = 0; i < filtered.length; i++) {
@@ -1072,66 +1076,61 @@ async function readLine(prompt, cwd, layout) {
                     const descPad = ' '.repeat(Math.max(descW - descStr.length, 0));
                     const namePaint = sel ? colors.primary.bold(nameStr) : chalk.hex('#818cf8')(nameStr);
                     const descPaint = sel ? colors.muted(descStr) : chalk.hex('#4b5563')(descStr);
-                    process.stdout.write(`\x1b[${row};1H\x1b[2K` +
-                        colors.dim('  │') + `  ${mark} ` + namePaint + '  ' + descPaint + descPad + colors.dim('│'));
-                    row++;
+                    process.stdout.write(colors.dim('  │') + `  ${mark} ` + namePaint + '  ' + descPaint + descPad + colors.dim('│') + '\n');
+                    slashBoxLines++;
                 }
             }
             const hint = ' ↑↓  Enter  Esc ';
             const fInner = DW - 2 - hint.length;
             const fLeft = Math.floor(fInner / 2);
             const fRight = fInner - fLeft;
-            process.stdout.write(`\x1b[${row};1H\x1b[2K` +
-                colors.dim('  ╰' + '─'.repeat(Math.max(fLeft, 0))) +
-                colors.muted(hint) +
-                colors.dim('─'.repeat(Math.max(fRight, 0)) + '╯'));
-            slashDrawn = true;
-            process.stdout.write('\x1b8');
+            process.stdout.write(colors.dim('  ╰' + '─'.repeat(Math.max(fLeft, 0))) + colors.muted(hint) + colors.dim('─'.repeat(Math.max(fRight, 0)) + '╯') + '\n');
+            slashBoxLines++;
         }
         function closeSlashPicker() {
             if (slashDrawn) {
-                const totalRows = 2 + slashBoxLines;
-                const startRow = Math.max(layout.divRow - totalRows, 1);
-                process.stdout.write('\x1b7');
-                for (let r = startRow; r < layout.divRow; r++) {
-                    process.stdout.write(`\x1b[${r};1H\x1b[2K`);
-                }
-                process.stdout.write('\x1b8');
+                for (let i = 0; i < slashBoxLines; i++)
+                    process.stdout.write('\x1b[1A\x1b[2K');
+                process.stdout.write('\x1b[2A\x1b[2K');
                 slashDrawn = false;
             }
+            else {
+                process.stdout.write('\r\x1b[K');
+            }
             slashBoxLines = 0;
             slashMode = false;
             slashQuery = '';
             slashSel = 0;
         }
         function drawTabPicker() {
+            if (tabDrawn) {
+                for (let i = 0; i < tabBoxLines; i++)
+                    process.stdout.write('\x1b[1A\x1b[2K');
+                process.stdout.write('\x1b[2A\x1b[2K');
+            }
+            else {
+                process.stdout.write('\r\x1b[K');
+                tabDrawn = true;
+            }
+            tabBoxLines = 0;
+            const TC = chalk.hex('#34d399');
+            const inputLine = colors.primary('  › ') + chalk.white(tabPreWord) + TC(tabQuery);
+            process.stdout.write(inputLine + '\r\n' + SEP + '\r\n');
+            const DW = Math.min(Math.max((process.stdout.columns ?? 80) - 6, 44), 72);
+            const IW = DW - 6;
             const filtered = filterFiles(tabQuery);
             if (tabSel >= filtered.length && filtered.length > 0)
                 tabSel = filtered.length - 1;
             const shown = filtered.slice(0, 10);
-            const DW = Math.min(Math.max(layout.cols - 6, 44), 72);
-            const IW = DW - 6;
-            const TC = chalk.hex('#34d399');
-            const itemCount = Math.max(shown.length, 1);
-            tabBoxLines = itemCount + 2;
-            const totalRows = 2 + tabBoxLines;
-            const startRow = Math.max(layout.divRow - totalRows, 1);
-            process.stdout.write('\x1b7');
-            const inputLine = colors.primary('  › ') + chalk.white(tabPreWord) + TC(tabQuery);
-            process.stdout.write(`\x1b[${startRow};1H\x1b[2K${inputLine}`);
-            process.stdout.write(`\x1b[${startRow + 1};1H\x1b[2K`);
-            let row = startRow + 2;
             const qLabel = tabQuery || 'tab complete';
             const hDashes = Math.max(DW - 5 - qLabel.length, 1);
-            process.stdout.write(`\x1b[${row};1H\x1b[2K` +
-                colors.dim('  ╭─ ') + TC(qLabel) + colors.dim(' ' + '─'.repeat(hDashes) + '╮'));
-            row++;
+            process.stdout.write(colors.dim('  ╭─ ') + TC(qLabel) + colors.dim(' ' + '─'.repeat(hDashes) + '╮') + '\n');
+            tabBoxLines++;
             if (shown.length === 0) {
                 const msg = 'no matches';
                 const pad = ' '.repeat(Math.max(IW - msg.length, 0));
-                process.stdout.write(`\x1b[${row};1H\x1b[2K` +
-                    colors.dim('  │') + '    ' + colors.muted(msg) + pad + colors.dim('│'));
-                row++;
+                process.stdout.write(colors.dim('  │') + '    ' + colors.muted(msg) + pad + colors.dim('│') + '\n');
+                tabBoxLines++;
             }
             else {
                 for (let i = 0; i < shown.length; i++) {
@@ -1144,33 +1143,27 @@ async function readLine(prompt, cwd, layout) {
                     const name = sel ? TC.bold(clip) + pad
                         : isDir ? chalk.hex('#38bdf8')(clip) + pad
                             : chalk.hex('#94a3b8')(clip + pad);
-                    process.stdout.write(`\x1b[${row};1H\x1b[2K` +
-                        colors.dim('  │') + `  ${mark} ` + name + colors.dim('│'));
-                    row++;
+                    process.stdout.write(colors.dim('  │') + `  ${mark} ` + name + colors.dim('│') + '\n');
+                    tabBoxLines++;
                 }
             }
             const hint = ' Tab/↑↓  Enter  Esc ';
             const fInner = DW - 2 - hint.length;
             const fLeft = Math.floor(fInner / 2);
             const fRight = fInner - fLeft;
-            process.stdout.write(`\x1b[${row};1H\x1b[2K` +
-                colors.dim('  ╰' + '─'.repeat(Math.max(fLeft, 0))) +
-                colors.muted(hint) +
-                colors.dim('─'.repeat(Math.max(fRight, 0)) + '╯'));
-            tabDrawn = true;
-            process.stdout.write('\x1b8');
+            process.stdout.write(colors.dim('  ╰' + '─'.repeat(Math.max(fLeft, 0))) + colors.muted(hint) + colors.dim('─'.repeat(Math.max(fRight, 0)) + '╯') + '\n');
+            tabBoxLines++;
         }
         function closeTabPicker() {
             if (tabDrawn) {
-                const totalRows = 2 + tabBoxLines;
-                const startRow = Math.max(layout.divRow - totalRows, 1);
-                process.stdout.write('\x1b7');
-                for (let r = startRow; r < layout.divRow; r++) {
-                    process.stdout.write(`\x1b[${r};1H\x1b[2K`);
-                }
-                process.stdout.write('\x1b8');
+                for (let i = 0; i < tabBoxLines; i++)
+                    process.stdout.write('\x1b[1A\x1b[2K');
+                process.stdout.write('\x1b[2A\x1b[2K');
                 tabDrawn = false;
             }
+            else {
+                process.stdout.write('\r\x1b[K');
+            }
             tabBoxLines = 0;
             tabMode = false;
             tabQuery = '';
@@ -1178,7 +1171,7 @@ async function readLine(prompt, cwd, layout) {
             tabPreWord = '';
         }
         function redraw() {
-            const cols = layout.cols;
+            const cols = process.stdout.columns ?? 80;
             const maxLen = Math.max(cols - 6, 10);
             let displayPre = prefix;
             if (displayPre.length > maxLen)
@@ -1191,7 +1184,8 @@ async function readLine(prompt, cwd, layout) {
             else {
                 inp = colors.primary('  › ') + chalk.white(displayPre);
             }
-            process.stdout.write(`\x1b[${layout.inputRow};1H\x1b[2K${inp}`);
+            process.stdout.write('\r\x1b[K' + inp);
+            process.stdout.write('\r\n' + SEP + '\x1b[1A\r' + inp);
         }
         function submit() {
             if (atMode)
@@ -1210,15 +1204,14 @@ async function readLine(prompt, cwd, layout) {
             const text = parts.join('\n');
             const lns = parts.length > 0 ? parts : (text ? [text] : []);
             cleanup();
-            // Clear the fixed input area
-            layout.clearInput();
+            process.stdout.write('\r\x1b[K');
+            process.stdout.write('\x1b[1B\x1b[2K');
+            process.stdout.write('\x1b[2A\x1b[2K');
             if (!text) {
                 resolve(null);
                 return;
             }
-            // Move into the chat scroll region and print the user message
-            layout.enterChat();
-            const cols = layout.cols;
+            const cols = process.stdout.columns ?? 80;
             const msgBg = chalk.bgHex('#334155').hex('#f1f5f9');
             const fillMsg = (raw) => ('  > ' + raw + ' ').padEnd(cols);
             if (pasteBlock !== null) {
@@ -1227,10 +1220,10 @@ async function readLine(prompt, cwd, layout) {
                     `[${pasteCount} lines]`,
                     suffix.trim() ? suffix.trim() : '',
                 ].filter(Boolean).join(' ');
-                process.stdout.write('\n' + msgBg(fillMsg(disp)) + '\n');
+                process.stdout.write(msgBg(fillMsg(disp)) + '\n');
             }
             else {
-                process.stdout.write('\n' + msgBg(fillMsg(text)) + '\n');
+                process.stdout.write(msgBg(fillMsg(text)) + '\n');
             }
             resolve({ text, lines: lns });
         }
@@ -1283,7 +1276,7 @@ async function readLine(prompt, cwd, layout) {
                     resolve(null);
                     return;
                 }
-                // Ctrl+L — clear chat area, reinit layout
+                // Ctrl+L — clear screen, redraw input
                 if (data === '\x0c') {
                     if (atMode)
                         closePicker();
@@ -1291,10 +1284,9 @@ async function readLine(prompt, cwd, layout) {
                         closeSlashPicker();
                     if (tabMode)
                         closeTabPicker();
-                    layout.clearScrollRegion();
-                    layout.redrawDivider();
-                    layout.drawHint(HINT_TEXT(C));
-                    layout.posInput(prompt);
+                    console.clear();
+                    process.stdout.write('\n' + SEP + '\n' + prompt);
+                    process.stdout.write('\r\n' + SEP + '\x1b[1A\r' + prompt);
                     return;
                 }
                 // ── @ picker mode ─────────────────────────────────────────
@@ -2125,9 +2117,28 @@ export async function startRepl(cwd) {
     }
     // activeCwd can change when /resume loads a conversation from a different directory
     let activeCwd = cwd;
+    // Rules appended to every system prompt to enforce safe file-operation behavior
+    const SAFE_FILE_RULES = `
+
+## CRITICAL RULES — Follow these on every response
+
+### File operations
+- **write_file** = CREATE only. Use it ONLY when a file does NOT exist yet.
+- **edit_file** = MODIFY existing files. For ANY change to an existing file, always use edit_file with <find>/<replace>.
+- Before editing any file: use <read_file> to see its current content first.
+- NEVER overwrite an existing file with write_file — it destroys user code.
+
+### Scope
+- Only touch files the user explicitly mentioned or that are clearly required by the task.
+- If the user says "create X" and X already exists: STOP and ask — "I see X already exists at [path]. Do you want me to (a) modify it, or (b) create a new file?"
+- Do NOT restructure, rename, or "improve" anything that wasn't asked.
+
+### When unsure
+- Ask ONE short clarifying question before writing any code.
+- Better to ask than to guess wrong and destroy existing work.`;
     const buildSystemMsg = (dir) => ({
         role: 'system',
-        content: SYSTEM_PROMPT + '\n\nProject context:\n' + buildContext(dir),
+        content: SYSTEM_PROMPT + SAFE_FILE_RULES + '\n\nProject context:\n' + buildContext(dir),
     });
     const history = [buildSystemMsg(activeCwd)];
     let sessionId = generateId();
@@ -2176,10 +2187,6 @@ export async function startRepl(cwd) {
     process.stdin.setRawMode(true);
     process.stdin.resume();
     process.stdin.setEncoding('utf8');
-    // Initialize sticky-bottom layout (scroll region + fixed input bar)
-    const layout = new ChatLayout();
-    layout.init();
-    process.on('exit', () => layout.cleanup());
     // Sequential loop — queued input lets user type during AI stream
     while (true) {
         try {
@@ -2208,8 +2215,8 @@ export async function startRepl(cwd) {
                     userReminder = `The user's request: "${display}". `;
                 }
                 const taskInstruction = userReminder
-                    ? `The user's exact request was: "${rawUserMsg.slice(0, 300)}"\nNow execute THIS request and ONLY this request — nothing else. Do not invent, add, or change anything the user did not ask for. Use the file content above to find the exact text and apply the change.`
-                    : `Execute the user's request using the file content above.`;
+                    ? `The user's exact request was: "${rawUserMsg.slice(0, 300)}"\nNow execute THIS request and ONLY this request — nothing else. Do not invent, add, or change anything the user did not ask for. Use <edit_file> with targeted <find>/<replace> — never use <write_file> on existing files. Use the file content above to find the exact text and apply the change.`
+                    : `Execute the user's request using the file content above. Use <edit_file> for existing files, <write_file> only for new files.`;
                 // Keep using FLASH_MODEL after file reads
                 if (readFileTurnCount > 5 && !forcedEditMode) {
                     forcedEditMode = true;
@@ -2239,14 +2246,13 @@ export async function startRepl(cwd) {
                 const q = queuedResult;
                 queuedResult = null;
                 result = q;
-                // Show queued message inside scroll region
-                layout.enterChat();
+                // Show queued message as if just submitted
                 const cols = process.stdout.columns ?? 80;
                 const msgBgQ = chalk.bgHex('#334155').hex('#f1f5f9');
-                process.stdout.write('\n' + msgBgQ(('  > ' + q.text + ' ').padEnd(cols)) + '\n');
+                process.stdout.write(msgBgQ(('  > ' + q.text + ' ').padEnd(cols)) + '\n');
             }
             else {
-                result = await readLine(PROMPT, activeCwd, layout);
+                result = await readLine(PROMPT, activeCwd);
             }
             if (!result)
                 continue;
@@ -2255,12 +2261,7 @@ export async function startRepl(cwd) {
                 lastUserLine = line;
             // ── Slash commands ──────────────────────────────────────────
             if (!skipInput && line.trim() === '/resume') {
-                // Temporarily reset scroll region so picker can use full terminal with relative cursor movement
-                process.stdout.write('\x1b[r');
                 const convId = await showConversationPicker();
-                // Restore scroll region + fixed rows
-                layout.resize();
-                layout.enterChat();
                 if (convId) {
                     const conv = loadConversation(convId);
                     if (conv) {
@@ -2300,8 +2301,6 @@ export async function startRepl(cwd) {
                     if (lastUserLine)
                         queuedResult = { text: lastUserLine, lines: [lastUserLine] };
                 });
-                // Re-establish scroll region after /clear (console.clear) or other commands
-                layout.resize();
                 continue;
             }
             if (!skipInput) {
@@ -2455,6 +2454,16 @@ export async function startRepl(cwd) {
                         executedInlineOps.add(inlineOpFingerprint(op));
                     }
                     else {
+                        // Track existing file size to detect write_file overwrites of existing code
+                        let existingLineCount = 0;
+                        if (op.type === 'write' && op.path) {
+                            try {
+                                const fp = path.resolve(activeCwd, op.path);
+                                if (fs.existsSync(fp))
+                                    existingLineCount = fs.readFileSync(fp, 'utf-8').split('\n').length;
+                            }
+                            catch { /* ignore */ }
+                        }
                         const previewLines = (op.type === 'write' || op.type === 'edit') ? printDiffPreview(op, activeCwd) : 0;
                         const allowed = await askPermission(label, key, alwaysAllowed, op.type === 'run', previewLines > 0, previewLines);
                         executedInlineOps.add(inlineOpFingerprint(op));
@@ -2530,11 +2539,17 @@ export async function startRepl(cwd) {
                             else if ((opResult.type === 'modified' || opResult.type === 'created') && op.path &&
                                 (op.type === 'edit' || op.type === 'write')) {
                                 // After a successful edit, inject a note so AI knows the file changed
-                                // This prevents subsequent <edit_file> ops from using stale <find> text
                                 history.push({
                                     role: 'system',
-                                    content: `[File updated] ${op.path} was just modified by a previous operation in this response. If you have more edits for this file, use <read_file path="${op.path}"/> first to get the current content before using <edit_file>, or use <write_file> with the complete new content.`,
+                                    content: `[File updated] ${op.path} was just modified. For further edits to this file, use <read_file path="${op.path}"/> first to get the current content, then <edit_file> with targeted changes.`,
                                 });
+                                // Educate AI when it used write_file to overwrite a non-trivial existing file
+                                if (op.type === 'write' && opResult.type === 'modified' && existingLineCount > 20) {
+                                    history.push({
+                                        role: 'system',
+                                        content: `[Rule] You used <write_file> to completely replace ${op.path} (${existingLineCount} lines of existing code). This is wrong. RULE: write_file is ONLY for creating new files. For existing files, always use <edit_file> with <find>/<replace> to make targeted changes. Never overwrite existing code with write_file.`,
+                                    });
+                                }
                             }
                         }
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taj-special/dravix-code",
-  "version": "1.1.23",
+  "version": "1.1.25",
   "description": "AI-powered coding assistant CLI — Dravix Code",
   "type": "module",
   "bin": {