chore: update merge branch with latest v2

# Conflicts:
#	packages/core/src/plugin/provider/github-copilot.ts

packages/plugin/package.json

@@ -5,6 +5,7 @@
   "type": "module",
   "license": "MIT",
   "scripts": {
+    "test": "bun test --timeout 5000",
     "typecheck": "tsgo --noEmit",
     "build": "tsc"
   },

packages/plugin/src/v2/effect/agent.ts

@@ -1,5 +1,5 @@
-import type { AgentV2Info } from "@opencode-ai/sdk/v2/types"
 import type { AgentApi } from "@opencode-ai/client/effect/api"
+import type { AgentV2Info } from "@opencode-ai/sdk/v2/types"
 import type { Effect } from "effect"
 import type { TransformHook } from "./registration.js"
 

packages/plugin/src/v2/effect/aisdk.ts

@@ -1,16 +1,16 @@
 import type { LanguageModelV3 } from "@ai-sdk/provider"
-import type { ModelV2Info } from "@opencode-ai/sdk/v2/types"
+import type { Model } from "@opencode-ai/schema/model"
 import type { Hooks } from "./registration.js"
 
 export type AISDKHooks = Hooks<{
   sdk: {
-    readonly model: ModelV2Info
+    readonly model: Model.Info
     readonly package: string
     readonly options: Record<string, any>
     sdk?: any
   }
   language: {
-    readonly model: ModelV2Info
+    readonly model: Model.Info
     readonly sdk: any
     readonly options: Record<string, any>
     language?: LanguageModelV3

packages/plugin/src/v2/effect/index.ts

@@ -12,3 +12,13 @@ export type { SkillDraft, SkillHooks } from "./skill.js"
 export * as Tool from "./tool.js"
 export type { ToolDomain, ToolDraft, ToolExecuteBeforeEvent, ToolExecuteAfterEvent } from "./tool.js"
 export type { SessionHooks } from "./runtime.js"
+
+export { Agent } from "@opencode-ai/schema/agent"
+export { Command } from "@opencode-ai/schema/command"
+export { Connection } from "@opencode-ai/schema/connection"
+export { Credential } from "@opencode-ai/schema/credential"
+export { Integration } from "@opencode-ai/schema/integration"
+export { Model } from "@opencode-ai/schema/model"
+export { Provider } from "@opencode-ai/schema/provider"
+export { Reference } from "@opencode-ai/schema/reference"
+export { Skill } from "@opencode-ai/schema/skill"

packages/plugin/src/v2/promise/aisdk.ts

@@ -1,16 +1,16 @@
 import type { LanguageModelV3 } from "@ai-sdk/provider"
-import type { ModelV2Info } from "@opencode-ai/sdk/v2/types"
+import type { Model } from "@opencode-ai/schema/model"
 import type { Hooks } from "./registration.js"
 
 export type AISDKHooks = Hooks<{
   sdk: {
-    readonly model: ModelV2Info
+    readonly model: Model.Info
     readonly package: string
     readonly options: Record<string, any>
     sdk?: any
   }
   language: {
-    readonly model: ModelV2Info
+    readonly model: Model.Info
     readonly sdk: any
     readonly options: Record<string, any>
     language?: LanguageModelV3

packages/plugin/src/v2/promise/index.ts

@@ -11,3 +11,13 @@ export type { IntegrationDraft, IntegrationHooks, IntegrationMethodRegistration
 export type { ReferenceDraft, ReferenceHooks } from "./reference.js"
 export type { SessionHooks } from "./runtime.js"
 export type { SkillDraft, SkillHooks } from "./skill.js"
+
+export { Agent } from "@opencode-ai/schema/agent"
+export { Command } from "@opencode-ai/schema/command"
+export { Connection } from "@opencode-ai/schema/connection"
+export { Credential } from "@opencode-ai/schema/credential"
+export { Integration } from "@opencode-ai/schema/integration"
+export { Model } from "@opencode-ai/schema/model"
+export { Provider } from "@opencode-ai/schema/provider"
+export { Reference } from "@opencode-ai/schema/reference"
+export { Skill } from "@opencode-ai/schema/skill"

packages/plugin/test/contract-identity.test.ts

@@ -0,0 +1,41 @@
+import { expect, test } from "bun:test"
+import { Agent } from "@opencode-ai/schema/agent"
+import { Command } from "@opencode-ai/schema/command"
+import { Connection } from "@opencode-ai/schema/connection"
+import { Credential } from "@opencode-ai/schema/credential"
+import { Integration } from "@opencode-ai/schema/integration"
+import { Model } from "@opencode-ai/schema/model"
+import { Provider } from "@opencode-ai/schema/provider"
+import { Reference } from "@opencode-ai/schema/reference"
+import { Skill } from "@opencode-ai/schema/skill"
+
+const Plugin = await import("../src/v2/effect/index")
+const PromisePlugin = await import("../src/v2/promise/index")
+
+test.each([
+  ["effect", Plugin],
+  ["promise", PromisePlugin],
+])("%s entrypoint exposes its canonical Schema contracts", (name, entrypoint) => {
+  expect(entrypoint.Agent).toBe(Agent)
+  expect(entrypoint.Command).toBe(Command)
+  expect(entrypoint.Connection).toBe(Connection)
+  expect(entrypoint.Credential).toBe(Credential)
+  expect(entrypoint.Integration).toBe(Integration)
+  expect(entrypoint.Model).toBe(Model)
+  expect(entrypoint.Provider).toBe(Provider)
+  expect(entrypoint.Reference).toBe(Reference)
+  expect(entrypoint.Skill).toBe(Skill)
+  expect(Object.keys(entrypoint).sort()).toEqual([
+    "Agent",
+    "Command",
+    "Connection",
+    "Credential",
+    "Integration",
+    "Model",
+    "Provider",
+    "Reference",
+    "Skill",
+    ...(name === "effect" ? ["Tool"] : []),
+    "define",
+  ])
+})