fix(folder): support moving nested folders by chang-xinhai · Pull Request #547 · Nagi-ovo/gemini-voyager

chang-xinhai · 2026-03-29T05:16:53Z

🚫 AI Policy / AI 政策

We explicitly reject AI-generated PRs that have not been manually verified.
本项目拒绝接受任何未经人工复核的 AI 生成的 PR。
Low-quality AI PRs will be closed immediately. / 低质量的 AI PR 会被直接关闭。
You must understand and take responsibility for every line of code you submit. / 你必须理解并对
你提交的每一行代码负责。
Workflow Proficiency / 协作能力: Ensure you are familiar with GitHub/Git workflows and
maintain a clean Git history. Please learn the basics first if needed to avoid messy PR history. /
请确保你熟悉 GitHub/Git 工作流并保持 Git 历史整洁。如有必要请先学习相关知识，避免 PR 历史过于混
乱。

Description / 描述

本 PR 支持多层文件夹整体移动，补全了现有文件夹拖拽能力在嵌套结构下的限制。

主要改动：

允许非 pinned 的文件夹在包含子文件夹时仍可被拖动
支持将多层文件夹作为整棵树拖入其他文件夹
支持将多层文件夹整体拖回根目录
支持同级文件夹拖拽重排
移动后保持子树结构不变，所有子文件夹的相对顺序不变
移动后保持源父级和目标父级下的同级排序正确
禁止将文件夹拖入自身或其后代节点下，避免形成循环
pinned 文件夹保持不可拖动

另外，本 PR 还补充了多层文件夹移动相关的回归测试，并修复了一些与本次改动相关的类型收窄问题，以确保
typecheck 可以通过。

Related Issue / 相关 Issue

Closes #546

Visual Proof / 可视化证据

已附上录屏 / 截图，展示以下场景：

多层文件夹拖入其他文件夹
多层文件夹拖回根目录
同级文件夹重排
pinned 文件夹不可拖动

Browser Testing / 浏览器测试

Chrome / Edge (Chromium): Tested / 已测试
Firefox: Tested (Mandatory) / 已测试（必填）
Safari: Tested (Optional) or labeled as unsupported / 已测试（可选）或已标注为不支持

Checklist / 检查清单

I have manually verified that the feature works as intended. / 我已手动验证功能按预期工作。
I have confirmed that this PR does not break existing functionality. / 我已确认此 PR 不会破
坏原有功能。
I have run bun run lint, bun run typecheck, bun run format and bun run build. / 我已
运行代码校验、类型检查、格式化及构建。
I have added/updated necessary tests and they pass (bun run test). / 我已添加/更新了必要的
测试并确保通过（bun run test）。

default.mov

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Entire-Checkpoint: 8498f007f19d

Nagi-ovo · 2026-03-29T10:45:24Z

@chang-xinhai CI is green now (I pushed a formatting fix). When you're ready, feel free to mark it as ready for review and we can merge 👍

chang-xinhai · 2026-03-29T15:54:40Z

Thank you so much for the quick response and the formatting fix! I'm super excited about this. It's marked as ready for review now! 🚀

Copilot

Pull request overview

This PR extends the folder drag-and-drop system to support moving entire nested folder subtrees (while preventing cycles), and adds regression tests to cover the new behavior. It also includes several storage/type-narrowing hardening changes to keep runtime behavior safer and satisfy typecheck.

Changes:

Allow non-pinned folders (including those with descendants) to be draggable, while keeping pinned folders fixed.
Introduce a centralized moveFolder operation to handle reparenting/reordering with cycle prevention and sibling sortIndex updates.
Add regression tests for multi-level folder moves and pinned/descendant-move restrictions; add several storage/type guards in sync-related codepaths.

Reviewed changes

Copilot reviewed 7 out of 7 changed files in this pull request and generated 5 comments.

Show a summary per file

