diff --git a/integrations/ckprompt/command_test.go b/integrations/ckprompt/command_test.go
index 4e3f479..3bded88 100644
--- a/integrations/ckprompt/command_test.go
+++ b/integrations/ckprompt/command_test.go
@@ -255,7 +255,7 @@ func TestCatalogCommandTreesAreIndependentAndOmitShow(t *testing.T) {
 			app := newPromptTestApp(t, test.cmd)
 			var output bytes.Buffer
 			outcome := app.Execute(context.Background(), []string{"help", "promptkit", "list"}, commandkit.Streams{Out: &output, Err: io.Discard})
-			if outcome.Kind != commandkit.OutcomeSuccess || !strings.Contains(output.String(), "list") || !strings.Contains(output.String(), test.want) || strings.Contains(output.String(), test.omit) || strings.Contains(output.String(), "show") {
+			if outcome.Kind != commandkit.OutcomeSuccess || !strings.Contains(output.String(), "list") || !strings.Contains(output.String(), test.want) || strings.Contains(output.String(), "\n  "+test.omit+" ") || strings.Contains(output.String(), "\n  show ") {
 				t.Fatalf("catalog-only help = (%#v, %q)", outcome, output.String())
 			}
 		})
@@ -714,7 +714,7 @@ func TestCatalogFailureReportsWarningAndNativeExplanationSeparately(t *testing.T
 		}, providerErr
 	}}))
 	var output, diagnosticOutput bytes.Buffer
-	outcome := app.Execute(context.Background(), []string{"--verbose", "promptkit", "list", "prompts"}, commandkit.Streams{Out: &output, Err: &diagnosticOutput})
+	outcome := app.Execute(context.Background(), []string{"promptkit", "list", "prompts", "--verbose"}, commandkit.Streams{Out: &output, Err: &diagnosticOutput})
 	if outcome.Kind != commandkit.OutcomeOperational || !errors.Is(outcome.Cause, providerErr) {
 		t.Fatalf("provider failure outcome = %#v", outcome)
 	}
@@ -731,7 +731,7 @@ func TestCatalogFailureReportsWarningAndNativeExplanationSeparately(t *testing.T
 	}}))
 	output.Reset()
 	diagnosticOutput.Reset()
-	outcome = canceled.Execute(ctx, []string{"--verbose", "promptkit", "list", "prompts"}, commandkit.Streams{Out: &output, Err: &diagnosticOutput})
+	outcome = canceled.Execute(ctx, []string{"promptkit", "list", "prompts", "--verbose"}, commandkit.Streams{Out: &output, Err: &diagnosticOutput})
 	if outcome.Kind != commandkit.OutcomeOperational || !errors.Is(outcome.Cause, context.Canceled) || !strings.Contains(diagnosticOutput.String(), "catalog warning") || output.Len() != 0 {
 		t.Fatalf("post-provider cancellation outcome = %#v output=%q err=%q", outcome, output.String(), diagnosticOutput.String())
 	}
@@ -774,7 +774,7 @@ func TestCatalogAndInspectionRespectSuccessfulReportingModes(t *testing.T) {
 			app := newPromptTestApp(t, Command(suite))
 			args := []string{"promptkit", "list", "prompts"}
 			if mode != "ordinary" {
-				args = append([]string{"--" + mode}, args...)
+				args = append(args, "--"+mode)
 			}
 			var output, diagnosticOutput bytes.Buffer
 			outcome := app.Execute(context.Background(), args, commandkit.Streams{Out: &output, Err: &diagnosticOutput})
@@ -796,7 +796,7 @@ func TestCatalogAndInspectionRespectSuccessfulReportingModes(t *testing.T) {
 			diagnosticOutput.Reset()
 			args = []string{"promptkit", "show", "prompt", "briefing"}
 			if mode != "ordinary" {
-				args = append([]string{"--" + mode}, args...)
+				args = append(args, "--"+mode)
 			}
 			outcome = app.Execute(context.Background(), args, commandkit.Streams{Out: &output, Err: &diagnosticOutput})
 			if outcome.Kind != commandkit.OutcomeSuccess || calls != 2 {
@@ -824,7 +824,7 @@ func TestQuietInspectionStillFindsReportEncodingFailure(t *testing.T) {
 	}}))
 	result := &countingWriter{}
 	var diagnosticOutput bytes.Buffer
-	outcome := app.Execute(context.Background(), []string{"--quiet", "promptkit", "show", "profile", "broken"}, commandkit.Streams{Out: result, Err: &diagnosticOutput})
+	outcome := app.Execute(context.Background(), []string{"promptkit", "show", "profile", "broken", "--quiet"}, commandkit.Streams{Out: result, Err: &diagnosticOutput})
 	if !called || result.calls != 0 {
 		t.Fatalf("quiet rendering called=%t destination writes=%d", called, result.calls)
 	}
@@ -1089,7 +1089,7 @@ func TestNativeLookupErrorsAndBlankIDsReachCallbacks(t *testing.T) {
 	}
 	output.Reset()
 	diagnosticOutput.Reset()
