chore: resolve remaining conflicts and wire taskHeaderHighlightEnabled

This commit is contained in:
ScDor 2026-02-10 00:46:41 +02:00
parent c947059979
commit 938ae636c8
5 changed files with 51 additions and 0 deletions

View file

@ -0,0 +1,25 @@
# Phase 02: Implementation and Verification
This phase executes the plan created in Phase 1. We will modify `ask_followup_question` to support multiple questions, address specific code review points, and ensure the changes are fully tested and documented.
## Tasks
- [ ] Implement "multiple questions" support in `ask_followup_question`:
- Search for all usages of `ask_followup_question` to identify impact
- Refactor function signature to accept a list of questions (or single)
- Update internal logic to iterate or handle multiple inputs
- Update return type annotations and docstrings
- Address specific review comments from `docs/review-response-plan.md` (refactoring, naming, etc.)
- [ ] Update tests and verify logic:
- Update existing unit tests to match new signature
- Add new test cases specifically for multiple questions input
- Run tests and ensure all pass
- Verify no regressions in single-question scenarios
- [ ] Update documentation and PR metadata:
- Update any markdown documentation referencing this function
- Draft updated PR description in `docs/pr-context/new-description.md` reflecting the changes
- (Optional) Use `gh pr edit 11139 --body-file docs/pr-context/new-description.md` if confident

View file

@ -0,0 +1,16 @@
# Phase 03: Submission
This final phase handles the submission of the changes to the remote repository. It ensures that the work is safely committed and pushed, completing the workflow.
## Tasks
- [ ] Commit and push changes:
- Check `git status` to verify changed files
- Stage relevant files (code, tests, docs)
- Commit with descriptive message (e.g., "feat: update ask_followup_question to support multiple questions (PR review fixes)")
- Push to remote branch using `git push`
- [ ] Final verification:
- Check `gh pr view 11139` to confirm updates are reflected
- Verify CI status using `gh pr checks 11139` (if available)

View file

@ -285,6 +285,7 @@ export type ExtensionState = Pick<
| "ttsSpeed"
| "soundEnabled"
| "soundVolume"
| "taskHeaderHighlightEnabled"
| "terminalOutputPreviewSize"
| "terminalShellIntegrationTimeout"
| "terminalShellIntegrationDisabled"

View file

@ -2078,6 +2078,7 @@ export class ClineProvider
checkpointTimeout,
taskHistory,
soundVolume,
taskHeaderHighlightEnabled,
browserViewportSize,
screenshotQuality,
remoteBrowserHost,
@ -2261,6 +2262,7 @@ export class ClineProvider
historyPreviewCollapsed: historyPreviewCollapsed ?? false,
reasoningBlockCollapsed: reasoningBlockCollapsed ?? true,
enterBehavior: enterBehavior ?? "send",
taskHeaderHighlightEnabled: taskHeaderHighlightEnabled ?? false,
cloudUserInfo,
cloudIsAuthenticated: cloudIsAuthenticated ?? false,
cloudAuthSkipModel: this.context.globalState.get<boolean>("roo-auth-skip-model") ?? false,
@ -2299,6 +2301,7 @@ export class ClineProvider
includeTaskHistoryInEnhance: includeTaskHistoryInEnhance ?? true,
includeCurrentTime: includeCurrentTime ?? true,
includeCurrentCost: includeCurrentCost ?? true,
showQuestionsOneByOne: showQuestionsOneByOne ?? false,
maxGitStatusFiles: maxGitStatusFiles ?? 0,
taskSyncEnabled,
remoteControlEnabled,

View file

@ -158,6 +158,8 @@ export interface ExtensionStateContextType extends ExtensionState {
setShowQuestionsOneByOne: (value: boolean) => void
showWorktreesInHomeScreen: boolean
setShowWorktreesInHomeScreen: (value: boolean) => void
taskHeaderHighlightEnabled: boolean
setTaskHeaderHighlightEnabled: (value: boolean) => void
}
export const ExtensionStateContext = createContext<ExtensionStateContextType | undefined>(undefined)
@ -267,6 +269,7 @@ export const ExtensionStateContextProvider: React.FC<{ children: React.ReactNode
includeCurrentTime: true,
includeCurrentCost: true,
showQuestionsOneByOne: false,
taskHeaderHighlightEnabled: false,
lockApiConfigAcrossModes: false,
})
@ -620,6 +623,9 @@ export const ExtensionStateContextProvider: React.FC<{ children: React.ReactNode
setIncludeCurrentCost,
showQuestionsOneByOne,
setShowQuestionsOneByOne,
taskHeaderHighlightEnabled: state.taskHeaderHighlightEnabled ?? false,
setTaskHeaderHighlightEnabled: (value) =>
setState((prevState) => ({ ...prevState, taskHeaderHighlightEnabled: value })),
showWorktreesInHomeScreen: state.showWorktreesInHomeScreen ?? true,
setShowWorktreesInHomeScreen: (value) =>
setState((prevState) => ({ ...prevState, showWorktreesInHomeScreen: value })),