@iinm/plain-agent 1.10.12 → 1.10.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iinm/plain-agent",
-  "version": "1.10.12",
+  "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/cli/formatter.mjs

@@ -221,7 +221,7 @@ export function formatToolResult(toolResult) {
         styleText("yellow", "$1"),
       )
       .replace(/(^<stderr>|<\/stderr>$)/gm, styleText("magenta", "$1"))
-      .replace(/(^<error>|<\/error>$)/gm, styleText("magenta", "$1"));
+      .replace(/(^<error code=.+?>|<\/error>$)/gm, styleText("magenta", "$1"));
   }
 
   if (toolResult.toolName === "read_file") {

package/src/cli/interactive.mjs

@@ -501,7 +501,8 @@ export function startInteractiveSession({
     }
     if (partialContent.position === "stop") {
       if (partialContent.type === "tool_use") {
-        process.stdout.write("\r\x1b[K");
+        // 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();

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,