droid-patch 0.14.0 → 0.15.0

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-jucBZXia.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-DgX_0sGe.mjs";
 import bin from "tiny-bin";
 import { styleText } from "node:util";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
@@ -1042,6 +1042,56 @@ function getDroidVersion(droidPath) {
 		return;
 	}
 }
+function parseSemver(versionText) {
+	const match = versionText.match(/^(\d+)\.(\d+)\.(\d+)$/);
+	if (!match) return null;
+	return [
+		Number(match[1]),
+		Number(match[2]),
+		Number(match[3])
+	];
+}
+function compareSemver(left, right) {
+	const l = parseSemver(left);
+	const r = parseSemver(right);
+	if (!l || !r) throw new Error(`Invalid semver comparison: "${left}" vs "${right}"`);
+	for (let i = 0; i < 3; i++) {
+		if (l[i] > r[i]) return 1;
+		if (l[i] < r[i]) return -1;
+	}
+	return 0;
+}
+function matchesVersionRule(droidVersion, rule) {
+	if (rule.minVersion && compareSemver(droidVersion, rule.minVersion) < 0) return false;
+	if (rule.maxVersion && compareSemver(droidVersion, rule.maxVersion) >= 0) return false;
+	return true;
+}
+function resolveVersionedPatches(featureName, droidVersion, rules) {
+	if (!droidVersion) throw new Error(`Unable to detect droid version for ${featureName}`);
+	if (!parseSemver(droidVersion)) throw new Error(`Unsupported droid version format "${droidVersion}" for ${featureName}`);
+	const matchedRule = rules.find((rule) => matchesVersionRule(droidVersion, rule));
+	if (!matchedRule) throw new Error(`No patch rule matched ${featureName} on droid ${droidVersion}`);
+	return matchedRule.buildPatches();
+}
+const SKIP_LOGIN_PATCH_RULES = [{
+	id: "skip-login-legacy",
+	maxVersion: "0.68.0",
+	buildPatches: () => [{
+		name: "skipLogin",
+		description: "Replace process.env.FACTORY_API_KEY with \"fk-droid-patch-skip-00000\"",
+		pattern: Buffer.from("process.env.FACTORY_API_KEY"),
+		replacement: Buffer.from("\"fk-droid-patch-skip-00000\"")
+	}]
+}, {
+	id: "skip-login-v068-plus",
+	minVersion: "0.68.0",
+	buildPatches: () => [{
+		name: "factoryApiKeyLookupV068",
+		description: "Replace process.env[__.FACTORY_API_KEY]?.trim() with \"fk-droid-patch-skip-00000000000000000\"",
+		pattern: Buffer.from("process.env[__.FACTORY_API_KEY]?.trim()"),
+		replacement: Buffer.from("\"fk-droid-patch-skip-00000000000000000\"")
+	}]
+}];
 function findDefaultDroidPath() {
 	const home = homedir();
 	if (IS_WINDOWS) {
@@ -1102,6 +1152,7 @@ bin("droid-patch", "CLI tool to patch droid binary with various modifications").
 	const outputDir = options.output;
 	const backup = options.backup !== false;
 	const verbose = options.verbose;
+	const droidVersion = getDroidVersion(path);
 	const outputPath = outputDir && alias ? join(outputDir, alias) : void 0;
 	const needsBinaryPatch = !!isCustom || !!skipLogin || !!reasoningEffort || !!noTelemetry || !!apiBase && !websearch && !websearchProxy;
 	if (websearch && websearchProxy) {
@@ -1136,7 +1187,6 @@ bin("droid-patch", "CLI tool to patch droid binary with various modifications").
 		const { wrapperScript } = await createWebSearchUnifiedFiles(join(homedir(), ".droid-patch", "proxy"), execTargetPath, alias, websearchProxy ? void 0 : websearchTarget, standalone, websearchProxy);
 		execTargetPath = wrapperScript;
 		const aliasResult = await createAliasForWrapper(execTargetPath, alias, verbose);
-		const droidVersion = getDroidVersion(path);
 		await saveAliasMetadata(createMetadata(alias, path, {
 			isCustom: false,
 			skipLogin: false,
@@ -1230,12 +1280,13 @@ bin("droid-patch", "CLI tool to patch droid binary with various modifications").
 		pattern: Buffer.from("isCustom:!0"),
 		replacement: Buffer.from("isCustom:!1")
 	});
-	if (skipLogin) patches.push({
-		name: "skipLogin",
-		description: "Replace process.env.FACTORY_API_KEY with \"fk-droid-patch-skip-00000\"",
-		pattern: Buffer.from("process.env.FACTORY_API_KEY"),
-		replacement: Buffer.from("\"fk-droid-patch-skip-00000\"")
-	});
+	if (skipLogin) try {
+		patches.push(...resolveVersionedPatches("--skip-login", droidVersion, SKIP_LOGIN_PATCH_RULES));
+	} catch (error) {
+		console.log(styleText("red", `Error: ${error.message}`));
+		if (!droidVersion) console.log(styleText("gray", "Please use -p to point to a runnable droid binary."));
+		process.exit(1);
+	}
 	if (apiBase && !websearch) {
 		const originalUrl = "https://api.factory.ai";
 		const originalLength = 22;
@@ -1261,23 +1312,45 @@ bin("droid-patch", "CLI tool to patch droid binary with various modifications").
 	}
 	if (reasoningEffort) {
 		patches.push({
-			name: "reasoningEffortSupportedXHighList",
-			description: "Enable [\"high\",\"max\",\"xhigh\"] in UI for custom model list",
+			name: "reasoningEffortSupportedXHighListLegacy",
+			description: "Enable [\"high\",\"max\",\"xhigh\"] in UI for custom model list (legacy)",
 			pattern: Buffer.from(""),
 			replacement: Buffer.from(""),
+			suppressCheckUnlessFound: true,
 			regexPattern: /id:([A-Za-z$_])\.id,displayName:\1\.displayName,shortDisplayName:\1\.(?:displayName|id),modelProvider:\1\.provider\s*,supportedReasoningEfforts:\[(?:"(?:none|high)"(?:,"xhigh")?|"low","high","xhigh")\],defaultReasoningEffort:"(?:none|high)",isCustom:!([01]),noImageSupport:(?:\1\.noImageSupport|!1)/g,
 			regexReplacement: "id:$1.id,displayName:$1.displayName,shortDisplayName:$1.displayName,modelProvider:$1.provider,supportedReasoningEfforts:[\"high\",\"max\",\"xhigh\"],defaultReasoningEffort:\"high\",isCustom:!$2,noImageSupport:!1",
 			alreadyPatchedRegexPattern: /id:([A-Za-z$_])\.id,displayName:\1\.displayName,shortDisplayName:\1\.displayName,modelProvider:\1\.provider,supportedReasoningEfforts:\["high","max","xhigh"\],defaultReasoningEffort:"high",isCustom:!([01]),noImageSupport:!1/g
 		});
 		patches.push({
-			name: "reasoningEffortSupportedXHighResolver",
-			description: "Enable [\"high\",\"max\",\"xhigh\"] in UI for custom model config resolver",
+			name: "reasoningEffortSupportedXHighResolverLegacy",
+			description: "Enable [\"high\",\"max\",\"xhigh\"] in UI for custom model config resolver (legacy)",
 			pattern: Buffer.from(""),
 			replacement: Buffer.from(""),
+			suppressCheckUnlessFound: true,
 			regexPattern: /id:([A-Za-z$_])\.model,modelProvider:\1\.provider\s*,displayName:([A-Za-z$_]),shortDisplayName:\2,supportedReasoningEfforts:\[(?:"(?:none|high)"(?:,"xhigh")?|"low","high","xhigh")\],defaultReasoningEffort:"(?:none|high)",isCustom:!([01]),noImageSupport:(?:\1\.noImageSupport|!1)/g,
 			regexReplacement: "id:$1.model,modelProvider:$1.provider,displayName:$2,shortDisplayName:$2,supportedReasoningEfforts:[\"high\",\"max\",\"xhigh\"],defaultReasoningEffort:\"high\",isCustom:!$3,noImageSupport:!1",
 			alreadyPatchedRegexPattern: /id:([A-Za-z$_])\.model,modelProvider:\1\.provider,displayName:([A-Za-z$_]),shortDisplayName:\2,supportedReasoningEfforts:\["high","max","xhigh"\],defaultReasoningEffort:"high",isCustom:!([01]),noImageSupport:!1/g
 		});
+		patches.push({
+			name: "reasoningEffortSupportedXHighList",
+			description: "Enable [\"high\",\"max\",\"xhigh\"] in UI for custom model list",
+			pattern: Buffer.from(""),
+			replacement: Buffer.from(""),
+			skipIfAnySucceeded: ["reasoningEffortSupportedXHighListLegacy"],
+			regexPattern: /id:([A-Za-z$_])\.id,displayName:\1\.displayName,shortDisplayName:\1\.displayName,modelProvider:\1\.provider,supportedReasoningEfforts:[A-Za-z$_]\?\["off","low","medium","high"\]:\["none"\],defaultReasoningEffort:\1\.reasoningEffort\?\?"none",isCustom:!([01]),noImageSupport:\1\.noImageSupport/g,
+			regexReplacement: "id:$1.id,displayName:$1.displayName,shortDisplayName:$1.displayName,modelProvider:$1.provider,supportedReasoningEfforts:1?[\"high\",\"max\",\"xhigh\",\"none\"]:[\"high\"],defaultReasoningEffort:$1.reasoningEffort??\"high\",isCustom:!$2,noImageSupport:$1.noImageSupport",
+			alreadyPatchedRegexPattern: /id:([A-Za-z$_])\.id,displayName:\1\.displayName,shortDisplayName:\1\.displayName,modelProvider:\1\.provider,supportedReasoningEfforts:1\?\["high","max","xhigh"(?:,"none")?\]\s{0,7}:\["high"\],defaultReasoningEffort:\1\.reasoningEffort\?\?"high",isCustom:!([01]),noImageSupport:\1\.noImageSupport/g
+		});
+		patches.push({
+			name: "reasoningEffortSupportedXHighResolver",
+			description: "Enable [\"high\",\"max\",\"xhigh\"] in UI for custom model config resolver",
+			pattern: Buffer.from(""),
+			replacement: Buffer.from(""),
+			skipIfAnySucceeded: ["reasoningEffortSupportedXHighResolverLegacy"],
+			regexPattern: /id:([A-Za-z$_])\.model,modelProvider:\1\.provider,displayName:([A-Za-z$_]),shortDisplayName:\2,supportedReasoningEfforts:[A-Za-z$_]\?\["off","low","medium","high"\]:\["none"\],defaultReasoningEffort:\1\.reasoningEffort\?\?"none",isCustom:!([01]),noImageSupport:\1\.noImageSupport/g,
+			regexReplacement: "id:$1.model,modelProvider:$1.provider,displayName:$2,shortDisplayName:$2,supportedReasoningEfforts:1?[\"high\",\"max\",\"xhigh\",\"none\"]:[\"high\"],defaultReasoningEffort:$1.reasoningEffort??\"high\",isCustom:!$3,noImageSupport:$1.noImageSupport",
+			alreadyPatchedRegexPattern: /id:([A-Za-z$_])\.model,modelProvider:\1\.provider,displayName:([A-Za-z$_]),shortDisplayName:\2,supportedReasoningEfforts:1\?\["high","max","xhigh"(?:,"none")?\]\s{0,7}:\["high"\],defaultReasoningEffort:\1\.reasoningEffort\?\?"high",isCustom:!([01]),noImageSupport:\1\.noImageSupport/g
+		});
 		patches.push({
 			name: "reasoningEffortSupported",
 			description: "Fallback: Change supportedReasoningEfforts:[\"none\"] to [\"high\"] (for legacy/custom: configs)",
@@ -1380,7 +1453,6 @@ bin("droid-patch", "CLI tool to patch droid binary with various modifications").
 			let aliasResult;
 			if (websearch || websearchProxy) aliasResult = await createAliasForWrapper(execTargetPath, alias, verbose);
 			else aliasResult = await createAlias(result.outputPath, alias, verbose);
-			const droidVersion = getDroidVersion(path);
 			await saveAliasMetadata(createMetadata(alias, path, {
 				isCustom: !!isCustom,
 				skipLogin: !!skipLogin,
@@ -1493,6 +1565,11 @@ bin("droid-patch", "CLI tool to patch droid binary with various modifications").
 	}
 	console.log(styleText("white", `Using droid binary: ${newBinaryPath}`));
 	console.log(styleText("white", `Found ${metaList.length} alias(es) to update`));
+	const newDroidVersion = getDroidVersion(newBinaryPath);
+	if (!newDroidVersion) {
+		console.log(styleText("yellow", "[!] Warning: Could not detect droid version from the new binary"));
+		console.log(styleText("gray", "    skip-login aliases may fail to update"));
+	}
 	if (dryRun) console.log(styleText("blue", "(DRY RUN - no changes will be made)"));
 	console.log();
 	let successCount = 0;
@@ -1515,12 +1592,7 @@ bin("droid-patch", "CLI tool to patch droid binary with various modifications").
 				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.skipLogin) patches.push(...resolveVersionedPatches("skip-login", newDroidVersion, SKIP_LOGIN_PATCH_RULES));
 			if (meta.patches.apiBase && !meta.patches.websearch) {
 				const originalUrl = "https://api.factory.ai";
 				const paddedUrl = meta.patches.apiBase.padEnd(22, " ");
@@ -1533,23 +1605,45 @@ bin("droid-patch", "CLI tool to patch droid binary with various modifications").
 			}
 			if (meta.patches.reasoningEffort) {
 				patches.push({
-					name: "reasoningEffortSupportedXHighList",
-					description: "Enable [\"high\",\"max\",\"xhigh\"] in UI for custom model list",
+					name: "reasoningEffortSupportedXHighListLegacy",
+					description: "Enable [\"high\",\"max\",\"xhigh\"] in UI for custom model list (legacy)",
 					pattern: Buffer.from(""),
 					replacement: Buffer.from(""),
+					suppressCheckUnlessFound: true,
 					regexPattern: /id:([A-Za-z$_])\.id,displayName:\1\.displayName,shortDisplayName:\1\.(?:displayName|id),modelProvider:\1\.provider\s*,supportedReasoningEfforts:\[(?:"(?:none|high)"(?:,"xhigh")?|"low","high","xhigh")\],defaultReasoningEffort:"(?:none|high)",isCustom:!([01]),noImageSupport:(?:\1\.noImageSupport|!1)/g,
 					regexReplacement: "id:$1.id,displayName:$1.displayName,shortDisplayName:$1.displayName,modelProvider:$1.provider,supportedReasoningEfforts:[\"high\",\"max\",\"xhigh\"],defaultReasoningEffort:\"high\",isCustom:!$2,noImageSupport:!1",
 					alreadyPatchedRegexPattern: /id:([A-Za-z$_])\.id,displayName:\1\.displayName,shortDisplayName:\1\.displayName,modelProvider:\1\.provider,supportedReasoningEfforts:\["high","max","xhigh"\],defaultReasoningEffort:"high",isCustom:!([01]),noImageSupport:!1/g
 				});
 				patches.push({
-					name: "reasoningEffortSupportedXHighResolver",
-					description: "Enable [\"high\",\"max\",\"xhigh\"] in UI for custom model config resolver",
+					name: "reasoningEffortSupportedXHighResolverLegacy",
+					description: "Enable [\"high\",\"max\",\"xhigh\"] in UI for custom model config resolver (legacy)",
 					pattern: Buffer.from(""),
 					replacement: Buffer.from(""),
+					suppressCheckUnlessFound: true,
 					regexPattern: /id:([A-Za-z$_])\.model,modelProvider:\1\.provider\s*,displayName:([A-Za-z$_]),shortDisplayName:\2,supportedReasoningEfforts:\[(?:"(?:none|high)"(?:,"xhigh")?|"low","high","xhigh")\],defaultReasoningEffort:"(?:none|high)",isCustom:!([01]),noImageSupport:(?:\1\.noImageSupport|!1)/g,
 					regexReplacement: "id:$1.model,modelProvider:$1.provider,displayName:$2,shortDisplayName:$2,supportedReasoningEfforts:[\"high\",\"max\",\"xhigh\"],defaultReasoningEffort:\"high\",isCustom:!$3,noImageSupport:!1",
 					alreadyPatchedRegexPattern: /id:([A-Za-z$_])\.model,modelProvider:\1\.provider,displayName:([A-Za-z$_]),shortDisplayName:\2,supportedReasoningEfforts:\["high","max","xhigh"\],defaultReasoningEffort:"high",isCustom:!([01]),noImageSupport:!1/g
 				});
+				patches.push({
+					name: "reasoningEffortSupportedXHighList",
+					description: "Enable [\"high\",\"max\",\"xhigh\"] in UI for custom model list",
+					pattern: Buffer.from(""),
+					replacement: Buffer.from(""),
+					skipIfAnySucceeded: ["reasoningEffortSupportedXHighListLegacy"],
+					regexPattern: /id:([A-Za-z$_])\.id,displayName:\1\.displayName,shortDisplayName:\1\.displayName,modelProvider:\1\.provider,supportedReasoningEfforts:[A-Za-z$_]\?\["off","low","medium","high"\]:\["none"\],defaultReasoningEffort:\1\.reasoningEffort\?\?"none",isCustom:!([01]),noImageSupport:\1\.noImageSupport/g,
+					regexReplacement: "id:$1.id,displayName:$1.displayName,shortDisplayName:$1.displayName,modelProvider:$1.provider,supportedReasoningEfforts:1?[\"high\",\"max\",\"xhigh\",\"none\"]:[\"high\"],defaultReasoningEffort:$1.reasoningEffort??\"high\",isCustom:!$2,noImageSupport:$1.noImageSupport",
+					alreadyPatchedRegexPattern: /id:([A-Za-z$_])\.id,displayName:\1\.displayName,shortDisplayName:\1\.displayName,modelProvider:\1\.provider,supportedReasoningEfforts:1\?\["high","max","xhigh"(?:,"none")?\]\s{0,7}:\["high"\],defaultReasoningEffort:\1\.reasoningEffort\?\?"high",isCustom:!([01]),noImageSupport:\1\.noImageSupport/g
+				});
+				patches.push({
+					name: "reasoningEffortSupportedXHighResolver",
+					description: "Enable [\"high\",\"max\",\"xhigh\"] in UI for custom model config resolver",
+					pattern: Buffer.from(""),
+					replacement: Buffer.from(""),
+					skipIfAnySucceeded: ["reasoningEffortSupportedXHighResolverLegacy"],
+					regexPattern: /id:([A-Za-z$_])\.model,modelProvider:\1\.provider,displayName:([A-Za-z$_]),shortDisplayName:\2,supportedReasoningEfforts:[A-Za-z$_]\?\["off","low","medium","high"\]:\["none"\],defaultReasoningEffort:\1\.reasoningEffort\?\?"none",isCustom:!([01]),noImageSupport:\1\.noImageSupport/g,
+					regexReplacement: "id:$1.model,modelProvider:$1.provider,displayName:$2,shortDisplayName:$2,supportedReasoningEfforts:1?[\"high\",\"max\",\"xhigh\",\"none\"]:[\"high\"],defaultReasoningEffort:$1.reasoningEffort??\"high\",isCustom:!$3,noImageSupport:$1.noImageSupport",
+					alreadyPatchedRegexPattern: /id:([A-Za-z$_])\.model,modelProvider:\1\.provider,displayName:([A-Za-z$_]),shortDisplayName:\2,supportedReasoningEfforts:1\?\["high","max","xhigh"(?:,"none")?\]\s{0,7}:\["high"\],defaultReasoningEffort:\1\.reasoningEffort\?\?"high",isCustom:!([01]),noImageSupport:\1\.noImageSupport/g
+				});
 				patches.push({
 					name: "reasoningEffortSupported",
 					description: "Fallback: Change supportedReasoningEfforts:[\"none\"] to [\"high\"] (for legacy/custom: configs)",
@@ -1685,7 +1779,7 @@ bin("droid-patch", "CLI tool to patch droid binary with various modifications").
 			}
 			meta.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
 			meta.originalBinaryPath = newBinaryPath;
-			meta.droidVersion = getDroidVersion(newBinaryPath);
+			meta.droidVersion = newDroidVersion;
 			meta.droidPatchVersion = version;
 			await saveAliasMetadata(meta);
 			console.log(styleText("green", `  ✓ Updated successfully`));