@sprucelabs/sprucebot-llm 18.1.5 → 18.1.7

package/build/esm/parsingResponses/ResponseParserV2.js

@@ -187,6 +187,15 @@ export default class ResponseParserV2 {
             let message = response.replace(DONE_TOKEN, '').trim();
             let state = undefined;
             let callbackResults = undefined;
+            const missingParens = message.matchAll(/^@(\w+) \{.*\}/gm);
+            for (const match of missingParens) {
+                const name = match[1];
+                const error = this.renderCallbackResults({
+                    name,
+                    error: `Missing parentheses for @${name}()`,
+                }).trim();
+                callbackResults = `${callbackResults !== null && callbackResults !== void 0 ? callbackResults : ''}\n${error}`.trim();
+            }
             // Enter the pass when any @name( call shape is present (incl. typos)
             // or when a registered callback name appears as a call prefix.
             const hasCallShape = message != null && /^[ \t]*@\w+\(/m.test(message);
@@ -195,7 +204,8 @@ export default class ResponseParserV2 {
             const hasCallbacks = hasCallShape || hasRegisteredName;
             if (hasCallbacks) {
                 const { callbackResults: c, message: m } = yield this.invokeCallbacks(message, callbacks);
-                callbackResults = c;
+                callbackResults =
+                    `${callbackResults !== null && callbackResults !== void 0 ? callbackResults : ''}\n${c !== null && c !== void 0 ? c : ''}`.trim() || undefined;
                 message = m;
             }
             const hasState = response.includes('@updateState');
@@ -234,11 +244,17 @@ export default class ResponseParserV2 {
             let callbackResults = '';
             const spans = extractCallbackSpans(message);
             for (const span of spans) {
-                if (RESERVED_CALLBACK_NAMES.has(span.name)) {
+                const name = span.name;
+                if (name === 'results') {
+                    callbackResults += this.renderCallbackResults({
+                        name,
+                        error: `Agent cannot respond with built-in response callback @results()`,
+                    });
+                    continue;
+                }
+                if (RESERVED_CALLBACK_NAMES.has(name)) {
                     continue;
                 }
-                const name = span.name;
-                // Always strip the call from the user-facing message once recognized.
                 callbackStrippedMessage = stripCallFromMessage(callbackStrippedMessage, span.fullMatch.trim());
                 let options;
                 try {

package/build/parsingResponses/ResponseParserV2.js

@@ -183,6 +183,15 @@ class ResponseParserV2 {
         let message = response.replace(templates_1.DONE_TOKEN, '').trim();
         let state = undefined;
         let callbackResults = undefined;
+        const missingParens = message.matchAll(/^@(\w+) \{.*\}/gm);
+        for (const match of missingParens) {
+            const name = match[1];
+            const error = this.renderCallbackResults({
+                name,
+                error: `Missing parentheses for @${name}()`,
+            }).trim();
+            callbackResults = `${callbackResults ?? ''}\n${error}`.trim();
+        }
         // Enter the pass when any @name( call shape is present (incl. typos)
         // or when a registered callback name appears as a call prefix.
         const hasCallShape = message != null && /^[ \t]*@\w+\(/m.test(message);
@@ -191,7 +200,8 @@ class ResponseParserV2 {
         const hasCallbacks = hasCallShape || hasRegisteredName;
         if (hasCallbacks) {
             const { callbackResults: c, message: m } = await this.invokeCallbacks(message, callbacks);
-            callbackResults = c;
+            callbackResults =
+                `${callbackResults ?? ''}\n${c ?? ''}`.trim() || undefined;
             message = m;
         }
         const hasState = response.includes('@updateState');
@@ -227,11 +237,17 @@ class ResponseParserV2 {
         let callbackResults = '';
         const spans = extractCallbackSpans(message);
         for (const span of spans) {
-            if (RESERVED_CALLBACK_NAMES.has(span.name)) {
+            const name = span.name;
+            if (name === 'results') {
+                callbackResults += this.renderCallbackResults({
+                    name,
+                    error: `Agent cannot respond with built-in response callback @results()`,
+                });
+                continue;
+            }
+            if (RESERVED_CALLBACK_NAMES.has(name)) {
                 continue;
             }
-            const name = span.name;
-            // Always strip the call from the user-facing message once recognized.
             callbackStrippedMessage = stripCallFromMessage(callbackStrippedMessage, span.fullMatch.trim());
             let options;
             try {

package/package.json

@@ -8,7 +8,7 @@
       "eta"
     ]
   },
-  "version": "18.1.5",
+  "version": "18.1.7",
   "files": [
     "build"
   ],