@iinm/plain-agent 1.2.1 → 1.3.1

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.
@@ -122,7 +122,7 @@ Create the configuration.
 ```
 
 <details>
-<summary>Other provider examples</summary>
+<summary><b>Other provider examples</b></summary>
 
 ```js
 {
@@ -149,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
@@ -162,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
 ```
@@ -223,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
 {
@@ -270,7 +323,7 @@ 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
 {
@@ -467,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
@@ -502,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 
@@ -582,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
@@ -615,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.2.1",
+  "version": "1.3.1",
   "description": "A lightweight CLI-based coding agent",
   "license": "MIT",
   "type": "module",

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

@@ -192,7 +192,7 @@ export function formatProviderTokenUsage(usage) {
                 "rejected_prediction_tokens",
               ].includes(k),
           )
-          .map(([k, v]) => `${k}: ${v}`)
+          .map(([k, v]) => `${k}: ${JSON.stringify(v)}`)
           .join(", ")}`,
       );
     }

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);

package/src/config.d.ts

@@ -3,11 +3,7 @@ import { ToolUsePattern } from "./tool";
 import { AskURLToolOptions } from "./tools/askURL.mjs";
 import { AskWebToolOptions } from "./tools/askWeb.mjs";
 import { ExecCommandSanboxConfig } from "./tools/execCommand";
