Skip to content

Commit 13d239c

Browse files
shariqriazzshariqriazz
committed
fix-inconsistencies
1 parent de366cb commit 13d239c

25 files changed

+82
-82
lines changed

‎src/core/Cline.ts‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ export type ClineOptions = {
126126
parentTask?: Cline
127127
taskNumber?: number
128128
onCreated?: (cline: Cline) => void
129-
// Context Summarization Settings
129+
// Context Synthesization Settings
130130
enableContextSummarization?: boolean // Already added
131131
contextSummarizationTriggerThreshold?: number // Already added
132132
contextSummarizationInitialStaticTurns?: number // Already added
@@ -160,7 +160,7 @@ export class Cline extends EventEmitter<ClineEvents> {
160160
diffEnabled: boolean = false
161161
fuzzyMatchThreshold: number
162162

163-
// Context Summarization Settings (Added)
163+
// Context Synthesization Settings (Added)
164164
readonly enableContextSummarization: boolean
165165
readonly contextSummarizationTriggerThreshold: number
166166
readonly contextSummarizationInitialStaticTurns: number
@@ -229,7 +229,7 @@ export class Cline extends EventEmitter<ClineEvents> {
229229
parentTask,
230230
taskNumber = -1,
231231
onCreated,
232-
// Context Summarization Settings (Added)
232+
// Context Synthesization Settings (Added)
233233
enableContextSummarization = false,
234234
contextSummarizationTriggerThreshold = 80,
235235
contextSummarizationInitialStaticTurns = 5,
@@ -1062,7 +1062,7 @@ export class Cline extends EventEmitter<ClineEvents> {
10621062
: modelInfo.maxTokens
10631063

10641064
const contextWindow = modelInfo.contextWindow
1065-
let historyModifiedBySummarization = false // Flag to track if summarization updated history
1065+
let historyModifiedBySynthesization = false // Flag to track if synthesization updated history
10661066

10671067
if (this.enableContextSummarization) {
10681068
// --- Synthesizing Logic ---
@@ -1090,20 +1090,20 @@ export class Cline extends EventEmitter<ClineEvents> {
10901090
if (initialSliceEnd < recentSliceStart) {
10911091
const initialMessages = this.apiConversationHistory.slice(0, initialSliceEnd)
10921092
const recentMessages = this.apiConversationHistory.slice(recentSliceStart)
1093-
const messagesToSummarize = this.apiConversationHistory.slice(
1093+
const messagesToSynthesize = this.apiConversationHistory.slice(
10941094
initialSliceEnd,
10951095
recentSliceStart,
10961096
)
10971097

10981098
this.providerRef
10991099
.deref()
11001100
?.log(
1101-
`[Synthesizing] Slicing: Keep Initial ${initialMessages.length}, Synthesize ${messagesToSummarize.length}, Keep Recent ${recentMessages.length}`,
1101+
`[Synthesizing] Slicing: Keep Initial ${initialMessages.length}, Synthesize ${messagesToSynthesize.length}, Keep Recent ${recentMessages.length}`,
11021102
)
11031103

11041104
// Instantiate the synthesizer (consider using a dedicated API handler/model later)
11051105
const synthesizer = new ContextSynthesizer(this.api)
1106-
const summaryMessage = await synthesizer.synthesize(messagesToSummarize)
1106+
const summaryMessage = await synthesizer.synthesize(messagesToSynthesize)
11071107

11081108
if (summaryMessage) {
11091109
const newHistory = [...initialMessages, summaryMessage, ...recentMessages]
@@ -1115,12 +1115,12 @@ export class Cline extends EventEmitter<ClineEvents> {
11151115
// Add a system message to notify the user in the UI
11161116
await this.say("text", "[Older conversation turns synthesized to preserve context]")
11171117
await this.overwriteApiConversationHistory(newHistory)
1118-
historyModifiedBySummarization = true // Mark history as modified
1118+
historyModifiedBySynthesization = true // Mark history as modified
11191119
} else {
11201120
this.providerRef
11211121
.deref()
11221122
?.log(`[Synthesizing] Synthesizing failed. Falling back to truncation.`)
1123-
// Fall through to truncation if summarization fails
1123+
// Fall through to truncation if synthesization fails
11241124
}
11251125
} else {
11261126
this.providerRef
@@ -1139,15 +1139,15 @@ export class Cline extends EventEmitter<ClineEvents> {
11391139
// Fall through to truncation if history is too short
11401140
}
11411141
}
1142-
// If summarization is enabled but threshold not met, do nothing and proceed.
1142+
// If synthesization is enabled but threshold not met, do nothing and proceed.
11431143
}
11441144

1145-
// --- Truncation Logic (Only run if summarization didn't modify history) ---
1146-
if (!historyModifiedBySummarization) {
1145+
// --- Truncation Logic (Only run if synthesization didn't modify history) ---
1146+
if (!historyModifiedBySynthesization) {
11471147
// Note: totalTokens here refers to the previous response size, used by truncateConversationIfNeeded
11481148
// to estimate if the *next* request might overflow.
11491149
const trimmedMessages = await truncateConversationIfNeeded({
1150-
messages: this.apiConversationHistory, // Use potentially already summarized history if summarization failed above
1150+
messages: this.apiConversationHistory, // Use potentially already summarized history if synthesization failed above
11511151
totalTokens, // From previous response metrics
11521152
maxTokens,
11531153
contextWindow,
@@ -2695,9 +2695,9 @@ export class Cline extends EventEmitter<ClineEvents> {
26952695
}
26962696

26972697
/**
2698-
* Manually triggers summarization of the conversation context.
2699-
* @param isManualTrigger Whether this summarization was manually triggered by the user.
2700-
* @returns A promise that resolves when summarization is complete.
2698+
* Manually triggers synthesization of the conversation context.
2699+
* @param isManualTrigger Whether this synthesization was manually triggered by the user.
2700+
* @returns A promise that resolves when synthesization is complete.
27012701
*/
27022702
public async synthesizeConversationContext(_isManualTrigger: boolean = false): Promise<void> {
27032703
// Skip if synthesizing is disabled
@@ -2736,17 +2736,17 @@ export class Cline extends EventEmitter<ClineEvents> {
27362736
// Slice the conversation history
27372737
const initialMessages = this.apiConversationHistory.slice(0, initialSliceEnd)
27382738
const recentMessages = this.apiConversationHistory.slice(recentSliceStart)
2739-
const messagesToSummarize = this.apiConversationHistory.slice(initialSliceEnd, recentSliceStart)
2739+
const messagesToSynthesize = this.apiConversationHistory.slice(initialSliceEnd, recentSliceStart)
27402740

27412741
this.providerRef
27422742
.deref()
27432743
?.log(
2744-
`[Synthesizing] Slicing: Keep Initial ${initialMessages.length}, Synthesize ${messagesToSummarize.length}, Keep Recent ${recentMessages.length}`,
2744+
`[Synthesizing] Slicing: Keep Initial ${initialMessages.length}, Synthesize ${messagesToSynthesize.length}, Keep Recent ${recentMessages.length}`,
27452745
)
27462746

27472747
// Create synthesizer and generate synthesis
27482748
const synthesizer = new ContextSynthesizer(this.api)
2749-
const summaryMessage = await synthesizer.synthesize(messagesToSummarize)
2749+
const summaryMessage = await synthesizer.synthesize(messagesToSynthesize)
27502750

27512751
if (!summaryMessage) {
27522752
this.providerRef.deref()?.log(`[Synthesizing] Failed to generate synthesis.`)
@@ -2762,7 +2762,7 @@ export class Cline extends EventEmitter<ClineEvents> {
27622762
this.providerRef
27632763
.deref()
27642764
?.log(
2765-
`[Synthesizing] Successfully synthesized ${messagesToSummarize.length} messages. New history length: ${newHistory.length}`,
2765+
`[Synthesizing] Successfully synthesized ${messagesToSynthesize.length} messages. New history length: ${newHistory.length}`,
27662766
)
27672767
}
27682768
}

‎src/core/webview/ClineProvider.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
494494
mode,
495495
customInstructions: globalInstructions,
496496
experiments,
497-
// Context Summarization Settings (Added)
497+
// Context Synthesization Settings (Added)
498498
enableContextSummarization,
499499
contextSummarizationTriggerThreshold,
500500
contextSummarizationInitialStaticTurns,
@@ -518,7 +518,7 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
518518
parentTask,
519519
taskNumber: this.clineStack.length + 1,
520520
onCreated: (cline) => this.emit("clineCreated", cline),
521-
// Pass summarization settings to Cline (Added)
521+
// Pass synthesization settings to Cline (Added)
522522
enableContextSummarization,
523523
contextSummarizationTriggerThreshold,
524524
contextSummarizationInitialStaticTurns,
@@ -547,7 +547,7 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
547547
mode,
548548
customInstructions: globalInstructions,
549549
experiments,
550-
// Context Summarization Settings (Added)
550+
// Context Synthesization Settings (Added)
551551
enableContextSummarization,
552552
contextSummarizationTriggerThreshold,
553553
contextSummarizationInitialStaticTurns,
@@ -570,7 +570,7 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
570570
parentTask: historyItem.parentTask,
571571
taskNumber: historyItem.number,
572572
onCreated: (cline) => this.emit("clineCreated", cline),
573-
// Pass summarization settings to Cline (Added)
573+
// Pass synthesization settings to Cline (Added)
574574
enableContextSummarization,
575575
contextSummarizationTriggerThreshold,
576576
contextSummarizationInitialStaticTurns,
@@ -1235,7 +1235,7 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
12351235
maxReadFileLine,
12361236
terminalCompressProgressBar,
12371237
historyPreviewCollapsed,
1238-
// Context Summarization Settings (Added)
1238+
// Context Synthesization Settings (Added)
12391239
enableContextSummarization,
12401240
contextSummarizationTriggerThreshold,
12411241
contextSummarizationInitialStaticTurns,
@@ -1327,7 +1327,7 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
13271327
terminalCompressProgressBar: terminalCompressProgressBar ?? true,
13281328
hasSystemPromptOverride,
13291329
historyPreviewCollapsed: historyPreviewCollapsed ?? false,
1330-
// Context Summarization Settings (Added)
1330+
// Context Synthesization Settings (Added)
13311331
enableContextSummarization: enableContextSummarization ?? false,
13321332
contextSummarizationTriggerThreshold: contextSummarizationTriggerThreshold ?? 80,
13331333
contextSummarizationInitialStaticTurns: contextSummarizationInitialStaticTurns ?? 5,
@@ -1422,7 +1422,7 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
14221422
showRooIgnoredFiles: stateValues.showRooIgnoredFiles ?? true,
14231423
maxReadFileLine: stateValues.maxReadFileLine ?? 500,
14241424
historyPreviewCollapsed: stateValues.historyPreviewCollapsed ?? false,
1425-
// Context Summarization Settings (Added)
1425+
// Context Synthesization Settings (Added)
14261426
enableContextSummarization: stateValues.enableContextSummarization ?? false,
14271427
contextSummarizationTriggerThreshold: stateValues.contextSummarizationTriggerThreshold ?? 80,
14281428
contextSummarizationInitialStaticTurns: stateValues.contextSummarizationInitialStaticTurns ?? 5,

‎src/core/webview/__tests__/ClineProvider.test.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ describe("ClineProvider", () => {
425425
showRooIgnoredFiles: true,
426426
renderContext: "sidebar",
427427
maxReadFileLine: 500,
428-
// Context Summarization Defaults (Added for test)
428+
// Context Synthesization Defaults (Added for test)
429429
enableContextSummarization: false,
430430
contextSummarizationTriggerThreshold: 80,
431431
contextSummarizationInitialStaticTurns: 5,
@@ -734,7 +734,7 @@ describe("ClineProvider", () => {
734734
expect((await provider.getState()).showRooIgnoredFiles).toBe(false)
735735
})
736736

737-
test("handles context summarization settings messages", async () => {
737+
test("handles context synthesization settings messages", async () => {
738738
await provider.resolveWebviewView(mockWebviewView)
739739
const messageHandler = (mockWebviewView.webview.onDidReceiveMessage as jest.Mock).mock.calls[0][0]
740740

@@ -773,7 +773,7 @@ describe("ClineProvider", () => {
773773
expect((await provider.getState()).contextSummarizationRecentTurns).toBe(15)
774774
})
775775

776-
test("context summarization settings have correct default values", async () => {
776+
test("context synthesization settings have correct default values", async () => {
777777
// Mock globalState.get to return undefined for the new settings
778778
;(mockContext.globalState.get as jest.Mock).mockImplementation((key: string) => {
779779
if (

‎src/schemas/index.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@ export const globalSettingsSchema = z.object({
558558
terminalZdotdir: z.boolean().optional(),
559559
terminalCompressProgressBar: z.boolean().optional(),
560560

561-
// Context Summarization Settings
561+
// Context Synthesization Settings
562562
enableContextSummarization: z.boolean().optional(),
563563
contextSummarizationTriggerThreshold: z.number().optional(), // Percentage (e.g., 80)
564564
contextSummarizationInitialStaticTurns: z.number().optional(), // Number of initial turns to keep
@@ -642,7 +642,7 @@ const globalSettingsRecord: GlobalSettingsRecord = {
642642
terminalZdotdir: undefined,
643643
terminalCompressProgressBar: undefined,
644644

645-
// Context Summarization Settings
645+
// Context Synthesization Settings
646646
enableContextSummarization: undefined,
647647
contextSummarizationTriggerThreshold: undefined,
648648
contextSummarizationInitialStaticTurns: undefined,

‎src/shared/ExtensionMessage.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ export type ExtensionState = Pick<
166166
| "customModePrompts"
167167
| "customSupportPrompts"
168168
| "enhancementApiConfigId"
169-
// Context Summarization Settings (Added)
169+
// Context Synthesization Settings (Added)
170170
| "enableContextSummarization"
171171
| "contextSummarizationTriggerThreshold"
172172
| "contextSummarizationInitialStaticTurns"
@@ -208,7 +208,7 @@ export type ExtensionState = Pick<
208208
settingsImportedAt?: number
209209
historyPreviewCollapsed?: boolean
210210

211-
// Context Summarization Settings (Required part)
211+
// Context Synthesization Settings (Required part)
212212
enableContextSummarization: boolean
213213
contextSummarizationTriggerThreshold: number
214214
contextSummarizationInitialStaticTurns: number

‎webview-ui/src/components/settings/ContextManagementSettings.tsx‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type ContextManagementSettingsProps = HTMLAttributes<HTMLDivElement> & {
1515
maxWorkspaceFiles: number
1616
showRooIgnoredFiles?: boolean
1717
maxReadFileLine?: number
18-
// Context Summarization Props (Added)
18+
// Context Synthesization Props (Added)
1919
enableContextSummarization?: boolean
2020
contextSummarizationTriggerThreshold?: number
2121
contextSummarizationInitialStaticTurns?: number
@@ -26,7 +26,7 @@ type ContextManagementSettingsProps = HTMLAttributes<HTMLDivElement> & {
2626
| "maxWorkspaceFiles"
2727
| "showRooIgnoredFiles"
2828
| "maxReadFileLine"
29-
// Context Summarization Keys (Added)
29+
// Context Synthesization Keys (Added)
3030
| "enableContextSummarization"
3131
| "contextSummarizationTriggerThreshold"
3232
| "contextSummarizationInitialStaticTurns"
@@ -40,7 +40,7 @@ export const ContextManagementSettings = ({
4040
showRooIgnoredFiles,
4141
setCachedStateField,
4242
maxReadFileLine,
43-
// Context Summarization Props (Added)
43+
// Context Synthesization Props (Added)
4444
enableContextSummarization,
4545
contextSummarizationTriggerThreshold,
4646
contextSummarizationInitialStaticTurns,
@@ -147,14 +147,14 @@ export const ContextManagementSettings = ({
147147
</div>
148148
</div>
149149

150-
{/* --- Context Summarization Settings --- */}
150+
{/* --- Context Synthesization Settings --- */}
151151
<div className="border-t border-vscode-settings-rowHoverBackground my-4"></div>
152152

153153
<div>
154154
<VSCodeCheckbox
155155
checked={!!enableContextSummarization}
156156
onChange={(e: any) => setCachedStateField("enableContextSummarization", e.target.checked)} // Use generic setter
157-
data-testid="enable-context-summarization-checkbox">
157+
data-testid="enable-context-synthesization-checkbox">
158158
<label className="block font-medium mb-1">
159159
{t("settings:contextManagement.synthesization.enable.label")}
160160
</label>
@@ -184,7 +184,7 @@ export const ContextManagementSettings = ({
184184
}
185185
}}
186186
onClick={(e) => e.currentTarget.select()}
187-
data-testid="context-summarization-trigger-threshold-input"
187+
data-testid="context-synthesization-trigger-threshold-input"
188188
disabled={!enableContextSummarization}
189189
/>
190190
<span>%</span>
@@ -214,7 +214,7 @@ export const ContextManagementSettings = ({
214214
}
215215
}}
216216
onClick={(e) => e.currentTarget.select()}
217-
data-testid="context-summarization-initial-turns-input"
217+
data-testid="context-synthesization-initial-turns-input"
218218
disabled={!enableContextSummarization}
219219
/>
220220
<span>{t("settings:contextManagement.synthesization.turns")}</span>
@@ -244,7 +244,7 @@ export const ContextManagementSettings = ({
244244
}
245245
}}
246246
onClick={(e) => e.currentTarget.select()}
247-
data-testid="context-summarization-recent-turns-input"
247+
data-testid="context-synthesization-recent-turns-input"
248248
disabled={!enableContextSummarization}
249249
/>
250250
<span>{t("settings:contextManagement.synthesization.turns")}</span>
@@ -254,7 +254,7 @@ export const ContextManagementSettings = ({
254254
{t("settings:contextManagement.synthesization.recentTurns.description")}
255255
</div>
256256
</div>
257-
{/* --- End Context Summarization Settings --- */}
257+
{/* --- End Context Synthesization Settings --- */}
258258
</Section>
259259
</div>
260260
)

‎webview-ui/src/components/settings/SettingsView.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ const SettingsView = forwardRef<SettingsViewRef, SettingsViewProps>(({ onDone, t
259259
vscode.postMessage({ type: "updateExperimental", values: experiments })
260260
vscode.postMessage({ type: "alwaysAllowModeSwitch", bool: alwaysAllowModeSwitch })
261261
vscode.postMessage({ type: "alwaysAllowSubtasks", bool: alwaysAllowSubtasks })
262-
// Context Summarization Settings (Added - Use cachedState values)
262+
// Context Synthesization Settings (Added - Use cachedState values)
263263
vscode.postMessage({ type: "enableContextSummarization", bool: cachedState.enableContextSummarization })
264264
vscode.postMessage({
265265
type: "contextSummarizationTriggerThreshold",
@@ -273,7 +273,7 @@ const SettingsView = forwardRef<SettingsViewRef, SettingsViewProps>(({ onDone, t
273273
type: "contextSummarizationRecentTurns",
274274
value: cachedState.contextSummarizationRecentTurns,
275275
})
276-
// --- End Context Summarization ---
276+
// --- End Context Synthesization ---
277277
vscode.postMessage({ type: "upsertApiConfiguration", text: currentApiConfigName, apiConfiguration })
278278
vscode.postMessage({ type: "telemetrySetting", text: telemetrySetting })
279279
setChangeDetected(false)
@@ -496,7 +496,7 @@ const SettingsView = forwardRef<SettingsViewRef, SettingsViewProps>(({ onDone, t
496496
showRooIgnoredFiles={showRooIgnoredFiles}
497497
maxReadFileLine={maxReadFileLine}
498498
setCachedStateField={setCachedStateField}
499-
// Pass summarization state from cachedState (Added)
499+
// Pass synthesization state from cachedState (Added)
500500
enableContextSummarization={cachedState.enableContextSummarization}
501501
contextSummarizationTriggerThreshold={cachedState.contextSummarizationTriggerThreshold}
502502
contextSummarizationInitialStaticTurns={cachedState.contextSummarizationInitialStaticTurns}

0 commit comments

Comments
 (0)