|
|
@@ -14,7 +14,11 @@ export const AuthCommand = cmd({
|
|
|
command: "auth",
|
|
|
describe: "manage credentials",
|
|
|
builder: (yargs) =>
|
|
|
- yargs.command(AuthLoginCommand).command(AuthLogoutCommand).command(AuthListCommand).demandCommand(),
|
|
|
+ yargs
|
|
|
+ .command(AuthLoginCommand)
|
|
|
+ .command(AuthLogoutCommand)
|
|
|
+ .command(AuthListCommand)
|
|
|
+ .demandCommand(),
|
|
|
async handler() {},
|
|
|
})
|
|
|
|
|
|
@@ -60,7 +64,9 @@ export const AuthListCommand = cmd({
|
|
|
prompts.log.info(`${provider} ${UI.Style.TEXT_DIM}${envVar}`)
|
|
|
}
|
|
|
|
|
|
- prompts.outro(`${activeEnvVars.length} environment variable` + (activeEnvVars.length === 1 ? "" : "s"))
|
|
|
+ prompts.outro(
|
|
|
+ `${activeEnvVars.length} environment variable` + (activeEnvVars.length === 1 ? "" : "s"),
|
|
|
+ )
|
|
|
}
|
|
|
},
|
|
|
})
|
|
|
@@ -80,7 +86,9 @@ export const AuthLoginCommand = cmd({
|
|
|
UI.empty()
|
|
|
prompts.intro("Add credential")
|
|
|
if (args.url) {
|
|
|
- const wellknown = await fetch(`${args.url}/.well-known/opencode`).then((x) => x.json() as any)
|
|
|
+ const wellknown = await fetch(`${args.url}/.well-known/opencode`).then(
|
|
|
+ (x) => x.json() as any,
|
|
|
+ )
|
|
|
prompts.log.info(`Running \`${wellknown.auth.command.join(" ")}\``)
|
|
|
const proc = Bun.spawn({
|
|
|
cmd: wellknown.auth.command,
|
|
|
@@ -102,223 +110,224 @@ export const AuthLoginCommand = cmd({
|
|
|
prompts.outro("Done")
|
|
|
return
|
|
|
}
|
|
|
- await ModelsDev.refresh().catch(() => {})
|
|
|
- const providers = await ModelsDev.get()
|
|
|
- const priority: Record<string, number> = {
|
|
|
- opencode: 0,
|
|
|
- anthropic: 1,
|
|
|
- "github-copilot": 2,
|
|
|
- openai: 3,
|
|
|
- google: 4,
|
|
|
- openrouter: 5,
|
|
|
- vercel: 6,
|
|
|
- }
|
|
|
- let provider = await prompts.autocomplete({
|
|
|
- message: "Select provider",
|
|
|
- maxItems: 8,
|
|
|
- options: [
|
|
|
- ...pipe(
|
|
|
- providers,
|
|
|
- values(),
|
|
|
- sortBy(
|
|
|
- (x) => priority[x.id] ?? 99,
|
|
|
- (x) => x.name ?? x.id,
|
|
|
+ await ModelsDev.refresh().catch(() => {})
|
|
|
+ const providers = await ModelsDev.get()
|
|
|
+ const priority: Record<string, number> = {
|
|
|
+ opencode: 0,
|
|
|
+ anthropic: 1,
|
|
|
+ "github-copilot": 2,
|
|
|
+ openai: 3,
|
|
|
+ google: 4,
|
|
|
+ openrouter: 5,
|
|
|
+ vercel: 6,
|
|
|
+ }
|
|
|
+ let provider = await prompts.autocomplete({
|
|
|
+ message: "Select provider",
|
|
|
+ maxItems: 8,
|
|
|
+ options: [
|
|
|
+ ...pipe(
|
|
|
+ providers,
|
|
|
+ values(),
|
|
|
+ sortBy(
|
|
|
+ (x) => priority[x.id] ?? 99,
|
|
|
+ (x) => x.name ?? x.id,
|
|
|
+ ),
|
|
|
+ map((x) => ({
|
|
|
+ label: x.name,
|
|
|
+ value: x.id,
|
|
|
+ hint: priority[x.id] <= 1 ? "recommended" : undefined,
|
|
|
+ })),
|
|
|
),
|
|
|
- map((x) => ({
|
|
|
- label: x.name,
|
|
|
- value: x.id,
|
|
|
- hint: priority[x.id] <= 1 ? "recommended" : undefined,
|
|
|
- })),
|
|
|
- ),
|
|
|
- {
|
|
|
- value: "other",
|
|
|
- label: "Other",
|
|
|
- },
|
|
|
- ],
|
|
|
- })
|
|
|
+ {
|
|
|
+ value: "other",
|
|
|
+ label: "Other",
|
|
|
+ },
|
|
|
+ ],
|
|
|
+ })
|
|
|
|
|
|
- if (prompts.isCancel(provider)) throw new UI.CancelledError()
|
|
|
+ if (prompts.isCancel(provider)) throw new UI.CancelledError()
|
|
|
|
|
|
- const plugin = await Plugin.list().then((x) => x.find((x) => x.auth?.provider === provider))
|
|
|
- if (plugin && plugin.auth) {
|
|
|
- let index = 0
|
|
|
- if (plugin.auth.methods.length > 1) {
|
|
|
- const method = await prompts.select({
|
|
|
- message: "Login method",
|
|
|
- options: [
|
|
|
- ...plugin.auth.methods.map((x, index) => ({
|
|
|
- label: x.label,
|
|
|
- value: index.toString(),
|
|
|
- })),
|
|
|
- ],
|
|
|
- })
|
|
|
- if (prompts.isCancel(method)) throw new UI.CancelledError()
|
|
|
- index = parseInt(method)
|
|
|
- }
|
|
|
- const method = plugin.auth.methods[index]
|
|
|
+ const plugin = await Plugin.list().then((x) => x.find((x) => x.auth?.provider === provider))
|
|
|
+ if (plugin && plugin.auth) {
|
|
|
+ let index = 0
|
|
|
+ if (plugin.auth.methods.length > 1) {
|
|
|
+ const method = await prompts.select({
|
|
|
+ message: "Login method",
|
|
|
+ options: [
|
|
|
+ ...plugin.auth.methods.map((x, index) => ({
|
|
|
+ label: x.label,
|
|
|
+ value: index.toString(),
|
|
|
+ })),
|
|
|
+ ],
|
|
|
+ })
|
|
|
+ if (prompts.isCancel(method)) throw new UI.CancelledError()
|
|
|
+ index = parseInt(method)
|
|
|
+ }
|
|
|
+ const method = plugin.auth.methods[index]
|
|
|
|
|
|
- // Handle prompts for all auth types
|
|
|
- await new Promise((resolve) => setTimeout(resolve, 10))
|
|
|
- const inputs: Record<string, string> = {}
|
|
|
- if (method.prompts) {
|
|
|
- for (const prompt of method.prompts) {
|
|
|
- if (prompt.condition && !prompt.condition(inputs)) {
|
|
|
- continue
|
|
|
- }
|
|
|
- if (prompt.type === "select") {
|
|
|
- const value = await prompts.select({
|
|
|
- message: prompt.message,
|
|
|
- options: prompt.options,
|
|
|
- })
|
|
|
- if (prompts.isCancel(value)) throw new UI.CancelledError()
|
|
|
- inputs[prompt.key] = value
|
|
|
- } else {
|
|
|
- const value = await prompts.text({
|
|
|
- message: prompt.message,
|
|
|
- placeholder: prompt.placeholder,
|
|
|
- validate: prompt.validate ? (v) => prompt.validate!(v ?? "") : undefined,
|
|
|
- })
|
|
|
- if (prompts.isCancel(value)) throw new UI.CancelledError()
|
|
|
- inputs[prompt.key] = value
|
|
|
+ // Handle prompts for all auth types
|
|
|
+ await new Promise((resolve) => setTimeout(resolve, 10))
|
|
|
+ const inputs: Record<string, string> = {}
|
|
|
+ if (method.prompts) {
|
|
|
+ for (const prompt of method.prompts) {
|
|
|
+ if (prompt.condition && !prompt.condition(inputs)) {
|
|
|
+ continue
|
|
|
+ }
|
|
|
+ if (prompt.type === "select") {
|
|
|
+ const value = await prompts.select({
|
|
|
+ message: prompt.message,
|
|
|
+ options: prompt.options,
|
|
|
+ })
|
|
|
+ if (prompts.isCancel(value)) throw new UI.CancelledError()
|
|
|
+ inputs[prompt.key] = value
|
|
|
+ } else {
|
|
|
+ const value = await prompts.text({
|
|
|
+ message: prompt.message,
|
|
|
+ placeholder: prompt.placeholder,
|
|
|
+ validate: prompt.validate ? (v) => prompt.validate!(v ?? "") : undefined,
|
|
|
+ })
|
|
|
+ if (prompts.isCancel(value)) throw new UI.CancelledError()
|
|
|
+ inputs[prompt.key] = value
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
- }
|
|
|
|
|
|
- if (method.type === "oauth") {
|
|
|
- const authorize = await method.authorize(inputs)
|
|
|
-
|
|
|
- if (authorize.url) {
|
|
|
- prompts.log.info("Go to: " + authorize.url)
|
|
|
- }
|
|
|
+ if (method.type === "oauth") {
|
|
|
+ const authorize = await method.authorize(inputs)
|
|
|
|
|
|
- if (authorize.method === "auto") {
|
|
|
- if (authorize.instructions) {
|
|
|
- prompts.log.info(authorize.instructions)
|
|
|
+ if (authorize.url) {
|
|
|
+ prompts.log.info("Go to: " + authorize.url)
|
|
|
}
|
|
|
- const spinner = prompts.spinner()
|
|
|
- spinner.start("Waiting for authorization...")
|
|
|
- const result = await authorize.callback()
|
|
|
- if (result.type === "failed") {
|
|
|
- spinner.stop("Failed to authorize", 1)
|
|
|
+
|
|
|
+ if (authorize.method === "auto") {
|
|
|
+ if (authorize.instructions) {
|
|
|
+ prompts.log.info(authorize.instructions)
|
|
|
+ }
|
|
|
+ const spinner = prompts.spinner()
|
|
|
+ spinner.start("Waiting for authorization...")
|
|
|
+ const result = await authorize.callback()
|
|
|
+ if (result.type === "failed") {
|
|
|
+ spinner.stop("Failed to authorize", 1)
|
|
|
+ }
|
|
|
+ if (result.type === "success") {
|
|
|
+ const saveProvider = result.provider ?? provider
|
|
|
+ if ("refresh" in result) {
|
|
|
+ const { type: _, provider: __, refresh, access, expires, ...extraFields } = result
|
|
|
+ await Auth.set(saveProvider, {
|
|
|
+ type: "oauth",
|
|
|
+ refresh,
|
|
|
+ access,
|
|
|
+ expires,
|
|
|
+ ...extraFields,
|
|
|
+ })
|
|
|
+ }
|
|
|
+ if ("key" in result) {
|
|
|
+ await Auth.set(saveProvider, {
|
|
|
+ type: "api",
|
|
|
+ key: result.key,
|
|
|
+ })
|
|
|
+ }
|
|
|
+ spinner.stop("Login successful")
|
|
|
+ }
|
|
|
}
|
|
|
- if (result.type === "success") {
|
|
|
- const saveProvider = result.provider ?? provider
|
|
|
- if ("refresh" in result) {
|
|
|
- const { type: _, provider: __, refresh, access, expires, ...extraFields } = result
|
|
|
- await Auth.set(saveProvider, {
|
|
|
- type: "oauth",
|
|
|
- refresh,
|
|
|
- access,
|
|
|
- expires,
|
|
|
- ...extraFields,
|
|
|
- })
|
|
|
+
|
|
|
+ if (authorize.method === "code") {
|
|
|
+ const code = await prompts.text({
|
|
|
+ message: "Paste the authorization code here: ",
|
|
|
+ validate: (x) => (x && x.length > 0 ? undefined : "Required"),
|
|
|
+ })
|
|
|
+ if (prompts.isCancel(code)) throw new UI.CancelledError()
|
|
|
+ const result = await authorize.callback(code)
|
|
|
+ if (result.type === "failed") {
|
|
|
+ prompts.log.error("Failed to authorize")
|
|
|
}
|
|
|
- if ("key" in result) {
|
|
|
- await Auth.set(saveProvider, {
|
|
|
- type: "api",
|
|
|
- key: result.key,
|
|
|
- })
|
|
|
+ if (result.type === "success") {
|
|
|
+ const saveProvider = result.provider ?? provider
|
|
|
+ if ("refresh" in result) {
|
|
|
+ const { type: _, provider: __, refresh, access, expires, ...extraFields } = result
|
|
|
+ await Auth.set(saveProvider, {
|
|
|
+ type: "oauth",
|
|
|
+ refresh,
|
|
|
+ access,
|
|
|
+ expires,
|
|
|
+ ...extraFields,
|
|
|
+ })
|
|
|
+ }
|
|
|
+ if ("key" in result) {
|
|
|
+ await Auth.set(saveProvider, {
|
|
|
+ type: "api",
|
|
|
+ key: result.key,
|
|
|
+ })
|
|
|
+ }
|
|
|
+ prompts.log.success("Login successful")
|
|
|
}
|
|
|
- spinner.stop("Login successful")
|
|
|
}
|
|
|
+
|
|
|
+ prompts.outro("Done")
|
|
|
+ return
|
|
|
}
|
|
|
|
|
|
- if (authorize.method === "code") {
|
|
|
- const code = await prompts.text({
|
|
|
- message: "Paste the authorization code here: ",
|
|
|
- validate: (x) => (x && x.length > 0 ? undefined : "Required"),
|
|
|
- })
|
|
|
- if (prompts.isCancel(code)) throw new UI.CancelledError()
|
|
|
- const result = await authorize.callback(code)
|
|
|
- if (result.type === "failed") {
|
|
|
- prompts.log.error("Failed to authorize")
|
|
|
- }
|
|
|
- if (result.type === "success") {
|
|
|
- const saveProvider = result.provider ?? provider
|
|
|
- if ("refresh" in result) {
|
|
|
- const { type: _, provider: __, refresh, access, expires, ...extraFields } = result
|
|
|
- await Auth.set(saveProvider, {
|
|
|
- type: "oauth",
|
|
|
- refresh,
|
|
|
- access,
|
|
|
- expires,
|
|
|
- ...extraFields,
|
|
|
- })
|
|
|
+ if (method.type === "api") {
|
|
|
+ if (method.authorize) {
|
|
|
+ const result = await method.authorize(inputs)
|
|
|
+ if (result.type === "failed") {
|
|
|
+ prompts.log.error("Failed to authorize")
|
|
|
}
|
|
|
- if ("key" in result) {
|
|
|
+ if (result.type === "success") {
|
|
|
+ const saveProvider = result.provider ?? provider
|
|
|
await Auth.set(saveProvider, {
|
|
|
type: "api",
|
|
|
key: result.key,
|
|
|
})
|
|
|
+ prompts.log.success("Login successful")
|
|
|
}
|
|
|
- prompts.log.success("Login successful")
|
|
|
+ prompts.outro("Done")
|
|
|
+ return
|
|
|
}
|
|
|
}
|
|
|
+ }
|
|
|
|
|
|
+ if (provider === "other") {
|
|
|
+ provider = await prompts.text({
|
|
|
+ message: "Enter provider id",
|
|
|
+ validate: (x) =>
|
|
|
+ x && x.match(/^[0-9a-z-]+$/) ? undefined : "a-z, 0-9 and hyphens only",
|
|
|
+ })
|
|
|
+ if (prompts.isCancel(provider)) throw new UI.CancelledError()
|
|
|
+ provider = provider.replace(/^@ai-sdk\//, "")
|
|
|
+ if (prompts.isCancel(provider)) throw new UI.CancelledError()
|
|
|
+ prompts.log.warn(
|
|
|
+ `This only stores a credential for ${provider} - you will need configure it in opencode.json, check the docs for examples.`,
|
|
|
+ )
|
|
|
+ }
|
|
|
+
|
|
|
+ if (provider === "amazon-bedrock") {
|
|
|
+ prompts.log.info(
|
|
|
+ "Amazon bedrock can be configured with standard AWS environment variables like AWS_BEARER_TOKEN_BEDROCK, AWS_PROFILE or AWS_ACCESS_KEY_ID",
|
|
|
+ )
|
|
|
prompts.outro("Done")
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- if (method.type === "api") {
|
|
|
- if (method.authorize) {
|
|
|
- const result = await method.authorize(inputs)
|
|
|
- if (result.type === "failed") {
|
|
|
- prompts.log.error("Failed to authorize")
|
|
|
- }
|
|
|
- if (result.type === "success") {
|
|
|
- const saveProvider = result.provider ?? provider
|
|
|
- await Auth.set(saveProvider, {
|
|
|
- type: "api",
|
|
|
- key: result.key,
|
|
|
- })
|
|
|
- prompts.log.success("Login successful")
|
|
|
- }
|
|
|
- prompts.outro("Done")
|
|
|
- return
|
|
|
- }
|
|
|
+ if (provider === "opencode") {
|
|
|
+ prompts.log.info("Create an api key at https://opencode.ai/auth")
|
|
|
+ }
|
|
|
+
|
|
|
+ if (provider === "vercel") {
|
|
|
+ prompts.log.info("You can create an api key at https://vercel.link/ai-gateway-token")
|
|
|
}
|
|
|
- }
|
|
|
|
|
|
- if (provider === "other") {
|
|
|
- provider = await prompts.text({
|
|
|
- message: "Enter provider id",
|
|
|
- validate: (x) => (x && x.match(/^[0-9a-z-]+$/) ? undefined : "a-z, 0-9 and hyphens only"),
|
|
|
+ const key = await prompts.password({
|
|
|
+ message: "Enter your API key",
|
|
|
+ validate: (x) => (x && x.length > 0 ? undefined : "Required"),
|
|
|
+ })
|
|
|
+ if (prompts.isCancel(key)) throw new UI.CancelledError()
|
|
|
+ await Auth.set(provider, {
|
|
|
+ type: "api",
|
|
|
+ key,
|
|
|
})
|
|
|
- if (prompts.isCancel(provider)) throw new UI.CancelledError()
|
|
|
- provider = provider.replace(/^@ai-sdk\//, "")
|
|
|
- if (prompts.isCancel(provider)) throw new UI.CancelledError()
|
|
|
- prompts.log.warn(
|
|
|
- `This only stores a credential for ${provider} - you will need configure it in opencode.json, check the docs for examples.`,
|
|
|
- )
|
|
|
- }
|
|
|
|
|
|
- if (provider === "amazon-bedrock") {
|
|
|
- prompts.log.info(
|
|
|
- "Amazon bedrock can be configured with standard AWS environment variables like AWS_BEARER_TOKEN_BEDROCK, AWS_PROFILE or AWS_ACCESS_KEY_ID",
|
|
|
- )
|
|
|
prompts.outro("Done")
|
|
|
- return
|
|
|
- }
|
|
|
-
|
|
|
- if (provider === "opencode") {
|
|
|
- prompts.log.info("Create an api key at https://opencode.ai/auth")
|
|
|
- }
|
|
|
-
|
|
|
- if (provider === "vercel") {
|
|
|
- prompts.log.info("You can create an api key at https://vercel.link/ai-gateway-token")
|
|
|
- }
|
|
|
-
|
|
|
- const key = await prompts.password({
|
|
|
- message: "Enter your API key",
|
|
|
- validate: (x) => (x && x.length > 0 ? undefined : "Required"),
|
|
|
- })
|
|
|
- if (prompts.isCancel(key)) throw new UI.CancelledError()
|
|
|
- await Auth.set(provider, {
|
|
|
- type: "api",
|
|
|
- key,
|
|
|
- })
|
|
|
-
|
|
|
- prompts.outro("Done")
|
|
|
},
|
|
|
})
|
|
|
},
|