shark-ai 0.4.24 → 0.4.26

package/dist/bin/shark.js

@@ -293,6 +293,7 @@ var AgentActionSchema = z2.object({
     "manage_subagents",
     "complete_task",
     "wait",
+    "notify_user",
     "ast_list_structure",
     "ast_get_method",
     "ast_add_method",
@@ -523,7 +524,9 @@ function parseAgentResponse(rawResponse) {
       "invoke_subagent",
       "send_message",
       "manage_subagents",
-      "complete_task"
+      "complete_task",
+      "wait",
+      "notify_user"
     ];
     if (validTypes.includes(parsedObj.type)) {
       normalizedAction = parsedObj;
@@ -808,12 +811,14 @@ Seu objetivo \xE9 ajudar o usu\xE1rio a analisar, especificar e implementar c\xF
 \u{1F6A8} REGRAS CR\xCDTICAS DE RESPOSTA (JSON):
 - Voc\xEA DEVE responder APENAS com um objeto JSON v\xE1lido.
 - N\xE3o inclua nenhuma introdu\xE7\xE3o, explica\xE7\xE3o ou bloco de markdown fora do JSON.
-- Se precisar falar com o usu\xE1rio, use a action com type 'talk_with_user'.
+- Se precisar falar com o usu\xE1rio e aguardar uma resposta dele, use a action com type 'talk_with_user'.
+- Se voc\xEA quiser apenas enviar uma mensagem informativa ou relat\xF3rio detalhado para o usu\xE1rio sem bloquear ou parar a execu\xE7\xE3o para receber resposta, use a action 'notify_user'.
+
 
 SUA SA\xCDDA DEVE SEGUIR EXATAMENTE ESTE FORMATO JSON:
 {
   "action": {
-    "type": "create_file" | "modify_file" | "read_file" | "list_files" | "search_file" | "search_code" | "delete_file" | "run_command" | "talk_with_user" | "use_mcp_tool" | "activate_skill" | "define_subagent" | "invoke_subagent" | "send_message" | "manage_subagents" | "complete_task" | "wait",
+    "type": "create_file" | "modify_file" | "read_file" | "list_files" | "search_file" | "search_code" | "delete_file" | "run_command" | "talk_with_user" | "use_mcp_tool" | "activate_skill" | "define_subagent" | "invoke_subagent" | "send_message" | "manage_subagents" | "complete_task" | "wait" | "notify_user",
     "path": "caminho/relativo/do/arquivo (opcional)",
     "content": "conte\xFAdo do arquivo ou mensagem para o usu\xE1rio (opcional)",
     "start_anchor": "\xE2ncora de in\xEDcio de substitui\xE7\xE3o (modify_file apenas)",
@@ -871,7 +876,8 @@ var AGENT_RESPONSE_JSON_SCHEMA = {
             "send_message",
             "manage_subagents",
             "complete_task",
-            "wait"
+            "wait",
+            "notify_user"
           ]
         },
         "path": { "type": ["string", "null"] },
@@ -3605,6 +3611,7 @@ import { fileURLToPath as fileURLToPath2 } from "url";
 var SubagentManager = class {
   subagents = /* @__PURE__ */ new Map();
   customTypes = /* @__PURE__ */ new Map();
+  messageSeq = 0;
   registerSubagent(id, type, role, parentId) {
     this.subagents.set(id, { id, type, role, status: "running", parentId });
   }
@@ -3639,7 +3646,8 @@ var SubagentManager = class {
   sendMessage(recipient, message) {
     const mailboxDir = path9.resolve(process.cwd(), ".shark", "mailbox", recipient);
     fs8.mkdirSync(mailboxDir, { recursive: true });
-    const filePath = path9.join(mailboxDir, `${Date.now()}-${crypto2.randomUUID()}.json`);
+    const seq = (this.messageSeq++).toString().padStart(6, "0");
+    const filePath = path9.join(mailboxDir, `${Date.now()}-${seq}-${crypto2.randomUUID()}.json`);
     fs8.writeFileSync(filePath, JSON.stringify({ message }), "utf-8");
   }
   retrieveMessages(id) {
@@ -3964,32 +3972,39 @@ async function promptUser(message, initialValue, placeholder, prefix = "") {
   }
   return userReply;
 }
-async function waitForInputOrNotification(queue, promptMessage = "Your answer:", subagentPrefix = "", timeoutMs) {
+async function waitForInputOrNotification(queue, promptMessage = "Your answer:", subagentPrefix = "", timeoutMs, isAuto = false) {
   let cancelled = false;
   let resolvePromptPromise = null;
   let timerId = null;
-  const promptPromise = new Promise((resolve2) => {
-    resolvePromptPromise = resolve2;
-  });
-  const runPrompt = async () => {
-    try {
-      const userReply = await promptUser(promptMessage, void 0, void 0, subagentPrefix);
-      if (!cancelled && resolvePromptPromise) {
-        resolvePromptPromise({
-          type: "user",
-          content: userReply,
-          timestamp: Date.now()
-        });
+  const promises = [];
+  if (!isAuto) {
+    const promptPromise = new Promise((resolve2) => {
+      resolvePromptPromise = resolve2;
+    });
+    const runPrompt = async () => {
+      try {
+        const userReply = await promptUser(promptMessage, void 0, void 0, subagentPrefix);
+        if (!cancelled && resolvePromptPromise) {
+          resolvePromptPromise({
+            type: "user",
+            content: userReply,
+            timestamp: Date.now()
+          });
+        }
+      } catch (e) {
       }
-    } catch (e) {
-    }
-  };
-  runPrompt();
+    };
+    runPrompt();
+    promises.push(promptPromise);
+  }
   const queuePromise = queue.next();
-  const promises = [promptPromise, queuePromise];
+  promises.push(queuePromise);
   if (timeoutMs !== void 0 && timeoutMs !== null) {
     const timeoutPromise = new Promise((resolve2) => {
       timerId = setTimeout(() => {
+        if (resolvePromptPromise) {
+          cancelled = true;
+        }
         resolve2({
           type: "timeout",
           content: "Wait timeout expired.",
@@ -4005,10 +4020,12 @@ async function waitForInputOrNotification(queue, promptMessage = "Your answer:",
   }
   if (winner.type === "subagent_notification" || winner.type === "timeout") {
     cancelled = true;
-    process.stdin.emit("data", "\r");
-    await new Promise((r) => setTimeout(r, 50));
-    if (process.stdout.isTTY) {
-      process.stdout.write("\x1B[1A\x1B[2K\x1B[1A\x1B[2K");
+    if (!isAuto) {
+      process.stdin.emit("data", "\r");
+      await new Promise((r) => setTimeout(r, 50));
+      if (process.stdout.isTTY) {
+        process.stdout.write("\x1B[1A\x1B[2K\x1B[1A\x1B[2K");
+      }
     }
   }
   return winner;
@@ -4088,11 +4105,16 @@ You are a highly skilled Developer Agent.
 \u{1F449} **CURRENT TASK**: "${currentTask}"
 
 Your goal is to address the user's request:
-- If the request is a question, a request for explanation, or a discussion, answer the user using the 'talk_with_user' action. You can search the codebase or read files first to answer accurately. Once the explanation/discussion is complete, output a final response starting with "TASK_COMPLETED:" followed by a brief summary.
+- If the request is a question, a request for explanation, or a discussion, answer the user using the 'talk_with_user' action. You can search the codebase or read files first to answer accurately. Once the explanation/discussion is complete, execute the 'complete_task' action with a brief summary in the 'summary' field and the full explanation in the 'content' field.
 - If the request is to implement changes, debug, or write code:
   1. Implement the necessary changes.
   2. Verify (compile/test).
-  3. When you are confident the task is done, output a final response starting with "TASK_COMPLETED:" followed by a brief technical summary of what you did.
+  3. When you are confident the task is done, execute the 'complete_task' action with a brief technical summary of what you did in the 'summary' field and any additional details in the 'content' field.
+
+- Handling Subagent Notifications:
+  - When you receive notifications about subagent progress or completion in your mailbox, do NOT invoke the 'talk_with_user' action just to relay this information to the user if you still have other subagents running, or if you have further steps to execute yourself.
+  - Instead, process the subagent's output, update your task progress in the 'summary' field of your next action, and proceed with executing your next planned steps (or use the 'wait' action to continue waiting for other running subagents).
+  - Only use 'talk_with_user' if you genuinely require the user's input/decision to proceed, or when the entire task is ready for final discussion.
 `;
   let nextPrompt = basePrompt;
   let keepGoing = true;
@@ -4174,19 +4196,32 @@ ${mailboxMessages.map((m) => `- ${m}`).join("\n")}
           log.info(`\u{1F4CC} Status: ${response.summary}`);
         }
         if (response.message && response.message.includes("TASK_COMPLETED:")) {
+          const mainContent = response.message.split("TASK_COMPLETED:")[0].trim();
+          if (mainContent) {
+            log.info(colors.primary("\u{1F916} Shark Dev:"));
+            console.log(mainContent);
+          }
           finalSummary = response.message.split("TASK_COMPLETED:")[1].trim();
           log.success(`\u2714 Task Completed: ${finalSummary}`);
           if (options.taskId) {
             subagentManager.updateSubagentSummary(options.taskId, finalSummary);
+            if (process.env.SHARK_PARENT_ID) {
+              subagentManager.sendMessage(
+                process.env.SHARK_PARENT_ID,
+                `[Subagent Notification] Subagent ${process.env.SHARK_SUBAGENT_ROLE || "Subagent"} (${options.taskId}) completed.
+Result Details:
+${mainContent || finalSummary}`
+              );
+            }
             keepGoing = false;
             break;
           }
-          if (!options.taskInstruction) {
+          if (!options.auto || subagentManager.getActiveSubagentsForParent(myId).length > 0) {
             let nextMsg;
             if (!messageQueue.isEmpty()) {
               nextMsg = await messageQueue.next();
             } else {
-              nextMsg = await waitForInputOrNotification(messageQueue, "Your answer:", subagentPrefix);
+              nextMsg = await waitForInputOrNotification(messageQueue, "Your answer:", subagentPrefix, void 0, isAuto);
             }
             if (nextMsg.type === "user") {
               if (tui.isCancel(nextMsg.content)) {
@@ -4202,6 +4237,11 @@ ${mailboxMessages.map((m) => `- ${m}`).join("\n")}
           }
         }
         if (response.message && response.message.includes("TASK_FAILED:")) {
+          const mainContent = response.message.split("TASK_FAILED:")[0].trim();
+          if (mainContent) {
+            log.info(colors.primary("\u{1F916} Shark Dev:"));
+            console.log(mainContent);
+          }
           const failureReason = response.message.split("TASK_FAILED:")[1].trim();
           log.error(`\u274C Agent reported task failure: ${failureReason}`);
           if (options.taskId) {
@@ -4215,12 +4255,12 @@ ${mailboxMessages.map((m) => `- ${m}`).join("\n")}
             }
             return { success: false, summary: failureReason };
           }
-          if (!options.taskInstruction) {
+          if (!options.auto || subagentManager.getActiveSubagentsForParent(myId).length > 0) {
             let nextMsg;
             if (!messageQueue.isEmpty()) {
               nextMsg = await messageQueue.next();
             } else {
-              nextMsg = await waitForInputOrNotification(messageQueue, "Your answer:", subagentPrefix);
+              nextMsg = await waitForInputOrNotification(messageQueue, "Your answer:", subagentPrefix, void 0, isAuto);
             }
             if (nextMsg.type === "user") {
               if (tui.isCancel(nextMsg.content)) {
@@ -4247,7 +4287,7 @@ ${mailboxMessages.map((m) => `- ${m}`).join("\n")}
             if (!messageQueue.isEmpty()) {
               nextMsg = await messageQueue.next();
             } else {
-              nextMsg = await waitForInputOrNotification(messageQueue, "Your answer:", subagentPrefix);
+              nextMsg = await waitForInputOrNotification(messageQueue, "Your answer:", subagentPrefix, void 0, isAuto);
             }
             if (nextMsg.type === "user") {
               if (tui.isCancel(nextMsg.content)) {
@@ -4262,7 +4302,7 @@ ${mailboxMessages.map((m) => `- ${m}`).join("\n")}
             if (!messageQueue.isEmpty()) {
               nextMsg = await messageQueue.next();
             } else {
-              nextMsg = await waitForInputOrNotification(messageQueue, "Agent returned empty response. Type a message to continue or press Ctrl+C to cancel:", subagentPrefix);
+              nextMsg = await waitForInputOrNotification(messageQueue, "Agent returned empty response. Type a message to continue or press Ctrl+C to cancel:", subagentPrefix, void 0, isAuto);
             }
             if (nextMsg.type === "user") {
               if (tui.isCancel(nextMsg.content)) {
@@ -4426,7 +4466,7 @@ ${result}`;
                 if (!messageQueue.isEmpty()) {
                   nextMsg = await messageQueue.next();
                 } else {
-                  nextMsg = await waitForInputOrNotification(messageQueue, "Seu prompt alternativo para o agente:", subagentPrefix);
+                  nextMsg = await waitForInputOrNotification(messageQueue, "Seu prompt alternativo para o agente:", subagentPrefix, void 0, isAuto);
                 }
                 if (nextMsg.type === "user") {
                   if (tui.isCancel(nextMsg.content)) {
@@ -4443,19 +4483,33 @@ ${result}`;
             if (isSubagent) {
               const summary = hasCompleted ? contentStr.split("TASK_COMPLETED:")[1].trim() : contentStr;
               subagentManager.updateSubagentSummary(options.taskId, summary);
+              if (process.env.SHARK_PARENT_ID) {
+                const mainContent = hasCompleted ? contentStr.split("TASK_COMPLETED:")[0].trim() : contentStr;
+                subagentManager.sendMessage(
+                  process.env.SHARK_PARENT_ID,
+                  `[Subagent Notification] Subagent ${process.env.SHARK_SUBAGENT_ROLE || "Subagent"} (${options.taskId}) completed.
+Result Details:
+${mainContent}`
+                );
+              }
               finalSummary = summary;
               keepGoing = false;
               break;
             }
             if (hasCompleted) {
+              const mainContent = contentStr.split("TASK_COMPLETED:")[0].trim();
+              if (mainContent) {
+                log.info(colors.primary("\u{1F916} Shark Dev:"));
+                console.log(mainContent);
+              }
               finalSummary = contentStr.split("TASK_COMPLETED:")[1].trim();
               log.success(`\u2714 Task Completed: ${finalSummary}`);
-              if (!options.taskInstruction) {
+              if (!options.auto || subagentManager.getActiveSubagentsForParent(myId).length > 0) {
                 let nextMsg2;
                 if (!messageQueue.isEmpty()) {
                   nextMsg2 = await messageQueue.next();
                 } else {
-                  nextMsg2 = await waitForInputOrNotification(messageQueue, "Your answer:", subagentPrefix);
+                  nextMsg2 = await waitForInputOrNotification(messageQueue, "Your answer:", subagentPrefix, void 0, isAuto);
                 }
                 if (nextMsg2.type === "user") {
                   if (tui.isCancel(nextMsg2.content)) {
@@ -4476,7 +4530,7 @@ ${result}`;
             if (!messageQueue.isEmpty()) {
               nextMsg = await messageQueue.next();
             } else {
-              nextMsg = await waitForInputOrNotification(messageQueue, "Your answer:", subagentPrefix);
+              nextMsg = await waitForInputOrNotification(messageQueue, "Your answer:", subagentPrefix, void 0, isAuto);
             }
             if (nextMsg.type === "user") {
               if (tui.isCancel(nextMsg.content)) {
@@ -4560,10 +4614,37 @@ Result Details:
 ${detailedContent}`
               );
             }
+            finalSummary = taskSummary;
+            keepGoing = false;
+            break;
+          } else {
+            if (detailedContent) {
+              log.info(colors.primary("\u{1F916} Shark Dev:"));
+              console.log(detailedContent);
+            }
+            log.success(`\u2714 Task Completed: ${taskSummary}`);
+            if (!options.auto || subagentManager.getActiveSubagentsForParent(myId).length > 0) {
+              let nextMsg;
+              if (!messageQueue.isEmpty()) {
+                nextMsg = await messageQueue.next();
+              } else {
+                nextMsg = await waitForInputOrNotification(messageQueue, "Your answer:", subagentPrefix, void 0, isAuto);
+              }
+              if (nextMsg.type === "user") {
+                if (tui.isCancel(nextMsg.content)) {
+                  finalSummary = taskSummary;
+                  keepGoing = false;
+                  break;
+                }
+              }
+              nextPrompt = nextMsg.content;
+              continue;
+            } else {
+              finalSummary = taskSummary;
+              keepGoing = false;
+              break;
+            }
           }
-          finalSummary = taskSummary;
-          keepGoing = false;
-          break;
         } else if (action.type === "wait") {
           const durationSeconds = action.duration_seconds || 0;
           const durationMs = durationSeconds > 0 ? durationSeconds * 1e3 : void 0;
@@ -4572,7 +4653,7 @@ ${detailedContent}`
           if (!messageQueue.isEmpty()) {
             nextMsg = await messageQueue.next();
           } else {
-            nextMsg = await waitForInputOrNotification(messageQueue, "Your answer:", subagentPrefix, durationMs);
+            nextMsg = await waitForInputOrNotification(messageQueue, "Your answer:", subagentPrefix, durationMs, isAuto);
           }
           if (nextMsg.type === "timeout") {
             resultMsg = `[System]: Wait duration of ${durationSeconds} seconds expired. No notifications received.`;
@@ -4585,6 +4666,13 @@ ${detailedContent}`
           } else {
             resultMsg = nextMsg.content;
           }
+        } else if (action.type === "notify_user") {
+          const messageContent = action.content || "";
+          if (messageContent) {
+            log.info(colors.primary("\u{1F916} Shark Dev:"));
+            console.log(messageContent);
+          }
+          resultMsg = `[Action notify_user Success]: Notifica\xE7\xE3o exibida com sucesso para o usu\xE1rio.`;
         } else {
           resultMsg = `[Unsupported action type: ${action.type}]`;
         }