* feat(secrets): expand secret target coverage and gateway tooling * docs(secrets): align gateway and CLI secret docs * chore(protocol): regenerate swift gateway models for secrets methods * fix(config): restore talk apiKey fallback and stabilize runner test * ci(windows): reduce test worker count for shard stability * ci(windows): raise node heap for test shard stability * test(feishu): make proxy env precedence assertion windows-safe * fix(gateway): resolve auth password SecretInput refs for clients * fix(gateway): resolve remote SecretInput credentials for clients * fix(secrets): skip inactive refs in command snapshot assignments * fix(secrets): scope gateway.remote refs to effective auth surfaces * fix(secrets): ignore memory defaults when enabled agents disable search * fix(secrets): honor Google Chat serviceAccountRef inheritance * fix(secrets): address tsgo errors in command and gateway collectors * fix(secrets): avoid auth-store load in providers-only configure * fix(gateway): defer local password ref resolution by precedence * fix(secrets): gate telegram webhook secret refs by webhook mode * fix(secrets): gate slack signing secret refs to http mode * fix(secrets): skip telegram botToken refs when tokenFile is set * fix(secrets): gate discord pluralkit refs by enabled flag * fix(secrets): gate discord voice tts refs by voice enabled * test(secrets): make runtime fixture modes explicit * fix(cli): resolve local qr password secret refs * fix(cli): fail when gateway leaves command refs unresolved * fix(gateway): fail when local password SecretRef is unresolved * fix(gateway): fail when required remote SecretRefs are unresolved * fix(gateway): resolve local password refs only when password can win * fix(cli): skip local password SecretRef resolution on qr token override * test(gateway): cast SecretRef fixtures to OpenClawConfig * test(secrets): activate mode-gated targets in runtime coverage fixture * fix(cron): support SecretInput webhook tokens safely * fix(bluebubbles): support SecretInput passwords across config paths * fix(msteams): make appPassword SecretInput-safe in onboarding/token paths * fix(bluebubbles): align SecretInput schema helper typing * fix(cli): clarify secrets.resolve version-skew errors * refactor(secrets): return structured inactive paths from secrets.resolve * refactor(gateway): type onboarding secret writes as SecretInput * chore(protocol): regenerate swift models for secrets.resolve * feat(secrets): expand extension credential secretref support * fix(secrets): gate web-search refs by active provider * fix(onboarding): detect SecretRef credentials in extension status * fix(onboarding): allow keeping existing ref in secret prompt * fix(onboarding): resolve gateway password SecretRefs for probe and tui * fix(onboarding): honor secret-input-mode for local gateway auth * fix(acp): resolve gateway SecretInput credentials * fix(secrets): gate gateway.remote refs to remote surfaces * test(secrets): cover pattern matching and inactive array refs * docs(secrets): clarify secrets.resolve and remote active surfaces * fix(bluebubbles): keep existing SecretRef during onboarding * fix(tests): resolve CI type errors in new SecretRef coverage * fix(extensions): replace raw fetch with SSRF-guarded fetch * test(secrets): mark gateway remote targets active in runtime coverage * test(infra): normalize home-prefix expectation across platforms * fix(cli): only resolve local qr password refs in password mode * test(cli): cover local qr token mode with unresolved password ref * docs(cli): clarify local qr password ref resolution behavior * refactor(extensions): reuse sdk SecretInput helpers * fix(wizard): resolve onboarding env-template secrets before plaintext * fix(cli): surface secrets.resolve diagnostics in memory and qr * test(secrets): repair post-rebase runtime and fixtures * fix(gateway): skip remote password ref resolution when token wins * fix(secrets): treat tailscale remote gateway refs as active * fix(gateway): allow remote password fallback when token ref is unresolved * fix(gateway): ignore stale local password refs for none and trusted-proxy * fix(gateway): skip remote secret ref resolution on local call paths * test(cli): cover qr remote tailscale secret ref resolution * fix(secrets): align gateway password active-surface with auth inference * fix(cli): resolve inferred local gateway password refs in qr * fix(gateway): prefer resolvable remote password over token ref pre-resolution * test(gateway): cover none and trusted-proxy stale password refs * docs(secrets): sync qr and gateway active-surface behavior * fix: restore stability blockers from pre-release audit * Secrets: fix collector/runtime precedence contradictions * docs: align secrets and web credential docs * fix(rebase): resolve integration regressions after main rebase * fix(node-host): resolve gateway secret refs for auth * fix(secrets): harden secretinput runtime readers * gateway: skip inactive auth secretref resolution * cli: avoid gateway preflight for inactive secret refs * extensions: allow unresolved refs in onboarding status * tests: fix qr-cli module mock hoist ordering * Security: align audit checks with SecretInput resolution * Gateway: resolve local-mode remote fallback secret refs * Node host: avoid resolving inactive password secret refs * Secrets runtime: mark Slack appToken inactive for HTTP mode * secrets: keep inactive gateway remote refs non-blocking * cli: include agent memory secret targets in runtime resolution * docs(secrets): sync docs with active-surface and web search behavior * fix(secrets): keep telegram top-level token refs active for blank account tokens * fix(daemon): resolve gateway password secret refs for probe auth * fix(secrets): skip IRC NickServ ref resolution when NickServ is disabled * fix(secrets): align token inheritance and exec timeout defaults * docs(secrets): clarify active-surface notes in cli docs * cli: require secrets.resolve gateway capability * gateway: log auth secret surface diagnostics * secrets: remove dead provider resolver module * fix(secrets): restore gateway auth precedence and fallback resolution * fix(tests): align plugin runtime mock typings --------- Co-authored-by: Peter Steinberger <steipete@gmail.com>
135 lines
4.6 KiB
TypeScript
135 lines
4.6 KiB
TypeScript
import { upsertAuthProfile } from "../agents/auth-profiles.js";
|
|
import { normalizeApiKeyInput, validateApiKeyInput } from "./auth-choice.api-key.js";
|
|
import {
|
|
normalizeSecretInputModeInput,
|
|
ensureApiKeyFromOptionEnvOrPrompt,
|
|
promptSecretRefForOnboarding,
|
|
resolveSecretInputModeForEnvSelection,
|
|
} from "./auth-choice.apply-helpers.js";
|
|
import type { ApplyAuthChoiceParams, ApplyAuthChoiceResult } from "./auth-choice.apply.js";
|
|
import { buildTokenProfileId, validateAnthropicSetupToken } from "./auth-token.js";
|
|
import { applyAgentDefaultModelPrimary } from "./onboard-auth.config-shared.js";
|
|
import { applyAuthProfileConfig, setAnthropicApiKey } from "./onboard-auth.js";
|
|
|
|
const DEFAULT_ANTHROPIC_MODEL = "anthropic/claude-sonnet-4-6";
|
|
|
|
export async function applyAuthChoiceAnthropic(
|
|
params: ApplyAuthChoiceParams,
|
|
): Promise<ApplyAuthChoiceResult | null> {
|
|
const requestedSecretInputMode = normalizeSecretInputModeInput(params.opts?.secretInputMode);
|
|
if (
|
|
params.authChoice === "setup-token" ||
|
|
params.authChoice === "oauth" ||
|
|
params.authChoice === "token"
|
|
) {
|
|
let nextConfig = params.config;
|
|
await params.prompter.note(
|
|
["Run `claude setup-token` in your terminal.", "Then paste the generated token below."].join(
|
|
"\n",
|
|
),
|
|
"Anthropic setup-token",
|
|
);
|
|
|
|
const selectedMode = await resolveSecretInputModeForEnvSelection({
|
|
prompter: params.prompter,
|
|
explicitMode: requestedSecretInputMode,
|
|
copy: {
|
|
modeMessage: "How do you want to provide this setup token?",
|
|
plaintextLabel: "Paste setup token now",
|
|
plaintextHint: "Stores the token directly in the auth profile",
|
|
},
|
|
});
|
|
let token = "";
|
|
let tokenRef: { source: "env" | "file" | "exec"; provider: string; id: string } | undefined;
|
|
if (selectedMode === "ref") {
|
|
const resolved = await promptSecretRefForOnboarding({
|
|
provider: "anthropic-setup-token",
|
|
config: params.config,
|
|
prompter: params.prompter,
|
|
preferredEnvVar: "ANTHROPIC_SETUP_TOKEN",
|
|
copy: {
|
|
sourceMessage: "Where is this Anthropic setup token stored?",
|
|
envVarPlaceholder: "ANTHROPIC_SETUP_TOKEN",
|
|
},
|
|
});
|
|
token = resolved.resolvedValue.trim();
|
|
tokenRef = resolved.ref;
|
|
} else {
|
|
const tokenRaw = await params.prompter.text({
|
|
message: "Paste Anthropic setup-token",
|
|
validate: (value) => validateAnthropicSetupToken(String(value ?? "")),
|
|
});
|
|
token = String(tokenRaw ?? "").trim();
|
|
}
|
|
const tokenValidationError = validateAnthropicSetupToken(token);
|
|
if (tokenValidationError) {
|
|
throw new Error(tokenValidationError);
|
|
}
|
|
|
|
const profileNameRaw = await params.prompter.text({
|
|
message: "Token name (blank = default)",
|
|
placeholder: "default",
|
|
});
|
|
const provider = "anthropic";
|
|
const namedProfileId = buildTokenProfileId({
|
|
provider,
|
|
name: String(profileNameRaw ?? ""),
|
|
});
|
|
|
|
upsertAuthProfile({
|
|
profileId: namedProfileId,
|
|
agentDir: params.agentDir,
|
|
credential: {
|
|
type: "token",
|
|
provider,
|
|
token,
|
|
...(tokenRef ? { tokenRef } : {}),
|
|
},
|
|
});
|
|
|
|
nextConfig = applyAuthProfileConfig(nextConfig, {
|
|
profileId: namedProfileId,
|
|
provider,
|
|
mode: "token",
|
|
});
|
|
if (params.setDefaultModel) {
|
|
nextConfig = applyAgentDefaultModelPrimary(nextConfig, DEFAULT_ANTHROPIC_MODEL);
|
|
}
|
|
return { config: nextConfig };
|
|
}
|
|
|
|
if (params.authChoice === "apiKey") {
|
|
if (params.opts?.tokenProvider && params.opts.tokenProvider !== "anthropic") {
|
|
return null;
|
|
}
|
|
|
|
let nextConfig = params.config;
|
|
await ensureApiKeyFromOptionEnvOrPrompt({
|
|
token: params.opts?.token,
|
|
tokenProvider: params.opts?.tokenProvider ?? "anthropic",
|
|
secretInputMode: requestedSecretInputMode,
|
|
config: nextConfig,
|
|
expectedProviders: ["anthropic"],
|
|
provider: "anthropic",
|
|
envLabel: "ANTHROPIC_API_KEY",
|
|
promptMessage: "Enter Anthropic API key",
|
|
normalize: normalizeApiKeyInput,
|
|
validate: validateApiKeyInput,
|
|
prompter: params.prompter,
|
|
setCredential: async (apiKey, mode) =>
|
|
setAnthropicApiKey(apiKey, params.agentDir, { secretInputMode: mode }),
|
|
});
|
|
nextConfig = applyAuthProfileConfig(nextConfig, {
|
|
profileId: "anthropic:default",
|
|
provider: "anthropic",
|
|
mode: "api_key",
|
|
});
|
|
if (params.setDefaultModel) {
|
|
nextConfig = applyAgentDefaultModelPrimary(nextConfig, DEFAULT_ANTHROPIC_MODEL);
|
|
}
|
|
return { config: nextConfig };
|
|
}
|
|
|
|
return null;
|
|
}
|