fix(acp): isolate workspace settings and context file resolution for worktree sessions - #8152

Closed

Aleks-0 wants to merge 24 commits into

QwenLM:mainfrom

Aleks-0:worktree-settings-isolation

Commits on Jul 30, 2026

fix(acp): isolate workspace settings and context file resolution for worktree sessions
QwenCode
committed
3046b94
fix(acp): address review feedback — fix worktree test mock, add coverage
QwenCode
committed
79f2170
docs(acp): document single-worktree-session assumption on defaultSettingsCwd
QwenCode
committed
f8635ac
test(acp): cover defaultSettingsCwd clear-on-close path
QwenCode
committed
f1ac5e2

Commits on Aug 1, 2026

fix(acp): address runtime verification feedback — per-session settings cwd, daemon worktree-awareness
QwenCode
committed
89df65e
fix(acp): cover enter_worktree path + fix findEffectiveWorkspace dead code
QwenCode
committed
731126b
fix(acp): read activeWorktree from session config, fix GET/POST split, guard dangling worktree
QwenCode
committed
76868ae
Merge branch 'main' into worktree-settings-isolation
wenshao
authored
7af1462
fix(acp): address PR review — stale worktree guards, containment, error log
QwenCode
committed
c0f9b91
Merge remote-tracking branch 'origin/worktree-settings-isolation' into worktree-settings-isolation
QwenCode
committed
0099742
fix(acp): guard all resolveSettingsCwd returns with existsSync
QwenCode
committed
55696ea
fix(acp): prefer worktree settings cwd over explicit client cwd, clear worktreeCwd on cd-to-root
QwenCode
committed
ec57679
fix(acp): address PR #8152 review — JSDoc priority, stale sessionId, loop split, path normalization
QwenCode
committed
52a068c

Commits on Aug 2, 2026

fix(acp): address PR #8152 review — dead switch removal, test coverage, tsconfig cleanup
QwenCode
committed
959c362

Commits on Aug 8, 2026

fix(acp): address PR #8152 review — dead switch removal, test coverage, tsconfig cleanup
QwenCode
committed
a12c58b
merge: sync with upstream/main
QwenCode
committed
18530dc

Commits on Aug 9, 2026

fix(acp): address PR #8152 R2 review — settings reload ordering, worktree containment, persist routing, dead code removal
QwenCode
committed
0c0512b

Commits on Aug 10, 2026

Merge remote-tracking branch 'upstream/main' into worktree-settings-isolation
QwenCode
committed
7d9c586
fix(acp): restore worktree cwd on ACP session resume
QwenCode
committed
b5a8b2a

Commits on Aug 11, 2026

Merge remote-tracking branch 'upstream/main' into worktree-settings-isolation
QwenCode
committed
078e788

Commits on Aug 12, 2026

chore: merge origin/main into worktree-settings-isolation

qwen-code-dev-bot
and
qwencoder
committed
2b2bec8
fix(acp): resolve worktree settings isolation review comments
QwenCode
committed
18e2a98
Merge remote-tracking branch 'origin/worktree-settings-isolation' into worktree-settings-isolation
QwenCode
committed
10dad43

Commits on Aug 30, 2026

Merge remote-tracking branch 'origin/main' into worktree-settings-isolation
wenshao
committed
e424719