The open source coding agent.
TypeScript
fix: switch consumers to service imports to break bundle cycles (#18438)
Kit Langton214a6c6cf130
diff --git a/packages/opencode/src/agent/agent.ts b/packages/opencode/src/agent/agent.tsindex fd07ebc85b7..5a629c73e12 100644--- a/packages/opencode/src/agent/agent.ts+++ b/packages/opencode/src/agent/agent.ts@@ -14,7 +14,7 @@ import PROMPT_COMPACTION from "./prompt/compaction.txt"import PROMPT_EXPLORE from "./prompt/explore.txt"import PROMPT_SUMMARY from "./prompt/summary.txt"import PROMPT_TITLE from "./prompt/title.txt"-import { PermissionNext } from "@/permission"+import { Permission as PermissionNext } from "@/permission/service"import { mergeDeep, pipe, sortBy, values } from "remeda"import { Global } from "@/global"import path from "path"diff --git a/packages/opencode/src/cli/cmd/tui/context/sync.tsx b/packages/opencode/src/cli/cmd/tui/context/sync.tsxindex 3b296a927aa..d0698773472 100644--- a/packages/opencode/src/cli/cmd/tui/context/sync.tsx+++ b/packages/opencode/src/cli/cmd/tui/context/sync.tsx@@ -22,7 +22,7 @@ import { createStore, produce, reconcile } from "solid-js/store"import { useSDK } from "@tui/context/sdk"import { Binary } from "@opencode-ai/util/binary"import { createSimpleContext } from "./helper"-import type { Snapshot } from "@/snapshot"+import type { Snapshot } from "@/snapshot/service"import { useExit } from "./exit"import { useArgs } from "./args"import { batch, onMount } from "solid-js"diff --git a/packages/opencode/src/server/routes/session.ts b/packages/opencode/src/server/routes/session.tsindex 613c8b05c17..564bb496b50 100644--- a/packages/opencode/src/server/routes/session.ts+++ b/packages/opencode/src/server/routes/session.ts@@ -12,7 +12,7 @@ import { SessionStatus } from "@/session/status"import { SessionSummary } from "@/session/summary"import { Todo } from "../../session/todo"import { Agent } from "../../agent/agent"-import { Snapshot } from "@/snapshot"+import { Snapshot } from "@/snapshot/service"import { Log } from "../../util/log"import { PermissionNext } from "@/permission"import { PermissionID } from "@/permission/schema"diff --git a/packages/opencode/src/session/index.ts b/packages/opencode/src/session/index.tsindex 01fd214e0a4..bbb7c97fd25 100644--- a/packages/opencode/src/session/index.ts+++ b/packages/opencode/src/session/index.ts@@ -20,7 +20,7 @@ import { Instance } from "../project/instance"import { SessionPrompt } from "./prompt"import { fn } from "@/util/fn"import { Command } from "../command"-import { Snapshot } from "@/snapshot"+import { Snapshot } from "@/snapshot/service"import { WorkspaceContext } from "../control-plane/workspace-context"import { ProjectID } from "../project/schema"import { WorkspaceID } from "../control-plane/schema"@@ -28,7 +28,7 @@ import { SessionID, MessageID, PartID } from "./schema"import type { Provider } from "@/provider/provider"import { ModelID, ProviderID } from "@/provider/schema"-import { PermissionNext } from "@/permission"+import { Permission as PermissionNext } from "@/permission/service"import { Global } from "@/global"import type { LanguageModelV2Usage } from "@ai-sdk/provider"import { iife } from "@/util/iife"diff --git a/packages/opencode/src/session/llm.ts b/packages/opencode/src/session/llm.tsindex 748fd3eb21a..b28a595e1b8 100644--- a/packages/opencode/src/session/llm.ts+++ b/packages/opencode/src/session/llm.ts@@ -21,7 +21,7 @@ import type { MessageV2 } from "./message-v2"import { Plugin } from "@/plugin"import { SystemPrompt } from "./system"import { Flag } from "@/flag/flag"-import { PermissionNext } from "@/permission"+import { Permission as PermissionNext } from "@/permission/service"import { Auth } from "@/auth"export namespace LLM {diff --git a/packages/opencode/src/session/message-v2.ts b/packages/opencode/src/session/message-v2.tsindex f1335f6f21a..3e1816e68e0 100644--- a/packages/opencode/src/session/message-v2.ts+++ b/packages/opencode/src/session/message-v2.ts@@ -4,7 +4,7 @@ import z from "zod"import { NamedError } from "@opencode-ai/util/error"import { APICallError, convertToModelMessages, LoadAPIKeyError, type ModelMessage, type UIMessage } from "ai"import { LSP } from "../lsp"-import { Snapshot } from "@/snapshot"+import { Snapshot } from "@/snapshot/service"import { fn } from "@/util/fn"import { Database, NotFoundError, and, desc, eq, inArray, lt, or } from "@/storage/db"import { MessageTable, PartTable, SessionTable } from "./session.sql"diff --git a/packages/opencode/src/session/processor.ts b/packages/opencode/src/session/processor.tsindex 8200dea7564..2fe3310ca6d 100644--- a/packages/opencode/src/session/processor.ts+++ b/packages/opencode/src/session/processor.ts@@ -13,7 +13,7 @@ import { LLM } from "./llm"import { Config } from "@/config/config"import { SessionCompaction } from "./compaction"import { PermissionNext } from "@/permission"-import { Question } from "@/question"+import { Question } from "@/question/service"import { PartID } from "./schema"import type { SessionID, MessageID } from "./schema"diff --git a/packages/opencode/src/session/session.sql.ts b/packages/opencode/src/session/session.sql.tsindex ea1c4dafb91..f73e16804a9 100644--- a/packages/opencode/src/session/session.sql.ts+++ b/packages/opencode/src/session/session.sql.ts@@ -1,8 +1,8 @@import { sqliteTable, text, integer, index, primaryKey } from "drizzle-orm/sqlite-core"import { ProjectTable } from "../project/project.sql"import type { MessageV2 } from "./message-v2"-import type { Snapshot } from "../snapshot"-import type { PermissionNext } from "../permission"+import type { Snapshot } from "../snapshot/service"+import type { Permission as PermissionNext } from "../permission/service"import type { ProjectID } from "../project/schema"import type { SessionID, MessageID, PartID } from "./schema"import type { WorkspaceID } from "../control-plane/schema"diff --git a/packages/opencode/src/session/system.ts b/packages/opencode/src/session/system.tsindex 80c89618e33..ead715cfb7f 100644--- a/packages/opencode/src/session/system.ts+++ b/packages/opencode/src/session/system.ts@@ -11,7 +11,7 @@ import PROMPT_CODEX from "./prompt/codex.txt"import PROMPT_TRINITY from "./prompt/trinity.txt"import type { Provider } from "@/provider/provider"import type { Agent } from "@/agent/agent"-import { PermissionNext } from "@/permission"+import { Permission as PermissionNext } from "@/permission/service"import { Skill } from "@/skill"export namespace SystemPrompt {diff --git a/packages/opencode/src/tool/apply_patch.ts b/packages/opencode/src/tool/apply_patch.tsindex 06293b6eba6..66c8b181b25 100644--- a/packages/opencode/src/tool/apply_patch.ts+++ b/packages/opencode/src/tool/apply_patch.ts@@ -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"),diff --git a/packages/opencode/src/tool/edit.ts b/packages/opencode/src/tool/edit.tsindex 1a7614fc17f..982095cd55f 100644--- a/packages/opencode/src/tool/edit.ts+++ b/packages/opencode/src/tool/edit.ts@@ -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 = 20diff --git a/packages/opencode/src/tool/question.ts b/packages/opencode/src/tool/question.tsindex a2887546d4b..27a988e5632 100644--- a/packages/opencode/src/tool/question.ts+++ b/packages/opencode/src/tool/question.ts@@ -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,diff --git a/packages/opencode/src/tool/task.ts b/packages/opencode/src/tool/task.tsindex 9cabf47eb1d..79bec756026 100644--- a/packages/opencode/src/tool/task.ts+++ b/packages/opencode/src/tool/task.ts@@ -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"),diff --git a/packages/opencode/src/tool/tool.ts b/packages/opencode/src/tool/tool.tsindex d29af86f83f..c34bdbc5085 100644--- a/packages/opencode/src/tool/tool.ts+++ b/packages/opencode/src/tool/tool.ts@@ -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"diff --git a/packages/opencode/src/tool/write.ts b/packages/opencode/src/tool/write.tsindex 83474a543ca..abfab6d482a 100644--- a/packages/opencode/src/tool/write.ts+++ b/packages/opencode/src/tool/write.ts@@ -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"