@osovv/vv-opencode 1.7.0 → 2.0.0

package/dist/plugins/v2-runtime/index.d.ts

@@ -0,0 +1,50 @@
+import { Plugin as V2Plugin } from "@opencode/plugin";
+import type { Hooks, Plugin as V1Plugin, PluginInput, PluginOptions } from "@opencode-ai/plugin";
+/**
+ * The v2 setup signature, including an optional cleanup return.
+ */
+export type V2Setup = (context: V2Plugin.Context) => Promise<V2Plugin.Cleanup | void> | V2Plugin.Cleanup | void;
+/**
+ * A dual-runtime plugin entrypoint: the v2 Plugin shape (id + setup) plus the
+ * v1 object-entrypoint server() member. OpenCode v1 (>= 1.18.29) detects the
+ * default export through its id/server members and calls only server(); OpenCode
+ * v2 reads id and setup() and ignores server(). Neither runtime loads the other
+ * path, so a package exposing exactly this default export registers once.
+ */
+export type DualPlugin = V2Plugin.Plugin & {
+    server: V1Plugin;
+};
+/**
+ * Build the dual entrypoint for one plugin.
+ *
+ * The v1 factory keeps its original single-argument or two-argument signature
+ * and is wrapped verbatim as the server() member. The v2 setup receives the v2
+ * plugin context and may return nothing yet; later migration tasks attach the
+ * domain registrations.
+ */
+export declare function defineDualPlugin(definition: {
+    id: string;
+    v1: V1Plugin;
+    v2: V2Setup;
+}): DualPlugin;
+/**
+ * Merge multiple v1 hook objects into one hook object.
+ *
+ * The v1 runtime triggers each hook key across plugin entries sequentially in
+ * registration order, and calls dispose() on every entry in registration order
+ * at shutdown. Producing one merged object that chains every key sequentially
+ * and forwards dispose in registration order reproduces that behavior exactly
+ * while presenting the aggregator as a single plugin entry.
+ *
+ * Children that returned undefined or an object without the requested key are
+ * skipped for that key. An empty list produces an object with no hook members.
+ */
+export declare function mergeV1Hooks(entries: Array<Hooks | undefined>): Hooks;
+/**
+ * Run v1 plugin factories sequentially and merge their hook objects.
+ *
+ * A factory that throws is logged and skipped so one failing plugin cannot take
+ * the remaining plugins offline, matching how the v1 runtime isolates plugin
+ * load failures across separate package entries.
+ */
+export declare function aggregateV1Plugins(factories: Array<V1Plugin>, input: PluginInput, options?: PluginOptions, onError?: (error: unknown, index: number) => void): Promise<Hooks>;

package/dist/plugins/v2-runtime/index.js

