Merge pull request #104 from zevorn/claw/skill-dispatch-fix

claw: fix skill dispatch and rename /skill to /skills

Author: zevorn

claw/shell/shell_commands.c

@@ -285,7 +285,7 @@ static void cmd_memories(int argc, char **argv)
 #ifdef CONFIG_RTCLAW_SKILL_ENABLE
 #define SKILL_REPLY_SIZE 2048
 
-static void cmd_skill(int argc, char **argv)
+static void cmd_skills(int argc, char **argv)
 {
     if (argc < 2) {
         char buf[512];
@@ -438,7 +438,7 @@ const shell_cmd_t shell_common_commands[] = {
     SHELL_CMD("/forget",        cmd_forget,        "Delete a long-term memory"),
     SHELL_CMD("/memories",      cmd_memories,      "List long-term memories"),
 #ifdef CONFIG_RTCLAW_SKILL_ENABLE
-    SHELL_CMD("/skill",         cmd_skill,         "List or execute a skill"),
+    SHELL_CMD("/skills",        cmd_skills,        "List or execute a skill"),
 #endif
 #ifdef CONFIG_RTCLAW_SCHED_ENABLE
     SHELL_CMD("/task",          cmd_task,           "Tasks [rm <name>]"),

platform/common/espressif/esp_shell.c

@@ -499,17 +499,24 @@ static void dispatch_command(char *line)
 #ifdef CONFIG_RTCLAW_SKILL_ENABLE
     /* Try dynamic skill as last resort */
     {
-        char *skill_reply = claw_malloc(SKILL_REPLY_SIZE);
-        if (skill_reply && ai_skill_try_command(argv[0], argc, argv,
-                                                skill_reply,
-                                                SKILL_REPLY_SIZE)
-                == CLAW_OK) {
-            printf("\n" CLR_GREEN "rt-claw> " CLR_RESET "%s\n",
-                   skill_reply);
-            claw_free(skill_reply);
+        const char *sname = argv[0];
+        if (sname[0] == '/') {
+            sname++;
+        }
+        if (ai_skill_find(sname)) {
+            char *skill_reply = claw_malloc(SKILL_REPLY_SIZE);
+            if (skill_reply) {
+                if (ai_skill_try_command(argv[0], argc, argv,
+                                         skill_reply,
+                                         SKILL_REPLY_SIZE)
+                        == CLAW_OK) {
+                    printf("\n" CLR_GREEN "rt-claw> " CLR_RESET
+                           "%s\n", skill_reply);
+                }
+                claw_free(skill_reply);
+            }
             return;
         }
-        claw_free(skill_reply);
     }
 #endif
 

platform/linux/shell.c

@@ -428,17 +428,24 @@ static void dispatch_command(char *line)
 
 #ifdef CONFIG_RTCLAW_SKILL_ENABLE
     {
-        char *skill_reply = claw_malloc(SKILL_REPLY_SIZE);
-        if (skill_reply &&
-            ai_skill_try_command(argv[0], argc, argv,
-                                skill_reply,
-                                SKILL_REPLY_SIZE) == CLAW_OK) {
-            printf("\n" CLR_GREEN "rt-claw> " CLR_RESET
-                   "%s\n", skill_reply);
-            claw_free(skill_reply);
+        const char *sname = argv[0];
+        if (sname[0] == '/') {
+            sname++;
+        }
+        if (ai_skill_find(sname)) {
+            char *skill_reply = claw_malloc(SKILL_REPLY_SIZE);
+            if (skill_reply) {
+                if (ai_skill_try_command(argv[0], argc, argv,
+                                         skill_reply,
+                                         SKILL_REPLY_SIZE)
+                        == CLAW_OK) {
+                    printf("\n" CLR_GREEN "rt-claw> " CLR_RESET
+                           "%s\n", skill_reply);
+                }
+                claw_free(skill_reply);
+            }
             return;
         }
-        claw_free(skill_reply);
     }
 #endif
 

platform/zynq-a9/shell.c

@@ -473,19 +473,25 @@ static void dispatch_command(char *line)
     }
 
 #ifdef CONFIG_RTCLAW_SKILL_ENABLE
-    /* Try dynamic skill as last resort */
     {
-        char *skill_reply = claw_malloc(SKILL_REPLY_SIZE);
-        if (skill_reply && ai_skill_try_command(argv[0], argc, argv,
-                                                skill_reply,
-                                                SKILL_REPLY_SIZE)
-                == CLAW_OK) {
-            printf("\n" CLR_GREEN "rt-claw> " CLR_RESET "%s\n",
-                   skill_reply);
-            claw_free(skill_reply);
+        const char *sname = argv[0];
+        if (sname[0] == '/') {
+            sname++;
+        }
+        if (ai_skill_find(sname)) {
+            char *skill_reply = claw_malloc(SKILL_REPLY_SIZE);
+            if (skill_reply) {
+                if (ai_skill_try_command(argv[0], argc, argv,
+                                         skill_reply,
+                                         SKILL_REPLY_SIZE)
+                        == CLAW_OK) {
+                    printf("\n" CLR_GREEN "rt-claw> " CLR_RESET
+                           "%s\n", skill_reply);
+                }
+                claw_free(skill_reply);
+            }
             return;
         }
-        claw_free(skill_reply);
     }
 #endif