-	outcome = app.Execute(context.Background(), []string{"promptkit", "show", "prompt", ""}, commandkit.Streams{Out: &output, Err: &diagnosticOutput})
+	outcome = app.Execute(context.Background(), []string{"promptkit", "show", "prompt", "", "--verbose"}, commandkit.Streams{Out: &output, Err: &diagnosticOutput})
 	if outcome.Kind != commandkit.OutcomeOperational || !errors.Is(outcome.Cause, nativeErr) || calls != 1 || output.Len() != 0 || !strings.Contains(diagnosticOutput.String(), "lookup context") {
 		t.Fatalf("native lookup failure = (%#v, calls=%d, out=%q, err=%q)", outcome, calls, output.String(), diagnosticOutput.String())
 	}
diff --git a/integrations/ckprompt/requirements_command_test.go b/integrations/ckprompt/requirements_command_test.go
index 033586c..e8de298 100644
--- a/integrations/ckprompt/requirements_command_test.go
+++ b/integrations/ckprompt/requirements_command_test.go
@@ -319,7 +319,7 @@ func TestRequirementsCommandPreservesDiagnosticsCancellationAndDelivery(t *testi
 			return commandkit.Acquired[*promptkit.RequirementInspection]{Value: &promptkit.RequirementInspection{Issues: []promptkit.RequirementIssue{issue}}, Diagnostics: []commandkit.Diagnostic{diagnostic}}, nil
 		}}))
 		var report, diagnostics bytes.Buffer
-		outcome := app.Execute(context.Background(), []string{"--verbose", "promptkit", "requirements", "show", "briefing"}, commandkit.Streams{Out: &report, Err: &diagnostics})
+		outcome := app.Execute(context.Background(), []string{"promptkit", "requirements", "show", "briefing", "--verbose"}, commandkit.Streams{Out: &report, Err: &diagnostics})
 		var decoded map[string]any
 		if err := yaml.Unmarshal(report.Bytes(), &decoded); err != nil {
 			t.Fatalf("decode partial report %q: %v", report.String(), err)
@@ -339,7 +339,7 @@ func TestRequirementsCommandPreservesDiagnosticsCancellationAndDelivery(t *testi
 			return commandkit.Acquired[*promptkit.RequirementInspection]{Diagnostics: []commandkit.Diagnostic{diagnostic}}, providerErr
 		}}))
 		var report, diagnostics bytes.Buffer
-		outcome := app.Execute(context.Background(), []string{"--verbose", "promptkit", "requirements", "show", "briefing"}, commandkit.Streams{Out: &report, Err: &diagnostics})
+		outcome := app.Execute(context.Background(), []string{"promptkit", "requirements", "show", "briefing", "--verbose"}, commandkit.Streams{Out: &report, Err: &diagnostics})
 		if outcome.Kind != commandkit.OutcomeOperational || outcome.Status != 1 || !errors.Is(outcome.Cause, providerErr) || outcome.Presentation.Diagnostics.State != commandkit.DeliveryComplete || !strings.Contains(diagnostics.String(), "provider warning") || report.Len() != 0 {
 			t.Fatalf("provider failure outcome=%#v report=%q diagnostics=%q", outcome, report.String(), diagnostics.String())
 		}
@@ -352,7 +352,7 @@ func TestRequirementsCommandPreservesDiagnosticsCancellationAndDelivery(t *testi
 			return commandkit.Acquired[*promptkit.RequirementInspection]{Value: &promptkit.RequirementInspection{Complete: true}, Diagnostics: []commandkit.Diagnostic{diagnostic}}, nil
 		}}))
 		var report, diagnostics bytes.Buffer
-		outcome := app.Execute(ctx, []string{"--verbose", "promptkit", "requirements", "show", "briefing"}, commandkit.Streams{Out: &report, Err: &diagnostics})
+		outcome := app.Execute(ctx, []string{"promptkit", "requirements", "show", "briefing", "--verbose"}, commandkit.Streams{Out: &report, Err: &diagnostics})
 		if outcome.Kind != commandkit.OutcomeOperational || !errors.Is(outcome.Cause, context.Canceled) || !strings.Contains(diagnostics.String(), "provider warning") || report.Len() != 0 {
 			t.Fatalf("post-provider cancellation = %#v report=%q", outcome, report.String())
 		}
@@ -401,8 +401,8 @@ func TestRequirementsCommandPreservesDiagnosticsCancellationAndDelivery(t *testi
 			return commandkit.Acquired[*promptkit.RequirementInspection]{Value: &promptkit.RequirementInspection{PromptID: "briefing"}, Diagnostics: []commandkit.Diagnostic{badDiagnostic}}, nil
 		}}))
 		var report bytes.Buffer
-		outcome := app.Execute(context.Background(), []string{"--verbose", "promptkit", "requirements", "show", "briefing"}, commandkit.Streams{Out: &report, Err: io.Discard})
-		if outcome.Kind != commandkit.OutcomeOperational || !errors.Is(outcome.Presentation.Diagnostics.WriteError, diagnosticErr) || outcome.Presentation.Diagnostics.State != commandkit.DeliveryIncomplete || report.Len() == 0 {
+		outcome := app.Execute(context.Background(), []string{"promptkit", "requirements", "show", "briefing", "--verbose"}, commandkit.Streams{Out: &report, Err: io.Discard})
+		if outcome.Kind != commandkit.OutcomeOperational || !errors.Is(outcome.Presentation.Diagnostics.RenderError, diagnosticErr) || outcome.Presentation.Diagnostics.State != commandkit.DeliveryIncomplete || report.Len() == 0 {
 			t.Fatalf("diagnostic delivery outcome = %#v report=%q", outcome, report.String())
 		}
 	})