diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 07fef86..b73b782 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -71,7 +71,7 @@ jobs:
           node scripts/validate-supply-chain-workflow.mjs
           node scripts/validate-release-workflow.mjs
           node --test scripts/release-security.test.mjs scripts/supply-chain-workflow.test.mjs scripts/resolve-release-context.test.mjs scripts/release-workflow.test.mjs
-          python3 -m unittest scripts/test_normalize_macos_binary.py scripts/test_package_release.py
+          python3 -m unittest scripts/test_generate_cli_assets.py scripts/test_normalize_macos_binary.py scripts/test_package_release.py
       - name: Validate pinned example templates
         env:
           STACK_SPECIFICATION_DIR: ${{ github.workspace }}/.stack-specification
@@ -82,6 +82,24 @@ jobs:
         run: cargo +stable fmt --check
       - name: Run tests
         run: cargo +stable test --locked
+      - name: Validate generated completion and manual assets
+        shell: bash
+        run: |
+          python3 scripts/generate_cli_assets.py --binary target/debug/stack --check
+          bash -n distribution/generated/share/bash-completion/completions/stack
+          source distribution/generated/share/bash-completion/completions/stack
+          COMP_WORDS=(stack r)
+          COMP_CWORD=1
+          _stack_completion
+          test "${COMPREPLY[*]}" = render
+          COMP_WORDS=(stack icons li)
+          COMP_CWORD=2
+          _stack_completion
+          test "${COMPREPLY[*]}" = list
+          COMP_WORDS=(stack icons list a)
+          COMP_CWORD=3
+          _stack_completion
+          test "${COMPREPLY[*]}" = "aws azure"
       - name: Run canonical formatter suite
         env:
           STACK_SPECIFICATION_DIR: ${{ github.workspace }}/.stack-specification
@@ -127,6 +145,11 @@ jobs:
           ./target/release/stack update --help
           ./target/release/stack lsp --help
           ./target/release/stack icons --help
+          ./target/release/stack completions --help
+          ./target/release/stack completions bash | cmp distribution/generated/share/bash-completion/completions/stack -
+          ./target/release/stack completions zsh | cmp distribution/generated/share/zsh/site-functions/_stack -
+          ./target/release/stack completions fish | cmp distribution/generated/share/fish/vendor_completions.d/stack.fish -
+          ./target/release/stack manpage | cmp distribution/generated/share/man/man1/stack.1 -
           ./target/release/stack icons list
           ./target/release/stack icons list aws s3
           ./target/release/stack icons import --help
@@ -140,6 +163,7 @@ jobs:
           test -s CONTRIBUTING.md
           test -s SECURITY.md
           test -s docs/language-server.md
+          test -s docs/completions.md
           test -s docs/self-update.md
           test -s docs/publication-audit.md
           test -s docs/provider-icon-import.md
@@ -151,9 +175,14 @@ jobs:
           test -s distribution/distribution-contract.schema.json
           test -s distribution/install-receipt.schema.json
           test -s distribution/release-manifest.schema.json
+          test -s distribution/generated/share/bash-completion/completions/stack
+          test -s distribution/generated/share/zsh/site-functions/_stack
+          test -s distribution/generated/share/fish/vendor_completions.d/stack.fish
+          test -s distribution/generated/share/man/man1/stack.1
           test -s Cargo.toml
           test -s Cargo.lock
           test -s src/config.rs
+          test -s src/command_docs.rs
           test -s src/lsp.rs
           test -s src/update.rs
           test -s src/update/install.rs
@@ -176,6 +205,8 @@ jobs:
           test -s scripts/release-security.mjs
           test -s scripts/release-security.test.mjs
           test -s scripts/package_release.py
+          test -s scripts/generate_cli_assets.py
+          test -s scripts/test_generate_cli_assets.py
           test -s scripts/normalize_macos_binary.py
           test -s scripts/test_normalize_macos_binary.py
           test -s scripts/test_package_release.py
diff --git a/Cargo.lock b/Cargo.lock
index 0bf9243..7f31445 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -385,7 +385,7 @@ checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba"
 
 [[package]]
 name = "stack-cli"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "flate2",
  "roxmltree",
diff --git a/Cargo.toml b/Cargo.toml
index 705b75b..74631b2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "stack-cli"
-version = "0.3.0"
+version = "0.4.0"
 edition = "2024"
 rust-version = "1.85"
 publish = false
diff --git a/README.md b/README.md
index 2f58788..dc30187 100644
--- a/README.md
+++ b/README.md
@@ -45,6 +45,8 @@ stack icons list aws s3
 stack icons import gcp --accept-terms
 stack icons import simple-icons --accept-terms
 stack render arch.stack -o arch.svg --notice arch.NOTICE.md
+stack completions zsh
+stack manpage
 ```
 
 `stack help`, `stack -h`, and `stack --help` print top-level help. Use `stack help <COMMAND>` or `<COMMAND> -h` / `<COMMAND> --help` for command-specific usage and examples; nested icon help is available through `stack help icons <COMMAND>`. `stack version`, `stack -v`, `stack -V`, and `stack --version` print the same Cargo package version. Help and version output use standard output and exit with status `0`. Invalid arguments and unknown commands use standard error and status `2`; close command typos include a suggested command and the relevant help invocation.
@@ -61,6 +63,8 @@ stack render arch.stack -o arch.svg --notice arch.NOTICE.md
 
 `stack update` is implemented for future receipted direct installations, with `--check`, exact-version selection, authenticated release-manifest and archive verification, and rollback-aware atomic replacement. It refuses Homebrew, Aqua, Cargo, and unknown ownership. The published 0.3.0 binary does not contain this command and its manual installation has no receipt, so the self-update channel remains planned. See the [self-update contract](./docs/self-update.md).
 
+`stack completions <bash|zsh|fish>` and `stack manpage` generate deterministic shell integration and an offline roff manual from the CLI command metadata. Future release archives carry the exact generated files; Homebrew installs them into its managed completion and manual paths, while direct, Aqua, and future Cargo users can generate them into user-owned locations without modifying shell startup files. See the [completion and manual guide](./docs/completions.md).
+
 `stack icons list [PROVIDER] [QUERY]` searches the asset-free catalog by ID, product name, or category. The catalog currently contains 1,051 IDs: 305 AWS, 45 Google Cloud, 639 Azure, and 62 curated developer and collaboration tool icons. This command reads only metadata embedded in the CLI.
 
 `stack icons import <PROVIDER> --accept-terms` downloads the audited official archive set, verifies every complete SHA-256 before ZIP processing, reads allowlisted SVG entries with fixed size limits, sanitizes active and external content, preserves official colors and geometry, and writes the manifest, notice, and processed SVGs atomically. The default store is `$XDG_CONFIG_HOME/stack/icons`, falling back to `$HOME/.config/stack/icons`. `$XDG_CONFIG_HOME/stack/config.yaml` can set an absolute `default_icons_path`. Use `-o <DIRECTORY>` to put provider child directories below a project-local root. See [the provider icon guide](./docs/provider-icon-import.md) for configuration, project-local usage, sources, hashes, and rights.
@@ -83,9 +87,10 @@ The CLI requires Rust 1.85 or newer.
 cargo run -- check arch.stack
 cargo test --locked
 cargo clippy --all-targets --all-features --locked -- -D warnings
+python3 scripts/generate_cli_assets.py --binary target/debug/stack --check
 ```
 
-CI validates formatting, unit and process-level integration tests, release metadata and workflow security policies, at least 90% line/region coverage and 95% function coverage, Clippy, documentation, a release build, `--help`, and `--version` on stable Rust. Tests and Clippy also run on Rust 1.85.
+CI validates formatting, unit and process-level integration tests, generated completion and manual drift, release metadata and workflow security policies, at least 90% line/region coverage and 95% function coverage, Clippy, documentation, a release build, `--help`, and `--version` on stable Rust. Tests and Clippy also run on Rust 1.85.
 
 Canonical formatter behavior is checked against the pinned `stack-sh/specification` fixture revision recorded in `tests/specification-revision`.
 
diff --git a/distribution/distribution-contract.json b/distribution/distribution-contract.json
index ed5eaca..95ffb3c 100644
--- a/distribution/distribution-contract.json
+++ b/distribution/distribution-contract.json
@@ -6,7 +6,7 @@
     "sourceCargoPackage": "stack-cli",
     "publishedCargoPackage": null,
     "sourceVersionFile": "Cargo.toml",
-    "currentSourceVersion": "0.3.0",
+    "currentSourceVersion": "0.4.0",
     "minimumRustVersion": "1.85"
   },
   "availability": {
@@ -30,8 +30,18 @@
       "stack",
       "LICENSE",
       "NOTICE",
-      "THIRD_PARTY_LICENSES.md"
+      "THIRD_PARTY_LICENSES.md",
+      "share/bash-completion/completions/stack",
+      "share/zsh/site-functions/_stack",
+      "share/fish/vendor_completions.d/stack.fish",
+      "share/man/man1/stack.1"
     ],
+    "completionPaths": {
+      "bash": "share/bash-completion/completions/stack",
+      "zsh": "share/zsh/site-functions/_stack",
+      "fish": "share/fish/vendor_completions.d/stack.fish"
+    },
+    "manpagePath": "share/man/man1/stack.1",
     "releaseManifestNameTemplate": "stack-v{version}-release-manifest.json",
     "installReceiptSchema": "distribution/install-receipt.schema.json",
     "checksumNameTemplate": "stack-v{version}-checksums.txt",
@@ -114,7 +124,7 @@
         "aarch64-unknown-linux-gnu",
         "x86_64-unknown-linux-gnu"
       ],
-      "owns": "canonical immutable binary archives, release manifest, checksums, signature bundle, SBOMs, and provenance",
+      "owns": "canonical immutable binary archives with generated shell completions and manual page, release manifest, checksums, signature bundle, SBOMs, and provenance",
       "source": "tagged stack-sh/cli source",
       "updatePolicy": "stable releases only unless the user requests an exact prerelease"
     },
@@ -126,7 +136,7 @@
         "aarch64-unknown-linux-gnu",
         "x86_64-unknown-linux-gnu"
       ],
-      "owns": "formula metadata, GitHub archive URL and SHA-256 mapping, install, upgrade, and uninstall lifecycle on current Homebrew tier-1 hosts",
+      "owns": "formula metadata, GitHub archive URL and SHA-256 mapping, completion and manual placement, install, upgrade, and uninstall lifecycle on current Homebrew tier-1 hosts",
       "source": "github-release",
       "updatePolicy": "Homebrew owns upgrades; stack self-update must refuse replacement"
     },
@@ -178,6 +188,8 @@
       "all archive contents and metadata names match this contract",
       "all checksums, Sigstore bundles, SBOMs, and provenance verify",
       "stack --version, help, init, check, and render pass on each target",
