Mika Kuns
68f461d0e1
docs(specs): agent settings per list and per task UI reimplementation
2026-04-22 12:01:20 +02:00
Mika Kuns
cfb410dd4d
Merge task: Improve the Readme
2026-04-22 11:34:13 +02:00
Mika Kuns
b378fbf550
chore(settings): allow context-mode MCP tools locally
2026-04-22 11:03:43 +02:00
Mika Kuns
cb43bcdd10
docs(plans): add 2026-04-21 open-items consolidation
2026-04-22 11:03:40 +02:00
Mika Kuns
31420574db
feat(ui): show status messages and real diff-stats in DiffModal
...
- Count additions/deletions per file as lines are parsed.
- Surface load failures and empty-diff states via StatusMessage.
- Pass the worktree base commit so diffs render against the branch
base, not just the working-tree HEAD.
2026-04-22 11:03:37 +02:00
Mika Kuns
07dee31847
fix(data): use UTF-8 encoding for git process stdio
...
Ensures non-ASCII git output (branch names, paths, commit messages) is
read and written without locale-dependent corruption.
2026-04-22 11:03:24 +02:00
Mika Kuns
4debd5ce09
fix(ui): disable Merge button after worktree is no longer Active
...
Add WorktreeStateLabel observable property populated from
entity.Worktree?.State.ToString() in both BindAsync and
RefreshWorktreeAsync. CanMerge now requires WorktreeStateLabel == "Active"
so the button disables after a successful merge with removeWorktree:false.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com >
2026-04-22 10:36:09 +02:00
Mika Kuns
1495c63e3d
fix(worker): return Blocked when MergeAbortAsync fails to avoid stuck repo
...
If git merge --abort throws, the repo is left mid-merge. Previously the
code logged a warning and returned a conflict result, giving the UI a
stale file list. Now it returns Blocked with an explicit message so the
caller knows manual resolution is required.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com >
2026-04-22 10:30:44 +02:00
Mika Kuns
953d93179d
fix(worker): honour targetBranch in MergeAsync by checking out before merge
...
Add GitService.CheckoutBranchAsync; compare targetBranch to current HEAD
before MergeNoFfAsync and switch when they differ. Returns Blocked if the
branch does not exist. Add three new tests (two service, one GitService).
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com >
2026-04-22 10:25:35 +02:00
Mika Kuns
1bc7fcc609
feat(ui): add Merge button to DiffModal
2026-04-22 09:53:11 +02:00
Mika Kuns
c911717a3b
feat(ui): add Merge command to DiffModal
2026-04-22 09:53:07 +02:00
Mika Kuns
949911f6c8
feat(ui): attach MergeModal to DetailsIsland
2026-04-22 09:53:03 +02:00
Mika Kuns
f3a58a6515
feat(ui): wire DetailsIsland ApproveMerge through MergeModal
2026-04-22 09:52:59 +02:00
Mika Kuns
ee4cd706ef
chore(app): register MergeModalViewModel
2026-04-22 09:47:19 +02:00
Mika Kuns
e11b01951e
feat(ui): add MergeModalView
2026-04-22 09:46:33 +02:00
Mika Kuns
3d0cc4ffed
feat(ui): add MergeModalViewModel
2026-04-22 09:46:20 +02:00
Mika Kuns
4585b20f80
feat(ui): add MergeTaskAsync and GetMergeTargetsAsync to WorkerClient
2026-04-22 09:44:48 +02:00
Mika Kuns
c53b5878cf
feat(worker): expose MergeTask and GetMergeTargets on WorkerHub
2026-04-22 09:44:22 +02:00
Mika Kuns
c13ae437f7
chore(worker): register TaskMergeService
2026-04-22 09:43:34 +02:00
Mika Kuns
5780879629
test(worker): cover GetTargetsAsync and dirty-tree block
2026-04-22 09:41:31 +02:00
Mika Kuns
2bcd5ef9bd
test(worker): cover merge conflict auto-abort
2026-04-22 09:41:31 +02:00
Mika Kuns
63eb860e40
test(worker): cover diverged non-conflicting merge
2026-04-22 09:41:30 +02:00
Mika Kuns
e80ac7de49
test(worker): cover TaskMergeService removeWorktree path
2026-04-22 09:41:30 +02:00
Mika Kuns
3331c24898
feat(worker): implement TaskMergeService happy path
2026-04-22 09:37:35 +02:00
Mika Kuns
1c20d8f846
feat(worker): scaffold TaskMergeService with pre-flight checks
2026-04-22 09:36:16 +02:00
Mika Kuns
77a1460e3a
feat(git): add ListConflictedFilesAsync
2026-04-22 09:31:36 +02:00
Mika Kuns
21a1870fd7
feat(git): add MergeAbortAsync
2026-04-22 09:29:24 +02:00
Mika Kuns
3ebbdb3f6e
feat(git): add MergeNoFfAsync returning (exitCode, stderr)
2026-04-22 09:27:47 +02:00
Mika Kuns
535d0c5558
feat(git): add IsMidMergeAsync
2026-04-22 09:25:10 +02:00
Mika Kuns
2d807aa606
feat(git): add ListLocalBranchesAsync
2026-04-22 09:23:35 +02:00
Mika Kuns
93ee7b72d5
feat(git): add GetCurrentBranchAsync
2026-04-22 09:22:41 +02:00
Mika Kuns
32ef1b389a
docs: clarify merged-with-cleanup-warning result shape
2026-04-22 09:17:43 +02:00
Mika Kuns
0885518a68
docs: add worktree merge implementation plan
...
23 TDD-sized tasks covering GitService additions, TaskMergeService,
SignalR surface, MergeModal view/vm, and wiring into DetailsIsland
plus DiffModal. Each task: failing test -> implement -> green -> commit.
2026-04-22 09:16:38 +02:00
Mika Kuns
944d3bd3e8
docs: add worktree merge design spec
...
Captures decisions for merging a task worktree into a target branch:
merge-commit strategy, dual UI entry (Details island + DiffModal),
per-merge cleanup checkbox, pre-flight + abort-on-conflict.
2026-04-22 09:08:44 +02:00
Mika Kuns
fb89e02b02
docs: note ResetTask hub method and TaskResetService
2026-04-21 17:46:00 +02:00
Mika Kuns
58c8210afa
fix(ui): correct Reset button tooltip wording
2026-04-21 17:44:50 +02:00
Mika Kuns
2ce6b7bd3a
feat(ui): add Continue and Reset buttons to agent strip
2026-04-21 17:44:00 +02:00
Mika Kuns
f90d3d8375
fix(ui): early-return in ResetAsync when ConfirmAsync is unwired
2026-04-21 17:42:36 +02:00
Mika Kuns
b03e858a8f
feat(ui): add Continue and Reset commands to DetailsIslandViewModel
2026-04-21 17:40:32 +02:00
Mika Kuns
2278b516ea
feat(ui): add ContinueTaskAsync and ResetTaskAsync to WorkerClient
2026-04-21 17:37:41 +02:00
Mika Kuns
219a231f32
feat(worker): expose ResetTask hub method
...
Wire TaskResetService into DI and add WorkerHub.ResetTask with the
same InvalidOperationException/KeyNotFoundException error-translation
pattern as ContinueTask.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com >
2026-04-21 17:35:37 +02:00
Mika Kuns
74eb36d3c0
feat(worker): add TaskResetService for discard + reset flow
...
Orchestrates worktree discard, task reset to Manual, and SignalR broadcast.
Includes integration tests (happy path + running-task rejection).
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com >
2026-04-21 17:31:52 +02:00
Mika Kuns
202236a45b
feat(data): add TaskRepository.ResetToManualAsync
2026-04-21 17:26:01 +02:00
Mika Kuns
88be19a231
test(worker): strengthen DiscardAsync test (cleanup + branch assertion)
2026-04-21 17:23:58 +02:00
Mika Kuns
44203f3c67
feat(worker): add WorktreeManager.DiscardAsync for task reset
...
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com >
2026-04-21 17:21:08 +02:00
Mika Kuns
133774cb86
docs: add implementation plan for continue and reset buttons
2026-04-21 16:47:51 +02:00
Mika Kuns
a3bb557d76
docs: add spec for continue and reset buttons on failed tasks
2026-04-21 16:43:54 +02:00
Mika Kuns
23f8fddc4d
docs: add UI-rewrite notes, plans, and stream-formatter spec
2026-04-21 15:56:19 +02:00
Mika Kuns
a180e8446c
chore(worker): tweak launchSettings
2026-04-21 15:56:14 +02:00
Mika Kuns
0406d35b61
style(ui): polish islands and remove terminal traffic-light dots
2026-04-21 15:56:07 +02:00