@@ -0,0 +1,114 @@
+// FILE: src/plugins/v2-runtime/index.ts
+// VERSION: 1.0.0
+// START_MODULE_CONTRACT
+//   PURPOSE: Provide the dual-runtime plugin foundation that lets one package entrypoint serve OpenCode v1 (server() object entrypoints, >= 1.18.29) and OpenCode v2 (Plugin.define setup, >= 2.0.18) without double registration.
+//   SCOPE: Dual entrypoint construction with stable plugin ids, sequential v1 plugin aggregation with per-plugin error isolation, hook-object merging that preserves v1 trigger and dispose ordering, and the typed seams later tasks use to attach v2 domain registrations.
+//   DEPENDS: [@opencode/plugin, @opencode-ai/plugin]
+//   LINKS: [M-PLUGIN-V2-RUNTIME, V-M-PLUGIN-V2-RUNTIME, M-PLUGIN-GUARDIAN, M-PLUGIN-WORKFLOW]
+//   ROLE: RUNTIME
+//   MAP_MODE: EXPORTS
+// END_MODULE_CONTRACT
+//
+// START_MODULE_MAP
+//   defineDualPlugin - Build a dual entrypoint whose default export serves v2 via setup(ctx) and v1 via server(input, options).
+//   mergeV1Hooks - Merge v1 hook objects into one object that runs each hook key sequentially in registration order and disposes in the same order.
+//   aggregateV1Plugins - Run v1 plugin factories sequentially with per-factory error isolation and merge their hook objects.
+//   DualPlugin - Type of the dual entrypoint: v2 Plugin shape plus the v1 server() member.
+//   V2Setup - Signature of a v2 setup function receiving the v2 plugin Context.
+// END_MODULE_MAP
+//
+// START_CHANGE_SUMMARY
+//   LAST_CHANGE: [C-OPENCODE-V2-MIGRATION - Created the dual-runtime foundation so every package entrypoint loads under both OpenCode runtimes.]
+// END_CHANGE_SUMMARY
+import { Plugin as V2Plugin } from "@opencode/plugin";
+// END_BLOCK_DUAL_PLUGIN_TYPE
+// START_BLOCK_DEFINE_DUAL_PLUGIN
+/**
+ * Build the dual entrypoint for one plugin.
+ *
+ * The v1 factory keeps its original single-argument or two-argument signature
+ * and is wrapped verbatim as the server() member. The v2 setup receives the v2
+ * plugin context and may return nothing yet; later migration tasks attach the
+ * domain registrations.
+ */
+export function defineDualPlugin(definition) {
+    return {
+        ...V2Plugin.define({
+            id: definition.id,
+            setup: definition.v2,
+        }),
+        server: definition.v1,
+    };
+}
+// END_BLOCK_DEFINE_DUAL_PLUGIN
+// START_BLOCK_MERGE_V1_HOOKS
+/**
+ * Merge multiple v1 hook objects into one hook object.
+ *
+ * The v1 runtime triggers each hook key across plugin entries sequentially in
+ * registration order, and calls dispose() on every entry in registration order
+ * at shutdown. Producing one merged object that chains every key sequentially
+ * and forwards dispose in registration order reproduces that behavior exactly
+ * while presenting the aggregator as a single plugin entry.
+ *
+ * Children that returned undefined or an object without the requested key are
+ * skipped for that key. An empty list produces an object with no hook members.
+ */
+export function mergeV1Hooks(entries) {
+    const present = entries.filter((entry) => Boolean(entry));
+    const keys = new Set();
+    for (const entry of present) {
+        for (const key of Object.keys(entry)) {
+            keys.add(key);
+        }
+    }
+    const merged = {};
+    for (const key of keys) {
+        if (key === "dispose")
+            continue;
+        const handlers = present
+            .map((entry) => entry[key])
+            .filter((handler) => typeof handler === "function");
+        if (handlers.length === 0)
+            continue;
+        merged[key] = async (input, output) => {
+            for (const handler of handlers) {
+                await handler(input, output);
+            }
+        };
+    }
+    const disposers = present
+        .map((entry) => entry.dispose)
+        .filter((disposer) => typeof disposer === "function");
+    if (disposers.length > 0) {
+        merged.dispose = async () => {
+            for (const disposer of disposers) {
+                await disposer();
+            }
+        };
+    }
+    return merged;
+}
+// END_BLOCK_MERGE_V1_HOOKS
+// START_BLOCK_AGGREGATE_V1_PLUGINS
+/**
+ * Run v1 plugin factories sequentially and merge their hook objects.
+ *
+ * A factory that throws is logged and skipped so one failing plugin cannot take
+ * the remaining plugins offline, matching how the v1 runtime isolates plugin
+ * load failures across separate package entries.
+ */
+export async function aggregateV1Plugins(factories, input, options, onError) {
+    const results = [];
+    for (const [index, factory] of factories.entries()) {
+        try {
+            results.push(await factory(input, options));
+        }
+        catch (error) {
+            onError?.(error, index);
+        }
+    }
+    return mergeV1Hooks(results);
+}
+// END_BLOCK_AGGREGATE_V1_PLUGINS
+//# sourceMappingURL=index.js.map

