micro-models-agent 0.13.1 → 0.13.2

package/dist/tools/create-dir.js

@@ -1,9 +1,9 @@
 import { mkdirSync, existsSync } from "fs";
-import { resolve, normalize } from "path";
 import { t } from "../i18n/index";
 import { isPathWritable } from "../modules/security/path-validator";
 import { logFileWrite, logSecurityBlock } from "../modules/security/audit-log";
 import { getSessionSecurityConfig } from "../modules/security/session-isolation";
+import { safeResolvePath } from "./path-utils";
 export const createDirTool = {
     name: "create_dir",
     description: "Create a directory (and any intermediate directories).",
@@ -17,8 +17,7 @@ export const createDirTool = {
     },
     handler: async (ctx, args) => {
         const path = String(args.path);
-        const baseDir = resolve(ctx.baseDir);
-        const resolved = resolve(baseDir, normalize(path));
+        const resolved = safeResolvePath(ctx.baseDir, path);
         // Get session-specific security config
         const securityConfig = ctx.sessionContext
             ? getSessionSecurityConfig(ctx.config, ctx.sessionContext)
@@ -34,7 +33,7 @@ export const createDirTool = {
             };
         }
         // Check path permissions
-        const scopeCheck = isPathWritable(ctx.baseDir, path, ctx.scope, ctx.config.security?.paths);
+        const scopeCheck = isPathWritable(ctx.baseDir, resolved, ctx.scope, ctx.config.security?.paths);
         if (!scopeCheck.allowed) {
             logSecurityBlock(ctx.sessionId, "file_write", scopeCheck.reason || "Path not allowed", path);
             return {

package/dist/tools/delete-file.js

@@ -1,10 +1,10 @@
 import { unlinkSync, existsSync, statSync, readFileSync } from "fs";
-import { resolve, normalize } from "path";
 import { t } from "../i18n/index";
 import { isPathWritable } from "../modules/security/path-validator";
 import { logFileDelete, logSecurityBlock } from "../modules/security/audit-log";
 import { getSessionSecurityConfig } from "../modules/security/session-isolation";
 import { generateDeleteDiff } from "../ui/diff";
+import { safeResolvePath } from "./path-utils";
 export const deleteFileTool = {
     name: "delete_file",
     description: "Delete a file from the filesystem.",
@@ -18,8 +18,7 @@ export const deleteFileTool = {
     },
     handler: async (ctx, args) => {
         const path = String(args.path);
-        const baseDir = resolve(ctx.baseDir);
-        const resolved = resolve(baseDir, normalize(path));
+        const resolved = safeResolvePath(ctx.baseDir, path);
         // Get session-specific security config
         const securityConfig = ctx.sessionContext
             ? getSessionSecurityConfig(ctx.config, ctx.sessionContext)
@@ -35,7 +34,7 @@ export const deleteFileTool = {
             };
         }
         // Check path permissions
-        const scopeCheck = isPathWritable(ctx.baseDir, path, ctx.scope, ctx.config.security?.paths);
+        const scopeCheck = isPathWritable(ctx.baseDir, resolved, ctx.scope, ctx.config.security?.paths);
         if (!scopeCheck.allowed) {
             logSecurityBlock(ctx.sessionId, "file_delete", scopeCheck.reason || "Path not allowed", path);
             return {

package/dist/tools/edit-file.js

@@ -1,11 +1,11 @@
 import { readFileSync, writeFileSync } from "fs";
-import { resolve, normalize } from "path";
 import { t } from "../i18n/index";
 import { isPathWritable } from "../modules/security/path-validator";
 import { scanContent } from "../modules/security/content-scanner";
 import { logFileWrite, logSecurityBlock } from "../modules/security/audit-log";
 import { getSessionSecurityConfig } from "../modules/security/session-isolation";
 import { generateDiff } from "../ui/diff";
+import { safeResolvePath } from "./path-utils";
 export const editFileTool = {
     name: "edit_file",
     description: "Find and replace text in an existing file. Uses exact string match (not regex).",
@@ -21,8 +21,7 @@ export const editFileTool = {
     },
     handler: async (ctx, args) => {
         const path = String(args.path);
-        const baseDir = resolve(ctx.baseDir);
-        const resolved = resolve(baseDir, normalize(path));
+        const resolved = safeResolvePath(ctx.baseDir, path);
         // Get session-specific security config
         const securityConfig = ctx.sessionContext
             ? getSessionSecurityConfig(ctx.config, ctx.sessionContext)
@@ -38,7 +37,7 @@ export const editFileTool = {
             };
         }
         // Check path permissions
-        const scopeCheck = isPathWritable(ctx.baseDir, path, ctx.scope, ctx.config.security?.paths);
+        const scopeCheck = isPathWritable(ctx.baseDir, resolved, ctx.scope, ctx.config.security?.paths);
         if (!scopeCheck.allowed) {
             logSecurityBlock(ctx.sessionId, "file_write", scopeCheck.reason || "Path not allowed", path);
             return {

package/dist/tools/executor.js

@@ -86,4 +86,10 @@ export class ToolExecutor {
     getToolDefinitions(tags) {
         return this.registry.getAllForLLM(tags);
     }
+    getRegistry() {
+        return this.registry;
+    }
+    setScope(scope) {
+        this.ctx.scope = scope;
+    }
 }

package/dist/tools/file-info.js

@@ -1,7 +1,7 @@
 import { statSync, existsSync } from 'fs';
-import { resolve, normalize } from 'path';
 import { t } from '../i18n/index';
 import { isPathInScope } from '../modules/security/path-validator';
+import { safeResolvePath } from './path-utils';
 export const fileInfoTool = {
     name: 'file_info',
     description: 'Get metadata about a file or directory (size, creation date, modification date).',
@@ -15,10 +15,9 @@ export const fileInfoTool = {
     },
     handler: async (ctx, args) => {
         const path = String(args.path);
-        const baseDir = resolve(ctx.baseDir);
-        const resolved = resolve(baseDir, normalize(path));
+        const resolved = safeResolvePath(ctx.baseDir, path);
         // Check path permissions
-        const scopeCheck = isPathInScope(ctx.baseDir, path, ctx.scope, ctx.config.security?.paths);
+        const scopeCheck = isPathInScope(ctx.baseDir, resolved, ctx.scope, ctx.config.security?.paths);
         if (!scopeCheck.allowed) {
             return {
                 success: false,

package/dist/tools/list-dir.js

@@ -1,7 +1,8 @@
 import { readdirSync, statSync, existsSync } from 'fs';
-import { resolve, normalize } from 'path';
+import { resolve } from 'path';
 import { t } from '../i18n/index';
 import { isPathInScope } from '../modules/security/path-validator';
+import { safeResolvePath } from './path-utils';
 export const listDirTool = {
     name: 'list_dir',
     description: 'List files and directories in a given path.',
@@ -15,10 +16,9 @@ export const listDirTool = {
     },
     handler: async (ctx, args) => {
         const path = String(args.path);
-        const baseDir = resolve(ctx.baseDir);
-        const resolved = resolve(baseDir, normalize(path));
+        const resolved = safeResolvePath(ctx.baseDir, path);
         // Check path permissions
-        const scopeCheck = isPathInScope(ctx.baseDir, path, ctx.scope, ctx.config.security?.paths);
+        const scopeCheck = isPathInScope(ctx.baseDir, resolved, ctx.scope, ctx.config.security?.paths);
         if (!scopeCheck.allowed) {
             return {
                 success: false,

package/dist/tools/path-utils.js

@@ -0,0 +1,51 @@
+import { resolve, normalize, dirname, basename, sep } from 'path';
+import { existsSync } from 'fs';
+/**
+ * Resolve a user-provided path against baseDir.
+ *
+ * Handles common model mistakes:
+ * 1. Leading slash: "/testing/cat3" → resolve relative to baseDir
+ * 2. Missing separator: "E:\agent_test" when baseDir is "E:\agent\_test"
+ *    → inserts the missing backslash
+ *
+ * For new files the parent directory must exist; we check that instead of
+ * the full path so write_file still works.
+ */
+export function safeResolvePath(baseDir, userPath) {
+    const norm = normalize(userPath);
+    const stripped = norm.replace(/^[/\\]/, '');
+    const resolved = resolve(baseDir, stripped);
+    // Fast path: if it exists (or parent does for new files), return it
+    if (existsSync(resolved) || existsSync(dirname(resolved)))
+        return resolved;
+    const baseNorm = normalize(baseDir);
+    // Walk ancestors and look for missing separators
+    let cur = baseNorm;
+    while (cur && cur !== dirname(cur)) {
+        const name = basename(cur);
+        if (!name) {
+            cur = dirname(cur);
+            continue;
+        }
+        let idx = stripped.toLowerCase().indexOf(name.toLowerCase());
+        while (idx >= 0) {
+            const afterIdx = idx + name.length;
+            const afterChar = stripped[afterIdx];
+            if (afterChar && afterChar !== '\\' && afterChar !== '/') {
+                const fixed = stripped.slice(0, afterIdx) + sep + stripped.slice(afterIdx);
+                const fixedResolved = resolve(baseDir, normalize(fixed));
+                if (existsSync(fixedResolved) || existsSync(dirname(fixedResolved))) {
+                    return fixedResolved;
+                }
+                // Try from ancestor's parent
+                const fromParent = resolve(dirname(cur), normalize(fixed));
+                if (existsSync(fromParent) || existsSync(dirname(fromParent))) {
+                    return fromParent;
+                }
+            }
+            idx = stripped.toLowerCase().indexOf(name.toLowerCase(), idx + 1);
+        }
+        cur = dirname(cur);
+    }
+    return resolved;
+}

package/dist/tools/read-file.js

@@ -1,9 +1,10 @@
 import { readFileSync, existsSync } from "fs";
-import { resolve, normalize, extname } from "path";
+import { extname } from "path";
 import { t } from "../i18n/index";
 import { isPathInScope } from "../modules/security/path-validator";
 import { DEFAULT_SECURITY_CONFIG } from "../config/security";
 import { logSecurityBlock } from "../modules/security/audit-log";
+import { safeResolvePath } from "./path-utils";
 /** Default number of lines returned when the caller omits `limit`. */
 const DEFAULT_LIMIT = 50;
 export const readFileTool = {
@@ -27,8 +28,9 @@ export const readFileTool = {
     },
     handler: async (ctx, args) => {
         const path = String(args.path);
+        const resolved = safeResolvePath(ctx.baseDir, path);
         const securityPaths = ctx.config?.security?.paths || DEFAULT_SECURITY_CONFIG.paths;
-        const scopeCheck = isPathInScope(ctx.baseDir, path, ctx.scope, securityPaths);
+        const scopeCheck = isPathInScope(ctx.baseDir, resolved, ctx.scope, securityPaths);
         if (!scopeCheck.allowed) {
             const pathStr = path;
             logSecurityBlock(ctx.sessionId || undefined, "file_read", scopeCheck.reason || "Path not allowed", pathStr);
@@ -39,12 +41,13 @@ export const readFileTool = {
                 }),
             };
         }
-        const resolved = resolve(ctx.baseDir, normalize(path));
         if (!existsSync(resolved)) {
             return { success: false, output: t("file.notfound", { path }) };
         }
         ctx.trackReadPath?.(path);
         const content = readFileSync(resolved, "utf-8");
+        // Track file paths mentioned in the document (e.g. structure.md, README)
+        ctx.trackDocumentContent?.(content);
         const lines = content.split("\n");
         const total = lines.length;
         const offset = args.offset || 1;

package/dist/tools/write-file.js

@@ -1,11 +1,12 @@
 import { writeFileSync, mkdirSync, existsSync, readFileSync } from "fs";
-import { resolve, normalize, dirname } from "path";
+import { dirname } from "path";
 import { t } from "../i18n/index";
 import { isPathWritable } from "../modules/security/path-validator";
 import { scanContent } from "../modules/security/content-scanner";
 import { logFileWrite, logSecurityBlock } from "../modules/security/audit-log";
 import { getSessionSecurityConfig } from "../modules/security/session-isolation";
 import { generateDiff, generateNewFileDiff } from "../ui/diff";
+import { safeResolvePath } from "./path-utils";
 export const writeFileTool = {
     name: "write_file",
     description: "Create or overwrite a file with given content. Creates intermediate directories if needed.",
@@ -20,10 +21,9 @@ export const writeFileTool = {
     },
     handler: async (ctx, args) => {
         const path = String(args.path);
-        const baseDir = resolve(ctx.baseDir);
-        const resolved = resolve(baseDir, normalize(path));
-        // Check path permissions
-        const scopeCheck = isPathWritable(ctx.baseDir, path, ctx.scope, ctx.config.security?.paths);
+        const resolved = safeResolvePath(ctx.baseDir, path);
+        // Check path permissions using the resolved path
+        const scopeCheck = isPathWritable(ctx.baseDir, resolved, ctx.scope, ctx.config.security?.paths);
         if (!scopeCheck.allowed) {
             logSecurityBlock(ctx.sessionId, "file_write", scopeCheck.reason || "Path not allowed", path);
             return {

package/dist/ui/renderer.js

@@ -136,6 +136,6 @@ export class Renderer {
         if (!this.card)
             return;
         const { tool, start } = this.card;
-        this.toolEnd(tool, Date.now() - start, true);
+        this.toolEnd(tool, Date.now() - start);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "micro-models-agent",
-  "version": "0.13.1",
+  "version": "0.13.2",
   "description": "Micro Models Agent (MMA) — LLM agent harness for small models (Qwen3.5-9B, 32K-64K context)",
   "type": "module",
   "bin": {