@mcpc-tech/core 0.2.6 → 0.2.7-beta.2

package/index.mjs

@@ -1059,7 +1059,7 @@ var SystemPrompts = {
 4. **Collect feedback** from each action result
 5. **Decide** next step:
    - **proceed**: More work needed
-   - **complete**: Question answered
+   - **complete**: Question answered (do NOT provide action field)
    - **retry**: Current action failed
 6. **Provide** parameter object matching action name
 7. **Continue** until complete
@@ -1068,9 +1068,16 @@ var SystemPrompts = {
 \`\`\`json
 {
   "action": "tool_name",
-  "decision": "proceed|retry|complete", 
+  "decision": "proceed|retry", 
   "tool_name": { /* tool parameters */ }
 }
+\`\`\`
+
+**When task is complete:**
+\`\`\`json
+{
+  "decision": "complete"
+}
 \`\`\``,
   /**
    * Workflow execution system prompt
@@ -1110,14 +1117,22 @@ var SystemPrompts = {
 - Continue until question answered
 
 ## JSON Response Format
+**During execution:**
 \`\`\`json
 {
   "action": "tool_name",
-  "decision": "proceed|retry|complete",
+  "decision": "proceed|retry",
   "tool_name": { /* tool parameters */ }
 }
 \`\`\`
 
+**When task is complete (do NOT include action):**
+\`\`\`json
+{
+  "decision": "complete"
+}
+\`\`\`
+
 ## Available Tools
 {toolList}`,
   /**
@@ -1152,9 +1167,12 @@ You MUST respond with a JSON object for workflow execution:
 
 **For Step Execution (Subsequent Calls):**
 - action: "{toolName}"
-- decision: "proceed" (advance), "retry" (retry), or "complete" (finish - sampling mode only)
+- decision: "proceed" (advance), "retry" (retry)
 - [step parameters]: Tool-specific parameters you autonomously determine for current step
 
+**When Workflow is Complete (do NOT include action):**
+- decision: "complete"
+
 **\u{1F3AF} AGENTIC WORKFLOW CONSTRAINTS:**
 - Response must be pure JSON demonstrating autonomous decision-making within workflow structure
 - Invalid JSON indicates failure in agentic workflow reasoning
@@ -1497,13 +1515,13 @@ var AgenticExecutor = class {
       this.tracingEnabled = false;
     }
   }
-  async execute(args, schema) {
+  async execute(args, schema, parentSpan) {
     const executeSpan = this.tracingEnabled ? startSpan("mcpc.agentic_execute", {
       agent: this.name,
       action: String(args[this.ACTION_KEY] ?? "unknown"),
       nextAction: String(args[this.NEXT_ACTION_KEY] ?? "none"),
       args: JSON.stringify(args)
-    }) : null;
+    }, parentSpan ?? void 0) : null;
     try {
       const validationResult = this.validate(args, schema);
       if (!validationResult.valid) {
@@ -2097,7 +2115,7 @@ var BaseSamplingExecutor = class {
         role: "user",
         content: {
           type: "text",
-          text: 'Return ONE AND ONLY ONE raw JSON object (no code fences, explanations, or multiple objects). The JSON MUST include action and decision. Example: {"action":"<tool>","decision":"proceed|complete","<tool>":{}}'
+          text: 'Return ONE AND ONLY ONE raw JSON object (no code fences, explanations, or multiple objects). During execution provide: {"action":"<tool>","decision":"proceed|retry","<tool>":{}}. When complete provide: {"decision":"complete"}'
         }
       }
     ];
@@ -2157,13 +2175,24 @@ var BaseSamplingExecutor = class {
               role: "user",
               content: {
                 type: "text",
-                text: 'Required fields missing: action or decision. Return ONLY raw JSON, no code fences or explanations. Example: {"action":"<tool>","decision":"proceed|complete","<tool>":{}}'
+                text: 'Required fields missing. During execution provide: {"action":"<tool>","decision":"proceed|retry","<tool>":{}}. When complete provide: {"decision":"complete"}'
+              }
+            });
+            if (iterationSpan) endSpan(iterationSpan);
+            continue;
+          }
+          if (parsedData["decision"] === "complete" && action) {
+            this.conversationHistory.push({
+              role: "user",
+              content: {
+                type: "text",
+                text: 'Invalid: Cannot have both "decision":"complete" and "action" field. When complete, only provide {"decision":"complete"}.'
               }
             });
             if (iterationSpan) endSpan(iterationSpan);
             continue;
           }
-          const result = await this.processAction(parsedData, schema, state, loopSpan);
+          const result = await this.processAction(parsedData, schema, state, iterationSpan);
           this.logIterationProgress(parsedData, result, model, stopReason, role);
           if (iterationSpan) {
             let rawJson = "{}";
@@ -2443,12 +2472,25 @@ var SamplingExecutor = class extends BaseSamplingExecutor {
   }
   async processAction(parsedData, schema, _state, parentSpan) {
     const toolCallData = parsedData;
+    const isComplete = toolCallData.decision === "complete";
+    const actionName = toolCallData.action;
+    if (isComplete && actionName) {
+      return {
+        content: [
+          {
+            type: "text",
+            text: 'Invalid: Cannot have both "decision":"complete" and "action" field. When complete, only provide {"decision":"complete"}. When executing, provide {"action":"<tool>","decision":"proceed|retry","<tool>":{}}.'
+          }
+        ],
+        isError: true
+      };
+    }
     if (toolCallData.decision === "complete") {
       return await this.createCompletionResult("Task completed", parentSpan);
     }
     try {
       const { action: _action, decision: _decision, ..._toolArgs } = toolCallData;
-      const toolResult = await this.agenticExecutor.execute(toolCallData, schema);
+      const toolResult = await this.agenticExecutor.execute(toolCallData, schema, parentSpan);
       const resultText = toolResult.content?.filter((content) => content.type === "text")?.map((content) => content.text)?.join("\n") || "No result";
       this.conversationHistory.push({
         role: "assistant",
@@ -2490,8 +2532,7 @@ ${JSON.stringify(context2, null, 2)}`;
 ## Current Task
 You will now use agentic sampling to complete the following task: "${userRequest}"${contextInfo}
 
-When you need to use a tool, specify the tool name in 'action' and provide tool-specific parameters as additional properties.
-When the task is complete, use "action": "complete".`;
+When you need to use a tool, specify the tool name in 'action' and provide tool-specific parameters as additional properties.`;
     return this.injectJsonInstruction({
       prompt: basePrompt + taskPrompt,
       schema: agenticSchema
@@ -3063,6 +3104,19 @@ var WorkflowSamplingExecutor = class extends BaseSamplingExecutor {
       throw new Error("WorkflowState is required for workflow");
     }
     const toolCallData = parsedData;
+    const isComplete = toolCallData.decision === "complete";
+    const actionName = toolCallData.action;
+    if (isComplete && actionName) {
+      return {
+        content: [
+          {
+            type: "text",
+            text: 'Invalid: Cannot have both "decision":"complete" and "action" field. When complete, only provide {"decision":"complete"}. When executing, provide {"action":"<tool>","decision":"proceed|retry","<tool>":{}}.'
+          }
+        ],
+        isError: true
+      };
+    }
     if (toolCallData.decision === "complete") {
       return await this.createCompletionResult("Task completed", parentSpan);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mcpc-tech/core",
-  "version": "0.2.6",
+  "version": "0.2.7-beta.2",
   "homepage": "https://jsr.io/@mcpc/core",
   "type": "module",
   "dependencies": {