diff --git a/manifest.template.json b/manifest.template.json
index 9ff08da2..4da5a1de 100644
--- a/manifest.template.json
+++ b/manifest.template.json
@@ -88,7 +88,7 @@
     },
     {
       "name": "edit_block",
-      "description": "Apply surgical text replacements to files. Make small, focused edits with minimal context for precision."
+      "description": "Apply surgical edits to files. Supports text replacement (old_string/new_string) with fuzzy matching for text files, and range updates (range/content) for Excel files."
     },
     {
       "name": "start_process",
@@ -133,6 +133,10 @@
     {
       "name": "get_prompts",
       "description": "Browse and retrieve curated Desktop Commander prompts for various tasks and workflows."
+    },
+    {
+      "name": "execute_node",
+      "description": "Execute Node.js code directly using the MCP server's Node runtime. Supports ES modules with top-level await."
     }
   ],
   "keywords": [
diff --git a/package-lock.json b/package-lock.json
index c7f194d8..9d15a9e2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,18 +1,19 @@
 {
   "name": "@wonderwhy-er/desktop-commander",
-  "version": "0.2.21",
+  "version": "0.2.23",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@wonderwhy-er/desktop-commander",
-      "version": "0.2.21",
+      "version": "0.2.23",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
         "@modelcontextprotocol/sdk": "^1.9.0",
         "@vscode/ripgrep": "^1.15.9",
         "cross-fetch": "^4.1.0",
+        "exceljs": "^4.4.0",
         "fastest-levenshtein": "^1.0.16",
         "glob": "^10.3.10",
         "isbinaryfile": "^5.0.4",
@@ -85,6 +86,47 @@
         "node": ">=14.17.0"
       }
     },
+    "node_modules/@fast-csv/format": {
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/@fast-csv/format/-/format-4.3.5.tgz",
+      "integrity": "sha512-8iRn6QF3I8Ak78lNAa+Gdl5MJJBM5vRHivFtMRUWINdevNo00K7OXxS2PshawLKTejVwieIlPmK5YlLu6w4u8A==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "^14.0.1",
+        "lodash.escaperegexp": "^4.1.2",
+        "lodash.isboolean": "^3.0.3",
+        "lodash.isequal": "^4.5.0",
+        "lodash.isfunction": "^3.0.9",
+        "lodash.isnil": "^4.0.0"
+      }
+    },
+    "node_modules/@fast-csv/format/node_modules/@types/node": {
+      "version": "14.18.63",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.63.tgz",
+      "integrity": "sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==",
+      "license": "MIT"
+    },
+    "node_modules/@fast-csv/parse": {
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/@fast-csv/parse/-/parse-4.3.6.tgz",
+      "integrity": "sha512-uRsLYksqpbDmWaSmzvJcuApSEe38+6NQZBUsuAyMZKqHxH0g1wcJgsKUvN3WC8tewaqFjBMMGrkHmC+T7k8LvA==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "^14.0.1",
+        "lodash.escaperegexp": "^4.1.2",
+        "lodash.groupby": "^4.6.0",
+        "lodash.isfunction": "^3.0.9",
+        "lodash.isnil": "^4.0.0",
+        "lodash.isundefined": "^3.0.1",
+        "lodash.uniq": "^4.5.0"
+      }
+    },
+    "node_modules/@fast-csv/parse/node_modules/@types/node": {
+      "version": "14.18.63",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.63.tgz",
+      "integrity": "sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==",
+      "license": "MIT"
+    },
     "node_modules/@inquirer/checkbox": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-3.0.1.tgz",
@@ -1019,7 +1061,6 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -1171,7 +1212,6 @@
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.3.2.tgz",
       "integrity": "sha512-+25nxyyznAXF7Nef3y0EbBeqmGZgeN/BxHX29Rs39djAfaFalmQ89SE6CWyDCHzGL0yt/ycBtNOmGTW0FyGWNw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "archiver-utils": "^2.1.0",
@@ -1190,7 +1230,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-2.1.0.tgz",
       "integrity": "sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "glob": "^7.1.4",
@@ -1212,7 +1251,6 @@
       "version": "1.1.12",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
       "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
@@ -1224,7 +1262,6 @@
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
       "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
       "deprecated": "Glob versions prior to v9 are no longer supported",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
@@ -1245,7 +1282,6 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
@@ -1258,7 +1294,6 @@
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
       "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "core-util-is": "~1.0.0",
@@ -1274,14 +1309,12 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/archiver-utils/node_modules/string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "safe-buffer": "~5.1.0"
@@ -1301,7 +1334,6 @@
       "version": "3.2.6",
       "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
       "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/balanced-match": {
@@ -1314,7 +1346,6 @@
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
       "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -1331,6 +1362,15 @@
       ],
       "license": "MIT"
     },
+    "node_modules/big-integer": {
+      "version": "1.6.52",
+      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.52.tgz",
+      "integrity": "sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg==",
+      "license": "Unlicense",
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
     "node_modules/big.js": {
       "version": "5.2.2",
       "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
@@ -1341,6 +1381,19 @@
         "node": "*"
       }
     },
+    "node_modules/binary": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
+      "integrity": "sha512-D4H1y5KYwpJgK8wk1Cue5LLPgmwHKYSChkbspQg5JtVuR5ulGckxfR62H3AE9UDkdMC8yyXlqYihuz3Aqg2XZg==",
+      "license": "MIT",
+      "dependencies": {
+        "buffers": "~0.1.1",
+        "chainsaw": "~0.1.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/binary-extensions": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
@@ -1358,7 +1411,6 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
       "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "buffer": "^5.5.0",
@@ -1366,6 +1418,12 @@
         "readable-stream": "^3.4.0"
       }
     },
+    "node_modules/bluebird": {
+      "version": "3.4.7",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz",
+      "integrity": "sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA==",
+      "license": "MIT"
+    },
     "node_modules/body-parser": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.0.tgz",
@@ -1443,7 +1501,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "caniuse-lite": "^1.0.30001688",
         "electron-to-chromium": "^1.5.73",
@@ -1461,7 +1518,6 @@
       "version": "5.7.1",
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
       "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -1523,6 +1579,23 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/buffer-indexof-polyfill": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz",
+      "integrity": "sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/buffers": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
+      "integrity": "sha512-9q/rDEGSb/Qsvv2qvzIzdluL5k7AaJOTrw23z9reQthrbF7is4CtlT0DXyO1oei2DCp4uojjzQ7igaSHp1kAEQ==",
+      "engines": {
+        "node": ">=0.2.0"
+      }
+    },
     "node_modules/bytes": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
@@ -1640,6 +1713,18 @@
         "node": ">=4"
       }
     },
+    "node_modules/chainsaw": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
+      "integrity": "sha512-75kWfWt6MEKNC8xYXIdRpDehRYY/tNSgwKaJq+dbbDcxORuVrrQ+SEHoWsniVn9XPYfP4gmdWIeDk/4YNp1rNQ==",
+      "license": "MIT/X11",
+      "dependencies": {
+        "traverse": ">=0.3.0 <0.4"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/chalk": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -1847,7 +1932,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-4.1.2.tgz",
       "integrity": "sha512-D3uMHtGc/fcO1Gt1/L7i1e33VOvD4A9hfQLP+6ewd+BvG/gQ84Yh4oftEhAdjSMgBgwGL+jsppT7JYNpo6MHHg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "buffer-crc32": "^0.2.13",
@@ -1863,7 +1947,6 @@
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/config-chain": {
@@ -1920,7 +2003,6 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
       "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/cors": {
@@ -1940,7 +2022,6 @@
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz",
       "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==",
-      "dev": true,
       "license": "Apache-2.0",
       "bin": {
         "crc32": "bin/crc32.njs"
@@ -1953,7 +2034,6 @@
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-4.0.3.tgz",
       "integrity": "sha512-NT7w2JVU7DFroFdYkeq8cywxrgjPHWkdX1wjpRQXPX5Asews3tA+Ght6lddQO5Mkumffp3X7GEqku3epj2toIw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "crc-32": "^1.2.0",
@@ -1986,6 +2066,12 @@
         "node": ">= 8"
       }
     },
+    "node_modules/dayjs": {
+      "version": "1.11.19",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.19.tgz",
+      "integrity": "sha512-t5EcLVS6QPBNqM2z8fakk/NKel+Xzshgt8FFKAn+qwlD1pzZWxh0nVCrvFK7ZDb6XucZeF9z8C7CBWTRIVApAw==",
+      "license": "MIT"
+    },
     "node_modules/debug": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
@@ -2580,6 +2666,45 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/duplexer2": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
+      "integrity": "sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "node_modules/duplexer2/node_modules/readable-stream": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+      "license": "MIT",
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/duplexer2/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "license": "MIT"
+    },
+    "node_modules/duplexer2/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
     "node_modules/duplexer3": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.5.tgz",
@@ -2635,7 +2760,6 @@
       "version": "1.4.4",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
       "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "once": "^1.4.0"
@@ -2818,6 +2942,35 @@
         "node": ">=18.0.0"
       }
     },
+    "node_modules/exceljs": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/exceljs/-/exceljs-4.4.0.tgz",
+      "integrity": "sha512-XctvKaEMaj1Ii9oDOqbW/6e1gXknSY4g/aLCDicOXqBE4M0nRWkUu0PTp++UPNzoFY12BNHMfs/VadKIS6llvg==",
+      "license": "MIT",
+      "dependencies": {
+        "archiver": "^5.0.0",
+        "dayjs": "^1.8.34",
+        "fast-csv": "^4.3.1",
+        "jszip": "^3.10.1",
+        "readable-stream": "^3.6.0",
+        "saxes": "^5.0.1",
+        "tmp": "^0.2.0",
+        "unzipper": "^0.10.11",
+        "uuid": "^8.3.0"
+      },
+      "engines": {
+        "node": ">=8.3.0"
+      }
+    },
+    "node_modules/exceljs/node_modules/tmp": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.5.tgz",
+      "integrity": "sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.14"
+      }
+    },
     "node_modules/express": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/express/-/express-5.0.1.tgz",
@@ -2954,6 +3107,19 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/fast-csv": {
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/fast-csv/-/fast-csv-4.3.6.tgz",
+      "integrity": "sha512-2RNSpuwwsJGP0frGsOmTb9oUF+VkFSM4SyLTDgwf2ciHWTarN0lQTC+F2f/t5J9QjW+c65VFIAAu85GsvMIusw==",
+      "license": "MIT",
+      "dependencies": {
+        "@fast-csv/format": "4.3.5",
+        "@fast-csv/parse": "4.3.6"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -3230,7 +3396,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
       "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/fs-extra": {
@@ -3252,7 +3417,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true,
       "license": "ISC"
     },
     "node_modules/fsevents": {
@@ -3270,6 +3434,90 @@
         "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
       }
     },
+    "node_modules/fstream": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
+      "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
+      "deprecated": "This package is no longer supported.",
+      "license": "ISC",
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "inherits": "~2.0.0",
+        "mkdirp": ">=0.5 0",
+        "rimraf": "2"
+      },
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/fstream/node_modules/brace-expansion": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/fstream/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "license": "ISC",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/fstream/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/fstream/node_modules/mkdirp": {
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+      "license": "MIT",
+      "dependencies": {
+        "minimist": "^1.2.6"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
+    "node_modules/fstream/node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
+      "license": "ISC",
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
     "node_modules/function-bind": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
@@ -3473,7 +3721,6 @@
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-      "dev": true,
       "license": "ISC"
     },
     "node_modules/has-flag": {
@@ -3599,7 +3846,6 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
       "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -3633,6 +3879,12 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/immediate": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
+      "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==",
+      "license": "MIT"
+    },
     "node_modules/import-local": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz",
@@ -3658,7 +3910,6 @@
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
       "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "once": "^1.3.0",
@@ -3852,7 +4103,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
       "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/isbinaryfile": {
@@ -3999,6 +4249,48 @@
         "graceful-fs": "^4.1.6"
       }
     },
+    "node_modules/jszip": {
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz",
+      "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==",
+      "license": "(MIT OR GPL-3.0-or-later)",
+      "dependencies": {
+        "lie": "~3.3.0",
+        "pako": "~1.0.2",
+        "readable-stream": "~2.3.6",
+        "setimmediate": "^1.0.5"
+      }
+    },
+    "node_modules/jszip/node_modules/readable-stream": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+      "license": "MIT",
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/jszip/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "license": "MIT"
+    },
+    "node_modules/jszip/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
     "node_modules/keyv": {
       "version": "4.5.4",
       "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
@@ -4023,7 +4315,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz",
       "integrity": "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "readable-stream": "^2.0.5"
@@ -4036,7 +4327,6 @@
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
       "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "core-util-is": "~1.0.0",
@@ -4052,19 +4342,32 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/lazystream/node_modules/string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "safe-buffer": "~5.1.0"
       }
     },
+    "node_modules/lie": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",
+      "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
+      "license": "MIT",
+      "dependencies": {
+        "immediate": "~3.0.5"
+      }
+    },
+    "node_modules/listenercount": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz",
+      "integrity": "sha512-3mk/Zag0+IJxeDrxSgaDPy4zZ3w05PRZeJNnlWhzFz5OkX49J4krc+A8X2d2M69vGMBEX0uyl8M+W+8gH+kBqQ==",
+      "license": "ISC"
+    },
     "node_modules/loader-runner": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
@@ -4114,35 +4417,79 @@
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
       "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/lodash.difference": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz",
       "integrity": "sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==",
-      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.escaperegexp": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz",
+      "integrity": "sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw==",
       "license": "MIT"
     },
     "node_modules/lodash.flatten": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
       "integrity": "sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==",
-      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.groupby": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.groupby/-/lodash.groupby-4.6.0.tgz",
+      "integrity": "sha512-5dcWxm23+VAoz+awKmBaiBvzox8+RqMgFhi7UvX9DHZr2HdxHXM/Wrf8cfKpsW37RNrvtPn6hSwNqurSILbmJw==",
+      "license": "MIT"
+    },
+    "node_modules/lodash.isboolean": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
+      "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==",
+      "license": "MIT"
+    },
+    "node_modules/lodash.isequal": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
+      "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==",
+      "deprecated": "This package is deprecated. Use require('node:util').isDeepStrictEqual instead.",
+      "license": "MIT"
+    },
+    "node_modules/lodash.isfunction": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz",
+      "integrity": "sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw==",
+      "license": "MIT"
+    },
+    "node_modules/lodash.isnil": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.isnil/-/lodash.isnil-4.0.0.tgz",
+      "integrity": "sha512-up2Mzq3545mwVnMhTDMdfoG1OurpA/s5t88JmQX809eH3C8491iu2sfKhTfhQtKY78oPNhiaHJUpT/dUDAAtng==",
       "license": "MIT"
     },
     "node_modules/lodash.isplainobject": {
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
       "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==",
-      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.isundefined": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash.isundefined/-/lodash.isundefined-3.0.1.tgz",
+      "integrity": "sha512-MXB1is3s899/cD8jheYYE2V9qTHwKvt+npCwpD+1Sxm3Q3cECXCiYHjeHWXNwr6Q0SOBPrYUDxendrO6goVTEA==",
       "license": "MIT"
     },
     "node_modules/lodash.union": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz",
       "integrity": "sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw==",
-      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.uniq": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
+      "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==",
       "license": "MIT"
     },
     "node_modules/log-symbols": {
@@ -4344,7 +4691,6 @@
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
       "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
-      "dev": true,
       "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -4557,7 +4903,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -4807,6 +5152,12 @@
       "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
       "license": "BlueOak-1.0.0"
     },
+    "node_modules/pako": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
+      "license": "(MIT AND Zlib)"
+    },
     "node_modules/parseurl": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
@@ -4830,7 +5181,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -4995,7 +5345,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
       "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/proto-list": {
@@ -5153,7 +5502,6 @@
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
       "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "inherits": "^2.0.3",
@@ -5168,7 +5516,6 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.3.tgz",
       "integrity": "sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==",
-      "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
         "minimatch": "^5.1.0"
@@ -5178,7 +5525,6 @@
       "version": "5.1.6",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
       "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "brace-expansion": "^2.0.1"
@@ -5470,6 +5816,18 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
       "license": "MIT"
     },
+    "node_modules/saxes": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
+      "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
+      "license": "ISC",
+      "dependencies": {
+        "xmlchars": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/schema-utils": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
@@ -5570,6 +5928,12 @@
         "node": ">= 18"
       }
     },
+    "node_modules/setimmediate": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==",
+      "license": "MIT"
+    },
     "node_modules/setprototypeof": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
@@ -5899,7 +6263,6 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
       "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "safe-buffer": "~5.2.0"
@@ -6078,7 +6441,6 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
       "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "bl": "^4.0.3",
@@ -6151,7 +6513,6 @@
       "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "fast-uri": "^3.0.1",
@@ -6285,6 +6646,15 @@
       "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
       "license": "MIT"
     },
+    "node_modules/traverse": {
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
+      "integrity": "sha512-iawgk0hLP3SxGKDfnDJf8wTz4p2qImnyihM5Hh/sGvQ3K37dPi/w8sRhdNIxYA1TwFwc5mDhIJq+O0RsvXBKdQ==",
+      "license": "MIT/X11",
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/trim-repeated": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz",
@@ -6438,7 +6808,6 @@
       "integrity": "sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==",
       "dev": true,
       "license": "Apache-2.0",
-      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -6491,6 +6860,54 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/unzipper": {
+      "version": "0.10.14",
+      "resolved": "https://registry.npmjs.org/unzipper/-/unzipper-0.10.14.tgz",
+      "integrity": "sha512-ti4wZj+0bQTiX2KmKWuwj7lhV+2n//uXEotUmGuQqrbVZSEGFMbI68+c6JCQ8aAmUWYvtHEz2A8K6wXvueR/6g==",
+      "license": "MIT",
+      "dependencies": {
+        "big-integer": "^1.6.17",
+        "binary": "~0.3.0",
+        "bluebird": "~3.4.1",
+        "buffer-indexof-polyfill": "~1.0.0",
+        "duplexer2": "~0.1.4",
+        "fstream": "^1.0.12",
+        "graceful-fs": "^4.2.2",
+        "listenercount": "~1.0.1",
+        "readable-stream": "~2.3.6",
+        "setimmediate": "~1.0.4"
+      }
+    },
+    "node_modules/unzipper/node_modules/readable-stream": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+      "license": "MIT",
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/unzipper/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "license": "MIT"
+    },
+    "node_modules/unzipper/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
     "node_modules/update-browserslist-db": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",
@@ -6558,7 +6975,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/utils-merge": {
@@ -6570,6 +6986,15 @@
         "node": ">= 0.4.0"
       }
     },
+    "node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "license": "MIT",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
     "node_modules/vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
@@ -6615,7 +7040,6 @@
       "integrity": "sha512-UFynvx+gM44Gv9qFgj0acCQK2VE1CtdfwFdimkapco3hlPCJ/zeq73n2yVKimVbtm+TnApIugGhLJnkU6gjYXA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/eslint-scope": "^3.7.7",
         "@types/estree": "^1.0.6",
@@ -6663,7 +7087,6 @@
       "integrity": "sha512-MfwFQ6SfwinsUVi0rNJm7rHZ31GyTcpVE5pgVA3hwFRb7COD4TzjUUwhGWKfO50+xdc2MQPuEBBJoqIMGt3JDw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@discoveryjs/json-ext": "^0.6.1",
         "@webpack-cli/configtest": "^3.0.1",
@@ -6784,7 +7207,6 @@
       "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "fast-uri": "^3.0.1",
@@ -6988,6 +7410,12 @@
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
       "license": "ISC"
     },
+    "node_modules/xmlchars": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
+      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
+      "license": "MIT"
+    },
     "node_modules/xtend": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
@@ -7025,7 +7453,6 @@
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-4.1.1.tgz",
       "integrity": "sha512-9qv4rlDiopXg4E69k+vMHjNN63YFMe9sZMrdlvKnCjlCRWeCBswPPMPUfx+ipsAWq1LXHe70RcbaHdJJpS6hyQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "archiver-utils": "^3.0.4",
