droid-patch 0.13.0 → 0.13.2

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 #!/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-hvk8y5gC.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, mkdirSync, readFileSync, writeFileSync } from "node:fs";
@@ -14,12 +14,12 @@ import { createInterface } from "node:readline/promises";
 /**
 * WebSearch External Providers Mode (--websearch)
 *
-* Priority: Smithery Exa > Google PSE > Serper > Brave > SearXNG > DuckDuckGo
+* Priority: Smithery Exa > Google PSE > Tavily > Serper > Brave > SearXNG > DuckDuckGo
 */
 function generateSearchProxyServerCode() {
 	return `#!/usr/bin/env node
 // Droid WebSearch Proxy Server (External Providers Mode)
-// Priority: Smithery Exa > Google PSE > Serper > Brave > SearXNG > DuckDuckGo
+// Priority: Smithery Exa > Google PSE > Tavily > Serper > Brave > SearXNG > DuckDuckGo
 
 const http = require('http');
 const https = require('https');
@@ -75,6 +75,30 @@ async function searchGooglePSE(query, numResults) {
   return null;
 }
 
+async function searchTavily(query, numResults) {
+  const apiKey = process.env.TAVILY_API_KEY;
+  if (!apiKey) return null;
+  try {
+    const bodyStr = JSON.stringify({
+      api_key: apiKey,
+      query: query,
+      max_results: numResults,
+      search_depth: 'basic',
+      include_answer: false,
+      include_images: false,
+      include_raw_content: false
+    }).replace(/'/g, "'\\\\''");
+    const curlCmd = 'curl -s "https://api.tavily.com/search" -H "Content-Type: application/json" -d \\'' + bodyStr + "\\'";
+    const data = JSON.parse(execSync(curlCmd, { encoding: 'utf-8', timeout: 15000 }));
+    if (data && Array.isArray(data.results) && data.results.length > 0) {
+      return data.results.slice(0, numResults).map(function(item) {
+        return { title: item.title || '', url: item.url || '', content: item.content || item.snippet || item.raw_content || '' };
+      });
+    }
+  } catch (e) { log('Tavily failed:', e.message); }
+  return null;
+}
+
 async function searchSerper(query, numResults) {
   const apiKey = process.env.SERPER_API_KEY;
   if (!apiKey) return null;
@@ -144,13 +168,16 @@ async function search(query, numResults) {
   numResults = numResults || 10;
   log('Search:', query);
   
-  // Priority: Smithery > Google PSE > Serper > Brave > SearXNG > DuckDuckGo
+  // Priority: Smithery > Google PSE > Tavily > Serper > Brave > SearXNG > DuckDuckGo
   var results = await searchSmitheryExa(query, numResults);
   if (results && results.length > 0) return { results: results, source: 'smithery-exa' };
   
   results = await searchGooglePSE(query, numResults);
   if (results && results.length > 0) return { results: results, source: 'google-pse' };
   
+  results = await searchTavily(query, numResults);
+  if (results && results.length > 0) return { results: results, source: 'tavily' };
+  
   results = await searchSerper(query, numResults);
   if (results && results.length > 0) return { results: results, source: 'serper' };
   
@@ -1057,7 +1084,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("--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"];
@@ -1068,14 +1095,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 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 || !!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:"));
@@ -1157,14 +1183,16 @@ bin("droid-patch", "CLI tool to patch droid binary with various modifications").
 			console.log(styleText("gray", "  2. Google PSE:"));
 			console.log(styleText("gray", "     export GOOGLE_PSE_API_KEY=your_api_key"));
 			console.log(styleText("gray", "     export GOOGLE_PSE_CX=your_search_engine_id"));
-			console.log(styleText("gray", "  3-6. Serper, Brave, SearXNG, DuckDuckGo (fallbacks)"));
+			console.log(styleText("gray", "  3. Tavily:"));
+			console.log(styleText("gray", "     export TAVILY_API_KEY=your_api_key"));
+			console.log(styleText("gray", "  4-7. Serper, Brave, SearXNG, DuckDuckGo (fallbacks)"));
 			console.log();
 			console.log("Debug mode:");
 			console.log(styleText("gray", "  export DROID_SEARCH_DEBUG=1"));
 		}
 		return;
 	}
-	if (!isCustom && !skipLogin && !apiBase && !websearch && !reasoningEffort && !noTelemetry && !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"));
@@ -1172,7 +1200,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", "  --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:");
@@ -1284,24 +1311,6 @@ bin("droid-patch", "CLI tool to patch droid binary with various modifications").
 			replacement: Buffer.from("!0||this.webEvents.length")
 		});
 	}
-	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,
@@ -1359,8 +1368,7 @@ bin("droid-patch", "CLI tool to patch droid binary with various modifications").
 				websearchProxy: !!websearchProxy,
 				reasoningEffort: !!reasoningEffort,
 				noTelemetry: !!noTelemetry,
-				standalone: !!standalone,
-				specModelCustom: !!specModelCustom
+				standalone: !!standalone
 			}, {
 				droidPatchVersion: version,
 				droidVersion,
@@ -1381,7 +1389,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"];
@@ -1395,8 +1403,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}`));
@@ -1557,24 +1564,6 @@ bin("droid-patch", "CLI tool to patch droid binary with various modifications").
 					replacement: Buffer.from("!0||this.webEvents.length")
 				});
 			}
-			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({