march-cli 0.1.21 → 0.1.22

package/src/cli/commands/model-command.mjs

@@ -1,141 +1,141 @@
-import { getProviderLabel } from "../../provider/presets.mjs";
-import { globalConfigJsonPath, upsertModelSelection } from "../../config/config-json.mjs";
-
-// Deduplicate models by id, preferring canonical providers.
-// When the same model id appears under multiple providers (e.g. supergrok-oauth
-// and xai-oauth), keep only the entry with the preferred provider.
-const PREFERRED_PROVIDERS = ["supergrok-oauth"];
-
-function dedupByModelId(scopedModels) {
-  const seen = new Map();
-  const result = [];
-  for (const entry of scopedModels) {
-    const { model } = entry;
-    const existing = seen.get(model.id);
-    if (!existing) {
-      seen.set(model.id, entry);
-      result.push(entry);
-    } else {
-      // Prefer canonical provider when duplicates exist
-      const existingPref = PREFERRED_PROVIDERS.indexOf(existing.model.provider);
-      const currentPref = PREFERRED_PROVIDERS.indexOf(model.provider);
-      if (currentPref !== -1 && (existingPref === -1 || currentPref < existingPref)) {
-        const idx = result.indexOf(existing);
-        result[idx] = entry;
-        seen.set(model.id, entry);
-      }
-    }
-  }
-  return result;
-}
-
-export function parseModelCommand(input) {
-  if (input !== "/model" && !input.startsWith("/model ")) {
-    return { type: "none" };
-  }
-  const arg = input.slice("/model".length).trim();
-  if (!arg) return { type: "select-interactive" };
-  return { type: "error", message: "Use /model without arguments or Ctrl+L to choose a model." };
-}
-
-export async function selectModelByIndex(index, { runner }) {
-  const scopedModels = runner.getScopedModels?.() || [];
-  if (scopedModels.length === 0) return "(no available models - run `march provider --config`)";
-  const selected = scopedModels[index - 1];
-  if (!selected) return `Error: model index out of range: ${index}`;
-  await runner.setModel(selected.model);
-  const name = selected.model.name || selected.model.id;
-  return `Model: ${name} (${selected.model.provider})`;
-}
-
-export function buildModelSelectItems({ current, scopedModels = [] }) {
-  const deduped = dedupByModelId(scopedModels);
-  return deduped.map(({ model }, index) => ({
-    value: String(index),
-    label: `${model.name || model.id} (${getProviderLabel(model.provider)})`,
-    description: current && model.id === current.id && model.provider === current.provider ? "current" : model.provider,
-    model,
-  }));
-}
-
-export async function handleModelCommand(parsed, { runner, ui = null, configHomeDir } = {}) {
-  if (parsed.type === "select-interactive") {
-    const scopedModels = runner.getScopedModels?.() || [];
-    if (!ui?.selectList || scopedModels.length === 0) return "Use Ctrl+L to choose a model.";
-    const current = runner.getCurrentModel?.();
-    const items = buildModelSelectItems({ current, scopedModels });
-    const selectedIndex = Math.max(0, items.findIndex((item) =>
-      current && item.model.id === current.id && item.model.provider === current.provider
-    ));
-    const selectedItem = await ui.selectList({
-      items,
-      selectedIndex,
-      width: 72,
-      suppressInitialConfirm: true,
-      searchable: true,
-      getSearchText: modelSelectSearchText,
-    });
-    if (!selectedItem) return "Model unchanged.";
-    const model = await runner.setModel(selectedItem.model);
-    persistModelSelection(model, { configHomeDir });
-    return `Model: ${model.name || model.id} (${model.provider})`;
-  }
-  if (parsed.type === "select") return selectModelByIndex(parsed.index, { runner });
-  if (parsed.type === "error") return `Error: ${parsed.message}`;
-  return "";
-}
-
-function modelSelectSearchText(item) {
-  const model = item?.model;
-  return `${item?.label ?? ""} ${model?.name ?? ""} ${model?.id ?? ""} ${model?.provider ?? ""}`;
-}
-
-export function persistModelSelection(model, { configHomeDir } = {}) {
-  if (!model?.provider || !model?.id) return null;
-  return upsertModelSelection({
-    path: globalConfigJsonPath(configHomeDir),
-    provider: model.provider,
-    model: model.__isFast ? model.__baseId : model.id,
-    serviceTier: model.__isFast ? "priority" : undefined,
-  });
-}
-
-export function formatModelsList({ current, scopedModels = [] }) {
-  const lines = [];
-  if (current) {
-    lines.push(`Current: ${current.name || current.id} (${current.provider})`);
-  }
-  if (scopedModels.length === 0) {
-    lines.push("(no available models - run `march provider --config`)");
-    return lines;
-  }
-  lines.push(...formatGroupedModels({ current, scopedModels }));
-  lines.push("Use Ctrl+L or /model to choose a model.");
-  return lines;
-}
-
-function formatGroupedModels({ current, scopedModels }) {
-  const deduped = dedupByModelId(scopedModels);
-  const groups = new Map();
-  for (const item of deduped) {
-    const provider = item.model.provider;
-    if (!groups.has(provider)) groups.set(provider, []);
-    groups.get(provider).push(item);
-  }
-  const lines = [];
-  for (const [provider, items] of [...groups.entries()].sort(([a], [b]) => a.localeCompare(b))) {
-    lines.push(`── ${getProviderLabel(provider)} ──`);
-    for (const { model } of items) {
-      const marker = current && model.id === current.id && model.provider === current.provider ? "●" : " ";
-      lines.push(`  ${marker} ${model.name || model.id}`);
-    }
-  }
-  return lines;
-}
-
-export function listModels({ runner }) {
-  return formatModelsList({
-    current: runner.getCurrentModel?.(),
-    scopedModels: runner.getScopedModels?.() || [],
-  });
-}
+import { getProviderLabel } from "../../provider/presets.mjs";
+import { globalConfigJsonPath, upsertModelSelection } from "../../config/config-json.mjs";
+
+// Deduplicate models by id, preferring canonical providers.
+// When the same model id appears under multiple providers (e.g. supergrok-oauth
+// and xai-oauth), keep only the entry with the preferred provider.
+const PREFERRED_PROVIDERS = ["supergrok-oauth"];
+
+function dedupByModelId(scopedModels) {
+  const seen = new Map();
+  const result = [];
+  for (const entry of scopedModels) {
+    const { model } = entry;
+    const existing = seen.get(model.id);
+    if (!existing) {
+      seen.set(model.id, entry);
+      result.push(entry);
+    } else {
+      // Prefer canonical provider when duplicates exist
+      const existingPref = PREFERRED_PROVIDERS.indexOf(existing.model.provider);
+      const currentPref = PREFERRED_PROVIDERS.indexOf(model.provider);
+      if (currentPref !== -1 && (existingPref === -1 || currentPref < existingPref)) {
+        const idx = result.indexOf(existing);
+        result[idx] = entry;
+        seen.set(model.id, entry);
+      }
+    }
+  }
+  return result;
+}
+
+export function parseModelCommand(input) {
+  if (input !== "/model" && !input.startsWith("/model ")) {
+    return { type: "none" };
+  }
+  const arg = input.slice("/model".length).trim();
+  if (!arg) return { type: "select-interactive" };
+  return { type: "error", message: "Use /model without arguments or Ctrl+L to choose a model." };
+}
+
+export async function selectModelByIndex(index, { runner }) {
+  const scopedModels = runner.getScopedModels?.() || [];
+  if (scopedModels.length === 0) return "(no available models - run `march provider --config`)";
+  const selected = scopedModels[index - 1];
+  if (!selected) return `Error: model index out of range: ${index}`;
+  await runner.setModel(selected.model);
+  const name = selected.model.name || selected.model.id;
+  return `Model: ${name} (${selected.model.provider})`;
+}
+
+export function buildModelSelectItems({ current, scopedModels = [] }) {
+  const deduped = dedupByModelId(scopedModels);
+  return deduped.map(({ model }, index) => ({
+    value: String(index),
+    label: `${model.name || model.id} (${getProviderLabel(model.provider)})`,
+    description: current && model.id === current.id && model.provider === current.provider ? "current" : model.provider,
+    model,
+  }));
+}
+
+export async function handleModelCommand(parsed, { runner, ui = null, configHomeDir } = {}) {
+  if (parsed.type === "select-interactive") {
+    const scopedModels = runner.getScopedModels?.() || [];
+    if (!ui?.selectList || scopedModels.length === 0) return "Use Ctrl+L to choose a model.";
+    const current = runner.getCurrentModel?.();
+    const items = buildModelSelectItems({ current, scopedModels });
+    const selectedIndex = Math.max(0, items.findIndex((item) =>
+      current && item.model.id === current.id && item.model.provider === current.provider
+    ));
+    const selectedItem = await ui.selectList({
+      items,
+      selectedIndex,
+      width: 72,
+      suppressInitialConfirm: true,
+      searchable: true,
+      getSearchText: modelSelectSearchText,
+    });
+    if (!selectedItem) return "Model unchanged.";
+    const model = await runner.setModel(selectedItem.model);
+    persistModelSelection(model, { configHomeDir });
+    return `Model: ${model.name || model.id} (${model.provider})`;
+  }
+  if (parsed.type === "select") return selectModelByIndex(parsed.index, { runner });
+  if (parsed.type === "error") return `Error: ${parsed.message}`;
+  return "";
+}
+
+function modelSelectSearchText(item) {
+  const model = item?.model;
+  return `${item?.label ?? ""} ${model?.name ?? ""} ${model?.id ?? ""} ${model?.provider ?? ""}`;
+}
+
+export function persistModelSelection(model, { configHomeDir } = {}) {
+  if (!model?.provider || !model?.id) return null;
+  return upsertModelSelection({
+    path: globalConfigJsonPath(configHomeDir),
+    provider: model.provider,
+    model: model.__isFast ? model.__baseId : model.id,
+    serviceTier: model.__isFast ? "priority" : undefined,
+  });
+}
+
+export function formatModelsList({ current, scopedModels = [] }) {
+  const lines = [];
+  if (current) {
+    lines.push(`Current: ${current.name || current.id} (${current.provider})`);
+  }
+  if (scopedModels.length === 0) {
+    lines.push("(no available models - run `march provider --config`)");
+    return lines;
+  }
+  lines.push(...formatGroupedModels({ current, scopedModels }));
+  lines.push("Use Ctrl+L or /model to choose a model.");
+  return lines;
+}
+
+function formatGroupedModels({ current, scopedModels }) {
+  const deduped = dedupByModelId(scopedModels);
+  const groups = new Map();
+  for (const item of deduped) {
+    const provider = item.model.provider;
+    if (!groups.has(provider)) groups.set(provider, []);
+    groups.get(provider).push(item);
+  }
+  const lines = [];
+  for (const [provider, items] of [...groups.entries()].sort(([a], [b]) => a.localeCompare(b))) {
+    lines.push(`── ${getProviderLabel(provider)} ──`);
+    for (const { model } of items) {
+      const marker = current && model.id === current.id && model.provider === current.provider ? "●" : " ";
+      lines.push(`  ${marker} ${model.name || model.id}`);
+    }
+  }
+  return lines;
+}
+
+export function listModels({ runner }) {
+  return formatModelsList({
+    current: runner.getCurrentModel?.(),
+    scopedModels: runner.getScopedModels?.() || [],
+  });
+}