+      "generated shell completion source matches the archived bash, zsh, and fish files",
+      "generated manual page matches the archived stack.1 file",
       "the release manifest records minimumSupportedCliVersion and each verified channel"
     ],
     "selfUpdateActivation": [
diff --git a/distribution/distribution-contract.schema.json b/distribution/distribution-contract.schema.json
index 692566c..a65fca2 100644
--- a/distribution/distribution-contract.schema.json
+++ b/distribution/distribution-contract.schema.json
@@ -71,6 +71,8 @@
         "archiveNameTemplate",
         "archiveRootTemplate",
         "requiredEntries",
+        "completionPaths",
+        "manpagePath",
         "releaseManifestNameTemplate",
         "installReceiptSchema",
         "checksumNameTemplate",
@@ -86,10 +88,21 @@
         "archiveRootTemplate": { "$ref": "#/$defs/template" },
         "requiredEntries": {
           "type": "array",
-          "minItems": 4,
+          "minItems": 8,
           "uniqueItems": true,
           "items": { "type": "string", "minLength": 1 }
         },
+        "completionPaths": {
+          "type": "object",
+          "additionalProperties": false,
+          "required": ["bash", "zsh", "fish"],
+          "properties": {
+            "bash": { "const": "share/bash-completion/completions/stack" },
+            "zsh": { "const": "share/zsh/site-functions/_stack" },
+            "fish": { "const": "share/fish/vendor_completions.d/stack.fish" }
+          }
+        },
+        "manpagePath": { "const": "share/man/man1/stack.1" },
         "releaseManifestNameTemplate": { "$ref": "#/$defs/template" },
         "installReceiptSchema": { "const": "distribution/install-receipt.schema.json" },
         "checksumNameTemplate": { "$ref": "#/$defs/template" },
diff --git a/distribution/generated/share/bash-completion/completions/stack b/distribution/generated/share/bash-completion/completions/stack
new file mode 100644
index 0000000..fb2268b
--- /dev/null
+++ b/distribution/generated/share/bash-completion/completions/stack
@@ -0,0 +1,43 @@
+# Generated by `stack completions bash`; do not edit.
+_stack_completion() {
+local current previous context words
+current="${COMP_WORDS[COMP_CWORD]-}"
+previous="${COMP_WORDS[COMP_CWORD-1]-}"
+context="${COMP_WORDS[1]-}"
+if [[ "$context" == icons && $COMP_CWORD -ge 3 ]]; then
+context="icons ${COMP_WORDS[2]-}"
+fi
+case "$previous" in
+--template) words="hello-stack application-and-data groups-and-layout commerce-platform aws-serverless-checkout gcp-data-service azure-event-platform github-delivery-workflow mixed-provider-platform" ;;
+--provider-pack|-o|--output|--notice) compopt -o default 2>/dev/null || true; return ;;
+--version) COMPREPLY=(); return ;;
+*) words="" ;;
+esac
+if [[ -z "$words" ]]; then
+if (( COMP_CWORD == 1 )); then
+words="init check fmt render update lsp icons completions manpage help version -h --help -v -V --version"
+    else
+      case "$context" in
+        "init") words="--template -o --output --force -h --help" ;;
+        "check") words="-h --help" ;;
+        "fmt") words="- --check -h --help" ;;
+        "render") words="--provider-pack -o --notice -h --help" ;;
+        "update") words="--check --version -h --help" ;;
+        "lsp") words="-h --help" ;;
+        "icons") words="list import help -h --help" ;;
+        "icons list") words="aws gcp azure simple-icons -h --help" ;;
+        "icons import") words="aws gcp azure simple-icons --accept-terms -o -h --help" ;;
+        "completions") words="bash zsh fish -h --help" ;;
+        "manpage") words="-h --help" ;;
+        "help") words="init check fmt render update lsp icons completions manpage help version -h --help" ;;
+        "version") words="-h --help" ;;
+        *) words="" ;;
+esac
+fi
+fi
+COMPREPLY=( $(compgen -W "$words" -- "$current") )
+if (( ${#COMPREPLY[@]} == 0 )); then
+compopt -o default 2>/dev/null || true
+fi
+}
+complete -F _stack_completion stack
diff --git a/distribution/generated/share/fish/vendor_completions.d/stack.fish b/distribution/generated/share/fish/vendor_completions.d/stack.fish
new file mode 100644
index 0000000..6dac9fc
--- /dev/null
+++ b/distribution/generated/share/fish/vendor_completions.d/stack.fish
@@ -0,0 +1,85 @@
+# Generated by `stack completions fish`; do not edit.
+function __stack_needs_command
+set -l tokens (commandline -opc)
+test (count $tokens) -eq 1
+end
+complete -c stack -n __stack_needs_command -a 'init' -d 'Create a Stack file from a versioned starter template'
+complete -c stack -n __stack_needs_command -a 'check' -d 'Validate a Stack source file without modifying it'
+complete -c stack -n __stack_needs_command -a 'fmt' -d 'Format a file in place or read from standard input'
+complete -c stack -n __stack_needs_command -a 'render' -d 'Render standalone SVG to standard output or a file'
+complete -c stack -n __stack_needs_command -a 'update' -d 'Check for or install a verified direct-install update'
+complete -c stack -n __stack_needs_command -a 'lsp' -d 'Run the Stack language server over standard input and output'
+complete -c stack -n __stack_needs_command -a 'icons' -d 'List catalogs and import audited provider icon archives'
+complete -c stack -n __stack_needs_command -a 'completions' -d 'Generate bash, zsh, or fish completion source'
+complete -c stack -n __stack_needs_command -a 'manpage' -d 'Print the offline Stack CLI manual page'
+complete -c stack -n __stack_needs_command -a 'help' -d 'Print this message or the help of a subcommand'
+complete -c stack -n __stack_needs_command -a 'version' -d 'Print version information'
+complete -c stack -n __stack_needs_command -s 'h'
+complete -c stack -n __stack_needs_command -l 'help'
+complete -c stack -n __stack_needs_command -s 'v'
+complete -c stack -n __stack_needs_command -s 'V'
+complete -c stack -n __stack_needs_command -l 'version'
+complete -c stack -n '__fish_seen_subcommand_from init' -l 'template' -r
+complete -c stack -n '__fish_seen_subcommand_from init' -s 'o'
+complete -c stack -n '__fish_seen_subcommand_from init' -l 'output' -r
+complete -c stack -n '__fish_seen_subcommand_from init' -l 'force'
+complete -c stack -n '__fish_seen_subcommand_from init' -s 'h'
+complete -c stack -n '__fish_seen_subcommand_from init' -l 'help'
+complete -c stack -n '__fish_seen_subcommand_from check' -s 'h'
+complete -c stack -n '__fish_seen_subcommand_from check' -l 'help'
+complete -c stack -n '__fish_seen_subcommand_from fmt' -a '-'
+complete -c stack -n '__fish_seen_subcommand_from fmt' -l 'check'
+complete -c stack -n '__fish_seen_subcommand_from fmt' -s 'h'
+complete -c stack -n '__fish_seen_subcommand_from fmt' -l 'help'
+complete -c stack -n '__fish_seen_subcommand_from render' -l 'provider-pack' -r
+complete -c stack -n '__fish_seen_subcommand_from render' -s 'o'
+complete -c stack -n '__fish_seen_subcommand_from render' -l 'notice' -r
+complete -c stack -n '__fish_seen_subcommand_from render' -s 'h'
+complete -c stack -n '__fish_seen_subcommand_from render' -l 'help'
+complete -c stack -n '__fish_seen_subcommand_from update' -l 'check'
+complete -c stack -n '__fish_seen_subcommand_from update' -l 'version' -r
+complete -c stack -n '__fish_seen_subcommand_from update' -s 'h'
+complete -c stack -n '__fish_seen_subcommand_from update' -l 'help'
+complete -c stack -n '__fish_seen_subcommand_from lsp' -s 'h'
+complete -c stack -n '__fish_seen_subcommand_from lsp' -l 'help'
+complete -c stack -n '__fish_seen_subcommand_from icons' -a 'list'
+complete -c stack -n '__fish_seen_subcommand_from icons' -a 'import'
+complete -c stack -n '__fish_seen_subcommand_from icons' -a 'help'
+complete -c stack -n '__fish_seen_subcommand_from icons' -s 'h'
+complete -c stack -n '__fish_seen_subcommand_from icons' -l 'help'
+complete -c stack -n '__fish_seen_subcommand_from icons; and __fish_seen_subcommand_from list' -a 'aws'
+complete -c stack -n '__fish_seen_subcommand_from icons; and __fish_seen_subcommand_from list' -a 'gcp'
+complete -c stack -n '__fish_seen_subcommand_from icons; and __fish_seen_subcommand_from list' -a 'azure'
+complete -c stack -n '__fish_seen_subcommand_from icons; and __fish_seen_subcommand_from list' -a 'simple-icons'
+complete -c stack -n '__fish_seen_subcommand_from icons; and __fish_seen_subcommand_from list' -s 'h'
+complete -c stack -n '__fish_seen_subcommand_from icons; and __fish_seen_subcommand_from list' -l 'help'
+complete -c stack -n '__fish_seen_subcommand_from icons; and __fish_seen_subcommand_from import' -a 'aws'
+complete -c stack -n '__fish_seen_subcommand_from icons; and __fish_seen_subcommand_from import' -a 'gcp'
+complete -c stack -n '__fish_seen_subcommand_from icons; and __fish_seen_subcommand_from import' -a 'azure'
+complete -c stack -n '__fish_seen_subcommand_from icons; and __fish_seen_subcommand_from import' -a 'simple-icons'
+complete -c stack -n '__fish_seen_subcommand_from icons; and __fish_seen_subcommand_from import' -l 'accept-terms'
+complete -c stack -n '__fish_seen_subcommand_from icons; and __fish_seen_subcommand_from import' -s 'o'
+complete -c stack -n '__fish_seen_subcommand_from icons; and __fish_seen_subcommand_from import' -s 'h'
+complete -c stack -n '__fish_seen_subcommand_from icons; and __fish_seen_subcommand_from import' -l 'help'
+complete -c stack -n '__fish_seen_subcommand_from completions' -a 'bash'
+complete -c stack -n '__fish_seen_subcommand_from completions' -a 'zsh'
+complete -c stack -n '__fish_seen_subcommand_from completions' -a 'fish'
+complete -c stack -n '__fish_seen_subcommand_from completions' -s 'h'
+complete -c stack -n '__fish_seen_subcommand_from completions' -l 'help'
+complete -c stack -n '__fish_seen_subcommand_from manpage' -s 'h'
+complete -c stack -n '__fish_seen_subcommand_from manpage' -l 'help'
+complete -c stack -n '__fish_seen_subcommand_from help' -a 'init'
+complete -c stack -n '__fish_seen_subcommand_from help' -a 'check'
+complete -c stack -n '__fish_seen_subcommand_from help' -a 'fmt'
+complete -c stack -n '__fish_seen_subcommand_from help' -a 'render'
+complete -c stack -n '__fish_seen_subcommand_from help' -a 'update'
+complete -c stack -n '__fish_seen_subcommand_from help' -a 'lsp'
+complete -c stack -n '__fish_seen_subcommand_from help' -a 'icons'
+complete -c stack -n '__fish_seen_subcommand_from help' -a 'completions'
+complete -c stack -n '__fish_seen_subcommand_from help' -a 'manpage'
+complete -c stack -n '__fish_seen_subcommand_from help' -a 'help'
+complete -c stack -n '__fish_seen_subcommand_from help' -a 'version'
+complete -c stack -n '__fish_seen_subcommand_from help' -s 'h'
+complete -c stack -n '__fish_seen_subcommand_from help' -l 'help'
+complete -c stack -n '__fish_seen_subcommand_from version' -s 'h'
+complete -c stack -n '__fish_seen_subcommand_from version' -l 'help'
diff --git a/distribution/generated/share/man/man1/stack.1 b/distribution/generated/share/man/man1/stack.1
new file mode 100644
index 0000000..62f409c
--- /dev/null
+++ b/distribution/generated/share/man/man1/stack.1
@@ -0,0 +1,323 @@
+.TH STACK 1 "" "Stack CLI 0.4.0" "Stack CLI Manual"
+.SH NAME
+stack \- Stack diagram toolchain
+.SH SYNOPSIS
+.B stack
+.RI "<COMMAND> [OPTIONS]"
+.SH DESCRIPTION
+Stack validates, formats, renders, and develops Stack architecture diagrams.
+.SH COMMAND REFERENCE
+.SS "stack"
+.nf
+Stack diagram toolchain
+
+Usage:
+  stack <COMMAND> [OPTIONS]
+  stack help [COMMAND]
+
+Commands:
+  init       Create a Stack file from a versioned starter template
+  check      Validate a Stack source file without modifying it
+  fmt        Format a file in place or read from standard input
+  render     Render standalone SVG to standard output or a file
+  update     Check for or install a verified direct\-install update
+  lsp        Run the Stack language server over standard input and output
+  icons      List catalogs and import audited provider icon archives
+  completions  Generate bash, zsh, or fish completion source
+  manpage    Print the offline Stack CLI manual page
+  help       Print this message or the help of a subcommand
+  version    Print version information
+
+Options:
+  \-h, \-\-help          Print help
+  \-v, \-V, \-\-version   Print version
+
+Examples:
+  stack init
+  stack init \-\-template application\-and\-data \-o architecture.stack
+  stack check arch.stack
+  stack fmt \-\-check arch.stack
+  stack render arch.stack \-o arch.svg
+  stack update \-\-check
+  stack lsp
+  stack icons list aws s3
+  stack completions zsh > _stack
+  stack manpage > stack.1
+.fi
+.SS "stack init"
+.nf
+Create a Stack file from a versioned starter template
+
+Usage:
+  stack init [\-\-template <TEMPLATE>] [\-o <FILE>] [\-\-force]
+
+Options:
+  \-\-template <TEMPLATE>  Select a curated template; defaults to hello\-stack
+  \-o, \-\-output <FILE>    Write to this path; defaults to diagram.stack
+  \-\-force                Replace an existing output file atomically
+  \-h, \-\-help             Print help
+
+Templates:
+  hello\-stack                Smallest directed diagram using built\-in icons
+  application\-and\-data       Application, database, details, and edge labels
+  groups\-and\-layout          Groups, ordering, rank, and layout direction
+  commerce\-platform         Production\-like built\-in architecture
+  aws\-serverless\-checkout    AWS serverless architecture
+  gcp\-data\-service           Google Cloud data service
+  azure\-event\-platform       Azure event\-driven platform
+  github\-delivery\-workflow   GitHub delivery workflow
+  mixed\-provider\-platform    AWS, GCP, Azure, and SaaS architecture
+
+Provider templates remain valid without imported icon packs and render with
+deterministic fallback icons. Use 'stack icons import <PROVIDER> \-\-accept\-terms'
+before rendering when branded icons are required.
+
+Examples:
+  stack init
+  stack init \-\-template groups\-and\-layout
+  stack init \-\-template aws\-serverless\-checkout \-o checkout.stack
+  stack init \-\-force
+.fi
+.SS "stack check"
+.nf
+Validate a Stack source file without modifying it
+
+Usage:
+  stack check <FILE>
+
+Arguments:
+  <FILE>  Read Stack source bytes from this file
+
+Options:
+  \-h, \-\-help  Print help
+
+Examples:
+  stack check arch.stack
+.fi
+.SS "stack fmt"
+.nf
+Format Stack source canonically
+
+Usage:
+  stack fmt <FILE>
+  stack fmt \-\-check <FILE>
+  stack fmt \-
+
+Arguments:
+  <FILE>  Format the file atomically in place
+  \-       Read from standard input and write to standard output
+
+Options:
+  \-\-check     Report whether formatting is required without writing output
+  \-h, \-\-help  Print help
+
+Examples:
+  stack fmt arch.stack
+  stack fmt \-\-check arch.stack
+  stack fmt \- < input.stack > output.stack
+.fi
+.SS "stack render"
+.nf
+Render Stack source as standalone SVG
+
+Usage:
+  stack render <FILE> [\-\-provider\-pack <DIRECTORY>] [\-o <OUTPUT>] [\-\-notice <NOTICE>]
+
+Arguments:
+  <FILE>                      Read Stack source bytes from this file
+
+Options:
+  \-\-provider\-pack <DIRECTORY> Read known provider packs from this icon\-store root
+  \-o <OUTPUT>                 Write SVG atomically instead of using standard output
+  \-\-notice <NOTICE>           Write exact used\-provider notices atomically
+  \-h, \-\-help                  Print help
+
+Default icon store:
+  $XDG_CONFIG_HOME/stack/icons or $HOME/.config/stack/icons
+
+Examples:
+  stack render arch.stack
+  stack render arch.stack \-o arch.svg
+  stack render arch.stack \-\-notice arch.NOTICE.md \-o arch.svg
+.fi
+.SS "stack update"
+.nf
+Check for or install a verified direct\-install update
+
+Usage:
+  stack update
+  stack update \-\-check
+  stack update \-\-version <VERSION>
+
+Options:
+  \-\-check              Resolve an update without downloading or changing files
+  \-\-version <VERSION>  Select an exact stable or MAJOR.MINOR.PATCH\-rc.N release
+  \-h, \-\-help           Print help
+
+Safety:
+  Replacement requires a matching direct\-install receipt and a GitHub CLI
+  artifact\-attestation check for the exact repository, workflow, tag, commit,
+  and GitHub\-hosted runner. Homebrew, Aqua, Cargo, and unknown installs are
+  never replaced.
+
+Examples:
+  stack update \-\-check
+  stack update
+  stack update \-\-version 0.4.0
+  stack update \-\-version 0.4.0\-rc.1
+.fi
+.SS "stack lsp"
+.nf
+Run the Stack language server over standard input and output
+
+Usage:
+  stack lsp
+
+Options:
+  \-h, \-\-help  Print help
+
+Protocol:
+  LSP 3.18 JSON\-RPC messages use Content\-Length framing over standard input
+  and output. Standard output is reserved for protocol messages.
+
+Examples:
+  stack lsp
+.fi
+.SS "stack icons"
+.nf
+Manage local provider icon packs
+
+Usage:
+  stack icons <COMMAND>
+
+Commands:
+  list    List searchable asset\-free provider catalog metadata
+  import  Download and import an audited provider icon archive
+  help    Print this message or the help of an icons subcommand
+
+Options:
+  \-h, \-\-help  Print help
+
+Providers:
+  aws            305 AWS Architecture Icons
+  gcp             45 Google Cloud product and category icons
+  azure          639 Azure Public Service Icons
+  simple\-icons    62 curated developer and collaboration tools
+
+Examples:
+  stack icons list
+  stack icons list aws s3
+  stack icons import gcp \-\-accept\-terms
+.fi
+.SS "stack icons list"
+.nf
+List searchable asset\-free provider catalog metadata
+
+Usage:
+  stack icons list
+  stack icons list <PROVIDER> [QUERY]
+
+Arguments:
+  <PROVIDER>  aws, gcp, azure, or simple\-icons
+  [QUERY]     Case\-insensitive ID, product, or category substring
+
+Options:
+  \-h, \-\-help  Print help
+
+Examples:
+  stack icons list
+  stack icons list aws s3
+.fi
+.SS "stack icons import"
+.nf
+Download and import audited provider icon archives
+
+Usage:
+  stack icons import <PROVIDER> \-\-accept\-terms [\-o <DIRECTORY>]
+
+Arguments:
+  <PROVIDER>  aws, gcp, azure, or simple\-icons
+
+Options:
+  \-\-accept\-terms  Confirm that you reviewed all provider and brand terms
+  \-o <DIRECTORY>  Store packs below this icon\-store root
+  \-h, \-\-help       Print help
+
+Default icon store:
+  $XDG_CONFIG_HOME/stack/icons or $HOME/.config/stack/icons
+
+Examples:
+  stack icons import gcp \-\-accept\-terms
+  stack icons import simple\-icons \-\-accept\-terms \-o .stack\-icons
+.fi
+.SS "stack completions"
+.nf
+Generate shell completion source
+
+Usage:
+  stack completions <SHELL>
+
+Arguments:
+  <SHELL>  bash, zsh, or fish
+
+Options:
+  \-h, \-\-help  Print help
+
+Examples:
+  stack completions bash > stack.bash
+  stack completions zsh > _stack
+  stack completions fish > stack.fish
+.fi
+.SS "stack manpage"
+.nf
+Print the offline Stack CLI manual page
+
+Usage:
+  stack manpage
+
+Options:
+  \-h, \-\-help  Print help
+
+Examples:
+  stack manpage > stack.1
+  man ./stack.1
+.fi
+.SS "stack help"
+.nf
+Print top\-level or subcommand help
+
+Usage:
+  stack help
+  stack help <COMMAND>
+  stack help icons <COMMAND>
+
+Arguments:
+  <COMMAND>  init, check, fmt, render, update, lsp, icons, completions,
+             manpage, help, or version
+
+Options:
+  \-h, \-\-help  Print help
+
+Examples:
+  stack help
+  stack help render
+  stack help icons import
+.fi
+.SS "stack version"
+.nf
+Print Stack CLI version information
+
+Usage:
+  stack version
+
+Options:
+  \-h, \-\-help  Print help
+
+Examples:
+  stack version
+.fi
+.SH FILES
+Configuration uses $XDG_CONFIG_HOME/stack or $HOME/.config/stack.
+.SH SEE ALSO
+.BR man (1),
+https://stack-diagram.com/docs/
diff --git a/distribution/generated/share/zsh/site-functions/_stack b/distribution/generated/share/zsh/site-functions/_stack
new file mode 100644
index 0000000..9badb58
--- /dev/null
+++ b/distribution/generated/share/zsh/site-functions/_stack
@@ -0,0 +1,50 @@
+#compdef stack
+# Generated by `stack completions zsh`; do not edit.
+_stack() {
+local context="${words[2]-}"
+if [[ "$context" == icons && $CURRENT -ge 4 ]]; then
+context="icons ${words[3]-}"
+fi
+if (( CURRENT == 2 )); then
+local -a commands
+commands=(
+      'init:Create a Stack file from a versioned starter template'
+      'check:Validate a Stack source file without modifying it'
+      'fmt:Format a file in place or read from standard input'
+      'render:Render standalone SVG to standard output or a file'
+      'update:Check for or install a verified direct-install update'
+      'lsp:Run the Stack language server over standard input and output'
+      'icons:List catalogs and import audited provider icon archives'
+      'completions:Generate bash, zsh, or fish completion source'
+      'manpage:Print the offline Stack CLI manual page'
+      'help:Print this message or the help of a subcommand'
+      'version:Print version information'
+      '-h:Global option'
+      '--help:Global option'
+      '-v:Global option'
+      '-V:Global option'
+      '--version:Global option'
+    )
+_describe 'command' commands
+return
+fi
+local -a candidates
+case "$context" in
+    "init") candidates=('--template' '-o' '--output' '--force' '-h' '--help') ;;
+    "check") candidates=('-h' '--help') ;;
+    "fmt") candidates=('-' '--check' '-h' '--help') ;;
+    "render") candidates=('--provider-pack' '-o' '--notice' '-h' '--help') ;;
+    "update") candidates=('--check' '--version' '-h' '--help') ;;
+    "lsp") candidates=('-h' '--help') ;;
+    "icons") candidates=('list' 'import' 'help' '-h' '--help') ;;
+    "icons list") candidates=('aws' 'gcp' 'azure' 'simple-icons' '-h' '--help') ;;
+    "icons import") candidates=('aws' 'gcp' 'azure' 'simple-icons' '--accept-terms' '-o' '-h' '--help') ;;
+    "completions") candidates=('bash' 'zsh' 'fish' '-h' '--help') ;;
+    "manpage") candidates=('-h' '--help') ;;
+    "help") candidates=('init' 'check' 'fmt' 'render' 'update' 'lsp' 'icons' 'completions' 'manpage' 'help' 'version' '-h' '--help') ;;
+    "version") candidates=('-h' '--help') ;;
+    *) candidates=() ;;
+esac
+compadd -- $candidates
+}
+compdef _stack stack
diff --git a/docs/completions.md b/docs/completions.md
new file mode 100644
index 0000000..ab03fe3
--- /dev/null
+++ b/docs/completions.md
@@ -0,0 +1,69 @@
+# Shell completion and offline manual
+
+Stack CLI generates bash, zsh, and fish completion source and a roff manual page from the command metadata compiled into the `stack` binary. The generated source is deterministic: CI compares all four tracked files with fresh command output and a release is rejected when the archive, runtime generator, and command definition differ.
+
+```sh
+stack completions bash
+stack completions zsh
+stack completions fish
+stack manpage
+```
+
+The published release archive stores the exact same bytes at these paths:
+
+| Asset | Archive path |
+| --- | --- |
+| bash | `share/bash-completion/completions/stack` |
+| zsh | `share/zsh/site-functions/_stack` |
+| fish | `share/fish/vendor_completions.d/stack.fish` |
+| manual | `share/man/man1/stack.1` |
+
+The source tree after Stack CLI 0.3.0 contains these commands and assets. The immutable 0.3.0 archives predate them; do not infer that an older installed binary can generate them.
+
+## Homebrew
+
+The owner-maintained formula installs the archived files through Homebrew's `bash_completion`, `zsh_completion`, `fish_completion`, and `man1` helpers. These helpers link files into the package-manager prefix described by the [Homebrew Formula Cookbook](https://docs.brew.sh/Formula-Cookbook). The shell may still require its normal completion initialization; follow [Homebrew's shell-completion setup](https://docs.brew.sh/Shell-Completion).
+
+No shell startup file is modified by the formula.
+
+## Direct, Aqua, and future Cargo installs
+
+Aqua's registry `files` mapping owns executable placement, not a user's shell startup or global manual database. A direct binary copy and a future Cargo install have the same boundary. Generate files into a user-owned location after installing the binary:
+
+```sh
+data_root="${XDG_DATA_HOME:-$HOME/.local/share}"
+config_root="${XDG_CONFIG_HOME:-$HOME/.config}"
+
+mkdir -p "$data_root/bash-completion/completions"
+stack completions bash > "$data_root/bash-completion/completions/stack"
+
+mkdir -p "$data_root/zsh/site-functions"
+stack completions zsh > "$data_root/zsh/site-functions/_stack"
+
+mkdir -p "$config_root/fish/completions"
+stack completions fish > "$config_root/fish/completions/stack.fish"
+
+mkdir -p "$data_root/man/man1"
+stack manpage > "$data_root/man/man1/stack.1"
+```
+
+For zsh, add `$data_root/zsh/site-functions` to `fpath` before running `compinit`. Bash must load the chosen completion directory through its normal completion framework. Fish discovers `$XDG_CONFIG_HOME/fish/completions` automatically. Add `$data_root/man` to `MANPATH` when the host does not already include the user data prefix. These are user shell choices, so `stack` prints bytes only and never edits dotfiles.
+
+You can also read the manual without installation:
+
+```sh
+stack manpage > stack.1
+man ./stack.1
+```
+
+## Maintainer workflow
+
+Build the binary, regenerate the tracked assets, and review the diff:
+
+```sh
+cargo build --locked
+python3 scripts/generate_cli_assets.py --binary target/debug/stack
+python3 scripts/generate_cli_assets.py --binary target/debug/stack --check
+```
+
+Release packaging accepts only the four exact tracked paths, regular files, bounded sizes, fixed permissions, and deterministic archive metadata. `scripts/verify_release_binary.py` independently proves that the target binary reproduces every archived file.
diff --git a/docs/distribution.md b/docs/distribution.md
index 25f6e77..bcaca06 100644
--- a/docs/distribution.md
+++ b/docs/distribution.md
@@ -40,7 +40,16 @@ stack-v{version}-{target}.provenance.sigstore.json
 stack-v{version}-{target}.sbom.sigstore.json
 ```
 
-Each archive contains one directory named `stack-v{version}-{target}` with `stack`, `LICENSE`, `NOTICE`, and `THIRD_PARTY_LICENSES.md`. Archives use bytewise path order, numeric uid/gid 0, `SOURCE_DATE_EPOCH` for entry times, and a gzip header without a source filename or wall-clock timestamp.
+Each archive contains one directory named `stack-v{version}-{target}` with `stack`, `LICENSE`, `NOTICE`, `THIRD_PARTY_LICENSES.md`, and the generated files below. Archives use bytewise path order, numeric uid/gid 0, `SOURCE_DATE_EPOCH` for entry times, and a gzip header without a source filename or wall-clock timestamp.
+
+```text
+share/bash-completion/completions/stack
+share/zsh/site-functions/_stack
+share/fish/vendor_completions.d/stack.fish
+share/man/man1/stack.1
+```
+
+The target binary must reproduce those exact bytes through `stack completions <SHELL>` and `stack manpage`. See the [shell completion and manual contract](./completions.md) for package-manager and user-owned installation paths.
 
 Release binaries use Rust 1.85.0 exactly. GNU/Linux builds run natively in the digest-pinned `rust:1.85.0-slim-bullseye` multi-architecture image and install their remaining release tools from the image's dated Debian snapshot, so their maximum glibc requirement is 2.31. macOS builds set `MACOSX_DEPLOYMENT_TARGET=13.0`, replace the path-dependent linker UUID with one derived from unsigned executable content, and apply a timestamp-free ad-hoc signature with a fixed identifier. Every target is built twice into isolated Cargo target directories on one GitHub-hosted native runner; the normalized binary bytes and independently packaged archive bytes must match before upload.
 
@@ -70,7 +79,7 @@ brew upgrade stack-sh/tap/stack
 brew uninstall stack-sh/tap/stack
 ```
 
-The formula does not remove or replace Stack configuration and icon stores during an upgrade or uninstall. Formula updates verify release checksums, provenance, and SBOM attestations before changing the archive mapping. The fail-closed update and recovery procedure is maintained in the tap's [maintainer guide](https://github.com/stack-sh/homebrew-tap/blob/main/docs/maintaining.md).
+For releases carrying the generated assets, the formula installs bash, zsh, and fish completions plus `stack.1` through Homebrew's standard path helpers. It does not edit shell startup files. The formula does not remove or replace Stack configuration and icon stores during an upgrade or uninstall. Formula updates verify release checksums, provenance, and SBOM attestations before changing the archive mapping. The fail-closed update and recovery procedure is maintained in the tap's [maintainer guide](https://github.com/stack-sh/homebrew-tap/blob/main/docs/maintaining.md).
 
 Homebrew was activated after the immutable `v0.3.0` release assets were published. The release manifest therefore remains the publication-time record, while this contract and the tap CI record the later channel activation; release assets are not replaced to retrofit that state.
 
@@ -123,6 +132,8 @@ stack --version
 
 Commit `aqua-checksums.json` with the configuration. To upgrade after a new stable Stack release, run `aqua update`, review the version change, then run `aqua update-checksum` and `aqua install`. Aqua owns the replacement; `stack` self-update must refuse to overwrite it. The registry maintainer procedure and four-target test command are in [`aqua/README.md`](../aqua/README.md).
 
+Aqua installs the executable declared by its registry mapping and does not own shell startup files or a global manual database. On a release that includes the generator, use `stack completions` and `stack manpage` to write the desired user-owned files as documented in the [completion guide](./completions.md).
+
 Aqua was activated after the immutable `v0.3.0` release assets were published. The release manifest remains the publication-time record; the pinned registry commit, generated checksum lock, contract, and CI runs are the later activation evidence. No release asset is replaced.
 
 ## Direct installation
@@ -138,12 +149,14 @@ install -m 0755 "stack-v0.3.0-{target}/stack" "$HOME/.local/bin/stack"
 
 Add `$HOME/.local/bin` to `PATH` if it is not already present. This manual installation has no self-update receipt. The source tree after 0.3.0 contains `stack update`, but the published 0.3.0 binary does not, and this installation cannot be claimed retroactively without risking a package-manager-owned binary. Self-update remains unavailable until a later release and verified direct installer separately activate the channel. The command and receipt contract are documented in the [self-update guide](./self-update.md).
 
+On a future archive that carries completion and manual assets, either copy the verified `share/` files into the matching system prefix or use the installed binary to generate user-owned files following the [completion guide](./completions.md). Do not copy these files from a different Stack version; CI and release verification require them to match the binary's command definition.
+
 ## Channel ownership
 
 | Channel | Owns | Must not do |
 | --- | --- | --- |
-| GitHub Releases | Canonical immutable archives, manifest, checksums, signature bundle, SBOMs, and provenance | Replace a tag or asset after publication |
-| Homebrew | Formula metadata, archive URL/digest mapping, install, upgrade, and uninstall | Rebuild a different binary or delegate upgrades to `stack` |
+| GitHub Releases | Canonical immutable archives with generated completions and manual, manifest, checksums, signature bundle, SBOMs, and provenance | Replace a tag or asset after publication |
+| Homebrew | Formula metadata, archive URL/digest mapping, standard completion/manual placement, install, upgrade, and uninstall | Rebuild a different binary or delegate upgrades to `stack` |
 | Cargo | A future unambiguous crates.io source package, its registry dependency graph, and installation of the `stack` binary | Claim binary-archive identity, promise the local `stack-cli` package name on crates.io, or publish while dependencies remain Git-only |
 | Aqua | Registry metadata and version pinning mapped to canonical archives and digests | Repack an archive or select prereleases by default |
 | `stack` self-update | Verified atomic replacement for direct installs with a Stack installation receipt | Replace a binary owned by Homebrew, Cargo, Aqua, or an unknown installer |
@@ -154,7 +167,7 @@ The workspace currently uses `stack-cli` as its local Cargo package name, but th
 
 ## Release activation and rollback
 
-A channel becomes available only after all of its target builds and clean-install smoke tests pass. A stable GitHub release additionally requires matching tag/version metadata, complete archive contents, valid checksums and Sigstore bundle, inspectable SPDX SBOMs and provenance, and successful `stack --version`, `help`, `init`, `check`, and `render` smoke tests on every tier-1 target.
+A channel becomes available only after all of its target builds and clean-install smoke tests pass. A stable GitHub release additionally requires matching tag/version metadata, complete archive contents, valid checksums and Sigstore bundle, inspectable SPDX SBOMs and provenance, exact generated completion/manual bytes, and successful `stack --version`, `help`, `init`, `check`, and `render` smoke tests on every tier-1 target.
 
 Tags and assets are immutable. For a broken release, mark it as withdrawn, exclude it from default update resolution, restore package-manager metadata to the last verified release, and publish a new patch version. Do not overwrite the broken tag or assets. Cargo may yank a broken package version, but yanking is not deletion and the replacement still uses a new version.
 
diff --git a/docs/releases/v0.4.0.md b/docs/releases/v0.4.0.md
new file mode 100644
index 0000000..0162a9b
--- /dev/null
+++ b/docs/releases/v0.4.0.md
@@ -0,0 +1,24 @@
+# Stack CLI 0.4.0
+
+This release adds editor integration, verified update foundations, and offline command discovery to the native Stack CLI.
+
+Highlights:
+
+- Generate bash, zsh, and fish completion source with `stack completions`.
+- Read or install a deterministic roff manual generated by `stack manpage`.
+- Run the native Stack language server with `stack lsp` for diagnostics, completion, hover, document symbols, and formatting.
+- Check future direct-install updates with a fail-closed client that authenticates release manifests and archives. Self-update remains unavailable until a verified direct installer creates installation receipts and a later release explicitly activates the channel.
+- Verify every target archive, including the exact completion and manual bytes, with SHA-256, keyless Sigstore, SLSA provenance, and an SPDX 2.3 SBOM attestation.
+
+Download the archive for your target and all matching verification materials from this release. Follow the [release verification guide](https://github.com/stack-sh/cli/blob/v0.4.0/docs/supply-chain.md) before installing any file. At publication time, GitHub Releases owns the new artifacts. Homebrew and Aqua remain on their last independently verified version until their owner repositories update and pass clean-install lifecycle tests; Cargo remains planned.
+
+The archive contains `stack`, license files, generated completion files under `share/`, and `share/man/man1/stack.1`. After verification, replace `{target}` with the downloaded target:
+
+```sh
+tar -xzf "stack-v0.4.0-{target}.tar.gz"
+mkdir -p "$HOME/.local/bin"
+install -m 0755 "stack-v0.4.0-{target}/stack" "$HOME/.local/bin/stack"
+"$HOME/.local/bin/stack" --version
+```
+
+Use the [completion and manual guide](../completions.md) to copy the matching archived files or generate them into user-owned locations. The manual installation above intentionally does not create a self-update receipt.
diff --git a/scripts/generate_cli_assets.py b/scripts/generate_cli_assets.py
new file mode 100644
index 0000000..e2c97a8
--- /dev/null
+++ b/scripts/generate_cli_assets.py
@@ -0,0 +1,114 @@
+#!/usr/bin/env python3
+import argparse
+import os
+from pathlib import Path
+import stat
+import subprocess
+import tempfile
+
+
+ROOT = Path(__file__).resolve().parent.parent
+DEFAULT_OUTPUT = ROOT / "distribution" / "generated"
+ASSETS = {
+    "share/bash-completion/completions/stack": ("completions", "bash"),
+    "share/fish/vendor_completions.d/stack.fish": ("completions", "fish"),
+    "share/man/man1/stack.1": ("manpage",),
+    "share/zsh/site-functions/_stack": ("completions", "zsh"),
+}
+MAXIMUM_ASSET_BYTES = 1024 * 1024
+
+
+def require(condition, message):
+    if not condition:
+        raise ValueError(message)
+
+
+def generated_assets(binary):
+    binary_path = Path(binary).absolute()
+    metadata = binary_path.lstat()
+    require(stat.S_ISREG(metadata.st_mode), "CLI binary must be a regular file, not a symlink")
+    require(os.access(binary_path, os.X_OK), "CLI binary must be executable")
+
+    generated = {}
+    for relative_path, arguments in ASSETS.items():
+        completed = subprocess.run(
+            [binary_path, *arguments],
+            check=False,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+        )
+        require(completed.returncode == 0, f"asset generator failed: stack {' '.join(arguments)}")
+        require(completed.stderr == b"", f"asset generator wrote diagnostics: stack {' '.join(arguments)}")
+        require(
+            0 < len(completed.stdout) <= MAXIMUM_ASSET_BYTES,
+            f"generated asset size is invalid: {relative_path}",
+        )
+        require(completed.stdout.endswith(b"\n"), f"generated asset lacks final newline: {relative_path}")
+        generated[relative_path] = completed.stdout
+    return generated
+
+
+def validate_inventory(output):
+    if not output.exists():
+        return
+    actual = {
+        path.relative_to(output).as_posix()
+        for path in output.rglob("*")
+        if path.is_file() or path.is_symlink()
+    }
+    require(actual == set(ASSETS), "generated asset inventory is incomplete or contains unexpected files")
+
+
+def check_assets(binary, output=DEFAULT_OUTPUT):
+    output_path = Path(output).absolute()
+    validate_inventory(output_path)
+    for relative_path, expected in generated_assets(binary).items():
+        destination = output_path / relative_path
+        metadata = destination.lstat()
+        require(stat.S_ISREG(metadata.st_mode), f"generated asset must be a regular file: {relative_path}")
+        require(destination.read_bytes() == expected, f"generated asset is stale: {relative_path}")
+    return len(ASSETS)
+
+
+def write_assets(binary, output=DEFAULT_OUTPUT):
+    output_path = Path(output).absolute()
+    generated = generated_assets(binary)
+    for relative_path, contents in generated.items():
+        destination = output_path / relative_path
+        destination.parent.mkdir(parents=True, exist_ok=True)
+        descriptor, temporary_name = tempfile.mkstemp(
+            prefix=f".{destination.name}.", suffix=".tmp", dir=destination.parent
+        )
+        temporary = Path(temporary_name)
+        try:
+            with os.fdopen(descriptor, "wb") as stream:
+                stream.write(contents)
+                stream.flush()
+                os.fsync(stream.fileno())
+            os.chmod(temporary, 0o644)
+            os.replace(temporary, destination)
+        finally:
+            temporary.unlink(missing_ok=True)
+    validate_inventory(output_path)
+    return len(generated)
+
+
+def main():
+    parser = argparse.ArgumentParser(description="Generate deterministic Stack CLI shell and manual assets")
+    parser.add_argument("--binary", required=True)
+    parser.add_argument("--output", default=DEFAULT_OUTPUT)
+    parser.add_argument("--check", action="store_true")
+    arguments = parser.parse_args()
+    try:
+        count = (
+            check_assets(arguments.binary, arguments.output)
+            if arguments.check
+            else write_assets(arguments.binary, arguments.output)
+        )
+        print(f"{'Validated' if arguments.check else 'Generated'} {count} CLI assets.")
+    except (OSError, ValueError) as error:
+        raise SystemExit(str(error)) from error
+
+
+if __name__ == "__main__":
+    main()
diff --git a/scripts/package_release.py b/scripts/package_release.py
index 7b3347f..8e8dfa7 100644
--- a/scripts/package_release.py
+++ b/scripts/package_release.py
@@ -17,7 +17,19 @@
     "aarch64-unknown-linux-gnu",
     "x86_64-unknown-linux-gnu",
 }
-REQUIRED_FILES = ("LICENSE", "NOTICE", "THIRD_PARTY_LICENSES.md", "stack")
+GENERATED_FILES = {
+    "share/bash-completion/completions/stack": ROOT / "distribution/generated/share/bash-completion/completions/stack",
+    "share/fish/vendor_completions.d/stack.fish": ROOT / "distribution/generated/share/fish/vendor_completions.d/stack.fish",
+    "share/man/man1/stack.1": ROOT / "distribution/generated/share/man/man1/stack.1",
+    "share/zsh/site-functions/_stack": ROOT / "distribution/generated/share/zsh/site-functions/_stack",
+}
+REQUIRED_FILES = (
+    "LICENSE",
+    "NOTICE",
+    "THIRD_PARTY_LICENSES.md",
+    *GENERATED_FILES,
+    "stack",
+)
 VERSION_PATTERN = re.compile(r"^[0-9]+\.[0-9]+\.[0-9]+(?:-rc\.[1-9][0-9]*)?$")
 MAXIMUM_FILE_BYTES = 256 * 1024 * 1024
 
@@ -82,6 +94,16 @@ def tar_info(name, mode, size, source_date_epoch, entry_type=tarfile.REGTYPE):
     return info
 
 
+def archive_file_sources(binary_path):
+    return {
+        "LICENSE": ROOT / "LICENSE",
+        "NOTICE": ROOT / "NOTICE",
+        "THIRD_PARTY_LICENSES.md": ROOT / "THIRD_PARTY_LICENSES.md",
+        **GENERATED_FILES,
+        "stack": binary_path,
+    }
+
+
 def create_archive(binary, target, version, source_date_epoch, output_directory):
     binary_path = validate_inputs(binary, target, version, source_date_epoch)
     output = Path(output_directory).absolute()
@@ -93,12 +115,7 @@ def create_archive(binary, target, version, source_date_epoch, output_directory)
     require(not os.path.lexists(destination), f"refusing to replace release archive: {destination.name}")
     root_name = archive_root(target, version)
 
-    file_sources = {
-        "LICENSE": ROOT / "LICENSE",
-        "NOTICE": ROOT / "NOTICE",
-        "THIRD_PARTY_LICENSES.md": ROOT / "THIRD_PARTY_LICENSES.md",
-        "stack": binary_path,
-    }
+    file_sources = archive_file_sources(binary_path)
     for name, source in file_sources.items():
         source_stat = source.lstat()
         require(stat.S_ISREG(source_stat.st_mode), f"archive input must be a regular file: {name}")
@@ -182,7 +199,8 @@ def verify_archive(archive, target, version, source_date_epoch, expected_binary=
                 expected_digest = sha256_file(expected_binary)
                 require(sha256_stream(extracted) == expected_digest, "archived binary differs from its build output")
             elif name != "stack":
-                require(extracted.read() == (ROOT / name).read_bytes(), f"archive notice differs from source: {name}")
+                source = archive_file_sources(expected_binary)[name]
+                require(extracted.read() == source.read_bytes(), f"archive file differs from source: {name}")
 
     return {"archive": archive_path.name, "entries": len(expected_names), "sha256": sha256_file(archive_path)}
 
diff --git a/scripts/release-security.test.mjs b/scripts/release-security.test.mjs
index 1fb6f3c..d7c9e18 100644
--- a/scripts/release-security.test.mjs
+++ b/scripts/release-security.test.mjs
@@ -12,7 +12,7 @@ import {
   verifyReleaseMetadata,
 } from "./release-security.mjs";
 
-const version = "0.3.0";
+const version = "0.4.0";
 const commit = "0123456789abcdef0123456789abcdef01234567";
 const provenancePredicate = "https://slsa.dev/provenance/v1";
 const sbomPredicate = "https://spdx.dev/Document/v2.3";
@@ -251,7 +251,7 @@ test("the minimum supported version cannot be newer than the release", (t) => {
       directory,
       version,
       commit,
-      minimumSupportedCliVersion: "0.4.0",
+      minimumSupportedCliVersion: "0.5.0",
       sourceDateEpoch: 1_788_566_400,
       builderWorkflow: "stack-sh/cli/.github/workflows/release.yaml",
     }),
diff --git a/scripts/resolve-release-context.test.mjs b/scripts/resolve-release-context.test.mjs
index 61140bc..be0ffa8 100644
--- a/scripts/resolve-release-context.test.mjs
+++ b/scripts/resolve-release-context.test.mjs
@@ -20,17 +20,17 @@ test("main dispatch resolves a non-publishing verification run", () => {
       ref: "refs/heads/main",
       refName: "main",
       sha,
-      requestedVersion: "0.3.0",
+      requestedVersion: "0.4.0",
       cargoToml,
       contract,
     }),
     {
-      version: "0.3.0",
-      tag: "v0.3.0",
+      version: "0.4.0",
+      tag: "v0.4.0",
       sourceRef: "refs/heads/main",
       publish: false,
       verifiedChannels: "",
-      minimumSupportedCliVersion: "0.3.0",
+      minimumSupportedCliVersion: "0.4.0",
     },
   );
 });