-
-export type ClaudeCodePluginConfig = {
-  name: string;
-  path: string;
-};
+import { ClaudeCodePluginRepo } from "./claudeCodePlugin.mjs";
 
 export type AppConfig = {
   model?: string;
@@ -25,7 +21,7 @@ export type AppConfig = {
   };
   mcpServers?: Record<string, MCPServerConfig>;
   notifyCmd?: string;
-  claudeCodePlugins?: ClaudeCodePluginConfig[];
+  claudeCodePlugins?: ClaudeCodePluginRepo[];
 };
 
 export type MCPServerConfig = {

package/src/context/loadAgentRoles.mjs

@@ -1,3 +1,5 @@
+/** @import { ClaudeCodePlugin } from "../claudeCodePlugin.mjs" */
+
 import crypto from "node:crypto";
 import fs from "node:fs/promises";
 import path from "node:path";
@@ -7,7 +9,6 @@ import {
   AGENT_PROJECT_METADATA_DIR,
   AGENT_ROOT,
   AGENT_USER_CONFIG_DIR,
-  CLAUDE_CODE_PLUGIN_DIR,
 } from "../env.mjs";
 
 /**
@@ -21,10 +22,11 @@ import {
 
 /**
  * Load all agent roles from the predefined directories.
- * @param {Array<{name: string, path: string}>} [claudeCodePlugins]
+ * @param {ClaudeCodePlugin[]} [claudeCodePlugins]
  * @returns {Promise<Map<string, AgentRole>>}
  */
 export async function loadAgentRoles(claudeCodePlugins) {
+  /** @type {Array<{dir: string, idPrefix: string, only?: RegExp}>} */
   const agentDirs = [
     {
       dir: path.resolve(AGENT_ROOT, ".config", "agents.predefined"),
@@ -41,11 +43,10 @@ export async function loadAgentRoles(claudeCodePlugins) {
   // Add plugin directories if provided
   if (claudeCodePlugins) {
     for (const plugin of claudeCodePlugins) {
-      const pluginBase = path.join(CLAUDE_CODE_PLUGIN_DIR, plugin.path);
-
       agentDirs.push({
-        dir: path.join(pluginBase, "agents"),
+        dir: path.join(plugin.path, "agents"),
         idPrefix: `claude/${plugin.name}:`,
+        only: plugin.only,
       });
     }
   }
@@ -53,7 +54,7 @@ export async function loadAgentRoles(claudeCodePlugins) {
   /** @type {Map<string, AgentRole>} */
   const roles = new Map();
 
-  for (const { dir, idPrefix } of agentDirs) {
+  for (const { dir, idPrefix, only } of agentDirs) {
     const files = await getMarkdownFiles(dir).catch((err) => {
       if (err.code !== "ENOENT") {
         console.warn(`Failed to list agent roles in ${dir}:`, err);
@@ -70,6 +71,11 @@ export async function loadAgentRoles(claudeCodePlugins) {
 
       if (content === null) continue;
 
+      // Filter by only pattern if specified
+      if (only && !only.test(file)) {
+        continue;
+      }
+
       let role = parseAgentRole(file, content, fullPath, idPrefix);
       if (role.import) {
         role = await mergeRemoteRole(role, file, fullPath);

package/src/context/loadPrompts.mjs

@@ -1,3 +1,5 @@
+/** @import { ClaudeCodePlugin } from "../claudeCodePlugin.mjs" */
+
 import { execFileSync } from "node:child_process";
 import crypto from "node:crypto";
 import fs from "node:fs/promises";
@@ -8,7 +10,6 @@ import {
   AGENT_PROJECT_METADATA_DIR,
   AGENT_ROOT,
   AGENT_USER_CONFIG_DIR,
-  CLAUDE_CODE_PLUGIN_DIR,
 } from "../env.mjs";
 
 /**
@@ -25,10 +26,11 @@ import {
 
 /**
  * Load all prompts from the predefined directories.
- * @param {Array<{name: string, path: string}>} [claudeCodePlugins]
+ * @param {ClaudeCodePlugin[]} [claudeCodePlugins]
  * @returns {Promise<Map<string, Prompt>>}
  */
 export async function loadPrompts(claudeCodePlugins) {
+  /** @type {Array<{dir: string, idPrefix: string, only?: RegExp}>} */
   const promptDirs = [
     {
       dir: path.resolve(AGENT_ROOT, ".config", "prompts.predefined"),
@@ -49,18 +51,18 @@ export async function loadPrompts(claudeCodePlugins) {
   // Add plugin directories if provided
   if (claudeCodePlugins) {
     for (const plugin of claudeCodePlugins) {
-      const pluginBase = path.join(CLAUDE_CODE_PLUGIN_DIR, plugin.path);
-
       // Commands
       promptDirs.push({
-        dir: path.join(pluginBase, "commands"),
+        dir: path.join(plugin.path, "commands"),
         idPrefix: `claude/${plugin.name}/commands:`,
+        only: plugin.only,
       });
 
       // Skills
       promptDirs.push({
-        dir: path.join(pluginBase, "skills"),
+        dir: path.join(plugin.path, "skills"),
         idPrefix: `claude/${plugin.name}/skills:`,
+        only: plugin.only,
       });
     }
   }
@@ -68,7 +70,7 @@ export async function loadPrompts(claudeCodePlugins) {
   /** @type {Map<string, Prompt>} */
   const prompts = new Map();
 
-  for (const { dir, idPrefix } of promptDirs) {
+  for (const { dir, idPrefix, only } of promptDirs) {
     const files = await getMarkdownFiles(dir).catch((err) => {
       if (err.code !== "ENOENT") {
         console.warn(`Failed to list prompts in ${dir}:`, err);
@@ -85,6 +87,11 @@ export async function loadPrompts(claudeCodePlugins) {
 
       if (content === null) continue;
 
+      // Filter by only pattern if specified
+      if (only && !only.test(file)) {
+        continue;
+      }
+
       //  Ignore all files in the skills/ directory except for SKILL.md.
       if (fullPath.match(/\/skills\//) && !file.endsWith("/SKILL.md")) {
         continue;
@@ -240,6 +247,7 @@ async function getMarkdownFiles(dir, baseDir = dir) {
  */
 function parsePrompt(relativePath, fileContent, fullPath, idPrefix = "") {
   const rawId = relativePath.replace(/\/SKILL\.md$/, "").replace(/\.md$/, "");
+  const isSkill = relativePath.endsWith("SKILL.md");
   const isShortcut = rawId.startsWith("shortcuts/");
   const id = isShortcut
     ? idPrefix + rawId.replace(/^shortcuts\//, "")
@@ -257,7 +265,7 @@ function parsePrompt(relativePath, fileContent, fullPath, idPrefix = "") {
       content: fileContent.trim(),
       filePath: fullPath,
       isShortcut,
-      isSkill: relativePath.endsWith("SKILL.md"),
+      isSkill,
     };
   }
 
@@ -281,7 +289,7 @@ function parsePrompt(relativePath, fileContent, fullPath, idPrefix = "") {
         parseFrontmatterField(match[1], "user-invocable") === "true" ||
         undefined,
       isShortcut,
-      isSkill: relativePath.endsWith("SKILL.md"),
+      isSkill,
     };
   }
   const userInvocable = frontmatter["user-invocable"];
@@ -304,7 +312,6 @@ function parsePrompt(relativePath, fileContent, fullPath, idPrefix = "") {
  * @param {string} field
  * @returns {string | undefined}
  */
-
 function parseFrontmatterField(frontmatter, field) {
   const regex = new RegExp(`^${field}:\\s*(.*)$`, "m");
   const match = frontmatter.match(regex);

package/src/main.mjs

@@ -4,6 +4,10 @@
 
 import { styleText } from "node:util";
 import { createAgent } from "./agent.mjs";
+import {
+  installClaudeCodePlugins,
+  resolvePluginPaths,
+} from "./claudeCodePlugin.mjs";
 import { parseCliArgs, printHelp } from "./cliArgs.mjs";
 import { startBatchSession } from "./cliBatch.mjs";
 import { startInteractiveSession } from "./cliInteractive.mjs";
@@ -29,11 +33,11 @@ import { writeFileTool } from "./tools/writeFile.mjs";
 import { createToolUseApprover } from "./toolUseApprover.mjs";
 
 const cliArgs = parseCliArgs(process.argv);
-if (cliArgs.showHelp) {
+if (cliArgs.subcommand.type === "help") {
   printHelp();
 }
 
-if (cliArgs.listModels) {
+if (cliArgs.subcommand.type === "list-models") {
   const { appConfig } = await loadAppConfig({ skipTrustCheck: true });
   if (!appConfig.models || appConfig.models.length === 0) {
     console.error("No models found in configuration.");
@@ -48,6 +52,11 @@ if (cliArgs.listModels) {
   process.exit(0);
 }
 
+if (cliArgs.subcommand.type === "install-claude-code-plugins") {
+  await installClaudeCodePlugins();
+  process.exit(0);
+}
+
 (async () => {
   const startTime = new Date();
   const sessionId = [
@@ -56,12 +65,18 @@ if (cliArgs.listModels) {
       `0${startTime.getMinutes()}`.slice(-2),
   ].join("-");
   const tmuxSessionId = `agent-${sessionId}`;
-  const isBatchMode = Boolean(cliArgs.batch);
+
+  const isBatchMode = cliArgs.subcommand.type === "batch";
+  const configFiles =
+    cliArgs.subcommand.type === "batch" ||
+    cliArgs.subcommand.type === "interactive"
+      ? cliArgs.subcommand.config
+      : [];
 
   const { appConfig, loadedConfigPath } = await loadAppConfig({
     skipUserConfig: isBatchMode,
     skipTrustCheck: isBatchMode,
-    configFiles: cliArgs.config,
+    configFiles,
   });
 
   // In batch mode, skip human-readable output
@@ -121,9 +136,17 @@ if (cliArgs.listModels) {
     }
   }
 
-  const modelNameWithVariant = cliArgs.model || appConfig.model || "";
-  const agentRoles = await loadAgentRoles(appConfig.claudeCodePlugins);
-  const prompts = await loadPrompts(appConfig.claudeCodePlugins);
+  const modelFromConfig = appConfig.model || "";
+  const modelFromArgs =
+    cliArgs.subcommand.type === "batch" ||
+    cliArgs.subcommand.type === "interactive"
+      ? cliArgs.subcommand.model
+      : null;
+  const modelNameWithVariant = modelFromArgs || modelFromConfig;
+
+  const pluginPaths = resolvePluginPaths(appConfig.claudeCodePlugins ?? []);
+  const agentRoles = await loadAgentRoles(pluginPaths);
+  const prompts = await loadPrompts(pluginPaths);
 
   const prompt = createPrompt({
     username: USER_NAME,
@@ -216,19 +239,20 @@ if (cliArgs.listModels) {
     },
   };
 
-  if (isBatchMode) {
-    if (!cliArgs.batch) {
+  if (cliArgs.subcommand.type === "batch") {
+    const task = cliArgs.subcommand.task;
+    if (!task) {
       throw new Error("Batch task is required in batch mode");
     }
     await startBatchSession({
       ...sessionOptions,
-      task: cliArgs.batch,
+      task,
     });
   } else {
     startInteractiveSession({
       ...sessionOptions,
       notifyCmd: appConfig.notifyCmd || AGENT_NOTIFY_CMD_DEFAULT,
-      claudeCodePlugins: appConfig.claudeCodePlugins,
+      claudeCodePlugins: resolvePluginPaths(appConfig.claudeCodePlugins ?? []),
     });
   }
 })().catch((err) => {