From 4272bb83e0c0d08cf9b2d6b111de7e853cc23553 Mon Sep 17 00:00:00 2001 From: Dax Raad Date: Thu, 3 Sep 2026 18:09:44 -0400 Subject: [PATCH] feat(cli): support command aliases with update alias for upgrade --- packages/cli/src/commands/commands.ts | 1 + packages/cli/src/framework/runtime.ts | 12 ++++++++++-- packages/cli/src/framework/spec.ts | 26 +++++++++++++++++++++----- 3 files changed, 32 insertions(+), 7 deletions(-) diff --git a/packages/cli/src/commands/commands.ts b/packages/cli/src/commands/commands.ts index f819454bce2..875444201b8 100644 --- a/packages/cli/src/commands/commands.ts +++ b/packages/cli/src/commands/commands.ts @@ -59,6 +59,7 @@ const Root = Spec.make(typeof OPENCODE_CLI_NAME === "string" ? OPENCODE_CLI_NAME commands: [ Spec.make("upgrade", { description: "Upgrade OpenCode to the latest or a specific version", + aliases: ["update"], params: { target: Argument.string("target").pipe( Argument.withDescription("Version to upgrade to (with or without a leading v)"), diff --git a/packages/cli/src/framework/runtime.ts b/packages/cli/src/framework/runtime.ts index fdbc950681b..c0a84008164 100644 --- a/packages/cli/src/framework/runtime.ts +++ b/packages/cli/src/framework/runtime.ts @@ -67,9 +67,13 @@ export function handlers(root: Root, handlers: Hand function add(node: Spec.Any, value: RuntimeHandlers) { if (typeof value === "function") { result.push({ spec: node.spec, load: value as () => Promise<{ default: RuntimeHandler }> }) + for (const alias of node.aliases) result.push({ spec: alias.spec, load: value as () => Promise<{ default: RuntimeHandler }> }) return } - if (value.$) result.push({ spec: node.spec, load: value.$ as () => Promise<{ default: RuntimeHandler }> }) + if (value.$) { + result.push({ spec: node.spec, load: value.$ as () => Promise<{ default: RuntimeHandler }> }) + for (const alias of node.aliases) result.push({ spec: alias.spec, load: value.$ as () => Promise<{ default: RuntimeHandler }> }) + } for (const [name, child] of Object.entries(node.commands)) add(child, value[name] as RuntimeHandlers) } @@ -99,8 +103,12 @@ function provide(node: Spec.Any, handlers: ReadonlyArray): Provided ) : node.spec if (!Object.keys(node.commands).length) return spec as ProvidedCommand + const children = Object.values(node.commands) return spec.pipe( - Command.withSubcommands(Object.values(node.commands).map((child) => provide(child, handlers))), + Command.withSubcommands([ + ...children.map((child) => provide(child, handlers)), + ...children.flatMap((child) => child.aliases.map((alias) => provide(alias, handlers))), + ]), ) as ProvidedCommand } diff --git a/packages/cli/src/framework/spec.ts b/packages/cli/src/framework/spec.ts index 345a0cfa85e..58799329974 100644 --- a/packages/cli/src/framework/spec.ts +++ b/packages/cli/src/framework/spec.ts @@ -2,6 +2,7 @@ import { Command } from "effect/unstable/cli" type Options> = { readonly description?: string + readonly aliases?: ReadonlyArray readonly params?: Config readonly commands?: Commands } @@ -14,6 +15,7 @@ export interface Node< readonly name: Name readonly spec: Spec readonly commands: Commands + readonly aliases: ReadonlyArray } export type Any = Node, Children> @@ -24,14 +26,28 @@ export function make< const Config extends Command.Command.Config = {}, const Commands extends ReadonlyArray = [], >(name: Name, options: Options = {}) { - const command = Command.make(name, options.params ?? ({} as Config)) - const spec = options.description ? command.pipe(Command.withDescription(options.description)) : command + const aliases = options.aliases ?? [] + const params = options.params ?? ({} as Config) + const command = Command.make(name, params) + const described = options.description ? command.pipe(Command.withDescription(options.description)) : command + // Effect supports a single native alias, shown inline as `name, alias` in help. + // Extra aliases become sibling commands sharing params and subcommands. + const spec = aliases.length > 0 ? described.pipe(Command.withAlias(aliases[0])) : described + const commands = Object.fromEntries( + (options.commands ?? []).map((command) => [command.name, command]), + ) as ChildrenOf + const extra = aliases.slice(1).map((alias) => { + const aliasCommand = Command.make(alias, params) + const aliasSpec = options.description + ? aliasCommand.pipe(Command.withDescription(options.description)) + : aliasCommand + return { name: alias, spec: aliasSpec, commands, aliases: [] } + }) return { name, spec, - commands: Object.fromEntries( - (options.commands ?? []).map((command) => [command.name, command]), - ) as ChildrenOf, + commands, + aliases: extra, } }