package/dist/plugins/v2-runtime/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/v2-runtime/index.ts"],"names":[],"mappings":"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"}

package/dist/plugins/v2-runtime/location-config.d.ts

@@ -0,0 +1,51 @@
+import type { ConfigSource } from "../../lib/config-layers.js";
+import type { VvocConfig } from "../../lib/vvoc-config.js";
+/**
+ * Effective vvoc config resolved for one session location directory.
+ */
+export interface LocationConfigSnapshot {
+    readonly directory: string;
+    readonly config: VvocConfig;
+    readonly source: ConfigSource;
+    readonly warnings: readonly string[];
+    readonly loadedAt: number;
+}
+export interface LocationResolverOptions {
+    /**
+     * Injectable effective-config loader for one directory. Defaults to the
+     * layer engine with effective scope and default fallback, mirroring the v1
+     * startup snapshot semantics for that directory.
+     */
+    loadForDirectory?: (directory: string) => Promise<Omit<LocationConfigSnapshot, "directory" | "loadedAt">>;
+    /** TTL in milliseconds for cached entries; defaults to 2000. */
+    ttlMs?: number;
+    /** Injectable logger receiving resolution failure warnings. */
+    warn?: (message: string) => void;
+    /** Injectable clock in milliseconds for deterministic tests. */
+    now?: () => number;
+}
+export interface LocationResolver {
+    /** Resolve the effective config for one directory, or undefined when it cannot be loaded (fail closed). */
+    forDirectory(directory: string): Promise<LocationConfigSnapshot | undefined>;
+    /** Resolve the effective config for a session through its persisted location directory. */
+    forSession(sessionID: string, sessionGet: (input: {
+        sessionID: string;
+    }) => Promise<{
+        location?: {
+            directory?: string;
+        };
+    } | undefined>): Promise<LocationConfigSnapshot | undefined>;
+    /** Drop the cached entry for one directory so the next read reloads from disk. */
+    invalidate(directory: string): void;
+    /** Number of directories currently cached; exposed for tests and diagnostics. */
+    readonly cachedDirectories: readonly string[];
+}
+/**
+ * Build the per-location resolver.
+ *
+ * A directory whose config fails to load resolves to undefined after a logged
+ * warning, and that failure is cached for the TTL so a broken project does not
+ * hammer the filesystem from every hook invocation. Plugins treat undefined as
+ * disabled for that location, preserving the v1 fail-closed posture.
+ */
+export declare function createLocationResolver(options?: LocationResolverOptions): LocationResolver;

package/dist/plugins/v2-runtime/location-config.js

