opensource/kilocode
3
0
Fork 0
mirror of https://github.com/Kilo-Org/kilocode.git synced 2026-09-24 16:02:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: stabilize PR test failures

Browse Source
This commit is contained in:
kirillk
2026-08-12 11:51:24 -04:00
parent f6f8aa563b
commit 7524abc386
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/core/test/process/process.test.ts
+2 -2
View File
@@ -159,7 +159,7 @@ describe("AppProcess", () => {
(directory) => {
const ready = path.join(directory, "ready")
const settled = path.join(directory, "settled")
const script = `const fs=require('fs');fs.writeFileSync(${JSON.stringify(ready)},String(process.pid));process.on('SIGTERM',()=>{fs.writeFileSync(${JSON.stringify(settled)},'settled');process.exit(0)});setInterval(()=>{},60000)`
const script = `const fs=require('fs');process.on('SIGTERM',()=>{fs.writeFileSync(${JSON.stringify(settled)},'settled');process.exit(0)});fs.writeFileSync(${JSON.stringify(ready)},String(process.pid));setInterval(()=>{},60000)` // kilocode_change
return Effect.gen(function* () {
const svc = yield* AppProcess.Service
const exit = yield* Effect.exit(svc.run(cmd("-e", script), { timeout: "250 millis" }))
@@ -180,7 +180,7 @@ describe("AppProcess", () => {
(directory) => {
const ready = path.join(directory, "ready")
const settled = path.join(directory, "settled")
const script = `const fs=require('fs');fs.writeFileSync(${JSON.stringify(ready)},String(process.pid));process.on('SIGTERM',()=>{fs.writeFileSync(${JSON.stringify(settled)},'settled');process.exit(0)});setInterval(()=>{},60000)`
const script = `const fs=require('fs');process.on('SIGTERM',()=>{fs.writeFileSync(${JSON.stringify(settled)},'settled');process.exit(0)});fs.writeFileSync(${JSON.stringify(ready)},String(process.pid));setInterval(()=>{},60000)` // kilocode_change
return Effect.gen(function* () {
const svc = yield* AppProcess.Service
const fiber = yield* svc.run(cmd("-e", script)).pipe(Effect.forkChild)
packages/kilo-jetbrains/frontend/src/main/kotlin/ai/kilocode/client/session/controller/SessionController.kt
+21 -2
View File
@@ -185,6 +185,8 @@ class SessionController(
private var agentTime: Double? = null
private var prefModel: String? = null
private var prefAgent: String? = null
private var prefVariantKey: String? = null
private var prefVariant: String? = null
private var modelTime: Double? = null
private val snapshots = mutableMapOf<PartKey, String>()
@@ -638,6 +640,8 @@ class SessionController(
modelTime = null
prefModel = null
prefAgent = null
prefVariantKey = null
prefVariant = null
cs.launch {
try {
sessions.updateConfig(directory, ConfigUpdateDto(agent = name))
@@ -661,6 +665,8 @@ class SessionController(
modelTime = null
prefModel = null
prefAgent = null
prefVariantKey = null
prefVariant = null
app.selectModel(agent, provider, id)
selectResolvedModel(key)
model.modelOverride = model.defaultModel != model.model
@@ -671,6 +677,8 @@ class SessionController(
assertEdt()
val agent = model.agent ?: return
LOG.debug { "${ChatLogSummary.sid(sid ?: ref?.key ?: "pending")} kind=config model-reset agent=$agent" }
prefVariantKey = null
prefVariant = null
app.clearModel(agent)
val auto = configModel(agent) ?: providerModel(agent)
selectResolvedModel(auto)
@@ -683,6 +691,8 @@ class SessionController(
val key = model.model ?: return
if (value !in model.variants) return
LOG.debug { "${ChatLogSummary.sid(sid ?: ref?.key ?: "pending")} kind=config variant=$key/$value" }
prefVariantKey = key
prefVariant = value
app.selectVariant(key, value)
model.variant = value
capture("Reasoning Variant Selected", sessionProps() + mapOf("model" to key, "variant" to value))
@@ -693,7 +703,8 @@ class SessionController(
* mirroring VS Code's setSessionAgent + setSessionModel + variant seeding. Attaching the pick to
* the first prompt alone only affects that one turn; setting it as the session's preferred
* selection makes the pickers and every later turn use it too, and survives the later
* workspace-ready model resolution because [prefAgent] / [prefModel] win in [syncModelSelection].
* workspace-ready model resolution because [prefAgent] / [prefModel] / [prefVariant] win in
* [syncModelSelection].
*/
fun applySelection(select: PromptSelection) {
assertEdt()
@@ -708,6 +719,11 @@ class SessionController(
select.variant?.let { app.selectVariant(key, it) }
prefAgent = agent
prefModel = key
prefVariantKey = key
prefVariant = select.variant
} else {
prefVariantKey = null
prefVariant = null
}
syncModelSelection()
model.refreshHeader()
@@ -1930,8 +1946,11 @@ class SessionController(
model.model = key
val item = key?.let(::item)
model.variants = item?.variants ?: emptyList()
val pref = prefVariant?.takeIf { prefVariantKey == key }
val saved = key?.let { app.models.value.variant[it] }
model.variant = saved?.takeIf { it in model.variants } ?: model.variants.firstOrNull()
model.variant = pref?.takeIf { it in model.variants }
?: saved?.takeIf { it in model.variants }
?: model.variants.firstOrNull()
model.refreshHeader()
}