Skip to content
Merged
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
5 changes: 5 additions & 0 deletions .changeset/models-dev-tui-logging.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@kilocode/cli": patch
---

Stop models.dev catalog refresh errors from overwriting the TUI prompt.
13 changes: 11 additions & 2 deletions packages/core/src/models-dev.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import path from "path"
import { Context, Duration, Effect, Layer, Option, Schedule, Schema } from "effect"
import { Context, Duration, Effect, Layer, Logger, Option, Schedule, Schema } from "effect" // kilocode_change
import { FetchHttpClient, HttpClient, HttpClientRequest } from "effect/unstable/http"
import { ModelsDev } from "@opencode-ai/schema/models-dev"
import { Global } from "./global"
Expand All @@ -12,6 +12,7 @@ import * as ModelsRefresh from "./kilocode/models-refresh" // kilocode_change
import { EventV2 } from "./event"
import { makeGlobalNode } from "./effect/app-node"
import { httpClient } from "./effect/app-node-platform"
import { Observability } from "./observability" // kilocode_change

export const CatalogModelStatus = Schema.Literals(["alpha", "beta", "deprecated"])
export type CatalogModelStatus = typeof CatalogModelStatus.Type
Expand Down Expand Up @@ -156,6 +157,7 @@ const layer = Layer.effect(
Effect.gen(function* () {
const fs = yield* FSUtil.Service
const events = yield* EventV2.Service
const loggers = yield* Effect.service(Logger.CurrentLoggers) // kilocode_change
const http = HttpClient.filterStatusOk(
(yield* HttpClient.HttpClient).pipe(
HttpClient.retryTransient({
Expand Down Expand Up @@ -259,6 +261,7 @@ const layer = Layer.effect(
).pipe(
Effect.tapCause((cause) => Effect.logError("Failed to fetch models.dev", { cause: cause })),
Effect.ignore,
Effect.provideService(Logger.CurrentLoggers, loggers), // kilocode_change
)
})

Expand All @@ -271,6 +274,12 @@ const layer = Layer.effect(
}),
)

export const node = makeGlobalNode({ service: Service, layer: layer, deps: [FSUtil.node, EventV2.node, httpClient] })
// kilocode_change start - capture file/OTLP loggers before the refresh fork
export const node = makeGlobalNode({
service: Service,
layer: layer,
deps: [FSUtil.node, EventV2.node, httpClient, Observability.node],
})
// kilocode_change end

export * as ModelsDev from "./models-dev"
65 changes: 65 additions & 0 deletions packages/core/test/kilocode/models-dev-logger.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
import { afterAll, beforeAll, describe, expect } from "bun:test"
import { Effect, Layer } from "effect"
import { HttpClient, HttpClientResponse } from "effect/unstable/http"
import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
import { LayerNodePlatform } from "@opencode-ai/core/effect/app-node-platform"
import { Flag } from "@opencode-ai/core/flag/flag"
import { Global } from "@opencode-ai/core/global"
import { ModelsDev } from "@opencode-ai/core/models-dev"
import { mkdir, readFile, rm, writeFile } from "fs/promises"
import path from "path"
import * as TestConsole from "effect/testing/TestConsole"
import { it } from "../lib/effect"

const ORIGINAL_MODELS_PATH = Flag.KILO_MODELS_PATH
const ORIGINAL_DISABLE_FETCH = Flag.KILO_DISABLE_MODELS_FETCH
const cache = Global.Path.cache
const log = Global.Path.log
const root = path.join(Global.Path.tmp, `models-logger-${process.pid}-${Math.random().toString(36).slice(2)}`)
const logs = path.join(root, "log")

beforeAll(async () => {
Flag.KILO_MODELS_PATH = undefined
Flag.KILO_DISABLE_MODELS_FETCH = true
Global.Path.cache = root
Global.Path.log = logs
await mkdir(logs, { recursive: true })
await writeFile(path.join(root, "models.json"), "{}")
})

afterAll(async () => {
Flag.KILO_MODELS_PATH = ORIGINAL_MODELS_PATH
Flag.KILO_DISABLE_MODELS_FETCH = ORIGINAL_DISABLE_FETCH
Global.Path.cache = cache
Global.Path.log = log
await rm(root, { recursive: true, force: true })
})

const client = HttpClient.make((request) =>
Effect.succeed(HttpClientResponse.fromWeb(request, new Response("boom", { status: 500 }))),
)

const layer = Layer.fresh(
AppNodeBuilder.build(ModelsDev.node, [[LayerNodePlatform.httpClient, Layer.succeed(HttpClient.HttpClient, client)]]),
)

async function logged() {
const file = path.join(logs, "opencode.log")
for (let i = 0; i < 50; i++) {
const text = await readFile(file, "utf8").catch(() => "")
if (text.includes("Failed to fetch models.dev")) return text
await Bun.sleep(10)
}
return await readFile(file, "utf8").catch(() => "")
}

describe("ModelsDev catalog refresh logging", () => {
it.live("failed refresh logs to file without Effect defaultLogger", () =>
Effect.gen(function* () {
yield* ModelsDev.Service.use((s) => s.refresh(true)).pipe(Effect.provide(layer))
const lines = yield* TestConsole.logLines
expect(lines.join("\n")).not.toContain("Failed to fetch models.dev")
Comment thread
johnnyeric marked this conversation as resolved.
Resolved
expect(yield* Effect.promise(logged)).toContain("Failed to fetch models.dev")
}),
)
})
Loading