releases/ClaudeDo
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Packages Projects Releases 12 Wiki Activity
943 Commits 9 Branches 12 Tags
c6534165b245c10fbc9e4763ef3fff45f18328c8
Commit Graph

943 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mika kuns
d8a973d0e1 feat(ui): add inline conflict resolver view-model 2026-06-05 10:56:47 +02:00
mika kuns
0b623b8e4a feat(ui): add inline conflict model (file/hunk with resolution) 2026-06-05 10:55:20 +02:00
mika kuns
5edb433755 feat(ui): batch-merge cockpit view with checkboxes and conflicts panel 2026-06-05 10:54:34 +02:00
mika kuns
c8f82ed3c2 feat(i18n): add batch-merge cockpit strings (en/de) 2026-06-05 10:52:28 +02:00
mika kuns
1aa06077a8 feat(ui): wire batch selection, target loading and resolve seam 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-06-05 10:50:38 +02:00
mika kuns
cb20877620 feat(hub): expose conflict-resolution merge methods 2026-06-05 10:50:04 +02:00
mika kuns
dcbf67c63b feat(merge): read conflict stages and write user resolutions 2026-06-05 10:49:07 +02:00
mika kuns
02b11c727c feat(ui): add skip-and-continue batch merge orchestration 2026-06-05 10:47:17 +02:00
mika kuns
74afc46909 feat(git): add conflict-stage blob reads and single-path staging 2026-06-05 10:47:14 +02:00
mika kuns
ef3fba1690 feat(ui): add batch-merge row state to worktrees cockpit VM 2026-06-05 10:44:18 +02:00
mika kuns
ef2f5c51e4 docs(plan): Layer C inline conflict resolver 2026-06-05 10:44:18 +02:00
mika kuns
3060cb0242 docs(plan): Layer B multi-worktree merge cockpit plan 2026-06-05 10:42:02 +02:00
mika kuns
3596053512 feat(ui): fuse git tab into one approve+merge cockpit 2026-06-05 10:32:02 +02:00
mika kuns
4bf4a27036 feat(ui): route single-task merge conflicts into a resolution seam 2026-06-05 10:30:43 +02:00
mika kuns
de4ad5dcf3 feat(ui): maximize work console via green traffic-light dot 2026-06-05 10:27:47 +02:00
mika kuns
2dfc4559b1 feat(ui): add conflict-resolution worker contract (foundation for merge rework) 2026-06-05 10:20:42 +02:00
mika kuns
dd3b03b9e4 docs(plan): foundation + Layer A plan and Layer B/C parallel kickoff prompts 
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
 2026-06-05 10:15:52 +02:00
mika kuns
f4416ee1c3 docs(design): git tab merge & review rework — shared foundation + 3 layers 
Design for simplifying single-task review/merge (Layer A), multi-worktree
batch merge cockpit (Layer B), and inline conflict resolver (Layer C),
with frozen shared contracts so B/C build in parallel worktrees.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
 2026-06-05 10:09:10 +02:00
mika kuns
42bb79e2b7 feat(ui): rename review Retry to Continue and make Reset discard the worktree 
[Continue] keeps the reject-to-queue + resume behaviour. [Reset] now calls
ResetTaskAsync (discards the task worktree and returns it to Idle) behind a
confirmation, replacing the old park-to-idle action.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
 2026-06-05 09:03:47 +02:00
mika kuns
561028e67b fix(ui): set prompt-action resting color on ContentPresenter 
The Fluent theme sets text color on the inner ContentPresenter, so setting
Foreground on the Button only took effect on hover. Move the normal-state
color onto the ContentPresenter so [Retry] shows green at rest.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
 2026-06-05 08:58:26 +02:00
mika kuns
07a9d07cf6 style(ui): align refine button with star and update refine icon 
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
 2026-06-05 08:57:50 +02:00
mika kuns
19435b2d48 style(ui): render review actions as bracketed terminal text 
Replace the chromed btn/accent buttons in the review prompt with borderless
bracketed text actions ([Retry] [Reset]) so they read as terminal commands.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
 2026-06-05 08:42:17 +02:00
mika kuns
e22a3267fe refactor(ui): blend review prompt into the terminal instead of a boxed footer 
Drop the bordered Surface2 footer and lay the feedback prompt directly on the
terminal background, aligned with the log lines, so it reads as a shell input
line rather than a separate panel.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
 2026-06-05 08:39:00 +02:00
