droid-patch 0.12.2 → 0.13.1

package/dist/cli.mjs

@@ -1,13 +1,14 @@
 #!/usr/bin/env node
-import { a as removeAlias, d as listAllMetadata, f as loadAliasMetadata, i as listAliases, l as createMetadata, m as patchDroid, n as createAlias, o as removeAliasesByFilter, p as saveAliasMetadata, r as createAliasForWrapper, t as clearAllAliases, u as formatPatches } from "./alias-DwnTg_u5.mjs";
+import { a as removeAlias, d as listAllMetadata, f as loadAliasMetadata, i as listAliases, l as createMetadata, m as patchDroid, n as createAlias, o as removeAliasesByFilter, p as saveAliasMetadata, r as createAliasForWrapper, t as clearAllAliases, u as formatPatches } from "./alias-12JqnRQZ.mjs";
 import bin from "tiny-bin";
 import { styleText } from "node:util";
-import { existsSync, readFileSync } from "node:fs";
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
-import { homedir } from "node:os";
+import { homedir, platform } from "node:os";
 import { fileURLToPath } from "node:url";
 import { execSync } from "node:child_process";
 import { chmod, mkdir, writeFile } from "node:fs/promises";
+import { createInterface } from "node:readline/promises";
 
 //#region src/websearch-external.ts
 /**
@@ -518,8 +519,9 @@ process.on('SIGINT', function() { server.close(); process.exit(0); });
 
 //#endregion
 //#region src/websearch-patch.ts
+const IS_WINDOWS$1 = platform() === "win32";
 /**
-* Generate unified wrapper script
+* Generate unified wrapper script (Unix bash)
 */
 function generateUnifiedWrapper(droidPath, proxyScriptPath, standalone = false) {
 	const standaloneEnv = standalone ? "STANDALONE_MODE=1 " : "";
@@ -601,6 +603,91 @@ exit $DROID_EXIT_CODE
 `;
 }
 /**
+* Generate Windows wrapper script (.cmd batch file)
+*/
+function generateWindowsWrapper(droidPath, proxyScriptPath, standalone = false) {
+	return `@echo off
+setlocal enabledelayedexpansion
+REM Droid with WebSearch
+REM Auto-generated by droid-patch --websearch
+
+set "PROXY_SCRIPT=${proxyScriptPath}"
+set "DROID_BIN=${droidPath}"
+set "PORT_FILE=%TEMP%\\droid-websearch-%RANDOM%%RANDOM%.port"
+
+REM Check for passthrough commands
+set "PASSTHROUGH=0"
+for %%a in (%*) do (
+    if "%%a"=="--help" set "PASSTHROUGH=1"
+    if "%%a"=="-h" set "PASSTHROUGH=1"
+    if "%%a"=="--version" set "PASSTHROUGH=1"
+    if "%%a"=="-V" set "PASSTHROUGH=1"
+    if "%%a"=="help" set "PASSTHROUGH=1"
+    if "%%a"=="version" set "PASSTHROUGH=1"
+    if "%%a"=="completion" set "PASSTHROUGH=1"
+    if "%%a"=="completions" set "PASSTHROUGH=1"
+    if "%%a"=="exec" set "PASSTHROUGH=1"
+    if "%%a"=="plugin" set "PASSTHROUGH=1"
+)
+if "%PASSTHROUGH%"=="1" (
+    "%DROID_BIN%" %*
+    exit /b %ERRORLEVEL%
+)
+
+REM Start proxy server
+${standalone ? "set STANDALONE_MODE=1\r\n" : ""}set "SEARCH_PROXY_PORT=0"
+set "SEARCH_PROXY_PORT_FILE=%PORT_FILE%"
+
+if defined DROID_SEARCH_DEBUG (
+    echo [websearch] Starting proxy... 1>&2
+    start /b node "%PROXY_SCRIPT%"
+) else (
+    start /b node "%PROXY_SCRIPT%" >nul 2>&1
+)
+
+REM Wait for port file
+set "RETRY=0"
+:wait_loop
+if %RETRY% GEQ 50 goto :proxy_failed
+set /a RETRY+=1
+timeout /t 1 /nobreak >nul 2>&1
+if not exist "%PORT_FILE%" goto :wait_loop
+
+REM Read port and check health
+set /p ACTUAL_PORT=<"%PORT_FILE%"
+if not defined ACTUAL_PORT goto :wait_loop
+
+REM Simple health check using curl or PowerShell
+where curl >nul 2>&1
+if %ERRORLEVEL%==0 (
+    curl -s "http://127.0.0.1:%ACTUAL_PORT%/health" >nul 2>&1
+    if %ERRORLEVEL%==0 goto :proxy_ready
+) else (
+    powershell -Command "try { Invoke-WebRequest -Uri 'http://127.0.0.1:%ACTUAL_PORT%/health' -UseBasicParsing -TimeoutSec 2 | Out-Null; exit 0 } catch { exit 1 }" >nul 2>&1
+    if %ERRORLEVEL%==0 goto :proxy_ready
+)
+goto :wait_loop
+
+:proxy_failed
+echo [websearch] Failed to start proxy, running without websearch 1>&2
+del "%PORT_FILE%" 2>nul
+"%DROID_BIN%" %*
+exit /b %ERRORLEVEL%
+
+:proxy_ready
+if defined DROID_SEARCH_DEBUG echo [websearch] Proxy ready on port %ACTUAL_PORT% 1>&2
+del "%PORT_FILE%" 2>nul
+
+set "FACTORY_API_BASE_URL_OVERRIDE=http://127.0.0.1:%ACTUAL_PORT%"
+"%DROID_BIN%" %*
+set "DROID_EXIT_CODE=%ERRORLEVEL%"
+
+REM Cleanup: kill node processes started by this script
+REM Note: Windows doesn't have easy process tree tracking, proxy will exit when parent exits
+exit /b %DROID_EXIT_CODE%
+`;
+}
+/**
 * Create unified WebSearch files
 *
 * @param outputDir - Directory to write files to
@@ -613,13 +700,13 @@ exit $DROID_EXIT_CODE
 async function createWebSearchUnifiedFiles(outputDir, droidPath, aliasName, apiBase, standalone = false, useNativeProvider = false) {
 	if (!existsSync(outputDir)) await mkdir(outputDir, { recursive: true });
 	const proxyScriptPath = join(outputDir, `${aliasName}-proxy.js`);
-	const wrapperScriptPath = join(outputDir, aliasName);
+	const wrapperScriptPath = IS_WINDOWS$1 ? join(outputDir, `${aliasName}.cmd`) : join(outputDir, aliasName);
 	const factoryApiUrl = apiBase || "https://api.factory.ai";
 	await writeFile(proxyScriptPath, useNativeProvider ? generateNativeSearchProxyServer(factoryApiUrl) : generateExternalSearchProxyServer(factoryApiUrl));
 	console.log(`[*] Created proxy script: ${proxyScriptPath}`);
 	console.log(`[*] Mode: ${useNativeProvider ? "native provider (requires proxy plugin)" : "external providers"}`);
-	await writeFile(wrapperScriptPath, generateUnifiedWrapper(droidPath, proxyScriptPath, standalone));
-	await chmod(wrapperScriptPath, 493);
+	await writeFile(wrapperScriptPath, IS_WINDOWS$1 ? generateWindowsWrapper(droidPath, proxyScriptPath, standalone) : generateUnifiedWrapper(droidPath, proxyScriptPath, standalone));
+	if (!IS_WINDOWS$1) await chmod(wrapperScriptPath, 493);
 	console.log(`[*] Created wrapper: ${wrapperScriptPath}`);
 	if (standalone) console.log(`[*] Standalone mode enabled`);
 	return {
@@ -628,9 +715,278 @@ async function createWebSearchUnifiedFiles(outputDir, droidPath, aliasName, apiB
 	};
 }
 
+//#endregion
+//#region src/model-manager.ts
+/**
+* Custom Model Manager
+* Manages custom models in ~/.factory/settings.json
+*/
+const FACTORY_DIR = join(homedir(), ".factory");
+const SETTINGS_PATH = join(FACTORY_DIR, "settings.json");
+/**
+* Generate model ID from displayName and index
+* Format: custom:{DisplayName}-{index} where spaces are replaced with -
+* This matches droid's buildCustomModelId function
+*/
+function generateModelId(displayName, index) {
+	return `custom:${displayName.trim().replace(/\s+/g, "-")}-${index}`;
+}
+/**
+* Load settings.json
+*/
+function loadSettings() {
+	if (!existsSync(SETTINGS_PATH)) return {};
+	try {
+		const content = readFileSync(SETTINGS_PATH, "utf-8");
+		return JSON.parse(content);
+	} catch {
+		return {};
+	}
+}
+/**
+* Save settings.json
+*/
+function saveSettings(settings) {
+	if (!existsSync(FACTORY_DIR)) mkdirSync(FACTORY_DIR, { recursive: true });
+	writeFileSync(SETTINGS_PATH, JSON.stringify(settings, null, 2));
+}
+/**
+* Rebuild all model IDs and indexes based on their array position
+* This is necessary because droid uses array index as part of the ID
+*/
+function rebuildModelIds(models) {
+	return models.map((model, index) => ({
+		...model,
+		id: generateModelId(model.displayName, index),
+		index,
+		noImageSupport: model.noImageSupport ?? false
+	}));
+}
+/**
+* Add a custom model at specified index (or end if not specified)
+*/
+function addModel(modelName, displayName, baseUrl, apiKey, provider, insertIndex) {
+	const settings = loadSettings();
+	if (!settings.customModels) settings.customModels = [];
+	const actualIndex = insertIndex ?? settings.customModels.length;
+	if (actualIndex < 0 || actualIndex > settings.customModels.length) return {
+		success: false,
+		model: {},
+		message: `Invalid index ${actualIndex}. Valid range: 0-${settings.customModels.length}`
+	};
+	const newModel = {
+		model: modelName,
+		id: "",
+		baseUrl,
+		apiKey,
+		displayName,
+		provider,
+		index: 0,
+		noImageSupport: false
+	};
+	settings.customModels.splice(actualIndex, 0, newModel);
+	settings.customModels = rebuildModelIds(settings.customModels);
+	const insertedModel = settings.customModels[actualIndex];
+	saveSettings(settings);
+	return {
+		success: true,
+		model: insertedModel,
+		message: `Added model "${displayName}" at index ${actualIndex} with ID "${insertedModel.id}"`
+	};
+}
+/**
+* Remove a custom model by index, ID, or displayName
+*/
+function removeModel(identifier) {
+	const settings = loadSettings();
+	if (!settings.customModels || settings.customModels.length === 0) return {
+		success: false,
+		message: "No custom models configured"
+	};
+	let index;
+	const numericIndex = parseInt(identifier, 10);
+	if (!isNaN(numericIndex) && numericIndex >= 0 && numericIndex < settings.customModels.length) index = numericIndex;
+	else index = settings.customModels.findIndex((m) => m.id === identifier || m.displayName === identifier);
+	if (index === -1) return {
+		success: false,
+		message: `Model "${identifier}" not found. Use index (0-${settings.customModels.length - 1}), ID, or display name.`
+	};
+	const oldIds = settings.customModels.map((m) => ({
+		id: m.id,
+		displayName: m.displayName
+	}));
+	const removed = settings.customModels.splice(index, 1)[0];
+	const oldDefaultId = settings.sessionDefaultSettings?.model;
+	settings.customModels = rebuildModelIds(settings.customModels);
+	const updatedModels = [];
+	for (let i = index; i < settings.customModels.length; i++) {
+		const oldInfo = oldIds[i + 1];
+		const newModel = settings.customModels[i];
+		if (oldInfo && oldInfo.id !== newModel.id) updatedModels.push({
+			oldId: oldInfo.id,
+			newId: newModel.id,
+			displayName: newModel.displayName
+		});
+	}
+	if (oldDefaultId) if (oldDefaultId === removed.id) delete settings.sessionDefaultSettings.model;
+	else {
+		const updatedDefault = updatedModels.find((u) => u.oldId === oldDefaultId);
+		if (updatedDefault) settings.sessionDefaultSettings.model = updatedDefault.newId;
+	}
+	saveSettings(settings);
+	return {
+		success: true,
+		removed,
+		message: `Removed model "${removed.displayName}" (was at index ${index})`,
+		updatedModels
+	};
+}
+/**
+* List all custom models
+*/
+function listModels() {
+	return loadSettings().customModels || [];
+}
+/**
+* Get current default model
+*/
+function getDefaultModel() {
+	return loadSettings().sessionDefaultSettings?.model;
+}
+/**
+* Print models list with detailed info
+*/
+function printModelsList() {
+	const models = listModels();
+	const defaultModel = getDefaultModel();
+	console.log(styleText("cyan", "═".repeat(60)));
+	console.log(styleText(["cyan", "bold"], "  Custom Models"));
+	console.log(styleText("cyan", "═".repeat(60)));
+	console.log();
+	if (models.length === 0) {
+		console.log(styleText("gray", "  No custom models configured."));
+		console.log();
+		console.log(styleText("gray", "  Add one with: npx droid-patch add-model"));
+	} else {
+		console.log(styleText("white", `  Found ${models.length} model(s):`));
+		console.log();
+		for (let i = 0; i < models.length; i++) {
+			const model = models[i];
+			const defaultMark = model.id === defaultModel ? styleText("green", " [DEFAULT]") : "";
+			const indexMark = styleText("gray", `[${i}]`);
+			console.log(`  ${indexMark} ${styleText(["cyan", "bold"], model.displayName)}${defaultMark}`);
+			console.log(styleText("gray", `      ID:       ${model.id}`));
+			console.log(styleText("gray", `      Model:    ${model.model}`));
+			console.log(styleText("gray", `      Provider: ${model.provider}`));
+			console.log(styleText("gray", `      Base URL: ${model.baseUrl}`));
+			console.log(styleText("gray", `      API Key:  ${model.apiKey.substring(0, 8)}...`));
+			console.log();
+		}
+	}
+	console.log(styleText("gray", `  Settings file: ${SETTINGS_PATH}`));
+	console.log();
+}
+/**
+* Interactive prompt helper using readline/promises
+*/
+async function prompt(question, defaultValue) {
+	const defaultHint = defaultValue ? ` (${defaultValue})` : "";
+	const rl = createInterface({
+		input: process.stdin,
+		output: process.stdout
+	});
+	try {
+		return (await rl.question(`${question}${defaultHint}: `)).trim() || defaultValue || "";
+	} finally {
+		rl.close();
+	}
+}
+/**
+* Interactive prompt for selecting from options
+*/
+async function promptSelect(question, options) {
+	console.log(question);
+	options.forEach((opt, i) => {
+		console.log(styleText("cyan", `  ${i + 1}. ${opt}`));
+	});
+	const rl = createInterface({
+		input: process.stdin,
+		output: process.stdout
+	});
+	try {
+		const answer = await rl.question("Select (number): ");
+		const idx = parseInt(answer.trim(), 10) - 1;
+		if (idx >= 0 && idx < options.length) return options[idx];
+		return options[0];
+	} finally {
+		rl.close();
+	}
+}
+/**
+* Interactive mode for adding a model
+*/
+async function addModelInteractive(insertIndex) {
+	console.log(styleText("cyan", "═".repeat(60)));
+	console.log(styleText(["cyan", "bold"], "  Add Custom Model (Interactive)"));
+	console.log(styleText("cyan", "═".repeat(60)));
+	console.log();
+	const models = listModels();
+	if (models.length > 0) {
+		console.log(styleText("gray", `Current models: ${models.length}`));
+		models.forEach((m, i) => {
+			console.log(styleText("gray", `  [${i}] ${m.displayName}`));
+		});
+		console.log();
+	}
+	const displayName = await prompt("Display name (e.g., 'Opus [proxy]')");
+	if (!displayName) {
+		console.log(styleText("red", "Display name is required"));
+		return;
+	}
+	const modelName = await prompt("Model name (e.g., 'claude-sonnet-4-20250514')");
+	if (!modelName) {
+		console.log(styleText("red", "Model name is required"));
+		return;
+	}
+	const baseUrl = await prompt("Base URL (e.g., 'http://127.0.0.1:20002/droid')");
+	if (!baseUrl) {
+		console.log(styleText("red", "Base URL is required"));
+		return;
+	}
+	const apiKey = await prompt("API Key");
+	if (!apiKey) {
+		console.log(styleText("red", "API Key is required"));
+		return;
+	}
+	const provider = await promptSelect("Provider:", [
+		"anthropic",
+		"openai",
+		"generic-chat-completion-api"
+	]);
+	let actualIndex = insertIndex;
+	if (actualIndex === void 0 && models.length > 0) {
+		const indexStr = await prompt(`Insert at index (0-${models.length})`, String(models.length));
+		actualIndex = parseInt(indexStr, 10);
+		if (isNaN(actualIndex) || actualIndex < 0 || actualIndex > models.length) actualIndex = models.length;
+	}
+	console.log();
+	const result = addModel(modelName, displayName, baseUrl, apiKey, provider, actualIndex);
+	if (result.success) {
+		console.log(styleText("green", `[+] ${result.message}`));
+		console.log();
+		console.log(styleText("white", "Model details:"));
+		console.log(styleText("gray", `  ID: ${result.model.id}`));
+		console.log(styleText("gray", `  Display Name: ${result.model.displayName}`));
+		console.log(styleText("gray", `  Model: ${result.model.model}`));
+		console.log(styleText("gray", `  Provider: ${result.model.provider}`));
+		console.log(styleText("gray", `  Base URL: ${result.model.baseUrl}`));
+	} else console.log(styleText("red", `Error: ${result.message}`));
+}
+
 //#endregion
 //#region src/cli.ts
 const __dirname = dirname(fileURLToPath(import.meta.url));
+const IS_WINDOWS = platform() === "win32";
 function getVersion() {
 	try {
 		const pkgPath = join(__dirname, "..", "package.json");
@@ -659,6 +1015,27 @@ function getDroidVersion(droidPath) {
 }
 function findDefaultDroidPath() {
 	const home = homedir();
+	if (IS_WINDOWS) {
+		try {
+			const firstResult = execSync("where droid", {
+				encoding: "utf-8",
+				stdio: [
+					"pipe",
+					"pipe",
+					"pipe"
+				]
+			}).trim().split(/\r?\n/)[0];
+			if (firstResult && existsSync(firstResult)) return firstResult;
+		} catch {}
+		const windowsPaths = [
+			join(home, ".droid", "bin", "droid.exe"),
+			join(home, "AppData", "Local", "Programs", "droid", "droid.exe"),
+			join(home, "scoop", "apps", "droid", "current", "droid.exe"),
+			"./droid.exe"
+		];
+		for (const p of windowsPaths) if (existsSync(p)) return p;
+		return join(home, ".droid", "bin", "droid.exe");
+	}
 	try {
 		const result = execSync("which droid", {
 			encoding: "utf-8",
@@ -680,7 +1057,7 @@ function findDefaultDroidPath() {
 	for (const p of paths) if (existsSync(p)) return p;
 	return join(home, ".droid", "bin", "droid");
 }
-bin("droid-patch", "CLI tool to patch droid binary with various modifications").package("droid-patch", version).option("--is-custom", "Patch isCustom:!0 to isCustom:!1 (enable context compression for custom models)").option("--skip-login", "Inject a fake FACTORY_API_KEY to bypass login requirement (no real key needed)").option("--api-base <url>", "Replace API URL (standalone: binary patch, max 22 chars; with --websearch: proxy forward target, no limit)").option("--websearch", "Enable local WebSearch proxy with external providers (Smithery, Google PSE, etc.)").option("--websearch-proxy", "Enable native provider websearch (requires proxy plugin, reads ~/.factory/settings.json)").option("--standalone", "Standalone mode: mock non-LLM Factory APIs (use with --websearch)").option("--reasoning-effort", "Enable reasoning effort for custom models (set to high, enable UI selector)").option("--disable-telemetry", "Disable telemetry and Sentry error reporting (block data uploads)").option("--auto-high", "Set default autonomy mode to auto-high (bypass settings.json race condition)").option("--spec-model-custom", "Enable custom models as spec model (show in UI selector + bypass validation)").option("--dry-run", "Verify patches without actually modifying the binary").option("-p, --path <path>", "Path to the droid binary").option("-o, --output <dir>", "Output directory for patched binary").option("--no-backup", "Do not create backup of original binary").option("-v, --verbose", "Enable verbose output").argument("[alias]", "Alias name for the patched binary").action(async (options, args) => {
+bin("droid-patch", "CLI tool to patch droid binary with various modifications").package("droid-patch", version).option("--is-custom", "Patch isCustom:!0 to isCustom:!1 (enable context compression for custom models)").option("--skip-login", "Inject a fake FACTORY_API_KEY to bypass login requirement (no real key needed)").option("--api-base <url>", "Replace API URL (standalone: binary patch, max 22 chars; with --websearch: proxy forward target, no limit)").option("--websearch", "Enable local WebSearch proxy with external providers (Smithery, Google PSE, etc.)").option("--websearch-proxy", "Enable native provider websearch (requires proxy plugin, reads ~/.factory/settings.json)").option("--standalone", "Standalone mode: mock non-LLM Factory APIs (use with --websearch)").option("--reasoning-effort", "Enable reasoning effort for custom models (set to high, enable UI selector)").option("--disable-telemetry", "Disable telemetry and Sentry error reporting (block data uploads)").option("--dry-run", "Verify patches without actually modifying the binary").option("-p, --path <path>", "Path to the droid binary").option("-o, --output <dir>", "Output directory for patched binary").option("--no-backup", "Do not create backup of original binary").option("-v, --verbose", "Enable verbose output").argument("[alias]", "Alias name for the patched binary").action(async (options, args) => {
 	const alias = args?.[0];
 	const isCustom = options["is-custom"];
 	const skipLogin = options["skip-login"];
@@ -691,15 +1068,13 @@ bin("droid-patch", "CLI tool to patch droid binary with various modifications").
 	const websearchTarget = websearch ? apiBase || "https://api.factory.ai" : void 0;
 	const reasoningEffort = options["reasoning-effort"];
 	const noTelemetry = options["disable-telemetry"];
-	const autoHigh = options["auto-high"];
-	const specModelCustom = options["spec-model-custom"];
 	const dryRun = options["dry-run"];
 	const path = options.path || findDefaultDroidPath();
 	const outputDir = options.output;
 	const backup = options.backup !== false;
 	const verbose = options.verbose;
 	const outputPath = outputDir && alias ? join(outputDir, alias) : void 0;
-	const needsBinaryPatch = !!isCustom || !!skipLogin || !!reasoningEffort || !!noTelemetry || !!autoHigh || !!specModelCustom || !!apiBase && !websearch && !websearchProxy;
+	const needsBinaryPatch = !!isCustom || !!skipLogin || !!reasoningEffort || !!noTelemetry || !!apiBase && !websearch && !websearchProxy;
 	if (websearch && websearchProxy) {
 		console.log(styleText("red", "Error: Cannot use --websearch and --websearch-proxy together"));
 		console.log(styleText("gray", "Choose one:"));
@@ -788,7 +1163,7 @@ bin("droid-patch", "CLI tool to patch droid binary with various modifications").
 		}
 		return;
 	}
-	if (!isCustom && !skipLogin && !apiBase && !websearch && !reasoningEffort && !noTelemetry && !autoHigh && !specModelCustom) {
+	if (!isCustom && !skipLogin && !apiBase && !websearch && !reasoningEffort && !noTelemetry) {
 		console.log(styleText("yellow", "No patch flags specified. Available patches:"));
 		console.log(styleText("gray", "  --is-custom         Patch isCustom for custom models"));
 		console.log(styleText("gray", "  --skip-login        Bypass login by injecting a fake API key"));
@@ -796,8 +1171,6 @@ bin("droid-patch", "CLI tool to patch droid binary with various modifications").
 		console.log(styleText("gray", "  --websearch         Enable local WebSearch proxy"));
 		console.log(styleText("gray", "  --reasoning-effort  Set reasoning effort level for custom models"));
 		console.log(styleText("gray", "  --disable-telemetry Disable telemetry and Sentry error reporting"));
-		console.log(styleText("gray", "  --auto-high         Set default autonomy mode to auto-high"));
-		console.log(styleText("gray", "  --spec-model-custom Enable custom models as spec model"));
 		console.log(styleText("gray", "  --standalone        Standalone mode: mock non-LLM Factory APIs"));
 		console.log();
 		console.log("Usage examples:");
@@ -909,30 +1282,6 @@ bin("droid-patch", "CLI tool to patch droid binary with various modifications").
 			replacement: Buffer.from("!0||this.webEvents.length")
 		});
 	}
-	if (autoHigh) patches.push({
-		name: "autoHighAutonomy",
-		description: "Hardcode getCurrentAutonomyMode() to return \"auto-high\"",
-		pattern: Buffer.from("getCurrentAutonomyMode(){return this.autonomyMode}"),
-		replacement: Buffer.from("getCurrentAutonomyMode(){return\"auto-high\"       }")
-	});
-	if (specModelCustom) {
-		patches.push({
-			name: "specModelCustomUIShow",
-			description: "Show all custom models in spec model selector (bypass filter)",
-			pattern: Buffer.from(""),
-			replacement: Buffer.from(""),
-			regexPattern: /([A-Za-z_$])=([A-Za-z_$])\?([A-Za-z_$])\.filter\(\(([A-Za-z_$])\)=>\2\.includes\(\4\.id\)\):\3/g,
-			regexReplacement: "$1=0?$3.filter(($4)=>$2.includes($4.id)):$3"
-		});
-		patches.push({
-			name: "specModelCustomValidation",
-			description: "Bypass compatibilityGroup check for custom spec models",
-			pattern: Buffer.from(""),
-			replacement: Buffer.from(""),
-			regexPattern: /([A-Z])=([a-zA-Z_$][a-zA-Z0-9_$]*)\(A\),([A-Z])=\2\(R\);if\(\1&&\1!==\3\)\{/g,
-			regexReplacement: "$1=$2(A),$3=$2(R);if($3&&$1!==$3){"
-		});
-	}
 	try {
 		const result = await patchDroid({
 			inputPath: path,
@@ -990,9 +1339,7 @@ bin("droid-patch", "CLI tool to patch droid binary with various modifications").
 				websearchProxy: !!websearchProxy,
 				reasoningEffort: !!reasoningEffort,
 				noTelemetry: !!noTelemetry,
-				standalone: !!standalone,
-				autoHigh: !!autoHigh,
-				specModelCustom: !!specModelCustom
+				standalone: !!standalone
 			}, {
 				droidPatchVersion: version,
 				droidVersion,
@@ -1013,7 +1360,7 @@ bin("droid-patch", "CLI tool to patch droid binary with various modifications").
 	}
 }).command("list", "List all droid-patch aliases").action(async () => {
 	await listAliases();
-}).command("remove", "Remove alias(es) by name or filter").argument("[alias-or-path]", "Alias name or file path to remove").option("--patch-version <version>", "Remove aliases created by this droid-patch version").option("--droid-version <version>", "Remove aliases for this droid version").option("--flag <flag>", "Remove aliases with this flag (is-custom, skip-login, websearch, api-base, reasoning-effort, disable-telemetry, standalone, spec-model-custom)").action(async (options, args) => {
+}).command("remove", "Remove alias(es) by name or filter").argument("[alias-or-path]", "Alias name or file path to remove").option("--patch-version <version>", "Remove aliases created by this droid-patch version").option("--droid-version <version>", "Remove aliases for this droid version").option("--flag <flag>", "Remove aliases with this flag (is-custom, skip-login, websearch, api-base, reasoning-effort, disable-telemetry, standalone)").action(async (options, args) => {
 	const target = args?.[0];
 	const patchVersion = options["patch-version"];
 	const droidVersion = options["droid-version"];
@@ -1027,8 +1374,7 @@ bin("droid-patch", "CLI tool to patch droid binary with various modifications").
 			"api-base",
 			"reasoning-effort",
 			"disable-telemetry",
-			"standalone",
-			"spec-model-custom"
+			"standalone"
 		];
 		if (!allowedFlags.includes(flagRaw)) {
 			console.error(styleText("red", `Error: Invalid --flag value: ${flagRaw}`));
@@ -1189,30 +1535,6 @@ bin("droid-patch", "CLI tool to patch droid binary with various modifications").
 					replacement: Buffer.from("!0||this.webEvents.length")
 				});
 			}
-			if (meta.patches.autoHigh) patches.push({
-				name: "autoHighAutonomy",
-				description: "Hardcode getCurrentAutonomyMode() to return \"auto-high\"",
-				pattern: Buffer.from("getCurrentAutonomyMode(){return this.autonomyMode}"),
-				replacement: Buffer.from("getCurrentAutonomyMode(){return\"auto-high\"       }")
-			});
-			if (meta.patches.specModelCustom) {
-				patches.push({
-					name: "specModelCustomUIShow",
-					description: "Show all custom models in spec model selector (bypass filter)",
-					pattern: Buffer.from(""),
-					replacement: Buffer.from(""),
-					regexPattern: /([A-Za-z_$])=([A-Za-z_$])\?([A-Za-z_$])\.filter\(\(([A-Za-z_$])\)=>\2\.includes\(\4\.id\)\):\3/g,
-					regexReplacement: "$1=0?$3.filter(($4)=>$2.includes($4.id)):$3"
-				});
-				patches.push({
-					name: "specModelCustomValidation",
-					description: "Bypass compatibilityGroup check for custom spec models",
-					pattern: Buffer.from(""),
-					replacement: Buffer.from(""),
-					regexPattern: /([A-Z])=([a-zA-Z_$][a-zA-Z0-9_$]*)\(A\),([A-Z])=\2\(R\);if\(\1&&\1!==\3\)\{/g,
-					regexReplacement: "$1=$2(A),$3=$2(R);if($3&&$1!==$3){"
-				});
-			}
 			const outputPath = join(join(homedir(), ".droid-patch", "bins"), `${meta.name}-patched`);
 			if (patches.length > 0) {
 				if (!(await patchDroid({
@@ -1318,6 +1640,105 @@ bin("droid-patch", "CLI tool to patch droid binary with various modifications").
 		console.log(styleText("gray", `  Success: ${successCount}, Failed: ${failCount}`));
 	}
 	console.log(styleText("cyan", "═".repeat(60)));
+}).command("add-model", "Add a custom model to settings.json (interactive if no options)").option("-m, --model <model>", "Model name (e.g., claude-sonnet-4-20250514)").option("-n, --name <name>", "Display name (e.g., 'Opus [proxy]')").option("-u, --url <url>", "Base URL (e.g., http://127.0.0.1:20002/droid)").option("-k, --key <key>", "API key").option("-p, --provider <provider>", "Provider: anthropic, openai, or generic-chat-completion-api").option("-i, --index <index>", "Insert at index (auto-assigned if not specified)").action(async (options) => {
+	const model = options.model;
+	const displayName = options.name;
+	const baseUrl = options.url;
+	const apiKey = options.key;
+	const providerStr = options.provider;
+	const indexStr = options.index;
+	if (!model && !displayName && !baseUrl && !apiKey && !providerStr) {
+		await addModelInteractive(indexStr ? parseInt(indexStr, 10) : void 0);
+		return;
+	}
+	if (!model || !displayName || !baseUrl || !apiKey || !providerStr) {
+		console.log(styleText("yellow", "Missing required options. Enter interactive mode or provide all options."));
+		console.log();
+		console.log(styleText("white", "Interactive mode:"));
+		console.log(styleText("cyan", "  npx droid-patch add-model"));
+		console.log();
+		console.log(styleText("white", "Full command mode:"));
+		console.log(styleText("cyan", "  npx droid-patch add-model \\"));
+		console.log(styleText("cyan", "    -m \"claude-sonnet-4-20250514\" \\"));
+		console.log(styleText("cyan", "    -n \"Opus [proxy]\" \\"));
+		console.log(styleText("cyan", "    -u \"http://127.0.0.1:20002/droid\" \\"));
+		console.log(styleText("cyan", "    -k \"your-api-key\" \\"));
+		console.log(styleText("cyan", "    -p \"anthropic\""));
+		console.log();
+		console.log(styleText("gray", "Providers: anthropic, openai, generic-chat-completion-api"));
+		console.log(styleText("gray", "Optional: -i <index> to insert at specific position"));
+		process.exit(1);
+	}
+	const validProviders = [
+		"anthropic",
+		"openai",
+		"generic-chat-completion-api"
+	];
+	if (!validProviders.includes(providerStr)) {
+		console.log(styleText("red", `Error: Invalid provider "${providerStr}"`));
+		console.log(styleText("gray", `Valid providers: ${validProviders.join(", ")}`));
+		process.exit(1);
+	}
+	const index = indexStr ? parseInt(indexStr, 10) : void 0;
+	if (indexStr && (isNaN(index) || index < 0)) {
+		console.log(styleText("red", "Error: Index must be a non-negative number"));
+		process.exit(1);
+	}
+	const result = addModel(model, displayName, baseUrl, apiKey, providerStr, index);
+	if (result.success) {
+		console.log(styleText("green", `[+] ${result.message}`));
+		console.log();
+		console.log(styleText("white", "Model details:"));
+		console.log(styleText("gray", `  ID: ${result.model.id}`));
+		console.log(styleText("gray", `  Display Name: ${result.model.displayName}`));
+		console.log(styleText("gray", `  Model: ${result.model.model}`));
+		console.log(styleText("gray", `  Provider: ${result.model.provider}`));
+		console.log(styleText("gray", `  Base URL: ${result.model.baseUrl}`));
+	} else {
+		console.log(styleText("red", `Error: ${result.message}`));
+		process.exit(1);
+	}
+}).command("remove-model", "Remove a custom model from settings.json").argument("<identifier>", "Model index, ID, or display name to remove").action((options, args) => {
+	const identifier = args?.[0];
+	if (!identifier) {
+		console.log(styleText("red", "Error: Model identifier required"));
+		console.log();
+		console.log(styleText("white", "Usage:"));
+		console.log(styleText("cyan", "  npx droid-patch remove-model <identifier>"));
+		console.log();
+		console.log(styleText("gray", "Identifier can be:"));
+		console.log(styleText("gray", "  - Index number (e.g., 0, 1, 2)"));
+		console.log(styleText("gray", "  - Model ID (e.g., custom:Opus-[proxy]-0)"));
+		console.log(styleText("gray", "  - Display name (e.g., 'Opus [proxy]')"));
+		console.log();
+		console.log(styleText("gray", "Use 'npx droid-patch list-models' to see all models"));
+		process.exit(1);
+	}
+	const result = removeModel(identifier);
+	if (result.success && result.removed) {
+		console.log(styleText("green", `[+] ${result.message}`));
+		console.log();
+		console.log(styleText("white", "Removed model details:"));
+		console.log(styleText("gray", `  ID: ${result.removed.id}`));
+		console.log(styleText("gray", `  Display Name: ${result.removed.displayName}`));
+		console.log(styleText("gray", `  Model: ${result.removed.model}`));
+		console.log(styleText("gray", `  Provider: ${result.removed.provider}`));
+		if (result.updatedModels && result.updatedModels.length > 0) {
+			console.log();
+			console.log(styleText("yellow", "Updated model IDs (due to index shift):"));
+			for (const updated of result.updatedModels) {
+				console.log(styleText("gray", `  ${updated.displayName}:`));
+				console.log(styleText("gray", `    ${updated.oldId} → ${updated.newId}`));
+			}
+		}
+		console.log();
+		console.log(styleText("gray", "Use 'npx droid-patch list-models' to see current state."));
+	} else {
+		console.log(styleText("red", `Error: ${result.message}`));
+		process.exit(1);
+	}
+}).command("list-models", "List all custom models in settings.json").action(() => {
+	printModelsList();
 }).run().catch((err) => {
 	console.error(err);
 	process.exit(1);