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

package/index.mjs

@@ -2159,29 +2159,19 @@ var BaseSamplingExecutor = class {
             }
           });
           const action = parsedData["action"];
-          const actionStr = action && typeof action === "string" ? String(action) : "unknown_action";
-          const spanName = `mcpc.sampling_iteration.${actionStr}`;
-          iterationSpan = this.tracingEnabled ? startSpan(spanName, {
-            iteration: this.currentIteration + 1,
-            agent: this.name,
-            action: actionStr,
-            systemPrompt: systemPrompt(),
-            maxTokens: String(Number.MAX_SAFE_INTEGER),
-            maxIterations: this.maxIterations,
-            messages: JSON.stringify(this.conversationHistory)
-          }, loopSpan ?? void 0) : null;
-          if (!action || typeof parsedData["decision"] !== "string") {
+          const decision = parsedData["decision"];
+          if (typeof decision !== "string") {
             this.conversationHistory.push({
               role: "user",
               content: {
                 type: "text",
-                text: 'Required fields missing. During execution provide: {"action":"<tool>","decision":"proceed|retry","<tool>":{}}. When complete provide: {"decision":"complete"}'
+                text: 'Missing required field "decision". Provide: {"action":"<tool>","decision":"proceed|retry","<tool>":{}} or {"decision":"complete"}'
               }
             });
             if (iterationSpan) endSpan(iterationSpan);
             continue;
           }
-          if (parsedData["decision"] === "complete" && action) {
+          if (decision === "complete" && action) {
             this.conversationHistory.push({
               role: "user",
               content: {
@@ -2192,6 +2182,28 @@ var BaseSamplingExecutor = class {
             if (iterationSpan) endSpan(iterationSpan);
             continue;
           }
+          if (decision !== "complete" && !action) {
+            this.conversationHistory.push({
+              role: "user",
+              content: {
+                type: "text",
+                text: 'Missing required field "action". When executing, provide: {"action":"<tool>","decision":"proceed|retry","<tool>":{}}'
+              }
+            });
+            if (iterationSpan) endSpan(iterationSpan);
+            continue;
+          }
+          const actionStr = decision === "complete" ? "completion" : action && typeof action === "string" ? String(action) : "unknown_action";
+          const spanName = `mcpc.sampling_iteration.${actionStr}`;
+          iterationSpan = this.tracingEnabled ? startSpan(spanName, {
+            iteration: this.currentIteration + 1,
+            agent: this.name,
+            action: actionStr,
+            systemPrompt: systemPrompt(),
+            maxTokens: String(Number.MAX_SAFE_INTEGER),
+            maxIterations: this.maxIterations,
+            messages: JSON.stringify(this.conversationHistory)
+          }, loopSpan ?? void 0) : null;
           const result = await this.processAction(parsedData, schema, state, iterationSpan);
           this.logIterationProgress(parsedData, result, model, stopReason, role);
           if (iterationSpan) {
@@ -2207,6 +2219,7 @@ var BaseSamplingExecutor = class {
               maxIterations: this.maxIterations,
               parsed: rawJson,
               action: typeof action === "string" ? action : String(action),
+              decision: typeof decision === "string" ? decision : String(decision),
               samplingResponse: responseContent,
               toolResult: JSON.stringify(result),
               model,
@@ -2472,19 +2485,6 @@ 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);
     }
@@ -3104,19 +3104,6 @@ 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.7-beta.2",
+  "version": "0.2.8",
   "homepage": "https://jsr.io/@mcpc/core",
   "type": "module",
   "dependencies": {