march-cli 0.1.11 → 0.1.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "march-cli",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "description": "March CLI — terminal-native coding agent with context reconstruction",
   "type": "module",
   "main": "./src/main.mjs",

package/src/agent/tool-names.mjs

@@ -1 +1 @@
-export const MARCH_BASE_TOOL_NAMES = ["grep", "ls"];
+export const MARCH_BASE_TOOL_NAMES = ["grep", "find", "ls"];

package/src/agent/tools.mjs

@@ -3,7 +3,6 @@ import { Type } from "typebox";
 import { createCommandExecTool } from "./command-exec-tool.mjs";
 import { createContextStatsTool } from "./context-stats-tool.mjs";
 import { createEditFileTool } from "./file-edit-tool.mjs";
-import { createFindTool } from "./find-tool.mjs";
 import { createReadFileTool } from "./read-file-tool.mjs";
 import { toolText } from "./tool-result.mjs";
 import { createShellTools } from "../shell/tools.mjs";
@@ -14,7 +13,6 @@ export function createMarchCustomTools({ cwd, engine, ui, memoryTools = [], shel
   const commandExecTool = createCommandExecTool({ cwd });
   const contextStatsTool = createContextStatsTool({ engine });
   const editFileTool = createEditFileTool({ engine, ui, lspService });
-  const findTool = createFindTool({ cwd });
   const readFileTool = createReadFileTool({ engine });
 
   const tools = [
@@ -22,7 +20,6 @@ export function createMarchCustomTools({ cwd, engine, ui, memoryTools = [], shel
     contextStatsTool,
     commandExecTool,
     editFileTool,
-    findTool,
     ...createShellTools(shellRuntime),
     ...memoryTools,
     ...mcpTools,

package/src/cli/tui/syntax/highlighting.mjs

@@ -19,7 +19,6 @@ import {
 } from "./languages.mjs";
 
 const RESOURCE_DIR = join(dirname(fileURLToPath(import.meta.url)), "tree-sitter");
-const ENCODER = new TextEncoder();
 
 let initPromise;
 let initialized = false;
@@ -87,11 +86,10 @@ function treeSitterRuns(text, lang) {
   if (!initialized || !parser || !text) return null;
   try {
     const tree = parser.parse(text);
-    const byteToIndex = buildByteToIndex(text);
     const scopes = Array.from({ length: text.length }, () => ({ scope: "default", priority: 0 }));
     const query = queries.get(lang);
-    if (query) applyQueryScopes(query, tree.rootNode, byteToIndex, scopes);
-    collectNodeScopes(tree.rootNode, byteToIndex, scopes);
+    if (query) applyQueryScopes(query, tree.rootNode, scopes);
+    collectNodeScopes(tree.rootNode, scopes);
     return scopesToRuns(text, scopes);
   } catch {
     return null;
@@ -109,11 +107,11 @@ function loadHighlightQuery(language, queryFile) {
   }
 }
 
-function applyQueryScopes(query, rootNode, byteToIndex, scopes) {
+function applyQueryScopes(query, rootNode, scopes) {
   for (const capture of query.captures(rootNode)) {
     const scope = captureScope(capture.name);
     if (!scope) continue;
-    applyScope(scopes, byteToIndex[capture.node.startIndex] ?? 0, byteToIndex[capture.node.endIndex] ?? scopes.length, scope);
+    applyScope(scopes, capture.node.startIndex, capture.node.endIndex, scope);
   }
 }
 
@@ -135,10 +133,10 @@ function captureScope(name) {
   return null;
 }
 
-function collectNodeScopes(node, byteToIndex, scopes) {
+function collectNodeScopes(node, scopes) {
   const scope = classifyNode(node);
-  if (scope) applyScope(scopes, byteToIndex[node.startIndex] ?? 0, byteToIndex[node.endIndex] ?? scopes.length, scope);
-  for (const child of node.children ?? []) collectNodeScopes(child, byteToIndex, scopes);
+  if (scope) applyScope(scopes, node.startIndex, node.endIndex, scope);
+  for (const child of node.children ?? []) collectNodeScopes(child, scopes);
 }
 
 function classifyNode(node) {
@@ -259,19 +257,4 @@ export function styleSyntax(text, scope = "default", bg = "") {
   return `\x1b[${codes.join(";")}m${text}${R}`;
 }
 
-function buildByteToIndex(text) {
-  const map = [];
-  let byte = 0;
-  for (let index = 0; index < text.length;) {
-    const codePoint = text.codePointAt(index);
-    const char = String.fromCodePoint(codePoint);
-    const bytes = ENCODER.encode(char).length;
-    for (let i = 0; i < bytes; i++) map[byte + i] = index;
-    byte += bytes;
-    index += char.length;
-  }
-  map[byte] = text.length;
-  return map;
-}
-
 void initializeTreeSitterHighlighting();

package/src/cli/tui/syntax/languages.mjs

@@ -25,7 +25,7 @@ export const LANG_ALIASES = new Map([
   ["cs", "csharp"], ["css", "css"], ["cts", "typescript"], ["csharp", "csharp"], ["cxx", "cpp"],
   ["diff", "diff"], ["go", "go"], ["h", "c"], ["hh", "cpp"], ["htm", "html"], ["html", "html"],
   ["hpp", "cpp"], ["hxx", "cpp"], ["java", "java"], ["javascript", "javascript"], ["js", "javascript"],
-  ["json", "json"], ["jsonc", "json"], ["jsx", "jsx"], ["mjs", "javascript"], ["mts", "typescript"],
+  ["json", "json"], ["jsonc", "json"], ["jsx", "tsx"], ["mjs", "javascript"], ["mts", "typescript"],
   ["patch", "diff"], ["php", "php"], ["py", "python"], ["python", "python"], ["rb", "ruby"],
   ["rs", "rust"], ["ruby", "ruby"], ["rust", "rust"], ["sh", "bash"], ["toml", "toml"],
   ["ts", "typescript"], ["tsx", "tsx"], ["typescript", "typescript"], ["yaml", "yaml"], ["yml", "yaml"],

package/src/agent/find-tool.mjs

@@ -1,112 +0,0 @@
-import { readdirSync, statSync } from "node:fs";
-import { isAbsolute, relative, resolve } from "node:path";
-import { defineTool } from "@earendil-works/pi-coding-agent";
-import { Type } from "typebox";
-import { toolText } from "./tool-result.mjs";
-
-const DEFAULT_LIMIT = 1000;
-const DEFAULT_IGNORES = new Set([".git", "node_modules"]);
-
-export function createFindTool({ cwd }) {
-  return defineTool({
-    name: "find",
-    label: "Find Files",
-    description: "Find files by glob pattern. Pattern is matched relative to the search directory. Basename-only patterns like '*.mjs' search recursively, so find('*.mjs', path:'src') and find('src/**/*.mjs') both work.",
-    parameters: Type.Object({
-      pattern: Type.String({ description: "Glob pattern to match files, e.g. '*.mjs', '**/*.json', or 'src/**/*.test.mjs'" }),
-      path: Type.Optional(Type.String({ description: "Directory to search in (default: current directory)" })),
-      limit: Type.Optional(Type.Number({ description: "Maximum number of results (default 1000)" })),
-    }),
-    execute: async (_toolCallId, params) => executeFind({ cwd, ...params }),
-  });
-}
-
-export function executeFind({ cwd, pattern, path = ".", limit = DEFAULT_LIMIT }) {
-  const searchRoot = resolveSearchRoot(cwd, path);
-  const trimmedPattern = String(pattern ?? "").trim().replaceAll("\\", "/");
-  if (!trimmedPattern) return toolText("Error: pattern is required", { error: true });
-  const effectivePattern = normalizePattern(trimmedPattern);
-
-  const max = Math.max(1, Number(limit) || DEFAULT_LIMIT);
-  let files;
-  try {
-    files = listFiles(searchRoot);
-  } catch (err) {
-    return toolText(`Error: ${err.message}`, { error: true });
-  }
-
-  const matches = [];
-  for (const file of files) {
-    const rel = toPosix(relative(searchRoot, file));
-    if (!matchesGlob(effectivePattern, rel)) continue;
-    matches.push(rel);
-    if (matches.length >= max) break;
-  }
-
-  if (matches.length === 0) return toolText("No files found matching pattern", { pattern: trimmedPattern, effectivePattern, path: searchRoot, count: 0 });
-  const limitHint = matches.length >= max ? `\n\n[Results truncated to ${max}. Increase limit or refine pattern.]` : "";
-  return toolText(`${matches.join("\n")}${limitHint}`, {
-    pattern: trimmedPattern,
-    effectivePattern: effectivePattern === trimmedPattern ? undefined : effectivePattern,
-    path: searchRoot,
-    count: matches.length,
-    resultLimitReached: matches.length >= max ? max : undefined,
-  });
-}
-
-function normalizePattern(pattern) {
-  if (pattern.includes("/") || pattern.includes("**")) return pattern;
-  return `**/${pattern}`;
-}
-
-function resolveSearchRoot(cwd, path) {
-  const raw = String(path || ".");
-  return isAbsolute(raw) ? raw : resolve(cwd, raw);
-}
-
-function listFiles(root) {
-  const out = [];
-  walk(root, out);
-  return out.sort((a, b) => toPosix(a).localeCompare(toPosix(b)));
-}
-
-function walk(dir, out) {
-  for (const entry of readdirSync(dir, { withFileTypes: true })) {
-    if (entry.isDirectory() && DEFAULT_IGNORES.has(entry.name)) continue;
-    const path = resolve(dir, entry.name);
-    if (entry.isDirectory()) walk(path, out);
-    else if (entry.isFile()) out.push(path);
-  }
-}
-
-function matchesGlob(pattern, candidate) {
-  return matchSegments(splitGlob(pattern), splitGlob(candidate));
-}
-
-function matchSegments(patternSegments, candidateSegments) {
-  if (patternSegments.length === 0) return candidateSegments.length === 0;
-  const [head, ...tail] = patternSegments;
-  if (head === "**") {
-    if (matchSegments(tail, candidateSegments)) return true;
-    return candidateSegments.length > 0 && matchSegments(patternSegments, candidateSegments.slice(1));
-  }
-  if (candidateSegments.length === 0) return false;
-  return matchSegment(head, candidateSegments[0]) && matchSegments(tail, candidateSegments.slice(1));
-}
-
-function matchSegment(pattern, candidate) {
-  const regex = new RegExp(`^${escapeRegex(pattern).replaceAll("\\*", "[^/]*").replaceAll("\\?", "[^/]")}$`);
-  return regex.test(candidate);
-}
-
-function splitGlob(value) {
-  return String(value).split("/").filter(Boolean);
-}
-
-function toPosix(value) {
-  return String(value).replaceAll("\\", "/");
-}
-
-function escapeRegex(value) {
-  return String(value).replace(/[|\\{}()[\]^$+*?.]/g, "\\$&");
-}