@iinm/plain-agent 1.10.21 → 1.10.22

package/README.md

@@ -360,7 +360,7 @@ Files are loaded in the following order. Settings in later files override earlie
         "action": "allow"
       },
       {
-        "toolName": { "$regex": "^(exec_command|tmux_command)$" },
+        "toolName": "exec_command",
         "action": "allow"
       },
       {
@@ -426,6 +426,14 @@ Files are loaded in the following order. Settings in later files override earlie
     ]
   },
 
+  "tools": {
+    // Enable web tools. See Quick Start section.
+    "webSearch": {},
+    "webFetch": {},
+    // Enable the tmux tool
+    "tmux": { "enabled": true }
+  },
+
   // Sandbox environment for the exec_command and tmux_command tools
   "sandbox": {
     // Commands are wrapped and executed with this command
@@ -489,7 +497,7 @@ The agent can use the following tools:
 - **write_file**: Write a file.
 - **patch_file**: Patch a file.
 - **exec_command**: Run a command without shell interpretation.
-- **tmux_command**: Run a tmux command.
+- **tmux_command**: Run a tmux command. It is disabled by default.
 - **web_search**: Search the web with one or more keyword sets and answer a question based on the combined results (requires Google API key, Vertex AI configuration, or the `command` provider with a local search command).
 - **web_fetch**: Fetch the contents of a single URL and answer a question based on it (requires Google API key, Vertex AI configuration, or the `command` provider with a local fetch command such as `w3m`, `curl`, or `lynx`).
 - **switch_to_subagent**: Switch to a subagent role within the same conversation, focusing on the specified goal.

package/config/config.predefined.json

@@ -9,6 +9,15 @@
         "action": "deny",
         "reason": "Use rg or fd instead"
       },
