march-cli 0.1.24 → 0.1.25

package/src/supergrok/actions/image-generate.mjs

@@ -1,60 +1,60 @@
-import { DEFAULT_SUPERGROK_IMAGE_MODEL } from "../constants.mjs";
-import { readErrorMessage, successEnvelope } from "../response.mjs";
-import { saveGeneratedImageAttachment } from "../../session/attachments.mjs";
-
-const ASPECT_RATIOS = new Set(["1:1", "16:9", "4:3", "3:2", "2:3", "3:4", "9:16"]);
-const RESOLUTIONS = new Set(["1k", "2k"]);
-
-export async function runSuperGrokImageGenerate({ query, options = {}, credentials, projectMarchDir, fetchImpl = fetch } = {}) {
-  if (!projectMarchDir) throw new Error("projectMarchDir is required for SuperGrok image generation");
-  const model = String(options.model || DEFAULT_SUPERGROK_IMAGE_MODEL).trim() || DEFAULT_SUPERGROK_IMAGE_MODEL;
-  const aspectRatio = normalizeEnum(options.aspect_ratio, ASPECT_RATIOS, "1:1");
-  const resolution = normalizeEnum(options.resolution, RESOLUTIONS, "1k");
-  const response = await fetchImpl(`${credentials.baseUrl}/images/generations`, {
-    method: "POST",
-    headers: {
-      Authorization: `Bearer ${credentials.apiKey}`,
-      "Content-Type": "application/json",
-      "User-Agent": "March-SuperGrok/0.1",
-    },
-    body: JSON.stringify({
-      model,
-      prompt: query,
-      aspect_ratio: aspectRatio,
-      resolution,
-    }),
-  });
-
-  if (!response.ok) {
-    throw new Error(`SuperGrok image generation failed (${response.status}): ${await readErrorMessage(response)}`);
-  }
-
-  const payload = await response.json();
-  const first = payload.data?.[0] || {};
-  const b64 = first.b64_json || first.image_base64 || "";
-  const url = first.url || "";
-  if (!b64 && !url) throw new Error("xAI image response contained neither b64_json nor url");
-
-  const artifacts = [];
-  if (b64) {
-    const saved = saveGeneratedImageAttachment({ projectMarchDir, data: b64, mimeType: "image/png" });
-    artifacts.push({ type: "image", path: saved.path, marker: saved.marker, mimeType: "image/png" });
-  } else {
-    artifacts.push({ type: "image", url, mimeType: first.mime_type || "image/png" });
-  }
-
-  return successEnvelope({
-    credentialSource: credentials.credentialSource,
-    action: "image_generate",
-    model,
-    query,
-    artifacts,
-    extra: { aspect_ratio: aspectRatio, resolution },
-  });
-}
-
-function normalizeEnum(value, allowed, fallback) {
-  const normalized = String(value || fallback).trim();
-  if (!allowed.has(normalized)) return fallback;
-  return normalized;
-}
+import { DEFAULT_SUPERGROK_IMAGE_MODEL } from "../constants.mjs";
+import { readErrorMessage, successEnvelope } from "../response.mjs";
+import { saveGeneratedImageAttachment } from "../../session/attachments.mjs";
+
+const ASPECT_RATIOS = new Set(["1:1", "16:9", "4:3", "3:2", "2:3", "3:4", "9:16"]);
+const RESOLUTIONS = new Set(["1k", "2k"]);
+
+export async function runSuperGrokImageGenerate({ query, options = {}, credentials, projectMarchDir, fetchImpl = fetch } = {}) {
+  if (!projectMarchDir) throw new Error("projectMarchDir is required for SuperGrok image generation");
+  const model = String(options.model || DEFAULT_SUPERGROK_IMAGE_MODEL).trim() || DEFAULT_SUPERGROK_IMAGE_MODEL;
+  const aspectRatio = normalizeEnum(options.aspect_ratio, ASPECT_RATIOS, "1:1");
+  const resolution = normalizeEnum(options.resolution, RESOLUTIONS, "1k");
+  const response = await fetchImpl(`${credentials.baseUrl}/images/generations`, {
+    method: "POST",
+    headers: {
+      Authorization: `Bearer ${credentials.apiKey}`,
+      "Content-Type": "application/json",
+      "User-Agent": "March-SuperGrok/0.1",
+    },
+    body: JSON.stringify({
+      model,
+      prompt: query,
+      aspect_ratio: aspectRatio,
+      resolution,
+    }),
+  });
+
+  if (!response.ok) {
+    throw new Error(`SuperGrok image generation failed (${response.status}): ${await readErrorMessage(response)}`);
+  }
+
+  const payload = await response.json();
+  const first = payload.data?.[0] || {};
+  const b64 = first.b64_json || first.image_base64 || "";
+  const url = first.url || "";
+  if (!b64 && !url) throw new Error("xAI image response contained neither b64_json nor url");
+
+  const artifacts = [];
+  if (b64) {
+    const saved = saveGeneratedImageAttachment({ projectMarchDir, data: b64, mimeType: "image/png" });
+    artifacts.push({ type: "image", path: saved.path, marker: saved.marker, mimeType: "image/png" });
+  } else {
+    artifacts.push({ type: "image", url, mimeType: first.mime_type || "image/png" });
+  }
+
+  return successEnvelope({
+    credentialSource: credentials.credentialSource,
+    action: "image_generate",
+    model,
+    query,
+    artifacts,
+    extra: { aspect_ratio: aspectRatio, resolution },
+  });
+}
+
+function normalizeEnum(value, allowed, fallback) {
+  const normalized = String(value || fallback).trim();
+  if (!allowed.has(normalized)) return fallback;
+  return normalized;
+}

