refactor: rename --clear-screen/-on-detach to symmetric --clear-on-attach/--clear-on-detach (#432)

eminwux · web-flow · commit efe5cd6f4a13 · 2026-06-12T13:57:37.000+02:00
diff --git a/cmd/config/env.go b/cmd/config/env.go
@@ -115,11 +115,11 @@ var (
 	//nolint:revive,gochecknoglobals,staticcheck // ignore linter warning about this variable
 	SB_ATTACH_FULL_CAPTURE = DefineKV("SB_ATTACH_FULL_CAPTURE", "sb/attach/fullCapture")
 	//nolint:revive,gochecknoglobals,staticcheck // ignore linter warning about this variable
-	SB_ATTACH_CLEAR_SCREEN = DefineKV("SB_ATTACH_CLEAR_SCREEN", "sb/attach/clearScreen")
+	SB_ATTACH_CLEAR_ON_ATTACH = DefineKV("SB_ATTACH_CLEAR_ON_ATTACH", "sb/attach/clearOnAttach")
 	//nolint:revive,gochecknoglobals,staticcheck // ignore linter warning about this variable
-	SB_ATTACH_CLEAR_SCREEN_ON_DETACH = DefineKV(
-		"SB_ATTACH_CLEAR_SCREEN_ON_DETACH",
-		"sb/attach/clearScreenOnDetach",
+	SB_ATTACH_CLEAR_ON_DETACH = DefineKV(
+		"SB_ATTACH_CLEAR_ON_DETACH",
+		"sb/attach/clearOnDetach",
 	)
 	//nolint:revive,gochecknoglobals,staticcheck // ignore linter warning about this variable
 	SB_DETACH_NAME = DefineKV("SB_DETACH_NAME", "sb/detach/name")
@@ -205,11 +205,11 @@ var (
 		"sbsh.client.disableDetachKeystroke",
 	)
 	//nolint:revive,gochecknoglobals,staticcheck // ignore linter warning about this variable
-	SBSH_CLIENT_CLEAR_SCREEN = DefineKV("SBSH_CLIENT_CLEAR_SCREEN", "sbsh.client.clearScreen")
+	SBSH_CLIENT_CLEAR_ON_ATTACH = DefineKV("SBSH_CLIENT_CLEAR_ON_ATTACH", "sbsh.client.clearOnAttach")
 	//nolint:revive,gochecknoglobals,staticcheck // ignore linter warning about this variable
-	SBSH_CLIENT_CLEAR_SCREEN_ON_DETACH = DefineKV(
-		"SBSH_CLIENT_CLEAR_SCREEN_ON_DETACH",
-		"sbsh.client.clearScreenOnDetach",
+	SBSH_CLIENT_CLEAR_ON_DETACH = DefineKV(
+		"SBSH_CLIENT_CLEAR_ON_DETACH",
+		"sbsh.client.clearOnDetach",
 	)
 
 	//nolint:revive,gochecknoglobals,staticcheck // ignore linter warning about this variable
diff --git a/cmd/sb/attach/attach.go b/cmd/sb/attach/attach.go
@@ -176,13 +176,13 @@ func setupAttachCmdFlags(attachCmd *cobra.Command) {
 		Bool("full-capture", false, "Replay the entire raw capture buffer on attach instead of repainting the current screen")
 	_ = viper.BindPFlag(config.SB_ATTACH_FULL_CAPTURE.ViperKey, attachCmd.Flags().Lookup("full-capture"))
 	attachCmd.Flags().
-		Bool("clear-screen", false, "Clear the terminal before repainting the session screen on attach (legacy behavior); the default paints below existing content. No effect with --full-capture, whose replay is raw history")
-	_ = viper.BindPFlag(config.SB_ATTACH_CLEAR_SCREEN.ViperKey, attachCmd.Flags().Lookup("clear-screen"))
+		Bool("clear-on-attach", false, "Clear the terminal before repainting the session screen on attach (legacy behavior); the default paints below existing content. No effect with --full-capture, whose replay is raw history")
+	_ = viper.BindPFlag(config.SB_ATTACH_CLEAR_ON_ATTACH.ViperKey, attachCmd.Flags().Lookup("clear-on-attach"))
 	attachCmd.Flags().
-		Bool("clear-screen-on-detach", false, "Erase the screen after detaching (^] twice or sb detach); the default leaves screen content untouched")
+		Bool("clear-on-detach", false, "Erase the screen after detaching (^] twice or sb detach); the default leaves screen content untouched")
 	_ = viper.BindPFlag(
-		config.SB_ATTACH_CLEAR_SCREEN_ON_DETACH.ViperKey,
-		attachCmd.Flags().Lookup("clear-screen-on-detach"),
+		config.SB_ATTACH_CLEAR_ON_DETACH.ViperKey,
+		attachCmd.Flags().Lookup("clear-on-detach"),
 	)
 }
 
@@ -210,8 +210,8 @@ func run(
 
 	disableDetach := viper.GetBool(config.SB_ATTACH_DISABLE_DETACH_KEYSTROKE.ViperKey)
 	fullCapture := viper.GetBool(config.SB_ATTACH_FULL_CAPTURE.ViperKey)
-	clearScreen := viper.GetBool(config.SB_ATTACH_CLEAR_SCREEN.ViperKey)
-	clearScreenOnDetach := viper.GetBool(config.SB_ATTACH_CLEAR_SCREEN_ON_DETACH.ViperKey)
+	clearOnAttach := viper.GetBool(config.SB_ATTACH_CLEAR_ON_ATTACH.ViperKey)
+	clearOnDetach := viper.GetBool(config.SB_ATTACH_CLEAR_ON_DETACH.ViperKey)
 
 	logger.DebugContext(
 		ctx,
@@ -222,10 +222,10 @@ func run(
 		disableDetach,
 		"full_capture",
 		fullCapture,
-		"clear_screen",
-		clearScreen,
-		"clear_screen_on_detach",
-		clearScreenOnDetach,
+		"clear_on_attach",
+		clearOnAttach,
+		"clear_on_detach",
+		clearOnDetach,
 	)
 
 	runErr := attach.Run(ctx, attach.Options{
@@ -235,8 +235,8 @@ func run(
 		Stderr:                 os.Stderr,
 		DisableDetachKeystroke: disableDetach,
 		FullCapture:            fullCapture,
-		ClearScreen:            clearScreen,
-		ClearScreenOnDetach:    clearScreenOnDetach,
+		ClearOnAttach:          clearOnAttach,
+		ClearOnDetach:          clearOnDetach,
 		Logger:                 logger,
 	})
 	if runErr == nil || errors.Is(runErr, context.Canceled) || errors.Is(runErr, errdefs.ErrContextDone) {
diff --git a/cmd/sbsh/sbsh.go b/cmd/sbsh/sbsh.go
@@ -212,9 +212,9 @@ You can also use sbsh with parameters. For example:
 					TerminalSpec:    terminalSpec,
 					DetachKeystroke: !disableDetach, // Invert flag: when disable-detach is true, DetachKeystroke is false
 					ClientMode:      api.RunNewTerminal,
-					ClearScreen:     viper.GetBool(config.SBSH_CLIENT_CLEAR_SCREEN.ViperKey),
-					ClearScreenOnDetach: viper.GetBool(
-						config.SBSH_CLIENT_CLEAR_SCREEN_ON_DETACH.ViperKey,
+					ClearOnAttach:   viper.GetBool(config.SBSH_CLIENT_CLEAR_ON_ATTACH.ViperKey),
+					ClearOnDetach: viper.GetBool(
+						config.SBSH_CLIENT_CLEAR_ON_DETACH.ViperKey,
 					),
 				},
 			}
@@ -315,16 +315,16 @@ func setClientFlags(rootCmd *cobra.Command) error {
 	}
 
 	rootCmd.Flags().
-		Bool("clear-screen", false, "Clear the terminal before painting the session screen (legacy behavior); the default paints below existing content")
-	if err := viper.BindPFlag(config.SBSH_CLIENT_CLEAR_SCREEN.ViperKey, rootCmd.Flags().Lookup("clear-screen")); err != nil {
+		Bool("clear-on-attach", false, "Clear the terminal before painting the session screen (legacy behavior); the default paints below existing content")
+	if err := viper.BindPFlag(config.SBSH_CLIENT_CLEAR_ON_ATTACH.ViperKey, rootCmd.Flags().Lookup("clear-on-attach")); err != nil {
 		return err
 	}
 
 	rootCmd.Flags().
-		Bool("clear-screen-on-detach", false, "Erase the screen after detaching (^] twice or sb detach); the default leaves screen content untouched")
+		Bool("clear-on-detach", false, "Erase the screen after detaching (^] twice or sb detach); the default leaves screen content untouched")
 	if err := viper.BindPFlag(
-		config.SBSH_CLIENT_CLEAR_SCREEN_ON_DETACH.ViperKey,
-		rootCmd.Flags().Lookup("clear-screen-on-detach"),
+		config.SBSH_CLIENT_CLEAR_ON_DETACH.ViperKey,
+		rootCmd.Flags().Lookup("clear-on-detach"),
 	); err != nil {
 		return err
 	}
diff --git a/internal/client/clientrunner/io.go b/internal/client/clientrunner/io.go
@@ -151,11 +151,11 @@ func (sr *Exec) attach() error {
 	var response struct{}
 	sr.metadataMu.RLock()
 	fullCapture := sr.metadata.Spec.FullCapture
-	clearScreen := sr.metadata.Spec.ClearScreen
+	clearOnAttach := sr.metadata.Spec.ClearOnAttach
 	sr.metadataMu.RUnlock()
 	conn, err := sr.terminalClient.Attach(
 		sr.ctx,
-		&api.AttachRequest{ClientID: sr.id, FullCapture: fullCapture, ClearScreen: clearScreen},
+		&api.AttachRequest{ClientID: sr.id, FullCapture: fullCapture, ClearOnAttach: clearOnAttach},
 		&response,
 	)
 	if err != nil {
diff --git a/internal/client/clientrunner/io_extra_test.go b/internal/client/clientrunner/io_extra_test.go
@@ -68,13 +68,13 @@ func TestAttach_Success(t *testing.T) {
 		},
 	}
 	sr.metadata.Spec.FullCapture = true
-	sr.metadata.Spec.ClearScreen = true
+	sr.metadata.Spec.ClearOnAttach = true
 
 	if err := sr.attach(); err != nil {
 		t.Fatalf("attach: %v", err)
 	}
-	if gotReq == nil || gotReq.ClientID != sr.id || !gotReq.FullCapture || !gotReq.ClearScreen {
-		t.Fatalf("attach request = %+v; want ClientID=%q FullCapture=true ClearScreen=true", gotReq, sr.id)
+	if gotReq == nil || gotReq.ClientID != sr.id || !gotReq.FullCapture || !gotReq.ClearOnAttach {
+		t.Fatalf("attach request = %+v; want ClientID=%q FullCapture=true ClearOnAttach=true", gotReq, sr.id)
 	}
 	if sr.ioConn != clientConn {
 		t.Fatal("attach did not store the returned connection in ioConn")
diff --git a/internal/client/clientrunner/lifecycle.go b/internal/client/clientrunner/lifecycle.go
@@ -236,15 +236,15 @@ func (sr *Exec) Detach() error {
 	// funnel through here, so this is the only place the opt-in detach
 	// clear applies; the Close()/process-exit paths always pass false.
 	sr.metadataMu.RLock()
-	clearScreen := sr.metadata.Spec.ClearScreenOnDetach
+	clearOnDetach := sr.metadata.Spec.ClearOnDetach
 	sr.metadataMu.RUnlock()
 
 	if err := sr.terminalClient.Detach(ctx, &sr.id); err != nil {
 		sr.logger.Warn("Detach RPC failed; restoring parent terminal anyway", "client_id", sr.id, "error", err)
 		// Suppress the "Detached" banner — it would be misleading when the RPC
 		// failed — but the restore still runs. See #383. The opt-in clear still
 		// applies: the user committed to detaching either way.
-		sr.restoreParentTerminal("", clearScreen)
+		sr.restoreParentTerminal("", clearOnDetach)
 		return err
 	}
 
@@ -253,7 +253,7 @@ func (sr *Exec) Detach() error {
 	// message so it is written after the inbound copier has drained (no
 	// interleave with mid-flush remote bytes) but while raw mode is still active
 	// so the embedded \r\n behaves. See issues #364 and #383.
-	sr.restoreParentTerminal("\x1b[93m\r\nDetached\x1b[0m\r\n", clearScreen)
+	sr.restoreParentTerminal("\x1b[93m\r\nDetached\x1b[0m\r\n", clearOnDetach)
 
 	return nil
 }
diff --git a/internal/client/clientrunner/restore_linux_test.go b/internal/client/clientrunner/restore_linux_test.go
@@ -380,13 +380,13 @@ func TestDetach_CursorStaysAfterBanner(t *testing.T) {
 	}
 }
 
-// TestDetach_OptInClearScreen asserts --clear-screen-on-detach performs a real
+// TestDetach_OptInClearScreen asserts --clear-on-detach performs a real
 // screen erase — the \x1b[2J\x1b[H bytes on client stdout after the normalize
 // sequence — not merely a cursor-home.
 func TestDetach_OptInClearScreen(t *testing.T) {
 	sr, _ := newAttachedExec(t)
 	sr.terminalClient = &mockTerminalClient{}
-	sr.metadata.Spec.ClearScreenOnDetach = true
+	sr.metadata.Spec.ClearOnDetach = true
 
 	out := captureDetachOutput(t, sr)
 
@@ -414,7 +414,7 @@ func TestDetach_OptInClearScreen_RPCFailure(t *testing.T) {
 	sr.terminalClient = &mockTerminalClient{
 		detachFunc: func(_ context.Context, _ *api.ID) error { return errMockDetach },
 	}
-	sr.metadata.Spec.ClearScreenOnDetach = true
+	sr.metadata.Spec.ClearOnDetach = true
 
 	r, w, errPipe := os.Pipe()
 	if errPipe != nil {
diff --git a/internal/client/clientrunner/terminal.go b/internal/client/clientrunner/terminal.go
@@ -103,7 +103,7 @@ const escRestoreParentTerm = "\x1b7" + // save cursor (DECSC) so ?1049l's DECRC
 	"\x1b[?2004l" // disable bracketed paste
 
 // escClearScreenHome is the full screen erase + cursor home the opt-in
-// --clear-screen-on-detach flag emits after escRestoreParentTerm — a real
+// --clear-on-detach flag emits after escRestoreParentTerm — a real
 // erase, not merely a cursor-home. See issue #425.
 const escClearScreenHome = "\x1b[2J\x1b[H"
 
@@ -122,7 +122,7 @@ const escClearScreenHome = "\x1b[2J\x1b[H"
 //
 // clearScreen, when true, emits a full screen erase + home immediately after
 // the normalize sequence — the user-detach paths pass the opt-in
-// ClearScreenOnDetach spec value; the Close()/process-exit paths pass false
+// ClearOnDetach spec value; the Close()/process-exit paths pass false
 // so they keep the screen content untouched. See issue #425.
 func (sr *Exec) restoreParentTerminal(postDrainMsg string, clearScreen bool) {
 	sr.restoreOnce.Do(func() {
diff --git a/internal/terminal/terminalrunner/connections_attach_paint_test.go b/internal/terminal/terminalrunner/connections_attach_paint_test.go
@@ -47,7 +47,7 @@ func TestInitialAttachPaintRepaintsScreen(t *testing.T) {
 	}
 }
 
-// --clear-screen (clearScreen=true) restores the legacy clear-and-repaint
+// --clear-on-attach (clearScreen=true) restores the legacy clear-and-repaint
 // seed paint.
 func TestInitialAttachPaintClearScreen(t *testing.T) {
 	sr := newScreenExec()
diff --git a/internal/terminal/terminalrunner/lifecycle.go b/internal/terminal/terminalrunner/lifecycle.go
@@ -496,7 +496,7 @@ func (sr *Exec) Attach(req *api.AttachRequest, response *api.ResponseWithFD) err
 		return fmt.Errorf("Attach: terminal not running")
 	}
 
-	cliFD, err := sr.CreateNewClient(&req.ClientID, req.FullCapture, req.ClearScreen)
+	cliFD, err := sr.CreateNewClient(&req.ClientID, req.FullCapture, req.ClearOnAttach)
 	if err != nil {
 		return err
 	}
@@ -511,7 +511,7 @@ func (sr *Exec) Attach(req *api.AttachRequest, response *api.ResponseWithFD) err
 		"Attach response",
 		"id", req.ClientID,
 		"fullCapture", req.FullCapture,
-		"clearScreen", req.ClearScreen,
+		"clearOnAttach", req.ClearOnAttach,
 		"ok", payload.OK,
 		"fds", fds,
 	)
diff --git a/internal/terminal/terminalrunner/terminal_runner_exec.go b/internal/terminal/terminalrunner/terminal_runner_exec.go
@@ -156,7 +156,7 @@ type ioClient struct {
 	// clearScreen opts the repaint into the legacy clear-and-repaint
 	// (erase screen + home + absolute positioning) instead of the default
 	// relative paint that preserves the client's prior terminal content.
-	// Set by the --clear-screen flag; ignored on the fullCapture path,
+	// Set by the --clear-on-attach flag; ignored on the fullCapture path,
 	// whose replay is raw history.
 	clearScreen bool
 }
diff --git a/internal/terminal/terminalrunner/terminal_screen.go b/internal/terminal/terminalrunner/terminal_screen.go
@@ -203,7 +203,7 @@ func (m *screenModel) repaint(clearScreen bool) []byte {
 // writeAbsolutePaint emits the legacy clear-and-repaint: erase the whole
 // screen, home, one absolutely positioned write per row, absolute final
 // cursor. Used for alt-screen sessions (entering the alt buffer first) and
-// for the --clear-screen opt-in on the normal buffer.
+// for the --clear-on-attach opt-in on the normal buffer.
 func writeAbsolutePaint(b *strings.Builder, lines []string, cur vt10x.Cursor, altScreen bool) {
 	if altScreen {
 		b.WriteString(escEnterAltScreen)
diff --git a/internal/terminal/terminalrunner/terminal_screen_test.go b/internal/terminal/terminalrunner/terminal_screen_test.go
@@ -231,7 +231,7 @@ func TestRepaintEmptyScreen(t *testing.T) {
 	}
 }
 
-// --clear-screen restores the legacy behavior on an empty screen: clear +
+// --clear-on-attach restores the legacy behavior on an empty screen: clear +
 // home, cursor at row 1 col 1, visible.
 func TestRepaintEmptyScreenClearScreen(t *testing.T) {
 	m := newScreenModel()
@@ -267,7 +267,7 @@ func TestRepaintPlainOutput(t *testing.T) {
 	}
 }
 
-// --clear-screen restores the legacy paint: clear + home + absolute per-row
+// --clear-on-attach restores the legacy paint: clear + home + absolute per-row
 // positioning, no newlines (which would stairstep in raw mode).
 func TestRepaintPlainOutputClearScreen(t *testing.T) {
 	m := newScreenModel()
diff --git a/pkg/api/client.go b/pkg/api/client.go
@@ -47,22 +47,22 @@ type ClientSpec struct {
 	// Attach RPC; the server owns the replay. Set by the --full-capture flag.
 	FullCapture bool `json:"fullCapture,omitempty"`
 
-	// ClearScreen, when true, makes the attach repaint clear the client's
+	// ClearOnAttach, when true, makes the attach repaint clear the client's
 	// terminal and paint with absolute positioning (the legacy behavior)
 	// instead of the default relative paint that preserves prior terminal
 	// content. Forwarded to the terminal server via the Attach RPC. Set by
-	// the --clear-screen flag; the full-capture replay is raw history and
+	// the --clear-on-attach flag; the full-capture replay is raw history and
 	// is unaffected by it.
-	ClearScreen bool `json:"clearScreen,omitempty"`
+	ClearOnAttach bool `json:"clearOnAttach,omitempty"`
 
-	// ClearScreenOnDetach, when true, makes the client erase the whole
+	// ClearOnDetach, when true, makes the client erase the whole
 	// screen (\x1b[2J\x1b[H) after the parent-terminal restore sequence on
 	// the user-detach path (^]^] keystroke or `sb detach`). The default
 	// leaves the screen content untouched with the cursor on the line
 	// after the Detached banner. Process-exit teardown paths never clear.
-	// Set by the --clear-screen-on-detach flag; client-local, never sent
+	// Set by the --clear-on-detach flag; client-local, never sent
 	// to the terminal server.
-	ClearScreenOnDetach bool `json:"clearScreenOnDetach,omitempty"`
+	ClearOnDetach bool `json:"clearOnDetach,omitempty"`
 
 	// ClientMode determines whether the client runs a new terminal or attaches to an existing one.
 	ClientMode ClientMode `json:"clientMode,omitempty"`
diff --git a/pkg/api/terminal.go b/pkg/api/terminal.go
@@ -307,15 +307,15 @@ type SubscribeRequest struct {
 // capture buffer on attach — the legacy behavior — instead of the default
 // bounded repaint synthesized from the live screen model. It mirrors the
 // CLI's --full-capture flag, which plumbs through ClientSpec.FullCapture.
-// ClearScreen opts the repaint into the legacy clear-and-repaint (erase
+// ClearOnAttach opts the repaint into the legacy clear-and-repaint (erase
 // screen + absolute positioning) instead of the default relative paint
 // that preserves the client's prior terminal content; it mirrors the CLI's
-// --clear-screen flag via ClientSpec.ClearScreen and has no effect on the
+// --clear-on-attach flag via ClientSpec.ClearOnAttach and has no effect on the
 // full-capture replay, which is raw history.
 type AttachRequest struct {
-	ClientID    ID
-	FullCapture bool
-	ClearScreen bool
+	ClientID      ID
+	FullCapture   bool
+	ClearOnAttach bool
 }
 
 // ResponseWithFD carries a normal JSON result plus OOB file descriptors.
diff --git a/pkg/attach/attach.go b/pkg/attach/attach.go
@@ -62,18 +62,18 @@ type Options struct {
 	// It flows through ClientSpec.FullCapture to the terminal server.
 	FullCapture bool
 
-	// ClearScreen, when true, makes the attach repaint clear the terminal
+	// ClearOnAttach, when true, makes the attach repaint clear the terminal
 	// and paint with absolute positioning (the legacy behavior) instead of
 	// the default relative paint that preserves prior terminal content. It
-	// flows through ClientSpec.ClearScreen to the terminal server. The
+	// flows through ClientSpec.ClearOnAttach to the terminal server. The
 	// full-capture replay is raw history and is unaffected by it.
-	ClearScreen bool
+	ClearOnAttach bool
 
-	// ClearScreenOnDetach, when true, erases the whole screen after the
+	// ClearOnDetach, when true, erases the whole screen after the
 	// parent-terminal restore on the user-detach path (^]^] or `sb
 	// detach`). The default leaves screen content untouched. It flows
-	// through ClientSpec.ClearScreenOnDetach and stays client-local.
-	ClearScreenOnDetach bool
+	// through ClientSpec.ClearOnDetach and stays client-local.
+	ClearOnDetach bool
 
 	// Logger is a structured logger for diagnostics. Defaults to a
 	// discard logger when nil so embedders aren't forced to wire one
@@ -142,14 +142,14 @@ func Run(ctx context.Context, opts Options) error {
 			Annotations: make(map[string]string),
 		},
 		Spec: api.ClientSpec{
-			ID:                  api.ID(clientID),
-			RunPath:             runDir,
-			SockerCtrl:          clientCtrlSocket,
-			ClientMode:          api.AttachToTerminal,
-			DetachKeystroke:     !opts.DisableDetachKeystroke,
-			FullCapture:         opts.FullCapture,
-			ClearScreen:         opts.ClearScreen,
-			ClearScreenOnDetach: opts.ClearScreenOnDetach,
+			ID:              api.ID(clientID),
+			RunPath:         runDir,
+			SockerCtrl:      clientCtrlSocket,
+			ClientMode:      api.AttachToTerminal,
+			DetachKeystroke: !opts.DisableDetachKeystroke,
+			FullCapture:     opts.FullCapture,
+			ClearOnAttach:   opts.ClearOnAttach,
+			ClearOnDetach:   opts.ClearOnDetach,
 			TerminalSpec: &api.TerminalSpec{
 				SocketFile: opts.SocketPath,
 			},
diff --git a/pkg/builder/client.go b/pkg/builder/client.go
diff --git a/pkg/builder/client_test.go b/pkg/builder/client_test.go
diff --git a/pkg/spawn/client.go b/pkg/spawn/client.go
diff --git a/pkg/spawn/client_test.go b/pkg/spawn/client_test.go

Original file line number	Diff line number	Diff line change
`@@ -68,13 +68,13 @@ func TestAttach_Success(t *testing.T) {`
`68`	`68`	`},`
`69`	`69`	`}`
`70`	`70`	`sr.metadata.Spec.FullCapture = true`
`71`		`- sr.metadata.Spec.ClearScreen = true`
	`71`	`+ sr.metadata.Spec.ClearOnAttach = true`
`72`	`72`
`73`	`73`	`if err := sr.attach(); err != nil {`
`74`	`74`	`t.Fatalf("attach: %v", err)`
`75`	`75`	`}`
`76`		`- if gotReq == nil \|\| gotReq.ClientID != sr.id \|\| !gotReq.FullCapture \|\| !gotReq.ClearScreen {`
`77`		`- t.Fatalf("attach request = %+v; want ClientID=%q FullCapture=true ClearScreen=true", gotReq, sr.id)`
	`76`	`+ if gotReq == nil \|\| gotReq.ClientID != sr.id \|\| !gotReq.FullCapture \|\| !gotReq.ClearOnAttach {`
	`77`	`+ t.Fatalf("attach request = %+v; want ClientID=%q FullCapture=true ClearOnAttach=true", gotReq, sr.id)`
`78`	`78`	`}`
`79`	`79`	`if sr.ioConn != clientConn {`
`80`	`80`	`t.Fatal("attach did not store the returned connection in ioConn")`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ func TestInitialAttachPaintRepaintsScreen(t *testing.T) {`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
`50`		`-// --clear-screen (clearScreen=true) restores the legacy clear-and-repaint`
	`50`	`+// --clear-on-attach (clearScreen=true) restores the legacy clear-and-repaint`
`51`	`51`	`// seed paint.`
`52`	`52`	`func TestInitialAttachPaintClearScreen(t *testing.T) {`
`53`	`53`	`sr := newScreenExec()`
Original file line number	Diff line number	Diff line change
`@@ -496,7 +496,7 @@ func (sr Exec) Attach(req api.AttachRequest, response *api.ResponseWithFD) err`
`496`	`496`	`return fmt.Errorf("Attach: terminal not running")`
`497`	`497`	`}`
`498`	`498`
`499`		`- cliFD, err := sr.CreateNewClient(&req.ClientID, req.FullCapture, req.ClearScreen)`
	`499`	`+ cliFD, err := sr.CreateNewClient(&req.ClientID, req.FullCapture, req.ClearOnAttach)`
`500`	`500`	`if err != nil {`
`501`	`501`	`return err`
`502`	`502`	`}`
`@@ -511,7 +511,7 @@ func (sr Exec) Attach(req api.AttachRequest, response *api.ResponseWithFD) err`
`511`	`511`	`"Attach response",`
`512`	`512`	`"id", req.ClientID,`
`513`	`513`	`"fullCapture", req.FullCapture,`
`514`		`- "clearScreen", req.ClearScreen,`
	`514`	`+ "clearOnAttach", req.ClearOnAttach,`
`515`	`515`	`"ok", payload.OK,`
`516`	`516`	`"fds", fds,`
`517`	`517`	`)`