+      {
+        "toolName": "exec_command",
+        "input": {
+          "command": "bash",
+          "args": ["-c", { "$not": { "$regex": "[|><&;$`]" } }]
+        },
+        "action": "deny",
+        "reason": "Use bash -c only when shell features (|, >, <, &, ;, $, `) are required"
+      },
       {
         "toolName": "exec_command",
         "input": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iinm/plain-agent",
-  "version": "1.10.21",
+  "version": "1.10.22",
   "description": "A lightweight coding agent for the terminal.",
   "license": "MIT",
   "type": "module",

package/src/config.d.ts

@@ -83,6 +83,7 @@ export type AppConfig = {
   tools?: {
     webSearch?: WebSearchToolConfig;
     webFetch?: WebFetchToolConfig;
+    tmux?: { enabled: boolean };
   };
   mcpServers?: Record<string, MCPServerConfig>;
   notifyCmd?: { command: string; args?: string[] };

package/src/config.mjs

@@ -95,6 +95,12 @@ export async function loadAppConfig(options = {}) {
               ...config.tools.webFetch,
             }
           : merged.tools?.webFetch,
+        tmux: config.tools?.tmux
+          ? {
+              ...(merged.tools?.tmux ?? {}),
+              ...config.tools.tmux,
+            }
+          : merged.tools?.tmux,
       },
       mcpServers: {
         ...(merged.mcpServers ?? {}),

package/src/main.mjs

@@ -139,8 +139,6 @@ export async function main(argv = process.argv) {
     ? new Date(resumedState.startTime)
     : new Date();
   const sessionId = resumedState ? resumedState.sessionId : generateSessionId();
-  const tmuxSessionId = `agent-${sessionId}`;
-
   const isBatchMode = cliArgs.subcommand.type === "batch";
   /** @type {string[]} */
   const configFiles =
@@ -294,7 +292,6 @@ export async function main(argv = process.argv) {
     workingDir: process.cwd(),
     today: new Date().toISOString().split("T")[0],
     sessionId,
-    tmuxSessionId,
     projectMetadataDir: AGENT_PROJECT_METADATA_DIR,
     agentRoles,
     skills: Array.from(prompts.values()).filter((p) => p.isSkill),
@@ -305,12 +302,15 @@ export async function main(argv = process.argv) {
     readFileTool,
     writeFileTool,
     createPatchFileTool(),
-    createTmuxCommandTool({ sandbox: appConfig.sandbox }),
     createCompactContextTool(),
     createSwitchToSubagentTool(),
     createSwitchToMainAgentTool(),
   ];
 
+  if (appConfig.tools?.tmux?.enabled) {
+    builtinTools.push(createTmuxCommandTool({ sandbox: appConfig.sandbox }));
+  }
+
   if (appConfig.tools?.webSearch) {
     const webSearchConfig = appConfig.tools.webSearch;
     if (webSearchConfig.provider === "command") {

package/src/prompt.mjs

@@ -7,7 +7,6 @@ import { toOneLine } from "./utils/toOneLine.mjs";
  * @property {string} workingDir - The current working directory.
  * @property {string} today - Today's date in YYYY-MM-DD format.
  * @property {string} sessionId
- * @property {string} tmuxSessionId
  * @property {string} projectMetadataDir - The directory where memory files are stored.
  * @property {Map<string, import('./context/loadAgentRoles.mjs').AgentRole>} agentRoles - Available agent roles.
  * @property {{filePath: string, description: string}[]} skills
@@ -22,7 +21,6 @@ export function createPrompt({
   modelName,
   sessionId,
   today,
-  tmuxSessionId,
   workingDir,
   projectMetadataDir,
   agentRoles,
@@ -75,7 +73,6 @@ Always read the target lines with \`read_file\` first to verify line numbers and
 
 - Use relative paths for files inside the working directory, absolute paths for files outside.
 - Use ${projectMetadataDir}/tmp/ for temporary files.
-- Use bash -c only when pipes (|) or redirection (>, <) are required.
 
 Examples:
 - List directories or find files: fd [".", "./", "--max-depth", "3", "--type", "d", "--hidden"]
@@ -84,18 +81,6 @@ Examples:
   Get PR details: gh ["pr", "view", "123", "--json", "title,body,url"]
   Get PR comment: gh ["api", "--method", "GET", "repos/<owner>/<repo>/pulls/comments/<id>", "--jq", "{user: .user.login, path: .path, line: .line, body: .body}"]
 
-## tmux_command
-
-- Use only when the user explicitly requests it.
-- Create a new session with the given tmux session id.
-
-Examples:
-- Start session: new-session ["-d", "-s", "<tmux-session-id>"]
-- Detect window number to send keys: list-windows ["-t", "<tmux-session-id>"]
-- Get output of window before sending keys: capture-pane ["-p", "-t", "<tmux-session-id>:<window>"]
-- Send key to session: send-keys ["-t", "<tmux-session-id>:<window>", "echo hello", "Enter"]
-- Delete line: send-keys ["-t", "<tmux-session-id>:<window>", "C-a", "C-k"]
-
 # Project Rules and Skills
  
 Discover and apply project-specific rules and reusable skills.
@@ -119,7 +104,6 @@ ${skillDescriptions}
 - Current working directory: ${workingDir}
 - Today's date: ${today}
 - Session id: ${sessionId}
-- Tmux session id: ${tmuxSessionId}
 - Memory file path: ${projectMetadataDir}/memory/${sessionId}--<kebab-case-title>.md
 
 Available subagents:

package/src/tools/tmuxCommand.mjs

@@ -18,7 +18,17 @@ export function createTmuxCommandTool(config) {
   return {
     def: {
       name: "tmux_command",
-      description: "Run a tmux command",
+      description: [
+        "Run a tmux command.",
+        "The tmux session id is plain-agent-<session-id>.",
+        "",
+        "Examples:",
+        '- Start session: new-session ["-d", "-s", "<tmux-session-id>"]',
+        '- Detect window number to send keys: list-windows ["-t", "<tmux-session-id>"]',
+        '- Get output of window before sending keys: capture-pane ["-p", "-t", "<tmux-session-id>:<window>"]',
+        '- Send key to session: send-keys ["-t", "<tmux-session-id>:<window>", "echo hello", "Enter"]',
+        '- Delete line: send-keys ["-t", "<tmux-session-id>:<window>", "C-a", "C-k"]',
+      ].join("\n"),
       inputSchema: {
         type: "object",
         properties: {

package/src/utils/evalJSONConfig.mjs

@@ -40,6 +40,23 @@ export function evalJSONConfig(configItem) {
       );
     }
 
+    if (Object.keys(configItem).length === 1 && "$not" in configItem) {
+      const pattern = evalJSONConfig(configItem.$not);
+      /** @param {unknown} value */
+      return (value) => {
+        if (typeof pattern === "string") {
+          return value !== pattern;
+        }
+        if (pattern instanceof RegExp) {
+          return typeof value !== "string" || !pattern.test(value);
+        }
+        if (typeof pattern === "function") {
+          return !pattern(value);
+        }
+        return true;
+      };
+    }
+
     if (Object.keys(configItem).length === 1 && "$has" in configItem) {
       const pattern = evalJSONConfig(configItem.$has);
       /** @param {unknown} value */