Skip to content

Merge latest origin/main and reconcile workspace side-panel conflicts#3010

Draft
Copilot wants to merge 6 commits intomainfrom
copilot/add-file-explorer-functionality
Draft

Merge latest origin/main and reconcile workspace side-panel conflicts#3010
Copilot wants to merge 6 commits intomainfrom
copilot/add-file-explorer-functionality

Conversation

Copy link
Contributor

Copilot AI commented Mar 7, 2026

This updates the branch to the current origin/main and resolves the workspace conflicts where the branch’s File Explorer side-panel work overlapped with mainline’s newer vertical-tab workspace layout. The merged result keeps the latest left-tab-bar layout model while preserving the ability to switch the shared side panel between Wave AI and File Explorer.

  • Workspace layout model

    • Rebased the branch’s side-panel state onto the newer origin/main workspace layout implementation.
    • Preserved activePanelAtom and fileexplorer support on top of the new outer/inner panel-group layout.
    • Kept the shared side panel semantics: panel visibility remains separate from which panel content is active.
  • Workspace rendering

    • Resolved workspace.tsx by keeping the new vertical-tab-bar structure from origin/main.
    • Restored conditional side-panel rendering so the left panel can host either:
      • AIPanel
      • FileExplorerPanel
  • Tab bar behavior

    • Updated the vertical tab bar AI toggle to use the active side-panel state, matching top tab bar behavior and avoiding regressions when File Explorer owns the side panel.
{tabId !== "" &&
    (activePanel === "fileexplorer" ? (
        <FileExplorerPanel />
    ) : (
        <AIPanel roundTopLeft={showLeftTabBar} />
    ))}
  • Result
    • Brings in the latest origin/main changes without dropping the branch-specific File Explorer panel flow.
    • Aligns workspace/tab UI behavior around a single source of truth for side-panel selection.

Merged workspace / tab layout preview


💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.

Co-authored-by: sawka <2722291+sawka@users.noreply.github.com>
@cloudflare-workers-and-pages
Copy link

cloudflare-workers-and-pages bot commented Mar 7, 2026

Deploying waveterm with  Cloudflare Pages  Cloudflare Pages

Latest commit: 0f6fca1
Status: ✅  Deploy successful!
Preview URL: https://3cefc3ca.waveterm.pages.dev
Branch Preview URL: https://copilot-add-file-explorer-fu.waveterm.pages.dev

View logs

Co-authored-by: sawka <2722291+sawka@users.noreply.github.com>
Copilot AI changed the title [WIP] Implement file explorer on top of generic tree view Add a dev-only File Explorer side panel on top of the generic tree view Mar 7, 2026
Copilot finished work on behalf of sawka March 7, 2026 01:58
Co-authored-by: sawka <2722291+sawka@users.noreply.github.com>
Copilot AI changed the title Add a dev-only File Explorer side panel on top of the generic tree view Merge latest origin/main and reconcile workspace side-panel conflicts Mar 14, 2026
Copilot AI requested a review from sawka March 14, 2026 19:33
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.

2 participants