nolo-cli 0.1.38 → 0.1.40

package/agent-runtime/localWorkspaceTools.ts

@@ -20,6 +20,7 @@ type WorkspaceFileArgs = {
   newText?: unknown;
   expectedReplacements?: unknown;
   query?: unknown;
+  includeIgnored?: unknown;
   command?: unknown;
   cmd?: unknown;
   branch?: unknown;
@@ -42,18 +43,11 @@ type OpenAiCompatibleTool = Record<string, unknown> & {
 };
 
 const WORKSPACE_TOOL_NAMES = [
-  "listWorkspaceFiles",
-  "readWorkspaceFile",
-  "writeWorkspaceFile",
-  "replaceWorkspaceText",
   "listFiles",
   "readFile",
   "writeFile",
   "editFile",
   "searchFiles",
-  "searchWorkspace",
-  "applyEdit",
-  "applyLineEdits",
   "startPreview",
   "getPreviewStatus",
   "stopPreview",
@@ -92,7 +86,7 @@ function buildListWorkspaceFilesTool(): OpenAiCompatibleTool {
   return {
     type: "function",
     function: {
-      name: "listWorkspaceFiles",
+      name: "listFiles",
       description: "List files and directories inside a workspace directory.",
       parameters: {
         type: "object",
@@ -108,9 +102,9 @@ function buildReadWorkspaceFileTool(): OpenAiCompatibleTool {
   return {
     type: "function",
     function: {
-      name: "readWorkspaceFile",
+      name: "readFile",
       description:
-        "Read a UTF-8 text file inside the workspace. Read before editing when you need the current content or exact text for replaceWorkspaceText; skip unnecessary reads for trivial known writes.",
+        "Read a UTF-8 text file inside the workspace. Read before editing when you need the current content or exact text for editFile; skip unnecessary reads for trivial known writes.",
       parameters: {
         type: "object",
         properties: {
@@ -126,9 +120,9 @@ function buildWriteWorkspaceFileTool(): OpenAiCompatibleTool {
   return {
     type: "function",
     function: {
-      name: "writeWorkspaceFile",
+      name: "writeFile",
       description:
-        "Write full UTF-8 file content inside the workspace. Prefer replaceWorkspaceText for small edits to existing large files; use this for new files or deliberate whole-file rewrites.",
+        "Write full UTF-8 file content inside the workspace. For new files or deliberate whole-file rewrites only. For existing files, prefer editFile for targeted edits. Warn that whole-file rewrites can cause line-ending churn.",
       parameters: {
         type: "object",
         properties: {
@@ -148,9 +142,9 @@ function buildReplaceWorkspaceTextTool(): OpenAiCompatibleTool {
   return {
     type: "function",
     function: {
-      name: "replaceWorkspaceText",
+      name: "editFile",
       description:
-        "Use for small, exact edits in one workspace file without constructing a patch. Read the file first when you need the exact oldText; set expectedReplacements to avoid accidental broad edits.",
+        "Use for small, exact edits in one workspace file without constructing a patch. Read the file first when you need the exact oldText; set expectedReplacements to avoid accidental broad edits. When expected replacement count fails, report a blocker instead of falling back to a full-file rewrite.",
       parameters: {
         type: "object",
         properties: {
@@ -178,7 +172,7 @@ function buildSearchWorkspaceTool(): OpenAiCompatibleTool {
   return {
     type: "function",
     function: {
-      name: "searchWorkspace",
+      name: "searchFiles",
       description: "Search text in the current workspace using ripgrep when available.",
       parameters: {
         type: "object",
@@ -188,6 +182,11 @@ function buildSearchWorkspaceTool(): OpenAiCompatibleTool {
             description: "Search query or regular expression.",
           },
           path: buildWorkspacePathProperty(),
+          includeIgnored: {
+            type: "boolean",
+            description:
+              "When true, search files ignored by .gitignore such as .tmp. Defaults to false; .git and node_modules remain excluded.",
+          },
         },
         required: ["query"],
       },
@@ -331,45 +330,21 @@ function buildWorkspaceShellCommand(args: {
     : buildBashCommand(args.command);
 }
 
-function renameWorkspaceToolDefinition(
-  tool: OpenAiCompatibleTool,
-  name: string
-): OpenAiCompatibleTool {
-  const description = typeof tool.function?.description === "string"
-    ? tool.function.description
-        .replaceAll("replaceWorkspaceText", "editFile")
-        .replaceAll("readWorkspaceFile", "readFile")
-    : tool.function?.description;
-  return {
-    ...tool,
-    function: {
-      ...(tool.function ?? {}),
-      name,
-      description,
-    },
-  };
-}
-
 function buildWorkspaceToolDefinition(toolName: string) {
-  if (toolName === "listWorkspaceFiles" || toolName === "listFiles") {
-    return renameWorkspaceToolDefinition(buildListWorkspaceFilesTool(), toolName);
+  if (toolName === "listFiles") {
+    return buildListWorkspaceFilesTool();
   }
-  if (toolName === "readWorkspaceFile" || toolName === "readFile") {
-    return renameWorkspaceToolDefinition(buildReadWorkspaceFileTool(), toolName);
+  if (toolName === "readFile") {
+    return buildReadWorkspaceFileTool();
   }
-  if (toolName === "writeWorkspaceFile" || toolName === "writeFile") {
-    return renameWorkspaceToolDefinition(buildWriteWorkspaceFileTool(), toolName);
+  if (toolName === "writeFile") {
+    return buildWriteWorkspaceFileTool();
   }
-  if (
-    toolName === "replaceWorkspaceText" ||
-    toolName === "editFile" ||
-    toolName === "applyEdit" ||
-    toolName === "applyLineEdits"
-  ) {
-    return renameWorkspaceToolDefinition(buildReplaceWorkspaceTextTool(), toolName);
+  if (toolName === "editFile") {
+    return buildReplaceWorkspaceTextTool();
   }
-  if (toolName === "searchWorkspace" || toolName === "searchFiles") {
-    return renameWorkspaceToolDefinition(buildSearchWorkspaceTool(), toolName);
+  if (toolName === "searchFiles") {
+    return buildSearchWorkspaceTool();
   }
   if (toolName === "startPreview" || toolName === "getPreviewStatus" || toolName === "stopPreview" || toolName === "releasePreview") {
     return buildPreviewLifecycleTool(toolName);
@@ -379,20 +354,6 @@ function buildWorkspaceToolDefinition(toolName: string) {
   return null;
 }
 
-function removeRedundantWorkspaceToolAliases(toolNames: Set<string>) {
-  const next = new Set(toolNames);
-  if (next.has("listWorkspaceFiles")) next.delete("listFiles");
-  if (next.has("readWorkspaceFile")) next.delete("readFile");
-  if (next.has("writeWorkspaceFile")) next.delete("writeFile");
-  if (next.has("replaceWorkspaceText")) {
-    next.delete("editFile");
-    next.delete("applyEdit");
-    next.delete("applyLineEdits");
-  }
-  if (next.has("searchWorkspace")) next.delete("searchFiles");
-  return next;
-}
-
 function filterDeclaredWorkspaceToolNames(args: {
   toolNames?: string[];
   exposeShellTools: boolean;
@@ -409,14 +370,14 @@ export function buildLocalWorkspaceToolset(args: {
   exposeShellTools?: boolean;
 }) {
   const exposeShellTools = args.exposeShellTools === true;
-  const toolNames = removeRedundantWorkspaceToolAliases(new Set([
+  const toolNames = new Set([
     ...DEFAULT_LOCAL_CODING_TOOL_NAMES,
     ...(exposeShellTools ? SHELL_TOOL_NAMES : []),
     ...filterDeclaredWorkspaceToolNames({
       toolNames: args.declaredToolNames,
       exposeShellTools,
     }),
-  ]));
+  ]);
   return {
     toolNames: [...toolNames],
     exposeShellTools,
@@ -442,7 +403,7 @@ export function buildLocalWorkspaceOpenAiTools(args: {
   toolNames?: string[];
   exposeShellTools?: boolean;
 }) {
-  const declaredTools = removeRedundantWorkspaceToolAliases(new Set(args.toolNames ?? []));
+  const declaredTools = new Set(args.toolNames ?? []);
   return WORKSPACE_TOOL_NAMES
     .filter((toolName) => {
       if (!declaredTools.has(toolName)) return false;
@@ -488,21 +449,21 @@ function requireWorkspaceToolPath(args: WorkspaceFileArgs) {
 
 function requireWorkspaceFileContent(args: WorkspaceFileArgs) {
   if (typeof args.content !== "string") {
-    throw new Error("writeWorkspaceFile requires string content.");
+    throw new Error("writeFile requires string content.");
   }
   return args.content;
 }
 
 function requireWorkspaceOldText(args: WorkspaceFileArgs) {
   if (typeof args.oldText !== "string" || !args.oldText) {
-    throw new Error("replaceWorkspaceText requires non-empty oldText.");
+    throw new Error("editFile requires non-empty oldText.");
   }
   return args.oldText;
 }
 
 function requireWorkspaceNewText(args: WorkspaceFileArgs) {
   if (typeof args.newText !== "string") {
-    throw new Error("replaceWorkspaceText requires string newText.");
+    throw new Error("editFile requires string newText.");
   }
   return args.newText;
 }
@@ -511,7 +472,7 @@ function readExpectedReplacementCount(args: WorkspaceFileArgs) {
   if (args.expectedReplacements === undefined) return 1;
   const value = Number(args.expectedReplacements);
   if (!Number.isInteger(value) || value < 1) {
-    throw new Error("replaceWorkspaceText expectedReplacements must be a positive integer.");
+    throw new Error("editFile expectedReplacements must be a positive integer.");
   }
   return value;
 }
@@ -529,7 +490,7 @@ function pluralizeReplacement(count: number) {
 
 function requireWorkspaceSearchQuery(args: WorkspaceFileArgs) {
   const query = typeof args.query === "string" ? args.query.trim() : "";
-  if (!query) throw new Error("searchWorkspace requires a non-empty query.");
+  if (!query) throw new Error("searchFiles requires a non-empty query.");
   return query;
 }
 
@@ -777,7 +738,7 @@ export function resolveLocalWorkspaceToolPath(args: {
   return targetPath;
 }
 
-async function readWorkspaceFileTool(args: {
+async function readFileTool(args: {
   call: AgentRuntimeToolCallInput;
   workspaceRoot: string;
 }): Promise<AgentRuntimeToolResult> {
@@ -800,10 +761,15 @@ async function readWorkspaceFileTool(args: {
   };
 }
 
-async function writeWorkspaceFileTool(args: {
+async function writeFileTool(args: {
   call: AgentRuntimeToolCallInput;
   workspaceRoot: string;
 }): Promise<AgentRuntimeToolResult> {
+  // TODO: Explore cheaply including diff stat/EOL warning after writeFile.
+  // If implementation is larger than a small safe change, defer it.
+  // Exact boundaries: writeFileTool function in localWorkspaceTools.ts.
+  // Consider adding a post-write hook that runs `git diff --stat` and checks line endings.
+  // Keep it optional and non-blocking.
   const parsed = parseWorkspaceToolArguments(args.call.arguments);
   const requestedPath = requireWorkspaceToolPath(parsed);
   const content = requireWorkspaceFileContent(parsed);
@@ -826,7 +792,7 @@ async function writeWorkspaceFileTool(args: {
   };
 }
 
-async function replaceWorkspaceTextTool(args: {
+async function editFileTool(args: {
   call: AgentRuntimeToolCallInput;
   workspaceRoot: string;
 }): Promise<AgentRuntimeToolResult> {
@@ -843,7 +809,7 @@ async function replaceWorkspaceTextTool(args: {
   const replacementCount = countExactTextOccurrences({ content, oldText });
   if (replacementCount !== expectedReplacements) {
     throw new Error(
-      `replaceWorkspaceText expected ${expectedReplacements} ${pluralizeReplacement(expectedReplacements)} ` +
+      `editFile expected ${expectedReplacements} ${pluralizeReplacement(expectedReplacements)} ` +
         `but found ${replacementCount} in ${requestedPath}.`
     );
   }
@@ -877,7 +843,7 @@ async function formatWorkspaceDirEntry(args: {
   return info.isDirectory() ? `${relativePath}/` : relativePath;
 }
 
-async function listWorkspaceFilesTool(args: {
+async function listFilesTool(args: {
   call: AgentRuntimeToolCallInput;
   workspaceRoot: string;
 }): Promise<AgentRuntimeToolResult> {
@@ -904,7 +870,7 @@ async function listWorkspaceFilesTool(args: {
   };
 }
 
-async function searchWorkspaceTool(args: {
+async function searchFilesTool(args: {
   call: AgentRuntimeToolCallInput;
   workspaceRoot: string;
 }): Promise<AgentRuntimeToolResult> {
@@ -913,6 +879,7 @@ async function searchWorkspaceTool(args: {
   const requestedPath = typeof parsed.path === "string" && parsed.path.trim()
     ? parsed.path.trim()
     : ".";
+  const includeIgnored = parsed.includeIgnored === true;
   const searchPath = resolveLocalWorkspaceToolPath({
     workspaceRoot: args.workspaceRoot,
     requestedPath,
@@ -930,6 +897,7 @@ async function searchWorkspaceTool(args: {
           "--line-number",
           "--no-heading",
           "--hidden",
+          ...(includeIgnored ? ["--no-ignore"] : []),
           "--glob",
           "!node_modules",
           "--glob",
@@ -959,6 +927,7 @@ async function searchWorkspaceTool(args: {
     metadata: {
       query,
       path: requestedPath,
+      includeIgnored,
       exitCode: result.exitCode,
     },
   };
@@ -1101,51 +1070,23 @@ async function execShellTool(args: {
 
 export function createLocalWorkspaceToolExecutors(args: LocalWorkspaceToolArgs) {
   return {
-    listWorkspaceFiles: (call: AgentRuntimeToolCallInput) => listWorkspaceFilesTool({
-      call,
-      workspaceRoot: args.workspaceRoot,
-    }),
-    readWorkspaceFile: (call: AgentRuntimeToolCallInput) => readWorkspaceFileTool({
-      call,
-      workspaceRoot: args.workspaceRoot,
-    }),
-    writeWorkspaceFile: (call: AgentRuntimeToolCallInput) => writeWorkspaceFileTool({
-      call,
-      workspaceRoot: args.workspaceRoot,
-    }),
-    replaceWorkspaceText: (call: AgentRuntimeToolCallInput) => replaceWorkspaceTextTool({
-      call,
-      workspaceRoot: args.workspaceRoot,
-    }),
-    editFile: (call: AgentRuntimeToolCallInput) => replaceWorkspaceTextTool({
-      call,
-      workspaceRoot: args.workspaceRoot,
-    }),
-    applyEdit: (call: AgentRuntimeToolCallInput) => replaceWorkspaceTextTool({
-      call,
-      workspaceRoot: args.workspaceRoot,
-    }),
-    applyLineEdits: (call: AgentRuntimeToolCallInput) => replaceWorkspaceTextTool({
-      call,
-      workspaceRoot: args.workspaceRoot,
-    }),
-    listFiles: (call: AgentRuntimeToolCallInput) => listWorkspaceFilesTool({
+    editFile: (call: AgentRuntimeToolCallInput) => editFileTool({
       call,
       workspaceRoot: args.workspaceRoot,
     }),
-    readFile: (call: AgentRuntimeToolCallInput) => readWorkspaceFileTool({
+    listFiles: (call: AgentRuntimeToolCallInput) => listFilesTool({
       call,
       workspaceRoot: args.workspaceRoot,
     }),
-    writeFile: (call: AgentRuntimeToolCallInput) => writeWorkspaceFileTool({
+    readFile: (call: AgentRuntimeToolCallInput) => readFileTool({
       call,
       workspaceRoot: args.workspaceRoot,
     }),
-    searchWorkspace: (call: AgentRuntimeToolCallInput) => searchWorkspaceTool({
+    writeFile: (call: AgentRuntimeToolCallInput) => writeFileTool({
       call,
       workspaceRoot: args.workspaceRoot,
     }),
-    searchFiles: (call: AgentRuntimeToolCallInput) => searchWorkspaceTool({
+    searchFiles: (call: AgentRuntimeToolCallInput) => searchFilesTool({
       call,
       workspaceRoot: args.workspaceRoot,
     }),