File	Description
src/pages/popup/components/ContextSyncSettings.tsx	Hardens stored port loading by accepting only numeric values.
src/pages/popup/components/CloudSyncSettings.tsx	Adds runtime validators/type guards when loading folders/prompts/starred data from storage.
src/pages/content/folder/manager.ts	Enables dragging for non-pinned folders; adds `moveFolder` and routes folder moves/reorders through it; tightens starred-message shape checks.
src/pages/content/folder/aistudio.ts	Adds casts after validation to satisfy TS in folder data migration/loading paths.
src/pages/content/folder/tests/folderMove.test.ts	Adds regression tests for nested folder move/reorder behaviors, pinned restrictions, and cycle prevention.
src/pages/background/index.ts	Adds runtime type guards for starred messages and fork nodes loaded from storage.
src/core/services/GoogleDriveSyncService.ts	Adds small helpers to validate cached token/state values read from storage.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-03-29T16:00:04Z

+          const mergedFolders = this.mergeFolderData(
+            localData as FolderData,
+            syncData as FolderData,
+          );


These as FolderData casts are only needed because validateFolderData returns boolean, so TypeScript can’t narrow after the check. Consider changing validateFolderData to a type guard (data is FolderData) so callers can rely on narrowing without assertions (this also avoids accidentally masking a future mismatch if FolderData shape changes).

@copilot apply changes based on this feedback

devin-ai-integration

✅ Devin Review: No Issues Found

Devin Review analyzed this PR and found no potential bugs to report.

View in Devin Review to see 5 additional findings.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Co-authored-by: devin-ai-integration[bot] <158243242+devin-ai-integration[bot]@users.noreply.github.com>

Nagi-ovo · 2026-03-29T16:26:26Z

@codex review

chatgpt-codex-connector · 2026-03-29T16:32:05Z

Codex Review: Didn't find any major issues. Breezy!

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Nagi-ovo · 2026-03-30T07:16:09Z

@chang-xinhai LGTM

chang-xinhai and others added 2 commits March 29, 2026 11:40

fix(folder): support moving nested folders

8222e13

style: format code with prettier

ab13421

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Entire-Checkpoint: 8498f007f19d

chang-xinhai marked this pull request as ready for review March 29, 2026 15:54

Copilot AI review requested due to automatic review settings March 29, 2026 15:54

Copilot started reviewing on behalf of chang-xinhai March 29, 2026 15:55 View session

Copilot AI reviewed Mar 29, 2026

View reviewed changes

devin-ai-integration Bot reviewed Mar 29, 2026

View reviewed changes

chang-xinhai and others added 4 commits March 30, 2026 00:11

Update src/pages/popup/components/CloudSyncSettings.tsx

422339b

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update src/pages/popup/components/CloudSyncSettings.tsx

ef82294

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update src/pages/background/index.ts

c5f76e4

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update src/pages/background/index.ts

a326f11

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

This comment was marked as resolved.

Sign in to view

Update src/pages/popup/components/CloudSyncSettings.tsx

6da7000

Co-authored-by: devin-ai-integration[bot] <158243242+devin-ai-integration[bot]@users.noreply.github.com>

Nagi-ovo merged commit d30bd4e into Nagi-ovo:main Mar 30, 2026
1 check passed

Uh oh!

Conversation

chang-xinhai commented Mar 29, 2026 • edited by devin-ai-integration Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🚫 AI Policy / AI 政策

Description / 描述

Related Issue / 相关 Issue

Visual Proof / 可视化证据

Browser Testing / 浏览器测试

Checklist / 检查清单

Uh oh!

Nagi-ovo commented Mar 29, 2026

Uh oh!

chang-xinhai commented Mar 29, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI Mar 29, 2026

Choose a reason for hiding this comment

Uh oh!

chang-xinhai Mar 29, 2026

Choose a reason for hiding this comment

Uh oh!

devin-ai-integration Bot left a comment

Choose a reason for hiding this comment

✅ Devin Review: No Issues Found

Uh oh!

This comment was marked as resolved.

Uh oh!

Nagi-ovo commented Mar 29, 2026

Uh oh!

chatgpt-codex-connector Bot commented Mar 29, 2026

Uh oh!

Nagi-ovo commented Mar 30, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

chang-xinhai commented Mar 29, 2026 •

edited by devin-ai-integration Bot

Loading