poe-code 3.0.159 → 3.0.160

package/dist/index.js

@@ -825,15 +825,25 @@ async function resolve(chain, options) {
     visited: /* @__PURE__ */ new Set([documentLayer.filePath]),
     depth: 1
   }) : void 0;
+  const composedPrompt = composePromptChain(
+    {
+      source: documentLayer.source,
+      data: parsedDocument.data
+    },
+    resolvedBase?.layers ?? []
+  );
   const merged = mergeLayers([
     ...collectDataLayers(chain.slice(0, documentIndex)),
     {
       source: documentLayer.source,
-      data: parsedDocument.data
+      data: withResolvedPrompt(parsedDocument.data, composedPrompt?.prompt)
     },
-    ...resolvedBase?.layers ?? [],
+    ...stripResolvedBasePrompts(resolvedBase?.layers ?? [], composedPrompt?.consumedBaseIndexes ?? /* @__PURE__ */ new Set()),
     ...collectDataLayers(chain.slice(documentIndex + 1))
   ]);
+  if (composedPrompt !== void 0 && merged.sources.prompt === documentLayer.source && composedPrompt.source !== void 0) {
+    merged.sources.prompt = composedPrompt.source;
+  }
   return {
     data: merged.data,
     sources: merged.sources,
@@ -926,6 +936,89 @@ Visited files:
 function collectDataLayers(chain) {
   return chain.filter(isDataLayer);
 }
+function composePromptChain(documentLayer, baseLayers) {
+  const documentPrompt = documentLayer.data.prompt;
+  if (documentPrompt !== void 0 && typeof documentPrompt !== "string") {
+    return void 0;
+  }
+  if (documentPrompt !== void 0) {
+    assertValidYieldCount(documentPrompt);
+  }
+  let prompt = documentPrompt;
+  let source = prompt === void 0 || prompt === "" ? void 0 : documentLayer.source;
+  const consumedBaseIndexes = /* @__PURE__ */ new Set();
+  for (const [index, layer] of baseLayers.entries()) {
+    const candidate = layer.data.prompt;
+    if (candidate === void 0) {
+      continue;
+    }
+    if (typeof candidate !== "string") {
+      break;
+    }
+    assertValidYieldCount(candidate);
+    consumedBaseIndexes.add(index);
+    prompt = composeAdjacentPrompts(prompt, candidate);
+    if (source === void 0 && candidate !== "") {
+      source = layer.source;
+    }
+  }
+  if (prompt !== void 0 && prompt.includes(YIELD_TOKEN)) {
+    throw new Error('Final resolved prompt contains an unresolved "{{yield}}" token.');
+  }
+  if (prompt === void 0) {
+    return void 0;
+  }
+  return {
+    consumedBaseIndexes,
+    prompt,
+    source
+  };
+}
+function composeAdjacentPrompts(high, low) {
+  if (high === void 0 || high === "") {
+    return low.includes(YIELD_TOKEN) ? replaceYield(low, "") : low;
+  }
+  if (high.includes(YIELD_TOKEN)) {
+    return replaceYield(high, low);
+  }
+  if (low.includes(YIELD_TOKEN)) {
+    return replaceYield(low, high);
+  }
+  return high;
+}
+function replaceYield(prompt, replacement) {
+  return prompt.replace(YIELD_TOKEN, replacement);
+}
+function assertValidYieldCount(prompt) {
+  if (countYieldTokens(prompt) > 1) {
+    throw new Error('Prompt composition supports exactly one "{{yield}}" token per prompt.');
+  }
+}
+function countYieldTokens(prompt) {
+  return prompt.split(YIELD_TOKEN).length - 1;
+}
+function withResolvedPrompt(data, prompt) {
+  if (prompt === void 0) {
+    return data;
+  }
+  return {
+    ...data,
+    prompt
+  };
+}
+function stripResolvedBasePrompts(layers, consumedBaseIndexes) {
+  return layers.map((layer, index) => {
+    if (!consumedBaseIndexes.has(index) || typeof layer.data.prompt !== "string") {
+      return layer;
+    }
+    const { prompt: ignoredPrompt, ...data } = layer.data;
+    void ignoredPrompt;
+    return {
+      source: layer.source,
+      data
+    };
+  });
+}
 function getBaseName(filePath) {
   return path4.basename(filePath, path4.extname(filePath));
 }
@@ -944,7 +1037,7 @@ function isDocumentLayer(layer) {
 function isBaseLayer(layer) {
   return "path" in layer;
 }
-var MAX_EXTENDS_DEPTH;
+var MAX_EXTENDS_DEPTH, YIELD_TOKEN;
 var init_resolve = __esm({
   "packages/config-extends/src/resolve.ts"() {
     "use strict";
@@ -952,6 +1045,7 @@ var init_resolve = __esm({
     init_merge();
     init_parse();
     MAX_EXTENDS_DEPTH = 5;
+    YIELD_TOKEN = "{{yield}}";
   }
 });
 
@@ -19017,9 +19111,10 @@ function buildTemplateContext(env) {
   const repo = getOptionalEnvValue(env, "GITHUB_REPOSITORY");
   const issueNumber = getOptionalEnvValue(env, "ISSUE_NUMBER");
   const prNumber = getOptionalEnvValue(env, "PR_NUMBER");
+  const url = buildUrl(repo, issueNumber, prNumber);
   return {
     ...repo === void 0 ? {} : { repo },
-    ...buildUrl(repo, issueNumber, prNumber) === void 0 ? {} : { url: buildUrl(repo, issueNumber, prNumber) },
+    ...url === void 0 ? {} : { url },
     issue: pruneUndefined({
       number: issueNumber,
       title: getOptionalEnvValue(env, "ISSUE_TITLE"),
@@ -19085,12 +19180,7 @@ function buildPerItemTemplateContext(item, sharedContext) {
   };
 }
 function renderPrompt(template, view) {
-  Mustache3.escape = (value) => value;
-  try {
-    return Mustache3.render(template, view);
-  } finally {
-    Mustache3.escape = originalMustacheEscape;
-  }
+  return Mustache3.render(template, view);
 }
 function resolveSourceCommand(source, env) {
   const repo = env.get("GITHUB_REPOSITORY");
@@ -19225,7 +19315,7 @@ async function selectAutomationName(message2, automations) {
   }
   return selected;
 }
-var UPSTREAM_REPO, builtInPromptsDirCandidates, builtInWorkflowTemplatesDirCandidates, originalMustacheEscape, installableAutomations, runCommandDef, listCommand, installCommand, uninstallCommand, requireUserAllowCommand, requireCommentPrefixCommand, prepareCommand, promptPreviewCommand, variablesCommand, ghGroup;
+var UPSTREAM_REPO, builtInPromptsDirCandidates, builtInWorkflowTemplatesDirCandidates, installableAutomations, runCommandDef, listCommand, installCommand, uninstallCommand, requireUserAllowCommand, requireCommentPrefixCommand, prepareCommand, promptPreviewCommand, variablesCommand, ghGroup;
 var init_commands = __esm({
   "packages/github-workflows/src/commands.ts"() {
     "use strict";
@@ -19248,7 +19338,7 @@ var init_commands = __esm({
       fileURLToPath4(new URL("./workflow-templates", import.meta.url)),
       fileURLToPath4(new URL("../src/workflow-templates", import.meta.url))
     ];
-    originalMustacheEscape = Mustache3.escape;
+    Mustache3.escape = (value) => value;
     installableAutomations = [
       "fix-vulnerabilities",
       "github-issue-comment-created",
@@ -33374,7 +33464,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "poe-code",
-      version: "3.0.159",
+      version: "3.0.160",
       description: "CLI tool to configure Poe API for developer workflows.",
       type: "module",
       main: "./dist/index.js",