Skip to content

Commit 6f2e975

Browse files
committed
Cut over to ssh_exec execution surfaces
1 parent 6b5de0c commit 6f2e975

8 files changed

Lines changed: 19 additions & 19 deletions

File tree

test/codex/app_server/connection_execution_surface_test.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ defmodule Codex.AppServer.ConnectionExecutionSurfaceTest do
2525
init_timeout_ms: 500,
2626
process_env: AppServerSubprocess.process_env(harness),
2727
execution_surface: [
28-
surface_kind: :static_ssh,
28+
surface_kind: :ssh_exec,
2929
transport_options:
3030
FakeSSH.transport_options(fake_ssh,
3131
destination: "app-server.test.example",

test/codex/cli_session_test.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ defmodule Codex.CLISessionTest do
251251
CLI.start(["resume", "--last"],
252252
codex_opts: codex_opts,
253253
execution_surface: [
254-
surface_kind: :static_ssh,
254+
surface_kind: :ssh_exec,
255255
transport_options:
256256
FakeSSH.transport_options(fake_ssh,
257257
destination: "cli-session.test.example",

test/codex/cli_test.exs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ defmodule Codex.CLITest do
239239
CLI.run(["features", "list"],
240240
codex_opts: codex_opts,
241241
execution_surface: [
242-
surface_kind: :static_ssh,
242+
surface_kind: :ssh_exec,
243243
transport_options:
244244
FakeSSH.transport_options(fake_ssh,
245245
destination: "cli-run.test.example",
@@ -292,7 +292,7 @@ defmodule Codex.CLITest do
292292
assert {:ok, %{stdout: "remote-surface\n", success: true}} =
293293
CLI.run(["features", "list"],
294294
execution_surface: [
295-
surface_kind: :static_ssh,
295+
surface_kind: :ssh_exec,
296296
transport_options:
297297
FakeSSH.transport_options(fake_ssh,
298298
destination: "cli-run-effective-surface.example"

test/codex/exec/options_test.exs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ defmodule Codex.Exec.OptionsTest do
99
{:ok, codex_opts} =
1010
Options.new(%{
1111
execution_surface: [
12-
surface_kind: :static_ssh,
12+
surface_kind: :ssh_exec,
1313
transport_options: [destination: "exec-options.test.example", port: 2222]
1414
]
1515
})
1616

1717
assert {:ok, %ExecOptions{execution_surface: %ExecutionSurface{} = execution_surface}} =
1818
ExecOptions.new(%{codex_opts: codex_opts})
1919

20-
assert execution_surface.surface_kind == :static_ssh
20+
assert execution_surface.surface_kind == :ssh_exec
2121
assert execution_surface.transport_options[:destination] == "exec-options.test.example"
2222
end
2323

@@ -28,12 +28,12 @@ defmodule Codex.Exec.OptionsTest do
2828
ExecOptions.new(%{
2929
codex_opts: codex_opts,
3030
execution_surface: [
31-
surface_kind: :static_ssh,
31+
surface_kind: :ssh_exec,
3232
transport_options: [destination: "override.test.example"]
3333
]
3434
})
3535

36-
assert execution_surface.surface_kind == :static_ssh
36+
assert execution_surface.surface_kind == :ssh_exec
3737
assert execution_surface.transport_options[:destination] == "override.test.example"
3838
end
3939
end

test/codex/exec_test.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ defmodule Codex.ExecTest do
138138
Exec.run("hello over ssh", %{
139139
codex_opts: codex_opts,
140140
execution_surface: [
141-
surface_kind: :static_ssh,
141+
surface_kind: :ssh_exec,
142142
transport_options:
143143
FakeSSH.transport_options(fake_ssh,
144144
destination: "exec.test.example",

test/codex/mcp/transport/stdio_test.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ defmodule Codex.MCP.Transport.StdioTest do
6969
command: AppServerSubprocess.command_path(harness),
7070
env: AppServerSubprocess.process_env(harness),
7171
execution_surface: [
72-
surface_kind: :static_ssh,
72+
surface_kind: :ssh_exec,
7373
transport_options:
7474
FakeSSH.transport_options(fake_ssh,
7575
destination: "mcp-stdio.test.example",

test/codex/options_test.exs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@ defmodule Codex.OptionsTest do
6565
assert {:ok, %Options{execution_surface: %ExecutionSurface{} = execution_surface}} =
6666
Options.new(%{
6767
execution_surface: %{
68-
surface_kind: :static_ssh,
68+
surface_kind: :ssh_exec,
6969
transport_options: [destination: "options.test.example", port: 2222]
7070
}
7171
})
7272

73-
assert execution_surface.surface_kind == :static_ssh
73+
assert execution_surface.surface_kind == :ssh_exec
7474
assert execution_surface.transport_options[:destination] == "options.test.example"
7575
assert execution_surface.transport_options[:port] == 2222
7676
end
@@ -109,7 +109,7 @@ defmodule Codex.OptionsTest do
109109
assert {:ok, %CliSubprocessCore.CommandSpec{program: "codex", argv_prefix: []}} =
110110
Options.codex_command_spec(
111111
opts,
112-
surface_kind: :static_ssh,
112+
surface_kind: :ssh_exec,
113113
transport_options: [destination: "ssh.example"]
114114
)
115115
end

test/codex/thread_transport_test.exs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,22 @@ defmodule Codex.ThreadTransportTest do
2525
end
2626

2727
test "rejects execution-surface atoms in transport" do
28-
assert {:error, {:invalid_transport, :static_ssh}} =
29-
ThreadOptions.new(%{transport: :static_ssh})
28+
assert {:error, {:invalid_transport, :ssh_exec}} =
29+
ThreadOptions.new(%{transport: :ssh_exec})
3030
end
3131

3232
test "rejects execution-surface maps in transport" do
33-
assert {:error, {:invalid_transport, %{surface_kind: :static_ssh}}} =
34-
ThreadOptions.new(%{transport: %{surface_kind: :static_ssh}})
33+
assert {:error, {:invalid_transport, %{surface_kind: :ssh_exec}}} =
34+
ThreadOptions.new(%{transport: %{surface_kind: :ssh_exec}})
3535
end
3636

3737
test "rejects execution-surface keywords in transport" do
3838
assert {:error,
3939
{:invalid_transport,
40-
[surface_kind: :static_ssh, transport_options: [destination: "example"]]}} =
40+
[surface_kind: :ssh_exec, transport_options: [destination: "example"]]}} =
4141
ThreadOptions.new(%{
4242
transport: [
43-
surface_kind: :static_ssh,
43+
surface_kind: :ssh_exec,
4444
transport_options: [destination: "example"]
4545
]
4646
})

0 commit comments

Comments
 (0)