@iinm/plain-agent 1.9.4 → 1.10.1

package/README.md

@@ -2,62 +2,11 @@
 
 A lightweight, capable coding agent for the terminal.
 
-- **Multi-provider** — Use Claude, GPT, Gemini, or any OpenAI-compatible model.
-  <details>
-  <summary>Predefined models</summary>
-  
-  ```
-  # Model+Variant (Platform+Variant)
-  claude-haiku-4-5+thinking-16k (platform: anthropic+default)
-  claude-haiku-4-5+thinking-32k (platform: anthropic+default)
-  claude-sonnet-4-6+thinking-high (platform: anthropic+default)
-  claude-sonnet-4-6+thinking-max (platform: anthropic+default)
-  claude-opus-4-7+thinking-high (platform: anthropic+default)
-  claude-opus-4-7+thinking-max (platform: anthropic+default)
-  claude-haiku-4-5+thinking-16k-bedrock (platform: bedrock+default)
-  claude-haiku-4-5+thinking-32k-bedrock (platform: bedrock+default)
-  claude-sonnet-4-6+thinking-high-bedrock (platform: bedrock+default)
-  claude-sonnet-4-6+thinking-max-bedrock (platform: bedrock+default)
-  claude-opus-4-7+thinking-high-bedrock (platform: bedrock+default)
-  claude-opus-4-7+thinking-max-bedrock (platform: bedrock+default)
-  gemini-3-flash-preview+thinking-medium (platform: gemini+default)
-  gemini-3-flash-preview+thinking-high (platform: gemini+default)
-  gemini-3.1-pro-preview+thinking-medium (platform: gemini+default)
-  gemini-3.1-pro-preview+thinking-high (platform: gemini+default)
-  gemini-3-flash-preview+thinking-medium-vertex-ai (platform: vertex-ai+default)
-  gemini-3-flash-preview+thinking-high-vertex-ai (platform: vertex-ai+default)
-  gemini-3.1-pro-preview+thinking-medium-vertex-ai (platform: vertex-ai+default)
-  gemini-3.1-pro-preview+thinking-high-vertex-ai (platform: vertex-ai+default)
-  gpt-5.4-mini+thinking-medium (platform: openai+default)
-  gpt-5.4-mini+thinking-high (platform: openai+default)
-  gpt-5.4-mini+thinking-xhigh (platform: openai+default)
-  gpt-5.5+thinking-medium (platform: openai+default)
-  gpt-5.5+thinking-high (platform: openai+default)
-  gpt-5.5+thinking-xhigh (platform: openai+default)
-  gpt-5.2-chat+thinking-medium-azure (platform: azure+openai)
-  gpt-oss-120b+fireworks (platform: openai-compatible+fireworks)
-  glm-5+vertex-ai (platform: vertex-ai+default)
-  glm-5.1+fireworks (platform: openai-compatible+fireworks)
-  glm-5.1+novita (platform: openai-compatible+novita)
-  kimi-k2.6+fireworks (platform: openai-compatible+fireworks)
-  kimi-k2.6+novita (platform: openai-compatible+novita)
-  deepseek-v4-pro+novita (platform: openai-compatible+novita)
-  deepseek-v4-pro+fireworks (platform: openai-compatible+fireworks)
-  minimax-m2.7+fireworks (platform: openai-compatible+fireworks)
-  minimax-m2.7+novita (platform: openai-compatible+novita)
-  qwen3.6-plus+fireworks (platform: openai-compatible+fireworks)
-  qwen3.6-27b+novita (platform: openai-compatible+novita)
-  nova-2-lite+bedrock (platform: bedrock+default)
-  claude-haiku-4-5+thinking-16k-bedrock-converse (platform: bedrock+default)
-  ```
-  </details>
-
-
-- **Approval rules & path validation** — Auto-approve tool uses by name and arguments using regex patterns ([config.predefined.json#autoApproval](https://github.com/iinm/plain-agent/blob/main/config/config.predefined.json)); restrict file access to the working directory — git-ignored files require explicit approval ([src/toolInputValidator.mjs](https://github.com/iinm/plain-agent/blob/main/src/toolInputValidator.mjs)).
-- **Sandboxed execution** — Run agent commands in a Docker container with a read-only project root and no network; writable mode and allowlisted network destinations can be enabled as needed.
-- **Plain-text memory** — Task state is saved as Markdown files under `.plain-agent/memory/` for easy review.
-- **Extensible** — Define prompts and subagents in Markdown. Connect MCP servers.
-  Supports Claude Code plugins and `.claude/` commands, subagents, and skills.
+- **Multi-provider** — Use Claude, GPT, Gemini, or any OpenAI-compatible model via Bedrock, Vertex AI, or direct APIs.
+- **Fine-grained auto-approval** — Auto-approve tool calls by name and arguments using regex patterns.
+- **Sandboxed execution** — Run commands in a Docker container with filesystem and network isolation.
+- **Claude Code compatible** — Use Claude Code plugins, commands, subagents, and skills from `.claude/`.
+- **Zero external dependencies** — Built with Node.js standard libraries only.
 
 ## Limitations
 
@@ -114,25 +63,35 @@ Create the configuration.
     }
   ],
 
