march-cli 0.1.24 → 0.1.25

package/src/supergrok/response.mjs

@@ -1,76 +1,76 @@
-export function successEnvelope({ credentialSource, action, model, query, answer = "", citations = [], inlineCitations = [], artifacts = [], extra = {} }) {
-  return {
-    success: true,
-    provider: "xai",
-    credential_source: credentialSource,
-    action,
-    model,
-    query,
-    answer,
-    citations,
-    inline_citations: inlineCitations,
-    artifacts,
-    ...extra,
-  };
-}
-
-export function errorEnvelope({ credentialSource = null, action, model = null, query = "", error, errorType = "error" }) {
-  return {
-    success: false,
-    provider: "xai",
-    credential_source: credentialSource,
-    action,
-    model,
-    query,
-    error,
-    error_type: errorType,
-  };
-}
-
-export function extractResponseText(payload) {
-  const outputText = String(payload?.output_text || "").trim();
-  if (outputText) return outputText;
-
-  const parts = [];
-  for (const item of payload?.output || []) {
-    if (item?.type !== "message") continue;
-    for (const content of item.content || []) {
-      if (content?.type !== "output_text" && content?.type !== "text") continue;
-      const text = String(content.text || "").trim();
-      if (text) parts.push(text);
-    }
-  }
-  return parts.join("\n\n").trim();
-}
-
-export function extractInlineCitations(payload) {
-  const citations = [];
-  for (const item of payload?.output || []) {
-    if (item?.type !== "message") continue;
-    for (const content of item.content || []) {
-      for (const annotation of content.annotations || []) {
-        if (annotation?.type !== "url_citation") continue;
-        citations.push({
-          url: annotation.url || "",
-          title: annotation.title || "",
-          start_index: annotation.start_index,
-          end_index: annotation.end_index,
-        });
-      }
-    }
-  }
-  return citations;
-}
-
-export async function readErrorMessage(response) {
-  const text = await response.text().catch(() => "");
-  if (!text) return response.statusText || `HTTP ${response.status}`;
-  try {
-    const json = JSON.parse(text);
-    if (typeof json.error === "string") return json.code && !json.error.includes(json.code) ? `${json.code}: ${json.error}` : json.error;
-    if (json.error?.message) return json.error.message;
-    return JSON.stringify(json).slice(0, 500);
-  } catch {
-    return text.slice(0, 500);
-  }
-}
+export function successEnvelope({ credentialSource, action, model, query, answer = "", citations = [], inlineCitations = [], artifacts = [], extra = {} }) {
+  return {
+    success: true,
+    provider: "xai",
+    credential_source: credentialSource,
+    action,
+    model,
+    query,
+    answer,
+    citations,
+    inline_citations: inlineCitations,
+    artifacts,
+    ...extra,
+  };
+}
+
+export function errorEnvelope({ credentialSource = null, action, model = null, query = "", error, errorType = "error" }) {
+  return {
+    success: false,
+    provider: "xai",
+    credential_source: credentialSource,
+    action,
+    model,
+    query,
+    error,
+    error_type: errorType,
+  };
+}
+
+export function extractResponseText(payload) {
+  const outputText = String(payload?.output_text || "").trim();
+  if (outputText) return outputText;
+
+  const parts = [];
+  for (const item of payload?.output || []) {
+    if (item?.type !== "message") continue;
+    for (const content of item.content || []) {
+      if (content?.type !== "output_text" && content?.type !== "text") continue;
+      const text = String(content.text || "").trim();
+      if (text) parts.push(text);
+    }
+  }
+  return parts.join("\n\n").trim();
+}
+
+export function extractInlineCitations(payload) {
+  const citations = [];
+  for (const item of payload?.output || []) {
+    if (item?.type !== "message") continue;
+    for (const content of item.content || []) {
+      for (const annotation of content.annotations || []) {
+        if (annotation?.type !== "url_citation") continue;
+        citations.push({
+          url: annotation.url || "",
+          title: annotation.title || "",
+          start_index: annotation.start_index,
+          end_index: annotation.end_index,
+        });
+      }
+    }
+  }
+  return citations;
+}
+
+export async function readErrorMessage(response) {
+  const text = await response.text().catch(() => "");
+  if (!text) return response.statusText || `HTTP ${response.status}`;
+  try {
+    const json = JSON.parse(text);
+    if (typeof json.error === "string") return json.code && !json.error.includes(json.code) ? `${json.code}: ${json.error}` : json.error;
+    if (json.error?.message) return json.error.message;
+    return JSON.stringify(json).slice(0, 500);
+  } catch {
+    return text.slice(0, 500);
+  }
+}

