@taj-special/dravix-code 1.1.24 → 1.1.26

package/dist/cli/repl.js

@@ -2117,9 +2117,34 @@ 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
+
+### Creating files
+- NEVER show code in code blocks when the user asks to create files or a project.
+- ALWAYS use <write_file path="filename"> tags to create actual files.
+- Code blocks are for short explanations only — they do NOT create files.
+- Output ALL required files in ONE response using <write_file> tags.
+
+### 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();
@@ -2196,8 +2221,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;
@@ -2435,6 +2460,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));
@@ -2510,11 +2545,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.`,
+                                    });
+                                }
                             }
                         }
                     }
@@ -2738,24 +2779,28 @@ export async function startRepl(cwd) {
                     }
                     const allOps = parseOps(normalized);
                     // ── Detect incomplete plan: AI described steps but didn't output tags ──
-                    // Pattern: response has numbered items like "2. something" or "3. something"
-                    // but very few actual file operation tags were output → force continuation
                     if (!readFileContinue && !streamCancelled) {
                         const hasAnyReadOp = allOps.some(op => op.type === 'read_file' || op.type === 'read_folder' || op.type === 'search_code');
                         const writeOps = allOps.filter(op => op.type !== 'read_file' && op.type !== 'read_folder' && op.type !== 'search_code').length;
                         const plannedSteps = (normalized.match(/^\s*[2-9]\.\s+\S/mg) ?? []).length;
-                        // AI described a plan (numbered steps 2+) but did nothing at all — force execution
+                        const hasCodeFence = normalized.includes('```');
+                        const hasStepList = (normalized.match(/^\s*\d+[.)]\s+\S/mg) ?? []).length >= 2;
+                        // Case 1: AI listed numbered steps (2+) but produced zero file ops
                         if (plannedSteps >= 1 && writeOps === 0 && !hasAnyReadOp) {
-                            history.push({ role: 'system', content: 'You described the steps but did not output any tags. Output the actual <edit_file> or <write_file> tags NOW to apply the changes. No explanation — just the tags.' });
+                            history.push({ role: 'system', content: 'CRITICAL ERROR: You described steps but produced NO file operation tags. You MUST output <write_file> or <edit_file> tags to create/modify actual files. Do NOT show code in ``` blocks — use <write_file path="filename"> tags instead. Output all the tags NOW. No explanation.' });
+                            readFileContinue = true;
+                            // Case 2: AI showed code blocks + numbered list but no tags — regardless of language
+                        }
+                        else if (hasCodeFence && hasStepList && writeOps === 0 && allOps.length === 0) {
+                            history.push({ role: 'system', content: 'CRITICAL ERROR: You are showing code in ``` blocks instead of using <write_file> tags. This is wrong. ``` blocks do NOT create files — only <write_file> tags create files. Replace every ``` code block with a <write_file path="filename"> tag and output ALL files now.' });
                             readFileContinue = true;
-                            // AI gave a non-trivial response with zero operations of any kind
+                            // Case 3: Long response with code blocks but zero file ops — catch any language
                         }
-                        else if (writeOps === 0 && allOps.length === 0 && normalized.trim().length > 200) {
-                            const hasCodeFence = normalized.includes('```');
-                            const hasStepList = (normalized.match(/^\s*\d+[.)]\s+\S/mg) ?? []).length >= 2;
+                        else if (hasCodeFence && writeOps === 0 && allOps.length === 0 && normalized.trim().length > 400) {
                             const hasWouldNeed = /(?:should|would need to|need to|you(?:'d)? need to|we(?:'d)? need to)\s+(?:edit|modify|update|change|create|add|remove)/i.test(normalized);
-                            if ((hasCodeFence || hasStepList) && hasWouldNeed) {
-                                history.push({ role: 'system', content: 'You explained what to do but did not output any tags. Apply the changes NOW using <edit_file> or <write_file> tags. Do not re-explain — just output the tags.' });
+                            const looksLikeFileDump = normalized.split('```').length > 3; // 2+ code blocks
+                            if (hasWouldNeed || looksLikeFileDump) {
+                                history.push({ role: 'system', content: 'CRITICAL ERROR: You showed code in ``` blocks instead of using <write_file> tags. ``` blocks are for explanations only — they do NOT create actual files. Output all files using <write_file path="..."> tags RIGHT NOW. No text, no explanation — only tags.' });
                                 readFileContinue = true;
                             }
                         }

package/package.json

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