diff --git a/docs/superpowers/specs/2026-06-19-feature-unification-design.md b/docs/superpowers/specs/2026-06-19-feature-unification-design.md index 4be0b509..3591c89c 100644 --- a/docs/superpowers/specs/2026-06-19-feature-unification-design.md +++ b/docs/superpowers/specs/2026-06-19-feature-unification-design.md @@ -35,7 +35,7 @@ the engine. | A1 | Diff viewing | `DiffModalViewModel` (worktree + commit-range), `WorktreeModalViewModel` (file-tree + per-file), `PlanningDiffViewModel` (per-subtask + integration) | `UnifiedDiffParser`, `DiffLinesView` (good) | | A2 | Agent-config editing | `ListSettingsModalViewModel` (list scope), `AgentSettingsSectionViewModel` (task scope); global lives in `SettingsModalViewModel` | `InheritanceResolver`, `InheritedBadge` (good) | | A3 | Worktree actions | `WorktreesOverviewModalViewModel` per-row cmds (Merge/Discard/Keep/ForceRemove/ShowDiff/Jump) vs `MergeSectionViewModel` (Merge/OpenDiff) | same `IWorkerClient` calls | -| A4 | Merge display | `AgentStripView` re-displays `MergeSectionViewModel` state | — | +| A4 | Merge display | ~~`AgentStripView` re-displays `MergeSectionViewModel` state~~ — resolved 2026-08-06: `AgentStripView` was dead (never bound after the task-detail redesign); deleted instead of unified | — | ### Bucket B — entry-point sprawl (one backend, many hand-wired doors) diff --git a/src/ClaudeDo.Localization/locales/de.json b/src/ClaudeDo.Localization/locales/de.json index 87e755b9..0e50167b 100644 --- a/src/ClaudeDo.Localization/locales/de.json +++ b/src/ClaudeDo.Localization/locales/de.json @@ -249,21 +249,7 @@ } }, "agent": { - "stopTip": "Agent stoppen", - "sendToQueue": "In Warteschlange einreihen", - "sendToQueueTip": "Diese Aufgabe einreihen, damit der Worker sie übernimmt", - "removeFromQueue": "Aus Warteschlange entfernen", - "removeFromQueueTip": "Diese Aufgabe wieder aus der Warteschlange nehmen", - "worktreeLabel": "WORKTREE", - "copyPathTip": "Pfad kopieren", - "diffLabel": "DIFF", - "openDiff": "Diff öffnen", - "worktreeBtn": "Worktree", - "openWorktreeTip": "Worktree im Datei-Explorer öffnen", - "continue": "Fortsetzen", - "continueTip": "Die letzte Sitzung fortsetzen und weitermachen", - "resetAndRetry": "Zurücksetzen & erneut versuchen", - "resetAndRetryTip": "Den Worktree verwerfen und die Aufgabe erneut einreihen, um von vorn zu beginnen" + "openWorktreeTip": "Worktree im Datei-Explorer öffnen" }, "notes": { "today": "Heute", diff --git a/src/ClaudeDo.Localization/locales/en.json b/src/ClaudeDo.Localization/locales/en.json index 4f052ac5..64ff5967 100644 --- a/src/ClaudeDo.Localization/locales/en.json +++ b/src/ClaudeDo.Localization/locales/en.json @@ -249,21 +249,7 @@ } }, "agent": { - "stopTip": "Stop agent", - "sendToQueue": "Send to queue", - "sendToQueueTip": "Queue this task for the worker to pick up", - "removeFromQueue": "Remove from queue", - "removeFromQueueTip": "Take this task back out of the queue", - "worktreeLabel": "WORKTREE", - "copyPathTip": "Copy path", - "diffLabel": "DIFF", - "openDiff": "Open diff", - "worktreeBtn": "Worktree", - "openWorktreeTip": "Open worktree in file explorer", - "continue": "Continue", - "continueTip": "Resume the last session and keep going", - "resetAndRetry": "Reset & retry", - "resetAndRetryTip": "Discard the worktree and re-queue the task to run from scratch" + "openWorktreeTip": "Open worktree in file explorer" }, "notes": { "today": "Today", diff --git a/src/ClaudeDo.Ui/CLAUDE.md b/src/ClaudeDo.Ui/CLAUDE.md index b901b1bd..542e0688 100644 --- a/src/ClaudeDo.Ui/CLAUDE.md +++ b/src/ClaudeDo.Ui/CLAUDE.md @@ -30,7 +30,7 @@ ViewModels/ WorkerConnection, WorktreesOverview, UnifiedDiffParser Conflicts/ — ConflictResolverViewModel + ConflictModels Views/ — mirrors the VM layout; Islands/Detail/ holds TaskHeaderBar, - DescriptionStepsCard, WorkConsole; plus AgentStripView, SessionTerminalView + DescriptionStepsCard, WorkConsole; plus SessionTerminalView Views/Controls/ — MarkdownView, ModalShell, ThemedDatePicker, DiffLinesView, InheritedBadge, AgentConfigEditor Design/ — Tokens.axaml (design tokens; merged before styles) diff --git a/src/ClaudeDo.Ui/Design/IslandStyles.axaml b/src/ClaudeDo.Ui/Design/IslandStyles.axaml index da7c8242..fbcd8e8d 100644 --- a/src/ClaudeDo.Ui/Design/IslandStyles.axaml +++ b/src/ClaudeDo.Ui/Design/IslandStyles.axaml @@ -8,7 +8,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -