fix: 修复全新安装后顶部残留大量 project tab + sync 清理 - #115
Merged
Merged
Conversation
added 3 commits
July 7, 2026 10:11
Three syncProject improvements for Copilot-Switch orphan worktree
cleanup:
1. Incomplete worktrees deleted automatically:
Directories without .git pointer (empty dirs from failed session
creation) are removed during sync. Previously they accumulated in
.agentdock/worktrees/ and confused users.
2. git worktree prune cleans dead registry entries:
syncProject now runs 'git worktree prune --verbose' to remove stale
refs in .git/worktrees/. After manual cleanup that removed the
worktree directory but left the registry entry, prune removes it.
3. SyncReport replaces synced count:
syncProject now returns { inserted, removed, cleanedOrphans, prunedRefs, total }
instead of a single count. The toast in SessionSidebar uses the new
structure to show accurate per-operation stats.
- electron/main/ipc/db.ts: added git worktree prune, delete incomplete
worktrees, SyncReport return type.
- electron/preload.ts: sync.project() return type updated to SyncReport.
- src/components/SessionSidebar.tsx: toast uses new SyncReport fields.
- plugins/__tests__/sync-cleanup.test.ts: 5/5 tests pass.
- docs/tech-debt/nsis-macro-expansion.md: documented NSIS macro issue.
Resolves: orphan .agentdock/worktrees/ directories accumulating in
Copilot-Switch after repeated install/uninstall cycles.
$USERPROFILE is not an NSIS built-in variable and is silently ignored
in the uninstaller context (warning 6000: unknown variable/constant
"USERPROFILE" detected, ignoring). This caused RMDir /r to not delete
~/.agentdock (the legacy global DB path written by v0.1-v0.2), so
stale project tabs survived uninstall.
Fix: derive the user's home directory from $DESKTOP (which IS a valid
NSIS built-in variable) by stripping the trailing 8 characters
("Desktop"). $DESKTOP = C:\Users\<u>\Desktop → stripping gives
C:\Users\<u> → append "\.agentdock" to get the target path.
Also clean both customUnInstall (macro-level) and customUnInstallSection
(Section-level fallback) to handle both cases.
…cy DB 全新安装后顶部残留大量 project tab 的完整修复。 根因 1: 打包后 process.cwd() 是安装目录（不是用户项目），被 main.ts 的 auto-init 逻辑当成 active project，syncProject 再把它 auto-register 进 global DB，产生 'AgentDock' 这一行 tab。 修复: 仅在 dev 模式 auto-init 到 cwd；打包模式不设 active project， 显示'打开项目'欢迎页。 根因 2: legacy $HOME/.agentdock/projects.db (v0.1-v0.2 的 global DB) 积累了 41 行历史残留（e2e temp 目录、worktree 目录、build 产物）， 卸载不清、重装照读。 修复: app 启动时在 JS 层清理 legacy projects.db（100% 可靠， 不依赖 NSIS 宏）。 NSIS 踩坑: - $USERPROFILE 不是 NSIS 内置变量，RMDir 静默失败（warning 6000）。 改用 $DESKTOP 倒推 home 目录。 - customUnInstall/customUnInstallSection 宏在 NSIS 3.0.4 下不展开， 不能依赖它做关键清理。userData 清理放 JS 层，NSIS 只兜底。 验证: silent install/uninstall + 启动后断言 projects.db 为 0 行。 改动: - electron/main.ts: 打包不 auto-init + 启动清 legacy DB - build/installer/installer.nsh: $DESKTOP 倒推 + 双保险清理 - electron-builder.yml: deleteAppDataOnUninstall true - docs/fix-stale-project-tabs.md: 完整修复经验 - docs/troubleshooting.md: 用户清理指南
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request introduces robust cleanup mechanisms and path normalization to resolve issues with stale project tabs, redundant directories, and improper uninstallation behavior. Key changes include updating the electron main process to avoid auto-registering the installation directory as a project in packaged builds, cleaning up legacy databases on startup, pruning stale git worktree refs, and implementing fuzzy path matching with path healing. Additionally, Ctrl+W/Cmd+W shortcut handling was refactored to use IPC for closing tabs reliably across platforms. Review feedback highlights a critical security concern regarding the validation of worktree paths before deletion to prevent accidental data loss, suggests using the native $PROFILE variable in NSIS instead of fragile string manipulation on $DESKTOP, and points out a duplicate definition of onCloseTab in the preload script.
Important
The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.
added 3 commits
July 15, 2026 22:24
1. (security-critical) syncProject 删除不完整 worktree 前校验路径确实 在 <projectPath>/.agentdock/worktrees/ 内,防止畸形 sessionId (如 ../..) 逃逸目录导致 rmSync 误删。 2/3. (high) NSIS installer.nsh 改用 $PROFILE 内置变量替代 $DESKTOP -8 倒推。$DESKTOP 在 OneDrive 环境下是 C:\Users\<u>\OneDrive\Desktop,倒推会得到错误的 home 目录。 $PROFILE 直接是 C:\Users\<u>,可靠。customUnInstall 和 customUnInstallSection 两处都改。 4. (medium) preload.ts 删除 onCloseTab 的重复定义(windowControls 内 多余一份),保留顶层 api 对象上的定义(TabBar 用的是这个)。 单测 12/12 通过。
# Conflicts: # electron-builder.yml # electron/main.ts
installer.nsh 的 preInit/customInstall 宏用了
!ifdef BUILD_UNINSTALLER
!macroend
!endif
试图在 uninstaller build 时提前结束宏,但 NSIS 不允许 !macroend
出现在 !ifdef 条件块内(宏定义结构必须完整),导致
'!include: error in script ... on line 6' 编译失败。
改为整个宏体用 !ifndef UNINSTALLER_OUT_FILE 包裹(合法),
uninstaller build 时宏体为空,不碰 $INSTDIR。
本地 pack 验证通过。
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
问题
全新安装 AgentDock 后（无论安装/卸载多少次），顶部残留大量 project tab —— 包括安装目录、历史项目、worktree 目录、build 产物、e2e temp 目录。用户全新安装后未执行任何操作，tab 就已存在。
两个独立根因
根因 1: 打包后
process.cwd()被 auto-register 成项目main.ts启动执行activeProjectPath = process.cwd()。打包后 cwd = 安装目录（不是用户项目），syncProject把它 auto-register 成 'AgentDock' 项目。修复: 仅 dev 模式 auto-init；打包模式显示'打开项目'欢迎页。
根因 2: legacy
~/.agentdock/projects.db未清理v0.1-v0.2 的 global DB 在
$HOME/.agentdock/projects.db，积累 41 行历史残留，卸载不清、重装照读。修复: app 启动时 JS 层清理（100% 可靠，不依赖 NSIS 宏）。
NSIS 踩坑（写进经验文档）
$USERPROFILE不是 NSIS 内置变量 →RMDir静默失败（warning 6000）→ 改用$DESKTOP倒推 home 目录customUnInstall/customUnInstallSection宏在 NSIS 3.0.4 不展开 → 关键清理放 JS 层，NSIS 只兜底附带修复（sync-cleanup）
syncProject清理不完整 worktree（无 .git 指针）+git worktree pruneSyncReport返回结构化统计（inserted/removed/cleanedOrphans/prunedRefs/total）db:projects:createfuzzy 匹配 + path healing（同 path 不同大小写/斜杠不再重复创建）测试
文档
docs/fix-stale-project-tabs.md— 完整修复经验docs/troubleshooting.md— 用户清理指南docs/tech-debt/nsis-macro-expansion.md— NSIS 宏技术债