Oct 8, 2025 · Oct 8, 2025
diff --git a/agent/agent_test.go b/agent/agent_test.go

 //nolint:dogsled
 conn, agentClient, _, _, _ := setupAgent(t, agentsdk.Manifest{}, 0)
 idConnectionReport := uuid.New()
 id := uuid.New()

 // Test that the connection is reported. This must be tested in the
 // first connection because we care about verifying all of these.
 netConn0, err := conn.ReconnectingPTY(ctx,id, 80, 80, "bash --norc")
 netConn0, err := conn.ReconnectingPTY(ctx,idConnectionReport, 80, 80, "bash --norc")
 require.NoError(t, err)
 _ = netConn0.Close()
 assertConnectionReport(t, agentClient, proto.Connection_RECONNECTING_PTY, 0, "")
diff --git a/agent/reconnectingpty/screen.go b/agent/reconnectingpty/screen.go

 // screenReconnectingPTY provides a reconnectable PTY via `screen`.
 type screenReconnectingPTY struct {
 logger  slog.Logger
 execer  agentexec.Execer
 command *pty.Cmd

 // own which causes it to spawn with the specified size.
 func newScreen(ctx context.Context, logger slog.Logger, execer agentexec.Execer, cmd *pty.Cmd, options *Options) *screenReconnectingPTY {
 rpty := &screenReconnectingPTY{
 logger:  logger,
 execer:  execer,
 command: cmd,
 metrics: options.Metrics,

 ptty, process, err := rpty.doAttach(ctx, conn, height, width, logger)
 if err != nil {
 logger.Debug(ctx, "unable to attach to screen reconnecting pty", slog.Error(err))
 if errors.Is(err, context.Canceled) {
 // Likely the process was too short-lived and canceled the version command.
 // TODO: Is it worth distinguishing between that and a cancel from the
 }
 return err
 }
 logger.Debug(ctx, "attached to screen reconnecting pty")

 defer func() {
 // Log only for debugging since the process might have already exited on its
 }

 func (rpty *screenReconnectingPTY) Close(err error) {
 rpty.logger.Debug(context.Background(), "closing screen reconnecting pty", slog.Error(err))
 // The closing state change will be handled by the lifecycle.
 rpty.state.setState(StateClosing, err)
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1807,11 +1807,12 @@ func TestAgent_ReconnectingPTY(t *testing.T) {

		//nolint:dogsled
		conn, agentClient, _, _, _ := setupAgent(t, agentsdk.Manifest{}, 0)
		idConnectionReport := uuid.New()
		id := uuid.New()

		// Test that the connection is reported. This must be tested in the
		// first connection because we care about verifying all of these.
		netConn0, err := conn.ReconnectingPTY(ctx,id, 80, 80, "bash --norc")
		netConn0, err := conn.ReconnectingPTY(ctx,idConnectionReport, 80, 80, "bash --norc")
		require.NoError(t, err)
		_ = netConn0.Close()
		assertConnectionReport(t, agentClient, proto.Connection_RECONNECTING_PTY, 0, "")
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -25,6 +25,7 @@ import (

		// screenReconnectingPTY provides a reconnectable PTY via `screen`.
		type screenReconnectingPTY struct {
		logger slog.Logger
		execer agentexec.Execer
		command *pty.Cmd

Expand DownExpand Up		@@ -62,6 +63,7 @@ type screenReconnectingPTY struct {
		// own which causes it to spawn with the specified size.
		func newScreen(ctx context.Context, logger slog.Logger, execer agentexec.Execer, cmd pty.Cmd, options Options) *screenReconnectingPTY {
		rpty := &screenReconnectingPTY{
		logger: logger,
		execer: execer,
		command: cmd,
		metrics: options.Metrics,
Expand DownExpand Up		@@ -173,6 +175,7 @@ func (rpty *screenReconnectingPTY) Attach(ctx context.Context, _ string, conn ne

		ptty, process, err := rpty.doAttach(ctx, conn, height, width, logger)
		if err != nil {
		logger.Debug(ctx, "unable to attach to screen reconnecting pty", slog.Error(err))
		if errors.Is(err, context.Canceled) {
		// Likely the process was too short-lived and canceled the version command.
		// TODO: Is it worth distinguishing between that and a cancel from the
Expand All		@@ -182,6 +185,7 @@ func (rpty *screenReconnectingPTY) Attach(ctx context.Context, _ string, conn ne
		}
		return err
		}
		logger.Debug(ctx, "attached to screen reconnecting pty")

		defer func() {
		// Log only for debugging since the process might have already exited on its
Expand DownExpand Up		@@ -403,6 +407,7 @@ func (rpty *screenReconnectingPTY) Wait() {
		}

		func (rpty *screenReconnectingPTY) Close(err error) {
		rpty.logger.Debug(context.Background(), "closing screen reconnecting pty", slog.Error(err))
		// The closing state change will be handled by the lifecycle.
		rpty.state.setState(StateClosing, err)
		}