@@ -0,0 +1,91 @@
+// FILE: src/plugins/v2-runtime/location-config.ts
+// VERSION: 1.0.0
+// START_MODULE_CONTRACT
+//   PURPOSE: Resolve the effective vvoc configuration per session location for the OpenCode v2 runtime, replacing the v1 startup-snapshot model.
+//   SCOPE: Per-directory effective config resolution through the existing layer engine with TTL caching, session-to-directory mapping through the v2 session API, watcher-driven invalidation, and fail-closed behavior for unresolvable locations.
+//   DEPENDS: [src/lib/config-layers.ts]
+//   LINKS: [M-PLUGIN-V2-RUNTIME, V-M-PLUGIN-V2-RUNTIME, M-CONFIG-LAYERS]
+//   ROLE: RUNTIME
+//   MAP_MODE: EXPORTS
+// END_MODULE_CONTRACT
+//
+// START_MODULE_MAP
+//   LocationConfigSnapshot - Effective config resolved for one directory plus source metadata and load time.
+//   LocationResolver - Resolver interface with forDirectory, forSession, invalidate, and cachedDirectories.
+//   LocationResolverOptions - Injectable loader, logger, TTL, and clock for deterministic tests.
+//   createLocationResolver - Build a per-directory caching resolver with session mapping and invalidation.
+// END_MODULE_MAP
+//
+// START_CHANGE_SUMMARY
+//   LAST_CHANGE: [C-OPENCODE-V2-MIGRATION T-002 - Created the per-location config resolver for the v2 runtime.]
+// END_CHANGE_SUMMARY
+import { loadVvocConfigForRead } from "../../lib/config-layers.js";
+/**
+ * Build the per-location resolver.
+ *
+ * A directory whose config fails to load resolves to undefined after a logged
+ * warning, and that failure is cached for the TTL so a broken project does not
+ * hammer the filesystem from every hook invocation. Plugins treat undefined as
+ * disabled for that location, preserving the v1 fail-closed posture.
+ */
+export function createLocationResolver(options = {}) {
+    const ttlMs = options.ttlMs ?? 2000;
+    const warn = options.warn ?? ((message) => console.warn(message));
+    const now = options.now ?? Date.now;
+    const load = options.loadForDirectory ??
+        (async (directory) => {
+            const read = await loadVvocConfigForRead({
+                cwd: directory,
+                scope: "effective",
+                allowDefault: true,
+            });
+            return { config: read.config, source: read.source, warnings: read.warnings };
+        });
+    const cache = new Map();
+    async function resolve(directory) {
+        const key = directory;
+        const cached = cache.get(key);
+        if (cached && cached.expiresAt > now()) {
+            return cached.value;
+        }
+        let value;
+        try {
+            value = { directory, ...(await load(directory)), loadedAt: now() };
+        }
+        catch (error) {
+            warn(`[vvoc][v2-runtime] config resolution failed for ${directory}: ${String(error)}; plugins stay disabled for this location`);
+            value = undefined;
+        }
+        cache.set(key, { value, expiresAt: now() + ttlMs });
+        return value;
+    }
+    return {
+        async forDirectory(directory) {
+            return resolve(directory);
+        },
+        async forSession(sessionID, sessionGet) {
+            let directory;
+            try {
+                const session = await sessionGet({ sessionID });
+                directory = session?.location?.directory;
+            }
+            catch (error) {
+                warn(`[vvoc][v2-runtime] session lookup failed for ${sessionID}: ${String(error)}; plugins stay disabled for this session`);
+                return undefined;
+            }
+            if (!directory) {
+                warn(`[vvoc][v2-runtime] session ${sessionID} has no location directory; plugins stay disabled for this session`);
+                return undefined;
+            }
+            return resolve(directory);
+        },
+        invalidate(directory) {
+            cache.delete(directory);
+        },
+        get cachedDirectories() {
+            return [...cache.keys()];
+        },
+    };
+}
+// END_BLOCK_CREATE_LOCATION_RESOLVER
+//# sourceMappingURL=location-config.js.map

package/dist/plugins/v2-runtime/location-config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"location-config.js","sourceRoot":"","sources":["../../../src/plugins/v2-runtime/location-config.ts"],"names":[],"mappings":"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"}

package/dist/plugins/v2-runtime/setup.d.ts

