lmin/zmo-cli
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

fix: switch consumers to service imports to break bundle cycles (#18438)

Browse Source
This commit is contained in:
Kit Langton
2026-03-20 16:55:46 -04:00
committed by GitHub
parent 3f249aba6d
commit 214a6c6cf1
15 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/opencode/src/tool/apply_patch.ts
View File

@@ -12,7 +12,7 @@ import { trimDiff } from "./edit"
import { LSP } from "../lsp"
import { Filesystem } from "../util/filesystem"
import DESCRIPTION from "./apply_patch.txt"
import { File } from "../file"
import { File } from "../file/service"
const PatchParams = z.object({
patchText: z.string().describe("The full patch text that describes all changes to be made"),

4
packages/opencode/src/tool/edit.ts
View File

@@ -9,13 +9,13 @@ import { Tool } from "./tool"
import { LSP } from "../lsp"
import { createTwoFilesPatch, diffLines } from "diff"
import DESCRIPTION from "./edit.txt"
import { File } from "../file"
import { File } from "../file/service"
import { FileWatcher } from "../file/watcher"
import { Bus } from "../bus"
import { FileTime } from "../file/time"
import { Filesystem } from "../util/filesystem"
import { Instance } from "../project/instance"
import { Snapshot } from "@/snapshot"
import { Snapshot } from "@/snapshot/service"
import { assertExternalDirectory } from "./external-directory"
const MAX_DIAGNOSTICS_PER_FILE = 20

5
packages/opencode/src/tool/question.ts
View File

@@ -1,6 +1,7 @@
import z from "zod"
import { Tool } from "./tool"
import { Question } from "../question"
import { Question } from "../question/service"
import { Question as QuestionApi } from "../question"
import DESCRIPTION from "./question.txt"
export const QuestionTool = Tool.define("question", {
@@ -9,7 +10,7 @@ export const QuestionTool = Tool.define("question", {
questions: z.array(Question.Info.omit({ custom: true })).describe("Questions to ask"),
}),
async execute(params, ctx) {
const answers = await Question.ask({
const answers = await QuestionApi.ask({
sessionID: ctx.sessionID,
questions: params.questions,
tool: ctx.callID ? { messageID: ctx.messageID, callID: ctx.callID } : undefined,

2
packages/opencode/src/tool/task.ts
View File

@@ -10,7 +10,7 @@ import { SessionPrompt } from "../session/prompt"
import { iife } from "@/util/iife"
import { defer } from "@/util/defer"
import { Config } from "../config/config"
import { PermissionNext } from "@/permission"
import { Permission as PermissionNext } from "@/permission/service"
const parameters = z.object({
description: z.string().describe("A short (3-5 words) description of the task"),

2
packages/opencode/src/tool/tool.ts
View File

@@ -1,7 +1,7 @@
import z from "zod"
import type { MessageV2 } from "../session/message-v2"
import type { Agent } from "../agent/agent"
import type { PermissionNext } from "../permission"
import type { Permission as PermissionNext } from "../permission/service"
import type { SessionID, MessageID } from "../session/schema"
import { Truncate } from "./truncate"

2
packages/opencode/src/tool/write.ts
View File

@@ -5,7 +5,7 @@ import { LSP } from "../lsp"
import { createTwoFilesPatch } from "diff"
import DESCRIPTION from "./write.txt"
import { Bus } from "../bus"
import { File } from "../file"
import { File } from "../file/service"
import { FileWatcher } from "../file/watcher"
import { FileTime } from "../file/time"
import { Filesystem } from "../util/filesystem"