droid-patch 0.4.0 → 0.5.0

package/dist/{cli.js → cli.mjs}

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { createAlias, createAliasForWrapper, createMetadata, formatPatches, listAliases, listAllMetadata, loadAliasMetadata, patchDroid, removeAlias, saveAliasMetadata } from "./alias-UwlvAO5o.js";
+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-DVggcM0G.mjs";
 import bin from "tiny-bin";
 import { styleText } from "node:util";
 import { existsSync, readFileSync } from "node:fs";
@@ -15,15 +15,15 @@ import { chmod, mkdir, writeFile } from "node:fs/promises";
 * Since BUN_CONFIG_PRELOAD doesn't work with compiled binaries,
 * use a local proxy server to intercept search requests instead
 *
-* Features:
-* - Auto-shutdown on idle (default 5 minutes without requests)
-* - Timeout configurable via DROID_PROXY_IDLE_TIMEOUT env var (seconds)
-* - Set to 0 to disable timeout
+* Each droid instance runs its own proxy server.
+* The proxy is killed automatically when droid exits.
+* @param factoryApiUrl - Custom Factory API URL (default: https://api.factory.ai)
 */
-function generateSearchProxyServer() {
+function generateSearchProxyServer(factoryApiUrl = "https://api.factory.ai") {
 	return `#!/usr/bin/env node
 // Droid WebSearch Proxy Server
 // Auto-generated by droid-patch --websearch
+// This proxy runs as a child process of droid and is killed when droid exits
 
 const http = require('http');
 const https = require('https');
@@ -31,71 +31,13 @@ const { execSync } = require('child_process');
 const fs = require('fs');
 
 const DEBUG = process.env.DROID_SEARCH_DEBUG === '1';
-const PORT = parseInt(process.env.SEARCH_PROXY_PORT || '23119');
-
-// Idle timeout in seconds, default 5 minutes, set to 0 to disable
-const IDLE_TIMEOUT = parseInt(process.env.DROID_PROXY_IDLE_TIMEOUT || '300');
-let lastActivityTime = Date.now();
-let idleCheckTimer = null;
+const PORT = parseInt(process.env.SEARCH_PROXY_PORT || '0'); // 0 = auto-assign
+const FACTORY_API = '${factoryApiUrl}';
 
 function log(...args) {
   if (DEBUG) console.error('[websearch]', ...args);
 }
 
-// Update activity time
-function updateActivity() {
-  lastActivityTime = Date.now();
-}
-
-// Check if any droid process is running (droid instances using the proxy)
-function isDroidRunning() {
-  try {
-    const { execSync } = require('child_process');
-    // Use ps to check if droid.patched binary is running
-    // Exclude scripts and grep itself, only match actual droid binary processes
-    const result = execSync(
-      'ps aux | grep -E "[d]roid\\\\.patched" | grep -v grep | wc -l',
-      { encoding: 'utf-8', timeout: 1000 }
-    ).trim();
-    return parseInt(result) > 0;
-  } catch {
-    return false;
-  }
-}
-
-// Check idle time and possibly exit
-function checkIdleAndExit() {
-  if (IDLE_TIMEOUT <= 0) return; // Timeout disabled
-
-  // If droid process is running, refresh activity time (like heartbeat)
-  if (isDroidRunning()) {
-    log('Droid process detected, keeping proxy alive');
-    updateActivity();
-    return;
-  }
-
-  const idleMs = Date.now() - lastActivityTime;
-  const timeoutMs = IDLE_TIMEOUT * 1000;
-
-  if (idleMs >= timeoutMs) {
-    log(\`Idle for \${Math.round(idleMs / 1000)}s and no droid running, shutting down...\`);
-    cleanup();
-    process.exit(0);
-  }
-}
-
-// Cleanup resources
-function cleanup() {
-  if (idleCheckTimer) {
-    clearInterval(idleCheckTimer);
-    idleCheckTimer = null;
-  }
-  // Delete PID file
-  try {
-    fs.unlinkSync('/tmp/droid-search-proxy.pid');
-  } catch {}
-}
-
 // === Search Implementation ===
 
 // Smithery Exa MCP - highest priority, requires SMITHERY_API_KEY and SMITHERY_PROFILE
@@ -442,31 +384,16 @@ async function search(query, numResults = 10) {
 
 // === HTTP Proxy Server ===
 
-const FACTORY_API = 'https://api.factory.ai';
-
 const server = http.createServer(async (req, res) => {
   const url = new URL(req.url, \`http://\${req.headers.host}\`);
 
-  // Health check - don't update activity time to avoid self-ping preventing timeout
+  // Health check
   if (url.pathname === '/health') {
-    const idleSeconds = Math.round((Date.now() - lastActivityTime) / 1000);
-    const droidRunning = isDroidRunning();
     res.writeHead(200, { 'Content-Type': 'application/json' });
-    res.end(JSON.stringify({
-      status: 'ok',
-      port: PORT,
-      idleTimeout: IDLE_TIMEOUT,
-      idleSeconds: idleSeconds,
-      droidRunning: droidRunning,
-      // If droid is running, won't shutdown; otherwise calculate based on idle time
-      willShutdownIn: IDLE_TIMEOUT > 0 && !droidRunning ? Math.max(0, IDLE_TIMEOUT - idleSeconds) : null
-    }));
+    res.end(JSON.stringify({ status: 'ok', port: server.address()?.port || PORT }));
     return;
   }
 
-  // Update activity time (only non-health-check requests refresh it)
-  updateActivity();
-
   // Search endpoint - intercept
   if (url.pathname === '/api/tools/exa/search' && req.method === 'POST') {
     let body = '';
@@ -492,7 +419,9 @@ const server = http.createServer(async (req, res) => {
   log('Proxy:', req.method, url.pathname);
 
   const proxyUrl = new URL(FACTORY_API + url.pathname + url.search);
-  const proxyReq = https.request(proxyUrl, {
+  // Choose http or https based on target protocol
+  const proxyModule = proxyUrl.protocol === 'https:' ? https : http;
+  const proxyReq = proxyModule.request(proxyUrl, {
     method: req.method,
     headers: { ...req.headers, host: proxyUrl.host }
   }, proxyRes => {
@@ -524,6 +453,9 @@ server.listen(PORT, '127.0.0.1', () => {
     fs.writeFileSync(portFile, String(actualPort));
   }
 
+  // Output PORT= line for wrapper script to parse
+  console.log('PORT=' + actualPort);
+
   const hasSmithery = process.env.SMITHERY_API_KEY && process.env.SMITHERY_PROFILE;
   log('Search proxy started on http://127.0.0.1:' + actualPort);
   log('Smithery Exa:', hasSmithery ? 'configured (priority 1)' : 'not set');
@@ -531,109 +463,89 @@ server.listen(PORT, '127.0.0.1', () => {
   log('Serper:', process.env.SERPER_API_KEY ? 'configured' : 'not set');
   log('Brave:', process.env.BRAVE_API_KEY ? 'configured' : 'not set');
   log('SearXNG:', process.env.SEARXNG_URL || 'not set');
-
-  // Start idle check timer
-  // Check interval = min(timeout/2, 30s) to ensure timely timeout detection
-  if (IDLE_TIMEOUT > 0) {
-    const checkInterval = Math.min(IDLE_TIMEOUT * 500, 30000); // milliseconds
-    log(\`Idle timeout: \${IDLE_TIMEOUT}s (will auto-shutdown when idle)\`);
-    idleCheckTimer = setInterval(checkIdleAndExit, checkInterval);
-  } else {
-    log('Idle timeout: disabled (will run forever)');
-  }
 });
 
-process.on('SIGTERM', () => { cleanup(); server.close(); process.exit(0); });
-process.on('SIGINT', () => { cleanup(); server.close(); process.exit(0); });
+process.on('SIGTERM', () => { server.close(); process.exit(0); });
+process.on('SIGINT', () => { server.close(); process.exit(0); });
 `;
 }
 /**
 * Generate unified Wrapper script
-* Uses shared proxy server mode:
-* - All droid instances share the same proxy process
-* - Proxy starts automatically if not running
-* - Proxy runs as background daemon, doesn't exit with droid
+* Each droid instance runs its own proxy:
+* - Uses port 0 to let system auto-assign available port
+* - Proxy runs as child process
+* - Proxy is killed when droid exits
+* - Supports multiple droid instances running simultaneously
 */
 function generateUnifiedWrapper(droidPath, proxyScriptPath) {
 	return `#!/bin/bash
 # Droid with WebSearch
 # Auto-generated by droid-patch --websearch
+# Each instance runs its own proxy on a system-assigned port
 
 PROXY_SCRIPT="${proxyScriptPath}"
 DROID_BIN="${droidPath}"
-PORT=23119
-PID_FILE="/tmp/droid-search-proxy.pid"
-LOG_FILE="/tmp/droid-search-proxy.log"
-
-# Check if proxy is running
-is_proxy_running() {
-  if [ -f "$PID_FILE" ]; then
-    local pid
-    pid=$(cat "$PID_FILE")
-    if kill -0 "$pid" 2>/dev/null; then
-      # Process exists, check if port responds
-      if curl -s "http://127.0.0.1:$PORT/health" > /dev/null 2>&1; then
-        return 0
-      fi
-    fi
-    # PID file exists but process doesn't exist or port not responding, cleanup
-    rm -f "$PID_FILE"
+PROXY_PID=""
+PORT_FILE="/tmp/droid-websearch-\$\$.port"
+
+# Cleanup function - kill proxy when droid exits
+cleanup() {
+  if [ -n "\$PROXY_PID" ] && kill -0 "\$PROXY_PID" 2>/dev/null; then
+    [ -n "\$DROID_SEARCH_DEBUG" ] && echo "[websearch] Stopping proxy (PID: \$PROXY_PID)" >&2
+    kill "\$PROXY_PID" 2>/dev/null
+    wait "\$PROXY_PID" 2>/dev/null
   fi
-  return 1
+  rm -f "\$PORT_FILE"
 }
 
-# Start shared proxy
-start_shared_proxy() {
-  # First check if port is occupied by another program
-  if lsof -i:"$PORT" > /dev/null 2>&1; then
-    # Port is occupied, check if it's our proxy
-    if curl -s "http://127.0.0.1:$PORT/health" > /dev/null 2>&1; then
-      [ -n "$DROID_SEARCH_DEBUG" ] && echo "[websearch] Proxy already running on port $PORT" >&2
-      return 0
-    else
-      echo "[websearch] Port $PORT is occupied by another process" >&2
-      return 1
-    fi
-  fi
-
-  [ -n "$DROID_SEARCH_DEBUG" ] && echo "[websearch] Starting shared proxy on port $PORT..." >&2
+# Set up trap to cleanup on exit
+trap cleanup EXIT INT TERM
 
-  # Start proxy as background daemon
-  SEARCH_PROXY_PORT="$PORT" nohup node "$PROXY_SCRIPT" >> "$LOG_FILE" 2>&1 &
-  echo $! > "$PID_FILE"
+[ -n "\$DROID_SEARCH_DEBUG" ] && echo "[websearch] Starting proxy..." >&2
 
-  # Wait for proxy to start
-  for i in {1..30}; do
-    if curl -s "http://127.0.0.1:$PORT/health" > /dev/null 2>&1; then
-      [ -n "$DROID_SEARCH_DEBUG" ] && echo "[websearch] Proxy ready on port $PORT (PID: $(cat $PID_FILE))" >&2
-      return 0
+# Start proxy with port 0 (system will assign available port)
+# Proxy writes actual port to PORT_FILE
+if [ -n "\$DROID_SEARCH_DEBUG" ]; then
+  SEARCH_PROXY_PORT=0 SEARCH_PROXY_PORT_FILE="\$PORT_FILE" node "\$PROXY_SCRIPT" 2>&1 &
+else
+  SEARCH_PROXY_PORT=0 SEARCH_PROXY_PORT_FILE="\$PORT_FILE" node "\$PROXY_SCRIPT" >/dev/null 2>&1 &
+fi
+PROXY_PID=\$!
+
+# Wait for proxy to start and get actual port (max 5 seconds)
+for i in {1..50}; do
+  # Check if proxy process is still running
+  if ! kill -0 "\$PROXY_PID" 2>/dev/null; then
+    [ -n "\$DROID_SEARCH_DEBUG" ] && echo "[websearch] Proxy process died" >&2
+    break
+  fi
+  if [ -f "\$PORT_FILE" ]; then
+    ACTUAL_PORT=\$(cat "\$PORT_FILE" 2>/dev/null)
+    if [ -n "\$ACTUAL_PORT" ] && curl -s "http://127.0.0.1:\$ACTUAL_PORT/health" > /dev/null 2>&1; then
+      [ -n "\$DROID_SEARCH_DEBUG" ] && echo "[websearch] Proxy ready on port \$ACTUAL_PORT (PID: \$PROXY_PID)" >&2
+      break
     fi
-    sleep 0.1
-  done
-
-  echo "[websearch] Failed to start proxy" >&2
-  rm -f "$PID_FILE"
-  return 1
-}
-
-# Ensure proxy is running
-ensure_proxy() {
-  if is_proxy_running; then
-    [ -n "$DROID_SEARCH_DEBUG" ] && echo "[websearch] Using existing proxy on port $PORT" >&2
-    return 0
   fi
-  start_shared_proxy
-}
-
-# Start/reuse proxy
-if ! ensure_proxy; then
-  echo "[websearch] Running without search proxy" >&2
-  exec "$DROID_BIN" "$@"
+  sleep 0.1
+done
+
+# Check if proxy started successfully
+if [ ! -f "\$PORT_FILE" ] || [ -z "\$(cat "\$PORT_FILE" 2>/dev/null)" ]; then
+  echo "[websearch] Failed to start proxy, running without websearch" >&2
+  cleanup
+  exec "\$DROID_BIN" "\$@"
 fi
 
-# Run droid, set API to point to local proxy
-export FACTORY_API_BASE_URL_OVERRIDE="http://127.0.0.1:$PORT"
-exec "$DROID_BIN" "$@"
+ACTUAL_PORT=\$(cat "\$PORT_FILE")
+rm -f "\$PORT_FILE"
+
+# Run droid with proxy
+export FACTORY_API_BASE_URL_OVERRIDE="http://127.0.0.1:\$ACTUAL_PORT"
+"\$DROID_BIN" "\$@"
+DROID_EXIT_CODE=\$?
+
+# Cleanup will be called by trap
+exit \$DROID_EXIT_CODE
 `;
 }
 /**
@@ -644,12 +556,17 @@ exec "$DROID_BIN" "$@"
 * - proxy server intercepts search requests, passes through other requests
 * - uses FACTORY_API_BASE_URL_OVERRIDE env var to point to proxy
 * - alias works directly, no extra steps needed
+*
+* @param outputDir - Directory to write files to
+* @param droidPath - Path to droid binary
+* @param aliasName - Alias name for the wrapper
+* @param apiBase - Custom API base URL for proxy to forward requests to
 */
-async function createWebSearchUnifiedFiles(outputDir, droidPath, aliasName) {
+async function createWebSearchUnifiedFiles(outputDir, droidPath, aliasName, apiBase) {
 	if (!existsSync(outputDir)) await mkdir(outputDir, { recursive: true });
 	const proxyScriptPath = join(outputDir, `${aliasName}-proxy.js`);
 	const wrapperScriptPath = join(outputDir, aliasName);
-	await writeFile(proxyScriptPath, generateSearchProxyServer());
+	await writeFile(proxyScriptPath, generateSearchProxyServer(apiBase || "https://api.factory.ai"));
 	console.log(`[*] Created proxy script: ${proxyScriptPath}`);
 	await writeFile(wrapperScriptPath, generateUnifiedWrapper(droidPath, proxyScriptPath));
 	await chmod(wrapperScriptPath, 493);
@@ -666,13 +583,29 @@ const __dirname = dirname(fileURLToPath(import.meta.url));
 function getVersion() {
 	try {
 		const pkgPath = join(__dirname, "..", "package.json");
-		const pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
-		return pkg.version || "0.0.0";
+		return JSON.parse(readFileSync(pkgPath, "utf-8")).version || "0.0.0";
 	} catch {
 		return "0.0.0";
 	}
 }
 const version = getVersion();
+function getDroidVersion(droidPath) {
+	try {
+		const result = execSync(`"${droidPath}" --version`, {
+			encoding: "utf-8",
+			stdio: [
+				"pipe",
+				"pipe",
+				"pipe"
+			],
+			timeout: 5e3
+		}).trim();
+		const match = result.match(/(\d+\.\d+\.\d+)/);
+		return match ? match[1] : result || void 0;
+	} catch {
+		return;
+	}
+}
 function findDefaultDroidPath() {
 	const home = homedir();
 	try {
@@ -696,12 +629,13 @@ 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 Factory API base URL (https://api.factory.ai) with custom URL").option("--websearch", "Enable local WebSearch via fetch hook (Google PSE + DuckDuckGo fallback)").option("--reasoning-effort", "Enable reasoning effort for custom models (set to high, enable UI selector)").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 Factory API URL with custom URL (binary patch, or forward target with --websearch)").option("--websearch", "Enable local WebSearch proxy (each instance runs own proxy, auto-cleanup on exit)").option("--reasoning-effort", "Enable reasoning effort for custom models (set to high, enable UI selector)").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"];
 	const apiBase = options["api-base"];
-	const webSearch = options["websearch"];
+	const websearch = options["websearch"];
+	const websearchTarget = websearch ? apiBase || "https://api.factory.ai" : void 0;
 	const reasoningEffort = options["reasoning-effort"];
 	const dryRun = options["dry-run"];
 	const path = options.path || findDefaultDroidPath();
@@ -709,7 +643,7 @@ bin("droid-patch", "CLI tool to patch droid binary with various modifications").
 	const backup = options.backup !== false;
 	const verbose = options.verbose;
 	const outputPath = outputDir && alias ? join(outputDir, alias) : void 0;
-	if (webSearch && !isCustom && !skipLogin && !apiBase) {
+	if (websearch && !isCustom && !skipLogin && !reasoningEffort) {
 		if (!alias) {
 			console.log(styleText("red", "Error: Alias name required for --websearch"));
 			console.log(styleText("gray", "Usage: npx droid-patch --websearch <alias>"));
@@ -719,17 +653,21 @@ bin("droid-patch", "CLI tool to patch droid binary with various modifications").
 		console.log(styleText(["cyan", "bold"], "  Droid WebSearch Setup"));
 		console.log(styleText("cyan", "═".repeat(60)));
 		console.log();
-		const websearchDir = join(homedir(), ".droid-patch", "websearch");
-		const { wrapperScript } = await createWebSearchUnifiedFiles(websearchDir, path, alias);
+		console.log(styleText("white", `Forward target: ${websearchTarget}`));
+		console.log();
+		const { wrapperScript } = await createWebSearchUnifiedFiles(join(homedir(), ".droid-patch", "proxy"), path, alias, websearchTarget);
 		await createAliasForWrapper(wrapperScript, alias, verbose);
-		const metadata = createMetadata(alias, path, {
+		const droidVersion = getDroidVersion(path);
+		await saveAliasMetadata(createMetadata(alias, path, {
 			isCustom: false,
 			skipLogin: false,
-			apiBase: null,
+			apiBase: apiBase || null,
 			websearch: true,
 			reasoningEffort: false
-		});
-		await saveAliasMetadata(metadata);
+		}, {
+			droidPatchVersion: version,
+			droidVersion
+		}));
 		console.log();
 		console.log(styleText("green", "═".repeat(60)));
 		console.log(styleText(["green", "bold"], "  WebSearch Ready!"));
@@ -755,22 +693,20 @@ bin("droid-patch", "CLI tool to patch droid binary with various modifications").
 		console.log(styleText("gray", "  export DROID_SEARCH_DEBUG=1"));
 		return;
 	}
-	if (!isCustom && !skipLogin && !apiBase && !webSearch && !reasoningEffort) {
+	if (!isCustom && !skipLogin && !apiBase && !websearch && !reasoningEffort) {
 		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"));
-		console.log(styleText("gray", "  --api-base          Replace Factory API URL with custom server"));
-		console.log(styleText("gray", "  --websearch         Enable local WebSearch (Google PSE + DuckDuckGo)"));
+		console.log(styleText("gray", "  --api-base          Replace Factory API URL (binary patch)"));
+		console.log(styleText("gray", "  --websearch         Enable local WebSearch proxy"));
 		console.log(styleText("gray", "  --reasoning-effort  Set reasoning effort level for custom models"));
 		console.log();
 		console.log("Usage examples:");
 		console.log(styleText("cyan", "  npx droid-patch --is-custom droid-custom"));
 		console.log(styleText("cyan", "  npx droid-patch --skip-login droid-nologin"));
 		console.log(styleText("cyan", "  npx droid-patch --is-custom --skip-login droid-patched"));
-		console.log(styleText("cyan", "  npx droid-patch --skip-login -o . my-droid"));
-		console.log(styleText("cyan", "  npx droid-patch --api-base http://localhost:3000 droid-local"));
 		console.log(styleText("cyan", "  npx droid-patch --websearch droid-search"));
-		console.log(styleText("cyan", "  npx droid-patch --reasoning-effort high droid-reasoning"));
+		console.log(styleText("cyan", "  npx droid-patch --websearch --api-base=http://127.0.0.1:20002 my-droid"));
 		process.exit(1);
 	}
 	if (!alias && !dryRun) {
@@ -795,9 +731,9 @@ bin("droid-patch", "CLI tool to patch droid binary with various modifications").
 		pattern: Buffer.from("process.env.FACTORY_API_KEY"),
 		replacement: Buffer.from("\"fk-droid-patch-skip-00000\"")
 	});
-	if (apiBase) {
+	if (apiBase && !websearch) {
 		const originalUrl = "https://api.factory.ai";
-		const originalLength = originalUrl.length;
+		const originalLength = 22;
 		let normalizedUrl = apiBase.replace(/\/+$/, "");
 		if (normalizedUrl.length > originalLength) {
 			console.log(styleText("red", `Error: API base URL must be ${originalLength} characters or less`));
@@ -843,6 +779,12 @@ bin("droid-patch", "CLI tool to patch droid binary with various modifications").
 			pattern: Buffer.from("supportedReasoningEfforts.length<=1"),
 			replacement: Buffer.from("supportedReasoningEfforts.length<=0")
 		});
+		patches.push({
+			name: "reasoningEffortValidationBypass",
+			description: "Bypass reasoning effort validation (allows xhigh in settings.json)",
+			pattern: Buffer.from("if(R&&!B.supportedReasoningEfforts.includes(R))"),
+			replacement: Buffer.from("if(0&&!B.supportedReasoningEfforts.includes(R))")
+		});
 	}
 	try {
 		const result = await patchDroid({
@@ -874,30 +816,24 @@ bin("droid-patch", "CLI tool to patch droid binary with various modifications").
 		}
 		if (result.success && result.outputPath && alias) {
 			console.log();
-			if (webSearch) {
-				const websearchDir = join(homedir(), ".droid-patch", "websearch");
-				const { wrapperScript } = await createWebSearchUnifiedFiles(websearchDir, result.outputPath, alias);
+			if (websearch) {
+				const { wrapperScript } = await createWebSearchUnifiedFiles(join(homedir(), ".droid-patch", "proxy"), result.outputPath, alias, websearchTarget);
 				await createAliasForWrapper(wrapperScript, alias, verbose);
 				console.log();
-				console.log(styleText("cyan", "WebSearch providers (optional):"));
-				console.log(styleText("gray", "  Works out of the box with DuckDuckGo fallback"));
-				console.log(styleText("gray", "  For better results, configure a provider:"));
-				console.log();
-				console.log(styleText("yellow", "  Smithery Exa"), styleText("gray", " - Best quality, free via smithery.ai"));
-				console.log(styleText("gray", "    export SMITHERY_API_KEY=... SMITHERY_PROFILE=..."));
-				console.log(styleText("yellow", "  Google PSE"), styleText("gray", " - 10,000/day free"));
-				console.log(styleText("gray", "    export GOOGLE_PSE_API_KEY=... GOOGLE_PSE_CX=..."));
-				console.log();
-				console.log(styleText("gray", "  See README for all providers and setup guides"));
+				console.log(styleText("cyan", "WebSearch enabled"));
+				console.log(styleText("white", `  Forward target: ${websearchTarget}`));
 			} else await createAlias(result.outputPath, alias, verbose);
-			const metadata = createMetadata(alias, path, {
+			const droidVersion = getDroidVersion(path);
+			await saveAliasMetadata(createMetadata(alias, path, {
 				isCustom: !!isCustom,
 				skipLogin: !!skipLogin,
 				apiBase: apiBase || null,
-				websearch: !!webSearch,
+				websearch: !!websearch,
 				reasoningEffort: !!reasoningEffort
-			});
-			await saveAliasMetadata(metadata);
+			}, {
+				droidPatchVersion: version,
+				droidVersion
+			}));
 		}
 		if (result.success) {
 			console.log();
@@ -913,8 +849,23 @@ 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 a droid-patch alias or patched binary file").argument("<alias-or-path>", "Alias name or file path to remove").action(async (_options, args) => {
-	const target = args[0];
+}).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)").action(async (options, args) => {
+	const target = args?.[0];
+	const patchVersion = options["patch-version"];
+	const droidVersion = options["droid-version"];
+	const flag = options.flag;
+	if (patchVersion || droidVersion || flag) {
+		await removeAliasesByFilter({
+			patchVersion,
+			droidVersion,
+			flags: flag ? [flag] : void 0
+		});
+		return;
+	}
+	if (!target) {
+		console.error(styleText("red", "Error: Provide an alias name or use filter options (--patch-version, --droid-version, --flag)"));
+		process.exit(1);
+	}
 	if (target.includes("/") || existsSync(target)) {
 		const { unlink: unlink$1 } = await import("node:fs/promises");
 		try {
@@ -927,86 +878,8 @@ bin("droid-patch", "CLI tool to patch droid binary with various modifications").
 	} else await removeAlias(target);
 }).command("version", "Print droid-patch version").action(() => {
 	console.log(`droid-patch v${version}`);
-}).command("proxy-status", "Check websearch proxy status").action(async () => {
-	const pidFile = "/tmp/droid-search-proxy.pid";
-	const logFile = "/tmp/droid-search-proxy.log";
-	const port = 23119;
-	console.log(styleText("cyan", "═".repeat(60)));
-	console.log(styleText(["cyan", "bold"], "  WebSearch Proxy Status"));
-	console.log(styleText("cyan", "═".repeat(60)));
-	console.log();
-	try {
-		const response = await fetch(`http://127.0.0.1:${port}/health`);
-		if (response.ok) {
-			const data = await response.json();
-			console.log(styleText("green", `  Status: Running ✓`));
-			console.log(styleText("white", `  Port: ${port}`));
-			if (existsSync(pidFile)) {
-				const { readFileSync: readFileSync$1 } = await import("node:fs");
-				const pid = readFileSync$1(pidFile, "utf-8").trim();
-				console.log(styleText("white", `  PID: ${pid}`));
-			}
-			if (data.droidRunning !== void 0) console.log(styleText("white", `  Droid running: ${data.droidRunning ? "yes (proxy will stay alive)" : "no"}`));
-			if (data.idleTimeout !== void 0) if (data.idleTimeout > 0) {
-				const idleMins = Math.floor((data.idleSeconds || 0) / 60);
-				const idleSecs = (data.idleSeconds || 0) % 60;
-				if (data.droidRunning) console.log(styleText("white", `  Idle: ${idleMins}m ${idleSecs}s (won't shutdown while droid runs)`));
-				else if (data.willShutdownIn !== null) {
-					const shutdownMins = Math.floor((data.willShutdownIn || 0) / 60);
-					const shutdownSecs = (data.willShutdownIn || 0) % 60;
-					console.log(styleText("white", `  Idle: ${idleMins}m ${idleSecs}s`));
-					console.log(styleText("white", `  Auto-shutdown in: ${shutdownMins}m ${shutdownSecs}s`));
-				}
-			} else console.log(styleText("white", `  Auto-shutdown: disabled`));
-			console.log(styleText("white", `  Log: ${logFile}`));
-			console.log();
-			console.log(styleText("gray", "To stop the proxy manually:"));
-			console.log(styleText("cyan", "  npx droid-patch proxy-stop"));
-			console.log();
-			console.log(styleText("gray", "To disable auto-shutdown:"));
-			console.log(styleText("cyan", "  export DROID_PROXY_IDLE_TIMEOUT=0"));
-		}
-	} catch {
-		console.log(styleText("yellow", `  Status: Not running`));
-		console.log();
-		console.log(styleText("gray", "The proxy will start automatically when you run droid-full."));
-		console.log(styleText("gray", "It will auto-shutdown after 5 minutes of idle (configurable)."));
-	}
-	console.log();
-}).command("proxy-stop", "Stop the websearch proxy").action(async () => {
-	const pidFile = "/tmp/droid-search-proxy.pid";
-	if (!existsSync(pidFile)) {
-		console.log(styleText("yellow", "Proxy is not running (no PID file)"));
-		return;
-	}
-	try {
-		const { readFileSync: readFileSync$1, unlinkSync: unlinkSync$1 } = await import("node:fs");
-		const pid = readFileSync$1(pidFile, "utf-8").trim();
-		process.kill(parseInt(pid), "SIGTERM");
-		unlinkSync$1(pidFile);
-		console.log(styleText("green", `[*] Proxy stopped (PID: ${pid})`));
-	} catch (error) {
-		console.log(styleText("yellow", `[!] Could not stop proxy: ${error.message}`));
-		try {
-			const { unlinkSync: unlinkSync$1 } = await import("node:fs");
-			unlinkSync$1(pidFile);
-			console.log(styleText("gray", "Cleaned up stale PID file"));
-		} catch {}
-	}
-}).command("proxy-log", "Show websearch proxy logs").action(async () => {
-	const logFile = "/tmp/droid-search-proxy.log";
-	if (!existsSync(logFile)) {
-		console.log(styleText("yellow", "No log file found"));
-		return;
-	}
-	const { readFileSync: readFileSync$1 } = await import("node:fs");
-	const log = readFileSync$1(logFile, "utf-8");
-	const lines = log.split("\n").slice(-50);
-	console.log(styleText("cyan", "═".repeat(60)));
-	console.log(styleText(["cyan", "bold"], "  WebSearch Proxy Logs (last 50 lines)"));
-	console.log(styleText("cyan", "═".repeat(60)));
-	console.log();
-	console.log(lines.join("\n"));
+}).command("clear", "Remove all droid-patch aliases and related files").action(async () => {
+	await clearAllAliases();
 }).command("update", "Update aliases with latest droid binary").argument("[alias]", "Specific alias to update (optional, updates all if not specified)").option("--dry-run", "Preview without making changes").option("-p, --path <path>", "Path to new droid binary").option("-v, --verbose", "Enable verbose output").action(async (options, args) => {
 	const aliasName = args?.[0];
 	const dryRun = options["dry-run"];
@@ -1071,7 +944,7 @@ bin("droid-patch", "CLI tool to patch droid binary with various modifications").
 			});
 			if (meta.patches.apiBase) {
 				const originalUrl = "https://api.factory.ai";
-				const paddedUrl = meta.patches.apiBase.padEnd(originalUrl.length, " ");
+				const paddedUrl = meta.patches.apiBase.padEnd(22, " ");
 				patches.push({
 					name: "apiBase",
 					description: `Replace Factory API URL with "${meta.patches.apiBase}"`,
@@ -1104,19 +977,23 @@ bin("droid-patch", "CLI tool to patch droid binary with various modifications").
 					pattern: Buffer.from("supportedReasoningEfforts.length<=1"),
 					replacement: Buffer.from("supportedReasoningEfforts.length<=0")
 				});
+				patches.push({
+					name: "reasoningEffortValidationBypass",
+					description: "Bypass reasoning effort validation (allows xhigh in settings.json)",
+					pattern: Buffer.from("if(R&&!B.supportedReasoningEfforts.includes(R))"),
+					replacement: Buffer.from("if(0&&!B.supportedReasoningEfforts.includes(R))")
+				});
 			}
-			const binsDir = join(homedir(), ".droid-patch", "bins");
-			const outputPath = join(binsDir, `${meta.name}-patched`);
+			const outputPath = join(join(homedir(), ".droid-patch", "bins"), `${meta.name}-patched`);
 			if (patches.length > 0) {
-				const result = await patchDroid({
+				if (!(await patchDroid({
 					inputPath: newBinaryPath,
 					outputPath,
 					patches,
 					dryRun: false,
 					backup: false,
 					verbose
-				});
-				if (!result.success) {
+				})).success) {
 					console.log(styleText("red", `  ✗ Failed to apply patches`));
 					failCount++;
 					continue;
@@ -1129,13 +1006,17 @@ bin("droid-patch", "CLI tool to patch droid binary with various modifications").
 					console.log(styleText("yellow", `  [!] Could not re-sign binary`));
 				}
 			}
-			if (meta.patches.websearch) {
-				const websearchDir = join(homedir(), ".droid-patch", "websearch");
-				const targetBinaryPath = patches.length > 0 ? outputPath : newBinaryPath;
-				await createWebSearchUnifiedFiles(websearchDir, targetBinaryPath, meta.name);
+			if (meta.patches.websearch || !!meta.patches.proxy) {
+				const forwardTarget = meta.patches.apiBase || meta.patches.proxy || "https://api.factory.ai";
+				await createWebSearchUnifiedFiles(join(homedir(), ".droid-patch", "proxy"), patches.length > 0 ? outputPath : newBinaryPath, meta.name, forwardTarget);
 				if (verbose) console.log(styleText("gray", `  Regenerated websearch wrapper`));
+				if (meta.patches.proxy && !meta.patches.websearch) {
+					meta.patches.websearch = true;
+					meta.patches.apiBase = meta.patches.proxy;
+					delete meta.patches.proxy;
+				}
 			}
-			meta.updatedAt = new Date().toISOString();
+			meta.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
 			meta.originalBinaryPath = newBinaryPath;
 			await saveAliasMetadata(meta);
 			console.log(styleText("green", `  ✓ Updated successfully`));
@@ -1165,4 +1046,5 @@ bin("droid-patch", "CLI tool to patch droid binary with various modifications").
 });
 
 //#endregion
-//# sourceMappingURL=cli.js.map
+export {  };
+//# sourceMappingURL=cli.mjs.map