@@ -39,20 +39,20 @@ test("an exact version tag resolves a publishing run", () => {
   assert.deepEqual(
     resolveReleaseContext({
       eventName: "push",
-      ref: "refs/tags/v0.3.0",
-      refName: "v0.3.0",
+      ref: "refs/tags/v0.4.0",
+      refName: "v0.4.0",
       sha,
       requestedVersion: "",
       cargoToml,
       contract,
     }),
     {
-      version: "0.3.0",
-      tag: "v0.3.0",
-      sourceRef: "refs/tags/v0.3.0",
+      version: "0.4.0",
+      tag: "v0.4.0",
+      sourceRef: "refs/tags/v0.4.0",
       publish: true,
       verifiedChannels: "github-release",
-      minimumSupportedCliVersion: "0.3.0",
+      minimumSupportedCliVersion: "0.4.0",
     },
   );
 });
@@ -65,17 +65,17 @@ test("an activated self-update channel is recorded in a tagged release", () => {
   assert.deepEqual(
     resolveReleaseContext({
       eventName: "push",
-      ref: "refs/tags/v0.3.0",
-      refName: "v0.3.0",
+      ref: "refs/tags/v0.4.0",
+      refName: "v0.4.0",
       sha,
       requestedVersion: "",
       cargoToml,
       contract: activated,
     }),
     {
-      version: "0.3.0",
-      tag: "v0.3.0",
-      sourceRef: "refs/tags/v0.3.0",
+      version: "0.4.0",
+      tag: "v0.4.0",
+      sourceRef: "refs/tags/v0.4.0",
       publish: true,
       verifiedChannels: "github-release,self-update",
       minimumSupportedCliVersion: "0.2.1",
@@ -84,7 +84,7 @@ test("an activated self-update channel is recorded in a tagged release", () => {
 });
 
 test("self-update activation rejects a missing or future compatibility floor", () => {
-  for (const floor of [null, "0.4.0", "invalid"]) {
+  for (const floor of [null, "0.5.0", "invalid"]) {
     const activated = structuredClone(contract);
     const selfUpdate = activated.channels.find(({ id }) => id === "self-update");
     selfUpdate.state = "available";
@@ -92,8 +92,8 @@ test("self-update activation rejects a missing or future compatibility floor", (
     assert.throws(
       () => resolveReleaseContext({
         eventName: "push",
-        ref: "refs/tags/v0.3.0",
-        refName: "v0.3.0",
+        ref: "refs/tags/v0.4.0",
+        refName: "v0.4.0",
         sha,
         requestedVersion: "",
         cargoToml,
@@ -113,17 +113,17 @@ test("manual runs from another ref or version are rejected", () => {
     contract,
   };
   assert.throws(
-    () => resolveReleaseContext({ ...common, ref: "refs/heads/topic", requestedVersion: "0.3.0" }),
+    () => resolveReleaseContext({ ...common, ref: "refs/heads/topic", requestedVersion: "0.4.0" }),
     /must run from main/,
   );
   assert.throws(
-    () => resolveReleaseContext({ ...common, ref: "refs/heads/main", requestedVersion: "0.4.0" }),
+    () => resolveReleaseContext({ ...common, ref: "refs/heads/main", requestedVersion: "0.5.0" }),
     /must match Cargo.toml/,
   );
 });
 
 test("floating and mismatched tags are rejected", () => {
-  for (const ref of ["refs/tags/latest", "refs/tags/v0.3", "refs/tags/v0.4.0"]) {
+  for (const ref of ["refs/tags/latest", "refs/tags/v0.4", "refs/tags/v0.5.0"]) {
     assert.throws(
       () => resolveReleaseContext({
         eventName: "push",
@@ -141,14 +141,14 @@ test("floating and mismatched tags are rejected", () => {
 
 test("source and contract version drift is rejected", () => {
   const drifted = structuredClone(contract);
-  drifted.product.currentSourceVersion = "0.4.0";
+  drifted.product.currentSourceVersion = "0.5.0";
   assert.throws(
     () => resolveReleaseContext({
       eventName: "workflow_dispatch",
       ref: "refs/heads/main",
       refName: "main",
       sha,
-      requestedVersion: "0.3.0",
+      requestedVersion: "0.4.0",
       cargoToml,
       contract: drifted,
     }),
diff --git a/scripts/supply-chain-workflow.test.mjs b/scripts/supply-chain-workflow.test.mjs
index e7038e0..bde86e5 100644
--- a/scripts/supply-chain-workflow.test.mjs
+++ b/scripts/supply-chain-workflow.test.mjs
@@ -10,6 +10,8 @@ import { validateSupplyChainWorkflow } from "./validate-supply-chain-workflow.mj
 
 const root = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
 const workflow = fs.readFileSync(path.join(root, ".github", "workflows", "supply-chain.yaml"), "utf8");
+const cargoToml = fs.readFileSync(path.join(root, "Cargo.toml"), "utf8");
+const packageVersion = cargoToml.match(/^version\s*=\s*"([^"]+)"/m)?.[1];
 
 test("the checked-in supply-chain workflow is least privilege and fully pinned", () => {
   assert.deepEqual(validateSupplyChainWorkflow(workflow), { actions: 6, permissions: 3 });
@@ -55,7 +57,8 @@ test("the smoke fixture is bounded and never overwritten", (t) => {
   t.after(() => fs.rmSync(directory, { force: true, recursive: true }));
 
   const fixture = createSmokeFixture(directory);
-  assert.match(path.basename(fixture), /^stack-v0\.3\.0-supply-chain-smoke\.bin$/);
+  assert.ok(packageVersion, "Cargo.toml package version is missing");
+  assert.equal(path.basename(fixture), `stack-v${packageVersion}-supply-chain-smoke.bin`);
   assert.match(fs.readFileSync(fixture, "utf8"), /^Stack supply-chain smoke fixture\nsource=/);
   assert.throws(() => createSmokeFixture(directory), /refusing to replace smoke fixture/);
 });
diff --git a/scripts/test_generate_cli_assets.py b/scripts/test_generate_cli_assets.py
new file mode 100644
index 0000000..a8a1875
--- /dev/null
+++ b/scripts/test_generate_cli_assets.py
@@ -0,0 +1,54 @@
+from pathlib import Path
+import tempfile
+import unittest
+
+from scripts.generate_cli_assets import ASSETS, check_assets, write_assets
+
+
+class GenerateCliAssetsTest(unittest.TestCase):
+    def setUp(self):
+        self.temporary = tempfile.TemporaryDirectory(prefix="stack-cli-assets-")
+        self.root = Path(self.temporary.name)
+        self.binary = self.root / "stack"
+        self.binary.write_text(
+            "#!/bin/sh\n"
+            "if [ \"$1\" = manpage ]; then\n"
+            "  printf '.TH STACK 1\\n'\n"
+            "else\n"
+            "  printf '# %s completion\\n' \"$2\"\n"
+            "fi\n",
+            encoding="utf-8",
+        )
+        self.binary.chmod(0o755)
+        self.output = self.root / "generated"
+
+    def tearDown(self):
+        self.temporary.cleanup()
+
+    def test_write_and_check_exact_inventory(self):
+        self.assertEqual(write_assets(self.binary, self.output), 4)
+        self.assertEqual(check_assets(self.binary, self.output), 4)
+        self.assertEqual(
+            {
+                path.relative_to(self.output).as_posix()
+                for path in self.output.rglob("*")
+                if path.is_file()
+            },
+            set(ASSETS),
+        )
+
+    def test_stale_and_unexpected_assets_fail(self):
+        write_assets(self.binary, self.output)
+        (self.output / "share/man/man1/stack.1").write_text("stale\n", encoding="utf-8")
+        with self.assertRaisesRegex(ValueError, "stale"):
+            check_assets(self.binary, self.output)
+
+        write_assets(self.binary, self.output)
+        unexpected = self.output / "unexpected"
+        unexpected.write_text("unexpected\n", encoding="utf-8")
+        with self.assertRaisesRegex(ValueError, "inventory"):
+            check_assets(self.binary, self.output)
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/scripts/test_package_release.py b/scripts/test_package_release.py
index effaa8d..4bcd945 100644
--- a/scripts/test_package_release.py
+++ b/scripts/test_package_release.py
@@ -8,7 +8,7 @@
 
 
 class PackageReleaseTest(unittest.TestCase):
-    version = "0.3.0"
+    version = "0.4.0"
     target = "aarch64-apple-darwin"
     source_date_epoch = 1_788_566_400
 
@@ -41,10 +41,13 @@ def test_archive_is_reproducible_and_exact(self):
         self.assertEqual(first.read_bytes(), second.read_bytes())
         self.assertEqual(
             verify_archive(first, self.target, self.version, self.source_date_epoch, self.binary)["entries"],
-            5,
+            9,
         )
         with gzip.open(first, "rb") as stream:
-            self.assertIn(b"deterministic Stack executable fixture", stream.read())
+            contents = stream.read()
+            self.assertIn(b"deterministic Stack executable fixture", contents)
+            self.assertIn(b"Generated by `stack completions bash`", contents)
+            self.assertIn(b"Stack CLI Manual", contents)
 
     def test_existing_archive_is_never_replaced(self):
         create_archive(
@@ -65,7 +68,7 @@ def test_existing_archive_is_never_replaced(self):
 
     def test_version_and_target_drift_are_rejected(self):
         with self.assertRaisesRegex(ValueError, "match Cargo.toml"):
-            create_archive(self.binary, self.target, "0.4.0", self.source_date_epoch, self.root)
+            create_archive(self.binary, self.target, "0.5.0", self.source_date_epoch, self.root)
         with self.assertRaisesRegex(ValueError, "unsupported release target"):
             create_archive(self.binary, "x86_64-pc-windows-msvc", self.version, self.source_date_epoch, self.root)
 
diff --git a/scripts/validate-distribution-contract.mjs b/scripts/validate-distribution-contract.mjs
index b06e1ad..95e1ab7 100644
--- a/scripts/validate-distribution-contract.mjs
+++ b/scripts/validate-distribution-contract.mjs
@@ -13,7 +13,21 @@ const expectedTargets = [
 ];
 const expectedChannels = ["aqua", "cargo", "github-release", "homebrew", "self-update"];
 const availableChannels = new Set(["aqua", "github-release", "homebrew"]);
-const requiredArchiveEntries = ["LICENSE", "NOTICE", "THIRD_PARTY_LICENSES.md", "stack"];
+const requiredArchiveEntries = [
+  "LICENSE",
+  "NOTICE",
+  "THIRD_PARTY_LICENSES.md",
+  "share/bash-completion/completions/stack",
+  "share/fish/vendor_completions.d/stack.fish",
+  "share/man/man1/stack.1",
+  "share/zsh/site-functions/_stack",
+  "stack",
+];
+const completionPaths = {
+  bash: "share/bash-completion/completions/stack",
+  zsh: "share/zsh/site-functions/_stack",
+  fish: "share/fish/vendor_completions.d/stack.fish",
+};
 const requiredUnsupportedTerms = ["32-bit", "BSD", "Windows", "musl"];
 const requiredActivationTerms = ["Cargo package version", "SBOMs", "provenance", "stack --version"];
 const targetDefinitions = new Map([
@@ -160,6 +174,14 @@ export function validateDistributionContract(contract, cargoToml) {
     invariant(contract.artifacts?.[name]?.includes("{target}"), `${name} must contain {target}`);
   }
   sameValues(contract.artifacts?.requiredEntries ?? [], requiredArchiveEntries, "archive entries");
+  invariant(
+    JSON.stringify(contract.artifacts?.completionPaths) === JSON.stringify(completionPaths),
+    "completion paths must use the canonical archive locations",
+  );
+  invariant(
+    contract.artifacts?.manpagePath === "share/man/man1/stack.1",
+    "manual page must use the canonical archive location",
+  );
   invariant(contract.artifacts?.checksumAlgorithm === "sha256", "checksum algorithm must be sha256");
   invariant(
     contract.artifacts?.installReceiptSchema === "distribution/install-receipt.schema.json",
@@ -187,7 +209,7 @@ export function validateDistributionContract(contract, cargoToml) {
     invariant(unsupported.includes(term), `unsupported platforms must mention ${term}`);
   }
   const activation = (contract.verification?.releaseActivation ?? []).join(" ");
-  for (const term of requiredActivationTerms) {
+  for (const term of [...requiredActivationTerms, "shell completion", "manual page"]) {
     invariant(activation.includes(term), `release activation must mention ${term}`);
   }
   const selfUpdateActivation = (contract.verification?.selfUpdateActivation ?? []).join(" ");
diff --git a/scripts/verify_release_binary.py b/scripts/verify_release_binary.py
index 367eea8..a70ec15 100644
--- a/scripts/verify_release_binary.py
+++ b/scripts/verify_release_binary.py
@@ -9,6 +9,7 @@
 import xml.etree.ElementTree as ET
 
 
+ROOT = Path(__file__).resolve().parent.parent
 TARGETS = {
     "aarch64-apple-darwin": ("Mach-O", "arm64"),
     "x86_64-apple-darwin": ("Mach-O", "x86_64"),
@@ -16,6 +17,12 @@
     "x86_64-unknown-linux-gnu": ("ELF", "x86-64"),
 }
 MAXIMUM_BINARY_BYTES = 256 * 1024 * 1024
+GENERATED_COMMANDS = {
+    "share/bash-completion/completions/stack": ("completions", "bash"),
+    "share/fish/vendor_completions.d/stack.fish": ("completions", "fish"),
+    "share/man/man1/stack.1": ("manpage",),
+    "share/zsh/site-functions/_stack": ("completions", "zsh"),
+}
 
 
 def require(condition, message):
@@ -97,6 +104,12 @@ def verify_commands(binary, version):
         b"stack update" in command([binary, "update", "--help"]),
         "update help output is missing usage",
     )
+    for relative_path, arguments in GENERATED_COMMANDS.items():
+        expected = (ROOT / "distribution/generated" / relative_path).read_bytes()
+        require(
+            command([binary, *arguments]) == expected,
+            f"generated CLI asset differs from source: {relative_path}",
+        )
 
     with tempfile.TemporaryDirectory(prefix="stack-release-smoke-") as temporary:
         working_directory = Path(temporary)
diff --git a/src/command_docs.rs b/src/command_docs.rs
new file mode 100644
index 0000000..61cbbe4
--- /dev/null
+++ b/src/command_docs.rs
@@ -0,0 +1,479 @@
+//! Deterministic shell-completion and manual-page generation.
+
+use std::fmt::Write as _;
+
+use super::{
+    CHECK_HELP, COMPLETIONS_HELP, FORMAT_HELP, GENERAL_HELP, HELP_HELP, ICONS_HELP,
+    ICONS_IMPORT_HELP, ICONS_LIST_HELP, INIT_HELP, LSP_HELP, MANPAGE_HELP, RENDER_HELP,
+    UPDATE_HELP, VERSION_HELP,
+};
+
+pub(crate) const TOP_LEVEL_NAMES: &[&str] = &[
+    "init",
+    "check",
+    "fmt",
+    "render",
+    "update",
+    "lsp",
+    "icons",
+    "completions",
+    "manpage",
+    "help",
+    "version",
+];
+
+const GLOBAL_OPTIONS: &[&str] = &["-h", "--help", "-v", "-V", "--version"];
+const PROVIDERS: &[&str] = &["aws", "gcp", "azure", "simple-icons"];
+const SHELLS: &[&str] = &["bash", "zsh", "fish"];
+const TEMPLATES: &[&str] = &[
+    "hello-stack",
+    "application-and-data",
+    "groups-and-layout",
+    "commerce-platform",
+    "aws-serverless-checkout",
+    "gcp-data-service",
+    "azure-event-platform",
+    "github-delivery-workflow",
+    "mixed-provider-platform",
+];
+
+#[derive(Clone, Copy)]
+struct CommandSpec {
+    context: &'static str,
+    description: &'static str,
+    options: &'static [&'static str],
+    values: &'static [&'static str],
+}
+
+const COMMANDS: &[CommandSpec] = &[
+    CommandSpec {
+        context: "init",
+        description: "Create a Stack file from a versioned starter template",
+        options: &["--template", "-o", "--output", "--force", "-h", "--help"],
+        values: &[],
+    },
+    CommandSpec {
+        context: "check",
+        description: "Validate a Stack source file without modifying it",
+        options: &["-h", "--help"],
+        values: &[],
+    },
+    CommandSpec {
+        context: "fmt",
+        description: "Format a file in place or read from standard input",
+        options: &["--check", "-h", "--help"],
+        values: &["-"],
+    },
+    CommandSpec {
+        context: "render",
+        description: "Render standalone SVG to standard output or a file",
+        options: &["--provider-pack", "-o", "--notice", "-h", "--help"],
+        values: &[],
+    },
+    CommandSpec {
+        context: "update",
+        description: "Check for or install a verified direct-install update",
+        options: &["--check", "--version", "-h", "--help"],
+        values: &[],
+    },
+    CommandSpec {
+        context: "lsp",
+        description: "Run the Stack language server over standard input and output",
+        options: &["-h", "--help"],
+        values: &[],
+    },
+    CommandSpec {
+        context: "icons",
+        description: "List catalogs and import audited provider icon archives",
+        options: &["-h", "--help"],
+        values: &["list", "import", "help"],
+    },
+    CommandSpec {
+        context: "icons list",
+        description: "List searchable asset-free provider catalog metadata",
+        options: &["-h", "--help"],
+        values: PROVIDERS,
+    },
+    CommandSpec {
+        context: "icons import",
+        description: "Download and import an audited provider icon archive",
+        options: &["--accept-terms", "-o", "-h", "--help"],
+        values: PROVIDERS,
+    },
+    CommandSpec {
+        context: "completions",
+        description: "Generate bash, zsh, or fish completion source",
+        options: &["-h", "--help"],
+        values: SHELLS,
+    },
+    CommandSpec {
+        context: "manpage",
+        description: "Print the offline Stack CLI manual page",
+        options: &["-h", "--help"],
+        values: &[],
+    },
+    CommandSpec {
+        context: "help",
+        description: "Print this message or the help of a subcommand",
+        options: &["-h", "--help"],
+        values: TOP_LEVEL_NAMES,
+    },
+    CommandSpec {
+        context: "version",
+        description: "Print version information",
+        options: &["-h", "--help"],
+        values: &[],
+    },
+];
+
+pub(crate) fn completion(shell: &str) -> Result<String, String> {
+    match shell {
+        "bash" => Ok(bash_completion()),
+        "zsh" => Ok(zsh_completion()),
+        "fish" => Ok(fish_completion()),
+        _ => Err(format!(
+            "unsupported shell '{shell}'; supported shells: {}",
+            SHELLS.join(", ")
+        )),
+    }
+}
+
+fn words(values: &[&str]) -> String {
+    values.join(" ")
+}
+
+fn bash_completion() -> String {
+    let mut output = String::from(
+        "# Generated by `stack completions bash`; do not edit.\n\
+_stack_completion() {\n\
+  local current previous context words\n\
+  current=\"${COMP_WORDS[COMP_CWORD]-}\"\n\
+  previous=\"${COMP_WORDS[COMP_CWORD-1]-}\"\n\
+  context=\"${COMP_WORDS[1]-}\"\n\
+  if [[ \"$context\" == icons && $COMP_CWORD -ge 3 ]]; then\n\
+    context=\"icons ${COMP_WORDS[2]-}\"\n\
+  fi\n\
+  case \"$previous\" in\n\
+    --template) words=\"",
+    );
+    output.push_str(&words(TEMPLATES));
+    output.push_str(
+        "\" ;;\n\
+    --provider-pack|-o|--output|--notice) compopt -o default 2>/dev/null || true; return ;;\n\
+    --version) COMPREPLY=(); return ;;\n\
+    *) words=\"\" ;;\n\
+  esac\n\
+  if [[ -z \"$words\" ]]; then\n\
+    if (( COMP_CWORD == 1 )); then\n\
+      words=\"",
+    );
+    let top_level = TOP_LEVEL_NAMES
+        .iter()
+        .chain(GLOBAL_OPTIONS.iter())
+        .copied()
+        .collect::<Vec<_>>();
+    output.push_str(&words(&top_level));
+    output.push_str("\"\n    else\n      case \"$context\" in\n");
+    for command in COMMANDS {
+        let candidates = command
+            .values
+            .iter()
+            .chain(command.options.iter())
+            .copied()
+            .collect::<Vec<_>>();
+        let _ = writeln!(
+            output,
+            "        \"{}\") words=\"{}\" ;;",
+            command.context,
+            words(&candidates)
+        );
+    }
+    output.push_str(
+        "        *) words=\"\" ;;\n\
+      esac\n\
+    fi\n\
+  fi\n\
+  COMPREPLY=( $(compgen -W \"$words\" -- \"$current\") )\n\
+  if (( ${#COMPREPLY[@]} == 0 )); then\n\
+    compopt -o default 2>/dev/null || true\n\
+  fi\n\
+}\n\
+complete -F _stack_completion stack\n",
+    );
+    output
+}
+
+fn zsh_completion() -> String {
+    let mut output = String::from(
+        "#compdef stack\n# Generated by `stack completions zsh`; do not edit.\n\
+_stack() {\n\
+  local context=\"${words[2]-}\"\n\
+  if [[ \"$context\" == icons && $CURRENT -ge 4 ]]; then\n\
+    context=\"icons ${words[3]-}\"\n\
+  fi\n\
+  if (( CURRENT == 2 )); then\n\
+    local -a commands\n\
+    commands=(\n",
+    );
+    for command_name in TOP_LEVEL_NAMES {
+        let description = COMMANDS
+            .iter()
+            .find(|command| command.context == *command_name)
+            .map_or("Stack CLI command", |command| command.description);
+        let _ = writeln!(output, "      '{}:{}'", command_name, description);
+    }
+    for option in GLOBAL_OPTIONS {
+        let _ = writeln!(output, "      '{}:Global option'", option);
+    }
+    output.push_str(
+        "    )\n\
+    _describe 'command' commands\n\
+    return\n\
+  fi\n\
+  local -a candidates\n\
+  case \"$context\" in\n",
+    );
+    for command in COMMANDS {
+        let candidates = command
+            .values
+            .iter()
+            .chain(command.options.iter())
+            .copied()
+            .collect::<Vec<_>>();
+        let quoted = candidates
+            .iter()
+            .map(|candidate| format!("'{candidate}'"))
+            .collect::<Vec<_>>()
+            .join(" ");
+        let _ = writeln!(
+            output,
+            "    \"{}\") candidates=({}) ;;",
+            command.context, quoted
+        );
+    }
+    output.push_str(
+        "    *) candidates=() ;;\n\
+  esac\n\
+  compadd -- $candidates\n\
+}\n\
+compdef _stack stack\n",
+    );
+    output
+}
+
+fn fish_completion() -> String {
+    let mut output = String::from(
+        "# Generated by `stack completions fish`; do not edit.\n\
+function __stack_needs_command\n\
+    set -l tokens (commandline -opc)\n\
+    test (count $tokens) -eq 1\n\
+end\n",
+    );
+    for command_name in TOP_LEVEL_NAMES {
+        let description = COMMANDS
+            .iter()
+            .find(|command| command.context == *command_name)
+            .map_or("Stack CLI command", |command| command.description);
+        let _ = writeln!(
+            output,
+            "complete -c stack -n __stack_needs_command -a '{}' -d '{}'",
+            command_name, description
+        );
+    }
+    for option in GLOBAL_OPTIONS {
+        if let Some(long) = option.strip_prefix("--") {
+            let _ = writeln!(
+                output,
+                "complete -c stack -n __stack_needs_command -l '{}'",
+                long
+            );
+        } else if option.len() == 2 && option.starts_with('-') {
+            let _ = writeln!(
+                output,
+                "complete -c stack -n __stack_needs_command -s '{}'",
+                &option[1..]
+            );
+        }
+    }
+    for command in COMMANDS {
+        let condition = if command.context.contains(' ') {
+            let mut parts = command.context.split_whitespace();
+            let parent = parts.next().unwrap_or_default();
+            let child = parts.next().unwrap_or_default();
+            format!("__fish_seen_subcommand_from {parent}; and __fish_seen_subcommand_from {child}")
+        } else {
+            format!("__fish_seen_subcommand_from {}", command.context)
+        };
+        for value in command.values {
+            let _ = writeln!(
+                output,
+                "complete -c stack -n '{}' -a '{}'",
+                condition, value
+            );
+        }
+        for option in command.options {
+            if let Some(long) = option.strip_prefix("--") {
+                let requires_value = matches!(
+                    *option,
+                    "--template" | "--output" | "--provider-pack" | "--notice" | "--version"
+                );
+                let _ = writeln!(
+                    output,
+                    "complete -c stack -n '{}' -l '{}'{}",
+                    condition,
+                    long,
+                    if requires_value { " -r" } else { "" }
+                );
+            } else if option.len() == 2 && option.starts_with('-') {
+                let _ = writeln!(
+                    output,
+                    "complete -c stack -n '{}' -s '{}'",
+                    condition,
+                    &option[1..]
+                );
+            }
+        }
+    }
+    output
+}
+
+fn roff_escape(line: &str) -> String {
+    let escaped = line.replace('\\', "\\e").replace('-', "\\-");
+    if escaped.starts_with('.') || escaped.starts_with('\'') {
+        format!("\\&{escaped}")
+    } else {
+        escaped
+    }
+}
+
+pub(crate) fn manpage() -> String {
+    let mut output = format!(
+        ".TH STACK 1 \"\" \"Stack CLI {}\" \"Stack CLI Manual\"\n\
+.SH NAME\n\
+stack \\- Stack diagram toolchain\n\
+.SH SYNOPSIS\n\
+.B stack\n\
+.RI \"<COMMAND> [OPTIONS]\"\n\
+.SH DESCRIPTION\n\
+Stack validates, formats, renders, and develops Stack architecture diagrams.\n\
+.SH COMMAND REFERENCE\n",
+        env!("CARGO_PKG_VERSION")
+    );
+    for (title, help) in [
+        ("stack", GENERAL_HELP),
+        ("stack init", INIT_HELP),
+        ("stack check", CHECK_HELP),
+        ("stack fmt", FORMAT_HELP),
+        ("stack render", RENDER_HELP),
+        ("stack update", UPDATE_HELP),
+        ("stack lsp", LSP_HELP),
+        ("stack icons", ICONS_HELP),
+        ("stack icons list", ICONS_LIST_HELP),
+        ("stack icons import", ICONS_IMPORT_HELP),
+        ("stack completions", COMPLETIONS_HELP),
+        ("stack manpage", MANPAGE_HELP),
+        ("stack help", HELP_HELP),
+        ("stack version", VERSION_HELP),
+    ] {
+        let _ = writeln!(output, ".SS \"{}\"", roff_escape(title));
+        output.push_str(".nf\n");
+        for line in help.lines() {
+            let _ = writeln!(output, "{}", roff_escape(line));
+        }
+        output.push_str(".fi\n");
+    }
+    output.push_str(
+        ".SH FILES\n\
+Configuration uses $XDG_CONFIG_HOME/stack or $HOME/.config/stack.\n\
+.SH SEE ALSO\n\
+.BR man (1),\n\
+https://stack-diagram.com/docs/\n",
+    );
+    output
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn help_for(context: &str) -> Option<&'static str> {
+        match context {
+            "init" => Some(INIT_HELP),
+            "check" => Some(CHECK_HELP),
+            "fmt" => Some(FORMAT_HELP),
+            "render" => Some(RENDER_HELP),
+            "update" => Some(UPDATE_HELP),
+            "lsp" => Some(LSP_HELP),
+            "icons" => Some(ICONS_HELP),
+            "icons list" => Some(ICONS_LIST_HELP),
+            "icons import" => Some(ICONS_IMPORT_HELP),
+            "completions" => Some(COMPLETIONS_HELP),
+            "manpage" => Some(MANPAGE_HELP),
+            "help" => Some(HELP_HELP),
+            "version" => Some(VERSION_HELP),
+            _ => None,
+        }
+    }
+
+    #[test]
+    fn command_inventory_is_present_in_help_and_generators() {
+        for command in COMMANDS {
+            let help = help_for(command.context);
+            assert!(help.is_some(), "missing help page for {}", command.context);
+            let Some(help) = help else {
+                continue;
+            };
+            for option in command.options {
+                assert!(
+                    help.contains(option),
+                    "{} help is missing option {option}",
+                    command.context
+                );
+            }
+            for value in command.values {
+                assert!(
+                    help.contains(value),
+                    "{} help is missing value {value}",
+                    command.context
+                );
+            }
+        }
+        for command_name in TOP_LEVEL_NAMES {
+            let command = COMMANDS
+                .iter()
+                .find(|command| command.context == *command_name);
+            assert!(command.is_some(), "missing metadata for {command_name}");
+            let Some(command) = command else {
+                continue;
+            };
+            assert!(GENERAL_HELP.contains(command_name));
+            assert!(GENERAL_HELP.contains(command.description));
+        }
+        for shell in SHELLS {
+            let generated = completion(shell);
+            assert!(generated.is_ok(), "generation failed for {shell}");
+            let generated = generated.unwrap_or_default();
+            assert!(generated.ends_with('\n'));
+            for command_name in TOP_LEVEL_NAMES {
+                assert!(generated.contains(command_name));
+            }
+        }
+    }
+
+    #[test]
+    fn unsupported_shell_is_rejected() {
+        assert_eq!(
+            completion("powershell"),
+            Err("unsupported shell 'powershell'; supported shells: bash, zsh, fish".to_owned())
+        );
+    }
+
+    #[test]
+    fn manual_is_deterministic_and_contains_every_help_page() {
+        assert_eq!(manpage(), manpage());
+        let manual = manpage();
+        assert!(manual.starts_with(".TH STACK 1"));
+        assert!(manual.contains(".SS \"stack icons import\""));
+        assert!(manual.contains("Stack CLI Manual"));
+    }
+}
diff --git a/src/lib.rs b/src/lib.rs
index 92bd6e4..06fe292 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -14,6 +14,7 @@ use stack_engine::{
     ProviderPack, RenderOutput, Severity,
 };
 
+mod command_docs;
 mod config;
 mod lsp;
 mod provider;
@@ -43,6 +44,8 @@ Commands:
   update     Check for or install a verified direct-install update
   lsp        Run the Stack language server over standard input and output
   icons      List catalogs and import audited provider icon archives
+  completions  Generate bash, zsh, or fish completion source
+  manpage    Print the offline Stack CLI manual page
   help       Print this message or the help of a subcommand
   version    Print version information
 
@@ -59,6 +62,8 @@ Examples:
   stack update --check
   stack lsp
   stack icons list aws s3
+  stack completions zsh > _stack
+  stack manpage > stack.1
 ";
 const INIT_HELP: &str = "\
 Create a Stack file from a versioned starter template
@@ -257,6 +262,36 @@ Examples:
   stack icons import gcp --accept-terms
   stack icons import simple-icons --accept-terms -o .stack-icons
 ";
+const COMPLETIONS_HELP: &str = "\
+Generate shell completion source
+
+Usage:
+  stack completions <SHELL>
+
+Arguments:
+  <SHELL>  bash, zsh, or fish
+
+Options:
+  -h, --help  Print help
+
+Examples:
+  stack completions bash > stack.bash
+  stack completions zsh > _stack
+  stack completions fish > stack.fish
+";
+const MANPAGE_HELP: &str = "\
+Print the offline Stack CLI manual page
+
+Usage:
+  stack manpage
+
+Options:
+  -h, --help  Print help
+
+Examples:
+  stack manpage > stack.1
+  man ./stack.1
+";
 const HELP_HELP: &str = "\
 Print top-level or subcommand help
 
@@ -266,7 +301,11 @@ Usage:
   stack help icons <COMMAND>
 
 Arguments:
-  <COMMAND>  init, check, fmt, render, update, lsp, icons, help, or version
+  <COMMAND>  init, check, fmt, render, update, lsp, icons, completions,
+             manpage, help, or version
+
+Options:
+  -h, --help  Print help
 
 Examples:
   stack help
@@ -359,13 +398,17 @@ pub fn run(
     if command == OsStr::new("icons") {
         return run_icons(&mut arguments, stdout, stderr);
     }
+    if command == OsStr::new("completions") {
+        return run_completions(arguments, stdout, stderr);
+    }
+    if command == OsStr::new("manpage") {
+        return run_manpage(arguments, stdout, stderr);
+    }
 
     unknown_command_error(
         "stack",
         &command,
-        &[
-            "init", "check", "fmt", "render", "update", "lsp", "icons", "help", "version",
-        ],
+        command_docs::TOP_LEVEL_NAMES,
         "stack help",
         stderr,
     )
@@ -404,6 +447,10 @@ fn run_help(
         UPDATE_HELP
     } else if command == OsStr::new("lsp") {
         LSP_HELP
+    } else if command == OsStr::new("completions") {
+        COMPLETIONS_HELP
+    } else if command == OsStr::new("manpage") {
+        MANPAGE_HELP
     } else if command == OsStr::new("help") {
         HELP_HELP
     } else if command == OsStr::new("version") {
@@ -412,9 +459,7 @@ fn run_help(
         return unknown_command_error(
             "stack help",
             &command,
-            &[
-                "init", "check", "fmt", "render", "update", "lsp", "icons", "help", "version",
-            ],
+            command_docs::TOP_LEVEL_NAMES,
             "stack help",
             stderr,
         );
@@ -587,6 +632,62 @@ fn run_version(
     )
 }
 
+fn run_completions(
+    mut arguments: impl Iterator<Item = OsString>,
+    stdout: &mut dyn Write,
+    stderr: &mut dyn Write,
+) -> u8 {
+    let Some(shell) = arguments.next() else {
+        return argument_error("missing shell; supported shells: bash, zsh, fish", stderr);
+    };
+    if is_help_flag(&shell) {
+        if let Some(extra) = arguments.next() {
+            return argument_error(
+                &format!("unexpected argument '{}'", extra.to_string_lossy()),
+                stderr,
+            );
+        }
+        return write_stdout(COMPLETIONS_HELP, stdout, stderr);
+    }
+    if let Some(extra) = arguments.next() {
+        return argument_error(
+            &format!("unexpected argument '{}'", extra.to_string_lossy()),
+            stderr,
+        );
+    }
+    let shell = match shell.to_str() {
+        Some(shell) => shell,
+        None => return argument_error("shell must be valid UTF-8", stderr),
+    };
+    match command_docs::completion(shell) {
+        Ok(source) => write_stdout(&source, stdout, stderr),
+        Err(error) => argument_error(&error, stderr),
+    }
+}
+
+fn run_manpage(
+    mut arguments: impl Iterator<Item = OsString>,
+    stdout: &mut dyn Write,
+    stderr: &mut dyn Write,
+) -> u8 {
+    if let Some(argument) = arguments.next() {
+        if is_help_flag(&argument) {
+            if let Some(extra) = arguments.next() {
+                return argument_error(
+                    &format!("unexpected argument '{}'", extra.to_string_lossy()),
+                    stderr,
+                );
+            }
+            return write_stdout(MANPAGE_HELP, stdout, stderr);
+        }
+        return argument_error(
+            &format!("unexpected argument '{}'", argument.to_string_lossy()),
+            stderr,
+        );
+    }
+    write_stdout(&command_docs::manpage(), stdout, stderr)
+}
+
 fn run_update(
     mut arguments: impl Iterator<Item = OsString>,
     stdout: &mut dyn Write,
@@ -1818,7 +1919,8 @@ mod tests {
             run_without_input([OsString::from("--version")], &mut stdout, &mut stderr),
             EXIT_SUCCESS
         );
-        assert_eq!(stdout, b"stack 0.3.0\n");
+        let expected_version = format!("stack {}\n", env!("CARGO_PKG_VERSION"));
+        assert_eq!(stdout, expected_version.as_bytes());
         assert!(stderr.is_empty());
 
         stdout.clear();
diff --git a/src/update/install.rs b/src/update/install.rs
index 39051d1..2858c98 100644
--- a/src/update/install.rs
+++ b/src/update/install.rs
@@ -288,6 +288,10 @@ pub(super) fn extract_binary(
         format!("{root}/LICENSE"),
         format!("{root}/NOTICE"),
         format!("{root}/THIRD_PARTY_LICENSES.md"),
+        format!("{root}/share/bash-completion/completions/stack"),
+        format!("{root}/share/fish/vendor_completions.d/stack.fish"),
+        format!("{root}/share/man/man1/stack.1"),
+        format!("{root}/share/zsh/site-functions/_stack"),
         format!("{root}/stack"),
     ];
     let decoder = GzDecoder::new(Cursor::new(archive_bytes));
diff --git a/src/update/tests.rs b/src/update/tests.rs
index cece4aa..2bf7832 100644
--- a/src/update/tests.rs
+++ b/src/update/tests.rs
@@ -174,6 +174,19 @@ fn release_archive(version: &Version, candidate: &[u8]) -> TestResult<Vec<u8>> {
         ("LICENSE", b"license".as_slice()),
         ("NOTICE", b"notice".as_slice()),
         ("THIRD_PARTY_LICENSES.md", b"third party".as_slice()),
+        (
+            "share/bash-completion/completions/stack",
+            b"bash completion".as_slice(),
+        ),
+        (
+            "share/fish/vendor_completions.d/stack.fish",
+            b"fish completion".as_slice(),
+        ),
+        ("share/man/man1/stack.1", b"manual page".as_slice()),
+        (
+            "share/zsh/site-functions/_stack",
+            b"zsh completion".as_slice(),
+        ),
     ] {
         add_archive_entry(
             &mut builder,
diff --git a/tests/cli.rs b/tests/cli.rs
index b98c275..7ff0961 100644
--- a/tests/cli.rs
+++ b/tests/cli.rs
@@ -283,6 +283,22 @@ fn help_snapshots_and_aliases_are_stdout_only() -> Result<(), Box<dyn Error>> {
             &["help", "icons", "import"],
             include_bytes!("snapshots/icons-import-help.txt"),
         ),
+        (
+            &["completions", "--help"],
+            include_bytes!("snapshots/completions-help.txt"),
+        ),
+        (
+            &["help", "completions"],
+            include_bytes!("snapshots/completions-help.txt"),
+        ),
+        (
+            &["manpage", "--help"],
+            include_bytes!("snapshots/manpage-help.txt"),
+        ),
+        (
+            &["help", "manpage"],
+            include_bytes!("snapshots/manpage-help.txt"),
+        ),
         (&["help", "help"], include_bytes!("snapshots/help-help.txt")),
         (
             &["help", "--help"],
@@ -309,6 +325,88 @@ fn help_snapshots_and_aliases_are_stdout_only() -> Result<(), Box<dyn Error>> {
     Ok(())
 }
 
+#[test]
+fn generated_shell_and_manual_assets_are_exact_and_usable() -> Result<(), Box<dyn Error>> {
+    for (shell, expected) in [
+        (
+            "bash",
+            include_bytes!("../distribution/generated/share/bash-completion/completions/stack")
+                .as_slice(),
+        ),
+        (
+            "zsh",
+            include_bytes!("../distribution/generated/share/zsh/site-functions/_stack").as_slice(),
+        ),
+        (
+            "fish",
+            include_bytes!("../distribution/generated/share/fish/vendor_completions.d/stack.fish")
+                .as_slice(),
+        ),
+    ] {
+        assert_stdout_only(&["completions", shell], expected)?;
+    }
+    assert_stdout_only(
+        &["manpage"],
+        include_bytes!("../distribution/generated/share/man/man1/stack.1"),
+    )?;
+
+    let directory = TestDirectory::new("completion-smoke")?;
+    let bash_completion = directory.file(
+        "stack.bash",
+        include_bytes!("../distribution/generated/share/bash-completion/completions/stack"),
+    )?;
+    let bash = Command::new("bash")
+        .args([
+            "-c",
+            "source \"$1\"; COMP_WORDS=(stack r); COMP_CWORD=1; _stack_completion; printf '%s\\n' \"${COMPREPLY[@]}\"; COMP_WORDS=(stack icons li); COMP_CWORD=2; _stack_completion; printf '%s\\n' \"${COMPREPLY[@]}\"; COMP_WORDS=(stack icons list a); COMP_CWORD=3; _stack_completion; printf '%s\\n' \"${COMPREPLY[@]}\"",
+            "stack-completion-test",
+        ])
+        .arg(&bash_completion)
+        .output()?;
+    assert!(bash.status.success());
+    assert_eq!(bash.stdout, b"render\nlist\naws\nazure\n");
+    assert!(bash.stderr.is_empty());
+
+    for (program, relative_path) in [
+        (
+            "zsh",
+            "distribution/generated/share/zsh/site-functions/_stack",
+        ),
+        (
+            "fish",
+            "distribution/generated/share/fish/vendor_completions.d/stack.fish",
+        ),
+    ] {
+        match Command::new(program)
+            .arg("-n")
+            .arg(Path::new(env!("CARGO_MANIFEST_DIR")).join(relative_path))
+            .output()
+        {
+            Ok(output) => {
+                assert!(output.status.success(), "{program} syntax check failed");
+                assert!(
+                    output.stderr.is_empty(),
+                    "{program} syntax check emitted diagnostics"
+                );
+            }
+            Err(error) if error.kind() == std::io::ErrorKind::NotFound => {}
+            Err(error) => return Err(error.into()),
+        }
+    }
+
+    let unsupported = stack(["completions", "powershell"])?;
+    assert_eq!(unsupported.status.code(), Some(2));
+    assert!(unsupported.stdout.is_empty());
+    let diagnostics = String::from_utf8(unsupported.stderr)?;
+    assert!(
+        diagnostics.starts_with(
+            "error: unsupported shell 'powershell'; supported shells: bash, zsh, fish\n"
+        )
+    );
+    assert!(diagnostics.contains("Usage:\n  stack <COMMAND>"));
+    Ok(())
+}
+
 #[test]
 fn command_typos_are_actionable_and_stderr_only() -> Result<(), Box<dyn Error>> {
     let cases: &[(&[&str], &str)] = &[
diff --git a/tests/snapshots/completions-help.txt b/tests/snapshots/completions-help.txt
new file mode 100644
index 0000000..f1e802d
--- /dev/null
+++ b/tests/snapshots/completions-help.txt
@@ -0,0 +1,15 @@
+Generate shell completion source
+
+Usage:
+  stack completions <SHELL>
+
+Arguments:
+  <SHELL>  bash, zsh, or fish
+
+Options:
+  -h, --help  Print help
+
+Examples:
+  stack completions bash > stack.bash
+  stack completions zsh > _stack
+  stack completions fish > stack.fish
diff --git a/tests/snapshots/help-help.txt b/tests/snapshots/help-help.txt
index 7985e3f..b56ffc3 100644
--- a/tests/snapshots/help-help.txt
+++ b/tests/snapshots/help-help.txt
@@ -6,7 +6,11 @@ Usage:
   stack help icons <COMMAND>
 
 Arguments:
-  <COMMAND>  init, check, fmt, render, update, lsp, icons, help, or version
+  <COMMAND>  init, check, fmt, render, update, lsp, icons, completions,
+             manpage, help, or version
+
+Options:
+  -h, --help  Print help
 
 Examples:
   stack help
diff --git a/tests/snapshots/help.txt b/tests/snapshots/help.txt
index f46cff0..b664e11 100644
--- a/tests/snapshots/help.txt
+++ b/tests/snapshots/help.txt
@@ -12,6 +12,8 @@ Commands:
   update     Check for or install a verified direct-install update
   lsp        Run the Stack language server over standard input and output
   icons      List catalogs and import audited provider icon archives
+  completions  Generate bash, zsh, or fish completion source
+  manpage    Print the offline Stack CLI manual page
   help       Print this message or the help of a subcommand
   version    Print version information
 
@@ -28,3 +30,5 @@ Examples:
   stack update --check
   stack lsp
   stack icons list aws s3
+  stack completions zsh > _stack
+  stack manpage > stack.1
diff --git a/tests/snapshots/manpage-help.txt b/tests/snapshots/manpage-help.txt
new file mode 100644
index 0000000..9fc3cec
--- /dev/null
+++ b/tests/snapshots/manpage-help.txt
@@ -0,0 +1,11 @@
+Print the offline Stack CLI manual page
+
+Usage:
+  stack manpage
+
+Options:
+  -h, --help  Print help
+
+Examples:
+  stack manpage > stack.1
+  man ./stack.1
diff --git a/tests/update.rs b/tests/update.rs
index bbbad23..4258276 100644
--- a/tests/update.rs
+++ b/tests/update.rs
@@ -107,6 +107,19 @@ fn update_archive(
         ("LICENSE", b"license".as_slice()),
         ("NOTICE", b"notice".as_slice()),
         ("THIRD_PARTY_LICENSES.md", b"third party".as_slice()),
+        (
+            "share/bash-completion/completions/stack",
+            b"bash completion".as_slice(),
+        ),
+        (
+            "share/fish/vendor_completions.d/stack.fish",
+            b"fish completion".as_slice(),
+        ),
+        ("share/man/man1/stack.1", b"manual page".as_slice()),
+        (
+            "share/zsh/site-functions/_stack",
+            b"zsh completion".as_slice(),
+        ),
     ] {
         append_tar_entry(
             &mut builder,
@@ -298,7 +311,7 @@ fn update_binary_integrates_local_release_verification_and_atomic_replacement()
     let current_bytes = fs::read(&installed)?;
     let target = update_target()?;
     let current_version = env!("CARGO_PKG_VERSION");
-    let update_version = "0.3.1";
+    let update_version = "0.4.1";
     let epoch = 1_788_566_400_u64;
     let current_commit = "1111111111111111111111111111111111111111";
     let release_commit = "2222222222222222222222222222222222222222";
@@ -327,7 +340,7 @@ fn update_binary_integrates_local_release_verification_and_atomic_replacement()
         }))?,
     )?;
 
-    let candidate = b"#!/bin/sh\nif [ \"$1\" = \"--version\" ]; then printf 'stack 0.3.1\\n'; exit 0; fi\nexit 2\n";
+    let candidate = b"#!/bin/sh\nif [ \"$1\" = \"--version\" ]; then printf 'stack 0.4.1\\n'; exit 0; fi\nexit 2\n";
     let archive = update_archive(update_version, target, candidate, epoch)?;
     let archive_digest = sha256(&archive);
     let supported_targets = [
@@ -443,16 +456,16 @@ fn update_binary_integrates_local_release_verification_and_atomic_replacement()
         "{}",
         String::from_utf8_lossy(&output.stderr)
     );
-    assert!(String::from_utf8(output.stdout)?.contains("Updated stack 0.3.0 -> 0.3.1"));
+    assert!(String::from_utf8(output.stdout)?.contains("Updated stack 0.4.0 -> 0.4.1"));
     assert_eq!(fs::read(&installed)?, candidate);
     assert_eq!(fs::read_to_string(&gh_log)?, "verified\nverified\n");
     assert_eq!(server.hits().len(), 3);
 
     let version = Command::new(&installed).arg("--version").output()?;
     assert_eq!(version.status.code(), Some(0));
-    assert_eq!(version.stdout, b"stack 0.3.1\n");
+    assert_eq!(version.stdout, b"stack 0.4.1\n");
     let receipt: Value = serde_json::from_slice(&fs::read(receipt_path)?)?;
-    assert_eq!(receipt["version"], "0.3.1");
+    assert_eq!(receipt["version"], "0.4.1");
     assert_eq!(receipt["sourceCommit"], release_commit);
     assert_eq!(receipt["binary"]["sha256"], sha256(candidate));
     Ok(())