package/src/supergrok/actions/search.mjs

@@ -1,78 +1,78 @@
-import { DEFAULT_SUPERGROK_SEARCH_MODEL } from "../constants.mjs";
-import { extractInlineCitations, extractResponseText, readErrorMessage, successEnvelope } from "../response.mjs";
-
-const MAX_DOMAINS = 5;
-const MAX_HANDLES = 10;
-
-export async function runSuperGrokSearch({ action, query, options = {}, credentials, fetchImpl = fetch } = {}) {
-  const model = String(options.model || DEFAULT_SUPERGROK_SEARCH_MODEL).trim() || DEFAULT_SUPERGROK_SEARCH_MODEL;
-  const tool = action === "x_search" ? buildXSearchTool(options) : buildWebSearchTool(options);
-  const response = await fetchImpl(`${credentials.baseUrl}/responses`, {
-    method: "POST",
-    headers: {
-      Authorization: `Bearer ${credentials.apiKey}`,
-      "Content-Type": "application/json",
-      "User-Agent": "March-SuperGrok/0.1",
-    },
-    body: JSON.stringify({
-      model,
-      input: [{ role: "user", content: query }],
-      tools: [tool],
-      store: false,
-    }),
-  });
-
-  if (!response.ok) {
-    throw new Error(`SuperGrok ${action} failed (${response.status}): ${await readErrorMessage(response)}`);
-  }
-
-  const payload = await response.json();
-  return successEnvelope({
-    credentialSource: credentials.credentialSource,
-    action,
-    model,
-    query,
-    answer: extractResponseText(payload),
-    citations: payload.citations || [],
-    inlineCitations: extractInlineCitations(payload),
-  });
-}
-
-function buildWebSearchTool(options) {
-  const allowed = normalizeList(options.allowed_domains, "allowed_domains", MAX_DOMAINS);
-  const excluded = normalizeList(options.excluded_domains, "excluded_domains", MAX_DOMAINS);
-  if (allowed.length && excluded.length) throw new Error("allowed_domains and excluded_domains cannot both be set");
-  const tool = {
-    type: "web_search",
-    enable_image_understanding: options.enable_image_understanding ?? true,
-  };
-  if (allowed.length) tool.filters = { allowed_domains: allowed };
-  if (excluded.length) tool.filters = { excluded_domains: excluded };
-  return tool;
-}
-
-function buildXSearchTool(options) {
-  const allowed = normalizeHandles(options.allowed_x_handles, "allowed_x_handles");
-  const excluded = normalizeHandles(options.excluded_x_handles, "excluded_x_handles");
-  if (allowed.length && excluded.length) throw new Error("allowed_x_handles and excluded_x_handles cannot both be set");
-  const tool = {
-    type: "x_search",
-    enable_image_understanding: options.enable_image_understanding ?? true,
-    enable_video_understanding: options.enable_video_understanding ?? true,
-  };
-  if (allowed.length) tool.allowed_x_handles = allowed;
-  if (excluded.length) tool.excluded_x_handles = excluded;
-  if (String(options.from_date || "").trim()) tool.from_date = String(options.from_date).trim();
-  if (String(options.to_date || "").trim()) tool.to_date = String(options.to_date).trim();
-  return tool;
-}
-
-function normalizeHandles(value, fieldName) {
-  return normalizeList(value, fieldName, MAX_HANDLES).map((handle) => handle.replace(/^@+/, "")).filter(Boolean);
-}
-
-function normalizeList(value, fieldName, max) {
-  const list = Array.isArray(value) ? value.map((item) => String(item || "").trim()).filter(Boolean) : [];
-  if (list.length > max) throw new Error(`${fieldName} supports at most ${max} entries`);
-  return list;
-}
+import { DEFAULT_SUPERGROK_SEARCH_MODEL } from "../constants.mjs";
+import { extractInlineCitations, extractResponseText, readErrorMessage, successEnvelope } from "../response.mjs";
+
+const MAX_DOMAINS = 5;
+const MAX_HANDLES = 10;
+
+export async function runSuperGrokSearch({ action, query, options = {}, credentials, fetchImpl = fetch } = {}) {
+  const model = String(options.model || DEFAULT_SUPERGROK_SEARCH_MODEL).trim() || DEFAULT_SUPERGROK_SEARCH_MODEL;
+  const tool = action === "x_search" ? buildXSearchTool(options) : buildWebSearchTool(options);
+  const response = await fetchImpl(`${credentials.baseUrl}/responses`, {
+    method: "POST",
+    headers: {
+      Authorization: `Bearer ${credentials.apiKey}`,
+      "Content-Type": "application/json",
+      "User-Agent": "March-SuperGrok/0.1",
+    },
+    body: JSON.stringify({
+      model,
+      input: [{ role: "user", content: query }],
+      tools: [tool],
+      store: false,
+    }),
+  });
+
+  if (!response.ok) {
+    throw new Error(`SuperGrok ${action} failed (${response.status}): ${await readErrorMessage(response)}`);
+  }
+
+  const payload = await response.json();
+  return successEnvelope({
+    credentialSource: credentials.credentialSource,
+    action,
+    model,
+    query,
+    answer: extractResponseText(payload),
+    citations: payload.citations || [],
+    inlineCitations: extractInlineCitations(payload),
+  });
+}
+
+function buildWebSearchTool(options) {
+  const allowed = normalizeList(options.allowed_domains, "allowed_domains", MAX_DOMAINS);
+  const excluded = normalizeList(options.excluded_domains, "excluded_domains", MAX_DOMAINS);
+  if (allowed.length && excluded.length) throw new Error("allowed_domains and excluded_domains cannot both be set");
+  const tool = {
+    type: "web_search",
+    enable_image_understanding: options.enable_image_understanding ?? true,
+  };
+  if (allowed.length) tool.filters = { allowed_domains: allowed };
+  if (excluded.length) tool.filters = { excluded_domains: excluded };
+  return tool;
+}
+
+function buildXSearchTool(options) {
+  const allowed = normalizeHandles(options.allowed_x_handles, "allowed_x_handles");
+  const excluded = normalizeHandles(options.excluded_x_handles, "excluded_x_handles");
+  if (allowed.length && excluded.length) throw new Error("allowed_x_handles and excluded_x_handles cannot both be set");
+  const tool = {
+    type: "x_search",
+    enable_image_understanding: options.enable_image_understanding ?? true,
+    enable_video_understanding: options.enable_video_understanding ?? true,
+  };
+  if (allowed.length) tool.allowed_x_handles = allowed;
+  if (excluded.length) tool.excluded_x_handles = excluded;
+  if (String(options.from_date || "").trim()) tool.from_date = String(options.from_date).trim();
+  if (String(options.to_date || "").trim()) tool.to_date = String(options.to_date).trim();
+  return tool;
+}
+
+function normalizeHandles(value, fieldName) {
+  return normalizeList(value, fieldName, MAX_HANDLES).map((handle) => handle.replace(/^@+/, "")).filter(Boolean);
+}
+
+function normalizeList(value, fieldName, max) {
+  const list = Array.isArray(value) ? value.map((item) => String(item || "").trim()).filter(Boolean) : [];
+  if (list.length > max) throw new Error(`${fieldName} supports at most ${max} entries`);
+  return list;
+}

