refactor: extract shared util package (#37828)

packages/core/src/session/compaction.ts

@@ -5,8 +5,8 @@ import { SessionError } from "@opencode-ai/schema/session-error"
 import { Context, Effect, Layer, Stream } from "effect"
 import { Config } from "../config"
 import { EventV2 } from "../event"
-import { makeLocationNode } from "../effect/app-node"
-import { llmClient } from "../effect/app-node-platform"
+import { makeLocationNode } from "@opencode-ai/util/effect/app-node"
+import { llmClient } from "@opencode-ai/util/effect/app-node-platform"
 import { SessionEvent } from "./event"
 import type { SessionMessage } from "./message"
 import { SessionModelHeaders } from "./model-headers"

packages/core/src/session/context.ts

@@ -3,7 +3,7 @@ export * as SessionContext from "./context"
 import { Context, Effect, Layer } from "effect"
 import { AgentV2 } from "../agent"
 import { Database } from "../database/database"
-import { makeLocationNode } from "../effect/app-node"
+import { makeLocationNode } from "@opencode-ai/util/effect/app-node"
 import { InstructionDiscovery } from "../instruction-discovery"
 import { Instructions } from "../instructions/index"
 import { InstructionBuiltIns } from "../instructions/builtins"

packages/core/src/session/execution.ts

@@ -3,7 +3,7 @@ export * as SessionExecution from "./execution"
 import { Cause, Context, Effect, Exit, Layer } from "effect"
 import { EventV2 } from "../event"
 import { LocationServiceMap } from "../location-service-map"
-import { makeGlobalNode } from "../effect/app-node"
+import { makeGlobalNode } from "@opencode-ai/util/effect/app-node"
 import { SessionEvent } from "./event"
 import { SessionRunCoordinator } from "./run-coordinator"
 import { SessionRunner } from "./runner/index"

packages/core/src/session/execution/restart.ts

@@ -1,7 +1,7 @@
 export * as SessionRestart from "./restart"
 
 import { Context, Effect, Layer } from "effect"
-import { makeGlobalNode } from "../../effect/app-node"
+import { makeGlobalNode } from "@opencode-ai/util/effect/app-node"
 import { SessionExecution } from "../execution"
 import { SessionStore } from "../store"
 

packages/core/src/session/generate-node.ts

@@ -3,8 +3,8 @@ export * as SessionGenerateNode from "./generate-node"
 import { LLM, LLMClient, Message, SystemPart } from "@opencode-ai/ai"
 import { Effect, Layer } from "effect"
 import { Database } from "../database/database"
-import { makeLocationNode } from "../effect/app-node"
-import { llmClient } from "../effect/app-node-platform"
+import { makeLocationNode } from "@opencode-ai/util/effect/app-node"
+import { llmClient } from "@opencode-ai/util/effect/app-node-platform"
 import { PluginHooks } from "../plugin/hooks"
 import { SessionContext } from "./context"
 import { SessionGenerate } from "./generate"

packages/core/src/session/instruction-entry.ts

@@ -4,7 +4,7 @@ import { and, asc, eq, isNotNull, isNull, ne, or } from "drizzle-orm"
 import { Context, Effect, Layer, Schema } from "effect"
 import { InstructionEntry } from "@opencode-ai/schema/instruction-entry"
 import { Database } from "../database/database"
-import { makeLocationNode } from "../effect/app-node"
+import { makeLocationNode } from "@opencode-ai/util/effect/app-node"
 import { Instructions } from "../instructions/index"
 import { SessionSchema } from "./schema"
 import { InstructionEntryTable } from "./sql"

packages/core/src/session/instructions.ts

@@ -2,9 +2,9 @@ export * as SessionInstructions from "./instructions"
 
 import { relative } from "path"
 import { Context, DateTime, Effect, Layer, Option, Ref, Schema } from "effect"
-import { makeLocationNode } from "../effect/app-node"
+import { makeLocationNode } from "@opencode-ai/util/effect/app-node"
 import { EventV2 } from "../event"
-import { FSUtil } from "../fs-util"
+import { FSUtil } from "@opencode-ai/util/fs-util"
 import { Location } from "../location"
 import { SessionEvent } from "./event"
 import { MessageDecodeError } from "./error"

packages/core/src/session/model-headers.ts

@@ -1,6 +1,6 @@
 export * as SessionModelHeaders from "./model-headers"
 
-import { InstallationVersion } from "../installation/version"
+import { InstallationVersion } from "@opencode-ai/util/installation/version"
 import { SessionSchema } from "./schema"
 import { Schema } from "effect"
 

packages/core/src/session/model-request.ts

@@ -3,7 +3,7 @@ export * as SessionModelRequest from "./model-request"
 import { LLM, Message, SystemPart, type LLMRequest } from "@opencode-ai/ai"
 import { SessionError } from "@opencode-ai/schema/session-error"
 import { Context, Effect, Layer } from "effect"
-import { makeLocationNode } from "../effect/app-node"
+import { makeLocationNode } from "@opencode-ai/util/effect/app-node"
 import { PluginHooks } from "../plugin/hooks"
 import { ToolRegistry } from "../tool/registry"
 import { SessionContext } from "./context"

packages/core/src/session/projector.ts

@@ -4,7 +4,7 @@ import { and, asc, desc, eq, gt, gte, inArray, lt, sql } from "drizzle-orm"
 import { DateTime, Effect, Layer, Schema, Stream } from "effect"
 import { Database } from "../database/database"
 import { EventV2 } from "../event"
-import { makeGlobalNode } from "../effect/app-node"
+import { makeGlobalNode } from "@opencode-ai/util/effect/app-node"
 import { ModelV2 } from "../model"
 import { SessionEvent } from "./event"
 import { SessionV1 } from "../v1/session"

packages/core/src/session/runner/llm.ts

@@ -21,8 +21,8 @@ import { SessionTitle } from "../title"
 import { Service } from "./index"
 import { createLLMEventPublisher } from "./publish-llm-event"
 import { Snapshot } from "../../snapshot"
-import { makeLocationNode } from "../../effect/app-node"
-import { llmClient } from "../../effect/app-node-platform"
+import { makeLocationNode } from "@opencode-ai/util/effect/app-node"
+import { llmClient } from "@opencode-ai/util/effect/app-node-platform"
 import { StepFailedError } from "../error"
 import { toSessionError } from "../to-session-error"
 import { SessionRunnerRetry } from "./retry"

packages/core/src/session/runner/model.ts

@@ -1,6 +1,6 @@
 export * as SessionRunnerModel from "./model"
 
-import { makeLocationNode } from "../../effect/app-node"
+import { makeLocationNode } from "@opencode-ai/util/effect/app-node"
 import { Model } from "@opencode-ai/ai"
 // ast-grep-ignore: no-star-import
 import * as AnthropicMessages from "@opencode-ai/ai/protocols/anthropic-messages"
@@ -16,7 +16,7 @@ import { Catalog } from "../../catalog"
 import { Credential } from "../../credential"
 import { Integration } from "../../integration"
 import { ModelV2 } from "../../model"
-import { Npm } from "../../npm"
+import { Npm } from "@opencode-ai/util/npm"
 import { OpenAICodex } from "../../plugin/provider/openai-codex"
 import { ProviderV2 } from "../../provider"
 import { SessionSchema } from "../schema"

packages/core/src/session/store.ts

@@ -3,7 +3,7 @@ export * as SessionStore from "./store"
 import { and, eq, inArray, isNotNull, isNull } from "drizzle-orm"
 import { Context, Effect, Layer, Schema } from "effect"
 import { Database } from "../database/database"
-import { makeGlobalNode } from "../effect/app-node"
+import { makeGlobalNode } from "@opencode-ai/util/effect/app-node"
 import { SessionHistory } from "./history"
 import { MessageDecodeError } from "./error"
 import { SessionMessage } from "./message"

packages/core/src/session/title.ts

@@ -5,8 +5,8 @@ import { Context, Effect, Layer, Stream } from "effect"
 import { AgentV2 } from "../agent"
 import { Database } from "../database/database"
 import { EventV2 } from "../event"
-import { makeLocationNode } from "../effect/app-node"
-import { llmClient } from "../effect/app-node-platform"
+import { makeLocationNode } from "@opencode-ai/util/effect/app-node"
+import { llmClient } from "@opencode-ai/util/effect/app-node-platform"
 import { SessionEvent } from "./event"
 import { SessionHistory } from "./history"
 import { SessionModelHeaders } from "./model-headers"