diff --git a/packages/cli-rs/crates/cli/src/commands/default.rs b/packages/cli-rs/crates/cli/src/commands/default.rs index f5bec74bb6d..80c0e5e3cd6 100644 --- a/packages/cli-rs/crates/cli/src/commands/default.rs +++ b/packages/cli-rs/crates/cli/src/commands/default.rs @@ -49,12 +49,6 @@ pub fn run(context: &Context, args: &RootArgs) -> anyhow::Result<()> { ))?; // A managed service's client follows the service when it restarts on a new port or password. let client = opencode_service::follow::client(transport, &connection, &paths, &env)?; - let location = runtime.block_on(server_directory(&client, &directory.to_string_lossy()))?; - let info = CliConfig::new(&paths).get().unwrap_or_else(|error| { - log::warn!("failed to read cli.json: {error}"); - Default::default() - }); - let config = Resolved::new(info, |name| std::env::var(name).ok()); // A `--session` ID the server does not know becomes the ID of the session the first prompt creates. let session = match &args.session { Some(id) => { @@ -66,6 +60,13 @@ pub fn run(context: &Context, args: &RootArgs) -> anyhow::Result<()> { } None => None, }; + let info = CliConfig::new(&paths).get().unwrap_or_else(|error| { + log::warn!("failed to read cli.json: {error}"); + Default::default() + }); + let config = Resolved::new(info, |name| std::env::var(name).ok()); + // As TS `run` does, after the session lookup and the config read. + let location = runtime.block_on(server_directory(&client, &directory.to_string_lossy()))?; let route = match &session { Some((id, true)) => Route::Session { id: id.clone() }, _ => std::env::var("OPENCODE_ROUTE") diff --git a/packages/cli-rs/parity/fixtures/E.11a/session-list.sim/report.json b/packages/cli-rs/parity/fixtures/E.11a/session-list.sim/report.json index 50421fd69de..6207cd86fdf 100644 --- a/packages/cli-rs/parity/fixtures/E.11a/session-list.sim/report.json +++ b/packages/cli-rs/parity/fixtures/E.11a/session-list.sim/report.json @@ -39,7 +39,6 @@ ] }, "onlyA": [ - "GET /api/fs/list", "GET /api/plugin" ], "onlyB": [] diff --git a/packages/cli-rs/parity/fixtures/E.2/running-reply.sim/report.json b/packages/cli-rs/parity/fixtures/E.2/running-reply.sim/report.json index 57e6cd819a0..37e459da093 100644 --- a/packages/cli-rs/parity/fixtures/E.2/running-reply.sim/report.json +++ b/packages/cli-rs/parity/fixtures/E.2/running-reply.sim/report.json @@ -45,7 +45,6 @@ ] }, "onlyA": [ - "GET /api/fs/list", "GET /api/plugin" ], "onlyB": [] diff --git a/packages/cli-rs/parity/fixtures/H.2/session-open.sim/report.json b/packages/cli-rs/parity/fixtures/H.2/session-open.sim/report.json index 7dc9eb4ae5d..c3796e58f03 100644 --- a/packages/cli-rs/parity/fixtures/H.2/session-open.sim/report.json +++ b/packages/cli-rs/parity/fixtures/H.2/session-open.sim/report.json @@ -39,7 +39,6 @@ ] }, "onlyA": [ - "GET /api/fs/list", "GET /api/plugin" ], "onlyB": []