@edgehero/pi-dispatch 3.0.0 → 4.0.0

package/src/env-allowlist.mjs

@@ -33,7 +33,7 @@ import { egressEnv } from "./egress.mjs";
 import { forgeSpec } from "./forges.mjs";
 import { apiKeyVariable } from "./provider-key.mjs";
 import { isDeterminateFsCode } from "./transient.mjs";
-import { KEYLESS_HOW, keylessVerdict } from "./model-endpoints.mjs";
+import { KEYLESS_HOW, keylessVerdict, providerRenameHint, readOverlayModels, RENAMED_PROVIDERS } from "./model-endpoints.mjs";
 import { KEYLESS_ENV_NAME } from "./reserved-env.mjs";
 
 function configError(message) {
@@ -161,7 +161,7 @@ export function resolveProviderCredential({ provider, hostEnv, authFromPi = fals
 			error.code = unreadable.code;
 			throw error;
 		}
-		throw configError(unknownProviderMessage(provider));
+		throw configError(unknownProviderMessage(provider, hintOverlay(provider, modelEndpoints, hostEnv)));
 	}
 	const held = candidates
 		.map((name) => [name, hostEnv[name]])
@@ -209,8 +209,24 @@ export function keylessEndpointsFor(provider, modelEndpoints) {
 	return verdict.keyless ? verdict.endpoints : null;
 }
 
-function unknownProviderMessage(provider) {
-	return `pi has no provider "${provider}", so there is no key variable to give it a key. Use one of pi's provider ids with its key in the worker environment or in pi's auth.json, or, ${KEYLESS_HOW}.`;
+function unknownProviderMessage(provider, overlay = {}) {
+	return `pi has no provider "${provider}", so there is no key variable to give it a key.${providerRenameHint(provider, { ...overlay, piProviders: piProviders() })} Use one of pi's provider ids with its key in the worker environment or in pi's auth.json, or, ${KEYLESS_HOW}.`;
+}
+
+/**
+ * The overlay models.json the rename hint is judged on (issue #587's review): the pickup's snapshot when it read one, else
+ * the overlay itself, read here, only for an id pi renamed. The snapshot reads the overlay only when an endpoint is
+ * declared, so a full custom provider under the old id, with no endpoint, was told "did you mean". A read that fails
+ * is `overlayUnread`: no guess.
+ */
+function hintOverlay(provider, modelEndpoints, hostEnv) {
+	if (modelEndpoints?.models) return { models: modelEndpoints.models };
+	if (!Object.hasOwn(RENAMED_PROVIDERS, provider)) return {};
+	try {
+		return { models: readOverlayModels(hostEnv?.PI_GLOBAL_PI_DIR) };
+	} catch {
+		return { overlayUnread: true };
+	}
 }
 
 function defaultAgentDir(hostEnv) {
@@ -524,13 +540,15 @@ export function buildContainerEnv({ provider, model, maxTurns, maxTokens, maxCos
 	if (exitAuth === true) env.PI_EXIT_AUTH = "stdin";
 	else delete env.PI_EXIT_AUTH;
 
-	// Issue #500: the runner sets these two in its own environment, for its child processes, and no value from outside
+	// Issue #500: the runner sets these in its own environment, for its child processes, and no value from outside
 	// may arrive first. Both lists refuse them upstream (config.mjs for PI_FORWARD_ENV, the triggers loader for
 	// run.secrets, through RUNNER_ENV_NAMES); this is the line that holds if either refusal is ever bypassed.
 	// env-internal PI_DISPATCH_CHILD_LEDGER: set by the runner inside the container, never by the worker, so removed here.
 	delete env.PI_DISPATCH_CHILD_LEDGER;
 	// env-internal PI_DISPATCH_RUNNER_PID: set by the runner inside the container, never by the worker, so removed here.
 	delete env.PI_DISPATCH_RUNNER_PID;
+	// env-internal PI_DISPATCH_PRICE_TABLE: set by the runner inside the container, never by the worker, so removed here.
+	delete env.PI_DISPATCH_PRICE_TABLE;
 
 	// Forge-backed jobs, and local cron jobs that opted in via run.github. Other local-folder jobs have
 	// no token (CONST-TOKEN-SCOPED-PER-JOB). The mint goes into BOTH of its forge's variables because