mirror of
https://github.com/openclaw/openclaw.git
synced 2026-06-02 11:14:56 +00:00
* refactor: extract agent core package Introduce packages/agent-core as the OpenClaw-owned home for reusable agent loop, harness, session, prompt, and runtime dependency contracts. * refactor: extract shared llm runtime Move provider model registries, stream wrappers, OAuth helpers, and LLM utilities into src/llm with plugin-sdk barrels instead of depending on the old embedded runtime layout. * refactor: remove pi runtime internals Rename remaining Pi-shaped agent surfaces to OpenClaw agent runtime names, delete obsolete Pi docs and package graph checks, and add the third-party notice for incorporated code. * refactor: tighten agent session runtime Make agent-core/runtime dependencies explicit, consolidate compaction and session transcript helpers, and move model/session helpers behind OpenClaw-owned contracts. * refactor: remove static model and pi auth paths Drop static model catalogs and Pi auth bridges, move model/provider facts to manifest-owned runtime contracts, and harden internal embedded-agent utilities. * refactor: remove legacy provider compat paths * docs: remove agent parity notes * fix: skip provider wildcard metadata parsing * refactor: share session extension sdk loading * refactor: inline acpx proxy error formatter * refactor: fold edit recovery into edit tool * fix: accept extension batch separator * test: align startup provider plugin expectations * fix: restore provider-scoped release discovery * test: align static asset packaging expectations * fix: run static provider catalogs during scoped discovery * fix: add provider entry catalogs for scoped live discovery * fix: load lightweight provider catalog entries * fix: refresh provider-scoped plugin metadata * fix: keep provider catalog entries on release live path * fix: keep static manifest models in release live checks * fix: harden release model discovery * fix: reduce OpenAI live cache probe reasoning * fix: disable OpenAI cache probe reasoning * ci: extend OpenAI gateway live timeout * fix: extend live gateway model budget * fix: stabilize release validation regressions * fix: honor provider aliases in model rows * fix: stabilize release validation lanes * fix: stabilize release memory qa * ci: stabilize release validation lanes * ci: prefer ipv4 for live docker node calls * fix: restore shared tool-call stream wrapper * ci: remove legacy pi test shard alias * fix: clean up embedded agent test drift * fix: stabilize runtime alias status * fix: clean up embedded agent ci drift * fix: restore release ci invariants * fix: clean up post-rebase runtime drift * fix: restore release ci checks * fix: restore release ci after rebase * fix: remove stale pi runtime path * test: align compaction runtime expectations * test: update plugin prerelease expectations * fix: handle claude live tool approvals * fix: stabilize release validation gates * fix: finish agent runtime import * test: finish post-rebase agent runtime mocks * fix: keep codex compaction native * fix: stabilize codex app-server hook tests * test: isolate codex diagnostic active run * test: remove codex diagnostic completion race # Conflicts: # extensions/codex/src/app-server/run-attempt.test.ts * ci: fix full release manifest performance run id * refactor: narrow llm plugin sdk boundary * chore: drop generated google boundary stamps * fix: repair rebase fallout * fix: clean up rebased runtime references * fix: decode codex jwt payloads as base64url * fix: preserve shipped pi runtime alias * fix: add scoped sdk virtual modules * fix: decode llm codex oauth jwt as base64url * fix: avoid stale vertex adc negative cache * fix: harden tool arg decoding and codeql path * fix: keep vertex adc negative checks live * refactor: consolidate codex jwt and edit helpers * fix: await codex oauth node runtime imports * fix: preserve sdk tool and notice contracts * fix: preserve shipped compat config boundaries * fix: align codex oauth callback host * fix: terminate agent-core loop streams on failure * fix: keep codex oauth callback alive during fallback * ci: include session tools in critical codeql scans * fix: keep Cloudflare Anthropic provider auth header * docs: redirect legacy pi runtime pages * fix: honor bundled web provider compat discovery * fix: protect session output spill files * fix: keep legacy agent dir env blocked * fix: contain auto-discovered skill symlinks * fix: harden agent core sdk proxy surfaces * fix: restore approval reaction sdk compat * fix: keep live docker runs bounded * fix: keep codex oauth redirect host aligned * fix: resolve post-rebase agent runtime drift * fix: redact anthropic oauth parse failures * fix: preserve responses strict tool shaping * fix: repair agent runtime rebase cleanup * docs: redirect retired parity pages * fix: bound auto-discovered resources to roots * fix: repair post-rebase agent test drift * fix: preserve bundled provider allowlist migration * fix: preserve manifest-owned provider aliases * fix: declare photon image dependency * fix: keep provider headers out of proxy body * fix: preserve shipped env aliases * fix: refresh control ui i18n generated state * fix: quote read fallback paths * fix: preview edits through configured backend * test: satisfy core test typecheck * fix: preserve ZAI usage auth fallback * test: repair codex diagnostic test * fix: repair agent runtime rebase drift * test: finish embedded runner import rename * fix: repair agent runtime rebase integrations * test: align compaction oauth fallback expectations * fix: allow sdk-auth session models * fix: update doctor tool schema import * fix: preserve bedrock plugin region * fix: stream harmony-like prose immediately * ci: include session runtime in codeql shards * fix: repair latest rebase integrations * fix: honor explicit codex websocket transport * fix: keep openai-compatible credentials provider-scoped * fix: refresh sdk api baseline after rebase * fix: route cli runtime aliases through openclaw harness * test: rename stale harness mock expectation * test: rename embedded agent overflow calls * test: clean embedded auth test wording * test: use openclaw stream types in deepinfra cache test * fix: refresh sdk api baseline on latest main * fix: honor bundled discovery compat allowlists * fix: refresh sdk api baseline after latest rebase * fix: remove stale rebase imports * test: rename stale model catalog mock * test: mock renamed doctor runtime modules * fix: map canonical kimi env auth * fix: use internal model registry in bench script * fix: migrate deepinfra provider catalog entry * fix: enforce builtin tool suppression * fix: route compaction auth and proxy payloads safely * refactor: prune unused llm registry leftovers * test: update codex hooks session import * test: fix model picker ci coverage * test: align model picker auth mock types
242 lines
7.0 KiB
TypeScript
242 lines
7.0 KiB
TypeScript
import { randomBytes } from "node:crypto";
|
|
import { generatePkceVerifierChallenge, toFormUrlEncoded } from "openclaw/plugin-sdk/provider-auth";
|
|
import {
|
|
parseOAuthCallbackInput,
|
|
waitForLocalOAuthCallback,
|
|
} from "openclaw/plugin-sdk/provider-auth-runtime";
|
|
import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
|
|
|
|
const CHUTES_AUTHORIZE_ENDPOINT = "https://api.chutes.ai/idp/authorize";
|
|
const CHUTES_TOKEN_ENDPOINT = "https://api.chutes.ai/idp/token";
|
|
const CHUTES_USERINFO_ENDPOINT = "https://api.chutes.ai/idp/userinfo";
|
|
|
|
type OAuthPrompt = {
|
|
message: string;
|
|
placeholder?: string;
|
|
};
|
|
|
|
type OAuthCredentials = {
|
|
refresh: string;
|
|
access: string;
|
|
expires: number;
|
|
[key: string]: unknown;
|
|
};
|
|
|
|
type ChutesOAuthAppConfig = {
|
|
clientId: string;
|
|
clientSecret?: string;
|
|
redirectUri: string;
|
|
scopes: string[];
|
|
};
|
|
|
|
type ChutesUserInfo = {
|
|
sub?: string;
|
|
username?: string;
|
|
};
|
|
|
|
type ChutesStoredOAuth = OAuthCredentials & {
|
|
accountId?: string;
|
|
clientId?: string;
|
|
};
|
|
|
|
function parseRedirectUri(redirectUri: string): {
|
|
hostname: string;
|
|
port: number;
|
|
pathname: string;
|
|
} {
|
|
const url = new URL(redirectUri);
|
|
if (url.protocol !== "http:") {
|
|
throw new Error(`Chutes OAuth redirect URI must be http:// (got ${redirectUri})`);
|
|
}
|
|
const hostname = url.hostname || "127.0.0.1";
|
|
if (hostname !== "localhost" && hostname !== "127.0.0.1" && hostname !== "::1") {
|
|
throw new Error(
|
|
`Chutes OAuth redirect hostname must be loopback (got ${hostname}). Use http://127.0.0.1:<port>/...`,
|
|
);
|
|
}
|
|
return {
|
|
hostname,
|
|
port: url.port ? Number.parseInt(url.port, 10) : 80,
|
|
pathname: url.pathname || "/",
|
|
};
|
|
}
|
|
|
|
function parseManualOAuthInput(
|
|
input: string,
|
|
expectedState: string,
|
|
): { code: string; state: string } {
|
|
const parsed = parseOAuthCallbackInput(input, {
|
|
invalidInput: "Paste the full redirect URL (must include code + state).",
|
|
missingState: "Missing 'state' parameter. Paste the full redirect URL.",
|
|
});
|
|
if ("error" in parsed) {
|
|
throw new Error(parsed.error);
|
|
}
|
|
if (parsed.state !== expectedState) {
|
|
throw new Error("OAuth state mismatch - possible CSRF attack. Please retry login.");
|
|
}
|
|
return parsed;
|
|
}
|
|
|
|
function buildAuthorizeUrl(params: {
|
|
clientId: string;
|
|
redirectUri: string;
|
|
scopes: string[];
|
|
state: string;
|
|
challenge: string;
|
|
}): string {
|
|
const qs = new URLSearchParams({
|
|
client_id: params.clientId,
|
|
redirect_uri: params.redirectUri,
|
|
response_type: "code",
|
|
scope: params.scopes.join(" "),
|
|
state: params.state,
|
|
code_challenge: params.challenge,
|
|
code_challenge_method: "S256",
|
|
});
|
|
return `${CHUTES_AUTHORIZE_ENDPOINT}?${qs.toString()}`;
|
|
}
|
|
|
|
function coerceExpiresAt(expiresInSeconds: number, now: number): number {
|
|
const value = now + Math.max(0, Math.floor(expiresInSeconds)) * 1000 - 5 * 60 * 1000;
|
|
return Math.max(value, now + 30_000);
|
|
}
|
|
|
|
async function fetchChutesUserInfo(params: {
|
|
accessToken: string;
|
|
fetchFn?: typeof fetch;
|
|
}): Promise<ChutesUserInfo | null> {
|
|
const fetchFn = params.fetchFn ?? fetch;
|
|
const response = await fetchFn(CHUTES_USERINFO_ENDPOINT, {
|
|
headers: { Authorization: `Bearer ${params.accessToken}` },
|
|
});
|
|
if (!response.ok) {
|
|
return null;
|
|
}
|
|
const data = (await response.json()) as unknown;
|
|
return data && typeof data === "object" ? (data as ChutesUserInfo) : null;
|
|
}
|
|
|
|
async function exchangeChutesCodeForTokens(params: {
|
|
app: ChutesOAuthAppConfig;
|
|
code: string;
|
|
codeVerifier: string;
|
|
fetchFn?: typeof fetch;
|
|
now?: number;
|
|
}): Promise<ChutesStoredOAuth> {
|
|
const fetchFn = params.fetchFn ?? fetch;
|
|
const now = params.now ?? Date.now();
|
|
const body = new URLSearchParams(
|
|
toFormUrlEncoded({
|
|
grant_type: "authorization_code",
|
|
client_id: params.app.clientId,
|
|
code: params.code,
|
|
redirect_uri: params.app.redirectUri,
|
|
code_verifier: params.codeVerifier,
|
|
}),
|
|
);
|
|
if (params.app.clientSecret) {
|
|
body.set("client_secret", params.app.clientSecret);
|
|
}
|
|
|
|
const response = await fetchFn(CHUTES_TOKEN_ENDPOINT, {
|
|
method: "POST",
|
|
headers: { "Content-Type": "application/x-www-form-urlencoded" },
|
|
body,
|
|
});
|
|
if (!response.ok) {
|
|
throw new Error(`Chutes token exchange failed: ${await response.text()}`);
|
|
}
|
|
|
|
const data = (await response.json()) as {
|
|
access_token?: string;
|
|
refresh_token?: string;
|
|
expires_in?: number;
|
|
};
|
|
const access = normalizeOptionalString(data.access_token);
|
|
const refresh = normalizeOptionalString(data.refresh_token);
|
|
if (!access) {
|
|
throw new Error("Chutes token exchange returned no access_token");
|
|
}
|
|
if (!refresh) {
|
|
throw new Error("Chutes token exchange returned no refresh_token");
|
|
}
|
|
|
|
const info = await fetchChutesUserInfo({ accessToken: access, fetchFn });
|
|
return {
|
|
access,
|
|
refresh,
|
|
expires: coerceExpiresAt(data.expires_in ?? 0, now),
|
|
email: info?.username,
|
|
accountId: info?.sub,
|
|
clientId: params.app.clientId,
|
|
} as ChutesStoredOAuth;
|
|
}
|
|
|
|
export async function loginChutes(params: {
|
|
app: ChutesOAuthAppConfig;
|
|
manual?: boolean;
|
|
timeoutMs?: number;
|
|
createState?: () => string;
|
|
onAuth: (event: { url: string }) => Promise<void>;
|
|
onPrompt: (prompt: OAuthPrompt) => Promise<string>;
|
|
onProgress?: (message: string) => void;
|
|
fetchFn?: typeof fetch;
|
|
}): Promise<ChutesStoredOAuth> {
|
|
const { verifier, challenge } = generatePkceVerifierChallenge();
|
|
const state = params.createState?.() ?? randomBytes(16).toString("hex");
|
|
const timeoutMs = params.timeoutMs ?? 3 * 60 * 1000;
|
|
const url = buildAuthorizeUrl({
|
|
clientId: params.app.clientId,
|
|
redirectUri: params.app.redirectUri,
|
|
scopes: params.app.scopes,
|
|
state,
|
|
challenge,
|
|
});
|
|
|
|
let codeAndState: { code: string; state: string };
|
|
if (params.manual) {
|
|
await params.onAuth({ url });
|
|
params.onProgress?.("Waiting for redirect URL...");
|
|
codeAndState = parseManualOAuthInput(
|
|
await params.onPrompt({
|
|
message: "Paste the redirect URL",
|
|
placeholder: `${params.app.redirectUri}?code=...&state=...`,
|
|
}),
|
|
state,
|
|
);
|
|
} else {
|
|
const redirect = parseRedirectUri(params.app.redirectUri);
|
|
const callback = waitForLocalOAuthCallback({
|
|
expectedState: state,
|
|
timeoutMs,
|
|
port: redirect.port,
|
|
callbackPath: redirect.pathname,
|
|
redirectUri: params.app.redirectUri,
|
|
successTitle: "Chutes OAuth complete",
|
|
hostname: redirect.hostname,
|
|
onProgress: params.onProgress,
|
|
}).catch(async () => {
|
|
params.onProgress?.("OAuth callback not detected; paste redirect URL...");
|
|
return parseManualOAuthInput(
|
|
await params.onPrompt({
|
|
message: "Paste the redirect URL",
|
|
placeholder: `${params.app.redirectUri}?code=...&state=...`,
|
|
}),
|
|
state,
|
|
);
|
|
});
|
|
|
|
await params.onAuth({ url });
|
|
codeAndState = await callback;
|
|
}
|
|
|
|
params.onProgress?.("Exchanging code for tokens...");
|
|
return await exchangeChutesCodeForTokens({
|
|
app: params.app,
|
|
code: codeAndState.code,
|
|
codeVerifier: verifier,
|
|
fetchFn: params.fetchFn,
|
|
});
|
|
}
|