@aiaiai-pt/martha-cli 0.3.0 → 0.4.0

package/dist/index.js

@@ -1019,7 +1019,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
         this._exitCallback = (err) => {
           if (err.code !== "commander.executeSubCommandAsync") {
             throw err;
-          } else {}
+          }
         };
       }
       return this;
@@ -10830,7 +10830,7 @@ function registerDefinitionCommands(program2, config) {
   function isJson() {
     return !!program2.opts().json;
   }
-  const listCmd = cmd.command("list").description(`List ${config.typeNamePlural}`).option("--inactive", "Include inactive items").option("--limit <n>", "Max results", "50");
+  const listCmd = cmd.command("list").description(`List ${config.typeNamePlural}`).option("--inactive", "Include inactive items").option("--limit <n>", "Max results per page", "50").option("--search <term>", "Case-insensitive substring filter on name (server-side)").option("--all", "Auto-paginate until every matching item is fetched (server caps at 500/page)");
   if (config.extraListOptions) {
     config.extraListOptions(listCmd);
   }
@@ -10840,17 +10840,65 @@ function registerDefinitionCommands(program2, config) {
     if (isNaN(limitN) || limitN < 1) {
       throw new CLIError("--limit must be a positive integer", 4 /* Validation */);
     }
-    const params = {
-      limit: String(limitN),
-      skip: "0"
-    };
+    const baseParams = {};
     if (!opts.inactive)
-      params.active_only = "true";
+      baseParams.active_only = "true";
+    if (opts.search)
+      baseParams.name_contains = String(opts.search);
     if (config.buildListParams) {
-      Object.assign(params, config.buildListParams(opts));
+      Object.assign(baseParams, config.buildListParams(opts));
+    }
+    let items;
+    let total;
+    if (opts.all) {
+      const pageSize = 500;
+      items = [];
+      let skip = 0;
+      while (true) {
+        const params = {
+          ...baseParams,
+          limit: String(pageSize),
+          skip: String(skip)
+        };
+        const res = await ctx.api.getRaw(config.apiPath, { params });
+        if (!res.ok) {
+          throw new CLIError(`List ${config.typeNamePlural} failed: HTTP ${res.status}`, 1 /* Error */);
+        }
+        const headerTotal = res.headers.get("x-total-count");
+        if (headerTotal !== null && total === undefined) {
+          total = Number(headerTotal);
+        }
+        const body = await res.json();
+        const pageItems = config.extractList(body);
+        items.push(...pageItems);
+        if (pageItems.length < pageSize)
+          break;
+        if (total !== undefined && items.length >= total)
+          break;
+        skip += pageSize;
+        if (skip > 50000) {
+          throw new CLIError(`Aborted --all after fetching ${items.length} ${config.typeNamePlural}; suspected pagination bug`, 1 /* Error */);
+        }
+      }
+    } else {
+      const params = {
+        ...baseParams,
+        limit: String(limitN),
+        skip: "0"
+      };
+      const res = await ctx.api.getRaw(config.apiPath, { params });
+      if (!res.ok) {
+        throw new CLIError(`List ${config.typeNamePlural} failed: HTTP ${res.status}`, 1 /* Error */);
+      }
+      const headerTotal = res.headers.get("x-total-count");
+      if (headerTotal !== null)
+        total = Number(headerTotal);
+      const data = await res.json();
+      items = config.extractList(data);
+      const bodyTotal = config.extractTotal?.(data);
+      if (bodyTotal !== undefined)
+        total = bodyTotal;
     }
-    const data = await ctx.api.get(config.apiPath, { params });
-    const items = config.extractList(data);
     if (isJson()) {
       console.log(JSON.stringify(items, null, 2));
       return;
@@ -10862,10 +10910,10 @@ function registerDefinitionCommands(program2, config) {
     for (const item of items) {
       console.log(config.listColumns.map((col, i) => col.accessor(item).padEnd(widths[i])).join("  "));
     }
-    const total = config.extractTotal?.(data);
     if (total !== undefined && total > items.length) {
+      const hint = opts.search ? `(narrow with --search or use --all)` : `(use --search <term> or --all to load everything)`;
       console.log(source_default.dim(`
-${items.length} of ${total} ${config.typeNamePlural} (use --limit ${total} to see all)`));
+${items.length} of ${total} ${config.typeNamePlural} ${hint}`));
     } else {
       console.log(source_default.dim(`
 ${items.length} ${config.typeNamePlural}`));
@@ -11456,16 +11504,46 @@ Error: ${err instanceof Error ? err.message : String(err)}
 `);
 }
 async function runOneShot(ctx, sessionId, message, isJson, clientId, showTools, timeoutMs) {
+  const toolCalls = [];
+  function recordToolStatus(data) {
+    try {
+      const tools = JSON.parse(data);
+      for (const t of tools) {
+        const name = t.tool_name ?? t.tool_label;
+        if (!name)
+          continue;
+        toolCalls.push({ name, status: t.status });
+      }
+    } catch {}
+  }
+  function recordToolCall(data) {
+    try {
+      const parsed = JSON.parse(data);
+      if (parsed.name)
+        toolCalls.push({ name: parsed.name });
+    } catch {}
+  }
   const { response } = await sendMessage(ctx, sessionId, message, {
     clientId,
     timeoutMs,
-    onToolCall: showTools ? (data) => process.stderr.write(formatToolCall(data)) : undefined,
+    onToolStatus: isJson ? recordToolStatus : showTools ? (data) => {
+      recordToolStatus(data);
+      process.stderr.write(formatToolStatus(data));
+    } : undefined,
+    onToolCall: isJson ? recordToolCall : showTools ? (data) => {
+      recordToolCall(data);
+      process.stderr.write(formatToolCall(data));
+    } : undefined,
     onToolResult: showTools ? (data) => process.stderr.write(formatToolResult(data)) : undefined,
     onClear: showTools ? () => process.stderr.write(source_default.dim(`  --- tool iteration ---
 `)) : undefined
   });
   if (isJson) {
-    console.log(JSON.stringify({ session_id: sessionId, response }));
+    console.log(JSON.stringify({
+      session_id: sessionId,
+      response,
+      tool_calls: toolCalls
+    }));
   } else {
     console.log(response);
   }
@@ -15729,23 +15807,30 @@ async function resolveClientId(ctx, nameOrId) {
 async function resolveDefinitionId(ctx, type, name) {
   if (type === "agent")
     return name;
-  const path5 = type === "function" ? `${DEFS_API}/functions` : `${DEFS_API}/workflows`;
-  const data = await ctx.api.get(path5, {
-    params: { limit: "500", skip: "0" }
-  });
-  let items;
-  if (Array.isArray(data)) {
-    items = data;
-  } else if (data && typeof data === "object" && "items" in data) {
-    items = data.items;
-  } else {
-    throw new CLIError(`Unexpected response shape from ${type}s list`, 1 /* Error */);
-  }
-  const match = items.find((d) => String(d.name ?? "").toLowerCase() === name.toLowerCase());
-  if (!match) {
-    throw new CLIError(`${type} not found: '${name}'`, 3 /* NotFound */, `Run \`martha ${type}s list\` to see available ${type}s.`);
+  const listPath = type === "function" ? `${DEFS_API}/functions` : `${DEFS_API}/workflows`;
+  const exactPath = `${listPath}/${encodeURIComponent(name)}`;
+  try {
+    const exact = await ctx.api.get(exactPath);
+    if (exact && typeof exact === "object" && "id" in exact) {
+      return String(exact.id);
+    }
+  } catch (e) {
+    const code = e?.status ?? e?.statusCode;
+    if (code !== 404)
+      throw e;
   }
-  return String(match.id);
+  let suggestion = "";
+  try {
+    const fuzzy = await ctx.api.get(listPath, {
+      params: { name_contains: name, limit: "5", skip: "0" }
+    });
+    const items = Array.isArray(fuzzy) ? fuzzy : fuzzy && typeof fuzzy === "object" && ("items" in fuzzy) ? fuzzy.items : [];
+    const names = items.map((d) => String(d.name ?? "")).filter((n) => n.length > 0).slice(0, 5);
+    if (names.length > 0) {
+      suggestion = `Did you mean: ${names.join(", ")}?`;
+    }
+  } catch {}
+  throw new CLIError(`${type} not found: '${name}'`, 3 /* NotFound */, suggestion || `Run \`martha ${type}s list --search ${name}\` to find it.`);
 }
 function formatDate(val) {
   if (!val)
@@ -16231,7 +16316,11 @@ ${clients.length} client(s)`));
     const result = await ctx.api.get(`${API}/${clientId}`);
     const assetBaseUrl = getEmbedAssetBaseUrl(ctx.profile.api_url);
     if (isJson()) {
-      console.log(JSON.stringify({ ...result, asset_base_url: assetBaseUrl, embed_credentials: credentials }, null, 2));
+      console.log(JSON.stringify({
+        ...result,
+        asset_base_url: assetBaseUrl,
+        embed_credentials: credentials
+      }, null, 2));
       return;
     }
     printEmbedSummary(result, assetBaseUrl);
@@ -16331,7 +16420,9 @@ ${clients.length} client(s)`));
       const manifestPath = `/api/embed/manifest/${encodeURIComponent(key)}`;
       const manifest = await ctx.api.get(manifestPath, { headers: { Origin: origin } });
       const deniedUrl = `${deriveMarthaWebOrigin(ctx.profile.api_url)}${manifestPath}`;
-      const denied = await fetch(deniedUrl, { headers: { Origin: deniedOrigin } });
+      const denied = await fetch(deniedUrl, {
+        headers: { Origin: deniedOrigin }
+      });
       if (denied.status !== 403) {
         throw new CLIError(`Denied-origin manifest check expected 403, got ${denied.status}`, 1 /* Error */);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiaiai-pt/martha-cli",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Terminal-first client for the Martha AI platform",
   "homepage": "https://docs.martha.nomadriver.co",
   "repository": {