@iinm/plain-agent 1.7.13 → 1.7.14

package/README.md

@@ -191,7 +191,7 @@ Create the configuration.
     },
     {
       "name": "claude-sonnet-4-6",
-      "variant": "thinking-16k-bedrock-jp",
+      "variant": "thinking-high-bedrock-jp",
       "platform": {
         "name": "bedrock",
         "variant": "jp"
@@ -201,7 +201,8 @@ Create the configuration.
         "config": {
           "model": "jp.anthropic.claude-sonnet-4-6",
           "max_tokens": 32768,
-          "thinking": { "type": "enabled", "budget_tokens": 16384 }
+          "thinking": { "type": "adaptive" },
+          "output_config": { "effort": "high" }
         }
       },
       "cost": {
@@ -239,6 +240,18 @@ plain
 plain -m <model+variant>
 ```
 
+(Optional) Set up a sandbox for your project with the `sandbox-configurator` agent.
+
+```
+/agents:sandbox-configurator Set up a sandbox for this project
+```
+
+After the agent finishes, run the generated setup script once to build the sandbox image and install dependencies.
+
+```sh
+./.plain-agent/setup.sh
+```
+
 Run in batch mode (non-interactive).
 In batch mode, config files are not loaded automatically. Only the files specified with `--config` are loaded.
 
@@ -331,7 +344,7 @@ The agent loads configuration files in the following order. Settings in later fi
   },
   "sandbox": {
     "command": "plain-sandbox",
-    "args": ["--dockerfile", ".plain-agent/sandbox/Dockerfile", "--allow-write", "--skip-build", "--keep-alive", "30"],
+    "args": ["--allow-write", "--skip-build", "--keep-alive", "30"],
     "separator": "--",
     "rules": [
       {
@@ -394,7 +407,7 @@ The agent loads configuration files in the following order. Settings in later fi
   // https://github.com/iinm/plain-agent/tree/main/sandbox
   "sandbox": {
     "command": "plain-sandbox",
-    "args": ["--dockerfile", ".plain-agent/sandbox/Dockerfile", "--allow-write", "--skip-build", "--keep-alive", "30"],
+    "args": ["--allow-write", "--skip-build", "--keep-alive", "30"],
     // separator is inserted between sandbox flags and the user command to prevent bypasses
     "separator": "--",
 

package/config/agents.predefined/sandbox-configurator.md

@@ -1,8 +1,8 @@
 ---
-description: Analyzes the project and builds sandbox configuration files (Dockerfile, run.sh, env, setup.sh) tailored to the project's needs.
+description: Analyzes the project and generates sandbox configuration files (run.sh, setup.sh) tailored to the project's needs.
 ---
 
-You are a sandbox builder. You analyze the project and generate sandbox configuration files so that commands run in an isolated Docker container.
+You are a sandbox builder. You analyze the project and generate sandbox configuration files so that commands run in an isolated Docker container using the `plain-sandbox` preset image.
 
 ## Overview
 
@@ -19,48 +19,40 @@ Before generating anything, analyze the project to determine:
 
 ### 1a. Runtime & Tools
 
-Detect the project type and determine which runtimes to install via mise:
+Detect the project type and determine which runtimes to install via mise. Use the runtime's bundled package managers instead of installing them separately via mise (e.g. Node.js ships with npm; use `corepack enable` for yarn/pnpm).
 
-| File found | mise install commands |
-|---|---|
-| `package.json` | `mise use node@<version>` (check `.nvmrc` or `.node-version`, else use LTS) |
-| `package.json` + `package-lock.json` | Add `mise use npm@latest` |
-| `package.json` + `yarn.lock` | Add `mise use yarn@latest` |
-| `package.json` + `pnpm-lock.yaml` | Add `mise use pnpm@latest` |
-| `requirements.txt` or `pyproject.toml` | `mise use python@<version>` (check `.python-version`, else 3.12) |
-| `go.mod` | `mise use go@<version>` (check `go.mod` for version directive) |
-| `Cargo.toml` | `mise use rust@latest` |
-| Multiple of the above | All detected runtimes |
+| File found | mise install commands | Version source |
+|---|---|---|
+| `package.json` | `mise use node@<version>` | `.nvmrc` / `.node-version` / `package.json` (`engines.node`) |
+| `requirements.txt` or `pyproject.toml` | `mise use python@<version>` | `.python-version` / `pyproject.toml` (`requires-python`) |
 
 Also check for common dev tools:
-- `terraform/` directory or `*.tf` files → `mise use terraform@<version>`
-- `.terraform-version` → `mise use terraform@<version>`
+- `*.tf` files or `.terraform-version` → `mise use terraform@<version>` (version source: `.terraform-version`)
+
+If a version cannot be determined from the files above, **ask the user which version to use** rather than falling back to a default.
 
 ### 1b. Volume Candidates
 
-Detect directories that should use Docker volumes (for performance with large directories):
+Detect directories that should use Docker volumes. A Docker volume is preferred over a host bind mount for `node_modules` because:
+
+- `node_modules` contains many thousands of small files, and bind-mounting it into the container is slow on macOS/Windows (file sync overhead).
+- Native modules compiled for the host OS/arch can be incompatible with the Linux container, so keeping container-side `node_modules` isolated avoids conflicts.
 
 | Project type | Cache volumes | Dependency volumes |
 |---|---|---|
-| Node.js | `plain-sandbox--global--home-npm:/home/sandbox/.npm` | `node_modules` (per package.json dir if monorepo) |
+| Node.js | `plain-sandbox--global--home-npm:/home/sandbox/.npm` | `node_modules` (per `package.json` dir if monorepo) |
 | Python | `plain-sandbox--global--home-pip:/home/sandbox/.cache/pip` | — |
-| Go | `plain-sandbox--global--home-go-pkg:/home/sandbox/go/pkg/mod` | — |
-| Rust | `plain-sandbox--global--home-cargo:/home/sandbox/.cargo/registry` | — |
 
-For monorepo detection: if multiple `package.json` files exist (excluding `node_modules`), treat as monorepo and create a volume per `node_modules` directory.
+For monorepo detection: if multiple `package.json` files exist (excluding `node_modules`), treat as a monorepo and create a volume per `node_modules` directory.
 
 ### 1c. Setup Install Commands
 
 | Project type | Install command |
 |---|---|
 | Node.js (npm) | `npm ci` (or `npm install` if no lockfile) |
-| Node.js (yarn) | `yarn install --frozen-lockfile` |
-| Node.js (pnpm) | `pnpm install --frozen-lockfile` |
+| Node.js (yarn) | `corepack enable && yarn install --frozen-lockfile` |
+| Node.js (pnpm) | `corepack enable && pnpm install --frozen-lockfile` |
 | Python | `pip install -r requirements.txt` or `pip install .` |
-| Go | `go mod download` |
-| Rust | `cargo build` |
-
-If multiple project types, include all relevant commands.
 
 ## Step 2: Confirm with User
 
@@ -77,45 +69,7 @@ Ask only one additional question:
 
 ## Step 3: Generate run.sh
 
-Generate `.plain-agent/sandbox/run.sh`. The structure varies by project type.
-
-### Monorepo handling:
-
-If multiple `package.json` files exist, dynamically create volumes for each `node_modules`:
-
-```bash
-# Create volumes for each node_modules directory
-for path in $(fd package.json --max-depth 3 | sed -E 's,package.json$,node_modules,'); do
-  mkdir -p "$path"
-  options+=("--volume" "$path")
-done
-```
-
-### Git worktree handling:
-
-Always include this block after the options array, before `plain-sandbox`:
-
-```bash
-# Mount main worktree if using git worktrees
-git_root=$(git rev-parse --show-toplevel 2>/dev/null || true)
-if test -n "$git_root" && test -f "$git_root/.git"; then
-  main_worktree_path=$(sed -E 's,^gitdir: (.+)/.git/.+,\1,' < "$git_root/.git")
-  options+=("--mount-writable" "$main_worktree_path:$main_worktree_path")
-fi
-```
-
-### gitconfig handling:
-
-Include this block only if the user confirmed:
-
-```bash
-# Mount gitconfig
-if test -f "$HOME/.gitconfig"; then
-  options+=("--mount-readonly" "$HOME/.gitconfig:/home/sandbox/.gitconfig")
-fi
-```
-
-### Complete run.sh example (Node.js project):
+Generate `.plain-agent/sandbox/run.sh`. Use the following Node.js example as the template and adapt volumes for other runtimes from the table in Step 1b.
 
 ```bash
 #!/usr/bin/env bash
@@ -128,6 +82,13 @@ options=(
   --volume node_modules
 )
 
+# Monorepo: create a volume for each node_modules directory.
+# Include only when multiple package.json files exist.
+# for path in $(fd package.json --max-depth 3 | sed -E 's,package.json$,node_modules,'); do
+#   mkdir -p "$path"
+#   options+=("--volume" "$path")
+# done
+
 # Mount main worktree if using git worktrees
 git_root=$(git rev-parse --show-toplevel 2>/dev/null || true)
 if test -n "$git_root" && test -f "$git_root/.git"; then
@@ -135,7 +96,7 @@ if test -n "$git_root" && test -f "$git_root/.git"; then
   options+=("--mount-writable" "$main_worktree_path:$main_worktree_path")
 fi
 
-# Mount gitconfig
+# Mount gitconfig (include only if the user confirmed)
 if test -f "$HOME/.gitconfig"; then
   options+=("--mount-readonly" "$HOME/.gitconfig:/home/sandbox/.gitconfig")
 fi
@@ -145,7 +106,7 @@ plain-sandbox "${options[@]}" "$@"
 
 ## Step 4: Generate setup.sh
 
-Generate `.plain-agent/setup.sh`:
+Generate `.plain-agent/setup.sh`. Use the following Node.js example and replace `node@lts` / `npm ci` with the commands chosen in Step 1.
 
 ```bash
 #!/usr/bin/env bash
@@ -154,24 +115,31 @@ set -eu -o pipefail
 
 this_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
-# Setup sandbox (install dependencies inside container with full network access)
+# Setup sandbox (install runtime and dependencies with network access)
 "$this_dir/sandbox/run.sh" --verbose --allow-net 0.0.0.0/0 mise use node@lts
 "$this_dir/sandbox/run.sh" --verbose --allow-net 0.0.0.0/0 npm ci
 
-# Setup host (install dependencies on host)
+# Setup host
 npm ci
 ```
 
-The `--allow-net 0.0.0.0/0` is needed only during setup for downloading packages. It should NOT be in run.sh for normal usage.
+`--allow-net 0.0.0.0/0` is needed only during setup for downloading packages. It should NOT be in run.sh for normal usage.
 
 ## Step 5: Show config.json Example
 
-After generating all files, display the following example and instruct the user to add it to their `.plain-agent/config.json`:
-
-```
-Add the following to your .plain-agent/config.json:
+After generating all files, instruct the user to add the following to their `.plain-agent/config.json`:
 
+```json
 {
+  "autoApproval": {
+    "patterns": [
+      {
+        "toolName": "exec_command",
+        "input": { "command": { "$regex": "^(gh|docker)$" } },
+        "action": "ask"
+      }
+    ]
+  },
   "sandbox": {
     "command": ".plain-agent/sandbox/run.sh",
     "args": ["--skip-build", "--keep-alive", "30"],
@@ -186,7 +154,7 @@ Add the following to your .plain-agent/config.json:
 }
 ```
 
-If the project already has a `.plain-agent/config.json`, show only the `sandbox` key that should be added/merged. Remind the user:
+If the project already has a `.plain-agent/config.json`, show only the keys that should be added/merged. Remind the user:
 - `--skip-build` assumes the image is already built (run `setup.sh` first to build)
 - `--keep-alive 30` reuses the container for 30 seconds between commands for performance
-- `rules` for `gh` and `docker` should typically run unsandboxed (host access needed)
+- `gh` and `docker` run unsandboxed (host access needed), so they should also be set to `ask` in `autoApproval` to avoid being auto-approved alongside other shell commands. Place this `ask` pattern before any broad `allow` pattern for `exec_command`, since `autoApproval` patterns are evaluated in order and the first match wins.

package/config/config.predefined.json

@@ -181,7 +181,7 @@
     },
     {
       "name": "claude-sonnet-4-6",
-      "variant": "thinking-16k",
+      "variant": "thinking-high",
       "platform": {
         "name": "anthropic",
         "variant": "default",
@@ -192,7 +192,8 @@
         "config": {
           "model": "claude-sonnet-4-6",
           "max_tokens": 32768,
-          "thinking": { "type": "enabled", "budget_tokens": 16384 }
+          "thinking": { "type": "adaptive" },
+          "output_config": { "effort": "high" }
         }
       },
       "cost": {
@@ -208,7 +209,7 @@
     },
     {
       "name": "claude-sonnet-4-6",
-      "variant": "thinking-32k",
+      "variant": "thinking-max",
       "platform": {
         "name": "anthropic",
         "variant": "default",
@@ -219,7 +220,8 @@
         "config": {
           "model": "claude-sonnet-4-6",
           "max_tokens": 64000,
-          "thinking": { "type": "enabled", "budget_tokens": 32768 }
+          "thinking": { "type": "adaptive" },
+          "output_config": { "effort": "max" }
         }
       },
       "cost": {
@@ -234,8 +236,8 @@
       }
     },
     {
-      "name": "claude-opus-4-6",
-      "variant": "thinking-16k",
+      "name": "claude-opus-4-7",
+      "variant": "thinking-high",
       "platform": {
         "name": "anthropic",
         "variant": "default",
@@ -244,9 +246,10 @@
       "model": {
         "format": "anthropic",
         "config": {
-          "model": "claude-opus-4-6",
+          "model": "claude-opus-4-7",
           "max_tokens": 32768,
-          "thinking": { "type": "enabled", "budget_tokens": 16384 }
+          "thinking": { "type": "adaptive" },
+          "output_config": { "effort": "high" }
         }
       },
       "cost": {
@@ -261,8 +264,8 @@
       }
     },
     {
-      "name": "claude-opus-4-6",
-      "variant": "thinking-32k",
+      "name": "claude-opus-4-7",
+      "variant": "thinking-max",
       "platform": {
         "name": "anthropic",
         "variant": "default",
@@ -271,9 +274,10 @@
       "model": {
         "format": "anthropic",
         "config": {
-          "model": "claude-opus-4-6",
+          "model": "claude-opus-4-7",
           "max_tokens": 64000,
-          "thinking": { "type": "enabled", "budget_tokens": 32768 }
+          "thinking": { "type": "adaptive" },
+          "output_config": { "effort": "max" }
         }
       },
       "cost": {
@@ -342,7 +346,7 @@
     },
     {
       "name": "claude-sonnet-4-6",
-      "variant": "thinking-16k-bedrock",
+      "variant": "thinking-high-bedrock",
       "platform": {
         "name": "bedrock",
         "variant": "default"
@@ -352,7 +356,8 @@
         "config": {
           "model": "global.anthropic.claude-sonnet-4-6",
           "max_tokens": 32768,
-          "thinking": { "type": "enabled", "budget_tokens": 16384 }
+          "thinking": { "type": "adaptive" },
+          "output_config": { "effort": "high" }
         }
       },
       "cost": {
@@ -368,7 +373,7 @@
     },
     {
       "name": "claude-sonnet-4-6",
-      "variant": "thinking-32k-bedrock",
+      "variant": "thinking-max-bedrock",
       "platform": {
         "name": "bedrock",
         "variant": "default"
@@ -378,7 +383,8 @@
         "config": {
           "model": "global.anthropic.claude-sonnet-4-6",
           "max_tokens": 64000,
-          "thinking": { "type": "enabled", "budget_tokens": 32768 }
+          "thinking": { "type": "adaptive" },
+          "output_config": { "effort": "max" }
         }
       },
       "cost": {
@@ -393,8 +399,8 @@
       }
     },
     {
-      "name": "claude-opus-4-6",
-      "variant": "thinking-16k-bedrock",
+      "name": "claude-opus-4-7",
+      "variant": "thinking-high-bedrock",
       "platform": {
         "name": "bedrock",
         "variant": "default"
@@ -402,9 +408,10 @@
       "model": {
         "format": "anthropic",
         "config": {
-          "model": "global.anthropic.claude-opus-4-6-v1",
+          "model": "global.anthropic.claude-opus-4-7",
           "max_tokens": 32768,
-          "thinking": { "type": "enabled", "budget_tokens": 16384 }
+          "thinking": { "type": "adaptive" },
+          "output_config": { "effort": "high" }
         }
       },
       "cost": {
@@ -419,8 +426,8 @@
       }
     },
     {
-      "name": "claude-opus-4-6",
-      "variant": "thinking-32k-bedrock",
+      "name": "claude-opus-4-7",
+      "variant": "thinking-max-bedrock",
       "platform": {
         "name": "bedrock",
         "variant": "default"
@@ -428,9 +435,10 @@
       "model": {
         "format": "anthropic",
         "config": {
-          "model": "global.anthropic.claude-opus-4-6-v1",
+          "model": "global.anthropic.claude-opus-4-7",
           "max_tokens": 64000,
-          "thinking": { "type": "enabled", "budget_tokens": 32768 }
+          "thinking": { "type": "adaptive" },
+          "output_config": { "effort": "max" }
         }
       },
       "cost": {

package/package.json

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

package/src/cliPasteTransform.mjs

@@ -52,6 +52,12 @@ export function resolvePastePlaceholders(input) {
   return text;
 }
 
+// Time to wait for a continuation paste chunk before flushing the paste buffer.
+// Some terminals split large pastes into multiple bracketed paste sequences
+// (e.g. `\x1b[200~...\x1b[201~\x1b[200~...\x1b[201~`) that arrive back-to-back.
+// Holding the paste briefly lets us merge them into a single placeholder.
+const PASTE_MERGE_WINDOW_MS = 20;
+
 /**
  * Create a Transform stream to handle bracketed paste before readline.
  * @param {() => void} onCtrlC - Called when Ctrl-C or Ctrl-D is detected
@@ -60,8 +66,43 @@ export function resolvePastePlaceholders(input) {
 export function createPasteTransform(onCtrlC) {
   let inPasteMode = false;
   let pasteBuffer = "";
+  // True when a paste just ended and we are waiting to see if the next data
+  // continues it (i.e. starts with another BRACKETED_PASTE_START).
+  let awaitingMerge = false;
+  /** @type {NodeJS.Timeout | null} */
+  let mergeTimer = null;
+  /** @type {Transform} */
+  let transform;
+
+  const clearMergeTimer = () => {
+    if (mergeTimer) {
+      clearTimeout(mergeTimer);
+      mergeTimer = null;
+    }
+  };
+
+  const flushPaste = () => {
+    clearMergeTimer();
+    awaitingMerge = false;
+    if (pasteBuffer) {
+      // Remove trailing newline for single-line paste detection
+      const trimmedPaste = pasteBuffer.replace(/\n$/, "");
+
+      // For single-line paste, insert directly without placeholder
+      if (!trimmedPaste.includes("\n")) {
+        transform.push(trimmedPaste);
+      } else {
+        // For multi-line paste, use placeholder
+        const hash = generatePasteHash(pasteBuffer);
+        pastedContentStore.set(hash, pasteBuffer);
+        const lines = pasteBuffer.split("\n");
+        transform.push(`[Pasted text #${hash}, ${lines.length} lines]`);
+      }
+    }
+    pasteBuffer = "";
+  };
 
-  return new Transform({
+  transform = new Transform({
     transform(chunk, _encoding, callback) {
       /** @type {string} */
       let data = chunk.toString("utf8");
@@ -77,32 +118,28 @@ export function createPasteTransform(onCtrlC) {
         if (inPasteMode) {
           const endIdx = data.indexOf(BRACKETED_PASTE_END);
           if (endIdx !== -1) {
-            // End of paste
+            // End of (this chunk of) paste. Hold the buffer briefly in case
+            // another paste chunk follows immediately and should be merged.
             pasteBuffer += data.slice(0, endIdx);
             data = data.slice(endIdx + BRACKETED_PASTE_END.length);
             inPasteMode = false;
-
-            // Handle paste content
-            if (pasteBuffer) {
-              // Remove trailing newline for single-line paste detection
-              const trimmedPaste = pasteBuffer.replace(/\n$/, "");
-
-              // For single-line paste, insert directly without placeholder
-              if (!trimmedPaste.includes("\n")) {
-                this.push(trimmedPaste);
-              } else {
-                // For multi-line paste, use placeholder
-                const hash = generatePasteHash(pasteBuffer);
-                pastedContentStore.set(hash, pasteBuffer);
-                const lines = pasteBuffer.split("\n");
-                this.push(`[Pasted text #${hash}, ${lines.length} lines]`);
-              }
-            }
-            pasteBuffer = "";
+            awaitingMerge = true;
           } else {
             // Still in paste mode
             pasteBuffer += data;
-            break;
+            data = "";
+          }
+        } else if (awaitingMerge) {
+          // If the next data starts with another paste start marker, treat it
+          // as a continuation of the previous paste and merge.
+          if (data.startsWith(BRACKETED_PASTE_START)) {
+            data = data.slice(BRACKETED_PASTE_START.length);
+            inPasteMode = true;
+            awaitingMerge = false;
+            clearMergeTimer();
+          } else {
+            // Not a continuation; flush pending paste, then process this data.
+            flushPaste();
           }
         } else {
           const startIdx = data.indexOf(BRACKETED_PASTE_START);
@@ -118,12 +155,30 @@ export function createPasteTransform(onCtrlC) {
           } else {
             // Normal data
             this.push(data);
-            break;
+            data = "";
           }
         }
       }
 
+      // If the chunk ended while still awaiting a continuation, schedule a
+      // short timer to flush the pending paste if nothing else arrives.
+      if (awaitingMerge && !mergeTimer) {
+        mergeTimer = setTimeout(() => {
+          mergeTimer = null;
+          flushPaste();
+        }, PASTE_MERGE_WINDOW_MS);
+      }
+
+      callback();
+    },
+
+    flush(callback) {
+      if (awaitingMerge) {
+        flushPaste();
+      }
       callback();
     },
   });
+
+  return transform;
 }