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(cli): guard session import in config error handlers

Browse Source
This commit is contained in:
Alex Alecu
2026-04-07 18:06:48 +03:00
parent 5d184aba94
commit 2ca9542254
2 changed files with 30 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/opencode/src/config/config.ts
+24 -8
View File
@@ -568,8 +568,12 @@ export namespace Config {
const message = text ? `Config file at ${item} is invalid: ${text}` : `Config file at ${item} is invalid`
const err = new InvalidError({ path: item, issues }, { cause })
if (warnings) warnings.push({ path: item, message, detail: text || undefined })
const { Session } = await import("@/session")
Bus.publish(Session.Event.Error, { error: new NamedError.Unknown({ message }).toObject() })
try {
const { Session } = await import("@/session")
Bus.publish(Session.Event.Error, { error: new NamedError.Unknown({ message }).toObject() })
} catch (e) {
log.warn("could not publish session error", { message, err: e })
}
if (kind === "command") {
log.error("failed to load command", { command: item, err, message })
return
@@ -593,8 +597,12 @@ export namespace Config {
? err.data.message
: `Failed to parse command ${item}`
if (warnings) warnings.push({ path: item, message }) // kilocode_change
const { Session } = await import("@/session")
Bus.publish(Session.Event.Error, { error: new NamedError.Unknown({ message }).toObject() })
try {
const { Session } = await import("@/session")
Bus.publish(Session.Event.Error, { error: new NamedError.Unknown({ message }).toObject() })
} catch (e) {
log.warn("could not publish session error", { message, err: e })
}
log.error("failed to load command", { command: item, err })
return undefined
})
@@ -646,8 +654,12 @@ export namespace Config {
? err.data.message
: `Failed to parse agent ${item}`
if (warnings) warnings.push({ path: item, message }) // kilocode_change
const { Session } = await import("@/session")
Bus.publish(Session.Event.Error, { error: new NamedError.Unknown({ message }).toObject() })
try {
const { Session } = await import("@/session")
Bus.publish(Session.Event.Error, { error: new NamedError.Unknown({ message }).toObject() })
} catch (e) {
log.warn("could not publish session error", { message, err: e })
}
log.error("failed to load agent", { agent: item, err })
return undefined
})
@@ -700,8 +712,12 @@ export namespace Config {
? err.data.message
: `Failed to parse mode ${item}`
if (warnings) warnings.push({ path: item, message }) // kilocode_change
const { Session } = await import("@/session")
Bus.publish(Session.Event.Error, { error: new NamedError.Unknown({ message }).toObject() })
try {
const { Session } = await import("@/session")
Bus.publish(Session.Event.Error, { error: new NamedError.Unknown({ message }).toObject() })
} catch (e) {
log.warn("could not publish session error", { message, err: e })
}
log.error("failed to load mode", { mode: item, err })
return undefined
})
packages/opencode/test/kilocode/config-resilience.test.ts
+6 -31
View File
@@ -1,6 +1,5 @@
import { afterEach, describe, expect, test } from "bun:test"
import path from "path"
import { Bus } from "../../src/bus"
import { Config } from "../../src/config/config"
import { Instance } from "../../src/project/instance"
import { Filesystem } from "../../src/util/filesystem"
@@ -47,7 +46,7 @@ Valid agent prompt`,
})
})
test("publishes an error for invalid agent markdown configs", async () => {
test("reports a warning for invalid agent markdown configs", async () => {
await using tmp = await tmpdir({
init: async (dir) => {
await Filesystem.write(
@@ -63,22 +62,10 @@ Broken agent prompt`,
await Instance.provide({
directory: tmp.path,
fn: async () => {
const seen: Array<{ type: string; properties: { error: { name: string; data: { message: string } } } }> = []
const unsub = Bus.subscribeAll((event) => {
if (event.type === "session.error") seen.push(event)
})
await Config.get()
unsub()
const warns = await Config.warnings()
expect(
seen.some(
(item) =>
item.properties.error.name === "UnknownError" &&
item.properties.error.data.message.includes("skip.md") &&
item.properties.error.data.message.includes("mode"),
),
).toBe(true)
expect(warns.some((w) => w.path.includes("skip.md") && w.message.includes("mode"))).toBe(true)
},
})
})
@@ -117,7 +104,7 @@ Valid command template`,
})
})
test("publishes an error for invalid command markdown configs", async () => {
test("reports a warning for invalid command markdown configs", async () => {
await using tmp = await tmpdir({
init: async (dir) => {
await Filesystem.write(
@@ -133,22 +120,10 @@ Broken command template`,
await Instance.provide({
directory: tmp.path,
fn: async () => {
const seen: Array<{ type: string; properties: { error: { name: string; data: { message: string } } } }> = []
const unsub = Bus.subscribeAll((event) => {
if (event.type === "session.error") seen.push(event)
})
await Config.get()
unsub()
const warns = await Config.warnings()
expect(
seen.some(
(item) =>
item.properties.error.name === "UnknownError" &&
item.properties.error.data.message.includes("skip.md") &&
item.properties.error.data.message.includes("subtask"),
),
).toBe(true)
expect(warns.some((w) => w.path.includes("skip.md") && w.message.includes("subtask"))).toBe(true)
},
})
})