@iinm/plain-agent 1.8.6 → 1.8.7

package/README.md

@@ -29,9 +29,8 @@ A lightweight CLI-based coding agent.
 
 - Node.js 22 or later
 - LLM provider credentials
+- [ripgrep](https://github.com/burntsushi/ripgrep), [fd](https://github.com/sharkdp/fd)
 - Bash / Docker for sandboxed execution
-- [ripgrep](https://github.com/burntsushi/ripgrep)
-- [fd](https://github.com/sharkdp/fd)
 
 ## Quick Start
 
@@ -50,8 +49,8 @@ Create the configuration.
 ```js
 // ~/.config/plain-agent/config.local.json
 {
+  // Set default model
   "model": "claude-sonnet-4-6+thinking-high",
-  // "model": "gpt-5.5+thinking-high",
 
   // Configure the providers you want to use
   "platforms": [
@@ -59,7 +58,7 @@ Create the configuration.
       "name": "anthropic",
       "variant": "default",
       "apiKey": "<ANTHROPIC_API_KEY>"
-      // Or
+      // Or read from environment variable
       // "apiKey": { "$env": "ANTHROPIC_API_KEY" }
     },
     {
@@ -71,17 +70,16 @@ Create the configuration.
       "name": "openai",
       "variant": "default",
       "apiKey": "<OPENAI_API_KEY>"
-    },
+    }
   ],
 
-  // Optional
+  // (Optional) Enable web search tools
   "tools": {
     // askWeb: Searches the web to answer questions requiring up-to-date information or external sources.
     "askWeb": {
       "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>",
@@ -89,18 +87,14 @@ Create the configuration.
     },
 
     // askURL: Answers questions based on provided URL content.
-    //         Directly injecting URL content into context is not supported to prevent prompt injection.
     "askURL": {
       "provider": "gemini",
-      "apiKey": "<GEMINI_API_KEY>"
+      "apiKey": "<GEMINI_API_KEY>",
       "model": "gemini-3-flash-preview"
-
       // Or use Vertex AI (Requires gcloud CLI to get authentication token)
     }
-  },
-
+  }
 }
-
 ```
 
 <details>
@@ -118,6 +112,7 @@ Create the configuration.
       "azureConfigDir": "/home/xxx/.azure-for-agent"
     },
     {
+      // Requires AWS CLI to get credentials
       "name": "bedrock",
       "variant": "default",
       "baseURL": "https://bedrock-runtime.<region>.amazonaws.com",
@@ -128,8 +123,8 @@ Create the configuration.
       "name": "vertex-ai",
       "variant": "default",
       "baseURL": "https://aiplatform.googleapis.com/v1beta1/projects/<project>/locations/<location>",
-      // Optional
-      "account": "<service_account_email>"
+      // (Optional) Impersonate this service account to obtain an auth token
+      "account": "<SERVICE_ACCOUNT_EMAIL>"
     }
   ]
 }
@@ -302,7 +297,7 @@ plain cost
 plain cost --from 2026-04-01 --to 2026-04-30
 ```
 
-(Optional) Configure plain-agent for your project.
+Configure plain-agent for your project.
 
 ```
 /configure Auto-approve file writes and patches
@@ -417,14 +412,13 @@ Files are loaded in the following order. Settings in later files override earlie
 
       // MCP Tool naming convention: mcp__<serverName>__<toolName>
       {
-        "toolName": { "$regex": "slack_(read|search)_.+" },
+        "toolName": { "$regex": "mcp__slack__slack_(read|search)_.+" },
         "action": "allow"
       }
     ]
   },
 
-  // (Optional) Sandbox environment for the exec_command and tmux_command tools
-  // https://github.com/iinm/plain-agent/tree/main/sandbox
+  // Sandbox environment for the exec_command and tmux_command tools
   "sandbox": {
     "command": "plain-sandbox",
     "args": ["--allow-write", "--skip-build", "--keep-alive", "30"],
@@ -458,7 +452,7 @@ Files are loaded in the following order. Settings in later files override earlie
       "command": "npx",
       "args": ["-y", "chrome-devtools-mcp@latest", "--isolated"]
     },
-    // ⚠️ Add this to config.local.json to avoid committing secrets to Git
+    // ⚠️ Add to config.local.json to avoid committing secrets to Git
     "slack": {
       "command": "npx",
       "args": ["-y", "mcp-remote", "https://mcp.slack.com/mcp", "--header", "Authorization:Bearer <SLACK_TOKEN>"],
@@ -475,21 +469,22 @@ Files are loaded in the following order. Settings in later files override earlie
       "command": "npx",
       "args": ["-y", "mcp-remote", "https://knowledge-mcp.global.api.aws"]
     },
