promptopskit 0.3.1 → 0.3.4

package/dist/index.cjs

@@ -64,10 +64,156 @@ __export(src_exports, {
   withUsageTapCall: () => withUsageTapCall
 });
 module.exports = __toCommonJS(src_exports);
+var import_node_path4 = require("path");
+
+// src/renderer/interpolate.ts
+var VARIABLE_RE = /\{\{\s*([a-zA-Z_][a-zA-Z0-9_]*)\s*\}\}/g;
+var ESCAPED_OPEN = /\\\{\\\{/g;
+var ESCAPE_PLACEHOLDER = "\0ESCAPED_OPEN\0";
+function interpolate(template, variables, options = {}) {
+  const { strict = false } = options;
+  let result = template.replace(ESCAPED_OPEN, ESCAPE_PLACEHOLDER);
+  result = result.replace(VARIABLE_RE, (match, name) => {
+    if (name in variables) {
+      return variables[name];
+    }
+    if (strict) {
+      throw new Error(`Missing required variable: "${name}"`);
+    }
+    return match;
+  });
+  result = result.replaceAll(ESCAPE_PLACEHOLDER, "{{");
+  return result;
+}
+function extractVariables(template) {
+  const vars = /* @__PURE__ */ new Set();
+  let match;
+  const re = new RegExp(VARIABLE_RE.source, "g");
+  while ((match = re.exec(template)) !== null) {
+    vars.add(match[1]);
+  }
+  return [...vars];
+}
+
+// src/renderer/renderer.ts
+function renderSections(asset, options = {}) {
+  const { variables = {}, strict = false } = options;
+  const result = {};
+  if (asset.sections.system_instructions) {
+    result.system_instructions = interpolate(
+      asset.sections.system_instructions,
+      variables,
+      { strict }
+    );
+  }
+  if (asset.sections.prompt_template) {
+    result.prompt_template = interpolate(
+      asset.sections.prompt_template,
+      variables,
+      { strict }
+    );
+  }
+  return result;
+}
+
+// src/overrides/apply-overrides.ts
+function applyOverrides(asset, options = {}) {
+  let result = { ...asset };
+  if (options.environment && result.environments?.[options.environment]) {
+    result = mergeOverride(result, result.environments[options.environment]);
+  }
+  if (options.tier && result.tiers?.[options.tier]) {
+    result = mergeOverride(result, result.tiers[options.tier]);
+  }
+  if (options.runtime) {
+    result = mergeOverride(result, options.runtime);
+  }
+  return result;
+}
+function mergeOverride(base, override) {
+  const result = { ...base };
+  if (override.model !== void 0) result.model = override.model;
+  if (override.fallback_models !== void 0) result.fallback_models = override.fallback_models;
+  if (override.tools !== void 0) result.tools = override.tools;
+  if (override.reasoning !== void 0) {
+    result.reasoning = { ...result.reasoning, ...override.reasoning };
+  }
+  if (override.sampling !== void 0) {
+    result.sampling = { ...result.sampling, ...override.sampling };
+  }
+  if (override.response !== void 0) {
+    result.response = { ...result.response, ...override.response };
+  }
+  return result;
+}
+
+// src/providers/resolve-asset.ts
+function resolveAssetForProvider(asset, runtime = {}) {
+  if (!runtime.environment && !runtime.tier && !runtime.runtime) {
+    return asset;
+  }
+  return applyOverrides(asset, {
+    environment: runtime.environment,
+    tier: runtime.tier,
+    runtime: runtime.runtime
+  });
+}
+
+// src/prompt-resolution.ts
 var import_promises3 = require("fs/promises");
 var import_node_fs2 = require("fs");
 var import_node_path3 = require("path");
 
+// src/cache.ts
+var import_node_fs = require("fs");
+var PromptCache = class {
+  cache = /* @__PURE__ */ new Map();
+  maxSize;
+  constructor(maxSize = 100) {
+    this.maxSize = maxSize;
+  }
+  get(filePath) {
+    const entry = this.cache.get(filePath);
+    if (!entry) return void 0;
+    try {
+      const stat = (0, import_node_fs.statSync)(filePath);
+      if (stat.mtimeMs !== entry.mtime) {
+        this.cache.delete(filePath);
+        return void 0;
+      }
+    } catch {
+      this.cache.delete(filePath);
+      return void 0;
+    }
+    this.cache.delete(filePath);
+    this.cache.set(filePath, entry);
+    return entry.value;
+  }
+  set(filePath, value) {
+    try {
+      const stat = (0, import_node_fs.statSync)(filePath);
+      if (this.cache.has(filePath)) {
+        this.cache.delete(filePath);
+      } else if (this.cache.size >= this.maxSize) {
+        const oldest = this.cache.keys().next().value;
+        if (oldest) this.cache.delete(oldest);
+      }
+      this.cache.set(filePath, { value, mtime: stat.mtimeMs });
+    } catch {
+    }
+  }
+  clear() {
+    this.cache.clear();
+  }
+  get size() {
+    return this.cache.size;
+  }
+};
+
+// src/composition/resolve-includes.ts
+var import_promises2 = require("fs/promises");
+var import_node_path2 = require("path");
+
 // src/parser/parser.ts
 var import_gray_matter = __toESM(require("gray-matter"), 1);
 
@@ -324,8 +470,6 @@ function applyDefaults(asset, defaults) {
 }
 
 // src/composition/resolve-includes.ts
-var import_promises2 = require("fs/promises");
-var import_node_path2 = require("path");
 async function resolveIncludes(asset, basePath, visited = /* @__PURE__ */ new Set()) {
   if (!asset.includes || asset.includes.length === 0) {
     return asset;
@@ -362,101 +506,119 @@ async function resolveIncludes(asset, basePath, visited = /* @__PURE__ */ new Se
   };
 }
 
-// src/overrides/apply-overrides.ts
-function applyOverrides(asset, options = {}) {
-  let result = { ...asset };
-  if (options.environment && result.environments?.[options.environment]) {
-    result = mergeOverride(result, result.environments[options.environment]);
-  }
-  if (options.tier && result.tiers?.[options.tier]) {
-    result = mergeOverride(result, result.tiers[options.tier]);
-  }
-  if (options.runtime) {
-    result = mergeOverride(result, options.runtime);
-  }
-  return result;
-}
-function mergeOverride(base, override) {
-  const result = { ...base };
-  if (override.model !== void 0) result.model = override.model;
-  if (override.fallback_models !== void 0) result.fallback_models = override.fallback_models;
-  if (override.tools !== void 0) result.tools = override.tools;
-  if (override.reasoning !== void 0) {
-    result.reasoning = { ...result.reasoning, ...override.reasoning };
-  }
-  if (override.sampling !== void 0) {
-    result.sampling = { ...result.sampling, ...override.sampling };
-  }
-  if (override.response !== void 0) {
-    result.response = { ...result.response, ...override.response };
+// src/prompt-resolution.ts
+var sharedPromptCache = new PromptCache();
+async function loadPromptAsset(promptPath, config, promptCache = sharedPromptCache) {
+  const mode = config.mode ?? "auto";
+  if (mode !== "source-only" && config.compiledDir) {
+    const compiledFile = (0, import_node_path3.resolve)(config.compiledDir, promptPath + ".json");
+    if ((0, import_node_fs2.existsSync)(compiledFile)) {
+      if (mode === "auto") {
+        const sourceFile = (0, import_node_path3.resolve)(config.sourceDir, promptPath + ".md");
+        if ((0, import_node_fs2.existsSync)(sourceFile)) {
+          const compiledMtime = (0, import_node_fs2.statSync)(compiledFile).mtimeMs;
+          const sourceMtime = (0, import_node_fs2.statSync)(sourceFile).mtimeMs;
+          if (sourceMtime > compiledMtime) {
+            console.warn(
+              `[promptopskit] Warning: compiled artifact for "${promptPath}" is older than source .md file.
+               Run "promptopskit compile" or switch to source-only mode.`
+            );
+          }
+        }
+      }
+      const content = await (0, import_promises3.readFile)(compiledFile, "utf-8");
+      return JSON.parse(content);
+    }
+    if (mode === "compiled-only") {
+      throw new Error(
+        `Compiled artifact not found: ${compiledFile}
+Run "promptopskit compile" to generate it.`
+      );
+    }
   }
-  return result;
-}
-
-// src/renderer/interpolate.ts
-var VARIABLE_RE = /\{\{\s*([a-zA-Z_][a-zA-Z0-9_]*)\s*\}\}/g;
-var ESCAPED_OPEN = /\\\{\\\{/g;
-var ESCAPE_PLACEHOLDER = "\0ESCAPED_OPEN\0";
-function interpolate(template, variables, options = {}) {
-  const { strict = false } = options;
-  let result = template.replace(ESCAPED_OPEN, ESCAPE_PLACEHOLDER);
-  result = result.replace(VARIABLE_RE, (match, name) => {
-    if (name in variables) {
-      return variables[name];
+  if (mode !== "compiled-only") {
+    const sourceFile = (0, import_node_path3.resolve)(config.sourceDir, promptPath + ".md");
+    if (config.cache !== false) {
+      const cached = promptCache.get(sourceFile);
+      if (cached) {
+        return cached;
+      }
     }
-    if (strict) {
-      throw new Error(`Missing required variable: "${name}"`);
+    if (!(0, import_node_fs2.existsSync)(sourceFile)) {
+      const paths = [sourceFile];
+      if (config.compiledDir) {
+        paths.unshift((0, import_node_path3.resolve)(config.compiledDir, promptPath + ".json"));
+      }
+      throw new Error(
+        `Prompt not found: "${promptPath}"
+Searched:
+${paths.map((candidate) => `  - ${candidate}`).join("\n")}`
+      );
     }
-    return match;
+    const { asset } = await loadPromptFile(sourceFile, { defaultsRoot: config.sourceDir });
+    if (config.cache !== false) {
+      promptCache.set(sourceFile, asset);
+    }
+    return asset;
+  }
+  throw new Error(`Prompt not found: "${promptPath}"`);
+}
+async function resolvePromptAsset(promptPath, config, options = {}, promptCache = sharedPromptCache) {
+  let asset = await loadPromptAsset(promptPath, config, promptCache);
+  const sourceFile = (0, import_node_path3.resolve)(config.sourceDir, promptPath + ".md");
+  if (asset.includes && asset.includes.length > 0 && (0, import_node_fs2.existsSync)(sourceFile)) {
+    asset = await resolveIncludes(asset, sourceFile);
+  }
+  asset = applyOverrides(asset, {
+    environment: options.environment,
+    tier: options.tier,
+    runtime: options.runtime
   });
-  result = result.replaceAll(ESCAPE_PLACEHOLDER, "{{");
-  return result;
+  return asset;
 }
-function extractVariables(template) {
-  const vars = /* @__PURE__ */ new Set();
-  let match;
-  const re = new RegExp(VARIABLE_RE.source, "g");
-  while ((match = re.exec(template)) !== null) {
-    vars.add(match[1]);
-  }
-  return [...vars];
+function resolveInlinePromptSource(source, options = {}) {
+  const { asset } = parsePrompt(source);
+  return applyOverrides(asset, {
+    environment: options.environment,
+    tier: options.tier,
+    runtime: options.runtime
+  });
 }
 
-// src/renderer/renderer.ts
-function renderSections(asset, options = {}) {
-  const { variables = {}, strict = false } = options;
-  const result = {};
-  if (asset.sections.system_instructions) {
-    result.system_instructions = interpolate(
-      asset.sections.system_instructions,
-      variables,
-      { strict }
-    );
+// src/providers/prompt-input.ts
+function isPromptLookup(input) {
+  return "path" in input && typeof input.path === "string" && "sourceDir" in input;
+}
+function isInlinePromptSource(input) {
+  return "source" in input && typeof input.source === "string";
+}
+async function resolveProviderPromptInput(input, runtime) {
+  if (isPromptLookup(input)) {
+    return resolvePromptAsset(input.path, input, runtime);
   }
-  if (asset.sections.prompt_template) {
-    result.prompt_template = interpolate(
-      asset.sections.prompt_template,
-      variables,
-      { strict }
-    );
+  if (isInlinePromptSource(input)) {
+    return resolveInlinePromptSource(input.source, runtime);
   }
-  return result;
+  return input;
 }
-
-// src/providers/resolve-asset.ts
-function resolveAssetForProvider(asset, runtime = {}) {
-  if (!runtime.environment && !runtime.tier && !runtime.runtime) {
-    return asset;
-  }
-  return applyOverrides(asset, {
-    environment: runtime.environment,
-    tier: runtime.tier,
-    runtime: runtime.runtime
-  });
+function withPromptInputSupport(adapter) {
+  const validatePrompt = async (input, runtime) => {
+    const resolved = await resolveProviderPromptInput(input, runtime);
+    return adapter.validate(resolved, runtime);
+  };
+  const renderPrompt2 = async (input, runtime) => {
+    const resolved = await resolveProviderPromptInput(input, runtime);
+    return adapter.render(resolved, runtime);
+  };
+  return {
+    ...adapter,
+    validatePrompt,
+    renderPrompt: renderPrompt2
+  };
 }
 
 // src/providers/openai.ts
-var openaiAdapter = {
+var openaiAdapter = withPromptInputSupport({
   name: "openai",
   validate(asset, runtime) {
     const resolvedAsset = resolveAssetForProvider(asset, runtime);
@@ -530,10 +692,10 @@ var openaiAdapter = {
       model: resolvedAsset.model ?? "unknown"
     };
   }
-};
+});
 
 // src/providers/anthropic.ts
-var anthropicAdapter = {
+var anthropicAdapter = withPromptInputSupport({
   name: "anthropic",
   validate(asset, runtime) {
     const resolvedAsset = resolveAssetForProvider(asset, runtime);
@@ -612,10 +774,10 @@ var anthropicAdapter = {
       model: resolvedAsset.model ?? "unknown"
     };
   }
-};
+});
 
 // src/providers/gemini.ts
-var geminiAdapter = {
+var geminiAdapter = withPromptInputSupport({
   name: "gemini",
   validate(asset, runtime) {
     const resolvedAsset = resolveAssetForProvider(asset, runtime);
@@ -698,10 +860,10 @@ var geminiAdapter = {
       model: resolvedAsset.model ?? "unknown"
     };
   }
-};
+});
 
 // src/providers/openrouter.ts
-var openrouterAdapter = {
+var openrouterAdapter = withPromptInputSupport({
   name: "openrouter",
   validate(asset, runtime) {
     return openaiAdapter.validate(asset, runtime);
@@ -713,7 +875,7 @@ var openrouterAdapter = {
       provider: "openrouter"
     };
   }
-};
+});
 
 // src/providers/index.ts
 var adapters = {
@@ -923,48 +1085,6 @@ function findClosestMatch(input, candidates) {
   return best;
 }
 
-// src/cache.ts
-var import_node_fs = require("fs");
-var PromptCache = class {
-  cache = /* @__PURE__ */ new Map();
-  maxSize;
-  constructor(maxSize = 100) {
-    this.maxSize = maxSize;
-  }
-  get(filePath) {
-    const entry = this.cache.get(filePath);
-    if (!entry) return void 0;
-    try {
-      const stat = (0, import_node_fs.statSync)(filePath);
-      if (stat.mtimeMs !== entry.mtime) {
-        this.cache.delete(filePath);
-        return void 0;
-      }
-    } catch {
-      this.cache.delete(filePath);
-      return void 0;
-    }
-    return entry.value;
-  }
-  set(filePath, value) {
-    if (this.cache.size >= this.maxSize) {
-      const oldest = this.cache.keys().next().value;
-      if (oldest) this.cache.delete(oldest);
-    }
-    try {
-      const stat = (0, import_node_fs.statSync)(filePath);
-      this.cache.set(filePath, { value, mtime: stat.mtimeMs });
-    } catch {
-    }
-  }
-  clear() {
-    this.cache.clear();
-  }
-  get size() {
-    return this.cache.size;
-  }
-};
-
 // src/usagetap/client.ts
 var DEFAULT_BASE_URL = "https://api.usagetap.com";
 var ACCEPT_HEADER = "application/vnd.usagetap.v1+json";
@@ -1372,73 +1492,13 @@ var PromptOpsKit = class {
    * Load a prompt asset from compiled or source, based on mode.
    */
   async loadPrompt(promptPath) {
-    const mode = this.config.mode;
-    if (mode !== "source-only" && this.config.compiledDir) {
-      const compiledFile = (0, import_node_path3.resolve)(this.config.compiledDir, promptPath + ".json");
-      if ((0, import_node_fs2.existsSync)(compiledFile)) {
-        if (mode === "auto") {
-          const sourceFile = (0, import_node_path3.resolve)(this.config.sourceDir, promptPath + ".md");
-          if ((0, import_node_fs2.existsSync)(sourceFile)) {
-            const compiledMtime = (0, import_node_fs2.statSync)(compiledFile).mtimeMs;
-            const sourceMtime = (0, import_node_fs2.statSync)(sourceFile).mtimeMs;
-            if (sourceMtime > compiledMtime) {
-              console.warn(
-                `[promptopskit] Warning: compiled artifact for "${promptPath}" is older than source .md file.
-               Run "promptopskit compile" or switch to source-only mode.`
-              );
-            }
-          }
-        }
-        const content = await (0, import_promises3.readFile)(compiledFile, "utf-8");
-        return JSON.parse(content);
-      }
-      if (mode === "compiled-only") {
-        throw new Error(
-          `Compiled artifact not found: ${compiledFile}
-Run "promptopskit compile" to generate it.`
-        );
-      }
-    }
-    if (mode !== "compiled-only") {
-      const sourceFile = (0, import_node_path3.resolve)(this.config.sourceDir, promptPath + ".md");
-      if (this.config.cache) {
-        const cached = this.promptCache.get(sourceFile);
-        if (cached) return cached;
-      }
-      if (!(0, import_node_fs2.existsSync)(sourceFile)) {
-        const paths = [sourceFile];
-        if (this.config.compiledDir) {
-          paths.unshift((0, import_node_path3.resolve)(this.config.compiledDir, promptPath + ".json"));
-        }
-        throw new Error(
-          `Prompt not found: "${promptPath}"
-Searched:
-${paths.map((p) => `  - ${p}`).join("\n")}`
-        );
-      }
-      const { asset } = await loadPromptFile(sourceFile, { defaultsRoot: this.config.sourceDir });
-      if (this.config.cache) {
-        this.promptCache.set(sourceFile, asset);
-      }
-      return asset;
-    }
-    throw new Error(`Prompt not found: "${promptPath}"`);
+    return loadPromptAsset(promptPath, this.config, this.promptCache);
   }
   /**
    * Resolve a prompt: load, resolve includes, apply overrides.
    */
   async resolvePrompt(promptPath, options = {}) {
-    let asset = await this.loadPrompt(promptPath);
-    const sourceFile = (0, import_node_path3.resolve)(this.config.sourceDir, promptPath + ".md");
-    if (asset.includes && asset.includes.length > 0 && (0, import_node_fs2.existsSync)(sourceFile)) {
-      asset = await resolveIncludes(asset, sourceFile);
-    }
-    asset = applyOverrides(asset, {
-      environment: options.environment,
-      tier: options.tier,
-      runtime: options.runtime
-    });
-    return asset;
+    return resolvePromptAsset(promptPath, this.config, options, this.promptCache);
   }
   /**
    * Render a prompt for a specific provider.
@@ -1446,13 +1506,11 @@ ${paths.map((p) => `  - ${p}`).join("\n")}`
   async renderPrompt(options) {
     let resolved;
     if (options.source) {
-      const { asset } = parsePrompt(options.source);
-      const overridden = applyOverrides(asset, {
+      resolved = resolveInlinePromptSource(options.source, {
         environment: options.environment,
         tier: options.tier,
         runtime: options.runtime
       });
-      resolved = overridden;
     } else if (options.path) {
       resolved = await this.resolvePrompt(options.path, {
         environment: options.environment,
@@ -1496,7 +1554,8 @@ ${paths.map((p) => `  - ${p}`).join("\n")}`
    */
   async validatePrompt(promptPath) {
     const asset = await this.loadPrompt(promptPath);
-    return validateAsset(asset, void 0, promptPath);
+    const sourceFile = (0, import_node_path4.resolve)(this.config.sourceDir, promptPath + ".md");
+    return validateAssetWithIncludes(asset, sourceFile);
   }
   /**
    * Clear the internal cache.