@bridge_gpt/mcp-server 0.1.13 → 0.1.16

package/build/pipeline-utils.js

@@ -79,6 +79,28 @@ export function validatePipelineSchema(json) {
     return { valid: errors.length === 0, errors };
 }
 // ---------------------------------------------------------------------------
+// Instruction-File Content Helpers
+// ---------------------------------------------------------------------------
+/**
+ * True when markdown contains a terminal ``## Return`` H2 heading — i.e. the
+ * heading appears and no later H2 heading follows. Used by the build-time
+ * bundler and the custom-pipeline loader to enforce the
+ * ``agent_result``-contract for ``agent_task`` instruction files.
+ */
+export function hasTerminalReturnSection(markdown) {
+    if (typeof markdown !== "string" || markdown.length === 0)
+        return false;
+    const h2Pattern = /^##\s+(.+?)\s*$/gm;
+    let match;
+    let lastHeading = null;
+    while ((match = h2Pattern.exec(markdown)) !== null) {
+        lastHeading = match[1].trim();
+    }
+    if (lastHeading === null)
+        return false;
+    return /^return\b/i.test(lastHeading);
+}
+// ---------------------------------------------------------------------------
 // Variable Handling
 // ---------------------------------------------------------------------------
 const variablePattern = () => /\{([a-zA-Z_][a-zA-Z0-9_]*)}/g;
@@ -123,7 +145,7 @@ function substituteInParams(params, variables) {
 // ---------------------------------------------------------------------------
 // Recipe Resolution
 // ---------------------------------------------------------------------------
-export function resolveRecipe(pipeline, instructions, variables, skipSteps) {
+export function resolveRecipe(pipeline, instructions, variables, skipSteps, autoApprove) {
     // Validate required variables are provided
     const declared = pipeline.variables ?? [];
     const missing = declared.filter((v) => !(v in variables));
@@ -140,13 +162,18 @@ export function resolveRecipe(pipeline, instructions, variables, skipSteps) {
         const skipKey = step.type === "mcp_call" ? step.tool : step.description;
         if (skip.has(skipKey))
             continue;
+        const declaredApproval = step.requires_approval ?? false;
+        const effectiveApproval = declaredApproval && !autoApprove;
         const base = {
             step: stepIndex++,
             type: step.type,
-            description: step.description,
+            description: substituteVariables(step.description, variables),
             on_error: step.on_error ?? "halt",
-            requires_approval: step.requires_approval ?? false,
+            requires_approval: effectiveApproval,
         };
+        if (declaredApproval !== effectiveApproval) {
+            base.requires_approval_declared = declaredApproval;
+        }
         if (step.type === "mcp_call") {
             base.tool = step.tool;
             base.params = substituteInParams(step.params, variables);
@@ -168,17 +195,22 @@ export function resolveRecipe(pipeline, instructions, variables, skipSteps) {
         }
         resolvedSteps.push(base);
     }
+    const baseInstructions = "IMPORTANT: Execute every step below in exact sequential order. " +
+        "For mcp_call steps, call the specified tool with the provided params. " +
+        "For agent_task steps, follow the instruction text using any tools it specifies. " +
+        "If requires_approval is true, pause before executing. For agent_task steps, the instruction file's own approval format is authoritative — follow it verbatim and do not substitute your own short confirmation prompt. For mcp_call steps with no instruction file, present the resolved params as bullet points and ask for approval. " +
+        'For on_error "halt", stop the pipeline immediately on failure. ' +
+        'For on_error "warn_and_continue", log a warning and proceed. ' +
+        "Do not skip steps, reorder them, or substitute your own tool calls.";
+    const autoApproveSuffix = autoApprove
+        ? " Auto-approve mode is ACTIVE: every approval gate has been pre-approved by the user via the auto_approve flag — proceed without pausing for confirmation, applying the default branching, file-staging, and recommendation choices documented in each instruction file's auto-approve branch."
+        : "";
     return {
         pipeline: pipeline.name,
         description: pipeline.description ?? "",
         total_steps: resolvedSteps.length,
-        agent_instructions: "IMPORTANT: Execute every step below in exact sequential order. " +
-            "For mcp_call steps, call the specified tool with the provided params. " +
-            "For agent_task steps, follow the instruction text using any tools it specifies. " +
-            "If requires_approval is true, pause before executing. For agent_task steps, the instruction file's own approval format is authoritative — follow it verbatim and do not substitute your own short confirmation prompt. For mcp_call steps with no instruction file, present the resolved params as bullet points and ask for approval. " +
-            'For on_error "halt", stop the pipeline immediately on failure. ' +
-            'For on_error "warn_and_continue", log a warning and proceed. ' +
-            "Do not skip steps, reorder them, or substitute your own tool calls.",
+        agent_instructions: baseInstructions + autoApproveSuffix,
+        auto_approve: !!autoApprove,
         steps: resolvedSteps,
     };
 }
@@ -237,15 +269,21 @@ export async function loadCustomPipelines(pipelinesDir, instructionsDir, bundled
             }
             const pipeline = parsed;
             const key = file.replace(/\.json$/, "");
-            // Validate instruction_file references
+            // Validate instruction_file references and terminal ## Return contract.
             let hasInvalidRef = false;
             for (const step of pipeline.steps) {
                 if (step.type === "agent_task" && step.instruction_file) {
-                    if (!(step.instruction_file in mergedInstructions)) {
+                    const content = mergedInstructions[step.instruction_file];
+                    if (content === undefined) {
                         console.error(`Warning: skipping "${file}" — instruction_file "${step.instruction_file}" not found.`);
                         hasInvalidRef = true;
                         break;
                     }
+                    if (!hasTerminalReturnSection(content)) {
+                        console.error(`Warning: skipping "${file}" — instruction_file "${step.instruction_file}" is missing a terminal "## Return" section (required by BAPI-275 agent_result contract).`);
+                        hasInvalidRef = true;
+                        break;
+                    }
                 }
             }
             if (hasInvalidRef)