@@ -0,0 +1,48 @@
+import type { Plugin as V2Plugin } from "@opencode/plugin";
+import { type LocationResolver } from "./location-config.js";
+/**
+ * The context handed to every vvoc plugin v2 setup: the OpenCode v2 plugin
+ * context plus the shared location resolver and a multiplexed config watcher.
+ */
+export interface V2AdapterContext {
+    readonly ctx: V2Plugin.Context;
+    readonly resolver: LocationResolver;
+    /** Watch the project vvoc config effective for one directory; the returned stop function never throws. */
+    watchConfig(directory: string, onChange: () => void): Promise<() => void>;
+}
+type V2PluginSetup = (adapter: V2AdapterContext) => Promise<V2Plugin.Cleanup | void> | V2Plugin.Cleanup | void;
+/**
+ * Per-plugin v2 setup functions in the canonical v1 plugin order. Migration
+ * tasks append entries as each plugin gains its v2 registration.
+ */
+export declare const V2_PLUGIN_SETUPS: Array<{
+    name: string;
+    setup: V2PluginSetup;
+}>;
+/**
+ * OpenCode v1 (>= 1.18.29) also invokes setup() on dual entrypoints through
+ * its reduced v2 bridge host, whose context only carries the agent, aisdk,
+ * catalog, command, integration, plugin, reference, and skill domains. The
+ * full OpenCode v2 context additionally carries app, location, event, model,
+ * provider, session, storage, tool, and the remaining runtime domains. Probe
+ * verified against OpenCode 1.18.32: the v1 bridge lacks tool, session, event,
+ * storage, app, and location, so their presence distinguishes the runtimes.
+ */
+export declare function isFullV2Context(context: V2Plugin.Context): boolean;
+/**
+ * Build the shared adapter for one plugin context: a per-location config
+ * resolver and a config watcher multiplexer that keeps one filesystem watch
+ * per directory regardless of how many plugins subscribe to that directory.
+ */
+export declare function createV2Adapter(context: V2Plugin.Context): V2AdapterContext;
+/**
+ * Run every registered v2 plugin setup against the adapter, isolating failures
+ * per plugin, and return one cleanup that disposes the successful cleanups in
+ * reverse registration order.
+ *
+ * Under the v1 v2-bridge host this returns without registering anything: the
+ * same entrypoint's server() member already provides the v1 behavior, so the
+ * package never registers twice inside one OpenCode v1 process.
+ */
+export declare function setupV2Plugins(context: V2Plugin.Context): Promise<V2Plugin.Cleanup | void>;
+export {};

package/dist/plugins/v2-runtime/setup.js