-    // ⚠️ Add this to config.local.json to avoid committing secrets to Git
+    // ⚠️ Add to config.local.json to avoid committing secrets to Git
     "google_developer-knowledge": {
       "command": "npx",
       "args": ["-y", "mcp-remote", "https://developerknowledge.googleapis.com/mcp", "--header", "X-Goog-Api-Key:<GOOGLE_API_KEY>"]
     }
   },
 
-  // Override default notification command (falls back to terminal bell)
-  // "notifyCmd": { "command": "plain-notify-desktop", "args": [] }
+  // Override default notification command
+  "notifyCmd": { "command": "plain-notify-desktop", "args": [] }
 
-  // (Optional) Voice input. See "Voice Input" below.
-  // "voiceInput": {
-  //   "provider": "openai",
-  //   "apiKey": "<OPENAI_API_KEY>"
-  // }
+  // Voice input. See "Voice Input" below.
+  // ⚠️ Add to config.local.json to avoid committing secrets to Git
+  "voiceInput": {
+    "provider": "openai",
+    "apiKey": "<OPENAI_API_KEY>"
+  }
 }
 ```
 </details>
@@ -518,6 +513,7 @@ The agent searches for prompts in the following directories:
 
 - `~/.config/plain-agent/prompts/`
 - `.plain-agent/prompts/`
+- `.plain-agent/prompts/skills/`
 - `.claude/commands/`
 - `.claude/skills/`
 
@@ -533,19 +529,6 @@ description: Create a commit message based on staged changes
 Review the staged changes and create a concise commit message following the conventional commits specification.
 ```
 
-You can also import remote prompts with the `import` field:
-
-```md
----
-import: https://raw.githubusercontent.com/anthropics/claude-code/5cff78741f54a0dcfaeb11d29b9ea9a83f3882ff/plugins/feature-dev/commands/feature-dev.md
----
-
-- Use memory file instead of TodoWrite
-- Parallel execution of subagents is not supported. Delegate to subagents sequentially.
-```
-
-Remote prompts are fetched and cached locally. The local content will be appended to the imported content.
-
 ### Shortcuts
 
 Prompts located in a `shortcuts/` subdirectory (e.g., `.plain-agent/prompts/shortcuts/commit.md`) can be invoked directly as a top-level command (e.g., `/commit`).
