@heventure/model-provider-x 0.2.8-beta.0 → 0.2.9-beta.0

package/dist/cli/args.js

@@ -103,11 +103,11 @@ export function parseModelSelection(selection, models) {
     return [...selected];
 }
 export function usage() {
-    return `model-provider-x
+    return `model-provider-x (alias: mpx)
 
 Usage:
-  model-provider-x [options]
-  model-provider-x setup [options]
+  mpx [options]
+  mpx setup [options]
 
 Options:
   --base-url <url>     OpenAI-compatible API base URL, for example http://localhost:8888/v1

package/dist/cli/index.js

@@ -122,6 +122,24 @@ async function runSetup(command) {
     const rl = createInterface({ input, output });
     try {
         output.write(canUseTui() ? renderIntro() : "model-provider-x\n\n");
+        // Check for existing profiles
+        const config = await readToolConfig();
+        const profileIds = Object.keys(config.profiles);
+        let selectedProfileId;
+        if (profileIds.length > 0 && !command.options.baseURL && !command.options.providerPreset) {
+            selectedProfileId = await resolveProfileAction(rl, config, profileIds);
+        }
+        if (selectedProfileId) {
+            const savedProfile = config.profiles[selectedProfileId];
+            const wantModify = await askModifyProfile(rl, savedProfile);
+            if (!wantModify) {
+                // Directly apply saved profile
+                await applySavedProfile(rl, savedProfile);
+                return;
+            }
+            // Pre-fill command options with saved profile
+            command = mergeProfileIntoCommand(command, savedProfile);
+        }
         const providerInput = await collectProviderInput(rl, command);
         output.write("Detecting provider capabilities...\n");
         const capabilities = await detectProviderCapabilities({ baseURL: providerInput.baseURL, apiKey: providerInput.apiKey });
@@ -142,6 +160,135 @@ async function runSetup(command) {
         rl.close();
     }
 }
+async function resolveProfileAction(rl, config, profileIds) {
+    const choices = [
+        { label: "Create new profile", value: undefined, hint: "start fresh" },
+        ...profileIds.map((id) => {
+            const p = config.profiles[id];
+            const keyHint = p.apiKey ? "key set" : "no key";
+            const modelCount = `${p.models.length} models`;
+            const targetHint = p.target ?? "no target";
+            return {
+                label: `${p.name} (${id})`,
+                value: id,
+                hint: `${p.baseURL} · ${modelCount} · ${keyHint} · ${targetHint}`
+            };
+        })
+    ];
+    if (canUseTui()) {
+        return selectChoice("Select profile", choices);
+    }
+    output.write("Existing profiles:\n");
+    choices.forEach((c, i) => {
+        const hint = c.hint ? ` - ${c.hint}` : "";
+        output.write(`  ${i}. ${c.label}${hint}\n`);
+    });
+    const answer = await rl.question("Select profile number or press Enter for new: ");
+    const idx = Number(answer.trim());
+    if (!answer.trim() || !Number.isInteger(idx) || idx === 0)
+        return undefined;
+    return choices[idx]?.value;
+}
+async function askModifyProfile(rl, profile) {
+    output.write(`\nSelected profile: ${profile.name}\n`);
+    output.write(`  Provider: ${profile.baseURL}\n`);
+    output.write(`  Models: ${profile.models.length}\n`);
+    if (profile.target) {
+        output.write(`  Target: ${profile.target}\n`);
+    }
+    if (canUseTui()) {
+        return selectChoice("What to do?", [
+            { label: "Use as-is", value: false, hint: "apply directly" },
+            { label: "Modify settings", value: true, hint: "update models, key, etc." }
+        ]);
+    }
+    const answer = await rl.question("Use this profile as-is or modify? [use/modify] ");
+    return answer.trim().toLowerCase() === "modify";
+}
+async function applySavedProfile(rl, profile) {
+    const target = profile.target ?? "opencode";
+    const toolConfigPath = getDefaultToolConfigPath();
+    if (target === "opencode") {
+        const opencodeApiType = profile.opencodeApiType ?? "chat";
+        const baseURL = profile.proxy
+            ? `http://127.0.0.1:4141/v1`
+            : profile.baseURL;
+        const apiKey = profile.proxy
+            ? (await readToolConfig()).proxy.authToken
+            : profile.apiKey ?? "";
+        const fragment = buildProviderConfig({
+            providerId: profile.id,
+            providerName: profile.name,
+            baseURL,
+            apiKey,
+            models: profile.models,
+            opencodeApiType
+        });
+        const targetPath = await chooseConfigPath(rl, profile.id, false);
+        if (targetPath) {
+            const result = await writeProviderToConfig({ targetPath, providerId: profile.id, provider: fragment.provider[profile.id] });
+            output.write(`Updated ${result.targetPath}\n`);
+            if (result.backupPath) {
+                output.write(`Backup: ${result.backupPath}\n`);
+            }
+        }
+        else {
+            output.write(`${JSON.stringify(fragment, null, 2)}\n`);
+        }
+        return;
+    }
+    if (target === "codex") {
+        const proxyBaseURL = profile.proxy
+            ? `http://127.0.0.1:4141/v1`
+            : profile.baseURL;
+        const result = await writeCodexConfig({
+            targetPath: getDefaultCodexConfigPath(),
+            providerId: profile.id,
+            providerName: profile.name,
+            baseURL: proxyBaseURL,
+            authCommand: "model-provider-x",
+            authArgs: profile.proxy ? ["proxy", "token"] : ["config", "api-key", "--profile", profile.id],
+            model: profile.models[0] ?? ""
+        });
+        output.write(`Updated Codex config: ${result.targetPath}\n`);
+        return;
+    }
+    // claude-code
+    const proxyBaseURL = profile.proxy
+        ? `http://127.0.0.1:4141`
+        : profile.baseURL;
+    const modelMapping = defaultClaudeModelMapping(profile.models[0] ?? "");
+    const result = await writeClaudeCodeSettings({
+        targetPath: getDefaultClaudeSettingsPath(),
+        proxy: {
+            baseURL: proxyBaseURL,
+            authToken: profile.proxy ? (await readToolConfig()).proxy.authToken : profile.apiKey ?? "",
+            enableModelDiscovery: profile.proxy ?? false,
+            defaultModel: profile.models[0] ?? "",
+            models: profile.models,
+            modelMapping
+        }
+    });
+    output.write(`Updated Claude Code settings: ${result.targetPath}\n`);
+}
+function mergeProfileIntoCommand(command, profile) {
+    const opts = { ...command.options };
+    opts.providerName ??= profile.name;
+    opts.providerId ??= profile.id;
+    opts.baseURL ??= profile.baseURL;
+    opts.apiKey ??= profile.apiKey;
+    opts.models ??= profile.models.length > 0 ? profile.models : undefined;
+    opts.opencodeApiType ??= profile.opencodeApiType;
+    if (profile.proxy !== undefined && opts.proxy === undefined) {
+        opts.proxy = profile.proxy;
+    }
+    return {
+        ...command,
+        profileId: profile.id,
+        target: command.target ?? profile.target,
+        options: opts
+    };
+}
 async function collectProviderInput(rl, command) {
     const providerDefaults = await resolveProviderDefaults(rl, command.options);
     const providerName = await requiredOption(rl, command.options.providerName ?? providerDefaults.name, "Provider name");
@@ -212,6 +359,17 @@ async function writeOpenCodeSetup(rl, command, selection, useProxy, capabilities
         output.write(`${JSON.stringify(fragment, null, 2)}\n`);
         return;
     }
+    // Persist complete profile with target, opencodeApiType, and proxy
+    await upsertProviderProfile(selection.toolConfigPath, {
+        id: selection.providerId,
+        name: selection.providerName,
+        baseURL: selection.upstreamBaseURL,
+        apiKey: selection.apiKey.trim() || undefined,
+        models: selection.selectedModels,
+        target: "opencode",
+        opencodeApiType,
+        proxy: useProxy
+    });
     const result = await writeProviderToConfig({ targetPath, providerId: selection.providerId, provider });
     output.write(`Saved profile ${selection.providerId} to ${selection.toolConfigPath}\n`);
     output.write(`Updated ${result.targetPath}\n`);
@@ -245,6 +403,16 @@ async function writeClaudeCodeSetup(rl, command, selection, useProxy) {
             modelMapping
         }
     });
+    // Persist complete profile
+    await upsertProviderProfile(selection.toolConfigPath, {
+        id: selection.providerId,
+        name: selection.providerName,
+        baseURL: selection.upstreamBaseURL,
+        apiKey: selection.apiKey.trim() || undefined,
+        models: selection.selectedModels,
+        target: "claude-code",
+        proxy: useProxy
+    });
     output.write(`Saved profile ${selection.providerId} to ${selection.toolConfigPath}\n`);
     output.write(`Updated Claude Code settings: ${result.targetPath}\n`);
     if (result.backupPath) {
@@ -276,6 +444,16 @@ async function writeCodexSetup(rl, command, selection, useProxy) {
         authArgs: useProxy ? ["proxy", "token"] : ["config", "api-key", "--profile", selection.providerId],
         model: selection.defaultModel
     });
+    // Persist complete profile
+    await upsertProviderProfile(selection.toolConfigPath, {
+        id: selection.providerId,
+        name: selection.providerName,
+        baseURL: selection.upstreamBaseURL,
+        apiKey: selection.apiKey.trim() || undefined,
+        models: selection.selectedModels,
+        target: "codex",
+        proxy: useProxy
+    });
     output.write(`Saved profile ${selection.providerId} to ${selection.toolConfigPath}\n`);
     output.write(`Updated Codex config: ${result.targetPath}\n`);
     if (result.backupPath) {

package/dist/core/tool-config.js

@@ -61,7 +61,10 @@ function normalizeToolConfig(config) {
                     name: String(value.name ?? id),
                     baseURL: String(value.baseURL ?? ""),
                     apiKey: value.apiKey ? String(value.apiKey) : undefined,
-                    models: Array.isArray(value.models) ? value.models.map(String) : []
+                    models: Array.isArray(value.models) ? value.models.map(String) : [],
+                    target: isValidTarget(value.target) ? value.target : undefined,
+                    opencodeApiType: isValidOpencodeApiType(value.opencodeApiType) ? value.opencodeApiType : undefined,
+                    proxy: typeof value.proxy === "boolean" ? value.proxy : undefined
                 }
             ];
         })),
@@ -83,3 +86,9 @@ async function fileExists(path) {
 function isRecord(value) {
     return typeof value === "object" && value !== null && !Array.isArray(value);
 }
+function isValidTarget(value) {
+    return typeof value === "string" && ["opencode", "codex", "claude-code"].includes(value);
+}
+function isValidOpencodeApiType(value) {
+    return typeof value === "string" && ["chat", "responses", "messages"].includes(value);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heventure/model-provider-x",
-  "version": "0.2.8-beta.0",
+  "version": "0.2.9-beta.0",
   "description": "TUI configurator and local API proxy for wiring custom model providers into OpenCode and Claude Code.",
   "private": false,
   "license": "MIT",
@@ -15,9 +15,10 @@
   "homepage": "https://github.com/HughesCuit/model-provider-x#readme",
   "type": "module",
   "main": "dist/cli/index.js",
-  "bin": {
-    "model-provider-x": "dist/cli/index.js"
-  },
+"bin": {
+  "model-provider-x": "dist/cli/index.js",
+  "mpx": "dist/cli/index.js"
+},
   "files": [
     "dist",
     "README.md",