@mcpc-tech/cli 0.1.6 → 0.1.8-beta.1

package/bin/mcpc.mjs

@@ -140,16 +140,8 @@ var init_logger = __esm({
       }
       logToConsole(level, data) {
         const message = typeof data === "string" ? data : JSON.stringify(data);
-        const prefix = `[${this.loggerName}]`;
-        if (level === "debug") {
-          console.debug(prefix, message);
-        } else if (level === "info" || level === "notice") {
-          console.info(prefix, message);
-        } else if (level === "warning") {
-          console.warn(prefix, message);
-        } else {
-          console.error(prefix, message);
-        }
+        const prefix = `[${this.loggerName}:${level}]`;
+        console.error(prefix, message);
       }
       debug(data) {
         return this.log("debug", data);
@@ -714,9 +706,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();
 }
@@ -1452,13 +1477,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) {
@@ -2052,7 +2077,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>":{}}'
         }
       }
     ];
@@ -2088,15 +2113,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}`;
@@ -2120,7 +2143,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 = "{}";
@@ -2174,23 +2197,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.`
       }
     });
   }
@@ -2328,11 +2343,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,
@@ -2408,12 +2423,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",
@@ -2453,10 +2477,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
@@ -3028,6 +3052,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/cli",
-  "version": "0.1.6",
+  "version": "0.1.8-beta.1",
   "homepage": "https://jsr.io/@mcpc/cli",
   "type": "module",
   "dependencies": {

package/types/src/app.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app.d.ts","sources":["../../src/app.ts"],"names":[],"mappings":"AAAA,SAAS,WAAW,4BAAwC;AAI5D,cAAc,mBAAmB,0BAAmD;AACpF,cAAc,UAAU,6BAA6B;AAErD,OAAO,cAAM,eACX,SAAS,eACR,QAAQ,qBA8BT;AAEF,OAAO,cAAM,iBAAgB,YAO3B"}
+{"version":3,"file":"app.d.ts","sources":["../../src/app.ts"],"names":[],"mappings":"AAAA,SAAS,WAAW,4BAAwC;AAI5D,cAAc,mBAAmB,0BAA0D;AAC3F,cAAc,UAAU,6BAA6B;AAErD,OAAO,cAAM,eACX,SAAS,eACR,QAAQ,qBA8BT;AAEF,OAAO,cAAM,iBAAgB,YAO3B"}

package/types/src/config/loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loader.d.ts","sources":["../../../src/config/loader.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2CC,GAED,cAAc,iBAAiB,0BAAgC;AAK/D,iBAAiB;EACf;;GAEC,GACD,OAAO,MAAM;EACb;;GAEC,GACD,UAAU,MAAM;EAChB;;GAEC,GACD;IACE,QAAQ,OAAO,MAAM,EAAE,OAAO;IAC9B,WAAW,OAAO,MAAM,EAAE,OAAO;;EAEnC;;GAEC,GACD,QAAQ;;AAwHV;;;CAGC,GACD,OAAO,iBAAe,cAAc,QAAQ,aAAa,IAAI;AAoK7D;;CAEC,GACD,OAAO,iBAAS,eAAe,QAAQ,UAAU,GAAG,IAAI"}
+{"version":3,"file":"loader.d.ts","sources":["../../../src/config/loader.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2CC,GAED,cAAc,iBAAiB,0BAAuC;AAKtE,iBAAiB;EACf;;GAEC,GACD,OAAO,MAAM;EACb;;GAEC,GACD,UAAU,MAAM;EAChB;;GAEC,GACD;IACE,QAAQ,OAAO,MAAM,EAAE,OAAO;IAC9B,WAAW,OAAO,MAAM,EAAE,OAAO;;EAEnC;;GAEC,GACD,QAAQ;;AAwHV;;;CAGC,GACD,OAAO,iBAAe,cAAc,QAAQ,aAAa,IAAI;AAoK7D;;CAEC,GACD,OAAO,iBAAS,eAAe,QAAQ,UAAU,GAAG,IAAI"}