lmin/zmo-cli
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

fix(cli): avoid AppRuntime re-entry for network options (#26052)

Browse Source
This commit is contained in:
Kit Langton
2026-05-06 11:02:08 -04:00
committed by GitHub
parent 889f979c0b
commit 63a175b50d
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/opencode/src/cli/cmd/acp.ts
View File

@@ -22,7 +22,7 @@ export const AcpCommand = effectCmd({
}, },
handler: Effect.fn("Cli.acp")(function* (args) { handler: Effect.fn("Cli.acp")(function* (args) {
process.env.OPENCODE_CLIENT = "acp" process.env.OPENCODE_CLIENT = "acp"
const opts = yield* Effect.promise(() => resolveNetworkOptions(args)) const opts = yield* resolveNetworkOptions(args)
const server = yield* Effect.promise(() => Server.listen(opts)) const server = yield* Effect.promise(() => Server.listen(opts))
const sdk = createOpencodeClient({ const sdk = createOpencodeClient({

2
packages/opencode/src/cli/cmd/serve.ts
View File

@@ -15,7 +15,7 @@ export const ServeCommand = effectCmd({
if (!Flag.OPENCODE_SERVER_PASSWORD) { if (!Flag.OPENCODE_SERVER_PASSWORD) {
console.log("Warning: OPENCODE_SERVER_PASSWORD is not set; server is unsecured.") console.log("Warning: OPENCODE_SERVER_PASSWORD is not set; server is unsecured.")
} }
const opts = yield* Effect.promise(() => resolveNetworkOptions(args)) const opts = yield* resolveNetworkOptions(args)
const server = yield* Effect.promise(() => Server.listen(opts)) const server = yield* Effect.promise(() => Server.listen(opts))
console.log(`opencode server listening on http://${server.hostname}:${server.port}`) console.log(`opencode server listening on http://${server.hostname}:${server.port}`)

4
packages/opencode/src/cli/cmd/web.ts
View File

@@ -40,7 +40,7 @@ export const WebCommand = effectCmd({
if (!Flag.OPENCODE_SERVER_PASSWORD) { if (!Flag.OPENCODE_SERVER_PASSWORD) {
UI.println(UI.Style.TEXT_WARNING_BOLD + "! OPENCODE_SERVER_PASSWORD is not set; server is unsecured.") UI.println(UI.Style.TEXT_WARNING_BOLD + "! OPENCODE_SERVER_PASSWORD is not set; server is unsecured.")
} }
const opts = yield* Effect.promise(() => resolveNetworkOptions(args)) const opts = yield* resolveNetworkOptions(args)
const server = yield* Effect.promise(() => Server.listen(opts)) const server = yield* Effect.promise(() => Server.listen(opts))
UI.empty() UI.empty()
UI.println(UI.logo(" ")) UI.println(UI.logo(" "))
@@ -72,7 +72,7 @@ export const WebCommand = effectCmd({
} }
// Open localhost in browser // Open localhost in browser
open(localhostUrl.toString()).catch(() => {}) open(localhostUrl).catch(() => {})
} else { } else {
const displayUrl = server.url.toString() const displayUrl = server.url.toString()
UI.println(UI.Style.TEXT_INFO_BOLD + " Web interface: ", UI.Style.TEXT_NORMAL, displayUrl) UI.println(UI.Style.TEXT_INFO_BOLD + " Web interface: ", UI.Style.TEXT_NORMAL, displayUrl)

8
packages/opencode/src/cli/network.ts
View File

@@ -1,6 +1,6 @@
import type { Argv, InferredOptionTypes } from "yargs" import type { Argv, InferredOptionTypes } from "yargs"
import { Config } from "@/config/config" import { Config } from "@/config/config"
import { AppRuntime } from "@/effect/app-runtime" import { Effect } from "effect"
const options = { const options = {
port: { port: {
@@ -36,10 +36,10 @@ export type NetworkOptions = InferredOptionTypes<typeof options>
export function withNetworkOptions<T>(yargs: Argv<T>) { export function withNetworkOptions<T>(yargs: Argv<T>) {
return yargs.options(options) return yargs.options(options)
} }
export async function resolveNetworkOptions(args: NetworkOptions) { export const resolveNetworkOptions = Effect.fn("Cli.resolveNetworkOptions")(function* (args: NetworkOptions) {
const config = await AppRuntime.runPromise(Config.Service.use((cfg) => cfg.getGlobal())) const config = yield* Config.Service.use((cfg) => cfg.getGlobal())
return resolveNetworkOptionsNoConfig(args, config) return resolveNetworkOptionsNoConfig(args, config)
} })
export function resolveNetworkOptionsNoConfig(args: NetworkOptions, config?: Config.Info) { export function resolveNetworkOptionsNoConfig(args: NetworkOptions, config?: Config.Info) {
const portExplicitlySet = process.argv.includes("--port") const portExplicitlySet = process.argv.includes("--port")