@koi-language/koi 1.0.5 → 1.1.0

package/src/runtime/incremental-json-parser.js

@@ -11,6 +11,8 @@ export class IncrementalJSONParser {
     this.actionsStartIndex = -1; // Position where "actions":[ was found
     this.lastParsedIndex = 0; // Last position we successfully parsed up to
     this.parsedActions = 0; // Count of actions we've parsed
+    this.pendingObjectEnd = -1; // Position where a potential complete object ended (} char)
+    this.pendingObjectStart = -1; // Start position of the pending object
   }
 
   /**
@@ -36,11 +38,6 @@ export class IncrementalJSONParser {
         }
       } else {
         // Haven't found actions array yet, wait for more data
-        if (process.env.KOI_DEBUG_LLM && this.buffer.length > 50) {
-          // Show first 100 chars of buffer to debug what LLM is generating
-          const preview = this.buffer.substring(0, 100).replace(/\n/g, '\\n');
-          console.error(`[IncrementalParser] ⏳ Waiting for "actions" array (buffer: ${this.buffer.length} chars, preview: "${preview}...")`);
-        }
         return actions;
       }
     }
@@ -87,31 +84,44 @@ export class IncrementalJSONParser {
       } else if (char === '}') {
         depth--;
         if (depth === 0 && objectStart !== -1) {
-          // Complete action object found!
-          const actionJSON = this.buffer.substring(objectStart, i + 1);
+          // Potential complete object - save position but wait for delimiter
+          this.pendingObjectEnd = i;
+          this.pendingObjectStart = objectStart;
+          objectStart = -1;
+        }
+      } else if ((char === ',' || char === ']') && depth === 0) {
+        // Delimiter found - if we have a pending object, parse it now
+        if (this.pendingObjectEnd !== -1) {
+          const actionJSON = this.buffer.substring(this.pendingObjectStart, this.pendingObjectEnd + 1);
+
           try {
             const action = JSON.parse(actionJSON);
+
             actions.push(action);
             this.parsedActions++;
-            this.lastParsedIndex = i + 1;
+            this.lastParsedIndex = this.pendingObjectEnd + 1;
 
             if (process.env.KOI_DEBUG_LLM) {
-              console.error(`[IncrementalParser] ✅ Parsed action #${this.parsedActions}: ${action.intent || action.type || 'unknown'}`);
+              console.error(`[IncrementalParser] ✅ Parsed action #${this.parsedActions}: ${action.intent || action.type || 'unknown'}${action.id ? ` (id: ${action.id})` : ''}`);
             }
           } catch (e) {
-            // Failed to parse - might be incomplete, wait for more data
+            // Failed to parse - might be malformed JSON
             if (process.env.KOI_DEBUG_LLM) {
-              console.error(`[IncrementalParser] ⚠️  Failed to parse object at ${objectStart}: ${e.message}`);
+              console.error(`[IncrementalParser] ⚠️  Failed to parse object at ${this.pendingObjectStart}: ${e.message}`);
             }
           }
-          objectStart = -1;
+
+          this.pendingObjectEnd = -1;
+          this.pendingObjectStart = -1;
         }
-      } else if (char === ']' && depth === 0) {
-        // End of actions array
-        if (process.env.KOI_DEBUG_LLM) {
-          console.error(`[IncrementalParser] 🏁 End of actions array reached`);
+
+        // If this is the end of the array, stop parsing
+        if (char === ']') {
+          if (process.env.KOI_DEBUG_LLM) {
+            console.error(`[IncrementalParser] 🏁 End of actions array reached`);
+          }
+          break;
         }
-        break;
       }
     }
 
@@ -136,6 +146,30 @@ export class IncrementalJSONParser {
       actions.push(...objects);
     }
 
+    // If no "actions" array was found, the LLM returned raw JSON
+    // Wrap it in a return action so it can be executed properly
+    if (this.actionsStartIndex === -1 && this.buffer.length > 0) {
+      try {
+        const rawJSON = JSON.parse(this.buffer.trim());
+        // Check if it's not already an action (has actionType or intent)
+        if (!rawJSON.actionType && !rawJSON.actions) {
+          if (process.env.KOI_DEBUG_LLM) {
+            console.error(`[IncrementalParser] ⚠️ No "actions" array found - wrapping raw JSON in return action`);
+          }
+          return [{
+            actionType: 'direct',
+            intent: 'return',
+            data: rawJSON
+          }];
+        }
+      } catch (e) {
+        // Not valid JSON, return whatever objects we found
+        if (process.env.KOI_DEBUG_LLM) {
+          console.error(`[IncrementalParser] ⚠️ Failed to parse raw response as JSON: ${e.message}`);
+        }
+      }
+    }
+
     return actions;
   }
 

package/src/runtime/index.js

@@ -7,6 +7,7 @@ export { MCPClient, mcpClient } from './mcp-client.js';
 export { Planner, PlanningAgent } from './planner.js';
 export { SkillSelector, skillSelector } from './skill-selector.js';
 export { registry, getRegistry } from './registry.js';
+export { mcpRegistry } from './mcp-registry.js';
 
 // Global registry for skill functions (for tool calling)
 export const SkillRegistry = {