@@ -0,0 +1,174 @@
+// FILE: src/plugins/v2-runtime/setup.ts
+// VERSION: 1.1.0
+// START_MODULE_CONTRACT
+//   PURPOSE: Dispatch the v2 setup(ctx) entry for the package root across the vvoc server plugins through a shared adapter carrying per-location config resolution and config watching.
+//   SCOPE: Central v2 registration seam: the adapter context (plugin context, location resolver, config watch helper), the ordered plugin setup registry, full-v2-context feature detection, per-plugin error isolation, and aggregated reverse-order cleanup disposal.
+//   DEPENDS: [@opencode/plugin, src/plugins/v2-runtime/location-config.ts, src/plugins/v2-runtime/config-watcher.ts]
+//   LINKS: [M-PLUGIN-V2-RUNTIME, V-M-PLUGIN-V2-RUNTIME]
+//   ROLE: RUNTIME
+//   MAP_MODE: EXPORTS
+// END_MODULE_CONTRACT
+//
+// START_MODULE_MAP
+//   setupV2Plugins - Run the v2 registrations for every vvoc server plugin against one full OpenCode v2 plugin context and return one aggregated cleanup; no-ops under the v1 v2-bridge host where the v1 runtime already calls server().
+//   V2_PLUGIN_SETUPS - Ordered registry of per-plugin v2 setup functions extended by later migration tasks.
+//   V2AdapterContext - Plugin context plus the location resolver and multiplexed config watcher shared by all vvoc plugins.
+//   createV2Adapter - Build the shared adapter context with the location resolver and multiplexed config watcher.
+//   isFullV2Context - Feature-detect whether a setup context carries the full OpenCode v2 domain set.
+// END_MODULE_MAP
+//
+// START_CHANGE_SUMMARY
+//   LAST_CHANGE: [C-OPENCODE-V2-MIGRATION T-002 - Plugin setups now receive the shared adapter context with per-location config resolution and config watching.]
+// END_CHANGE_SUMMARY
+import { createLocationResolver } from "./location-config.js";
+import { watchProjectVvocConfig } from "./config-watcher.js";
+import { setupAnalyticsV2 } from "../analytics/v2.js";
+import { setupSystemContextInjectionV2 } from "../system-context-injection/v2.js";
+import { setupModelRolesV2 } from "../model-roles/v2.js";
+import { setupToolHistoryCompactionV2 } from "../tool-history-compaction/v2.js";
+import { setupSpecGuardV2 } from "../spec-guard/v2.js";
+import { setupSecretsRedactionV2 } from "../secrets-redaction/v2.js";
+import { setupPeakHoursV2 } from "../peak-hours/v2.js";
+import { setupWebToolsV2 } from "../web-tools/v2.js";
+import { setupHashlineEditV2 } from "../hashline-edit/v2.js";
+import { setupGuardianV2 } from "../guardian/v2.js";
+import { setupWorkflowV2 } from "../workflow/v2.js";
+// END_BLOCK_V2_ADAPTER_CONTEXT
+// START_BLOCK_V2_PLUGIN_SETUPS
+/**
+ * Per-plugin v2 setup functions in the canonical v1 plugin order. Migration
+ * tasks append entries as each plugin gains its v2 registration.
+ */
+export const V2_PLUGIN_SETUPS = [
+    { name: "analytics", setup: (adapter) => setupAnalyticsV2(adapter) },
+    { name: "system-context-injection", setup: (adapter) => setupSystemContextInjectionV2(adapter) },
+    { name: "model-roles", setup: (adapter) => setupModelRolesV2(adapter) },
+    { name: "tool-history-compaction", setup: (adapter) => setupToolHistoryCompactionV2(adapter) },
+    { name: "spec-guard", setup: (adapter) => setupSpecGuardV2(adapter) },
+    { name: "secrets-redaction", setup: (adapter) => setupSecretsRedactionV2(adapter) },
+    { name: "peak-hours", setup: (adapter) => setupPeakHoursV2(adapter) },
+    { name: "web-tools", setup: (adapter) => setupWebToolsV2(adapter) },
+    { name: "hashline-edit", setup: (adapter) => setupHashlineEditV2(adapter) },
+    { name: "guardian", setup: (adapter) => setupGuardianV2(adapter) },
+    { name: "workflow", setup: (adapter) => setupWorkflowV2(adapter) },
+];
+// END_BLOCK_V2_PLUGIN_SETUPS
+// START_BLOCK_IS_FULL_V2_CONTEXT
+/**
+ * OpenCode v1 (>= 1.18.29) also invokes setup() on dual entrypoints through
+ * its reduced v2 bridge host, whose context only carries the agent, aisdk,
+ * catalog, command, integration, plugin, reference, and skill domains. The
+ * full OpenCode v2 context additionally carries app, location, event, model,
+ * provider, session, storage, tool, and the remaining runtime domains. Probe
+ * verified against OpenCode 1.18.32: the v1 bridge lacks tool, session, event,
+ * storage, app, and location, so their presence distinguishes the runtimes.
+ */
+export function isFullV2Context(context) {
+    const probe = context;
+    return ("tool" in probe &&
+        "session" in probe &&
+        "event" in probe &&
+        "storage" in probe &&
+        "app" in probe &&
+        "location" in probe);
+}
+// END_BLOCK_IS_FULL_V2_CONTEXT
+// START_BLOCK_CREATE_ADAPTER
+/**
+ * Build the shared adapter for one plugin context: a per-location config
+ * resolver and a config watcher multiplexer that keeps one filesystem watch
+ * per directory regardless of how many plugins subscribe to that directory.
+ */
+export function createV2Adapter(context) {
+    const resolver = createLocationResolver();
+    const subscriptions = new Map();
+    const activeWatches = new Map();
+    async function ensureWatched(directory) {
+        if (activeWatches.has(directory))
+            return;
+        const listeners = subscriptions.get(directory);
+        if (!listeners || listeners.size === 0)
+            return;
+        const stopWatch = await watchProjectVvocConfig(directory, () => {
+            resolver.invalidate(directory);
+            for (const listener of listeners.values()) {
+                try {
+                    listener();
+                }
+                catch (error) {
+                    console.warn(`[vvoc][v2-runtime] config listener failed for ${directory}: ${String(error)}`);
+                }
+            }
+        });
+        activeWatches.set(directory, stopWatch);
+    }
+    return {
+        ctx: context,
+        resolver,
+        async watchConfig(directory, onChange) {
+            const key = Symbol("vvoc-config-listener");
+            let listeners = subscriptions.get(directory);
+            if (!listeners) {
+                listeners = new Map();
+                subscriptions.set(directory, listeners);
+            }
+            listeners.set(key, onChange);
+            await ensureWatched(directory);
+            let stopped = false;
+            return () => {
+                if (stopped)
+                    return;
+                stopped = true;
+                const current = subscriptions.get(directory);
+                if (!current)
+                    return;
+                current.delete(key);
+                if (current.size === 0) {
+                    subscriptions.delete(directory);
+                    const stopWatch = activeWatches.get(directory);
+                    if (stopWatch) {
+                        activeWatches.delete(directory);
+                        stopWatch();
+                    }
+                }
+            };
+        },
+    };
+}
+// END_BLOCK_CREATE_ADAPTER
+// START_BLOCK_SETUP_V2_PLUGINS
+/**
+ * Run every registered v2 plugin setup against the adapter, isolating failures
+ * per plugin, and return one cleanup that disposes the successful cleanups in
+ * reverse registration order.
+ *
+ * Under the v1 v2-bridge host this returns without registering anything: the
+ * same entrypoint's server() member already provides the v1 behavior, so the
+ * package never registers twice inside one OpenCode v1 process.
+ */
+export async function setupV2Plugins(context) {
+    if (!isFullV2Context(context))
+        return undefined;
+    const adapter = createV2Adapter(context);
+    const cleanups = [];
+    for (const entry of V2_PLUGIN_SETUPS) {
+        try {
+            const cleanup = await entry.setup(adapter);
+            if (typeof cleanup === "function") {
+                cleanups.push(cleanup);
+            }
+        }
+        catch (error) {
+            console.error(`[vvoc][v2-runtime] plugin ${entry.name} failed to load: ${String(error)}`);
+        }
+    }
+    if (cleanups.length === 0)
+        return undefined;
+    return async () => {
+        for (const cleanup of cleanups.reverse()) {
+            await cleanup();
+        }
+    };
+}
+// END_BLOCK_SETUP_V2_PLUGINS
+//# sourceMappingURL=setup.js.map

