[REMOTE-2178] Add `oz runner` CRUD CLI commands by warp-dev-github-integration[bot] · Pull Request #13760 · warpdotdev/warp

warp-dev-github-integration · 2026-07-15T15:39:04Z

Description

Adds a oz runner CRUD command group to the Oz CLI for managing cloud agent runners:

oz runner list — list runners (name, description, instance shape, OS, arch, and OS-specific config: Linux Docker image or macOS version). Supports --sort-by name|last-updated and --jq <FILTER> filtering over the JSON representation.
oz runner create — create a runner. --name (required), --description, --setup-command (repeatable), --os linux|macos (default linux), --arch x86-64|aarch64 (default x86-64), --docker-image (Linux only), --macos-version (macOS only), --vcpus+--memory-gb (instance shape, both-or-neither). Owner scope defaults to Team (--team/--personal to override).
oz runner update <uid> — update by UID, or by unambiguous --name.
oz runner delete <uid> — with --force.

Backed by the server GraphQL getRunners query and upsertRunner/deleteRunner mutations (schema mirrored into the client schema.graphql, cynic operations added). Client-side validation mirrors the server rule that OS-specific config may only be set with the matching --os.

Everything is gated behind a new CloudAgentRunnerCLICommands feature flag (enabled on dogfood), so the subcommand is hidden/rejected until runners launch.

Linked Issue

Requested via the factory-client Slack thread (linked below).

The linked issue is labeled ready-to-spec or ready-to-implement.

Testing

CLI-only change (no GUI surface), so no computer-use UI verification is required. Validated with CARGO_BUILD_JOBS=1:

cargo build (warp_graphql_schema, warp_graphql, warp_cli, warp_features, warp app) — passes; cynic validates the new operations against the mirrored schema at compile time.
cargo nextest run -p warp_cli -p warp_graphql — passes (includes new arg-parsing / validate_os_config / scope-default unit tests in runner_tests.rs).
./script/format — clean.
cargo clippy --workspace ... -- -D warnings (presubmit form) — clean.

Validation criteria confirmed:

Builds succeed; schema/ops validate at compile time.
Arg-parsing tests: list (+--sort-by, +--jq), create (--name required, --description >240 rejected, --vcpus/--memory-gb both-or-neither), update <uid>/update --name, delete <uid> --force.
OS/OS-config validation: --macos-version rejected with --os linux; --docker-image rejected with --os macos; matching combos accepted.
runner create with no scope flag resolves to Team.
runner list --jq '<expr>' filters over the serialized runner JSON via the existing --jq plumbing (JsonOutput + print_raw_json).

Screenshots / Videos

N/A — CLI-only change.

Agent Mode

Warp Agent Mode - This PR was created via Warp's AI Agent Mode

Add `oz runner list|create|update|delete` commands backed by the server GraphQL `getRunners` query and `upsertRunner`/`deleteRunner` mutations, gated behind a new `CloudAgentRunnerCLICommands` feature flag (enabled on dogfood). - Mirror the server runner schema (types, inputs, enums, unions) into the client `schema.graphql` and add cynic operations. - Add the `runner` subcommand to `warp_cli` with clap arg definitions, a pure `validate_os_config` helper, and unit tests. - Implement the SDK runner runner in the app crate (list/create/update/ delete via `send_graphql_request`), with a table/JSON output model. - Wire the feature flag, dispatch, auth, and telemetry. Co-Authored-By: Warp <agent@warp.dev>

oz-for-oss · 2026-07-15T15:39:17Z

@warp-dev-github-integration[bot]

I'm starting a first review of this pull request.

You can view the conversation on Warp.

I completed the review and no human review was requested for this pull request.

Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

Powered by Oz

oz-for-oss

Overview

This PR adds a feature-flagged oz runner CRUD command group, GraphQL operations/schema bindings, telemetry events, and CLI argument tests for managing cloud agent runners. No approved or repository spec context was available, so there are no spec-drift findings.

Concerns

runner update accepts both a positional UID and --name, but the implementation resolves by UID first and silently ignores --name, so ambiguous or mismatched targets can update the wrong runner instead of failing fast.
runner delete refuses non-interactive deletes without --force, but that refusal currently follows the same success termination path as an interactive cancellation, which can make automation treat a failed delete as successful.
For this user-facing CLI change, please include a terminal transcript, screenshot, or short recording demonstrating the runner command flows end to end.

Verdict

Found: 0 critical, 3 important, 0 suggestions

Request changes

Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

Powered by Oz

oz-for-oss · 2026-07-15T15:44:24Z