package/src/cli/commands/paste-image-command.mjs

@@ -1,43 +1,43 @@
-import { readClipboardImage } from "../input/image-clipboard.mjs";
-import { saveImageAttachment } from "../../session/attachments.mjs";
-import { formatAttachmentMarkerForDisplay } from "../../session/attachment-display.mjs";
-
-export function pasteClipboardImage({
-  ui,
-  projectMarchDir,
-  sessionId,
-  readClipboardImageImpl = readClipboardImage,
-  saveImageAttachmentImpl = saveImageAttachment,
-  now = new Date(),
-} = {}) {
-  const image = readClipboardImageImpl();
-  if (!image?.ok) return [`Error: ${image?.message || "failed to read clipboard image"}`];
-
-  let saved;
-  try {
-    saved = saveImageAttachmentImpl({
-      projectMarchDir,
-      sessionId,
-      data: image.data,
-      mimeType: image.mimeType,
-      source: "clipboard",
-      now,
-    });
-  } catch (err) {
-    return [`Error: failed to save clipboard image: ${err.message}`];
-  }
-
-  const marker = `@.march/${saved.relativePath}`;
-  const displayLabel = formatAttachmentMarkerForDisplay(marker);
-  if (typeof ui?.insertAttachmentAtCursor === "function") {
-    ui.insertAttachmentAtCursor({ marker, label: displayLabel });
-  } else {
-    ui?.insertTextAtCursor?.(withLeadingSpace(ui?.getInputText?.() ?? "", marker));
-  }
-  return [`Attached image: ${displayLabel}`];
-}
-
-export function withLeadingSpace(currentText, marker) {
-  if (!String(currentText || "").trim()) return marker;
-  return ` ${marker}`;
-}
+import { readClipboardImage } from "../input/image-clipboard.mjs";
+import { saveImageAttachment } from "../../session/attachments.mjs";
+import { formatAttachmentMarkerForDisplay } from "../../session/attachment-display.mjs";
+
+export function pasteClipboardImage({
+  ui,
+  projectMarchDir,
+  sessionId,
+  readClipboardImageImpl = readClipboardImage,
+  saveImageAttachmentImpl = saveImageAttachment,
+  now = new Date(),
+} = {}) {
+  const image = readClipboardImageImpl();
+  if (!image?.ok) return [`Error: ${image?.message || "failed to read clipboard image"}`];
+
+  let saved;
+  try {
+    saved = saveImageAttachmentImpl({
+      projectMarchDir,
+      sessionId,
+      data: image.data,
+      mimeType: image.mimeType,
+      source: "clipboard",
+      now,
+    });
+  } catch (err) {
+    return [`Error: failed to save clipboard image: ${err.message}`];
+  }
+
+  const marker = `@.march/${saved.relativePath}`;
+  const displayLabel = formatAttachmentMarkerForDisplay(marker);
+  if (typeof ui?.insertAttachmentAtCursor === "function") {
+    ui.insertAttachmentAtCursor({ marker, label: displayLabel });
+  } else {
+    ui?.insertTextAtCursor?.(withLeadingSpace(ui?.getInputText?.() ?? "", marker));
+  }
+  return [`Attached image: ${displayLabel}`];
+}
+
+export function withLeadingSpace(currentText, marker) {
+  if (!String(currentText || "").trim()) return marker;
+  return ` ${marker}`;
+}