package/dist/plugins/v2-runtime/setup.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../../src/plugins/v2-runtime/setup.ts"],"names":[],"mappings":"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"}

package/dist/plugins/web-tools/index.d.ts

@@ -16,3 +16,5 @@ export declare function applyBuiltinSuppression(config: Config): void;
  * naming the file without the value.
  */
 export declare const WebToolsPlugin: Plugin;
+declare const _default: import("../v2-runtime/index.js").DualPlugin;
+export default _default;

package/dist/plugins/web-tools/index.js

@@ -3,7 +3,7 @@
 // START_MODULE_CONTRACT
 //   PURPOSE: Register the canonical web_search and web_fetch tools, publish their strict input contracts through the owned definition seam, validate owned raw arguments before execution, and suppress OpenCode built-ins at runtime while the web-tools plugin is enabled.
 //   SCOPE: Startup vvoc snapshot use, plugin toggle handling, runtime permission suppression, tool registration, owned contract publication and pre-execute validation for the two owned tool ids only, and credential-safe diagnostics. No interception of unrelated host or MCP tools.
-//   DEPENDS: [@opencode-ai/plugin, src/lib/agent-tool-contract.ts, src/lib/config-layers.ts, src/lib/plugin-toggle-config.ts, src/plugins/web-tools/config.ts, src/plugins/web-tools/schemas.ts, src/plugins/web-tools/search-service.ts, src/plugins/web-tools/fetch-service.ts]
+//   DEPENDS: [@opencode-ai/plugin, src/lib/agent-tool-contract.ts, src/lib/config-layers.ts, src/lib/plugin-toggle-config.ts, src/plugins/web-tools/config.ts, src/plugins/web-tools/schemas.ts, src/plugins/web-tools/search-service.ts, src/plugins/web-tools/fetch-service.ts, src/plugins/v2-runtime/index.ts]
 //   LINKS: M-PLUGIN-WEB-TOOLS, M-WEB-CONFIG, M-WEB-SEARCH-SERVICE, M-WEB-FETCH-SERVICE, M-AGENT-TOOL-CONTRACT, V-M-PLUGIN-WEB-TOOLS, DF-WEB-SEARCH, DF-WEB-FETCH
 //   ROLE: RUNTIME
 //   MAP_MODE: EXPORTS
