@visorcraft/idlehands 1.1.16 → 1.2.0

package/dist/themes.js

@@ -8,9 +8,9 @@
  * Built-in: default, dark, light, minimal, hacker
  * Custom:   ~/.config/idlehands/themes/<name>.json
  */
-import pc from 'picocolors';
 import fs from 'node:fs/promises';
 import path from 'node:path';
+import pc from 'picocolors';
 import { configDir } from './utils.js';
 // All supported picocolors primitives.
 const PC = {
@@ -31,8 +31,8 @@ const PC = {
 };
 /** Resolve a palette string like "bold+cyan" to a composed function. */
 function resolveColor(spec) {
-    const parts = spec.split('+').map(p => p.trim().toLowerCase());
-    const fns = parts.map(p => PC[p]).filter(Boolean);
+    const parts = spec.split('+').map((p) => p.trim().toLowerCase());
+    const fns = parts.map((p) => PC[p]).filter(Boolean);
     if (fns.length === 0)
         return undefined;
     if (fns.length === 1)
@@ -41,8 +41,14 @@ function resolveColor(spec) {
 }
 /** The default (identity) palette — no remapping. */
 const DEFAULT_PALETTE = {
-    dim: 'dim', bold: 'bold', red: 'red', yellow: 'yellow',
-    green: 'green', cyan: 'cyan', magenta: 'magenta', blue: 'blue',
+    dim: 'dim',
+    bold: 'bold',
+    red: 'red',
+    yellow: 'yellow',
+    green: 'green',
+    cyan: 'cyan',
+    magenta: 'magenta',
+    blue: 'blue',
 };
 const BUILTIN_PALETTES = {
     default: {},

package/dist/themes.js.map

@@ -1 +1 @@
-{"version":3,"file":"themes.js","sourceRoot":"","sources":["../src/themes.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"themes.js","sourceRoot":"","sources":["../src/themes.ts"],"names":[],"mappings":"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"}

package/dist/tools/tool-error.js

@@ -19,10 +19,7 @@ export class ToolError extends Error {
      * Format as a concise tool result content string
      */
     toToolResult() {
-        const lines = [
-            `ERROR: code=${this.code} retryable=${this.retryable}`,
-            `msg=${this.message}`
-        ];
+        const lines = [`ERROR: code=${this.code} retryable=${this.retryable}`, `msg=${this.message}`];
         if (this.hint) {
             lines.push(`hint=${this.hint}`);
         }
@@ -76,7 +73,7 @@ export class ToolError extends Error {
 export class ValidationError extends ToolError {
     errors;
     constructor(errors) {
-        super('invalid_args', `Validation failed: ${errors.map(e => e.message).join('; ')}`, false, undefined, { fields: errors.map(e => e.field) });
+        super('invalid_args', `Validation failed: ${errors.map((e) => e.message).join('; ')}`, false, undefined, { fields: errors.map((e) => e.field) });
         this.errors = errors;
         this.name = 'ValidationError';
     }

package/dist/tools/tool-error.js.map

@@ -1 +1 @@
-{"version":3,"file":"tool-error.js","sourceRoot":"","sources":["../../src/tools/tool-error.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tool-error.js","sourceRoot":"","sources":["../../src/tools/tool-error.ts"],"names":[],"mappings":"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"}

package/dist/tools.js

@@ -279,8 +279,10 @@ export async function undo_path(ctx, args) {
     const p = directPath ? resolvePath(ctx, directPath) : ctx.lastEditedPath;
     if (!p)
         throw new Error('undo: missing path');
+    const absCwd = path.resolve(ctx.cwd);
+    const redactedPath = redactPath(p, absCwd);
     if (!ctx.noConfirm && ctx.confirm) {
-        const ok = await ctx.confirm(`Restore latest backup for:\n  ${p}\nThis will overwrite the current file. Proceed? (y/N) `);
+        const ok = await ctx.confirm(`Restore latest backup for:\n  ${redactedPath}\nThis will overwrite the current file. Proceed? (y/N) `);
         if (!ok)
             return 'undo: cancelled';
     }
@@ -288,11 +290,13 @@ export async function undo_path(ctx, args) {
         throw new Error('undo: confirmation required (run with --no-confirm/--yolo or in interactive mode)');
     }
     if (ctx.dryRun)
-        return `dry-run: would restore latest backup for ${p}`;
+        return `dry-run: would restore latest backup for ${redactedPath}`;
     return await restoreLatestBackup(p, ctx);
 }
 export async function read_file(ctx, args) {
     const p = resolvePath(ctx, args?.path);
+    const absCwd = path.resolve(ctx.cwd);
+    const redactedPath = redactPath(p, absCwd);
     const offset = args?.offset != null ? Number(args.offset) : undefined;
     const rawLimit = args?.limit != null ? Number(args.limit) : undefined;
     const limit = Number.isFinite(rawLimit) && rawLimit > 0
@@ -317,7 +321,7 @@ export async function read_file(ctx, args) {
     try {
         const stat = await fs.stat(p);
         if (stat.isDirectory()) {
-            return `read_file: "${p}" is a directory, not a file. Use list_dir to see its contents, or search_files to find specific code.`;
+            return `read_file: "${redactedPath}" is a directory, not a file. Use list_dir to see its contents, or search_files to find specific code.`;
         }
     }
     catch (e) {
@@ -419,6 +423,8 @@ export async function read_files(ctx, args) {
 }
 export async function write_file(ctx, args) {
     const p = resolvePath(ctx, args?.path);
+    const absCwd = path.resolve(ctx.cwd);
+    const redactedPath = redactPath(p, absCwd);
     // Content may arrive as a string (normal) or as a parsed JSON object
     // (when llama-server's XML parser auto-parses JSON content values).
     const raw = args?.content;
@@ -434,6 +440,7 @@ export async function write_file(ctx, args) {
         throw new Error('write_file: missing path');
     if (content == null)
         throw new Error('write_file: missing content (got ' + typeof raw + ')');
+    const overwrite = Boolean(args?.overwrite ?? args?.force);
     enforceMutationWithinCwd('write_file', p, ctx);
     const cwdWarning = checkCwdWarning('write_file', p, ctx);
     // Path safety check (Phase 9)
@@ -443,7 +450,7 @@ export async function write_file(ctx, args) {
     }
     if (pathVerdict.tier === 'cautious' && !ctx.noConfirm) {
         if (ctx.confirm) {
-            const ok = await ctx.confirm(pathVerdict.prompt || `Write to ${p}?`, { tool: 'write_file', args: { path: p } });
+            const ok = await ctx.confirm(pathVerdict.prompt || `Write to ${redactedPath}?`, { tool: 'write_file', args: { path: p } });
             if (!ok)
                 throw new Error(`write_file: cancelled by user (${pathVerdict.reason})`);
         }
@@ -451,8 +458,15 @@ export async function write_file(ctx, args) {
             throw new Error(`write_file: blocked (${pathVerdict.reason}) without --no-confirm/--yolo`);
         }
     }
-    if (ctx.dryRun)
-        return `dry-run: would write ${p} (${Buffer.byteLength(content, 'utf8')} bytes)${cwdWarning}`;
+    const existingStat = await fs.stat(p).catch(() => null);
+    if (existingStat?.isFile() && existingStat.size > 0 && !overwrite) {
+        throw new Error(`write_file: refusing to overwrite existing non-empty file ${redactedPath} without explicit overwrite=true (or force=true). ` +
+            `Use edit_range/apply_patch for surgical edits, or set overwrite=true for intentional full-file replacement.`);
+    }
+    if (ctx.dryRun) {
+        const mode = existingStat?.isFile() ? (existingStat.size > 0 ? 'overwrite' : 'update-empty') : 'create';
+        return `dry-run: would write ${p} (${Buffer.byteLength(content, 'utf8')} bytes, mode=${mode}${overwrite ? ', explicit-overwrite' : ''})${cwdWarning}`;
+    }
     // Phase 9d: snapshot /etc/ files before editing
     if (ctx.mode === 'sys' && ctx.vault) {
         await snapshotBeforeEdit(ctx.vault, p).catch(() => { });
@@ -463,10 +477,12 @@ export async function write_file(ctx, args) {
     ctx.onMutation?.(p);
     const afterBuf = Buffer.from(content, 'utf8');
     const replayNote = await checkpointReplay(ctx, { op: 'write_file', filePath: p, before: beforeBuf, after: afterBuf });
-    return `wrote ${p} (${Buffer.byteLength(content, 'utf8')} bytes)${replayNote}${cwdWarning}`;
+    return `wrote ${redactedPath} (${Buffer.byteLength(content, 'utf8')} bytes)${replayNote}${cwdWarning}`;
 }
 export async function insert_file(ctx, args) {
     const p = resolvePath(ctx, args?.path);
+    const absCwd = path.resolve(ctx.cwd);
+    const redactedPath = redactPath(p, absCwd);
     const line = Number(args?.line);
     const rawText = args?.text;
     const text = typeof rawText === 'string' ? rawText
@@ -485,7 +501,7 @@ export async function insert_file(ctx, args) {
     }
     if (pathVerdict.tier === 'cautious' && !ctx.noConfirm) {
         if (ctx.confirm) {
-            const ok = await ctx.confirm(pathVerdict.prompt || `Insert into ${p}?`, { tool: 'insert_file', args: { path: p } });
+            const ok = await ctx.confirm(pathVerdict.prompt || `Insert into ${redactedPath}?`, { tool: 'insert_file', args: { path: p } });
             if (!ok)
                 throw new Error(`insert_file: cancelled by user (${pathVerdict.reason})`);
         }
@@ -494,7 +510,7 @@ export async function insert_file(ctx, args) {
         }
     }
     if (ctx.dryRun)
-        return `dry-run: would insert into ${p} at line=${line} (${Buffer.byteLength(text, 'utf8')} bytes)`;
+        return `dry-run: would insert into ${redactedPath} at line=${line} (${Buffer.byteLength(text, 'utf8')} bytes)`;
     // Phase 9d: snapshot /etc/ files before editing
     if (ctx.mode === 'sys' && ctx.vault) {
         await snapshotBeforeEdit(ctx.vault, p).catch(() => { });
@@ -515,7 +531,7 @@ export async function insert_file(ctx, args) {
             after: Buffer.from(out, 'utf8')
         });
         const cwdWarning = checkCwdWarning('insert_file', p, ctx);
-        return `inserted into ${p} at 0${replayNote}${cwdWarning}`;
+        return `inserted into ${redactedPath} at 0${replayNote}${cwdWarning}`;
     }
     const lines = beforeText.split(/\r?\n/);
     let idx;
@@ -544,10 +560,12 @@ export async function insert_file(ctx, args) {
         after: Buffer.from(out, 'utf8')
     });
     const cwdWarning = checkCwdWarning('insert_file', p, ctx);
-    return `inserted into ${p} at ${idx}${replayNote}${cwdWarning}`;
+    return `inserted into ${redactedPath} at ${idx}${replayNote}${cwdWarning}`;
 }
 export async function edit_file(ctx, args) {
     const p = resolvePath(ctx, args?.path);
+    const absCwd = path.resolve(ctx.cwd);
+    const redactedPath = redactPath(p, absCwd);
     const rawOld = args?.old_text;
     const oldText = typeof rawOld === 'string' ? rawOld
         : (rawOld != null && typeof rawOld === 'object' ? JSON.stringify(rawOld, null, 2) : undefined);
@@ -569,7 +587,7 @@ export async function edit_file(ctx, args) {
     }
     if (pathVerdict.tier === 'cautious' && !ctx.noConfirm) {
         if (ctx.confirm) {
-            const ok = await ctx.confirm(pathVerdict.prompt || `Edit ${p}?`, { tool: 'edit_file', args: { path: p, old_text: oldText, new_text: newText } });
+            const ok = await ctx.confirm(pathVerdict.prompt || `Edit ${redactedPath}?`, { tool: 'edit_file', args: { path: p, old_text: oldText, new_text: newText } });
             if (!ok)
                 throw new Error(`edit_file: cancelled by user (${pathVerdict.reason})`);
         }
@@ -582,7 +600,7 @@ export async function edit_file(ctx, args) {
         await snapshotBeforeEdit(ctx.vault, p).catch(() => { });
     }
     const cur = await fs.readFile(p, 'utf8').catch((e) => {
-        throw new Error(`edit_file: cannot read ${p}: ${e?.message ?? String(e)}`);
+        throw new Error(`edit_file: cannot read ${redactedPath}: ${e?.message ?? String(e)}`);
     });
     const idx = cur.indexOf(oldText);
     if (idx === -1) {
@@ -618,11 +636,11 @@ export async function edit_file(ctx, args) {
         else {
             hint = `\nFile head (first 400 chars):\n${cur.slice(0, 400)}`;
         }
-        throw new Error(`edit_file: old_text not found in ${p}. Re-read the file and retry with exact text.${hint}`);
+        throw new Error(`edit_file: old_text not found in ${redactedPath}. Re-read the file and retry with exact text.${hint}`);
     }
     const next = replaceAll ? cur.split(oldText).join(newText) : cur.slice(0, idx) + newText + cur.slice(idx + oldText.length);
     if (ctx.dryRun)
-        return `dry-run: would edit ${p} (replace_all=${replaceAll})`;
+        return `dry-run: would edit ${redactedPath} (replace_all=${replaceAll})`;
     await backupFile(p, ctx);
     await atomicWrite(p, next);
     ctx.onMutation?.(p);
@@ -633,7 +651,7 @@ export async function edit_file(ctx, args) {
         after: Buffer.from(next, 'utf8')
     });
     const cwdWarning = checkCwdWarning('edit_file', p, ctx);
-    return `edited ${p} (replace_all=${replaceAll})${replayNote}${cwdWarning}`;
+    return `edited ${redactedPath} (replace_all=${replaceAll})${replayNote}${cwdWarning}`;
 }
 function normalizePatchPath(p) {
     let s = String(p ?? '').trim();
@@ -766,6 +784,12 @@ export async function edit_range(ctx, args) {
         throw new Error('edit_range: missing/invalid end_line');
     if (replacement == null)
         throw new Error('edit_range: missing replacement (got ' + typeof rawReplacement + ')');
+    const hasLiteralEscapedNewlines = replacement.includes('\\n');
+    const hasRealNewlines = replacement.includes('\n') || replacement.includes('\r');
+    if (hasLiteralEscapedNewlines && !hasRealNewlines) {
+        throw new Error('edit_range: replacement appears double-escaped (contains literal "\\n" sequences). ' +
+            'Resend replacement with REAL newline characters (multi-line string), not escaped backslash-n text.');
+    }
     enforceMutationWithinCwd('edit_range', p, ctx);
     // Path safety check (Phase 9)
     const pathVerdict = checkPathSafety(p);
@@ -877,7 +901,8 @@ export async function apply_patch(ctx, args) {
             if (chk.rc !== 0)
                 throw new Error(`apply_patch: patch --dry-run failed:\n${chk.err || chk.out}`);
         }
-        return `dry-run: patch would apply cleanly (${touched.paths.length} files): ${touched.paths.join(', ')}`;
+        const redactedPaths = touched.paths.map((rel) => redactPath(resolvePath(ctx, rel), path.resolve(ctx.cwd)));
+        return `dry-run: patch would apply cleanly (${touched.paths.length} files): ${redactedPaths.join(', ')}`;
     }
     // Snapshot + backup before applying
     const beforeMap = new Map();
@@ -923,7 +948,8 @@ export async function apply_patch(ctx, args) {
         replayNotes += replayNote;
         cwdWarnings += checkCwdWarning('apply_patch', abs, ctx);
     }
-    return `applied patch (${touched.paths.length} files): ${touched.paths.join(', ')}${replayNotes}${cwdWarnings}`;
+    const redactedPaths = touched.paths.map((rel) => redactPath(resolvePath(ctx, rel), path.resolve(ctx.cwd)));
+    return `applied patch (${touched.paths.length} files): ${redactedPaths.join(', ')}${replayNotes}${cwdWarnings}`;
 }
 export async function list_dir(ctx, args) {
     const p = resolvePath(ctx, args?.path ?? '.');
@@ -931,6 +957,7 @@ export async function list_dir(ctx, args) {
     const maxEntries = Math.min(args?.max_entries ? Number(args.max_entries) : 200, 500);
     if (!p)
         throw new Error('list_dir: missing path');
+    const absCwd = path.resolve(ctx.cwd);
     const lines = [];
     let count = 0;
     async function walk(dir, depth) {
@@ -945,7 +972,7 @@ export async function list_dir(ctx, args) {
             const full = path.join(dir, ent.name);
             const st = await fs.lstat(full).catch(() => null);
             const kind = ent.isDirectory() ? 'dir' : ent.isSymbolicLink() ? 'link' : 'file';
-            lines.push(`${kind}\t${st?.size ?? 0}\t${full}`);
+            lines.push(`${kind}\t${st?.size ?? 0}\t${redactPath(full, absCwd)}`);
             count++;
             if (recursive && ent.isDirectory() && depth < 3) {
                 await walk(full, depth + 1);
@@ -956,7 +983,7 @@ export async function list_dir(ctx, args) {
     if (count >= maxEntries)
         lines.push(`[truncated after ${maxEntries} entries]`);
     if (!lines.length)
-        return `[empty directory: ${p}]`;
+        return `[empty directory: ${redactPath(p, absCwd)}]`;
     return lines.join('\n');
 }
 export async function search_files(ctx, args) {
@@ -968,6 +995,7 @@ export async function search_files(ctx, args) {
         throw new Error('search_files: missing path');
     if (!pattern)
         throw new Error('search_files: missing pattern');
+    const absCwd = path.resolve(ctx.cwd);
     // Prefer rg if available (fast, bounded output)
     if (await hasRg()) {
         const cmd = ['rg', '-n', '--no-heading', '--color', 'never', pattern, root];
@@ -978,7 +1006,7 @@ export async function search_files(ctx, args) {
             const parsed = JSON.parse(rawJson);
             // rg exits 1 when no matches found (not an error), 2+ for real errors.
             if (parsed.rc === 1 && !parsed.out?.trim()) {
-                return `No matches for pattern "${pattern}" in ${root}. STOP — do NOT read files individually to search. Try a broader regex pattern, different keywords, or use exec: grep -rn "keyword" ${root}`;
+                return `No matches for pattern \"${pattern}\" in ${root}. STOP — do NOT read files individually to search. Try a broader regex pattern, different keywords, or use exec: grep -rn \"keyword\" ${root}`;
             }
             if (parsed.rc >= 2) {
                 // Real rg error — fall through to regex fallback below
@@ -989,7 +1017,16 @@ export async function search_files(ctx, args) {
                     const lines = rgOutput.split(/\r?\n/).filter(Boolean).slice(0, maxResults);
                     if (lines.length >= maxResults)
                         lines.push(`[truncated after ${maxResults} results]`);
-                    return lines.join('\n');
+                    // Redact paths in rg output
+                    const redactedLines = lines.map(line => {
+                        const colonIdx = line.indexOf(':');
+                        if (colonIdx === -1)
+                            return line;
+                        const filePath = line.substring(0, colonIdx);
+                        const rest = line.substring(colonIdx + 1);
+                        return redactPath(filePath, absCwd) + ':' + rest;
+                    });
+                    return redactedLines.join('\n');
                 }
             }
         }
@@ -1003,7 +1040,7 @@ export async function search_files(ctx, args) {
         re = new RegExp(pattern);
     }
     catch (e) {
-        throw new ToolError('invalid_args', `search_files: invalid regex pattern: ${e?.message ?? String(e)}`, false, 'Escape regex metacharacters (\\, [, ], (, ), +, *, ?). If you intended literal text, use an escaped/literal pattern.');
+        throw new ToolError('invalid_args', `search_files: invalid regex pattern: ${e?.message ?? String(e)}`, false, 'Escape regex metacharacters (\\\\, [, ], (, ), +, *, ?). If you intended literal text, use an escaped/literal pattern.');
     }
     const out = [];
     async function walk(dir, depth) {
@@ -1042,7 +1079,7 @@ export async function search_files(ctx, args) {
             const lines = buf.split(/\r?\n/);
             for (let i = 0; i < lines.length; i++) {
                 if (re.test(lines[i])) {
-                    out.push(`${full}:${i + 1}:${lines[i]}`);
+                    out.push(`${redactPath(full, absCwd)}:${i + 1}:${lines[i]}`);
                     if (out.length >= maxResults)
                         return;
                 }
@@ -1052,10 +1089,9 @@ export async function search_files(ctx, args) {
     await walk(root, 0);
     if (out.length >= maxResults)
         out.push(`[truncated after ${maxResults} results]`);
-    const result = out.join('\n');
-    if (!result)
-        return `No matches for pattern "${pattern}" in ${root}. STOP — do NOT read files individually to search. Try a broader regex pattern, different keywords, or use exec: grep -rn "keyword" ${root}`;
-    return result;
+    if (!out.length)
+        return `No matches for pattern \"${pattern}\" in ${redactPath(root, absCwd)}.`;
+    return out.join('\n');
 }
 function stripSimpleQuotedSegments(s) {
     // Best-effort quote stripping for lightweight shell pattern checks.
@@ -1390,7 +1426,7 @@ export async function exec(ctx, args) {
 }
 async function execWithPty(args) {
     const { pty, command, cwd, timeout, maxBytes, captureLimit, signal, execCwdWarning } = args;
-    const proc = pty.spawn(BASH_PATH, ['-lc', command], {
+    const proc = pty.spawn(BASH_PATH, ['-c', command], {
         name: 'xterm-color',
         cwd,
         cols: 120,
@@ -1512,11 +1548,6 @@ export async function vault_search(ctx, args) {
 export async function sys_context(ctx, args) {
     return sysContextTool(ctx, args);
 }
-function resolvePath(ctx, p) {
-    if (typeof p !== 'string' || !p.trim())
-        throw new Error('missing path');
-    return path.resolve(ctx.cwd, p);
-}
 /**
  * Check if a target path is within a directory.
  * Handles the classic root directory edge case: when dir is `/`, every absolute path is valid.
@@ -1526,6 +1557,24 @@ function isWithinDir(target, dir) {
         return target.startsWith('/');
     return target === dir || target.startsWith(dir + path.sep);
 }
+function resolvePath(ctx, p) {
+    if (typeof p !== 'string' || !p.trim())
+        throw new Error('missing path');
+    return path.resolve(ctx.cwd, p);
+}
+/**
+ * Redact a path for safe output.
+ * - Paths within cwd are shown as relative paths
+ * - Paths outside cwd are redacted as [outside-cwd]/basename
+ */
+function redactPath(filePath, absCwd) {
+    const resolved = path.resolve(filePath);
+    if (isWithinDir(resolved, absCwd)) {
+        return path.relative(absCwd, resolved);
+    }
+    const basename = path.basename(resolved);
+    return `[outside-cwd]/${basename}`;
+}
 /**
  * Check if a resolved path is outside the working directory.
  * Returns a model-visible warning string if so, empty string otherwise.
@@ -1586,7 +1635,7 @@ async function hasRg() {
     catch {
         // try PATH
         return await new Promise((resolve) => {
-            const c = spawn(BASH_PATH, ['-lc', 'command -v rg >/dev/null 2>&1'], { stdio: 'ignore' });
+            const c = spawn(BASH_PATH, ['-c', 'command -v rg >/dev/null 2>&1'], { stdio: 'ignore' });
             c.on('error', () => resolve(false));
             c.on('close', (code) => resolve(code === 0));
         });