Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/QueryEngine.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ import { getGlobalConfig } from './utils/config.js'
import { getCwd } from './utils/cwd.js'
import { isBareMode, isEnvTruthy } from './utils/envUtils.js'
import { logForDebugging } from './utils/debug.js'
import { getFastModeState } from './utils/fastMode.js'
import { getProviderFastModeState } from './utils/providerFastMode.js'
import {
type FileHistoryState,
fileHistoryEnabled,
Expand Down Expand Up @@ -630,7 +630,7 @@ export class QueryEngine {
usage: this.totalUsage,
modelUsage: getModelUsage(),
permission_denials: this.permissionDenials,
fast_mode_state: getFastModeState(
fast_mode_state: getProviderFastModeState(
mainLoopModel,
initialAppState.fastMode,
),
Expand Down Expand Up @@ -875,7 +875,7 @@ export class QueryEngine {
usage: this.totalUsage,
modelUsage: getModelUsage(),
permission_denials: this.permissionDenials,
fast_mode_state: getFastModeState(
fast_mode_state: getProviderFastModeState(
mainLoopModel,
initialAppState.fastMode,
),
Expand Down Expand Up @@ -1005,7 +1005,7 @@ export class QueryEngine {
usage: this.totalUsage,
modelUsage: getModelUsage(),
permission_denials: this.permissionDenials,
fast_mode_state: getFastModeState(
fast_mode_state: getProviderFastModeState(
mainLoopModel,
initialAppState.fastMode,
),
Expand Down Expand Up @@ -1048,7 +1048,7 @@ export class QueryEngine {
usage: this.totalUsage,
modelUsage: getModelUsage(),
permission_denials: this.permissionDenials,
fast_mode_state: getFastModeState(
fast_mode_state: getProviderFastModeState(
mainLoopModel,
initialAppState.fastMode,
),
Expand Down Expand Up @@ -1107,7 +1107,7 @@ export class QueryEngine {
usage: this.totalUsage,
modelUsage: getModelUsage(),
permission_denials: this.permissionDenials,
fast_mode_state: getFastModeState(
fast_mode_state: getProviderFastModeState(
mainLoopModel,
initialAppState.fastMode,
),
Expand Down Expand Up @@ -1161,7 +1161,7 @@ export class QueryEngine {
modelUsage: getModelUsage(),
permission_denials: this.permissionDenials,
structured_output: structuredOutputFromTool,
fast_mode_state: getFastModeState(
fast_mode_state: getProviderFastModeState(
mainLoopModel,
initialAppState.fastMode,
),
Expand Down
27 changes: 19 additions & 8 deletions src/cli/print.ts
Original file line number Diff line number Diff line change
Expand Up @@ -168,11 +168,14 @@ import {
import { settingsChangeDetector } from 'src/utils/settings/changeDetector.js'
import { applySettingsChange } from 'src/utils/settings/applySettingsChange.js'
import {
isFastModeAvailable,
isFastModeEnabled,
isFastModeSupportedByModel,
getFastModeState,
} from 'src/utils/fastMode.js'
import {
getInitialProviderFastModeSetting,
getProviderFastModeState,
isFastModeToggleAvailable,
isFastModeToggleEnabled,
} from 'src/utils/providerFastMode.js'
import {
isAutoModeGateEnabled,
getAutoModeUnavailableNotification,
Expand Down Expand Up @@ -516,10 +519,15 @@ export async function runHeadless(

// In headless mode, also sync the denormalized fastMode field from
// settings. The TUI manages fastMode via the UI so it skips this.
if (isFastModeEnabled()) {
if (isFastModeToggleEnabled()) {
setAppState(prev => {
const s = prev.settings as Record<string, unknown>
const fastMode = s.fastMode === true && !s.fastModePerSessionOptIn
const fastMode = getInitialProviderFastModeSetting(
prev.mainLoopModel,
{
settings: getSettings_DEPRECATED(),
targetKey: prev.providerSelectionTargetKey,
},
)
return { ...prev, fastMode }
})
}
Expand Down Expand Up @@ -4471,9 +4479,12 @@ async function handleInitializeRequest(
pid: process.pid,
}

if (isFastModeEnabled() && isFastModeAvailable()) {
if (
isFastModeToggleEnabled() &&
(isFastModeToggleAvailable() || getAppState().fastMode)
) {
const appState = getAppState()
initResponse.fast_mode_state = getFastModeState(
initResponse.fast_mode_state = getProviderFastModeState(
options.userSpecifiedModel ?? null,
appState.fastMode,
)
Expand Down
Loading
Loading