@@ -13,10 +13,11 @@
 //   SUPPRESSED_BUILTIN_PERMISSIONS - Built-in permission ids hidden while the plugin is enabled.
 //   applyBuiltinSuppression - Add runtime-only deny rules unless the user configured a key explicitly.
 //   WebToolsPlugin - Public plugin entry registering web_search and web_fetch.
+//   default - Dual subpath entrypoint: v2 setup() seam plus v1 server() delegating to the named factory.
 // END_MODULE_MAP
 //
 // START_CHANGE_SUMMARY
-//   LAST_CHANGE: [C-AGENT-TOOL-CONTRACTS T-006 - Published both web tool contracts through the owned definition adapter and added an owned-only pre-execute guard; preserved built-in suppression, explicit user overrides, and disabled-plugin behavior.]
+//   LAST_CHANGE: [C-OPENCODE-V2-MIGRATION T-001 - Added the dual subpath entrypoint so the plugin loads under OpenCode v1 via server() and v2 via setup(). Prior: C-AGENT-TOOL-CONTRACTS T-006 - Published both web tool contracts through the owned definition adapter and added an owned-only pre-execute guard; preserved built-in suppression, explicit user overrides, and disabled-plugin behavior.]
 // END_CHANGE_SUMMARY
 import { ContractInputError, createToolDefinitionAdapter } from "../../lib/agent-tool-contract.js";
 import { loadVvocConfig } from "../../lib/config-layers.js";
@@ -107,4 +108,14 @@ export const WebToolsPlugin = async ({ client, directory }) => {
         "tool.definition": toolDefinitionAdapter,
     };
 };
+// START_BLOCK_DUAL_SUBPATH_ENTRY
+import { defineDualPlugin } from "../v2-runtime/index.js";
+import { createV2Adapter } from "../v2-runtime/setup.js";
+import { setupWebToolsV2 } from "./v2.js";
+export default defineDualPlugin({
+    id: "vvoc.web-tools",
+    v1: WebToolsPlugin,
+    v2: (ctx) => setupWebToolsV2(createV2Adapter(ctx)),
+});
+// END_BLOCK_DUAL_SUBPATH_ENTRY
 //# sourceMappingURL=index.js.map

package/dist/plugins/web-tools/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/web-tools/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/web-tools/index.ts"],"names":[],"mappings":"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"}

package/dist/plugins/web-tools/v2.d.ts

@@ -0,0 +1,11 @@
+import type { Plugin as V2Plugin } from "@opencode/plugin";
+import type { V2AdapterContext } from "../v2-runtime/setup.js";
+/**
+ * Register the web tools on the v2 runtime.
+ *
+ * A later valid tool registration overrides the same effective name, so
+ * registering web_search and web_fetch replaces the OpenCode built-ins while
+ * the plugin is enabled and disposing the registration restores them, which
+ * replaces the v1 config-hook builtin suppression.
+ */
+export declare function setupWebToolsV2(adapter: V2AdapterContext): Promise<V2Plugin.Cleanup | void>;