From cda0455bf77cc63d41f25195931a4af4d700f730 Mon Sep 17 00:00:00 2001
From: Tristan Cartledge <tristan@speakeasyapi.dev>
Date: Fri, 2 Oct 2026 10:37:22 +1000
Subject: [PATCH 1/4] fix(cli): omit inherited body flags from intent commands

---
 .changesets/1790900058-eee5daf2.yaml          |  10 ++
 templates/templates/cli/README.md             |  10 +-
 templates/templates/cli/includes/intents.ts   | 104 +++---------------
 templates/templates/cli/includes/usage.ts     |  70 +-----------
 templates/templates/cli/intentcmd.go.stmpl    |  85 +++-----------
 .../templates/cli/intenthint_test.go.stmpl    |  21 ----
 .../cli/tests/primary/intents_test.go.stmpl   |  56 ++++++----
 .../requestshape_additional_test.go.stmpl     |  22 +---
 tests/overlays/primary/cli/overlay.yaml       |   4 +
 zSDKs/sdk-cli/.speakeasy/gen.lock             |  18 +--
 zSDKs/sdk-cli/docs/cli_enroll.md              |  18 +--
 zSDKs/sdk-cli/docs/cli_invite.md              |  20 +---
 zSDKs/sdk-cli/docs/cli_observe.md             |  14 +--
 zSDKs/sdk-cli/docs/cli_produce.md             |  18 ++-
 zSDKs/sdk-cli/docs/cli_render.md              |  12 +-
 zSDKs/sdk-cli/docs/cli_say.md                 |   2 +-
 zSDKs/sdk-cli/internal/cli/intent_enroll.go   |  31 ++----
 zSDKs/sdk-cli/internal/cli/intent_invite.go   |  42 ++-----
 zSDKs/sdk-cli/internal/cli/intent_observe.go  |  32 ++----
 zSDKs/sdk-cli/internal/cli/intent_produce.go  |  32 ++----
 zSDKs/sdk-cli/internal/cli/intent_render.go   |  32 ++----
 zSDKs/sdk-cli/internal/cli/intent_say.go      |   6 +-
 .../internal/cli/tag1/intent_tag1-recent.go   |   5 +-
 zSDKs/sdk-cli/internal/usage/schema.go        |  14 +--
 zSDKs/sdk-cli/tests/intenthint_test.go        |  23 ----
 25 files changed, 189 insertions(+), 512 deletions(-)
 create mode 100644 .changesets/1790900058-eee5daf2.yaml

diff --git a/.changesets/1790900058-eee5daf2.yaml b/.changesets/1790900058-eee5daf2.yaml
new file mode 100644
index 00000000..94cd1eeb
--- /dev/null
+++ b/.changesets/1790900058-eee5daf2.yaml
@@ -0,0 +1,10 @@
+id: 1790900058-eee5daf2
+features:
+    - cliCommands
+targets:
+    - cli
+type: fix
+bump: patch
+description: omit inherited body flags from intent commands
+author: TristanSpeakEasy
+date: "2026-10-02"
diff --git a/templates/templates/cli/README.md b/templates/templates/cli/README.md
index dca3ca96..85378b05 100644
--- a/templates/templates/cli/README.md
+++ b/templates/templates/cli/README.md
@@ -572,7 +572,7 @@ Selection happens before route-local presets or schema defaults are applied. Aft
 
 `--body` remains the advanced escape and must contain a JSON object for dispatch. Its `@path`, `@-`, and stdin forms are resolved exactly once; the runtime selects from the object's keys, merges inputs and the selected preset, and replays the final object through the generic `--body` flag for the normal generated `BuildRequest` path. A body key unique to an unrouted union member returns a typed error naming the generated-operation escape. Unknown keys remain owned by `BuildRequest`'s normal body-key verification. Dispatch requires the generated operation to have flag metadata and the generic `--body` surface; pure `BuildRequestBody` operations are gated.
 
-Dispatch commands never register backing request-body metadata: no whole-union JSON flag and no expanded body fields. They retain non-body path/query/header metadata, operation security, `--body`, `--schema`, and declared flags. Help puts route-specific flags under `<Label> variant Flags:` (or `A / B variants` for a strict multi-route subset), leaves shared flags ungrouped, and appends the anchor/default summary. The static `--usage` KDL contains exactly the same surface.
+JSON-body intent commands, including single-route commands, never register backing request-body metadata: no inherited whole-union JSON flag, expanded body fields, or body defaults. They retain non-body path/query/header metadata, operation security, the JSON body flag, `--schema`, and declared flags. Body-less intents retain their parameter flags; multipart intents retain their upload fields because they have no JSON body escape. Use the generated operation command for the full JSON body-field flag surface. Dispatch help puts route-specific flags under `<Label> variant Flags:` (or `A / B variants` for a strict multi-route subset), leaves shared flags ungrouped, and appends the anchor/default summary. The static `--usage` KDL contains exactly the same surface.
 
 `override: true` replaces only the generated registration at the operation's exact canonical command path. The command must target that same operation, cover every component member, and replace a non-promoted leaf. The operation file is still generated so the intent reuses its metadata and run function. Runtime registration, KDL usage, generated README command trees and examples all omit the generated operation entry and insert the intent in manifest order; generated Arazzo tests that still encode the removed flag surface are skipped, while dedicated intent tests cover the replacement. Without `override`, the generated operation remains available as the full-control escape.
 
@@ -681,7 +681,7 @@ cli users create --no-interactive
 - Cobra validates positionals before lifecycle hooks, so the Args wrapper may defer an arity error only when an interactive prompt can supply a missing declared required positional. The PreRunE wrapper applies answers and always re-runs a deferred validator. Because Cobra computed its argument slice once, RunE and PostRunE wrappers receive the effective injected args through per-command execution state.
 - Positional prompting requires an explicit `interactive.Declare` contract; commands without `speakeasy_prompt_args` retain their original `Args` function unchanged. In v1, expanded union variant flags carry `speakeasy:union-member` and are never prompted independently, because requiring every variant at once would be incorrect. Callers select/populate unions through their existing top-level or variant surfaces.
 - Route-dispatch intents annotate only inputs required by every route. Anchors and conditionally required inputs are deliberately not marked required: the current prompt plan has no one-of choice, so prompting both anchors (e.g. `--engine` and `--pipeline`) would create an invalid request. The shared prompt runs first; route selection or a typed conditional-required error follows in `RunE`.
