@markjaquith/agency 2.66.0 → 2.67.0

package/README.md

@@ -54,7 +54,7 @@ workbase/
   .opencode/
     opencode.jsonc         # managed @agency subagent, instructions, and reference
     tui.jsonc              # managed TUI plugin registration
-    plugin/agency-repository-skills.ts # managed workbase access and checkout skills
+    plugins/agency-repository-skills.ts # managed workbase access and checkout skills
     tui/agency-debug.ts    # managed /agency-debug TUI diagnostic
   agency.json              # tracked config and portable repository declarations
   repos/                   # ignored local materializations
@@ -119,6 +119,9 @@ toast and does not submit a prompt to an LLM. When no writable checkout skill
 directory is available, server initialization is reported as indeterminate
 rather than inferred from plugin discovery.
 OpenCode discovers the config and plugin from task and epic launch directories.
+The plugin uses OpenCode's plural discovery directory and exports both the V1
+server function and the `opencode2` module wrapper. Integration sync migrates a
+checksum-valid legacy singular-path plugin and preserves customized files.
 The plugin grants whole-workbase access dynamically, while the portable
 reference advertises that context to agents. Bash and Agency operations must
 still follow the write authority reported by `agency context`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@markjaquith/agency",
-  "version": "2.66.0",
+  "version": "2.67.0",
   "description": "Manage agentic work across repositories with durable workbases",
   "keywords": [
     "agents",

package/src/commands/init.test.ts

@@ -74,7 +74,7 @@ describe("init command", () => {
 			await Bun.file(join(root, ".opencode/command/agency.md")).exists(),
 		).toBe(false)
 		const plugin = await Bun.file(
-			join(root, ".opencode/plugin/agency-repository-skills.ts"),
+			join(root, ".opencode/plugins/agency-repository-skills.ts"),
 		).text()
 		expect(plugin).toContain("AGENCY_WRITABLE_CHECKOUT")
 		expect(plugin).toContain("config.skills.paths")

package/src/commands/integration.test.ts

@@ -87,7 +87,7 @@ OpenCode config: missing
   Action: Run 'agency integration sync' to install Agency instructions and whole-workbase OpenCode access.
 
 OpenCode workbase plugin: missing
-  Path: .opencode/plugin/agency-repository-skills.ts
+  Path: .opencode/plugins/agency-repository-skills.ts
   The managed OpenCode workbase plugin needs synchronization.
   Action: Run 'agency integration sync' to provide workbase access and expose writable-checkout skills in OpenCode.
 
@@ -124,7 +124,7 @@ OpenCode /agency-debug: missing
 		).toBe(false)
 		expect(
 			await Bun.file(
-				join(root, ".opencode/plugin/agency-repository-skills.ts"),
+				join(root, ".opencode/plugins/agency-repository-skills.ts"),
 			).exists(),
 		).toBe(true)
 		expect(await Bun.file(join(root, ".opencode/tui.jsonc")).exists()).toBe(
@@ -151,7 +151,7 @@ OpenCode config: synced
   Agency's managed OpenCode launch config is ready to load Agency instructions and provide whole-workbase read access.
 
 OpenCode workbase plugin: synced
-  Path: .opencode/plugin/agency-repository-skills.ts
+  Path: .opencode/plugins/agency-repository-skills.ts
   Agency's managed OpenCode plugin provides whole-workbase access and exposes writable-checkout skills.
 
 OpenCode TUI config: synced

package/src/services/IntegrationService.test.ts

@@ -72,7 +72,7 @@ describe("IntegrationService", () => {
 		await write(root, ".opencode/opencode.jsonc", managedWorkbaseOpencode)
 		await write(
 			root,
-			".opencode/plugin/agency-repository-skills.ts",
+			".opencode/plugins/agency-repository-skills.ts",
 			managedWorkbaseOpencodePlugin,
 		)
 		await write(root, ".opencode/tui.jsonc", managedWorkbaseOpencodeTui)
@@ -126,6 +126,15 @@ describe("IntegrationService", () => {
 		expect(managedWorkbaseOpencodePlugin).toContain(
 			"process.env.AGENCY_WRITABLE_CHECKOUT",
 		)
+		expect(managedWorkbaseOpencodePlugin).toContain(
+			'import type { Plugin, PluginModule } from "@opencode-ai/plugin/v1"',
+		)
+		expect(managedWorkbaseOpencodePlugin).toContain(
+			"export const AgencyPlugin = plugin",
+		)
+		expect(managedWorkbaseOpencodePlugin).toContain('id: "agency"')
+		expect(managedWorkbaseOpencodePlugin).toContain("setup,")
+		expect(managedWorkbaseOpencodePlugin).toContain("server: plugin")
 		expect(managedWorkbaseOpencodePlugin).toContain(
 			'["agency", "context", ".", "--compact", "--json"]',
 		)
@@ -276,7 +285,12 @@ describe("IntegrationService", () => {
 				task: "example",
 				phase,
 			})
-			const hooks = await generated.default({ directory: root } as never)
+			expect(generated.default).toMatchObject({
+				id: "agency",
+				setup: expect.any(Function),
+				server: generated.AgencyPlugin,
+			})
+			const hooks = await generated.AgencyPlugin({ directory: root } as never)
 			await hooks["chat.message"]!(
 				{ sessionID: "worker-session" } as never,
 				{
@@ -351,6 +365,52 @@ describe("IntegrationService", () => {
 			phase: "build",
 		}))
 
+	test("registers the workbase reference through the OpenCode V2 API", async () => {
+		const path = join(root, ".opencode/plugins/agency-repository-skills.ts")
+		await write(
+			root,
+			".opencode/plugins/agency-repository-skills.ts",
+			managedWorkbaseOpencodePlugin,
+		)
+		const generated = await import(`${pathToFileURL(path).href}?v2-setup`)
+		let reference:
+			| {
+					name: string
+					source: { type: string; path: string; description: string }
+			  }
+			| undefined
+
+		await generated.default.setup({
+			reference: {
+				transform: async (callback: (references: unknown) => void) =>
+					callback({
+						list: () => [],
+						add: (
+							name: string,
+							source: {
+								type: string
+								path: string
+								description: string
+							},
+						) => {
+							reference = { name, source }
+						},
+					}),
+			},
+			skill: { transform: async () => {} },
+		})
+
+		expect(reference).toEqual({
+			name: "workbase",
+			source: {
+				type: "local",
+				path: root,
+				description:
+					"Complete Agency workbase context; write authority still comes only from agency context",
+			},
+		})
+	})
+
 	test("registers a TUI-only /agency-debug diagnostic", async () => {
 		const config = JSON.parse(managedBody(managedWorkbaseOpencodeTui))
 		expect(config).toEqual({
@@ -688,7 +748,7 @@ describe("IntegrationService", () => {
 		).toBe(false)
 		expect(
 			await Bun.file(
-				join(root, ".opencode/plugin/agency-repository-skills.ts"),
+				join(root, ".opencode/plugins/agency-repository-skills.ts"),
 			).text(),
 		).toBe(managedWorkbaseOpencodePlugin)
 		expect(await Bun.file(join(root, ".opencode/tui.jsonc")).text()).toBe(
@@ -761,6 +821,35 @@ describe("IntegrationService", () => {
 		})
 	})
 
+	test("migrates a checksum-valid plugin from the legacy singular path", async () => {
+		const legacyPath = join(
+			root,
+			".opencode/plugin/agency-repository-skills.ts",
+		)
+		const pluginPath = join(
+			root,
+			".opencode/plugins/agency-repository-skills.ts",
+		)
+		await write(
+			root,
+			".opencode/plugin/agency-repository-skills.ts",
+			managedWorkbaseOpencodePlugin,
+		)
+
+		const result = await sync(root)
+
+		expect(result.files[2]).toMatchObject({
+			name: "opencode-plugin",
+			path: pluginPath,
+			state: "managed",
+			changed: true,
+		})
+		expect(await Bun.file(pluginPath).text()).toBe(
+			managedWorkbaseOpencodePlugin,
+		)
+		expect(await Bun.file(legacyPath).exists()).toBe(false)
+	})
+
 	test("preserves user-owned TUI config and diagnostic plugin", async () => {
 		const customConfig = '{"theme":"custom"}\n'
 		const customPlugin =

package/src/services/IntegrationService.ts

@@ -179,12 +179,12 @@ const inspect = (root: string) =>
 		const opencodeJsonPath = join(opencodeDirectory, "opencode.json")
 		const tuiPath = join(opencodeDirectory, "tui.jsonc")
 		const tuiJsonPath = join(opencodeDirectory, "tui.json")
-		const pluginPath = join(
+		const legacyPluginPath = join(
 			opencodeDirectory,
 			"plugin",
 			"agency-repository-skills.ts",
 		)
-		const pluralPluginPath = join(
+		const pluginPath = join(
 			opencodeDirectory,
 			"plugins",
 			"agency-repository-skills.ts",
@@ -229,11 +229,6 @@ const inspect = (root: string) =>
 
 		if ((yield* fs.readSymlinkTarget(pluginPath)) !== null) {
 			files.push(fileStatus("opencode-plugin", pluginPath, "customized"))
-		} else if (
-			(yield* fs.readSymlinkTarget(pluralPluginPath)) !== null ||
-			(yield* fs.exists(pluralPluginPath))
-		) {
-			files.push(fileStatus("opencode-plugin", pluralPluginPath, "customized"))
 		} else if (yield* fs.exists(pluginPath)) {
 			files.push(
 				classify(
@@ -244,6 +239,20 @@ const inspect = (root: string) =>
 					canUpdateManagedWorkbaseOpencodePlugin,
 				),
 			)
+		} else if (
+			(yield* fs.readSymlinkTarget(legacyPluginPath)) !== null ||
+			(yield* fs.exists(legacyPluginPath))
+		) {
+			const legacyContent =
+				(yield* fs.readSymlinkTarget(legacyPluginPath)) === null
+					? yield* fs.readFile(legacyPluginPath)
+					: null
+			files.push(
+				legacyContent !== null &&
+					canUpdateManagedWorkbaseOpencodePlugin(legacyContent)
+					? fileStatus("opencode-plugin", pluginPath, "missing")
+					: fileStatus("opencode-plugin", legacyPluginPath, "customized"),
+			)
 		} else {
 			files.push(fileStatus("opencode-plugin", pluginPath, "missing"))
 		}
@@ -319,6 +328,23 @@ const canRemoveLegacyOpencodeCommand = (root: string) =>
 		return createHash("sha256").update(canonical).digest("hex") === match[1]
 	})
 
+const canRemoveLegacyOpencodePlugin = (root: string) =>
+	Effect.gen(function* () {
+		const fs = yield* FileSystemService
+		const path = join(
+			root,
+			".opencode",
+			"plugin",
+			"agency-repository-skills.ts",
+		)
+		if (
+			(yield* fs.readSymlinkTarget(path)) !== null ||
+			!(yield* fs.exists(path))
+		)
+			return false
+		return canUpdateManagedWorkbaseOpencodePlugin(yield* fs.readFile(path))
+	})
+
 export class IntegrationService extends Effect.Service<IntegrationService>()(
 	"IntegrationService",
 	{
@@ -343,6 +369,8 @@ export class IntegrationService extends Effect.Service<IntegrationService>()(
 						) && (yield* canRemoveLegacyAgents(root))
 					const removeLegacyOpencodeCommand =
 						yield* canRemoveLegacyOpencodeCommand(root)
+					const removeLegacyOpencodePlugin =
+						yield* canRemoveLegacyOpencodePlugin(root)
 					const files: IntegrationSyncFile[] = []
 
 					for (const status of statuses) {
@@ -356,7 +384,7 @@ export class IntegrationService extends Effect.Service<IntegrationService>()(
 								yield* fs.createDirectory(join(root, ".opencode"))
 								yield* fs.writeFile(status.path, managedWorkbaseOpencode)
 							} else if (status.name === "opencode-plugin") {
-								yield* fs.createDirectory(join(root, ".opencode", "plugin"))
+								yield* fs.createDirectory(join(root, ".opencode", "plugins"))
 								yield* fs.writeFile(status.path, managedWorkbaseOpencodePlugin)
 							} else if (status.name === "opencode-tui") {
 								yield* fs.createDirectory(join(root, ".opencode"))
@@ -376,11 +404,19 @@ export class IntegrationService extends Effect.Service<IntegrationService>()(
 								needsWrite ? "managed" : status.state,
 							),
 							changed:
-								needsWrite || (status.name === "agents" && removeLegacyAgents),
+								needsWrite ||
+								(status.name === "agents" && removeLegacyAgents) ||
+								(status.name === "opencode-plugin" &&
+									removeLegacyOpencodePlugin),
 						})
 					}
 
 					if (removeLegacyAgents) yield* fs.deleteFile(join(root, "AGENTS.md"))
+					if (removeLegacyOpencodePlugin) {
+						yield* fs.deleteFile(
+							join(root, ".opencode", "plugin", "agency-repository-skills.ts"),
+						)
+					}
 					if (removeLegacyOpencodeCommand) {
 						yield* fs.deleteFile(
 							join(root, ".opencode", "command", "agency.md"),

package/src/workbase/opencode-plugin-file.ts

@@ -8,7 +8,8 @@ const checksum = (content: string) =>
 
 const body = `import { existsSync, readFileSync } from "node:fs"
 import { dirname, join, resolve, sep } from "node:path"
-import type { Plugin } from "@opencode-ai/plugin"
+import { fileURLToPath } from "node:url"
+import type { Plugin, PluginModule } from "@opencode-ai/plugin/v1"
 
 const workerLaunchPattern = /^Agency worker launch target: ([^.\\s]+)\\./
 
@@ -20,6 +21,20 @@ type AgencyContext = {
   phase?: string
 }
 
+type V2PluginContext = {
+  reference: {
+    transform(callback: (references: {
+      list(): readonly (readonly [string, unknown])[]
+      add(name: string, source: { type: "local"; path: string; description: string }): void
+    }) => void): Promise<unknown>
+  }
+  skill: {
+    transform(callback: (skills: {
+      source(source: { type: "directory"; path: string }): void
+    }) => void): Promise<unknown>
+  }
+}
+
 const contextTarget = (result: Record<string, any>): string | undefined => {
   const target = result.target
   if (target?.kind === "epic") return \`epic:\${target.epicId}\`
@@ -69,6 +84,15 @@ const discoverCheckout = (directory: string, root: string | undefined) => {
   }
 }
 
+const checkoutSkillPaths = (checkout: string | undefined) => checkout
+  ? [
+      join(checkout, ".claude", "skills"),
+      join(checkout, ".agents", "skills"),
+      join(checkout, ".opencode", "skill"),
+      join(checkout, ".opencode", "skills"),
+    ].filter(existsSync)
+  : []
+
 const agencyContext = async (
   directory: string,
   useEnvironmentTarget = true,
@@ -141,12 +165,7 @@ const plugin: Plugin = async ({ directory }) => {
 
       if (!checkout) return
 
-      const paths = [
-        join(checkout, ".claude", "skills"),
-        join(checkout, ".agents", "skills"),
-        join(checkout, ".opencode", "skill"),
-        join(checkout, ".opencode", "skills"),
-      ].filter(existsSync).map((path) => \`\${path}\${sep}.\`)
+      const paths = checkoutSkillPaths(checkout).map((path) => \`\${path}\${sep}.\`)
       if (paths.length === 0) return
 
       config.skills ??= {}
@@ -186,7 +205,31 @@ const plugin: Plugin = async ({ directory }) => {
   }
 }
 
-export default plugin
+export const AgencyPlugin = plugin
+
+const setup = async (context: V2PluginContext) => {
+  const root = resolve(dirname(fileURLToPath(import.meta.url)), "../..")
+  await context.reference.transform((references) => {
+    if (references.list().some(([name]) => name === "workbase")) return
+    references.add("workbase", {
+      type: "local",
+      path: root,
+      description: "Complete Agency workbase context; write authority still comes only from agency context",
+    })
+  })
+
+  const paths = checkoutSkillPaths(process.env.AGENCY_WRITABLE_CHECKOUT)
+  if (paths.length === 0) return
+  await context.skill.transform((skills) => {
+    for (const path of paths) skills.source({ type: "directory", path })
+  })
+}
+
+export default {
+  id: "agency",
+  setup,
+  server: plugin,
+} satisfies PluginModule & { setup: (context: V2PluginContext) => Promise<void> }
 `
 
 const renderManagedWorkbaseOpencodePlugin = (content: string) =>