-  // (Optional) Enable web search tools
+  // (Optional) Enable web tools
   "tools": {
-    // askWeb: Searches the web to answer questions requiring up-to-date information or external sources.
-    "askWeb": {
+    "webSearch": {
       "provider": "gemini",
       "apiKey": "<GEMINI_API_KEY>",
       "model": "gemini-3-flash-preview"
+
       // Or use Vertex AI (Requires gcloud CLI to get authentication token)
       // "provider": "gemini-vertex-ai",
       // "baseURL": "https://aiplatform.googleapis.com/v1beta1/projects/<project_id>/locations/<location>",
       // "model": "gemini-3-flash-preview"
+
+      // Or use a custom command
+      // "provider": "command",
+      // "command": "bash",
+      // "args": ["-c", "w3m -dump -o display_link_number=1 \"https://lite.duckduckgo.com/lite?q=$*\"", "-"]
     },
 
-    // askURL: Answers questions based on provided URL content.
-    "askURL": {
+    "webFetch": {
       "provider": "gemini",
       "apiKey": "<GEMINI_API_KEY>",
       "model": "gemini-3-flash-preview"
+
       // Or use Vertex AI (Requires gcloud CLI to get authentication token)
+
+      // Or use a custom command
+      // "provider": "command",
+      // "command": "w3m",
+      // "args": ["-dump", "-o", "display_link_number=1"]
     }
   }
 }
@@ -378,8 +337,7 @@ Files are loaded in the following order. Settings in later files override earlie
         ├── (3) config.json        # Project-specific configuration
         ├── (4) config.local.json  # Project-specific local configuration (including secrets)
         ├── prompts/               # Project-specific prompts
-        ├── agents/                # Project-specific agent roles
-        └── sandbox/               # Sandbox runner scripts
+        └── agents/                # Project-specific agent roles
 ```
 
 ### Example
@@ -402,7 +360,7 @@ Files are loaded in the following order. Settings in later files override earlie
         "action": "allow"
       },
       {
-        "toolName": { "$regex": "^(ask_web|ask_url)$" },
+        "toolName": { "$regex": "^(web_search|web_fetch)$" },
         "action": "allow"
       }
       // ⚠️ Never do this. mcp run outside the sandbox, so they can send anything externally.
@@ -461,7 +419,7 @@ Files are loaded in the following order. Settings in later files override earlie
       },
 
       {
-        "toolName": { "$regex": "^(ask_web|ask_url)$" },
+        "toolName": { "$regex": "^(web_search|web_fetch)$" },
         "action": "allow"
       },
 
@@ -553,8 +511,8 @@ The agent can use the following tools to assist with tasks:
 - **patch_file**: Patch a file.
 - **exec_command**: Run a command without shell interpretation.
 - **tmux_command**: Run a tmux command.
-- **ask_web**: Use the web search to answer questions that need up-to-date information or supporting sources. (requires Google API key or Vertex AI configuration).
-- **ask_url**: Use one or more provided URLs to answer a question. Include the URLs in your question. (requires Google API key or Vertex AI configuration).
+- **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.
 - **switch_to_main_agent**: Switch back to the main agent role and report the result. After reporting, the subagent's conversation history is removed from the context.
 - **compact_context**: Compact the conversation context by discarding prior messages and reloading task state from a memory file. Use when the context has grown large but the task is not yet complete. Can also be invoked via the `/compact` slash command.

package/package.json

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

package/src/cliCost.mjs

@@ -87,6 +87,24 @@ export function parseDateOnly(value) {
   return date;
 }
 
+/**
+ * Deduplicate usage records by sessionId, keeping only the last record for each session.
+ * This prevents double-counting when a session is resumed and exited multiple times.
+ *
+ * @param {UsageRecord[]} records - Records in chronological order (oldest first)
+ * @returns {UsageRecord[]} Deduplicated records (one per sessionId)
+ */
+function deduplicateBySessionId(records) {
+  /** @type {Map<string, UsageRecord>} */
+  const bySessionId = new Map();
+  for (const record of records) {
+    if (record.sessionId) {
+      bySessionId.set(record.sessionId, record);
+    }
+  }
+  return Array.from(bySessionId.values());
+}
+
 /**
  * Aggregate usage records into a cost report.
  *
@@ -103,12 +121,14 @@ export function aggregateUsage(records, period) {
     );
   }
 
+  const deduplicated = deduplicateBySessionId(records);
+
   /** @type {Map<string, Map<string, DailyEntry>>} */
   const byCurrency = new Map();
   let noPricingSessionCount = 0;
   let excludedOutOfRange = 0;
 
-  for (const record of records) {
+  for (const record of deduplicated) {
     if (record.timestamp == null) {
       excludedOutOfRange++;
       continue;

package/src/cliFormatter.mjs

@@ -152,20 +152,27 @@ export async function formatToolUse(toolUse) {
     ].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 === "web_search") {
+    /** @type {Partial<import("./tools/webSearch.mjs").WebSearchInput>} */
+    const webSearchInput = input;
+    const searchesLine = webSearchInput.searches
+      ? webSearchInput.searches.map((s) => s.keywords.join(" ")).join(" | ")
+      : "";
+    return [
+      `tool: ${toolName}`,
+      `searches: ${searchesLine}`,
+      `question: ${webSearchInput.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",
-    );
+  if (toolName === "web_fetch") {
+    /** @type {Partial<import("./tools/webFetch.mjs").WebFetchInput>} */
+    const webFetchInput = input;
+    return [
+      `tool: ${toolName}`,
+      `url: ${webFetchInput.url}`,
+      `question: ${webFetchInput.question}`,
+    ].join("\n");
   }
 
   const { provider: _, ...filteredToolUse } = toolUse;

package/src/cliInteractive.mjs

@@ -17,6 +17,7 @@ import { createInterruptTransform } from "./cliInterruptTransform.mjs";
 import { createMuteTransform } from "./cliMuteTransform.mjs";
 import { createPasteHandler } from "./cliPasteTransform.mjs";
 import { appendUsageRecord, buildUsageRecord } from "./usageStore.mjs";
+import { createSequentialExecutor } from "./utils/createSequentialExecutor.mjs";
 import { notify } from "./utils/notify.mjs";
 import { parseVoiceToggleKey, startVoiceSession } from "./voiceInput.mjs";
 
@@ -473,12 +474,16 @@ export function startInteractiveSession({
     }
   });
 
