@iinm/plain-agent 1.8.5 → 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.5",
+  "version": "1.8.7",
   "description": "A lightweight CLI-based coding agent",
   "license": "MIT",
   "type": "module",
@@ -33,10 +33,7 @@
     "lint": "npx @biomejs/biome check",
     "fix": "npx @biomejs/biome check --fix"
   },
-  "dependencies": {
-    "diff": "^8.0.4",
-    "yaml": "^2.8.3"
-  },
+  "dependencies": {},
   "devDependencies": {
     "@biomejs/biome": "^2.4.12",
     "@types/node": "^22.19.17",

package/src/cliFormatter.mjs

@@ -8,8 +8,12 @@
  * @import { SwitchToSubagentInput } from "./tools/switchToSubagent"
  */
 
+import { execFile } from "node:child_process";
+import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
 import { styleText } from "node:util";
-import { createPatch } from "diff";
+import { noThrow } from "./utils/noThrow.mjs";
 
 /** Length above which a single-line arg forces block-form rendering. */
 const ARG_BLOCK_LENGTH_THRESHOLD = 60;
@@ -57,9 +61,11 @@ export function formatArgs(args) {
 /**
  * Format tool use for display.
  * @param {MessageContentToolUse} toolUse
- * @returns {string}
+ * @param {{ createDiff?: (oldContent: string, newContent: string) => Promise<string | null> }} [options]
+ * @returns {Promise<string>}
  */
-export function formatToolUse(toolUse) {
+export async function formatToolUse(toolUse, options = {}) {
+  const { createDiff = tryGitDiff } = options;
   const { toolName, input } = toolUse;
 
   if (toolName === "exec_command") {
@@ -99,23 +105,26 @@ export function formatToolUse(toolUse) {
       diffs.push({ search, replace });
     }
 
-    const highlightedDiff = diffs
-      .map(
-        ({ search, replace }) =>
-          `${createPatch(patchFileInput.filePath || "", search, replace)
-            .replace(/^-.+$/gm, (match) => styleText("red", match))
-            .replace(/^\+.+$/gm, (match) => styleText("green", match))
-            .replace(/^@@.+$/gm, (match) => styleText("gray", match))
-            .replace(/^\$/gm, (match) =>
-              styleText("gray", match),
-            )}\n-------\n${replace}`,
-      )
-      .join("\n\n");
+    const highlightedDiff = await Promise.all(
+      diffs.map(async ({ search, replace }) => {
+        const gitDiffOutput = await createDiff(search, replace);
+        if (gitDiffOutput) {
+          return `${gitDiffOutput}\n-------\n${replace}`;
+        }
+        return [
+          `${styleText("yellow", "(git diff unavailable, showing plain diff)")}`,
+          "--- old",
+          `${search}`,
+          "+++ new",
+          `${replace}`,
+        ].join("\n");
+      }),
+    );
 
     return [
       `tool: ${toolName}`,
       `path: ${patchFileInput.filePath}`,
-      `diff:\n${highlightedDiff}`,
+      `diff:\n${highlightedDiff.join("\n\n")}`,
     ].join("\n");
   }
 
@@ -349,11 +358,20 @@ export function formatCostForBatch(summary) {
 /**
  * Print a message to the console.
  * @param {Message} message
+ * @returns {Promise<void>}
  */
-export function printMessage(message) {
+export async function printMessage(message) {
   switch (message.role) {
     case "assistant": {
       // console.log(styleText("bold", "\nAgent:"));
+      // Pre-format all tool_use parts in parallel to avoid sequential awaits
+      const toolUseParts = message.content.filter(
+        (part) => part.type === "tool_use",
+      );
+      const formattedToolUses = await Promise.all(
+        toolUseParts.map((part) => formatToolUse(part)),
+      );
+      let toolUseIndex = 0;
       for (const part of message.content) {
         switch (part.type) {
           // Note: Streamで表示するためここでは表示しない
@@ -371,7 +389,7 @@ export function printMessage(message) {
           //   break;
           case "tool_use":
             console.log(styleText("bold", "\nTool call:"));
-            console.log(formatToolUse(part));
+            console.log(formattedToolUses[toolUseIndex++]);
             break;
         }
       }
@@ -411,3 +429,90 @@ export function printMessage(message) {
     }
   }
 }
+
+/**
+ * Generate a colored unified diff using `git diff --color`.
+ * Falls back to `null` if git is unavailable or if any step fails
+ * (temp directory creation, file writing, git execution, or cleanup).
+ * @param {string} oldContent
+ * @param {string} newContent
+ * @returns {Promise<string | null>}
+ */
+async function tryGitDiff(oldContent, newContent) {
+  const tmpDir = await noThrow(() =>
+    mkdtemp(path.join(os.tmpdir(), "git-diff-")),
+  );
+  if (tmpDir instanceof Error) {
+    console.error(
+      styleText("yellow", `git diff: mkdtemp failed: ${tmpDir.message}`),
+    );
+    return null;
+  }
+
+  const oldPath = path.join(tmpDir, "old");
+  const newPath = path.join(tmpDir, "new");
+
+  try {
+    const w1 = await noThrow(() => writeFile(oldPath, oldContent, "utf8"));
+    if (w1 instanceof Error) {
+      console.error(
+        styleText("yellow", `git diff: writeFile(old) failed: ${w1.message}`),
+      );
+      return null;
+    }
+
+    const w2 = await noThrow(() => writeFile(newPath, newContent, "utf8"));
+    if (w2 instanceof Error) {
+      console.error(
+        styleText("yellow", `git diff: writeFile(new) failed: ${w2.message}`),
+      );
+      return null;
+    }
+
+    const diffResult = await noThrow(() => execGitDiff(oldPath, newPath));
+    if (diffResult instanceof Error) {
+      console.error(
+        styleText("yellow", `git diff: exec failed: ${diffResult.message}`),
+      );
+      return null;
+    }
+
+    return diffResult;
+  } finally {
+    const cleanup = await noThrow(() =>
+      rm(tmpDir, { recursive: true, force: true }),
+    );
+    if (cleanup instanceof Error) {
+      console.error(
+        styleText("yellow", `git diff: cleanup failed: ${cleanup.message}`),
+      );
+    }
+  }
+}
+
+/**
+ * Execute git diff accepting exit code 1 as success (differences found).
+ * @param {string} oldPath
+ * @param {string} newPath
+ * @returns {Promise<string>}
+ */
+function execGitDiff(oldPath, newPath) {
+  return new Promise((resolve, reject) => {
+    execFile(
+      "git",
+      ["--no-pager", "diff", "--color", "--no-index", "--", oldPath, newPath],
+      { encoding: "utf8", maxBuffer: 10 * 1024 * 1024 },
+      (error, stdout, stderr) => {
+        if (stderr) {
+          console.error(styleText("yellow", `git diff stderr: ${stderr}`));
+        }
+        // git diff returns exit code 1 when there are differences, which is expected
+        if (error && error.code !== 1) {
+          reject(error);
+        } else {
+          resolve(stdout);
+        }
+      },
+    );
+  });
+}

package/src/cliInteractive.mjs

@@ -473,7 +473,11 @@ export function startInteractiveSession({
   });
 
   agentEventEmitter.on("message", (message) => {
-    printMessage(message);
+    printMessage(message).catch((err) => {
+      console.error(
+        styleText("red", `Error rendering message: ${err.message}`),
+      );
+    });
   });
 
   agentEventEmitter.on("toolUseRequest", () => {

package/src/context/loadAgentRoles.mjs

@@ -1,15 +1,13 @@
 /** @import { ClaudeCodePlugin } from "../claudeCodePlugin.mjs" */
 
-import crypto from "node:crypto";
 import fs from "node:fs/promises";
 import path from "node:path";
-import { parse as parseYaml } from "yaml";
 import {
-  AGENT_CACHE_DIR,
   AGENT_PROJECT_METADATA_DIR,
   AGENT_ROOT,
   AGENT_USER_CONFIG_DIR,
 } from "../env.mjs";
+import { parseFrontmatter } from "../utils/parseFrontmatter.mjs";
 
 /**
  * @typedef {Object} AgentRole
@@ -18,7 +16,6 @@ import {
  * @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
@@ -253,21 +149,7 @@ function parseAgentRole(relativePath, fileContent, fullPath, idPrefix = "") {
     };
   }
 
-  /** @type {{description?:string; import?:string}} */
-  let frontmatter;
-  try {
-    frontmatter = /** @type {{description?:string; import?:string}} */ (
-      parseYaml(match[1])
-    );
-  } catch (_err) {
-    return {
-      id,
-      description: parseFrontmatterField(match[1], "description") ?? "",
-      content: fileContent.trim(),
-      filePath: fullPath,
-      claudeOriginated,
-    };
-  }
+  const frontmatter = parseFrontmatter(match[1]);
   const content = match[2].trim();
 
   return {
@@ -276,19 +158,5 @@ function parseAgentRole(relativePath, fileContent, fullPath, idPrefix = "") {
     content,
     filePath: fullPath,
     claudeOriginated,
-    import: frontmatter.import,
   };
 }
-
-/**
- * Parse a field from YAML frontmatter.
- * @param {string} frontmatter
- * @param {string} field
- * @returns {string | undefined}
- */
-
-function parseFrontmatterField(frontmatter, field) {
-  const regex = new RegExp(`^${field}:\\s*(.*)$`, "m");
-  const match = frontmatter.match(regex);
-  return match ? match[1].trim() : undefined;
-}

package/src/context/loadPrompts.mjs

@@ -1,16 +1,13 @@
 /** @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 { parse as parseYaml } from "yaml";
 import {
-  AGENT_CACHE_DIR,
   AGENT_PROJECT_METADATA_DIR,
   AGENT_ROOT,
   AGENT_USER_CONFIG_DIR,
 } from "../env.mjs";
+import { parseFrontmatter } from "../utils/parseFrontmatter.mjs";
 
 /**
  * @typedef {Object} Prompt
@@ -19,7 +16,6 @@ import {
  * @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
@@ -287,29 +183,7 @@ function parsePrompt(relativePath, fileContent, fullPath, idPrefix = "") {
 
   const content = match[2].trim();
 
-  /** @type {{description?:string; import?:string; "user-invocable"?:boolean}} */
-  let frontmatter;
-  try {
-    frontmatter =
-      /** @type {{description?:string; import?:string; "user-invocable"?:boolean}} */ (
-        parseYaml(match[1])
-      );
-  } catch (_err) {
-    return {
-      id,
-      description: parseFrontmatterField(match[1], "description") ?? "",
-      content,
-      filePath: fullPath,
-      claudeOriginated,
-      import: parseFrontmatterField(match[1], "import"),
-      userInvocable:
-        parseFrontmatterField(match[1], "user-invocable") === "true" ||
-        undefined,
-      isShortcut,
-      isSkill,
-    };
-  }
-  const userInvocable = frontmatter["user-invocable"];
+  const frontmatter = parseFrontmatter(match[1]);
 
   return {
     id,
@@ -317,21 +191,8 @@ function parsePrompt(relativePath, fileContent, fullPath, idPrefix = "") {
     content,
     filePath: fullPath,
     claudeOriginated,
-    import: frontmatter.import,
-    userInvocable: userInvocable ?? undefined,
+    userInvocable: frontmatter["user-invocable"] === "true" ? true : undefined,
     isShortcut,
     isSkill: relativePath.endsWith("SKILL.md"),
   };
 }
-
-/**
- * Parse a field from YAML frontmatter.
- * @param {string} frontmatter
- * @param {string} field
- * @returns {string | undefined}
- */
-function parseFrontmatterField(frontmatter, field) {
-  const regex = new RegExp(`^${field}:\\s*(.*)$`, "m");
-  const match = frontmatter.match(regex);
-  return match ? match[1].trim() : undefined;
-}

package/src/utils/parseFrontmatter.mjs

@@ -0,0 +1,19 @@
+/**
+ * Parse simple key-value frontmatter using regex.
+ * Only supports `key: value` format. No multiline strings.
+ * @param {string} frontmatter - The YAML frontmatter content (without --- delimiters)
+ * @returns {Record<string, string>} Parsed key-value pairs
+ */
+export function parseFrontmatter(frontmatter) {
+  /** @type {Record<string, string>} */
+  const result = {};
+
+  for (const line of frontmatter.split(/\r?\n/)) {
+    const match = line.match(/^(\w[\w-]*):\s?(.*)$/);
+    if (match) {
+      result[match[1]] = match[2].trimEnd();
+    }
+  }
+
+  return result;
+}