From ff88d61175ac88dc8238d1309731246648c80781 Mon Sep 17 00:00:00 2001 From: marius-kilocode Date: Fri, 29 May 2026 09:57:41 +0200 Subject: [PATCH] refactor(cli): remove legacy Vcs facade --- packages/opencode/src/kilo-sessions/kilo-sessions.ts | 9 +++++++-- packages/opencode/src/project/vcs.ts | 7 ------- script/check-opencode-promise-facades.ts | 1 - 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/packages/opencode/src/kilo-sessions/kilo-sessions.ts b/packages/opencode/src/kilo-sessions/kilo-sessions.ts index a4f5b80155e..0355bef27d7 100644 --- a/packages/opencode/src/kilo-sessions/kilo-sessions.ts +++ b/packages/opencode/src/kilo-sessions/kilo-sessions.ts @@ -354,7 +354,7 @@ export namespace KiloSessions { const getSessions = async () => { const [gitUrl, gitBranch] = await Promise.all([ getGitUrl().catch(() => undefined), - Vcs.branch().catch(() => undefined), + branch().catch(() => undefined), ]) const { AppRuntime } = await import("@/effect/app-runtime") const statusMap = await AppRuntime.runPromise(SessionStatus.Service.use((svc) => svc.list())) @@ -723,11 +723,16 @@ export namespace KiloSessions { }) } + async function branch() { + const { AppRuntime } = await import("@/effect/app-runtime") + return AppRuntime.runPromise(Vcs.Service.use((svc) => svc.branch())) + } + async function meta(sessionId?: string) { const override = sessionId ? KiloSession.resolvePlatform(sessionId) : undefined const platform = override || process.env["KILO_PLATFORM"] || "cli" const orgId = await getOrgId() - const gitBranch = await Vcs.branch().catch(() => undefined) + const gitBranch = await branch().catch(() => undefined) const gitUrl = await getGitUrl().catch(() => undefined) return { diff --git a/packages/opencode/src/project/vcs.ts b/packages/opencode/src/project/vcs.ts index 9d7f14ad5bb..02173453dbf 100644 --- a/packages/opencode/src/project/vcs.ts +++ b/packages/opencode/src/project/vcs.ts @@ -7,7 +7,6 @@ import { FileWatcher } from "@/file/watcher" import { Git } from "@/git" import * as Log from "@opencode-ai/core/util/log" import { zod, zodObject } from "@/util/effect-zod" -import { makeRuntime } from "@/effect/run-service" // kilocode_change import { NonNegativeInt, withStatics } from "@/util/schema" const log = Log.create({ service: "vcs" }) @@ -408,10 +407,4 @@ export const layer: Layer.Layer = Lay export const defaultLayer = layer.pipe(Layer.provide(Git.defaultLayer), Layer.provide(Bus.layer)) -// kilocode_change start - legacy promise helpers for Kilo callsites -const { runPromise } = makeRuntime(Service, defaultLayer) -export const branch = () => runPromise((svc) => svc.branch()) -export const defaultBranch = () => runPromise((svc) => svc.defaultBranch()) -// kilocode_change end - export * as Vcs from "./vcs" diff --git a/script/check-opencode-promise-facades.ts b/script/check-opencode-promise-facades.ts index 6614f444169..a6dc40e2a8a 100644 --- a/script/check-opencode-promise-facades.ts +++ b/script/check-opencode-promise-facades.ts @@ -20,7 +20,6 @@ const allow: Record = { "cli/cmd/tui/config/tui.ts": "separately tracked TUI config facade", "installation/index.ts": "existing installation facade outside #10655", "permission/index.ts": "transitional facade removed by #10620", - "project/vcs.ts": "transitional facade removed by #10620", "provider/provider.ts": "transitional facade tracked by #10655", "question/index.ts": "transitional facade deferred for upstream reconciliation in #10655", "session/compaction.ts": "existing compaction facade outside #10655",