package/src/supergrok/tool.mjs

@@ -1,61 +1,61 @@
-import { defineTool } from "@earendil-works/pi-coding-agent";
-import { Type } from "typebox";
-import { toolText } from "../agent/tool-result.mjs";
-import { resolveSuperGrokCredentials } from "./auth.mjs";
-import { runSuperGrokImageGenerate } from "./actions/image-generate.mjs";
-import { runSuperGrokSearch } from "./actions/search.mjs";
-import { errorEnvelope } from "./response.mjs";
-
-const ACTIONS = ["web_search", "x_search", "image_generate"];
-
-export function createSuperGrokTool({ authStorage, projectMarchDir, resolveCredentials = resolveSuperGrokCredentials, fetchImpl = fetch } = {}) {
-  return defineTool({
-    name: "supergrok",
-    label: "SuperGrok",
-    description:
-      "Use SuperGrok for complex research tasks that would otherwise require multiple searches or source comparison. " +
-      "It is backed by an agent team that can search repeatedly, verify across sources, and synthesize an answer.",
-    promptSnippet: "supergrok(action, query, options?) - Prefer SuperGrok for complex web/X research or Grok image generation",
-    promptGuidelines: [
-      "Prefer action=web_search for broad, ambiguous, current, or multi-step research.",
-      "Use action=x_search for targeted X/Twitter posts, reactions, profiles, and threads.",
-      "Use action=image_generate when the user asks Grok/SuperGrok to create an image.",
-      "Use narrower tools instead for simple lookups, exact URL fetching, targeted X search, or non-Grok image generation.",
-    ],
-    parameters: Type.Object({
-      action: Type.String({ enum: ACTIONS, description: "SuperGrok capability to invoke" }),
-      query: Type.String({ description: "Search query or image prompt" }),
-      options: Type.Optional(Type.Object({}, { additionalProperties: true, description: "Action-specific optional controls" })),
-    }),
-    execute: async (_toolCallId, params) => {
-      const action = params.action;
-      const query = String(params.query || "").trim();
-      const options = params.options && typeof params.options === "object" ? params.options : {};
-      if (!ACTIONS.includes(action)) return toolJson(errorEnvelope({ action, query, error: `Unsupported SuperGrok action: ${action}`, errorType: "invalid_action" }), { error: true });
-      if (!query) return toolJson(errorEnvelope({ action, query, error: "query is required", errorType: "invalid_request" }), { error: true });
-
-      let credentials;
-      try {
-        credentials = await resolveCredentials({ authStorage });
-        const payload = action === "image_generate"
-          ? await runSuperGrokImageGenerate({ query, options, credentials, projectMarchDir, fetchImpl })
-          : await runSuperGrokSearch({ action, query, options, credentials, fetchImpl });
-        return toolJson(payload, payload);
-      } catch (err) {
-        const payload = errorEnvelope({
-          credentialSource: credentials?.credentialSource ?? null,
-          action,
-          model: options.model ?? null,
-          query,
-          error: err.message,
-          errorType: err.name || "error",
-        });
-        return toolJson(payload, { ...payload, error: true });
-      }
-    },
-  });
-}
-
-function toolJson(payload, details = {}) {
-  return toolText(JSON.stringify(payload, null, 2), details);
-}
+import { defineTool } from "@earendil-works/pi-coding-agent";
+import { Type } from "typebox";
+import { toolText } from "../agent/tool-result.mjs";
+import { resolveSuperGrokCredentials } from "./auth.mjs";
+import { runSuperGrokImageGenerate } from "./actions/image-generate.mjs";
+import { runSuperGrokSearch } from "./actions/search.mjs";
+import { errorEnvelope } from "./response.mjs";
+
+const ACTIONS = ["web_search", "x_search", "image_generate"];
+
+export function createSuperGrokTool({ authStorage, projectMarchDir, resolveCredentials = resolveSuperGrokCredentials, fetchImpl = fetch } = {}) {
+  return defineTool({
+    name: "supergrok",
+    label: "SuperGrok",
+    description:
+      "Use SuperGrok for complex research tasks that would otherwise require multiple searches or source comparison. " +
+      "It is backed by an agent team that can search repeatedly, verify across sources, and synthesize an answer.",
+    promptSnippet: "supergrok(action, query, options?) - Prefer SuperGrok for complex web/X research or Grok image generation",
+    promptGuidelines: [
+      "Prefer action=web_search for broad, ambiguous, current, or multi-step research.",
+      "Use action=x_search for targeted X/Twitter posts, reactions, profiles, and threads.",
+      "Use action=image_generate when the user asks Grok/SuperGrok to create an image.",
+      "Use narrower tools instead for simple lookups, exact URL fetching, targeted X search, or non-Grok image generation.",
+    ],
+    parameters: Type.Object({
+      action: Type.String({ enum: ACTIONS, description: "SuperGrok capability to invoke" }),
+      query: Type.String({ description: "Search query or image prompt" }),
+      options: Type.Optional(Type.Object({}, { additionalProperties: true, description: "Action-specific optional controls" })),
+    }),
+    execute: async (_toolCallId, params) => {
+      const action = params.action;
+      const query = String(params.query || "").trim();
+      const options = params.options && typeof params.options === "object" ? params.options : {};
+      if (!ACTIONS.includes(action)) return toolJson(errorEnvelope({ action, query, error: `Unsupported SuperGrok action: ${action}`, errorType: "invalid_action" }), { error: true });
+      if (!query) return toolJson(errorEnvelope({ action, query, error: "query is required", errorType: "invalid_request" }), { error: true });
+
+      let credentials;
+      try {
+        credentials = await resolveCredentials({ authStorage });
+        const payload = action === "image_generate"
+          ? await runSuperGrokImageGenerate({ query, options, credentials, projectMarchDir, fetchImpl })
+          : await runSuperGrokSearch({ action, query, options, credentials, fetchImpl });
+        return toolJson(payload, payload);
+      } catch (err) {
+        const payload = errorEnvelope({
+          credentialSource: credentials?.credentialSource ?? null,
+          action,
+          model: options.model ?? null,
+          query,
+          error: err.message,
+          errorType: err.name || "error",
+        });
+        return toolJson(payload, { ...payload, error: true });
+      }
+    },
+  });
+}
+
+function toolJson(payload, details = {}) {
+  return toolText(JSON.stringify(payload, null, 2), details);
+}

