@agimon-ai/doompi-cache 0.0.1-alpha.76 → 0.0.1-alpha.77

package/dist/{pi-cache-optimizer-0QTIQ3WS.cjs → pi-cache-optimizer-OLTjpxH3.cjs}

@@ -4,7 +4,7 @@ let node_fs = require("node:fs");
 let node_os = require("node:os");
 let node_path = require("node:path");
 let _earendil_works_pi_coding_agent = require("@earendil-works/pi-coding-agent");
-//#region ../../../node_modules/.pnpm/pi-cache-optimizer@2.8.10_@earendil-works+pi-coding-agent@1.0.0_@aws-sdk+credential-pro_e6a616769ceba02485c856d1cac3f060/node_modules/pi-cache-optimizer/index.ts
+//#region ../../../node_modules/.pnpm/pi-cache-optimizer@2.8.11_@earendil-works+pi-coding-agent@1.0.0_@aws-sdk+credential-pro_0ecfb3ce13205c80fe5b3070d67cc50f/node_modules/pi-cache-optimizer/index.ts
 const PI_CACHE_RETENTION_ENV = "PI_CACHE_RETENTION";
 const LONG_CACHE_RETENTION_VALUE = "long";
 const PI_CACHE_RETENTION_BASELINE_SYMBOL = Symbol.for("pi.cache.optimizer.retention-baseline.v1");