-- Declared intent commands (`x-speakeasy-cli-commands`) keep their presets under a partial body: when the caller passes `--body` (or the operation's whole-body-field flag, e.g. the union flag of a mixed operation) the intent merges its presets into that JSON per key — caller keys win, presets fill the gaps including the key that selects the pinned request variant, a known discriminator value is filled in — instead of handing the body to the operation untouched, where the union's default variant would silently replace the pinned one. A body that names another variant (a foreign selector key, or the discriminator with a different value) is a typed `CLI_VALIDATION` usage error naming the intent, the variant, and the full-control escape command. The selector knowledge (`CLIVariantSelectors`: own/foreign distinguishing keys, discriminator key + pinned value) is derived by the decoder's link step (`variantSelectors` in `cli_commands_link.go`) and rendered into `flagutil.PresetMerge` (`intentcmd.go.stmpl`, runtime in `auxiliary/internal/flagutil/preset.go.stmpl`).
+- Declared intent commands (`x-speakeasy-cli-commands`) keep their presets under a partial body: when the caller passes `--body` the intent merges its presets into that JSON per key — caller keys win, presets fill the gaps including the key that selects the pinned request variant, a known discriminator value is filled in — instead of handing the body to the operation untouched, where the union's default variant would silently replace the pinned one. A body that names another variant (a foreign selector key, or the discriminator with a different value) is a typed `CLI_VALIDATION` usage error naming the intent, the variant, and the full-control escape command. The selector knowledge (`CLIVariantSelectors`: own/foreign distinguishing keys, discriminator key + pinned value) is derived by the decoder's link step (`variantSelectors` in `cli_commands_link.go`) and rendered into `flagutil.PresetMerge` (`intentcmd.go.stmpl`, runtime in `auxiliary/internal/flagutil/preset.go.stmpl`).
 
 **Annotation contract**:
 
@@ -1246,7 +1246,7 @@ The compact layout and `Just works:` heading are runtime help contracts. Cobra m
 
 The KDL schema is built at generation time from the command tree in `includes/usage.ts` and emitted at runtime by `usage.EmitSchema()`. It includes command names, aliases, help text, flags, defaults, config metadata, and the config file location. Generated flags include the same auto-assigned short forms as the parser and `--help` (for example, `flag "-i --id <id>"` when `--id` receives `-i`). Shorthand assignment still reserves inherited global letters and the pagination `-a`; route-dispatch intents expose only shorthands for the non-body flags they register.
 
-Declared commands (`x-speakeasy-cli-commands`) are part of the schema: bound intents mount into the KDL tree under their declared parent path with the same flag surface the runtime registers (declared positional `arg` nodes, operation security flags, the body flag, `--schema`, and declared flags — plus ordinary backing-operation flag metadata for pinned intents, or non-body parameter metadata only for route dispatch; `buildIntentUsageCommand` in `includes/usage.ts`), and planned placeholders appear with their summary. For commands added after static schema generation, live schema emission reads `speakeasy_prompt_args` and emits the same `arg` nodes. Once Cobra validation succeeds, `--usage` on an intent or planned command emits KDL and wins over the command's other runtime surfaces, including `--schema` and the bare-invocation usage error (`runIntent*Cmd` in `intentcmd.go.stmpl` and `newPlannedCmd` in `intents.go.stmpl` check `usage.UsageRequested` first, matching operation commands).
+Declared commands (`x-speakeasy-cli-commands`) are part of the schema: bound intents mount into the KDL tree under their declared parent path with the same flag surface the runtime registers (declared positional `arg` nodes, operation security flags, the body flag, `--schema`, and declared flags — plus non-body parameter metadata for JSON-body intents (multipart intents keep their upload fields); `buildIntentUsageCommand` in `includes/usage.ts`), and planned placeholders appear with their summary. For commands added after static schema generation, live schema emission reads `speakeasy_prompt_args` and emits the same `arg` nodes. Once Cobra validation succeeds, `--usage` on an intent or planned command emits KDL and wins over the command's other runtime surfaces, including `--schema` and the bare-invocation usage error (`runIntent*Cmd` in `intentcmd.go.stmpl` and `newPlannedCmd` in `intents.go.stmpl` check `usage.UsageRequested` first, matching operation commands).
 
 **`--usage` is one root-level contract**: `NewRootCommand` creates cobra's default `help` and `completion` commands (`InitDefaultHelpCmd`/`InitDefaultCompletionCmd`, which cobra would otherwise add lazily inside `Execute`), applies declared command order, calls `interactive.Intercept(rootCmd)` when interactive mode is enabled, and then calls `usage.Intercept(rootCmd)` as the outer/last interceptor. Both see every generated, intent, catalog, auth and hand-written (`custom.Register` and root custom region) command. The usage interceptor walks the tree and (a) wraps each command's `Run`/`RunE` — non-runnable groups such as `auth` get a `RunE` that falls back to help — so `--usage` emits the command's KDL schema and nothing runs, and (b) folds every lifecycle hook (`PersistentPreRun(E)`, `PreRun(E)`, `PostRun(E)`, `PersistentPostRun(E)`) into a no-op under `--usage`, so a custom pre-run cannot mutate state either. Cobra's validation still surrounds those hooks: unknown flags, `--help`, non-deferred `Args` validation (`op bogus --usage` is a `NoArgs` error), and Cobra's post-PreRun required-flag/flag-group validators can win. `output.InstallErrorHandling` skips its eager typed copy of the latter two checks under `--usage`, but does not suppress Cobra's originals; such failures retain Cobra's existing untyped/runtime classification. The interactive Args wrapper explicitly does not defer under `--usage`, and the interactive PreRunE wrapper also checks the usage/doc-surface gates. Per-command `usage.UsageRequested` checks remain (harmless) as the documented precedence. Commands absent from the static KDL table use live Cobra schema emission, including declared positional `arg` nodes. The KDL root tree carries the built-in `auth` group (`login`/`whoami`/`logout`, unless a generated command already owns `auth` by name or alias — cobra dispatches to the first registered), `explore`, catalog commands (`x-speakeasy-cli-catalog`; a catalog whose exact name is a generated group lends the group its summary, one that only matches an alias is unreachable and skipped), and cobra's `help` and `completion` (`bash`/`zsh`/`fish`/`powershell`). `cmd/gendocs` skips `help`/`completion` (utility surface, same filter as the explorer) so the docs set is unchanged.
 
@@ -1610,7 +1610,7 @@ The `--body` flag is registered on all metadata-driven operations that have a bo
 - `--body` and the metadata flag that carries the whole body field (e.g. `--body-param`, or `--request-body` for a non-expanded body) both set: error; neither silently wins. That whole-body metadata flag has `--body`'s precedence over stdin: when it is set, stdin is not read.
 - Required union fields: after `BuildRequest` or `BuildRequestBody` has merged every source, a reflection preflight walks the request body through structs, pointers, slices, arrays, and maps. A union value (identified by `union:"member"` fields) with no selected member and no non-empty `union:"unknown"` raw value fails as `*flagutil.MissingRequiredFieldError` / `CLI_VALIDATION`, naming its JSON-tag path (`input`, `nested.input`, `items[0].input`) and its generated union flag when metadata provides one. A missing root union instead says that the request body selects no variant and names the whole-body and union flags. Builder errors still win — notably, selecting an expanded discriminated variant while omitting one of that variant's required flags retains the precise `missing required flag` error. Nil pointer unions remain optional; selected members are traversed for nested required unions; and fields omitted by the SDK's `omitempty`/`omitzero` rules are skipped. Metadata-backed form/multipart bodies with no `--body` flag are included only for fields tagged `,json`, because those are the fields their serializer passes through union JSON marshaling. This runs before dry-run or live SDK invocation, so serializer text is not parsed as a fallback. Intent commands are covered because they synthesize or merge the body flag and then call the backing operation's same request builder.
 
-**Declared intent commands** (`intentcmd.go.stmpl`): a whole request supplied up front — `--body`, the whole-body metadata flag (`BodyParamFlag`, computed from the operation's flag metadata by `wholeBodyFlagName` rather than assumed to be `--body-param`), or piped stdin — takes request control and the declared inputs are not synthesized into a competing body. Stdin is read once with `flagutil.AttachStdinBody` (same mode-aware `ReadStdinBody` contract: nothing read on a TTY, EOF is no body, agent mode bounded by the stdin deadline) and re-attached as the command input so `BuildRequest` reads it exactly like the operation path; piped JSON therefore runs the request instead of landing on the help page, and interactive prompting (TTY only) is untouched. A positional argument or declared flag given alongside a supplied body is merged by `flagutil.MergeInputIntoBody` (typed: bool/int/float/string): if the body lacks the bound key the input is injected, if it already sets it the invocation errors naming both sources.
+**Declared intent commands** (`intentcmd.go.stmpl`): a whole request supplied up front — the JSON body flag (normally `--body`, or the operation's single body flag when it has no metadata) or piped stdin — takes request control and the declared inputs are not synthesized into a competing body. Stdin is read once with `flagutil.AttachStdinBody` (same mode-aware `ReadStdinBody` contract: nothing read on a TTY, EOF is no body, agent mode bounded by the stdin deadline) and re-attached as the command input so `BuildRequest` reads it exactly like the operation path; piped JSON therefore runs the request instead of landing on the help page, and interactive prompting (TTY only) is untouched. A positional argument or declared flag given alongside a supplied body is merged by `flagutil.MergeInputIntoBody` (typed: bool/int/float/string): if the body lacks the bound key the input is injected, if it already sets it the invocation errors naming both sources.
 
 **`@` forms of the body flag** (`flagutil.ResolveBodyFlagValue`, applied to `--body` and single `--request-body`-style flags in `BuildRequest`/`BuildRequestBody`): `--body @path` reads the file at `path`; `--body @-` reads stdin to EOF with a blocking read (no probe window); `--body @@...` is the literal escape (the value minus one `@`) for a raw body whose first byte must be `@`. Any other value is used verbatim. A supplied intent `--body` flows through `BuildRequest` unchanged, so the forms apply to intent commands too; a synthesized intent body never starts with `@`. A failed local read is explicitly `CLI_VALIDATION` and names both the path and flag; it is never inferred to be a connection problem from the wrapped OS error.
 
@@ -1713,7 +1713,7 @@ These categories were skipped in primary and have been fixed:
 
 - **Response headers (flat format)**: CLI always uses `envelope-http` response format. The 2 tests using `responseFormat: flat` remain skipped (`headers-*-flat`)
 - **OAuth device flow**: Auth is config-file based only (no browser-based login)
-- **Compact intent operation flags**: operation-backed intents still list every registered backing-operation flag, including flags not declared by the manifest. Collapsing those undeclared flags behind an operation-help pointer is deferred because it needs template-only filtering that must not hide them from Cobra docs or KDL.
+- **Compact intent operation flags**: operation-backed intents retain non-body parameter flags even when they are not declared by the manifest; JSON-body intents omit inherited body-field flags, shorthands, defaults, and union descriptions. Multipart intents keep their upload flags. Collapsing those undeclared flags behind an operation-help pointer is deferred because it needs template-only filtering that must not hide them from Cobra docs or KDL.
 
 ### Known Bugs
 
diff --git a/templates/templates/cli/includes/intents.ts b/templates/templates/cli/includes/intents.ts
index 54c311d1..87ee635e 100644
--- a/templates/templates/cli/includes/intents.ts
+++ b/templates/templates/cli/includes/intents.ts
@@ -20,8 +20,7 @@
 interface IntentBodyEntry {
   Key: string; // top-level body key (from a single-segment JSON Pointer)
   Name?: string; // flag name
-  BackingFlag?: string; // generated operation flag for the same body key ("" when it is the declared flag itself)
-  SatisfiedBy?: string[]; // flags that replace a positional (backing flag + whole-body surfaces)
+  SatisfiedBy?: string[];
   Shorthand?: string;
   Summary?: string;
   Type?: string; // string | int | float | bool (string when absent)
@@ -78,7 +77,7 @@ interface IntentCmdCtx {
   SecurityFlags: string; // per-operation security flag registration snippet
   HasMeta: boolean; // whether the operation registers flag metadata
   BodyFlag: string; // flag the run function reads the JSON body from ("" = no body)
-  BodyParamFlag: string; // the operation's whole-body-field flag when its metadata registers one (e.g. "body-param" for a union body), "" otherwise
+
   BodyFieldPath: string; // metadata field path identifying request-body fields
   HasBody: boolean; // the backing operation carries a request body
   RunFunc: string;
@@ -328,51 +327,6 @@ function foldIntentArtifactPath(segments: any[], terminal: any): any {
   return node;
 }
 
-// Returns the operation flag that writes the same top-level JSON body key as
-// a declared positional argument. This mirrors collectMetadataFromFields for
-// direct expandable-body fields; suppressed, nested-expanded, or ambiguous
-// fields intentionally have no fallback surface.
-function intentBackingBodyFlag(
-  op: Operation,
-  key: string,
-  hasMeta: boolean,
-): string {
-  if (!hasMeta || !op.Request?.IsRequestBody || !isRequestBodyExpandable(op)) {
-    return "";
-  }
-
-  const globalFlags = getGlobalFlagNames();
-  const registered = (op.Request.RequestBody.Type.Fields || [])
-    .filter((field: FieldDef) => !field.Const)
-    .map((field: FieldDef) => {
-      const flagName = sanitizeFlagNameWithReserved(field.Name);
-      if (globalFlags.has(flagName)) return null;
-      const registersBeforeExpansion =
-        field.Type.Type.toString() === "union" ||
-        isNullableOptionalWrapped(field);
-      if (!registersBeforeExpansion) {
-        if (getInputClassType(field) === "MultipartRequestBody") return null;
-        if (shouldExpandNestedField(field)) return null;
-      }
-      return {
-        wireName: field.OriginalName || field.Name,
-        flagName,
-      };
-    })
-    .filter(
-      (entry): entry is { wireName: string; flagName: string } =>
-        entry !== null,
-    );
-
-  const matches = registered.filter((entry) => entry.wireName === key);
-  if (matches.length !== 1) return "";
-  const candidate = matches[0].flagName;
-  if (registered.filter((entry) => entry.flagName === candidate).length !== 1) {
-    return "";
-  }
-  return candidate;
-}
-
 interface IntentOpLocation {
   op: Operation;
   pkgPath: string; // slash-joined package path under internal/cli ("" = root)
@@ -485,19 +439,17 @@ function validateIntentParents(manifest: any): void {
 }
 
 // Validates that declared flag names do not collide with the generated flags
-// of the backing operation (params + body-derived flags), which would panic
+// of the backing operation (non-body parameters), which would panic
 // at cobra registration time.
 function validateIntentFlagNames(
   cmdKey: string,
   cmd: any,
   op: Operation,
   bodyFlag: string,
-  bodyParamFlag: string,
-  dispatch: boolean,
 ) {
   const generatedFlags = new Set<string>();
   try {
-    const metadata = dispatch
+    const metadata = bodyFlag
       ? collectOperationNonBodyFlagMeta(op)
       : collectOperationFlagMeta(op);
     for (const flagMeta of metadata) {
@@ -508,7 +460,7 @@ function validateIntentFlagNames(
     // surfaces computed by the same operation renderer below.
   }
   if (bodyFlag) generatedFlags.add(bodyFlag);
-  if (bodyParamFlag) generatedFlags.add(bodyParamFlag);
+
   for (const flag of cmd.Flags || []) {
     if (generatedFlags.has(flag.Name)) {
       throw new Error(
@@ -522,9 +474,12 @@ function validateIntentFlagNames(
   // exactly (operationAutoShorthandOwners shares its entry traversal). A
   // declared shorthand matching one on a registered flag panics pflag at
   // startup, so it must be a generation error (the README promises flag
-  // collisions fail generation). Dispatch commands register only the
-  // NonBodyMeta subset, so owners are restricted to it there.
-  const autoShorthandOwners = operationAutoShorthandOwners(op, dispatch);
+  // collisions fail generation). Intent commands register only the
+  // NonBodyMeta subset, so owners are restricted to it.
+  const autoShorthandOwners = operationAutoShorthandOwners(
+    op,
+    Boolean(bodyFlag),
+  );
   for (const flag of cmd.Flags || []) {
     if (!flag.Shorthand) continue;
     const owner = autoShorthandOwners.get(flag.Shorthand);
@@ -857,9 +812,7 @@ function collectIntentManifest(): IntentManifestCtx {
       args.push({
         Key: key,
         Name: a.Name || "input",
-        BackingFlag: dispatch
-          ? ""
-          : intentBackingBodyFlag(found.op, key, hasMeta),
+
         Summary: a.Summary || "",
         Variadic: Boolean(a.Variadic),
         Required: Boolean(a.Required),
@@ -878,15 +831,10 @@ function collectIntentManifest(): IntentManifestCtx {
       const key = intentPointerKey(f.Bind?.Pointer || "");
       if (!key || !f.Name) continue;
       const declaredFlagName = sanitizeFlagNameWithReserved(f.Name);
-      // The backing operation's own field flag satisfies the same body key;
-      // "" when it is the declared flag itself so checks are not duplicated.
-      const backingFlag = dispatch
-        ? ""
-        : intentBackingBodyFlag(found.op, key, hasMeta);
+
       flags.push({
         Key: key,
         Name: declaredFlagName,
-        BackingFlag: backingFlag === declaredFlagName ? "" : backingFlag,
         Shorthand: f.Shorthand || "",
         Summary: intentFlagHelp(f),
         Type: f.Type || "string",
@@ -973,38 +921,22 @@ function collectIntentManifest(): IntentManifestCtx {
       );
     }
 
-    const bodyParamFlag = dispatch
-      ? ""
-      : hasMeta
-      ? wholeBodyFlagName(found.op)
-      : "";
     validateIntentFlagNames(
       (cmd.Path || []).join(" "),
       cmd,
       found.op,
       bodyFlag,
-      bodyParamFlag,
-      dispatch,
     );
     for (const arg of args) {
       arg.SatisfiedBy = Array.from(
-        new Set(
-          [arg.BackingFlag || "", bodyFlag, bodyParamFlag].filter(
-            (name) => name !== "",
-          ),
-        ),
+        new Set([bodyFlag].filter((name) => name !== "")),
       );
     }
-    // A declared flag's requirement is also satisfied by a supplied whole
-    // body (which carries its bound key) or by the backing operation flag;
-    // interactive prompting reads these as body sources.
+    // A supplied whole body satisfies declared input requirements;
+    // interactive prompting reads it as a body source.
     for (const flag of flags) {
       flag.SatisfiedBy = Array.from(
-        new Set(
-          [flag.BackingFlag || "", bodyFlag, bodyParamFlag].filter(
-            (name) => name !== "",
-          ),
-        ),
+        new Set([bodyFlag].filter((name) => name !== "")),
       );
     }
 
@@ -1286,7 +1218,7 @@ function collectIntentManifest(): IntentManifestCtx {
         : "",
       HasMeta: hasMeta,
       BodyFlag: bodyFlag,
-      BodyParamFlag: bodyParamFlag,
+
       BodyFieldPath: hasMeta ? templateBodyFieldPath(found.op) : "",
       HasBody: Boolean(
         found.op.Request &&
diff --git a/templates/templates/cli/includes/usage.ts b/templates/templates/cli/includes/usage.ts
index 74630973..50ddb1af 100644
--- a/templates/templates/cli/includes/usage.ts
+++ b/templates/templates/cli/includes/usage.ts
@@ -1019,7 +1019,7 @@ function buildIntentUsageCommand(intent: IntentCmdCtx): UsageCommandDef {
 
   if (intent.HasMeta && found) {
     flags.push(
-      ...(intent.Dispatch
+      ...(intent.HasBody && intent.BodyFlag
         ? getOperationNonBodyUsageFlags(found.op)
         : getOperationBodyFieldUsageFlags(found.op)),
     );
@@ -1030,7 +1030,7 @@ function buildIntentUsageCommand(intent: IntentCmdCtx): UsageCommandDef {
   if (intent.BodyFlag) {
     flags.push({
       spec: usageFlagSpec(intent.BodyFlag, undefined, "body"),
-      help: `Request body as JSON (advanced; replaces intent arguments). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF.${
+      help: `Request body as JSON (advanced; merges with intent inputs, rejecting duplicate keys). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF.${
         intent.HasSchema ? " Use --schema to print the exact JSON Schema." : ""
       }`,
     });
@@ -1852,72 +1852,6 @@ registerTemplateFunc(
   templateIntentUsageSchemaPrecedenceTestEnabled,
 );
 
-// Bound intents whose required input has a backing operation flag: --body
-// combined with that flag explicitly empty must be rejected.
-interface IntentEmptyBackingFlagTestCase {
-  name: string;
-  path: string[];
-  bodyFlag: string;
-  backingFlag: string;
-  bodyJSON: string;
-}
-
-function getIntentEmptyBackingFlagTestCases(): IntentEmptyBackingFlagTestCase[] {
-  const cases: IntentEmptyBackingFlagTestCase[] = [];
-  for (const cmd of collectIntentManifest().Bound) {
-    if (!cmd.BodyFlag) continue;
-    const input = [...cmd.Args, ...cmd.Flags].find(
-      (i) =>
-        i.Required &&
-        !i.PresetCovered &&
-        i.BackingFlag &&
-        (!i.Type || i.Type === "string"),
-    );
-    if (!input) continue;
-    cases.push({
-      name: firstUseWord(cmd.Use),
-      path: [...cmd.ParentPath, firstUseWord(cmd.Use)],
-      bodyFlag: cmd.BodyFlag,
-      backingFlag: input.BackingFlag || "",
-      bodyJSON: JSON.stringify({ [input.Key]: "example-value" }),
-    });
-  }
-  return cases;
-}
-
-function templateIntentEmptyBackingFlagTestEnabled(): boolean {
-  return getIntentEmptyBackingFlagTestCases().length > 0;
-}
-registerTemplateFunc(
-  "templateIntentEmptyBackingFlagTestEnabled",
-  templateIntentEmptyBackingFlagTestEnabled,
-);
-
-function templateIntentEmptyBackingFlagTestCases(): string {
-  return getIntentEmptyBackingFlagTestCases()
-    .map((c) => {
-      const args = [
-        ...c.path,
-        `--${c.bodyFlag}`,
-        c.bodyJSON,
-        `--${c.backingFlag}`,
-        "",
-      ]
-        .map(goStringLiteral)
-        .join(", ");
-      return `{name: ${goStringLiteral(
-        c.name,
-      )}, args: []string{${args}}, backingFlag: ${goStringLiteral(
-        c.backingFlag,
-      )}},`;
-    })
-    .join("\n\t\t");
-}
-registerTemplateFunc(
-  "templateIntentEmptyBackingFlagTestCases",
-  templateIntentEmptyBackingFlagTestCases,
-);
-
 function templateArtifactIntentUsageTestEnabled(): boolean {
   return getArtifactTestCommand() !== null;
 }
diff --git a/templates/templates/cli/intentcmd.go.stmpl b/templates/templates/cli/intentcmd.go.stmpl
index d80e67bd..7752ee20 100644
--- a/templates/templates/cli/intentcmd.go.stmpl
+++ b/templates/templates/cli/intentcmd.go.stmpl
@@ -77,41 +77,25 @@ func InitIntent{{$c.FuncName}}(parent *cobra.Command) error {
 		},
 	}
 	{{- if $c.HasMeta}}
-	{{- if $c.Dispatch}}
+	{{- if and $c.HasBody $c.BodyFlag}}
 	intentMeta := flagutil.NonBodyMeta({{$c.MetaVar}}, "{{$c.BodyFieldPath}}")
-	flagutil.RegisterFlags(cmd, intentMeta)
-	flagutil.SetMetaPromptOptional(cmd, intentMeta, false)
 	{{- else}}
-	flagutil.RegisterFlags(cmd, {{$c.MetaVar}})
-	flagutil.SetMetaPromptOptional(cmd, {{$c.MetaVar}}, false)
-	{{- if $c.HasBody}}
-	flagutil.ClearBodyRequirements(cmd, {{$c.MetaVar}}, "{{$c.BodyFieldPath}}")
-	{{- end}}
-	{{- range $c.Args}}
-	{{- if .BackingFlag}}
-	_ = flagutil.OverridePromptRequirement(cmd, "{{.BackingFlag}}", false, false)
-	{{- end}}
-	{{- end}}
+	intentMeta := {{$c.MetaVar}}
 	{{- end}}
+	flagutil.RegisterFlags(cmd, intentMeta)
+	flagutil.SetMetaPromptOptional(cmd, intentMeta, false)
 	{{- end}}
 	{{- if $c.SecurityFlags}}
 	{{$c.SecurityFlags}}
 	{{- end}}
 	{{- if eq $c.BodyFlag "body"}}
-	cmd.Flags().String("body", "", "Request body as JSON (advanced; replaces intent arguments). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF.{{if $c.HasSchema}} Use --schema to print the exact JSON Schema.{{end}}")
+	cmd.Flags().String("body", "", "Request body as JSON (advanced; merges with intent inputs, rejecting duplicate keys). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF.{{if $c.HasSchema}} Use --schema to print the exact JSON Schema.{{end}}")
 	_ = flagutil.AnnotatePromptFlag(cmd, "body", flagutil.PromptFlagSpec{Kind: "json", BodyFlag: true})
 	{{- else if $c.BodyFlag}}
-	cmd.Flags().String("{{$c.BodyFlag}}", "", "Request body as JSON (advanced; replaces intent arguments). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF.{{if $c.HasSchema}} Use --schema to print the exact JSON Schema.{{end}}")
+	cmd.Flags().String("{{$c.BodyFlag}}", "", "Request body as JSON (advanced; merges with intent inputs, rejecting duplicate keys). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF.{{if $c.HasSchema}} Use --schema to print the exact JSON Schema.{{end}}")
 	_ = flagutil.AnnotatePromptFlag(cmd, "{{$c.BodyFlag}}", flagutil.PromptFlagSpec{Kind: "json", BodyFlag: true})
 	{{- end}}
-	{{- if and $c.HasMeta $c.BodyFlag (not $c.Dispatch)}}
-	if err := flagutil.AnnotateBodyFields(cmd, {{$c.MetaVar}}, "{{$c.BodyFieldPath}}", "{{$c.BodyFlag}}"{{if $c.BodyParamFlag}}, "{{$c.BodyParamFlag}}"{{end}}); err != nil {
-		return fmt.Errorf("annotate body fields for intent {{$c.ID}}: %w", err)
-	}
-	{{- end}}
-	{{- if $c.BodyParamFlag}}
-	_ = flagutil.MarkBodyFlag(cmd, "{{$c.BodyParamFlag}}")
-	{{- end}}
+
 	{{- if $c.HasSchema}}
 	cmd.Flags().Bool("schema", false, "Print the exact JSON Schema of the request body and exit")
 	_ = flagutil.AnnotatePromptFlag(cmd, "schema", flagutil.PromptFlagSpec{Kind: "bool", DocSurface: true})
@@ -131,8 +115,7 @@ func InitIntent{{$c.FuncName}}(parent *cobra.Command) error {
 		Kind: "{{if eq .Type "bool"}}bool{{else if eq .Type "int"}}int64{{else if eq .Type "float"}}float64{{else}}string{{end}}",
 		Order: {{$index}},
 		{{- if .SatisfiedBy}}
-		// A supplied whole body carries this flag's bound key (and the
-		// backing operation flag supplies it directly): no prompt then.
+
 		BodySources: []string{ {{- range $i, $name := .SatisfiedBy}}{{if $i}}, {{end}}"{{escapeGoString $name}}"{{end -}} },
 		{{- end}}
 	})
@@ -295,7 +278,7 @@ func runIntent{{$c.FuncName}}Cmd(cmd *cobra.Command, args []string) error {
 	}
 	{{- else}}
 	{{- if $c.BodyFlag}}
-	bodySurfaces := []string{"{{$c.BodyFlag}}"{{if $c.BodyParamFlag}}, "{{$c.BodyParamFlag}}"{{end}}}
+	bodySurfaces := []string{"{{$c.BodyFlag}}"}
 	for _, surface := range bodySurfaces {
 		if flagutil.FlagChanged(cmd, surface) {
 			if err := flagutil.ResolveBodyFlag(cmd, surface); err != nil {
@@ -304,11 +287,7 @@ func runIntent{{$c.FuncName}}Cmd(cmd *cobra.Command, args []string) error {
 		}
 	}
 	suppliedBodyFlag := ""
-	{{- if $c.BodyParamFlag}}
-	if flagutil.FlagChanged(cmd, "{{$c.BodyParamFlag}}") {
-		suppliedBodyFlag = "{{$c.BodyParamFlag}}"
-	}
-	{{- end}}
+
 	if flagutil.FlagChanged(cmd, "{{$c.BodyFlag}}") {
 		suppliedBodyFlag = "{{$c.BodyFlag}}"
 	}
@@ -327,24 +306,7 @@ func runIntent{{$c.FuncName}}Cmd(cmd *cobra.Command, args []string) error {
 	{{- end}}
 	{{- if or $c.Args $c.Flags}}
 	if bodySupplied {
-		{{- range $c.Args}}
-		{{- if and .Required (not .PresetCovered) .BackingFlag}}
-		if flagutil.FlagChanged(cmd, "{{.BackingFlag}}") {
-			if v, _ := flagutil.GetStringFlag(cmd, "{{.BackingFlag}}"); v == "" {
-				return flagutil.WithCLIValidation(fmt.Errorf("--{{.BackingFlag}} must not be empty"))
-			}
-		}
-		{{- end}}
-		{{- end}}
-		{{- range $c.Flags}}
-		{{- if and .Required (not .PresetCovered) .BackingFlag (or (not .Type) (eq .Type "string") (eq .Type ""))}}
-		if flagutil.FlagChanged(cmd, "{{.BackingFlag}}") {
-			if v, _ := flagutil.GetStringFlag(cmd, "{{.BackingFlag}}"); v == "" {
-				return flagutil.WithCLIValidation(fmt.Errorf("--{{.BackingFlag}} must not be empty"))
-			}
-		}
-		{{- end}}
-		{{- end}}
+
 		{{- range $c.Args}}
 		if len(args) > 0 {
 			if err := flagutil.MergeInputIntoBody(cmd, suppliedBodyFlag, "{{escapeGoString .Key}}", "the <{{escapeGoString .Name}}> argument", strings.Join(args, " ")); err != nil {
@@ -376,7 +338,7 @@ func runIntent{{$c.FuncName}}Cmd(cmd *cobra.Command, args []string) error {
 	}
 	{{- end}}
 {{- if or (gt $c.MinArgs 0) $c.PromptFlags}}
-	if len(args) == 0 && !bodySupplied{{range $c.Args}}{{range .SatisfiedBy}} && !flagutil.FlagChanged(cmd, "{{.}}"){{end}}{{end}}{{range $c.Flags}} && !flagutil.FlagChanged(cmd, "{{.Name}}"){{if .BackingFlag}} && !flagutil.FlagChanged(cmd, "{{.BackingFlag}}"){{end}}{{end}} {
+	if len(args) == 0 && !bodySupplied{{range $c.Args}}{{range .SatisfiedBy}} && !flagutil.FlagChanged(cmd, "{{.}}"){{end}}{{end}}{{range $c.Flags}} && !flagutil.FlagChanged(cmd, "{{.Name}}"){{end}} {
 		{{- addImport "internal/output" true}}
 		{{- $missingMessage := "missing required input"}}
 		{{- $foundMissing := false}}
@@ -412,19 +374,10 @@ func runIntent{{$c.FuncName}}Cmd(cmd *cobra.Command, args []string) error {
 		{{- end}}
 		{{- range $c.Args}}
 		{{- if and .Required (not .PresetCovered)}}
-		if len(args) == 0{{if .BackingFlag}} && !flagutil.FlagChanged(cmd, "{{.BackingFlag}}"){{end}} {
+		if len(args) == 0 {
 			return flagutil.WithCLIValidation(fmt.Errorf("missing required argument (or pass a full request with --{{$c.BodyFlag}})"))
 		}
-		{{- if .BackingFlag}}
-		// An explicitly empty backing-flag value must not stand in for the
-		// required positional — nor override a supplied one at the request
-		// layer — and bypass required-string validation.
-		if flagutil.FlagChanged(cmd, "{{.BackingFlag}}") {
-			if v, _ := flagutil.GetStringFlag(cmd, "{{.BackingFlag}}"); v == "" {
-				return flagutil.WithCLIValidation(fmt.Errorf("--{{.BackingFlag}} must not be empty"))
-			}
-		}
-		{{- end}}
+
 		{{- end}}
 		if len(args) > 0 {
 			body["{{escapeGoString .Key}}"] = strings.Join(args, " ")
@@ -432,7 +385,7 @@ func runIntent{{$c.FuncName}}Cmd(cmd *cobra.Command, args []string) error {
 		{{- end}}
 		{{- range $c.Flags}}
 		{{- if and .Required (not .PresetCovered)}}
-		if !flagutil.FlagChanged(cmd, "{{.Name}}"){{if .BackingFlag}} && !flagutil.FlagChanged(cmd, "{{.BackingFlag}}"){{end}} {
+		if !flagutil.FlagChanged(cmd, "{{.Name}}") {
 			return flagutil.WithCLIValidation(fmt.Errorf("required flag --{{.Name}} not set (or pass a full request with --{{$c.BodyFlag}})"))
 		}
 		{{- end}}
@@ -444,13 +397,7 @@ func runIntent{{$c.FuncName}}Cmd(cmd *cobra.Command, args []string) error {
 				return flagutil.WithCLIValidation(fmt.Errorf("--{{.Name}} must not be empty"))
 			}
 		}
-		{{- if .BackingFlag}}
-		if flagutil.FlagChanged(cmd, "{{.BackingFlag}}") {
-			if v, _ := flagutil.GetStringFlag(cmd, "{{.BackingFlag}}"); v == "" {
-				return flagutil.WithCLIValidation(fmt.Errorf("--{{.BackingFlag}} must not be empty"))
-			}
-		}
-		{{- end}}
+
 		{{- end}}
 		if flagutil.FlagChanged(cmd, "{{.Name}}") {
 			{{- if eq .Type "bool"}}
diff --git a/templates/templates/cli/intenthint_test.go.stmpl b/templates/templates/cli/intenthint_test.go.stmpl
index 258441ad..4e106f6c 100644
--- a/templates/templates/cli/intenthint_test.go.stmpl
+++ b/templates/templates/cli/intenthint_test.go.stmpl
@@ -46,24 +46,3 @@ func TestIntentSpacedBoolFlagValueHintIsSilentInMachineMode(t *testing.T) {
 	}
 }
 {{- end }}
-{{- if templateIntentEmptyBackingFlagTestEnabled }}
-
-// A whole --body plus the backing operation flag explicitly empty must be a
-// validation error, not an empty override of the body's required key.
-func TestIntentBodyWithEmptyBackingFlagIsRejected(t *testing.T) {
-	for _, tc := range []struct {
-		name        string
-		args        []string
-		backingFlag string
-	}{
-		{{templateIntentEmptyBackingFlagTestCases}}
-	} {
-		t.Run(tc.name, func(t *testing.T) {
-			h := NewCLITestHarness(t)
-			err := h.Run(tc.args)
-			require.Error(t, err)
-			assert.Contains(t, err.Error(), "--"+tc.backingFlag+" must not be empty")
-		})
-	}
-}
-{{- end }}
diff --git a/templates/templates/cli/tests/primary/intents_test.go.stmpl b/templates/templates/cli/tests/primary/intents_test.go.stmpl
index eeb7a535..eae0c680 100644
--- a/templates/templates/cli/tests/primary/intents_test.go.stmpl
+++ b/templates/templates/cli/tests/primary/intents_test.go.stmpl
@@ -370,7 +370,7 @@ func TestIntentPartialBodyKeepsPresets(t *testing.T) {
 	s := newEchoServer()
 	defer s.Close()
 
-	for _, surface := range []string{"--body", "--cli-intent-run-body"} {
+	for _, surface := range []string{"--body"} {
 		t.Run(surface, func(t *testing.T) {
 			h := NewCLITestHarness(t)
 			require.NoError(t, h.RunWithServer(s.URL, []string{"render", surface, `{"input":"cat"}`}))
@@ -403,27 +403,43 @@ func TestIntentPartialBodyUserKeysWin(t *testing.T) {
 	assert.Equal(t, "cat", body["input"])
 }
 
-func TestIntentBothBodySurfacesMerged(t *testing.T) {
+func TestIntentBodyFlagSurface(t *testing.T) {
 	recordTest("intents-both-body-surfaces-merged")
+	for _, surface := range []string{"--help", "--usage"} {
+		h := NewCLITestHarness(t)
+		require.NoError(t, h.RunBare([]string{"render", surface}))
+		assert.Contains(t, h.GetStdout(), "--body")
+		assert.Contains(t, h.GetStdout(), "--model")
+		assert.NotContains(t, h.GetStdout(), "cli-intent-run-body")
+		assert.NotContains(t, h.GetStdout(), "replaces intent arguments")
+
+		h = NewCLITestHarness(t)
+		require.NoError(t, h.RunBare([]string{"upload", surface}))
+		assert.Contains(t, h.GetStdout(), "--file")
+		assert.NotContains(t, h.GetStdout(), "--body")
+
+		h = NewCLITestHarness(t)
+		require.NoError(t, h.RunBare([]string{"model-job", surface}))
+		assert.Contains(t, h.GetStdout(), "--variant-id")
+		assert.NotContains(t, h.GetStdout(), "--discriminated-variant-body")
+	}
+
+	for _, flag := range []string{"--cli-intent-run-body", "-b"} {
+		h := NewCLITestHarness(t)
+		err := h.RunBare([]string{"render", flag, `{}`})
+		require.Error(t, err)
+		assert.Contains(t, err.Error(), "unknown")
+	}
+
 	s := newEchoServer()
 	defer s.Close()
 	h := NewCLITestHarness(t)
-	// Supplying the request through both --body and the whole-body field
-	// flag is ambiguous and rejected; each surface on its own is merged with
-	// the presets.
-	err := h.RunWithServer(s.URL, []string{"render",
-		"--body", `{"input":"from-body"}`,
-		"--cli-intent-run-body", `{"input":"from-field"}`})
-	require.Error(t, err)
-	assert.Contains(t, err.Error(), "--body")
-	assert.Contains(t, err.Error(), "--cli-intent-run-body")
-
-	h = NewCLITestHarness(t)
-	require.NoError(t, h.RunWithServer(s.URL, []string{"render",
-		"--cli-intent-run-body", `{"input":"from-field"}`}))
+	require.NoError(t, h.RunWithServer(s.URL, []string{"render", "from-argument",
+		"--body", `{"output_modalities":["text"]}`, "-m", "render-2"}))
 	body := echoedJSON(t, h.GetStdout())
-	assert.Equal(t, "from-field", body["input"])
-	assert.Equal(t, "render-1", body["model"])
+	assert.Equal(t, "from-argument", body["input"])
+	assert.Equal(t, "render-2", body["model"])
+	assert.Equal(t, []interface{}{"text"}, body["output_modalities"])
 }
 
 func TestIntentForeignSelectorIsUsageError(t *testing.T) {
@@ -469,9 +485,7 @@ func TestIntentNonObjectBodyFallsThrough(t *testing.T) {
 	assert.NotContains(t, err.Error(), "presets the")
 }
 
-// TestIntentDiscriminatedPartialBody exercises the second body surface being
-// the union field flag of a mixed operation, the discriminator conflict, and
-// the discriminator fill.
+
 func TestIntentDiscriminatedPartialBody(t *testing.T) {
 	recordTest("intents-discriminated-partial-body")
 	s := newEchoServer()
@@ -479,7 +493,7 @@ func TestIntentDiscriminatedPartialBody(t *testing.T) {
 
 	h := NewCLITestHarness(t)
 	require.NoError(t, h.RunWithServer(s.URL, []string{"model-job", "--variant-id", "v1",
-		"--discriminated-variant-body", `{"input":"cat"}`}))
+		"--body", `{"input":"cat"}`}))
 	body := echoedJSON(t, h.GetStdout())
 	assert.Equal(t, "model", body["kind"])
 	assert.Equal(t, "fixed-model", body["model"])
diff --git a/templates/templates/cli/tests/primary/requestshape_additional_test.go.stmpl b/templates/templates/cli/tests/primary/requestshape_additional_test.go.stmpl
index b3571a18..04c0511e 100644
--- a/templates/templates/cli/tests/primary/requestshape_additional_test.go.stmpl
+++ b/templates/templates/cli/tests/primary/requestshape_additional_test.go.stmpl
@@ -234,28 +234,12 @@ func TestIntentPositionalMergedIntoBodyLackingKey(t *testing.T) {
 	assert.Equal(t, "m2", jsonGetString(output, "json.model"))
 }
 
-func TestIntentPositionalMergedIntoWholeBodyFlag(t *testing.T) {
+func TestIntentInheritedWholeBodyFlagIsRejected(t *testing.T) {
 	recordTest("request-shape-intent-positional-merged-into-whole-body-flag")
-	s := newEchoServer()
-	defer s.Close()
 	h := NewCLITestHarness(t)
-	// "generate" is pinned to the model variant, so a body naming the
-	// agent selector is rejected as a foreign variant; with a same-variant
-	// body the positional fills the missing input key.
-	err := h.RunWithServer(s.URL, []string{"generate", "hello",
-		"--request-body", `{"agent":"research-bot"}`,
-	})
+	err := h.RunBare([]string{"generate", "hello", "--request-body", `{"model":"m-explicit"}`})
 	require.Error(t, err)
-	assert.Contains(t, err.Error(), `"agent"`)
-
-	h = NewCLITestHarness(t)
-	err = h.RunWithServer(s.URL, []string{"generate", "hello",
-		"--request-body", `{"model":"m-explicit"}`,
-	})
-	require.NoError(t, err)
-	output := strings.TrimSpace(h.GetStdout())
-	assert.Equal(t, "hello", jsonGetString(output, "json.input"))
-	assert.Equal(t, "m-explicit", jsonGetString(output, "json.model"))
+	assert.Contains(t, err.Error(), "unknown flag: --request-body")
 }
 
 func TestIntentDeclaredFlagAndBodyBothSettingKeyRejected(t *testing.T) {
diff --git a/tests/overlays/primary/cli/overlay.yaml b/tests/overlays/primary/cli/overlay.yaml
index 406aa686..95b098f0 100644
--- a/tests/overlays/primary/cli/overlay.yaml
+++ b/tests/overlays/primary/cli/overlay.yaml
@@ -73,6 +73,10 @@ actions:
               defaultFrom: schema
               summary: Stream events as they arrive
       commands:
+        upload:
+          category: Create
+          summary: Upload a multipart file using the operation flags
+          op: requestBodyPutMultipartFile
         generate:
           category: Create
           summary: Generate a reply from a prompt
diff --git a/zSDKs/sdk-cli/.speakeasy/gen.lock b/zSDKs/sdk-cli/.speakeasy/gen.lock
index 36fbe580..f4dcc90b 100644
--- a/zSDKs/sdk-cli/.speakeasy/gen.lock
+++ b/zSDKs/sdk-cli/.speakeasy/gen.lock
@@ -116,17 +116,17 @@ trackedFiles:
   internal/cli/group/subgroup/subgroupop.go:
     last_write_checksum: sha1:9c0ee99441b98871cc0197f375abe54d212e79d1
   internal/cli/intent_enroll.go:
-    last_write_checksum: sha1:252745f1b8488cadc55b27ea848f0ca769b6d1b4
+    last_write_checksum: sha1:0244016c26778a3216ed206775dc93cc9f338cd9
   internal/cli/intent_invite.go:
-    last_write_checksum: sha1:4b1b7c8f7928fdc8dfa8207bbf4188de7ac6e509
+    last_write_checksum: sha1:a5b376e4c2216ee5eae2b00bc1585eda47566631
   internal/cli/intent_observe.go:
-    last_write_checksum: sha1:87fd17a08f82d3bae09e41e9ce20c26bdb91adc8
+    last_write_checksum: sha1:0ba220ea9b1c72b5be13a6eb8cd01b46783359bb
   internal/cli/intent_produce.go:
-    last_write_checksum: sha1:c187c073b396fa6a35d7b5a68df8c3a5579a4fbe
+    last_write_checksum: sha1:c0b552ae90de890d610a7ba3e9c460053ea5b4e5
   internal/cli/intent_render.go:
-    last_write_checksum: sha1:3c5292302ae4458ad426a011a269ddc6e066ca2b
+    last_write_checksum: sha1:e2a15348c10c96dffd27cb4a91805386b8cb2b0c
   internal/cli/intent_say.go:
-    last_write_checksum: sha1:c6e608cf6170ac7bec0b67ca3ed0b96e33b48ac4
+    last_write_checksum: sha1:6602dc09bc19950318fffb2a7897a2ad1fe161b9
   internal/cli/intents.go:
     last_write_checksum: sha1:997b951af6d215576d30574a54022937beedd890
   internal/cli/intents_order_test.go:
@@ -188,7 +188,7 @@ trackedFiles:
   internal/cli/tag1/deprecated1.go:
     last_write_checksum: sha1:d1f0f32d443ed19ab0c0d69b0a6bcce888e8839c
   internal/cli/tag1/intent_tag1-recent.go:
-    last_write_checksum: sha1:c63e43dfb33fdab87ceb5ed41d7b32531ab36354
+    last_write_checksum: sha1:74592793f72ae26ba75f9d72ca19e60a110277a1
   internal/cli/tag1/listtest1.go:
     last_write_checksum: sha1:fba0d0404efd3b49bc18ffbbcbecf822e89fe56d
   internal/cli/tag1/postfilewithencoding.go:
@@ -642,7 +642,7 @@ trackedFiles:
   internal/usage/bodyschemas.go:
     last_write_checksum: sha1:775249b69ed405ad072c16a76fe6113f375b3818
   internal/usage/schema.go:
-    last_write_checksum: sha1:9acbc11795232aa9f1ab1debc47b32783201eb4a
+    last_write_checksum: sha1:d6e80819354ac26de322645ba22c0db378ad6a22
   scripts/install.ps1:
     last_write_checksum: sha1:9dcf40ea00ecb8ceda83d5056f57235b43cf658a
   scripts/install.sh:
@@ -664,7 +664,7 @@ trackedFiles:
   tests/echo_server_test.go:
     last_write_checksum: sha1:c2325d3d67e1aeeb81e76b0df4f79eedb38e8742
   tests/intenthint_test.go:
-    last_write_checksum: sha1:0e2e5a90bd9db451792478aaada89359a5827986
+    last_write_checksum: sha1:a4157f549c7c601ec6c7e486e1f520402b9c758e
   tests/intentstream_test.go:
     last_write_checksum: sha1:e8d67c6234585b91260b8e4a8485e2da74f87d0e
   tests/mockserver/.gitignore:
diff --git a/zSDKs/sdk-cli/docs/cli_enroll.md b/zSDKs/sdk-cli/docs/cli_enroll.md
index 69188f8d..32dc2a08 100644
--- a/zSDKs/sdk-cli/docs/cli_enroll.md
+++ b/zSDKs/sdk-cli/docs/cli_enroll.md
@@ -15,20 +15,10 @@ cli enroll [flags]
 ### Options
 
 ```
-      --age float                    number value
-      --associated-ids stringArray   list of values
-      --body string                  Request body as JSON (advanced; replaces intent arguments). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.
-  -e, --email string                 [required]
-      --enrollment-email string      Email address to enroll
-  -f, --first-name string            string value
-  -g, --gender string                options: male, female, other
-  -h, --help                         help for enroll
-  -i, --id string                    string value
-  -l, --last-name string             string value
-      --metadata string              JSON object
-      --metadata-any string          A metadata object with additionalProperties true (any type) - should be flattened
-  -p, --postal-code string           string value
-      --schema                       Print the exact JSON Schema of the request body and exit
+      --body string               Request body as JSON (advanced; merges with intent inputs, rejecting duplicate keys). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.
+      --enrollment-email string   Email address to enroll
+  -h, --help                      help for enroll
+      --schema                    Print the exact JSON Schema of the request body and exit
 ```
 
 ### Options inherited from parent commands
diff --git a/zSDKs/sdk-cli/docs/cli_invite.md b/zSDKs/sdk-cli/docs/cli_invite.md
index 2aa79b0f..14d58b3d 100644
--- a/zSDKs/sdk-cli/docs/cli_invite.md
+++ b/zSDKs/sdk-cli/docs/cli_invite.md
@@ -24,21 +24,11 @@ cli invite [email] [flags]
 ### Options
 
 ```
-      --age float                    number value
-      --associated-ids stringArray   list of values
-      --body string                  Request body as JSON (advanced; replaces intent arguments). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.
-  -e, --email string                 [required]
-  -f, --first-name string            string value
-  -g, --gender string                options: male, female, other
-      --given-name string            First name to record
-  -h, --help                         help for invite
-  -i, --id string                    string value
-  -l, --last-name string             string value
-      --metadata string              JSON object
-      --metadata-any string          A metadata object with additionalProperties true (any type) - should be flattened
-  -p, --postal-code string           string value
-      --schema                       Print the exact JSON Schema of the request body and exit
-      --user-gender string           Gender to record (e.g. male, female, other)
+      --body string          Request body as JSON (advanced; merges with intent inputs, rejecting duplicate keys). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.
+      --given-name string    First name to record
+  -h, --help                 help for invite
+      --schema               Print the exact JSON Schema of the request body and exit
+      --user-gender string   Gender to record (e.g. male, female, other)
 ```
 
 ### Options inherited from parent commands
diff --git a/zSDKs/sdk-cli/docs/cli_observe.md b/zSDKs/sdk-cli/docs/cli_observe.md
index d03ba7ce..06f6f112 100644
--- a/zSDKs/sdk-cli/docs/cli_observe.md
+++ b/zSDKs/sdk-cli/docs/cli_observe.md
@@ -20,14 +20,12 @@ cli observe [prompt] [flags]
 ### Options
 
 ```
-      --async                           Return the operation handle without waiting for a terminal response
-      --body string                     Request body as JSON (advanced; replaces intent arguments). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.
-  -h, --help                            help for observe
-      --output-modalities stringArray   options: text, image
-      --poll-interval string            Override the initial polling interval (positive Go duration, for example 500ms or 2s)
-      --poll-timeout string             Override the overall polling deadline (positive Go duration, at least the effective poll interval)
-  -p, --prompt string                   [required]
-      --schema                          Print the exact JSON Schema of the request body and exit
+      --async                  Return the operation handle without waiting for a terminal response
+      --body string            Request body as JSON (advanced; merges with intent inputs, rejecting duplicate keys). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.
+  -h, --help                   help for observe
+      --poll-interval string   Override the initial polling interval (positive Go duration, for example 500ms or 2s)
+      --poll-timeout string    Override the overall polling deadline (positive Go duration, at least the effective poll interval)
+      --schema                 Print the exact JSON Schema of the request body and exit
 ```
 
 ### Options inherited from parent commands
diff --git a/zSDKs/sdk-cli/docs/cli_produce.md b/zSDKs/sdk-cli/docs/cli_produce.md
index e28a0f42..a4dbf3c4 100644
--- a/zSDKs/sdk-cli/docs/cli_produce.md
+++ b/zSDKs/sdk-cli/docs/cli_produce.md
@@ -23,16 +23,14 @@ cli produce [prompt] [flags]
 ### Options
 
 ```
-      --async                           Return the operation handle without waiting for a terminal response
-      --body string                     Request body as JSON (advanced; replaces intent arguments). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.
-  -h, --help                            help for produce
-      --out string                      Write the image to this file (or into this directory). Default: ./produce-{timestamp}-{rand}.{ext}
-      --output-modalities stringArray   options: text, image
-      --poll-interval string            Override the initial polling interval (positive Go duration, for example 500ms or 2s)
-      --poll-timeout string             Override the overall polling deadline (positive Go duration, at least the effective poll interval)
-  -p, --prompt string                   [required]
-      --raw-response                    Print the raw API response instead of writing the image to a file
-      --schema                          Print the exact JSON Schema of the request body and exit
+      --async                  Return the operation handle without waiting for a terminal response
+      --body string            Request body as JSON (advanced; merges with intent inputs, rejecting duplicate keys). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.
+  -h, --help                   help for produce
+      --out string             Write the image to this file (or into this directory). Default: ./produce-{timestamp}-{rand}.{ext}
+      --poll-interval string   Override the initial polling interval (positive Go duration, for example 500ms or 2s)
+      --poll-timeout string    Override the overall polling deadline (positive Go duration, at least the effective poll interval)
+      --raw-response           Print the raw API response instead of writing the image to a file
+      --schema                 Print the exact JSON Schema of the request body and exit
 ```
 
 ### Options inherited from parent commands
diff --git a/zSDKs/sdk-cli/docs/cli_render.md b/zSDKs/sdk-cli/docs/cli_render.md
index 7b04d9c5..8355e655 100644
--- a/zSDKs/sdk-cli/docs/cli_render.md
+++ b/zSDKs/sdk-cli/docs/cli_render.md
@@ -23,13 +23,11 @@ cli render [prompt] [flags]
 ### Options
 
 ```
-      --body string                     Request body as JSON (advanced; replaces intent arguments). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.
-  -h, --help                            help for render
-      --out string                      Write the image to this file (or into this directory). Default: ./render-{timestamp}-{rand}.{ext}
-      --output-modalities stringArray   options: text, image
-  -p, --prompt string                   [required]
-      --raw-response                    Print the raw API response instead of writing the image to a file
-      --schema                          Print the exact JSON Schema of the request body and exit
+      --body string    Request body as JSON (advanced; merges with intent inputs, rejecting duplicate keys). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.
+  -h, --help           help for render
+      --out string     Write the image to this file (or into this directory). Default: ./render-{timestamp}-{rand}.{ext}
+      --raw-response   Print the raw API response instead of writing the image to a file
+      --schema         Print the exact JSON Schema of the request body and exit
 ```
 
 ### Options inherited from parent commands
diff --git a/zSDKs/sdk-cli/docs/cli_say.md b/zSDKs/sdk-cli/docs/cli_say.md
index 7f31c4ae..c88aeab0 100644
--- a/zSDKs/sdk-cli/docs/cli_say.md
+++ b/zSDKs/sdk-cli/docs/cli_say.md
@@ -24,7 +24,7 @@ cli say [prompt] [flags]
 
 ```
   -h, --help             help for say
-      --request string   Request body as JSON (advanced; replaces intent arguments). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.
+      --request string   Request body as JSON (advanced; merges with intent inputs, rejecting duplicate keys). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.
       --schema           Print the exact JSON Schema of the request body and exit
       --stream           Stream events as they arrive (default: true)
 ```
diff --git a/zSDKs/sdk-cli/internal/cli/intent_enroll.go b/zSDKs/sdk-cli/internal/cli/intent_enroll.go
index 7ea83cae..c44afeea 100644
--- a/zSDKs/sdk-cli/internal/cli/intent_enroll.go
+++ b/zSDKs/sdk-cli/internal/cli/intent_enroll.go
@@ -24,14 +24,11 @@ func InitIntentEnroll(parent *cobra.Command) error {
 			"speakeasy_strict_body_keys":     "true",
 		},
 	}
-	flagutil.RegisterFlags(cmd, createUserCmdMeta)
-	flagutil.SetMetaPromptOptional(cmd, createUserCmdMeta, false)
-	flagutil.ClearBodyRequirements(cmd, createUserCmdMeta, "")
-	cmd.Flags().String("body", "", "Request body as JSON (advanced; replaces intent arguments). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.")
+	intentMeta := flagutil.NonBodyMeta(createUserCmdMeta, "")
+	flagutil.RegisterFlags(cmd, intentMeta)
+	flagutil.SetMetaPromptOptional(cmd, intentMeta, false)
+	cmd.Flags().String("body", "", "Request body as JSON (advanced; merges with intent inputs, rejecting duplicate keys). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.")
 	_ = flagutil.AnnotatePromptFlag(cmd, "body", flagutil.PromptFlagSpec{Kind: "json", BodyFlag: true})
-	if err := flagutil.AnnotateBodyFields(cmd, createUserCmdMeta, "", "body"); err != nil {
-		return fmt.Errorf("annotate body fields for intent enroll: %w", err)
-	}
 	cmd.Flags().Bool("schema", false, "Print the exact JSON Schema of the request body and exit")
 	_ = flagutil.AnnotatePromptFlag(cmd, "schema", flagutil.PromptFlagSpec{Kind: "bool", DocSurface: true})
 	cmd.Flags().StringP("enrollment-email", "", "", "Email address to enroll")
@@ -39,9 +36,8 @@ func InitIntentEnroll(parent *cobra.Command) error {
 		Required: true,
 		Kind:     "string",
 		Order:    0,
-		// A supplied whole body carries this flag's bound key (and the
-		// backing operation flag supplies it directly): no prompt then.
-		BodySources: []string{"email", "body"},
+
+		BodySources: []string{"body"},
 	})
 	for _, sibling := range parent.Commands() {
 		if sibling.Name() == cmd.Name() || sibling.HasAlias(cmd.Name()) {
@@ -68,6 +64,7 @@ func runIntentEnrollCmd(cmd *cobra.Command, args []string) error {
 		}
 	}
 	suppliedBodyFlag := ""
+
 	if flagutil.FlagChanged(cmd, "body") {
 		suppliedBodyFlag = "body"
 	}
@@ -80,11 +77,6 @@ func runIntentEnrollCmd(cmd *cobra.Command, args []string) error {
 		bodySupplied = attached
 	}
 	if bodySupplied {
-		if flagutil.FlagChanged(cmd, "email") {
-			if v, _ := flagutil.GetStringFlag(cmd, "email"); v == "" {
-				return flagutil.WithCLIValidation(fmt.Errorf("--email must not be empty"))
-			}
-		}
 		if flagutil.FlagChanged(cmd, "enrollment-email") {
 			v, _ := flagutil.GetStringFlag(cmd, "enrollment-email")
 			if v == "" {
@@ -95,12 +87,12 @@ func runIntentEnrollCmd(cmd *cobra.Command, args []string) error {
 			}
 		}
 	}
-	if len(args) == 0 && !bodySupplied && !flagutil.FlagChanged(cmd, "enrollment-email") && !flagutil.FlagChanged(cmd, "email") {
+	if len(args) == 0 && !bodySupplied && !flagutil.FlagChanged(cmd, "enrollment-email") {
 		return output.UsageHelpError(cmd, fmt.Errorf("%s", "required flag --enrollment-email not set (or pass a full request with --body)"))
 	}
 	if !bodySupplied {
 		body := map[string]any{}
-		if !flagutil.FlagChanged(cmd, "enrollment-email") && !flagutil.FlagChanged(cmd, "email") {
+		if !flagutil.FlagChanged(cmd, "enrollment-email") {
 			return flagutil.WithCLIValidation(fmt.Errorf("required flag --enrollment-email not set (or pass a full request with --body)"))
 		}
 		// An explicitly empty required input must not synthesize a body that
@@ -110,11 +102,6 @@ func runIntentEnrollCmd(cmd *cobra.Command, args []string) error {
 				return flagutil.WithCLIValidation(fmt.Errorf("--enrollment-email must not be empty"))
 			}
 		}
-		if flagutil.FlagChanged(cmd, "email") {
-			if v, _ := flagutil.GetStringFlag(cmd, "email"); v == "" {
-				return flagutil.WithCLIValidation(fmt.Errorf("--email must not be empty"))
-			}
-		}
 		if flagutil.FlagChanged(cmd, "enrollment-email") {
 			v, _ := flagutil.GetStringFlag(cmd, "enrollment-email")
 			body["email"] = v
diff --git a/zSDKs/sdk-cli/internal/cli/intent_invite.go b/zSDKs/sdk-cli/internal/cli/intent_invite.go
index 776f1153..a358eb5a 100644
--- a/zSDKs/sdk-cli/internal/cli/intent_invite.go
+++ b/zSDKs/sdk-cli/internal/cli/intent_invite.go
@@ -29,15 +29,11 @@ func InitIntentInvite(parent *cobra.Command) error {
 			"speakeasy_command_hints":        "{\"CLI_VALIDATION\":[\"Print the exact request schema with --schema\"]}",
 		},
 	}
-	flagutil.RegisterFlags(cmd, createUserCmdMeta)
-	flagutil.SetMetaPromptOptional(cmd, createUserCmdMeta, false)
-	flagutil.ClearBodyRequirements(cmd, createUserCmdMeta, "")
-	_ = flagutil.OverridePromptRequirement(cmd, "email", false, false)
-	cmd.Flags().String("body", "", "Request body as JSON (advanced; replaces intent arguments). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.")
+	intentMeta := flagutil.NonBodyMeta(createUserCmdMeta, "")
+	flagutil.RegisterFlags(cmd, intentMeta)
+	flagutil.SetMetaPromptOptional(cmd, intentMeta, false)
+	cmd.Flags().String("body", "", "Request body as JSON (advanced; merges with intent inputs, rejecting duplicate keys). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.")
 	_ = flagutil.AnnotatePromptFlag(cmd, "body", flagutil.PromptFlagSpec{Kind: "json", BodyFlag: true})
-	if err := flagutil.AnnotateBodyFields(cmd, createUserCmdMeta, "", "body"); err != nil {
-		return fmt.Errorf("annotate body fields for intent invite: %w", err)
-	}
 	cmd.Flags().Bool("schema", false, "Print the exact JSON Schema of the request body and exit")
 	_ = flagutil.AnnotatePromptFlag(cmd, "schema", flagutil.PromptFlagSpec{Kind: "bool", DocSurface: true})
 	cmd.Flags().StringP("given-name", "", "", "First name to record")
@@ -45,25 +41,23 @@ func InitIntentInvite(parent *cobra.Command) error {
 		Required: false,
 		Kind:     "string",
 		Order:    0,
-		// A supplied whole body carries this flag's bound key (and the
-		// backing operation flag supplies it directly): no prompt then.
-		BodySources: []string{"first-name", "body"},
+
+		BodySources: []string{"body"},
 	})
 	cmd.Flags().StringP("user-gender", "", "", "Gender to record (e.g. male, female, other)")
 	_ = flagutil.AnnotatePromptFlag(cmd, "user-gender", flagutil.PromptFlagSpec{
 		Required: false,
 		Kind:     "string",
 		Order:    1,
-		// A supplied whole body carries this flag's bound key (and the
-		// backing operation flag supplies it directly): no prompt then.
-		BodySources: []string{"gender", "body"},
+
+		BodySources: []string{"body"},
 	})
 	if err := interactive.Declare(cmd, interactive.CommandSpec{Args: []interactive.ArgSpec{
 		{
 			Name: "email", Summary: "Email address to invite",
 			Required: true, Variadic: true,
 			BodyKey:     "email",
-			SatisfiedBy: []string{"email", "body"},
+			SatisfiedBy: []string{"body"},
 		},
 	}}); err != nil {
 		return fmt.Errorf("declare interactive arguments for intent invite: %w", err)
@@ -99,6 +93,7 @@ func runIntentInviteCmd(cmd *cobra.Command, args []string) error {
 		}
 	}
 	suppliedBodyFlag := ""
+
 	if flagutil.FlagChanged(cmd, "body") {
 		suppliedBodyFlag = "body"
 	}
@@ -114,11 +109,6 @@ func runIntentInviteCmd(cmd *cobra.Command, args []string) error {
 		fmt.Fprintln(cmd.ErrOrStderr(), hint)
 	}
 	if bodySupplied {
-		if flagutil.FlagChanged(cmd, "email") {
-			if v, _ := flagutil.GetStringFlag(cmd, "email"); v == "" {
-				return flagutil.WithCLIValidation(fmt.Errorf("--email must not be empty"))
-			}
-		}
 		if len(args) > 0 {
 			if err := flagutil.MergeInputIntoBody(cmd, suppliedBodyFlag, "email", "the <email> argument", strings.Join(args, " ")); err != nil {
 				return flagutil.WithCLIValidation(err)
@@ -137,7 +127,7 @@ func runIntentInviteCmd(cmd *cobra.Command, args []string) error {
 			}
 		}
 	}
-	if len(args) == 0 && !bodySupplied && !flagutil.FlagChanged(cmd, "email") && !flagutil.FlagChanged(cmd, "body") && !flagutil.FlagChanged(cmd, "given-name") && !flagutil.FlagChanged(cmd, "first-name") && !flagutil.FlagChanged(cmd, "user-gender") && !flagutil.FlagChanged(cmd, "gender") {
+	if len(args) == 0 && !bodySupplied && !flagutil.FlagChanged(cmd, "body") && !flagutil.FlagChanged(cmd, "given-name") && !flagutil.FlagChanged(cmd, "user-gender") {
 		return output.UsageHelpError(cmd, fmt.Errorf("%s", "missing required argument <email> (or pass a full request with --body)"))
 	}
 	if !bodySupplied {
@@ -145,17 +135,9 @@ func runIntentInviteCmd(cmd *cobra.Command, args []string) error {
 		if err := json.Unmarshal([]byte(intentInvitePreset.Preset), &body); err != nil {
 			return err
 		}
-		if len(args) == 0 && !flagutil.FlagChanged(cmd, "email") {
+		if len(args) == 0 {
 			return flagutil.WithCLIValidation(fmt.Errorf("missing required argument (or pass a full request with --body)"))
 		}
-		// An explicitly empty backing-flag value must not stand in for the
-		// required positional — nor override a supplied one at the request
-		// layer — and bypass required-string validation.
-		if flagutil.FlagChanged(cmd, "email") {
-			if v, _ := flagutil.GetStringFlag(cmd, "email"); v == "" {
-				return flagutil.WithCLIValidation(fmt.Errorf("--email must not be empty"))
-			}
-		}
 		if len(args) > 0 {
 			body["email"] = strings.Join(args, " ")
 		}
diff --git a/zSDKs/sdk-cli/internal/cli/intent_observe.go b/zSDKs/sdk-cli/internal/cli/intent_observe.go
index 7b5c5d52..d1f58040 100644
--- a/zSDKs/sdk-cli/internal/cli/intent_observe.go
+++ b/zSDKs/sdk-cli/internal/cli/intent_observe.go
@@ -32,15 +32,11 @@ func InitIntentObserve(parent *cobra.Command) error {
 			"speakeasy_async":                "{\"idPointer\":\"/id\",\"statePointer\":\"/status\",\"states\":{\"completed\":\"success\",\"failed\":\"failure\",\"in_progress\":\"pending\",\"requires_action\":\"handoff\"},\"interval\":\"20ms\",\"backoff\":1.5,\"maxInterval\":\"60ms\",\"timeout\":\"5s\",\"command\":\"observe\",\"resume\":\"cli get-asset --id\",\"parameterIn\":\"path\",\"parameterName\":\"id\",\"params\":[{\"in\":\"query\",\"name\":\"stream\",\"value\":false}]}",
 		},
 	}
-	flagutil.RegisterFlags(cmd, renderAssetCmdMeta)
-	flagutil.SetMetaPromptOptional(cmd, renderAssetCmdMeta, false)
-	flagutil.ClearBodyRequirements(cmd, renderAssetCmdMeta, "")
-	_ = flagutil.OverridePromptRequirement(cmd, "prompt", false, false)
-	cmd.Flags().String("body", "", "Request body as JSON (advanced; replaces intent arguments). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.")
+	intentMeta := flagutil.NonBodyMeta(renderAssetCmdMeta, "")
+	flagutil.RegisterFlags(cmd, intentMeta)
+	flagutil.SetMetaPromptOptional(cmd, intentMeta, false)
+	cmd.Flags().String("body", "", "Request body as JSON (advanced; merges with intent inputs, rejecting duplicate keys). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.")
 	_ = flagutil.AnnotatePromptFlag(cmd, "body", flagutil.PromptFlagSpec{Kind: "json", BodyFlag: true})
-	if err := flagutil.AnnotateBodyFields(cmd, renderAssetCmdMeta, "", "body"); err != nil {
-		return fmt.Errorf("annotate body fields for intent observe: %w", err)
-	}
 	cmd.Flags().Bool("schema", false, "Print the exact JSON Schema of the request body and exit")
 	_ = flagutil.AnnotatePromptFlag(cmd, "schema", flagutil.PromptFlagSpec{Kind: "bool", DocSurface: true})
 	if err := interactive.Declare(cmd, interactive.CommandSpec{Args: []interactive.ArgSpec{
@@ -48,7 +44,7 @@ func InitIntentObserve(parent *cobra.Command) error {
 			Name: "prompt", Summary: "Text prompt to render",
 			Required: true, Variadic: true,
 			BodyKey:     "prompt",
-			SatisfiedBy: []string{"prompt", "body"},
+			SatisfiedBy: []string{"body"},
 		},
 	}}); err != nil {
 		return fmt.Errorf("declare interactive arguments for intent observe: %w", err)
@@ -90,6 +86,7 @@ func runIntentObserveCmd(cmd *cobra.Command, args []string) error {
 		}
 	}
 	suppliedBodyFlag := ""
+
 	if flagutil.FlagChanged(cmd, "body") {
 		suppliedBodyFlag = "body"
 	}
@@ -105,18 +102,13 @@ func runIntentObserveCmd(cmd *cobra.Command, args []string) error {
 		fmt.Fprintln(cmd.ErrOrStderr(), hint)
 	}
 	if bodySupplied {
-		if flagutil.FlagChanged(cmd, "prompt") {
-			if v, _ := flagutil.GetStringFlag(cmd, "prompt"); v == "" {
-				return flagutil.WithCLIValidation(fmt.Errorf("--prompt must not be empty"))
-			}
-		}
 		if len(args) > 0 {
 			if err := flagutil.MergeInputIntoBody(cmd, suppliedBodyFlag, "prompt", "the <prompt> argument", strings.Join(args, " ")); err != nil {
 				return flagutil.WithCLIValidation(err)
 			}
 		}
 	}
-	if len(args) == 0 && !bodySupplied && !flagutil.FlagChanged(cmd, "prompt") && !flagutil.FlagChanged(cmd, "body") {
+	if len(args) == 0 && !bodySupplied && !flagutil.FlagChanged(cmd, "body") {
 		return output.UsageHelpError(cmd, fmt.Errorf("%s", "missing required argument <prompt> (or pass a full request with --body)"))
 	}
 	if !bodySupplied {
@@ -124,17 +116,9 @@ func runIntentObserveCmd(cmd *cobra.Command, args []string) error {
 		if err := json.Unmarshal([]byte(intentObservePreset.Preset), &body); err != nil {
 			return err
 		}
-		if len(args) == 0 && !flagutil.FlagChanged(cmd, "prompt") {
+		if len(args) == 0 {
 			return flagutil.WithCLIValidation(fmt.Errorf("missing required argument (or pass a full request with --body)"))
 		}
-		// An explicitly empty backing-flag value must not stand in for the
-		// required positional — nor override a supplied one at the request
-		// layer — and bypass required-string validation.
-		if flagutil.FlagChanged(cmd, "prompt") {
-			if v, _ := flagutil.GetStringFlag(cmd, "prompt"); v == "" {
-				return flagutil.WithCLIValidation(fmt.Errorf("--prompt must not be empty"))
-			}
-		}
 		if len(args) > 0 {
 			body["prompt"] = strings.Join(args, " ")
 		}
diff --git a/zSDKs/sdk-cli/internal/cli/intent_produce.go b/zSDKs/sdk-cli/internal/cli/intent_produce.go
index 6ea0aba1..8648dedb 100644
--- a/zSDKs/sdk-cli/internal/cli/intent_produce.go
+++ b/zSDKs/sdk-cli/internal/cli/intent_produce.go
@@ -34,15 +34,11 @@ func InitIntentProduce(parent *cobra.Command) error {
 			"speakeasy_async":                "{\"idPointer\":\"/id\",\"statePointer\":\"/status\",\"states\":{\"completed\":\"success\",\"failed\":\"failure\",\"in_progress\":\"pending\",\"requires_action\":\"handoff\"},\"interval\":\"20ms\",\"backoff\":1.5,\"maxInterval\":\"60ms\",\"timeout\":\"5s\",\"command\":\"produce\",\"resume\":\"cli get-asset --id\",\"parameterIn\":\"path\",\"parameterName\":\"id\",\"params\":[{\"in\":\"query\",\"name\":\"stream\",\"value\":false}]}",
 		},
 	}
-	flagutil.RegisterFlags(cmd, renderAssetCmdMeta)
-	flagutil.SetMetaPromptOptional(cmd, renderAssetCmdMeta, false)
-	flagutil.ClearBodyRequirements(cmd, renderAssetCmdMeta, "")
-	_ = flagutil.OverridePromptRequirement(cmd, "prompt", false, false)
-	cmd.Flags().String("body", "", "Request body as JSON (advanced; replaces intent arguments). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.")
+	intentMeta := flagutil.NonBodyMeta(renderAssetCmdMeta, "")
+	flagutil.RegisterFlags(cmd, intentMeta)
+	flagutil.SetMetaPromptOptional(cmd, intentMeta, false)
+	cmd.Flags().String("body", "", "Request body as JSON (advanced; merges with intent inputs, rejecting duplicate keys). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.")
 	_ = flagutil.AnnotatePromptFlag(cmd, "body", flagutil.PromptFlagSpec{Kind: "json", BodyFlag: true})
-	if err := flagutil.AnnotateBodyFields(cmd, renderAssetCmdMeta, "", "body"); err != nil {
-		return fmt.Errorf("annotate body fields for intent produce: %w", err)
-	}
 	cmd.Flags().Bool("schema", false, "Print the exact JSON Schema of the request body and exit")
 	_ = flagutil.AnnotatePromptFlag(cmd, "schema", flagutil.PromptFlagSpec{Kind: "bool", DocSurface: true})
 	if err := interactive.Declare(cmd, interactive.CommandSpec{Args: []interactive.ArgSpec{
@@ -50,7 +46,7 @@ func InitIntentProduce(parent *cobra.Command) error {
 			Name: "prompt", Summary: "Text prompt to render",
 			Required: true, Variadic: true,
 			BodyKey:     "prompt",
-			SatisfiedBy: []string{"prompt", "body"},
+			SatisfiedBy: []string{"body"},
 		},
 	}}); err != nil {
 		return fmt.Errorf("declare interactive arguments for intent produce: %w", err)
@@ -102,6 +98,7 @@ func runIntentProduceCmd(cmd *cobra.Command, args []string) error {
 		}
 	}
 	suppliedBodyFlag := ""
+
 	if flagutil.FlagChanged(cmd, "body") {
 		suppliedBodyFlag = "body"
 	}
@@ -117,18 +114,13 @@ func runIntentProduceCmd(cmd *cobra.Command, args []string) error {
 		fmt.Fprintln(cmd.ErrOrStderr(), hint)
 	}
 	if bodySupplied {
-		if flagutil.FlagChanged(cmd, "prompt") {
-			if v, _ := flagutil.GetStringFlag(cmd, "prompt"); v == "" {
-				return flagutil.WithCLIValidation(fmt.Errorf("--prompt must not be empty"))
-			}
-		}
 		if len(args) > 0 {
 			if err := flagutil.MergeInputIntoBody(cmd, suppliedBodyFlag, "prompt", "the <prompt> argument", strings.Join(args, " ")); err != nil {
 				return flagutil.WithCLIValidation(err)
 			}
 		}
 	}
-	if len(args) == 0 && !bodySupplied && !flagutil.FlagChanged(cmd, "prompt") && !flagutil.FlagChanged(cmd, "body") {
+	if len(args) == 0 && !bodySupplied && !flagutil.FlagChanged(cmd, "body") {
 		return output.UsageHelpError(cmd, fmt.Errorf("%s", "missing required argument <prompt> (or pass a full request with --body)"))
 	}
 	if !bodySupplied {
@@ -136,17 +128,9 @@ func runIntentProduceCmd(cmd *cobra.Command, args []string) error {
 		if err := json.Unmarshal([]byte(intentProducePreset.Preset), &body); err != nil {
 			return err
 		}
-		if len(args) == 0 && !flagutil.FlagChanged(cmd, "prompt") {
+		if len(args) == 0 {
 			return flagutil.WithCLIValidation(fmt.Errorf("missing required argument (or pass a full request with --body)"))
 		}
-		// An explicitly empty backing-flag value must not stand in for the
-		// required positional — nor override a supplied one at the request
-		// layer — and bypass required-string validation.
-		if flagutil.FlagChanged(cmd, "prompt") {
-			if v, _ := flagutil.GetStringFlag(cmd, "prompt"); v == "" {
-				return flagutil.WithCLIValidation(fmt.Errorf("--prompt must not be empty"))
-			}
-		}
 		if len(args) > 0 {
 			body["prompt"] = strings.Join(args, " ")
 		}
diff --git a/zSDKs/sdk-cli/internal/cli/intent_render.go b/zSDKs/sdk-cli/internal/cli/intent_render.go
index 098dcbaa..3b3c32cd 100644
--- a/zSDKs/sdk-cli/internal/cli/intent_render.go
+++ b/zSDKs/sdk-cli/internal/cli/intent_render.go
@@ -29,15 +29,11 @@ func InitIntentRender(parent *cobra.Command) error {
 			"speakeasy_artifact":             "{\"pointer\":[{\"field\":\"steps\"},{\"wild\":true},{\"field\":\"content\"},{\"wild\":true}],\"kind\":\"image\",\"defaultPath\":\"render-{timestamp}-{rand}.{ext}\"}",
 		},
 	}
-	flagutil.RegisterFlags(cmd, renderAssetCmdMeta)
-	flagutil.SetMetaPromptOptional(cmd, renderAssetCmdMeta, false)
-	flagutil.ClearBodyRequirements(cmd, renderAssetCmdMeta, "")
-	_ = flagutil.OverridePromptRequirement(cmd, "prompt", false, false)
-	cmd.Flags().String("body", "", "Request body as JSON (advanced; replaces intent arguments). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.")
+	intentMeta := flagutil.NonBodyMeta(renderAssetCmdMeta, "")
+	flagutil.RegisterFlags(cmd, intentMeta)
+	flagutil.SetMetaPromptOptional(cmd, intentMeta, false)
+	cmd.Flags().String("body", "", "Request body as JSON (advanced; merges with intent inputs, rejecting duplicate keys). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.")
 	_ = flagutil.AnnotatePromptFlag(cmd, "body", flagutil.PromptFlagSpec{Kind: "json", BodyFlag: true})
-	if err := flagutil.AnnotateBodyFields(cmd, renderAssetCmdMeta, "", "body"); err != nil {
-		return fmt.Errorf("annotate body fields for intent render: %w", err)
-	}
 	cmd.Flags().Bool("schema", false, "Print the exact JSON Schema of the request body and exit")
 	_ = flagutil.AnnotatePromptFlag(cmd, "schema", flagutil.PromptFlagSpec{Kind: "bool", DocSurface: true})
 	if err := interactive.Declare(cmd, interactive.CommandSpec{Args: []interactive.ArgSpec{
@@ -45,7 +41,7 @@ func InitIntentRender(parent *cobra.Command) error {
 			Name: "prompt", Summary: "Text prompt to render",
 			Required: true, Variadic: true,
 			BodyKey:     "prompt",
-			SatisfiedBy: []string{"prompt", "body"},
+			SatisfiedBy: []string{"body"},
 		},
 	}}); err != nil {
 		return fmt.Errorf("declare interactive arguments for intent render: %w", err)
@@ -91,6 +87,7 @@ func runIntentRenderCmd(cmd *cobra.Command, args []string) error {
 		}
 	}
 	suppliedBodyFlag := ""
+
 	if flagutil.FlagChanged(cmd, "body") {
 		suppliedBodyFlag = "body"
 	}
@@ -106,18 +103,13 @@ func runIntentRenderCmd(cmd *cobra.Command, args []string) error {
 		fmt.Fprintln(cmd.ErrOrStderr(), hint)
 	}
 	if bodySupplied {
-		if flagutil.FlagChanged(cmd, "prompt") {
-			if v, _ := flagutil.GetStringFlag(cmd, "prompt"); v == "" {
-				return flagutil.WithCLIValidation(fmt.Errorf("--prompt must not be empty"))
-			}
-		}
 		if len(args) > 0 {
 			if err := flagutil.MergeInputIntoBody(cmd, suppliedBodyFlag, "prompt", "the <prompt> argument", strings.Join(args, " ")); err != nil {
 				return flagutil.WithCLIValidation(err)
 			}
 		}
 	}
-	if len(args) == 0 && !bodySupplied && !flagutil.FlagChanged(cmd, "prompt") && !flagutil.FlagChanged(cmd, "body") {
+	if len(args) == 0 && !bodySupplied && !flagutil.FlagChanged(cmd, "body") {
 		return output.UsageHelpError(cmd, fmt.Errorf("%s", "missing required argument <prompt> (or pass a full request with --body)"))
 	}
 	if !bodySupplied {
@@ -125,17 +117,9 @@ func runIntentRenderCmd(cmd *cobra.Command, args []string) error {
 		if err := json.Unmarshal([]byte(intentRenderPreset.Preset), &body); err != nil {
 			return err
 		}
-		if len(args) == 0 && !flagutil.FlagChanged(cmd, "prompt") {
+		if len(args) == 0 {
 			return flagutil.WithCLIValidation(fmt.Errorf("missing required argument (or pass a full request with --body)"))
 		}
-		// An explicitly empty backing-flag value must not stand in for the
-		// required positional — nor override a supplied one at the request
-		// layer — and bypass required-string validation.
-		if flagutil.FlagChanged(cmd, "prompt") {
-			if v, _ := flagutil.GetStringFlag(cmd, "prompt"); v == "" {
-				return flagutil.WithCLIValidation(fmt.Errorf("--prompt must not be empty"))
-			}
-		}
 		if len(args) > 0 {
 			body["prompt"] = strings.Join(args, " ")
 		}
diff --git a/zSDKs/sdk-cli/internal/cli/intent_say.go b/zSDKs/sdk-cli/internal/cli/intent_say.go
index 71b54717..aa673026 100644
--- a/zSDKs/sdk-cli/internal/cli/intent_say.go
+++ b/zSDKs/sdk-cli/internal/cli/intent_say.go
@@ -29,7 +29,7 @@ func InitIntentSay(parent *cobra.Command) error {
 			"speakeasy_stream_select":        "/data/content",
 		},
 	}
-	cmd.Flags().String("request", "", "Request body as JSON (advanced; replaces intent arguments). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.")
+	cmd.Flags().String("request", "", "Request body as JSON (advanced; merges with intent inputs, rejecting duplicate keys). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.")
 	_ = flagutil.AnnotatePromptFlag(cmd, "request", flagutil.PromptFlagSpec{Kind: "json", BodyFlag: true})
 	cmd.Flags().Bool("schema", false, "Print the exact JSON Schema of the request body and exit")
 	_ = flagutil.AnnotatePromptFlag(cmd, "schema", flagutil.PromptFlagSpec{Kind: "bool", DocSurface: true})
@@ -38,8 +38,7 @@ func InitIntentSay(parent *cobra.Command) error {
 		Required: false,
 		Kind:     "bool",
 		Order:    0,
-		// A supplied whole body carries this flag's bound key (and the
-		// backing operation flag supplies it directly): no prompt then.
+
 		BodySources: []string{"request"},
 	})
 	if err := interactive.Declare(cmd, interactive.CommandSpec{Args: []interactive.ArgSpec{
@@ -85,6 +84,7 @@ func runIntentSayCmd(cmd *cobra.Command, args []string) error {
 		}
 	}
 	suppliedBodyFlag := ""
+
 	if flagutil.FlagChanged(cmd, "request") {
 		suppliedBodyFlag = "request"
 	}
diff --git a/zSDKs/sdk-cli/internal/cli/tag1/intent_tag1-recent.go b/zSDKs/sdk-cli/internal/cli/tag1/intent_tag1-recent.go
index 227089a1..72ed6012 100644
--- a/zSDKs/sdk-cli/internal/cli/tag1/intent_tag1-recent.go
+++ b/zSDKs/sdk-cli/internal/cli/tag1/intent_tag1-recent.go
@@ -21,8 +21,9 @@ func InitIntentTag1Recent(parent *cobra.Command) error {
 			"speakeasy_strict_body_keys": "true",
 		},
 	}
-	flagutil.RegisterFlags(cmd, listTest1CmdMeta)
-	flagutil.SetMetaPromptOptional(cmd, listTest1CmdMeta, false)
+	intentMeta := listTest1CmdMeta
+	flagutil.RegisterFlags(cmd, intentMeta)
+	flagutil.SetMetaPromptOptional(cmd, intentMeta, false)
 	for _, sibling := range parent.Commands() {
 		if sibling.Name() == cmd.Name() || sibling.HasAlias(cmd.Name()) {
 			return fmt.Errorf("intent command %q collides with the name or alias of an existing %q command; rename the declared command", "tag1-recent", sibling.Name())
diff --git a/zSDKs/sdk-cli/internal/usage/schema.go b/zSDKs/sdk-cli/internal/usage/schema.go
index 2e4df0bd..8dede3f5 100644
--- a/zSDKs/sdk-cli/internal/usage/schema.go
+++ b/zSDKs/sdk-cli/internal/usage/schema.go
@@ -13,13 +13,13 @@ import (
 )
 
 var usageSchemas = map[string]string{
-	"":                                     "name \"cli\"\nbin \"cli\"\nabout \"\"\"\n  This document will show case as many of our features as possible in as little operations/models as possible.\n  This will then generate a SDK that we can more easily review than the test SDKs based on uber.yaml spec.\n  \"\"\"\nversion \"0.0.1\"\nconfig {\n  file \"~/.config/cli/config.yaml\"\n}\nflag \"--usage\" help=\"Print the CLI Usage schema in KDL format\" global=#true\nflag \"-v --version\" help=\"Print the CLI version\"\nflag \"-o --output-format <format>\" help=\"Specify the output format. Options: pretty, json, yaml, table, toon.\" global=#true config=\"output_format\" default=\"pretty\"\nflag \"--color <color>\" help=\"Control colored output: auto (color when output is a TTY), always, or never. Respects NO_COLOR and FORCE_COLOR env vars.\" global=#true default=\"auto\"\nflag \"-q --jq <jq>\" help=\"Filter and transform output using a jq expression (e.g., '.name', '.items[] | .id')\" global=#true\nflag \"--raw-output\" help=\"Write --jq string results as raw text instead of JSON strings (like jq -r); non-string results stay JSON\" global=#true default=#false\nflag \"--server-url <url>\" help=\"Override the default server URL\" global=#true\nflag \"--server <server>\" help=\"Select a server by index (for indexed servers) or name (for named servers)\" global=#true\nflag \"-H --header <header...>\" help=\"Set a custom HTTP request header (format: \\\"Key: Value\\\"). Can be specified multiple times.\" global=#true var=#true\nflag \"--include-headers\" help=\"Include HTTP response headers in the output\" global=#true default=#false\nflag \"--timeout <duration>\" help=\"HTTP request timeout (e.g., 30s, 5m, 100ms)\" global=#true config=\"timeout\"\nflag \"--interactive\" help=\"Prompt for missing inputs and open guided configure/auth forms (forms fall back to line prompts on stdin off-TTY)\" global=#true default=#false\nflag \"--no-interactive\" help=\"Disable all interactive features (auto-prompting, explorer auto-launch, TUI forms)\" global=#true default=#false\nflag \"--dry-run\" help=\"Preview API requests without sending them (no network, no OS keychain). Human preview on stderr; with -o json or --jq, one JSON object per request on stdout. Local mutation commands (auth login, auth logout and configure) make no request: they skip prompts and writes and report a no-op (stderr, or one JSON object on stdout in the machine form)\" global=#true default=#false\nflag \"-d --debug\" help=\"Log request and response diagnostics to stderr\" global=#true default=#false\nflag \"--agent-mode\" help=\"Enable structured errors and default TOON output for AI coding agents.\" global=#true default=#false\nflag \"--no-retries\" help=\"Disable automatic retries (default: retries enabled with exponential backoff)\" global=#true config=\"no_retries\" default=#false\nflag \"--retry-max-elapsed-time <duration>\" help=\"Maximum total time for retries (e.g., 30s, 5m). Default: 30s\" global=#true config=\"retry_max_elapsed_time\"\nflag \"--retry-connection-errors\" help=\"Retry on connection errors (EOF, reset, etc.)\" global=#true config=\"retry_connection_errors\" default=#false\nflag \"--retry-config <json>\" help=\"Full retry config as JSON. Schema: {\\\"strategy\\\":\\\"backoff\\\",\\\"backoff\\\":{\\\"initialInterval\\\":500,\\\"maxInterval\\\":10000,\\\"exponent\\\":1.5,\\\"maxElapsedTime\\\":30000},\\\"retryConnectionErrors\\\":false}. Times are in milliseconds.\" global=#true config=\"retry_config\"\nflag \"--subdomain <subdomain>\" help=\"Server template variable: subdomain\" global=#true\nflag \"--version-param <version_param>\" help=\"Server template variable: version\" global=#true\nflag \"--host-name <host_name>\" help=\"Server template variable: HostName\" global=#true\nflag \"--port <port>\" help=\"Server template variable: PORT\" global=#true\nflag \"--username <username>\" help=\"HTTP Basic username\" global=#true env=\"CLI_USERNAME\" config=\"security.username\"\nflag \"--password <password>\" help=\"HTTP Basic password\" global=#true env=\"CLI_PASSWORD\" config=\"security.password\"\nflag \"--bearer-auth <bearer_auth>\" help=\"HTTP Bearer\" global=#true env=\"CLI_BEARER_AUTH\" config=\"security.bearer_auth\"\nflag \"--my-api-key <my_api_key>\" help=\"API Key\" global=#true env=\"CLI_MY_API_KEY\" config=\"security.my_api_key\"\nflag \"--oauth2 <oauth2>\" help=\"OAuth2 Authorization\" global=#true env=\"CLI_OAUTH2\" config=\"security.oauth2\"\nflag \"--app-id <app_id>\" help=\"Custom authentication credential\" global=#true env=\"CLI_APP_ID\" config=\"security.app_id\"\nflag \"--secret <secret>\" help=\"Custom authentication credential\" global=#true env=\"CLI_SECRET\" config=\"security.secret\"\nflag \"--mobile-auth <mobile_auth>\" help=\"\"\"\n  OAuth2 Password flow, a flow that is too\n  long to describe in a single line.\n  \"\"\" global=#true env=\"CLI_MOBILE_AUTH\" config=\"security.mobile_auth\"\nflag \"--client-id <client_id>\" help=\"Client Credentials flow. client identifier\" global=#true env=\"CLI_CLIENT_ID\" config=\"security.client_id\"\nflag \"--client-secret <client_secret>\" help=\"Client Credentials flow. client secret\" global=#true env=\"CLI_CLIENT_SECRET\" config=\"security.client_secret\"\nflag \"--token-url <token_url>\" help=\"Client Credentials flow. token URL\" global=#true env=\"CLI_TOKEN_URL\" config=\"security.token_url\"\nflag \"--query-param1 <query_param1>\" help=\"A long winded, multi-line description\" global=#true env=\"CLI_QUERY_PARAM1\" config=\"globals.query_param1\"\nflag \"--deprecated-query-param1 <deprecated_query_param1>\" help=\"A deprecated description\" global=#true env=\"CLI_DEPRECATED_QUERY_PARAM1\" config=\"globals.deprecated_query_param1\"\nflag \"--deprecated-query-param2 <deprecated_query_param2>\" help=\"Global deprecated-query-param2 parameter\" global=#true env=\"CLI_DEPRECATED_QUERY_PARAM2\" config=\"globals.deprecated_query_param2\"\nflag \"--lone-query-param <lone_query_param>\" help=\"Global lone-query-param parameter\" global=#true env=\"CLI_LONE_QUERY_PARAM\" config=\"globals.lone_query_param\"\ncmd \"invite\" help=\"Invite a user by email\" {\n  arg \"email\" help=\"Email address to invite\" required=#true var=#true\n  flag \"-i --id <id>\" help=\"string value\"\n  flag \"-e --email <email>\" help=\"[required]\"\n  flag \"-f --first-name <first_name>\" help=\"string value\"\n  flag \"-l --last-name <last_name>\" help=\"string value\"\n  flag \"--age <age>\" help=\"number value\"\n  flag \"-p --postal-code <postal_code>\" help=\"string value\"\n  flag \"-g --gender <gender>\" help=\"options: male, female, other\"\n  flag \"--associated-ids <associated_ids...>\" help=\"list of values\" var=#true\n  flag \"--metadata <metadata>\" help=\"JSON object\"\n  flag \"--metadata-any <metadata_any>\" help=\"A metadata object with additionalProperties true (any type) - should be flattened\"\n  flag \"--body <body>\" help=\"Request body as JSON (advanced; replaces intent arguments). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n  flag \"--given-name <given_name>\" help=\"First name to record\"\n  flag \"--user-gender <user_gender>\" help=\"Gender to record (e.g. male, female, other)\" {\n    suggestions \"male\" \"female\" \"other\"\n  }\n}\ncmd \"enroll\" help=\"Enroll a user by email\" {\n  flag \"-i --id <id>\" help=\"string value\"\n  flag \"-e --email <email>\" help=\"[required]\"\n  flag \"-f --first-name <first_name>\" help=\"string value\"\n  flag \"-l --last-name <last_name>\" help=\"string value\"\n  flag \"--age <age>\" help=\"number value\"\n  flag \"-p --postal-code <postal_code>\" help=\"string value\"\n  flag \"-g --gender <gender>\" help=\"options: male, female, other\"\n  flag \"--associated-ids <associated_ids...>\" help=\"list of values\" var=#true\n  flag \"--metadata <metadata>\" help=\"JSON object\"\n  flag \"--metadata-any <metadata_any>\" help=\"A metadata object with additionalProperties true (any type) - should be flattened\"\n  flag \"--body <body>\" help=\"Request body as JSON (advanced; replaces intent arguments). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n  flag \"--enrollment-email <enrollment_email>\" help=\"Email address to enroll\"\n}\ncmd \"render\" help=\"Render an image asset to a file\" {\n  arg \"prompt\" help=\"Text prompt to render\" required=#true var=#true\n  flag \"-p --prompt <prompt>\" help=\"[required]\"\n  flag \"--output-modalities <output_modalities...>\" help=\"options: text, image\" var=#true\n  flag \"--body <body>\" help=\"Request body as JSON (advanced; replaces intent arguments). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n  flag \"--out <path>\" help=\"Write the image to this file (or into this directory). Default: ./render-{timestamp}-{rand}.{ext}\"\n  flag \"--raw-response\" help=\"Print the raw API response instead of writing the image to a file\"\n}\ncmd \"produce\" help=\"Produce an image asset and wait for completion\" {\n  arg \"prompt\" help=\"Text prompt to render\" required=#true var=#true\n  flag \"-p --prompt <prompt>\" help=\"[required]\"\n  flag \"--output-modalities <output_modalities...>\" help=\"options: text, image\" var=#true\n  flag \"--body <body>\" help=\"Request body as JSON (advanced; replaces intent arguments). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n  flag \"--out <path>\" help=\"Write the image to this file (or into this directory). Default: ./produce-{timestamp}-{rand}.{ext}\"\n  flag \"--raw-response\" help=\"Print the raw API response instead of writing the image to a file\"\n  flag \"--async\" help=\"Return the operation handle without waiting for a terminal response\"\n  flag \"--poll-interval <duration>\" help=\"Override the initial polling interval (positive Go duration, for example 500ms or 2s)\"\n  flag \"--poll-timeout <duration>\" help=\"Override the overall polling deadline (positive Go duration, at least the effective poll interval)\"\n}\ncmd \"observe\" help=\"Produce an asset and print its terminal status\" {\n  arg \"prompt\" help=\"Text prompt to render\" required=#true var=#true\n  flag \"-p --prompt <prompt>\" help=\"[required]\"\n  flag \"--output-modalities <output_modalities...>\" help=\"options: text, image\" var=#true\n  flag \"--body <body>\" help=\"Request body as JSON (advanced; replaces intent arguments). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n  flag \"--async\" help=\"Return the operation handle without waiting for a terminal response\"\n  flag \"--poll-interval <duration>\" help=\"Override the initial polling interval (positive Go duration, for example 500ms or 2s)\"\n  flag \"--poll-timeout <duration>\" help=\"Override the overall polling deadline (positive Go duration, at least the effective poll interval)\"\n}\ncmd \"say\" help=\"Stream a chat reply\" {\n  arg \"prompt\" help=\"Prompt to send\" required=#true var=#true\n  flag \"--request <body>\" help=\"Request body as JSON (advanced; replaces intent arguments). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n  flag \"--stream\" help=\"Stream events as they arrive (default: true)\" default=#true\n}\ncmd \"archive\" help=\"Archive a user account\"\ncmd \"test-group\" help=\"Operations for test-group\" {\n  alias \"tg\"\n  cmd \"tag2\" help=\"Operations for tag2\" {\n    cmd \"post-test\" help=\"Post Test2\" {\n      alias \"pt\"\n      flag \"--obj <obj>\" help=\"A simple object that uses all our supported primitive types and enums and has optional properties. [required]\"\n      flag \"-t --type <type>\" help=\"options: type1, type2\"\n      flag \"--body <body>\" help=\"Request body as JSON (alternative to individual flags). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n      flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n      flag \"--output-file <output_file>\" help=\"Save the response body to a file path (recommended for binary/file responses)\"\n      flag \"--output-b64\" help=\"Encode binary response as base64 and print to stdout\"\n    }\n  }\n  cmd \"tag3\" help=\"Operations for tag3\" {\n    cmd \"post-test\" help=\"Post Test2\" {\n      alias \"pt\"\n      flag \"--obj <obj>\" help=\"A simple object that uses all our supported primitive types and enums and has optional properties. [required]\"\n      flag \"-t --type <type>\" help=\"options: type1, type2\"\n      flag \"--body <body>\" help=\"Request body as JSON (alternative to individual flags). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n      flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n      flag \"--output-file <output_file>\" help=\"Save the response body to a file path (recommended for binary/file responses)\"\n      flag \"--output-b64\" help=\"Encode binary response as base64 and print to stdout\"\n    }\n  }\n}\ncmd \"hello\" help=\"Hand-written command that survives regeneration\"\ncmd \"auth\" help=\"Manage authentication credentials\" {\n  cmd \"login\" help=\"Interactively configure authentication credentials\"\n  cmd \"logout\" help=\"Clear all stored authentication credentials\"\n  cmd \"whoami\" help=\"Display current authentication and global parameter configuration\"\n}\ncmd \"binary-and-string-upload\" help=\"Binary And String Upload\" {\n  alias \"basu\"\n  flag \"-b --binary <binary>\" help=\"binary data (file:<path> or b64:<base64>)\"\n  flag \"-s --string <string>\" help=\"string value\"\n  flag \"--body <body>\" help=\"Request body as JSON (alternative to individual flags). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n}\ncmd \"chat\" help=\"Chat\" {\n  flag \"--body <body>\" help=\"Request body as JSON (alternative to individual flags). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n  flag \"--stream\" help=\"Stream events as they arrive\" default=#true\n  flag \"--max-tokens <max_tokens>\" help=\"Maximum number of tokens to generate\"\n  flag \"--temperature <temperature>\" help=\"Sampling temperature\"\n}\ncmd \"completion\" help=\"Generate the autocompletion script for the specified shell\" {\n  cmd \"bash\" help=\"Generate the autocompletion script for bash\"\n  cmd \"fish\" help=\"Generate the autocompletion script for fish\"\n  cmd \"powershell\" help=\"Generate the autocompletion script for powershell\"\n  cmd \"zsh\" help=\"Generate the autocompletion script for zsh\"\n}\ncmd \"configure\" help=\"Configure authentication, global parameters, and preferences\"\ncmd \"create-user\" help=\"Create User\" {\n  alias \"cu\"\n  flag \"-i --id <id>\" help=\"string value\"\n  flag \"-e --email <email>\" help=\"[required]\"\n  flag \"-f --first-name <first_name>\" help=\"string value\"\n  flag \"-l --last-name <last_name>\" help=\"string value\"\n  flag \"--age <age>\" help=\"number value\"\n  flag \"-p --postal-code <postal_code>\" help=\"string value\"\n  flag \"-g --gender <gender>\" help=\"options: male, female, other\"\n  flag \"--associated-ids <associated_ids...>\" help=\"list of values\" var=#true\n  flag \"--metadata <metadata>\" help=\"JSON object\"\n  flag \"--metadata-any <metadata_any>\" help=\"A metadata object with additionalProperties true (any type) - should be flattened\"\n  flag \"--body <body>\" help=\"Request body as JSON (alternative to individual flags). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n}\ncmd \"create-with-union\" help=\"Create with discriminated union request body\" {\n  alias \"cwu\"\n  flag \"--dry-run-param\" help=\"If true, validates without creating\"\n  flag \"-n --name <name>\" help=\"Name for the shape [required]\"\n  flag \"-s --shape <shape>\" help=\"{ \\\"type\\\": string, \\\"radius\\\": number, ... } | { \\\"type\\\": string, \\\"width\\\": number, \\\"height\\\": number, ... }\"\n  flag \"--shape.circle <circle>\" help=\"Circle variant as JSON\"\n  flag \"--shape.circle.radius <radius>\" help=\"The radius of the circle [required]\"\n  flag \"--shape.circle.color-param <color_param>\" help=\"Optional color of the circle\"\n  flag \"--shape.rectangle <rectangle>\" help=\"Rectangle variant as JSON\"\n  flag \"--shape.rectangle.width <width>\" help=\"The width of the rectangle [required]\"\n  flag \"--shape.rectangle.height <height>\" help=\"The height of the rectangle [required]\"\n  flag \"--shape.rectangle.color-param <color_param>\" help=\"Optional color of the rectangle\"\n  flag \"--description <description>\" help=\"Optional description\"\n  flag \"--body <body>\" help=\"Request body as JSON (alternative to individual flags). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n}\ncmd \"delete-user\" help=\"Delete User\" {\n  alias \"du\"\n  arg \"id\" help=\"string value (or use --id)\"\n  flag \"-i --id <id>\" help=\"string value (or pass it as the [id] argument)\"\n}\ncmd \"explore\" help=\"Interactively browse and run commands\"\ncmd \"get-asset\" help=\"Get Asset\" {\n  alias \"ga\"\n  flag \"-i --id <id>\" help=\"[required]\"\n  flag \"-s --stream\" help=\"boolean flag\" default=#true\n}\ncmd \"get-binary-default-response\" help=\"Get Binary Default Response\" {\n  alias \"gbdr\"\n  flag \"--output-file <output_file>\" help=\"Save the response body to a file path (recommended for binary/file responses)\"\n  flag \"--output-b64\" help=\"Encode binary response as base64 and print to stdout\"\n}\ncmd \"get-duplicate-export-collision\" help=\"Tests that a spec-defined error type colliding with a built-in SDK error name does not cause TS2308\" {\n  alias \"gdec\"\n}\ncmd \"get-empty-object-error\" help=\"Get Empty Object Error\" {\n  alias \"geoe\"\n}\ncmd \"get-error-in-union\" help=\"Get Error In Union\" {\n  alias \"geiu\"\n}\ncmd \"get-error-only-example\" help=\"Operation with example only on error response\" {\n  alias \"geoex\"\n}\ncmd \"get-fully-flattened-request\" help=\"Get Fully Flattened Request\" {\n  alias \"gffr\"\n  flag \"-l --lang <lang>\" help=\"[required]\"\n  flag \"-m --max-length <max_length>\" help=\"integer value\"\n  flag \"-n --name <name>\" help=\"[required]\"\n  flag \"-e --emoji <emoji>\" help=\"options: wave, smiley, thumbsup, tada\"\n  flag \"-g --gif <gif>\" help=\"string value\"\n  flag \"-r --reply\" help=\"boolean flag\"\n  flag \"-p --private\" help=\"boolean flag\"\n  flag \"--body <body>\" help=\"Request body as JSON (alternative to individual flags). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n}\ncmd \"get-named-primitive-union\" help=\"Test named primitive union options using title and x-speakeasy-name-override\" {\n  alias \"gnpu\"\n}\ncmd \"get-nested-integer-string\" help=\"Test nested struct with integer:string tag\" {\n  alias \"gnis\"\n}\ncmd \"get-polymorphism\" help=\"Get Polymorphism\" {\n  alias \"gp\"\n}\ncmd \"get-positional-default\" help=\"Get an item with a default path identifier\" {\n  alias \"gpd\"\n  arg \"id\" help=\"string value (or use --id)\"\n  flag \"-i --id <id>\" help=\"string value (or pass it as the [id] argument)\" default=\"default-id\"\n}\ncmd \"get-request-body-flattened-away\" help=\"Get Request Body Flattened Away\" {\n  alias \"grbfa\"\n}\ncmd \"get-union-errors\" help=\"Get Union Errors\" {\n  alias \"gue\"\n  flag \"-p --page <page>\" help=\"[required]\"\n  flag \"-a --all\" help=\"Automatically paginate and fetch all results (streams NDJSON for JSON output)\"\n  flag \"--max-pages <max_pages>\" help=\"Maximum number of pages to fetch when using --all (0 = no limit)\" default=0\n}\ncmd \"get-user\" help=\"Get User\" {\n  alias \"gu\"\n  arg \"id\" help=\"string value (or use --id)\"\n  flag \"-i --id <id>\" help=\"string value (or pass it as the [id] argument)\"\n}\ncmd \"group\" help=\"Operations for group\" {\n  cmd \"root-group-op\" help=\"An operation at the group's root level\" {\n    alias \"rgo\"\n  }\n  cmd \"sub\" help=\"Operations for sub-group\" {\n    cmd \"empty\" help=\"Operations for empty\" {\n      cmd \"tail\" help=\"Operations for tail\" {\n        cmd \"nested-group-op\" help=\"An operation at the group's deepest level\" {\n          alias \"ngo\"\n        }\n      }\n    }\n    cmd \"op\" help=\"An operation at the group's top level\"\n  }\n}\ncmd \"help\" help=\"Help about any command\"\ncmd \"login\" help=\"Login\"\ncmd \"namespace-tests\" help=\"Operations for namespace-tests\" {\n  alias \"nt\"\n  cmd \"conflicts\" help=\"Operations for conflicts\" {\n    cmd \"create-namespace\" help=\"Create Namespace Conflict Test\" {\n      alias \"cn\"\n      flag \"-i --id <id>\" help=\"[required]\"\n      flag \"-n --name <name>\" help=\"[required]\"\n      flag \"-s --species <species>\" help=\"The species of the pet (e.g., dog, cat) [required]\"\n      flag \"-m --models <models>\" help=\"A field name that often collides\"\n      flag \"-r --request <request>\" help=\"A field name that often collides\"\n      flag \"--operations <operations>\" help=\"A field name that often collides\"\n      flag \"-e --errors <errors>\" help=\"A field name that often collides\"\n      flag \"-u --utils <utils>\" help=\"A field name that often collides\"\n      flag \"--body <body>\" help=\"Request body as JSON (alternative to individual flags). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n      flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n    }\n    cmd \"get-namespace\" help=\"Get Namespace Conflict Test\" {\n      alias \"gn\"\n    }\n    cmd \"get-pet-owners\" help=\"Get Pet Owners\" {\n      alias \"gpo\"\n    }\n    cmd \"get-triple-namespace\" help=\"Get Triple Namespace Conflict Test\" {\n      alias \"gtn\"\n    }\n    cmd \"put-namespace\" help=\"Put Property Name Conflicts Behind\" {\n      alias \"pn\"\n      flag \"--direct <direct>\" help=\"JSON object\"\n      flag \"-n --namespaced <namespaced>\" help=\"JSON object\"\n      flag \"--overridden <overridden>\" help=\"JSON object\"\n      flag \"-a --allof <allof>\" help=\"JSON object\"\n      flag \"--body <body>\" help=\"Request body as JSON (alternative to individual flags). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n      flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n    }\n  }\n  cmd \"single-bar\" help=\"Operations for single-bar\" {\n    alias \"sb\"\n    cmd \"get-single-namespace-bar-pet\" help=\"Get Single Namespace Bar Pet\" {\n      alias \"gsnbp\"\n    }\n  }\n  cmd \"single-foo\" help=\"Operations for single-foo\" {\n    alias \"sf\"\n    cmd \"create-single-namespace-foo-pet\" help=\"Create Single Namespace Foo Pet\" {\n      alias \"csnfp\"\n      flag \"-i --id <id>\" help=\"[required]\"\n      flag \"-n --name <name>\" help=\"[required]\"\n      flag \"-s --species <species>\" help=\"The species of the pet (e.g., dog, cat) [required]\"\n      flag \"-m --models <models>\" help=\"A field name that often collides\"\n      flag \"-r --request <request>\" help=\"A field name that often collides\"\n      flag \"--operations <operations>\" help=\"A field name that often collides\"\n      flag \"-e --errors <errors>\" help=\"A field name that often collides\"\n      flag \"-u --utils <utils>\" help=\"A field name that often collides\"\n      flag \"--body <body>\" help=\"Request body as JSON (alternative to individual flags). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n      flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n    }\n    cmd \"get-single-namespace-foo-pet\" help=\"Get Single Namespace Foo Pet\" {\n      alias \"gsnfp\"\n    }\n  }\n  cmd \"types\" help=\"Operations for types\" {\n    cmd \"get-namespace\" help=\"Get Namespace Types Test\" {\n      alias \"gn\"\n    }\n    cmd \"get-namespace-animal\" help=\"Get Namespace Animal (Discriminated Union)\" {\n      alias \"gna\"\n    }\n    cmd \"get-namespace-organization\" help=\"Get Namespace Organization (Nested Inline Schemas)\" {\n      alias \"gno\"\n    }\n    cmd \"get-namespace-vehicle\" help=\"Get Namespace Vehicle (Non-Discriminated Union)\" {\n      alias \"gnv\"\n    }\n  }\n}\ncmd \"obsolete\" help=\"A subSDK in which all operations are deprecated\" {\n  cmd \"deprecated1\" help=\"Deprecated Operation\"\n}\ncmd \"operation-with-leading-and-trailing-underscores\" help=\"Operation With Leading And Trailing Underscores\" {\n  alias \"owlatu\"\n  flag \"--qp1 <qp1>\" help=\"This parameter will not be filled in with the queryParam1 global because it uses x-speakeasy-name-override which results in a non-matching name. [required]\"\n}\ncmd \"parentheses-in-path-allowed\" help=\"A string with \\\\x7b\\\\x7b double braces \\\\x7d\\\\x7d and { single braces }\\\\nand \\\\\\\\{\\\\\\\\{ escaped curlies \\\\\\\\}\\\\\\\\} and `backticks`.\\\\nand \\\\\\\\`escaped backticks\\\\\\\\` and double slashes\\\\\\\\\\\\\\\\\\\\nand 'single quotes' and \\\\\\\"double quotes\\\\\\\".\\\\nand  \\\\\\\\'escaped single quotes\\\\\\\\' and \\\\\\\\\\\\\\\"escaped double quotes\\\\\\\\\\\\\\\".\" {\n  alias \"pipa\"\n  arg \"id\" help=\"string value (or use --id)\"\n  flag \"-i --id <id>\" help=\"string value (or pass it as the [id] argument)\"\n  flag \"--field-with-braces-in-description <field_with_braces_in_description>\" help=\"\"\"\n    A string with " + string([]byte{'{', '{'}) + " double braces " + string([]byte{'}', '}'}) + " and { single braces }\n    and \\\\{\\\\{ escaped curlies \\\\}\\\\} and 'backticks'.\n    and \\\\'escaped backticks\\\\' and double slashes\\\\\\\\\n    and 'single quotes' and \"double quotes\".\n    and  \\\\'escaped single quotes\\\\' and \\\\\"escaped double quotes\\\\\".\n    \"\"\"\n  flag \"--field-with-braces-in-default <field_with_braces_in_default>\" help=\"string value\" default=\"\"\"\n    A string with " + string([]byte{'{', '{'}) + " double braces " + string([]byte{'}', '}'}) + " and { single braces }\n    and \\\\{\\\\{ escaped curlies \\\\}\\\\} and `backticks`.\n    and \\\\`escaped backticks\\\\` and double slashes\\\\\\\\\n    and 'single quotes' and \"double quotes\".\n    and  \\\\'escaped single quotes\\\\' and \\\\\"escaped double quotes\\\\\".\n\n    \"\"\"\n  flag \"--field-with-braces-in-title <field_with_braces_in_title>\" help=\"string value\"\n  flag \"--field-with-braces-in-example <field_with_braces_in_example>\" help=\"string value\"\n  flag \"--body <body>\" help=\"Request body as JSON (alternative to individual flags). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n}\ncmd \"post-file\" help=\"Post File\" {\n  alias \"pf\"\n  flag \"-u --upload <file>\" help=\"A file\"\n  flag \"--output-file <output_file>\" help=\"Save the response body to a file path (recommended for binary/file responses)\"\n  flag \"--output-b64\" help=\"Encode binary response as base64 and print to stdout\"\n}\ncmd \"render-asset\" help=\"Render Asset\" {\n  alias \"ra\"\n  flag \"-p --prompt <prompt>\" help=\"[required]\"\n  flag \"--output-modalities <output_modalities...>\" help=\"options: text, image\" var=#true\n  flag \"--body <body>\" help=\"Request body as JSON (alternative to individual flags). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n}\ncmd \"tag1\" help=\"The first tag\" {\n  cmd \"recent\" help=\"List recent test1 pages via tag1\" {\n    flag \"-p --page <page>\" help=\"[required]\"\n    flag \"--query-param2 <query_param2>\" help=\"\"\"\n      An [enum](https://enum.com) \"query parameter\"\n      that is not easily described in a single line.\n\n      **Available Values:**\n      | Value | Description |\n      |-------|-------------|\n      | 0     | No data     |\n      | 1     | Partial     |\n      | 2     | Complete    |\n      (options: 0, 1, 2) [required]\n      \"\"\"\n    flag \"--header-param1 <header_param1>\" help=\"[required]\"\n  }\n  cmd \"auth\" help=\"\"\"\n    This operation aims at testing available OAuth2 scopes collection:\n     - only operation with oauth2 authorizationCode security flow\n     - belongs to a subSDK\n    \"\"\" {\n    flag \"--access-token <accessToken>\" help=\"Security credential\"\n  }\n  cmd \"deprecated1\" help=\"Deprecated Operation\"\n  cmd \"list-test1\" help=\"Get Test1\" {\n    alias \"lt\"\n    arg \"page\" help=\"integer value (or use --page)\"\n    flag \"-p --page <page>\" help=\"integer value (or pass it as the [page] argument)\"\n    flag \"--query-param2 <query_param2>\" help=\"\"\"\n      An [enum](https://enum.com) \"query parameter\"\n      that is not easily described in a single line.\n\n      **Available Values:**\n      | Value | Description |\n      |-------|-------------|\n      | 0     | No data     |\n      | 1     | Partial     |\n      | 2     | Complete    |\n      (options: 0, 1, 2) [required]\n      \"\"\"\n    flag \"--header-param1 <header_param1>\" help=\"[required]\"\n    flag \"-a --all\" help=\"Automatically paginate and fetch all results (streams NDJSON for JSON output)\"\n    flag \"--max-pages <max_pages>\" help=\"Maximum number of pages to fetch when using --all (0 = no limit)\" default=0\n  }\n  cmd \"post-file-with-encoding\" help=\"Post File With Encoding\" {\n    alias \"pfwe\"\n    flag \"--file <file>\" help=\"The file to upload (supports CSV, PNG, JPEG, or PDF)\"\n    flag \"-a --attachment <file>\" help=\"An optional binary attachment\"\n    flag \"--file-name <file_name>\" help=\"Optional custom file name\"\n    flag \"--file-purpose <file_purpose>\" help=\"Purpose of the file upload\"\n    flag \"-m --metadata <metadata>\" help=\"JSON metadata about the file\"\n  }\n}\ncmd \"test-endpoint\" help=\"Test Endpoint\" {\n  alias \"te\"\n  arg \"test-name\" help=\"string value (or use --test-name)\"\n  flag \"-t --test-name <test_name>\" help=\"string value (or pass it as the [test-name] argument)\"\n  flag \"--test <test>\" help=\"[required]\"\n  flag \"--body <body>\" help=\"Request body as JSON (alternative to individual flags). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n}\ncmd \"test-enum-formats\" help=\"Test x-speakeasy-enums in different formats\" {\n  alias \"tef\"\n  flag \"--string-array-format <string_array_format>\" help=\"String enum with x-speakeasy-enums as array (full coverage) (options: pending_review, approved_final, rejected_permanently, arch_x86, mobile_ios, custom_field) [required]\"\n  flag \"--string-map-format <string_map_format>\" help=\"String enum with x-speakeasy-enums as map (full coverage) (options: low_priority, medium_priority, high_priority, critical_urgent) [required]\"\n  flag \"--string-partial-map-format <string_partial_map_format>\" help=\"String enum with x-speakeasy-enums as map (partial coverage) (options: draft_mode, under_review, published_live, archived_old) [required]\"\n  flag \"--integer-map-format <integer_map_format>\" help=\"Integer enum with x-speakeasy-enums as map (full coverage) (options: 100, 200, 300, 400) [required]\"\n  flag \"--integer-partial-map-format <integer_partial_map_format>\" help=\"Integer enum with x-speakeasy-enums as map (partial coverage) (options: 1, 2, 3, 4, 5) [required]\"\n  flag \"--body <body>\" help=\"Request body as JSON (alternative to individual flags). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n}\ncmd \"update-user\" help=\"Update User\" {\n  alias \"uu\"\n  arg \"id\" help=\"string value (or use --id)\"\n  flag \"-i --id <id>\" help=\"string value (or pass it as the [id] argument)\"\n  flag \"--user.id <id>\" help=\"[required]\"\n  flag \"--user.email <email>\" help=\"[required]\"\n  flag \"--user.first-name <first_name>\" help=\"string value\"\n  flag \"--user.last-name <last_name>\" help=\"string value\"\n  flag \"--user.age <age>\" help=\"number value\"\n  flag \"--user.postal-code <postal_code>\" help=\"string value\"\n  flag \"--user.gender <gender>\" help=\"options: male, female, other\"\n  flag \"--user.associated-ids <associated_ids...>\" help=\"list of values\" var=#true\n  flag \"--user.metadata <metadata>\" help=\"JSON object\"\n  flag \"--user.metadata-any <metadata_any>\" help=\"A metadata object with additionalProperties true (any type) - should be flattened\"\n  flag \"--body <body>\" help=\"Request body as JSON (alternative to individual flags). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n}\ncmd \"url-validation-stress-test\" help=\"Url Validation Stress Test\" {\n  alias \"uvst\"\n}\ncmd \"validate\" help=\"Validate\"\ncmd \"version\" help=\"Print the CLI version\"\ncmd \"whoami\" help=\"Display current authentication and global parameter configuration\"\n",
-	"invite":                               "cmd \"invite\" help=\"Invite a user by email\" {\n  arg \"email\" help=\"Email address to invite\" required=#true var=#true\n  flag \"-i --id <id>\" help=\"string value\"\n  flag \"-e --email <email>\" help=\"[required]\"\n  flag \"-f --first-name <first_name>\" help=\"string value\"\n  flag \"-l --last-name <last_name>\" help=\"string value\"\n  flag \"--age <age>\" help=\"number value\"\n  flag \"-p --postal-code <postal_code>\" help=\"string value\"\n  flag \"-g --gender <gender>\" help=\"options: male, female, other\"\n  flag \"--associated-ids <associated_ids...>\" help=\"list of values\" var=#true\n  flag \"--metadata <metadata>\" help=\"JSON object\"\n  flag \"--metadata-any <metadata_any>\" help=\"A metadata object with additionalProperties true (any type) - should be flattened\"\n  flag \"--body <body>\" help=\"Request body as JSON (advanced; replaces intent arguments). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n  flag \"--given-name <given_name>\" help=\"First name to record\"\n  flag \"--user-gender <user_gender>\" help=\"Gender to record (e.g. male, female, other)\" {\n    suggestions \"male\" \"female\" \"other\"\n  }\n}\n",
-	"enroll":                               "cmd \"enroll\" help=\"Enroll a user by email\" {\n  flag \"-i --id <id>\" help=\"string value\"\n  flag \"-e --email <email>\" help=\"[required]\"\n  flag \"-f --first-name <first_name>\" help=\"string value\"\n  flag \"-l --last-name <last_name>\" help=\"string value\"\n  flag \"--age <age>\" help=\"number value\"\n  flag \"-p --postal-code <postal_code>\" help=\"string value\"\n  flag \"-g --gender <gender>\" help=\"options: male, female, other\"\n  flag \"--associated-ids <associated_ids...>\" help=\"list of values\" var=#true\n  flag \"--metadata <metadata>\" help=\"JSON object\"\n  flag \"--metadata-any <metadata_any>\" help=\"A metadata object with additionalProperties true (any type) - should be flattened\"\n  flag \"--body <body>\" help=\"Request body as JSON (advanced; replaces intent arguments). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n  flag \"--enrollment-email <enrollment_email>\" help=\"Email address to enroll\"\n}\n",
-	"render":                               "cmd \"render\" help=\"Render an image asset to a file\" {\n  arg \"prompt\" help=\"Text prompt to render\" required=#true var=#true\n  flag \"-p --prompt <prompt>\" help=\"[required]\"\n  flag \"--output-modalities <output_modalities...>\" help=\"options: text, image\" var=#true\n  flag \"--body <body>\" help=\"Request body as JSON (advanced; replaces intent arguments). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n  flag \"--out <path>\" help=\"Write the image to this file (or into this directory). Default: ./render-{timestamp}-{rand}.{ext}\"\n  flag \"--raw-response\" help=\"Print the raw API response instead of writing the image to a file\"\n}\n",
-	"produce":                              "cmd \"produce\" help=\"Produce an image asset and wait for completion\" {\n  arg \"prompt\" help=\"Text prompt to render\" required=#true var=#true\n  flag \"-p --prompt <prompt>\" help=\"[required]\"\n  flag \"--output-modalities <output_modalities...>\" help=\"options: text, image\" var=#true\n  flag \"--body <body>\" help=\"Request body as JSON (advanced; replaces intent arguments). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n  flag \"--out <path>\" help=\"Write the image to this file (or into this directory). Default: ./produce-{timestamp}-{rand}.{ext}\"\n  flag \"--raw-response\" help=\"Print the raw API response instead of writing the image to a file\"\n  flag \"--async\" help=\"Return the operation handle without waiting for a terminal response\"\n  flag \"--poll-interval <duration>\" help=\"Override the initial polling interval (positive Go duration, for example 500ms or 2s)\"\n  flag \"--poll-timeout <duration>\" help=\"Override the overall polling deadline (positive Go duration, at least the effective poll interval)\"\n}\n",
-	"observe":                              "cmd \"observe\" help=\"Produce an asset and print its terminal status\" {\n  arg \"prompt\" help=\"Text prompt to render\" required=#true var=#true\n  flag \"-p --prompt <prompt>\" help=\"[required]\"\n  flag \"--output-modalities <output_modalities...>\" help=\"options: text, image\" var=#true\n  flag \"--body <body>\" help=\"Request body as JSON (advanced; replaces intent arguments). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n  flag \"--async\" help=\"Return the operation handle without waiting for a terminal response\"\n  flag \"--poll-interval <duration>\" help=\"Override the initial polling interval (positive Go duration, for example 500ms or 2s)\"\n  flag \"--poll-timeout <duration>\" help=\"Override the overall polling deadline (positive Go duration, at least the effective poll interval)\"\n}\n",
-	"say":                                  "cmd \"say\" help=\"Stream a chat reply\" {\n  arg \"prompt\" help=\"Prompt to send\" required=#true var=#true\n  flag \"--request <body>\" help=\"Request body as JSON (advanced; replaces intent arguments). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n  flag \"--stream\" help=\"Stream events as they arrive (default: true)\" default=#true\n}\n",
+	"":                                     "name \"cli\"\nbin \"cli\"\nabout \"\"\"\n  This document will show case as many of our features as possible in as little operations/models as possible.\n  This will then generate a SDK that we can more easily review than the test SDKs based on uber.yaml spec.\n  \"\"\"\nversion \"0.0.1\"\nconfig {\n  file \"~/.config/cli/config.yaml\"\n}\nflag \"--usage\" help=\"Print the CLI Usage schema in KDL format\" global=#true\nflag \"-v --version\" help=\"Print the CLI version\"\nflag \"-o --output-format <format>\" help=\"Specify the output format. Options: pretty, json, yaml, table, toon.\" global=#true config=\"output_format\" default=\"pretty\"\nflag \"--color <color>\" help=\"Control colored output: auto (color when output is a TTY), always, or never. Respects NO_COLOR and FORCE_COLOR env vars.\" global=#true default=\"auto\"\nflag \"-q --jq <jq>\" help=\"Filter and transform output using a jq expression (e.g., '.name', '.items[] | .id')\" global=#true\nflag \"--raw-output\" help=\"Write --jq string results as raw text instead of JSON strings (like jq -r); non-string results stay JSON\" global=#true default=#false\nflag \"--server-url <url>\" help=\"Override the default server URL\" global=#true\nflag \"--server <server>\" help=\"Select a server by index (for indexed servers) or name (for named servers)\" global=#true\nflag \"-H --header <header...>\" help=\"Set a custom HTTP request header (format: \\\"Key: Value\\\"). Can be specified multiple times.\" global=#true var=#true\nflag \"--include-headers\" help=\"Include HTTP response headers in the output\" global=#true default=#false\nflag \"--timeout <duration>\" help=\"HTTP request timeout (e.g., 30s, 5m, 100ms)\" global=#true config=\"timeout\"\nflag \"--interactive\" help=\"Prompt for missing inputs and open guided configure/auth forms (forms fall back to line prompts on stdin off-TTY)\" global=#true default=#false\nflag \"--no-interactive\" help=\"Disable all interactive features (auto-prompting, explorer auto-launch, TUI forms)\" global=#true default=#false\nflag \"--dry-run\" help=\"Preview API requests without sending them (no network, no OS keychain). Human preview on stderr; with -o json or --jq, one JSON object per request on stdout. Local mutation commands (auth login, auth logout and configure) make no request: they skip prompts and writes and report a no-op (stderr, or one JSON object on stdout in the machine form)\" global=#true default=#false\nflag \"-d --debug\" help=\"Log request and response diagnostics to stderr\" global=#true default=#false\nflag \"--agent-mode\" help=\"Enable structured errors and default TOON output for AI coding agents.\" global=#true default=#false\nflag \"--no-retries\" help=\"Disable automatic retries (default: retries enabled with exponential backoff)\" global=#true config=\"no_retries\" default=#false\nflag \"--retry-max-elapsed-time <duration>\" help=\"Maximum total time for retries (e.g., 30s, 5m). Default: 30s\" global=#true config=\"retry_max_elapsed_time\"\nflag \"--retry-connection-errors\" help=\"Retry on connection errors (EOF, reset, etc.)\" global=#true config=\"retry_connection_errors\" default=#false\nflag \"--retry-config <json>\" help=\"Full retry config as JSON. Schema: {\\\"strategy\\\":\\\"backoff\\\",\\\"backoff\\\":{\\\"initialInterval\\\":500,\\\"maxInterval\\\":10000,\\\"exponent\\\":1.5,\\\"maxElapsedTime\\\":30000},\\\"retryConnectionErrors\\\":false}. Times are in milliseconds.\" global=#true config=\"retry_config\"\nflag \"--subdomain <subdomain>\" help=\"Server template variable: subdomain\" global=#true\nflag \"--version-param <version_param>\" help=\"Server template variable: version\" global=#true\nflag \"--host-name <host_name>\" help=\"Server template variable: HostName\" global=#true\nflag \"--port <port>\" help=\"Server template variable: PORT\" global=#true\nflag \"--username <username>\" help=\"HTTP Basic username\" global=#true env=\"CLI_USERNAME\" config=\"security.username\"\nflag \"--password <password>\" help=\"HTTP Basic password\" global=#true env=\"CLI_PASSWORD\" config=\"security.password\"\nflag \"--bearer-auth <bearer_auth>\" help=\"HTTP Bearer\" global=#true env=\"CLI_BEARER_AUTH\" config=\"security.bearer_auth\"\nflag \"--my-api-key <my_api_key>\" help=\"API Key\" global=#true env=\"CLI_MY_API_KEY\" config=\"security.my_api_key\"\nflag \"--oauth2 <oauth2>\" help=\"OAuth2 Authorization\" global=#true env=\"CLI_OAUTH2\" config=\"security.oauth2\"\nflag \"--app-id <app_id>\" help=\"Custom authentication credential\" global=#true env=\"CLI_APP_ID\" config=\"security.app_id\"\nflag \"--secret <secret>\" help=\"Custom authentication credential\" global=#true env=\"CLI_SECRET\" config=\"security.secret\"\nflag \"--mobile-auth <mobile_auth>\" help=\"\"\"\n  OAuth2 Password flow, a flow that is too\n  long to describe in a single line.\n  \"\"\" global=#true env=\"CLI_MOBILE_AUTH\" config=\"security.mobile_auth\"\nflag \"--client-id <client_id>\" help=\"Client Credentials flow. client identifier\" global=#true env=\"CLI_CLIENT_ID\" config=\"security.client_id\"\nflag \"--client-secret <client_secret>\" help=\"Client Credentials flow. client secret\" global=#true env=\"CLI_CLIENT_SECRET\" config=\"security.client_secret\"\nflag \"--token-url <token_url>\" help=\"Client Credentials flow. token URL\" global=#true env=\"CLI_TOKEN_URL\" config=\"security.token_url\"\nflag \"--query-param1 <query_param1>\" help=\"A long winded, multi-line description\" global=#true env=\"CLI_QUERY_PARAM1\" config=\"globals.query_param1\"\nflag \"--deprecated-query-param1 <deprecated_query_param1>\" help=\"A deprecated description\" global=#true env=\"CLI_DEPRECATED_QUERY_PARAM1\" config=\"globals.deprecated_query_param1\"\nflag \"--deprecated-query-param2 <deprecated_query_param2>\" help=\"Global deprecated-query-param2 parameter\" global=#true env=\"CLI_DEPRECATED_QUERY_PARAM2\" config=\"globals.deprecated_query_param2\"\nflag \"--lone-query-param <lone_query_param>\" help=\"Global lone-query-param parameter\" global=#true env=\"CLI_LONE_QUERY_PARAM\" config=\"globals.lone_query_param\"\ncmd \"invite\" help=\"Invite a user by email\" {\n  arg \"email\" help=\"Email address to invite\" required=#true var=#true\n  flag \"--body <body>\" help=\"Request body as JSON (advanced; merges with intent inputs, rejecting duplicate keys). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n  flag \"--given-name <given_name>\" help=\"First name to record\"\n  flag \"--user-gender <user_gender>\" help=\"Gender to record (e.g. male, female, other)\" {\n    suggestions \"male\" \"female\" \"other\"\n  }\n}\ncmd \"enroll\" help=\"Enroll a user by email\" {\n  flag \"--body <body>\" help=\"Request body as JSON (advanced; merges with intent inputs, rejecting duplicate keys). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n  flag \"--enrollment-email <enrollment_email>\" help=\"Email address to enroll\"\n}\ncmd \"render\" help=\"Render an image asset to a file\" {\n  arg \"prompt\" help=\"Text prompt to render\" required=#true var=#true\n  flag \"--body <body>\" help=\"Request body as JSON (advanced; merges with intent inputs, rejecting duplicate keys). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n  flag \"--out <path>\" help=\"Write the image to this file (or into this directory). Default: ./render-{timestamp}-{rand}.{ext}\"\n  flag \"--raw-response\" help=\"Print the raw API response instead of writing the image to a file\"\n}\ncmd \"produce\" help=\"Produce an image asset and wait for completion\" {\n  arg \"prompt\" help=\"Text prompt to render\" required=#true var=#true\n  flag \"--body <body>\" help=\"Request body as JSON (advanced; merges with intent inputs, rejecting duplicate keys). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n  flag \"--out <path>\" help=\"Write the image to this file (or into this directory). Default: ./produce-{timestamp}-{rand}.{ext}\"\n  flag \"--raw-response\" help=\"Print the raw API response instead of writing the image to a file\"\n  flag \"--async\" help=\"Return the operation handle without waiting for a terminal response\"\n  flag \"--poll-interval <duration>\" help=\"Override the initial polling interval (positive Go duration, for example 500ms or 2s)\"\n  flag \"--poll-timeout <duration>\" help=\"Override the overall polling deadline (positive Go duration, at least the effective poll interval)\"\n}\ncmd \"observe\" help=\"Produce an asset and print its terminal status\" {\n  arg \"prompt\" help=\"Text prompt to render\" required=#true var=#true\n  flag \"--body <body>\" help=\"Request body as JSON (advanced; merges with intent inputs, rejecting duplicate keys). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n  flag \"--async\" help=\"Return the operation handle without waiting for a terminal response\"\n  flag \"--poll-interval <duration>\" help=\"Override the initial polling interval (positive Go duration, for example 500ms or 2s)\"\n  flag \"--poll-timeout <duration>\" help=\"Override the overall polling deadline (positive Go duration, at least the effective poll interval)\"\n}\ncmd \"say\" help=\"Stream a chat reply\" {\n  arg \"prompt\" help=\"Prompt to send\" required=#true var=#true\n  flag \"--request <body>\" help=\"Request body as JSON (advanced; merges with intent inputs, rejecting duplicate keys). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n  flag \"--stream\" help=\"Stream events as they arrive (default: true)\" default=#true\n}\ncmd \"archive\" help=\"Archive a user account\"\ncmd \"test-group\" help=\"Operations for test-group\" {\n  alias \"tg\"\n  cmd \"tag2\" help=\"Operations for tag2\" {\n    cmd \"post-test\" help=\"Post Test2\" {\n      alias \"pt\"\n      flag \"--obj <obj>\" help=\"A simple object that uses all our supported primitive types and enums and has optional properties. [required]\"\n      flag \"-t --type <type>\" help=\"options: type1, type2\"\n      flag \"--body <body>\" help=\"Request body as JSON (alternative to individual flags). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n      flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n      flag \"--output-file <output_file>\" help=\"Save the response body to a file path (recommended for binary/file responses)\"\n      flag \"--output-b64\" help=\"Encode binary response as base64 and print to stdout\"\n    }\n  }\n  cmd \"tag3\" help=\"Operations for tag3\" {\n    cmd \"post-test\" help=\"Post Test2\" {\n      alias \"pt\"\n      flag \"--obj <obj>\" help=\"A simple object that uses all our supported primitive types and enums and has optional properties. [required]\"\n      flag \"-t --type <type>\" help=\"options: type1, type2\"\n      flag \"--body <body>\" help=\"Request body as JSON (alternative to individual flags). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n      flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n      flag \"--output-file <output_file>\" help=\"Save the response body to a file path (recommended for binary/file responses)\"\n      flag \"--output-b64\" help=\"Encode binary response as base64 and print to stdout\"\n    }\n  }\n}\ncmd \"hello\" help=\"Hand-written command that survives regeneration\"\ncmd \"auth\" help=\"Manage authentication credentials\" {\n  cmd \"login\" help=\"Interactively configure authentication credentials\"\n  cmd \"logout\" help=\"Clear all stored authentication credentials\"\n  cmd \"whoami\" help=\"Display current authentication and global parameter configuration\"\n}\ncmd \"binary-and-string-upload\" help=\"Binary And String Upload\" {\n  alias \"basu\"\n  flag \"-b --binary <binary>\" help=\"binary data (file:<path> or b64:<base64>)\"\n  flag \"-s --string <string>\" help=\"string value\"\n  flag \"--body <body>\" help=\"Request body as JSON (alternative to individual flags). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n}\ncmd \"chat\" help=\"Chat\" {\n  flag \"--body <body>\" help=\"Request body as JSON (alternative to individual flags). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n  flag \"--stream\" help=\"Stream events as they arrive\" default=#true\n  flag \"--max-tokens <max_tokens>\" help=\"Maximum number of tokens to generate\"\n  flag \"--temperature <temperature>\" help=\"Sampling temperature\"\n}\ncmd \"completion\" help=\"Generate the autocompletion script for the specified shell\" {\n  cmd \"bash\" help=\"Generate the autocompletion script for bash\"\n  cmd \"fish\" help=\"Generate the autocompletion script for fish\"\n  cmd \"powershell\" help=\"Generate the autocompletion script for powershell\"\n  cmd \"zsh\" help=\"Generate the autocompletion script for zsh\"\n}\ncmd \"configure\" help=\"Configure authentication, global parameters, and preferences\"\ncmd \"create-user\" help=\"Create User\" {\n  alias \"cu\"\n  flag \"-i --id <id>\" help=\"string value\"\n  flag \"-e --email <email>\" help=\"[required]\"\n  flag \"-f --first-name <first_name>\" help=\"string value\"\n  flag \"-l --last-name <last_name>\" help=\"string value\"\n  flag \"--age <age>\" help=\"number value\"\n  flag \"-p --postal-code <postal_code>\" help=\"string value\"\n  flag \"-g --gender <gender>\" help=\"options: male, female, other\"\n  flag \"--associated-ids <associated_ids...>\" help=\"list of values\" var=#true\n  flag \"--metadata <metadata>\" help=\"JSON object\"\n  flag \"--metadata-any <metadata_any>\" help=\"A metadata object with additionalProperties true (any type) - should be flattened\"\n  flag \"--body <body>\" help=\"Request body as JSON (alternative to individual flags). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n}\ncmd \"create-with-union\" help=\"Create with discriminated union request body\" {\n  alias \"cwu\"\n  flag \"--dry-run-param\" help=\"If true, validates without creating\"\n  flag \"-n --name <name>\" help=\"Name for the shape [required]\"\n  flag \"-s --shape <shape>\" help=\"{ \\\"type\\\": string, \\\"radius\\\": number, ... } | { \\\"type\\\": string, \\\"width\\\": number, \\\"height\\\": number, ... }\"\n  flag \"--shape.circle <circle>\" help=\"Circle variant as JSON\"\n  flag \"--shape.circle.radius <radius>\" help=\"The radius of the circle [required]\"\n  flag \"--shape.circle.color-param <color_param>\" help=\"Optional color of the circle\"\n  flag \"--shape.rectangle <rectangle>\" help=\"Rectangle variant as JSON\"\n  flag \"--shape.rectangle.width <width>\" help=\"The width of the rectangle [required]\"\n  flag \"--shape.rectangle.height <height>\" help=\"The height of the rectangle [required]\"\n  flag \"--shape.rectangle.color-param <color_param>\" help=\"Optional color of the rectangle\"\n  flag \"--description <description>\" help=\"Optional description\"\n  flag \"--body <body>\" help=\"Request body as JSON (alternative to individual flags). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n}\ncmd \"delete-user\" help=\"Delete User\" {\n  alias \"du\"\n  arg \"id\" help=\"string value (or use --id)\"\n  flag \"-i --id <id>\" help=\"string value (or pass it as the [id] argument)\"\n}\ncmd \"explore\" help=\"Interactively browse and run commands\"\ncmd \"get-asset\" help=\"Get Asset\" {\n  alias \"ga\"\n  flag \"-i --id <id>\" help=\"[required]\"\n  flag \"-s --stream\" help=\"boolean flag\" default=#true\n}\ncmd \"get-binary-default-response\" help=\"Get Binary Default Response\" {\n  alias \"gbdr\"\n  flag \"--output-file <output_file>\" help=\"Save the response body to a file path (recommended for binary/file responses)\"\n  flag \"--output-b64\" help=\"Encode binary response as base64 and print to stdout\"\n}\ncmd \"get-duplicate-export-collision\" help=\"Tests that a spec-defined error type colliding with a built-in SDK error name does not cause TS2308\" {\n  alias \"gdec\"\n}\ncmd \"get-empty-object-error\" help=\"Get Empty Object Error\" {\n  alias \"geoe\"\n}\ncmd \"get-error-in-union\" help=\"Get Error In Union\" {\n  alias \"geiu\"\n}\ncmd \"get-error-only-example\" help=\"Operation with example only on error response\" {\n  alias \"geoex\"\n}\ncmd \"get-fully-flattened-request\" help=\"Get Fully Flattened Request\" {\n  alias \"gffr\"\n  flag \"-l --lang <lang>\" help=\"[required]\"\n  flag \"-m --max-length <max_length>\" help=\"integer value\"\n  flag \"-n --name <name>\" help=\"[required]\"\n  flag \"-e --emoji <emoji>\" help=\"options: wave, smiley, thumbsup, tada\"\n  flag \"-g --gif <gif>\" help=\"string value\"\n  flag \"-r --reply\" help=\"boolean flag\"\n  flag \"-p --private\" help=\"boolean flag\"\n  flag \"--body <body>\" help=\"Request body as JSON (alternative to individual flags). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n}\ncmd \"get-named-primitive-union\" help=\"Test named primitive union options using title and x-speakeasy-name-override\" {\n  alias \"gnpu\"\n}\ncmd \"get-nested-integer-string\" help=\"Test nested struct with integer:string tag\" {\n  alias \"gnis\"\n}\ncmd \"get-polymorphism\" help=\"Get Polymorphism\" {\n  alias \"gp\"\n}\ncmd \"get-positional-default\" help=\"Get an item with a default path identifier\" {\n  alias \"gpd\"\n  arg \"id\" help=\"string value (or use --id)\"\n  flag \"-i --id <id>\" help=\"string value (or pass it as the [id] argument)\" default=\"default-id\"\n}\ncmd \"get-request-body-flattened-away\" help=\"Get Request Body Flattened Away\" {\n  alias \"grbfa\"\n}\ncmd \"get-union-errors\" help=\"Get Union Errors\" {\n  alias \"gue\"\n  flag \"-p --page <page>\" help=\"[required]\"\n  flag \"-a --all\" help=\"Automatically paginate and fetch all results (streams NDJSON for JSON output)\"\n  flag \"--max-pages <max_pages>\" help=\"Maximum number of pages to fetch when using --all (0 = no limit)\" default=0\n}\ncmd \"get-user\" help=\"Get User\" {\n  alias \"gu\"\n  arg \"id\" help=\"string value (or use --id)\"\n  flag \"-i --id <id>\" help=\"string value (or pass it as the [id] argument)\"\n}\ncmd \"group\" help=\"Operations for group\" {\n  cmd \"root-group-op\" help=\"An operation at the group's root level\" {\n    alias \"rgo\"\n  }\n  cmd \"sub\" help=\"Operations for sub-group\" {\n    cmd \"empty\" help=\"Operations for empty\" {\n      cmd \"tail\" help=\"Operations for tail\" {\n        cmd \"nested-group-op\" help=\"An operation at the group's deepest level\" {\n          alias \"ngo\"\n        }\n      }\n    }\n    cmd \"op\" help=\"An operation at the group's top level\"\n  }\n}\ncmd \"help\" help=\"Help about any command\"\ncmd \"login\" help=\"Login\"\ncmd \"namespace-tests\" help=\"Operations for namespace-tests\" {\n  alias \"nt\"\n  cmd \"conflicts\" help=\"Operations for conflicts\" {\n    cmd \"create-namespace\" help=\"Create Namespace Conflict Test\" {\n      alias \"cn\"\n      flag \"-i --id <id>\" help=\"[required]\"\n      flag \"-n --name <name>\" help=\"[required]\"\n      flag \"-s --species <species>\" help=\"The species of the pet (e.g., dog, cat) [required]\"\n      flag \"-m --models <models>\" help=\"A field name that often collides\"\n      flag \"-r --request <request>\" help=\"A field name that often collides\"\n      flag \"--operations <operations>\" help=\"A field name that often collides\"\n      flag \"-e --errors <errors>\" help=\"A field name that often collides\"\n      flag \"-u --utils <utils>\" help=\"A field name that often collides\"\n      flag \"--body <body>\" help=\"Request body as JSON (alternative to individual flags). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n      flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n    }\n    cmd \"get-namespace\" help=\"Get Namespace Conflict Test\" {\n      alias \"gn\"\n    }\n    cmd \"get-pet-owners\" help=\"Get Pet Owners\" {\n      alias \"gpo\"\n    }\n    cmd \"get-triple-namespace\" help=\"Get Triple Namespace Conflict Test\" {\n      alias \"gtn\"\n    }\n    cmd \"put-namespace\" help=\"Put Property Name Conflicts Behind\" {\n      alias \"pn\"\n      flag \"--direct <direct>\" help=\"JSON object\"\n      flag \"-n --namespaced <namespaced>\" help=\"JSON object\"\n      flag \"--overridden <overridden>\" help=\"JSON object\"\n      flag \"-a --allof <allof>\" help=\"JSON object\"\n      flag \"--body <body>\" help=\"Request body as JSON (alternative to individual flags). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n      flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n    }\n  }\n  cmd \"single-bar\" help=\"Operations for single-bar\" {\n    alias \"sb\"\n    cmd \"get-single-namespace-bar-pet\" help=\"Get Single Namespace Bar Pet\" {\n      alias \"gsnbp\"\n    }\n  }\n  cmd \"single-foo\" help=\"Operations for single-foo\" {\n    alias \"sf\"\n    cmd \"create-single-namespace-foo-pet\" help=\"Create Single Namespace Foo Pet\" {\n      alias \"csnfp\"\n      flag \"-i --id <id>\" help=\"[required]\"\n      flag \"-n --name <name>\" help=\"[required]\"\n      flag \"-s --species <species>\" help=\"The species of the pet (e.g., dog, cat) [required]\"\n      flag \"-m --models <models>\" help=\"A field name that often collides\"\n      flag \"-r --request <request>\" help=\"A field name that often collides\"\n      flag \"--operations <operations>\" help=\"A field name that often collides\"\n      flag \"-e --errors <errors>\" help=\"A field name that often collides\"\n      flag \"-u --utils <utils>\" help=\"A field name that often collides\"\n      flag \"--body <body>\" help=\"Request body as JSON (alternative to individual flags). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n      flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n    }\n    cmd \"get-single-namespace-foo-pet\" help=\"Get Single Namespace Foo Pet\" {\n      alias \"gsnfp\"\n    }\n  }\n  cmd \"types\" help=\"Operations for types\" {\n    cmd \"get-namespace\" help=\"Get Namespace Types Test\" {\n      alias \"gn\"\n    }\n    cmd \"get-namespace-animal\" help=\"Get Namespace Animal (Discriminated Union)\" {\n      alias \"gna\"\n    }\n    cmd \"get-namespace-organization\" help=\"Get Namespace Organization (Nested Inline Schemas)\" {\n      alias \"gno\"\n    }\n    cmd \"get-namespace-vehicle\" help=\"Get Namespace Vehicle (Non-Discriminated Union)\" {\n      alias \"gnv\"\n    }\n  }\n}\ncmd \"obsolete\" help=\"A subSDK in which all operations are deprecated\" {\n  cmd \"deprecated1\" help=\"Deprecated Operation\"\n}\ncmd \"operation-with-leading-and-trailing-underscores\" help=\"Operation With Leading And Trailing Underscores\" {\n  alias \"owlatu\"\n  flag \"--qp1 <qp1>\" help=\"This parameter will not be filled in with the queryParam1 global because it uses x-speakeasy-name-override which results in a non-matching name. [required]\"\n}\ncmd \"parentheses-in-path-allowed\" help=\"A string with \\\\x7b\\\\x7b double braces \\\\x7d\\\\x7d and { single braces }\\\\nand \\\\\\\\{\\\\\\\\{ escaped curlies \\\\\\\\}\\\\\\\\} and `backticks`.\\\\nand \\\\\\\\`escaped backticks\\\\\\\\` and double slashes\\\\\\\\\\\\\\\\\\\\nand 'single quotes' and \\\\\\\"double quotes\\\\\\\".\\\\nand  \\\\\\\\'escaped single quotes\\\\\\\\' and \\\\\\\\\\\\\\\"escaped double quotes\\\\\\\\\\\\\\\".\" {\n  alias \"pipa\"\n  arg \"id\" help=\"string value (or use --id)\"\n  flag \"-i --id <id>\" help=\"string value (or pass it as the [id] argument)\"\n  flag \"--field-with-braces-in-description <field_with_braces_in_description>\" help=\"\"\"\n    A string with " + string([]byte{'{', '{'}) + " double braces " + string([]byte{'}', '}'}) + " and { single braces }\n    and \\\\{\\\\{ escaped curlies \\\\}\\\\} and 'backticks'.\n    and \\\\'escaped backticks\\\\' and double slashes\\\\\\\\\n    and 'single quotes' and \"double quotes\".\n    and  \\\\'escaped single quotes\\\\' and \\\\\"escaped double quotes\\\\\".\n    \"\"\"\n  flag \"--field-with-braces-in-default <field_with_braces_in_default>\" help=\"string value\" default=\"\"\"\n    A string with " + string([]byte{'{', '{'}) + " double braces " + string([]byte{'}', '}'}) + " and { single braces }\n    and \\\\{\\\\{ escaped curlies \\\\}\\\\} and `backticks`.\n    and \\\\`escaped backticks\\\\` and double slashes\\\\\\\\\n    and 'single quotes' and \"double quotes\".\n    and  \\\\'escaped single quotes\\\\' and \\\\\"escaped double quotes\\\\\".\n\n    \"\"\"\n  flag \"--field-with-braces-in-title <field_with_braces_in_title>\" help=\"string value\"\n  flag \"--field-with-braces-in-example <field_with_braces_in_example>\" help=\"string value\"\n  flag \"--body <body>\" help=\"Request body as JSON (alternative to individual flags). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n}\ncmd \"post-file\" help=\"Post File\" {\n  alias \"pf\"\n  flag \"-u --upload <file>\" help=\"A file\"\n  flag \"--output-file <output_file>\" help=\"Save the response body to a file path (recommended for binary/file responses)\"\n  flag \"--output-b64\" help=\"Encode binary response as base64 and print to stdout\"\n}\ncmd \"render-asset\" help=\"Render Asset\" {\n  alias \"ra\"\n  flag \"-p --prompt <prompt>\" help=\"[required]\"\n  flag \"--output-modalities <output_modalities...>\" help=\"options: text, image\" var=#true\n  flag \"--body <body>\" help=\"Request body as JSON (alternative to individual flags). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n}\ncmd \"tag1\" help=\"The first tag\" {\n  cmd \"recent\" help=\"List recent test1 pages via tag1\" {\n    flag \"-p --page <page>\" help=\"[required]\"\n    flag \"--query-param2 <query_param2>\" help=\"\"\"\n      An [enum](https://enum.com) \"query parameter\"\n      that is not easily described in a single line.\n\n      **Available Values:**\n      | Value | Description |\n      |-------|-------------|\n      | 0     | No data     |\n      | 1     | Partial     |\n      | 2     | Complete    |\n      (options: 0, 1, 2) [required]\n      \"\"\"\n    flag \"--header-param1 <header_param1>\" help=\"[required]\"\n  }\n  cmd \"auth\" help=\"\"\"\n    This operation aims at testing available OAuth2 scopes collection:\n     - only operation with oauth2 authorizationCode security flow\n     - belongs to a subSDK\n    \"\"\" {\n    flag \"--access-token <accessToken>\" help=\"Security credential\"\n  }\n  cmd \"deprecated1\" help=\"Deprecated Operation\"\n  cmd \"list-test1\" help=\"Get Test1\" {\n    alias \"lt\"\n    arg \"page\" help=\"integer value (or use --page)\"\n    flag \"-p --page <page>\" help=\"integer value (or pass it as the [page] argument)\"\n    flag \"--query-param2 <query_param2>\" help=\"\"\"\n      An [enum](https://enum.com) \"query parameter\"\n      that is not easily described in a single line.\n\n      **Available Values:**\n      | Value | Description |\n      |-------|-------------|\n      | 0     | No data     |\n      | 1     | Partial     |\n      | 2     | Complete    |\n      (options: 0, 1, 2) [required]\n      \"\"\"\n    flag \"--header-param1 <header_param1>\" help=\"[required]\"\n    flag \"-a --all\" help=\"Automatically paginate and fetch all results (streams NDJSON for JSON output)\"\n    flag \"--max-pages <max_pages>\" help=\"Maximum number of pages to fetch when using --all (0 = no limit)\" default=0\n  }\n  cmd \"post-file-with-encoding\" help=\"Post File With Encoding\" {\n    alias \"pfwe\"\n    flag \"--file <file>\" help=\"The file to upload (supports CSV, PNG, JPEG, or PDF)\"\n    flag \"-a --attachment <file>\" help=\"An optional binary attachment\"\n    flag \"--file-name <file_name>\" help=\"Optional custom file name\"\n    flag \"--file-purpose <file_purpose>\" help=\"Purpose of the file upload\"\n    flag \"-m --metadata <metadata>\" help=\"JSON metadata about the file\"\n  }\n}\ncmd \"test-endpoint\" help=\"Test Endpoint\" {\n  alias \"te\"\n  arg \"test-name\" help=\"string value (or use --test-name)\"\n  flag \"-t --test-name <test_name>\" help=\"string value (or pass it as the [test-name] argument)\"\n  flag \"--test <test>\" help=\"[required]\"\n  flag \"--body <body>\" help=\"Request body as JSON (alternative to individual flags). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n}\ncmd \"test-enum-formats\" help=\"Test x-speakeasy-enums in different formats\" {\n  alias \"tef\"\n  flag \"--string-array-format <string_array_format>\" help=\"String enum with x-speakeasy-enums as array (full coverage) (options: pending_review, approved_final, rejected_permanently, arch_x86, mobile_ios, custom_field) [required]\"\n  flag \"--string-map-format <string_map_format>\" help=\"String enum with x-speakeasy-enums as map (full coverage) (options: low_priority, medium_priority, high_priority, critical_urgent) [required]\"\n  flag \"--string-partial-map-format <string_partial_map_format>\" help=\"String enum with x-speakeasy-enums as map (partial coverage) (options: draft_mode, under_review, published_live, archived_old) [required]\"\n  flag \"--integer-map-format <integer_map_format>\" help=\"Integer enum with x-speakeasy-enums as map (full coverage) (options: 100, 200, 300, 400) [required]\"\n  flag \"--integer-partial-map-format <integer_partial_map_format>\" help=\"Integer enum with x-speakeasy-enums as map (partial coverage) (options: 1, 2, 3, 4, 5) [required]\"\n  flag \"--body <body>\" help=\"Request body as JSON (alternative to individual flags). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n}\ncmd \"update-user\" help=\"Update User\" {\n  alias \"uu\"\n  arg \"id\" help=\"string value (or use --id)\"\n  flag \"-i --id <id>\" help=\"string value (or pass it as the [id] argument)\"\n  flag \"--user.id <id>\" help=\"[required]\"\n  flag \"--user.email <email>\" help=\"[required]\"\n  flag \"--user.first-name <first_name>\" help=\"string value\"\n  flag \"--user.last-name <last_name>\" help=\"string value\"\n  flag \"--user.age <age>\" help=\"number value\"\n  flag \"--user.postal-code <postal_code>\" help=\"string value\"\n  flag \"--user.gender <gender>\" help=\"options: male, female, other\"\n  flag \"--user.associated-ids <associated_ids...>\" help=\"list of values\" var=#true\n  flag \"--user.metadata <metadata>\" help=\"JSON object\"\n  flag \"--user.metadata-any <metadata_any>\" help=\"A metadata object with additionalProperties true (any type) - should be flattened\"\n  flag \"--body <body>\" help=\"Request body as JSON (alternative to individual flags). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n}\ncmd \"url-validation-stress-test\" help=\"Url Validation Stress Test\" {\n  alias \"uvst\"\n}\ncmd \"validate\" help=\"Validate\"\ncmd \"version\" help=\"Print the CLI version\"\ncmd \"whoami\" help=\"Display current authentication and global parameter configuration\"\n",
+	"invite":                               "cmd \"invite\" help=\"Invite a user by email\" {\n  arg \"email\" help=\"Email address to invite\" required=#true var=#true\n  flag \"--body <body>\" help=\"Request body as JSON (advanced; merges with intent inputs, rejecting duplicate keys). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n  flag \"--given-name <given_name>\" help=\"First name to record\"\n  flag \"--user-gender <user_gender>\" help=\"Gender to record (e.g. male, female, other)\" {\n    suggestions \"male\" \"female\" \"other\"\n  }\n}\n",
+	"enroll":                               "cmd \"enroll\" help=\"Enroll a user by email\" {\n  flag \"--body <body>\" help=\"Request body as JSON (advanced; merges with intent inputs, rejecting duplicate keys). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n  flag \"--enrollment-email <enrollment_email>\" help=\"Email address to enroll\"\n}\n",
+	"render":                               "cmd \"render\" help=\"Render an image asset to a file\" {\n  arg \"prompt\" help=\"Text prompt to render\" required=#true var=#true\n  flag \"--body <body>\" help=\"Request body as JSON (advanced; merges with intent inputs, rejecting duplicate keys). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n  flag \"--out <path>\" help=\"Write the image to this file (or into this directory). Default: ./render-{timestamp}-{rand}.{ext}\"\n  flag \"--raw-response\" help=\"Print the raw API response instead of writing the image to a file\"\n}\n",
+	"produce":                              "cmd \"produce\" help=\"Produce an image asset and wait for completion\" {\n  arg \"prompt\" help=\"Text prompt to render\" required=#true var=#true\n  flag \"--body <body>\" help=\"Request body as JSON (advanced; merges with intent inputs, rejecting duplicate keys). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n  flag \"--out <path>\" help=\"Write the image to this file (or into this directory). Default: ./produce-{timestamp}-{rand}.{ext}\"\n  flag \"--raw-response\" help=\"Print the raw API response instead of writing the image to a file\"\n  flag \"--async\" help=\"Return the operation handle without waiting for a terminal response\"\n  flag \"--poll-interval <duration>\" help=\"Override the initial polling interval (positive Go duration, for example 500ms or 2s)\"\n  flag \"--poll-timeout <duration>\" help=\"Override the overall polling deadline (positive Go duration, at least the effective poll interval)\"\n}\n",
+	"observe":                              "cmd \"observe\" help=\"Produce an asset and print its terminal status\" {\n  arg \"prompt\" help=\"Text prompt to render\" required=#true var=#true\n  flag \"--body <body>\" help=\"Request body as JSON (advanced; merges with intent inputs, rejecting duplicate keys). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n  flag \"--async\" help=\"Return the operation handle without waiting for a terminal response\"\n  flag \"--poll-interval <duration>\" help=\"Override the initial polling interval (positive Go duration, for example 500ms or 2s)\"\n  flag \"--poll-timeout <duration>\" help=\"Override the overall polling deadline (positive Go duration, at least the effective poll interval)\"\n}\n",
+	"say":                                  "cmd \"say\" help=\"Stream a chat reply\" {\n  arg \"prompt\" help=\"Prompt to send\" required=#true var=#true\n  flag \"--request <body>\" help=\"Request body as JSON (advanced; merges with intent inputs, rejecting duplicate keys). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n  flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n  flag \"--stream\" help=\"Stream events as they arrive (default: true)\" default=#true\n}\n",
 	"archive":                              "cmd \"archive\" help=\"Archive a user account\"\n",
 	"test-group":                           "cmd \"test-group\" help=\"Operations for test-group\" {\n  alias \"tg\"\n  cmd \"tag2\" help=\"Operations for tag2\" {\n    cmd \"post-test\" help=\"Post Test2\" {\n      alias \"pt\"\n      flag \"--obj <obj>\" help=\"A simple object that uses all our supported primitive types and enums and has optional properties. [required]\"\n      flag \"-t --type <type>\" help=\"options: type1, type2\"\n      flag \"--body <body>\" help=\"Request body as JSON (alternative to individual flags). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n      flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n      flag \"--output-file <output_file>\" help=\"Save the response body to a file path (recommended for binary/file responses)\"\n      flag \"--output-b64\" help=\"Encode binary response as base64 and print to stdout\"\n    }\n  }\n  cmd \"tag3\" help=\"Operations for tag3\" {\n    cmd \"post-test\" help=\"Post Test2\" {\n      alias \"pt\"\n      flag \"--obj <obj>\" help=\"A simple object that uses all our supported primitive types and enums and has optional properties. [required]\"\n      flag \"-t --type <type>\" help=\"options: type1, type2\"\n      flag \"--body <body>\" help=\"Request body as JSON (alternative to individual flags). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n      flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n      flag \"--output-file <output_file>\" help=\"Save the response body to a file path (recommended for binary/file responses)\"\n      flag \"--output-b64\" help=\"Encode binary response as base64 and print to stdout\"\n    }\n  }\n}\n",
 	"tg":                                   "cmd \"test-group\" help=\"Operations for test-group\" {\n  alias \"tg\"\n  cmd \"tag2\" help=\"Operations for tag2\" {\n    cmd \"post-test\" help=\"Post Test2\" {\n      alias \"pt\"\n      flag \"--obj <obj>\" help=\"A simple object that uses all our supported primitive types and enums and has optional properties. [required]\"\n      flag \"-t --type <type>\" help=\"options: type1, type2\"\n      flag \"--body <body>\" help=\"Request body as JSON (alternative to individual flags). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n      flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n      flag \"--output-file <output_file>\" help=\"Save the response body to a file path (recommended for binary/file responses)\"\n      flag \"--output-b64\" help=\"Encode binary response as base64 and print to stdout\"\n    }\n  }\n  cmd \"tag3\" help=\"Operations for tag3\" {\n    cmd \"post-test\" help=\"Post Test2\" {\n      alias \"pt\"\n      flag \"--obj <obj>\" help=\"A simple object that uses all our supported primitive types and enums and has optional properties. [required]\"\n      flag \"-t --type <type>\" help=\"options: type1, type2\"\n      flag \"--body <body>\" help=\"Request body as JSON (alternative to individual flags). Can also be provided via stdin; @path reads a file, @- reads stdin to EOF. Use --schema to print the exact JSON Schema.\"\n      flag \"--schema\" help=\"Print the exact JSON Schema of the request body and exit\"\n      flag \"--output-file <output_file>\" help=\"Save the response body to a file path (recommended for binary/file responses)\"\n      flag \"--output-b64\" help=\"Encode binary response as base64 and print to stdout\"\n    }\n  }\n}\n",
diff --git a/zSDKs/sdk-cli/tests/intenthint_test.go b/zSDKs/sdk-cli/tests/intenthint_test.go
index 70e13548..badd6964 100644
--- a/zSDKs/sdk-cli/tests/intenthint_test.go
+++ b/zSDKs/sdk-cli/tests/intenthint_test.go
@@ -45,26 +45,3 @@ func TestIntentSpacedBoolFlagValueHintIsSilentInMachineMode(t *testing.T) {
 		})
 	}
 }
-
-// A whole --body plus the backing operation flag explicitly empty must be a
-// validation error, not an empty override of the body's required key.
-func TestIntentBodyWithEmptyBackingFlagIsRejected(t *testing.T) {
-	for _, tc := range []struct {
-		name        string
-		args        []string
-		backingFlag string
-	}{
-		{name: "invite", args: []string{"invite", "--body", "{\"email\":\"example-value\"}", "--email", ""}, backingFlag: "email"},
-		{name: "enroll", args: []string{"enroll", "--body", "{\"email\":\"example-value\"}", "--email", ""}, backingFlag: "email"},
-		{name: "render", args: []string{"render", "--body", "{\"prompt\":\"example-value\"}", "--prompt", ""}, backingFlag: "prompt"},
-		{name: "produce", args: []string{"produce", "--body", "{\"prompt\":\"example-value\"}", "--prompt", ""}, backingFlag: "prompt"},
-		{name: "observe", args: []string{"observe", "--body", "{\"prompt\":\"example-value\"}", "--prompt", ""}, backingFlag: "prompt"},
-	} {
-		t.Run(tc.name, func(t *testing.T) {
-			h := NewCLITestHarness(t)
-			err := h.Run(tc.args)
-			require.Error(t, err)
-			assert.Contains(t, err.Error(), "--"+tc.backingFlag+" must not be empty")
-		})
-	}
-}

From 2f533814fd096368ed8e2f1d4d80e320712ba218 Mon Sep 17 00:00:00 2001
From: Tristan Cartledge <tristan@speakeasyapi.dev>
Date: Fri, 2 Oct 2026 10:47:25 +1000
Subject: [PATCH 2/4] docs(cli): clarify intent JSON body flags

---
 templates/templates/cli/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/templates/cli/README.md b/templates/templates/cli/README.md
index 85378b05..0436938b 100644
--- a/templates/templates/cli/README.md
+++ b/templates/templates/cli/README.md
@@ -681,7 +681,7 @@ cli users create --no-interactive
 - Cobra validates positionals before lifecycle hooks, so the Args wrapper may defer an arity error only when an interactive prompt can supply a missing declared required positional. The PreRunE wrapper applies answers and always re-runs a deferred validator. Because Cobra computed its argument slice once, RunE and PostRunE wrappers receive the effective injected args through per-command execution state.
 - Positional prompting requires an explicit `interactive.Declare` contract; commands without `speakeasy_prompt_args` retain their original `Args` function unchanged. In v1, expanded union variant flags carry `speakeasy:union-member` and are never prompted independently, because requiring every variant at once would be incorrect. Callers select/populate unions through their existing top-level or variant surfaces.
 - Route-dispatch intents annotate only inputs required by every route. Anchors and conditionally required inputs are deliberately not marked required: the current prompt plan has no one-of choice, so prompting both anchors (e.g. `--engine` and `--pipeline`) would create an invalid request. The shared prompt runs first; route selection or a typed conditional-required error follows in `RunE`.
-- Declared intent commands (`x-speakeasy-cli-commands`) keep their presets under a partial body: when the caller passes `--body` the intent merges its presets into that JSON per key — caller keys win, presets fill the gaps including the key that selects the pinned request variant, a known discriminator value is filled in — instead of handing the body to the operation untouched, where the union's default variant would silently replace the pinned one. A body that names another variant (a foreign selector key, or the discriminator with a different value) is a typed `CLI_VALIDATION` usage error naming the intent, the variant, and the full-control escape command. The selector knowledge (`CLIVariantSelectors`: own/foreign distinguishing keys, discriminator key + pinned value) is derived by the decoder's link step (`variantSelectors` in `cli_commands_link.go`) and rendered into `flagutil.PresetMerge` (`intentcmd.go.stmpl`, runtime in `auxiliary/internal/flagutil/preset.go.stmpl`).
+- Declared intent commands (`x-speakeasy-cli-commands`) keep their presets under a partial body: when the caller passes the intent's JSON body flag (`--body`, or the operation's single JSON body flag for metadata-free requests), the intent merges its presets into that JSON per key — caller keys win, presets fill the gaps including the key that selects the pinned request variant, a known discriminator value is filled in — instead of handing the body to the operation untouched, where the union's default variant would silently replace the pinned one. A body that names another variant (a foreign selector key, or the discriminator with a different value) is a typed `CLI_VALIDATION` usage error naming the intent, the variant, and the full-control escape command. The selector knowledge (`CLIVariantSelectors`: own/foreign distinguishing keys, discriminator key + pinned value) is derived by the decoder's link step (`variantSelectors` in `cli_commands_link.go`) and rendered into `flagutil.PresetMerge` (`intentcmd.go.stmpl`, runtime in `auxiliary/internal/flagutil/preset.go.stmpl`).
 
 **Annotation contract**:
 

From 379a3e79a7c0d6580ccf99d03cc7f29a48ff77e5 Mon Sep 17 00:00:00 2001
From: Tristan Cartledge <tristan@speakeasyapi.dev>
Date: Fri, 2 Oct 2026 12:04:33 +1000
Subject: [PATCH 3/4] test(cli): cover expanded intent flags and release
 version guard

---
 pkg/generate/snapshots/cli_release_go_test.go | 27 +++++++++++++++++++
 .../cli/tests/primary/intents_test.go.stmpl   |  4 +--
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/pkg/generate/snapshots/cli_release_go_test.go b/pkg/generate/snapshots/cli_release_go_test.go
index b2efee14..d96dce60 100644
--- a/pkg/generate/snapshots/cli_release_go_test.go
+++ b/pkg/generate/snapshots/cli_release_go_test.go
@@ -74,6 +74,15 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Check release version
+        run: |
+          tag_version="${GITHUB_REF_NAME#v}"
+          cli_version=$(sed -n 's/^var Version = "\(.*\)"$/\1/p' internal/cli/version.go)
+          if [ -z "$cli_version" ] || [ "$tag_version" != "$cli_version" ]; then
+            printf '::error::Release tag %s does not match generated CLI version %s. Set cli.version in .speakeasy/gen.yaml to %s and regenerate before tagging.\n' "$GITHUB_REF_NAME" "$cli_version" "$tag_version"
+            exit 1
+          fi
+
       - name: Setup Go
         uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
         with:
@@ -1070,6 +1079,15 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Check release version
+        run: |
+          tag_version="${GITHUB_REF_NAME#v}"
+          cli_version=$(sed -n 's/^var Version = "\(.*\)"$/\1/p' internal/cli/version.go)
+          if [ -z "$cli_version" ] || [ "$tag_version" != "$cli_version" ]; then
+            printf '::error::Release tag %s does not match generated CLI version %s. Set cli.version in .speakeasy/gen.yaml to %s and regenerate before tagging.\n' "$GITHUB_REF_NAME" "$cli_version" "$tag_version"
+            exit 1
+          fi
+
       - name: Setup Go
         uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
         with:
@@ -2117,6 +2135,15 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Check release version
+        run: |
+          tag_version="${GITHUB_REF_NAME#v}"
+          cli_version=$(sed -n 's/^var Version = "\(.*\)"$/\1/p' internal/cli/version.go)
+          if [ -z "$cli_version" ] || [ "$tag_version" != "$cli_version" ]; then
+            printf '::error::Release tag %s does not match generated CLI version %s. Set cli.version in .speakeasy/gen.yaml to %s and regenerate before tagging.\n' "$GITHUB_REF_NAME" "$cli_version" "$tag_version"
+            exit 1
+          fi
+
       - name: Setup Go
         uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
         with:
diff --git a/templates/templates/cli/tests/primary/intents_test.go.stmpl b/templates/templates/cli/tests/primary/intents_test.go.stmpl
index eae0c680..5709aaf2 100644
--- a/templates/templates/cli/tests/primary/intents_test.go.stmpl
+++ b/templates/templates/cli/tests/primary/intents_test.go.stmpl
@@ -404,12 +404,12 @@ func TestIntentPartialBodyUserKeysWin(t *testing.T) {
 }
 
 func TestIntentBodyFlagSurface(t *testing.T) {
-	recordTest("intents-both-body-surfaces-merged")
 	for _, surface := range []string{"--help", "--usage"} {
 		h := NewCLITestHarness(t)
 		require.NoError(t, h.RunBare([]string{"render", surface}))
 		assert.Contains(t, h.GetStdout(), "--body")
 		assert.Contains(t, h.GetStdout(), "--model")
+		assert.NotContains(t, h.GetStdout(), "--output-modalities")
 		assert.NotContains(t, h.GetStdout(), "cli-intent-run-body")
 		assert.NotContains(t, h.GetStdout(), "replaces intent arguments")
 
@@ -424,7 +424,7 @@ func TestIntentBodyFlagSurface(t *testing.T) {
 		assert.NotContains(t, h.GetStdout(), "--discriminated-variant-body")
 	}
 
-	for _, flag := range []string{"--cli-intent-run-body", "-b"} {
+	for _, flag := range []string{"--cli-intent-run-body", "-b", "--output-modalities"} {
 		h := NewCLITestHarness(t)
 		err := h.RunBare([]string{"render", flag, `{}`})
 		require.Error(t, err)

From 0e623065d5bb00a994332b8e17d7d92849391a2a Mon Sep 17 00:00:00 2001
From: Tristan Cartledge <tristan@speakeasyapi.dev>
Date: Fri, 2 Oct 2026 12:29:40 +1000
Subject: [PATCH 4/4] test(cli): retire obsolete dual-body coverage
 registration

---
 internal/features/tests.go                     | 1 -
 internal/features/tests_generated.go           | 5 -----
 reports/features-report.md                     | 3 +--
 reports/tests.csv                              | 1 -
 templates/templates/csharp/features.ts         | 1 -
 templates/templates/go/features.ts             | 1 -
 templates/templates/javav2/features.ts         | 1 -
 templates/templates/mcp-typescript/features.ts | 1 -
 templates/templates/php/features.ts            | 1 -
 templates/templates/pythonv2/features.ts       | 1 -
 templates/templates/ruby/features.ts           | 1 -
 templates/templates/typescriptv2/features.ts   | 1 -
 templates/templates/unity/features.ts          | 1 -
 13 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/internal/features/tests.go b/internal/features/tests.go
index 2b104ab7..b46a21e6 100644
--- a/internal/features/tests.go
+++ b/internal/features/tests.go
@@ -711,7 +711,6 @@ const (
 	TestIntentRouteDispatchHelpUsage
 	TestIntentRouteDispatchInteractivePlan
 	TestIntentRouteDispatchOverrideOnce
-	TestIntentsBothBodySurfacesMerged
 	TestIntentsDiscriminatedPartialBody
 	TestIntentsForeignSelectorAgentEnvelope
 	TestIntentsForeignSelectorUsageError
diff --git a/internal/features/tests_generated.go b/internal/features/tests_generated.go
index 03d5b1b3..c6ef4a12 100644
--- a/internal/features/tests_generated.go
+++ b/internal/features/tests_generated.go
@@ -466,8 +466,6 @@ func (t Test) String() string {
         return "intent-route-dispatch-interactive-plan"
     case TestIntentRouteDispatchOverrideOnce:
         return "intent-route-dispatch-override-once"
-    case TestIntentsBothBodySurfacesMerged:
-        return "intents-both-body-surfaces-merged"
     case TestIntentsDiscriminatedPartialBody:
         return "intents-discriminated-partial-body"
     case TestIntentsForeignSelectorAgentEnvelope:
@@ -1964,8 +1962,6 @@ func TestFromString(s string) Test {
         return TestIntentRouteDispatchInteractivePlan
     case "intent-route-dispatch-override-once":
         return TestIntentRouteDispatchOverrideOnce
-    case "intents-both-body-surfaces-merged":
-        return TestIntentsBothBodySurfacesMerged
     case "intents-discriminated-partial-body":
         return TestIntentsDiscriminatedPartialBody
     case "intents-foreign-selector-agent-envelope":
@@ -3230,7 +3226,6 @@ var testList = []Test{
     TestIntentRouteDispatchHelpUsage,
     TestIntentRouteDispatchInteractivePlan,
     TestIntentRouteDispatchOverrideOnce,
-    TestIntentsBothBodySurfacesMerged,
     TestIntentsDiscriminatedPartialBody,
     TestIntentsForeignSelectorAgentEnvelope,
     TestIntentsForeignSelectorUsageError,
diff --git a/reports/features-report.md b/reports/features-report.md
index 8560e814..006eebf7 100644
--- a/reports/features-report.md
+++ b/reports/features-report.md
@@ -827,7 +827,6 @@ Legend: :white_check_mark: Implemented, :question_mark: Skipped, :no_entry: Not
 | intent-route-dispatch-help-usage                                                  | :question_mark:    | :white_check_mark: | :question_mark:    | :question_mark:    | :question_mark:    | :question_mark: | :question_mark: | :question_mark:    | :question_mark:    | :question_mark:    | :question_mark:    |
 | intent-route-dispatch-interactive-plan                                            | :question_mark:    | :white_check_mark: | :question_mark:    | :question_mark:    | :question_mark:    | :question_mark: | :question_mark: | :question_mark:    | :question_mark:    | :question_mark:    | :question_mark:    |
 | intent-route-dispatch-override-once                                               | :question_mark:    | :white_check_mark: | :question_mark:    | :question_mark:    | :question_mark:    | :question_mark: | :question_mark: | :question_mark:    | :question_mark:    | :question_mark:    | :question_mark:    |
-| intents-both-body-surfaces-merged                                                 | :question_mark:    | :white_check_mark: | :question_mark:    | :question_mark:    | :question_mark:    | :question_mark: | :question_mark: | :question_mark:    | :question_mark:    | :question_mark:    | :question_mark:    |
 | intents-discriminated-partial-body                                                | :question_mark:    | :white_check_mark: | :question_mark:    | :question_mark:    | :question_mark:    | :question_mark: | :question_mark: | :question_mark:    | :question_mark:    | :question_mark:    | :question_mark:    |
 | intents-foreign-selector-agent-envelope                                           | :question_mark:    | :white_check_mark: | :question_mark:    | :question_mark:    | :question_mark:    | :question_mark: | :question_mark: | :question_mark:    | :question_mark:    | :question_mark:    | :question_mark:    |
 | intents-foreign-selector-usage-error                                              | :question_mark:    | :white_check_mark: | :question_mark:    | :question_mark:    | :question_mark:    | :question_mark: | :question_mark: | :question_mark:    | :question_mark:    | :question_mark:    | :question_mark:    |
@@ -882,4 +881,4 @@ Legend: :white_check_mark: Implemented, :question_mark: Skipped, :no_entry: Not
 | security-ranking-source-rank                                                      | :question_mark:    | :white_check_mark: | :question_mark:    | :question_mark:    | :question_mark:    | :question_mark: | :question_mark: | :question_mark:    | :question_mark:    | :question_mark:    | :question_mark:    |
 | event-stream-with-operation-timeout-streams-to-completion                         | :question_mark:    | :question_mark:    | :question_mark:    | :white_check_mark: | :question_mark:    | :question_mark: | :question_mark: | :question_mark:    | :question_mark:    | :question_mark:    | :question_mark:    |
 | jsonl-stream-timeout-still-bounds-slow-stream                                     | :question_mark:    | :question_mark:    | :question_mark:    | :white_check_mark: | :question_mark:    | :question_mark: | :question_mark: | :question_mark:    | :question_mark:    | :question_mark:    | :question_mark:    |
-| jsonl-stream-with-timeout-streams-to-completion                                   | :question_mark:    | :question_mark:    | :question_mark:    | :white_check_mark: | :question_mark:    | :question_mark: | :question_mark: | :question_mark:    | :question_mark:    | :question_mark:    | :question_mark:    |
\ No newline at end of file
+| jsonl-stream-with-timeout-streams-to-completion                                   | :question_mark:    | :question_mark:    | :question_mark:    | :white_check_mark: | :question_mark:    | :question_mark: | :question_mark: | :question_mark:    | :question_mark:    | :question_mark:    | :question_mark:    |
diff --git a/reports/tests.csv b/reports/tests.csv
index af6bbb13..887e980c 100644
--- a/reports/tests.csv
+++ b/reports/tests.csv
@@ -689,7 +689,6 @@ intent-route-dispatch-flag-paths,:question_mark:,:white_check_mark:,:question_ma
 intent-route-dispatch-help-usage,:question_mark:,:white_check_mark:,:question_mark:,:question_mark:,:question_mark:,:question_mark:,:question_mark:,:question_mark:,:question_mark:,:question_mark:,:question_mark:
 intent-route-dispatch-interactive-plan,:question_mark:,:white_check_mark:,:question_mark:,:question_mark:,:question_mark:,:question_mark:,:question_mark:,:question_mark:,:question_mark:,:question_mark:,:question_mark:
 intent-route-dispatch-override-once,:question_mark:,:white_check_mark:,:question_mark:,:question_mark:,:question_mark:,:question_mark:,:question_mark:,:question_mark:,:question_mark:,:question_mark:,:question_mark:
-intents-both-body-surfaces-merged,:question_mark:,:white_check_mark:,:question_mark:,:question_mark:,:question_mark:,:question_mark:,:question_mark:,:question_mark:,:question_mark:,:question_mark:,:question_mark:
 intents-discriminated-partial-body,:question_mark:,:white_check_mark:,:question_mark:,:question_mark:,:question_mark:,:question_mark:,:question_mark:,:question_mark:,:question_mark:,:question_mark:,:question_mark:
 intents-foreign-selector-agent-envelope,:question_mark:,:white_check_mark:,:question_mark:,:question_mark:,:question_mark:,:question_mark:,:question_mark:,:question_mark:,:question_mark:,:question_mark:,:question_mark:
 intents-foreign-selector-usage-error,:question_mark:,:white_check_mark:,:question_mark:,:question_mark:,:question_mark:,:question_mark:,:question_mark:,:question_mark:,:question_mark:,:question_mark:,:question_mark:
diff --git a/templates/templates/csharp/features.ts b/templates/templates/csharp/features.ts
index 24555186..84d9042a 100644
--- a/templates/templates/csharp/features.ts
+++ b/templates/templates/csharp/features.ts
@@ -358,7 +358,6 @@ function isTestSkipped(test: string): boolean {
     "intent-route-dispatch-help-usage",
     "intent-route-dispatch-interactive-plan",
     "intent-route-dispatch-override-once",
-    "intents-both-body-surfaces-merged",
     "intents-discriminated-partial-body",
     "intents-foreign-selector-agent-envelope",
     "intents-foreign-selector-usage-error",
diff --git a/templates/templates/go/features.ts b/templates/templates/go/features.ts
index c62f1f11..d94588dd 100644
--- a/templates/templates/go/features.ts
+++ b/templates/templates/go/features.ts
@@ -361,7 +361,6 @@ function isTestSkipped(test: string): boolean {
     "intent-route-dispatch-help-usage",
     "intent-route-dispatch-interactive-plan",
     "intent-route-dispatch-override-once",
-    "intents-both-body-surfaces-merged",
     "intents-discriminated-partial-body",
     "intents-foreign-selector-agent-envelope",
     "intents-foreign-selector-usage-error",
diff --git a/templates/templates/javav2/features.ts b/templates/templates/javav2/features.ts
index 63905e55..dd276f93 100644
--- a/templates/templates/javav2/features.ts
+++ b/templates/templates/javav2/features.ts
@@ -406,7 +406,6 @@ function isTestSkipped(test: string): boolean {
     "intent-route-dispatch-help-usage",
     "intent-route-dispatch-interactive-plan",
     "intent-route-dispatch-override-once",
-    "intents-both-body-surfaces-merged",
     "intents-discriminated-partial-body",
     "intents-foreign-selector-agent-envelope",
     "intents-foreign-selector-usage-error",
diff --git a/templates/templates/mcp-typescript/features.ts b/templates/templates/mcp-typescript/features.ts
index 28b0ea12..f3d701f6 100644
--- a/templates/templates/mcp-typescript/features.ts
+++ b/templates/templates/mcp-typescript/features.ts
@@ -615,7 +615,6 @@ function isTestSkipped(test: string): boolean {
     "intent-route-dispatch-help-usage",
     "intent-route-dispatch-interactive-plan",
     "intent-route-dispatch-override-once",
-    "intents-both-body-surfaces-merged",
     "intents-discriminated-partial-body",
     "intents-foreign-selector-agent-envelope",
     "intents-foreign-selector-usage-error",
diff --git a/templates/templates/php/features.ts b/templates/templates/php/features.ts
index 1d8647e0..4f31e0f7 100644
--- a/templates/templates/php/features.ts
+++ b/templates/templates/php/features.ts
@@ -502,7 +502,6 @@ function isTestSkipped(test: string): boolean {
     "intent-route-dispatch-help-usage",
     "intent-route-dispatch-interactive-plan",
     "intent-route-dispatch-override-once",
-    "intents-both-body-surfaces-merged",
     "intents-discriminated-partial-body",
     "intents-foreign-selector-agent-envelope",
     "intents-foreign-selector-usage-error",
diff --git a/templates/templates/pythonv2/features.ts b/templates/templates/pythonv2/features.ts
index a6f81c5a..b22bb0ef 100644
--- a/templates/templates/pythonv2/features.ts
+++ b/templates/templates/pythonv2/features.ts
@@ -364,7 +364,6 @@ function isTestSkipped(test: string): boolean {
     "intent-route-dispatch-help-usage",
     "intent-route-dispatch-interactive-plan",
     "intent-route-dispatch-override-once",
-    "intents-both-body-surfaces-merged",
     "intents-discriminated-partial-body",
     "intents-foreign-selector-agent-envelope",
     "intents-foreign-selector-usage-error",
diff --git a/templates/templates/ruby/features.ts b/templates/templates/ruby/features.ts
index bab54086..a5cb1c9f 100644
--- a/templates/templates/ruby/features.ts
+++ b/templates/templates/ruby/features.ts
@@ -403,7 +403,6 @@ function isTestSkipped(test: string): boolean {
     "intent-route-dispatch-help-usage",
     "intent-route-dispatch-interactive-plan",
     "intent-route-dispatch-override-once",
-    "intents-both-body-surfaces-merged",
     "intents-discriminated-partial-body",
     "intents-foreign-selector-agent-envelope",
     "intents-foreign-selector-usage-error",
diff --git a/templates/templates/typescriptv2/features.ts b/templates/templates/typescriptv2/features.ts
index fa0a6c89..0944b60e 100644
--- a/templates/templates/typescriptv2/features.ts
+++ b/templates/templates/typescriptv2/features.ts
@@ -351,7 +351,6 @@ function isTestSkipped(test: string): boolean {
     "intent-route-dispatch-help-usage",
     "intent-route-dispatch-interactive-plan",
     "intent-route-dispatch-override-once",
-    "intents-both-body-surfaces-merged",
     "intents-discriminated-partial-body",
     "intents-foreign-selector-agent-envelope",
     "intents-foreign-selector-usage-error",
diff --git a/templates/templates/unity/features.ts b/templates/templates/unity/features.ts
index 23b0b521..7b5af1f4 100644
--- a/templates/templates/unity/features.ts
+++ b/templates/templates/unity/features.ts
@@ -524,7 +524,6 @@ function isTestSkipped(test: string): boolean {
     "intent-route-dispatch-help-usage",
     "intent-route-dispatch-interactive-plan",
     "intent-route-dispatch-override-once",
-    "intents-both-body-surfaces-merged",
     "intents-discriminated-partial-body",
     "intents-foreign-selector-agent-envelope",
     "intents-foreign-selector-usage-error",