Repository navigation
Commit 8761ddc
committed
Merge branch 'main' (upstream 4d14dbe) into fix/937-process-queued-messages-on-terminal-finish
Scope cut: this merge also reduces the PR to the #937 fix alone, dropping the
durable-ack subsystem so the branch becomes mergeable.
Conflict resolutions:
- ExecuteCommandTool.ts (5 hunks): union on every hunk. The options object and
ExecuteCommandOptions carry upstream's toolCallId and this branch's
toolResultPublished; both publish arms keep upstream's
markToolRejected(task, toolCallId) and the branch's publishToolResult /
shouldDrainQueuedMessages / settle-and-rethrow. The working-directory guard
uses upstream's richer commandWorkingDirectoryError while returning the
branch's 3-tuple [false, error, false].
- Task.ts (2 hunks): kept upstream's isProtected short-circuit inside the
branch's deferred-claim queuedAskResolution expression, and kept upstream's
protected-ask exemption comment and !isProtected predicate alongside the
branch's resolution-gate-before-claim comment.
- ReadFileTool.ts (3 hunks): reverted to main. All three were
sayUserFeedbackAndAckQueued vs markToolRejected; the ack call was cut.
- Test files: ask-queued-message-drain.spec.ts, readFileTool.spec.ts,
webviewMessageHandler.spec.ts, api-send-message.spec.ts reverted to main
(they assert the cut APIs). executeCommandTool.spec.ts resolved as a union
of the mock task, plus toolCallId added to the new drain tests.
Cut (not deferred behind a flag): sayUserFeedbackAndAckQueued,
discardConsumedQueuedMessage, the persistQueuedFeedbackAndAcknowledge rework,
queuedFeedbackRows reconciliation, MessageQueueService.claimMessage,
Task.editQueuedMessage, askResponseQueuedMessageId, inFlightAskGates,
inFlightAskBlocksQueuedSubmission, the say()/addToClineMessages boolean
returns, and the webviewMessageHandler/api.ts additions that depended on them.
Kept: the terminal-completion drain in ExecuteCommandTool (publication signal,
commandSubmitted third tuple element, drain at both completion sites and after
background transition, settle on every throw path), and minimal Task support
(awaitable failure-aware serialized processQueuedMessages, submitUserMessage
returning Promise<boolean> with a cancellation guard, a re-drain guard so a
pending response is never overwritten, awaited drain in condenseContext).1,018 files changed
Lines changed: 78709 additions & 27886 deletions
File tree
- .github
- ISSUE_TEMPLATE
- actions
- setup-node-pnpm
- slack-notify
- workflows
- .husky
- .roo
- commands
- rules-translate
- skills
- roo-conflict-resolution
- roo-translation
- apps
- cli
- scripts
- src
- agent
- __tests__
- commands/cli
- lib
- sdk
- storage
- task-history
- utils
- __tests__
- ui
- components
- __tests__
- tools
- hooks
- vscode-e2e
- src
- fixtures
- heap
- suite
- visual/__screenshots__
- docs
- architecture
- locales
- ca
- de
- es
- fr
- hi
- id
- it
- ja
- ko
- nl
- pl
- pt-BR
- ru
- tr
- vi
- zh-CN
- zh-TW
- packages
- build
- cloud
- src
- config-eslint
- core
- src/custom-tools/__tests__
- ipc
- src
- __tests__
- telemetry
- src
- __tests__
- types
- src
- __tests__
- provider-settings
- providers
- vscode-shim
- src
- __tests__
- api
- classes
- utils
- schemas
- scripts
- agent-evals
- solheim-smoke
- src
- __mocks__
- __tests__
- activate
- api
- __tests__
- providers
- __tests__
- fetchers
- __tests__
- utils
- __tests__
- transform
- __tests__
- cache-strategy
- assets/marketplace
- core
- assistant-message
- __tests__
- auto-approval
- checkpoints
- __tests__
- condense
- __tests__
- config
- __tests__
- context-management
- __tests__
- diff/strategies
- __tests__
- environment
- ignore
- mentions
- __tests__
- message-manager
- message-queue
- prompts
- __tests__
- sections
- __tests__
- tools
- __tests__
- native-tools
- __tests__
- task-persistence
- __tests__
- task
- __tests__
- run-state
- __tests__
- tools
- __tests__
- webview
- __tests__
- worktree
- extension
- __tests__
- i18n
- locales
- ca
- de
- en
- es
- fr
- hi
- id
- it
- ja
- ko
- nl
- pl
- pt-BR
- ru
- tr
- vi
- zh-CN
- zh-TW
- integrations
- editor/__tests__
- misc
- __tests__
- fixtures
- terminal
- __tests__
- scripts/__tests__
- services
- __tests__
- checkpoints
- __tests__
- code-index
- __tests__
- embedders
- __tests__
- interfaces
- processors
- __tests__
- semble
- __tests__
- vector-store
- __tests__
- command
- __tests__
- destructive-command-guard
- __tests__
- glob/__tests__
- language-models
- __tests__
- managed-binary
- marketplace
- __tests__
- mcp
- __tests__
- utils
- __tests__
- roo-config
- search
- __tests__
- skills
- __tests__
- tree-sitter
- __tests__
- fixtures
- queries
- test-utils/__tests__
- utils
- __tests__
- webview-ui
- playwright
- gallery
- src
- __tests__
- components
- chat
- __tests__
- __screenshots__
- utils
- common
- __tests__
- __screenshots__
- history
- __tests__
- __screenshots__
- modes
- __tests__
- settings
- __tests__
- __screenshots__
- providers
- __tests__
- __screenshots__
- utils
- __tests__
- ui
- __tests__
- hooks
- __tests__
- welcome
- context
- __tests__
- hooks
- i18n
- locales
- ca
- de
- en
- es
- fr
- hi
- id
- it
- ja
- ko
- nl
- pl
- pt-BR
- ru
- tr
- vi
- zh-CN
- zh-TW
- oauth
- utils
- __tests__
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
79 | 79 | | |
80 | 80 | | |
81 | 81 | | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
82 | 85 | | |
83 | 86 | | |
84 | 87 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
4 | | - | |
| 3 | + | |
| 4 | + | |
5 | 5 | | |
6 | | - | |
| 6 | + | |
7 | 7 | | |
8 | | - | |
9 | 8 | | |
10 | 9 | | |
| 10 | + | |
| 11 | + | |
11 | 12 | | |
12 | | - | |
| 13 | + | |
13 | 14 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
| 6 | + | |
7 | 7 | | |
8 | | - | |
9 | 8 | | |
10 | 9 | | |
| 10 | + | |
| 11 | + | |
11 | 12 | | |
12 | | - | |
| 13 | + | |
13 | 14 | | |
14 | 15 | | |
15 | | - | |
| 16 | + | |
| 17 | + | |
16 | 18 | | |
17 | 19 | | |
18 | 20 | | |
19 | | - | |
| 21 | + | |
20 | 22 | | |
21 | 23 | | |
22 | | - | |
| 24 | + | |
23 | 25 | | |
24 | 26 | | |
25 | | - | |
| 27 | + | |
26 | 28 | | |
27 | 29 | | |
28 | | - | |
| 30 | + | |
29 | 31 | | |
30 | 32 | | |
31 | | - | |
| 33 | + | |
32 | 34 | | |
33 | 35 | | |
34 | | - | |
| 36 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
| 2 | + | |
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
7 | | - | |
8 | | - | |
9 | | - | |
10 | | - | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
11 | 11 | | |
12 | | - | |
13 | | - | |
14 | | - | |
15 | | - | |
16 | | - | |
17 | | - | |
18 | | - | |
19 | | - | |
| 12 | + | |
20 | 13 | | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | | - | |
25 | | - | |
26 | | - | |
27 | | - | |
28 | | - | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
29 | 22 | | |
30 | | - | |
31 | | - | |
32 | | - | |
33 | | - | |
34 | | - | |
35 | | - | |
36 | | - | |
37 | | - | |
38 | | - | |
39 | | - | |
40 | | - | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
41 | 31 | | |
42 | | - | |
43 | | - | |
44 | | - | |
45 | | - | |
46 | | - | |
47 | | - | |
48 | | - | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
49 | 43 | | |
50 | | - | |
51 | | - | |
52 | | - | |
53 | | - | |
54 | | - | |
55 | | - | |
56 | | - | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
57 | 51 | | |
58 | | - | |
59 | | - | |
60 | | - | |
61 | | - | |
62 | | - | |
63 | | - | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
64 | 59 | | |
65 | | - | |
66 | | - | |
67 | | - | |
68 | | - | |
69 | | - | |
70 | | - | |
71 | | - | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
72 | 66 | | |
73 | | - | |
74 | | - | |
75 | | - | |
76 | | - | |
77 | | - | |
78 | | - | |
79 | | - | |
80 | | - | |
81 | | - | |
82 | | - | |
83 | | - | |
84 | | - | |
85 | | - | |
86 | | - | |
87 | | - | |
88 | | - | |
89 | | - | |
90 | | - | |
91 | | - | |
92 | | - | |
93 | | - | |
94 | | - | |
95 | | - | |
96 | | - | |
97 | | - | |
98 | | - | |
99 | | - | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
100 | 74 | | |
101 | | - | |
102 | | - | |
103 | | - | |
104 | | - | |
105 | | - | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
106 | 102 | | |
107 | | - | |
108 | | - | |
109 | | - | |
110 | | - | |
111 | | - | |
112 | | - | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
113 | 108 | | |
114 | | - | |
115 | | - | |
116 | | - | |
117 | | - | |
118 | | - | |
119 | | - | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
| 4 | + | |
5 | 5 | | |
6 | | - | |
| 6 | + | |
7 | 7 | | |
8 | | - | |
9 | 8 | | |
10 | 9 | | |
| 10 | + | |
| 11 | + | |
11 | 12 | | |
12 | | - | |
| 13 | + | |
13 | 14 | | |
14 | 15 | | |
15 | | - | |
| 16 | + | |
16 | 17 | | |
17 | | - | |
18 | | - | |
| 18 | + | |
| 19 | + | |
19 | 20 | | |
20 | 21 | | |
21 | | - | |
| 22 | + | |
0 commit comments