droid-patch 0.2.1 → 0.4.0

package/dist/cli.js

@@ -1,11 +1,12 @@
 #!/usr/bin/env node
-import { createAlias, createAliasForWrapper, listAliases, patchDroid, removeAlias } from "./alias-C9LRaTwF.js";
+import { createAlias, createAliasForWrapper, createMetadata, formatPatches, listAliases, listAllMetadata, loadAliasMetadata, patchDroid, removeAlias, saveAliasMetadata } from "./alias-UwlvAO5o.js";
 import bin from "tiny-bin";
 import { styleText } from "node:util";
 import { existsSync, readFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { homedir } from "node:os";
 import { fileURLToPath } from "node:url";
+import { execSync } from "node:child_process";
 import { chmod, mkdir, writeFile } from "node:fs/promises";
 
 //#region src/websearch-patch.ts
@@ -674,20 +675,34 @@ function getVersion() {
 const version = getVersion();
 function findDefaultDroidPath() {
 	const home = homedir();
+	try {
+		const result = execSync("which droid", {
+			encoding: "utf-8",
+			stdio: [
+				"pipe",
+				"pipe",
+				"pipe"
+			]
+		}).trim();
+		if (result && existsSync(result)) return result;
+	} catch {}
 	const paths = [
-		join(home, ".droid/bin/droid"),
+		join(home, ".droid", "bin", "droid"),
+		"/opt/homebrew/bin/droid",
 		"/usr/local/bin/droid",
+		"/usr/bin/droid",
 		"./droid"
 	];
 	for (const p of paths) if (existsSync(p)) return p;
-	return join(home, ".droid/bin/droid");
+	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("--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 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) => {
 	const alias = args?.[0];
 	const isCustom = options["is-custom"];
 	const skipLogin = options["skip-login"];
 	const apiBase = options["api-base"];
 	const webSearch = options["websearch"];
+	const reasoningEffort = options["reasoning-effort"];
 	const dryRun = options["dry-run"];
 	const path = options.path || findDefaultDroidPath();
 	const outputDir = options.output;
@@ -707,6 +722,14 @@ bin("droid-patch", "CLI tool to patch droid binary with various modifications").
 		const websearchDir = join(homedir(), ".droid-patch", "websearch");
 		const { wrapperScript } = await createWebSearchUnifiedFiles(websearchDir, path, alias);
 		await createAliasForWrapper(wrapperScript, alias, verbose);
+		const metadata = createMetadata(alias, path, {
+			isCustom: false,
+			skipLogin: false,
+			apiBase: null,
+			websearch: true,
+			reasoningEffort: false
+		});
+		await saveAliasMetadata(metadata);
 		console.log();
 		console.log(styleText("green", "═".repeat(60)));
 		console.log(styleText(["green", "bold"], "  WebSearch Ready!"));
@@ -732,12 +755,13 @@ 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) {
+	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", "  --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", "  --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"));
@@ -746,6 +770,7 @@ bin("droid-patch", "CLI tool to patch droid binary with various modifications").
 		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"));
 		process.exit(1);
 	}
 	if (!alias && !dryRun) {
@@ -793,6 +818,32 @@ bin("droid-patch", "CLI tool to patch droid binary with various modifications").
 			replacement: Buffer.from(paddedUrl)
 		});
 	}
+	if (reasoningEffort) {
+		patches.push({
+			name: "reasoningEffortSupported",
+			description: "Change supportedReasoningEfforts:[\"none\"] to [\"high\"]",
+			pattern: Buffer.from("supportedReasoningEfforts:[\"none\"]"),
+			replacement: Buffer.from("supportedReasoningEfforts:[\"high\"]")
+		});
+		patches.push({
+			name: "reasoningEffortDefault",
+			description: "Change defaultReasoningEffort:\"none\" to \"high\"",
+			pattern: Buffer.from("defaultReasoningEffort:\"none\""),
+			replacement: Buffer.from("defaultReasoningEffort:\"high\"")
+		});
+		patches.push({
+			name: "reasoningEffortUIShow",
+			description: "Change supportedReasoningEfforts.length>1 to length>0",
+			pattern: Buffer.from("supportedReasoningEfforts.length>1"),
+			replacement: Buffer.from("supportedReasoningEfforts.length>0")
+		});
+		patches.push({
+			name: "reasoningEffortUIEnable",
+			description: "Change supportedReasoningEfforts.length<=1 to length<=0",
+			pattern: Buffer.from("supportedReasoningEfforts.length<=1"),
+			replacement: Buffer.from("supportedReasoningEfforts.length<=0")
+		});
+	}
 	try {
 		const result = await patchDroid({
 			inputPath: path,
@@ -839,6 +890,14 @@ bin("droid-patch", "CLI tool to patch droid binary with various modifications").
 				console.log();
 				console.log(styleText("gray", "  See README for all providers and setup guides"));
 			} else await createAlias(result.outputPath, alias, verbose);
+			const metadata = createMetadata(alias, path, {
+				isCustom: !!isCustom,
+				skipLogin: !!skipLogin,
+				apiBase: apiBase || null,
+				websearch: !!webSearch,
+				reasoningEffort: !!reasoningEffort
+			});
+			await saveAliasMetadata(metadata);
 		}
 		if (result.success) {
 			console.log();
@@ -948,6 +1007,158 @@ bin("droid-patch", "CLI tool to patch droid binary with various modifications").
 	console.log(styleText("cyan", "═".repeat(60)));
 	console.log();
 	console.log(lines.join("\n"));
+}).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"];
+	const newBinaryPath = options.path || findDefaultDroidPath();
+	const verbose = options.verbose;
+	console.log(styleText("cyan", "═".repeat(60)));
+	console.log(styleText(["cyan", "bold"], "  Droid-Patch Update"));
+	console.log(styleText("cyan", "═".repeat(60)));
+	console.log();
+	if (!existsSync(newBinaryPath)) {
+		console.log(styleText("red", `Error: Droid binary not found at ${newBinaryPath}`));
+		console.log(styleText("gray", "Use -p to specify a different path"));
+		process.exit(1);
+	}
+	let metaList;
+	if (aliasName) {
+		const meta = await loadAliasMetadata(aliasName);
+		if (!meta) {
+			console.log(styleText("red", `Error: No metadata found for alias "${aliasName}"`));
+			console.log(styleText("gray", "This alias may have been created before update tracking was added."));
+			console.log(styleText("gray", "Remove and recreate the alias to enable update support."));
+			process.exit(1);
+		}
+		metaList = [meta];
+	} else {
+		metaList = await listAllMetadata();
+		if (metaList.length === 0) {
+			console.log(styleText("yellow", "No aliases with metadata found."));
+			console.log(styleText("gray", "Create aliases with droid-patch to enable update support."));
+			process.exit(0);
+		}
+	}
+	console.log(styleText("white", `Using droid binary: ${newBinaryPath}`));
+	console.log(styleText("white", `Found ${metaList.length} alias(es) to update`));
+	if (dryRun) console.log(styleText("blue", "(DRY RUN - no changes will be made)"));
+	console.log();
+	let successCount = 0;
+	let failCount = 0;
+	for (const meta of metaList) {
+		if (!meta) continue;
+		console.log(styleText("cyan", `─`.repeat(40)));
+		console.log(styleText("white", `Updating: ${styleText(["cyan", "bold"], meta.name)}`));
+		console.log(styleText("gray", `  Patches: ${formatPatches(meta.patches)}`));
+		if (dryRun) {
+			console.log(styleText("blue", `  [DRY RUN] Would re-apply patches`));
+			successCount++;
+			continue;
+		}
+		try {
+			const patches = [];
+			if (meta.patches.isCustom) patches.push({
+				name: "isCustom",
+				description: "Change isCustom:!0 to isCustom:!1",
+				pattern: Buffer.from("isCustom:!0"),
+				replacement: Buffer.from("isCustom:!1")
+			});
+			if (meta.patches.skipLogin) patches.push({
+				name: "skipLogin",
+				description: "Replace process.env.FACTORY_API_KEY with fake key",
+				pattern: Buffer.from("process.env.FACTORY_API_KEY"),
+				replacement: Buffer.from("\"fk-droid-patch-skip-00000\"")
+			});
+			if (meta.patches.apiBase) {
+				const originalUrl = "https://api.factory.ai";
+				const paddedUrl = meta.patches.apiBase.padEnd(originalUrl.length, " ");
+				patches.push({
+					name: "apiBase",
+					description: `Replace Factory API URL with "${meta.patches.apiBase}"`,
+					pattern: Buffer.from(originalUrl),
+					replacement: Buffer.from(paddedUrl)
+				});
+			}
+			if (meta.patches.reasoningEffort) {
+				patches.push({
+					name: "reasoningEffortSupported",
+					description: "Change supportedReasoningEfforts:[\"none\"] to [\"high\"]",
+					pattern: Buffer.from("supportedReasoningEfforts:[\"none\"]"),
+					replacement: Buffer.from("supportedReasoningEfforts:[\"high\"]")
+				});
+				patches.push({
+					name: "reasoningEffortDefault",
+					description: "Change defaultReasoningEffort:\"none\" to \"high\"",
+					pattern: Buffer.from("defaultReasoningEffort:\"none\""),
+					replacement: Buffer.from("defaultReasoningEffort:\"high\"")
+				});
+				patches.push({
+					name: "reasoningEffortUIShow",
+					description: "Change supportedReasoningEfforts.length>1 to length>0",
+					pattern: Buffer.from("supportedReasoningEfforts.length>1"),
+					replacement: Buffer.from("supportedReasoningEfforts.length>0")
+				});
+				patches.push({
+					name: "reasoningEffortUIEnable",
+					description: "Change supportedReasoningEfforts.length<=1 to length<=0",
+					pattern: Buffer.from("supportedReasoningEfforts.length<=1"),
+					replacement: Buffer.from("supportedReasoningEfforts.length<=0")
+				});
+			}
+			const binsDir = join(homedir(), ".droid-patch", "bins");
+			const outputPath = join(binsDir, `${meta.name}-patched`);
+			if (patches.length > 0) {
+				const result = await patchDroid({
+					inputPath: newBinaryPath,
+					outputPath,
+					patches,
+					dryRun: false,
+					backup: false,
+					verbose
+				});
+				if (!result.success) {
+					console.log(styleText("red", `  ✗ Failed to apply patches`));
+					failCount++;
+					continue;
+				}
+				if (process.platform === "darwin") try {
+					const { execSync: execSync$1 } = await import("node:child_process");
+					execSync$1(`codesign --force --deep --sign - "${outputPath}"`, { stdio: "pipe" });
+					if (verbose) console.log(styleText("gray", `  Re-signed binary`));
+				} catch {
+					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 (verbose) console.log(styleText("gray", `  Regenerated websearch wrapper`));
+			}
+			meta.updatedAt = new Date().toISOString();
+			meta.originalBinaryPath = newBinaryPath;
+			await saveAliasMetadata(meta);
+			console.log(styleText("green", `  ✓ Updated successfully`));
+			successCount++;
+		} catch (error) {
+			console.log(styleText("red", `  ✗ Error: ${error.message}`));
+			if (verbose) console.error(error.stack);
+			failCount++;
+		}
+	}
+	console.log();
+	console.log(styleText("cyan", "═".repeat(60)));
+	if (dryRun) {
+		console.log(styleText(["blue", "bold"], "  DRY RUN COMPLETE"));
+		console.log(styleText("gray", `  Would update ${successCount} alias(es)`));
+	} else if (failCount === 0) {
+		console.log(styleText(["green", "bold"], "  UPDATE COMPLETE"));
+		console.log(styleText("gray", `  Updated ${successCount} alias(es)`));
+	} else {
+		console.log(styleText(["yellow", "bold"], "  UPDATE FINISHED WITH ERRORS"));
+		console.log(styleText("gray", `  Success: ${successCount}, Failed: ${failCount}`));
+	}
+	console.log(styleText("cyan", "═".repeat(60)));
 }).run().catch((err) => {
 	console.error(err);
 	process.exit(1);