pi-open-agents 0.1.32 → 0.1.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-open-agents",
-  "version": "0.1.32",
+  "version": "0.1.33",
   "description": "Unified agent and subagent management for pi coding agent, with OpenCode-compatible agent definitions.",
   "keywords": [
     "pi-package",

package/src/discovery/loader.ts

@@ -115,6 +115,12 @@ export async function loadAgents(options: LoadAgentsOptions = {}): Promise<Agent
           // Skip disabled agents entirely
           if (agent.disable) continue;
 
+          // Resolve body-level include directives (fail-soft, never throws)
+          agent.prompt = await resolveIncludes(agent.prompt, path.dirname(filePath), {
+            fs: fileSystem,
+            reportedMissing: new Set(),
+          }, new Set([path.resolve(filePath)]), 0);
+
           // Add to the appropriate map
           if (discPath.source === "project") {
             projectAgents.set(agent.name, agent);
@@ -153,6 +159,119 @@ function defaultAgentDir(): string {
   return path.join(process.env.HOME ?? "", ".pi", "agent");
 }
 
+// ─── Include Directive Resolution ───────────────────────────────────────────
+
+/** Max recursion depth for include directives. */
+const INCLUDE_MAX_DEPTH = 8;
+
+/**
+ * A full-line include directive: `include: "path"`, `include: 'path'`,
+ * or `include: path`. Case-sensitive, must start at column 0 and occupy
+ * the whole line (trailing whitespace allowed). Occurrences inside
+ * sentences, indented lines, or fenced code blocks never match.
+ */
+const INCLUDE_LINE_RE = /^include:[ \t]+(?:"([^"]*)"|'([^']*)'|([^\s"']+))[ \t]*$/;
+
+/** Opening/closing fenced code block markers (``` or ~~~, optionally indented). */
+const FENCE_RE = /^[ \t]*(```|~~~)/;
+
+/** Shared state for one loadAgents run. */
+interface IncludeContext {
+  /** Filesystem abstraction (honors the custom fs used for tests). */
+  fs: AgentFs;
+  /** Resolved paths already warned about (one warning per missing path). */
+  reportedMissing: Set<string>;
+}
+
+function warnInclude(message: string): void {
+  console.error(`[pi-open-agents] include: ${message}`);
+}
+
+/**
+ * Resolve body-level include directives in agent markdown.
+ *
+ * Each directive line is replaced by the content of the referenced file,
+ * resolved relative to the directory of the file containing the directive.
+ * Includes are recursive under the same rule. Cycles are detected via the
+ * set of absolute paths on the current expansion path, and nesting is
+ * capped at INCLUDE_MAX_DEPTH.
+ *
+ * Fail-soft: missing files, cycles, and over-deep nesting keep the directive
+ * line literal and warn on stderr, but never throw. Keeping the line (instead
+ * of dropping it) preserves visibility for debugging and for any downstream
+ * loader that might resolve it later.
+ *
+ * @param content  Markdown body to process
+ * @param baseDir  Directory of the file containing the directives
+ * @param ctx      Shared per-load state
+ * @param visited  Absolute paths on the current expansion path (cycle guard)
+ * @param depth    Current inclusion depth (0 = the agent file itself)
+ */
+async function resolveIncludes(
+  content: string,
+  baseDir: string,
+  ctx: IncludeContext,
+  visited: Set<string>,
+  depth: number,
+): Promise<string> {
+  const lines = content.split("\n");
+  const out: string[] = [];
+  let inFence = false;
+
+  for (const line of lines) {
+    if (FENCE_RE.test(line)) {
+      inFence = !inFence;
+      out.push(line);
+      continue;
+    }
+
+    if (inFence) {
+      out.push(line);
+      continue;
+    }
+
+    const match = INCLUDE_LINE_RE.exec(line);
+    const includePath = match ? (match[1] ?? match[2] ?? match[3]) : undefined;
+    if (!includePath) {
+      out.push(line);
+      continue;
+    }
+
+    const resolved = path.resolve(baseDir, includePath);
+
+    if (visited.has(resolved)) {
+      warnInclude(`cycle detected for "${includePath}" (${resolved}); keeping directive literal`);
+      out.push(line);
+      continue;
+    }
+
+    if (depth >= INCLUDE_MAX_DEPTH) {
+      warnInclude(`max depth ${INCLUDE_MAX_DEPTH} exceeded for "${includePath}"; keeping directive literal`);
+      out.push(line);
+      continue;
+    }
+
+    let raw: string;
+    try {
+      raw = await ctx.fs.readFile(resolved);
+    } catch {
+      if (!ctx.reportedMissing.has(resolved)) {
+        ctx.reportedMissing.add(resolved);
+        warnInclude(`file not found: "${includePath}" (${resolved}); keeping directive literal`);
+      }
+      out.push(line);
+      continue;
+    }
+
+    visited.add(resolved);
+    const expanded = await resolveIncludes(raw, path.dirname(resolved), ctx, visited, depth + 1);
+    visited.delete(resolved);
+    out.push(expanded);
+  }
+
+  return out.join("\n");
+}
+
 // ─── Filtering Utilities ────────────────────────────────────────────────────
 
 /**