package/src/supergrok/auth.mjs

@@ -1,36 +1,36 @@
-import {
-  SUPERGROK_OAUTH_PROVIDER_ID,
-  XAI_API_PROVIDER_ID,
-  XAI_BASE_URL,
-  XAI_OAUTH_COMPAT_PROVIDER_ID,
-} from "./constants.mjs";
-import { registerSuperGrokOAuthProvider } from "./oauth-provider.mjs";
-
-export async function resolveSuperGrokCredentials({ authStorage, baseUrl = XAI_BASE_URL } = {}) {
-  registerSuperGrokOAuthProvider();
-
-  for (const providerId of [SUPERGROK_OAUTH_PROVIDER_ID, XAI_OAUTH_COMPAT_PROVIDER_ID]) {
-    const apiKey = await authStorage?.getApiKey?.(providerId, { includeFallback: false });
-    if (apiKey) {
-      const credentials = authStorage?.get?.(providerId) ?? {};
-      return {
-        provider: "xai",
-        credentialSource: providerId,
-        apiKey,
-        baseUrl: String(credentials.baseUrl || baseUrl).replace(/\/$/, ""),
-      };
-    }
-  }
-
-  const apiKey = await authStorage?.getApiKey?.(XAI_API_PROVIDER_ID, { includeFallback: true });
-  if (apiKey) {
-    return {
-      provider: "xai",
-      credentialSource: XAI_API_PROVIDER_ID,
-      apiKey,
-      baseUrl: String(baseUrl).replace(/\/$/, ""),
-    };
-  }
-
-  throw new Error("No SuperGrok credentials available. Run: march login supergrok-oauth, or configure XAI_API_KEY / xai provider.");
-}
+import {
+  SUPERGROK_OAUTH_PROVIDER_ID,
+  XAI_API_PROVIDER_ID,
+  XAI_BASE_URL,
+  XAI_OAUTH_COMPAT_PROVIDER_ID,
+} from "./constants.mjs";
+import { registerSuperGrokOAuthProvider } from "./oauth-provider.mjs";
+
+export async function resolveSuperGrokCredentials({ authStorage, baseUrl = XAI_BASE_URL } = {}) {
+  registerSuperGrokOAuthProvider();
+
+  for (const providerId of [SUPERGROK_OAUTH_PROVIDER_ID, XAI_OAUTH_COMPAT_PROVIDER_ID]) {
+    const apiKey = await authStorage?.getApiKey?.(providerId, { includeFallback: false });
+    if (apiKey) {
+      const credentials = authStorage?.get?.(providerId) ?? {};
+      return {
+        provider: "xai",
+        credentialSource: providerId,
+        apiKey,
+        baseUrl: String(credentials.baseUrl || baseUrl).replace(/\/$/, ""),
+      };
+    }
+  }
+
+  const apiKey = await authStorage?.getApiKey?.(XAI_API_PROVIDER_ID, { includeFallback: true });
+  if (apiKey) {
+    return {
+      provider: "xai",
+      credentialSource: XAI_API_PROVIDER_ID,
+      apiKey,
+      baseUrl: String(baseUrl).replace(/\/$/, ""),
+    };
+  }
+
+  throw new Error("No SuperGrok credentials available. Run: march login supergrok-oauth, or configure XAI_API_KEY / xai provider.");
+}