package/src/cli/commands/provider-command.mjs

@@ -1,59 +1,59 @@
-import { getProviderLabel } from "../../provider/presets.mjs";
-
-export function parseProviderCommand(input) {
-  if (input !== "/providers" && !input.startsWith("/providers ")) {
-    return { type: "none" };
-  }
-  const arg = input.slice("/providers".length).trim();
-  if (!arg) return { type: "list" };
-  return { type: "error", message: "Provider switching is done by choosing a model with Ctrl+L or /model." };
-}
-
-export function listProviders({ runner }) {
-  const scopedModels = runner.getScopedModels?.() || [];
-  const seen = new Set();
-  const providers = new Map();
-  for (const { model } of scopedModels) {
-    // Deduplicate: skip models that differ only by provider (e.g. supergrok-oauth vs xai-oauth)
-    if (seen.has(model.id)) continue;
-    seen.add(model.id);
-    if (!providers.has(model.provider)) {
-      providers.set(model.provider, {
-        provider: model.provider,
-        modelCount: 0,
-        defaultModel: model.id,
-      });
-    }
-    const entry = providers.get(model.provider);
-    entry.modelCount += 1;
-  }
-  return [...providers.values()].sort((a, b) => a.provider.localeCompare(b.provider));
-}
-
-export function formatProvidersList({ currentProvider, providers = [] }) {
-  if (providers.length === 0) return ["(no providers available)"];
-  return providers.map(({ provider, modelCount }) => {
-    const marker = provider === currentProvider ? "●" : "○";
-    return `${marker} ${provider} (${modelCount} model${modelCount === 1 ? "" : "s"})`;
-  });
-}
-
-export async function handleProviderCommand(parsed, { ui, runner }) {
-  if (parsed.type === "list") {
-    const configured = runner.getConfiguredProviders?.() ?? [];
-    if (configured.length === 0) {
-      return [
-        "Configured providers: (none)",
-        "Run `march provider --config` outside REPL to add credentials.",
-      ].join("\n");
-    }
-    return [
-      "Configured providers:",
-      ...configured.map((provider) => `  ${getProviderLabel(provider)}`),
-      "Use Ctrl+L or /model to choose a model.",
-      "Run `march provider --config` outside REPL to add/update credentials.",
-    ].join("\n");
-  }
-  if (parsed.type === "error") return `Error: ${parsed.message}`;
-  return "";
-}
+import { getProviderLabel } from "../../provider/presets.mjs";
+
+export function parseProviderCommand(input) {
+  if (input !== "/providers" && !input.startsWith("/providers ")) {
+    return { type: "none" };
+  }
+  const arg = input.slice("/providers".length).trim();
+  if (!arg) return { type: "list" };
+  return { type: "error", message: "Provider switching is done by choosing a model with Ctrl+L or /model." };
+}
+
+export function listProviders({ runner }) {
+  const scopedModels = runner.getScopedModels?.() || [];
+  const seen = new Set();
+  const providers = new Map();
+  for (const { model } of scopedModels) {
+    // Deduplicate: skip models that differ only by provider (e.g. supergrok-oauth vs xai-oauth)
+    if (seen.has(model.id)) continue;
+    seen.add(model.id);
+    if (!providers.has(model.provider)) {
+      providers.set(model.provider, {
+        provider: model.provider,
+        modelCount: 0,
+        defaultModel: model.id,
+      });
+    }
+    const entry = providers.get(model.provider);
+    entry.modelCount += 1;
+  }
+  return [...providers.values()].sort((a, b) => a.provider.localeCompare(b.provider));
+}
+
+export function formatProvidersList({ currentProvider, providers = [] }) {
+  if (providers.length === 0) return ["(no providers available)"];
+  return providers.map(({ provider, modelCount }) => {
+    const marker = provider === currentProvider ? "●" : "○";
+    return `${marker} ${provider} (${modelCount} model${modelCount === 1 ? "" : "s"})`;
+  });
+}
+
+export async function handleProviderCommand(parsed, { ui, runner }) {
+  if (parsed.type === "list") {
+    const configured = runner.getConfiguredProviders?.() ?? [];
+    if (configured.length === 0) {
+      return [
+        "Configured providers: (none)",
+        "Run `march provider --config` outside REPL to add credentials.",
+      ].join("\n");
+    }
+    return [
+      "Configured providers:",
+      ...configured.map((provider) => `  ${getProviderLabel(provider)}`),
+      "Use Ctrl+L or /model to choose a model.",
+      "Run `march provider --config` outside REPL to add/update credentials.",
+    ].join("\n");
+  }
+  if (parsed.type === "error") return `Error: ${parsed.message}`;
+  return "";
+}