@@ -7040,7 +7467,6 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-3.0.4.tgz",
       "integrity": "sha512-KVgf4XQVrTjhyWmx6cte4RxonPLR9onExufI1jhvw/MQ4BB6IsZD5gT8Lq+u/+pRkWna/6JoHpiQioaqFP5Rzw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "glob": "^7.2.3",
@@ -7062,7 +7488,6 @@
       "version": "1.1.12",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
       "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
@@ -7074,7 +7499,6 @@
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
       "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
       "deprecated": "Glob versions prior to v9 are no longer supported",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
@@ -7095,7 +7519,6 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
@@ -7109,7 +7532,6 @@
       "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz",
       "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==",
       "license": "MIT",
-      "peer": true,
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }
diff --git a/package.json b/package.json
index 1f363c78..71078891 100644
--- a/package.json
+++ b/package.json
@@ -83,6 +83,7 @@
     "fastest-levenshtein": "^1.0.16",
     "glob": "^10.3.10",
     "isbinaryfile": "^5.0.4",
+    "exceljs": "^4.4.0",
     "zod": "^3.24.1",
     "zod-to-json-schema": "^3.23.5"
   },
diff --git a/src/handlers/filesystem-handlers.ts b/src/handlers/filesystem-handlers.ts
index bf09ad82..c219641e 100644
--- a/src/handlers/filesystem-handlers.ts
+++ b/src/handlers/filesystem-handlers.ts
@@ -9,6 +9,7 @@ import {
     type FileResult,
     type MultiFileResult
 } from '../tools/filesystem.js';
+import type { ReadOptions } from '../utils/files/base.js';
 
 import {ServerResult} from '../types.js';
 import {withTimeout} from '../utils/withTimeout.js';
