oc-codex-multi-auth 6.1.3 → 6.1.7

package/scripts/install-oc-codex-multi-auth-core.js

@@ -8,21 +8,28 @@ const PACKAGE_NAME = "oc-codex-multi-auth";
 const LEGACY_PACKAGE_NAMES = ["oc-chatgpt-multi-auth"];
 const WINDOWS_RENAME_RETRY_ATTEMPTS = 5;
 const WINDOWS_RENAME_RETRY_BASE_DELAY_MS = 10;
+const STALE_MANAGED_MODEL_KEYS = new Set([
+	"gpt-5.2",
+	"gpt-5.3-codex",
+	"gpt-5.4",
+]);
 
 function getManagedPackageNames() {
 	return [PACKAGE_NAME, ...LEGACY_PACKAGE_NAMES];
 }
 
 function printHelp() {
-	console.log(`Usage: ${PACKAGE_NAME} [--modern|--legacy] [--dry-run] [--no-cache-clear]\n\n` +
+	console.log(`Usage: ${PACKAGE_NAME} [--modern|--full|--legacy] [--dry-run] [--no-cache-clear]\n\n` +
 		"Default behavior:\n" +
 		"  - Installs/updates global config at ~/.config/opencode/opencode.json\n" +
-		"  - Uses full catalog config by default (9 base models + 34 explicit presets)\n" +
+		"  - Enables the prompt status bar TUI plugin at ~/.config/opencode/tui.json\n" +
+		"  - Uses compact UI config by default (9 base OAuth models + variant picker presets)\n" +
 		"  - Ensures plugin is unpinned (latest)\n" +
 		"  - Clears OpenCode plugin cache\n\n" +
 		"Options:\n" +
-		"  --modern           Force compact modern config (9 base models + --variant presets)\n" +
-		"  --legacy           Force explicit legacy config (34 preset model entries)\n" +
+		"  --modern           Force compact modern config (9 base OAuth models + --variant presets)\n" +
+		"  --full             Install compact base models plus 36 explicit selector entries\n" +
+		"  --legacy           Force explicit legacy config (36 preset model entries)\n" +
 		"  --dry-run          Show actions without writing\n" +
 		"  --no-cache-clear   Skip clearing OpenCode cache\n"
 	);
@@ -63,8 +70,10 @@ function buildPaths(homeDir) {
 	return {
 		configDir,
 		configPath: join(configDir, "opencode.json"),
+		tuiConfigPath: join(configDir, "tui.json"),
 		cacheDir,
 		cacheNodeModulesPaths: getManagedPackageNames().map((name) => join(cacheDir, "node_modules", name)),
+		cachePackagePaths: getManagedPackageNames().map((name) => join(cacheDir, "packages", `${name}@latest`)),
 		cacheBunLock: join(cacheDir, "bun.lock"),
 		cachePackageJson: join(cacheDir, "package.json"),
 		modernTemplatePath,
@@ -81,30 +90,67 @@ function parseCliArgs(argv = process.argv.slice(2)) {
 	}
 
 	const requestedModern = args.has("--modern");
+	const requestedFull = args.has("--full");
 	const requestedLegacy = args.has("--legacy");
 
-	if (requestedModern && requestedLegacy) {
-		throw new Error("Choose only one of --modern or --legacy.");
+	const requestedModes = [requestedModern, requestedFull, requestedLegacy]
+		.filter(Boolean).length;
+	if (requestedModes > 1) {
+		throw new Error("Choose only one of --modern, --full, or --legacy.");
 	}
 
 	return {
 		wantsHelp: false,
 		dryRun: args.has("--dry-run"),
 		skipCacheClear: args.has("--no-cache-clear"),
-		configMode: requestedModern ? "modern" : requestedLegacy ? "legacy" : "full",
+		configMode: requestedFull ? "full" : requestedLegacy ? "legacy" : "modern",
 	};
 }
 
+function normalizePluginEntryForMatch(entry) {
+	const trimmed = entry.trim();
+	let normalized = trimmed.toLowerCase();
+	try {
+		normalized = decodeURIComponent(normalized);
+	} catch {
+		// Keep the raw lowercased value when a malformed URI escape is present.
+	}
+	normalized = normalized.replace(/\\/g, "/").replace(/\/+$/g, "");
+	if (normalized.endsWith("/dist")) {
+		normalized = normalized.slice(0, -"/dist".length);
+	}
+	return normalized;
+}
+
+function isManagedPluginEntry(entry) {
+	if (typeof entry !== "string") return false;
+	const trimmed = entry.trim().toLowerCase();
+	const normalized = normalizePluginEntryForMatch(entry);
+	return getManagedPackageNames().some((name) => {
+		const lowerName = name.toLowerCase();
+		return trimmed === lowerName ||
+			trimmed.startsWith(`${lowerName}@`) ||
+			normalized.endsWith(`/${lowerName}`) ||
+			normalized.endsWith(`/node_modules/${lowerName}`);
+	});
+}
+
 function normalizePluginList(list) {
 	const entries = Array.isArray(list) ? list.filter(Boolean) : [];
-	const managedNames = getManagedPackageNames();
-	const filtered = entries.filter((entry) => {
-		if (typeof entry !== "string") return true;
-		return !managedNames.some((name) => entry === name || entry.startsWith(`${name}@`));
-	});
+	const filtered = entries.filter((entry) => !isManagedPluginEntry(entry));
 	return [...filtered, PACKAGE_NAME];
 }
 
+function mergeTuiConfig(existingConfig) {
+	const existing = isPlainObject(existingConfig) ? { ...existingConfig } : {};
+	const next = { ...existing };
+	if (typeof next.$schema !== "string" || !next.$schema.trim()) {
+		next.$schema = "https://opencode.ai/tui.json";
+	}
+	next.plugin = normalizePluginList(existing.plugin);
+	return next;
+}
+
 function formatJson(obj) {
 	return `${JSON.stringify(obj, null, 2)}\n`;
 }
@@ -125,9 +171,12 @@ function isPlainObject(value) {
 // installer overwrite the managed shape it ships. This replaces the earlier
 // wholesale overwrite which clobbered custom user-added keys (see audit top-20
 // #6).
-function mergeOpenaiProvider(existingOpenai, templateOpenai) {
+function mergeOpenaiProvider(existingOpenai, templateOpenai, options = {}) {
 	const existingSafe = isPlainObject(existingOpenai) ? existingOpenai : {};
 	const templateSafe = isPlainObject(templateOpenai) ? templateOpenai : {};
+	const modelKeysToRemove = options.modelKeysToRemove instanceof Set
+		? options.modelKeysToRemove
+		: new Set();
 
 	const result = {};
 
@@ -147,7 +196,10 @@ function mergeOpenaiProvider(existingOpenai, templateOpenai) {
 	// 3. Merge `models` by id: template wins on collision, user-added ids survive.
 	const existingModels = isPlainObject(existingSafe.models) ? existingSafe.models : {};
 	const templateModels = isPlainObject(templateSafe.models) ? templateSafe.models : {};
-	const mergedModels = { ...existingModels, ...templateModels };
+	const prunedExistingModels = Object.fromEntries(
+		Object.entries(existingModels).filter(([key]) => !modelKeysToRemove.has(key)),
+	);
+	const mergedModels = { ...prunedExistingModels, ...templateModels };
 	if (Object.keys(mergedModels).length > 0) {
 		result.models = mergedModels;
 	}
@@ -203,6 +255,10 @@ function mergeFullTemplate(modernTemplate, legacyTemplate) {
 	};
 }
 
+function getTemplateModelKeys(template) {
+	return new Set(Object.keys(template.provider?.openai?.models ?? {}));
+}
+
 async function readJson(filePath) {
 	const content = await readFile(filePath, "utf-8");
 	return JSON.parse(content.charCodeAt(0) === 0xfeff ? content.slice(1) : content);
@@ -351,11 +407,17 @@ async function clearCache(paths, dryRun, skipCacheClear) {
 		for (const cacheNodeModulesPath of paths.cacheNodeModulesPaths) {
 			log(`[dry-run] Would remove ${cacheNodeModulesPath}`);
 		}
+		for (const cachePackagePath of paths.cachePackagePaths) {
+			log(`[dry-run] Would remove ${cachePackagePath}`);
+		}
 		log(`[dry-run] Would remove ${paths.cacheBunLock}`);
 	} else {
 		for (const cacheNodeModulesPath of paths.cacheNodeModulesPaths) {
 			await rm(cacheNodeModulesPath, { recursive: true, force: true });
 		}
+		for (const cachePackagePath of paths.cachePackagePaths) {
+			await rm(cachePackagePath, { recursive: true, force: true });
+		}
 		await rm(paths.cacheBunLock, { force: true });
 	}
 
@@ -386,6 +448,17 @@ export async function runInstaller(argv = process.argv.slice(2), options = {}) {
 
 	const template = await loadTemplate(configMode, paths);
 	template.plugin = [PACKAGE_NAME];
+	const modelKeysToRemove = new Set(STALE_MANAGED_MODEL_KEYS);
+	if (configMode === "modern") {
+		for (const key of getTemplateModelKeys(await readJson(paths.legacyTemplatePath))) {
+			modelKeysToRemove.add(key);
+		}
+	}
+	if (configMode === "legacy") {
+		for (const key of getTemplateModelKeys(await readJson(paths.modernTemplatePath))) {
+			modelKeysToRemove.add(key);
+		}
+	}
 
 	let nextConfig = template;
 	let existingConfig;
@@ -401,7 +474,9 @@ export async function runInstaller(argv = process.argv.slice(2), options = {}) {
 			const provider = (existing.provider && typeof existing.provider === "object")
 				? { ...existing.provider }
 				: {};
-			provider.openai = mergeOpenaiProvider(existing.provider?.openai, template.provider?.openai);
+			provider.openai = mergeOpenaiProvider(existing.provider?.openai, template.provider?.openai, {
+				modelKeysToRemove,
+			});
 			merged.provider = provider;
 			nextConfig = merged;
 		} catch (error) {
@@ -413,15 +488,39 @@ export async function runInstaller(argv = process.argv.slice(2), options = {}) {
 		log("No existing config found. Creating new global config.");
 	}
 
+	let nextTuiConfig = mergeTuiConfig(undefined);
+	let existingTuiConfig;
+	if (existsSync(paths.tuiConfigPath)) {
+		const backupPath = await backupConfig(paths.tuiConfigPath, dryRun);
+		log(`${dryRun ? "[dry-run] Would create backup" : "Backup created"}: ${backupPath}`);
+
+		try {
+			const existing = await readJson(paths.tuiConfigPath);
+			existingTuiConfig = existing;
+			nextTuiConfig = mergeTuiConfig(existing);
+		} catch (error) {
+			log(`Warning: Could not parse existing TUI config (${formatErrorForLog(error)}). Replacing with minimal TUI config.`);
+			existingTuiConfig = undefined;
+			nextTuiConfig = mergeTuiConfig(undefined);
+		}
+	} else {
+		log("No existing TUI config found. Creating new global TUI config.");
+	}
+
 	let wrote = false;
 	if (dryRun) {
 		log(`[dry-run] Would write ${paths.configPath} using ${configMode} config`);
 		log(`[dry-run] Diff for ${paths.configPath}:`);
 		log(formatConfigDiff(existingConfig, nextConfig));
+		log(`[dry-run] Would write ${paths.tuiConfigPath} with the TUI status plugin`);
+		log(`[dry-run] Diff for ${paths.tuiConfigPath}:`);
+		log(formatConfigDiff(existingTuiConfig, nextTuiConfig));
 	} else {
 		await writeFileAtomic(paths.configPath, formatJson(nextConfig));
+		await writeFileAtomic(paths.tuiConfigPath, formatJson(nextTuiConfig));
 		wrote = true;
 		log(`Wrote ${paths.configPath} (${configMode} config)`);
+		log(`Wrote ${paths.tuiConfigPath} (TUI status plugin)`);
 	}
 
 	await clearCache(paths, dryRun, skipCacheClear);
@@ -429,13 +528,13 @@ export async function runInstaller(argv = process.argv.slice(2), options = {}) {
 	log("\nDone. Restart OpenCode to (re)install the plugin.");
 	log("Example: opencode");
 	if (configMode === "modern") {
-		log("Note: Modern config intentionally shows 9 base model entries; use --variant to access all 34 shipped presets.");
+		log("Note: Modern config intentionally shows 9 base OAuth model entries; use the variant picker for reasoning presets.");
 	}
 	if (configMode === "legacy") {
-		log("Note: Legacy config writes 34 explicit preset entries and is also safe for older OpenCode versions.");
+		log("Note: Legacy config writes 36 explicit preset entries and is also safe for older OpenCode versions.");
 	}
 	if (configMode === "full") {
-		log("Note: Full config installs both modern base models and explicit preset entries so the full shipped catalog is visible by default.");
+		log("Note: Full config installs both compact base models and explicit preset entries for direct selector IDs.");
 	}
 
 	return {
@@ -443,6 +542,7 @@ export async function runInstaller(argv = process.argv.slice(2), options = {}) {
 		action: "install",
 		configMode,
 		configPath: paths.configPath,
+		tuiConfigPath: paths.tuiConfigPath,
 		dryRun: Boolean(dryRun),
 		wrote,
 	};
@@ -455,6 +555,7 @@ export const __test = {
 	formatConfigDiff,
 	mergeFullTemplate,
 	mergeOpenaiProvider,
+	mergeTuiConfig,
 	parseCliArgs,
 	writeFileAtomic,
 	renameWithWindowsRetry,