+  const enqueueOutput = createSequentialExecutor();
+
   agentEventEmitter.on("message", (message) => {
-    printMessage(message).catch((err) => {
-      console.error(
-        styleText("red", `Error rendering message: ${err.message}`),
-      );
-    });
+    enqueueOutput(() =>
+      printMessage(message).catch((err) => {
+        console.error(
+          styleText("red", `Error rendering message: ${err.message}`),
+        );
+      }),
+    );
   });
 
   agentEventEmitter.on("toolUseRequest", () => {
@@ -500,7 +505,9 @@ export function startInteractiveSession({
   });
 
   agentEventEmitter.on("providerTokenUsage", (usage) => {
-    console.log(formatProviderTokenUsage(usage));
+    enqueueOutput(() => {
+      console.log(formatProviderTokenUsage(usage));
+    });
   });
 
   agentEventEmitter.on("error", (error) => {
@@ -519,8 +526,12 @@ export function startInteractiveSession({
         styleText("yellow", `\nNotification error: ${err.message}`),
       );
     }
-    // 暫定対応: token usageのconsole出力を確実にflushするため、次のevent loop tickまで遅延
-    await new Promise((resolve) => setTimeout(resolve, 0));
+
+    // Wait for all output operations to complete
+    await enqueueOutput(() => {});
+
+    // Defer prompt rendering to ensure terminal output is visible
+    await new Promise((resolve) => setImmediate(resolve));
 
     state.turn = true;
     cli.prompt();

package/src/config.d.ts

@@ -1,11 +1,71 @@
 import { ClaudeCodePluginRepo } from "./claudeCodePlugin.mjs";
 import { ModelDefinition, PlatformConfig } from "./modelDefinition";
 import { ToolUsePattern } from "./tool";
-import { AskURLToolOptions } from "./tools/askURL.mjs";
-import { AskWebToolOptions } from "./tools/askWeb.mjs";
 import { ExecCommandSanboxConfig } from "./tools/execCommand";
+import {
+  WebFetchToolGeminiOptions,
+  WebFetchToolGeminiVertexAIOptions,
+} from "./tools/webFetch.mjs";
+import {
+  WebSearchToolGeminiOptions,
+  WebSearchToolGeminiVertexAIOptions,
+} from "./tools/webSearch.mjs";
 import { VoiceInputConfig } from "./voiceInput.mjs";
 
+/**
+ * JSON-serializable webFetch configuration.
+ *
+ * The `command` provider runs an arbitrary local command per fetch to
+ * download a URL's content; the agent's main model is then used to answer
+ * based on the dumped output. The runtime tool factory receives a resolved
+ * `modelCaller` instead — see `WebFetchToolOptions` in `tools/webFetch.mjs`.
+ */
+export type WebFetchToolConfig =
+  | WebFetchToolGeminiOptions
+  | WebFetchToolGeminiVertexAIOptions
+  | WebFetchToolCommandJsonConfig;
+
+export type WebFetchToolCommandJsonConfig = {
+  provider: "command";
+  /** Executable used to fetch the URL (e.g., `"w3m"`, `"curl"`). */
+  command: string;
+  /** Arguments passed before the URL (e.g., `["-dump"]`). The URL is appended automatically. */
+  args: string[];
+  /** Per-call timeout in milliseconds (default 30000). */
+  timeoutMs?: number;
+  /** Extra environment variables, merged on top of PATH / HOME / LANG. */
+  env?: Record<string, string>;
+  maxLength?: number;
+};
+
+/**
+ * JSON-serializable webSearch configuration.
+ *
+ * The `command` provider runs an arbitrary local command per keyword set
+ * to perform a search; the agent's main model is then used to filter the
+ * combined results down to entries relevant to the question. The runtime
+ * tool factory receives a resolved `modelCaller` instead — see
+ * `WebSearchToolOptions` in `tools/webSearch.mjs`.
+ */
+export type WebSearchToolConfig =
+  | WebSearchToolGeminiOptions
+  | WebSearchToolGeminiVertexAIOptions
+  | WebSearchToolCommandJsonConfig;
+
+export type WebSearchToolCommandJsonConfig = {
+  provider: "command";
+  /** Executable used to perform each search (e.g., a wrapper around a search API). */
+  command: string;
+  /** Arguments passed before each keyword set (e.g., `["-n", "5"]`). Keywords are appended automatically. */
+  args: string[];
+  /** Per-search timeout in milliseconds (default 30000). */
+  timeoutMs?: number;
+  /** Extra environment variables, merged on top of PATH / HOME / LANG. */
+  env?: Record<string, string>;
+  maxLengthPerSearch?: number;
+  maxTotalLength?: number;
+};
+
 export type AppConfig = {
   model?: string;
   models?: ModelDefinition[];
@@ -17,8 +77,8 @@ export type AppConfig = {
   };
   sandbox?: ExecCommandSanboxConfig;
   tools?: {
-    askWeb?: AskWebToolOptions;
-    askURL?: AskURLToolOptions;
+    webSearch?: WebSearchToolConfig;
+    webFetch?: WebFetchToolConfig;
   };
   mcpServers?: Record<string, MCPServerConfig>;
   notifyCmd?: { command: string; args?: string[] };

package/src/config.mjs

@@ -76,18 +76,18 @@ export async function loadAppConfig(options = {}) {
       },
       sandbox: config.sandbox ?? merged.sandbox,
       tools: {
-        askWeb: config.tools?.askWeb
+        webSearch: config.tools?.webSearch
           ? {
-              ...(merged.tools?.askWeb ?? {}),
-              ...config.tools.askWeb,
+              ...(merged.tools?.webSearch ?? {}),
+              ...config.tools.webSearch,
             }
-          : merged.tools?.askWeb,
-        askURL: config.tools?.askURL
+          : merged.tools?.webSearch,
+        webFetch: config.tools?.webFetch
           ? {
-              ...(merged.tools?.askURL ?? {}),
-              ...config.tools.askURL,
+              ...(merged.tools?.webFetch ?? {}),
+              ...config.tools.webFetch,
             }
-          : merged.tools?.askURL,
+          : merged.tools?.webFetch,
       },
       mcpServers: {
         ...(merged.mcpServers ?? {}),

package/src/main.mjs

@@ -22,8 +22,6 @@ import { setupMCPServer } from "./mcpIntegration.mjs";
 import { createModelCaller } from "./modelCaller.mjs";
 import { createPrompt } from "./prompt.mjs";
 import { listSessions, loadSession } from "./sessionStore.mjs";
-import { createAskURLTool } from "./tools/askURL.mjs";
-import { createAskWebTool } from "./tools/askWeb.mjs";
 import { createCompactContextTool } from "./tools/compactContext.mjs";
 import { createExecCommandTool } from "./tools/execCommand.mjs";
 import { createPatchFileTool } from "./tools/patchFile.mjs";
@@ -31,6 +29,8 @@ import { readFileTool } from "./tools/readFile.mjs";
 import { createSwitchToMainAgentTool } from "./tools/switchToMainAgent.mjs";
 import { createSwitchToSubagentTool } from "./tools/switchToSubagent.mjs";
 import { createTmuxCommandTool } from "./tools/tmuxCommand.mjs";
+import { createWebFetchTool } from "./tools/webFetch.mjs";
+import { createWebSearchTool } from "./tools/webSearch.mjs";
 import { writeFileTool } from "./tools/writeFile.mjs";
 import { createToolUseApprover } from "./toolUseApprover.mjs";
 
@@ -179,7 +179,7 @@ if (cliArgs.subcommand.type === "resume" && cliArgs.subcommand.list) {
         console.log(
           styleText(
             "yellow",
-            `  ⚠ workingDir differs (saved: ${resumedState.workingDir}, current: ${process.cwd()})`,
+            `  ⚠️ workingDir differs (saved: ${resumedState.workingDir}, current: ${process.cwd()})`,
           ),
         );
       }
@@ -285,28 +285,6 @@ if (cliArgs.subcommand.type === "resume" && cliArgs.subcommand.list) {
     createSwitchToMainAgentTool(),
   ];
 
-  if (appConfig.tools?.askWeb) {
-    builtinTools.push(createAskWebTool(appConfig.tools.askWeb));
-  }
-
-  if (appConfig.tools?.askURL) {
-    builtinTools.push(createAskURLTool(appConfig.tools.askURL));
-  }
-
-  const toolUseApprover = createToolUseApprover({
-    maxApprovals: appConfig.autoApproval?.maxApprovals || 50,
-    defaultAction: appConfig.autoApproval?.defaultAction || "ask",
-    patterns: appConfig.autoApproval?.patterns || [],
-    maskApprovalInput: (toolName, input) => {
-      for (const tool of builtinTools) {
-        if (tool.def.name === toolName && tool.maskApprovalInput) {
-          return tool.maskApprovalInput(input);
-        }
-      }
-      return input;
-    },
-  });
-
   const [modelName, modelVariant] = modelNameWithVariant.split("+");
   const modelDef = (appConfig.models ?? []).find(
     (entry) => entry.name === modelName && entry.variant === modelVariant,
@@ -328,14 +306,83 @@ if (cliArgs.subcommand.type === "resume" && cliArgs.subcommand.list) {
     );
   }
 
+  if (appConfig.tools?.webSearch) {
+    const webSearchConfig = appConfig.tools.webSearch;
+    if (webSearchConfig.provider === "command") {
+      const webSearchCallModel = createModelCaller({
+        ...modelDef,
+        platform: {
+          ...modelDef.platform,
+          ...platform,
+        },
+      });
+      builtinTools.push(
+        createWebSearchTool({
+          provider: "command",
+          command: webSearchConfig.command,
+          args: webSearchConfig.args,
+          timeoutMs: webSearchConfig.timeoutMs,
+          env: webSearchConfig.env,
+          modelCaller: webSearchCallModel,
+          maxLengthPerSearch: webSearchConfig.maxLengthPerSearch,
+          maxTotalLength: webSearchConfig.maxTotalLength,
+        }),
+      );
+    } else {
+      builtinTools.push(createWebSearchTool(webSearchConfig));
+    }
+  }
+
+  if (appConfig.tools?.webFetch) {
+    const webFetchConfig = appConfig.tools.webFetch;
+    if (webFetchConfig.provider === "command") {
+      const webFetchCallModel = createModelCaller({
+        ...modelDef,
+        platform: {
+          ...modelDef.platform,
+          ...platform,
+        },
+      });
+      builtinTools.push(
+        createWebFetchTool({
+          provider: "command",
+          command: webFetchConfig.command,
+          args: webFetchConfig.args,
+          timeoutMs: webFetchConfig.timeoutMs,
+          env: webFetchConfig.env,
+          modelCaller: webFetchCallModel,
+          maxLength: webFetchConfig.maxLength,
+        }),
+      );
+    } else {
+      builtinTools.push(createWebFetchTool(webFetchConfig));
+    }
+  }
+
+  const toolUseApprover = createToolUseApprover({
+    maxApprovals: appConfig.autoApproval?.maxApprovals || 50,
+    defaultAction: appConfig.autoApproval?.defaultAction || "ask",
+    patterns: appConfig.autoApproval?.patterns || [],
+    maskApprovalInput: (toolName, input) => {
+      for (const tool of builtinTools) {
+        if (tool.def.name === toolName && tool.maskApprovalInput) {
+          return tool.maskApprovalInput(input);
+        }
+      }
+      return input;
+    },
+  });
+
+  const agentCallModel = createModelCaller({
+    ...modelDef,
+    platform: {
+      ...modelDef.platform,
+      ...platform,
+    },
+  });
+
   const { userEventEmitter, agentEventEmitter, agentCommands } = createAgent({
-    callModel: createModelCaller({
-      ...modelDef,
-      platform: {
-        ...modelDef.platform,
-        ...platform,
-      },
-    }),
+    callModel: agentCallModel,
     prompt,
     tools: [...builtinTools, ...mcpTools],
     toolUseApprover,