@siact/sime-x-vue 0.0.11 → 0.0.12

package/dist/sime-x-vue.mjs

@@ -1682,8 +1682,43 @@ function useAgentInvoke(options) {
       args: Array.isArray(cmd.args) ? cmd.args : []
     }));
   };
-  const executeHostCommands = async (toolCallId, result) => {
-    const commands = extractExecutableCommands(result);
+  const buildCommandDefinitionMap = (commands) => {
+    return new Map(commands.map((command) => [command.name, command]));
+  };
+  const toExecutableCommand = (toolName, payload, commandDefinitions) => {
+    const commandDefinition = commandDefinitions.get(toolName);
+    if (!commandDefinition) {
+      return null;
+    }
+    const parameters = commandDefinition.parameters || [];
+    if (Array.isArray(payload)) {
+      return {
+        name: toolName,
+        args: payload
+      };
+    }
+    if (!payload || typeof payload !== "object") {
+      return {
+        name: toolName,
+        args: []
+      };
+    }
+    const payloadRecord = payload;
+    return {
+      name: toolName,
+      args: parameters.map((parameter) => payloadRecord[parameter.name])
+    };
+  };
+  const resolveExecutableCommands = (toolName, payload, commandDefinitions) => {
+    const extractedCommands = extractExecutableCommands(payload);
+    if (extractedCommands.length > 0) {
+      return extractedCommands;
+    }
+    const directCommand = toExecutableCommand(toolName, payload, commandDefinitions);
+    return directCommand ? [directCommand] : [];
+  };
+  const executeHostCommands = async (toolCallId, toolName, payload, commandDefinitions) => {
+    const commands = resolveExecutableCommands(toolName, payload, commandDefinitions);
     if (commands.length === 0) return false;
     try {
       executingTools.value = /* @__PURE__ */ new Set([...executingTools.value, toolCallId]);
@@ -1731,6 +1766,7 @@ function useAgentInvoke(options) {
     const processingToolResults = /* @__PURE__ */ new Set();
     abortController = new AbortController();
     const commands = await aiChatbotX.getCommads();
+    const commandDefinitions = buildCommandDefinitionMap(commands);
     conversationHistory.value.length > 0 ? [...conversationHistory.value] : void 0;
     try {
       const response = await fetch(options.endpoint.value, {
@@ -1765,9 +1801,8 @@ function useAgentInvoke(options) {
               state: "result"
             };
             currentToolParts.value = [...currentToolParts.value, toolPart];
-            if (tr.toolName === "executeCommand") {
-              console.log("executeCommand", tr.result);
-              void executeHostCommands(toolPart.toolCallId, tr.result);
+            if (commandDefinitions.has(tr.toolName)) {
+              void executeHostCommands(toolPart.toolCallId, tr.toolName, tr.result, commandDefinitions);
             }
           }
         }
@@ -1784,23 +1819,27 @@ function useAgentInvoke(options) {
           );
           currentToolParts.value = toolParts;
           for (const part of toolParts) {
-            if (part.toolName === "executeCommand" && !processedToolResults.has(part.toolCallId) && !processingToolResults.has(part.toolCallId)) {
+            if (commandDefinitions.has(part.toolName) && !processedToolResults.has(part.toolCallId) && !processingToolResults.has(part.toolCallId)) {
               if (part.type === "tool-call" && part.state === "call" && part.args) {
                 processingToolResults.add(part.toolCallId);
-                void executeHostCommands(part.toolCallId, part.args).then((executed) => {
-                  if (executed) {
-                    processedToolResults.add(part.toolCallId);
+                void executeHostCommands(part.toolCallId, part.toolName, part.args, commandDefinitions).then(
+                  (executed) => {
+                    if (executed) {
+                      processedToolResults.add(part.toolCallId);
+                    }
+                    processingToolResults.delete(part.toolCallId);
                   }
-                  processingToolResults.delete(part.toolCallId);
-                });
+                );
               } else if (part.type === "tool-result" && part.result) {
                 processingToolResults.add(part.toolCallId);
-                void executeHostCommands(part.toolCallId, part.result).then((executed) => {
-                  if (executed) {
-                    processedToolResults.add(part.toolCallId);
+                void executeHostCommands(part.toolCallId, part.toolName, part.result, commandDefinitions).then(
+                  (executed) => {
+                    if (executed) {
+                      processedToolResults.add(part.toolCallId);
+                    }
+                    processingToolResults.delete(part.toolCallId);
                   }
-                  processingToolResults.delete(part.toolCallId);
-                });
+                );
               }
             }
           }