@hasna/coders 0.1.2 → 0.1.4

package/dist/cli.mjs

@@ -61872,9 +61872,16 @@ async function runAgentLoop(initialMessages, options2) {
       throw error;
     }
     if (aborted) break;
+    const cleanedBlocks = contentBlocks.map((b) => {
+      if (b.type === "tool_use") {
+        const { _inputParseFailed, _rawInputJson, ...clean } = b;
+        return clean;
+      }
+      return b;
+    });
     const assistantMessage = {
       role: "assistant",
-      content: contentBlocks
+      content: cleanedBlocks
     };
     messages.push(assistantMessage);
     const toolUseBlocks = contentBlocks.filter(
@@ -70172,21 +70179,18 @@ function useSpinner(active) {
   }, [active]);
   return active ? FRAMES[i] : " ";
 }
-function createToolHandlers(onToolStart, onToolEnd, requestPermission) {
+function createToolHandlers() {
   const tools = [bashTool, readTool, editTool, writeTool, globTool, grepTool];
   const permCtx = createDefaultPermissionContext();
   const appState = { toolPermissionContext: permCtx, verbose: false };
-  const alwaysAllowed = /* @__PURE__ */ new Set();
   return tools.map((tool) => ({
     name: tool.name,
-    description: typeof tool.description === "function" ? `Tool: ${tool.name}` : String(tool.description),
-    inputSchema: { type: "object", properties: {} },
+    description: TOOL_DESCRIPTIONS[tool.name] ?? `Tool: ${tool.name}`,
+    inputSchema: TOOL_JSON_SCHEMAS[tool.name] ?? { type: "object", properties: {} },
     isReadOnly: tool.isReadOnly(),
     isConcurrencySafe: tool.isConcurrencySafe(),
     call: async (input, ctx) => {
       const summary = toolSummary(tool.name, input);
-      const toolId = `tool-${Date.now()}-${Math.random().toString(36).slice(2, 6)}`;
-      onToolStart(toolId, tool.name, summary);
       const t0 = performance.now();
       try {
         const toolCtx = {
@@ -70196,18 +70200,16 @@ function createToolHandlers(onToolStart, onToolEnd, requestPermission) {
           options: { mainLoopModel: "sonnet", thinkingConfig: { type: "disabled" }, isNonInteractiveSession: false, tools: [], agentDefinitions: { activeAgents: [] } }
         };
         const result = await tool.call(input, toolCtx);
-        const block2 = tool.mapToolResultToToolResultBlockParam(result.data, toolId);
+        const block2 = tool.mapToolResultToToolResultBlockParam(result.data, ctx.toolUseId ?? "");
         const dur = performance.now() - t0;
-        onToolEnd(toolId, block2.content.slice(0, 500), block2.is_error ? block2.content : void 0, dur);
         try {
           dbRun("INSERT INTO audit_log (tool_name, input_summary, result_summary, duration_ms, was_allowed) VALUES (?, ?, ?, ?, 1)", [tool.name, summary, block2.content.slice(0, 200), dur]);
         } catch {
         }
-        return { data: block2.content };
+        return block2.is_error ? { data: block2.content, error: block2.content, isError: true } : { data: block2.content };
       } catch (err) {
         const dur = performance.now() - t0;
         const errMsg = err instanceof Error ? err.message : String(err);
-        onToolEnd(toolId, "", errMsg, dur);
         try {
           dbRun("INSERT INTO audit_log (tool_name, input_summary, result_summary, duration_ms, was_allowed) VALUES (?, ?, ?, ?, 1)", [tool.name, summary, errMsg.slice(0, 200), dur]);
         } catch {
@@ -70390,11 +70392,23 @@ function App2({ model, mode, initialPrompt }) {
     setActiveTools((prev) => [...prev, { id, name, summary, status: "running" }]);
   }, []);
   const onToolEnd = (0, import_react22.useCallback)((id, result, error, durationMs) => {
-    setActiveTools(
-      (prev) => prev.map(
-        (t) => t.id === id ? { ...t, status: error ? "error" : "done", result, error, durationMs } : t
-      )
-    );
+    const tool = activeToolsRef.current.find((t) => t.id === id);
+    if (!tool) return;
+    const completed = {
+      ...tool,
+      status: error ? "error" : "done",
+      result,
+      error,
+      durationMs
+    };
+    setMsgs((prev) => [...prev, {
+      id: `td-${id}`,
+      role: "assistant",
+      content: "",
+      timestamp: Date.now(),
+      tools: [completed]
+    }]);
+    setActiveTools((prev) => prev.filter((t) => t.id !== id));
   }, []);
   const submit = (0, import_react22.useCallback)(async (text) => {
     if (!text.trim() || busy) return;
@@ -70416,8 +70430,9 @@ function App2({ model, mode, initialPrompt }) {
     setActiveTools([]);
     const t0 = performance.now();
     try {
-      const toolHandlers = createToolHandlers(onToolStart, onToolEnd, requestPermission);
+      const toolHandlers = createToolHandlers();
       const permCtx = createDefaultPermissionContext();
+      const toolStartTimes = /* @__PURE__ */ new Map();
       const result = await runAgentLoop(
         newHistory,
         {
@@ -70434,7 +70449,7 @@ function App2({ model, mode, initialPrompt }) {
           permissionContext: permCtx,
           maxTurns: 10,
           onTextDelta: (text2) => {
-            if (activeToolsRef.current.length === 0 || activeToolsRef.current.every((t) => t.status === "done" || t.status === "error")) {
+            if (activeToolsRef.current.length === 0) {
               setStreaming((prev) => prev + text2);
             }
           },
@@ -70442,11 +70457,14 @@ function App2({ model, mode, initialPrompt }) {
           },
           onToolUseStart: (name, id, toolInput) => {
             setStreaming("");
+            toolStartTimes.set(id, performance.now());
             onToolStart(id, name, toolSummary(name, toolInput));
           },
           onToolUseEnd: (name, id, toolResult) => {
             const isErr = toolResult.isError || !!toolResult.error;
-            onToolEnd(id, String(toolResult.data ?? "").slice(0, 500), isErr ? toolResult.error : void 0);
+            const startTime = toolStartTimes.get(id);
+            const dur2 = startTime ? performance.now() - startTime : void 0;
+            onToolEnd(id, String(toolResult.data ?? "").slice(0, 500), isErr ? toolResult.error : void 0, dur2);
           }
         }
       );
@@ -70466,19 +70484,27 @@ function App2({ model, mode, initialPrompt }) {
       );
       setCost((p) => p + c.totalCostUsd);
       setTokens((p) => p + result.usage.totalInputTokens + result.usage.totalOutputTokens);
-      const frozenTools = [...activeToolsRef.current].map(
-        (t) => t.status === "running" ? { ...t, status: "done" } : t
-      );
       const verb = VERBS[Math.floor(Math.random() * VERBS.length)];
-      setMsgs((p) => [...p, {
-        id: `a${Date.now()}`,
-        role: "assistant",
-        content: finalText || streaming || "(no response)",
-        timestamp: Date.now(),
-        tools: frozenTools.length > 0 ? frozenTools : void 0,
-        durationMs: dur,
-        durationVerb: verb
-      }]);
+      const textContent = finalText || streaming || "";
+      if (textContent && textContent !== "(no response)") {
+        setMsgs((p) => [...p, {
+          id: `a${Date.now()}`,
+          role: "assistant",
+          content: textContent,
+          timestamp: Date.now(),
+          durationMs: dur,
+          durationVerb: verb
+        }]);
+      } else if (dur > 1e3) {
+        setMsgs((p) => [...p, {
+          id: `a${Date.now()}`,
+          role: "assistant",
+          content: "",
+          timestamp: Date.now(),
+          durationMs: dur,
+          durationVerb: verb
+        }]);
+      }
       setHistory(result.messages.filter((m) => m.role === "user" || m.role === "assistant"));
       setStreaming("");
       setActiveTools([]);
@@ -70488,7 +70514,7 @@ function App2({ model, mode, initialPrompt }) {
     } finally {
       setBusy(false);
     }
-  }, [busy, history, model, exit, onToolStart, onToolEnd, requestPermission, streaming, activeTools]);
+  }, [busy, history, model, exit, onToolStart, onToolEnd, streaming, activeTools]);
   (0, import_react22.useEffect)(() => {
     if (initialPrompt) submit(initialPrompt);
   }, []);
@@ -70541,47 +70567,49 @@ function App2({ model, mode, initialPrompt }) {
     } else if (key.escape) setInput("");
     else if (!key.ctrl && !key.meta && ch) setInput((p) => p + ch);
   });
-  const recentTools = activeTools.slice(-2);
   const cols = stdout?.columns ?? 80;
   const sep = "\u2500".repeat(Math.min(cols, 120));
+  const hasRunningTools = activeTools.some((t) => t.status === "running");
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Static, { items: msgs, children: (msg) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box_default, { flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(MessageView, { msg }) }, msg.id) }),
-    busy && recentTools.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box_default, { flexDirection: "column", children: recentTools.map((t) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ToolItem, { tool: t }, t.id)) }),
-    busy && streaming && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box_default, { children: [
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: "green", children: "\u25CF " }),
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { children: streaming.split("\n").filter((l) => l.trim()).slice(-3).join("\n").slice(-200) })
-    ] }),
-    busy && !streaming && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box_default, { children: [
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(SpinnerDot, {}),
-      /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { dimColor: true, children: [
-        " ",
-        recentTools.some((t) => t.status === "running") ? "Working" : "Thinking",
-        "..."
-      ] })
-    ] }),
     /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box_default, { flexDirection: "column", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { dimColor: true, children: sep }),