@@ -2970,7 +2970,7 @@ function buildOpenAIProxyCompatWarningText(key, missing) {
 	const modelsJsonPath = getModelsJsonDisplayPath();
 	const lines = [
 		`💡 pi-cache-optimizer: ${key} is a third-party OpenAI-compatible proxy but merged compat lacks ${missing.join(" and ")}.`,
-		`Edit ${modelsJsonPath} -> providers["${providerLabel}"] -> compat (at the same level as baseUrl/api/apiKey/models).`,
+		`Run /cache-optimizer fix to preview a confirmed repair (or edit ${modelsJsonPath} -> providers["${providerLabel}"] -> compat manually).`,
 		``
 	];
 	appendOpenAIProxyCompatAdviceLines(lines, missing, {
@@ -4019,7 +4019,7 @@ function notifyCacheCompatIfNeeded(model, ctx, warnedModels) {
 	const adapter = selectAdapterForModel(model);
 	const text = adapter?.warningText?.(model);
 	if (!adapter || !text) return;
-	const key = `${adapter.id}:${modelKey(model)}`;
+	const key = adapter.warningText !== void 0 && describeMissingOpenAICompatibleProxyCompat(model).length === 1 && describeMissingCacheCompatForModel(model).length === 1 ? `proxy-affinity:${model.provider}` : `${adapter.id}:${modelKey(model)}`;
 	if (warnedModels.has(key)) return;
 	warnedModels.add(key);
 	ctx.ui.notify(text, "warning");
@@ -5473,6 +5473,46 @@ function resolveExplicitCompatValue(config, providerLabel, modelId, compatKey) {
 function hasExplicitLongRetentionOptInFromConfig(config, providerLabel, modelId) {
 	return resolveExplicitCompatValue(config, providerLabel, modelId, "supportsLongCacheRetention")?.value === true;
 }
+/** Locate a unique provider and its direct compat object without requiring models[]. */
+function locateProviderCompatInJsonc(text, providerLabel) {
+	const clean = stripJsoncComments(text);
+	const rootBrace = skipJsonWhitespace(clean, 0);
+	if (clean[rootBrace] !== "{") return void 0;
+	const providersKey = findJsonObjectKey(clean, rootBrace, "providers");
+	if (!providersKey || providersKey.count !== 1) return void 0;
+	const providersBrace = skipJsonWhitespace(clean, providersKey.valueStart);
+	if (clean[providersBrace] !== "{") return void 0;
+	const providersEnd = findMatchingBracket(clean, providersBrace);
+	if (providersEnd === void 0) return void 0;
+	const providerKey = findJsonObjectKey(clean, providersBrace, providerLabel);
+	if (!providerKey || providerKey.count !== 1 || providerKey.keyStart > providersEnd) return void 0;
+	const providerObjectBrace = skipJsonWhitespace(clean, providerKey.valueStart);
+	if (clean[providerObjectBrace] !== "{") return void 0;
+	const providerObjectEnd = findMatchingBracket(clean, providerObjectBrace);
+	if (providerObjectEnd === void 0 || providerObjectEnd > providersEnd) return void 0;
+	for (const key of ["models", "modelOverrides"]) {
+		const child = findJsonObjectKey(clean, providerObjectBrace, key);
+		if (child?.count && child.count > 1) return void 0;
+	}
+	const compatKey = findJsonObjectKey(clean, providerObjectBrace, "compat");
+	if (compatKey?.count && compatKey.count > 1) return void 0;
+	if (!compatKey) return {
+		providerObjectBrace,
+		providerObjectEnd,
+		providerCompatBrace: -1,
+		providerCompatEnd: -1
+	};
+	const providerCompatBrace = skipJsonWhitespace(clean, compatKey.valueStart);
+	if (clean[providerCompatBrace] !== "{") return void 0;
+	const providerCompatEnd = findMatchingBracket(clean, providerCompatBrace);
+	if (providerCompatEnd === void 0 || providerCompatEnd > providerObjectEnd) return void 0;
+	return {
+		providerObjectBrace,
+		providerObjectEnd,
+		providerCompatBrace,
+		providerCompatEnd
+	};
+}
 /** Locate a provider and optional modelOverrides entry without requiring models[]. */
 function locateModelOverrideInJsonc(text, providerLabel, modelId) {
 	const clean = stripJsoncComments(text);
@@ -6148,6 +6188,24 @@ function chooseFixPlacement(original, location, compatKeys, providerLabel, force
 	};
 	return decision;
 }
+function composeProviderAffinityInsertion(original, providerLabel) {
+	const location = locateProviderCompatInJsonc(original, providerLabel);
+	if (!location) return void 0;
+	return {
+		modifiedText: composeFixInsertion(original, {
+			modelObjectBrace: -1,
+			compatObjectBrace: -1,
+			compatObjectEnd: -1,
+			providerObjectBrace: location.providerObjectBrace,
+			providerCompatBrace: location.providerCompatBrace,
+			providerCompatEnd: location.providerCompatEnd,
+			modelOverrideObjectBrace: -1,
+			modelOverrideCompatBrace: -1,
+			modelOverrideCompatEnd: -1
+		}, { sendSessionAffinityHeaders: true }, "provider"),
+		placementLabel: `providers["${providerLabel}"] -> compat (provider level)`
+	};
+}
 function composeFixInsertion(original, location, compatKeys, placement = "model") {
 	const targetCompatBrace = placement === "provider" ? location.providerCompatBrace : placement === "modelOverride" ? location.modelOverrideCompatBrace : location.compatObjectBrace;
 	const targetCompatEnd = placement === "provider" ? location.providerCompatEnd : placement === "modelOverride" ? location.modelOverrideCompatEnd : location.compatObjectEnd;
@@ -6798,15 +6856,23 @@ function locateReceiptCompatTarget(text, provider, modelId, placement) {
 			compatEnd: location.modelOverrideCompatEnd
 		};
 	}
+	if (placement === "provider") {
+		const location = locateProviderCompatInJsonc(text, provider);
+		if (!location) return void 0;
+		return {
+			targetExists: true,
+			compatBrace: location.providerCompatBrace,
+			compatEnd: location.providerCompatEnd
+		};
+	}
 	const location = locateModelInJsonc(text, provider, modelId);
 	if (!location || location.providerKeyCount !== 1) return void 0;
 	if (location.allModelIds.filter((id) => id === modelId).length !== 1) return void 0;
-	if (placement === "provider" && location.providerCompatKeyCount > 1) return void 0;
-	if (placement === "model" && location.modelCompatKeyCount > 1) return void 0;
+	if (location.modelCompatKeyCount > 1) return void 0;
 	return {
 		targetExists: location.modelObjectBrace >= 0,
-		compatBrace: placement === "provider" ? location.providerCompatBrace : location.compatObjectBrace,
-		compatEnd: placement === "provider" ? location.providerCompatEnd : location.compatObjectEnd
+		compatBrace: location.compatObjectBrace,
+		compatEnd: location.compatObjectEnd
 	};
 }
 function readReceiptCompatScalarState(text, target, key) {
@@ -7366,11 +7432,13 @@ const __internals_for_tests = {
 	hasExplicitLongRetentionOptInFromConfig,
 	locateModelInJsonc,
 	locateModelOverrideInJsonc,
+	locateProviderCompatInJsonc,
 	composeFixInsertion,
 	selfCheckFix,
 	analyzeModelsJsonForMissingEntry,
 	composeMissingEntryInsertion,
 	composeModelOverrideInsertion,
+	composeProviderAffinityInsertion,
 	selfCheckMissingEntryInsertion,
 	decideFixPlacement,
 	chooseFixPlacement,
@@ -7462,7 +7530,8 @@ function pi_cache_optimizer_default(pi) {
 		if (isSessionAffinity403Applicable(model) && sendSessionAffinityHeaders403Models.has(key)) return {
 			providerLabel,
 			modelId: model.id,
-			compatKeys: { sendSessionAffinityHeaders: false }
+			compatKeys: { sendSessionAffinityHeaders: false },
+			forceModelLevel: true
 		};
 	}
 	function buildCommandFixSuggestion(model) {
@@ -8199,7 +8268,7 @@ function pi_cache_optimizer_default(pi) {
 			const configReceiptSnapshot = await readPromptCacheKeyConfigReceiptSnapshot();
 			const configReceipt = configReceiptSnapshot?.receipt;
 			const modelsReceipt = await readModelsJsonFixReceipt();
-			if (isActionablePromptCacheKeyConfigReceipt(configReceipt) && configReceipt.provider === model.provider && configReceipt.modelId === model.id && (!isActionableModelsJsonFixReceipt(modelsReceipt) || modelsReceipt.provider !== model.provider || modelsReceipt.modelId !== model.id || configReceipt.appliedAt >= modelsReceipt.appliedAt)) {
+			if (isActionablePromptCacheKeyConfigReceipt(configReceipt) && configReceipt.provider === model.provider && configReceipt.modelId === model.id && (!isActionableModelsJsonFixReceipt(modelsReceipt) || modelsReceipt.provider !== model.provider || modelsReceipt.placement !== "provider" && modelsReceipt.modelId !== model.id || configReceipt.appliedAt >= modelsReceipt.appliedAt)) {
 				if (!cmdCtx.hasUI) {
 					cmdCtx.ui.notify("❌ Rollback requires interactive confirmation. No changes were made.\nRun /cache-optimizer rollback in Pi's interactive UI to restore the prompt-cache-key setting.", "warning");
 					return;
@@ -8231,7 +8300,7 @@ Run /cache-optimizer rollback in Pi's interactive UI.${backupHint} Then run /rel
 				cmdCtx.ui.notify("ℹ️ No unapplied /cache-optimizer fix receipt was found.", "info");
 				return;
 			}
-			if (receipt.provider !== model.provider || receipt.modelId !== model.id) {
+			if (receipt.provider !== model.provider || receipt.placement !== "provider" && receipt.modelId !== model.id) {
 				cmdCtx.ui.notify(`ℹ️ The latest fix receipt is for ${receipt.provider}/${receipt.modelId}, not the active model ${model.provider}/${model.id}. Switch to the matching model before running rollback. No changes were made.`, "warning");
 				return;
 			}
@@ -8367,6 +8436,74 @@ Run /cache-optimizer fix prompt-cache-key in Pi's interactive UI for ${modelKey(
 			const location = locateModelInJsonc(originalText, suggestion.providerLabel, suggestion.modelId);
 			if (!location) {
 				const diagnosis = analyzeModelsJsonForMissingEntry(originalText, suggestion.providerLabel, suggestion.modelId);
+				const parsedOriginal = (() => {
+					try {
+						return parseJsonc(originalText);
+					} catch {
+						return;
+					}
+				})();
+				const provider = asRecord(asRecord(parsedOriginal)?.providers)?.[suggestion.providerLabel];
+				const explicit = resolveExplicitCompatValue(parsedOriginal, suggestion.providerLabel, suggestion.modelId, "sendSessionAffinityHeaders");
+				const hasTargetOverride = (locateModelOverrideInJsonc(originalText, suggestion.providerLabel, suggestion.modelId)?.modelOverrideObjectBrace ?? -1) >= 0;
+				const providerPlan = diagnosis && diagnosis.scenario !== "provider_missing" && isValidModelsConfigForEffectiveCompat(parsedOriginal) && asRecord(provider) && Object.keys(suggestion.compatKeys).length === 1 && suggestion.compatKeys.sendSessionAffinityHeaders === true && !suggestion.forceModelLevel && !hasTargetOverride && explicit === void 0 && getEffectiveCompatValueSource(model, parsedOriginal, "sendSessionAffinityHeaders") === void 0 ? composeProviderAffinityInsertion(originalText, suggestion.providerLabel) : void 0;
+				if (providerPlan) {
+					const checkProvider = (writtenText) => {
+						try {
+							const changed = parseJsonc(writtenText);
+							if (!isValidModelsConfigForEffectiveCompat(changed)) return "provider config is invalid";
+							if (resolveEffectiveCompatFromConfig(model, changed).sendSessionAffinityHeaders !== true) return "affinity flag is not effective";
+							const reverted = JSON.parse(JSON.stringify(changed));
+							const target = asRecord(asRecord(reverted.providers)?.[suggestion.providerLabel]);
+							const compat = asRecord(target?.compat);
+							if (!target || !compat || compat.sendSessionAffinityHeaders !== true) return "provider affinity key is missing";
+							delete compat.sendSessionAffinityHeaders;
+							if (!asRecord(asRecord(provider)?.compat)) delete target.compat;
+							return JSON.stringify(reverted) === JSON.stringify(parsedOriginal) ? null : "unrelated configuration was altered";
+						} catch {
+							return "invalid provider JSONC";
+						}
+					};
+					const checkError = checkProvider(providerPlan.modifiedText);
+					if (checkError) {
+						cmdCtx.ui.notify(`❌ Provider-level self-check failed: ${checkError}. No changes were made.`, "error");
+						return;
+					}
+					const backupPath = `${MODELS_JSON_PATH}.backup-cache-optimizer-${backupTimestamp()}`;
+					if (!await cmdCtx.ui.confirm("Cache Optimizer — Fix provider affinity", [
+						`📝 Preview of changes to ${getModelsJsonDisplayPath()}:`,
+						`Location: ${providerPlan.placementLabel}`,
+						`Compat JSON to write: ${JSON.stringify(suggestion.compatKeys)}`,
+						`⚠️ This affects all models using this provider across all sessions; model-level overrides remain authoritative.`,
+						`A timestamped backup will be written to: ${backupPath}`,
+						"Run /reload or restart Pi for the change to take effect.",
+						"Apply these changes?"
+					].join("\n"))) {
+						cmdCtx.ui.notify("No changes were made. Canceled by user.", "info");
+						return;
+					}
+					const receipt = createModelsJsonFixReceipt(originalText, providerPlan.modifiedText, suggestion.providerLabel, suggestion.modelId, "provider", suggestion.compatKeys, true, backupPath);
+					if (!receipt) {
+						cmdCtx.ui.notify("❌ Could not create a privacy-safe fix receipt. No changes were made.", "error");
+						return;
+					}
+					try {
+						const result = await applyModelsJsonFixTransaction(providerPlan.modifiedText, backupPath, checkProvider, {
+							expectedCurrentHash: hashText(originalText),
+							purpose: "fix",
+							onCommitted: async () => writeModelsJsonFixReceipt(receipt)
+						});
+						if ("postCheckError" in result) {
+							cmdCtx.ui.notify(`❌ Post-write self-check failed: ${result.postCheckError}. Backup restored.`, "error");
+							return;
+						}
+						invalidateModelsConfigCache();
+						cmdCtx.ui.notify(`✅ Fix applied to ${getModelsJsonDisplayPath()}.\nBackup saved to: ${backupPath}\nRun /reload or restart Pi.`, "info");
+					} catch (error) {
+						cmdCtx.ui.notify(`❌ Write failed: ${error instanceof Error ? error.message : String(error)}. Backup may be at: ${backupPath}`, "error");
+					}
+					return;
+				}
 				if (diagnosis && cmdCtx.hasUI) {
 					const repairsExistingOverride = (locateModelOverrideInJsonc(originalText, suggestion.providerLabel, suggestion.modelId)?.modelOverrideObjectBrace ?? -1) >= 0;
 					const plan = composeModelOverrideInsertion(originalText, suggestion.providerLabel, suggestion.modelId, suggestion.compatKeys);
@@ -8576,4 +8713,4 @@ Run /cache-optimizer fix prompt-cache-key in Pi's interactive UI for ${modelKey(
 exports.__internals_for_tests = __internals_for_tests;
 exports.default = pi_cache_optimizer_default;
 
-//# sourceMappingURL=pi-cache-optimizer-0QTIQ3WS.cjs.map
+//# sourceMappingURL=pi-cache-optimizer-OLTjpxH3.cjs.map