@siftd/connect-agent 0.2.53 → 0.2.54

package/dist/orchestrator.js

@@ -734,8 +734,8 @@ export class MasterOrchestrator {
     }
     hasCalendarMutation(message) {
         const lower = this.stripTodoSnapshot(message).toLowerCase();
-        const target = /(^|\s)\/cal\b|\/calendar\b|\bcalendar\b|\bcal\b/.test(lower);
-        const action = /\b(add|create|schedule|book|move|reschedule|update|change|cancel|delete|remove)\b/.test(lower);
+        const target = /(^|\s)\/cal\b|\/calendar\b|\bcalendar\b|\bcal\b|\bschedule\b|\bagenda\b/.test(lower);
+        const action = /\b(add|create|schedule|book|move|reschedule|update|change|cancel|delete|remove|set|put|place|remind)\b/.test(lower);
         const query = /\b(what|show|list|open|view|see)\b/.test(lower);
         return target && action && !query;
     }
@@ -1422,9 +1422,9 @@ ${hubContextStr}
         const toolsBase = this.getToolDefinitions();
         const last = messages[messages.length - 1];
         const lastContent = last && last.role === 'user' && typeof last.content === 'string' ? last.content : '';
-        const restrictWorkers = lastContent
-            ? (this.hasTodoMutation(lastContent) || this.hasCalendarMutation(lastContent))
-            : false;
+        const requiredTodo = lastContent ? this.hasTodoMutation(lastContent) : false;
+        const requiredCal = lastContent ? this.hasCalendarMutation(lastContent) : false;
+        const restrictWorkers = requiredTodo || requiredCal;
         const wantsTodoOrCal = restrictWorkers;
         const todoCalTools = new Set(['calendar_upsert_events', 'todo_upsert_items']);
         const blockedTools = new Set([
@@ -1444,6 +1444,7 @@ ${hubContextStr}
         const requestTimeoutMs = 60000;
         const forcedToolChoice = this.getToolChoice(currentMessages);
         let retriedForcedTool = false;
+        let retriedTodoCal = false;
         while (iterations < maxIterations) {
             iterations++;
             const toolChoice = forcedToolChoice ?? this.getToolChoice(currentMessages);
@@ -1492,13 +1493,44 @@ ${hubContextStr}
                     ];
                     continue;
                 }
+                if (wantsTodoOrCal && !retriedTodoCal && (requiredTodo || requiredCal)) {
+                    retriedTodoCal = true;
+                    const required = [
+                        requiredTodo ? 'todo_upsert_items' : null,
+                        requiredCal ? 'calendar_upsert_events' : null
+                    ].filter(Boolean).join(' and ');
+                    const followup = `You must call ${required} now. Do not spawn workers or call any other tools.`;
+                    currentMessages = [
+                        ...currentMessages,
+                        { role: 'assistant', content: response.content },
+                        { role: 'user', content: followup }
+                    ];
+                    continue;
+                }
                 return this.extractText(response.content);
             }
             const toolUseBlocks = response.content.filter((block) => block.type === 'tool_use');
             const toolNames = toolUseBlocks.map((block) => block.name);
             // Process tool calls
             const toolResults = await this.processToolCalls(response.content, sendMessage);
-            if (wantsTodoOrCal && (toolNames.includes('todo_upsert_items') || toolNames.includes('calendar_upsert_events'))) {
+            const missingTodo = requiredTodo && !toolNames.includes('todo_upsert_items');
+            const missingCal = requiredCal && !toolNames.includes('calendar_upsert_events');
+            if (wantsTodoOrCal && (missingTodo || missingCal) && !retriedTodoCal) {
+                retriedTodoCal = true;
+                const required = [
+                    missingTodo ? 'todo_upsert_items' : null,
+                    missingCal ? 'calendar_upsert_events' : null
+                ].filter(Boolean).join(' and ');
+                const followup = `You must call ${required} now. Do not repeat tools already called. Do not spawn workers.`;
+                currentMessages = [
+                    ...currentMessages,
+                    { role: 'assistant', content: response.content },
+                    { role: 'user', content: toolResults },
+                    { role: 'user', content: followup }
+                ];
+                continue;
+            }
+            if (wantsTodoOrCal && !missingTodo && !missingCal) {
                 const updates = [];
                 if (toolNames.includes('todo_upsert_items'))
                     updates.push('Updated /todo.');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@siftd/connect-agent",
-  "version": "0.2.53",
+  "version": "0.2.54",
   "description": "Master orchestrator agent - control Claude Code remotely via web",
   "type": "module",
   "main": "dist/index.js",