@iinm/plain-agent 1.10.11 → 1.10.13

package/package.json

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

package/sandbox/bin/plain-sandbox

@@ -7,6 +7,7 @@ SCRIPT_NAME=$(basename "${BASH_SOURCE[0]}")
 
 MOUNTABLE_SCRIPT_PATH="$HOME/.cache/$SCRIPT_NAME/$SCRIPT_NAME"
 CONTAINER_SCRIPT_PATH="/sandbox/bin/$SCRIPT_NAME"
+PRESET_BASE_IMAGE="public.ecr.aws/docker/library/debian:stable-20260505-slim"
 
 help() {
   cat << HELP
@@ -851,8 +852,8 @@ setup_container_user() {
 }
 
 print_preset_dockerfile() {
+  echo "FROM $PRESET_BASE_IMAGE"
   cat << 'EOF'
-FROM public.ecr.aws/docker/library/debian:stable-slim
 
 RUN apt update \
     && apt install -y \

package/src/agent.d.ts

@@ -37,7 +37,7 @@ type AgentEventMap = {
   message: [Message];
   partialMessageContent: [PartialMessageContent];
   error: [Error];
-  toolUseRequest: [];
+  toolUseRequest: [number];
   turnEnd: [];
   providerTokenUsage: [ProviderTokenUsage];
   subagentSwitched: [{ name: string } | null];

package/src/agentLoop.mjs

@@ -172,9 +172,6 @@ export function createAgentLoop({
             content: validation.toolResults,
           },
         ]);
-        if (validation.errorMessage) {
-          console.error(styleText("yellow", validation.errorMessage));
-        }
         continue;
       }
 
@@ -205,7 +202,7 @@ export function createAgentLoop({
 
       const isAllToolUseApproved = decisions.every((d) => d.action === "allow");
       if (!isAllToolUseApproved) {
-        agentEventEmitter.emit("toolUseRequest");
+        agentEventEmitter.emit("toolUseRequest", toolUseParts.length);
         break;
       }
 

package/src/cli/formatter.mjs

@@ -70,7 +70,7 @@ export async function formatToolUse(toolUse) {
     /** @type {Partial<ExecCommandInput>} */
     const execCommandInput = input;
     return [
-      `tool: ${toolName}`,
+      `${toolName}`,
       `command: ${JSON.stringify(execCommandInput.command)}`,
       formatArgs(execCommandInput.args),
     ].join("\n");
@@ -80,7 +80,7 @@ export async function formatToolUse(toolUse) {
     /** @type {Partial<WriteFileInput>} */
     const writeFileInput = input;
     return [
-      `tool: ${toolName}`,
+      `${toolName}`,
       `filePath: ${writeFileInput.filePath}`,
       `content:\n${writeFileInput.content}`,
     ].join("\n");
@@ -92,18 +92,16 @@ export async function formatToolUse(toolUse) {
     const filePath = patchFileInput.filePath ?? "";
     const patch = patchFileInput.patch || "";
     const rendered = await renderPatch(filePath, patch);
-    return [
-      `tool: ${toolName}`,
-      `path: ${filePath}`,
-      `patch:\n${rendered}`,
-    ].join("\n");
+    return [`${toolName}`, `path: ${filePath}`, `patch:\n${rendered}`].join(
+      "\n",
+    );
   }
 
   if (toolName === "read_file") {
     /** @type {Partial<ReadFileInput>} */
     const readFileInput = input;
     /** @type {string[]} */
-    const lines = [`tool: ${toolName}`, `filePath: ${readFileInput.filePath}`];
+    const lines = [`${toolName}`, `filePath: ${readFileInput.filePath}`];
     if (readFileInput.offset !== undefined) {
       lines.push(`offset: ${readFileInput.offset}`);
     }
@@ -117,7 +115,7 @@ export async function formatToolUse(toolUse) {
     /** @type {Partial<TmuxCommandInput>} */
     const tmuxCommandInput = input;
     return [
-      `tool: ${toolName}`,
+      `${toolName}`,
       `command: ${tmuxCommandInput.command}`,
       formatArgs(tmuxCommandInput.args),
     ].join("\n");
@@ -127,7 +125,7 @@ export async function formatToolUse(toolUse) {
     /** @type {Partial<SwitchToSubagentInput>} */
     const switchToSubagentInput = input;
     return [
-      `tool: ${toolName}`,
+      `${toolName}`,
       `name: ${switchToSubagentInput.name}`,
       `goal: ${switchToSubagentInput.goal}`,
     ].join("\n");
@@ -137,7 +135,7 @@ export async function formatToolUse(toolUse) {
     /** @type {Partial<CompactContextInput>} */
     const compactContextInput = input;
     return [
-      `tool: ${toolName}`,
+      `${toolName}`,
       `memoryPath: ${compactContextInput.memoryPath}`,
       `reason: ${compactContextInput.reason}`,
     ].join("\n");
@@ -147,7 +145,7 @@ export async function formatToolUse(toolUse) {
     /** @type {Partial<import("../tools/switchToMainAgent").SwitchToMainAgentInput>} */
     const switchToMainAgentInput = input;
     return [
-      `tool: ${toolName}`,
+      `${toolName}`,
       `memoryPath: ${switchToMainAgentInput.memoryPath}`,
     ].join("\n");
   }
@@ -159,7 +157,7 @@ export async function formatToolUse(toolUse) {
       ? webSearchInput.searches.map((s) => s.keywords.join(" ")).join(" | ")
       : "";
     return [
-      `tool: ${toolName}`,
+      `${toolName}`,
       `searches: ${searchesLine}`,
       `question: ${webSearchInput.question}`,
     ].join("\n");
@@ -169,7 +167,7 @@ export async function formatToolUse(toolUse) {
     /** @type {Partial<import("../tools/webFetch.mjs").WebFetchInput>} */
     const webFetchInput = input;
     return [
-      `tool: ${toolName}`,
+      `${toolName}`,
       `url: ${webFetchInput.url}`,
       `question: ${webFetchInput.question}`,
     ].join("\n");
@@ -212,7 +210,7 @@ export function formatToolResult(toolResult) {
   const contentString = contentStringParts.join("\n\n");
 
   if (isError) {
-    return styleText("red", contentString);
+    return styleText("magenta", contentString);
   }
 
   if (toolResult.toolName === "exec_command") {
@@ -223,7 +221,7 @@ export function formatToolResult(toolResult) {
         styleText("yellow", "$1"),
       )
       .replace(/(^<stderr>|<\/stderr>$)/gm, styleText("magenta", "$1"))
-      .replace(/(^<error>|<\/error>$)/gm, styleText("red", "$1"));
+      .replace(/(^<error code=.+?>|<\/error>$)/gm, styleText("magenta", "$1"));
   }
 
   if (toolResult.toolName === "read_file") {
@@ -237,7 +235,7 @@ export function formatToolResult(toolResult) {
     return contentString
       .replace(/(^<stdout>|<\/stdout>$)/gm, styleText("blue", "$1"))
       .replace(/(^<stderr>|<\/stderr>$)/gm, styleText("magenta", "$1"))
-      .replace(/(^<error>|<\/error>$)/gm, styleText("red", "$1"))
+      .replace(/(^<error>|<\/error>$)/gm, styleText("magenta", "$1"))
       .replace(/(^<tmux:.*?>|<\/tmux:.*?>$)/gm, styleText("green", "$1"));
   }
 
@@ -858,7 +856,7 @@ function renderPatchBlock(block, originalLines, nonce) {
       // "+ ".
       for (const op of diffLines(oldSlice, block.body)) {
         if (op.type === "-") {
-          out.push(styleText("red", `- ${op.line}`));
+          out.push(styleText("magenta", `- ${op.line}`));
         } else if (op.type === "+") {
           out.push(styleText("green", `+ ${op.line}`));
         } else {

package/src/cli/interactive.mjs

@@ -501,9 +501,8 @@ export function startInteractiveSession({
     }
     if (partialContent.position === "stop") {
       if (partialContent.type === "tool_use") {
-        process.stdout.write(
-          `\r\x1b[K${styleText("gray", `<${partialContent.type}>`)}\n`,
-        );
+        // Clear current line, move up one line, and clear that line too
+        process.stdout.write("\x1b[2K\x1b[1F\x1b[2K");
       } else {
         // Flush any buffered text before printing the closing tag
         streamBuffer.forceFlush();
@@ -524,13 +523,14 @@ export function startInteractiveSession({
     );
   });
 
-  agentEventEmitter.on("toolUseRequest", () => {
+  agentEventEmitter.on("toolUseRequest", (toolCount) => {
+    const toolText = toolCount === 1 ? "tool call" : "tool calls";
     cli.setPrompt(
       getCliPrompt(
         state.subagentName,
         styleText(
           "yellow",
-          "Approve tool calls? (y = allow once, Y = allow in this session, or feedback)",
+          `Approve ${toolCount} ${toolText}? (y = allow once, Y = allow in this session, or feedback)`,
         ),
       ),
     );

package/src/tools/compactContext.mjs

@@ -28,7 +28,7 @@ export function createCompactContextTool() {
         properties: {
           memoryPath: {
             type: "string",
-            description: `Path to the memory file under ${AGENT_MEMORY_DIR}/.`,
+            description: "Path to the memory file.",
           },
           reason: {
             type: "string",

package/src/tools/execCommand.mjs

@@ -140,19 +140,41 @@ export function createExecCommandTool(config) {
                   : "<stderr></stderr>",
               ];
 
-              if (err) {
-                // rg: 何もマッチしない場合は exit status != 0 になるので無視
-                const ignoreError = [command, ...(args || [])].includes("rg");
+              if (!stderr && err) {
+                // rg: exit status != 0 when no matches are found.
+                const ignoreError = ["rg"].includes(input.command);
                 if (!ignoreError) {
-                  // err.message が長過ぎる場合は先頭を表示
-                  const errMessageTruncated = err.message.slice(
+                  // mask sandbox details
+                  const originalCommand = [
+                    input.command,
+                    ...(input.args ?? []),
+                  ];
+                  const sandboxedCommand = [command, ...(args ?? [])];
+                  const sandboxStr = [
+                    ...sandboxedCommand.slice(
+                      0,
+                      sandboxedCommand.length - originalCommand.length,
+                    ),
+                    "",
+                  ].join(" ");
+
+                  const errMessageMasked = sandboxStr
+                    ? err.message.replaceAll(sandboxStr, "")
+                    : err.message;
+
+                  const errMessageTruncated = errMessageMasked.slice(
                     0,
                     OUTPUT_TRUNCATED_LENGTH,
                   );
                   const isErrMessageTruncated =
-                    err.message.length > OUTPUT_MAX_LENGTH;
+                    errMessageMasked.length > OUTPUT_TRUNCATED_LENGTH;
+
                   result.push(
-                    `\n<error>\n${err.name}: ${errMessageTruncated}${isErrMessageTruncated ? "... (Message truncated)" : ""}</error>`,
+                    [
+                      "",
+                      `<error code="${err.code}" killed="${err.killed}" signal="${err.signal}">`,
+                      `${err.name}: ${errMessageTruncated}${isErrMessageTruncated ? "... (Message truncated)" : ""}</error>`,
+                    ].join("\n"),
                   );
                 }
               }

package/src/tools/tmuxCommand.mjs

@@ -108,7 +108,7 @@ export function createTmuxCommandTool(config) {
                   ? `<stderr>\n${isStderrTruncated ? "(Output truncated) ..." : ""}${stderrTruncated}\n</stderr>`
                   : "<stderr></stderr>",
               ];
-              if (err) {
+              if (!stderr && err) {
                 const errMessageTruncated = err.message.slice(
                   0,
                   OUTPUT_MAX_LENGTH,