@@ -59,31 +60,47 @@ export async function handleReadFile(args: unknown): Promise<ServerResult> {
 
         const defaultLimit = config.fileReadLineLimit ?? 1000;
 
-        // Use the provided limits or defaults
-        const offset = parsed.offset ?? 0;
-        const length = parsed.length ?? defaultLimit;
-        
-        const fileResult = await readFile(parsed.path, parsed.isUrl, offset, length);
+        // Convert sheet parameter: numeric strings become numbers for Excel index access
+        let sheetParam: string | number | undefined = parsed.sheet;
+        if (parsed.sheet !== undefined && /^\d+$/.test(parsed.sheet)) {
+            sheetParam = parseInt(parsed.sheet, 10);
+        }
+
+        const options: ReadOptions = {
+            isUrl: parsed.isUrl,
+            offset: parsed.offset ?? 0,
+            length: parsed.length ?? defaultLimit,
+            sheet: sheetParam,
+            range: parsed.range
+        };
+        const fileResult = await readFile(parsed.path, options);
         
-        if (fileResult.isImage) {
+        if (fileResult.metadata?.isImage) {
             // For image files, return as an image content type
+            // Content should already be base64-encoded string from handler
+            const imageData = typeof fileResult.content === 'string'
+                ? fileResult.content
+                : fileResult.content.toString('base64');
             return {
                 content: [
-                    { 
-                        type: "text", 
-                        text: `Image file: ${parsed.path} (${fileResult.mimeType})\n` 
+                    {
+                        type: "text",
+                        text: `Image file: ${parsed.path} (${fileResult.mimeType})\n`
                     },
                     {
                         type: "image",
-                        data: fileResult.content,
+                        data: imageData,
                         mimeType: fileResult.mimeType
                     }
                 ],
             };
         } else {
             // For all other files, return as text
+            const textContent = typeof fileResult.content === 'string'
+                ? fileResult.content
+                : fileResult.content.toString('utf8');
             return {
-                content: [{ type: "text", text: fileResult.content }],
+                content: [{ type: "text", text: textContent }],
             };
         }
     };
@@ -241,6 +258,33 @@ export async function handleMoveFile(args: unknown): Promise<ServerResult> {
     }
 }
 
+/**
+ * Format a value for display, handling objects and arrays
+ */
+function formatValue(value: unknown, indent: string = ''): string {
+    if (value === null || value === undefined) {
+        return String(value);
+    }
+    if (Array.isArray(value)) {
+        if (value.length === 0) return '[]';
+        // For arrays of objects (like sheets), format each item
+        const items = value.map((item, i) => {
+            if (typeof item === 'object' && item !== null) {
+                const props = Object.entries(item)
+                    .map(([k, v]) => `${k}: ${v}`)
+                    .join(', ');
+                return `${indent}  [${i}] { ${props} }`;
+            }
+            return `${indent}  [${i}] ${item}`;
+        });
+        return `\n${items.join('\n')}`;
+    }
+    if (typeof value === 'object') {
+        return JSON.stringify(value);
+    }
+    return String(value);
+}
+
 /**
  * Handle get_file_info command
  */
@@ -248,12 +292,16 @@ export async function handleGetFileInfo(args: unknown): Promise<ServerResult> {
     try {
         const parsed = GetFileInfoArgsSchema.parse(args);
         const info = await getFileInfo(parsed.path);
+
+        // Generic formatting for any file type
+        const formattedText = Object.entries(info)
+            .map(([key, value]) => `${key}: ${formatValue(value)}`)
+            .join('\n');
+
         return {
-            content: [{ 
-                type: "text", 
-                text: Object.entries(info)
-                    .map(([key, value]) => `${key}: ${value}`)
-                    .join('\n') 
+            content: [{
+                type: "text",
+                text: formattedText
             }],
         };
     } catch (error) {
diff --git a/src/search-manager.ts b/src/search-manager.ts
index 980f1d3c..8ebacb96 100644
--- a/src/search-manager.ts
+++ b/src/search-manager.ts
@@ -1,8 +1,10 @@
 import { spawn, ChildProcess } from 'child_process';
 import path from 'path';
+import fs from 'fs/promises';
 import { validatePath } from './tools/filesystem.js';
 import { capture } from './utils/capture.js';
 import { getRipgrepPath } from './utils/ripgrep-resolver.js';
+import { isExcelFile } from './utils/files/index.js';
 
 export interface SearchResult {
   file: string;
@@ -144,7 +146,33 @@ export interface SearchSessionOptions {
       validatedPath: validPath
     });
 
+    // For content searches, only search Excel files when contextually relevant:
+    // - filePattern explicitly targets Excel files (*.xlsx, *.xls, etc.)
+    // - or rootPath is an Excel file itself
+    const shouldSearchExcel = options.searchType === 'content' &&
+      this.shouldIncludeExcelSearch(options.filePattern, validPath);
+
+    if (shouldSearchExcel) {
+      this.searchExcelFiles(
+        validPath,
+        options.pattern,
+        options.ignoreCase !== false,
+        options.maxResults,
+        options.filePattern  // Pass filePattern to filter Excel files too
+      ).then(excelResults => {
+        // Add Excel results to session (merged after initial response)
+        for (const result of excelResults) {
+          session.results.push(result);
+          session.totalMatches++;
+        }
+      }).catch((err) => {
+        // Log Excel search errors but don't fail the whole search
+        capture('excel_search_error', { error: err instanceof Error ? err.message : String(err) });
+      });
+    }
+
     // Wait for first chunk of data or early completion instead of fixed delay
+    // Excel search runs in background and results are merged via readSearchResults
     const firstChunk = new Promise<void>(resolve => {
       const onData = () => {
         session.process.stdout?.off('data', onData);
@@ -153,6 +181,8 @@ export interface SearchSessionOptions {
       session.process.stdout?.once('data', onData);
       setTimeout(resolve, 40); // cap at 40ms instead of 50-100ms
     });
+
+    // Only wait for ripgrep first chunk - Excel results merge asynchronously
     await firstChunk;
 
     return {
@@ -275,6 +305,187 @@ export interface SearchSessionOptions {
     }));
   }
 
+  /**
+   * Search Excel files for content matches
+   * Called during content search to include Excel files alongside text files
+   * Searches ALL sheets in each Excel file (row-wise for cross-column matching)
+   *
+   * TODO: Refactor - Extract Excel search logic to separate module (src/utils/search/excel-search.ts)
+   * and inject into SearchManager, similar to how file handlers are structured in src/utils/files/
+   * This would allow adding other file type searches (PDF, etc.) without bloating search-manager.ts
+   */
+  private async searchExcelFiles(
+    rootPath: string,
+    pattern: string,
+    ignoreCase: boolean,
+    maxResults?: number,
+    filePattern?: string
+  ): Promise<SearchResult[]> {
+    const results: SearchResult[] = [];
+
+    // Build regex for matching content
+    const flags = ignoreCase ? 'i' : '';
+    let regex: RegExp;
+    try {
+      regex = new RegExp(pattern, flags);
+    } catch {
+      // If pattern is not valid regex, escape it for literal matching
+      const escaped = pattern.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+      regex = new RegExp(escaped, flags);
+    }
+
+    // Find Excel files recursively
+    let excelFiles = await this.findExcelFiles(rootPath);
+
+    // Filter by filePattern if provided
+    if (filePattern) {
+      const patterns = filePattern.split('|').map(p => p.trim()).filter(Boolean);
+      excelFiles = excelFiles.filter(filePath => {
+        const fileName = path.basename(filePath);
+        return patterns.some(pat => {
+          // Support glob-like patterns
+          if (pat.includes('*')) {
+            const regexPat = pat.replace(/\./g, '\\.').replace(/\*/g, '.*');
+            return new RegExp(`^${regexPat}$`, 'i').test(fileName);
+          }
+          // Exact match (case-insensitive)
+          return fileName.toLowerCase() === pat.toLowerCase();
+        });
+      });
+    }
+
+    // Dynamically import ExcelJS to search all sheets
+    const ExcelJS = await import('exceljs');
+
+    for (const filePath of excelFiles) {
+      if (maxResults && results.length >= maxResults) break;
+
+      try {
+        const workbook = new ExcelJS.default.Workbook();
+        await workbook.xlsx.readFile(filePath);
+
+        // Search ALL sheets in the workbook (row-wise for speed and cross-column matching)
+        for (const worksheet of workbook.worksheets) {
+          if (maxResults && results.length >= maxResults) break;
+
+          const sheetName = worksheet.name;
+
+          // Iterate through rows (faster than cell-by-cell)
+          worksheet.eachRow({ includeEmpty: false }, (row, rowNumber) => {
+            if (maxResults && results.length >= maxResults) return;
+
+            // Build a concatenated string of all cell values in the row
+            const rowValues: string[] = [];
+            row.eachCell({ includeEmpty: false }, (cell) => {
+              if (cell.value === null || cell.value === undefined) return;
+
+              let cellStr: string;
+              if (typeof cell.value === 'object') {
+                if ('result' in cell.value) {
+                  cellStr = String(cell.value.result ?? '');
+                } else if ('richText' in cell.value) {
+                  cellStr = (cell.value as any).richText.map((rt: any) => rt.text).join('');
+                } else if ('text' in cell.value) {
+                  cellStr = String((cell.value as any).text);
+                } else {
+                  cellStr = String(cell.value);
+                }
+              } else {
+                cellStr = String(cell.value);
+              }
+
+              if (cellStr.trim()) {
+                rowValues.push(cellStr);
+              }
+            });
+
+            // Join all cell values with space for cross-column matching
+            const rowText = rowValues.join(' ');
+
+            if (regex.test(rowText)) {
+              // Extract the matching portion for display
+              const match = rowText.match(regex);
+              const matchContext = match
+                ? this.getMatchContext(rowText, match.index || 0, match[0].length)
+                : rowText.substring(0, 150);
+
+              results.push({
+                file: `${filePath}:${sheetName}!Row${rowNumber}`,
+                line: rowNumber,
+                match: matchContext,
+                type: 'content'
+              });
+            }
+          });
+        }
+      } catch (error) {
+        // Skip files that can't be read (permission issues, corrupted, etc.)
+        continue;
+      }
+    }
+
+    return results;
+  }
+
+  /**
+   * Find all Excel files in a directory recursively
+   */
+  private async findExcelFiles(rootPath: string): Promise<string[]> {
+    const excelFiles: string[] = [];
+
+    async function walk(dir: string): Promise<void> {
+      try {
+        const entries = await fs.readdir(dir, { withFileTypes: true });
+
+        for (const entry of entries) {
+          const fullPath = path.join(dir, entry.name);
+
+          if (entry.isDirectory()) {
+            // Skip node_modules, .git, etc.
+            if (!entry.name.startsWith('.') && entry.name !== 'node_modules') {
+              await walk(fullPath);
+            }
+          } else if (entry.isFile() && isExcelFile(entry.name)) {
+            excelFiles.push(fullPath);
+          }
+        }
+      } catch {
+        // Skip directories we can't read
+      }
+    }
+
+    // Check if rootPath is a file or directory
+    try {
+      const stats = await fs.stat(rootPath);
+      if (stats.isFile() && isExcelFile(rootPath)) {
+        return [rootPath];
+      } else if (stats.isDirectory()) {
+        await walk(rootPath);
+      }
+    } catch {
+      // Path doesn't exist or can't be accessed
+    }
+
+    return excelFiles;
+  }
+
+  /**
+   * Extract context around a match for display (show surrounding text)
+   */
+  private getMatchContext(text: string, matchStart: number, matchLength: number): string {
+    const contextChars = 50; // chars before and after match
+    const start = Math.max(0, matchStart - contextChars);
+    const end = Math.min(text.length, matchStart + matchLength + contextChars);
+
+    let context = text.substring(start, end);
+
+    // Add ellipsis if truncated
+    if (start > 0) context = '...' + context;
+    if (end < text.length) context = context + '...';
+
+    return context;
+  }
+
   /**
    * Clean up completed sessions older than specified time
    * Called automatically by cleanup interval
@@ -301,7 +512,7 @@ export interface SearchSessionOptions {
    * (has file extension and no glob wildcards)
    */
   private isExactFilename(pattern: string): boolean {
-    return /\.[a-zA-Z0-9]+$/.test(pattern) && 
+    return /\.[a-zA-Z0-9]+$/.test(pattern) &&
            !this.isGlobPattern(pattern);
   }
 
@@ -309,14 +520,46 @@ export interface SearchSessionOptions {
    * Detect if pattern contains glob wildcards
    */
   private isGlobPattern(pattern: string): boolean {
-    return pattern.includes('*') || 
-           pattern.includes('?') || 
-           pattern.includes('[') || 
+    return pattern.includes('*') ||
+           pattern.includes('?') ||
+           pattern.includes('[') ||
            pattern.includes('{') ||
            pattern.includes(']') ||
            pattern.includes('}');
   }
 
+  /**
+   * Determine if Excel search should be included based on context
+   * Only searches Excel files when:
+   * - filePattern explicitly targets Excel files (*.xlsx, *.xls, *.xlsm, *.xlsb)
+   * - or the rootPath itself is an Excel file
+   */
+  private shouldIncludeExcelSearch(filePattern?: string, rootPath?: string): boolean {
+    const excelExtensions = ['.xlsx', '.xls', '.xlsm', '.xlsb'];
+
+    // Check if rootPath is an Excel file
+    if (rootPath) {
+      const lowerPath = rootPath.toLowerCase();
+      if (excelExtensions.some(ext => lowerPath.endsWith(ext))) {
+        return true;
+      }
+    }
+
+    // Check if filePattern targets Excel files
+    if (filePattern) {
+      const lowerPattern = filePattern.toLowerCase();
+      // Check for patterns like *.xlsx, *.xls, or explicit Excel extensions
+      if (excelExtensions.some(ext =>
+        lowerPattern.includes(`*${ext}`) ||
+        lowerPattern.endsWith(ext)
+      )) {
+        return true;
+      }
+    }
+
+    return false;
+  }
+
   private buildRipgrepArgs(options: SearchSessionOptions): string[] {
     const args: string[] = [];
     
diff --git a/src/server.ts b/src/server.ts
index 5f032199..a39f9c09 100644
--- a/src/server.ts
+++ b/src/server.ts
@@ -261,9 +261,14 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
                         Can fetch content from URLs when isUrl parameter is set to true
                         (URLs are always read in full regardless of offset/length).
                         
-                        Handles text files normally and image files are returned as viewable images.
-                        Recognized image types: PNG, JPEG, GIF, WebP.
-                        
+                        FORMAT HANDLING (by extension):
+                        - Text: Uses offset/length for line-based pagination
+                        - Excel (.xlsx, .xls, .xlsm): Returns JSON 2D array
+                          * sheet: "Sheet1" (name) or "0" (index as string, 0-based)
+                          * range: ALWAYS use FROM:TO format (e.g., "A1:D100", "C1:C1", "B2:B50")
+                          * offset/length work as row pagination (optional fallback)
+                        - Images (PNG, JPEG, GIF, WebP): Base64 encoded viewable content
+
                         ${PATH_GUIDANCE}
                         ${CMD_PREFIX_DESCRIPTION}`,
                     inputSchema: zodToJsonSchema(ReadFileArgsSchema),
@@ -296,7 +301,7 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
                 {
                     name: "write_file",
                     description: `
-                        Write or append to file contents. 
+                        Write or append to file contents.
 
                         CHUNKING IS STANDARD PRACTICE: Always write files in chunks of 25-30 lines maximum.
                         This is the normal, recommended way to write files - not an emergency measure.
@@ -312,16 +317,21 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
                         1. Any file expected to be longer than 25-30 lines
                         2. When writing multiple files in sequence
                         3. When creating documentation, code files, or configuration files
-                        
+
                         HANDLING CONTINUATION ("Continue" prompts):
                         If user asks to "Continue" after an incomplete operation:
                         1. Read the file to see what was successfully written
                         2. Continue writing ONLY the remaining content using {mode: 'append'}
                         3. Keep chunks to 25-30 lines each
-                        
+
+                        FORMAT HANDLING (by extension):
+                        - Text files: String content
+                        - Excel (.xlsx, .xls, .xlsm): JSON 2D array or {"SheetName": [[...]]}
+                          Example: '[["Name","Age"],["Alice",30]]'
+
                         Files over 50 lines will generate performance notes but are still written successfully.
                         Only works within allowed directories.
-                        
+
                         ${PATH_GUIDANCE}
                         ${CMD_PREFIX_DESCRIPTION}`,
                     inputSchema: zodToJsonSchema(WriteFileArgsSchema),
@@ -550,13 +560,14 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
                         Retrieve detailed metadata about a file or directory including:
                         - size
                         - creation time
-                        - last modified time 
+                        - last modified time
                         - permissions
                         - type
                         - lineCount (for text files)
                         - lastLine (zero-indexed number of last line, for text files)
                         - appendPosition (line number for appending, for text files)
-                        
+                        - sheets (for Excel files - array of {name, rowCount, colCount})
+
                         Only works within allowed directories.
                         
                         ${PATH_GUIDANCE}
@@ -569,45 +580,54 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
                 },
                 // Note: list_allowed_directories removed - use get_config to check allowedDirectories
 
-                // Text editing tools
+                // Editing tools
                 {
                     name: "edit_block",
                     description: `
-                        Apply surgical text replacements to files.
-                        
+                        Apply surgical edits to files.
+
                         BEST PRACTICE: Make multiple small, focused edits rather than one large edit.
-                        Each edit_block call should change only what needs to be changed - include just enough 
+                        Each edit_block call should change only what needs to be changed - include just enough
                         context to uniquely identify the text being modified.
-                        
+
+                        FORMAT HANDLING (by extension):
+
+                        EXCEL FILES (.xlsx, .xls, .xlsm) - Range Update mode:
+                        Takes:
+                        - file_path: Path to the Excel file
+                        - range: ALWAYS use FROM:TO format - "SheetName!A1:C10" or "SheetName!C1:C1"
+                        - content: 2D array, e.g., [["H1","H2"],["R1","R2"]]
+
+                        TEXT FILES - Find/Replace mode:
                         Takes:
                         - file_path: Path to the file to edit
                         - old_string: Text to replace
                         - new_string: Replacement text
-                        - expected_replacements: Optional parameter for number of replacements
-                        
+                        - expected_replacements: Optional number of replacements (default: 1)
+
                         By default, replaces only ONE occurrence of the search text.
-                        To replace multiple occurrences, provide the expected_replacements parameter with
+                        To replace multiple occurrences, provide expected_replacements with
                         the exact number of matches expected.
-                        
+
                         UNIQUENESS REQUIREMENT: When expected_replacements=1 (default), include the minimal
                         amount of context necessary (typically 1-3 lines) before and after the change point,
                         with exact whitespace and indentation.
-                        
+
                         When editing multiple sections, make separate edit_block calls for each distinct change
                         rather than one large replacement.
-                        
+
                         When a close but non-exact match is found, a character-level diff is shown in the format:
                         common_prefix{-removed-}{+added+}common_suffix to help you identify what's different.
-                        
+
                         Similar to write_file, there is a configurable line limit (fileWriteLineLimit) that warns
                         if the edited file exceeds this limit. If this happens, consider breaking your edits into
                         smaller, more focused changes.
-                        
+
                         ${PATH_GUIDANCE}
                         ${CMD_PREFIX_DESCRIPTION}`,
                     inputSchema: zodToJsonSchema(EditBlockArgsSchema),
                     annotations: {
-                        title: "Edit Text Block",
+                        title: "Edit Block",
                         readOnlyHint: false,
                         destructiveHint: true,
                         openWorldHint: false,
@@ -637,7 +657,8 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
                         
                         COMMON FILE ANALYSIS PATTERNS:
                         • start_process("python3 -i") → Python REPL for data analysis (RECOMMENDED)
-                        • start_process("node -i") → Node.js for JSON processing  
+                        • start_process("node -i") → Node.js REPL for JSON processing
+                        • start_process("node:local") → Node.js on MCP server (stateless, ES imports, all code in one call)
                         • start_process("cut -d',' -f1 file.csv | sort | uniq -c") → Quick CSV analysis
                         • start_process("wc -l /path/file.csv") → Line counting
                         • start_process("head -10 /path/file.csv") → File preview
@@ -646,12 +667,15 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
                         For PDF, Excel, Word, archives, databases, and other binary formats, use process tools with appropriate libraries or command-line utilities.
                         
                         INTERACTIVE PROCESSES FOR DATA ANALYSIS:
-                        1. start_process("python3 -i") - Start Python REPL for data work
-                        2. start_process("node -i") - Start Node.js REPL for JSON/JS
-                        3. start_process("bash") - Start interactive bash shell
+                        For code/calculations, use in this priority order:
+                        1. start_process("python3 -i") - Python REPL (preferred)
+                        2. start_process("node -i") - Node.js REPL (when Python unavailable)
+                        3. start_process("node:local") - Node.js fallback (when node -i fails)
                         4. Use interact_with_process() to send commands
                         5. Use read_process_output() to get responses
-                        
+                        When Python is unavailable, prefer Node.js over shell for calculations.
+                        Node.js: Always use ES import syntax (import x from 'y'), not require().
+
                         SMART DETECTION:
                         - Detects REPL prompts (>>>, >, $, etc.)
                         - Identifies when process is waiting for input
@@ -755,7 +779,7 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
                         
                         SUPPORTED REPLs:
                         - Python: python3 -i (RECOMMENDED for data analysis)
-                        - Node.js: node -i  
+                        - Node.js: node -i
                         - R: R
                         - Julia: julia
                         - Shell: bash, zsh
@@ -844,9 +868,9 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
                     name: "kill_process",
                     description: `
                         Terminate a running process by PID.
-                        
+
                         Use with caution as this will forcefully terminate the specified process.
-                        
+
                         ${CMD_PREFIX_DESCRIPTION}`,
                     inputSchema: zodToJsonSchema(KillProcessArgsSchema),
                     annotations: {
@@ -964,7 +988,7 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
                         If unclear from context, use: "exploring tool capabilities"
                         
                         The prompt content will be injected and execution begins immediately.
-                        
+
                         ${CMD_PREFIX_DESCRIPTION}`,
                     inputSchema: zodToJsonSchema(GetPromptsArgsSchema),
                 }
diff --git a/src/tools/edit.ts b/src/tools/edit.ts
index 5847a16c..4411f160 100644
--- a/src/tools/edit.ts
+++ b/src/tools/edit.ts
@@ -1,3 +1,20 @@
+/**
+ * Text file editing via search/replace with fuzzy matching support.
+ *
+ * TECHNICAL DEBT / ARCHITECTURAL NOTE:
+ * This file contains text editing logic that should ideally live in TextFileHandler.editRange()
+ * to be consistent with how Excel editing works (ExcelFileHandler.editRange()).
+ *
+ * Current inconsistency:
+ * - Excel: edit_block → ExcelFileHandler.editRange() ✓ uses file handler
+ * - Text:  edit_block → performSearchReplace() here → bypasses TextFileHandler
+ *
+ * Future refactor should:
+ * 1. Move performSearchReplace() + fuzzy logic into TextFileHandler.editRange()
+ * 2. Make this file a thin dispatch layer that routes to appropriate FileHandler
+ * 3. Unify the editRange() signature to handle both text search/replace and structured edits
+ */
+
 import { readFile, writeFile, readFileInternal, validatePath } from './filesystem.js';
 import fs from 'fs/promises';
 import { ServerResult } from '../types.js';
@@ -337,14 +354,83 @@ function highlightDifferences(expected: string, actual: string): string {
 }
 
 /**
- * Handle edit_block command with enhanced functionality
- * - Supports multiple replacements
- * - Validates expected replacements count
- * - Provides detailed error messages
+ * Handle edit_block command
+ *
+ * 1. Text files: String replacement (old_string/new_string)
+ *    - Uses fuzzy matching for resilience
+ *    - Handles expected_replacements parameter
+ *
+ * 2. Structured files (Excel): Range rewrite (range + content)
+ *    - Bulk updates to cell ranges (e.g., "Sheet1!A1:C10")
+ *    - Whole sheet replacement (e.g., "Sheet1")
+ *    - More powerful and simpler than surgical location-based edits
+ *    - Supports chunking for large datasets (e.g., 1000 rows at a time)
+
  */
 export async function handleEditBlock(args: unknown): Promise<ServerResult> {
     const parsed = EditBlockArgsSchema.parse(args);
-    
+
+    // Structured files: Range rewrite
+    if (parsed.range !== undefined && parsed.content !== undefined) {
+        try {
+            // Validate path before any filesystem operations
+            const validatedPath = await validatePath(parsed.file_path);
+
+            const { getFileHandler } = await import('../utils/files/factory.js');
+            const handler = await getFileHandler(validatedPath);
+
+            // Parse content if it's a JSON string (AI often sends arrays as JSON strings)
+            let content = parsed.content;
+            if (typeof content === 'string') {
+                try {
+                    content = JSON.parse(content);
+                } catch {
+                    // Leave as-is if not valid JSON - let handler decide
+                }
+            }
+
+            // Check if handler supports range editing
+            if ('editRange' in handler && typeof handler.editRange === 'function') {
+                await handler.editRange(validatedPath, parsed.range, content, parsed.options);
+                return {
+                    content: [{
+                        type: "text",
+                        text: `Successfully updated range ${parsed.range} in ${parsed.file_path}`
+                    }],
+                };
+            } else {
+                return {
+                    content: [{
+                        type: "text",
+                        text: `Error: Range-based editing not supported for ${parsed.file_path}`
+                    }],
+                    isError: true
+                };
+            }
+        } catch (error) {
+            const errorMessage = error instanceof Error ? error.message : String(error);
+            return {
+                content: [{
+                    type: "text",
+                    text: `Error: ${errorMessage}`
+                }],
+                isError: true
+            };
+        }
+    }
+
+    // Text files: String replacement
+    // Validate required parameters for text replacement
+    if (parsed.old_string === undefined || parsed.new_string === undefined) {
+        return {
+            content: [{
+                type: "text",
+                text: `Error: Text replacement requires both old_string and new_string parameters`
+            }],
+            isError: true
+        };
+    }
+
     const searchReplace = {
         search: parsed.old_string,
         replace: parsed.new_string
diff --git a/src/tools/filesystem.ts b/src/tools/filesystem.ts
index d9e634ed..bc669a17 100644
--- a/src/tools/filesystem.ts
+++ b/src/tools/filesystem.ts
@@ -2,62 +2,25 @@ import fs from "fs/promises";
 import path from "path";
 import os from 'os';
 import fetch from 'cross-fetch';
-import { createReadStream } from 'fs';
-import { createInterface } from 'readline';
-import { isBinaryFile } from 'isbinaryfile';
 import {capture} from '../utils/capture.js';
 import {withTimeout} from '../utils/withTimeout.js';
 import {configManager} from '../config-manager.js';
+import { getFileHandler, TextFileHandler } from '../utils/files/index.js';
+import type { ReadOptions, FileResult } from '../utils/files/base.js';
 
 // CONSTANTS SECTION - Consolidate all timeouts and thresholds
 const FILE_OPERATION_TIMEOUTS = {
     PATH_VALIDATION: 10000,    // 10 seconds
-    URL_FETCH: 30000,          // 30 seconds  
+    URL_FETCH: 30000,          // 30 seconds
     FILE_READ: 30000,          // 30 seconds
 } as const;
 
 const FILE_SIZE_LIMITS = {
-    LARGE_FILE_THRESHOLD: 10 * 1024 * 1024,  // 10MB
     LINE_COUNT_LIMIT: 10 * 1024 * 1024,      // 10MB for line counting
 } as const;
 
-const READ_PERFORMANCE_THRESHOLDS = {
-    SMALL_READ_THRESHOLD: 100,    // For very small reads
-    DEEP_OFFSET_THRESHOLD: 1000,  // For byte estimation
-    SAMPLE_SIZE: 10000,           // Sample size for estimation
-    CHUNK_SIZE: 8192,             // 8KB chunks for reverse reading
-} as const;
-
 // UTILITY FUNCTIONS - Eliminate duplication
 
-/**
- * Count lines in text content efficiently
- * @param content Text content to count lines in
- * @returns Number of lines
- */
-function countLines(content: string): number {
-    return content.split('\n').length;
-}
-
-/**
- * Count lines in a file efficiently (for files under size limit)
- * @param filePath Path to the file
- * @returns Line count or undefined if file too large/can't read
- */
-async function getFileLineCount(filePath: string): Promise<number | undefined> {
-    try {
-        const stats = await fs.stat(filePath);
-        // Only count lines for reasonably sized files to avoid performance issues
-        if (stats.size < FILE_SIZE_LIMITS.LINE_COUNT_LIMIT) {
-            const content = await fs.readFile(filePath, 'utf8');
-            return countLines(content);
-        }
-    } catch (error) {
-        // If we can't read the file, just return undefined
-    }
-    return undefined;
-}
-
 /**
  * Get MIME type information for a file
  * @param filePath Path to the file
@@ -88,22 +51,6 @@ async function getDefaultReadLength(): Promise<number> {
     return config.fileReadLineLimit ?? 1000; // Default to 1000 lines if not set
 }
 
-/**
- * Generate instructions for handling binary files
- * @param filePath Path to the binary file
- * @param mimeType MIME type of the file
- * @returns Instruction message for the LLM
- */
-function getBinaryFileInstructions(filePath: string, mimeType: string): string {
-    const fileName = path.basename(filePath);
-    
-    return `Cannot read binary file as text: ${fileName} (${mimeType})
-
-Use start_process + interact_with_process to analyze binary files with appropriate tools (Node.js or Python libraries, command-line utilities, etc.).
-
-The read_file tool only handles text files and images.`;
-}
-
 // Initialize allowed directories from configuration
 async function getAllowedDirs(): Promise<string[]> {
     try {
@@ -280,12 +227,8 @@ export async function validatePath(requestedPath: string): Promise<string> {
     return result;
 }
 
-// File operation tools
-export interface FileResult {
-    content: string;
-    mimeType: string;
-    isImage: boolean;
-}
+// Re-export FileResult from base for consumers
+export type { FileResult } from '../utils/files/base.js';
 
 
 /**
@@ -322,12 +265,12 @@ export async function readFileFromUrl(url: string): Promise<FileResult> {
             const buffer = await response.arrayBuffer();
             const content = Buffer.from(buffer).toString('base64');
 
-            return { content, mimeType: contentType, isImage };
+            return { content, mimeType: contentType, metadata: { isImage } };
         } else {
             // For text content
             const content = await response.text();
 
-            return { content, mimeType: contentType, isImage };
+            return { content, mimeType: contentType, metadata: { isImage } };
         }
     } catch (error) {
         // Clear the timeout to prevent memory leaks
@@ -344,309 +287,24 @@ export async function readFileFromUrl(url: string): Promise<FileResult> {
 
 
 
-/**
- * Generate enhanced status message with total and remaining line information
- * @param readLines Number of lines actually read
- * @param offset Starting offset (line number)
- * @param totalLines Total lines in the file (if available)
- * @param isNegativeOffset Whether this is a tail operation
- * @returns Enhanced status message string
- */
-function generateEnhancedStatusMessage(
-    readLines: number, 
-    offset: number, 
-    totalLines?: number,
-    isNegativeOffset: boolean = false
-): string {
-    if (isNegativeOffset) {
-        // For tail operations (negative offset)
-        if (totalLines !== undefined) {
-            return `[Reading last ${readLines} lines (total: ${totalLines} lines)]`;
-        } else {
-            return `[Reading last ${readLines} lines]`;
-        }
-    } else {
-        // For normal reads (positive offset)
-        if (totalLines !== undefined) {
-            const endLine = offset + readLines;
-            const remainingLines = Math.max(0, totalLines - endLine);
-            
-            if (offset === 0) {
-                return `[Reading ${readLines} lines from start (total: ${totalLines} lines, ${remainingLines} remaining)]`;
-            } else {
-                return `[Reading ${readLines} lines from line ${offset} (total: ${totalLines} lines, ${remainingLines} remaining)]`;
-            }
-        } else {
-            // Fallback when total lines unknown
-            if (offset === 0) {
-                return `[Reading ${readLines} lines from start]`;
-            } else {
-                return `[Reading ${readLines} lines from line ${offset}]`;
-            }
-        }
-    }
-}
-
-/**
- * Read file content using smart positioning for optimal performance
- * @param filePath Path to the file (already validated)
- * @param offset Starting line number (negative for tail behavior)
- * @param length Maximum number of lines to read
- * @param mimeType MIME type of the file
- * @param includeStatusMessage Whether to include status headers (default: true)
- * @returns File result with content
- */
-async function readFileWithSmartPositioning(filePath: string, offset: number, length: number, mimeType: string, includeStatusMessage: boolean = true): Promise<FileResult> {
-    const stats = await fs.stat(filePath);
-    const fileSize = stats.size;
-
-    // Check if the file is binary (but allow images to pass through)
-    const { isImage } = await getMimeTypeInfo(filePath);
-    if (!isImage) {
-        const isBinary = await isBinaryFile(filePath);
-        if (isBinary) {
-            // Return instructions instead of trying to read binary content
-            const instructions = getBinaryFileInstructions(filePath, mimeType);
-            throw new Error(instructions);
-        }
-    }
-
-    // Get total line count for enhanced status messages (only for smaller files)
-    const totalLines = await getFileLineCount(filePath);
-
-    // For negative offsets (tail behavior), use reverse reading
-    if (offset < 0) {
-        const requestedLines = Math.abs(offset);
-
-        if (fileSize > FILE_SIZE_LIMITS.LARGE_FILE_THRESHOLD && requestedLines <= READ_PERFORMANCE_THRESHOLDS.SMALL_READ_THRESHOLD) {
-            // Use efficient reverse reading for large files with small tail requests
-            return await readLastNLinesReverse(filePath, requestedLines, mimeType, includeStatusMessage, totalLines);
-        } else {
-            // Use readline circular buffer for other cases
-            return await readFromEndWithReadline(filePath, requestedLines, mimeType, includeStatusMessage, totalLines);
-        }
-    }
-
-    // For positive offsets
-    else {
-        // For small files or reading from start, use simple readline
-        if (fileSize < FILE_SIZE_LIMITS.LARGE_FILE_THRESHOLD || offset === 0) {
-            return await readFromStartWithReadline(filePath, offset, length, mimeType, includeStatusMessage, totalLines);
-        }
-
-        // For large files with middle/end reads, try to estimate position
-        else {
-            // If seeking deep into file, try byte estimation
-            if (offset > READ_PERFORMANCE_THRESHOLDS.DEEP_OFFSET_THRESHOLD) {
-                return await readFromEstimatedPosition(filePath, offset, length, mimeType, includeStatusMessage, totalLines);
-            } else {
-                return await readFromStartWithReadline(filePath, offset, length, mimeType, includeStatusMessage, totalLines);
-            }
-        }
-    }
-}
-
-/**
- * Read last N lines efficiently by reading file backwards in chunks
- */
-async function readLastNLinesReverse(filePath: string, n: number, mimeType: string, includeStatusMessage: boolean = true, fileTotalLines?: number): Promise<FileResult> {
-    const fd = await fs.open(filePath, 'r');
-    try {
-        const stats = await fd.stat();
-        const fileSize = stats.size;
-
-        let position = fileSize;
-        let lines: string[] = [];
-        let partialLine = '';
-
-        while (position > 0 && lines.length < n) {
-            const readSize = Math.min(READ_PERFORMANCE_THRESHOLDS.CHUNK_SIZE, position);
-            position -= readSize;
-
-            const buffer = Buffer.alloc(readSize);
-            await fd.read(buffer, 0, readSize, position);
-
-            const chunk = buffer.toString('utf-8');
-            const text = chunk + partialLine;
-            const chunkLines = text.split('\n');
-
-            partialLine = chunkLines.shift() || '';
-            lines = chunkLines.concat(lines);
-        }
-
-        // Add the remaining partial line if we reached the beginning
-        if (position === 0 && partialLine) {
-            lines.unshift(partialLine);
-        }
-
-        const result = lines.slice(-n); // Get exactly n lines
-        const content = includeStatusMessage
-            ? `${generateEnhancedStatusMessage(result.length, -n, fileTotalLines, true)}\n\n${result.join('\n')}`
-            : result.join('\n');
-
-        return { content, mimeType, isImage: false };
-    } finally {
-        await fd.close();
-    }
-}
-
-/**
- * Read from end using readline with circular buffer
- */
-async function readFromEndWithReadline(filePath: string, requestedLines: number, mimeType: string, includeStatusMessage: boolean = true, fileTotalLines?: number): Promise<FileResult> {
-    const rl = createInterface({
-        input: createReadStream(filePath),
-        crlfDelay: Infinity
-    });
-
-    const buffer: string[] = new Array(requestedLines);
-    let bufferIndex = 0;
-    let totalLines = 0;
-
-    for await (const line of rl) {
-        buffer[bufferIndex] = line;
-        bufferIndex = (bufferIndex + 1) % requestedLines;
-        totalLines++;
-    }
-
-    rl.close();
-
-    // Extract lines in correct order
-    let result: string[];
-    if (totalLines >= requestedLines) {
-        result = [
-            ...buffer.slice(bufferIndex),
-            ...buffer.slice(0, bufferIndex)
-        ].filter(line => line !== undefined);
-    } else {
-        result = buffer.slice(0, totalLines);
-    }
-
-    const content = includeStatusMessage
-        ? `${generateEnhancedStatusMessage(result.length, -requestedLines, fileTotalLines, true)}\n\n${result.join('\n')}`
-        : result.join('\n');
-    return { content, mimeType, isImage: false };
-}
-
-/**
- * Read from start/middle using readline
- */
-async function readFromStartWithReadline(filePath: string, offset: number, length: number, mimeType: string, includeStatusMessage: boolean = true, fileTotalLines?: number): Promise<FileResult> {
-    const rl = createInterface({
-        input: createReadStream(filePath),
-        crlfDelay: Infinity
-    });
-
-    const result: string[] = [];
-    let lineNumber = 0;
-
-    for await (const line of rl) {
-        if (lineNumber >= offset && result.length < length) {
-            result.push(line);
-        }
-        if (result.length >= length) break; // Early exit optimization
-        lineNumber++;
-    }
-
-    rl.close();
-
-    if (includeStatusMessage) {
-        const statusMessage = generateEnhancedStatusMessage(result.length, offset, fileTotalLines, false);
-        const content = `${statusMessage}\n\n${result.join('\n')}`;
-        return { content, mimeType, isImage: false };
-    } else {
-        const content = result.join('\n');
-        return { content, mimeType, isImage: false };
-    }
-}
-
-/**
- * Read from estimated byte position for very large files
- */
-async function readFromEstimatedPosition(filePath: string, offset: number, length: number, mimeType: string, includeStatusMessage: boolean = true, fileTotalLines?: number): Promise<FileResult> {
-    // First, do a quick scan to estimate lines per byte
-    const rl = createInterface({
-        input: createReadStream(filePath),
-        crlfDelay: Infinity
-    });
-
-    let sampleLines = 0;
-    let bytesRead = 0;
-
-
-
-    for await (const line of rl) {
-        bytesRead += Buffer.byteLength(line, 'utf-8') + 1; // +1 for newline
-        sampleLines++;
-        if (bytesRead >= READ_PERFORMANCE_THRESHOLDS.SAMPLE_SIZE) break;
-    }
-
-    rl.close();
-
-    if (sampleLines === 0) {
-        // Fallback to simple read
-        return await readFromStartWithReadline(filePath, offset, length, mimeType, includeStatusMessage, fileTotalLines);
-    }
-
-    // Estimate average line length and seek position
-    const avgLineLength = bytesRead / sampleLines;
-    const estimatedBytePosition = Math.floor(offset * avgLineLength);
-
-    // Create a new stream starting from estimated position
-    const fd = await fs.open(filePath, 'r');
-    try {
-        const stats = await fd.stat();
-        const startPosition = Math.min(estimatedBytePosition, stats.size);
-
-        const stream = createReadStream(filePath, { start: startPosition });
-        const rl2 = createInterface({
-            input: stream,
-            crlfDelay: Infinity
-        });
-
-        const result: string[] = [];
-        let lineCount = 0;
-        let firstLineSkipped = false;
-
-        for await (const line of rl2) {
-            // Skip first potentially partial line if we didn't start at beginning
-            if (!firstLineSkipped && startPosition > 0) {
-                firstLineSkipped = true;
-                continue;
-            }
-
-            if (result.length < length) {
-                result.push(line);
-            } else {
-                break;
-            }
-            lineCount++;
-        }
-
-        rl2.close();
-
-        const content = includeStatusMessage
-            ? `${generateEnhancedStatusMessage(result.length, offset, fileTotalLines, false)}\n\n${result.join('\n')}`
-            : result.join('\n');
-        return { content, mimeType, isImage: false };
-    } finally {
-        await fd.close();
-    }
-}
-
 /**
  * Read file content from the local filesystem
  * @param filePath Path to the file
- * @param offset Starting line number to read from (default: 0)
- * @param length Maximum number of lines to read (default: from config or 1000)
+ * @param options Read options (offset, length, sheet, range)
  * @returns File content or file result with metadata
  */
-export async function readFileFromDisk(filePath: string, offset: number = 0, length?: number): Promise<FileResult> {
+export async function readFileFromDisk(
+    filePath: string,
+    options?: ReadOptions
+): Promise<FileResult> {
+    const { offset = 0, sheet, range } = options ?? {};
+    let { length } = options ?? {};
+
     // Add validation for required parameters
     if (!filePath || typeof filePath !== 'string') {
         throw new Error('Invalid file path provided');
     }
-    
+
     // Get default length from config if not provided
     if (length === undefined) {
         length = await getDefaultReadLength();
@@ -654,7 +312,7 @@ export async function readFileFromDisk(filePath: string, offset: number = 0, len
 
     const validPath = await validatePath(filePath);
 
-    // Get file extension for telemetry using path module consistently
+    // Get file extension for telemetry
     const fileExtension = getFileExtension(validPath);
 
     // Check file size before attempting to read
@@ -675,40 +333,40 @@ export async function readFileFromDisk(filePath: string, offset: number = 0, len
         // If we can't stat the file, continue anyway and let the read operation handle errors
     }
 
-    // Detect the MIME type based on file extension
-    const { mimeType, isImage } = await getMimeTypeInfo(validPath);
-    
     // Use withTimeout to handle potential hangs
     const readOperation = async () => {
-        if (isImage) {
-            // For image files, read as Buffer and convert to base64
-            // Images are always read in full, ignoring offset and length
-            const buffer = await fs.readFile(validPath);
-            const content = buffer.toString('base64');
+        // Get appropriate handler for this file type (async - includes binary detection)
+        const handler = await getFileHandler(validPath);
+
+        // Use handler to read the file
+        const result = await handler.read(validPath, {
+            offset,
+            length,
+            sheet,
+            range,
+            includeStatusMessage: true
+        });
 
-            return { content, mimeType, isImage };
+        // Return with content as string
+        // For images: content is already base64-encoded string from handler
+        // For text: content may be string or Buffer, convert to UTF-8 string
+        let content: string;
+        if (typeof result.content === 'string') {
+            content = result.content;
+        } else if (result.metadata?.isImage) {
+            // Image buffer should be base64 encoded, not UTF-8 converted
+            content = result.content.toString('base64');
         } else {
-            // For all other files, use smart positioning approach
-            try {
-                return await readFileWithSmartPositioning(validPath, offset, length, mimeType, true);
-            } catch (error) {
-                // If it's our binary file instruction error, return it as content
-                if (error instanceof Error && error.message.includes('Cannot read binary file as text:')) {
-                    return { content: error.message, mimeType: 'text/plain', isImage: false };
-                }
-                
-                // If UTF-8 reading fails for other reasons, also check if it's binary
-                const isBinary = await isBinaryFile(validPath);
-                if (isBinary) {
-                    const instructions = getBinaryFileInstructions(validPath, mimeType);
-                    return { content: instructions, mimeType: 'text/plain', isImage: false };
-                }
-                
-                // Only if it's truly not binary, then we have a real UTF-8 reading error
-                throw error;
-            }
+            content = result.content.toString('utf8');
         }
+
+        return {
+            content,
+            mimeType: result.mimeType,
+            metadata: result.metadata
+        };
     };
+
     // Execute with timeout
     const result = await withTimeout(
         readOperation(),
@@ -716,6 +374,7 @@ export async function readFileFromDisk(filePath: string, offset: number = 0, len
         `Read file operation for ${filePath}`,
         null
     );
+
     if (result == null) {
         // Handles the impossible case where withTimeout resolves to null instead of throwing
         throw new Error('Failed to read the file');
@@ -727,15 +386,17 @@ export async function readFileFromDisk(filePath: string, offset: number = 0, len
 /**
  * Read a file from either the local filesystem or a URL
  * @param filePath Path to the file or URL
- * @param isUrl Whether the path is a URL
- * @param offset Starting line number to read from (default: 0)
- * @param length Maximum number of lines to read (default: from config or 1000)
+ * @param options Read options (isUrl, offset, length, sheet, range)
  * @returns File content or file result with metadata
  */
-export async function readFile(filePath: string, isUrl?: boolean, offset?: number, length?: number): Promise<FileResult> {
+export async function readFile(
+    filePath: string,
+    options?: ReadOptions
+): Promise<FileResult> {
+    const { isUrl, offset, length, sheet, range } = options ?? {};
     return isUrl
         ? readFileFromUrl(filePath)
-        : readFileFromDisk(filePath, offset, length);
+        : readFileFromDisk(filePath, { offset, length, sheet, range });
 }
 
 /**
@@ -777,7 +438,7 @@ export async function readFileInternal(filePath: string, offset: number = 0, len
     }
 
     // Handle offset/length by splitting on line boundaries while preserving line endings
-    const lines = splitLinesPreservingEndings(content);
+    const lines = TextFileHandler.splitLinesPreservingEndings(content);
 
     // Apply offset and length
     const selectedLines = lines.slice(offset, offset + length);
@@ -786,47 +447,6 @@ export async function readFileInternal(filePath: string, offset: number = 0, len
     return selectedLines.join('');
 }
 
-/**
- * Split text into lines while preserving original line endings with each line
- * @param content The text content to split
- * @returns Array of lines, each including its original line ending
- */
-function splitLinesPreservingEndings(content: string): string[] {
-    if (!content) return [''];
-
-    const lines: string[] = [];
-    let currentLine = '';
-
-    for (let i = 0; i < content.length; i++) {
-        const char = content[i];
-        currentLine += char;
-
-        // Check for line ending patterns
-        if (char === '\n') {
-            // LF or end of CRLF
-            lines.push(currentLine);
-            currentLine = '';
-        } else if (char === '\r') {
-            // Could be CR or start of CRLF
-            if (i + 1 < content.length && content[i + 1] === '\n') {
-                // It's CRLF, include the \n as well
-                currentLine += content[i + 1];
-                i++; // Skip the \n in next iteration
-            }
-            // Either way, we have a complete line
-            lines.push(currentLine);
-            currentLine = '';
-        }
-    }
-
-    // Handle any remaining content (file not ending with line ending)
-    if (currentLine) {
-        lines.push(currentLine);
-    }
-
-    return lines;
-}
-
 export async function writeFile(filePath: string, content: string, mode: 'rewrite' | 'append' = 'rewrite'): Promise<void> {
     const validPath = await validatePath(filePath);
 
@@ -835,7 +455,7 @@ export async function writeFile(filePath: string, content: string, mode: 'rewrit
 
     // Calculate content metrics
     const contentBytes = Buffer.from(content).length;
-    const lineCount = countLines(content);
+    const lineCount = TextFileHandler.countLines(content);
 
     // Capture file extension and operation details in telemetry without capturing the file path
     capture('server_write_file', {
@@ -845,12 +465,11 @@ export async function writeFile(filePath: string, content: string, mode: 'rewrit
         lineCount: lineCount
     });
 
-    // Use different fs methods based on mode
-    if (mode === 'append') {
-        await fs.appendFile(validPath, content);
-    } else {
-        await fs.writeFile(validPath, content);
-    }
+    // Get appropriate handler for this file type (async - includes binary detection)
+    const handler = await getFileHandler(validPath);
+
+    // Use handler to write the file
+    await handler.write(validPath, content, mode);
 }
 
 export interface MultiFileResult {
@@ -868,11 +487,21 @@ export async function readMultipleFiles(paths: string[]): Promise<MultiFileResul
                 const validPath = await validatePath(filePath);
                 const fileResult = await readFile(validPath);
 
+                // Handle content conversion properly for images vs text
+                let content: string;
+                if (typeof fileResult.content === 'string') {
+                    content = fileResult.content;
+                } else if (fileResult.metadata?.isImage) {
+                    content = fileResult.content.toString('base64');
+                } else {
+                    content = fileResult.content.toString('utf8');
+                }
+
                 return {
                     path: filePath,
-                    content: typeof fileResult === 'string' ? fileResult : fileResult.content,
-                    mimeType: typeof fileResult === 'string' ? "text/plain" : fileResult.mimeType,
-                    isImage: typeof fileResult === 'string' ? false : fileResult.isImage
+                    content,
+                    mimeType: fileResult.mimeType,
+                    isImage: fileResult.metadata?.isImage ?? false
                 };
             } catch (error) {
                 const errorMessage = error instanceof Error ? error.message : String(error);
@@ -1083,10 +712,10 @@ async function searchFilesNodeJS(rootPath: string, pattern: string): Promise<str
 
 export async function getFileInfo(filePath: string): Promise<Record<string, any>> {
     const validPath = await validatePath(filePath);
-    const stats = await fs.stat(validPath);
 
-    // Basic file info
-    const info: Record<string, any> = {
+    // Get fs.stat as a fallback for any missing fields
+    const stats = await fs.stat(validPath);
+    const fallbackInfo = {
         size: stats.size,
         created: stats.birthtime,
         modified: stats.mtime,
@@ -1094,25 +723,58 @@ export async function getFileInfo(filePath: string): Promise<Record<string, any>
         isDirectory: stats.isDirectory(),
         isFile: stats.isFile(),
         permissions: stats.mode.toString(8).slice(-3),
+        fileType: 'text' as const,
+        metadata: undefined as Record<string, any> | undefined,
     };
 
-    // For text files that aren't too large, also count lines
-    if (stats.isFile() && stats.size < FILE_SIZE_LIMITS.LINE_COUNT_LIMIT) {
-        try {
-            // Get MIME type information
-            const { mimeType, isImage } = await getMimeTypeInfo(validPath);
-            
-            // Only count lines for non-image, likely text files
-            if (!isImage) {
-                const content = await fs.readFile(validPath, 'utf8');
-                const lineCount = countLines(content);
-                info.lineCount = lineCount;
-                info.lastLine = lineCount - 1; // Zero-indexed last line
-                info.appendPosition = lineCount; // Position to append at end
-            }
-        } catch (error) {
-            // If reading fails, just skip the line count
-            // This could happen for binary files or very large files
+    // Get appropriate handler for this file type (async - includes binary detection)
+    const handler = await getFileHandler(validPath);
+
+    // Use handler to get file info, with fallback
+    let fileInfo;
+    try {
+        fileInfo = await handler.getInfo(validPath);
+    } catch (error) {
+        // If handler fails, use fallback stats
+        fileInfo = fallbackInfo;
+    }
+
+    // Convert to legacy format (for backward compatibility)
+    // Use handler values with fallback to fs.stat values for any missing fields
+    const info: Record<string, any> = {
+        size: fileInfo.size ?? fallbackInfo.size,
+        created: fileInfo.created ?? fallbackInfo.created,
+        modified: fileInfo.modified ?? fallbackInfo.modified,
+        accessed: fileInfo.accessed ?? fallbackInfo.accessed,
+        isDirectory: fileInfo.isDirectory ?? fallbackInfo.isDirectory,
+        isFile: fileInfo.isFile ?? fallbackInfo.isFile,
+        permissions: fileInfo.permissions ?? fallbackInfo.permissions,
+        fileType: fileInfo.fileType ?? fallbackInfo.fileType,
+    };
+
+    // Add type-specific metadata
+    if (fileInfo.metadata) {
+        // For text files
+        if (fileInfo.metadata.lineCount !== undefined) {
+            info.lineCount = fileInfo.metadata.lineCount;
+            info.lastLine = fileInfo.metadata.lineCount - 1;
+            info.appendPosition = fileInfo.metadata.lineCount;
+        }
+
+        // For Excel files
+        if (fileInfo.metadata.sheets) {
+            info.sheets = fileInfo.metadata.sheets;
+            info.isExcelFile = true;
+        }
+
+        // For images
+        if (fileInfo.metadata.isImage) {
+            info.isImage = true;
+        }
+
+        // For binary files
+        if (fileInfo.metadata.isBinary) {
+            info.isBinary = true;
         }
     }
 
diff --git a/src/tools/improved-process-tools.ts b/src/tools/improved-process-tools.ts
index 3764c489..ace21706 100644
--- a/src/tools/improved-process-tools.ts
+++ b/src/tools/improved-process-tools.ts
@@ -4,9 +4,91 @@ import { StartProcessArgsSchema, ReadProcessOutputArgsSchema, InteractWithProces
 import { capture } from "../utils/capture.js";
 import { ServerResult } from '../types.js';
 import { analyzeProcessState, cleanProcessOutput, formatProcessStateMessage, ProcessState } from '../utils/process-detection.js';
-import { getSystemInfo } from '../utils/system-info.js';
 import * as os from 'os';
 import { configManager } from '../config-manager.js';
+import { spawn } from 'child_process';
+import fs from 'fs/promises';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+// Get the directory where the MCP is installed (for ES module imports)
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const mcpRoot = path.resolve(__dirname, '..', '..');
+
+// Track virtual Node sessions (PIDs that are actually Node fallback sessions)
+const virtualNodeSessions = new Map<number, { timeout_ms: number }>();
+let virtualPidCounter = -1000; // Use negative PIDs for virtual sessions
+
+/**
+ * Execute Node.js code via temp file (fallback when Python unavailable)
+ * Creates temp .mjs file in MCP directory for ES module import access
+ */
+async function executeNodeCode(code: string, timeout_ms: number = 30000): Promise<ServerResult> {
+  const tempFile = path.join(mcpRoot, `.mcp-exec-${Date.now()}-${Math.random().toString(36).slice(2)}.mjs`);
+
+  try {
+    await fs.writeFile(tempFile, code, 'utf8');
+
+    const result = await new Promise<{ stdout: string; stderr: string; exitCode: number }>((resolve) => {
+      const proc = spawn(process.execPath, [tempFile], {
+        cwd: mcpRoot,
+        timeout: timeout_ms
+      });
+
+      let stdout = '';
+      let stderr = '';
+
+      proc.stdout.on('data', (data) => {
+        stdout += data.toString();
+      });
+
+      proc.stderr.on('data', (data) => {
+        stderr += data.toString();
+      });
+
+      proc.on('close', (exitCode) => {
+        resolve({ stdout, stderr, exitCode: exitCode ?? 1 });
+      });
+
+      proc.on('error', (err) => {
+        resolve({ stdout, stderr: stderr + '\n' + err.message, exitCode: 1 });
+      });
+    });
+
+    // Clean up temp file
+    await fs.unlink(tempFile).catch(() => {});
+
+    if (result.exitCode !== 0) {
+      return {
+        content: [{
+          type: "text",
+          text: `Execution failed (exit code ${result.exitCode}):\n${result.stderr}\n${result.stdout}`
+        }],
+        isError: true
+      };
+    }
+
+    return {
+      content: [{
+        type: "text",
+        text: result.stdout || '(no output)'
+      }]
+    };
+
+  } catch (error) {
+    // Clean up temp file on error
+    await fs.unlink(tempFile).catch(() => {});
+
+    return {
+      content: [{
+        type: "text",
+        text: `Failed to execute Node.js code: ${error instanceof Error ? error.message : String(error)}`
+      }],
+      isError: true
+    };
+  }
+}
 
 /**
  * Start a new process (renamed from execute_command)
@@ -42,6 +124,31 @@ export async function startProcess(args: unknown): Promise<ServerResult> {
     };
   }
 
+  const commandToRun = parsed.data.command;
+
+  // Handle node:local - runs Node.js code directly on MCP server
+  if (commandToRun.trim() === 'node:local') {
+    const virtualPid = virtualPidCounter--;
+    virtualNodeSessions.set(virtualPid, { timeout_ms: parsed.data.timeout_ms || 30000 });
+
+    return {
+      content: [{
+        type: "text",
+        text: `Node.js session started with PID ${virtualPid} (MCP server execution)
+
+   IMPORTANT: Each interact_with_process call runs as a FRESH script.
+   State is NOT preserved between calls. Include ALL code in ONE call:
+   - imports, file reading, processing, and output together.
+
+   Available libraries:
+   - ExcelJS for Excel files: import ExcelJS from 'exceljs'
+   - All Node.js built-ins: fs, path, http, crypto, etc.
+
+🔄 Ready for code - send complete self-contained script via interact_with_process.`
+      }],
+    };
+  }
+
   let shellUsed: string | undefined = parsed.data.shell;
 
   if (!shellUsed) {
@@ -61,7 +168,7 @@ export async function startProcess(args: unknown): Promise<ServerResult> {
   }
 
   const result = await terminalManager.executeCommand(
-    parsed.data.command,
+    commandToRun,
     parsed.data.timeout_ms,
     shellUsed,
     parsed.data.verbose_timing || false
@@ -419,6 +526,20 @@ export async function interactWithProcess(args: unknown): Promise<ServerResult>
     verbose_timing = false
   } = parsed.data;
 
+  // Check if this is a virtual Node session (node:local)
+  if (virtualNodeSessions.has(pid)) {
+    const session = virtualNodeSessions.get(pid)!;
+    capture('server_interact_with_process_node_fallback', {
+      pid: pid,
+      inputLength: input.length
+    });
+
+    // Execute code via temp file approach
+    // Respect per-call timeout if provided, otherwise use session default
+    const effectiveTimeout = timeout_ms ?? session.timeout_ms;
+    return executeNodeCode(input, effectiveTimeout);
+  }
+
   // Timing telemetry
   const startTime = Date.now();
   let firstOutputTime: number | undefined;
@@ -639,13 +760,26 @@ export async function forceTerminate(args: unknown): Promise<ServerResult> {
     };
   }
 
-  const success = terminalManager.forceTerminate(parsed.data.pid);
+  const pid = parsed.data.pid;
+
+  // Handle virtual Node.js sessions (node:local)
+  if (virtualNodeSessions.has(pid)) {
+    virtualNodeSessions.delete(pid);
+    return {
+      content: [{
+        type: "text",
+        text: `Cleared virtual Node.js session ${pid}`
+      }],
+    };
+  }
+
+  const success = terminalManager.forceTerminate(pid);
   return {
     content: [{
       type: "text",
       text: success
-        ? `Successfully initiated termination of session ${parsed.data.pid}`
-        : `No active session found for PID ${parsed.data.pid}`
+        ? `Successfully initiated termination of session ${pid}`
+        : `No active session found for PID ${pid}`
     }],
   };
 }
@@ -655,14 +789,30 @@ export async function forceTerminate(args: unknown): Promise<ServerResult> {
  */
 export async function listSessions(): Promise<ServerResult> {
   const sessions = terminalManager.listActiveSessions();
+
+  // Include virtual Node.js sessions
+  const virtualSessions = Array.from(virtualNodeSessions.entries()).map(([pid, session]) => ({
+    pid,
+    type: 'node:local',
+    timeout_ms: session.timeout_ms
+  }));
+
+  const realSessionsText = sessions.map(s =>
+    `PID: ${s.pid}, Blocked: ${s.isBlocked}, Runtime: ${Math.round(s.runtime / 1000)}s`
+  );
+
+  const virtualSessionsText = virtualSessions.map(s =>
+    `PID: ${s.pid} (node:local), Timeout: ${s.timeout_ms}ms`
+  );
+
+  const allSessions = [...realSessionsText, ...virtualSessionsText];
+
   return {
     content: [{
       type: "text",
-      text: sessions.length === 0
+      text: allSessions.length === 0
         ? 'No active sessions'
-        : sessions.map(s =>
-            `PID: ${s.pid}, Blocked: ${s.isBlocked}, Runtime: ${Math.round(s.runtime / 1000)}s`
-          ).join('\n')
+        : allSessions.join('\n')
     }],
   };
 }
\ No newline at end of file
diff --git a/src/tools/schemas.ts b/src/tools/schemas.ts
index c521d713..73b4bfc7 100644
--- a/src/tools/schemas.ts
+++ b/src/tools/schemas.ts
@@ -47,6 +47,9 @@ export const ReadFileArgsSchema = z.object({
   isUrl: z.boolean().optional().default(false),
   offset: z.number().optional().default(0),
   length: z.number().optional().default(1000),
+  sheet: z.string().optional(),  // String only for MCP client compatibility (Cursor doesn't support union types in JSON Schema)
+  range: z.string().optional(),
+  options: z.record(z.any()).optional()
 });
 
 export const ReadMultipleFilesArgsSchema = z.object({
@@ -77,13 +80,26 @@ export const GetFileInfoArgsSchema = z.object({
   path: z.string(),
 });
 
-// Edit tools schema
+// Edit tools schema - SIMPLIFIED from three modes to two
+// Previously supported: text replacement, location-based edits (edits array), and range rewrites
+// Now supports only: text replacement and range rewrites
+// Removed 'edits' array parameter - location-based surgical edits were complex and unnecessary
+// Range rewrites are more powerful and cover all structured file editing needs
 export const EditBlockArgsSchema = z.object({
   file_path: z.string(),
-  old_string: z.string(),
-  new_string: z.string(),
+  // Text file string replacement
+  old_string: z.string().optional(),
+  new_string: z.string().optional(),
   expected_replacements: z.number().optional().default(1),
-});
+  // Structured file range rewrite (Excel, etc.)
+  range: z.string().optional(),
+  content: z.any().optional(),
+  options: z.record(z.any()).optional()
+}).refine(
+  data => (data.old_string !== undefined && data.new_string !== undefined) ||
+          (data.range !== undefined && data.content !== undefined),
+  { message: "Must provide either (old_string + new_string) or (range + content)" }
+);
 
 // Send input to process schema
 export const InteractWithProcessArgsSchema = z.object({
@@ -146,4 +162,5 @@ export const GetRecentToolCallsArgsSchema = z.object({
   maxResults: z.number().min(1).max(1000).optional().default(50),
   toolName: z.string().optional(),
   since: z.string().datetime().optional(),
-});
\ No newline at end of file
+});
+
diff --git a/src/utils/files/base.ts b/src/utils/files/base.ts
new file mode 100644
index 00000000..0a750bed
--- /dev/null
+++ b/src/utils/files/base.ts
@@ -0,0 +1,200 @@
+/**
+ * Base interfaces and types for file handling system
+ * All file handlers implement the FileHandler interface
+ */
+
+// ============================================================================
+// Core Interfaces
+// ============================================================================
+
+/**
+ * Base interface that all file handlers must implement
+ */
+export interface FileHandler {
+    /**
+     * Read file content
+     * @param path Validated file path
+     * @param options Read options (offset, length, sheet, etc.)
+     * @returns File result with content and metadata
+     */
+    read(path: string, options?: ReadOptions): Promise<FileResult>;
+
+    /**
+     * Write file (complete rewrite or append)
+     * @param path Validated file path
+     * @param content Content to write
+     * @param mode Write mode: 'rewrite' (default) or 'append'
+     */
+    write(path: string, content: any, mode?: 'rewrite' | 'append'): Promise<void>;
+
+    /**
+     * Edit a specific range (bulk rewrite)
+     * PRIMARY METHOD for structured file editing (Excel, etc.)
+     * Simpler and more powerful than location-based edits
+     * Supports:
+     * - Cell ranges: "Sheet1!A1:C10" with 2D array content
+     * - Whole sheets: "Sheet1" to replace entire sheet
+     * - Chunking: Update 1000 rows at a time for large files
+     *
+     * Currently implemented by: ExcelFileHandler
+     * TECHNICAL DEBT: TextFileHandler should also implement this for search/replace
+     * (logic currently in src/tools/edit.ts - see comments there)
+     *
+     * @param path Validated file path
+     * @param range Range identifier (e.g., "Sheet1!A1:C10" or "Sheet1")
+     * @param content New content for the range (2D array for Excel)
+     * @param options Additional format-specific options
+     * @returns Result with success status
+     */
+    editRange?(path: string, range: string, content: any, options?: Record<string, any>): Promise<EditResult>;
+
+    /**
+     * Get file metadata
+     * @param path Validated file path
+     * @returns File information including type-specific metadata
+     */
+    getInfo(path: string): Promise<FileInfo>;
+
+    /**
+     * Check if this handler can handle the given file
+     * @param path File path
+     * @returns true if this handler supports this file type (can be async for content-based checks)
+     */
+    canHandle(path: string): boolean | Promise<boolean>;
+}
+
+// ============================================================================
+// Read Operations
+// ============================================================================
+
+/**
+ * Options for reading files
+ */
+export interface ReadOptions {
+    /** Whether the path is a URL */
+    isUrl?: boolean;
+
+    /** Starting line/row number (for text/excel) */
+    offset?: number;
+
+    /** Maximum number of lines/rows to read */
+    length?: number;
+
+    /** Excel-specific: Sheet name or index */
+    sheet?: string | number;
+
+    /** Excel-specific: Cell range (e.g., "A1:C10") */
+    range?: string;
+
+    /** Whether to include status messages (default: true) */
+    includeStatusMessage?: boolean;
+}
+
+/**
+ * Result from reading a file
+ */
+export interface FileResult {
+    /** File content (string for text/csv, Buffer for binary, base64 string for images) */
+    content: string | Buffer;
+
+    /** MIME type of the content */
+    mimeType: string;
+
+    /** Type-specific metadata */
+    metadata?: FileMetadata;
+}
+
+/**
+ * File-type specific metadata
+ */
+export interface FileMetadata {
+    /** For images */
+    isImage?: boolean;
+
+    /** For binary files */
+    isBinary?: boolean;
+
+    /** For Excel files */
+    isExcelFile?: boolean;
+    sheets?: ExcelSheet[];
+    fileSize?: number;
+    isLargeFile?: boolean;
+
+    /** For text files */
+    lineCount?: number;
+
+    /** Error information if operation failed */
+    error?: boolean;
+    errorMessage?: string;
+}
+
+/**
+ * Excel sheet metadata
+ */
+export interface ExcelSheet {
+    /** Sheet name */
+    name: string;
+
+    /** Number of rows in sheet */
+    rowCount: number;
+
+    /** Number of columns in sheet */
+    colCount: number;
+}
+
+// ============================================================================
+// Edit Operations
+// ============================================================================
+
+/**
+ * Result from edit operation (used by editRange)
+ */
+export interface EditResult {
+    /** Whether all edits succeeded */
+    success: boolean;
+
+    /** Number of edits successfully applied */
+    editsApplied: number;
+
+    /** Errors that occurred during editing */
+    errors?: Array<{
+        location: string;
+        error: string;
+    }>;
+}
+
+// ============================================================================
+// File Information
+// ============================================================================
+
+/**
+ * File information and metadata
+ */
+export interface FileInfo {
+    /** File size in bytes */
+    size: number;
+
+    /** Creation time */
+    created: Date;
+
+    /** Last modification time */
+    modified: Date;
+
+    /** Last access time */
+    accessed: Date;
+
+    /** Is this a directory */
+    isDirectory: boolean;
+
+    /** Is this a regular file */
+    isFile: boolean;
+
+    /** File permissions (octal string) */
+    permissions: string;
+
+    /** File type classification */
+    fileType: 'text' | 'excel' | 'image' | 'binary';
+
+    /** Type-specific metadata */
+    metadata?: FileMetadata;
+}
diff --git a/src/utils/files/binary.ts b/src/utils/files/binary.ts
new file mode 100644
index 00000000..245bb01f
--- /dev/null
+++ b/src/utils/files/binary.ts
@@ -0,0 +1,79 @@
+/**
+ * Binary file handler
+ * Handles binary files that aren't supported by other handlers (Excel, Image)
+ * Uses isBinaryFile for content-based detection
+ * Returns instructions to use start_process with appropriate tools
+ */
+
+import fs from "fs/promises";
+import path from "path";
+import { isBinaryFile } from 'isbinaryfile';
+import {
+    FileHandler,
+    ReadOptions,
+    FileResult,
+    FileInfo
+} from './base.js';
+
+/**
+ * Binary file handler implementation
+ * Uses content-based detection via isBinaryFile
+ */
+export class BinaryFileHandler implements FileHandler {
+    async canHandle(filePath: string): Promise<boolean> {
+        // Content-based binary detection using isBinaryFile
+        try {
+            return await isBinaryFile(filePath);
+        } catch (error) {
+            // If we can't check (file doesn't exist, etc.), don't handle it
+            return false;
+        }
+    }
+
+    async read(filePath: string, options?: ReadOptions): Promise<FileResult> {
+        const instructions = this.getBinaryInstructions(filePath);
+
+        return {
+            content: instructions,
+            mimeType: 'text/plain',
+            metadata: {
+                isBinary: true
+            }
+        };
+    }
+
+    async write(path: string, content: any): Promise<void> {
+        throw new Error('Cannot write binary files directly. Use start_process with appropriate tools (Python, Node.js libraries, command-line utilities).');
+    }
+
+    async getInfo(path: string): Promise<FileInfo> {
+        const stats = await fs.stat(path);
+
+        return {
+            size: stats.size,
+            created: stats.birthtime,
+            modified: stats.mtime,
+            accessed: stats.atime,
+            isDirectory: stats.isDirectory(),
+            isFile: stats.isFile(),
+            permissions: stats.mode.toString(8).slice(-3),
+            fileType: 'binary',
+            metadata: {
+                isBinary: true
+            }
+        };
+    }
+
+    /**
+     * Generate instructions for handling binary files
+     */
+    private getBinaryInstructions(filePath: string): string {
+        const fileName = path.basename(filePath);
+
+        return `Cannot read binary file as text: ${fileName}
+
+Use start_process + interact_with_process to analyze binary files with appropriate tools (Node.js or Python libraries, command-line utilities, etc.).
+
+The read_file tool only handles text files, images, and Excel files.`;
+    }
+}
diff --git a/src/utils/files/excel.ts b/src/utils/files/excel.ts
new file mode 100644
index 00000000..5c0a9df1
--- /dev/null
+++ b/src/utils/files/excel.ts
@@ -0,0 +1,486 @@
+/**
+ * Excel file handler using ExcelJS
+ * Handles reading, writing, and editing Excel files (.xlsx, .xls, .xlsm)
+ */
+
+import ExcelJS from 'exceljs';
+import fs from 'fs/promises';
+import {
+    FileHandler,
+    ReadOptions,
+    FileResult,
+    EditResult,
+    FileInfo,
+    ExcelSheet
+} from './base.js';
+
+// File size limit: 10MB
+const FILE_SIZE_LIMIT = 10 * 1024 * 1024;
+
+/**
+ * Excel file metadata (internal use only)
+ */
+interface ExcelMetadata {
+    sheets: ExcelSheet[];
+    fileSize: number;
+    isLargeFile: boolean;
+}
+
+/**
+ * Excel file handler implementation using ExcelJS
+ * Supports: .xlsx, .xls, .xlsm files
+ */
+export class ExcelFileHandler implements FileHandler {
+
+    canHandle(path: string): boolean {
+        const ext = path.toLowerCase();
+        return ext.endsWith('.xlsx') || ext.endsWith('.xls') || ext.endsWith('.xlsm');
+    }
+
+    async read(path: string, options?: ReadOptions): Promise<FileResult> {
+        await this.checkFileSize(path);
+
+        const workbook = new ExcelJS.Workbook();
+        await workbook.xlsx.readFile(path);
+
+        const metadata = await this.extractMetadata(workbook, path);
+        const { sheetName, data, totalRows, returnedRows } = this.worksheetToArray(
+            workbook,
+            options?.sheet,
+            options?.range,
+            options?.offset,
+            options?.length
+        );
+
+        // Format output with sheet info header, usage hint, and JSON data
+        const paginationInfo = totalRows > returnedRows
+            ? `\n[Showing rows ${(options?.offset || 0) + 1}-${(options?.offset || 0) + returnedRows} of ${totalRows} total. Use offset/length to paginate.]`
+            : '';
+
+        const content = `[Sheet: '${sheetName}' from ${path}]${paginationInfo}
+[To MODIFY cells: use edit_block with range param, e.g., edit_block(path, {range: "Sheet1!E5", content: [[newValue]]})]
+
+${JSON.stringify(data)}`;
+
+        return {
+            content,
+            mimeType: 'application/json',
+            metadata: {
+                isExcelFile: true,
+                sheets: metadata.sheets,
+                fileSize: metadata.fileSize,
+                isLargeFile: metadata.isLargeFile
+            }
+        };
+    }
+
+    async write(path: string, content: any, mode?: 'rewrite' | 'append'): Promise<void> {
+        // Check existing file size if it exists
+        try {
+            await this.checkFileSize(path);
+        } catch (error) {
+            // File doesn't exist - that's fine for write
+            if ((error as any).code !== 'ENOENT' &&
+                !(error instanceof Error && error.message.includes('ENOENT'))) {
+                throw error;
+            }
+        }
+
+        // Parse content
+        let parsedContent = content;
+        if (typeof content === 'string') {
+            try {
+                parsedContent = JSON.parse(content);
+            } catch {
+                throw new Error('Invalid content format. Expected JSON string with 2D array or object with sheet names.');
+            }
+        }
+
+        // Handle append mode by finding last row and writing after it
+        if (mode === 'append') {
+            try {
+                const workbook = new ExcelJS.Workbook();
+                await workbook.xlsx.readFile(path);
+
+                if (Array.isArray(parsedContent)) {
+                    // Append to Sheet1
+                    let worksheet = workbook.getWorksheet('Sheet1');
+                    if (!worksheet) {
+                        worksheet = workbook.addWorksheet('Sheet1');
+                    }
+                    const startRow = (worksheet.actualRowCount || 0) + 1;
+                    this.writeRowsStartingAt(worksheet, startRow, parsedContent);
+                } else if (typeof parsedContent === 'object' && parsedContent !== null) {
+                    // Append to each named sheet
+                    for (const [sheetName, data] of Object.entries(parsedContent)) {
+                        if (Array.isArray(data)) {
+                            let worksheet = workbook.getWorksheet(sheetName);
+                            if (!worksheet) {
+                                worksheet = workbook.addWorksheet(sheetName);
+                            }
+                            const startRow = (worksheet.actualRowCount || 0) + 1;
+                            this.writeRowsStartingAt(worksheet, startRow, data as any[][]);
+                        }
+                    }
+                }
+
+                await workbook.xlsx.writeFile(path);
+                return;
+            } catch (error) {
+                // File doesn't exist - fall through to create new file
+                if ((error as any).code !== 'ENOENT' &&
+                    !(error instanceof Error && error.message.includes('ENOENT'))) {
+                    throw error;
+                }
+            }
+        }
+
+        // Rewrite mode (or append to non-existent file): create new workbook
+        const workbook = new ExcelJS.Workbook();
+
+        if (Array.isArray(parsedContent)) {
+            // Single sheet from 2D array
+            this.writeDataToSheet(workbook, 'Sheet1', parsedContent);
+        } else if (typeof parsedContent === 'object' && parsedContent !== null) {
+            // Object with sheet names as keys
+            for (const [sheetName, data] of Object.entries(parsedContent)) {
+                if (Array.isArray(data)) {
+                    this.writeDataToSheet(workbook, sheetName, data as any[][]);
+                }
+            }
+        } else {
+            throw new Error('Invalid content format. Expected 2D array or object with sheet names.');
+        }
+
+        await workbook.xlsx.writeFile(path);
+    }
+
+    async editRange(path: string, range: string, content: any, options?: Record<string, any>): Promise<EditResult> {
+        // Verify file exists and check size
+        try {
+            await this.checkFileSize(path);
+        } catch (error) {
+            if ((error as any).code === 'ENOENT' ||
+                (error instanceof Error && error.message.includes('ENOENT'))) {
+                throw new Error(`File not found: ${path}`);
+            }
+            throw error;
+        }
+
+        // Validate content
+        if (!Array.isArray(content)) {
+            throw new Error('Content must be a 2D array for range editing');
+        }
+
+        // Parse range: "Sheet1!A1:C10" or "Sheet1"
+        const [sheetName, cellRange] = this.parseRange(range);
+
+        const workbook = new ExcelJS.Workbook();
+        await workbook.xlsx.readFile(path);
+
+        // Get or create sheet
+        let worksheet = workbook.getWorksheet(sheetName);
+        if (!worksheet) {
+            worksheet = workbook.addWorksheet(sheetName);
+        }
+
+        if (cellRange) {
+            // Write to specific range
+            const { startRow, startCol } = this.parseCellRange(cellRange);
+
+            for (let r = 0; r < content.length; r++) {
+                const rowData = content[r];
+                if (!Array.isArray(rowData)) continue;
+
+                for (let c = 0; c < rowData.length; c++) {
+                    const cell = worksheet.getCell(startRow + r, startCol + c);
+                    const value = rowData[c];
+
+                    if (typeof value === 'string' && value.startsWith('=')) {
+                        cell.value = { formula: value.substring(1) };
+                    } else {
+                        cell.value = value;
+                    }
+                }
+            }
+        } else {
+            // Replace entire sheet content
+            // Clear existing data
+            worksheet.eachRow((row, rowNumber) => {
+                row.eachCell((cell) => {
+                    cell.value = null;
+                });
+            });
+
+            // Write new data
+            for (let r = 0; r < content.length; r++) {
+                const rowData = content[r];
+                if (!Array.isArray(rowData)) continue;
+
+                const row = worksheet.getRow(r + 1);
+                for (let c = 0; c < rowData.length; c++) {
+                    const value = rowData[c];
+                    if (typeof value === 'string' && value.startsWith('=')) {
+                        row.getCell(c + 1).value = { formula: value.substring(1) };
+                    } else {
+                        row.getCell(c + 1).value = value;
+                    }
+                }
+                row.commit();
+            }
+        }
+
+        await workbook.xlsx.writeFile(path);
+
+        return { success: true, editsApplied: 1 };
+    }
+
+    async getInfo(path: string): Promise<FileInfo> {
+        const stats = await fs.stat(path);
+
+        try {
+            const workbook = new ExcelJS.Workbook();
+            await workbook.xlsx.readFile(path);
+            const metadata = await this.extractMetadata(workbook, path);
+
+            return {
+                size: stats.size,
+                created: stats.birthtime,
+                modified: stats.mtime,
+                accessed: stats.atime,
+                isDirectory: stats.isDirectory(),
+                isFile: stats.isFile(),
+                permissions: stats.mode.toString(8).slice(-3),
+                fileType: 'excel',
+                metadata: {
+                    isExcelFile: true,
+                    sheets: metadata.sheets,
+                    fileSize: metadata.fileSize,
+                    isLargeFile: metadata.isLargeFile
+                }
+            };
+        } catch (error) {
+            return {
+                size: stats.size,
+                created: stats.birthtime,
+                modified: stats.mtime,
+                accessed: stats.atime,
+                isDirectory: stats.isDirectory(),
+                isFile: stats.isFile(),
+                permissions: stats.mode.toString(8).slice(-3),
+                fileType: 'excel',
+                metadata: {
+                    isExcelFile: true,
+                    fileSize: stats.size,
+                    error: true,
+                    errorMessage: error instanceof Error ? error.message : String(error)
+                }
+            };
+        }
+    }
+
+    // ========== Private Helpers ==========
+
+    private async checkFileSize(path: string): Promise<void> {
+        const stats = await fs.stat(path);
+        if (stats.size > FILE_SIZE_LIMIT) {
+            const sizeMB = (stats.size / 1024 / 1024).toFixed(1);
+            throw new Error(
+                `Excel file size (${sizeMB}MB) exceeds 10MB limit. ` +
+                `Consider using specialized tools for large file processing.`
+            );
+        }
+    }
+
+    private async extractMetadata(workbook: ExcelJS.Workbook, path: string): Promise<ExcelMetadata> {
+        const stats = await fs.stat(path);
+
+        const sheets: ExcelSheet[] = workbook.worksheets.map(ws => ({
+            name: ws.name,
+            rowCount: ws.actualRowCount || 0,
+            colCount: ws.actualColumnCount || 0
+        }));
+
+        return {
+            sheets,
+            fileSize: stats.size,
+            isLargeFile: stats.size > FILE_SIZE_LIMIT
+        };
+    }
+
+    private worksheetToArray(
+        workbook: ExcelJS.Workbook,
+        sheetRef?: string | number,
+        range?: string,
+        offset?: number,
+        length?: number
+    ): { sheetName: string; data: any[][]; totalRows: number; returnedRows: number } {
+        if (workbook.worksheets.length === 0) {
+            return { sheetName: '', data: [], totalRows: 0, returnedRows: 0 };
+        }
+
+        // Find target worksheet
+        let worksheet: ExcelJS.Worksheet | undefined;
+        let sheetName: string;
+
+        if (sheetRef === undefined) {
+            worksheet = workbook.worksheets[0];
+            sheetName = worksheet.name;
+        } else if (typeof sheetRef === 'number') {
+            if (sheetRef < 0 || sheetRef >= workbook.worksheets.length) {
+                throw new Error(`Sheet index ${sheetRef} out of range (0-${workbook.worksheets.length - 1})`);
+            }
+            worksheet = workbook.worksheets[sheetRef];
+            sheetName = worksheet.name;
+        } else {
+            worksheet = workbook.getWorksheet(sheetRef);
+            if (!worksheet) {
+                const available = workbook.worksheets.map(ws => ws.name).join(', ');
+                throw new Error(`Sheet "${sheetRef}" not found. Available sheets: ${available}`);
+            }
+            sheetName = sheetRef;
+        }
+
+        // Determine range to read
+        let startRow = 1;
+        let endRow = worksheet.actualRowCount || 1;
+        let startCol = 1;
+        let endCol = worksheet.actualColumnCount || 1;
+
+        if (range) {
+            const parsed = this.parseCellRange(range);
+            startRow = parsed.startRow;
+            startCol = parsed.startCol;
+            if (parsed.endRow) endRow = parsed.endRow;
+            if (parsed.endCol) endCol = parsed.endCol;
+        }
+
+        // Calculate total rows before pagination
+        const totalRows = endRow - startRow + 1;
+
+        // Apply offset/length pagination (row-based, matching text file behavior)
+        if (offset !== undefined) {
+            if (offset < 0) {
+                // Negative offset: last N rows (like text files)
+                // offset: -10 means "last 10 rows"
+                const lastNRows = Math.abs(offset);
+                startRow = Math.max(startRow, endRow - lastNRows + 1);
+            } else if (offset > 0) {
+                // Positive offset: skip first N rows
+                startRow = startRow + offset;
+            }
+        }
+
+        // Apply length limit (only for positive offset or no offset)
+        if (length !== undefined && length > 0 && (offset === undefined || offset >= 0)) {
+            endRow = Math.min(endRow, startRow + length - 1);
+        }
+
+        // Ensure valid range
+        if (startRow > endRow) {
+            return { sheetName, data: [], totalRows, returnedRows: 0 };
+        }
+
+        // Build 2D array (preserving types)
+        const data: any[][] = [];
+        for (let r = startRow; r <= endRow; r++) {
+            const row = worksheet.getRow(r);
+            const rowData: any[] = [];
+
+            for (let c = startCol; c <= endCol; c++) {
+                const cell = row.getCell(c);
+                let value: any = null;
+
+                if (cell.value !== null && cell.value !== undefined) {
+                    if (typeof cell.value === 'object') {
+                        // Handle formula results, rich text, etc.
+                        if ('result' in cell.value) {
+                            value = cell.value.result ?? null;
+                        } else if ('richText' in cell.value) {
+                            value = (cell.value as any).richText.map((rt: any) => rt.text).join('');
+                        } else if ('text' in cell.value) {
+                            value = (cell.value as any).text;
+                        } else if (cell.value instanceof Date) {
+                            value = cell.value.toISOString();
+                        } else {
+                            value = String(cell.value);
+                        }
+                    } else {
+                        // Preserve native types (string, number, boolean)
+                        value = cell.value;
+                    }
+                }
+
+                rowData.push(value);
+            }
+            data.push(rowData);
+        }
+
+        return { sheetName, data, totalRows, returnedRows: data.length };
+    }
+
+    private writeDataToSheet(workbook: ExcelJS.Workbook, sheetName: string, data: any[][]): void {
+        // Remove existing sheet if it exists
+        const existing = workbook.getWorksheet(sheetName);
+        if (existing) {
+            workbook.removeWorksheet(existing.id);
+        }
+
+        const worksheet = workbook.addWorksheet(sheetName);
+        this.writeRowsStartingAt(worksheet, 1, data);
+    }
+
+    private writeRowsStartingAt(worksheet: ExcelJS.Worksheet, startRow: number, data: any[][]): void {
+        for (let r = 0; r < data.length; r++) {
+            const rowData = data[r];
+            if (!Array.isArray(rowData)) continue;
+
+            const row = worksheet.getRow(startRow + r);
+            for (let c = 0; c < rowData.length; c++) {
+                const value = rowData[c];
+                if (typeof value === 'string' && value.startsWith('=')) {
+                    row.getCell(c + 1).value = { formula: value.substring(1) };
+                } else {
+                    row.getCell(c + 1).value = value;
+                }
+            }
+            row.commit();
+        }
+    }
+
+    private parseRange(range: string): [string, string | null] {
+        if (range.includes('!')) {
+            const [sheetName, cellRange] = range.split('!');
+            return [sheetName, cellRange];
+        }
+        return [range, null];
+    }
+
+    private parseCellRange(range: string): { startRow: number; startCol: number; endRow?: number; endCol?: number } {
+        // Parse A1 or A1:C10 format
+        const match = range.match(/^([A-Z]+)(\d+)(?::([A-Z]+)(\d+))?$/i);
+        if (!match) {
+            throw new Error(`Invalid cell range: ${range}`);
+        }
+
+        const startCol = this.columnToNumber(match[1]);
+        const startRow = parseInt(match[2], 10);
+
+        if (match[3] && match[4]) {
+            const endCol = this.columnToNumber(match[3]);
+            const endRow = parseInt(match[4], 10);
+            return { startRow, startCol, endRow, endCol };
+        }
+
+        return { startRow, startCol };
+    }
+
+    private columnToNumber(col: string): number {
+        let result = 0;
+        for (let i = 0; i < col.length; i++) {
+            result = result * 26 + col.charCodeAt(i) - 64;
+        }
+        return result;
+    }
+}
+
diff --git a/src/utils/files/factory.ts b/src/utils/files/factory.ts
new file mode 100644
index 00000000..e5f64a34
--- /dev/null
+++ b/src/utils/files/factory.ts
@@ -0,0 +1,98 @@
+/**
+ * Factory pattern for creating appropriate file handlers
+ * Routes file operations to the correct handler based on file type
+ *
+ * Each handler implements canHandle() which can be sync (extension-based)
+ * or async (content-based like BinaryFileHandler using isBinaryFile)
+ */
+
+import { FileHandler } from './base.js';
+import { TextFileHandler } from './text.js';
+import { ImageFileHandler } from './image.js';
+import { BinaryFileHandler } from './binary.js';
+import { ExcelFileHandler } from './excel.js';
+
+// Singleton instances of each handler
+let excelHandler: ExcelFileHandler | null = null;
+let imageHandler: ImageFileHandler | null = null;
+let textHandler: TextFileHandler | null = null;
+let binaryHandler: BinaryFileHandler | null = null;
+
+/**
+ * Initialize handlers (lazy initialization)
+ */
+function getExcelHandler(): ExcelFileHandler {
+    if (!excelHandler) excelHandler = new ExcelFileHandler();
+    return excelHandler;
+}
+
+function getImageHandler(): ImageFileHandler {
+    if (!imageHandler) imageHandler = new ImageFileHandler();
+    return imageHandler;
+}
+
+function getTextHandler(): TextFileHandler {
+    if (!textHandler) textHandler = new TextFileHandler();
+    return textHandler;
+}
+
+function getBinaryHandler(): BinaryFileHandler {
+    if (!binaryHandler) binaryHandler = new BinaryFileHandler();
+    return binaryHandler;
+}
+
+/**
+ * Get the appropriate file handler for a given file path
+ *
+ * Each handler's canHandle() determines if it can process the file.
+ * Extension-based handlers (Excel, Image) return sync boolean.
+ * BinaryFileHandler uses async isBinaryFile for content-based detection.
+ *
+ * Priority order:
+ * 1. Excel files (xlsx, xls, xlsm) - extension based
+ * 2. Image files (png, jpg, gif, webp) - extension based
+ * 3. Binary files - content-based detection via isBinaryFile
+ * 4. Text files (default)
+ *
+ * @param filePath File path to get handler for
+ * @returns FileHandler instance that can handle this file
+ */
+export async function getFileHandler(filePath: string): Promise<FileHandler> {
+    // Check Excel first (extension-based, sync)
+    if (getExcelHandler().canHandle(filePath)) {
+        return getExcelHandler();
+    }
+
+    // Check Image (extension-based, sync - images are binary but handled specially)
+    if (getImageHandler().canHandle(filePath)) {
+        return getImageHandler();
+    }
+
+    // Check Binary (content-based, async via isBinaryFile)
+    if (await getBinaryHandler().canHandle(filePath)) {
+        return getBinaryHandler();
+    }
+
+    // Default to text handler
+    return getTextHandler();
+}
+
+/**
+ * Check if a file path is an Excel file
+ * Delegates to ExcelFileHandler.canHandle to avoid duplicating extension logic
+ * @param path File path
+ * @returns true if file is Excel format
+ */
+export function isExcelFile(path: string): boolean {
+    return getExcelHandler().canHandle(path);
+}
+
+/**
+ * Check if a file path is an image file
+ * Delegates to ImageFileHandler.canHandle to avoid duplicating extension logic
+ * @param path File path
+ * @returns true if file is an image format
+ */
+export function isImageFile(path: string): boolean {
+    return getImageHandler().canHandle(path);
+}
diff --git a/src/utils/files/image.ts b/src/utils/files/image.ts
new file mode 100644
index 00000000..4e97ce9b
--- /dev/null
+++ b/src/utils/files/image.ts
@@ -0,0 +1,93 @@
+/**
+ * Image file handler
+ * Handles reading image files and converting to base64
+ */
+
+import fs from "fs/promises";
+import {
+    FileHandler,
+    ReadOptions,
+    FileResult,
+    FileInfo
+} from './base.js';
+
+/**
+ * Image file handler implementation
+ * Supports: PNG, JPEG, GIF, WebP, BMP, SVG
+ */
+export class ImageFileHandler implements FileHandler {
+    private static readonly IMAGE_EXTENSIONS = [
+        '.png', '.jpg', '.jpeg', '.gif', '.webp', '.bmp', '.svg'
+    ];
+
+    private static readonly IMAGE_MIME_TYPES: { [key: string]: string } = {
+        '.png': 'image/png',
+        '.jpg': 'image/jpeg',
+        '.jpeg': 'image/jpeg',
+        '.gif': 'image/gif',
+        '.webp': 'image/webp',
+        '.bmp': 'image/bmp',
+        '.svg': 'image/svg+xml'
+    };
+
+    canHandle(path: string): boolean {
+        const lowerPath = path.toLowerCase();
+        return ImageFileHandler.IMAGE_EXTENSIONS.some(ext => lowerPath.endsWith(ext));
+    }
+
+    async read(path: string, options?: ReadOptions): Promise<FileResult> {
+        // Images are always read in full, ignoring offset and length
+        const buffer = await fs.readFile(path);
+        const content = buffer.toString('base64');
+        const mimeType = this.getMimeType(path);
+
+        return {
+            content,
+            mimeType,
+            metadata: {
+                isImage: true
+            }
+        };
+    }
+
+    async write(path: string, content: Buffer | string): Promise<void> {
+        // If content is base64 string, convert to buffer
+        if (typeof content === 'string') {
+            const buffer = Buffer.from(content, 'base64');
+            await fs.writeFile(path, buffer);
+        } else {
+            await fs.writeFile(path, content);
+        }
+    }
+
+    async getInfo(path: string): Promise<FileInfo> {
+        const stats = await fs.stat(path);
+
+        return {
+            size: stats.size,
+            created: stats.birthtime,
+            modified: stats.mtime,
+            accessed: stats.atime,
+            isDirectory: stats.isDirectory(),
+            isFile: stats.isFile(),
+            permissions: stats.mode.toString(8).slice(-3),
+            fileType: 'image',
+            metadata: {
+                isImage: true
+            }
+        };
+    }
+
+    /**
+     * Get MIME type for image based on file extension
+     */
+    private getMimeType(path: string): string {
+        const lowerPath = path.toLowerCase();
+        for (const [ext, mimeType] of Object.entries(ImageFileHandler.IMAGE_MIME_TYPES)) {
+            if (lowerPath.endsWith(ext)) {
+                return mimeType;
+            }
+        }
+        return 'application/octet-stream'; // Fallback
+    }
+}
diff --git a/src/utils/files/index.ts b/src/utils/files/index.ts
new file mode 100644
index 00000000..c35e0642
--- /dev/null
+++ b/src/utils/files/index.ts
@@ -0,0 +1,16 @@
+/**
+ * File handling system
+ * Exports all file handlers, interfaces, and utilities
+ */
+
+// Base interfaces and types
+export * from './base.js';
+
+// Factory function
+export { getFileHandler, isExcelFile, isImageFile } from './factory.js';
+
+// File handlers
+export { TextFileHandler } from './text.js';
+export { ImageFileHandler } from './image.js';
+export { BinaryFileHandler } from './binary.js';
+export { ExcelFileHandler } from './excel.js';
diff --git a/src/utils/files/text.ts b/src/utils/files/text.ts
new file mode 100644
index 00000000..18d408f7
--- /dev/null
+++ b/src/utils/files/text.ts
@@ -0,0 +1,442 @@
+/**
+ * Text file handler
+ * Handles reading, writing, and editing text files
+ *
+ * Binary detection is handled at the factory level (factory.ts) using isBinaryFile.
+ * This handler only receives files that have been confirmed as text.
+ *
+ * TECHNICAL DEBT:
+ * This handler is missing editRange() - text search/replace logic currently lives in
+ * src/tools/edit.ts (performSearchReplace function) instead of here.
+ *
+ * For architectural consistency with ExcelFileHandler.editRange(), the fuzzy
+ * search/replace logic should be moved here. See comment in src/tools/edit.ts.
+ */
+
+import fs from "fs/promises";
+import path from "path";
+import { createReadStream } from 'fs';
+import { createInterface } from 'readline';
+import {
+    FileHandler,
+    ReadOptions,
+    FileResult,
+    FileInfo
+} from './base.js';
+
+// TODO: Centralize these constants with filesystem.ts to avoid silent drift
+// These duplicate concepts from filesystem.ts and should be moved to a shared
+// constants module (e.g., src/utils/files/constants.ts) during reorganization
+const FILE_SIZE_LIMITS = {
+    LARGE_FILE_THRESHOLD: 10 * 1024 * 1024,  // 10MB
+    LINE_COUNT_LIMIT: 10 * 1024 * 1024,      // 10MB for line counting
+} as const;
+
+const READ_PERFORMANCE_THRESHOLDS = {
+    SMALL_READ_THRESHOLD: 100,    // For very small reads
+    DEEP_OFFSET_THRESHOLD: 1000,  // For byte estimation
+    SAMPLE_SIZE: 10000,           // Sample size for estimation
+    CHUNK_SIZE: 8192,             // 8KB chunks for reverse reading
+} as const;
+
+/**
+ * Text file handler implementation
+ * Binary detection is done at the factory level - this handler assumes file is text
+ */
+export class TextFileHandler implements FileHandler {
+    canHandle(_path: string): boolean {
+        // Text handler accepts all files that pass the factory's binary check
+        // The factory routes binary files to BinaryFileHandler before reaching here
+        return true;
+    }
+
+    async read(filePath: string, options?: ReadOptions): Promise<FileResult> {
+        const offset = options?.offset ?? 0;
+        const length = options?.length ?? 1000; // Default from config
+        const includeStatusMessage = options?.includeStatusMessage ?? true;
+
+        // Binary detection is done at factory level - just read as text
+        return this.readFileWithSmartPositioning(filePath, offset, length, 'text/plain', includeStatusMessage);
+    }
+
+    async write(path: string, content: string, mode: 'rewrite' | 'append' = 'rewrite'): Promise<void> {
+        if (mode === 'append') {
+            await fs.appendFile(path, content);
+        } else {
+            await fs.writeFile(path, content);
+        }
+    }
+
+    async getInfo(path: string): Promise<FileInfo> {
+        const stats = await fs.stat(path);
+
+        const info: FileInfo = {
+            size: stats.size,
+            created: stats.birthtime,
+            modified: stats.mtime,
+            accessed: stats.atime,
+            isDirectory: stats.isDirectory(),
+            isFile: stats.isFile(),
+            permissions: stats.mode.toString(8).slice(-3),
+            fileType: 'text',
+            metadata: {}
+        };
+
+        // For text files that aren't too large, count lines
+        if (stats.isFile() && stats.size < FILE_SIZE_LIMITS.LINE_COUNT_LIMIT) {
+            try {
+                const content = await fs.readFile(path, 'utf8');
+                const lineCount = TextFileHandler.countLines(content);
+                info.metadata!.lineCount = lineCount;
+            } catch (error) {
+                // If reading fails, skip line count
+            }
+        }
+
+        return info;
+    }
+
+    // ========================================================================
+    // Private Helper Methods (extracted from filesystem.ts)
+    // ========================================================================
+
+    /**
+     * Count lines in text content
+     * Made static and public for use by other modules (e.g., writeFile telemetry in filesystem.ts)
+     */
+    static countLines(content: string): number {
+        return content.split('\n').length;
+    }
+
+    /**
+     * Get file line count (for files under size limit)
+     */
+    private async getFileLineCount(filePath: string): Promise<number | undefined> {
+        try {
+            const stats = await fs.stat(filePath);
+            if (stats.size < FILE_SIZE_LIMITS.LINE_COUNT_LIMIT) {
+                const content = await fs.readFile(filePath, 'utf8');
+                return TextFileHandler.countLines(content);
+            }
+        } catch (error) {
+            // If we can't read the file, return undefined
+        }
+        return undefined;
+    }
+
+    /**
+     * Generate enhanced status message
+     */
+    private generateEnhancedStatusMessage(
+        readLines: number,
+        offset: number,
+        totalLines?: number,
+        isNegativeOffset: boolean = false
+    ): string {
+        if (isNegativeOffset) {
+            if (totalLines !== undefined) {
+                return `[Reading last ${readLines} lines (total: ${totalLines} lines)]`;
+            } else {
+                return `[Reading last ${readLines} lines]`;
+            }
+        } else {
+            if (totalLines !== undefined) {
+                const endLine = offset + readLines;
+                const remainingLines = Math.max(0, totalLines - endLine);
+
+                if (offset === 0) {
+                    return `[Reading ${readLines} lines from start (total: ${totalLines} lines, ${remainingLines} remaining)]`;
+                } else {
+                    return `[Reading ${readLines} lines from line ${offset} (total: ${totalLines} lines, ${remainingLines} remaining)]`;
+                }
+            } else {
+                if (offset === 0) {
+                    return `[Reading ${readLines} lines from start]`;
+                } else {
+                    return `[Reading ${readLines} lines from line ${offset}]`;
+                }
+            }
+        }
+    }
+
+    /**
+     * Split text into lines while preserving line endings
+     * Made static and public for use by other modules (e.g., readFileInternal in filesystem.ts)
+     */
+    static splitLinesPreservingEndings(content: string): string[] {
+        if (!content) return [''];
+
+        const lines: string[] = [];
+        let currentLine = '';
+
+        for (let i = 0; i < content.length; i++) {
+            const char = content[i];
+            currentLine += char;
+
+            if (char === '\n') {
+                lines.push(currentLine);
+                currentLine = '';
+            } else if (char === '\r') {
+                if (i + 1 < content.length && content[i + 1] === '\n') {
+                    currentLine += content[i + 1];
+                    i++;
+                }
+                lines.push(currentLine);
+                currentLine = '';
+            }
+        }
+
+        if (currentLine) {
+            lines.push(currentLine);
+        }
+
+        return lines;
+    }
+
+    /**
+     * Read file with smart positioning for optimal performance
+     */
+    private async readFileWithSmartPositioning(
+        filePath: string,
+        offset: number,
+        length: number,
+        mimeType: string,
+        includeStatusMessage: boolean = true
+    ): Promise<FileResult> {
+        const stats = await fs.stat(filePath);
+        const fileSize = stats.size;
+
+        const totalLines = await this.getFileLineCount(filePath);
+
+        // For negative offsets (tail behavior), use reverse reading
+        if (offset < 0) {
+            const requestedLines = Math.abs(offset);
+
+            if (fileSize > FILE_SIZE_LIMITS.LARGE_FILE_THRESHOLD &&
+                requestedLines <= READ_PERFORMANCE_THRESHOLDS.SMALL_READ_THRESHOLD) {
+                return await this.readLastNLinesReverse(filePath, requestedLines, mimeType, includeStatusMessage, totalLines);
+            } else {
+                return await this.readFromEndWithReadline(filePath, requestedLines, mimeType, includeStatusMessage, totalLines);
+            }
+        }
+        // For positive offsets
+        else {
+            if (fileSize < FILE_SIZE_LIMITS.LARGE_FILE_THRESHOLD || offset === 0) {
+                return await this.readFromStartWithReadline(filePath, offset, length, mimeType, includeStatusMessage, totalLines);
+            } else {
+                if (offset > READ_PERFORMANCE_THRESHOLDS.DEEP_OFFSET_THRESHOLD) {
+                    return await this.readFromEstimatedPosition(filePath, offset, length, mimeType, includeStatusMessage, totalLines);
+                } else {
+                    return await this.readFromStartWithReadline(filePath, offset, length, mimeType, includeStatusMessage, totalLines);
+                }
+            }
+        }
+    }
+
+    /**
+     * Read last N lines efficiently by reading file backwards
+     */
+    private async readLastNLinesReverse(
+        filePath: string,
+        n: number,
+        mimeType: string,
+        includeStatusMessage: boolean = true,
+        fileTotalLines?: number
+    ): Promise<FileResult> {
+        const fd = await fs.open(filePath, 'r');
+        try {
+            const stats = await fd.stat();
+            const fileSize = stats.size;
+
+            let position = fileSize;
+            let lines: string[] = [];
+            let partialLine = '';
+
+            while (position > 0 && lines.length < n) {
+                const readSize = Math.min(READ_PERFORMANCE_THRESHOLDS.CHUNK_SIZE, position);
+                position -= readSize;
+
+                const buffer = Buffer.alloc(readSize);
+                await fd.read(buffer, 0, readSize, position);
+
+                const chunk = buffer.toString('utf-8');
+                const text = chunk + partialLine;
+                const chunkLines = text.split('\n');
+
+                partialLine = chunkLines.shift() || '';
+                lines = chunkLines.concat(lines);
+            }
+
+            if (position === 0 && partialLine) {
+                lines.unshift(partialLine);
+            }
+
+            const result = lines.slice(-n);
+            const content = includeStatusMessage
+                ? `${this.generateEnhancedStatusMessage(result.length, -n, fileTotalLines, true)}\n\n${result.join('\n')}`
+                : result.join('\n');
+
+            return { content, mimeType, metadata: {} };
+        } finally {
+            await fd.close();
+        }
+    }
+
+    /**
+     * Read from end using readline with circular buffer
+     */
+    private async readFromEndWithReadline(
+        filePath: string,
+        requestedLines: number,
+        mimeType: string,
+        includeStatusMessage: boolean = true,
+        fileTotalLines?: number
+    ): Promise<FileResult> {
+        const rl = createInterface({
+            input: createReadStream(filePath),
+            crlfDelay: Infinity
+        });
+
+        const buffer: string[] = new Array(requestedLines);
+        let bufferIndex = 0;
+        let totalLines = 0;
+
+        for await (const line of rl) {
+            buffer[bufferIndex] = line;
+            bufferIndex = (bufferIndex + 1) % requestedLines;
+            totalLines++;
+        }
+
+        rl.close();
+
+        let result: string[];
+        if (totalLines >= requestedLines) {
+            result = [
+                ...buffer.slice(bufferIndex),
+                ...buffer.slice(0, bufferIndex)
+            ].filter(line => line !== undefined);
+        } else {
+            result = buffer.slice(0, totalLines);
+        }
+
+        const content = includeStatusMessage
+            ? `${this.generateEnhancedStatusMessage(result.length, -requestedLines, fileTotalLines, true)}\n\n${result.join('\n')}`
+            : result.join('\n');
+
+        return { content, mimeType, metadata: {} };
+    }
+
+    /**
+     * Read from start/middle using readline
+     */
+    private async readFromStartWithReadline(
+        filePath: string,
+        offset: number,
+        length: number,
+        mimeType: string,
+        includeStatusMessage: boolean = true,
+        fileTotalLines?: number
+    ): Promise<FileResult> {
+        const rl = createInterface({
+            input: createReadStream(filePath),
+            crlfDelay: Infinity
+        });
+
+        const result: string[] = [];
+        let lineNumber = 0;
+
+        for await (const line of rl) {
+            if (lineNumber >= offset && result.length < length) {
+                result.push(line);
+            }
+            if (result.length >= length) break;
+            lineNumber++;
+        }
+
+        rl.close();
+
+        if (includeStatusMessage) {
+            const statusMessage = this.generateEnhancedStatusMessage(result.length, offset, fileTotalLines, false);
+            const content = `${statusMessage}\n\n${result.join('\n')}`;
+            return { content, mimeType, metadata: {} };
+        } else {
+            const content = result.join('\n');
+            return { content, mimeType, metadata: {} };
+        }
+    }
+
+    /**
+     * Read from estimated byte position for very large files
+     */
+    private async readFromEstimatedPosition(
+        filePath: string,
+        offset: number,
+        length: number,
+        mimeType: string,
+        includeStatusMessage: boolean = true,
+        fileTotalLines?: number
+    ): Promise<FileResult> {
+        // First, do a quick scan to estimate lines per byte
+        const rl = createInterface({
+            input: createReadStream(filePath),
+            crlfDelay: Infinity
+        });
+
+        let sampleLines = 0;
+        let bytesRead = 0;
+
+        for await (const line of rl) {
+            bytesRead += Buffer.byteLength(line, 'utf-8') + 1;
+            sampleLines++;
+            if (bytesRead >= READ_PERFORMANCE_THRESHOLDS.SAMPLE_SIZE) break;
+        }
+
+        rl.close();
+
+        if (sampleLines === 0) {
+            return await this.readFromStartWithReadline(filePath, offset, length, mimeType, includeStatusMessage, fileTotalLines);
+        }
+
+        // Estimate position
+        const avgLineLength = bytesRead / sampleLines;
+        const estimatedBytePosition = Math.floor(offset * avgLineLength);
+
+        const fd = await fs.open(filePath, 'r');
+        try {
+            const stats = await fd.stat();
+            const startPosition = Math.min(estimatedBytePosition, stats.size);
+
+            const stream = createReadStream(filePath, { start: startPosition });
+            const rl2 = createInterface({
+                input: stream,
+                crlfDelay: Infinity
+            });
+
+            const result: string[] = [];
+            let firstLineSkipped = false;
+
+            for await (const line of rl2) {
+                if (!firstLineSkipped && startPosition > 0) {
+                    firstLineSkipped = true;
+                    continue;
+                }
+
+                if (result.length < length) {
+                    result.push(line);
+                } else {
+                    break;
+                }
+            }
+
+            rl2.close();
+
+            const content = includeStatusMessage
+                ? `${this.generateEnhancedStatusMessage(result.length, offset, fileTotalLines, false)}\n\n${result.join('\n')}`
+                : result.join('\n');
+
+            return { content, mimeType, metadata: {} };
+        } finally {
+            await fd.close();
+        }
+    }
+}
diff --git a/src/utils/system-info.ts b/src/utils/system-info.ts
index 862e2b0a..5567f29b 100644
--- a/src/utils/system-info.ts
+++ b/src/utils/system-info.ts
@@ -1,6 +1,7 @@
 import os from 'os';
 import fs from 'fs';
 import path from 'path';
+import { execSync } from 'child_process';
 
 export interface DockerMount {
     hostPath: string;
@@ -43,6 +44,11 @@ export interface SystemInfo {
         path: string;
         npmVersion?: string;
     };
+    pythonInfo?: {
+        available: boolean;
+        command: string;
+        version?: string;
+    };
     processInfo: {
         pid: number;
         arch: string;
@@ -399,13 +405,13 @@ function detectNodeInfo(): SystemInfo['nodeInfo'] {
     try {
         // Get Node.js version from current process
         const version = process.version.replace('v', ''); // Remove 'v' prefix
-        
+
         // Get Node.js executable path from current process
         const path = process.execPath;
-        
+
         // Get npm version from environment if available
         const npmVersion = process.env.npm_version;
-        
+
         return {
             version,
             path,
@@ -416,6 +422,39 @@ function detectNodeInfo(): SystemInfo['nodeInfo'] {
     }
 }
 
+/**
+ * Detect Python installation and version and put on systeminfo.pythonInfo
+ */
+function detectPythonInfo(): SystemInfo['pythonInfo'] {
+    // Try python commands in order of preference
+    const pythonCommands = process.platform === 'win32'
+        ? ['python', 'python3', 'py']  // Windows: 'python' is common, 'py' launcher
+        : ['python3', 'python'];        // Unix: prefer python3
+
+    for (const cmd of pythonCommands) {
+        try {
+            const version = execSync(`${cmd} --version`, {
+                encoding: 'utf8',
+                timeout: 5000,
+                stdio: ['pipe', 'pipe', 'pipe']
+            }).trim();
+
+            // Verify it's Python 3.x
+            if (version.includes('Python 3')) {
+                return {
+                    available: true,
+                    command: cmd,
+                    version: version.replace('Python ', '')
+                };
+            }
+        } catch {
+            // Command not found or failed, try next
+        }
+    }
+
+    return { available: false, command: '' };
+}
+
 /**
  * Get comprehensive system information for tool prompts
  */
@@ -509,7 +548,10 @@ export function getSystemInfo(): SystemInfo {
     
     // Detect Node.js installation from current process
     const nodeInfo = detectNodeInfo();
-    
+
+    // Detect Python installation
+    const pythonInfo = detectPythonInfo();
+
     // Get process information
     const processInfo = {
         pid: process.pid,
@@ -538,6 +580,7 @@ export function getSystemInfo(): SystemInfo {
         },
         isDXT: !!process.env.MCP_DXT,
         nodeInfo,
+        pythonInfo,
         processInfo,
         examplePaths
     };
diff --git a/test/test-excel-files.js b/test/test-excel-files.js
new file mode 100644
index 00000000..8913d552
--- /dev/null
+++ b/test/test-excel-files.js
@@ -0,0 +1,369 @@
+/**
+ * Test script for Excel file handling functionality
+ *
+ * This script tests the ExcelFileHandler implementation:
+ * 1. Reading Excel files (basic, sheet selection, range, offset/length)
+ * 2. Writing Excel files (single sheet, multiple sheets, append mode)
+ * 3. Editing Excel files (range updates)
+ * 4. Getting Excel file info (sheet metadata)
+ * 5. File handler factory (correct handler selection)
+ */
+
+import { configManager } from '../dist/config-manager.js';
+import fs from 'fs/promises';
+import path from 'path';
+import { fileURLToPath } from 'url';
+import assert from 'assert';
+import { readFile, writeFile, getFileInfo } from '../dist/tools/filesystem.js';
+import { handleEditBlock } from '../dist/handlers/edit-search-handlers.js';
+import { getFileHandler } from '../dist/utils/files/factory.js';
+
+// Get directory name
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+// Define test directory and files
+const TEST_DIR = path.join(__dirname, 'test_excel_files');
+const BASIC_EXCEL = path.join(TEST_DIR, 'basic.xlsx');
+const MULTI_SHEET_EXCEL = path.join(TEST_DIR, 'multi_sheet.xlsx');
+const EDIT_EXCEL = path.join(TEST_DIR, 'edit_test.xlsx');
+
+/**
+ * Helper function to clean up test directories
+ */
+async function cleanupTestDirectories() {
+  try {
+    await fs.rm(TEST_DIR, { recursive: true, force: true });
+  } catch (error) {
+    if (error.code !== 'ENOENT') {
+      console.error('Error during cleanup:', error);
+    }
+  }
+}
+
+/**
+ * Setup function to prepare the test environment
+ */
+async function setup() {
+  // Clean up before tests (in case previous run left files)
+  await cleanupTestDirectories();
+
+  // Create test directory
+  await fs.mkdir(TEST_DIR, { recursive: true });
+  console.log(`✓ Setup: created test directory: ${TEST_DIR}`);
+
+  // Save original config to restore later
+  const originalConfig = await configManager.getConfig();
+
+  // Set allowed directories to include our test directory
+  await configManager.setValue('allowedDirectories', [TEST_DIR]);
+  console.log(`✓ Setup: set allowed directories`);
+
+  return originalConfig;
+}
+
+/**
+ * Teardown function to clean up after tests
+ */
+async function teardown(originalConfig) {
+  // Reset configuration to original
+  if (originalConfig) {
+    await configManager.updateConfig(originalConfig);
+  }
+
+  await cleanupTestDirectories();
+  console.log('✓ Teardown: test directory cleaned up and config restored');
+}
+
+/**
+ * Test 1: File handler factory selects ExcelFileHandler for .xlsx files
+ */
+async function testFileHandlerFactory() {
+  console.log('\n--- Test 1: File Handler Factory ---');
+
+  const handler = getFileHandler('test.xlsx');
+  assert.ok(handler, 'Handler should be returned for .xlsx file');
+  assert.ok(handler.constructor.name === 'ExcelFileHandler',
+    `Expected ExcelFileHandler but got ${handler.constructor.name}`);
+
+  const txtHandler = getFileHandler('test.txt');
+  assert.ok(txtHandler.constructor.name === 'TextFileHandler',
+    `Expected TextFileHandler for .txt but got ${txtHandler.constructor.name}`);
+
+  console.log('✓ File handler factory correctly selects handlers');
+}
+
+/**
+ * Test 2: Write and read basic Excel file
+ */
+async function testBasicWriteRead() {
+  console.log('\n--- Test 2: Basic Write and Read ---');
+
+  // Write a simple Excel file
+  const data = JSON.stringify([
+    ['Name', 'Age', 'City'],
+    ['Alice', 30, 'New York'],
+    ['Bob', 25, 'Los Angeles'],
+    ['Charlie', 35, 'Chicago']
+  ]);
+
+  await writeFile(BASIC_EXCEL, data);
+  console.log('✓ Wrote basic Excel file');
+
+  // Read it back
+  const result = await readFile(BASIC_EXCEL);
+  assert.ok(result.content, 'Should have content');
+  // Excel handler returns application/json because content is JSON-formatted for LLM consumption
+  assert.ok(result.mimeType === 'application/json',
+    `Expected application/json mime type but got ${result.mimeType}`);
+
+  // Verify content contains our data
+  const content = result.content.toString();
+  assert.ok(content.includes('Name'), 'Content should include Name header');
+  assert.ok(content.includes('Alice'), 'Content should include Alice');
+  assert.ok(content.includes('Chicago'), 'Content should include Chicago');
+
+  console.log('✓ Read back Excel file with correct content');
+}
+
+/**
+ * Test 3: Write and read multi-sheet Excel file
+ */
+async function testMultiSheetWriteRead() {
+  console.log('\n--- Test 3: Multi-Sheet Write and Read ---');
+
+  // Write multi-sheet Excel file
+  const data = JSON.stringify({
+    'Employees': [
+      ['Name', 'Department'],
+      ['Alice', 'Engineering'],
+      ['Bob', 'Sales']
+    ],
+    'Departments': [
+      ['Name', 'Budget'],
+      ['Engineering', 100000],
+      ['Sales', 50000]
+    ]
+  });
+
+  await writeFile(MULTI_SHEET_EXCEL, data);
+  console.log('✓ Wrote multi-sheet Excel file');
+
+  // Read specific sheet by name
+  const result1 = await readFile(MULTI_SHEET_EXCEL, { sheet: 'Employees' });
+  const content1 = result1.content.toString();
+  assert.ok(content1.includes('Alice'), 'Employees sheet should contain Alice');
+  assert.ok(content1.includes('Engineering'), 'Employees sheet should contain Engineering');
+  console.log('✓ Read Employees sheet by name');
+
+  // Read specific sheet by index
+  const result2 = await readFile(MULTI_SHEET_EXCEL, { sheet: 1 });
+  const content2 = result2.content.toString();
+  assert.ok(content2.includes('Budget'), 'Departments sheet should contain Budget');
+  assert.ok(content2.includes('100000'), 'Departments sheet should contain 100000');
+  console.log('✓ Read Departments sheet by index');
+}
+
+/**
+ * Test 4: Read with range parameter
+ */
+async function testRangeRead() {
+  console.log('\n--- Test 4: Range Read ---');
+
+  // Use the basic file we created
+  const result = await readFile(BASIC_EXCEL, { sheet: 'Sheet1', range: 'A1:B2' });
+  const content = result.content.toString();
+
+  // Should only have first 2 rows and 2 columns
+  assert.ok(content.includes('Name'), 'Range should include Name');
+  assert.ok(content.includes('Age'), 'Range should include Age');
+  assert.ok(content.includes('Alice'), 'Range should include Alice');
+  // City is column C, should NOT be included
+  assert.ok(!content.includes('City') || content.split('City').length === 1,
+    'Range A1:B2 should not include City column');
+
+  console.log('✓ Range read returns correct subset of data');
+}
+
+/**
+ * Test 5: Read with offset and length
+ */
+async function testOffsetLengthRead() {
+  console.log('\n--- Test 5: Offset and Length Read ---');
+
+  // Read with offset (skip header)
+  const result = await readFile(BASIC_EXCEL, { offset: 1, length: 2 });
+  const content = result.content.toString();
+
+  // Should have rows 2-3 (Alice, Bob) but not header or Charlie
+  assert.ok(content.includes('Alice'), 'Should include Alice (row 2)');
+  assert.ok(content.includes('Bob'), 'Should include Bob (row 3)');
+
+  console.log('✓ Offset and length read works correctly');
+}
+
+/**
+ * Test 6: Edit Excel range
+ */
+async function testEditRange() {
+  console.log('\n--- Test 6: Edit Excel Range ---');
+
+  // Create a file to edit
+  const data = JSON.stringify([
+    ['Product', 'Price'],
+    ['Apple', 1.00],
+    ['Banana', 0.50],
+    ['Cherry', 2.00]
+  ]);
+  await writeFile(EDIT_EXCEL, data);
+  console.log('✓ Created file for editing');
+
+  // Edit a cell using edit_block with range
+  const editResult = await handleEditBlock({
+    file_path: EDIT_EXCEL,
+    range: 'Sheet1!B2',
+    content: [[1.50]]  // Update Apple price
+  });
+
+  assert.ok(!editResult.isError, `Edit should succeed: ${editResult.content?.[0]?.text}`);
+  console.log('✓ Edit range succeeded');
+
+  // Verify the edit
+  const readResult = await readFile(EDIT_EXCEL);
+  const content = readResult.content.toString();
+  assert.ok(content.includes('1.5'), 'Price should be updated to 1.50');
+
+  console.log('✓ Edit was persisted correctly');
+}
+
+/**
+ * Test 7: Get Excel file info
+ */
+async function testGetFileInfo() {
+  console.log('\n--- Test 7: Get File Info ---');
+
+  const info = await getFileInfo(MULTI_SHEET_EXCEL);
+
+  assert.ok(info.isExcelFile, 'Should be marked as Excel file');
+  assert.ok(info.sheets, 'Should have sheets info');
+  assert.ok(Array.isArray(info.sheets), 'Sheets should be an array');
+  assert.strictEqual(info.sheets.length, 2, 'Should have 2 sheets');
+
+  // Check sheet details
+  const sheetNames = info.sheets.map(s => s.name);
+  assert.ok(sheetNames.includes('Employees'), 'Should have Employees sheet');
+  assert.ok(sheetNames.includes('Departments'), 'Should have Departments sheet');
+
+  // Check row/column counts
+  const employeesSheet = info.sheets.find(s => s.name === 'Employees');
+  assert.ok(employeesSheet.rowCount >= 3, 'Employees sheet should have at least 3 rows');
+  assert.ok(employeesSheet.colCount >= 2, 'Employees sheet should have at least 2 columns');
+
+  console.log('✓ File info returns correct sheet metadata');
+}
+
+/**
+ * Test 8: Append mode
+ */
+async function testAppendMode() {
+  console.log('\n--- Test 8: Append Mode ---');
+
+  // Create initial file
+  const initialData = JSON.stringify([
+    ['Name', 'Score'],
+    ['Alice', 100]
+  ]);
+  await writeFile(BASIC_EXCEL, initialData);
+
+  // Append more data
+  const appendData = JSON.stringify([
+    ['Bob', 95],
+    ['Charlie', 88]
+  ]);
+  await writeFile(BASIC_EXCEL, appendData, 'append');
+  console.log('✓ Appended data to Excel file');
+
+  // Read and verify
+  const result = await readFile(BASIC_EXCEL);
+  const content = result.content.toString();
+
+  assert.ok(content.includes('Alice'), 'Should still have Alice');
+  assert.ok(content.includes('Bob'), 'Should have appended Bob');
+  assert.ok(content.includes('Charlie'), 'Should have appended Charlie');
+
+  console.log('✓ Append mode works correctly');
+}
+
+/**
+ * Test 9: Negative offset (read from end)
+ */
+async function testNegativeOffset() {
+  console.log('\n--- Test 9: Negative Offset (Tail) ---');
+
+  // Create file with multiple rows
+  const data = JSON.stringify([
+    ['Row', 'Value'],
+    ['1', 'First'],
+    ['2', 'Second'],
+    ['3', 'Third'],
+    ['4', 'Fourth'],
+    ['5', 'Fifth']
+  ]);
+  await writeFile(BASIC_EXCEL, data);
+
+  // Read last 2 rows
+  const result = await readFile(BASIC_EXCEL, { offset: -2 });
+  const content = result.content.toString();
+
+  assert.ok(content.includes('Fourth') || content.includes('Fifth'),
+    'Should include data from last rows');
+
+  console.log('✓ Negative offset reads from end');
+}
+
+/**
+ * Run all tests
+ */
+async function runAllTests() {
+  console.log('=== Excel File Handling Tests ===\n');
+
+  await testFileHandlerFactory();
+  await testBasicWriteRead();
+  await testMultiSheetWriteRead();
+  await testRangeRead();
+  await testOffsetLengthRead();
+  await testEditRange();
+  await testGetFileInfo();
+  await testAppendMode();
+  await testNegativeOffset();
+
+  console.log('\n✅ All Excel tests passed!');
+}
+
+// Export the main test function
+export default async function runTests() {
+  let originalConfig;
+  try {
+    originalConfig = await setup();
+    await runAllTests();
+  } catch (error) {
+    console.error('❌ Test failed:', error.message);
+    console.error(error.stack);
+    return false;
+  } finally {
+    if (originalConfig) {
+      await teardown(originalConfig);
+    }
+  }
+  return true;
+}
+
+// If this file is run directly, execute the test
+if (import.meta.url === `file://${process.argv[1]}`) {
+  runTests().then(success => {
+    process.exit(success ? 0 : 1);
+  }).catch(error => {
+    console.error('❌ Unhandled error:', error);
+    process.exit(1);
+  });
+}
diff --git a/test/test-file-handlers.js b/test/test-file-handlers.js
new file mode 100644
index 00000000..1adcf7ec
--- /dev/null
+++ b/test/test-file-handlers.js
@@ -0,0 +1,325 @@
+/**
+ * Test script for file handler system
+ *
+ * This script tests the file handler architecture:
+ * 1. File handler factory returns correct handler types
+ * 2. FileResult interface consistency
+ * 3. ReadOptions interface usage
+ * 4. Handler canHandle() method
+ * 5. Text file handler basic operations
+ * 6. Image file handler detection
+ * 7. Binary file handler fallback
+ */
+
+import { configManager } from '../dist/config-manager.js';
+import fs from 'fs/promises';
+import path from 'path';
+import { fileURLToPath } from 'url';
+import assert from 'assert';
+import { readFile, writeFile, getFileInfo } from '../dist/tools/filesystem.js';
+import { getFileHandler } from '../dist/utils/files/factory.js';
+
+// Get directory name
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+// Define test directory and files
+const TEST_DIR = path.join(__dirname, 'test_file_handlers');
+const TEXT_FILE = path.join(TEST_DIR, 'test.txt');
+const JSON_FILE = path.join(TEST_DIR, 'test.json');
+const MD_FILE = path.join(TEST_DIR, 'test.md');
+
+/**
+ * Helper function to clean up test directories
+ */
+async function cleanupTestDirectories() {
+  try {
+    await fs.rm(TEST_DIR, { recursive: true, force: true });
+  } catch (error) {
+    if (error.code !== 'ENOENT') {
+      console.error('Error during cleanup:', error);
+    }
+  }
+}
+
+/**
+ * Setup function
+ */
+async function setup() {
+  // Clean up before tests (in case previous run left files)
+  await cleanupTestDirectories();
+
+  await fs.mkdir(TEST_DIR, { recursive: true });
+  console.log(`✓ Setup: created test directory: ${TEST_DIR}`);
+
+  const originalConfig = await configManager.getConfig();
+  await configManager.setValue('allowedDirectories', [TEST_DIR]);
+
+  return originalConfig;
+}
+
+/**
+ * Teardown function
+ * Always runs cleanup, restores config only if provided
+ */
+async function teardown(originalConfig) {
+  // Always clean up test directories, even if setup failed
+  try {
+    await cleanupTestDirectories();
+    console.log('✓ Teardown: cleaned up test directories');
+  } catch (error) {
+    console.error('Warning: Failed to clean up test directories:', error.message);
+  }
+
+  // Restore config only if we have the original
+  if (originalConfig) {
+    try {
+      await configManager.updateConfig(originalConfig);
+      console.log('✓ Teardown: restored config');
+    } catch (error) {
+      console.error('Warning: Failed to restore config:', error.message);
+    }
+  }
+}
+
+/**
+ * Test 1: Handler factory returns correct types
+ */
+async function testHandlerFactory() {
+  console.log('\n--- Test 1: Handler Factory Types ---');
+
+  // Note: TextFileHandler.canHandle() returns true for all files,
+  // so it catches most files before BinaryFileHandler.
+  // BinaryFileHandler only handles files that fail binary detection at read time.
+  const testCases = [
+    { file: 'test.xlsx', expected: 'ExcelFileHandler' },
+    { file: 'test.xls', expected: 'ExcelFileHandler' },
+    { file: 'test.xlsm', expected: 'ExcelFileHandler' },
+    { file: 'test.txt', expected: 'TextFileHandler' },
+    { file: 'test.js', expected: 'TextFileHandler' },
+    { file: 'test.json', expected: 'TextFileHandler' },
+    { file: 'test.md', expected: 'TextFileHandler' },
+    { file: 'test.png', expected: 'ImageFileHandler' },
+    { file: 'test.jpg', expected: 'ImageFileHandler' },
+    { file: 'test.jpeg', expected: 'ImageFileHandler' },
+    { file: 'test.gif', expected: 'ImageFileHandler' },
+    { file: 'test.webp', expected: 'ImageFileHandler' },
+  ];
+
+  for (const { file, expected } of testCases) {
+    const handler = getFileHandler(file);
+    assert.strictEqual(handler.constructor.name, expected,
+      `${file} should use ${expected} but got ${handler.constructor.name}`);
+  }
+
+  console.log('✓ All file types map to correct handlers');
+}
+
+/**
+ * Test 2: FileResult interface consistency
+ */
+async function testFileResultInterface() {
+  console.log('\n--- Test 2: FileResult Interface ---');
+
+  // Create a text file
+  await fs.writeFile(TEXT_FILE, 'Hello, World!\nLine 2\nLine 3');
+
+  const result = await readFile(TEXT_FILE);
+
+  // Check FileResult structure
+  assert.ok('content' in result, 'FileResult should have content');
+  assert.ok('mimeType' in result, 'FileResult should have mimeType');
+  assert.ok(result.content !== undefined, 'Content should not be undefined');
+  assert.ok(typeof result.mimeType === 'string', 'mimeType should be a string');
+
+  // metadata is optional but should be an object if present
+  if (result.metadata) {
+    assert.ok(typeof result.metadata === 'object', 'metadata should be an object');
+  }
+
+  console.log('✓ FileResult interface is consistent');
+}
+
+/**
+ * Test 3: ReadOptions interface
+ */
+async function testReadOptionsInterface() {
+  console.log('\n--- Test 3: ReadOptions Interface ---');
+
+  await fs.writeFile(TEXT_FILE, 'Line 1\nLine 2\nLine 3\nLine 4\nLine 5');
+
+  // Test offset option
+  const result1 = await readFile(TEXT_FILE, { offset: 2 });
+  const content1 = result1.content.toString();
+  assert.ok(content1.includes('Line 3'), 'Offset should skip to line 3');
+
+  // Test length option
+  const result2 = await readFile(TEXT_FILE, { offset: 0, length: 2 });
+  const content2 = result2.content.toString();
+  assert.ok(content2.includes('Line 1'), 'Should include Line 1');
+  assert.ok(content2.includes('Line 2'), 'Should include Line 2');
+
+  console.log('✓ ReadOptions work correctly');
+}
+
+/**
+ * Test 4: Handler canHandle method
+ */
+async function testCanHandle() {
+  console.log('\n--- Test 4: canHandle Method ---');
+
+  const excelHandler = getFileHandler('test.xlsx');
+  const textHandler = getFileHandler('test.txt');
+  const imageHandler = getFileHandler('test.png');
+
+  // Excel handler should handle xlsx
+  assert.ok(excelHandler.canHandle('anything.xlsx'), 'Excel handler should handle .xlsx');
+  assert.ok(excelHandler.canHandle('file.xls'), 'Excel handler should handle .xls');
+
+  // Image handler should handle images
+  assert.ok(imageHandler.canHandle('photo.png'), 'Image handler should handle .png');
+  assert.ok(imageHandler.canHandle('photo.jpg'), 'Image handler should handle .jpg');
+  assert.ok(imageHandler.canHandle('photo.jpeg'), 'Image handler should handle .jpeg');
+
+  // Text handler handles most things (fallback)
+  assert.ok(textHandler.canHandle('file.txt'), 'Text handler should handle .txt');
+
+  console.log('✓ canHandle methods work correctly');
+}
+
+/**
+ * Test 5: Text handler read/write
+ */
+async function testTextHandler() {
+  console.log('\n--- Test 5: Text Handler Operations ---');
+
+  const content = 'Test content\nWith multiple lines\nAnd special chars: äöü';
+
+  // Write
+  await writeFile(TEXT_FILE, content);
+  console.log('✓ Text write succeeded');
+
+  // Read
+  const result = await readFile(TEXT_FILE);
+  const readContent = result.content.toString();
+  assert.ok(readContent.includes('Test content'), 'Should read back content');
+  assert.ok(readContent.includes('äöü'), 'Should preserve special characters');
+
+  console.log('✓ Text handler read/write works');
+}
+
+/**
+ * Test 6: Text handler with JSON file
+ */
+async function testJsonFile() {
+  console.log('\n--- Test 6: JSON File Handling ---');
+
+  const data = { name: 'Test', values: [1, 2, 3] };
+  const content = JSON.stringify(data, null, 2);
+
+  await writeFile(JSON_FILE, content);
+
+  const result = await readFile(JSON_FILE);
+  const readContent = result.content.toString();
+  const parsed = JSON.parse(readContent.replace(/^\[.*?\]\n\n/, '')); // Remove status message
+
+  assert.strictEqual(parsed.name, 'Test', 'JSON should be preserved');
+  assert.deepStrictEqual(parsed.values, [1, 2, 3], 'Array should be preserved');
+
+  console.log('✓ JSON file handling works');
+}
+
+/**
+ * Test 7: File info returns correct structure
+ */
+async function testFileInfo() {
+  console.log('\n--- Test 7: File Info Structure ---');
+
+  await fs.writeFile(TEXT_FILE, 'Some content');
+
+  const info = await getFileInfo(TEXT_FILE);
+
+  // Check required fields
+  assert.ok('size' in info, 'Should have size');
+  assert.ok('created' in info || 'birthtime' in info, 'Should have creation time');
+  assert.ok('modified' in info || 'mtime' in info, 'Should have modification time');
+  assert.ok('isFile' in info, 'Should have isFile');
+  assert.ok('isDirectory' in info, 'Should have isDirectory');
+
+  assert.ok(info.size > 0, 'Size should be > 0');
+  assert.ok(info.isFile === true || info.isFile === 'true', 'Should be a file');
+
+  console.log('✓ File info structure is correct');
+}
+
+/**
+ * Test 8: Write mode (rewrite vs append)
+ */
+async function testWriteModes() {
+  console.log('\n--- Test 8: Write Modes ---');
+
+  // Initial write (rewrite mode - default)
+  await writeFile(TEXT_FILE, 'Initial content');
+
+  // Overwrite
+  await writeFile(TEXT_FILE, 'New content', 'rewrite');
+  let result = await readFile(TEXT_FILE);
+  let content = result.content.toString();
+  assert.ok(!content.includes('Initial'), 'Rewrite should replace content');
+  assert.ok(content.includes('New content'), 'Should have new content');
+  console.log('✓ Rewrite mode works');
+
+  // Append
+  await writeFile(TEXT_FILE, '\nAppended content', 'append');
+  result = await readFile(TEXT_FILE);
+  content = result.content.toString();
+  assert.ok(content.includes('New content'), 'Should keep original');
+  assert.ok(content.includes('Appended content'), 'Should have appended');
+  console.log('✓ Append mode works');
+}
+
+/**
+ * Run all tests
+ */
+async function runAllTests() {
+  console.log('=== File Handler System Tests ===\n');
+
+  await testHandlerFactory();
+  await testFileResultInterface();
+  await testReadOptionsInterface();
+  await testCanHandle();
+  await testTextHandler();
+  await testJsonFile();
+  await testFileInfo();
+  await testWriteModes();
+
+  console.log('\n✅ All file handler tests passed!');
+}
+
+// Export the main test function
+export default async function runTests() {
+  let originalConfig;
+  try {
+    originalConfig = await setup();
+    await runAllTests();
+  } catch (error) {
+    console.error('❌ Test failed:', error.message);
+    console.error(error.stack);
+    return false;
+  } finally {
+    // Always run teardown to clean up test directories and restore config
+    // teardown handles the case where originalConfig is undefined
+    await teardown(originalConfig);
+  }
+  return true;
+}
+
+// If this file is run directly, execute the test
+if (import.meta.url === `file://${process.argv[1]}`) {
+  runTests().then(success => {
+    process.exit(success ? 0 : 1);
+  }).catch(error => {
+    console.error('❌ Unhandled error:', error);
+    process.exit(1);
+  });
+}
diff --git a/test/test_output/node_repl_debug.txt b/test/test_output/node_repl_debug.txt
deleted file mode 100644
index 0db4e1d4..00000000
--- a/test/test_output/node_repl_debug.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-Starting Node.js REPL...
-Waiting for Node.js startup...
-[STDOUT] Welcome to Node.js v22.18.0.
-Type ".help" for more information.
-[STDOUT] >
-Initial output buffer: Welcome to Node.js v22.18.0.
-Type ".help" for more information.
-> 
-Sending simple command...
-[STDOUT] Hello from Node.js!
-[STDOUT] undefined
->
-Output after first command: Welcome to Node.js v22.18.0.
-Type ".help" for more information.
-> Hello from Node.js!
-undefined
-> 
-Sending multi-line command directly...
-Sending code:
-
-function greet(name) {
-  return `Hello, ${name}!`;
-}
-
-for (let i = 0; i < 3; i++) {
-  console.log(greet(`User ${i}`));
-}
-
-[STDOUT] >
-[STDOUT] ...
-[STDOUT] ...
-[STDOUT] undefined
->
-[STDOUT] >
-[STDOUT] ...
-[STDOUT] ...
-[STDOUT] Hello, User 0!
-[STDOUT] Hello, User 1!
-[STDOUT] Hello, User 2!
-[STDOUT] undefined
-[STDOUT] >
-[STDOUT] >
-Final output buffer: Welcome to Node.js v22.18.0.
-Type ".help" for more information.
-> Hello from Node.js!
-undefined
-> > ... ... undefined
-> > ... ... Hello, User 0!
-Hello, User 1!
-Hello, User 2!
-undefined
-> > 
-Found "Hello from Node.js!": true
-Found greetings: true
-Terminating Node.js process...
-Node.js process exited with code 0