@@ -572,18 +555,6 @@ description: Simplifies and refines code for clarity and maintainability
 You are a code simplifier. Your role is to refactor code while preserving its functionality.
 ```
 
-You can also import remote subagent definitions with the `import` field:
-
-```md
----
-import: https://raw.githubusercontent.com/anthropics/claude-code/f7ab5c799caf2ec8c7cd1b99d2bc2f158459ef5e/plugins/pr-review-toolkit/agents/code-simplifier.md
----
-
-Use AGENTS.md instead of CLAUDE.md in this project.
-```
-
-Remote subagents are fetched and cached locally. The local content will be appended to the imported content.
-
 ## Claude Code Plugin Support
 
 Example:

package/package.json

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

package/src/context/loadAgentRoles.mjs

@@ -1,10 +1,8 @@
 /** @import { ClaudeCodePlugin } from "../claudeCodePlugin.mjs" */
 
-import crypto from "node:crypto";
 import fs from "node:fs/promises";
 import path from "node:path";
 import {
-  AGENT_CACHE_DIR,
   AGENT_PROJECT_METADATA_DIR,
   AGENT_ROOT,
   AGENT_USER_CONFIG_DIR,
@@ -18,7 +16,6 @@ import { parseFrontmatter } from "../utils/parseFrontmatter.mjs";
  * @property {string} content
  * @property {string} filePath
  * @property {boolean} claudeOriginated
- * @property {string} [import]
  */
 
 /**
@@ -81,15 +78,7 @@ export async function loadAgentRoles(claudeCodePlugins) {
 
           if (content === null) return null;
 
-          let role = parseAgentRole(file, content, fullPath, idPrefix);
-          if (role.import) {
-            try {
-              role = await mergeRemoteRole(role, file, fullPath);
-            } catch (err) {
-              console.warn(`Failed to import remote role ${role.id}:`, err);
-              return null;
-            }
-          }
+          const role = parseAgentRole(file, content, fullPath, idPrefix);
 
           return role;
         }),
@@ -100,99 +89,6 @@ export async function loadAgentRoles(claudeCodePlugins) {
   return new Map(roles.map((role) => [role.id, role]));
 }
 
-/**
- * Merges a remote role into a local role.
- * @param {AgentRole} localRole
- * @param {string} relativePath
- * @param {string} fullPath
- * @returns {Promise<AgentRole>}
- */
-async function mergeRemoteRole(localRole, relativePath, fullPath) {
-  const importUrl = localRole.import;
-  if (!importUrl) {
-    return localRole;
-  }
-
-  const fetchedContent = await fetchAndCacheRole(importUrl).catch((err) => {
-    console.warn(`Failed to fetch agent role from ${importUrl}:`, err);
-    return null;
-  });
-
-  if (!fetchedContent) {
-    return localRole;
-  }
-
-  const remoteRole = parseAgentRole(relativePath, fetchedContent, fullPath);
-
-  return {
-    ...remoteRole,
-    ...localRole, // Local overrides
-    content: `${remoteRole.content}\n\n---\n\n${localRole.content}`.trim(),
-    description: localRole.description || remoteRole.description || "",
-  };
-}
-
-/**
- * Fetch an agent role from a URL and cache it.
- * @param {string} url
- * @returns {Promise<string>}
- */
-async function fetchAndCacheRole(url) {
-  const hash = crypto.createHash("sha256").update(url).digest("hex");
-  const cacheDir = path.join(AGENT_CACHE_DIR, "agents");
-  const cachePath = path.join(cacheDir, hash);
-
-  const cachedContent = await fs.readFile(cachePath, "utf-8").catch(() => null);
-  if (cachedContent !== null) {
-    return cachedContent;
-  }
-
-  const fetchedContent = await fetchContent(url);
-
-  // Attempt to cache, but don't block or fail on errors
-  fs.mkdir(cacheDir, { recursive: true })
-    .then(() => fs.writeFile(cachePath, fetchedContent, "utf-8"))
-    .catch((err) => {
-      console.warn(`Failed to write cache for ${url}:`, err);
-    });
-
-  return fetchedContent;
-}
-
-/**
- * Fetch content from a URL.
- * @param {string} url
- * @returns {Promise<string>}
- */
-async function fetchContent(url) {
-  const githubMatch = url.match(
-    /^https:\/\/github\.com\/([^/]+)\/([^/]+)\/blob\/([^/]+)\/(.+)$/,
-  );
-
-  if (githubMatch) {
-    const [, owner, repo, ref, path] = githubMatch;
-    const apiUrl = `repos/${owner}/${repo}/contents/${path}?ref=${ref}`;
-    try {
-      const { execFileSync } = await import("node:child_process");
-      return execFileSync(
-        "gh",
-        ["api", "-H", "Accept: application/vnd.github.v3.raw", apiUrl],
-        { encoding: "utf-8" },
-      );
-    } catch (err) {
-      throw new Error(`Failed to fetch from GitHub via gh CLI: ${err}`);
-    }
-  }
-
-  const response = await fetch(url);
-  if (!response.ok) {
-    throw new Error(
-      `Failed to fetch agent role from ${url}: ${response.status} ${response.statusText}`,
-    );
-  }
-  return response.text();
-}
-
 /**
  * Recursively get all markdown files in a directory.
  * @param {string} dir
@@ -262,6 +158,5 @@ function parseAgentRole(relativePath, fileContent, fullPath, idPrefix = "") {
     content,
     filePath: fullPath,
     claudeOriginated,
-    import: frontmatter.import,
   };
 }

package/src/context/loadPrompts.mjs

@@ -1,11 +1,8 @@
 /** @import { ClaudeCodePlugin } from "../claudeCodePlugin.mjs" */
 
-import { execFileSync } from "node:child_process";
-import crypto from "node:crypto";
 import fs from "node:fs/promises";
 import path from "node:path";
 import {
-  AGENT_CACHE_DIR,
   AGENT_PROJECT_METADATA_DIR,
   AGENT_ROOT,
   AGENT_USER_CONFIG_DIR,
@@ -19,7 +16,6 @@ import { parseFrontmatter } from "../utils/parseFrontmatter.mjs";
  * @property {string} content
  * @property {string} filePath
  * @property {boolean} claudeOriginated
- * @property {string} [import]
  * @property {boolean} [userInvocable]
  * @property {boolean} [isShortcut]
  * @property {boolean} [isSkill]
@@ -105,15 +101,7 @@ export async function loadPrompts(claudeCodePlugins) {
 
           if (content === null) return null;
 
-          let prompt = parsePrompt(file, content, fullPath, idPrefix);
-          if (prompt.import) {
-            try {
-              prompt = await mergeRemotePrompt(prompt, file, fullPath);
-            } catch (err) {
-              console.warn(`Failed to import remote prompt ${prompt.id}:`, err);
-              return null;
-            }
-          }
+          const prompt = parsePrompt(file, content, fullPath, idPrefix);
 
           if (prompt.userInvocable === false) {
             return null;
@@ -127,98 +115,6 @@ export async function loadPrompts(claudeCodePlugins) {
   return new Map(prompts.map((prompt) => [prompt.id, prompt]));
 }
 
-/**
- * Merges a remote prompt into a local prompt if an import URL is provided.
- * @param {Prompt} localPrompt
- * @param {string} relativePath
- * @param {string} fullPath
- * @returns {Promise<Prompt>}
- */
-async function mergeRemotePrompt(localPrompt, relativePath, fullPath) {
-  const importUrl = localPrompt.import;
-  if (!importUrl) {
-    return localPrompt;
-  }
-
-  const fetchedContent = await fetchAndCachePrompt(importUrl).catch((err) => {
-    console.warn(`Failed to fetch prompt from ${importUrl}:`, err);
-    return null;
-  });
-
-  if (!fetchedContent) {
-    return localPrompt;
-  }
-
-  const remotePrompt = parsePrompt(relativePath, fetchedContent, fullPath);
-
-  return {
-    ...remotePrompt,
-    ...localPrompt, // Local overrides
-    content: `${remotePrompt.content}\n\n---\n\n${localPrompt.content}`.trim(),
-    description: localPrompt.description || remotePrompt.description || "",
-  };
-}
-
-/**
- * Fetch a prompt from a URL and cache it.
- * @param {string} url
- * @returns {Promise<string>}
- */
-async function fetchAndCachePrompt(url) {
-  const hash = crypto.createHash("sha256").update(url).digest("hex");
-  const cacheDir = path.join(AGENT_CACHE_DIR, "prompts");
-  const cachePath = path.join(cacheDir, hash);
-
-  const cachedContent = await fs.readFile(cachePath, "utf-8").catch(() => null);
-  if (cachedContent !== null) {
-    return cachedContent;
-  }
-
-  const fetchedContent = await fetchContent(url);
-
-  // Attempt to cache, but don't block or fail on errors
-  fs.mkdir(cacheDir, { recursive: true })
-    .then(() => fs.writeFile(cachePath, fetchedContent, "utf-8"))
-    .catch((err) => {
-      console.warn(`Failed to write cache for ${url}:`, err);
-    });
-
-  return fetchedContent;
-}
-
-/**
- * Fetch content from a URL.
- * @param {string} url
- * @returns {Promise<string>}
- */
-async function fetchContent(url) {
-  const githubMatch = url.match(
-    /^https:\/\/github\.com\/([^/]+)\/([^/]+)\/blob\/([^/]+)\/(.+)$/,
-  );
-
-  if (githubMatch) {
-    const [, owner, repo, ref, path] = githubMatch;
-    const apiUrl = `repos/${owner}/${repo}/contents/${path}?ref=${ref}`;
-    try {
-      return execFileSync(
-        "gh",
-        ["api", "-H", "Accept: application/vnd.github.v3.raw", apiUrl],
-        { encoding: "utf-8" },
-      );
-    } catch (err) {
-      throw new Error(`Failed to fetch from GitHub via gh CLI: ${err}`);
-    }
-  }
-
-  const response = await fetch(url);
-  if (!response.ok) {
-    throw new Error(
-      `Failed to fetch prompt from ${url}: ${response.status} ${response.statusText}`,
-    );
-  }
-  return response.text();
-}
-
 /**
  * Recursively get all markdown files in a directory.
  * @param {string} dir
@@ -295,7 +191,6 @@ function parsePrompt(relativePath, fileContent, fullPath, idPrefix = "") {
     content,
     filePath: fullPath,
     claudeOriginated,
-    import: frontmatter.import,
     userInvocable: frontmatter["user-invocable"] === "true" ? true : undefined,
     isShortcut,
     isSkill: relativePath.endsWith("SKILL.md"),