+}
+
+#[derive(Debug, Clone, Args)]
+#[command(group(ArgGroup::new("runner_identifier").required(true).multiple(true).args(["id", "name"])))]


⚠️ [IMPORTANT] multiple(true) allows oz runner update <uid> --name <other>; resolve_runner then ignores --name and updates the UID, so ambiguous targets are accepted instead of rejected.

Suggested change

#[command(group(ArgGroup::new("runner_identifier").required(true).multiple(true).args(["id", "name"])))]

#[command(group(ArgGroup::new("runner_identifier").required(true).multiple(false).args(["id", "name"])))]

Fixed — the identifier ArgGroup is now exclusive (multiple(false)), so passing both a UID and --name is rejected (91363df).

oz-for-oss · 2026-07-15T15:44:25Z

+
+    fn delete(&self, args: DeleteRunnerArgs, ctx: &mut ModelContext<Self>) {
+        if !args.force && !confirm_delete(&args.id) {
+            ctx.terminate_app(TerminationMode::ForceTerminate, None);


⚠️ [IMPORTANT] This exits successfully when confirm_delete returns false, including the non-interactive refusal path, so scripts can treat a failed delete as success; report a fatal error for non-interactive refusal and reserve zero exit for an interactive “no”.

Fixed — a non-interactive refusal now returns a fatal (non-zero) error via report_fatal_error; only an interactive decline exits 0 (91363df).

bnavetta · 2026-07-15T16:16:08Z

+                    request_context: get_request_context(),
+                    sort_by,
+                });
+                let response = server_api.send_graphql_request(op, None).await?;


Instead of calling send_graphql_request directly, we should use a ServerApi client trait. This doesn't fit neatly into any of the existing ones, so we can add a new FactoryClient trait - see ManagedMcpClient as a recent example

Done in 91363df — added a FactoryClient ServerApi trait (app/src/server/server_api/factory.rs) with a get_factory_client() accessor following ManagedMcpClient; all runner GraphQL now routes through it.

bnavetta · 2026-07-15T16:16:49Z

