diff --git a/content/reference/cli/docker/sandbox/create/copilot.md b/content/reference/cli/docker/sandbox/create/copilot.md
new file mode 100644
index 0000000000..dbd6a2b0e3
--- /dev/null
+++ b/content/reference/cli/docker/sandbox/create/copilot.md
@@ -0,0 +1,6 @@
+---
+datafolder: sandbox-cli
+datafile: docker_sandbox_create_copilot
+title: docker sandbox create copilot
+layout: cli
+---
diff --git a/content/reference/cli/docker/sandbox/save.md b/content/reference/cli/docker/sandbox/save.md
new file mode 100644
index 0000000000..2b099380f7
--- /dev/null
+++ b/content/reference/cli/docker/sandbox/save.md
@@ -0,0 +1,6 @@
+---
+datafolder: sandbox-cli
+datafile: docker_sandbox_save
+title: docker sandbox save
+layout: cli
+---
diff --git a/data/sandbox-cli/docker_sandbox.yaml b/data/sandbox-cli/docker_sandbox.yaml
index 851e10ad87..9e96a5f3ea 100644
--- a/data/sandbox-cli/docker_sandbox.yaml
+++ b/data/sandbox-cli/docker_sandbox.yaml
@@ -12,6 +12,7 @@ cname:
     - docker sandbox reset
     - docker sandbox rm
     - docker sandbox run
+    - docker sandbox save
     - docker sandbox stop
     - docker sandbox version
 clink:
@@ -22,6 +23,7 @@ clink:
     - docker_sandbox_reset.yaml
     - docker_sandbox_rm.yaml
     - docker_sandbox_run.yaml
+    - docker_sandbox_save.yaml
     - docker_sandbox_stop.yaml
     - docker_sandbox_version.yaml
 options:
diff --git a/data/sandbox-cli/docker_sandbox_create_copilot.yaml b/data/sandbox-cli/docker_sandbox_create_copilot.yaml
new file mode 100644
index 0000000000..da5a0e07b3
--- /dev/null
+++ b/data/sandbox-cli/docker_sandbox_create_copilot.yaml
@@ -0,0 +1,40 @@
+command: docker sandbox create copilot
+short: Create a sandbox for copilot
+long: |-
+    Create a sandbox with access to a host workspace for copilot.
+
+    The workspace path is required and will be exposed inside the sandbox at the same path as on the host.
+
+    Use 'docker sandbox run SANDBOX' to start copilot after creation.
+usage: docker sandbox create copilot WORKSPACE
+pname: docker sandbox create
+plink: docker_sandbox_create.yaml
+inherited_options:
+    - option: debug
+      shorthand: D
+      value_type: bool
+      default_value: "false"
+      description: Enable debug logging
+      deprecated: false
+      hidden: false
+      experimental: false
+      experimentalcli: false
+      kubernetes: false
+      swarm: false
+    - option: socket
+      value_type: string
+      description: |
+        Connect to daemon at specific socket path (for development/debugging)
+      deprecated: false
+      hidden: true
+      experimental: false
+      experimentalcli: false
+      kubernetes: false
+      swarm: false
+deprecated: false
+hidden: false
+experimental: false
+experimentalcli: false
+kubernetes: false
+swarm: false
+
diff --git a/data/sandbox-cli/docker_sandbox_run.yaml b/data/sandbox-cli/docker_sandbox_run.yaml
index c5c0ee09bc..a32d82d8c3 100644
--- a/data/sandbox-cli/docker_sandbox_run.yaml
+++ b/data/sandbox-cli/docker_sandbox_run.yaml
@@ -4,16 +4,6 @@ long: |-
     Run an agent in a sandbox. Create the sandbox if it does not exist.
 
     Pass agent arguments after the "--" separator.
-
-    Examples:
-      # Create and run a sandbox with claude in current directory
-      docker sandbox run claude .
-
-      # Run an existing sandbox
-      docker sandbox run existing-sandbox
-
-      # Run a sandbox with agent arguments
-      docker sandbox run claude . -- -p "What version are you running?"
 usage: docker sandbox run SANDBOX [-- AGENT_ARGS...] | AGENT WORKSPACE [-- AGENT_ARGS...]
 pname: docker sandbox
 plink: docker_sandbox.yaml
diff --git a/data/sandbox-cli/docker_sandbox_save.yaml b/data/sandbox-cli/docker_sandbox_save.yaml
new file mode 100644
index 0000000000..253c6c5779
--- /dev/null
+++ b/data/sandbox-cli/docker_sandbox_save.yaml
@@ -0,0 +1,51 @@
+command: docker sandbox save
+short: Save a snapshot of the sandbox as a template
+long: |-
+    Save a snapshot of the sandbox as a template.
+
+    By default, the image is loaded into the host's Docker daemon (requires Docker to be running).
+    Use --output to save the image to a tar file instead.
+usage: docker sandbox save SANDBOX TAG
+pname: docker sandbox
+plink: docker_sandbox.yaml
+options:
+    - option: output
+      shorthand: o
+      value_type: string
+      description: |
+        Save image to specified tar file instead of loading into host Docker
+      deprecated: false
+      hidden: false
+      experimental: false
+      experimentalcli: false
+      kubernetes: false
+      swarm: false
+inherited_options:
+    - option: debug
+      shorthand: D
+      value_type: bool
+      default_value: "false"
+      description: Enable debug logging
+      deprecated: false
+      hidden: false
+      experimental: false
+      experimentalcli: false
+      kubernetes: false
+      swarm: false
+    - option: socket
+      value_type: string
+      description: |
+        Connect to daemon at specific socket path (for development/debugging)
+      deprecated: false
+      hidden: true
+      experimental: false
+      experimentalcli: false
+      kubernetes: false
+      swarm: false
+deprecated: false
+hidden: false
+experimental: false
+experimentalcli: false
+kubernetes: false
+swarm: false
+