@iinm/plain-agent 1.1.1 → 1.3.0

package/README.md

@@ -33,7 +33,7 @@ npm install -g @iinm/plain-agent
 List available models.
 
 ```sh
-plain --list-models
+plain list-models
 ```
 
 Create the configuration.
@@ -87,19 +87,33 @@ Create the configuration.
 
   // Optional
   "tools": {
-    "askGoogle": {
-      "model": "gemini-3-flash-preview",
-
-      // Google AI Studio
-      "apiKey": "FIXME"
+    "askWeb": {
+      "provider": "gemini",
+      "apiKey": "FIXME",
+      "model": "gemini-3-flash-preview"
+      // Optional
+      // "baseURL": "<proxy_url>"
 
       // Or use Vertex AI (Requires gcloud CLI to get authentication token)
-      // "platform": "vertex-ai",
+      // "provider": "gemini-vertex-ai",
       // "baseURL": "https://aiplatform.googleapis.com/v1beta1/projects/<project_id>/locations/<location>",
+      // "model": "gemini-3-flash-preview"
+      // Optional:
+      // "account": "<service_account_email>"
     },
 
-    "searchWeb": {
-      "tavilyApiKey": "FIXME"
+    "askURL": {
+      "provider": "gemini",
+      "apiKey": "FIXME"
+      // Optional
+      // "baseURL": "<proxy_url>"
+
+      // 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"
+      // Optional:
+      // "account": "<service_account_email>"
     }
   },
 
@@ -108,7 +122,7 @@ Create the configuration.
 ```
 
 <details>
-<summary>Other provider examples</summary>
+<summary><b>Other provider examples</b></summary>
 
 ```js
 {
@@ -135,6 +149,59 @@ Create the configuration.
 ```
 </details>
 
+<details>
+<summary><b>Bedrock example using Claude Japan inference profiles</b></summary>
+
+```js
+{
+  "models": [
+    {
+      "name": "claude-haiku-4-5",
+      "variant": "thinking-16k-bedrock-jp",
+      "platform": {
+        "name": "bedrock",
+        "variant": "jp"
+      },
+      "model": {
+        "format": "anthropic",
+        "config": {
+          "model": "jp.anthropic.claude-haiku-4-5-20251001-v1:0",
+          "max_tokens": 32768,
+          "thinking": { "type": "enabled", "budget_tokens": 16384 }
+        }
+      }
+    },
+    {
+      "name": "claude-sonnet-4-6",
+      "variant": "thinking-16k-bedrock-jp",
+      "platform": {
+        "name": "bedrock",
+        "variant": "jp"
+      },
+      "model": {
+        "format": "anthropic",
+        "config": {
+          "model": "jp.anthropic.claude-sonnet-4-6",
+          "max_tokens": 32768,
+          "thinking": { "type": "enabled", "budget_tokens": 16384 }
+        }
+      }
+    }
+  ],
+  "platforms": [
+    {
+      "name": "bedrock",
+      "variant": "jp",
+      "baseURL": "https://bedrock-runtime.ap-northeast-1.amazonaws.com",
+      "awsProfile": "FIXME"
+    }
+  ]
+}
+```
+</details>
+
+
+
 Run the agent.
 
 ```sh
@@ -148,7 +215,7 @@ Run in batch mode (non-interactive).
 In batch mode, config files are not loaded automatically. Only the files specified with `--config` are loaded.
 
 ```sh
-plain --batch "Add tests for src/main.mjs" \
+plain batch "Add tests for src/main.mjs" \
       --config ~/.config/plain-agent/config.local.json \
       --config .plain-agent/config.json
 ```
@@ -173,9 +240,8 @@ The agent can use the following tools to assist with tasks:
 - **write_file**: Write a file.
 - **patch_file**: Patch a file.
 - **tmux_command**: Run a tmux command.
-- **fetch_web_page**: Fetch and extract web page content from a given URL, returning it as Markdown.
-- **ask_google**: Ask Google a question using natural language (requires Google API key or Vertex AI configuration).
-- **search_web**: Search the web for information (requires Tavily API key).
+- **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).
 - **delegate_to_subagent**: Delegate a subtask to a subagent. The agent switches to a subagent role within the same conversation, focusing on the specified goal.
 - **report_as_subagent**: Report completion and return to the main agent. Used by subagents to communicate results and restore the main agent role. After reporting, the subagent's conversation history is removed from the context.
 
@@ -210,7 +276,7 @@ The agent loads configuration files in the following order. Settings in later fi
 ### Example
 
 <details>
-<summary>YOLO mode example (requires sandbox for safety)</summary>
+<summary><b>YOLO mode example (requires sandbox for safety)</b></summary>
 
 ```js
 {
@@ -218,12 +284,6 @@ The agent loads configuration files in the following order. Settings in later fi
     "defaultAction": "deny",
     "maxApprovals": 100,
     "patterns": [
-      // Prohibit direct access to external URLs (even GET requests can leak data via URL parameters)
-      {
-        "toolName": "fetch_web_page",
-        "action": "deny",
-        "reason": "Use ask_google instead"
-      },
       {
         "toolName": { "$regex": "^(write_file|patch_file)$" },
         "action": "allow"
@@ -233,11 +293,10 @@ The agent loads configuration files in the following order. Settings in later fi
         "action": "allow"
       },
       {
-        "toolName": "ask_google",
+        "toolName": { "$regex": "^(ask_web|ask_url)$" },
         "action": "allow"
       }
-
-      // ⚠️ Never do this. fetch_web_page and mcp run outside the sandbox, so they can send anything externally.
+      // ⚠️ Never do this. mcp run outside the sandbox, so they can send anything externally.
       // {
       //   "toolName": { "$regex": "." },
       //   "action": "allow"
@@ -264,11 +323,12 @@ The agent loads configuration files in the following order. Settings in later fi
 </details>
 
 <details>
-<summary>Full example</summary>
+<summary><b>Full example</b></summary>
 
 ```js
 {
   "autoApproval": {
+    "defaultAction": "ask",
     // The maximum number of automatic approvals.
     "maxApprovals": 50,
     // Patterns are evaluated in order. First match wins.
@@ -290,8 +350,9 @@ The agent loads configuration files in the following order. Settings in later fi
         "input": { "command": "npm", "args": ["run", { "$regex": "^(check|test|lint|fix)$" }] },
         "action": "allow"
       },
+
       {
-        "toolName": "ask_google",
+        "toolName": { "$regex": "^(ask_web|ask_url)$" },
         "action": "allow"
       },
 
@@ -459,20 +520,29 @@ The agent searches for subagent definitions in the following directories:
 
 Example:
 
-```sh
-git clone --depth 1 https://github.com/anthropics/claude-code .plain-agent/claude-code-plugins/anthropics/claude-code
-git clone --depth 1 https://github.com/awslabs/agent-plugins .plain-agent/claude-code-plugins/awslabs/agent-plugins
-```
-
 ```js
 // .plain-agent/config.json
 {
   "claudeCodePlugins": [
-    { "name": "pr-review-toolkit", "path": "anthropics/claude-code/plugins/pr-review-toolkit" },
-    { "name": "aws-serverless", "path": "awslabs/agent-plugins/plugins/aws-serverless" }
+    {
+      "source": "https://github.com/anthropics/claude-code",
+      "plugins": [
+        { "name": "feature-dev", "path": "plugins/feature-dev" },
+        { "name": "code-review", "path": "plugins/code-review" }
+      ]
+    },
+    {
+      "source": "https://github.com/anthropics/skills",
+      "plugins": [
+        { "name": "anthropics", "path": "", "only": "pdf|pptx" }
+      ]
+    }
   ]
 }
+```
 
+```sh
+plain install-claude-code-plugins
 ```
 
 ## Development
@@ -494,7 +564,7 @@ npx npm-check-updates -t minor -c 3 -u
 ## Appendix: Creating Least-Privilege Users for Cloud Providers
 
 <details>
-<summary>Amazon Bedrock</summary>
+<summary><b>Amazon Bedrock</b></summary>
 
 ```sh
 # IAM Identity Center 
@@ -574,7 +644,7 @@ aws bedrock-runtime invoke-model \
 </details>
 
 <details>
-<summary>Azure - Microsoft Foundry</summary>
+<summary><b>Azure - Microsoft Foundry</b></summary>
 
 ```sh
 resource_group=FIXME
@@ -607,7 +677,7 @@ az login --service-principal -u "$app_id" -p "$app_secret" --tenant "$tenant_id"
 </details>
 
 <details>
-<summary>Google Cloud Vertex AI</summary>
+<summary><b>Google Cloud Vertex AI</b></summary>
 
 ```sh
 project_id=FIXME

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iinm/plain-agent",
-  "version": "1.1.1",
+  "version": "1.3.0",
   "description": "A lightweight CLI-based coding agent",
   "license": "MIT",
   "type": "module",
@@ -37,21 +37,17 @@
   "dependencies": {
     "@aws-crypto/sha256-js": "^5.2.0",
     "@aws-sdk/credential-providers": "^3.1001.0",
-    "@modelcontextprotocol/sdk": "^1.27.1",
-    "@mozilla/readability": "^0.6.0",
+    "@cfworker/json-schema": "^4.1.1",
+    "@modelcontextprotocol/client": "^2.0.0-alpha.2",
     "@smithy/protocol-http": "^5.3.10",
     "@smithy/signature-v4": "^5.3.10",
     "diff": "^8.0.3",
-    "js-yaml": "^4.1.1",
-    "jsdom": "^28.1.0",
-    "turndown": "^7.2.2"
+    "js-yaml": "^4.1.1"
   },
   "devDependencies": {
     "@biomejs/biome": "^2.4.5",
     "@types/js-yaml": "^4.0.9",
-    "@types/jsdom": "^28.0.0",
     "@types/node": "^22.19.13",
-    "@types/turndown": "^5.0.6",
     "typescript": "^5.9.3"
   }
 }

package/src/claudeCodePlugin.mjs

@@ -0,0 +1,164 @@
+import { execFile } from "node:child_process";
+import fs from "node:fs/promises";
+import path from "node:path";
+import { loadAppConfig } from "./config.mjs";
+import { CLAUDE_CODE_PLUGIN_DIR } from "./env.mjs";
+
+/**
+ * @typedef {Object} ClaudeCodePluginRepo
+ * @property {string} source
+ * @property {Array<{name: string, path: string, only?: string}>} plugins
+ */
+
+/**
+ * @typedef {Object} ClaudeCodePlugin
+ * @property {string} name
+ * @property {string} path
+ * @property {RegExp} [only]
+ */
+
+/**
+ * Resolve plugin paths from hierarchical config structure.
+ * Converts {source, plugins} to flat {name, path, only} with full paths.
+ * @param {ClaudeCodePluginRepo[]} repos
+ * @returns {ClaudeCodePlugin[]}
+ */
+export function resolvePluginPaths(repos) {
+  if (!repos) return [];
+
+  /** @type {ClaudeCodePlugin[]} */
+  const result = [];
+
+  for (const repo of repos) {
+    const ownerRepo = extractOwnerRepo(repo.source);
+    if (!ownerRepo) {
+      console.warn(`Invalid source URL: ${repo.source}`);
+      continue;
+    }
+
+    for (const plugin of repo.plugins) {
+      // Compile only pattern to RegExp
+      let only;
+      if (plugin.only) {
+        try {
+          only = new RegExp(plugin.only);
+        } catch (err) {
+          console.warn(
+            `Invalid regex pattern "${plugin.only}" for plugin "${plugin.name}":`,
+            err instanceof Error ? err.message : String(err),
+          );
+        }
+      }
+
+      result.push({
+        name: plugin.name,
+        path: path.join(CLAUDE_CODE_PLUGIN_DIR, ownerRepo, plugin.path),
+        only,
+      });
+    }
+  }
+
+  return result;
+}
+
+/**
+ * Install Claude Code plugins by cloning repositories.
+ */
+export async function installClaudeCodePlugins() {
+  const { appConfig } = await loadAppConfig({ skipTrustCheck: true });
+  const repos = appConfig.claudeCodePlugins ?? [];
+
+  if (repos.length === 0) {
+    console.log("No plugins configured.");
+    return;
+  }
+
+  let installed = 0;
+  let skipped = 0;
+  let failed = 0;
+
+  // Track paths for summary
+  /** @type {string[]} */
+  const installedPaths = [];
+  /** @type {string[]} */
+  const skippedPaths = [];
+
+  // Ensure plugin directory exists
+  await fs.mkdir(CLAUDE_CODE_PLUGIN_DIR, { recursive: true });
+
+  for (const repo of repos) {
+    const ownerRepo = extractOwnerRepo(repo.source);
+    if (!ownerRepo) {
+      console.error(`❌ Invalid source URL: ${repo.source}`);
+      failed++;
+      continue;
+    }
+
+    const destPath = path.join(CLAUDE_CODE_PLUGIN_DIR, ownerRepo);
+
+    // Check if already exists
+    const exists = await fs
+      .access(destPath)
+      .then(() => true)
+      .catch(() => false);
+    if (exists) {
+      console.log(`⏭️ Skipping ${repo.source} → ${destPath}: already installed`);
+      skippedPaths.push(destPath);
+      skipped++;
+      continue;
+    }
+
+    // Clone the repository
+    console.log(`📥 Installing ${repo.source}...`);
+    try {
+      await new Promise((resolve, reject) => {
+        execFile(
+          "git",
+          ["clone", "--depth", "1", repo.source, destPath],
+          (err) => {
+            if (err) reject(err);
+            else resolve(undefined);
+          },
+        );
+      });
+      console.log(`✅ Installed to ${destPath}`);
+      installedPaths.push(destPath);
+      installed++;
+    } catch (error) {
+      console.error(
+        `❌ Failed to install: ${error instanceof Error ? error.message : String(error)}`,
+      );
+      failed++;
+    }
+  }
+
+  console.log(
+    `\n📊 Summary: ${installed} installed, ${skipped} skipped, ${failed} failed`,
+  );
+
+  if (installedPaths.length > 0) {
+    console.log("\nInstalled:");
+    for (const p of installedPaths) {
+      console.log(`  • ${p}`);
+    }
+  }
+
+  if (skippedPaths.length > 0) {
+    console.log("\nSkipped:");
+    for (const p of skippedPaths) {
+      console.log(`  • ${p}`);
+    }
+  }
+}
+
+/**
+ * Extract owner/repo from source URL.
+ * @param {string} source
+ * @returns {string|null}
+ */
+function extractOwnerRepo(source) {
+  // Handle: https://github.com/owner/repo
+  // Handle: git@github.com:owner/repo.git
+  const match = source.match(/[:/]([^/]+\/[^/]+?)(?:\.git)?$/);
+  return match ? match[1] : null;
+}

package/src/cliArgs.mjs

@@ -1,10 +1,30 @@
+/**
+ * @typedef {HelpSubcommand | InteractiveSubcommand | BatchSubcommand | ListModelsSubcommand | InstallClaudeCodePluginsSubcommand} Subcommand
+ */
+
+/**
+ * @typedef {{ type: 'help' }} HelpSubcommand
+ */
+
+/**
+ * @typedef {{ type: 'interactive', config: string[], model: string | null }} InteractiveSubcommand
+ */
+
+/**
+ * @typedef {{ type: 'batch', task: string, config: string[], model: string | null }} BatchSubcommand
+ */
+
+/**
+ * @typedef {{ type: 'list-models' }} ListModelsSubcommand
+ */
+
+/**
+ * @typedef {{ type: 'install-claude-code-plugins' }} InstallClaudeCodePluginsSubcommand
+ */
+
 /**
  * @typedef {Object} CliArgs
- * @property {string|null} model - Model name with variant
- * @property {boolean} showHelp - Whether to show help message
- * @property {boolean} listModels - Whether to list available models
- * @property {string|null} batch - Task instruction for batch mode
- * @property {string[]} config - Paths to additional config files for batch mode
+ * @property {Subcommand} subcommand - The subcommand to execute
  */
 
 /**
@@ -14,30 +34,81 @@
  */
 export function parseCliArgs(argv) {
   const args = argv.slice(2);
-  /** @type {CliArgs} */
-  const result = {
-    model: null,
-    showHelp: false,
-    listModels: false,
-    batch: null,
-    config: [],
-  };
+  const subcommandName = args[0];
+
+  if (["-h", "--help", "help"].includes(subcommandName)) {
+    return {
+      subcommand: { type: "help" },
+    };
+  }
 
-  for (let i = 0; i < args.length; i++) {
-    if ((args[i] === "-m" || args[i] === "--model") && args[i + 1]) {
-      result.model = args[++i];
-    } else if (args[i] === "-h" || args[i] === "--help") {
-      result.showHelp = true;
-    } else if (args[i] === "-l" || args[i] === "--list-models") {
-      result.listModels = true;
-    } else if (args[i] === "--batch" && args[i + 1]) {
-      result.batch = args[++i];
-    } else if (args[i] === "--config" && args[i + 1]) {
-      result.config.push(args[++i]);
+  if (!subcommandName || subcommandName.startsWith("-")) {
+    // Interactive mode (default)
+    const config = [];
+    let model = null;
+
+    for (let i = 0; i < args.length; i++) {
+      if (args[i] === "-m" || args[i] === "--model") {
+        if (args[i + 1]) {
+          model = args[i + 1];
+          i++;
+        }
+      } else if (args[i] === "-c" || args[i] === "--config") {
+        if (args[i + 1]) {
+          config.push(args[i + 1]);
+          i++;
+        }
+      }
     }
+
+    return {
+      subcommand: { type: "interactive", config, model },
+    };
   }
 
-  return result;
+  if (subcommandName === "batch") {
+    const batchArgs = args.slice(1);
+
+    let task = null;
+    let model = null;
+    const config = [];
+
+    for (let i = 0; i < batchArgs.length; i++) {
+      if (batchArgs[i] === "-m" || batchArgs[i] === "--model") {
+        if (batchArgs[i + 1]) {
+          model = batchArgs[i + 1];
+          i++;
+        }
+      } else if (batchArgs[i] === "-c" || batchArgs[i] === "--config") {
+        if (batchArgs[i + 1]) {
+          config.push(batchArgs[i + 1]);
+          i++;
+        }
+      } else if (!batchArgs[i].startsWith("-") && !task) {
+        task = batchArgs[i];
+      }
+    }
+
+    return {
+      subcommand: { type: "batch", task: task || "", config, model },
+    };
+  }
+
+  if (subcommandName === "list-models") {
+    return {
+      subcommand: { type: "list-models" },
+    };
+  }
+
+  if (subcommandName === "install-claude-code-plugins") {
+    return {
+      subcommand: { type: "install-claude-code-plugins" },
+    };
+  }
+
+  return {
+    subcommand: { type: "help" },
+  };
 }
 
 /**
@@ -46,22 +117,29 @@ export function parseCliArgs(argv) {
  */
 export function printHelp(exitCode = 0) {
   console.log(`
-Usage: agent [options]
-       agent --batch "task instruction" [options]
+Usage: plain [options]
+       plain batch [options] <task>
+       plain list-models
+       plain install-claude-code-plugins
 
 Options:
   -m, --model <model+variant>  Model to use
-  -l, --list-models            List available models
-  -h, --help          Show this help message
-  --batch <task>      Run in batch mode with the given task instruction
-  --config <file>     Config file to load (required in batch mode)
-                      In batch mode, only explicitly specified config files are loaded
+  -h, --help                   Show this help message
+  -c, --config <file>          Config file to load
+
+Subcommands:
+  batch <task>                 Run in batch mode with the given task instruction
+  list-models                  List available models
+  install-claude-code-plugins  Install Claude Code plugins
 
 Examples:
-  agent -m gpt-5.4+thinking-medium
-  plain --batch "Add tests for src/main.mjs" \\
-        --config ~/.config/plain-agent/config.local.json \\
-        --config .plain-agent/config.json
+  plain -m gpt-5.4+thinking-medium
+  plain batch \\
+        -c ~/.config/plain-agent/config.local.json \\
+        -c .plain-agent/config.json \\
+        "Add tests for src/main.mjs"
+  plain list-models
+  plain install-claude-code-plugins
 `);
   process.exit(exitCode);
 }

package/src/cliFormatter.mjs

@@ -4,7 +4,6 @@
  * @import { PatchFileInput } from "./tools/patchFile"
  * @import { WriteFileInput } from "./tools/writeFile"
  * @import { TmuxCommandInput } from "./tools/tmuxCommand"
- * @import { TavilySearchInput } from "./tools/tavilySearch"
  * @import { DelegateToSubagentInput } from "./tools/delegateToSubagent"
  */
 
@@ -86,14 +85,6 @@ export function formatToolUse(toolUse) {
     ].join("\n");
   }
 
-  if (toolName === "search_web") {
-    /** @type {Partial<TavilySearchInput>} */
-    const tavilySearchInput = input;
-    return [`tool: ${toolName}`, `query: ${tavilySearchInput.query}`].join(
-      "\n",
-    );
-  }
-
   if (toolName === "delegate_to_subagent") {
     /** @type {Partial<DelegateToSubagentInput>} */
     const delegateInput = input;

package/src/cliInteractive.mjs

@@ -1,7 +1,7 @@
 /**
  * @import { Message } from "./model"
  * @import { UserEventEmitter, AgentEventEmitter, AgentCommands } from "./agent"
- * @import { ClaudeCodePluginConfig } from "./config"
+ * @import { ClaudeCodePlugin } from "./claudeCodePlugin.mjs"
  */
 
 import { execFileSync } from "node:child_process";
@@ -197,7 +197,7 @@ const HELP_MESSAGE = [
  * @property {string} notifyCmd
  * @property {boolean} sandbox
  * @property {() => Promise<void>} onStop
- * @property {ClaudeCodePluginConfig[]} [claudeCodePlugins]
+ * @property {ClaudeCodePlugin[]} [claudeCodePlugins]
  */
 
 /**
@@ -257,7 +257,9 @@ export function startInteractiveSession({
     }
 
     const invocation = `${displayInvocation}${args ? ` ${args}` : ""}`;
-    const message = `System: This prompt was invoked as "${invocation}".\n\n${prompt.content}`;
+    const message = prompt.isSkill
+      ? `System: This prompt was invoked as "${invocation}".\nPrompt path: ${prompt.filePath}\n\n${prompt.content}`
+      : `System: This prompt was invoked as "${invocation}".\n\n${prompt.content}`;
 
     console.log(styleText("gray", "\n<prompt>"));
     console.log(message);