mika kuns
9c5872eb27 feat(ui): send Retry on Enter in the review prompt 
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
 2026-06-05 08:34:30 +02:00
mika kuns
8819a56496 feat(ui): rework review into terminal footer and add Git tab 
Move review feedback into a prompt-style footer on the Output tab with
Retry/Reset actions, relocate Approve and all merge/worktree controls to a
new Git tab, and reduce the Session tab to subtask outcomes.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
 2026-06-05 08:34:29 +02:00
mika kuns
6c65158be8 feat(ui): add IsGitTab flag to work console view model 2026-06-05 08:28:12 +02:00
mika kuns
096519b978 docs(review): add implementation plan for terminal-style review controls 
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
 2026-06-05 08:21:33 +02:00
mika kuns
266e6d191b docs(review): spec terminal-style review with Git tab and footer actions 
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
 2026-06-05 08:17:17 +02:00
mika kuns
cb4c396a53 docs(merge): document real git merge on approve, PreviewMerge hub method, and new GitService/WorkerClient members 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-06-04 23:43:44 +02:00
mika kuns
6e3f90d289 fix(ui): discard stale mergeability probe after task or target switch 
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
 2026-06-04 23:41:59 +02:00
mika kuns
de01579e84 feat(ui): add mergeability indicator and Merge button to work console 
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
 2026-06-04 23:36:56 +02:00
mika kuns
0d8999dc20 feat(ui): show mergeability and surface approve conflicts in the work console 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-06-04 23:35:53 +02:00
mika kuns
3202c76674 feat(ui): wire merge-aware approve and preview into the worker client 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-06-04 23:32:12 +02:00
mika kuns
43f8f7f7d8 feat(worker): expose PreviewMerge hub method and merge-on-approve 2026-06-04 23:29:05 +02:00
mika kuns
f1cf29b58d fix(worker): guard blank working dir in approve-merge before resolving target 
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
 2026-06-04 23:27:59 +02:00
mika kuns
98b0d58e03 fix(worker-tests): update TaskMergeService ctor calls after ITaskStateService injection 2026-06-04 23:25:03 +02:00
mika kuns
b817c87656 feat(worker): approve merges worktree before marking task done 2026-06-04 23:24:50 +02:00
mika kuns
2a6781f80f feat(ui): add Refine button, icon, and command to task card 2026-06-04 23:21:30 +02:00
mika kuns
4098f7f341 feat(git): add non-destructive merge-tree conflict probe 2026-06-04 23:18:54 +02:00
mika kuns
82390047d2 feat(ui): add RefineTask client call and refine events 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-06-04 23:16:58 +02:00
mika kuns
75ad7b1735 docs(merge): add approve-merge + conflict-preview implementation plan 
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
 2026-06-04 23:16:11 +02:00
mika kuns
e523ed85eb feat(refine): wire RefineTask hub method, broadcaster events, and DI 2026-06-04 23:14:00 +02:00
mika kuns
0460d7bea5 feat(refine): add RefineRunner, prompt/args helper, and interfaces 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-06-04 23:09:30 +02:00
mika kuns
66a7b2377f docs(merge): add approve-merge + conflict-preview design spec 
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
 2026-06-04 23:07:25 +02:00
mika kuns
eca6813cdb feat(prompts): add Refine prompt kind and default 2026-06-04 23:04:24 +02:00
mika kuns
22830d3ea8 feat(mcp): add add_subtask tool to claudedo MCP 2026-06-04 23:03:07 +02:00
mika kuns
3573548348 docs(refine): add Refine Task implementation plan 
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
 2026-06-04 23:00:01 +02:00
mika kuns
0867bc8296 docs(refine): add Refine Task design spec 
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
 2026-06-04 22:53:17 +02:00
mika kuns
1603be0c78 fix(ui): stop the console clipping the last log line 
The tab body ran flush into the console's rounded bottom corner, so the final
log line was shaved off. Inset the tab body from the bottom so the scroll
viewport ends above the corner and ScrollToEnd reveals the whole last line.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
 2026-06-04 22:51:49 +02:00
mika kuns
71a3765c07 fix(ui): render Output log directly on the console, not as a nested card 
The Output tab embedded SessionTerminalView, which is itself a bordered terminal
card with its own header — a card inside the console card. Render the log lines
directly on the console body instead (the console already provides the terminal
chrome, traffic lights, and status chip), with auto-scroll moved to code-behind.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
 2026-06-04 20:27:03 +02:00