Skip to content

release: merge develop into main#66

Merged
pallyoung merged 31 commits into
mainfrom
develop
May 26, 2026
Merged

release: merge develop into main#66
pallyoung merged 31 commits into
mainfrom
develop

Conversation

@pallyoung
Copy link
Copy Markdown
Contributor

Summary

  • merge the current develop branch into main
  • include the existing patch changeset for @spencer-kit/coder-studio
  • ship the active session border z-index fix needed for full verification

Verification

  • fnm exec --using 24.16.0 pnpm ci:verify

pallyoung added 30 commits May 20, 2026 02:42
…rge-check-agentic-workspace-phase-1-positioning

# Conflicts:
#	packages/server/src/__tests__/session-commands.test.ts
#	packages/server/src/server.ts
#	packages/server/src/storage/db.ts
#	packages/server/src/storage/migrations/001_init.sql
#	packages/server/src/storage/schema-version.ts
#	packages/server/src/supervisor/manager.ts
#	packages/server/src/ws/dispatch.ts
When the websocket drops out, the global connection banner already explains the situation. Surfacing additional recovery overlays/notices on top of that produced a 'failure' UX even though the coordinator's pendingSocketReconcile would transparently recover once the socket reconnects.

Two complementary guards:

1. failHistoricalRecovery now short-circuits to a quiet loading state when wsClient.getStatus() != 'connected', deferring to deferRecoveryUntilReconnect for resume.

2. showInlineRecoveryNotice and showReplayOverlay only render when wsHealthy is true, so even a stale failure state never stacks with the connection banner.

Adds a regression test that mocks getStatus() = 'disconnected' alongside replay/snapshot failures and asserts no recovery notice or blocking overlay appears.
The 'truncated' kind in TerminalReplayUiState was declared in the union but never produced by any setReplayUiState call site, and the matching zh/en locale strings were dead. Now that 'snapshot success counts as success' is the intended semantic (no partial-history notice needed), drop the unreachable branch, type member, and locale entries to shrink the state space.
@pallyoung pallyoung merged commit c5769ae into main May 26, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant