fix(typecheck): resolve post-rebase type errors

- Add missing Flag import in prompt.ts and skill/index.ts
- Update instruction.test.ts assertion for new system() return type
- Fix llm.test.ts to use withTestInstance helper and pass ctx correctly

Author: martinffx

packages/opencode/src/session/prompt.ts

@@ -37,6 +37,7 @@ import { SessionProcessor } from "./processor"
 import { Tool } from "@/tool/tool"
 import { Permission } from "@/permission"
 import { SessionStatus } from "./status"
+import { Flag } from "@opencode-ai/core/flag/flag"
 import { LLM } from "./llm"
 import { Shell } from "@/shell/shell"
 import { ShellID } from "@/tool/shell/id"

packages/opencode/src/skill/index.ts

@@ -11,6 +11,7 @@ import { AppFileSystem } from "@opencode-ai/core/filesystem"
 import { Config } from "@/config/config"
 import { ConfigMarkdown } from "@/config/markdown"
 import { RuntimeFlags } from "@/effect/runtime-flags"
+import { Flag } from "@opencode-ai/core/flag/flag"
 import { Glob } from "@opencode-ai/core/util/glob"
 import { withStatics } from "@opencode-ai/core/schema"
 import * as Log from "@opencode-ai/core/util/log"

packages/opencode/test/session/instruction.test.ts

@@ -229,7 +229,7 @@ describe("Instruction.system", () => {
         const paths = yield* svc.systemPaths()
         expect(paths.has(path.join(globalTmp, ".claude", "CLAUDE.md"))).toBe(false)
         expect(paths.has(path.join(projectTmp, "CLAUDE.md"))).toBe(false)
-        expect(yield* svc.system()).toEqual([])
+        expect(yield* svc.system()).toEqual({ global: [], project: [] })
       }).pipe(
         provideInstance(projectTmp),
         provideInstruction({ home: globalTmp, config: globalTmp }, { disableClaudeCodePrompt: true }),

packages/opencode/test/session/llm.test.ts

@@ -1375,10 +1375,10 @@ describe("session.llm.stream", () => {
       },
     })
 
-    await WithInstance.provide({
+    await withTestInstance({
       directory: tmp.path,
-      fn: async () => {
-        const resolved = await getModel(ProviderID.make("anthropic"), ModelID.make(model.id))
+      fn: async (ctx) => {
+        const resolved = await getModel(ProviderID.make("anthropic"), ModelID.make(model.id), ctx)
         const sessionID = SessionID.make("session-test-split-system")
         const agent = {
           name: "test",
@@ -1396,15 +1396,18 @@ describe("session.llm.stream", () => {
           model: { providerID: ProviderID.make("anthropic"), modelID: resolved.id },
         } satisfies MessageV2.User
 
-        await drain({
-          user,
-          sessionID,
-          model: resolved,
-          agent,
-          system: { stable: ["Global instructions"], dynamic: ["Project instructions"] },
-          messages: [{ role: "user", content: "Hello" }],
-          tools: {},
-        })
+        await drain(
+          {
+            user,
+            sessionID,
+            model: resolved,
+            agent,
+            system: { stable: ["Global instructions"], dynamic: ["Project instructions"] },
+            messages: [{ role: "user", content: "Hello" }],
+            tools: {},
+          },
+          ctx,
+        )
 
         const capture = await request
         const body = capture.body
@@ -1481,10 +1484,10 @@ describe("session.llm.stream", () => {
       },
     })
 
-    await WithInstance.provide({
+    await withTestInstance({
       directory: tmp.path,
-      fn: async () => {
-        const resolved = await getModel(ProviderID.make("anthropic"), ModelID.make(model.id))
+      fn: async (ctx) => {
+        const resolved = await getModel(ProviderID.make("anthropic"), ModelID.make(model.id), ctx)
         const sessionID = SessionID.make("session-test-flat-system")
         const agent = {
           name: "test",
@@ -1502,15 +1505,18 @@ describe("session.llm.stream", () => {
           model: { providerID: ProviderID.make("anthropic"), modelID: resolved.id },
         } satisfies MessageV2.User
 
-        await drain({
-          user,
-          sessionID,
-          model: resolved,
-          agent,
-          system: ["Combined instructions"],
-          messages: [{ role: "user", content: "Hello" }],
-          tools: {},
-        })
+        await drain(
+          {
+            user,
+            sessionID,
+            model: resolved,
+            agent,
+            system: ["Combined instructions"],
+            messages: [{ role: "user", content: "Hello" }],
+            tools: {},
+          },
+          ctx,
+        )
 
         const capture = await request
         const body = capture.body