Roo-Code/locales
Roo Code 4a04f0fe07 fix: resolve merge conflicts with main
- message.ts: keep both system_update_todos and too_many_tools_warning/tool
- AttemptCompletionTool.ts: preserve token usage flushing before delegation
- ClineProvider.ts: integrate _disposed guard, taskHistoryStore.dispose(),
  robust cancelTask error handling, and todo-subtask linking
- TaskHeader.tsx: combine PR cost tooltip logic with main isSubtask/back nav
- history-resume-delegation.spec.ts: add log mock to all provider stubs
2026-04-22 23:04:28 +00:00
..
ca fix: resolve merge conflicts with main 2026-04-22 23:04:28 +00:00
de fix: resolve merge conflicts with main 2026-04-22 23:04:28 +00:00
es fix: resolve merge conflicts with main 2026-04-22 23:04:28 +00:00
fr fix: resolve merge conflicts with main 2026-04-22 23:04:28 +00:00
hi fix: resolve merge conflicts with main 2026-04-22 23:04:28 +00:00
id fix: resolve merge conflicts with main 2026-04-22 23:04:28 +00:00
it fix: resolve merge conflicts with main 2026-04-22 23:04:28 +00:00
ja fix: resolve merge conflicts with main 2026-04-22 23:04:28 +00:00
ko fix: resolve merge conflicts with main 2026-04-22 23:04:28 +00:00
nl fix: resolve merge conflicts with main 2026-04-22 23:04:28 +00:00
pl fix: resolve merge conflicts with main 2026-04-22 23:04:28 +00:00
pt-BR fix: resolve merge conflicts with main 2026-04-22 23:04:28 +00:00
ru fix: resolve merge conflicts with main 2026-04-22 23:04:28 +00:00
tr fix: resolve merge conflicts with main 2026-04-22 23:04:28 +00:00
vi fix: resolve merge conflicts with main 2026-04-22 23:04:28 +00:00
zh-CN fix: resolve merge conflicts with main 2026-04-22 23:04:28 +00:00
zh-TW fix: resolve merge conflicts with main 2026-04-22 23:04:28 +00:00