package/src/text/ansi.mjs

@@ -1,3 +1,3 @@
-export function stripAnsi(text) {
-  return String(text ?? "").replace(/\x1b\[[0-?]*[ -/]*[@-~]/g, "");
-}
+export function stripAnsi(text) {
+  return String(text ?? "").replace(/\x1b\[[0-?]*[ -/]*[@-~]/g, "");
+}

package/src/web/config-command.mjs

@@ -1,43 +1,43 @@
-import { createInterface } from "node:readline";
-import { selectWithKeyboard } from "../cli/input/select-with-keyboard.mjs";
-import { globalConfigJsonPath, upsertWebSearchProvider } from "../config/config-json.mjs";
-import { WEB_SEARCH_PRESETS } from "./presets.mjs";
-
-export async function runWebSearchConfigCommand({
-  homeDir,
-  input = process.stdin,
-  output = process.stdout,
-  select = selectWithKeyboard,
-  readSecret = readLine,
-} = {}) {
-  const preset = await select({
-    input,
-    output,
-    message: "Choose web search provider to configure",
-    items: WEB_SEARCH_PRESETS.map((item) => ({ label: item.label, value: item })),
-  });
-  if (!preset) {
-    output.write("Web search configuration cancelled.\n");
-    return 1;
-  }
-
-  const apiKey = String(await readSecret({ input, output, prompt: `${preset.apiKeyLabel}: ` }) ?? "").trim();
-  if (!apiKey) {
-    output.write("API key is required.\n");
-    return 1;
-  }
-
-  const path = globalConfigJsonPath(homeDir);
-  upsertWebSearchProvider({ path, id: preset.id, apiKey });
-  output.write(`Saved web search provider: ${preset.label}\n`);
-  output.write(`Config: ${path}\n`);
-  return 0;
-}
-
-function readLine({ input = process.stdin, output = process.stdout, prompt }) {
-  const rl = createInterface({ input, output });
-  return new Promise((resolve) => rl.question(prompt, (answer) => {
-    rl.close();
-    resolve(answer);
-  }));
-}
+import { createInterface } from "node:readline";
+import { selectWithKeyboard } from "../cli/input/select-with-keyboard.mjs";
+import { globalConfigJsonPath, upsertWebSearchProvider } from "../config/config-json.mjs";
+import { WEB_SEARCH_PRESETS } from "./presets.mjs";
+
+export async function runWebSearchConfigCommand({
+  homeDir,
+  input = process.stdin,
+  output = process.stdout,
+  select = selectWithKeyboard,
+  readSecret = readLine,
+} = {}) {
+  const preset = await select({
+    input,
+    output,
+    message: "Choose web search provider to configure",
+    items: WEB_SEARCH_PRESETS.map((item) => ({ label: item.label, value: item })),
+  });
+  if (!preset) {
+    output.write("Web search configuration cancelled.\n");
+    return 1;
+  }
+
+  const apiKey = String(await readSecret({ input, output, prompt: `${preset.apiKeyLabel}: ` }) ?? "").trim();
+  if (!apiKey) {
+    output.write("API key is required.\n");
+    return 1;
+  }
+
+  const path = globalConfigJsonPath(homeDir);
+  upsertWebSearchProvider({ path, id: preset.id, apiKey });
+  output.write(`Saved web search provider: ${preset.label}\n`);
+  output.write(`Config: ${path}\n`);
+  return 0;
+}
+
+function readLine({ input = process.stdin, output = process.stdout, prompt }) {
+  const rl = createInterface({ input, output });
+  return new Promise((resolve) => rl.question(prompt, (answer) => {
+    rl.close();
+    resolve(answer);
+  }));
+}

package/src/web/fetch.mjs

@@ -1,78 +1,78 @@
-/**
- * Web fetch tool — fetches a URL and extracts readable content.
- * No API key required. Uses basic HTML-to-text extraction.
- */
-
-const MAX_CONTENT_LENGTH = 50_000;
-
-export async function fetchWebPage(url, { timeout = 15_000 } = {}) {
-  const controller = new AbortController();
-  const timer = setTimeout(() => controller.abort(), timeout);
-
-  try {
-    const res = await fetch(url, {
-      signal: controller.signal,
-      headers: {
-        "User-Agent": "March/0.1 (web-fetch)",
-        Accept: "text/html,application/xhtml+xml,text/plain",
-      },
-      redirect: "follow",
-    });
-
-    if (!res.ok) {
-      throw new Error(`HTTP ${res.status}: ${res.statusText}`);
-    }
-
-    const contentType = res.headers.get("content-type") ?? "";
-    if (!contentType.includes("text/html") && !contentType.includes("text/plain")) {
-      throw new Error(`Unsupported content type: ${contentType}`);
-    }
-
-    const raw = await res.text();
-    return extractText(raw, url);
-  } finally {
-    clearTimeout(timer);
-  }
-}
-
-function extractText(html, baseUrl) {
-  // Strip scripts, styles, and metadata
-  let text = html
-    .replace(/<script[^>]*>[\s\S]*?<\/script>/gi, "")
-    .replace(/<style[^>]*>[\s\S]*?<\/style>/gi, "")
-    .replace(/<head[^>]*>[\s\S]*?<\/head>/gi, "")
-    .replace(/<noscript[^>]*>[\s\S]*?<\/noscript>/gi, "");
-
-  // Convert block elements to newlines
-  text = text.replace(/<\/(div|p|h[1-6]|li|tr|article|section|header|footer|nav|main|aside)[^>]*>/gi, "\n");
-  text = text.replace(/<br\s*\/?>/gi, "\n");
-  text = text.replace(/<\/?(div|p|h[1-6]|li|tr|article|section|header|footer|nav|main|aside)[^>]*>/gi, "");
-
-  // Strip remaining tags
-  text = text.replace(/<[^>]+>/g, "");
-
-  // Decode entities
-  text = text
-    .replace(/&amp;/g, "&")
-    .replace(/&lt;/g, "<")
-    .replace(/&gt;/g, ">")
-    .replace(/&quot;/g, '"')
-    .replace(/&#39;/g, "'")
-    .replace(/&nbsp;/g, " ");
-
-  // Collapse whitespace
-  text = text.replace(/[ \t]+/g, " ");
-  text = text.replace(/\n{3,}/g, "\n\n");
-  text = text.trim();
-
-  if (text.length > MAX_CONTENT_LENGTH) {
-    text = text.slice(0, MAX_CONTENT_LENGTH) + "\n\n...(content truncated)";
-  }
-
-  return {
-    text,
-    url: baseUrl,
-    length: text.length,
-    truncated: text.length >= MAX_CONTENT_LENGTH,
-  };
-}
+/**
+ * Web fetch tool — fetches a URL and extracts readable content.
+ * No API key required. Uses basic HTML-to-text extraction.
+ */
+
+const MAX_CONTENT_LENGTH = 50_000;
+
+export async function fetchWebPage(url, { timeout = 15_000 } = {}) {
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), timeout);
+
+  try {
+    const res = await fetch(url, {
+      signal: controller.signal,
+      headers: {
+        "User-Agent": "March/0.1 (web-fetch)",
+        Accept: "text/html,application/xhtml+xml,text/plain",
+      },
+      redirect: "follow",
+    });
+
+    if (!res.ok) {
+      throw new Error(`HTTP ${res.status}: ${res.statusText}`);
+    }
+
+    const contentType = res.headers.get("content-type") ?? "";
+    if (!contentType.includes("text/html") && !contentType.includes("text/plain")) {
+      throw new Error(`Unsupported content type: ${contentType}`);
+    }
+
+    const raw = await res.text();
+    return extractText(raw, url);
+  } finally {
+    clearTimeout(timer);
+  }
+}
+
+function extractText(html, baseUrl) {
+  // Strip scripts, styles, and metadata
+  let text = html
+    .replace(/<script[^>]*>[\s\S]*?<\/script>/gi, "")
+    .replace(/<style[^>]*>[\s\S]*?<\/style>/gi, "")
+    .replace(/<head[^>]*>[\s\S]*?<\/head>/gi, "")
+    .replace(/<noscript[^>]*>[\s\S]*?<\/noscript>/gi, "");
+
+  // Convert block elements to newlines
+  text = text.replace(/<\/(div|p|h[1-6]|li|tr|article|section|header|footer|nav|main|aside)[^>]*>/gi, "\n");
+  text = text.replace(/<br\s*\/?>/gi, "\n");
+  text = text.replace(/<\/?(div|p|h[1-6]|li|tr|article|section|header|footer|nav|main|aside)[^>]*>/gi, "");
+
+  // Strip remaining tags
+  text = text.replace(/<[^>]+>/g, "");
+
+  // Decode entities
+  text = text
+    .replace(/&amp;/g, "&")
+    .replace(/&lt;/g, "<")
+    .replace(/&gt;/g, ">")
+    .replace(/&quot;/g, '"')
+    .replace(/&#39;/g, "'")
+    .replace(/&nbsp;/g, " ");
+
+  // Collapse whitespace
+  text = text.replace(/[ \t]+/g, " ");
+  text = text.replace(/\n{3,}/g, "\n\n");
+  text = text.trim();
+
+  if (text.length > MAX_CONTENT_LENGTH) {
+    text = text.slice(0, MAX_CONTENT_LENGTH) + "\n\n...(content truncated)";
+  }
+
+  return {
+    text,
+    url: baseUrl,
+    length: text.length,
+    truncated: text.length >= MAX_CONTENT_LENGTH,
+  };
+}

package/src/web/presets.mjs

@@ -1,16 +1,16 @@
-export const WEB_SEARCH_PRESETS = [
-  {
-    id: "tavily",
-    label: "Tavily",
-    apiKeyLabel: "Tavily API key",
-  },
-  {
-    id: "brave",
-    label: "Brave Search",
-    apiKeyLabel: "Brave Search API key",
-  },
-];
-
-export function getWebSearchPreset(id) {
-  return WEB_SEARCH_PRESETS.find((preset) => preset.id === id) ?? null;
-}
+export const WEB_SEARCH_PRESETS = [
+  {
+    id: "tavily",
+    label: "Tavily",
+    apiKeyLabel: "Tavily API key",
+  },
+  {
+    id: "brave",
+    label: "Brave Search",
+    apiKeyLabel: "Brave Search API key",
+  },
+];
+
+export function getWebSearchPreset(id) {
+  return WEB_SEARCH_PRESETS.find((preset) => preset.id === id) ?? null;
+}