Skip to content

Scope Desktop session runtimes and preserve classic tabs / 会话运行态隔离并保留 classic 顶部标签页#4360

Merged
SivanCola merged 9 commits into
esengine:main-v2from
lifu963:fix/desktop-session-sidebar-runtime
Jun 14, 2026
Merged

Scope Desktop session runtimes and preserve classic tabs / 会话运行态隔离并保留 classic 顶部标签页#4360
SivanCola merged 9 commits into
esengine:main-v2from
lifu963:fix/desktop-session-sidebar-runtime

Conversation

@lifu963

@lifu963 lifu963 commented Jun 14, 2026

Copy link
Copy Markdown
Contributor

Summary

本 PR 已按新的合并顺序整改:先合 #4369 的 workbench 桌面风格,再合本 PR 的 session runtime 修正。因此它不再把“移除顶部 Tab”作为 classic 的目标。

当前语义:

Relationship With #4369

#4369 是前置布局改动。本 PR 当前 head 已合入 #4369,并解决两边冲突:

Test Plan

  • pnpm --dir desktop/frontend typecheck
  • pnpm --dir desktop/frontend test
  • pnpm --dir desktop/frontend build
  • pnpm --dir desktop/frontend check:css
  • go test ./internal/config
  • cd desktop && go test .
  • git diff --cached --check
  • Browser preview on 127.0.0.1: classic has one .app-chrome__tab-strip / .tabbar; workbench has .app--workbench, zero .app-chrome__tab-strip, zero .tabbar, and one .app-chrome__workbench-search.

Notes

The build still emits the existing Vite warnings about mixed static/dynamic import of bridge.ts and large chunks; the build completes successfully.

Route Desktop navigation through session-scoped runtimes so switching or hiding views no longer cancels active work, and remove the user-facing top tab strip in favor of the sidebar.

Co-authored-by: Cursor <cursoragent@cursor.com>
@github-actions github-actions Bot added v2 Go rewrite (1.x) — main-v2 branch, active development desktop Wails desktop app (desktop/**) agent Core agent loop (internal/agent, internal/control) labels Jun 14, 2026
lifu963 and others added 6 commits June 14, 2026 15:19
Drop stale helper functions left behind by the session runtime refactor so desktop lint stays clean.

Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
Add a General settings option for desktop layout style, keeping the classic layout as the default while adding a Codex-inspired workbench sidebar.

Implement workbench-only navigation density, project/session quick actions, pinned project and session grouping, and desktop layout persistence.

Co-authored-by: SivanCola <32437197+SivanCola@users.noreply.github.com>
Co-authored-by: SivanCola <32437197+SivanCola@users.noreply.github.com>
Co-authored-by: SivanCola <32437197+SivanCola@users.noreply.github.com>
@github-actions github-actions Bot added the config Configuration & setup (internal/config) label Jun 14, 2026
@SivanCola SivanCola changed the title 让 Desktop 左侧会话栏成为唯一导航 Scope Desktop session runtimes and preserve classic tabs / 会话运行态隔离并保留 classic 顶部标签页 Jun 14, 2026
@SivanCola

Copy link
Copy Markdown
Collaborator

approve

Co-authored-by: Cursor <cursoragent@cursor.com>
@lifu963

lifu963 commented Jun 14, 2026

Copy link
Copy Markdown
Contributor Author

approve

@SivanCola
合并冲突已处理,可合并。

Resolve desktop/runtime conflicts while preserving the async Wails event emitter and topic-session index cache. Keep detached runtime telemetry and snapshot ownership on detached runtimes, and restore ClearSession cleanup error propagation.

Co-authored-by: SivanCola <32437197+SivanCola@users.noreply.github.com>
@SivanCola SivanCola enabled auto-merge June 14, 2026 15:37

@SivanCola SivanCola left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

approve

@SivanCola SivanCola merged commit 21d77d2 into esengine:main-v2 Jun 14, 2026
13 checks passed
@lifu963 lifu963 deleted the fix/desktop-session-sidebar-runtime branch June 15, 2026 01:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

agent Core agent loop (internal/agent, internal/control) config Configuration & setup (internal/config) desktop Wails desktop app (desktop/**) v2 Go rewrite (1.x) — main-v2 branch, active development

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants