@mcpc-tech/core 0.2.5 → 0.2.7-beta.1

package/index.mjs

@@ -685,9 +685,42 @@ function stripMarkdownAndText(text) {
   text = text.replace(/^```(?:json)?\s*\n?/i, "");
   text = text.replace(/\n?```\s*$/, "");
   text = text.replace(/^(?:here is|here's|response|result|output|json):\s*/i, "");
-  const jsonMatch = text.match(/(\{[\s\S]*\}|\[[\s\S]*\])/);
-  if (jsonMatch) {
-    text = jsonMatch[1];
+  const firstJsonIndex = text.search(/[\{\[]/);
+  if (firstJsonIndex >= 0) {
+    text = text.slice(firstJsonIndex);
+    let depth = 0;
+    let inString = false;
+    let escapeNext = false;
+    const startChar = text[0];
+    const endChar = startChar === "{" ? "}" : "]";
+    for (let i = 0; i < text.length; i++) {
+      const char = text[i];
+      if (escapeNext) {
+        escapeNext = false;
+        continue;
+      }
+      if (char === "\\") {
+        escapeNext = true;
+        continue;
+      }
+      if (char === '"' && !inString) {
+        inString = true;
+        continue;
+      }
+      if (char === '"' && inString) {
+        inString = false;
+        continue;
+      }
+      if (inString) continue;
+      if (char === startChar) {
+        depth++;
+      } else if (char === endChar) {
+        depth--;
+        if (depth === 0) {
+          return text.slice(0, i + 1);
+        }
+      }
+    }
   }
   return text.trim();
 }
@@ -1464,13 +1497,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) {
@@ -2064,7 +2097,7 @@ var BaseSamplingExecutor = class {
         role: "user",
         content: {
           type: "text",
-          text: 'Return ONLY raw JSON (no code fences or explanations). 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). The JSON MUST include action and decision. Example: {"action":"<tool>","decision":"proceed|complete","<tool>":{}}'
         }
       }
     ];
@@ -2100,15 +2133,13 @@ var BaseSamplingExecutor = class {
             if (iterationSpan) endSpan(iterationSpan);
             continue;
           }
-          if (parsedData) {
-            this.conversationHistory.push({
-              role: "assistant",
-              content: {
-                type: "text",
-                text: JSON.stringify(parsedData, null, 2)
-              }
-            });
-          }
+          this.conversationHistory.push({
+            role: "assistant",
+            content: {
+              type: "text",
+              text: JSON.stringify(parsedData, null, 2)
+            }
+          });
           const action = parsedData["action"];
           const actionStr = action && typeof action === "string" ? String(action) : "unknown_action";
           const spanName = `mcpc.sampling_iteration.${actionStr}`;
@@ -2132,7 +2163,7 @@ var BaseSamplingExecutor = class {
             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 = "{}";
@@ -2186,23 +2217,15 @@ var BaseSamplingExecutor = class {
       return await this.createExecutionError(error, loopSpan);
     }
   }
-  addParsingErrorToHistory(responseText, parseError) {
-    this.conversationHistory.push({
-      role: "assistant",
-      content: {
-        type: "text",
-        text: `JSON parsing failed. Response was: ${responseText}`
-      }
-    });
+  addParsingErrorToHistory(_responseText, parseError) {
+    const errorMsg = parseError instanceof Error ? parseError.message : String(parseError);
     this.conversationHistory.push({
       role: "user",
       content: {
         type: "text",
-        text: CompiledPrompts.errorResponse({
-          errorMessage: `JSON parsing failed: ${parseError instanceof Error ? parseError.message : String(parseError)}
+        text: `Invalid JSON: ${errorMsg}
 
-Please respond with valid JSON.`
-        })
+Respond with valid JSON.`
       }
     });
   }
@@ -2340,11 +2363,11 @@ ${msg.content.text}`;
     });
   }
   injectJsonInstruction({ prompt, schema, schemaPrefix = "JSON schema:", schemaSuffix = `STRICT REQUIREMENTS:
-1. Return ONLY raw JSON that passes JSON.parse() - no markdown, code blocks, explanatory text, or extra characters
+1. Return ONE AND ONLY ONE raw JSON object that passes JSON.parse() - no markdown, code blocks, explanatory text, or multiple JSON objects
 2. Include ALL required fields with correct data types and satisfy ALL schema constraints (anyOf, oneOf, allOf, not, enum, pattern, min/max, conditionals)
-3. Your response must be the JSON object itself, nothing else
+3. Your response must be a single JSON object, nothing else
 
-INVALID: \`\`\`json{"key":"value"}\`\`\` or "Here is: {"key":"value"}"
+INVALID: \`\`\`json{"key":"value"}\`\`\` or "Here is: {"key":"value"}" or {"key":"value"}{"key":"value"}
 VALID: {"key":"value"}` }) {
     return [
       prompt != null && prompt.length > 0 ? prompt : void 0,
@@ -2420,12 +2443,21 @@ 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 && actionName !== "complete") {
+      this.logger.debug({
+        message: "Decision is 'complete' with action present, treating as 'proceed'",
+        action: actionName
+      });
+      toolCallData.decision = "proceed";
+    }
     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",
@@ -2465,10 +2497,10 @@ ${JSON.stringify(context2, null, 2)}`;
     const taskPrompt = `
 
 ## Current Task
-I will now use agentic sampling to complete the following task: "${userRequest}"${contextInfo}
+You will now use agentic sampling to complete the following task: "${userRequest}"${contextInfo}
 
-When I need to use a tool, I should specify the tool name in 'action' and provide tool-specific parameters as additional properties.
-When the task is complete, I should use "action": "complete".`;
+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".`;
     return this.injectJsonInstruction({
       prompt: basePrompt + taskPrompt,
       schema: agenticSchema
@@ -3040,6 +3072,15 @@ 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 && actionName !== "complete") {
+      this.logger.debug({
+        message: "Decision is 'complete' with action present, treating as 'proceed'",
+        action: actionName
+      });
+      toolCallData.decision = "proceed";
+    }
     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.5",
+  "version": "0.2.7-beta.1",
   "homepage": "https://jsr.io/@mcpc/core",
   "type": "module",
   "dependencies": {