@hasna/assistants 0.6.17 → 0.6.19

package/dist/index.js

@@ -38775,6 +38775,10 @@ class SchedulerTool {
           type: "string",
           description: "Optional description for this schedule"
         },
+        sessionId: {
+          type: "string",
+          description: "Session id to scope the schedule to"
+        },
         id: {
           type: "string",
           description: "Schedule id (for delete/pause/resume)"
@@ -38819,6 +38823,7 @@ class SchedulerTool {
         createdAt: now2,
         updatedAt: now2,
         createdBy: "agent",
+        sessionId: typeof input.sessionId === "string" ? input.sessionId : undefined,
         command,
         description: input.description,
         status: "active",
@@ -40862,6 +40867,7 @@ Keep it concise but comprehensive.`
           createdAt: now2,
           updatedAt: now2,
           createdBy: "user",
+          sessionId: context.sessionId,
           command,
           status: "active",
           schedule: {
@@ -43036,6 +43042,12 @@ class AgentLoop {
           toolCall.input.cwd = this.cwd;
         }
       }
+      if (toolCall.name === "schedule") {
+        const input = toolCall.input;
+        if (input.sessionId === undefined) {
+          input.sessionId = this.sessionId;
+        }
+      }
       if (preHookResult?.continue === false || preHookResult?.permissionDecision === "deny") {
         const blockedResult = {
           toolCallId: toolCall.id,
@@ -43461,6 +43473,9 @@ ${effects.message}
       const now2 = Date.now();
       const due = await getDueSchedules(this.cwd, now2);
       for (const schedule of due) {
+        if (schedule.sessionId && schedule.sessionId !== this.sessionId) {
+          continue;
+        }
         const locked = await acquireScheduleLock(this.cwd, schedule.id, this.sessionId);
         if (!locked)
           continue;
@@ -43490,7 +43505,7 @@ ${effects.message}
         if (!schedule)
           break;
         const current = await readSchedule(this.cwd, schedule.id);
-        if (!current || current.status !== "active" || !current.nextRunAt || current.nextRunAt > Date.now()) {
+        if (!current || current.status !== "active" || !current.nextRunAt || current.nextRunAt > Date.now() || current.sessionId && current.sessionId !== this.sessionId) {
           await releaseScheduleLock(this.cwd, schedule.id, this.sessionId);
           continue;
         }
@@ -44513,15 +44528,23 @@ function Input({ onSubmit, isProcessing, queueLength = 0, commands, skills = []
   }, [value, autocompleteMode, skills]);
   const autocompleteItems = autocompleteMode === "skill" ? filteredSkills : filteredCommands;
   use_input_default((input, key) => {
-    if (key.tab && autocompleteItems.length > 0) {
-      const selected = autocompleteItems[selectedIndex] || autocompleteItems[0];
-      if (autocompleteMode === "skill") {
-        setValue("$" + selected.name + " ");
-      } else {
-        setValue(selected.name + " ");
+    if (key.tab) {
+      if (autocompleteItems.length > 0) {
+        const selected = autocompleteItems[selectedIndex] || autocompleteItems[0];
+        if (autocompleteMode === "skill") {
+          setValue("$" + selected.name + " ");
+        } else {
+          setValue(selected.name + " ");
+        }
+        setSelectedIndex(0);
+        return;
+      }
+      if (value.trim()) {
+        onSubmit(value, "queue");
+        setValue("");
+        setSelectedIndex(0);
+        return;
       }
-      setSelectedIndex(0);
-      return;
     }
     if (autocompleteItems.length > 0) {
       if (key.downArrow) {
@@ -44555,18 +44578,14 @@ function Input({ onSubmit, isProcessing, queueLength = 0, commands, skills = []
     if (autocompleteMode === "command" && filteredCommands.length > 0 && !submittedValue.includes(" ")) {
       const selected = filteredCommands[selectedIndex] || filteredCommands[0];
       if (selected) {
-        if (isProcessing) {
-          onSubmit(selected.name, "queue");
-        } else {
-          onSubmit(selected.name, "normal");
-        }
+        onSubmit(selected.name, isProcessing ? "interrupt" : "normal");
         setValue("");
         setSelectedIndex(0);
         return;
       }
     }
     if (isProcessing) {
-      onSubmit(submittedValue, "queue");
+      onSubmit(submittedValue, "interrupt");
     } else {
       onSubmit(submittedValue, "normal");
     }
@@ -44577,7 +44596,7 @@ function Input({ onSubmit, isProcessing, queueLength = 0, commands, skills = []
   let placeholder = "Type a message...";
   if (isProcessing) {
     prompt = "\u22EF";
-    placeholder = queueLength > 0 ? "Type to queue another..." : "Type to queue (Enter) or interrupt (Shift+Enter)...";
+    placeholder = queueLength > 0 ? "Type to interrupt (Enter) or queue (Tab)..." : "Type to interrupt (Enter) or queue (Tab)...";
   }
   const truncateDescription = (desc, maxLen = 60) => {
     if (desc.length <= maxLen)
@@ -45618,7 +45637,6 @@ function MessageBubble({ message, queuedMessageIds }) {
         ]
       }, undefined, true, undefined, this),
       toolCalls.length > 0 && /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
-        marginLeft: hasContent ? 2 : 0,
         marginTop: hasContent ? 1 : 0,
         children: /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(ToolCallPanel, {
           toolCalls,
@@ -45734,7 +45752,24 @@ function getToolContext(toolCall) {
       return truncate(String(input.pattern || ""), 20);
     case "grep":
       return truncate(String(input.pattern || ""), 20);
+    case "schedule":
+      return String(input.action || "");
+    case "feedback":
+      return String(input.type || "feedback");
+    case "web_search":
+      return truncate(String(input.query || ""), 20);
+    case "web_fetch":
+    case "curl":
+      const url = String(input.url || "");
+      try {
+        return new URL(url).hostname;
+      } catch {
+        return truncate(url, 20);
+      }
     default:
+      const action = input.action || input.command || input.operation;
+      if (action)
+        return truncate(String(action), 20);
       return "";
   }
 }
@@ -45758,6 +45793,10 @@ function getToolDisplayName(toolCall) {
       return "grep";
     case "display_image":
       return "image";
+    case "schedule":
+      return "schedule";
+    case "feedback":
+      return "feedback";
     case "notion":
     case "gmail":
     case "googledrive":
@@ -45788,6 +45827,10 @@ function formatToolCall(toolCall) {
       return `Finding: ${truncate(String(input.pattern || ""), 60)}`;
     case "grep":
       return `Searching: ${truncate(String(input.pattern || ""), 60)}`;
+    case "schedule":
+      return formatScheduleCall(input);
+    case "feedback":
+      return formatFeedbackCall(input);
     case "notion":
       return `Notion: ${truncate(String(input.command || input.action || ""), 60)}`;
     case "gmail":
@@ -45801,9 +45844,44 @@ function formatToolCall(toolCall) {
     case "slack":
       return `Slack: ${truncate(String(input.command || input.action || ""), 60)}`;
     default:
-      return `${name}: ${truncate(JSON.stringify(input), 50)}`;
+      if (name.startsWith("connect_") || name.includes("_")) {
+        const action = String(input.command || input.action || input.operation || "");
+        if (action) {
+          return `${formatToolDisplayName(name)}: ${truncate(action, 50)}`;
+        }
+      }
+      return `${formatToolDisplayName(name)}: ${truncate(JSON.stringify(input), 50)}`;
+  }
+}
+function formatToolDisplayName(name) {
+  return name.replace(/^connect_/, "").replace(/_/g, " ").replace(/\b\w/g, (c) => c.toUpperCase());
+}
+function formatScheduleCall(input) {
+  const action = String(input.action || "");
+  switch (action) {
+    case "list":
+      return "Listing scheduled tasks";
+    case "create":
+      const cmd = truncate(String(input.command || ""), 30);
+      const schedule = String(input.schedule || "");
+      return `Creating schedule: "${cmd}" (${schedule})`;
+    case "update":
+      return `Updating schedule: ${input.id || "unknown"}`;
+    case "delete":
+      return `Deleting schedule: ${input.id || "unknown"}`;
+    case "pause":
+      return `Pausing schedule: ${input.id || "unknown"}`;
+    case "resume":
+      return `Resuming schedule: ${input.id || "unknown"}`;
+    default:
+      return `Schedule: ${action || "unknown action"}`;
   }
 }
+function formatFeedbackCall(input) {
+  const type = String(input.type || "feedback");
+  const title = truncate(String(input.title || ""), 40);
+  return `Submitting ${type}: ${title}`;
+}
 function truncate(text, maxLength) {
   if (text.length <= maxLength)
     return text;
@@ -45811,8 +45889,12 @@ function truncate(text, maxLength) {
 }
 function truncateToolResult(toolResult, maxLines = 15, maxChars = 3000) {
   const toolName = toolResult.toolName || "tool";
-  const prefix = toolResult.isError ? `Error from ${toolName}: ` : `${toolName}: `;
   let content = String(toolResult.content || "");
+  const formatted = formatToolResultNicely(toolName, content, toolResult.isError);
+  if (formatted) {
+    return formatted;
+  }
+  const prefix = toolResult.isError ? `Error: ` : "";
   content = content.replace(/\x1B\[[0-9;]*[a-zA-Z]/g, "");
   content = content.replace(/\t/g, "  ");
   const lines = content.split(`
@@ -45827,6 +45909,129 @@ function truncateToolResult(toolResult, maxLines = 15, maxChars = 3000) {
   }
   return prefix + content.trim();
 }
+function formatToolResultNicely(toolName, content, isError) {
+  if (isError) {
+    if (content.includes("ENOENT") || content.includes("no such file")) {
+      return "\u26A0 File not found";
+    }
+    if (content.includes("EACCES") || content.includes("permission denied")) {
+      return "\u26A0 Permission denied";
+    }
+    if (content.includes("ETIMEDOUT") || content.includes("timeout")) {
+      return "\u26A0 Request timed out";
+    }
+    return null;
+  }
+  switch (toolName) {
+    case "schedule":
+      return formatScheduleResult(content);
+    case "feedback":
+      return formatFeedbackResult(content);
+    case "read":
+      return formatReadResult(content);
+    case "write":
+      return formatWriteResult(content);
+    case "glob":
+      return formatGlobResult(content);
+    case "grep":
+      return formatGrepResult(content);
+    case "bash":
+      return formatBashResult(content);
+    case "web_search":
+      return formatSearchResult(content);
+    default:
+      return null;
+  }
+}
+function formatScheduleResult(content) {
+  const trimmed = content.trim().toLowerCase();
+  if (trimmed === "no schedules found." || trimmed.includes("no schedules")) {
+    return "\uD83D\uDCC5 No scheduled tasks";
+  }
+  if (trimmed.includes("created") || trimmed.includes("scheduled")) {
+    return "\u2713 Schedule created";
+  }
+  if (trimmed.includes("deleted") || trimmed.includes("removed")) {
+    return "\u2713 Schedule deleted";
+  }
+  if (trimmed.includes("paused")) {
+    return "\u23F8 Schedule paused";
+  }
+  if (trimmed.includes("resumed")) {
+    return "\u25B6 Schedule resumed";
+  }
+  if (content.includes("id:") || content.includes("command:")) {
+    const lines = content.split(`
+`).filter((l) => l.trim());
+    return `\uD83D\uDCC5 ${lines.length} scheduled task${lines.length !== 1 ? "s" : ""}`;
+  }
+  return null;
+}
+function formatFeedbackResult(content) {
+  if (content.includes("submitted") || content.includes("created")) {
+    return "\u2713 Feedback submitted";
+  }
+  return null;
+}
+function formatReadResult(content) {
+  const lines = content.split(`
+`).length;
+  if (lines > 20) {
+    return `\uD83D\uDCC4 Read ${lines} lines`;
+  }
+  return null;
+}
+function formatWriteResult(content) {
+  if (content.includes("written") || content.includes("saved") || content.includes("created")) {
+    return "\u2713 File saved";
+  }
+  return null;
+}
+function formatGlobResult(content) {
+  const lines = content.split(`
+`).filter((l) => l.trim());
+  if (lines.length === 0) {
+    return "\uD83D\uDD0D No files found";
+  }
+  if (lines.length > 10) {
+    return `\uD83D\uDD0D Found ${lines.length} files`;
+  }
+  return null;
+}
+function formatGrepResult(content) {
+  const lines = content.split(`
+`).filter((l) => l.trim());
+  if (lines.length === 0) {
+    return "\uD83D\uDD0D No matches found";
+  }
+  if (lines.length > 10) {
+    return `\uD83D\uDD0D Found ${lines.length} matches`;
+  }
+  return null;
+}
+function formatBashResult(content) {
+  const trimmed = content.trim();
+  if (!trimmed) {
+    return "\u2713 Command completed";
+  }
+  if (trimmed.length < 100 && !trimmed.includes(`
+`)) {
+    return null;
+  }
+  const lines = trimmed.split(`
+`).length;
+  if (lines > 20) {
+    return `\u2713 Output: ${lines} lines`;
+  }
+  return null;
+}
+function formatSearchResult(content) {
+  const resultCount = (content.match(/https?:\/\//g) || []).length;
+  if (resultCount > 0) {
+    return `\uD83D\uDD0D Found ${resultCount} result${resultCount !== 1 ? "s" : ""}`;
+  }
+  return null;
+}
 
 // packages/terminal/src/components/Status.tsx
 var import_react25 = __toESM(require_react(), 1);
@@ -46898,7 +47103,7 @@ function App2({ cwd: cwd2, version }) {
       setShowSessionSelector(true);
       return;
     }
-    if (mode === "queue" || isProcessing && mode === "normal") {
+    if (mode === "queue") {
       if (!activeSessionId)
         return;
       const queuedId = generateId();
@@ -47334,7 +47539,7 @@ function formatStreamEvent(chunk) {
 
 // packages/terminal/src/index.tsx
 var jsx_dev_runtime11 = __toESM(require_jsx_dev_runtime(), 1);
-var VERSION3 = "0.6.17";
+var VERSION3 = "0.6.19";
 function parseArgs(argv) {
   const args = argv.slice(2);
   const options = {
@@ -47497,4 +47702,4 @@ if (options.print !== null) {
   });
 }
 
-//# debugId=36B3EC68850C35ED64756E2164756E21
+//# debugId=6BDD2D63CEF73C2464756E2164756E21