fix(sessions): address ephemeral session review findings
- commit
- 758670c5fa86f351ab85e02cb5b2ac8954ebd55b
- author
- brice · · 2026-07-07 06:09 UTC
- parent
- 16ed5a6
- signature
- GPG Verified
CD88F9E564E0102646FB6077A1A07C7C7C3E349D· arch-gpg Verified for the committer email
5 files · +43 -17
M internal/app/daemon_integration_test.go +2 -1
| @@ -4,6 +4,7 @@ package app | |||
| 4 | 4 | ||
| 5 | 5 | import ( | |
| 6 | 6 | "context" | |
| 7 | + | "errors" | |
| 7 | 8 | "io" | |
| 8 | 9 | "log/slog" | |
| 9 | 10 | "strings" | |
| @@ -111,7 +112,7 @@ func killAll(dir string) error { | |||
| 111 | 112 | return err | |
| 112 | 113 | } | |
| 113 | 114 | _, err = tr.Recv() | |
| 114 | - | if err == io.EOF { | |
| 115 | + | if errors.Is(err, io.EOF) { | |
| 115 | 116 | return nil | |
| 116 | 117 | } | |
| 117 | 118 | return err | |
| @@ -4,6 +4,7 @@ package app | |||||
| 4 | 4 | ||||
| 5 | import ( | 5 | import ( | ||
| 6 | "context" | 6 | "context" | ||
| 7 | + | "errors" | |||
| 7 | "io" | 8 | "io" | ||
| 8 | "log/slog" | 9 | "log/slog" | ||
| 9 | "strings" | 10 | "strings" | ||
| @@ -111,7 +112,7 @@ func killAll(dir string) error { | |||||
| 111 | return err | 112 | return err | ||
| 112 | } | 113 | } | ||
| 113 | _, err = tr.Recv() | 114 | _, err = tr.Recv() | ||
| 114 | - | if err == io.EOF { | 115 | + | if errors.Is(err, io.EOF) { |
| 115 | return nil | 116 | return nil | ||
| 116 | } | 117 | } | ||
| 117 | return err | 118 | return err | ||
M internal/usecase/client/client.go +18 -14
| @@ -382,11 +382,14 @@ func attachOnce(ctx context.Context, transport ports.Transport, term ports.Termi | |||
| 382 | 382 | if err != nil { | |
| 383 | 383 | return attachResult{err: fmt.Errorf("vev: awaiting welcome: %w", err)} | |
| 384 | 384 | } | |
| 385 | + | result := func(welcomed bool, err error) attachResult { | |
| 386 | + | return attachResult{resumeToken: resumeToken, sessionName: name, welcomed: welcomed, err: err} | |
| 387 | + | } | |
| 385 | 388 | switch reply.Type { | |
| 386 | 389 | case ports.MsgWelcome: | |
| 387 | 390 | welcome, derr := ports.UnmarshalWelcome(reply.Payload) | |
| 388 | 391 | if derr != nil { | |
| 389 | - | return attachResult{err: fmt.Errorf("vev: decoding welcome: %w", derr)} | |
| 392 | + | return result(false, fmt.Errorf("vev: decoding welcome: %w", derr)) | |
| 390 | 393 | } | |
| 391 | 394 | resumeToken = welcome.ResumeToken | |
| 392 | 395 | name = welcome.SessionName | |
| @@ -395,16 +398,17 @@ func attachOnce(ctx context.Context, transport ports.Transport, term ports.Termi | |||
| 395 | 398 | case ports.MsgError: | |
| 396 | 399 | em, derr := ports.UnmarshalErrorMsg(reply.Payload) | |
| 397 | 400 | if derr != nil { | |
| 398 | - | return attachResult{err: fmt.Errorf("vev: decoding error reply: %w", derr)} | |
| 401 | + | return result(false, fmt.Errorf("vev: decoding error reply: %w", derr)) | |
| 399 | 402 | } | |
| 400 | - | return attachResult{resumeToken: resumeToken, sessionName: name, err: &ProtocolError{Code: em.Code, Text: em.Text}} | |
| 403 | + | return result(false, &ProtocolError{Code: em.Code, Text: em.Text}) | |
| 401 | 404 | default: | |
| 402 | - | return attachResult{resumeToken: resumeToken, sessionName: name, err: fmt.Errorf("vev: unexpected reply type %d before welcome", reply.Type)} | |
| 405 | + | return result(false, fmt.Errorf("vev: unexpected reply type %d before welcome", reply.Type)) | |
| 403 | 406 | } | |
| 407 | + | welcomedResult := func(err error) attachResult { return result(true, err) } | |
| 404 | 408 | ||
| 405 | 409 | // 3. Enter raw mode after Welcome; Run owns restoration. | |
| 406 | 410 | if err := enterRaw(); err != nil { | |
| 407 | - | return attachResult{resumeToken: resumeToken, sessionName: name, welcomed: true, err: err} | |
| 411 | + | return welcomedResult(err) | |
| 408 | 412 | } | |
| 409 | 413 | clearStatus() | |
| 410 | 414 | ||
| @@ -449,9 +453,9 @@ func attachOnce(ctx context.Context, transport ports.Transport, term ports.Termi | |||
| 449 | 453 | // context was cancelled. A queued sender error takes priority. | |
| 450 | 454 | select { | |
| 451 | 455 | case serr := <-sendErrCh: | |
| 452 | - | return attachResult{resumeToken: resumeToken, sessionName: name, welcomed: true, err: fmt.Errorf("vev: sending to daemon: %w", serr)} | |
| 456 | + | return welcomedResult(fmt.Errorf("vev: sending to daemon: %w", serr)) | |
| 453 | 457 | default: | |
| 454 | - | return attachResult{resumeToken: resumeToken, sessionName: name, welcomed: true} | |
| 458 | + | return welcomedResult(nil) | |
| 455 | 459 | } | |
| 456 | 460 | case <-colorQueryCh: | |
| 457 | 461 | if err := term.QueryColors(); err != nil { | |
| @@ -460,21 +464,21 @@ func attachOnce(ctx context.Context, transport ports.Transport, term ports.Termi | |||
| 460 | 464 | case r := <-recvCh: | |
| 461 | 465 | if r.err != nil { | |
| 462 | 466 | if errors.Is(r.err, io.EOF) { | |
| 463 | - | return attachResult{resumeToken: resumeToken, sessionName: name, welcomed: true, err: fmt.Errorf("vev: daemon vanished (missing: %v): %w", ms.missing(), r.err)} | |
| 467 | + | return welcomedResult(fmt.Errorf("vev: daemon vanished (missing: %v): %w", ms.missing(), r.err)) | |
| 464 | 468 | } | |
| 465 | - | return attachResult{resumeToken: resumeToken, sessionName: name, welcomed: true, err: fmt.Errorf("vev: receiving from daemon: %w", r.err)} | |
| 469 | + | return welcomedResult(fmt.Errorf("vev: receiving from daemon: %w", r.err)) | |
| 466 | 470 | } | |
| 467 | 471 | switch r.frame.Type { | |
| 468 | 472 | case ports.MsgOutput: | |
| 469 | 473 | o, derr := ports.UnmarshalOutput(r.frame.Payload) | |
| 470 | 474 | if derr != nil { | |
| 471 | - | return attachResult{resumeToken: resumeToken, sessionName: name, welcomed: true, err: fmt.Errorf("vev: decoding output: %w", derr)} | |
| 475 | + | return welcomedResult(fmt.Errorf("vev: decoding output: %w", derr)) | |
| 472 | 476 | } | |
| 473 | 477 | if _, werr := term.Out().Write(o.Data); werr != nil { | |
| 474 | - | return attachResult{resumeToken: resumeToken, sessionName: name, welcomed: true, err: fmt.Errorf("vev: writing terminal output: %w", werr)} | |
| 478 | + | return welcomedResult(fmt.Errorf("vev: writing terminal output: %w", werr)) | |
| 475 | 479 | } | |
| 476 | 480 | if ferr := term.Flush(); ferr != nil { | |
| 477 | - | return attachResult{resumeToken: resumeToken, sessionName: name, welcomed: true, err: fmt.Errorf("vev: flushing terminal: %w", ferr)} | |
| 481 | + | return welcomedResult(fmt.Errorf("vev: flushing terminal: %w", ferr)) | |
| 478 | 482 | } | |
| 479 | 483 | if !ms.firstOutput { | |
| 480 | 484 | ms.firstOutput = true | |
| @@ -483,7 +487,7 @@ func attachOnce(ctx context.Context, transport ports.Transport, term ports.Termi | |||
| 483 | 487 | case ports.MsgDetached: | |
| 484 | 488 | d, derr := ports.UnmarshalDetached(r.frame.Payload) | |
| 485 | 489 | if derr != nil { | |
| 486 | - | return attachResult{resumeToken: resumeToken, sessionName: name, welcomed: true, err: fmt.Errorf("vev: decoding detached: %w", derr)} | |
| 490 | + | return welcomedResult(fmt.Errorf("vev: decoding detached: %w", derr)) | |
| 487 | 491 | } | |
| 488 | 492 | ms.detached = true | |
| 489 | 493 | if d.Reason == ports.ReasonDetach { | |
| @@ -491,7 +495,7 @@ func attachOnce(ctx context.Context, transport ports.Transport, term ports.Termi | |||
| 491 | 495 | } else { | |
| 492 | 496 | log.Warn("detached by daemon", "reason", d.Reason) | |
| 493 | 497 | } | |
| 494 | - | return attachResult{resumeToken: resumeToken, sessionName: name, welcomed: true, err: detachedResult(d.Reason)} | |
| 498 | + | return welcomedResult(detachedResult(d.Reason)) | |
| 495 | 499 | case ports.MsgPong: | |
| 496 | 500 | // Liveness reply; nothing to do. | |
| 497 | 501 | default: | |
| @@ -382,11 +382,14 @@ func attachOnce(ctx context.Context, transport ports.Transport, term ports.Termi | |||||
| 382 | if err != nil { | 382 | if err != nil { | ||
| 383 | return attachResult{err: fmt.Errorf("vev: awaiting welcome: %w", err)} | 383 | return attachResult{err: fmt.Errorf("vev: awaiting welcome: %w", err)} | ||
| 384 | } | 384 | } | ||
| 385 | + | result := func(welcomed bool, err error) attachResult { | |||
| 386 | + | return attachResult{resumeToken: resumeToken, sessionName: name, welcomed: welcomed, err: err} | |||
| 387 | + | } | |||
| 385 | switch reply.Type { | 388 | switch reply.Type { | ||
| 386 | case ports.MsgWelcome: | 389 | case ports.MsgWelcome: | ||
| 387 | welcome, derr := ports.UnmarshalWelcome(reply.Payload) | 390 | welcome, derr := ports.UnmarshalWelcome(reply.Payload) | ||
| 388 | if derr != nil { | 391 | if derr != nil { | ||
| 389 | - | return attachResult{err: fmt.Errorf("vev: decoding welcome: %w", derr)} | 392 | + | return result(false, fmt.Errorf("vev: decoding welcome: %w", derr)) |
| 390 | } | 393 | } | ||
| 391 | resumeToken = welcome.ResumeToken | 394 | resumeToken = welcome.ResumeToken | ||
| 392 | name = welcome.SessionName | 395 | name = welcome.SessionName | ||
| @@ -395,16 +398,17 @@ func attachOnce(ctx context.Context, transport ports.Transport, term ports.Termi | |||||
| 395 | case ports.MsgError: | 398 | case ports.MsgError: | ||
| 396 | em, derr := ports.UnmarshalErrorMsg(reply.Payload) | 399 | em, derr := ports.UnmarshalErrorMsg(reply.Payload) | ||
| 397 | if derr != nil { | 400 | if derr != nil { | ||
| 398 | - | return attachResult{err: fmt.Errorf("vev: decoding error reply: %w", derr)} | 401 | + | return result(false, fmt.Errorf("vev: decoding error reply: %w", derr)) |
| 399 | } | 402 | } | ||
| 400 | - | return attachResult{resumeToken: resumeToken, sessionName: name, err: &ProtocolError{Code: em.Code, Text: em.Text}} | 403 | + | return result(false, &ProtocolError{Code: em.Code, Text: em.Text}) |
| 401 | default: | 404 | default: | ||
| 402 | - | return attachResult{resumeToken: resumeToken, sessionName: name, err: fmt.Errorf("vev: unexpected reply type %d before welcome", reply.Type)} | 405 | + | return result(false, fmt.Errorf("vev: unexpected reply type %d before welcome", reply.Type)) |
| 403 | } | 406 | } | ||
| 407 | + | welcomedResult := func(err error) attachResult { return result(true, err) } | |||
| 404 | 408 | ||||
| 405 | // 3. Enter raw mode after Welcome; Run owns restoration. | 409 | // 3. Enter raw mode after Welcome; Run owns restoration. | ||
| 406 | if err := enterRaw(); err != nil { | 410 | if err := enterRaw(); err != nil { | ||
| 407 | - | return attachResult{resumeToken: resumeToken, sessionName: name, welcomed: true, err: err} | 411 | + | return welcomedResult(err) |
| 408 | } | 412 | } | ||
| 409 | clearStatus() | 413 | clearStatus() | ||
| 410 | 414 | ||||
| @@ -449,9 +453,9 @@ func attachOnce(ctx context.Context, transport ports.Transport, term ports.Termi | |||||
| 449 | // context was cancelled. A queued sender error takes priority. | 453 | // context was cancelled. A queued sender error takes priority. | ||
| 450 | select { | 454 | select { | ||
| 451 | case serr := <-sendErrCh: | 455 | case serr := <-sendErrCh: | ||
| 452 | - | return attachResult{resumeToken: resumeToken, sessionName: name, welcomed: true, err: fmt.Errorf("vev: sending to daemon: %w", serr)} | 456 | + | return welcomedResult(fmt.Errorf("vev: sending to daemon: %w", serr)) |
| 453 | default: | 457 | default: | ||
| 454 | - | return attachResult{resumeToken: resumeToken, sessionName: name, welcomed: true} | 458 | + | return welcomedResult(nil) |
| 455 | } | 459 | } | ||
| 456 | case <-colorQueryCh: | 460 | case <-colorQueryCh: | ||
| 457 | if err := term.QueryColors(); err != nil { | 461 | if err := term.QueryColors(); err != nil { | ||
| @@ -460,21 +464,21 @@ func attachOnce(ctx context.Context, transport ports.Transport, term ports.Termi | |||||
| 460 | case r := <-recvCh: | 464 | case r := <-recvCh: | ||
| 461 | if r.err != nil { | 465 | if r.err != nil { | ||
| 462 | if errors.Is(r.err, io.EOF) { | 466 | if errors.Is(r.err, io.EOF) { | ||
| 463 | - | return attachResult{resumeToken: resumeToken, sessionName: name, welcomed: true, err: fmt.Errorf("vev: daemon vanished (missing: %v): %w", ms.missing(), r.err)} | 467 | + | return welcomedResult(fmt.Errorf("vev: daemon vanished (missing: %v): %w", ms.missing(), r.err)) |
| 464 | } | 468 | } | ||
| 465 | - | return attachResult{resumeToken: resumeToken, sessionName: name, welcomed: true, err: fmt.Errorf("vev: receiving from daemon: %w", r.err)} | 469 | + | return welcomedResult(fmt.Errorf("vev: receiving from daemon: %w", r.err)) |
| 466 | } | 470 | } | ||
| 467 | switch r.frame.Type { | 471 | switch r.frame.Type { | ||
| 468 | case ports.MsgOutput: | 472 | case ports.MsgOutput: | ||
| 469 | o, derr := ports.UnmarshalOutput(r.frame.Payload) | 473 | o, derr := ports.UnmarshalOutput(r.frame.Payload) | ||
| 470 | if derr != nil { | 474 | if derr != nil { | ||
| 471 | - | return attachResult{resumeToken: resumeToken, sessionName: name, welcomed: true, err: fmt.Errorf("vev: decoding output: %w", derr)} | 475 | + | return welcomedResult(fmt.Errorf("vev: decoding output: %w", derr)) |
| 472 | } | 476 | } | ||
| 473 | if _, werr := term.Out().Write(o.Data); werr != nil { | 477 | if _, werr := term.Out().Write(o.Data); werr != nil { | ||
| 474 | - | return attachResult{resumeToken: resumeToken, sessionName: name, welcomed: true, err: fmt.Errorf("vev: writing terminal output: %w", werr)} | 478 | + | return welcomedResult(fmt.Errorf("vev: writing terminal output: %w", werr)) |
| 475 | } | 479 | } | ||
| 476 | if ferr := term.Flush(); ferr != nil { | 480 | if ferr := term.Flush(); ferr != nil { | ||
| 477 | - | return attachResult{resumeToken: resumeToken, sessionName: name, welcomed: true, err: fmt.Errorf("vev: flushing terminal: %w", ferr)} | 481 | + | return welcomedResult(fmt.Errorf("vev: flushing terminal: %w", ferr)) |
| 478 | } | 482 | } | ||
| 479 | if !ms.firstOutput { | 483 | if !ms.firstOutput { | ||
| 480 | ms.firstOutput = true | 484 | ms.firstOutput = true | ||
| @@ -483,7 +487,7 @@ func attachOnce(ctx context.Context, transport ports.Transport, term ports.Termi | |||||
| 483 | case ports.MsgDetached: | 487 | case ports.MsgDetached: | ||
| 484 | d, derr := ports.UnmarshalDetached(r.frame.Payload) | 488 | d, derr := ports.UnmarshalDetached(r.frame.Payload) | ||
| 485 | if derr != nil { | 489 | if derr != nil { | ||
| 486 | - | return attachResult{resumeToken: resumeToken, sessionName: name, welcomed: true, err: fmt.Errorf("vev: decoding detached: %w", derr)} | 490 | + | return welcomedResult(fmt.Errorf("vev: decoding detached: %w", derr)) |
| 487 | } | 491 | } | ||
| 488 | ms.detached = true | 492 | ms.detached = true | ||
| 489 | if d.Reason == ports.ReasonDetach { | 493 | if d.Reason == ports.ReasonDetach { | ||
| @@ -491,7 +495,7 @@ func attachOnce(ctx context.Context, transport ports.Transport, term ports.Termi | |||||
| 491 | } else { | 495 | } else { | ||
| 492 | log.Warn("detached by daemon", "reason", d.Reason) | 496 | log.Warn("detached by daemon", "reason", d.Reason) | ||
| 493 | } | 497 | } | ||
| 494 | - | return attachResult{resumeToken: resumeToken, sessionName: name, welcomed: true, err: detachedResult(d.Reason)} | 498 | + | return welcomedResult(detachedResult(d.Reason)) |
| 495 | case ports.MsgPong: | 499 | case ports.MsgPong: | ||
| 496 | // Liveness reply; nothing to do. | 500 | // Liveness reply; nothing to do. | ||
| 497 | default: | 501 | default: | ||
M internal/usecase/daemon/client.go +1 -1
| @@ -570,12 +570,12 @@ func (d *Daemon) detachOnSendError(sess *session, ac *attachedClient, failed por | |||
| 570 | 570 | } | |
| 571 | 571 | if sess.detachIfCurrent(ac) { | |
| 572 | 572 | d.unregisterPreview(ac) | |
| 573 | - | d.resetScreenDefaultColors(sess) | |
| 574 | 573 | if d.parkAttachment(sess, ac) { | |
| 575 | 574 | _ = ac.closeCapturedTransport(failed) | |
| 576 | 575 | d.log.Warn("parked client after send error", "session", sess.name) | |
| 577 | 576 | return | |
| 578 | 577 | } | |
| 578 | + | d.resetScreenDefaultColors(sess) | |
| 579 | 579 | _ = ac.closeCapturedTransport(failed) | |
| 580 | 580 | d.log.Warn("detached client after send error", "session", sess.name) | |
| 581 | 581 | } | |
| @@ -570,12 +570,12 @@ func (d *Daemon) detachOnSendError(sess *session, ac *attachedClient, failed por | |||||
| 570 | } | 570 | } | ||
| 571 | if sess.detachIfCurrent(ac) { | 571 | if sess.detachIfCurrent(ac) { | ||
| 572 | d.unregisterPreview(ac) | 572 | d.unregisterPreview(ac) | ||
| 573 | - | d.resetScreenDefaultColors(sess) | |||
| 574 | if d.parkAttachment(sess, ac) { | 573 | if d.parkAttachment(sess, ac) { | ||
| 575 | _ = ac.closeCapturedTransport(failed) | 574 | _ = ac.closeCapturedTransport(failed) | ||
| 576 | d.log.Warn("parked client after send error", "session", sess.name) | 575 | d.log.Warn("parked client after send error", "session", sess.name) | ||
| 577 | return | 576 | return | ||
| 578 | } | 577 | } | ||
| 578 | + | d.resetScreenDefaultColors(sess) | |||
| 579 | _ = ac.closeCapturedTransport(failed) | 579 | _ = ac.closeCapturedTransport(failed) | ||
| 580 | d.log.Warn("detached client after send error", "session", sess.name) | 580 | d.log.Warn("detached client after send error", "session", sess.name) | ||
| 581 | } | 581 | } | ||
M internal/usecase/daemon/daemon.go +3 -1
| @@ -15,7 +15,9 @@ | |||
| 15 | 15 | // scheduler). | |
| 16 | 16 | // - The daemon exits (Serve returns) when the last session is removed, or | |
| 17 | 17 | // when the parent context is cancelled (graceful shutdown notifies any | |
| 18 | - | // attached clients with ReasonServerShutdown). | |
| 18 | + | // attached clients with ReasonServerShutdown). Client detach does not end | |
| 19 | + | // a session: ephemeral sessions stay in memory until explicitly killed or | |
| 20 | + | // until the daemon exits, and named sessions can also persist on disk. | |
| 19 | 21 | // | |
| 20 | 22 | // Locking: a pane's screen/scrollback and per-client renderer shadow are | |
| 21 | 23 | // guarded by pane.mu/tab.mu as appropriate; the attached-client pointer by | |
| @@ -15,7 +15,9 @@ | |||||
| 15 | // scheduler). | 15 | // scheduler). | ||
| 16 | // - The daemon exits (Serve returns) when the last session is removed, or | 16 | // - The daemon exits (Serve returns) when the last session is removed, or | ||
| 17 | // when the parent context is cancelled (graceful shutdown notifies any | 17 | // when the parent context is cancelled (graceful shutdown notifies any | ||
| 18 | - | // attached clients with ReasonServerShutdown). | 18 | + | // attached clients with ReasonServerShutdown). Client detach does not end |
| 19 | + | // a session: ephemeral sessions stay in memory until explicitly killed or | |||
| 20 | + | // until the daemon exits, and named sessions can also persist on disk. | |||
| 19 | // | 21 | // | ||
| 20 | // Locking: a pane's screen/scrollback and per-client renderer shadow are | 22 | // Locking: a pane's screen/scrollback and per-client renderer shadow are | ||
| 21 | // guarded by pane.mu/tab.mu as appropriate; the attached-client pointer by | 23 | // guarded by pane.mu/tab.mu as appropriate; the attached-client pointer by | ||
M internal/usecase/daemon/status_test.go +19 -0
| @@ -363,6 +363,25 @@ func TestDetachOnSendErrorResetsScreenDefaultColors(t *testing.T) { | |||
| 363 | 363 | require.Empty(t, got, "OSC 10/11 queries must be swallowed once the client that reported these colors is gone") | |
| 364 | 364 | } | |
| 365 | 365 | ||
| 366 | + | func TestDetachOnSendErrorParkPreservesScreenDefaultColors(t *testing.T) { | |
| 367 | + | p, release := newBlockingPTY(t) | |
| 368 | + | d, sess, ac, _ := newManualSessionWithPTYs(t, p) | |
| 369 | + | defer release() | |
| 370 | + | ac.resumeCapable = true | |
| 371 | + | d.applyTheme(sess, ac, ports.Theme{ | |
| 372 | + | HasForeground: true, Foreground: renderer.RGB{R: 7, G: 8, B: 9}, | |
| 373 | + | HasBackground: true, Background: renderer.RGB{R: 10, G: 11, B: 12}, | |
| 374 | + | }) | |
| 375 | + | ||
| 376 | + | d.detachOnSendError(sess, ac, ac.transport()) | |
| 377 | + | ||
| 378 | + | tb := sess.activeTab() | |
| 379 | + | var got []byte | |
| 380 | + | tb.focusedPane().screen.OnResponse = func(b []byte) { got = append(got, b...) } | |
| 381 | + | tb.focusedPane().screen.Write([]byte("\x1b]10;?\a\x1b]11;?\a")) | |
| 382 | + | require.NotEmpty(t, got, "parked clients resume the same attachment, so screen default colors must be preserved") | |
| 383 | + | } | |
| 384 | + | ||
| 366 | 385 | func TestApplyThemeIgnoresReplacedClient(t *testing.T) { | |
| 367 | 386 | p, release := newBlockingPTY(t) | |
| 368 | 387 | d, sess, old, _ := newManualSessionWithPTYs(t, p) | |
| @@ -363,6 +363,25 @@ func TestDetachOnSendErrorResetsScreenDefaultColors(t *testing.T) { | |||||
| 363 | require.Empty(t, got, "OSC 10/11 queries must be swallowed once the client that reported these colors is gone") | 363 | require.Empty(t, got, "OSC 10/11 queries must be swallowed once the client that reported these colors is gone") | ||
| 364 | } | 364 | } | ||
| 365 | 365 | ||||
| 366 | + | func TestDetachOnSendErrorParkPreservesScreenDefaultColors(t *testing.T) { | |||
| 367 | + | p, release := newBlockingPTY(t) | |||
| 368 | + | d, sess, ac, _ := newManualSessionWithPTYs(t, p) | |||
| 369 | + | defer release() | |||
| 370 | + | ac.resumeCapable = true | |||
| 371 | + | d.applyTheme(sess, ac, ports.Theme{ | |||
| 372 | + | HasForeground: true, Foreground: renderer.RGB{R: 7, G: 8, B: 9}, | |||
| 373 | + | HasBackground: true, Background: renderer.RGB{R: 10, G: 11, B: 12}, | |||
| 374 | + | }) | |||
| 375 | + | ||||
| 376 | + | d.detachOnSendError(sess, ac, ac.transport()) | |||
| 377 | + | ||||
| 378 | + | tb := sess.activeTab() | |||
| 379 | + | var got []byte | |||
| 380 | + | tb.focusedPane().screen.OnResponse = func(b []byte) { got = append(got, b...) } | |||
| 381 | + | tb.focusedPane().screen.Write([]byte("\x1b]10;?\a\x1b]11;?\a")) | |||
| 382 | + | require.NotEmpty(t, got, "parked clients resume the same attachment, so screen default colors must be preserved") | |||
| 383 | + | } | |||
| 384 | + | ||||
| 366 | func TestApplyThemeIgnoresReplacedClient(t *testing.T) { | 385 | func TestApplyThemeIgnoresReplacedClient(t *testing.T) { | ||
| 367 | p, release := newBlockingPTY(t) | 386 | p, release := newBlockingPTY(t) | ||
| 368 | d, sess, old, _ := newManualSessionWithPTYs(t, p) | 387 | d, sess, old, _ := newManualSessionWithPTYs(t, p) | ||