-      /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box_default, { children: [
-        /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { color: "cyan", bold: true, children: [
-          PROMPT,
-          " "
-        ] }),
-        input.startsWith("/") ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: "magenta", children: input }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { children: input }),
-        !busy && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: "gray", children: "\u258E" })
+      busy && activeTools.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box_default, { flexDirection: "column", children: activeTools.map((t) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ToolItem, { tool: t }, t.id)) }),
+      busy && streaming && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box_default, { children: [
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: "green", children: "\u25CF " }),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { children: streaming.split("\n").filter((l) => l.trim()).slice(-3).join("\n").slice(-200) })
+      ] }),
+      busy && !streaming && activeTools.length === 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box_default, { children: [
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(SpinnerDot, {}),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { dimColor: true, children: " Thinking..." })
+      ] }),
+      busy && hasRunningTools && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box_default, { children: [
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(SpinnerDot, {}),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { dimColor: true, children: " Working..." })
       ] }),
-      showSlashMenu && filteredCommands.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box_default, { flexDirection: "column", paddingLeft: 2, children: filteredCommands.map((cmd, i) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box_default, { children: [
-        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: i === slashSelected ? "cyan" : void 0, bold: i === slashSelected, children: i === slashSelected ? "\u25B8 " : "  " }),
-        /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { color: i === slashSelected ? "cyan" : "blue", children: [
-          "/",
-          cmd.name.padEnd(16)
+      /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box_default, { flexDirection: "column", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { dimColor: true, children: sep }),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box_default, { children: [
+          /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { color: "cyan", bold: true, children: [
+            PROMPT,
+            " "
+          ] }),
+          input.startsWith("/") ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: "magenta", children: input }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { children: input }),
+          !busy && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: "gray", children: "\u258E" })
         ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { dimColor: true, children: [
-          " ",
-          cmd.description
-        ] })
-      ] }, cmd.name)) }),
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { dimColor: true, children: sep }),
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(StatusBar, { model, mode, cost, tokens })
+        showSlashMenu && filteredCommands.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box_default, { flexDirection: "column", paddingLeft: 2, children: filteredCommands.map((cmd, i) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box_default, { children: [
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: i === slashSelected ? "cyan" : void 0, bold: i === slashSelected, children: i === slashSelected ? "\u25B8 " : "  " }),
+          /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { color: i === slashSelected ? "cyan" : "blue", children: [
+            "/",
+            cmd.name.padEnd(16)
+          ] }),
+          /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { dimColor: true, children: [
+            " ",
+            cmd.description
+          ] })
+        ] }, cmd.name)) }),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { dimColor: true, children: sep }),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(StatusBar, { model, mode, cost, tokens })
+      ] })
     ] })
   ] });
 }
