feature: unified-shell-resolution (4/4) - #1136
Conversation
|
Warning Review limit reached
Next review available in: 15 minutes You've used all free OSS reviews for now. Wait for the free limit to reset to keep reviewing this public repository. How can I continue?After more reviews become available, a review can be triggered using the To avoid repeated limits, reduce automatic review volume by pausing incremental auto-reviews earlier, using label-based review opt-in, excluding WIP or generated PR titles, or requesting reviews manually when the PR is ready. If your team needs uninterrupted high-volume reviews, an organization admin can enable usage-based reviews. How do review limits work?CodeRabbit enforces per-developer PR review limits for each organization. Most developers receive the normal plan review availability. For paid Pro and Pro+ PR reviews, CodeRabbit uses adaptive limits for sustained high-volume activity. When a developer's recent PR review activity reaches the 95th percentile or higher among CodeRabbit users, additional reviews become available more gradually as earlier reviews age out of the rolling window. Please refer docs for additional details. 📝 WalkthroughWalkthroughThe change adds unified shell selection and resolution, shell-aware prompts, terminal lifecycle and recovery controls, command tracing and scheduling, strict OpenAI tool schemas, webview settings, localization, and supporting architecture reports. ChangesUnified shell execution
OpenAI tool schema configuration
Supporting reports and maintenance
Estimated code review effort: 5 (Critical) | ~120 minutes Sequence Diagram(s)sequenceDiagram
participant SettingsUI
participant ClineProvider
participant CommandEnvironmentService
participant TerminalRegistry
participant ExecuteCommandTool
SettingsUI->>ClineProvider: request or save shell selection
ClineProvider->>CommandEnvironmentService: resolve and cache environment
CommandEnvironmentService-->>ClineProvider: shell plans and effective shell
ClineProvider-->>SettingsUI: options, effective shell, or typed error
ExecuteCommandTool->>TerminalRegistry: enqueue command execution
TerminalRegistry->>CommandEnvironmentService: use resolved shell plan
TerminalRegistry-->>ExecuteCommandTool: terminal output and lifecycle events
Possibly related issues
Possibly related PRs
Suggested labels: Suggested reviewers: 🚥 Pre-merge checks | ✅ 3 | ❌ 2❌ Failed checks (2 warnings)
✅ Passed checks (3 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
Codecov Report❌ Patch coverage is 📢 Thoughts on this report? Let us know! |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 1
Note
Due to the large number of review comments, Critical severity comments were prioritized as inline comments.
🟠 Major comments (22)
docs/260801_0001_session_fork-pr-rebase-ci/224000_code-report.md-52-54 (1)
52-54: 📐 Maintainability & Code Quality | 🟠 Major | ⚡ Quick winDo not prescribe direct rebases for the B branches.
git rebase main <branch-name>replays copied prerequisite commits and historical CI workarounds. Rebuild each branch from its declared base and cherry-pick only its reviewed feature commits, as specified in222900_architect-report.md.🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@docs/260801_0001_session_fork-pr-rebase-ci/224000_code-report.md` around lines 52 - 54, Update the Sub-task 2 instructions to avoid directly rebasing each B branch onto main; instead, rebuild every B branch from its declared base and cherry-pick only the reviewed feature commits, following the process in 222900_architect-report.md, then verify each rebuilt branch builds and passes tests.docs/260801_0001_session_fork-pr-rebase-ci/224000_code-report.md-5-20 (1)
5-20: 📐 Maintainability & Code Quality | 🟠 Major | ⚡ Quick winCreate recovery refs for every planned branch.
This report records backups for six branches. The architecture plan defines 17 B branches and requires an immutable recovery ref for every pre-rewrite tip. Create and record the remaining refs, or document how these six refs cover all 17 branches. Otherwise, a later force update can leave a branch without a recovery point.
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@docs/260801_0001_session_fork-pr-rebase-ci/224000_code-report.md` around lines 5 - 20, Update the recovery-ref documentation to account for all 17 B branches defined by the architecture plan: create and record immutable pre-rewrite backup refs for the 11 branches missing from the six listed in “Step 1: Recovery Backup Refs,” or explicitly document how the existing six refs cover every planned branch. Ensure each planned branch has a clear recovery point before any force update.src/core/tools/__tests__/terminal-provider-fallback.spec.ts-116-137 (1)
116-137: 📐 Maintainability & Code Quality | 🟠 Major | ⚡ Quick winAssert fallback mismatch enforcement through production code.
The “same-family fallback” and “cross-family rejection” tests only read the fixture created by
makeEnv;execute_command.tsandTerminalRegistrycomparefallbackPlan?.family === primaryPlan.family, but neither test exercises that validation path. Add tests that call the real validation predicate/switch path with same-family and cross-family environments, ensuringShellFallbackMismatchErroris thrown on mismatch.🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@src/core/tools/__tests__/terminal-provider-fallback.spec.ts` around lines 116 - 137, Extend the tests in the same-family and cross-family sections to invoke the production fallback validation path used by execute_command.ts and TerminalRegistry, rather than only inspecting makeEnv output. Cover both matching and mismatching fallback families, and assert that the cross-family case throws ShellFallbackMismatchError while the same-family case is accepted.src/integrations/terminal/__tests__/ShellResolver.spec.ts-39-59 (1)
39-59: 📐 Maintainability & Code Quality | 🟠 Major | ⚡ Quick winReplace
as anywith typed test doubles.
entry: anyat Line 40,source: anyat Lines 44 and 50, andsettings as anyat Line 182 useas any. The coding guidelines prohibitas anyand require typed APIs or precise test doubles. The needed types are already exported: useShellResolutionSourceforsource,ShellResolverSettingsfor the settings argument, andResolvedProfile["entry"]forentry. The double assertion at Line 58 is acceptable as a last resort, but it needs a comment that explains why.♻️ Proposed typing
+import type { ShellResolverSettings } from "../shell/ShellResolver" +import type { ResolvedShell, ShellResolutionSource } from "../shell/types" + function createProfileResolverMock( - profiles: Record<string, { shell: ResolvedShell; entry: any } | undefined>, + profiles: Record<string, { shell: ResolvedShell; entry: Record<string, unknown> } | undefined>, defaultProfile?: ResolvedShell, ): TerminalProfileResolver { return { - resolveProfile: vi.fn((name: string, source: any) => { + resolveProfile: vi.fn((name: string, source: ShellResolutionSource) => {- const result = resolver.resolve(settings as any, cliOverride) + const result = resolver.resolve(settings as ShellResolverSettings, cliOverride)As per coding guidelines: "Avoid
as any; use typed APIs, bracket notation for private members where appropriate, or precise test doubles andunknownwith type guards. Use double assertions only as a last resort and explain them with a comment."Also applies to: 182-182
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@src/integrations/terminal/__tests__/ShellResolver.spec.ts` around lines 39 - 59, Replace the any-typed fields and parameters in createProfileResolverMock with ShellResolutionSource for source and ResolvedProfile["entry"] for entry, importing the required exported types. Update the settings argument near line 182 to use ShellResolverSettings instead of settings as any. Retain the TerminalProfileResolver double assertion only if necessary, and add a brief comment explaining why it is required.Source: Coding guidelines
src/utils/shell.ts-460-476 (1)
460-476: 🚀 Performance & Scalability | 🟠 Major | ⚡ Quick winCache the resolver lookup and expose fallback failures.
getShell()calls this path during prompt assembly, and each call instantiatesTerminalProfileResolverandShellResolver, which can read VS Code configuration/filesystem probes repeatedly. Keep the module references or resolver cached, or construct only for runtime-refreshed callers. Also capture thecatcherror and log it at debug level, since an unavailable resolver currently falls back to legacy detection without any log.🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@src/utils/shell.ts` around lines 460 - 476, Update getShell to cache the dynamically loaded resolver modules or initialized resolver so repeated prompt assembly calls do not recreate TerminalProfileResolver and ShellResolver or repeat configuration/filesystem probes; preserve runtime refresh behavior where required. Capture the exception in the resolver fallback catch and log it at debug level before continuing to legacy detection.webview-ui/src/components/settings/SettingsView.tsx-463-477 (1)
463-477: 🎯 Functional Correctness | 🟠 Major | ⚡ Quick winClear
pendingTerminalShellSelectionwhen synced state is no longer pending.
save()posts the selection and leaves the pending value set until discard.SettingsViewalways showspendingTerminalShellSelection ?? cachedState.terminalShellSelection, so a later change to the persistedextensionState.terminalShellSelectionwill still be masked by the stored pending value. Clear it with an effect whenextensionState.terminalShellSelectionchanges and is different from the pending value.🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@webview-ui/src/components/settings/SettingsView.tsx` around lines 463 - 477, Add an effect in SettingsView that observes extensionState.terminalShellSelection and clears pendingTerminalShellSelection when the synced value changes and differs from the pending selection. Preserve the pending value until that synchronization occurs, while ensuring the displayed terminal shell eventually reflects the persisted extension state.src/core/webview/ClineProvider.ts-3143-3147 (1)
3143-3147: 🗄️ Data Integrity & Integration | 🟠 Major | ⚡ Quick winThree
getEnvironmentcallers omitterminalShellIntegrationDisabled, so the shared cache stores the wrong execution provider.CommandEnvironmentService.resolveEnvironmentselectsprimaryProviderwithsettings.terminalShellIntegrationDisabled || primaryShell.family === "cmd" ? "execa" : "vscode". When the field is absent it is falsy, so any non-cmdshell resolves to"vscode"andpromptDescriptor.providerLabelbecomes"VS Code Integrated Terminal"even while the inline terminal is enabled.getEnvironmentthen caches that result and returns it to every later caller until the nextinvalidate(), including the task and prompt paths. The startup hydration atsrc/core/webview/ClineProvider.tslines 935-940 does pass the field, which confirms it belongs in this settings object.
src/core/webview/ClineProvider.ts#L3143-L3147: addterminalShellIntegrationDisabled: state.terminalShellIntegrationDisabledto theservice.getEnvironmentcall. This call runs directly afterservice.invalidate(), so it is the site that repopulates the shared cache with the wrong provider and reports a misleadingeffectiveShellto the settings UI.src/core/webview/ClineProvider.ts#L3049-L3053: addterminalShellIntegrationDisabled: state.terminalShellIntegrationDisabledto theservice.getEnvironmentcall inhandleRequestTerminalShellOptions.src/core/webview/generateSystemPrompt.ts#L52-L59: destructureterminalShellIntegrationDisabledfromprovider.getState()at lines 21-23 and pass it in theservice.getEnvironmentsettings object, so opening the system-prompt preview cannot poison the cache used by the next runtime request.Consider a single private helper on
ClineProviderthat builds theCommandEnvironmentSettingsobject from state. That removes this class of drift across the three call sites.🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@src/core/webview/ClineProvider.ts` around lines 3143 - 3147, Update all three getEnvironment callers to include terminalShellIntegrationDisabled from state: src/core/webview/ClineProvider.ts lines 3143-3147 and 3049-3053, and src/core/webview/generateSystemPrompt.ts lines 52-59 after destructuring it from provider.getState() at lines 21-23. Ensure each call supplies the complete settings object so shared environment caching uses the correct provider; optionally centralize this construction in a private ClineProvider helper to prevent future drift.src/core/webview/__tests__/terminal-shell-messages.spec.ts-217-357 (1)
217-357: 📐 Maintainability & Code Quality | 🟠 Major | 🏗️ Heavy liftThese mocks reimplement the handlers, so the production logic is untested.
mockProvidersupplies its own bodies forhandleRequestTerminalShellOptions,handleSetTerminalShellSelection, andhandleCustomShellPathPicked. The assertions therefore verify the mock, notClineProvider. The file header states that the suite verifies validated persistence, environment-cache invalidation, and idle-terminal closure, but none of those code paths execute. A regression inClineProvider.handleSetTerminalShellSelection— for example dropping theresult.rejectableguard beforesetValue— would still pass.Only the
webviewMessageHandlerdispatch is genuinely covered: delegation, the missing-payload guard atsetTerminalShellSelection, and the cancelled-dialog path. Those tests are valuable; keep them.Drive the real handlers instead. Construct a
ClineProviderwith a stubcontextProxyandpostMessageToWebview, and keep the existingvi.mockdoubles forShellResolver,TerminalProfileResolver,CommandEnvironmentService, andTerminalRegistry. Those doubles are already declared here and are currently unused by the handler assertions.🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@src/core/webview/__tests__/terminal-shell-messages.spec.ts` around lines 217 - 357, Replace the mock implementations of mockProvider.handleRequestTerminalShellOptions, handleSetTerminalShellSelection, and handleCustomShellPathPicked with a real ClineProvider instance configured with stub contextProxy and postMessageToWebview dependencies. Preserve the existing vi.mock doubles for ShellResolver, TerminalProfileResolver, CommandEnvironmentService, and TerminalRegistry, and retain the webviewMessageHandler dispatch, missing-payload, and cancelled-dialog tests while updating handler assertions to exercise production persistence, cache invalidation, and idle-terminal closure.src/integrations/terminal/TerminalRegistry.ts-594-618 (1)
594-618: 🩺 Stability & Availability | 🟠 Major | ⚡ Quick winAn illegal transition in recovery aborts the whole watchdog sweep.
recoverStaleTerminalcallstransition("failed", ownerExecutionId)unconditionally for VS Code terminals.TerminalLifecyclehas nofailed → failedand nodisposed → failededge, so the call throwsIllegalTransitionError. This path is reachable:TerminalProcess.runsets the lifecycle tofailedwhile the owner is still set, and the watchdog then recovers the same terminal through Evidence 1 when the terminal closes. The throw propagates out of thesetIntervalcallback inrunWatchdog, so it becomes an unhandled exception and the remaining terminals in that sweep are skipped.Guard the transition and isolate each terminal in the sweep.
🛡️ Proposed fix
if (terminal.provider === "vscode") { - terminal.lifecycle.transition("failed", ownerExecutionId) + if (terminal.lifecycle.state !== "failed" && terminal.lifecycle.state !== "disposed") { + terminal.lifecycle.transition("failed", ownerExecutionId) + } terminal.lifecycle.markBroken() if (terminal instanceof Terminal) { terminal.terminal.dispose() ShellIntegrationManager.zshCleanupTmpDir(terminal.id) } - terminal.lifecycle.transition("disposed", ownerExecutionId) + if (terminal.lifecycle.state !== "disposed") { + terminal.lifecycle.transition("disposed", ownerExecutionId) + } this.removeTerminal(terminal.id)Also wrap the per-terminal work in
runWatchdogso one failure cannot stop the sweep:for (const terminal of [...this.terminals]) { + try { const lifecycle = terminal.lifecycle ... + } catch (error) { + console.error(`[TerminalRegistry/watchdog] Error inspecting terminal ${terminal.id}:`, error) + } }Also applies to: 751-760
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@src/integrations/terminal/TerminalRegistry.ts` around lines 594 - 618, Update recoverStaleTerminal to avoid calling the VS Code terminal lifecycle transition to "failed" unless that transition is valid for the terminal’s current state, preventing repeated or disposed-to-failed transitions. In runWatchdog, isolate each terminal’s recovery/check logic with per-terminal error handling so an exception is logged or handled without aborting iteration over the remaining terminals.src/core/tools/__tests__/executeCommandTool.spec.ts-159-175 (1)
159-175: 🎯 Functional Correctness | 🟠 Major | ⚡ Quick winThese tests no longer verify HTML unescaping.
The inputs now contain the literal characters
<,>, and&instead of the entities<,>, and&.unescapeHtmlEntitiesreturns such input unchanged, so each assertion compares a string with itself and passes regardless of the implementation. The test names still describe entity decoding.Restore the entity inputs.
💚 Proposed fix
- it("should unescape < to < character", () => { - const input = "echo <test>" + it("should unescape < to < character", () => { + const input = "echo <test>" const expected = "echo <test>" expect(unescapeHtmlEntities(input)).toBe(expected) })Apply the same change to the
>,&, and mixed-entity cases.🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@src/core/tools/__tests__/executeCommandTool.spec.ts` around lines 159 - 175, Update the test inputs in the unescapeHtmlEntities cases to use the encoded entities (<, >, and &) while keeping expected values as literal characters. Apply the same correction to the related mixed-entity test so each assertion verifies actual decoding rather than unchanged input.src/integrations/terminal/TerminalRegistry.ts-648-656 (1)
648-656: 🩺 Stability & Availability | 🟠 Major | ⚡ Quick winThe ready-reservation deadline can kill a running command.
READY_RESERVATION_DEADLINE_MSdocuments a deadline "for a ready reservation to reach submission", but this branch does not check submission. A VS Code terminal stays inintegration-readyuntilsetActiveStreamtransitions it torunning, andsetActiveStreamruns only whenonDidStartTerminalShellExecutionfires.TerminalProcess.runsubmits the command throughexecuteCommandbefore that event arrives. If the start event is delayed more than 10 seconds, the watchdog callsrecoverStaleTerminal, which aborts the process and disposes the terminal while the command is running.Skip recovery when the lifecycle records a submitted command.
🐛 Proposed fix
if (state === "integration-ready" || state === "fallback-ready") { - if (elapsed > READY_RESERVATION_DEADLINE_MS) { + // A submitted command may sit in `integration-ready` until the VS Code + // start event arrives. Elapsed time alone is not evidence of staleness. + if (!lifecycle.commandSubmitted && elapsed > READY_RESERVATION_DEADLINE_MS) { console.info( `[TerminalRegistry/watchdog] Terminal ${terminal.id} ready reservation exceeded ${READY_RESERVATION_DEADLINE_MS}ms; recovering`, ) this.recoverStaleTerminal(terminal.id, ownerExecutionId, "TERMINAL_BUSY_STALE") } continue }🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@src/integrations/terminal/TerminalRegistry.ts` around lines 648 - 656, Update the watchdog branch in the terminal lifecycle monitoring logic around recoverStaleTerminal so it skips stale ready-reservation recovery when the lifecycle record indicates a command has already been submitted. Preserve recovery for ready terminals without a submitted command, and keep the existing transition to running via setActiveStream unchanged.src/integrations/terminal/TerminalRegistry.ts-268-341 (1)
268-341: 🗄️ Data Integrity & Integration | 🟠 Major | ⚡ Quick winFix the non-reentrant creation permit in provider switches.
withTerminalCreationPermitreturnsresult.value, so this wrapper object does not change the return contract. However,acquireCreationPermit()cannot be called twice on the same holder: it setscreationPermitInUseand queues subsequent callers. SinceprepareProviderSwitchalready holds the command lease and then callsgetOrCreateTerminalunder the creation permit, re-using the fallback under the same execution lease can deadlock via this non-reentrant permit. Acquire the fallback creation permit outside the existing command-lease scope, or avoid obtaining a replacement terminal while the same command is still active.🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@src/integrations/terminal/TerminalRegistry.ts` around lines 268 - 341, The getOrCreateTerminal flow can deadlock when prepareProviderSwitch already holds the command lease and re-enters withTerminalCreationPermit for the same execution. Adjust the provider-switch path around prepareProviderSwitch and getOrCreateTerminal so the fallback creation permit is acquired outside the existing command-lease scope, or defer replacement-terminal acquisition until that lease is released; preserve the existing terminal reuse and return behavior.src/integrations/terminal/TerminalProcess.ts-193-198 (1)
193-198: 🩺 Stability & Availability | 🟠 Major | ⚡ Quick winDo not let lifecycle bookkeeping fail a submitted command.
markCommandSubmittedthrows in two cases: the execution ID is not the current owner, andcommandSubmittedAtis already set. This call sits inside thetryblock that starts on line 186, afterexecuteCommandalready submitted the command. A throw therefore clearsactiveShellExecution, deletes the temp script, and rethrows, while the shell command keeps running with no tracking. The recovery and reuse paths make a secondrun()on the same lifecycle reachable.Guard the call so it cannot abort a submitted command.
🛡️ Proposed fix
if (this.executionId) { - this.terminal.lifecycle.markCommandSubmitted(this.executionId) + try { + this.terminal.lifecycle.markCommandSubmitted(this.executionId) + } catch (error) { + // The command is already submitted; bookkeeping failure must not + // abort it or delete the temp script it is executing. + console.warn("[TerminalProcess] markCommandSubmitted failed after submission:", error) + } }🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@src/integrations/terminal/TerminalProcess.ts` around lines 193 - 198, Update the lifecycle bookkeeping around TerminalProcess executionId handling so markCommandSubmitted cannot propagate an exception after executeCommand has submitted the command. Catch and contain failures from this call, preserving activeShellExecution, temporary-script cleanup state, and the normal command-running flow while leaving successful lifecycle marking unchanged.src/integrations/terminal/ExecaTerminalProcess.ts-74-80 (1)
74-80: 🎯 Functional Correctness | 🟠 Major | ⚡ Quick winHandle plan/env null values before merging environment variables.
ShellInvocationPlan.envallowsnullfor unset variables, butenv: { ...process.env, ...plan.env }sends the literal stringnullto the child process. Exclude null entries and delete keys whose plan value isnullbefore passingenvto execa.🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@src/integrations/terminal/ExecaTerminalProcess.ts` around lines 74 - 80, Update the environment construction in ExecaTerminalProcess to handle null values from plan.env: omit null entries from the merged environment and remove corresponding inherited process.env keys before passing env to execa. Preserve non-null plan overrides and the explicit LANG and LC_ALL UTF-8 settings.src/integrations/terminal/BaseTerminal.ts-439-446 (1)
439-446: 🎯 Functional Correctness | 🟠 Major | ⚡ Quick winUse path-aware comparison for
cwdMatches.
getOrCreateTerminalnormalizes the requested cwd withvscode.Uri.file(cwd).fsPath, butbuildReuseExternalCheckscompares the terminal’s rawinitialCwdto that normalized value with===. This can make reusable terminals fail the reuse predicate when the same path differs by separators or Windows drive-letter casing. UsearePathsEqualfor this comparison.🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@src/integrations/terminal/BaseTerminal.ts` around lines 439 - 446, The cwdMatches property in buildReuseExternalChecks compares paths using === which fails when paths differ by separators or Windows drive-letter casing. Replace the === comparison between terminal.getCurrentWorkingDirectory() and options.cwd with the arePathsEqual function to perform a path-aware comparison that handles these normalization differences correctly.src/integrations/terminal/types.ts-17-17 (1)
17-17: 🗄️ Data Integrity & Integration | 🟠 Major | ⚡ Quick winAlign
RooTerminal.runCommandwith the implementations.
ExecaTerminal.runCommandandTerminal.runCommandalready accept an optionalexecutionId;RooTerminalmust include it too. Otherwise typed callers such asExecuteCommandToolcannot pass the acquiredexecutionId, and the terminal acquires a syntheticlegacy-${id}-${Date.now()}owner. That breaks lifecycle ownership checks used byshellExecutionCompleteandTerminalRegistry.recoverStaleTerminal.🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@src/integrations/terminal/types.ts` at line 17, Update the RooTerminal runCommand signature to accept the optional executionId parameter used by ExecaTerminal.runCommand and Terminal.runCommand, preserving the existing command and callbacks parameters and returning RooTerminalProcessResultPromise so typed callers can pass the acquired execution ID for lifecycle ownership.src/integrations/terminal/Terminal.ts-57-72 (1)
57-72: 🎯 Functional Correctness | 🟠 Major | ⚡ Quick winDo not apply profile
shellArgsto a shell that did not come from that profile.The comment states that the args apply when the resolved shell came from a VS Code terminal profile. The code does not verify that.
Terminal.getProfileShell()returns the args of the configuredterminalProfile, whileresolvedEnv.primaryPlan.executablecan come from a different source, for example an explicitterminalShellSelectionor a custom shell path. In that case the terminal launches the resolved executable with args intended for another shell, for example--loginpassed topwsh.exe.Compare the executables before applying the args.
🐛 Proposed fix
if (resolvedEnv?.primaryPlan?.executable) { options.shellPath = resolvedEnv.primaryPlan.executable // When the resolved shell came from a VS Code terminal profile, // also pass the profile's shellArgs so the integrated terminal // uses the same arguments (e.g. --login for bash). const profileShell = Terminal.getProfileShell() - if (profileShell?.shellArgs) { + if (profileShell?.shellArgs && profileShell.shellPath === resolvedEnv.primaryPlan.executable) { options.shellArgs = profileShell.shellArgs }🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@src/integrations/terminal/Terminal.ts` around lines 57 - 72, Update the profile shellArgs logic in the resolvedEnv.primaryPlan block to apply arguments only when profileShell.executable matches resolvedEnv.primaryPlan.executable. Keep shellArgs unset for executables selected through other sources, while preserving the existing profile argument behavior for matching executables.src/integrations/terminal/shell/CommandEnvironmentService.ts-54-91 (1)
54-91: 🎯 Functional Correctness | 🟠 Major | ⚡ Quick winInclude
cwdin the cache key.Line 71 accepts
cwd, and Lines 148-156 store it in both invocation plans. Lines 72-73 reuse the cached plan only by settings version. A later task with another workspace can receive the prior task's working directory. WSL then uses the stale value in--cd.Proposed fix
private cached: ResolvedCommandEnvironment | null = null private cachedVersion: number = -1 + private cachedCwd: string | undefined private version: number = 0 @@ - if (this.cached && this.cachedVersion === this.version) { + if (this.cached && this.cachedVersion === this.version && this.cachedCwd === cwd) { return this.cached } @@ this.cached = env this.cachedVersion = this.version + this.cachedCwd = cwd return env @@ this.cached = null this.cachedVersion = -1 + this.cachedCwd = undefined🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@src/integrations/terminal/shell/CommandEnvironmentService.ts` around lines 54 - 91, The getEnvironment cache key currently ignores cwd, allowing a resolved environment from one workspace to be reused for another. Track the cwd associated with the cached result and only reuse it when both cachedVersion and cwd match; update that cached cwd whenever resolving and reset it in invalidate.src/core/task/Task.ts-3863-3866 (1)
3863-3866: 🎯 Functional Correctness | 🟠 Major | ⚡ Quick winPass the resolved environment to
SYSTEM_PROMPT.Line 3866 resolves the environment, but the
SYSTEM_PROMPTcall does not receive its finalresolvedEnvparameter. The system prompt therefore uses generic shell rules while tool definitions and command execution use the resolved shell.Proposed fix
this.api.getModel().id, provider.getSkillsManager(), + this.resolvedCommandEnvironment, )🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@src/core/task/Task.ts` around lines 3863 - 3866, Update getSystemPrompt to pass the environment returned by resolveCommandEnvironment into the SYSTEM_PROMPT call as its final resolvedEnv argument. Preserve the existing prompt inputs and ensure the resolved shell information is used consistently with tool definitions and command execution.src/core/task/Task.ts-3836-3856 (1)
3836-3856: 🎯 Functional Correctness | 🟠 Major | ⚡ Quick winForward
terminalShellIntegrationDisabledto the resolver.Line 3849 resolves an environment without this setting.
CommandEnvironmentServicetreatsundefinedasfalseand creates avscodeprimary plan for non-cmdshells.ExecuteCommandTooluses that plan whenresolvedEnvexists, so inline-terminal mode can run through the integrated terminal instead.Proposed fix
- const { terminalShellSelection, execaShellPath } = state ?? {} + const { terminalShellSelection, execaShellPath, terminalShellIntegrationDisabled = true } = state ?? {} @@ terminalShellSelection, execaShellPath, terminalProfile, + terminalShellIntegrationDisabled, },🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@src/core/task/Task.ts` around lines 3836 - 3856, Update the environment resolution call in the task flow around provider.getCommandEnvironmentService() to include terminalShellIntegrationDisabled from the persisted state alongside terminalShellSelection, execaShellPath, and terminalProfile. Ensure CommandEnvironmentService.getEnvironment receives the actual setting so inline-terminal mode does not default to the integrated-terminal plan.src/core/tools/ExecuteCommandTool.ts-762-769 (1)
762-769: 🗄️ Data Integrity & Integration | 🟠 Major | ⚡ Quick winHandle a missing fallback plan explicitly.
When
useFallbackPlanis true andresolvedEnv.fallbackPlanis undefined,planis undefined andsetShellInvocationPlanis skipped.ExecaTerminalProcessthen uses the legacyshell: truepath, so the command can run under a shell family that differs from the family reported to the model in the system prompt.
ShellFallbackMismatchError(Lines 54-68) documents exactly this condition but is never thrown in this file. Throw it here, or reject the fallback before the retry is started.🛠️ Proposed fix
if (terminal instanceof ExecaTerminal && resolvedEnv) { const plan: ShellInvocationPlan | undefined = useFallbackPlan ? resolvedEnv.fallbackPlan : resolvedEnv.primaryPlan - if (plan) { - terminal.setShellInvocationPlan(plan) + if (!plan) { + finalizeTrace() + throw new ShellFallbackMismatchError( + resolvedEnv.primaryPlan.family, + resolvedEnv.fallbackPlan?.family, + ) } + terminal.setShellInvocationPlan(plan) }🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@src/core/tools/ExecuteCommandTool.ts` around lines 762 - 769, Update the ExecaTerminal handling around resolvedEnv and the useFallbackPlan branch to explicitly reject a missing resolvedEnv.fallbackPlan before execution or retry continues. Throw the existing ShellFallbackMismatchError when fallback mode is requested without a fallback plan, rather than allowing setShellInvocationPlan to be skipped and the legacy shell path to run.src/core/tools/ExecuteCommandTool.ts-258-268 (1)
258-268: 🩺 Stability & Availability | 🟠 Major | ⚡ Quick winPost a terminal status when
enqueuerejects.Line 260 posts
status: "queued"to the webview. Ifscheduler.enqueuerejects, control goes to the outercatchat Line 372, which only callshandleError. No furthercommandExecutionStatusis posted, so the webview keeps showing the command as queued.enqueuerejects forTaskCancelledError,CommandAbortedError,SchedulerDisposedError, andDuplicateExecutionIdError.Post an
errorstatus for the sameexecutionIdwhen the enqueue fails.🛠️ Proposed fix
const queueEnteredAt = Date.now() traceBuilder.markQueueEnteredAt(queueEnteredAt) - await scheduler.enqueue({ executionId, taskId: task.taskId, requestedAt: queueEnteredAt }) + try { + await scheduler.enqueue({ executionId, taskId: task.taskId, requestedAt: queueEnteredAt }) + } catch (enqueueError) { + const status: CommandExecutionStatus = { + executionId, + status: "error", + message: (enqueueError as Error).message, + } + provider?.postMessageToWebview({ + type: "commandExecutionStatus", + text: JSON.stringify(status), + }) + traceBuilder.markError("SCHEDULER_REJECTED") + traceBuilder.finalize() + throw enqueueError + } const queueReleasedAt = Date.now()🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@src/core/tools/ExecuteCommandTool.ts` around lines 258 - 268, Update the enqueue flow around CommandScheduler.enqueue to catch enqueue failures and post a commandExecutionStatus with status "error" for the same executionId before propagating to the existing error handling. Preserve the current queued notification and successful queue timing updates, and ensure all enqueue rejection cases receive the terminal status.
ℹ️ Review info
⚙️ Run configuration
Configuration used: defaults
Review profile: CHILL
Plan: Pro Plus
Run ID: b3ef8319-0fef-40f5-9c51-f8cf292ad0e4
⛔ Files ignored due to path filters (8)
pnpm-lock.yamlis excluded by!**/pnpm-lock.yamlsrc/core/prompts/__tests__/__snapshots__/add-custom-instructions/architect-mode-prompt.snapis excluded by!**/*.snapsrc/core/prompts/__tests__/__snapshots__/add-custom-instructions/ask-mode-prompt.snapis excluded by!**/*.snapsrc/core/prompts/__tests__/__snapshots__/add-custom-instructions/mcp-server-creation-disabled.snapis excluded by!**/*.snapsrc/core/prompts/__tests__/__snapshots__/add-custom-instructions/no-mcp-servers.snapis excluded by!**/*.snapsrc/core/prompts/__tests__/__snapshots__/system-prompt/consistent-system-prompt.snapis excluded by!**/*.snapsrc/core/prompts/__tests__/__snapshots__/system-prompt/with-mcp-hub-provided.snapis excluded by!**/*.snapsrc/core/prompts/__tests__/__snapshots__/system-prompt/with-undefined-mcp-hub.snapis excluded by!**/*.snap
📒 Files selected for processing (105)
apps/vscode-e2e/src/suite/tools/terminal-profile.test.tsdocs/260731_0001_session_dashboard-blank-fix/164200_architect-report.mddocs/260801_0001_session_fork-pr-rebase-ci/222900_architect-report.mddocs/260801_0001_session_fork-pr-rebase-ci/224000_code-report.mddocs/260801_0001_session_fork-pr-rebase-ci/224700_code-report.mddocs/260801_0001_session_fork-pr-rebase-ci/230415_code-report.mddocs/260801_0001_session_fork-pr-rebase-ci/232300_code-report.mddocs/260801_0001_session_fork-pr-rebase-ci/234030_code-report.mddocs/260801_0001_session_fork-pr-rebase-ci/decisions.mddocs/260801_0001_session_fork-pr-rebase-ci/rebase-evidence.mddocs/260801_0001_session_fork-pr-rebase-ci/requirement-checklist.mddocs/feedbacks/fromarchitect/260801_crow_recall_register_validation.mddocs/feedbacks/fromarchitect/260801_missing_webview_build_path.mdknip.jsonpackages/types/src/__tests__/provider-settings.test.tspackages/types/src/__tests__/terminal-shell-settings.spec.tspackages/types/src/global-settings.tspackages/types/src/provider-settings.tspackages/types/src/terminal.tspackages/types/src/vscode-extension-host.tssrc/api/providers/__tests__/base-provider.spec.tssrc/api/providers/__tests__/openai.spec.tssrc/api/providers/base-openai-compatible-provider.tssrc/api/providers/base-provider.tssrc/api/providers/deepseek.tssrc/api/providers/friendli.tssrc/api/providers/kenari.tssrc/api/providers/lite-llm.tssrc/api/providers/lm-studio.tssrc/api/providers/openai-compatible.tssrc/api/providers/openai.tssrc/api/providers/opencode-go.tssrc/api/providers/openrouter.tssrc/core/prompts/__tests__/shell-environment-prompt.spec.tssrc/core/prompts/sections/rules.tssrc/core/prompts/sections/system-info.tssrc/core/prompts/system.tssrc/core/prompts/tools/native-tools/execute_command.tssrc/core/prompts/tools/native-tools/index.tssrc/core/task/Task.tssrc/core/task/build-tools.tssrc/core/tools/ExecuteCommandTool.tssrc/core/tools/__tests__/executeCommand.spec.tssrc/core/tools/__tests__/executeCommandTool.spec.tssrc/core/tools/__tests__/terminal-provider-fallback.spec.tssrc/core/webview/ClineProvider.tssrc/core/webview/__tests__/terminal-shell-messages.spec.tssrc/core/webview/generateSystemPrompt.tssrc/core/webview/webviewMessageHandler.tssrc/eslint-suppressions.jsonsrc/extension.tssrc/extension/api.tssrc/integrations/terminal/BaseTerminal.tssrc/integrations/terminal/CommandScheduler.tssrc/integrations/terminal/CommandTrace.tssrc/integrations/terminal/ExecaTerminal.tssrc/integrations/terminal/ExecaTerminalProcess.tssrc/integrations/terminal/Terminal.tssrc/integrations/terminal/TerminalLifecycle.tssrc/integrations/terminal/TerminalProcess.tssrc/integrations/terminal/TerminalRegistry.tssrc/integrations/terminal/__tests__/CommandScheduler.spec.tssrc/integrations/terminal/__tests__/ExecaTerminalProcess.spec.tssrc/integrations/terminal/__tests__/ShellInvocationAdapter.spec.tssrc/integrations/terminal/__tests__/ShellResolver.spec.tssrc/integrations/terminal/__tests__/TerminalLifecycle.spec.tssrc/integrations/terminal/__tests__/TerminalProcess.spec.tssrc/integrations/terminal/__tests__/TerminalProcessExec.bash.spec.tssrc/integrations/terminal/__tests__/TerminalProcessExec.cmd.spec.tssrc/integrations/terminal/__tests__/TerminalProcessExec.pwsh.spec.tssrc/integrations/terminal/__tests__/TerminalProfile.spec.tssrc/integrations/terminal/__tests__/TerminalRegistry.spec.tssrc/integrations/terminal/shell/CommandEnvironmentService.tssrc/integrations/terminal/shell/ShellInvocationAdapter.tssrc/integrations/terminal/shell/ShellResolver.tssrc/integrations/terminal/shell/TerminalProfileResolver.tssrc/integrations/terminal/shell/types.tssrc/integrations/terminal/types.tssrc/package.jsonsrc/utils/__tests__/shell.spec.tssrc/utils/shell.tswebview-ui/src/components/settings/SettingsView.tsxwebview-ui/src/components/settings/TerminalSettings.tsxwebview-ui/src/components/settings/__tests__/SettingsView.shell-selection.spec.tsxwebview-ui/src/components/settings/__tests__/TerminalSettings.shell.spec.tsxwebview-ui/src/components/settings/providers/OpenAICompatible.tsxwebview-ui/src/i18n/locales/ca/settings.jsonwebview-ui/src/i18n/locales/de/settings.jsonwebview-ui/src/i18n/locales/en/settings.jsonwebview-ui/src/i18n/locales/es/settings.jsonwebview-ui/src/i18n/locales/fr/settings.jsonwebview-ui/src/i18n/locales/hi/settings.jsonwebview-ui/src/i18n/locales/id/settings.jsonwebview-ui/src/i18n/locales/it/settings.jsonwebview-ui/src/i18n/locales/ja/settings.jsonwebview-ui/src/i18n/locales/ko/settings.jsonwebview-ui/src/i18n/locales/nl/settings.jsonwebview-ui/src/i18n/locales/pl/settings.jsonwebview-ui/src/i18n/locales/pt-BR/settings.jsonwebview-ui/src/i18n/locales/ru/settings.jsonwebview-ui/src/i18n/locales/tr/settings.jsonwebview-ui/src/i18n/locales/vi/settings.jsonwebview-ui/src/i18n/locales/zh-CN/settings.jsonwebview-ui/src/i18n/locales/zh-TW/settings.jsonwebview-ui/tsconfig.json
CodeRabbit identified a critical bug: onAbort() references 'timer' and 'ref' before their const declarations. If abortController.signal.aborted is already true when the promise executes, onAbort() is called synchronously before lines 327-328 initialize those bindings, causing a ReferenceError instead of the intended AbortError rejection. Fix: declare ref and timer before onAbort, change timer from const to let, and guard clearTimeout with a truthiness check.
github-actions
Bot
added
the
awaiting-review
Patch coverage checks were blocking 10+ PRs with 80%/70% thresholds. Changed to informational: true so patch coverage is reported but not a required status check.
These docs/ files are internal session reports and should not be included in the PR diff.
github-actions
Bot
added
has-conflicts
1 participant
Stack Position
feature/unified-shell-resolutionDescription
https://youtube.com/shorts/-cm4pnaoXD0
Full Feature Description
feature/unified-shell-resolutionterminal.ts,global-settings.ts,vscode-extension-host.ts, the settings UITerminalSettings.tsxandSettingsView.tsx, the backend terminal layersrc/integrations/terminal, and the task/tool/API wiringTask.ts,ExecuteCommandTool.ts,api.ts.SettingsView.tsxbind tocachedState, not live extension state.terminal-profile.test.ts. Manually run the same command in default, PowerShell, Command Prompt, and where available WSL/POSIX profiles, comparing the selected executable, output, exit code, cancellation, and cleanup.Why Split Into 17 PRs
Instead of submitting this feature as a single unified PR, it was split into individual PRs because as code size grows, safely reviewing a PR becomes very difficult. The feature was broken into mutually exclusive individual PRs so that each can be reviewed independently.
What This PR Specifically Changes
Connects settings to command environment to lifecycle in
Task.ts,ExecuteCommandTool.ts,ClineProvider.ts, andapi.ts, and verifies E2E profile behavior. Does not add new primitives.Included Files
src/core/task/Task.tssrc/core/webview/ClineProvider.tssrc/core/tools/ExecuteCommandTool.tssrc/extension/api.tsapps/vscode-e2e/src/suite/tools/terminal-profile.test.tsExclusion Scope
Summary by CodeRabbit
New Features
Bug Fixes
Documentation
Tests
Localization