march-cli 0.1.5 → 0.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "march-cli",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "March CLI — terminal-native coding agent with context reconstruction",
   "type": "module",
   "main": "./src/main.mjs",

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

@@ -1,6 +1,34 @@
 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" };
@@ -21,9 +49,10 @@ export async function selectModelByIndex(index, { runner }) {
 }
 
 export function buildModelSelectItems({ current, scopedModels = [] }) {
-  return scopedModels.map(({ model }, index) => ({
+  const deduped = dedupByModelId(scopedModels);
+  return deduped.map(({ model }, index) => ({
     value: String(index),
-    label: `${getProviderLabel(model.provider)} / ${model.name || model.id}`,
+    label: `${model.name || model.id} (${getProviderLabel(model.provider)})`,
     description: current && model.id === current.id && model.provider === current.provider ? "current" : model.provider,
     model,
   }));
@@ -34,19 +63,20 @@ export async function handleModelCommand(parsed, { runner, ui = null, configHome
     const scopedModels = runner.getScopedModels?.() || [];
     if (!ui?.selectList || scopedModels.length === 0) return "Use Ctrl+L to choose a model.";
     const current = runner.getCurrentModel?.();
-    const selectedIndex = Math.max(0, scopedModels.findIndex(({ model }) =>
-      current && model.id === current.id && model.provider === current.provider
+    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 item = await ui.selectList({
-      items: buildModelSelectItems({ current, scopedModels }),
+    const selectedItem = await ui.selectList({
+      items,
       selectedIndex,
       width: 72,
       suppressInitialConfirm: true,
       searchable: true,
       getSearchText: modelSelectSearchText,
     });
-    if (!item) return "Model unchanged.";
-    const model = await runner.setModel(item.model);
+    if (!selectedItem) return "Model unchanged.";
+    const model = await runner.setModel(selectedItem.model);
     persistModelSelection(model, { configHomeDir });
     return `Model: ${model.name || model.id} (${model.provider})`;
   }
@@ -85,8 +115,9 @@ export function formatModelsList({ current, scopedModels = [] }) {
 }
 
 function formatGroupedModels({ current, scopedModels }) {
+  const deduped = dedupByModelId(scopedModels);
   const groups = new Map();
-  for (const item of scopedModels) {
+  for (const item of deduped) {
     const provider = item.model.provider;
     if (!groups.has(provider)) groups.set(provider, []);
     groups.get(provider).push(item);

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

@@ -11,8 +11,12 @@ export function parseProviderCommand(input) {
 
 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,

package/src/cli/tui/tui-handlers.mjs

@@ -76,19 +76,20 @@ export function wireTuiHandlers({
       const scopedModels = runner.getScopedModels?.() || [];
       if (ui.selectList && scopedModels.length > 0) {
         const current = runner.getCurrentModel?.();
-        const selectedIndex = Math.max(0, scopedModels.findIndex(({ model }) =>
-          current && model.id === current.id && model.provider === current.provider
+        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 item = await ui.selectList({
-          items: buildModelSelectItems({ current, scopedModels }),
+        const selectedItem = await ui.selectList({
+          items,
           selectedIndex,
           width: 72,
         });
-        if (!item) {
+        if (!selectedItem) {
           ui.writeln(brightBlack(`● model: unchanged`));
           return;
         }
-        const model = await runner.setModel(item.model);
+        const model = await runner.setModel(selectedItem.model);
         persistModelSelection(model, { configHomeDir });
         const name = model.name || model.id;
         ui.writeln(brightBlack(`● model: ${name} (${model.provider})`));

package/src/provider/presets.mjs

@@ -28,10 +28,10 @@ const PROVIDER_LABELS = {
   openai: "OpenAI",
   "openai-codex": "OpenAI Codex",
   openrouter: "OpenRouter",
-  "supergrok-oauth": "SuperGrok OAuth (xAI Subscription)",
+  "supergrok-oauth": "SuperGrok",
   "vercel-ai-gateway": "Vercel AI Gateway",
   xai: "xAI",
-  "xai-oauth": "xAI OAuth (SuperGrok compatible)",
+  "xai-oauth": "xAI OAuth",
   zai: "ZAI",
   xiaomi: "Xiaomi MiMo",
   "xiaomi-token-plan-cn": "Xiaomi MiMo Token Plan (China)",

package/src/supergrok/provider.mjs

@@ -14,7 +14,7 @@ export function registerSuperGrokProvider(modelRegistry) {
   if (!modelRegistry?.registerProvider) return;
   for (const providerId of [SUPERGROK_OAUTH_PROVIDER_ID, XAI_OAUTH_COMPAT_PROVIDER_ID]) {
     modelRegistry.registerProvider(providerId, {
-      name: providerId === SUPERGROK_OAUTH_PROVIDER_ID ? "SuperGrok OAuth (xAI Subscription)" : "xAI OAuth (SuperGrok compatible)",
+      name: providerId === SUPERGROK_OAUTH_PROVIDER_ID ? "SuperGrok" : "xAI OAuth",
       baseUrl: XAI_BASE_URL,
       api: "openai-responses",
       oauth: { ...superGrokOAuthProvider, id: providerId },
@@ -33,4 +33,4 @@ export function registerSuperGrokProvider(modelRegistry) {
 
 export function getDefaultSuperGrokModelId() {
   return DEFAULT_SUPERGROK_MODEL;
-}
+}