@iinm/plain-agent 1.7.6 → 1.7.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iinm/plain-agent",
-  "version": "1.7.6",
+  "version": "1.7.8",
   "description": "A lightweight CLI-based coding agent",
   "license": "MIT",
   "type": "module",

package/src/cliFormatter.mjs

@@ -47,7 +47,7 @@ export function formatToolUse(toolUse) {
     const diffs = [];
     const matches = Array.from(
       diff.matchAll(
-        /<<<<<<< SEARCH\n(.*?)\n?=======\n(.*?)\n?>>>>>>> REPLACE/gs,
+        /<<<<<<< SEARCH [0-9a-z]{3}\n(.*?)\n======= [0-9a-z]{3}\n(.*?)\n?>>>>>>> REPLACE [0-9a-z]{3}/gs,
       ),
     );
     for (const match of matches) {
@@ -95,6 +95,31 @@ export function formatToolUse(toolUse) {
     ].join("\n");
   }
 
+  if (toolName === "report_as_subagent") {
+    /** @type {Partial<import("./tools/reportAsSubagent").ReportAsSubagentInput>} */
+    const reportAsSubagentInput = input;
+    return [
+      `tool: ${toolName}`,
+      `memoryPath: ${reportAsSubagentInput.memoryPath}`,
+    ].join("\n");
+  }
+
+  if (toolName === "ask_web") {
+    /** @type {Partial<import("./tools/askWeb.mjs").AskWebInput>} */
+    const askWebInput = input;
+    return [`tool: ${toolName}`, `question: ${askWebInput.question}`].join(
+      "\n",
+    );
+  }
+
+  if (toolName === "ask_url") {
+    /** @type {Partial<import("./tools/askURL.mjs").AskURLInput>} */
+    const askURLInput = input;
+    return [`tool: ${toolName}`, `question: ${askURLInput.question}`].join(
+      "\n",
+    );
+  }
+
   const { provider: _, ...filteredToolUse } = toolUse;
 
   return JSON.stringify(filteredToolUse, null, 2);

package/src/main.mjs

@@ -26,7 +26,7 @@ import { createAskURLTool } from "./tools/askURL.mjs";
 import { createAskWebTool } from "./tools/askWeb.mjs";
 import { createDelegateToSubagentTool } from "./tools/delegateToSubagent.mjs";
 import { createExecCommandTool } from "./tools/execCommand.mjs";
-import { patchFileTool } from "./tools/patchFile.mjs";
+import { createPatchFileTool } from "./tools/patchFile.mjs";
 import { createReportAsSubagentTool } from "./tools/reportAsSubagent.mjs";
 import { createTmuxCommandTool } from "./tools/tmuxCommand.mjs";
 import { writeFileTool } from "./tools/writeFile.mjs";
@@ -162,7 +162,7 @@ if (cliArgs.subcommand.type === "install-claude-code-plugins") {
   const builtinTools = [
     createExecCommandTool({ sandbox: appConfig.sandbox }),
     writeFileTool,
-    patchFileTool,
+    createPatchFileTool(),
     createTmuxCommandTool({ sandbox: appConfig.sandbox }),
     createDelegateToSubagentTool(),
     createReportAsSubagentTool(),

package/src/tools/askURL.mjs

@@ -25,7 +25,7 @@ import { noThrow } from "../utils/noThrow.mjs";
  */
 
 /**
- * @typedef {Object} AskWebInput
+ * @typedef {Object} AskURLInput
  * @property {string} question
  */
 
@@ -35,7 +35,7 @@ import { noThrow } from "../utils/noThrow.mjs";
  */
 export function createAskURLTool(config) {
   /**
-   * @param {AskWebInput} input
+   * @param {AskURLInput} input
    * @param {number} retryCount
    * @returns {Promise<string | Error>}
    */
@@ -193,9 +193,17 @@ Question: ${input.question}`,
     },
 
     /**
-     * @param {AskWebInput} input
+     * @param {AskURLInput} input
      * @returns {Promise<string | Error>}
      */
     impl: async (input) => await noThrow(async () => askURL(input, 0)),
+
+    /**
+     * @param {Record<string, unknown>} _input
+     * @returns {Record<string, unknown>}
+     */
+    maskApprovalInput: (_input) => {
+      return {};
+    },
   };
 }

package/src/tools/askWeb.mjs

@@ -196,5 +196,13 @@ Question: ${input.question}`,
      * @returns {Promise<string | Error>}
      */
     impl: async (input) => await noThrow(async () => askWeb(input, 0)),
+
+    /**
+     * @param {Record<string, unknown>} _input
+     * @returns {Record<string, unknown>}
+     */
+    maskApprovalInput: (_input) => {
+      return {};
+    },
   };
 }

package/src/tools/patchFile.mjs

@@ -6,91 +6,103 @@
 import fs from "node:fs/promises";
 import { noThrow } from "../utils/noThrow.mjs";
 
-/** @type {Tool} */
-export const patchFileTool = {
-  def: {
-    name: "patch_file",
-    description:
-      "Modify a file by replacing specific content with new content.",
-    inputSchema: {
-      type: "object",
-      properties: {
-        filePath: {
-          type: "string",
-        },
-        diff: {
-          description: `
+/**
+ * @param {string} [nonce]
+ * @returns {Tool}
+ */
+export function createPatchFileTool(
+  nonce = Math.random().toString(36).substring(2, 5),
+) {
+  return {
+    def: {
+      name: "patch_file",
+      description:
+        "Modify a file by replacing specific content with new content.",
+      inputSchema: {
+        type: "object",
+        properties: {
+          filePath: {
+            type: "string",
+          },
+          diff: {
+            description: `
 - Content is searched as an exact match including indentation and line breaks.
 - The first match found will be replaced if there are multiple matches.
-- Use multiple SEARCH/REPLACE blocks to replace multiple contents.
+- Use multiple SEARCH/REPLACE blocks with nonce (${nonce}) to replace multiple contents.
 
 Format:
-<<<<<<< SEARCH
+<<<<<<< SEARCH ${nonce}
 old content
-=======
+======= ${nonce}
 new content
->>>>>>> REPLACE
+>>>>>>> REPLACE ${nonce}
 
-<<<<<<< SEARCH
+<<<<<<< SEARCH ${nonce}
 other old content
-=======
+======= ${nonce}
 other new content
->>>>>>> REPLACE
+>>>>>>> REPLACE ${nonce}
           `.trim(),
-          type: "string",
+            type: "string",
+          },
         },
+        required: ["filePath", "diff"],
       },
-      required: ["filePath", "diff"],
     },
-  },
 
-  /**
-   * @param {PatchFileInput} input
-   * @returns {Promise<string | Error>}
-   */
-  impl: async (input) =>
-    await noThrow(async () => {
-      const { filePath, diff } = input;
+    /**
+     * @param {PatchFileInput} input
+     * @returns {Promise<string | Error>}
+     */
+    impl: async (input) =>
+      await noThrow(async () => {
+        const { filePath, diff } = input;
 
-      const content = await fs.readFile(filePath, "utf8");
-      const matches = Array.from(
-        diff.matchAll(
-          /<<<<<<< SEARCH\n(.*?)\n?=======\n(.*?)\n?>>>>>>> REPLACE/gs,
-        ),
-      );
-      if (matches.length === 0) {
-        throw new Error("No matches found in diff.");
-      }
-      let newContent = content;
-      for (const match of matches) {
-        const [_, search, replace] = match;
-        if (!newContent.includes(search)) {
+        const content = await fs.readFile(filePath, "utf8");
+        const matches = Array.from(
+          diff.matchAll(
+            new RegExp(
+              `<<<<<<< SEARCH ${nonce}\\n(.*?)\\n======= ${nonce}\\n(.*?)\\n?>>>>>>> REPLACE ${nonce}`,
+              "gs",
+            ),
+          ),
+        );
+        if (matches.length === 0) {
           throw new Error(
-            JSON.stringify(`Search content not found: ${search}`),
+            `Invalid diff format. All markers must include the nonce, e.g., <<<<<<< SEARCH ${nonce} / ======= ${nonce} / >>>>>>> REPLACE ${nonce}`,
           );
         }
-        // Escape $ characters in replacement string to prevent interpretation of $& $1 $$ patterns
-        const escapedReplace = replace.replace(/\$/g, "$$$$");
-        if (replace === "" && newContent.includes(`${search}\n`)) {
-          newContent = newContent.replace(`${search}\n`, "");
-        } else if (replace === "" && newContent.includes(`\n${search}`)) {
-          newContent = newContent.replace(`\n${search}`, "");
-        } else {
-          newContent = newContent.replace(search, escapedReplace);
+        let newContent = content;
+        for (const match of matches) {
+          const [_, search, replace] = match;
+          if (!newContent.includes(search)) {
+            throw new Error(
+              JSON.stringify(`Search content not found: ${search}`),
+            );
+          }
+          // Escape $ characters in replacement string to prevent interpretation of $& $1 $$ patterns
+          const escapedReplace = replace.replace(/\$/g, "$$$$");
+          if (replace === "" && newContent.includes(`${search}\n`)) {
+            newContent = newContent.replace(`${search}\n`, "");
+          } else if (replace === "" && newContent.includes(`\n${search}`)) {
+            newContent = newContent.replace(`\n${search}`, "");
+          } else {
+            newContent = newContent.replace(search, escapedReplace);
+          }
         }
-      }
-      await fs.writeFile(filePath, newContent);
-      return `Patched file: ${filePath}`;
-    }),
+        await fs.writeFile(filePath, newContent);
+        return `Patched file: ${filePath}`;
+      }),
 
-  /**
-   * @param {Record<string, unknown>} input
-   * @returns {Record<string, unknown>}
-   */
-  maskApprovalInput: (input) => {
-    const patchFileInput = /** @type {PatchFileInput} */ (input);
-    return {
-      filePath: patchFileInput.filePath,
-    };
-  },
-};
+    /**
+     * @param {Record<string, unknown>} input
+     * @returns {Record<string, unknown>}
+     */
+    maskApprovalInput: (input) => {
+      const patchFileInput = /** @type {PatchFileInput} */ (input);
+      return {
+        filePath: patchFileInput.filePath,
+      };
+    },
+  };
+}