package/src/supergrok/constants.mjs

@@ -1,18 +1,18 @@
-export const SUPERGROK_OAUTH_PROVIDER_ID = "supergrok-oauth";
-export const XAI_OAUTH_COMPAT_PROVIDER_ID = "xai-oauth";
-export const XAI_API_PROVIDER_ID = "xai";
-
-export const XAI_BASE_URL = "https://api.x.ai/v1";
-export const XAI_OAUTH_ISSUER = "https://auth.x.ai";
-export const XAI_OAUTH_DISCOVERY_URL = `${XAI_OAUTH_ISSUER}/.well-known/openid-configuration`;
-
-// Hermes/Grok CLI client id. xAI currently ties SuperGrok subscription access to this public client.
-export const XAI_OAUTH_CLIENT_ID = "b1a00492-073a-47ea-816f-4c329264a828";
-export const XAI_OAUTH_SCOPE = "openid profile email offline_access grok-cli:access api:access";
-export const XAI_OAUTH_REDIRECT_HOST = "127.0.0.1";
-export const XAI_OAUTH_REDIRECT_PORT = 56121;
-export const XAI_OAUTH_REDIRECT_PATH = "/callback";
-
-export const DEFAULT_SUPERGROK_MODEL = "grok-4.3";
-export const DEFAULT_SUPERGROK_SEARCH_MODEL = "grok-4.3";
-export const DEFAULT_SUPERGROK_IMAGE_MODEL = "grok-imagine-image";
+export const SUPERGROK_OAUTH_PROVIDER_ID = "supergrok-oauth";
+export const XAI_OAUTH_COMPAT_PROVIDER_ID = "xai-oauth";
+export const XAI_API_PROVIDER_ID = "xai";
+
+export const XAI_BASE_URL = "https://api.x.ai/v1";
+export const XAI_OAUTH_ISSUER = "https://auth.x.ai";
+export const XAI_OAUTH_DISCOVERY_URL = `${XAI_OAUTH_ISSUER}/.well-known/openid-configuration`;
+
+// Hermes/Grok CLI client id. xAI currently ties SuperGrok subscription access to this public client.
+export const XAI_OAUTH_CLIENT_ID = "b1a00492-073a-47ea-816f-4c329264a828";
+export const XAI_OAUTH_SCOPE = "openid profile email offline_access grok-cli:access api:access";
+export const XAI_OAUTH_REDIRECT_HOST = "127.0.0.1";
+export const XAI_OAUTH_REDIRECT_PORT = 56121;
+export const XAI_OAUTH_REDIRECT_PATH = "/callback";
+
+export const DEFAULT_SUPERGROK_MODEL = "grok-4.3";
+export const DEFAULT_SUPERGROK_SEARCH_MODEL = "grok-4.3";
+export const DEFAULT_SUPERGROK_IMAGE_MODEL = "grok-imagine-image";