add OpenRouter proxy for managed model routing and OSS program (#488)
* add OpenRouter proxy for managed model routing and OSS program proxy layer that mints ephemeral OpenRouter keys for users without BYOK API keys. two paths: pro plan users get their selected model proxied via OpenRouter; OSS program repos (hard-coded allowlist in config.ts) get free Claude Opus. BYOK env vars (PULLFROG_MODEL/OPENCODE_MODEL) always take precedence. frontend: OSS repos see a static "Opus (Free)" badge with the model dropdown disabled and no API key requirement. all models now carry openRouterResolve metadata for proxy target resolution. Made-with: Cursor * implement OSS program: proxy infrastructure for free model credits server-side OSS allowlist determines eligible repos. action mints ephemeral OpenRouter keys via OIDC-authenticated /api/proxy-token endpoint (idempotent on runId, $10 per-key safety limit). keys are disabled on workflow completion when no running refs remain. HWM-based usage sync tracks cumulative spend per account. schema: ProxyKey model, Account.usageUsd/activeKeyId, WorkflowRun.proxyKeyId action: OIDC credential stashing, resolveProxyModel uses server oss flag frontend: isOss flows from server page to components (no client allowlist) Made-with: Cursor * address PR review: repo cross-check, key retirement lifecycle, dead code removal - proxy-token: verify runId belongs to OIDC-authenticated repo via repo relation - add retireKey() shared primitive: disable in OpenRouter first, then mark disabled in DB - rotateKey: retire old active key after swap to prevent orphans - webhook: replace inline cleanupProxyKey with retireKey calls - syncAccountUsage: skip disabled keys - remove vestigial AccountPlan/plan field from action types - add disabled field to ProxyKey schema + migration Made-with: Cursor * replace deprecated opencode/mimo-v2-flash-free with mimo-v2-pro-free Made-with: Cursor * fix migration ordering: rename disabled migration to sort after table creation Made-with: Cursor * squash proxy key migrations into single migration Made-with: Cursor * add preview repo to OSS allowlist for testing Made-with: Cursor * populate OSS allowlist from oss-program-invitees.json Made-with: Cursor * format oss-program-invitees.json Made-with: Cursor * add installed public repos to OSS allowlist split ossRepos into three provenance-tracked lists: - internalRepos (pullfrog, colinhacks, RobinTail) - installedPublicRepos (external public non-fork repos with active installs) - invitees (from oss-program-invitees.json) also adds scripts/list-oss-candidates.ts to regenerate the installed list Made-with: Cursor * fix: resolve tokens before clearing OIDC env vars resolveTokens → acquireNewToken → isOIDCAvailable() checks ACTIONS_ID_TOKEN_REQUEST_URL/TOKEN env vars. The new OIDC stashing code was deleting them in restricted shell mode before resolveTokens ran, causing it to fall through to the GitHub App path which requires GITHUB_APP_ID/GITHUB_PRIVATE_KEY. Made-with: Cursor * derive proxy-token auth from OIDC claims, add ensureWorkflowRun upsert - proxy-token no longer requires body.runId; uses claims.run_id + claims.repository - shared ensureWorkflowRun upsert called from both webhook and proxy-token - workflow_run_requested handler now eagerly creates WorkflowRun records - eliminates race condition between webhook and action proxy-token call Made-with: Cursor * hardcode PULLFROG_ACCOUNT_ID, document preview debugging lessons GitHub node IDs are constant — no reason for this to be an env var. Removes the trailing-newline bug that caused P2025 errors. Adds wiki docs on workflow testing, Vercel env gotchas, and Neon preview branch discovery. Made-with: Cursor * fix: parse OpenRouter create-key response correctly the API returns `key` at the top level, not inside `data` Made-with: Cursor * onboarding cards, unlock OSS model selection, simplify console - add OnboardingCard component with two states: workflow install and model+test (dispatches "Tell me a joke" for test run) - replace PromptBox overlay gates with dedicated onboarding cards; PromptBox is now just the form, always enabled - use hasWorkflowRuns DB check to decide onboarding vs promptbox - unlock ModelSelector for OSS repos (was locked to Opus badge); resolve proxyModel from repo's selected model alias in run-context - rename "API key" row to "Model costs" with pure client-side states: OSS covered, auto-resolve, free model, BYOK with env var names - add "(Recommended)" badge to model aliases with recommended: true - remove OSS_MODEL_DISPLAY_NAME constant and secrets-fetching logic Made-with: Cursor * update stale xai model snapshot Made-with: Cursor * rename Permissions to Security, hide git push toggle, add shell isolation toggle with disabled state for public repos, remove opentoad agent name from logs Made-with: Cursor * chevron hover states, sidebar hooks/security entries Made-with: Cursor * address PR review feedback: rename recommended→preferred, fix dispatch orphan, update wiki docs - rename `recommended` to `preferred` in model alias registry to distinguish from the UI "Recommended" badge (which is hardcoded for opus + codex only) - cancel precreated WorkflowRun when workflow lookup fails in dispatch-workflow - replace run_sql/vercel env pull in wiki docs with neonctl + Prisma pattern - extend scripts/neon-branch.ts to output DATABASE_URL via neonctl - add Recommended badge to GPT Codex alongside Claude Opus in ModelSelector Made-with: Cursor
This commit is contained in:
Colin McDonnell
committed by
pullfrog[bot]
pullfrog[bot]
parent
39525547b5
commit
e6d34ee01b
@@ -19718,10 +19718,10 @@ var require_core = __commonJS({
|
||||
(0, command_1.issueCommand)("set-env", { name }, convertedVal);
|
||||
}
|
||||
exports.exportVariable = exportVariable;
|
||||
function setSecret2(secret) {
|
||||
function setSecret3(secret) {
|
||||
(0, command_1.issueCommand)("add-mask", {}, secret);
|
||||
}
|
||||
exports.setSecret = setSecret2;
|
||||
exports.setSecret = setSecret3;
|
||||
function addPath(inputPath) {
|
||||
const filePath = process.env["GITHUB_PATH"] || "";
|
||||
if (filePath) {
|
||||
@@ -19838,12 +19838,12 @@ Support boolean input list: \`true | True | TRUE | false | False | FALSE\``);
|
||||
return process.env[`STATE_${name}`] || "";
|
||||
}
|
||||
exports.getState = getState;
|
||||
function getIDToken2(aud) {
|
||||
function getIDToken3(aud) {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
return yield oidc_utils_1.OidcClient.getIDToken(aud);
|
||||
});
|
||||
}
|
||||
exports.getIDToken = getIDToken2;
|
||||
exports.getIDToken = getIDToken3;
|
||||
var summary_1 = require_summary();
|
||||
Object.defineProperty(exports, "summary", { enumerable: true, get: function() {
|
||||
return summary_1.summary;
|
||||
@@ -131925,19 +131925,40 @@ var providers = {
|
||||
"claude-opus": {
|
||||
displayName: "Claude Opus",
|
||||
resolve: "anthropic/claude-opus-4-6",
|
||||
recommended: true
|
||||
openRouterResolve: "openrouter/anthropic/claude-opus-4.6",
|
||||
preferred: true
|
||||
},
|
||||
"claude-sonnet": { displayName: "Claude Sonnet", resolve: "anthropic/claude-sonnet-4-6" },
|
||||
"claude-haiku": { displayName: "Claude Haiku", resolve: "anthropic/claude-haiku-4-5" }
|
||||
"claude-sonnet": {
|
||||
displayName: "Claude Sonnet",
|
||||
resolve: "anthropic/claude-sonnet-4-6",
|
||||
openRouterResolve: "openrouter/anthropic/claude-sonnet-4.6"
|
||||
},
|
||||
"claude-haiku": {
|
||||
displayName: "Claude Haiku",
|
||||
resolve: "anthropic/claude-haiku-4-5",
|
||||
openRouterResolve: "openrouter/anthropic/claude-haiku-4.5"
|
||||
}
|
||||
}
|
||||
}),
|
||||
openai: provider({
|
||||
displayName: "OpenAI",
|
||||
envVars: ["OPENAI_API_KEY"],
|
||||
models: {
|
||||
"gpt-codex": { displayName: "GPT Codex", resolve: "openai/gpt-5.3-codex", recommended: true },
|
||||
"gpt-codex-mini": { displayName: "GPT Codex Mini", resolve: "openai/codex-mini-latest" },
|
||||
o3: { displayName: "O3", resolve: "openai/o3" }
|
||||
"gpt-codex": {
|
||||
displayName: "GPT Codex",
|
||||
resolve: "openai/gpt-5.3-codex",
|
||||
openRouterResolve: "openrouter/openai/gpt-5.3-codex",
|
||||
preferred: true
|
||||
},
|
||||
"gpt-codex-mini": {
|
||||
displayName: "GPT Codex Mini",
|
||||
resolve: "openai/codex-mini-latest",
|
||||
openRouterResolve: "openrouter/openai/gpt-5.1-codex-mini"
|
||||
},
|
||||
o3: {
|
||||
displayName: "O3",
|
||||
resolve: "openai/o3"
|
||||
}
|
||||
}
|
||||
}),
|
||||
google: provider({
|
||||
@@ -131947,18 +131968,36 @@ var providers = {
|
||||
"gemini-pro": {
|
||||
displayName: "Gemini Pro",
|
||||
resolve: "google/gemini-3.1-pro-preview",
|
||||
recommended: true
|
||||
openRouterResolve: "openrouter/google/gemini-3.1-pro-preview",
|
||||
preferred: true
|
||||
},
|
||||
"gemini-flash": { displayName: "Gemini Flash", resolve: "google/gemini-3-flash-preview" }
|
||||
"gemini-flash": {
|
||||
displayName: "Gemini Flash",
|
||||
resolve: "google/gemini-3-flash-preview",
|
||||
openRouterResolve: "openrouter/google/gemini-3-flash-preview"
|
||||
}
|
||||
}
|
||||
}),
|
||||
xai: provider({
|
||||
displayName: "xAI",
|
||||
envVars: ["XAI_API_KEY"],
|
||||
models: {
|
||||
grok: { displayName: "Grok", resolve: "xai/grok-4", recommended: true },
|
||||
"grok-fast": { displayName: "Grok Fast", resolve: "xai/grok-4-fast" },
|
||||
"grok-code-fast": { displayName: "Grok Code Fast", resolve: "xai/grok-code-fast-1" }
|
||||
grok: {
|
||||
displayName: "Grok",
|
||||
resolve: "xai/grok-4",
|
||||
openRouterResolve: "openrouter/x-ai/grok-4",
|
||||
preferred: true
|
||||
},
|
||||
"grok-fast": {
|
||||
displayName: "Grok Fast",
|
||||
resolve: "xai/grok-4-fast",
|
||||
openRouterResolve: "openrouter/x-ai/grok-4-fast"
|
||||
},
|
||||
"grok-code-fast": {
|
||||
displayName: "Grok Code Fast",
|
||||
resolve: "xai/grok-code-fast-1",
|
||||
openRouterResolve: "openrouter/x-ai/grok-code-fast-1"
|
||||
}
|
||||
}
|
||||
}),
|
||||
deepseek: provider({
|
||||
@@ -131968,16 +132007,26 @@ var providers = {
|
||||
"deepseek-reasoner": {
|
||||
displayName: "DeepSeek Reasoner",
|
||||
resolve: "deepseek/deepseek-reasoner",
|
||||
recommended: true
|
||||
openRouterResolve: "openrouter/deepseek/deepseek-v3.2",
|
||||
preferred: true
|
||||
},
|
||||
"deepseek-chat": { displayName: "DeepSeek Chat", resolve: "deepseek/deepseek-chat" }
|
||||
"deepseek-chat": {
|
||||
displayName: "DeepSeek Chat",
|
||||
resolve: "deepseek/deepseek-chat",
|
||||
openRouterResolve: "openrouter/deepseek/deepseek-v3.2"
|
||||
}
|
||||
}
|
||||
}),
|
||||
moonshotai: provider({
|
||||
displayName: "Moonshot AI",
|
||||
envVars: ["MOONSHOT_API_KEY"],
|
||||
models: {
|
||||
"kimi-k2": { displayName: "Kimi K2", resolve: "moonshotai/kimi-k2.5", recommended: true }
|
||||
"kimi-k2": {
|
||||
displayName: "Kimi K2",
|
||||
resolve: "moonshotai/kimi-k2.5",
|
||||
openRouterResolve: "openrouter/moonshotai/kimi-k2.5",
|
||||
preferred: true
|
||||
}
|
||||
}
|
||||
}),
|
||||
opencode: provider({
|
||||
@@ -131987,18 +132036,50 @@ var providers = {
|
||||
"big-pickle": {
|
||||
displayName: "Big Pickle",
|
||||
resolve: "opencode/big-pickle",
|
||||
recommended: true,
|
||||
preferred: true,
|
||||
envVars: [],
|
||||
isFree: true
|
||||
},
|
||||
"claude-opus": { displayName: "Claude Opus", resolve: "opencode/claude-opus-4-6" },
|
||||
"claude-sonnet": { displayName: "Claude Sonnet", resolve: "opencode/claude-sonnet-4-6" },
|
||||
"claude-haiku": { displayName: "Claude Haiku", resolve: "opencode/claude-haiku-4-5" },
|
||||
"gpt-codex": { displayName: "GPT Codex", resolve: "opencode/gpt-5.3-codex" },
|
||||
"gpt-codex-mini": { displayName: "GPT Codex Mini", resolve: "opencode/gpt-5.1-codex-mini" },
|
||||
"gemini-pro": { displayName: "Gemini Pro", resolve: "opencode/gemini-3.1-pro" },
|
||||
"gemini-flash": { displayName: "Gemini Flash", resolve: "opencode/gemini-3-flash" },
|
||||
"kimi-k2": { displayName: "Kimi K2", resolve: "opencode/kimi-k2.5" },
|
||||
"claude-opus": {
|
||||
displayName: "Claude Opus",
|
||||
resolve: "opencode/claude-opus-4-6",
|
||||
openRouterResolve: "openrouter/anthropic/claude-opus-4.6"
|
||||
},
|
||||
"claude-sonnet": {
|
||||
displayName: "Claude Sonnet",
|
||||
resolve: "opencode/claude-sonnet-4-6",
|
||||
openRouterResolve: "openrouter/anthropic/claude-sonnet-4.6"
|
||||
},
|
||||
"claude-haiku": {
|
||||
displayName: "Claude Haiku",
|
||||
resolve: "opencode/claude-haiku-4-5",
|
||||
openRouterResolve: "openrouter/anthropic/claude-haiku-4.5"
|
||||
},
|
||||
"gpt-codex": {
|
||||
displayName: "GPT Codex",
|
||||
resolve: "opencode/gpt-5.3-codex",
|
||||
openRouterResolve: "openrouter/openai/gpt-5.3-codex"
|
||||
},
|
||||
"gpt-codex-mini": {
|
||||
displayName: "GPT Codex Mini",
|
||||
resolve: "opencode/gpt-5.1-codex-mini",
|
||||
openRouterResolve: "openrouter/openai/gpt-5.1-codex-mini"
|
||||
},
|
||||
"gemini-pro": {
|
||||
displayName: "Gemini Pro",
|
||||
resolve: "opencode/gemini-3.1-pro",
|
||||
openRouterResolve: "openrouter/google/gemini-3.1-pro-preview"
|
||||
},
|
||||
"gemini-flash": {
|
||||
displayName: "Gemini Flash",
|
||||
resolve: "opencode/gemini-3-flash",
|
||||
openRouterResolve: "openrouter/google/gemini-3-flash-preview"
|
||||
},
|
||||
"kimi-k2": {
|
||||
displayName: "Kimi K2",
|
||||
resolve: "opencode/kimi-k2.5",
|
||||
openRouterResolve: "openrouter/moonshotai/kimi-k2.5"
|
||||
},
|
||||
"gpt-5-nano": {
|
||||
displayName: "GPT Nano",
|
||||
resolve: "opencode/gpt-5-nano",
|
||||
@@ -132032,36 +132113,59 @@ var providers = {
|
||||
"claude-opus": {
|
||||
displayName: "Claude Opus",
|
||||
resolve: "openrouter/anthropic/claude-opus-4.6",
|
||||
recommended: true
|
||||
openRouterResolve: "openrouter/anthropic/claude-opus-4.6",
|
||||
preferred: true
|
||||
},
|
||||
"claude-sonnet": {
|
||||
displayName: "Claude Sonnet",
|
||||
resolve: "openrouter/anthropic/claude-sonnet-4.6"
|
||||
resolve: "openrouter/anthropic/claude-sonnet-4.6",
|
||||
openRouterResolve: "openrouter/anthropic/claude-sonnet-4.6"
|
||||
},
|
||||
"claude-haiku": {
|
||||
displayName: "Claude Haiku",
|
||||
resolve: "openrouter/anthropic/claude-haiku-4.5"
|
||||
resolve: "openrouter/anthropic/claude-haiku-4.5",
|
||||
openRouterResolve: "openrouter/anthropic/claude-haiku-4.5"
|
||||
},
|
||||
"gpt-codex": {
|
||||
displayName: "GPT Codex",
|
||||
resolve: "openrouter/openai/gpt-5.3-codex",
|
||||
openRouterResolve: "openrouter/openai/gpt-5.3-codex"
|
||||
},
|
||||
"gpt-codex": { displayName: "GPT Codex", resolve: "openrouter/openai/gpt-5.3-codex" },
|
||||
"gpt-codex-mini": {
|
||||
displayName: "GPT Codex Mini",
|
||||
resolve: "openrouter/openai/gpt-5.1-codex-mini"
|
||||
resolve: "openrouter/openai/gpt-5.1-codex-mini",
|
||||
openRouterResolve: "openrouter/openai/gpt-5.1-codex-mini"
|
||||
},
|
||||
"o4-mini": {
|
||||
displayName: "O4 Mini",
|
||||
resolve: "openrouter/openai/o4-mini",
|
||||
openRouterResolve: "openrouter/openai/o4-mini"
|
||||
},
|
||||
"o4-mini": { displayName: "O4 Mini", resolve: "openrouter/openai/o4-mini" },
|
||||
"gemini-pro": {
|
||||
displayName: "Gemini Pro",
|
||||
resolve: "openrouter/google/gemini-3.1-pro-preview"
|
||||
resolve: "openrouter/google/gemini-3.1-pro-preview",
|
||||
openRouterResolve: "openrouter/google/gemini-3.1-pro-preview"
|
||||
},
|
||||
"gemini-flash": {
|
||||
displayName: "Gemini Flash",
|
||||
resolve: "openrouter/google/gemini-3-flash-preview"
|
||||
resolve: "openrouter/google/gemini-3-flash-preview",
|
||||
openRouterResolve: "openrouter/google/gemini-3-flash-preview"
|
||||
},
|
||||
grok: {
|
||||
displayName: "Grok",
|
||||
resolve: "openrouter/x-ai/grok-4",
|
||||
openRouterResolve: "openrouter/x-ai/grok-4"
|
||||
},
|
||||
grok: { displayName: "Grok", resolve: "openrouter/x-ai/grok-4" },
|
||||
"deepseek-chat": {
|
||||
displayName: "DeepSeek Chat",
|
||||
resolve: "openrouter/deepseek/deepseek-chat-v3.1"
|
||||
resolve: "openrouter/deepseek/deepseek-v3.2",
|
||||
openRouterResolve: "openrouter/deepseek/deepseek-v3.2"
|
||||
},
|
||||
"kimi-k2": { displayName: "Kimi K2", resolve: "openrouter/moonshotai/kimi-k2.5" }
|
||||
"kimi-k2": {
|
||||
displayName: "Kimi K2",
|
||||
resolve: "openrouter/moonshotai/kimi-k2.5",
|
||||
openRouterResolve: "openrouter/moonshotai/kimi-k2.5"
|
||||
}
|
||||
}
|
||||
})
|
||||
};
|
||||
@@ -132090,7 +132194,8 @@ var modelAliases = Object.entries(providers).flatMap(
|
||||
provider: providerKey,
|
||||
displayName: def.displayName,
|
||||
resolve: def.resolve,
|
||||
recommended: def.recommended ?? false,
|
||||
openRouterResolve: def.openRouterResolve,
|
||||
preferred: def.preferred ?? false,
|
||||
isFree: def.isFree ?? false
|
||||
}))
|
||||
);
|
||||
@@ -148805,7 +148910,6 @@ var agent = (input) => {
|
||||
return {
|
||||
...input,
|
||||
run: async (ctx) => {
|
||||
log.info(`\xBB agent: ${input.name}`);
|
||||
if (ctx.payload.model) log.info(`\xBB model: ${ctx.payload.model}`);
|
||||
if (ctx.payload.timeout) log.info(`\xBB timeout: ${ctx.payload.timeout}`);
|
||||
log.info(`\xBB push: ${ctx.payload.push}`);
|
||||
@@ -148865,10 +148969,9 @@ function getOpenCodeModels(cliPath) {
|
||||
}
|
||||
var AUTO_SELECT_WARNING = "select a model explicitly in the Pullfrog console (https://pullfrog.com/console) to avoid this.";
|
||||
function resolveOpenCodeModel(ctx) {
|
||||
const envModel = process.env.PULLFROG_MODEL?.trim() || process.env.OPENCODE_MODEL?.trim();
|
||||
const envModel = process.env.PULLFROG_MODEL?.trim();
|
||||
if (envModel) {
|
||||
const source = process.env.PULLFROG_MODEL?.trim() ? "PULLFROG_MODEL" : "OPENCODE_MODEL";
|
||||
log.info(`\xBB model: ${envModel} (override via ${source})`);
|
||||
log.info(`\xBB model: ${envModel} (override via PULLFROG_MODEL)`);
|
||||
return envModel;
|
||||
}
|
||||
if (ctx.modelSlug) {
|
||||
@@ -148883,10 +148986,10 @@ function resolveOpenCodeModel(ctx) {
|
||||
const availableSet = new Set(availableModels);
|
||||
if (availableSet.size > 0) {
|
||||
log.debug(`\xBB opencode models (${availableSet.size}): ${availableModels.join(", ")}`);
|
||||
const match3 = modelAliases.find((a) => a.recommended && availableSet.has(a.resolve)) ?? modelAliases.find((a) => availableSet.has(a.resolve));
|
||||
const match3 = modelAliases.find((a) => a.preferred && availableSet.has(a.resolve)) ?? modelAliases.find((a) => availableSet.has(a.resolve));
|
||||
if (match3) {
|
||||
log.info(
|
||||
`\xBB model: ${match3.resolve} (auto-selected${match3.recommended ? " \u2014 recommended" : ""} curated match)`
|
||||
`\xBB model: ${match3.resolve} (auto-selected${match3.preferred ? " \u2014 preferred" : ""} curated match)`
|
||||
);
|
||||
log.warning(`\xBB model auto-selected. ${AUTO_SELECT_WARNING}`);
|
||||
return match3.resolve;
|
||||
@@ -149199,7 +149302,7 @@ var opentoad = agent({
|
||||
install: installOpencodeCli,
|
||||
run: async (ctx) => {
|
||||
const cliPath = await installOpencodeCli();
|
||||
const model = resolveOpenCodeModel({
|
||||
const model = ctx.payload.proxyModel ?? resolveOpenCodeModel({
|
||||
cliPath,
|
||||
modelSlug: ctx.payload.model
|
||||
});
|
||||
@@ -149857,7 +149960,7 @@ import { isAbsolute, resolve } from "node:path";
|
||||
// package.json
|
||||
var package_default = {
|
||||
name: "@pullfrog/pullfrog",
|
||||
version: "0.0.181",
|
||||
version: "0.0.182",
|
||||
type: "module",
|
||||
files: [
|
||||
"index.js",
|
||||
@@ -150059,7 +150162,9 @@ function resolvePayload(resolvedPromptInput, repoSettings) {
|
||||
progressCommentId: jsonPayload?.progressCommentId,
|
||||
// permissions: inputs > repoSettings > fallbacks
|
||||
push: inputs.push ?? repoSettings.push ?? "restricted",
|
||||
shell: resolvedShell
|
||||
shell: resolvedShell,
|
||||
// set by proxy logic in main.ts when routing through OpenRouter
|
||||
proxyModel: void 0
|
||||
};
|
||||
}
|
||||
|
||||
@@ -150174,7 +150279,8 @@ var defaultSettings = {
|
||||
};
|
||||
var defaultRunContext = {
|
||||
settings: defaultSettings,
|
||||
apiToken: ""
|
||||
apiToken: "",
|
||||
oss: false
|
||||
};
|
||||
async function fetchRunContext(params) {
|
||||
const timeoutMs = 3e4;
|
||||
@@ -150205,7 +150311,9 @@ async function fetchRunContext(params) {
|
||||
setupScript: data.settings?.setupScript ?? null,
|
||||
postCheckoutScript: data.settings?.postCheckoutScript ?? null
|
||||
},
|
||||
apiToken: data.apiToken
|
||||
apiToken: data.apiToken,
|
||||
oss: data.oss ?? false,
|
||||
proxyModel: data.proxyModel
|
||||
};
|
||||
} catch {
|
||||
clearTimeout(timeoutId);
|
||||
@@ -150228,7 +150336,9 @@ async function resolveRunContextData(params) {
|
||||
data: repoResponse.data
|
||||
},
|
||||
repoSettings: runContext.settings,
|
||||
apiToken: runContext.apiToken
|
||||
apiToken: runContext.apiToken,
|
||||
oss: runContext.oss,
|
||||
proxyModel: runContext.proxyModel
|
||||
};
|
||||
}
|
||||
|
||||
@@ -150367,6 +150477,48 @@ function resolveOutputSchema() {
|
||||
log.info("\xBB structured output schema provided \u2014 output will be required");
|
||||
return parsed2;
|
||||
}
|
||||
async function mintProxyKey(ctx) {
|
||||
try {
|
||||
process.env.ACTIONS_ID_TOKEN_REQUEST_URL = ctx.oidcCredentials.requestUrl;
|
||||
process.env.ACTIONS_ID_TOKEN_REQUEST_TOKEN = ctx.oidcCredentials.requestToken;
|
||||
const oidcToken = await core5.getIDToken("pullfrog-api");
|
||||
delete process.env.ACTIONS_ID_TOKEN_REQUEST_URL;
|
||||
delete process.env.ACTIONS_ID_TOKEN_REQUEST_TOKEN;
|
||||
const response = await apiFetch({
|
||||
path: "/api/proxy-token",
|
||||
method: "POST",
|
||||
headers: { Authorization: `Bearer ${oidcToken}` }
|
||||
});
|
||||
if (!response.ok) {
|
||||
log.warning(`proxy key mint failed (${response.status})`);
|
||||
return null;
|
||||
}
|
||||
const data = await response.json();
|
||||
return data.key;
|
||||
} catch (error49) {
|
||||
log.warning(`proxy key mint error: ${error49 instanceof Error ? error49.message : String(error49)}`);
|
||||
return null;
|
||||
} finally {
|
||||
delete process.env.ACTIONS_ID_TOKEN_REQUEST_URL;
|
||||
delete process.env.ACTIONS_ID_TOKEN_REQUEST_TOKEN;
|
||||
}
|
||||
}
|
||||
async function resolveProxyModel(ctx) {
|
||||
if (process.env.PULLFROG_MODEL?.trim()) return;
|
||||
if (ctx.oss && ctx.proxyModel) {
|
||||
if (!ctx.oidcCredentials) {
|
||||
log.warning("\xBB oss repo but no OIDC credentials available \u2014 skipping proxy");
|
||||
return;
|
||||
}
|
||||
const key = await mintProxyKey({ oidcCredentials: ctx.oidcCredentials });
|
||||
if (!key) return;
|
||||
process.env.OPENROUTER_API_KEY = key;
|
||||
core5.setSecret(key);
|
||||
ctx.payload.proxyModel = ctx.proxyModel;
|
||||
log.info(`\xBB proxy: oss \u2192 ${ctx.proxyModel}`);
|
||||
return;
|
||||
}
|
||||
}
|
||||
async function writeJobSummary(toolState) {
|
||||
const usageSummary = formatUsageSummary(toolState.usageEntries);
|
||||
const summaryParts = [toolState.lastProgressBody, usageSummary].filter(Boolean);
|
||||
@@ -150396,10 +150548,20 @@ async function main() {
|
||||
const payload = resolvePayload(resolvedPromptInput, runContext.repoSettings);
|
||||
toolState.model = payload.model;
|
||||
const tokenRef = __using(_stack2, await resolveTokens({ push: payload.push }), true);
|
||||
const oidcCredentials = process.env.ACTIONS_ID_TOKEN_REQUEST_URL && process.env.ACTIONS_ID_TOKEN_REQUEST_TOKEN ? {
|
||||
requestUrl: process.env.ACTIONS_ID_TOKEN_REQUEST_URL,
|
||||
requestToken: process.env.ACTIONS_ID_TOKEN_REQUEST_TOKEN
|
||||
} : null;
|
||||
if (payload.shell !== "enabled") {
|
||||
delete process.env.ACTIONS_ID_TOKEN_REQUEST_URL;
|
||||
delete process.env.ACTIONS_ID_TOKEN_REQUEST_TOKEN;
|
||||
}
|
||||
await resolveProxyModel({
|
||||
payload,
|
||||
oss: runContext.oss,
|
||||
proxyModel: runContext.proxyModel,
|
||||
oidcCredentials
|
||||
});
|
||||
const octokit = createOctokit(tokenRef.mcpToken);
|
||||
const runInfo = await resolveRun({ octokit });
|
||||
let toolContext;
|
||||
@@ -150427,7 +150589,7 @@ async function main() {
|
||||
const agent2 = resolveAgent();
|
||||
validateAgentApiKey({
|
||||
agent: agent2,
|
||||
model: payload.model,
|
||||
model: payload.proxyModel ?? payload.model,
|
||||
owner: runContext.repo.owner,
|
||||
name: runContext.repo.name
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user