@@ -70634,7 +70662,7 @@ function fmtTok(n) {
   if (n < 1e6) return `${(n / 1e3).toFixed(1)}K`;
   return `${(n / 1e6).toFixed(2)}M`;
 }
-var import_react22, import_jsx_runtime, CONN, PROMPT, FRAMES, VERBS;
+var import_react22, import_jsx_runtime, CONN, PROMPT, FRAMES, VERBS, TOOL_JSON_SCHEMAS, TOOL_DESCRIPTIONS;
 var init_app = __esm({
   async "src/ui/app.tsx"() {
     "use strict";
@@ -70662,6 +70690,82 @@ var init_app = __esm({
     PROMPT = "\u276F";
     FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
     VERBS = ["Baked", "Brewed", "Churned", "Cogitated", "Cooked", "Crunched", "Saut\xE9ed", "Worked"];
+    TOOL_JSON_SCHEMAS = {
+      Bash: {
+        type: "object",
+        properties: {
+          command: { type: "string", description: "The command to execute" },
+          description: { type: "string", description: "Clear, concise description of what this command does" },
+          timeout: { type: "number", description: "Optional timeout in milliseconds (max 600000)" },
+          run_in_background: { type: "boolean", description: "Set to true to run in the background" }
+        },
+        required: ["command"]
+      },
+      Read: {
+        type: "object",
+        properties: {
+          file_path: { type: "string", description: "The absolute path to the file to read" },
+          offset: { type: "number", description: "The line number to start reading from" },
+          limit: { type: "number", description: "The number of lines to read" },
+          pages: { type: "string", description: "Page range for PDF files (e.g. '1-5')" }
+        },
+        required: ["file_path"]
+      },
+      Edit: {
+        type: "object",
+        properties: {
+          file_path: { type: "string", description: "The absolute path to the file to modify" },
+          old_string: { type: "string", description: "The text to replace" },
+          new_string: { type: "string", description: "The text to replace it with (must be different from old_string)" },
+          replace_all: { type: "boolean", description: "Replace all occurrences of old_string (default false)", default: false }
+        },
+        required: ["file_path", "old_string", "new_string"]
+      },
+      Write: {
+        type: "object",
+        properties: {
+          file_path: { type: "string", description: "The absolute path to the file to write" },
+          content: { type: "string", description: "The content to write to the file" }
+        },
+        required: ["file_path", "content"]
+      },
+      Glob: {
+        type: "object",
+        properties: {
+          pattern: { type: "string", description: "The glob pattern to match files against" },
+          path: { type: "string", description: "The directory to search in. Defaults to current working directory." }
+        },
+        required: ["pattern"]
+      },
+      Grep: {
+        type: "object",
+        properties: {
+          pattern: { type: "string", description: "The regular expression pattern to search for" },
+          path: { type: "string", description: "File or directory to search in. Defaults to cwd." },
+          glob: { type: "string", description: "Glob pattern to filter files (e.g. '*.js', '*.{ts,tsx}')" },
+          type: { type: "string", description: "File type to search (js, py, rust, go, etc.)" },
+          output_mode: { type: "string", enum: ["content", "files_with_matches", "count"], description: "Output mode. Defaults to 'files_with_matches'." },
+          "-A": { type: "number", description: "Lines to show after each match" },
+          "-B": { type: "number", description: "Lines to show before each match" },
+          "-C": { type: "number", description: "Context lines before and after each match" },
+          context: { type: "number", description: "Alias for -C" },
+          "-i": { type: "boolean", description: "Case insensitive search" },
+          "-n": { type: "boolean", description: "Show line numbers (default true)" },
+          multiline: { type: "boolean", description: "Enable multiline mode" },
+          head_limit: { type: "number", description: "Limit output to first N entries" },
+          offset: { type: "number", description: "Skip first N entries" }
+        },
+        required: ["pattern"]
+      }
+    };
+    TOOL_DESCRIPTIONS = {
+      Bash: "Executes a bash command and returns its output. Use for system commands, builds, and terminal operations.",
+      Read: "Reads a file from the filesystem. Returns contents with line numbers. Supports text, PDF, images, and notebooks.",
+      Edit: "Performs exact string replacements in files. Use old_string/new_string for targeted edits.",
+      Write: "Writes content to a file, creating it if needed or overwriting if it exists.",
+      Glob: "Fast file pattern matching. Returns matching file paths sorted by modification time.",
+      Grep: "Content search powered by ripgrep. Supports regex, file type filters, and multiple output modes."
+    };
   }
 });
 
@@ -70879,7 +70983,7 @@ var VERSION, BUILD_TIME, PACKAGE_NAME2, ISSUES_URL2, startupTimestamps, original
 var init_index = __esm({
   "src/cli/index.ts"() {
     VERSION = "0.1.2";
-    BUILD_TIME = "2026-03-20T13:23:30.894Z";
+    BUILD_TIME = "2026-03-20T14:03:23.252Z";
     PACKAGE_NAME2 = "@hasna/coders";
     ISSUES_URL2 = "https://github.com/hasnaxyz/open-coders/issues";
     startupTimestamps = {};