march-cli 0.1.13 → 0.1.15

package/src/provider/custom-provider.mjs

@@ -52,7 +52,7 @@ function normalizeModels(providerId, models, { api, baseUrl }) {
       api: normalizeApi(providerId, model.api ?? api),
       baseUrl: typeof model.baseUrl === "string" && model.baseUrl.trim() ? model.baseUrl : baseUrl,
       reasoning: typeof model.reasoning === "boolean" ? model.reasoning : false,
-      input: normalizeInput(model.input),
+      input: normalizeInput(model.input, model.capabilities),
       cost: normalizeCost(model.cost),
       contextWindow: normalizePositiveNumber(model.contextWindow, 128000),
       maxTokens: normalizePositiveNumber(model.maxTokens, 4096),
@@ -75,9 +75,10 @@ function requireString(providerId, field, value) {
   return value;
 }
 
-function normalizeInput(input) {
-  if (!Array.isArray(input) || input.length === 0) return ["text"];
-  const normalized = input.filter((item) => item === "text" || item === "image");
+function normalizeInput(input, capabilities = null) {
+  const normalized = Array.isArray(input) ? input.filter((item) => item === "text" || item === "image") : [];
+  if ((capabilities?.images === true || capabilities?.vision === true) && !normalized.includes("image")) normalized.push("image");
+  if (!normalized.includes("text")) normalized.unshift("text");
   return normalized.length > 0 ? normalized : ["text"];
 }
 

package/src/provider/share-command.mjs

@@ -0,0 +1,79 @@
+import { globalConfigJsonPath, readConfigJson } from "../config/config-json.mjs";
+import { selectWithKeyboard } from "../cli/input/select-with-keyboard.mjs";
+import { cloneProviderForShare, createProviderShareToken, hasApiKey } from "./share-payload.mjs";
+
+export async function runProviderShareCommand({
+  homeDir,
+  providerId,
+  includeKey = false,
+  profileOnly = false,
+  input = process.stdin,
+  output = process.stdout,
+  select = selectWithKeyboard,
+} = {}) {
+  if (includeKey && profileOnly) {
+    output.write("Choose either --include-key or --profile-only, not both.\n");
+    return 1;
+  }
+
+  const config = readConfigJson(globalConfigJsonPath(homeDir));
+  const providers = normalizeProviders(config.providers);
+  const selectedProviderId = providerId ?? await selectProvider({ providers, input, output, select });
+  if (!selectedProviderId) {
+    output.write(Object.keys(providers).length ? "Provider share cancelled.\n" : "No providers configured. Run: march provider --config\n");
+    return 1;
+  }
+
+  const provider = providers[selectedProviderId];
+  if (!provider) {
+    output.write(`Provider not found: ${selectedProviderId}\n`);
+    return 1;
+  }
+
+  const includeApiKey = includeKey || (!profileOnly && await selectShareMode({ input, output, select }));
+  const sharedProvider = cloneProviderForShare(provider, { includeApiKey });
+  const token = createProviderShareToken({
+    providerId: selectedProviderId,
+    provider: sharedProvider,
+    mode: includeApiKey ? "full" : "profile-only",
+  });
+
+  output.write(`Provider: ${selectedProviderId}\n`);
+  output.write(`Mode: ${includeApiKey ? "Full config, including API key" : "Profile only, without API key"}\n`);
+  output.write(`API key: ${hasApiKey(sharedProvider) ? "included" : "not included"}\n\n`);
+  output.write(`march provider accept ${token}\n`);
+  return 0;
+}
+
+function normalizeProviders(providers) {
+  return providers && typeof providers === "object" && !Array.isArray(providers) ? providers : {};
+}
+
+async function selectProvider({ providers, input, output, select }) {
+  const items = Object.entries(providers).map(([id, provider]) => ({
+    value: id,
+    label: formatProviderLabel(id, provider),
+  }));
+  return await select({ input, output, message: "Choose provider to share", items });
+}
+
+async function selectShareMode({ input, output, select }) {
+  const mode = await select({
+    input,
+    output,
+    message: "Choose share mode",
+    items: [
+      { label: "Full config, including API key", value: "full" },
+      { label: "Profile only, without API key", value: "profile-only" },
+    ],
+  });
+  return mode === "full";
+}
+
+function formatProviderLabel(id, provider) {
+  const name = typeof provider?.name === "string" && provider.name ? provider.name : "-";
+  const type = typeof provider?.type === "string" && provider.type ? provider.type : "unknown";
+  const modelCount = Array.isArray(provider?.models) ? `${provider.models.length} model${provider.models.length === 1 ? "" : "s"}` : "built-in";
+  const key = hasApiKey(provider) ? "API key configured" : "no API key";
+  return `${id}  ${name}  ${type}  ${modelCount}  ${key}`;
+}

package/src/provider/share-payload.mjs

@@ -0,0 +1,52 @@
+const KIND = "march.provider.share";
+const VERSION = 1;
+const PREFIX = "march-provider-v1.";
+
+export function createProviderShareToken({ providerId, provider, mode }) {
+  const payload = {
+    kind: KIND,
+    version: VERSION,
+    mode,
+    containsApiKey: hasApiKey(provider),
+    providerId,
+    provider,
+  };
+  return `${PREFIX}${Buffer.from(JSON.stringify(payload), "utf8").toString("base64url")}`;
+}
+
+export function parseProviderShareToken(token) {
+  const text = String(token ?? "").trim();
+  if (!text.startsWith(PREFIX)) throw new Error(`Provider share token must start with ${PREFIX}`);
+  let payload;
+  try {
+    payload = JSON.parse(Buffer.from(text.slice(PREFIX.length), "base64url").toString("utf8"));
+  } catch {
+    throw new Error("Invalid provider share token");
+  }
+  validateProviderSharePayload(payload);
+  return payload;
+}
+
+export function cloneProviderForShare(provider, { includeApiKey }) {
+  const clone = structuredClone(provider);
+  if (!includeApiKey && clone.auth && typeof clone.auth === "object" && !Array.isArray(clone.auth)) {
+    delete clone.auth.apiKey;
+  }
+  return clone;
+}
+
+export function hasApiKey(provider) {
+  return typeof provider?.auth?.apiKey === "string" && provider.auth.apiKey.length > 0;
+}
+
+export function validateProviderSharePayload(payload) {
+  if (!payload || typeof payload !== "object" || Array.isArray(payload)) throw new Error("Invalid provider share payload");
+  if (payload.kind !== KIND || payload.version !== VERSION) throw new Error("Unsupported provider share token");
+  if (typeof payload.providerId !== "string" || !payload.providerId.trim()) throw new Error("Provider share token is missing providerId");
+  validateProviderProfile(payload.provider);
+}
+
+function validateProviderProfile(provider) {
+  if (!provider || typeof provider !== "object" || Array.isArray(provider)) throw new Error("Provider share token is missing provider config");
+  if (typeof provider.type !== "string" || !provider.type.trim()) throw new Error("Provider config is missing type");
+}

package/src/supergrok/tool.mjs

@@ -13,14 +13,14 @@ export function createSuperGrokTool({ authStorage, projectMarchDir, resolveCrede
     name: "supergrok",
     label: "SuperGrok",
     description:
-      "Use SuperGrok capabilities through xAI: realtime web search, X/Twitter search, and Grok image generation. " +
-      "Default search behavior is broad and enables image/video understanding where supported. Requires SuperGrok OAuth or XAI_API_KEY.",
-    promptSnippet: "supergrok(action, query, options?) - Use SuperGrok web_search, x_search, or image_generate",
+      "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: [
-      "Use action=web_search for current web/news/documentation facts.",
-      "Use action=x_search for current X/Twitter posts, reactions, profiles, and threads.",
+      "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.",
-      "Do not add domain, handle, or date filters unless the user asks for that narrower scope.",
+      "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" }),