+
+            ctx.spawn(
+                async move {
+                    let op = UpsertRunner::build(UpsertRunnerVariables {


This should also go in the FactoryClient

Moved into FactoryClient::upsert_runner (91363df).

bnavetta · 2026-07-15T16:17:16Z

+
+                let input = build_update_input(&args, &existing.config)?;
+
+                let op = UpsertRunner::build(UpsertRunnerVariables {


Ideally, one FactoryClient method for upserting a runner handles both create and update commands

Done — a single FactoryClient::upsert_runner method now serves both create and update (91363df).

bnavetta · 2026-07-15T16:17:25Z

+
+        ctx.spawn(
+            async move {
+                let op = DeleteRunner::build(DeleteRunnerVariables {


This should also go in the FactoryClient

Moved into FactoryClient::delete_runner (91363df).

bnavetta · 2026-07-15T16:18:05Z

+}
+
+/// Convert a resolved [`Owner`] into the GraphQL owner input.
+fn owner_to_input(owner: Owner) -> GqlOwner {


I think this conversion already exists

Removed the duplicate helper and reused the existing owner→GraphQL owner-input conversion (91363df).

bnavetta · 2026-07-15T16:19:36Z

+            Cell::new("Shape"),
+            Cell::new("OS"),
+            Cell::new("Arch"),
+            Cell::new("Docker image / macOS version"),


Instead of this kind of confusing column, let's call it OS Settings and have the value specify whether it's the Docker image or macOS version

Renamed the column to OS Settings; the value now states whether it's the Docker image or macOS version (91363df).

bnavetta · 2026-07-15T16:20:35Z

+    command: RunnerCommand,
+}
+
+fn parse_command(argv: &[&str]) -> RunnerCommand {


We don't need tests for clap validation, only our own functions

Removed the clap argument-parsing tests; kept only tests for our own functions (validate_os_config, confirm_delete) (91363df).

Address the review feedback on #13760: - Introduce a `FactoryClient` ServerApi trait (app/src/server/server_api/factory.rs) and route all runner GraphQL (get/upsert/delete) through it instead of calling send_graphql_request directly from the handler, following ManagedMcpClient. - Use a single `upsert_runner` method for both `create` and `update`. - Reuse the existing owner->GraphQL conversion instead of a duplicate helper. - Rename the list column to "OS Settings" with the value stating Docker image vs macOS version. - Reject ambiguous `update <uid> --name` via an exclusive ArgGroup, and make a non-interactive `delete` refusal return a fatal (non-zero) error. - Drop the clap-argument-parsing tests, keeping tests for our own functions (validate_os_config, confirm_delete). Co-Authored-By: Warp <agent@warp.dev>

warp-dev-github-integration · 2026-07-15T18:16:11Z

All review points addressed in 91363df (runner ops now go through a new FactoryClient trait, single upsert_runner for create/update, reused owner conversion, OS Settings column, exclusive update identifier, fatal non-interactive delete refusal, clap tests pruned).

Re: the request for an end-to-end command transcript — the commands are gated behind the CloudAgentRunnerCLICommands dogfood flag and hit getRunners/upsertRunner/deleteRunner, so a live CRUD run needs a runner-enabled backend. Behavior is covered by unit tests for our own logic (validate_os_config, confirm_delete) plus ./script/format and cargo clippy -p warp --all-targets --tests -- -D warnings (clean) and cargo nextest run -p warp_cli (green). Happy to attach a live transcript once pointed at a staging backend with the flag on.

warp-dev-github-integration · 2026-07-15T23:47:09Z

Smoke test update (ran the CLI against a live backend):

✅ runner list (pretty + JSON), the OS Settings column, --jq filtering, and all three validation-error cases (OS/config mismatch, ambiguous update <uid> --name, non-interactive delete refusal with non-zero exit) all behave correctly against real data.
⚠️ The create/update/delete happy-path could not be exercised in this runner: the only user-principal key is for IAP-gated staging and staging IAP token issuance is currently failing (gcloud print-identity-token → TOKEN_ISSUANCE_FAILED), while the non-IAP default backend only has a service-account key the server correctly rejects for mutations. The mutation request path is confirmed correct though — create/delete reached the server and surfaced its exact responses (create operations require a user principal, Unauthorized: Expected a user account).

Two minor notes: the top-level --api-key before a subcommand is swallowed by the [URLS] positional (pre-existing; works after the subcommand or via env), and the CLI JSON is flat (.[].name, not .[].config.name) — please confirm the flat shape is intended.

bnavetta · 2026-07-16T11:25:31Z

+
+/// Target CPU architecture for a runner sandbox.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, ValueEnum)]
+pub enum RunnerArchArg {


This should also have a default auto value, which resolves to the default architecture for the runner OS (x64 on Linux, arm64 on macOS)

Done in cb3b784 — --arch now has an auto value (the new default) that resolves to the OS default: x86-64 on Linux, aarch64 on macOS (resolve_arch).

bnavetta · 2026-07-16T11:25:48Z

+/// macOS version to use for a runner sandbox.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, ValueEnum)]
+pub enum RunnerMacosVersionArg {
+    #[value(name = "macos-14")]


Remove the macos- prefix from these; it's redundant

Done in cb3b784 — dropped the macos- prefix; values are now --macos-version 14|15|26|27.

bnavetta · 2026-07-16T11:28:57Z

+        }
+    };
+
+    let instance_shape = match (args.vcpus, args.memory_gb) {


On update, it should be possible to change either vCPUs or memory independently, preserving the existing value of the other setting

Done in cb3b784 — update now changes vCPUs and memory independently: an unspecified dimension is preserved from the existing shape (merge_instance_shape), and --vcpus/--memory-gb no longer require each other.

…dent vCPU/memory updates Addresses bnavetta's review feedback on the oz runner CLI: - warp_cli runner args: add an `Auto` variant to `RunnerArchArg` and default `--arch` to "auto"; drop the `macos-` prefix from `RunnerMacosVersionArg` value names (now "14"/"15"/"26"/"27"); make `--vcpus`/`--memory-gb` on `UpdateRunnerArgs` no longer require each other so they can be updated independently. - agent SDK runner: add `resolve_arch(arch, os)` (auto -> x86-64 on Linux, aarch64 on macOS) replacing `arch_to_gql`, used in both create and update; add `merge_instance_shape(new_vcpus, new_memory_gb, existing)` used in `build_update_input` so vCPUs/memory update independently while preserving the other dimension. - Add tests for `resolve_arch` and `merge_instance_shape`. Co-Authored-By: Warp <agent@warp.dev>

`oz runner update` can now rename a runner. `--name` is no longer mutually exclusive with a UID: when a UID is given, `--name` sets the runner's new name (rename); when no UID is given, `--name` is still required and identifies the runner to update. The identifier ArgGroup is now `required(true).multiple(true)`, and a new `resolve_updated_name` helper applies the rename only when a UID was used to locate the runner. Co-Authored-By: Warp <agent@warp.dev>

… resolve 3 conflicts Merge origin/master into i18n (downstream sync; keeps i18n SHA stable for stacked PR warpdotdev#13374). 3 content conflicts resolved per SOP merge-pattern (upstream structural refactor wins; restore menu_label wraps at call sites): - app/src/ai/blocklist/inline_action/orchestration_controls.rs (16 hunks): 15 wraps preserved - crates/warp_tui/src/terminal_session_view.rs (1 hunk): 29 wraps preserved - crates/warp_tui/src/zero_state.rs (1 hunk): 12 wraps preserved Auto-merged i18n files retained wraps: terminal/view.rs(99), agent_management/view.rs(50), lib.rs(22), tui_export(1), warp_tui/slash_commands(3), agent_block_sections(4). Known follow-up (tracked): upstream extracted orchestration UI into new module app/src/ai/orchestration/ (snapshots/validation/providers/config_state) with raw English literals — ~16 wrap sites regressed. Restore as next wave. New unwrapped literals for future wave: zero_state MCP section ("MCP", status labels), terminal_session_view "ctrl-c again to exit", orchestration "Loading…"/"No harnesses available". Gate: cargo check -p warp OK (5 upstream warnings in mcp/, not i18n scope); cargo test -p i18n 12/12 passed.

cla-bot Bot added the cla-signed label Jul 15, 2026

warp-dev-github-integration Bot requested a review from bnavetta July 15, 2026 15:39

oz-for-oss Bot reviewed Jul 15, 2026

View reviewed changes

bnavetta reviewed Jul 15, 2026

View reviewed changes

warp-dev-github-integration Bot requested a review from bnavetta July 15, 2026 18:14

bnavetta reviewed Jul 16, 2026

View reviewed changes

warp-dev-github-integration Bot requested a review from bnavetta July 16, 2026 12:47

bnavetta changed the title ~~Add oz runner CRUD CLI commands~~ [RMEOTE-2178] Add oz runner CRUD CLI commands Jul 16, 2026

bnavetta changed the title ~~[RMEOTE-2178] Add oz runner CRUD CLI commands~~ [REMOTE-2178] Add oz runner CRUD CLI commands Jul 16, 2026

bnavetta approved these changes Jul 16, 2026

View reviewed changes

bnavetta enabled auto-merge (squash) July 16, 2026 14:18

bnavetta merged commit 7ffccbb into master Jul 16, 2026
26 checks passed

bnavetta deleted the factory/oz-runner-cli branch July 16, 2026 14:36

	#[command(group(ArgGroup::new("runner_identifier").required(true).multiple(true).args(["id", "name"])))]
	#[command(group(ArgGroup::new("runner_identifier").required(true).multiple(false).args(["id", "name"])))]


		let input = build_update_input(&args, &existing.config)?;

		let op = UpsertRunner::build(UpsertRunnerVariables {

Uh oh!

Conversation

warp-dev-github-integration Bot commented Jul 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Linked Issue

Testing

Screenshots / Videos

Agent Mode

Uh oh!

oz-for-oss Bot commented Jul 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

oz-for-oss Bot left a comment

Choose a reason for hiding this comment

Overview

Concerns

Verdict

Uh oh!

oz-for-oss Bot Jul 15, 2026

Choose a reason for hiding this comment

Uh oh!

warp-dev-github-integration Bot Jul 15, 2026

Choose a reason for hiding this comment

Uh oh!

oz-for-oss Bot Jul 15, 2026

Choose a reason for hiding this comment

Uh oh!

warp-dev-github-integration Bot Jul 15, 2026

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

warp-dev-github-integration Bot Jul 15, 2026

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

warp-dev-github-integration Bot Jul 15, 2026

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

warp-dev-github-integration Bot Jul 15, 2026

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

warp-dev-github-integration Bot Jul 15, 2026

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

warp-dev-github-integration Bot Jul 15, 2026

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

warp-dev-github-integration Bot Jul 15, 2026

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

warp-dev-github-integration Bot Jul 15, 2026

Choose a reason for hiding this comment

Uh oh!

warp-dev-github-integration Bot commented Jul 15, 2026

Uh oh!

warp-dev-github-integration Bot commented Jul 15, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

warp-dev-github-integration Bot Jul 16, 2026

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

warp-dev-github-integration Bot Jul 16, 2026

Choose a reason for hiding this comment

Uh oh!

warp-dev-github-integration Bot commented Jul 15, 2026 •

edited

Loading

oz-for-oss Bot commented Jul 15, 2026 •

edited

Loading